Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp976850pxk; Fri, 25 Sep 2020 02:59:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygx9N8UOQ1wdtyTneOLwOVLSNSuQKqHwoO7O50Jq/FlxRmIHyoI8wo2mKxqzYJX95uaq/n X-Received: by 2002:a05:6402:3075:: with SMTP id bs21mr411068edb.236.1601027970617; Fri, 25 Sep 2020 02:59:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601027970; cv=none; d=google.com; s=arc-20160816; b=HS0z/cSiFpH+5ymBK0r0sonn94qoIjW8OePKR2LaOc4F8Qlz5hLv2N9f3x0fvllFKU trfaQVaUlC6lh/qTAgUbEdcTswvC1gnyzeicFq7blwIUtXf7SASASZR0AWAQ8VVihBAu 8AK/SzzR6uZGuGYX0bXFXEovIj8XR6SAE0jo/RJx1Y2hcTG4bLs6tCwdB3slEpCsjd/H UhcWNi1pbGOQcjgsOSznOb0kC8PjIqOO+F/SR2ZC+/fyL+xacdc4K5EkYgqDOMw5fhau 8b2+Y0oAbTxjbWK1XOZG570TndwqiQ8ejdz4jfHsmghoUVRs6Y6bLJ/6Wjf83tBTOwVa 31bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7RJH7pZMCVV5iroyiFLpiFRNTiQn0SSX+69PgDO+op4=; b=pGdjt/jslR0545u70mMVEDoYbRJEqA/2LKQf5IclYb3G2FCAz1x08FdZm6jZZqmrNH Bw9VC5+ODw5ik48+oiZv9b+ebYZERNDuC0LlnXBhcznN2fTMce3V8rI45/KkMFP/nLKO Bx7U6WcXSf1Bh2eh0sV0wW29rMqOFmn1SKk0mE5CJySreIfjOmTeG3CrKU7dW5d6Sy5a 2r61V0XpxDUMShRCZ/tmGR4YlDnH3HsPkfht9Zl+PqnS/TJSehhsG7kxDmFmTzgY51tk 88xgRfrHyb1O47TR+nukGSLIwEjmZ4X0oHbmAvHmD9l0xcowfW3/1N20OjpYTtwN3vHj 3AlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=Z5Tay6Ec; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b5si1478630ejq.317.2020.09.25.02.59.07; Fri, 25 Sep 2020 02:59:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=Z5Tay6Ec; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728173AbgIYJ5H (ORCPT + 99 others); Fri, 25 Sep 2020 05:57:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728143AbgIYJ44 (ORCPT ); Fri, 25 Sep 2020 05:56:56 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F218C0613D8 for ; Fri, 25 Sep 2020 02:56:55 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id d4so2388942wmd.5 for ; Fri, 25 Sep 2020 02:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7RJH7pZMCVV5iroyiFLpiFRNTiQn0SSX+69PgDO+op4=; b=Z5Tay6EcQTWazV7dTKt9RehYD/4epP7kRU3Ga/PrUGWrecnu5q/y5u3cYUdQDXeJ9c Tyz/nwhilwMzR4ntbwLfx6EoZ16+hl0EzUT8i/ih1BZiBOcm/WzdG1KAcIMWDxNltI6s e+yJCM3wjpKF1BppOv7Dp6OVp7eTZLCqSO4w8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7RJH7pZMCVV5iroyiFLpiFRNTiQn0SSX+69PgDO+op4=; b=ubjtStfJEUDNvKxCh5FDXqzX4utElXT18vu2iAAls1DKk0ysypOv6kBd2q36EVwvtB IqkQh4bAaEucpOVVw8EdkPiPL6Q9497sxWOJvgAuXOuks6DISjPXvjABz5naV5P0Pmmj NTElWAeRg+97pA3IMSkfg6OrU0BgXA5buFEsY1pEYyb3pKqBIRMBWMETgTuI/+Sn3XHO FObg30OzuBp3XMg6NPMBbeAtlrHYNXTrwY8XuXg8E+m3KPmT0e4gidSgMtdZVDSkHlii tEoSQ6D+ISq54Cd7b2CtN+wvLKwwhWqmo0bh1pBM9IBpJyOeuSyrZOyl7uLbDXGLyuNb Yqfw== X-Gm-Message-State: AOAM533ujUxKvuaPFsxH30I+G3PtH5wUx2yzNRPk+mUJa5qorsc2qUok Qu589U/Vtm01/JXF8Ia9wTa7pg== X-Received: by 2002:a7b:cc17:: with SMTP id f23mr2095213wmh.166.1601027813944; Fri, 25 Sep 2020 02:56:53 -0700 (PDT) Received: from antares.lan (e.0.c.6.b.e.c.e.a.c.9.7.c.2.1.0.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff:12c:79ca:eceb:6c0e]) by smtp.gmail.com with ESMTPSA id l10sm2225084wru.59.2020.09.25.02.56.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 02:56:53 -0700 (PDT) From: Lorenz Bauer To: Shuah Khan , Alexei Starovoitov , Daniel Borkmann Cc: kernel-team@cloudflare.com, Lorenz Bauer , linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next 4/4] selftest: bpf: Test copying a sockmap and sockhash Date: Fri, 25 Sep 2020 10:56:30 +0100 Message-Id: <20200925095630.49207-5-lmb@cloudflare.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200925095630.49207-1-lmb@cloudflare.com> References: <20200925095630.49207-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since we can now call map_update_elem(sockmap) from bpf_iter context it's possible to copy a sockmap or sockhash in the kernel. Add a selftest which exercises this. Signed-off-by: Lorenz Bauer --- .../selftests/bpf/prog_tests/sockmap_basic.c | 14 +++++----- .../selftests/bpf/progs/bpf_iter_sockmap.c | 27 +++++++++++++++---- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c index e8a4bfb4d9f4..854a508e81ce 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c @@ -194,7 +194,7 @@ static void test_sockmap_invalid_update(void) test_sockmap_invalid_update__destroy(skel); } -static void test_sockmap_iter(enum bpf_map_type map_type) +static void test_sockmap_copy(enum bpf_map_type map_type) { DECLARE_LIBBPF_OPTS(bpf_iter_attach_opts, opts); int err, len, src_fd, iter_fd, duration = 0; @@ -242,7 +242,7 @@ static void test_sockmap_iter(enum bpf_map_type map_type) linfo.map.map_fd = src_fd; opts.link_info = &linfo; opts.link_info_len = sizeof(linfo); - link = bpf_program__attach_iter(skel->progs.count_elems, &opts); + link = bpf_program__attach_iter(skel->progs.copy, &opts); if (CHECK(IS_ERR(link), "attach_iter", "attach_iter failed\n")) goto out; @@ -265,6 +265,8 @@ static void test_sockmap_iter(enum bpf_map_type map_type) skel->bss->socks, num_sockets)) goto close_iter; + compare_cookies(src, skel->maps.dst); + close_iter: close(iter_fd); free_link: @@ -294,8 +296,8 @@ void test_sockmap_basic(void) test_sockmap_update(BPF_MAP_TYPE_SOCKHASH); if (test__start_subtest("sockmap update in unsafe context")) test_sockmap_invalid_update(); - if (test__start_subtest("sockmap iter")) - test_sockmap_iter(BPF_MAP_TYPE_SOCKMAP); - if (test__start_subtest("sockhash iter")) - test_sockmap_iter(BPF_MAP_TYPE_SOCKHASH); + if (test__start_subtest("sockmap copy")) + test_sockmap_copy(BPF_MAP_TYPE_SOCKMAP); + if (test__start_subtest("sockhash copy")) + test_sockmap_copy(BPF_MAP_TYPE_SOCKHASH); } diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_sockmap.c b/tools/testing/selftests/bpf/progs/bpf_iter_sockmap.c index 1af7555f6057..f3af0e30cead 100644 --- a/tools/testing/selftests/bpf/progs/bpf_iter_sockmap.c +++ b/tools/testing/selftests/bpf/progs/bpf_iter_sockmap.c @@ -22,21 +22,38 @@ struct { __type(value, __u64); } sockhash SEC(".maps"); +struct { + __uint(type, BPF_MAP_TYPE_SOCKHASH); + __uint(max_entries, 64); + __type(key, __u32); + __type(value, __u64); +} dst SEC(".maps"); + __u32 elems = 0; __u32 socks = 0; SEC("iter/sockmap") -int count_elems(struct bpf_iter__sockmap *ctx) +int copy(struct bpf_iter__sockmap *ctx) { struct sock *sk = ctx->sk; __u32 tmp, *key = ctx->key; int ret; - if (key) - elems++; + if (!key) + return 0; - if (sk) + elems++; + + /* We need a temporary buffer on the stack, since the verifier doesn't + * let us use the pointer from the context as an argument to the helper. + */ + tmp = *key; + + if (sk) { socks++; + return bpf_map_update_elem(&dst, &tmp, sk, 0) != 0; + } - return 0; + ret = bpf_map_delete_elem(&dst, &tmp); + return ret && ret != -ENOENT; } -- 2.25.1