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=-23.3 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, 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 066DAC433E6 for ; Tue, 22 Dec 2020 01:58:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA21222CB1 for ; Tue, 22 Dec 2020 01:58:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725953AbgLVB5z (ORCPT ); Mon, 21 Dec 2020 20:57:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725924AbgLVB5z (ORCPT ); Mon, 21 Dec 2020 20:57:55 -0500 Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA2BEC0613D6 for ; Mon, 21 Dec 2020 17:57:14 -0800 (PST) Received: by mail-qv1-xf4a.google.com with SMTP id u8so9506531qvm.5 for ; Mon, 21 Dec 2020 17:57:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=R+Me/78QC9MGNY142zs6FXYrVvJlP5KajbEKMV2esN8=; b=RtD1RW+bnzt1MwmEnVlgqlh5swyYjZwEmdtXZS5RreJNQ6c1qXY1iLZY215+9RgwL/ J9GJ1PrCGeQ9OOpFzMjkr2qnKRJk7Pk2JuKsUULw9n4OOJ+XM8J77TypxMBUYAXM7z6j MPCmGYYNvrklAx4xV+ltqnEQSjJeb8By29uTRhqVPqn0xGKFJkGedeVg/n6EqqoqWu7i VtJTqwIwg8BZZLLpZB+K038/w9x+n8evVXxL0dW2eUmHB13ho5Cd7GkuqH4UFe7VOtV6 NAXtve5ml3jajU47sP+1Oaw/oq/KYRszF014Ff2t6a4Hs91gTpQKCbOacmhHa6QKVl1v sq5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=R+Me/78QC9MGNY142zs6FXYrVvJlP5KajbEKMV2esN8=; b=cwim57Xt7y7WkaYxYBjlTKsf0q77mmd66zc68hGtsqCjlBrpWH1FAXn5sUvR3JOiFp Rh9Vkx+st3NVcAvNBRULikpdja//SnatuUHc5Iq/hBLZC6DlaUaQ5S9Hr10VJa+hAnYR Q61VR4OBGoPSwRPpBI2QmxukscLlH3tmhaencEdgUHhTySSb0jwwaddauBIW1gn5RnYi sodnE90fKYUVV4OiyNhY4aKcXWLo5BRkc/+WpCgaQcqNBTdMMonnuEKWJFbCshadg8Lf PTa9CikNRad8h9pcnPn5zVqbTMxkh3v4PTNAxo6S4fOfSNYEG4aXZ/KcOUI2NHA/KpDV 7qCQ== X-Gm-Message-State: AOAM5324cnbM9q7qZcHb70yYD5vghm79q9EjH+zcYGWVJ/vt3TH4QDuM BsgfIWQqCDmP+8SE4iQ0hV6yjJc= X-Google-Smtp-Source: ABdhPJwQsRO828tY99BYHKRf98l4td5Wps0RnD9Wo1SCAGF3GMjTFqH+i+M6ClxmAjC9LLKC+OSK7Fg= Sender: "sdf via sendgmr" X-Received: from sdf2.svl.corp.google.com ([2620:15c:2c4:1:7220:84ff:fe09:7732]) (user=sdf job=sendgmr) by 2002:ad4:43ea:: with SMTP id f10mr20122956qvu.52.1608602233472; Mon, 21 Dec 2020 17:57:13 -0800 (PST) Date: Mon, 21 Dec 2020 17:57:11 -0800 In-Reply-To: Message-Id: Mime-Version: 1.0 References: <20201217172324.2121488-1-sdf@google.com> <20201217172324.2121488-3-sdf@google.com> Subject: Re: [PATCH bpf-next 2/2] bpf: split cgroup_bpf_enabled per attach type From: sdf@google.com To: Song Liu Cc: Networking , bpf , Alexei Starovoitov , Daniel Borkmann Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On 12/21, Song Liu wrote: > On Thu, Dec 17, 2020 at 9:26 AM Stanislav Fomichev wrote: > > > > When we attach any cgroup hook, the rest (even if unused/unattached) > start > > to contribute small overhead. In particular, the one we want to avoid is > > __cgroup_bpf_run_filter_skb which does two redirections to get to > > the cgroup and pushes/pulls skb. > > > > Let's split cgroup_bpf_enabled to be per-attach to make sure > > only used attach types trigger. > > > > I've dropped some existing high-level cgroup_bpf_enabled in some > > places because BPF_PROG_CGROUP_XXX_RUN macros usually have another > > cgroup_bpf_enabled check. > > > > I also had to copy-paste BPF_CGROUP_RUN_SA_PROG_LOCK for > > GETPEERNAME/GETSOCKNAME because type for cgroup_bpf_enabled[type] > > has to be constant and known at compile time. > > > > Signed-off-by: Stanislav Fomichev > [...] > > @@ -252,8 +252,10 @@ int bpf_percpu_cgroup_storage_update(struct > bpf_map *map, void *key, > > #define BPF_CGROUP_RUN_PROG_INET6_BIND_LOCK(sk, > uaddr) \ > > BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_INET6_BIND, > NULL) > > > > -#define BPF_CGROUP_PRE_CONNECT_ENABLED(sk) (cgroup_bpf_enabled && \ > > - sk->sk_prot->pre_connect) > > +#define > BPF_CGROUP_PRE_CONNECT_ENABLED(sk) \ > > + ((cgroup_bpf_enabled(BPF_CGROUP_INET4_CONNECT) | > | \ > > + cgroup_bpf_enabled(BPF_CGROUP_INET6_CONNECT)) > && \ > > + sk->sk_prot->pre_connect) > Patchworks highlighted the following (from checkpatch.pl I guess): > CHECK: Macro argument 'sk' may be better as '(sk)' to avoid precedence > issues > #99: FILE: include/linux/bpf-cgroup.h:255: > +#define BPF_CGROUP_PRE_CONNECT_ENABLED(sk) \ > + ((cgroup_bpf_enabled(BPF_CGROUP_INET4_CONNECT) || \ > + cgroup_bpf_enabled(BPF_CGROUP_INET6_CONNECT)) && \ > + sk->sk_prot->pre_connect) > Other than, looks good to me. Good point, will fix in a respin. > Acked-by: Song Liu