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 C8301454E9 for ; Tue, 25 Jun 2024 02:02:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3B4B410DC; Tue, 25 Jun 2024 02:02:35 +0200 (CEST) Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by mails.dpdk.org (Postfix) with ESMTP id 59DDF40EDD for ; Tue, 25 Jun 2024 02:02:34 +0200 (CEST) Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2ebed33cb65so54216151fa.2 for ; Mon, 24 Jun 2024 17:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273754; x=1719878554; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SJezzxlTAwUxe+HWUBONNR9W5kYbJ/IbCk/Ro/DPpnE=; b=BxmeUrCtkDRPmp+PEjOdNnlyCZ5UTOmG3nFspj03ZDX+RviyPtGl5Lx/uoazJYIFpy 9qZ5j2JKHTfaUF4dbyktGCZRwIy/V50w1LN0Dk6eo6iHSrScnRLb8PWhkZK/leF5lDff w9cPhhaAJSrzcPx09Z6lDYQQfOUbT7oHDi/E7aplAJXaGejgkJZBdjltNkndgYOksJmZ rfD7hhicJCuy5oEP+YBR5YEedTWDCg2ABpcaqWDEVkZsXGY35i1MFo6fsbL+m1h4El/a meWnk64bxGLxsLSc224XhtlRcxqlrjY8NgZz5Gj5wO1yvF5pB0/KUvUsPZKfSptu/h6w QsDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273754; x=1719878554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SJezzxlTAwUxe+HWUBONNR9W5kYbJ/IbCk/Ro/DPpnE=; b=ldnYHOOYkEppV78EAt6wmGGkGt0UhALItX1S50l5KzVZm4AnVgz8pJZVHWDf9HrfbE 24kgpKWSlMTSvwBhSPcN0EWwrkzWNa49zfxHApiGlGzhrxRGt3eCAEUE8/SzuzYiVAqk QU6oDtJ3O/cQkGasS0FEPpoV5q7qUimPxiEDiHvygLFsgXFVIJFHtlr+DOld9h3AIwTY FClHe+KH5CKePIJqBjihEa/9EyLnRK97YtVjOS4zClaBkUDydjyqnE7kjVRy5XgTlBgx Yx9+PyQovuUjs39e/T3+l9TuFNmU02JGkmsD9vEW12iUNAGElm82X4AjAJpQIe7xKMew AFYQ== X-Forwarded-Encrypted: i=1; AJvYcCUbZNCP30LowMBa9ZZaHZ029qB44K7Dxh4JPo+Nlmv8qx/OfjKi5SywxICxE4DWzFEfKEBPQ8xPkGB+LGZFU6w= X-Gm-Message-State: AOJu0YzOctAQCqVuJy/jw/AXrpjyrQtc1PwoEWWbDvYRFtmjw0N7c+d0 hgWZCpC64qOdr9lc19SySRuv7AoBirl6VkQoxSXdVhSZGePwvP6YbmpXT6gM X-Google-Smtp-Source: AGHT+IE4tZWhoOdLPgZvjAH7y+2ol53wyndl5UADekYWfbFyiluR3pecHgaCk5cQceGq6k4uTSF+Wg== X-Received: by 2002:a2e:9c88:0:b0:2ec:5364:c790 with SMTP id 38308e7fff4ca-2ec5931d8cemr53666761fa.22.1719273753640; Mon, 24 Jun 2024 17:02:33 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d208dcesm188537655e9.31.2024.06.24.17.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:02:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: Stephen Hemminger , dpdk stable Subject: patch 'bpf: disable on 32-bit x86' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:48 +0100 Message-Id: <20240624235907.885628-62-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/24. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/1f65019c2d7ff5396cb18a4ceeba231c6607b881 Thanks. Luca Boccassi --- >From 1f65019c2d7ff5396cb18a4ceeba231c6607b881 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 25 Apr 2024 16:05:58 +0100 Subject: [PATCH] bpf: disable on 32-bit x86 [ upstream commit 4edbcc7b5313949083f7694847342b1a45659d6b ] As per Intel, this is not supported, and the librte-bpf test fails on 32bit x86 kernels, so disable the library and the pmd. Signed-off-by: Luca Boccassi Acked-by: Stephen Hemminger --- app/test/meson.build | 11 ++++++++--- drivers/net/af_xdp/meson.build | 6 ++++++ lib/bpf/meson.build | 6 ++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index eee02cd8ff..09cbe5e620 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -15,7 +15,6 @@ test_sources = files( 'test_barrier.c', 'test_bitops.c', 'test_bitmap.c', - 'test_bpf.c', 'test_byteorder.c', 'test_cksum.c', 'test_cksum_perf.c', @@ -161,8 +160,6 @@ fast_tests = [ ['acl_autotest', true, true], ['atomic_autotest', false, true], ['bitmap_autotest', true, true], - ['bpf_autotest', true, true], - ['bpf_convert_autotest', true, true], ['bitops_autotest', true, true], ['byteorder_autotest', true, true], ['cksum_autotest', true, true], @@ -430,6 +427,14 @@ if dpdk_conf.has('RTE_HAS_LIBPCAP') endif endif +if arch_subdir != 'x86' or dpdk_conf.get('RTE_ARCH_64') + test_sources += 'test_bpf.c' + fast_tests += [ + ['bpf_autotest', true, true], + ['bpf_convert_autotest', true, true], + ] +endif + if cc.has_argument('-Wno-format-truncation') cflags += '-Wno-format-truncation' endif diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build index 979b914bb6..1182ce5325 100644 --- a/drivers/net/af_xdp/meson.build +++ b/drivers/net/af_xdp/meson.build @@ -7,6 +7,12 @@ if is_windows subdir_done() endif +if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_32') + build = false + reason = 'not supported on 32-bit x86' + subdir_done() +endif + sources = files('rte_eth_af_xdp.c') libxdp_ver = '>=1.2.2' diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build index cd739bb827..aa258a9061 100644 --- a/lib/bpf/meson.build +++ b/lib/bpf/meson.build @@ -7,6 +7,12 @@ if is_windows subdir_done() endif +if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_32') + build = false + reason = 'not supported on 32-bit x86' + subdir_done() +endif + sources = files('bpf.c', 'bpf_dump.c', 'bpf_exec.c', -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:16.912750848 +0100 +++ 0062-bpf-disable-on-32-bit-x86.patch 2024-06-25 00:22:13.217186301 +0100 @@ -1 +1 @@ -From 4edbcc7b5313949083f7694847342b1a45659d6b Mon Sep 17 00:00:00 2001 +From 1f65019c2d7ff5396cb18a4ceeba231c6607b881 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4edbcc7b5313949083f7694847342b1a45659d6b ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -14,4 +14,4 @@ - doc/guides/rel_notes/release_24_07.rst | 5 +++++ - drivers/net/af_xdp/meson.build | 6 ++++++ - lib/bpf/meson.build | 6 ++++++ - 3 files changed, 17 insertions(+) + app/test/meson.build | 11 ++++++++--- + drivers/net/af_xdp/meson.build | 6 ++++++ + lib/bpf/meson.build | 6 ++++++ + 3 files changed, 20 insertions(+), 3 deletions(-) @@ -19,7 +19,24 @@ -diff --git a/doc/guides/rel_notes/release_24_07.rst b/doc/guides/rel_notes/release_24_07.rst -index d4970cf6ec..1af7cb91a1 100644 ---- a/doc/guides/rel_notes/release_24_07.rst -+++ b/doc/guides/rel_notes/release_24_07.rst -@@ -138,6 +138,11 @@ Removed Items - Also, make sure to start the actual text at the margin. - ======================================================= +diff --git a/app/test/meson.build b/app/test/meson.build +index eee02cd8ff..09cbe5e620 100644 +--- a/app/test/meson.build ++++ b/app/test/meson.build +@@ -15,7 +15,6 @@ test_sources = files( + 'test_barrier.c', + 'test_bitops.c', + 'test_bitmap.c', +- 'test_bpf.c', + 'test_byteorder.c', + 'test_cksum.c', + 'test_cksum_perf.c', +@@ -161,8 +160,6 @@ fast_tests = [ + ['acl_autotest', true, true], + ['atomic_autotest', false, true], + ['bitmap_autotest', true, true], +- ['bpf_autotest', true, true], +- ['bpf_convert_autotest', true, true], + ['bitops_autotest', true, true], + ['byteorder_autotest', true, true], + ['cksum_autotest', true, true], +@@ -430,6 +427,14 @@ if dpdk_conf.has('RTE_HAS_LIBPCAP') + endif + endif @@ -27 +44,7 @@ -+* **Disabled the BPF library and net/af_xdp for 32-bit x86.** ++if arch_subdir != 'x86' or dpdk_conf.get('RTE_ARCH_64') ++ test_sources += 'test_bpf.c' ++ fast_tests += [ ++ ['bpf_autotest', true, true], ++ ['bpf_convert_autotest', true, true], ++ ] ++endif @@ -29,6 +52,3 @@ -+ BPF is not supported and the librte-bpf test fails on 32-bit x86 kernels. -+ So disable the library and the pmd. -+ - - API Changes - ----------- + if cc.has_argument('-Wno-format-truncation') + cflags += '-Wno-format-truncation' + endif @@ -36 +56 @@ -index 280bfa8f80..69d109ff46 100644 +index 979b914bb6..1182ce5325 100644