From patchwork Wed May 13 19:23:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 1289658 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Yin8pd76; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Ml3h62bQz9sSd for ; Thu, 14 May 2020 05:24:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390616AbgEMTYc (ORCPT ); Wed, 13 May 2020 15:24:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1732218AbgEMTYb (ORCPT ); Wed, 13 May 2020 15:24:31 -0400 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EABBC061A0C; Wed, 13 May 2020 12:24:31 -0700 (PDT) Received: by mail-il1-x142.google.com with SMTP id j2so864838ilr.5; Wed, 13 May 2020 12:24:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=oyHM7TvRRRTe25Gl/u3VxiStdwZw33rB19WS0P/3OiA=; b=Yin8pd76CWbWIEseez/cjeYX3rdWlXrNanzFRMF7Y26rxHTlorfdxz9WqMNo4Z7leb Lz/rlmDjkJk/UBGqYfu1EZtZ3u0VoMGeWQGBkzw3dCgtW7j/3zrl4ra+lmgDHLo/V6/g SwyKU+po3dTV+uDLtFPp7sMB1sRQmcQ6jds98M7XwbFnhjjUQaCJUXHNbHrjcyjCNfAw yPbbKPXoAAPMKfU43MzNojPUrt/Z4uFB+he0D/5JKQoCl6kPJkh5z+7x/uIrvolz5ElC o5GvRYn3KhjjFFVe9Ft+HkOjlROMp4jahuvZ5NoP/J+MNv4F1dA+41zL1byq6ANTVHK4 c03A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=oyHM7TvRRRTe25Gl/u3VxiStdwZw33rB19WS0P/3OiA=; b=XjAS6sEYGSKvYtmt7R4pwcn3LGtUb/HY5p7hSUAvF/CoRaY7M6kwCfWlXn4hbaZNED kRmIXO+f/18BTUtsdL6LHZsWic36HmkDEL1c6r8ffuVFYg21mt6HV5oUqw4ZFtEvn5uN i2SqHFqIMDyEpuXjP9i8nAkFd0aeIxmkVZP5MlOZpiLBnzum8cr10zB5ev9hkYJsV/OT eQde67GN4EAc06Vokpj+yqHEBZWXLINMW5c6W8yXMrlreZjmqYNfFqkzfhZ5T4bHfCEZ hPKYlcbhGNkedXqlvhhZ5fGcgcHk8Z0MRG0O8t9r8ArPS9dQPjychcf8nxYiu4M+jSMq KfEQ== X-Gm-Message-State: AOAM531y1AfBlMqkEyVbyg5xkKYfbMve8f11YXiwz3XdYodFB6SutJec 9sAirC7q+eSnnhfgbiRrNbc= X-Google-Smtp-Source: ABdhPJzr2m/XSg2/puojGKGu85g9+YglT6hCmanxh9yGf7xNeTM6y1hpp8rlxY6dO80XF9GbxSOHeg== X-Received: by 2002:a92:9ed0:: with SMTP id s77mr948204ilk.283.1589397870966; Wed, 13 May 2020 12:24:30 -0700 (PDT) Received: from [127.0.1.1] ([184.63.162.180]) by smtp.gmail.com with ESMTPSA id r1sm163749ilg.61.2020.05.13.12.23.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 May 2020 12:24:30 -0700 (PDT) Subject: [bpf-next PATCH 1/3] bpf: sk_msg add some generic helpers that may be useful from sk_msg From: John Fastabend To: ast@kernel.org, daniel@iogearbox.net Cc: lmb@cloudflare.com, bpf@vger.kernel.org, john.fastabend@gmail.com, jakub@cloudflare.com, netdev@vger.kernel.org Date: Wed, 13 May 2020 12:23:50 -0700 Message-ID: <158939783014.17281.11169741455617229373.stgit@john-Precision-5820-Tower> In-Reply-To: <158939776371.17281.8506900883049313932.stgit@john-Precision-5820-Tower> References: <158939776371.17281.8506900883049313932.stgit@john-Precision-5820-Tower> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add these generic helpers that may be useful to use from sk_msg programs. The helpers do not depend on ctx so we can simply add them here, BPF_FUNC_perf_event_output BPF_FUNC_get_current_uid_gid BPF_FUNC_get_current_pid_tgid BPF_FUNC_get_current_comm BPF_FUNC_get_current_cgroup_id BPF_FUNC_get_current_ancestor_cgroup_id BPF_FUNC_get_cgroup_classid Signed-off-by: John Fastabend Acked-by: Yonghong Song --- net/core/filter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index da06349..45b4a16 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6380,6 +6380,22 @@ sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_msg_push_data_proto; case BPF_FUNC_msg_pop_data: return &bpf_msg_pop_data_proto; + case BPF_FUNC_perf_event_output: + return &bpf_event_output_data_proto; + case BPF_FUNC_get_current_uid_gid: + return &bpf_get_current_uid_gid_proto; + case BPF_FUNC_get_current_pid_tgid: + return &bpf_get_current_pid_tgid_proto; +#ifdef CONFIG_CGROUPS + case BPF_FUNC_get_current_cgroup_id: + return &bpf_get_current_cgroup_id_proto; + case BPF_FUNC_get_current_ancestor_cgroup_id: + return &bpf_get_current_ancestor_cgroup_id_proto; +#endif +#ifdef CONFIG_CGROUP_NET_CLASSID + case BPF_FUNC_get_cgroup_classid: + return &bpf_get_cgroup_classid_curr_proto; +#endif default: return bpf_base_func_proto(func_id); } From patchwork Wed May 13 19:24:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 1289660 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DruQPF0J; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Ml476qTPz9sSm for ; Thu, 14 May 2020 05:24:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390616AbgEMTYz (ORCPT ); Wed, 13 May 2020 15:24:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1732218AbgEMTYy (ORCPT ); Wed, 13 May 2020 15:24:54 -0400 Received: from mail-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61E17C061A0C; Wed, 13 May 2020 12:24:53 -0700 (PDT) Received: by mail-il1-x143.google.com with SMTP id b18so887464ilf.2; Wed, 13 May 2020 12:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=mi/KO7g/LWcVX05cFdlNrLjoY2HGc40PsFiHws1E9sA=; b=DruQPF0JjEmVqFeVxupJk2RM5cSiJHZjGFxsd9/IJN5hrHNLu8Y6ngoPWPP91g039t JtcTuN/p/kdICzj1TS/pfNdmMhCREvmWEiFCADrf4wiQxDvHggwzG2RBylQiDjzsrca+ 6WB12K1yAJqHbVmJuWLMmr54yrrHWTK4iqQwczPDKv/G6qC0me9TUnz8qBj/OR8Yp/w+ wSz1PddPGrslRlZv7P2On539RhQOZdHxUvrGySO4UC1CJB6GgvG60mWVbmRMOW9P8h2r pbj7fxCh/im/7irKf4SU+sEtMBYPCbLs7kRuv12ES7LIXXuSV5rUTIluzTrunK8A/gW1 0CNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=mi/KO7g/LWcVX05cFdlNrLjoY2HGc40PsFiHws1E9sA=; b=KKfTRhgcKVowY5yKM7PTehNEm1iDYgDm4sNzwu0KRkIfNwZeWR3/+ikng/xUOVXGPM i2HFfmZm37+nsZb4/GYNpI9dB4wsUD8vkJyixRUbMPFar93rofi+e+SC2eqs0xIhP1Ln 8CIbjbxmIGnyFcKVsLKpEhw2t/qXN3kzp163ZkYh1EFNf5JrYnCSygSgGEn6mq0Ynf0f 6HOlslnIpfPtdizmb/3+VEnBPhxWYhNoEag/oPTojCX5EVE+tZSCmL5yfOdRuvCGTJIt VOrXZOXXfQ7B1WFNU5ms4lar0G9EEGmgMmda7CodUjLMW46IDnJSCX9eck41cbyPShn6 gAjg== X-Gm-Message-State: AOAM531UwRLPBkmD2hlLMZogkPWq+tAhVqM3w9iC576jpYW+g6nfK3Fv MWpY24CkJtXwCmsP22It9O0= X-Google-Smtp-Source: ABdhPJwHyf9o7/17gnOs6i7g6564uiB3bwvw+ODvqEbV6/f1bKH9y64sY4AUThdzcc7mtBJcrzCoRw== X-Received: by 2002:a92:d4c4:: with SMTP id o4mr1075683ilm.38.1589397892743; Wed, 13 May 2020 12:24:52 -0700 (PDT) Received: from [127.0.1.1] ([184.63.162.180]) by smtp.gmail.com with ESMTPSA id m17sm167114ilh.51.2020.05.13.12.24.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 May 2020 12:24:52 -0700 (PDT) Subject: [bpf-next PATCH 2/3] bpf: sk_msg helpers for probe_* and *current_task* From: John Fastabend To: ast@kernel.org, daniel@iogearbox.net Cc: lmb@cloudflare.com, bpf@vger.kernel.org, john.fastabend@gmail.com, jakub@cloudflare.com, netdev@vger.kernel.org Date: Wed, 13 May 2020 12:24:39 -0700 Message-ID: <158939787911.17281.887645911866087465.stgit@john-Precision-5820-Tower> In-Reply-To: <158939776371.17281.8506900883049313932.stgit@john-Precision-5820-Tower> References: <158939776371.17281.8506900883049313932.stgit@john-Precision-5820-Tower> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Often it is useful when applying policy to know something about the task. If the administrator has CAP_SYS_ADMIN rights then they can use kprobe + sk_msg and link the two programs together to accomplish this. However, this is a bit clunky and also means we have to call sk_msg program and kprobe program when we could just use a single program and avoid passing metadata through sk_msg/skb, socket, etc. To accomplish this add probe_* helpers to sk_msg programs guarded by a CAP_SYS_ADMIN check. New supported helpers are the following, BPF_FUNC_get_current_task BPF_FUNC_current_task_under_cgroup BPF_FUNC_probe_read_user BPF_FUNC_probe_read_kernel BPF_FUNC_probe_read BPF_FUNC_probe_read_user_str BPF_FUNC_probe_read_kernel_str BPF_FUNC_probe_read_str Signed-off-by: John Fastabend --- kernel/trace/bpf_trace.c | 16 ++++++++-------- net/core/filter.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index d961428..abe6721 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -147,7 +147,7 @@ BPF_CALL_3(bpf_probe_read_user, void *, dst, u32, size, return ret; } -static const struct bpf_func_proto bpf_probe_read_user_proto = { +const struct bpf_func_proto bpf_probe_read_user_proto = { .func = bpf_probe_read_user, .gpl_only = true, .ret_type = RET_INTEGER, @@ -167,7 +167,7 @@ BPF_CALL_3(bpf_probe_read_user_str, void *, dst, u32, size, return ret; } -static const struct bpf_func_proto bpf_probe_read_user_str_proto = { +const struct bpf_func_proto bpf_probe_read_user_str_proto = { .func = bpf_probe_read_user_str, .gpl_only = true, .ret_type = RET_INTEGER, @@ -198,7 +198,7 @@ BPF_CALL_3(bpf_probe_read_kernel, void *, dst, u32, size, return bpf_probe_read_kernel_common(dst, size, unsafe_ptr, false); } -static const struct bpf_func_proto bpf_probe_read_kernel_proto = { +const struct bpf_func_proto bpf_probe_read_kernel_proto = { .func = bpf_probe_read_kernel, .gpl_only = true, .ret_type = RET_INTEGER, @@ -213,7 +213,7 @@ BPF_CALL_3(bpf_probe_read_compat, void *, dst, u32, size, return bpf_probe_read_kernel_common(dst, size, unsafe_ptr, true); } -static const struct bpf_func_proto bpf_probe_read_compat_proto = { +const struct bpf_func_proto bpf_probe_read_compat_proto = { .func = bpf_probe_read_compat, .gpl_only = true, .ret_type = RET_INTEGER, @@ -253,7 +253,7 @@ BPF_CALL_3(bpf_probe_read_kernel_str, void *, dst, u32, size, return bpf_probe_read_kernel_str_common(dst, size, unsafe_ptr, false); } -static const struct bpf_func_proto bpf_probe_read_kernel_str_proto = { +const struct bpf_func_proto bpf_probe_read_kernel_str_proto = { .func = bpf_probe_read_kernel_str, .gpl_only = true, .ret_type = RET_INTEGER, @@ -268,7 +268,7 @@ BPF_CALL_3(bpf_probe_read_compat_str, void *, dst, u32, size, return bpf_probe_read_kernel_str_common(dst, size, unsafe_ptr, true); } -static const struct bpf_func_proto bpf_probe_read_compat_str_proto = { +const struct bpf_func_proto bpf_probe_read_compat_str_proto = { .func = bpf_probe_read_compat_str, .gpl_only = true, .ret_type = RET_INTEGER, @@ -874,7 +874,7 @@ BPF_CALL_0(bpf_get_current_task) return (long) current; } -static const struct bpf_func_proto bpf_get_current_task_proto = { +const struct bpf_func_proto bpf_get_current_task_proto = { .func = bpf_get_current_task, .gpl_only = true, .ret_type = RET_INTEGER, @@ -895,7 +895,7 @@ BPF_CALL_2(bpf_current_task_under_cgroup, struct bpf_map *, map, u32, idx) return task_under_cgroup_hierarchy(current, cgrp); } -static const struct bpf_func_proto bpf_current_task_under_cgroup_proto = { +const struct bpf_func_proto bpf_current_task_under_cgroup_proto = { .func = bpf_current_task_under_cgroup, .gpl_only = false, .ret_type = RET_INTEGER, diff --git a/net/core/filter.c b/net/core/filter.c index 45b4a16..d1c4739 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6362,6 +6362,15 @@ sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) const struct bpf_func_proto bpf_msg_redirect_map_proto __weak; const struct bpf_func_proto bpf_msg_redirect_hash_proto __weak; +const struct bpf_func_proto bpf_current_task_under_cgroup_proto __weak; +const struct bpf_func_proto bpf_get_current_task_proto __weak; +const struct bpf_func_proto bpf_probe_read_user_proto __weak; +const struct bpf_func_proto bpf_probe_read_user_str_proto __weak; +const struct bpf_func_proto bpf_probe_read_kernel_proto __weak; +const struct bpf_func_proto bpf_probe_read_kernel_str_proto __weak; +const struct bpf_func_proto bpf_probe_read_compat_proto __weak; +const struct bpf_func_proto bpf_probe_read_compat_str_proto __weak; + static const struct bpf_func_proto * sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) { @@ -6397,6 +6406,31 @@ sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_get_cgroup_classid_curr_proto; #endif default: + break; + } + + if (!capable(CAP_SYS_ADMIN)) + return bpf_base_func_proto(func_id); + + /* All helpers below are for CAP_SYS_ADMIN only */ + switch (func_id) { + case BPF_FUNC_get_current_task: + return &bpf_get_current_task_proto; + case BPF_FUNC_current_task_under_cgroup: + return &bpf_current_task_under_cgroup_proto; + case BPF_FUNC_probe_read_user: + return &bpf_probe_read_user_proto; + case BPF_FUNC_probe_read_kernel: + return &bpf_probe_read_kernel_proto; + case BPF_FUNC_probe_read: + return &bpf_probe_read_compat_proto; + case BPF_FUNC_probe_read_user_str: + return &bpf_probe_read_user_str_proto; + case BPF_FUNC_probe_read_kernel_str: + return &bpf_probe_read_kernel_str_proto; + case BPF_FUNC_probe_read_str: + return &bpf_probe_read_compat_str_proto; + default: return bpf_base_func_proto(func_id); } } From patchwork Wed May 13 19:24:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 1289662 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=UC3jc0bm; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Ml4V3NqQz9sRK for ; Thu, 14 May 2020 05:25:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390291AbgEMTZO (ORCPT ); Wed, 13 May 2020 15:25:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1732218AbgEMTZN (ORCPT ); Wed, 13 May 2020 15:25:13 -0400 Received: from mail-il1-x141.google.com (mail-il1-x141.google.com [IPv6:2607:f8b0:4864:20::141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B45A8C061A0C; Wed, 13 May 2020 12:25:13 -0700 (PDT) Received: by mail-il1-x141.google.com with SMTP id l20so830802ilj.10; Wed, 13 May 2020 12:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=ODQhDoD/RNKHs+K+pBLPAhhfok/39J8rg2Y2+wl2aD0=; b=UC3jc0bmdOQbrjh4LMP7ngEByr5STo/GX7kvhf20ir01eFIiMLHDBpwyapXN9JNMap +fywfZGL42qE0FpBn6wn6swxBIE4ESlkQbpHqybiSczL2YJY9kC19de2iItLY2r7qmgm zEa40Id7CLpgSh9ewUWuTyUwQCihsAtwsrM4JMbr8dQ34Fzh05LR+5NIsO57hYEHxfgb 75+9MPOUrHXVTUehGqRcKDrNtXmEv4++z9cBtqKnlBLaVjLBnvdJLbypvu6WPISY0g5W Q5qV0LTPwnFpQBGDqisgJR0h7L8MnjlCLM8zmrI/t8yCi+74ufZFvwY31K8peSzOngxS KXCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=ODQhDoD/RNKHs+K+pBLPAhhfok/39J8rg2Y2+wl2aD0=; b=A6eA1O6Stj7xXYr++lYOHkGxHjdBbRDJHFlymW5A5maRLXuLp1ybfcF0tx6o3I9CSi H5ueFbWSCUPn7XQ/lnFi5o6nWpwcKqor6QMwUuVshGl3t7NTzM3nPi5n+ILIHNYYlura MiaLxpkhhl5e6G/XcBqwycJPXhVBNBjeWbKNjRzXhvQPdqIcFLXzZSLYL100zjAOsFac 0QqGxgEl5ZmLhfLY5hb+snf+Xttnw52Fm+F1/8z5eZet8edI+idC3wPJe4vmUF0wZddx Sn07hZMwS1qsfnovnIb8wg0iz4hzqH6fELCuZjNKi+e+aLA6GcT6QQ7i6kZpfO908DFn pvkA== X-Gm-Message-State: AOAM532dGLTpDI6D5SrLzuhV9+HrzhmQ2f15ZYc7pg/oi/eaYJ1VLWWt ZkmL9Tw+Mww8MQ39da2/yws= X-Google-Smtp-Source: ABdhPJyBvGJh6Vntt5CMyTal0990zt9BKxLzNKwIEarWowr10YcyrhVhTN1i24AlIe880Yy4THKmJg== X-Received: by 2002:a92:d8ca:: with SMTP id l10mr1035577ilo.118.1589397913152; Wed, 13 May 2020 12:25:13 -0700 (PDT) Received: from [127.0.1.1] ([184.63.162.180]) by smtp.gmail.com with ESMTPSA id p1sm206770ioh.38.2020.05.13.12.25.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 May 2020 12:25:12 -0700 (PDT) Subject: [bpf-next PATCH 3/3] bpf: sk_msg add get socket storage helpers From: John Fastabend To: ast@kernel.org, daniel@iogearbox.net Cc: lmb@cloudflare.com, bpf@vger.kernel.org, john.fastabend@gmail.com, jakub@cloudflare.com, netdev@vger.kernel.org Date: Wed, 13 May 2020 12:24:58 -0700 Message-ID: <158939789875.17281.10136938760299538348.stgit@john-Precision-5820-Tower> In-Reply-To: <158939776371.17281.8506900883049313932.stgit@john-Precision-5820-Tower> References: <158939776371.17281.8506900883049313932.stgit@john-Precision-5820-Tower> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Add helpers to use local socket storage. Signed-off-by: John Fastabend --- include/uapi/linux/bpf.h | 2 ++ net/core/filter.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index bfb31c1..3ca7cfd 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3607,6 +3607,8 @@ struct sk_msg_md { __u32 remote_port; /* Stored in network byte order */ __u32 local_port; /* stored in host byte order */ __u32 size; /* Total size of sk_msg */ + + __bpf_md_ptr(struct bpf_sock *, sk); /* current socket */ }; struct sk_reuseport_md { diff --git a/net/core/filter.c b/net/core/filter.c index d1c4739..c42adc8 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6395,6 +6395,10 @@ sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_get_current_uid_gid_proto; case BPF_FUNC_get_current_pid_tgid: return &bpf_get_current_pid_tgid_proto; + case BPF_FUNC_sk_storage_get: + return &bpf_sk_storage_get_proto; + case BPF_FUNC_sk_storage_delete: + return &bpf_sk_storage_delete_proto; #ifdef CONFIG_CGROUPS case BPF_FUNC_get_current_cgroup_id: return &bpf_get_current_cgroup_id_proto; @@ -7243,6 +7247,11 @@ static bool sk_msg_is_valid_access(int off, int size, if (size != sizeof(__u64)) return false; break; + case offsetof(struct sk_msg_md, sk): + if (size != sizeof(__u64)) + return false; + info->reg_type = PTR_TO_SOCKET; + break; case bpf_ctx_range(struct sk_msg_md, family): case bpf_ctx_range(struct sk_msg_md, remote_ip4): case bpf_ctx_range(struct sk_msg_md, local_ip4): @@ -8577,6 +8586,12 @@ static u32 sk_msg_convert_ctx_access(enum bpf_access_type type, si->dst_reg, si->src_reg, offsetof(struct sk_msg_sg, size)); break; + + case offsetof(struct sk_msg_md, sk): + *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_msg, sk), + si->dst_reg, si->src_reg, + offsetof(struct sk_msg, sk)); + break; } return insn - insn_buf;