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 38B4A45BB6 for ; Wed, 23 Oct 2024 23:21:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3332D40261; Wed, 23 Oct 2024 23:21:55 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id E731A4333E for ; Wed, 23 Oct 2024 23:21:53 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4316f3d3c21so1996075e9.3 for ; Wed, 23 Oct 2024 14:21:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718513; x=1730323313; 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=ZvB2SRygfVS2KTss394VYVThGfJ3vBy37eWea4iF6MM=; b=IempplBmbfKKaNItcXo8xigmOW4y9qEb3pvnGFgtiosHXIzWm+woBlNsdSnrsSyZgy ioSVwmbnxsSgJh0xNupFhb2HwiManlqEwMGuj9jLTUcr2JGt4iB/bgtwVMiyUpbZW1od yo0PbbVKrIASoIU1wZdusn6YfvJvt+OByHzbZ9Gk6EMBNXFsQDy6WLdanCKvs96v5H5R hOAvWnlbmQyIqeoEfcp1DPlgtioHZpJ/tliqy4WDpx7FF1BHLqcBzlGg1uQtJN9vZx4s L1kBPniwAMkvmmkTzza0r6q3G2aCu37wssaEOARsdJTo/Y8NhgHuqr/6LdC7Mw4JJZ0r EPhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718513; x=1730323313; 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=ZvB2SRygfVS2KTss394VYVThGfJ3vBy37eWea4iF6MM=; b=CsUvzmXnvnHxL0sqOo1djScjvYrq3cmbAzWSmKqOCXQXKAwx2KfNwR9qw4MuWHBXxU sETaD1hB4RJ7xeQLb7Gp4tSyMQ7t0nD3ZFOT9s24DCMFgUgdLa4nm4bVjRVypzYDg0Ej PEm29Tdp3Br4bg3dWH0jc9MfyNflxsqO08JdbDYPQ5Y7FVLiKybNVWp9ftom10mhf55c jzkELYdJsUGqz+SLtC2HclWjJyqToBAVpKExau66P9/HscAiFsJ0q58y2WAwp6KfvV6a 1ZA2E5qoEHKo9r3Fl+1GIZpmCVDgEdHA/uFp/j8+CMRYwZeGAvkAtsXd2TAFUx1mAQkS QZIw== X-Forwarded-Encrypted: i=1; AJvYcCXGjH9B5Q8A4dqVKwt4d2hm1cxjDI4SbBMxnv9Su8aF9xadGOP4ufsd+WYjaINXchIEPDaF1ws=@dpdk.org X-Gm-Message-State: AOJu0YwLOzqITZ+oA/dEFw1ybph7Tvc5YibXN2ty/iG3CuVcx3MBRkQG sPUTNwbDEKh+n8ceBY26MipNoycWr3sFKVszzdvzSsnS2ZVf9cpO X-Google-Smtp-Source: AGHT+IGxN/NPsKsITHgeUTqskuJ9vEHj1miqLnI2K796WRKcgmOjYvsSV7J79fLfUq3W0jVuEIOp+g== X-Received: by 2002:a05:600c:3550:b0:42c:b16e:7a22 with SMTP id 5b1f17b1804b1-4318413f0ccmr36938085e9.12.1729718513379; Wed, 23 Oct 2024 14:21:53 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43186c3a5b4sm27310015e9.38.2024.10.23.14.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:21:52 -0700 (PDT) From: luca.boccassi@gmail.com To: Joshua Washington Cc: David Marchand , dpdk stable 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 Message-ID: <20241023211704.1216956-77-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-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.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 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 Signed-off-by: Joshua Washington --- 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 - #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