* (no subject) @ 2026-06-20 12:13 Siddharth C 2026-06-20 12:13 ` [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects Siddharth C 2026-06-20 12:13 ` [PATCH 2/2] selftests/bpf: validate rx_queue_index in xdp_metadata Siddharth C 0 siblings, 2 replies; 5+ messages in thread From: Siddharth C @ 2026-06-20 12:13 UTC (permalink / raw) To: ast, kuba, hawk, andrii, netdev, bpf, linux-kernel, linux-kselftest Cc: Siddharth C Subject: [PATCH 0/2] bpf: preserve rx_queue_index across XDP redirects XDP programs executed after redirect through cpumap and devmap currently lose ingress RX queue information because rx_queue_index is not preserved across xdp_buff to xdp_frame conversion. Preserve rx_queue_index in struct xdp_frame and restore it when rebuilding xdp_rxq_info for redirected execution paths. Add a selftest validating that ctx->rx_queue_index remains available through redirected execution. Testing: * Built modified kernel objects * Ran tools/testing/selftests/bpf/test_progs -t xdp_metadata -v * Verified xdp_metadata passes * Added explicit rx_queue_index assertion Siddharth C (1): bpf: preserve rx_queue_index across XDP redirects Siddharth_Cibi (1): selftests/bpf: validate rx_queue_index in xdp_metadata include/net/xdp.h | 2 ++ kernel/bpf/cpumap.c | 2 +- kernel/bpf/devmap.c | 5 ++++- net/core/xdp.c | 1 + tools/testing/selftests/bpf/prog_tests/xdp_metadata.c | 3 ++- tools/testing/selftests/bpf/progs/xdp_metadata.c | 2 +- tools/testing/selftests/bpf/xdp_metadata.h | 1 + 7 files changed, 12 insertions(+), 4 deletions(-) -- 2.53.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects 2026-06-20 12:13 Siddharth C @ 2026-06-20 12:13 ` Siddharth C 2026-06-20 12:13 ` [PATCH 2/2] selftests/bpf: validate rx_queue_index in xdp_metadata Siddharth C 1 sibling, 0 replies; 5+ messages in thread From: Siddharth C @ 2026-06-20 12:13 UTC (permalink / raw) To: ast, kuba, hawk, andrii, netdev, bpf, linux-kernel, linux-kselftest Cc: Siddharth C Store rx_queue_index in struct xdp_frame during xdp_buff to xdp_frame conversion and restore it when rebuilding xdp_rxq_info for cpumap and devmap execution paths. This preserves ingress RX queue information for XDP programs executed after redirect, allowing access to the original rx_queue_index instead of losing queue context. Also propagate rx_queue_index for zero-copy XDP frame conversion. Signed-off-by: Siddharth_Cibi <siddharthcibi@icloud.com> --- include/net/xdp.h | 2 ++ kernel/bpf/cpumap.c | 2 +- kernel/bpf/devmap.c | 5 ++++- net/core/xdp.c | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/net/xdp.h b/include/net/xdp.h index aa742f413c35..90318b2b76dc 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -301,6 +301,7 @@ struct xdp_frame { */ enum xdp_mem_type mem_type:32; struct net_device *dev_rx; /* used by cpumap */ + u32 rx_queue_index; u32 frame_sz; u32 flags; /* supported values defined in xdp_buff_flags */ }; @@ -441,6 +442,7 @@ struct xdp_frame *xdp_convert_buff_to_frame(struct xdp_buff *xdp) /* rxq only valid until napi_schedule ends, convert to xdp_mem_type */ xdp_frame->mem_type = xdp->rxq->mem.type; + xdp_frame->rx_queue_index = xdp->rxq->queue_index; return xdp_frame; } diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c index 5e59ab896f05..8f2d7013620f 100644 --- a/kernel/bpf/cpumap.c +++ b/kernel/bpf/cpumap.c @@ -197,7 +197,7 @@ static int cpu_map_bpf_prog_run_xdp(struct bpf_cpu_map_entry *rcpu, rxq.dev = xdpf->dev_rx; rxq.mem.type = xdpf->mem_type; - /* TODO: report queue_index to xdp_rxq_info */ + rxq.queue_index = xdpf->rx_queue_index; xdp_convert_frame_to_buff(xdpf, &xdp); diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index dc7b859e8bbf..f419fa0e53e5 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -339,7 +339,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog, struct net_device *rx_dev) { struct xdp_txq_info txq = { .dev = tx_dev }; - struct xdp_rxq_info rxq = { .dev = rx_dev }; + struct xdp_rxq_info rxq = { }; struct xdp_buff xdp; int i, nframes = 0; @@ -349,6 +349,9 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog, int err; xdp_convert_frame_to_buff(xdpf, &xdp); + rxq.dev = rx_dev; + rxq.mem.type = xdpf->mem_type; + rxq.queue_index = xdpf->rx_queue_index; xdp.txq = &txq; xdp.rxq = &rxq; diff --git a/net/core/xdp.c b/net/core/xdp.c index 9890a30584ba..9691d8dfadf3 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -606,6 +606,7 @@ struct xdp_frame *xdp_convert_zc_to_xdp_frame(struct xdp_buff *xdp) xdpf->metasize = metasize; xdpf->frame_sz = PAGE_SIZE; xdpf->mem_type = MEM_TYPE_PAGE_ORDER0; + xdpf->rx_queue_index = xdp->rxq->queue_index; xsk_buff_free(xdp); return xdpf; -- 2.53.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] selftests/bpf: validate rx_queue_index in xdp_metadata 2026-06-20 12:13 Siddharth C 2026-06-20 12:13 ` [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects Siddharth C @ 2026-06-20 12:13 ` Siddharth C 1 sibling, 0 replies; 5+ messages in thread From: Siddharth C @ 2026-06-20 12:13 UTC (permalink / raw) To: ast, kuba, hawk, andrii, netdev, bpf, linux-kernel, linux-kselftest Cc: Siddharth_Cibi From: Siddharth_Cibi <siddharthcibi@icloud.com> Extend xdp_metadata selftest coverage to validate that ctx->rx_queue_index is preserved and observable after XDP redirect execution. Capture rx_queue_index in metadata and assert that it matches the expected queue during packet verification. Signed-off-by: Siddharth_Cibi <siddharthcibi@icloud.com> --- tools/testing/selftests/bpf/prog_tests/xdp_metadata.c | 3 ++- tools/testing/selftests/bpf/progs/xdp_metadata.c | 2 +- tools/testing/selftests/bpf/xdp_metadata.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c index 5c31054ad4a4..f8cabbbe7bb7 100644 --- a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c +++ b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c @@ -309,7 +309,8 @@ static int verify_xsk_metadata(struct xsk *xsk, bool sent_from_af_xdp) if (!ASSERT_NEQ(meta->rx_hash, 0, "rx_hash")) return -1; - + if (!ASSERT_EQ(meta->rx_queue_index, QUEUE_ID, "rx_queue_index")) + return -1; if (!sent_from_af_xdp) { if (!ASSERT_NEQ(meta->rx_hash_type & XDP_RSS_TYPE_L4, 0, "rx_hash_type")) return -1; diff --git a/tools/testing/selftests/bpf/progs/xdp_metadata.c b/tools/testing/selftests/bpf/progs/xdp_metadata.c index 09bb8a038d52..62ae83860d7f 100644 --- a/tools/testing/selftests/bpf/progs/xdp_metadata.c +++ b/tools/testing/selftests/bpf/progs/xdp_metadata.c @@ -98,7 +98,7 @@ int rx(struct xdp_md *ctx) bpf_xdp_metadata_rx_hash(ctx, &meta->rx_hash, &meta->rx_hash_type); bpf_xdp_metadata_rx_vlan_tag(ctx, &meta->rx_vlan_proto, &meta->rx_vlan_tci); - + meta->rx_queue_index = ctx->rx_queue_index; return bpf_redirect_map(&xsk, ctx->rx_queue_index, XDP_PASS); } diff --git a/tools/testing/selftests/bpf/xdp_metadata.h b/tools/testing/selftests/bpf/xdp_metadata.h index 87318ad1117a..1f0ae4c00091 100644 --- a/tools/testing/selftests/bpf/xdp_metadata.h +++ b/tools/testing/selftests/bpf/xdp_metadata.h @@ -49,4 +49,5 @@ struct xdp_meta { __s32 rx_vlan_tag_err; }; enum xdp_meta_field hint_valid; + __u32 rx_queue_index; }; -- 2.53.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* (no subject) @ 2026-06-19 19:57 Siddharth_Cibi 2026-06-19 19:57 ` [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects Siddharth_Cibi 0 siblings, 1 reply; 5+ messages in thread From: Siddharth_Cibi @ 2026-06-19 19:57 UTC (permalink / raw) To: ast Cc: Siddharth_Cibi, Daniel Borkmann, David S. Miller, Jakub Kicinski, Jesper Dangaard Brouer, John Fastabend, Stanislav Fomichev, open list:XDP (eXpress Data Path):Keyword:(?:b|_)xdp(?:b|_), open list:XDP (eXpress Data Path):Keyword:(?:b|_)xdp(?:b|_) Subject: [PATCH 0/2] preserve rx_queue_index across XDP redirects XDP programs executed after redirect through cpumap and devmap currently lose ingress RX queue information because rx_queue_index is not preserved across xdp_buff to xdp_frame conversion. Preserve rx_queue_index in struct xdp_frame and restore it when rebuilding xdp_rxq_info for redirected execution paths. Add a selftest validating that ctx->rx_queue_index remains available through xdp_metadata after redirect. Testing: * Built modified kernel objects * Ran tools/testing/selftests/bpf/test_progs -t xdp_metadata -v * Verified xdp_metadata passes * Added explicit rx_queue_index assertion Siddharth C (1): bpf: preserve rx_queue_index across XDP redirects Siddharth_Cibi (1): selftests/bpf: validate rx_queue_index in xdp_metadata include/net/xdp.h | 2 ++ kernel/bpf/cpumap.c | 2 +- kernel/bpf/devmap.c | 5 ++++- net/core/xdp.c | 1 + tools/testing/selftests/bpf/prog_tests/xdp_metadata.c | 3 ++- tools/testing/selftests/bpf/progs/xdp_metadata.c | 2 +- tools/testing/selftests/bpf/xdp_metadata.h | 1 + 7 files changed, 12 insertions(+), 4 deletions(-) -- 2.53.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects 2026-06-19 19:57 Siddharth_Cibi @ 2026-06-19 19:57 ` Siddharth_Cibi 2026-06-19 20:50 ` bot+bpf-ci 0 siblings, 1 reply; 5+ messages in thread From: Siddharth_Cibi @ 2026-06-19 19:57 UTC (permalink / raw) To: ast Cc: Siddharth C, Daniel Borkmann, David S. Miller, Jakub Kicinski, Jesper Dangaard Brouer, John Fastabend, Stanislav Fomichev, Eric Dumazet, Paolo Abeni, Simon Horman, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Martin KaFai Lau, Song Liu, Yonghong Song, Jiri Olsa, Emil Tsalapatis, open list:XDP (eXpress Data Path), open list:XDP (eXpress Data Path), open list From: Siddharth C <siddharthcibi@icloud.com> Store rx_queue_index in struct xdp_frame during xdp_buff to xdp_frame conversion and restore it when rebuilding xdp_rxq_info for cpumap and devmap execution paths. This preserves ingress RX queue information for XDP programs executed after redirect, allowing access to the original rx_queue_index instead of losing queue context. Also propagate rx_queue_index for zero-copy XDP frame conversion. Signed-off-by: Siddharth_Cibi <siddharthcibi@icloud.com> --- include/net/xdp.h | 2 ++ kernel/bpf/cpumap.c | 2 +- kernel/bpf/devmap.c | 5 ++++- net/core/xdp.c | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/net/xdp.h b/include/net/xdp.h index aa742f413c35..90318b2b76dc 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -301,6 +301,7 @@ struct xdp_frame { */ enum xdp_mem_type mem_type:32; struct net_device *dev_rx; /* used by cpumap */ + u32 rx_queue_index; u32 frame_sz; u32 flags; /* supported values defined in xdp_buff_flags */ }; @@ -441,6 +442,7 @@ struct xdp_frame *xdp_convert_buff_to_frame(struct xdp_buff *xdp) /* rxq only valid until napi_schedule ends, convert to xdp_mem_type */ xdp_frame->mem_type = xdp->rxq->mem.type; + xdp_frame->rx_queue_index = xdp->rxq->queue_index; return xdp_frame; } diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c index 5e59ab896f05..8f2d7013620f 100644 --- a/kernel/bpf/cpumap.c +++ b/kernel/bpf/cpumap.c @@ -197,7 +197,7 @@ static int cpu_map_bpf_prog_run_xdp(struct bpf_cpu_map_entry *rcpu, rxq.dev = xdpf->dev_rx; rxq.mem.type = xdpf->mem_type; - /* TODO: report queue_index to xdp_rxq_info */ + rxq.queue_index = xdpf->rx_queue_index; xdp_convert_frame_to_buff(xdpf, &xdp); diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index dc7b859e8bbf..f419fa0e53e5 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -339,7 +339,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog, struct net_device *rx_dev) { struct xdp_txq_info txq = { .dev = tx_dev }; - struct xdp_rxq_info rxq = { .dev = rx_dev }; + struct xdp_rxq_info rxq = { }; struct xdp_buff xdp; int i, nframes = 0; @@ -349,6 +349,9 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog, int err; xdp_convert_frame_to_buff(xdpf, &xdp); + rxq.dev = rx_dev; + rxq.mem.type = xdpf->mem_type; + rxq.queue_index = xdpf->rx_queue_index; xdp.txq = &txq; xdp.rxq = &rxq; diff --git a/net/core/xdp.c b/net/core/xdp.c index 9890a30584ba..9691d8dfadf3 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -606,6 +606,7 @@ struct xdp_frame *xdp_convert_zc_to_xdp_frame(struct xdp_buff *xdp) xdpf->metasize = metasize; xdpf->frame_sz = PAGE_SIZE; xdpf->mem_type = MEM_TYPE_PAGE_ORDER0; + xdpf->rx_queue_index = xdp->rxq->queue_index; xsk_buff_free(xdp); return xdpf; -- 2.53.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects 2026-06-19 19:57 ` [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects Siddharth_Cibi @ 2026-06-19 20:50 ` bot+bpf-ci 0 siblings, 0 replies; 5+ messages in thread From: bot+bpf-ci @ 2026-06-19 20:50 UTC (permalink / raw) To: siddharthcibi, ast Cc: siddharthcibi, daniel, davem, kuba, hawk, john.fastabend, sdf, edumazet, pabeni, horms, andrii, eddyz87, memxor, martin.lau, song, yonghong.song, jolsa, emil, netdev, bpf, linux-kernel, ast, andrii, daniel, martin.lau, eddyz87, yonghong.song, clm, ihor.solodrai [-- Attachment #1: Type: text/plain, Size: 1429 bytes --] > Store rx_queue_index in struct xdp_frame during xdp_buff to > xdp_frame conversion and restore it when rebuilding xdp_rxq_info > for cpumap and devmap execution paths. > This preserves ingress RX queue information for XDP programs > executed after redirect, allowing access to the original > rx_queue_index instead of losing queue context. > Also propagate rx_queue_index for zero-copy XDP frame conversion. > Signed-off-by: Siddharth_Cibi <siddharthcibi@icloud.com> This looks like a fix for the cpumap path, where the synthetic xdp_rxq_info was previously built without a queue_index, leaving the placeholder: kernel/bpf/cpumap.c:cpu_map_bpf_prog_run_xdp() { rxq.dev = xdpf->dev_rx; rxq.mem.type = xdpf->mem_type; /* TODO: report queue_index to xdp_rxq_info */ ... } That synthetic xdp_rxq_info, with the missing queue_index and the TODO, came in when cpu_map_bpf_prog_run_xdp() was added. Should this carry: Fixes: 9216477449f3 ("bpf: cpumap: Add the possibility to attach an eBPF program to cpumap") The devmap path (dev_map_bpf_prog_run) shares the same missing queue_index, which was added in fbee97feed9b ("bpf: Add support to attach bpf program to a devmap entry"). --- AI reviewed your patch. Please fix the bug or email reply why it's not a bug. See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md CI run summary: https://github.com/kernel-patches/bpf/actions/runs/27846609854 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-06-20 12:14 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-06-20 12:13 Siddharth C 2026-06-20 12:13 ` [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects Siddharth C 2026-06-20 12:13 ` [PATCH 2/2] selftests/bpf: validate rx_queue_index in xdp_metadata Siddharth C -- strict thread matches above, loose matches on Subject: below -- 2026-06-19 19:57 Siddharth_Cibi 2026-06-19 19:57 ` [PATCH 1/2] bpf: preserve rx_queue_index across XDP redirects Siddharth_Cibi 2026-06-19 20:50 ` bot+bpf-ci
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox