From: luca.boccassi@gmail.com
To: Joshua Washington <joshwash@google.com>
Cc: David Marchand <david.marchand@redhat.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'net/gve/base: fix build with Fedora Rawhide' has been queued to stable release 22.11.7
Date: Wed, 23 Oct 2024 22:16:57 +0100 [thread overview]
Message-ID: <20241023211704.1216956-77-luca.boccassi@gmail.com> (raw)
In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com>
Hi,
FYI, your patch has been queued to stable release 22.11.7
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/25/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/1e230f1ca23203c6d14b46a36c7d050fb934859b
Thanks.
Luca Boccassi
---
From 1e230f1ca23203c6d14b46a36c7d050fb934859b Mon Sep 17 00:00:00 2001
From: Joshua Washington <joshwash@google.com>
Date: Thu, 17 Oct 2024 16:42:33 -0700
Subject: [PATCH] net/gve/base: fix build with Fedora Rawhide
[ upstream commit f0d9e787747dda0715654da9f0501f54fe105868 ]
Currently, a number of integer types are typedef'd to their corresponding
userspace or RTE values. This can be problematic if these types are
already defined somewhere else, as it would cause type collisions.
This patch changes the typedefs to #define macros which are only defined
if the types are not defined already.
Note: this was reported by OBS CI on 2024/10/17, when compiling DPDK
in Fedora Rawhide.
Fixes: c9ba2caf6302 ("net/gve/base: add OS-specific implementation")
Fixes: abf1242fbb84 ("net/gve: add struct members and typedefs for DQO")
Reported-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
---
drivers/net/gve/base/gve_osdep.h | 36 ++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
index 7cb73002f4..26374bac5e 100644
--- a/drivers/net/gve/base/gve_osdep.h
+++ b/drivers/net/gve/base/gve_osdep.h
@@ -24,18 +24,36 @@
#include "../gve_logs.h"
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
+#ifndef u8
+#define u8 uint8_t
+#endif
+#ifndef u16
+#define u16 uint16_t
+#endif
+#ifndef u32
+#define u32 uint32_t
+#endif
+#ifndef u64
+#define u64 uint64_t
+#endif
-typedef rte_be16_t __sum16;
+#ifndef __sum16
+#define __sum16 rte_be16_t
+#endif
-typedef rte_be16_t __be16;
-typedef rte_be32_t __be32;
-typedef rte_be64_t __be64;
+#ifndef __be16
+#define __be16 rte_be16_t
+#endif
+#ifndef __be32
+#define __be32 rte_be32_t
+#endif
+#ifndef __be64
+#define __be64 rte_be64_t
+#endif
-typedef rte_iova_t dma_addr_t;
+#ifndef dma_addr_t
+#define dma_addr_t rte_iova_t
+#endif
#define ETH_MIN_MTU RTE_ETHER_MIN_MTU
#define ETH_ALEN RTE_ETHER_ADDR_LEN
--
2.45.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-10-23 22:16:43.445294209 +0100
+++ 0077-net-gve-base-fix-build-with-Fedora-Rawhide.patch 2024-10-23 22:16:40.555944919 +0100
@@ -1 +1 @@
-From f0d9e787747dda0715654da9f0501f54fe105868 Mon Sep 17 00:00:00 2001
+From 1e230f1ca23203c6d14b46a36c7d050fb934859b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f0d9e787747dda0715654da9f0501f54fe105868 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -22,2 +23,2 @@
- drivers/net/gve/base/gve_osdep.h | 48 ++++++++++++++++++++++++--------
- 1 file changed, 36 insertions(+), 12 deletions(-)
+ drivers/net/gve/base/gve_osdep.h | 36 ++++++++++++++++++++++++--------
+ 1 file changed, 27 insertions(+), 9 deletions(-)
@@ -26 +27 @@
-index c0ee0d567c..64181cebd6 100644
+index 7cb73002f4..26374bac5e 100644
@@ -29,3 +30,3 @@
-@@ -29,22 +29,46 @@
- #include <sys/utsname.h>
- #endif
+@@ -24,18 +24,36 @@
+
+ #include "../gve_logs.h"
@@ -66,13 +66,0 @@
-+#endif
-
--typedef rte_le16_t __le16;
--typedef rte_le32_t __le32;
--typedef rte_le64_t __le64;
-+#ifndef __le16
-+#define __le16 rte_le16_t
-+#endif
-+#ifndef __le32
-+#define __le32 rte_le32_t
-+#endif
-+#ifndef __le64
-+#define __le64 rte_le64_t
next prev parent reply other threads:[~2024-10-23 21:21 UTC|newest]
Thread overview: 155+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 21:15 patch 'devtools: fix forbidden token check with multiple files' " luca.boccassi
2024-10-23 21:15 ` patch 'eal/x86: fix 32-bit write combining store' " luca.boccassi
2024-10-23 21:15 ` patch 'examples/eventdev: fix queue crash with generic pipeline' " luca.boccassi
2024-10-23 21:15 ` patch 'crypto/dpaa2_sec: fix memory leak' " luca.boccassi
2024-10-23 21:15 ` patch 'common/dpaax/caamflib: fix PDCP SNOW-ZUC watchdog' " luca.boccassi
2024-10-23 21:15 ` patch 'dev: fix callback lookup when unregistering device' " luca.boccassi
2024-10-23 21:15 ` patch 'examples/ipsec-secgw: fix dequeue count from cryptodev' " luca.boccassi
2024-10-23 21:15 ` patch 'bpf: fix free function mismatch if convert fails' " luca.boccassi
2024-10-23 21:15 ` patch 'baseband/la12xx: fix use after free in modem config' " luca.boccassi
2024-10-23 21:15 ` patch 'crypto/bcmfs: fix free function mismatch' " luca.boccassi
2024-10-23 21:15 ` patch 'dma/idxd: fix free function mismatch in device probe' " luca.boccassi
2024-10-23 21:15 ` patch 'event/cnxk: fix free function mismatch in port config' " luca.boccassi
2024-10-23 21:15 ` patch 'net/e1000: fix use after free in filter flush' " luca.boccassi
2024-10-23 21:15 ` patch 'net/nfp: fix double free in flow destroy' " luca.boccassi
2024-10-23 21:15 ` patch 'net/sfc: fix use after free in debug logs' " luca.boccassi
2024-10-23 21:15 ` patch 'raw/ifpga/base: fix use after free' " luca.boccassi
2024-10-23 21:15 ` patch 'raw/ifpga: fix free function mismatch in interrupt config' " luca.boccassi
2024-10-23 21:15 ` patch 'examples/vhost: fix free function mismatch' " luca.boccassi
2024-10-23 21:15 ` patch 'net/nfb: fix use after free' " luca.boccassi
2024-10-23 21:16 ` patch 'power: enable CPPC' " luca.boccassi
2024-10-23 21:16 ` patch 'fib6: add runtime checks in AVX512 lookup' " luca.boccassi
2024-10-23 21:16 ` patch 'app/dumpcap: fix handling of jumbo frames' " luca.boccassi
2024-10-23 21:16 ` patch 'net/cnxk: fix Rx timestamp handling for VF' " luca.boccassi
2024-10-23 21:16 ` patch 'net/cnxk: fix Rx offloads to handle timestamp' " luca.boccassi
2024-10-23 21:16 ` patch 'event/cnxk: fix Rx timestamp handling' " luca.boccassi
2024-10-23 21:16 ` patch 'common/cnxk: fix CPT HW word size for outbound SA' " luca.boccassi
2024-10-23 21:16 ` patch 'common/cnxk: fix base log level' " luca.boccassi
2024-10-23 21:16 ` patch 'baseband/acc: fix access to deallocated mem' " luca.boccassi
2024-10-23 21:16 ` patch 'vhost: fix offset while mapping log base address' " luca.boccassi
2024-10-23 21:16 ` patch 'vdpa: update used flags in used ring relay' " luca.boccassi
2024-10-23 21:16 ` patch 'net/virtio-user: reset used index counter' " luca.boccassi
2024-10-23 21:16 ` patch 'fib: fix AVX512 lookup' " luca.boccassi
2024-10-23 21:16 ` patch 'net/e1000: fix link status crash in secondary process' " luca.boccassi
2024-10-23 21:16 ` patch 'net/iavf: fix crash when link is unstable' " luca.boccassi
2024-10-23 21:16 ` patch 'net/ice/base: fix link speed for 200G' " luca.boccassi
2024-10-23 21:16 ` patch 'net/ice/base: fix iteration of TLVs in Preserved Fields Area' " luca.boccassi
2024-10-23 21:16 ` patch 'net/ixgbe/base: fix unchecked return value' " luca.boccassi
2024-10-23 21:16 ` patch 'net/i40e/base: fix setting flags in init function' " luca.boccassi
2024-10-23 21:16 ` patch 'net/i40e/base: fix misleading debug logs and comments' " luca.boccassi
2024-10-23 21:16 ` patch 'net/i40e/base: fix blinking X722 with X557 PHY' " luca.boccassi
2024-10-23 21:16 ` patch 'net/i40e/base: fix DDP loading with reserved track ID' " luca.boccassi
2024-10-23 21:16 ` patch 'net/i40e/base: fix repeated register dumps' " luca.boccassi
2024-10-23 21:16 ` patch 'net/i40e/base: fix unchecked return value' " luca.boccassi
2024-10-23 21:16 ` patch 'net/i40e/base: fix loop bounds' " luca.boccassi
2024-10-23 21:16 ` patch 'net/i40e: fix AVX-512 pointer copy on 32-bit' " luca.boccassi
2024-10-23 21:16 ` patch 'net/ice: " luca.boccassi
2024-10-23 21:16 ` patch 'net/iavf: " luca.boccassi
2024-10-23 21:16 ` patch 'net/tap: avoid memcpy with null argument' " luca.boccassi
2024-10-23 21:16 ` patch 'app/testpmd: remove unnecessary cast' " luca.boccassi
2024-10-23 21:16 ` patch 'net/pcap: set live interface as non-blocking' " luca.boccassi
2024-10-23 21:16 ` patch 'net/mana: support rdma-core via pkg-config' " luca.boccassi
2024-10-23 21:16 ` patch 'net/ena: revert redefining memcpy' " luca.boccassi
2024-10-23 21:16 ` patch 'net/hns3: remove some basic address dump' " luca.boccassi
2024-10-23 21:16 ` patch 'net/hns3: fix dump counter of registers' " luca.boccassi
2024-10-23 21:16 ` patch 'ethdev: fix overflow in descriptor count' " luca.boccassi
2024-10-23 21:16 ` patch 'bus/dpaa: fix PFDRs leaks due to FQRNIs' " luca.boccassi
2024-10-23 21:16 ` patch 'net/dpaa: fix typecasting channel ID' " luca.boccassi
2024-10-23 21:16 ` patch 'bus/dpaa: fix VSP for 1G fm1-mac9 and 10' " luca.boccassi
2024-10-23 21:16 ` patch 'bus/dpaa: fix the fman details status' " luca.boccassi
2024-10-23 21:16 ` patch 'net/dpaa: fix reallocate mbuf handling' " luca.boccassi
2024-10-23 21:16 ` patch 'net/memif: fix buffer overflow in zero copy Rx' " luca.boccassi
2024-10-23 21:16 ` patch 'net/tap: restrict maximum number of MP FDs' " luca.boccassi
2024-10-23 21:16 ` patch 'ethdev: verify queue ID in Tx done cleanup' " luca.boccassi
2024-10-23 21:16 ` patch 'net/hns3: verify reset type from firmware' " luca.boccassi
2024-10-23 21:16 ` patch 'net/nfp: fix link change return value' " luca.boccassi
2024-10-23 21:16 ` patch 'net/pcap: fix blocking Rx' " luca.boccassi
2024-10-23 21:16 ` patch 'net/ice/base: add bounds check' " luca.boccassi
2024-10-23 21:16 ` patch 'net/ice/base: fix VLAN replay after reset' " luca.boccassi
2024-10-23 21:16 ` patch 'net/iavf: preserve MAC address with i40e PF Linux driver' " luca.boccassi
2024-10-23 21:16 ` patch 'net/mlx5: workaround list management of Rx queue control' " luca.boccassi
2024-10-23 21:16 ` patch 'net/mlx5: fix number of supported flex parsers' " luca.boccassi
2024-10-23 21:16 ` patch 'app/testpmd: remove flex item init command leftover' " luca.boccassi
2024-10-23 21:16 ` patch 'net/mlx5: fix next protocol validation after flex item' " luca.boccassi
2024-10-23 21:16 ` patch 'build: remove version check on compiler links function' " luca.boccassi
2024-10-23 21:16 ` patch 'hash: fix thash LFSR initialization' " luca.boccassi
2024-10-23 21:16 ` patch 'dmadev: fix potential null pointer access' " luca.boccassi
2024-10-23 21:16 ` luca.boccassi [this message]
2024-10-23 21:16 ` patch 'power: fix mapped lcore ID' " luca.boccassi
2024-10-23 21:16 ` patch 'net/ionic: fix build on Fedora Rawhide' " luca.boccassi
2024-11-12 22:07 ` patch 'buildtools/chkincs: check driver specific headers' " luca.boccassi
2024-11-12 22:07 ` patch 'net/netvsc: fix using Tx queue higher than Rx queues' " luca.boccassi
2024-11-12 22:07 ` patch 'net/hns3: restrict tunnel flow rule to one header' " luca.boccassi
2024-11-12 22:07 ` patch 'net/ice: detect stopping a flow director queue twice' " luca.boccassi
2024-11-12 22:07 ` patch 'net/ixgbe: fix link status delay on FreeBSD' " luca.boccassi
2024-11-12 22:07 ` patch 'net/mvneta: fix possible out-of-bounds write' " luca.boccassi
2024-11-12 22:07 ` patch 'config/arm: fix warning for native build with meson >= 0.55' " luca.boccassi
2024-11-12 22:07 ` patch 'crypto/openssl: fix 3DES-CTR with big endian CPUs' " luca.boccassi
2024-11-12 22:07 ` patch 'eal/unix: optimize thread creation' " luca.boccassi
2024-11-13 7:45 ` David Marchand
2024-11-12 22:07 ` patch 'net/mlx5: fix memory leak in metering' " luca.boccassi
2024-11-12 22:07 ` patch 'net/mlx5: fix GRE flow item translation for root table' " luca.boccassi
2024-11-12 22:07 ` patch 'net/mlx5: fix SQ flow item size' " luca.boccassi
2024-11-12 22:07 ` patch 'net/mlx5: fix SWS meter state initialization' " luca.boccassi
2024-11-12 22:07 ` patch 'net/mlx5: fix reported Rx/Tx descriptor limits' " luca.boccassi
2024-11-12 22:07 ` patch 'app/dumpcap: remove unused struct array' " luca.boccassi
2024-11-12 22:07 ` patch 'bus/fslmc: fix Coverity warnings in QBMAN' " luca.boccassi
2024-11-12 22:07 ` patch 'net/dpaa2: fix memory corruption in TM' " luca.boccassi
2024-11-12 22:07 ` patch 'examples/l3fwd: fix read beyond boundaries' " luca.boccassi
2024-11-12 22:07 ` patch 'test/bonding: remove redundant info query' " luca.boccassi
2024-11-12 22:07 ` patch 'examples/ntb: check info query return' " luca.boccassi
2024-11-12 22:07 ` patch 'net/netvsc: force Tx VLAN offload on 801.2Q packet' " luca.boccassi
2024-11-12 22:07 ` patch 'net/vmxnet3: fix crash after configuration failure' " luca.boccassi
2024-11-12 22:07 ` patch 'net/hns3: remove ROH devices' " luca.boccassi
2024-11-12 22:07 ` patch 'net/txgbe: fix SWFW mbox' " luca.boccassi
2024-11-12 22:07 ` patch 'net/txgbe: fix VF-PF mbox interrupt' " luca.boccassi
2024-11-12 22:07 ` patch 'net/txgbe: remove outer UDP checksum capability' " luca.boccassi
2024-11-12 22:07 ` patch 'net/txgbe: fix driver load bit to inform firmware' " luca.boccassi
2024-11-12 22:07 ` patch 'net/ngbe: " luca.boccassi
2024-11-12 22:07 ` patch 'net/ngbe: reconfigure more MAC Rx registers' " luca.boccassi
2024-11-12 22:07 ` patch 'net/ngbe: fix interrupt lost in legacy or MSI mode' " luca.boccassi
2024-11-12 22:07 ` patch 'net/ngbe: restrict configuration of VLAN strip offload' " luca.boccassi
2024-11-12 22:07 ` patch 'net/vmxnet3: fix potential out of bounds stats access' " luca.boccassi
2024-11-12 22:07 ` patch 'net/vmxnet3: support larger MTU with version 6' " luca.boccassi
2024-11-12 22:07 ` patch 'net/hns3: fix error code for repeatedly create counter' " luca.boccassi
2024-11-12 22:07 ` patch 'net/hns3: fix fully use hardware flow director table' " luca.boccassi
2024-11-12 22:07 ` patch 'event/octeontx: fix possible integer overflow' " luca.boccassi
2024-11-12 22:07 ` patch 'baseband/acc: fix ring memory allocation' " luca.boccassi
2024-11-12 22:07 ` patch 'crypto/openssl: fix potential string overflow' " luca.boccassi
2024-11-12 22:07 ` patch 'test/crypto: fix synchronous API calls' " luca.boccassi
2024-11-12 22:07 ` patch 'crypto/qat: fix modexp/inv length' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnxt/tf_core: fix Thor TF EM key size check' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnxt/tf_ulp: fix parent child DB counters' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnxt: fix reading SFF-8436 SFP EEPROMs' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnxt: fix TCP and UDP checksum flags' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnxt: fix bad action offset in Tx BD' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnx2x: remove dead conditional' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnx2x: fix always true expression' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnx2x: fix possible infinite loop at startup' " luca.boccassi
2024-11-20 23:41 ` patch 'net/bnx2x: fix duplicate branch' " luca.boccassi
2024-11-20 23:41 ` patch 'common/cnxk: fix build on Ubuntu 24.04' " luca.boccassi
2024-11-20 23:41 ` patch 'net/cnxk: " luca.boccassi
2024-11-20 23:41 ` patch 'examples/l2fwd-event: fix spinlock handling' " luca.boccassi
2024-11-20 23:41 ` patch 'eventdev: fix possible array underflow/overflow' " luca.boccassi
2024-11-20 23:41 ` patch 'net/dpaa2: remove unnecessary check for null before free' " luca.boccassi
2024-11-20 23:41 ` patch 'common/mlx5: fix error CQE handling for 128 bytes CQE' " luca.boccassi
2024-11-20 23:41 ` patch 'net/mlx5: fix shared queue port number in vector Rx' " luca.boccassi
2024-11-20 23:41 ` patch 'net/mlx5/hws: fix allocation of STCs' " luca.boccassi
2024-11-20 23:41 ` patch 'net/mlx5: fix counter query loop getting stuck' " luca.boccassi
2024-11-20 23:41 ` patch 'common/mlx5: fix misalignment' " luca.boccassi
2024-11-20 23:41 ` patch 'net/mlx5: fix default RSS flows creation order' " luca.boccassi
2024-11-20 23:41 ` patch 'net/mlx5: fix Rx queue reference count in flushing flows' " luca.boccassi
2024-11-20 23:41 ` patch 'bus/dpaa: fix lock condition during error handling' " luca.boccassi
2024-11-20 23:41 ` patch 'net/iavf: add segment-length check to Tx prep' " luca.boccassi
2024-11-20 23:41 ` patch 'net/i40e: check register read for outer VLAN' " luca.boccassi
2024-11-20 23:41 ` patch 'common/dpaax/caamflib: enable fallthrough warnings' " luca.boccassi
2024-11-20 23:41 ` patch 'app/procinfo: fix leak on exit' " luca.boccassi
2024-11-20 23:41 ` patch 'member: fix choice of bucket for displacement' " luca.boccassi
2024-11-20 23:41 ` patch 'app/testpmd: fix aged flow destroy' " luca.boccassi
2024-11-27 0:54 ` patch 'test/bonding: fix loop on members' " luca.boccassi
2024-11-27 0:54 ` patch 'test/bonding: fix MAC address comparison' " luca.boccassi
2024-11-27 0:54 ` patch 'test/event: avoid duplicate initialization' " luca.boccassi
2024-11-27 0:54 ` patch 'test/eal: fix loop coverage for alignment macros' " luca.boccassi
2024-11-27 0:54 ` patch 'test/eal: fix lcore check' " luca.boccassi
2024-11-27 0:54 ` patch 'app/testpmd: remove redundant policy action condition' " luca.boccassi
2024-11-27 0:54 ` patch 'doc: correct definition of stats per queue feature' " luca.boccassi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241023211704.1216956-77-luca.boccassi@gmail.com \
--to=luca.boccassi@gmail.com \
--cc=david.marchand@redhat.com \
--cc=joshwash@google.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).