From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id D72E1A0A0E
for <public@inbox.dpdk.org>; Mon, 10 May 2021 18:10:33 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id D1D654003E;
Mon, 10 May 2021 18:10:33 +0200 (CEST)
Received: from NAM10-DM6-obe.outbound.protection.outlook.com
(mail-dm6nam10on2058.outbound.protection.outlook.com [40.107.93.58])
by mails.dpdk.org (Postfix) with ESMTP id 75EA940F35
for <stable@dpdk.org>; Mon, 10 May 2021 18:10:32 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=k9GF47skKUVm3jJ745+GbDI1B9zzI4vKPNmcbSvOyhuBK8hKRaS3f7tmRFPlFgzlaSUftYglQkl7kgL9DUqhIu29MdpaG6XV5gQlEeb/+QRNUpYEnUxdibX4C2CEN3OIkXa76cQVwLqyJEn5z8sAOfmq9+6MIUkajEwX8/69AYq+7SIPspBgZLtx2IuHpr0XM+y5HD/FczHuKBOxrM/8P01VPmOIu9xk6D4hQEe1rcxQ0gvIB0u2bLe8EvINO6fOQy64cd6kqGblJYNjRvr1UuMHxjyo14WppoXWp3QATE84cpIZYiejMsc/AIavfU3PQM9sq3kVwCMZzDKAtmGDPw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=PKAvYjPJ/drmxq36/0SXHSIssl6L1LLh7Oj5+HDUee0=;
b=Tuvqr9r9i//nTO4Amz8BIrLoRCsEw0NIqa90nnrqSntHGlZDlZFZCkmclMn9GB57WAMVeXT7txr5TEKuD7ubb4qi+swJNYKa0umGR7QqAE68cXTATveFdgfROQUJrRS2Xv1iwzllXCR0Q3s0UQ4QlLY1NBDflVqTSdhNtu7yY42dEihw4ZVA5RbleV2Wj3N4YY5SFDXHaLjpQOoRGl/ar4oZI0uNBwGRqXhxkTS+4cBoIuHeL25BzvNcg9BgOG027ESPLj7uwWLvEFVFdJ45fUezXHEcpz34SakIQIB1Seek5QU8ETSXYhgN8Gv05pqALamztogHlISvd/gjIaE/zQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com;
dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com;
dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=PKAvYjPJ/drmxq36/0SXHSIssl6L1LLh7Oj5+HDUee0=;
b=pVu6ViefI/pRGtLI5CQ7SPWT42jWNzVTxrTKGj5PFy/SmCIr+jFoCDz88c/vBA4JxCr1WJ6V3g0XvTWdWbdGOcoPTflqhHRlhi5onAthEn3KiNSHHU21Wb7fppbAWr1/j+ICZoV3jQZGRgZG0aYGWdQZh+ytjruLGrTXSNxqfwqPIz37/QlPNLKkkpAJJIslYp7kAl6PqP9LARPYZX7iWOFeUJw03s2Q/Dh+aZXm0vFup1MFviygtzBjcXVzimgHuTx8+sSToeGZBlXYEaEKSKMXscLUUKm6P0MZ9mOpnChTCEH17ygJOSFQ2DdBoUD4tPnvofNe3wtFwzkEsNvT1g==
Received: from BN9PR03CA0597.namprd03.prod.outlook.com (2603:10b6:408:10d::32)
by DM5PR12MB1196.namprd12.prod.outlook.com (2603:10b6:3:74::11) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May
2021 16:10:30 +0000
Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com
(2603:10b6:408:10d:cafe::33) by BN9PR03CA0597.outlook.office365.com
(2603:10b6:408:10d::32) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend
Transport; Mon, 10 May 2021 16:10:30 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed)
header.d=none;oktetlabs.ru; dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
216.228.112.34 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.112.34; helo=mail.nvidia.com;
Received: from mail.nvidia.com (216.228.112.34) by
BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:10:30 +0000
Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com
(172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May
2021 16:10:27 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Natanael Copa <ncopa@alpinelinux.org>
CC: Luca Boccassi <bluca@debian.org>, =?UTF-8?q?Morten=20Br=C3=B8rup?=
<mb@smartsharesystems.com>, Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
David Marchand <david.marchand@redhat.com>, dpdk stable <stable@dpdk.org>
Date: Tue, 11 May 2021 00:00:23 +0800
Message-ID: <20210510160258.30982-74-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com>
References: <20210510160258.30982-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
X-Originating-IP: [172.20.145.6]
X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: bea28a94-e345-4368-b843-08d913ce2248
X-MS-TrafficTypeDiagnostic: DM5PR12MB1196:
X-Microsoft-Antispam-PRVS: <DM5PR12MB119600B67DB97E6C180260F7A1549@DM5PR12MB1196.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:8882;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 7QDgOFNCd61e7XQcZzkrDc4eZqV/XBGlkPJ9PxoxOOZweeuAyOyiMHfSqv/lJf1YemWSFknnK1Hp4Jqvpecv//luYhNFju0yfbZ5K+BjweI+gJNpqIBvieHWFM2kdGbKBNbXNiAaDG7qLwoSWfybch+2d4FEDK6mlwCxAwB7Zep1YaXPbf9rmZxiPsjmxo4HVyOCeM0Z7d+Acb00MRiitiGtwi5OyWjL93azKG/7xN2YcYOMB4z6L8x2WFRtYpUbQlq074DElNAPTGKtoAhkvN7FAX7MG4tvYI3Fdg4r2NKtiUrPHsUqaZPpcCJCFX5ma6yGl9Ap3eeycNS/Nt8rLgOqZNsePU6iFoa2ajySOxy4yiwVTdi7bbpSs6mVr2YdNU4FtqZOXPDnmJffRE0fTgU673ih2HECJPdjDhxB93Im9e2gMxWEolIqh73At6IRtn4APs4P7YeQ9xdqYFvcbqNl0n5dHNP3Y/GrK2YEsnRFIfqT88jca+iy40HksXVWYmdPJU/VQlIwL+tcjnmOmlP9QT6HCRPvC+l/jFV8CLu8/dy42A2OqYAdf26DD4HgZB2d9moQV1dc8IPtJRNnqVl/WZDw1Nq0Gm0oehQaUoAASvwepCKLboaF0PxlgzN0pHPV7DQYYQpnCY/PTK4OnDu95iXv1glYPSry0vfg9pysxQ/llYQqUklGjqOrWn5+jwYbdO7rZ1tZaP5vfLJUbXBNzLzP9EuSlqGyVCqkfBdvB0+niVGYsBQIKxEb5oHiTQ+ll8cwZitA8ke7dp+Cmg==
X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;
SFS:(4636009)(376002)(39860400002)(346002)(136003)(396003)(36840700001)(46966006)(36756003)(83380400001)(8676002)(426003)(55016002)(5660300002)(36860700001)(186003)(66574015)(53546011)(336012)(6916009)(316002)(2906002)(478600001)(16526019)(2616005)(6286002)(36906005)(4326008)(86362001)(6666004)(26005)(54906003)(82740400003)(1076003)(70586007)(47076005)(82310400003)(8936002)(70206006)(7636003)(966005)(356005)(7696005);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:10:30.7288 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: bea28a94-e345-4368-b843-08d913ce2248
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1196
Subject: [dpdk-stable] patch 'net/cxgbe: remove use of uint type' has been
queued to stable release 20.11.2
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 20.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/6bee873fbb8eeb24a43eb5992c42ec9643c62db1
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From 6bee873fbb8eeb24a43eb5992c42ec9643c62db1 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 5 Nov 2020 22:17:10 +0100
Subject: [PATCH] net/cxgbe: remove use of uint type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Luca Boccassi <bluca@debian.org>
[ upstream commit 3d100ccb2e16087f1ba0ba09274ee1b40b6f0e15 ]
Improve portability by replacing non-standard 'uint' with 'unsigned int'.
This solves the build error with musl libc:
In file included from ../drivers/net/cxgbe/cxgbe.h:9,
from ../drivers/net/cxgbe/cxgbe_ethdev.c:37:
../drivers/net/cxgbe/base/common.h:201:4: error: unknown type name 'uint'
201 | uint synmapen:1; /* SYN Map Enable */
| ^~~~
Fixes: bfcb257d3014 ("net/cxgbe: enable RSS for VF")
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Reviewed-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: David Marchand <david.marchand@redhat.com>
---
drivers/net/cxgbe/base/common.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/cxgbe/base/common.h b/drivers/net/cxgbe/base/common.h
index 8fe8e2a36b..60ba14d044 100644
--- a/drivers/net/cxgbe/base/common.h
+++ b/drivers/net/cxgbe/base/common.h
@@ -201,15 +201,15 @@ struct rss_params {
unsigned int mode; /* RSS mode */
union {
struct {
- uint synmapen:1; /* SYN Map Enable */
- uint syn4tupenipv6:1; /* en 4-tuple IPv6 SYNs hash */
- uint syn2tupenipv6:1; /* en 2-tuple IPv6 SYNs hash */
- uint syn4tupenipv4:1; /* en 4-tuple IPv4 SYNs hash */
- uint syn2tupenipv4:1; /* en 2-tuple IPv4 SYNs hash */
- uint ofdmapen:1; /* Offload Map Enable */
- uint tnlmapen:1; /* Tunnel Map Enable */
- uint tnlalllookup:1; /* Tunnel All Lookup */
- uint hashtoeplitz:1; /* use Toeplitz hash */
+ unsigned int synmapen:1; /* SYN Map Enable */
+ unsigned int syn4tupenipv6:1; /* en 4-tuple IPv6 SYNs hash */
+ unsigned int syn2tupenipv6:1; /* en 2-tuple IPv6 SYNs hash */
+ unsigned int syn4tupenipv4:1; /* en 4-tuple IPv4 SYNs hash */
+ unsigned int syn2tupenipv4:1; /* en 2-tuple IPv4 SYNs hash */
+ unsigned int ofdmapen:1; /* Offload Map Enable */
+ unsigned int tnlmapen:1; /* Tunnel Map Enable */
+ unsigned int tnlalllookup:1; /* Tunnel All Lookup */
+ unsigned int hashtoeplitz:1; /* use Toeplitz hash */
} basicvirtual;
} u;
};
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-05-10 23:59:28.560741600 +0800
+++ 0075-net-cxgbe-remove-use-of-uint-type.patch 2021-05-10 23:59:26.430000000 +0800
@@ -1 +1 @@
-From 3d100ccb2e16087f1ba0ba09274ee1b40b6f0e15 Mon Sep 17 00:00:00 2001
+From 6bee873fbb8eeb24a43eb5992c42ec9643c62db1 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Luca Boccassi <bluca@debian.org>
+
+[ upstream commit 3d100ccb2e16087f1ba0ba09274ee1b40b6f0e15 ]
@@ -20 +22,0 @@
-Cc: stable@dpdk.org
@@ -31 +33 @@
-index 202a2f4baf..ab100d784c 100644
+index 8fe8e2a36b..60ba14d044 100644
@@ -34 +36 @@
-@@ -189,15 +189,15 @@ struct rss_params {
+@@ -201,15 +201,15 @@ struct rss_params {