From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3F4F548A44 for ; Fri, 31 Oct 2025 15:36:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 388F740150; Fri, 31 Oct 2025 15:36:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id F408040150 for ; Fri, 31 Oct 2025 15:36:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RUFKF4NjUTOc0HBFZPwMjAomdK4rvo2Ptu96sSsBGPs=; b=T27RCTYJoOLF0piA1/4KdZxyQrHsWVj7gSROtfJI9XXketNo1UoKTubPhmh+TQmwgmN2AW UYQtvO6TQPSQ+00obwgLY1F11CCJ4UALcJhFPRT8GJJoBFn/TybQe2vbB4aetZuBQmxbSP zOXD/sK5CVFfLHOym9vz2u+PAuddMS8= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-468-H0FOMshSOfabYtd02txMWA-1; Fri, 31 Oct 2025 10:36:04 -0400 X-MC-Unique: H0FOMshSOfabYtd02txMWA-1 X-Mimecast-MFC-AGG-ID: H0FOMshSOfabYtd02txMWA_1761921363 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6FF3C18001E4; Fri, 31 Oct 2025 14:36:03 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 384981800452; Fri, 31 Oct 2025 14:36:01 +0000 (UTC) From: Kevin Traynor To: Ashok Kaladi Cc: dpdk stable Subject: patch 'net/tap: fix BPF with cross-compilation' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:32:24 +0000 Message-ID: <20251031143421.324432-22-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 2c1yfZjmrd8UCsbWoTSDk8ocGDTbHnmv-FBMKSAIWbI_1761921363 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 --- .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 Ashish Sadanandan Ashish Shah +Ashok Kaladi Ashwin Sekhar T K Asim Jamshed 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 and others include @@ -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@dpdk.org @@ -24 +25 @@ -index 36df10939f..73d573e400 100644 +index be3cea2d34..bab1bcf3db 100644 @@ -27 +28 @@ -@@ -161,4 +161,5 @@ Ashish Paul +@@ -158,4 +158,5 @@ Ashish Paul