From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.3 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4897C31E46 for ; Wed, 12 Jun 2019 17:30:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D404215EA for ; Wed, 12 Jun 2019 17:30:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JL37K2LY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409548AbfFLRaw (ORCPT ); Wed, 12 Jun 2019 13:30:52 -0400 Received: from mail-vs1-f73.google.com ([209.85.217.73]:54868 "EHLO mail-vs1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409554AbfFLRaw (ORCPT ); Wed, 12 Jun 2019 13:30:52 -0400 Received: by mail-vs1-f73.google.com with SMTP id 184so5614613vsm.21 for ; Wed, 12 Jun 2019 10:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=lnSzeYdpJQCfSwR2gxAs8Ypau7xTKghIzw3qzvylwKU=; b=JL37K2LYpYVAau+IhV93rXXut1llW7IBWsF2sKDKVL3Knv0SH0aXSEThpMnqJ8A6G2 Gk6ggks3Te8uW27ppY++FLtHCBO5dL+ujgVZVY5asHltHtqLzi+8khdmFLD2wVBpJyc3 MOJXSgpAnNGgu1MifJYGxqjYrSK59CcN8UuvRzTsWpXSeuSfyi4bR7qY3qXuZ7FVco3Q 80W6u5ki0cgbuUuSx9v4WoBbH2cPCHFlGbwws2H0LBuU2EUp3rUKhgOCmkSi+Y7RLF8u +IAUbIQxkh//xNjl9EjPsLbXSj6VkKhdR9uDjwMMp6iBfcZz2oztBAF0Zkd5bpSRJjUp /zWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=lnSzeYdpJQCfSwR2gxAs8Ypau7xTKghIzw3qzvylwKU=; b=nNWgyfylJeTvEVjwf/BsPV1+ljG3zbpbkaZvAyiArXQv5IeBnX6XoBvWc/aC8/uIbN 4ydo5SXUEXSCNkBvb9ddPcSlxyqPy3J+JxglYejXwNWZNmSYceXZTWteUHG3DSEs3tDT tpxddh6u2YijBBSf0VujkZOYGd1dSirsXc4g+XAT66+1NwxSzDZSVQr1q9pryLRzBZcH vyuhBRp6Gfdg6Rfz8wvAHLJNdqrFQVC37ILnLJZ6SdRIz9FA5TsFKMizZZx0/loOc071 bqEfZJZfS7QKGyEsMri0N8fMm76ROhmiIzGu5LjAYuOc2W7qYmQvLQvG8LO4HLHZfprg tAJw== X-Gm-Message-State: APjAAAUu6u/yRbYNfOrg5I13FCK/mwLZsojIdm/UhHdOqUhsLiMuIlgC 8OF/8awni8oL6rroAfjZoKDwj4Y= X-Google-Smtp-Source: APXvYqwwmiWbcPNvQIYtoHc53dcQgUx+dxnQYMKtt0dIs+NqjdAIV/ON7uciV+HNbT4iUwxlPAVg+7c= X-Received: by 2002:a1f:8744:: with SMTP id j65mr32844970vkd.17.1560360650604; Wed, 12 Jun 2019 10:30:50 -0700 (PDT) Date: Wed, 12 Jun 2019 10:30:40 -0700 In-Reply-To: <20190612173040.61944-1-sdf@google.com> Message-Id: <20190612173040.61944-4-sdf@google.com> Mime-Version: 1.0 References: <20190612173040.61944-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.rc2.383.gf4fbbf30c2-goog Subject: [PATCH bpf-next 4/4] selftests/bpf: convert socket_cookie test to sk storage From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Martin Lau Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This lets us test that both BPF_PROG_TYPE_CGROUP_SOCK_ADDR and BPF_PROG_TYPE_SOCK_OPS can access underlying bpf_sock. Cc: Martin Lau Signed-off-by: Stanislav Fomichev --- .../selftests/bpf/progs/socket_cookie_prog.c | 46 ++++++++++++------- .../selftests/bpf/test_socket_cookie.c | 24 ++++------ 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/socket_cookie_prog.c b/tools/testing/selftests/bpf/progs/socket_cookie_prog.c index 9ff8ac4b0bf6..0db15c3210ad 100644 --- a/tools/testing/selftests/bpf/progs/socket_cookie_prog.c +++ b/tools/testing/selftests/bpf/progs/socket_cookie_prog.c @@ -7,25 +7,35 @@ #include "bpf_helpers.h" #include "bpf_endian.h" +struct socket_cookie { + __u64 cookie_key; + __u32 cookie_value; +}; + struct bpf_map_def SEC("maps") socket_cookies = { - .type = BPF_MAP_TYPE_HASH, - .key_size = sizeof(__u64), - .value_size = sizeof(__u32), - .max_entries = 1 << 8, + .type = BPF_MAP_TYPE_SK_STORAGE, + .key_size = sizeof(int), + .value_size = sizeof(struct socket_cookie), + .map_flags = BPF_F_NO_PREALLOC, }; +BPF_ANNOTATE_KV_PAIR(socket_cookies, int, struct socket_cookie); + SEC("cgroup/connect6") int set_cookie(struct bpf_sock_addr *ctx) { - __u32 cookie_value = 0xFF; - __u64 cookie_key; + struct socket_cookie *p; if (ctx->family != AF_INET6 || ctx->user_family != AF_INET6) return 1; - cookie_key = bpf_get_socket_cookie(ctx); - if (bpf_map_update_elem(&socket_cookies, &cookie_key, &cookie_value, 0)) - return 0; + p = bpf_sk_storage_get(&socket_cookies, ctx->sk, 0, + BPF_SK_STORAGE_GET_F_CREATE); + if (!p) + return 1; + + p->cookie_value = 0xFF; + p->cookie_key = bpf_get_socket_cookie(ctx); return 1; } @@ -33,9 +43,8 @@ int set_cookie(struct bpf_sock_addr *ctx) SEC("sockops") int update_cookie(struct bpf_sock_ops *ctx) { - __u32 new_cookie_value; - __u32 *cookie_value; - __u64 cookie_key; + struct bpf_sock *sk; + struct socket_cookie *p; if (ctx->family != AF_INET6) return 1; @@ -43,14 +52,17 @@ int update_cookie(struct bpf_sock_ops *ctx) if (ctx->op != BPF_SOCK_OPS_TCP_CONNECT_CB) return 1; - cookie_key = bpf_get_socket_cookie(ctx); + if (!ctx->sk) + return 1; + + p = bpf_sk_storage_get(&socket_cookies, ctx->sk, 0, 0); + if (!p) + return 1; - cookie_value = bpf_map_lookup_elem(&socket_cookies, &cookie_key); - if (!cookie_value) + if (p->cookie_key != bpf_get_socket_cookie(ctx)) return 1; - new_cookie_value = (ctx->local_port << 8) | *cookie_value; - bpf_map_update_elem(&socket_cookies, &cookie_key, &new_cookie_value, 0); + p->cookie_value = (ctx->local_port << 8) | p->cookie_value; return 1; } diff --git a/tools/testing/selftests/bpf/test_socket_cookie.c b/tools/testing/selftests/bpf/test_socket_cookie.c index cac8ee57a013..15653b0e26eb 100644 --- a/tools/testing/selftests/bpf/test_socket_cookie.c +++ b/tools/testing/selftests/bpf/test_socket_cookie.c @@ -18,6 +18,11 @@ #define CG_PATH "/foo" #define SOCKET_COOKIE_PROG "./socket_cookie_prog.o" +struct socket_cookie { + __u64 cookie_key; + __u32 cookie_value; +}; + static int start_server(void) { struct sockaddr_in6 addr; @@ -89,8 +94,7 @@ static int validate_map(struct bpf_map *map, int client_fd) __u32 cookie_expected_value; struct sockaddr_in6 addr; socklen_t len = sizeof(addr); - __u32 cookie_value; - __u64 cookie_key; + struct socket_cookie val; int err = 0; int map_fd; @@ -101,17 +105,7 @@ static int validate_map(struct bpf_map *map, int client_fd) map_fd = bpf_map__fd(map); - err = bpf_map_get_next_key(map_fd, NULL, &cookie_key); - if (err) { - log_err("Can't get cookie key from map"); - goto out; - } - - err = bpf_map_lookup_elem(map_fd, &cookie_key, &cookie_value); - if (err) { - log_err("Can't get cookie value from map"); - goto out; - } + err = bpf_map_lookup_elem(map_fd, &client_fd, &val); err = getsockname(client_fd, (struct sockaddr *)&addr, &len); if (err) { @@ -120,8 +114,8 @@ static int validate_map(struct bpf_map *map, int client_fd) } cookie_expected_value = (ntohs(addr.sin6_port) << 8) | 0xFF; - if (cookie_value != cookie_expected_value) { - log_err("Unexpected value in map: %x != %x", cookie_value, + if (val.cookie_value != cookie_expected_value) { + log_err("Unexpected value in map: %x != %x", val.cookie_value, cookie_expected_value); goto err; } -- 2.22.0.rc2.383.gf4fbbf30c2-goog