patch 'net/tap: fix BPF with cross-compilation' has been queued to stable release 24.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/05/25. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/2abcf02aeee843462bcd5a74f9f2d17d548e5194

Thanks.

Kevin

---
>From 2abcf02aeee843462bcd5a74f9f2d17d548e5194 Mon Sep 17 00:00:00 2001
From: Ashok Kaladi <ashok.k.kaladi at intel.com>
Date: Fri, 25 Jul 2025 01:43:19 -0500
Subject: [PATCH] net/tap: fix BPF with cross-compilation

[ upstream commit 475af3278fbed7c13033eeed605a121c24be077d ]

During cross-compilation, BPF build incorrectly includes header files
from the host system instead of the target sysroot. This leads to
build failures due to incompatible headers or unavailability of header
files in the host.

Fix by using the Meson sysroot property to correctly locate and include
BPF-related headers from the cross-compilation environment.

Fixes: d8d065045c4a ("net/tap: rewrite RSS BPF program")

Signed-off-by: Ashok Kaladi <ashok.k.kaladi at intel.com>
---
 .mailmap                        | 1 +
 drivers/net/tap/bpf/meson.build | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index be3cea2d34..bab1bcf3db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -158,4 +158,5 @@ Ashish Paul <apaul at juniper.net>
 Ashish Sadanandan <ashish.sadanandan at gmail.com>
 Ashish Shah <ashish.n.shah at intel.com>
+Ashok Kaladi <ashok.k.kaladi at intel.com>
 Ashwin Sekhar T K <asekhar at marvell.com> <ashwin.sekhar at caviumnetworks.com>
 Asim Jamshed <asim.jamshed at gmail.com>
diff --git a/drivers/net/tap/bpf/meson.build b/drivers/net/tap/bpf/meson.build
index 35d7438c74..38b74f044c 100644
--- a/drivers/net/tap/bpf/meson.build
+++ b/drivers/net/tap/bpf/meson.build
@@ -40,5 +40,9 @@ endif
 enable_tap_rss = true
 
-libbpf_include_dir = libbpf.get_variable(pkgconfig : 'includedir')
+# Determine sysroot if cross-compiling and the property exists in the
+# init files. Note that this environment variable will have to be passed
+# in as a property during meson setup.
+sysroot = meson.get_external_property('sysroot', '')
+libbpf_include_dir = sysroot + libbpf.get_variable(pkgconfig : 'includedir')
 
 # The include files <linux/bpf.h> and others include <asm/types.h>
@@ -46,5 +50,5 @@ libbpf_include_dir = libbpf.get_variable(pkgconfig : 'includedir')
 # Workaround by using include directoriy from the host build environment.
 machine_name = run_command('uname', '-m', check: true).stdout().strip()
-march_include_dir = '/usr/include/' + machine_name + '-linux-gnu'
+march_include_dir = sysroot + '/usr/include/' + machine_name + '-linux-gnu'
 
 clang_flags = [
-- 
2.51.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-10-31 13:53:52.944764407 +0000
+++ 0022-net-tap-fix-BPF-with-cross-compilation.patch	2025-10-31 13:53:52.042523387 +0000
@@ -1 +1 @@
-From 475af3278fbed7c13033eeed605a121c24be077d Mon Sep 17 00:00:00 2001
+From 2abcf02aeee843462bcd5a74f9f2d17d548e5194 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 475af3278fbed7c13033eeed605a121c24be077d ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 36df10939f..73d573e400 100644
+index be3cea2d34..bab1bcf3db 100644
@@ -27 +28 @@
-@@ -161,4 +161,5 @@ Ashish Paul <apaul at juniper.net>
+@@ -158,4 +158,5 @@ Ashish Paul <apaul at juniper.net>