From patchwork Thu Nov 26 17:02:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florent Revest X-Patchwork-Id: 11934379 X-Patchwork-Delegate: bpf@iogearbox.net 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 09E12C8300C for ; Thu, 26 Nov 2020 17:02:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D04C421D81 for ; Thu, 26 Nov 2020 17:02:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="VVRHBAlz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404264AbgKZRCT (ORCPT ); Thu, 26 Nov 2020 12:02:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404240AbgKZRCR (ORCPT ); Thu, 26 Nov 2020 12:02:17 -0500 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 EE715C0617A7 for ; Thu, 26 Nov 2020 09:02:16 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id p22so2749840wmg.3 for ; Thu, 26 Nov 2020 09:02:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WF3H28fEoYL2LDdOhRT3Ab9ca5suerjl3gza57entlg=; b=VVRHBAlzq5rkqrbiekPZUESvERwFucIUzv2eeGQBwSkqCFP9VEod2rsWKAMo7CpXnq M4ovNfj5d9R8C7OS6Rllff0lyf7HdFCtC/Y5S/bwP0KusvH2ho2/HqKsyZQNX1D+U11B KWSpNujKPhshnpbIbAriyhEIYDN7KsrFYRpG4= 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:mime-version :content-transfer-encoding; bh=WF3H28fEoYL2LDdOhRT3Ab9ca5suerjl3gza57entlg=; b=GtwIDO1hM3wpkTc4VHX1Xe/V+7OP5krxYcc5GZoD74FKxQRT8WvOMM/oJTJzbjDme4 XRavNlKpaS+OWl1L3HnpZV+PGsu52WATEeVjqSZHS/MXE22qAzUR0OAxLuo2BX8gj1CE Se0jfOnu75sgIGaeYcGFAnWex06h9wbbdAVizXv45aa1T7gmiG/TgoAZu/SkRDa0bJET 237TVOBRkoEWv0kOixUSzqVNnw1fKlmhAyYbTKAYoX1FdUhYxo02DA1pX425G9uVt/Kb QNN1b7Qo+AW0aws2lJ5wA7ibZzEoJVtE1mCqiNWNljd2KC6DvCx458MeDHtPMbwFLJtY 4Fng== X-Gm-Message-State: AOAM533d1tXnJSL+ZEf3gH6cH0od1svKJfAi9jh3dqIEb3yeoW2Er3vS Y1XunJwG1y5wbq0BXnv6fzSLYzhmRZwHuIr+ X-Google-Smtp-Source: ABdhPJwh6iMKsGrUw8a4IAsQW1+EEqQOxevWJtxF7h4yHKME9ETvMrIsQZLMAjm6sCqvrDzLJvNOPA== X-Received: by 2002:a05:600c:58e:: with SMTP id o14mr4431504wmd.47.1606410135376; Thu, 26 Nov 2020 09:02:15 -0800 (PST) Received: from revest.zrh.corp.google.com ([2a00:79e0:42:204:f693:9fff:fef4:a569]) by smtp.gmail.com with ESMTPSA id d17sm9373192wro.62.2020.11.26.09.02.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 09:02:14 -0800 (PST) From: Florent Revest X-Google-Original-From: Florent Revest To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@chromium.org, revest@google.com, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next 1/2] bpf: Expose bpf_get_socket_cookie to tracing programs Date: Thu, 26 Nov 2020 18:02:11 +0100 Message-Id: <20201126170212.1749137-1-revest@google.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net This creates a new helper proto because the existing bpf_get_socket_cookie_sock_proto has a ARG_PTR_TO_CTX argument and only works for BPF programs where the context is a sock. This helper could also be useful to other BPF program types such as LSM. Signed-off-by: Florent Revest --- kernel/trace/bpf_trace.c | 4 ++++ net/core/filter.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index d255bc9b2bfa..14ad96579813 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1725,6 +1725,8 @@ raw_tp_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) } } +extern const struct bpf_func_proto bpf_get_socket_cookie_sock_tracing_proto; + const struct bpf_func_proto * tracing_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) { @@ -1748,6 +1750,8 @@ tracing_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_sk_storage_get_tracing_proto; case BPF_FUNC_sk_storage_delete: return &bpf_sk_storage_delete_tracing_proto; + case BPF_FUNC_get_socket_cookie: + return &bpf_get_socket_cookie_sock_tracing_proto; #endif case BPF_FUNC_seq_printf: return prog->expected_attach_type == BPF_TRACE_ITER ? diff --git a/net/core/filter.c b/net/core/filter.c index 2ca5eecebacf..177c4e5e529d 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4631,6 +4631,13 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_proto = { .arg1_type = ARG_PTR_TO_CTX, }; +const struct bpf_func_proto bpf_get_socket_cookie_sock_tracing_proto = { + .func = bpf_get_socket_cookie_sock, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_BTF_ID_SOCK_COMMON, +}; + BPF_CALL_1(bpf_get_socket_cookie_sock_ops, struct bpf_sock_ops_kern *, ctx) { return __sock_gen_cookie(ctx->sk); From patchwork Thu Nov 26 17:02:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florent Revest X-Patchwork-Id: 11934381 X-Patchwork-Delegate: bpf@iogearbox.net 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 81A68C83010 for ; Thu, 26 Nov 2020 17:02:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E7B02145D for ; Thu, 26 Nov 2020 17:02:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fA0RiKXk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404274AbgKZRCY (ORCPT ); Thu, 26 Nov 2020 12:02:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403803AbgKZRCT (ORCPT ); Thu, 26 Nov 2020 12:02:19 -0500 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEDD1C0617A7 for ; Thu, 26 Nov 2020 09:02:17 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id s8so2847926wrw.10 for ; Thu, 26 Nov 2020 09:02:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SyZHVQfg5UasRnRBi3W8BI7EDbmbn+6eB9vLQ5Pp2HY=; b=fA0RiKXkxKUleTSpu9sFswF9isRUHKBVQcc0iFHjQytBucWWbVkKm99wSwmhMaR/Mp xbSzn8VCCNM0WPBgYSBY66IDgYKSeffh0eL8hG6F7EL+nVdJYqL6LPKbkee27QJjNF4I skam84Z6jUkO8ERvzzxbt85mvwAGwZkudWBcM= 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=SyZHVQfg5UasRnRBi3W8BI7EDbmbn+6eB9vLQ5Pp2HY=; b=Xh9Vw+jziLXo3vd/4oV+VjQwDxZF+pQvdFHSbGH+91c188rE17oYJvNZJTzh1C3mwk RXfPb4DZWxtC9QaPtNZm40ayA/60xzKeNmPEz/JTAQTQUPvIbdBobE90UqFFc72lyVZf AgnK988qBHyk0BskXFRHEjeeq6Lzqpqb8tChh7DSGkosspl0/weg1oKo1PF6ma3+CUfE kgP0/SSACAnscALNfrD/gjqCakX8b/lvxpSIxXXOhzYxwStrrtr2RwP5rjV49z1QgNDN 6WXiKrMb6o9clyBYdi83L+06qdnFWgV/QuzlpQ/y7Nf8UlHfFVTzsjU27fz/X2OWYlfN U0Rw== X-Gm-Message-State: AOAM530DSjD9EFx5guyw7VYiuzZsIh+gonR2963BT4QJyLyD3NtXc47/ R1ljonBKV/HUUw4Exxq+d/Qh2vw/YIZ6swsX X-Google-Smtp-Source: ABdhPJy0yhbmTT4EP0QCtY4CaJGWo9teCucIPZrWJdlHYhJ2EnwPpFySLQRhraU7zDnUBdbWuOmGRA== X-Received: by 2002:adf:de12:: with SMTP id b18mr5008582wrm.187.1606410136330; Thu, 26 Nov 2020 09:02:16 -0800 (PST) Received: from revest.zrh.corp.google.com ([2a00:79e0:42:204:f693:9fff:fef4:a569]) by smtp.gmail.com with ESMTPSA id d17sm9373192wro.62.2020.11.26.09.02.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 09:02:15 -0800 (PST) From: Florent Revest X-Google-Original-From: Florent Revest To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@chromium.org, revest@google.com, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next 2/2] bpf: Add a selftest for the tracing bpf_get_socket_cookie Date: Thu, 26 Nov 2020 18:02:12 +0100 Message-Id: <20201126170212.1749137-2-revest@google.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog In-Reply-To: <20201126170212.1749137-1-revest@google.com> References: <20201126170212.1749137-1-revest@google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net This builds up on the existing socket cookie test which checks whether the bpf_get_socket_cookie helpers provide the same value in cgroup/connect6 and sockops programs for a socket created by the userspace part of the test. Adding a tracing program to the existing objects requires a different attachment strategy and different headers. Signed-off-by: Florent Revest --- .../selftests/bpf/progs/socket_cookie_prog.c | 41 ++++++++++++++++--- .../selftests/bpf/test_socket_cookie.c | 18 +++++--- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/socket_cookie_prog.c b/tools/testing/selftests/bpf/progs/socket_cookie_prog.c index 0cb5656a22b0..a11026aeaaf1 100644 --- a/tools/testing/selftests/bpf/progs/socket_cookie_prog.c +++ b/tools/testing/selftests/bpf/progs/socket_cookie_prog.c @@ -1,11 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2018 Facebook -#include -#include +#include "vmlinux.h" #include #include +#include + +#define AF_INET6 10 struct socket_cookie { __u64 cookie_key; @@ -19,6 +21,14 @@ struct { __type(value, struct socket_cookie); } socket_cookies SEC(".maps"); +/* + * These three programs get executed in a row on connect() syscalls. The + * userspace side of the test creates a client socket, issues a connect() on it + * and then checks that the local storage associated with this socket has: + * cookie_value == local_port << 8 | 0xFF + * The different parts of this cookie_value are appended by those hooks if they + * all agree on the output of bpf_get_socket_cookie(). + */ SEC("cgroup/connect6") int set_cookie(struct bpf_sock_addr *ctx) { @@ -32,14 +42,14 @@ int set_cookie(struct bpf_sock_addr *ctx) if (!p) return 1; - p->cookie_value = 0xFF; + p->cookie_value = 0xF; p->cookie_key = bpf_get_socket_cookie(ctx); return 1; } SEC("sockops") -int update_cookie(struct bpf_sock_ops *ctx) +int update_cookie_sockops(struct bpf_sock_ops *ctx) { struct bpf_sock *sk; struct socket_cookie *p; @@ -60,11 +70,32 @@ int update_cookie(struct bpf_sock_ops *ctx) if (p->cookie_key != bpf_get_socket_cookie(ctx)) return 1; - p->cookie_value = (ctx->local_port << 8) | p->cookie_value; + p->cookie_value |= (ctx->local_port << 8); return 1; } +SEC("fexit/inet_stream_connect") +int BPF_PROG(update_cookie_tracing, struct socket *sock, + struct sockaddr *uaddr, int addr_len, int flags) +{ + struct socket_cookie *p; + + if (uaddr->sa_family != AF_INET6) + return 0; + + p = bpf_sk_storage_get(&socket_cookies, sock->sk, 0, 0); + if (!p) + return 0; + + if (p->cookie_key != bpf_get_socket_cookie(sock->sk)) + return 0; + + p->cookie_value |= 0xF0; + + return 0; +} + int _version SEC("version") = 1; char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/test_socket_cookie.c b/tools/testing/selftests/bpf/test_socket_cookie.c index ca7ca87e91aa..0d955c65a4f8 100644 --- a/tools/testing/selftests/bpf/test_socket_cookie.c +++ b/tools/testing/selftests/bpf/test_socket_cookie.c @@ -133,6 +133,7 @@ static int run_test(int cgfd) struct bpf_prog_load_attr attr; struct bpf_program *prog; struct bpf_object *pobj; + struct bpf_link *link; const char *prog_name; int server_fd = -1; int client_fd = -1; @@ -153,11 +154,18 @@ static int run_test(int cgfd) bpf_object__for_each_program(prog, pobj) { prog_name = bpf_program__section_name(prog); - if (libbpf_attach_type_by_name(prog_name, &attach_type)) - goto err; - - err = bpf_prog_attach(bpf_program__fd(prog), cgfd, attach_type, - BPF_F_ALLOW_OVERRIDE); + if (bpf_program__is_tracing(prog)) { + link = bpf_program__attach(prog); + err = !link; + continue; + } else { + if (libbpf_attach_type_by_name(prog_name, &attach_type)) + goto err; + + err = bpf_prog_attach(bpf_program__fd(prog), cgfd, + attach_type, + BPF_F_ALLOW_OVERRIDE); + } if (err) { log_err("Failed to attach prog %s", prog_name); goto out;