From patchwork Fri Aug 13 23:05:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 12436357 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=-26.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 68201C4338F for ; Fri, 13 Aug 2021 23:05:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4CE7561139 for ; Fri, 13 Aug 2021 23:05:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235484AbhHMXGE (ORCPT ); Fri, 13 Aug 2021 19:06:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235481AbhHMXGD (ORCPT ); Fri, 13 Aug 2021 19:06:03 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B32ADC061756 for ; Fri, 13 Aug 2021 16:05:35 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id o3-20020a2541030000b0290557cf3415f8so10731931yba.1 for ; Fri, 13 Aug 2021 16:05:35 -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=w5ArQODj62JzysVgNIqUBqKWTF4hbNQs1qCfMYZxXis=; b=DrZNkWWj5OC/mtB2NjaSWeG54bhFHodXay+7zjX2tQYgmFF7VmvEOrCLAINrAD+ttT EexC0Ijei3DPioGxCjMNwY9ynii/4PVBzQG1wA43gOKdPH2WRqY1yo2jPiVvILwlZfM/ hrKLwHK1GwtAVWE3nHxAqi/nlvkHk0h8HzRHQ5TfP/Dqkq+GKnXXBJ15boS3tDovXNn2 zZcNtPu7E4+Q6wJJEIcKSTa69Ou9rJYV1xn5RlSQlaRg3yHL32eLKdDZDxF8suO0O+VN aV996tTmUo4N87p57Qt1apl2ac+AGgmWW2qT2RsJpuqlzh7X8+3SLdFf/wMODDCjg2LH cjzQ== 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=w5ArQODj62JzysVgNIqUBqKWTF4hbNQs1qCfMYZxXis=; b=NMYEIkCFphI3BVoBiwAAhi9hnP8zo1eOc4cAF3TB71o0u/f/92QTr8Dbc4m+whOQE0 WNpo76gSZHVUaytzsd6YXUML/6qOnlaviSu5PTkl3XKjwv3OnUf+JTMvF+0CPOINDFlY HBdgAyWZcFf8gJoggEN7WKwajWIa5u8pBlg9pfDCOFpiyeP/kZiA4naXqocIBOPwF/qz ON8VJ/OsoLCVgKKHq1yYOTqUtftuz+AqwqrIZmDKGT1DGRzfkSzqGYL4bu/i3IYiMiIc yi57yQw25927QzyPw7TcKnD505H7k8hBuxjnuIfI4HKL81ZTRg5NXPmIq11SVyvCHgTX kwiQ== X-Gm-Message-State: AOAM5300uX7SVdglzeiXBfjYW1DsBcho9te2rEx5r2e/nhAqIbibnssS 83YXYaXs4VEWsee41RddjKNFkb0= X-Google-Smtp-Source: ABdhPJxx8HUPdBoso1DvwOX58ucsEqIzQLFLtjTEMiqP3iL2koYJnqNoZv7gm7vDBkl5+RJxvH+wRPQ= X-Received: from sdf2.svl.corp.google.com ([2620:15c:2c4:201:f73:a375:cbb9:779b]) (user=sdf job=sendgmr) by 2002:a25:4941:: with SMTP id w62mr5976061yba.230.1628895934963; Fri, 13 Aug 2021 16:05:34 -0700 (PDT) Date: Fri, 13 Aug 2021 16:05:29 -0700 In-Reply-To: <20210813230530.333779-1-sdf@google.com> Message-Id: <20210813230530.333779-2-sdf@google.com> Mime-Version: 1.0 References: <20210813230530.333779-1-sdf@google.com> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog Subject: [PATCH bpf-next v3 1/2] bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, Stanislav Fomichev , Martin KaFai Lau Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net This is similar to existing BPF_PROG_TYPE_CGROUP_SOCK and BPF_PROG_TYPE_CGROUP_SOCK_ADDR. Cc: Martin KaFai Lau Signed-off-by: Stanislav Fomichev --- kernel/bpf/cgroup.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index b567ca46555c..9f6070369caa 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -1846,11 +1846,29 @@ const struct bpf_verifier_ops cg_sysctl_verifier_ops = { const struct bpf_prog_ops cg_sysctl_prog_ops = { }; +#ifdef CONFIG_NET +BPF_CALL_1(bpf_get_netns_cookie_sockopt, struct bpf_sockopt_kern *, ctx) +{ + const struct net *net = ctx ? sock_net(ctx->sk) : &init_net; + + return net->net_cookie; +} + +static const struct bpf_func_proto bpf_get_netns_cookie_sockopt_proto = { + .func = bpf_get_netns_cookie_sockopt, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_CTX_OR_NULL, +}; +#endif + static const struct bpf_func_proto * cg_sockopt_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) { switch (func_id) { #ifdef CONFIG_NET + case BPF_FUNC_get_netns_cookie: + return &bpf_get_netns_cookie_sockopt_proto; case BPF_FUNC_sk_storage_get: return &bpf_sk_storage_get_proto; case BPF_FUNC_sk_storage_delete: