Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAB792D0C97 for ; Tue, 9 Jun 2026 17:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781025665; cv=none; b=to7kBG8H24aZxhndRJeHUMMLmDY8pgKiGlRlzbQQzgKQencyOtdKb+QPjtEAjK4fUpMa3czcmnNkFW0QpxreOWetMbXd2mH1INZTuJDU+J53aZms8mfI1yMCV32JXnyxV2elKl4x1lWWd04i23oavdeplqn8wcIdGVwU1LpU7pM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781025665; c=relaxed/simple; bh=XI+haEC2quli2Sq4sQ1q6XgpT3Tfp0QBhoSuBsxUEY0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=icKcjJ+oOtn4RSviZi8baRwcrgg+FAkTn82xqCi9Dv126jH8VEAkpV12xsdF8eU1IJMl/V3Kv45eOJUpPkay497LrwTgUWYUvU6H7XgNWM2MBAF7SbGI7EmqefMvmbIssajz1P+GamBaDXxNwCeqYvoGtsD9D228KHsv062NnSI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gh2FqYWo; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gh2FqYWo" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2bf114b0cf9so52897045ad.2 for ; Tue, 09 Jun 2026 10:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781025663; x=1781630463; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jyluqLv68wQjEUlv0jIOE7AOWLZPwx75nmuUuadG8AQ=; b=gh2FqYWonFl9nkdGAup99zRkfaEL+RVCVebxRUL6QI22YNCcivm7j3H94Zx8bHKZc5 pNK6k2ddqNVwSwHaryeLs8hoXDErRV7n0ZUr2p/H9iW9/IBzdXQhBLtw1DzWOAZOfpfS g8BCLtrEfAE9OOnI03Vdkf58pWUNDc0OGl5ThZTON3bRapw6Hkf3BL0WLqL/NefEvx4z cb+/y4i4AeaFL3Uj286rfffwMidBf8GA6NcitTkV4dCVtXRSxAXS8nDfHW6Y+ha5uhbf lpMaxmo8CNvM0NDYJ8uwDBIrPe2WxZX07dVAhqAC0/PmeZZIpyOT7mVZy4iPNOi9mkAz hYNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781025663; x=1781630463; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jyluqLv68wQjEUlv0jIOE7AOWLZPwx75nmuUuadG8AQ=; b=In+u1fGUq2KsCGOzJ6FG8gSX8h3ZUTE9RdsN1QLzR20lM4C5BMfV0DoZU2PZf2E39q XANBFQk/df94vJonfUdZDjw5C1fNlzm+lcgS2zs7bxTQLQ9oF4G74PUnZgV76OSzpFaa tzga8ASG7JFkR+2rZOJsOk0bIcU7ajfMbnNzL14qG0mEjmZ5/U6K7Eis67oap3tLqSlc Vylu6wD8dADSXHFP/pGhO6tTxqxooVF9v8tuK+KEJmVDQbsLqqEVQC6sbDGnM4qxPxNX rXxbsn4AiPnz7IaW856d3A4SISzs+H0nakZsNUfaGfTWjCbOKFndZDxD2hD0FvgsEHdS TwBw== X-Forwarded-Encrypted: i=1; AFNElJ+Xc8F2qUdai5OXd3PyOs0LIrJxdiUZ7XUtUNixbT971L2TQF7QcN/LYhtNoO12Oo9pO/U=@vger.kernel.org X-Gm-Message-State: AOJu0YwozMcKEc2r1Xozuw8zLZOU7rW+oe5bNYBmybjj4tLAI1bI1Xfo 6rXFrWQG7vSZ7j+snoOmu6uTzhZv1B/+Ob6nZ/+mIr0CYe6++bUcYNnL X-Gm-Gg: Acq92OHS9ZntCZKluOvOYQlgvvZNxn3Qsvp8EbtkYpUq7b3SR+ZlMcNY5w52LwtFEPh dWLHw51J+He5UY/bt2ewrIcnwaOv8SOiV4tOIVfq7wfKn6rPxQsW1v2j12xKh7zq2N+aZhDX4nZ 2dbApHgaUgveVDhIAZwX56yTkfqquRhnJN/v66c4XRNjPQh2sDEp5Ej67UB1tJSfu5y+zGhsGU3 dLd42IkA57g7+ibycKK2mpxNd3b9jkcu8rTXYebGmPQfWyq3RlwcJVvFs408ql97Q6ua270UG+E rc/FDojhj2HNQDPwG1EKG4UTIGleuaxy7UaMFEU6pILOTLYFccRQPdIOrY1J7EA9BTrtdjnT3CC CpmcdLmtO31+PG0xTj9HYsYRDvPgfMpr6Mw7qjCDyEcR8QKWPpMuTjU9IQilO2ijSDGzbA0EtyZ a0PVbLufmApiTjiQd6sBB9Wt8OUA8qykCWJ2nDe6UDTN6JRJbhC63y6T1f/DZ1gVTGaTsqW4765 OszMkVX/A== X-Received: by 2002:a17:903:1b08:b0:2c0:f807:56b2 with SMTP id d9443c01a7336-2c1e8955cd3mr214711275ad.34.1781025662838; Tue, 09 Jun 2026 10:21:02 -0700 (PDT) Received: from r912.tailbb6e1e.ts.net ([182.70.116.80]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c16649fab9sm220736435ad.79.2026.06.09.10.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 10:21:01 -0700 (PDT) From: Avinash Duduskar To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , John Fastabend , Stanislav Fomichev , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jesper Dangaard Brouer , KP Singh , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next] bpf: Add BPF_FIB_LOOKUP_VLAN flag to bpf_fib_lookup() helper Date: Tue, 9 Jun 2026 22:50:52 +0530 Message-ID: <20260609172052.81613-1-avinash.duduskar@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bpf_fib_lookup() returns the FIB-resolved egress ifindex straight from the fib result. When the egress is a VLAN device, the returned ifindex is the VLAN netdev's, which has no XDP xmit handler; XDP programs that want to forward the frame (e.g. xdp-forward) must instead target the underlying physical device and push the VLAN tag themselves. Today the program has no way to learn either the underlying ifindex or the VLAN tag without maintaining its own VLAN-to-ifindex map in userspace and refreshing it on netlink events. Add BPF_FIB_LOOKUP_VLAN. When the caller sets this flag and the fib result is a VLAN device, populate the existing output fields params->h_vlan_proto and params->h_vlan_TCI from the VLAN device, and replace params->ifindex with the underlying real device's ifindex. params->h_vlan_TCI carries the VID only, with PCP and DEI bits zero; a consumer wanting to set egress priority writes PCP itself. Only the immediate parent is resolved; stacked VLANs (QinQ) are not walked. When the flag is not set, behaviour is unchanged: h_vlan_proto and h_vlan_TCI are zeroed and ifindex is left at the FIB result. This lets an XDP redirect target the physical device and learn the tag to push in a single lookup, which xdp-forward's optional VLAN mode (xdp-project/xdp-tools#504) wants from the kernel side. The change extends bpf_fib_set_fwd_params() to take the egress dev and the lookup flags so the VLAN swap happens in the same place the vlan output fields are zeroed by default. Both IPv4 and IPv6 callers pass through. The helper's input semantics are unchanged. Under !CONFIG_VLAN_8021Q, is_vlan_dev() returns false and the new block is a no-op. Suggested-by: Toke Høiland-Jørgensen Signed-off-by: Avinash Duduskar --- include/uapi/linux/bpf.h | 21 ++++++++++++++++++++- net/core/filter.c | 27 +++++++++++++++++++++++---- tools/include/uapi/linux/bpf.h | 21 ++++++++++++++++++++- 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 11dd610fa5fa..aa7fe378a35d 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3527,6 +3527,19 @@ union bpf_attr { * Use the mark present in *params*->mark for the fib lookup. * This option should not be used with BPF_FIB_LOOKUP_DIRECT, * as it only has meaning for full lookups. + * **BPF_FIB_LOOKUP_VLAN** + * If the fib lookup resolves to a VLAN device, set + * *params*->h_vlan_proto and *params*->h_vlan_TCI from + * the VLAN device and replace *params*->ifindex with the + * underlying real device's ifindex. This lets XDP + * programs that target the underlying physical device + * (VLAN devices have no XDP xmit) discover both the + * real egress ifindex and the VLAN tag to push in one + * call. *params*->h_vlan_TCI carries the VID only, + * with PCP and DEI bits zero; a consumer wanting to + * set egress priority writes PCP itself. Only the + * immediate parent is resolved; stacked VLANs (QinQ) + * are not walked. * * *ctx* is either **struct xdp_md** for XDP programs or * **struct sk_buff** tc cls_act programs. @@ -7322,6 +7335,7 @@ enum { BPF_FIB_LOOKUP_TBID = (1U << 3), BPF_FIB_LOOKUP_SRC = (1U << 4), BPF_FIB_LOOKUP_MARK = (1U << 5), + BPF_FIB_LOOKUP_VLAN = (1U << 6), }; enum { @@ -7388,7 +7402,12 @@ struct bpf_fib_lookup { union { struct { - /* output */ + /* output: only populated with BPF_FIB_LOOKUP_VLAN + * when the resolved egress is a VLAN device, in + * which case *ifindex* is replaced with the + * underlying real device's ifindex. Otherwise + * both fields are zeroed. + */ __be16 h_vlan_proto; __be16 h_vlan_TCI; }; diff --git a/net/core/filter.c b/net/core/filter.c index 9590877b0714..782fa86df95a 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6119,10 +6119,28 @@ static const struct bpf_func_proto bpf_skb_get_xfrm_state_proto = { #endif #if IS_ENABLED(CONFIG_INET) || IS_ENABLED(CONFIG_IPV6) -static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params, u32 mtu) +static int bpf_fib_set_fwd_params(struct net_device *dev, + struct bpf_fib_lookup *params, + u32 flags, u32 mtu) { params->h_vlan_TCI = 0; params->h_vlan_proto = 0; + + if ((flags & BPF_FIB_LOOKUP_VLAN) && is_vlan_dev(dev)) { + struct net_device *real_dev = vlan_dev_real_dev(dev); + + /* Only the immediate parent is resolved; stacked VLANs + * (QinQ) are not walked, and a NULL real_dev (which + * is_vlan_dev() rules out in practice) keeps the + * original ifindex. + */ + if (real_dev) { + params->h_vlan_proto = vlan_dev_vlan_proto(dev); + params->h_vlan_TCI = htons(vlan_dev_vlan_id(dev)); + params->ifindex = real_dev->ifindex; + } + } + if (mtu) params->mtu_result = mtu; /* union with tot_len */ @@ -6265,7 +6283,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, memcpy(params->smac, dev->dev_addr, ETH_ALEN); set_fwd_params: - return bpf_fib_set_fwd_params(params, mtu); + return bpf_fib_set_fwd_params(dev, params, flags, mtu); } #endif @@ -6404,13 +6422,14 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params, memcpy(params->smac, dev->dev_addr, ETH_ALEN); set_fwd_params: - return bpf_fib_set_fwd_params(params, mtu); + return bpf_fib_set_fwd_params(dev, params, flags, mtu); } #endif #define BPF_FIB_LOOKUP_MASK (BPF_FIB_LOOKUP_DIRECT | BPF_FIB_LOOKUP_OUTPUT | \ BPF_FIB_LOOKUP_SKIP_NEIGH | BPF_FIB_LOOKUP_TBID | \ - BPF_FIB_LOOKUP_SRC | BPF_FIB_LOOKUP_MARK) + BPF_FIB_LOOKUP_SRC | BPF_FIB_LOOKUP_MARK | \ + BPF_FIB_LOOKUP_VLAN) BPF_CALL_4(bpf_xdp_fib_lookup, struct xdp_buff *, ctx, struct bpf_fib_lookup *, params, int, plen, u32, flags) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 11dd610fa5fa..aa7fe378a35d 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -3527,6 +3527,19 @@ union bpf_attr { * Use the mark present in *params*->mark for the fib lookup. * This option should not be used with BPF_FIB_LOOKUP_DIRECT, * as it only has meaning for full lookups. + * **BPF_FIB_LOOKUP_VLAN** + * If the fib lookup resolves to a VLAN device, set + * *params*->h_vlan_proto and *params*->h_vlan_TCI from + * the VLAN device and replace *params*->ifindex with the + * underlying real device's ifindex. This lets XDP + * programs that target the underlying physical device + * (VLAN devices have no XDP xmit) discover both the + * real egress ifindex and the VLAN tag to push in one + * call. *params*->h_vlan_TCI carries the VID only, + * with PCP and DEI bits zero; a consumer wanting to + * set egress priority writes PCP itself. Only the + * immediate parent is resolved; stacked VLANs (QinQ) + * are not walked. * * *ctx* is either **struct xdp_md** for XDP programs or * **struct sk_buff** tc cls_act programs. @@ -7322,6 +7335,7 @@ enum { BPF_FIB_LOOKUP_TBID = (1U << 3), BPF_FIB_LOOKUP_SRC = (1U << 4), BPF_FIB_LOOKUP_MARK = (1U << 5), + BPF_FIB_LOOKUP_VLAN = (1U << 6), }; enum { @@ -7388,7 +7402,12 @@ struct bpf_fib_lookup { union { struct { - /* output */ + /* output: only populated with BPF_FIB_LOOKUP_VLAN + * when the resolved egress is a VLAN device, in + * which case *ifindex* is replaced with the + * underlying real device's ifindex. Otherwise + * both fields are zeroed. + */ __be16 h_vlan_proto; __be16 h_vlan_TCI; }; base-commit: f1a660bbd12dd855fce6cf13f144008c4e45e7c7 -- 2.54.0