Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 9 May 2022 13:24:41 -0700
From:   Martin KaFai Lau <kafai@fb.com>
To:     Wille Kuutti <wille.kuutti@kuutti.com>
Cc:     'Alexei Starovoitov' <ast@kernel.org>,
        'Daniel Borkmann' <daniel@iogearbox.net>,
        'Andrii Nakryiko' <andrii@kernel.org>,
        'Song Liu' <songliubraving@fb.com>,
        'Yonghong Song' <yhs@fb.com>,
        'John Fastabend' <john.fastabend@gmail.com>,
        'KP Singh' <kpsingh@kernel.org>,
        "'David S. Miller'" <davem@davemloft.net>,
        'Eric Dumazet' <edumazet@google.com>,
        'Jakub Kicinski' <kuba@kernel.org>,
        'Paolo Abeni' <pabeni@redhat.com>, netdev@vger.kernel.org,
        bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net/core: Make bpf_skb_adjust_room BPF helper available
 for packets with non IPv4 or IPv6 payload
Message-ID: <20220509202441.l7jv5hnsfggpt2rg@kafai-mbp.dhcp.thefacebook.com>
References: <00fd01d860cc$59d5fa60$0d81ef20$@kuutti.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <00fd01d860cc$59d5fa60$0d81ef20$@kuutti.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cpDSwWNAVExOtZc6wW7tnwaHVWibJv1zsFPWba/PHqdX2oMB6VWa5MFflh0X?=
 =?us-ascii?Q?EZkJ1ZM0HTS9ejaHPhhgDRZgoEyzXpAqHrCCbXkwItFHCakX8Z8vGuxYvzjo?=
 =?us-ascii?Q?6SxYDUXYHcxhUYCq2sZKKyjBKh0avS9WY+5Yu4TC/LYAhuGeZbzzFdD743W1?=
 =?us-ascii?Q?mOYGVFJN8CvFXpjBfImFN+aYH/alfmAbZ6YeQz53CWZD0cMazd2oNUMiL8O3?=
 =?us-ascii?Q?5KZkEik6/YdSM4OZRgXdYrpTVhbxXiCW4YI0PqAZd/XEXswdvMPqE60sAHVN?=
 =?us-ascii?Q?qyc0lm08FM7+g+86EOcfFqFOaOfJH2qdwnxIaa5EC36LCp6cVwKbfwVPsWuA?=
 =?us-ascii?Q?4vXOlbHLoypmM8W98TitTxrarhU7OajGg/eFEFgHxOP3uZF4qWu0iuC/hRBl?=
 =?us-ascii?Q?0h0lomRu6amJmg2X6gTzFPT5NqUTrdvTIjE91hioL/HFnup0fAMV1dy1Qk+U?=
 =?us-ascii?Q?FlQaGP2Ukdiu5netkRuH9l0g0EqVvutJd3o+NeTM31tt4X/UmBF2d/XKq7iD?=
 =?us-ascii?Q?M0ygZWYO/6Shtq/3HO/uIax9fuZBFfw7hiGQ51JRA0iG4F75xs4a3UAJVMMn?=
 =?us-ascii?Q?ckDg3zxpokPM+cc8BrEZ7uZFrwTUnj9xM0nkSbHhTn3/w2X44PG62Uh1ThvT?=
 =?us-ascii?Q?cEZ5LDqHHqOUczMnSJPq9cDLHnakOQ/xt9ZYYdU6zOkuT5ULVR9xccVtLsoC?=
 =?us-ascii?Q?WSSB35Pm4ICqOgVHJhgBSG4kQBQdandFzyqiqJ54ytLudO+WrZXqVnrFNwQN?=
 =?us-ascii?Q?oxD3MUWccFMMTdJMuuzWhJliWe0CNiHZLGFyLwi99xz4WwFMAdZMYWkknyvE?=
 =?us-ascii?Q?SgpLQNpncYDmP4IkNWft45ovYuFrIiYtvtBD6UvD+12rVwGQFOrX2tz3//cT?=
 =?us-ascii?Q?e1r7F+9GYXfQxmRmpNKQGmvgpdNclTeqtMF5ecO+ytI8EO7IatdszzwkGctO?=
 =?us-ascii?Q?eN2PhchKrMfnt1fPUAQ8u3/PfCGqkASCpuVDDSyk+pyArtG9p0f54PTHW7nE?=
 =?us-ascii?Q?URxqNywv7tzYhDNd6x/V1e/lnAVS/pPK0oemMjcsWhu4wSNngt1AaTLMdkrw?=
 =?us-ascii?Q?9fqrLg4IDXxFJnIGtYR2TBs1FCDeKj4ajhz/vIkQvI2ieObq1wITVft3rqjU?=
 =?us-ascii?Q?0RjyuuK2gRaGdkZuBKI7EFZxNnFJ6WQ2xrX9jskrd4tODLDB/YgqcbQiNYaS?=
 =?us-ascii?Q?OALAB9EOoWMaXOMY7il67guLEaQIHLVh4jbJDLDqKhs4oEk4Av5mmlA4azHH?=
 =?us-ascii?Q?01XJKzq/F7OB+Y209Higarn5ISOwKzRqAQKkz0Of1e7ye4Ybb+M4G7pF2w+R?=
 =?us-ascii?Q?ONyjCCz7+jjRSRCfx7aBZ4hQnTnmIm6zF3kQ32JZg4sOnxSbVQzvfMWjsHxF?=
 =?us-ascii?Q?p6APLY9Mo0cmvEIzGvavxEN0AU0rFI7qq3xlsqpxlxrHuoAw9k13X/nnpka0?=
 =?us-ascii?Q?BB1N/YTOF8tq915nxvoTZZhnT9WWA/N87aEVRdJqkn2ICCM1+wjyVZVFkcnb?=
 =?us-ascii?Q?fPz9dDSIwRXQ8CE92VfNGUNHPTfu0Ez8PZljWbKKP0LxuWDPXKtw2dXOH1PX?=
 =?us-ascii?Q?ituwzBA8g8bJGVP0jBwnfbAX2ThPuWFFAJpdGEaO4azFRE5Q9JpnZ9b8137+?=
 =?us-ascii?Q?vEVm2rgQfyhJ7WlEqhFSYW7Sfvj4E6rYruW1kblwnRo30AHaSjiJ8dQjmQdu?=
 =?us-ascii?Q?axRvHr8yBdwr35t+bIAZ8FbaGfrW8aTgvroyI7qKt6bq9M/ExBn2mwwuT7Iw?=
 =?us-ascii?Q?yWrR2+ensfjrncpZ/JNotimi8byBL4w=3D?=
X-OriginatorOrg: fb.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4b546fbb-c20b-48be-df97-08da31f9f413
X-MS-Exchange-CrossTenant-AuthSource: SA1PR15MB5016.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 20:24:44.1512
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: KcaS6JeFaaK8mGSUld8WFGDyiEtmwAh6ZwXXA5unLDdUg/ZmMqHTX4mtwAwQNmyW
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR15MB4794
X-Proofpoint-GUID: Zg6VV8I3iFsz-p21TK106IVW3EwotT77
X-Proofpoint-ORIG-GUID: Zg6VV8I3iFsz-p21TK106IVW3EwotT77
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514
 definitions=2022-05-09_05,2022-05-09_02,2022-02-23_01
X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, May 06, 2022 at 01:06:20AM +0300, Wille Kuutti wrote:
> Network traffic is not limited to only IPv4 and IPv6 protocols, but several
> other L3 networking protocols are in common use in several
> applications and deployment scenarios which also could utilize BPF. This
> change enables the bpf_skb_adjust_room BPF helper to adjust the
> room after the MAC header using BPF_ADJ_ROOM_MAC option for packets with any
> L3 payload. For BPF_ADJ_ROOM_NET option only IPv4 and IPv6 are
> still supported as each L3 protocol would need it's own logic to determine
> the length of the L3 header to enable adjustment after the L3
> headers.
What are the non IPv4/6 use cases ? selftests are required for at least
some of these use cases.

Please tag the 'Subject' with bpf-next.

> Signed-off-by: Wille Kuutti <wille.kuutti@kuutti.com>
> ---
> net/core/filter.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 64470a727ef7..c6790a763c9b 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -3362,7 +3362,7 @@ static u32 bpf_skb_net_base_len(const struct sk_buff
> *skb)
>         case htons(ETH_P_IPV6):
>                 return sizeof(struct ipv6hdr);
>         default:
> -               return ~0U;
> +               return 0U;
Does it affect the len_min test in bpf_skb_adjust_room ?

>         }
> }
> 
> @@ -3582,7 +3582,8 @@ BPF_CALL_4(bpf_skb_adjust_room, struct sk_buff *, skb,
> s32, len_diff,
>         if (unlikely(len_diff_abs > 0xfffU))
>                 return -EFAULT;
>         if (unlikely(proto != htons(ETH_P_IP) &&
> -                    proto != htons(ETH_P_IPV6)))
> +                       proto != htons(ETH_P_IPV6) &&
> +                       mode != BPF_ADJ_ROOM_MAC))
>                 return -ENOTSUPP;
> 
>         off = skb_mac_header_len(skb);
> --
> 2.32.0
> 
>