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 69BA3A0C3F for ; Sat, 12 Jun 2021 01:08:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62ED74003F; Sat, 12 Jun 2021 01:08:53 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2089.outbound.protection.outlook.com [40.107.92.89]) by mails.dpdk.org (Postfix) with ESMTP id CF9574003F for ; Sat, 12 Jun 2021 01:08:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iHe70DgB999h5zwiBrN6DFmRM8CM6jASxC/lS3O402D9ITZN0Ef7P7MZtHB2o4lk3yEkniopEnT5yp2q5R+BzYKS7Q+Eh1Q8UCV8YY+IVLsz3Q1wQxU73OT0OTMsR7mpRve83OpdUUywgli+HdtjCAVt++2TC5F1+X9f6J1aZaLWHGw+/T/T039j8Sn5EYhiEDyJdyVyr5IBsUBvCsdYwSzSC1DIWBslkGNP/MtAyUb56LCvIrlULnQEsRCP4yW1YF4GVDh/v78NoRx1SVQadFFmmtzmfuqKMM7FzgqlQipA2zvaY6rUoDcnlJbi2r3GFSdeYOJ20DM2JAgpaWvd0w== 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=rrVC9k2onEdUPDhbs73GOFAppbu0Pwn5g0wsl6r7lTU=; b=MtXHGp3Q3ofP1He7vBOG0D3MThSTsBWznvJmXmWoqZEWgng6DiBTyWWTwzJd9qRmszWCt+wBlnpXK5SFZmoNmJ5jgoOkjf5klf+arqi4SFnwAwN1XRkVlZq9WHiN0xwSO2syrI357lGZsJUBkbuP7Hq/YhvdvmTKIIeJ5uD/Eb1/giKMaJszPMtamSignQpXRkAMFTeCUzM4AUIvn3VSwP2C0qI98dX1TYKRNbLGdpNutpUFKCVnutMAjPzmdPKreyiIJTcOl0BFChR4n1wwpwmyP+7YOdAit7Ve391SqTabQnC9QN9dujwBq0rtmlPHpklukz5fpz8OOwhLyOR2SQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=broadcom.com 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=rrVC9k2onEdUPDhbs73GOFAppbu0Pwn5g0wsl6r7lTU=; b=MCUUjcYz5mhr8I0WJgIusW6VPMwcFW8q2QabLLh0/9yt7Tt+5SlijWBDv5OqjkFwfdWtGZbKzjGA8Yt0fjD+X6QK+6xtnFDlT3Uf/L/Y7L+/hAYX+U1hQpnpm4Yyub1y4b87bICc7lYL/OKfpri3S1uTXE4w7blOM7H49P/51Kp5vLIIUCUurFZErwVM0mlZBwVg+JclEAd/3EfEfIR6x8wwakMycW0yAXaEmiJMNRix01hSJ3sWmzpfiEAXARD6DvdogdMphyDTIrUaLqNm/zy5WIiLN2CoGvTsdBCTYLcG95iYvk8ZqvGbKQkJ8mZU7wedKgdOhBmY8v1W04FlFQ== Received: from MW4PR03CA0348.namprd03.prod.outlook.com (2603:10b6:303:dc::23) by DM5PR12MB2470.namprd12.prod.outlook.com (2603:10b6:4:b4::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Fri, 11 Jun 2021 23:08:50 +0000 Received: from CO1NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dc:cafe::a6) by MW4PR03CA0348.outlook.office365.com (2603:10b6:303:dc::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:08:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; broadcom.com; dkim=none (message not signed) header.d=none;broadcom.com; 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 CO1NAM11FT048.mail.protection.outlook.com (10.13.175.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:08:49 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:08:48 +0000 From: Xueming Li To: Stephen Hemminger CC: Luca Boccassi , Ajit Khaparde , dpdk stable Date: Sat, 12 Jun 2021 07:02:15 +0800 Message-ID: <20210611230433.8208-41-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0b21041-e208-423b-9755-08d92d2ddfca X-MS-TrafficTypeDiagnostic: DM5PR12MB2470: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4RU5FQciTvDo3mzVkQpSNAUs/3+DcH9BIH5S5TmeD+vlU9Irgs0VfXVotuKXWJ4yPwFx8XKtCAK/P/1XBGeT+AsnmbNCGFg28g1gHTod6M7mgj87zU1l23sYg8LNpbbzxGDnNr+DoT8SxnjHDRvWpNoIXzk3EZPqOD4RuQ1K3uTun/eMaEdo5d7DxYguoZmZQ8XC44oZ0bFh/KKuaaPCh5koQQF1tu5jpTsB4P5Zauga+9ceu6o+h/W3Ip4HlP0E5iaofVc87obllGMnUN8pVwhUC6C/XT8e7oANZaW0IV1CBTTPRERILm47Gp6yOvBRzMvy2CayO7Npyu+33uSmb5ZmRBHIvFvKYy85RwwKtmHpHD3/yq4JL9GeKuL+Zf9seQywDAzNHZ9pvFyw8K3zYVhfFvd1xgmhY3f/2+JK8elVya3jduCL3xaXP2Y96b1SM/wqA0qHKTgm5IqLypIYixYZiqfbZ5a/plf0Gl5lXdP0n164e07+ZQULTuloY72UTrehaaSlhfeLnow+6YazyvglKunVO22Ea77LYbpXLrLIYi0HbEUPjj5m7raMtcOwlrBZgqOVehSvGaIhEtpOkyGZ9416i1eh3a/3DidZcQ2banSQ8nCiZd2JSWWnPMpoe7Z+6UlM6+3DHSVCnt5XG1+jiLmVF7Btco49LS4rI75sdH3iulN2Sk0q4mSX3h3iMQA/A6sxFnnMipgQJNgXC34HIHDPKrfGfhhszd17OfOlqik3RxtGhsuz9AJzgZskFxn1fBPBtcF+qX9QWwNCHWL4Cpwfu3RKNG4keXTjTtWzCNzdb7WXHZ9XV90xgT/G 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)(136003)(39860400002)(376002)(346002)(396003)(36840700001)(46966006)(36756003)(966005)(2906002)(186003)(47076005)(356005)(53546011)(1076003)(7636003)(16526019)(6916009)(316002)(478600001)(54906003)(36906005)(4326008)(6286002)(336012)(5660300002)(8936002)(82740400003)(55016002)(36860700001)(6666004)(8676002)(26005)(7696005)(82310400003)(86362001)(70206006)(83380400001)(426003)(2616005)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:08:49.9950 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0b21041-e208-423b-9755-08d92d2ddfca 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: CO1NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2470 Subject: [dpdk-stable] patch 'net/bnxt: use prefix on global function' 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 06/14/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/8965b6689600dbe98b8a970029b37616ec233e1a Thanks. Xueming Li --- >From 8965b6689600dbe98b8a970029b37616ec233e1a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 23 Apr 2021 14:04:44 -0700 Subject: [PATCH] net/bnxt: use prefix on global function Cc: Luca Boccassi [ upstream commit c02bbaa96b9f585021e02530ed4c7748f0db9188 ] When statically linked the function prandom_bytes is exposed and might conflict with something in application. All driver functions should use the same prefix. Fixes: 9738793f28ec ("net/bnxt: add VNIC functions and structs") Signed-off-by: Stephen Hemminger Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_flow.c | 4 ++-- drivers/net/bnxt/bnxt_vnic.c | 4 ++-- drivers/net/bnxt/bnxt_vnic.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index 514a5ed433..b8020d9e98 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -1397,8 +1397,8 @@ use_vnic: /* If hash key has not been specified, * use random hash key. */ - prandom_bytes(vnic->rss_hash_key, - HW_HASH_KEY_SIZE); + bnxt_prandom_bytes(vnic->rss_hash_key, + HW_HASH_KEY_SIZE); } else { if (rss->key_len > HW_HASH_KEY_SIZE) memcpy(vnic->rss_hash_key, diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c index 1602fb2b88..007f7e93c9 100644 --- a/drivers/net/bnxt/bnxt_vnic.c +++ b/drivers/net/bnxt/bnxt_vnic.c @@ -16,7 +16,7 @@ * VNIC Functions */ -void prandom_bytes(void *dest_ptr, size_t len) +void bnxt_prandom_bytes(void *dest_ptr, size_t len) { char *dest = (char *)dest_ptr; uint64_t rb; @@ -172,7 +172,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) HW_HASH_KEY_SIZE); vnic->mc_list_dma_addr = vnic->rss_hash_key_dma_addr + HW_HASH_KEY_SIZE; - prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE); + bnxt_prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE); } return 0; diff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h index f173a02f97..07c7aeac0d 100644 --- a/drivers/net/bnxt/bnxt_vnic.h +++ b/drivers/net/bnxt/bnxt_vnic.h @@ -68,7 +68,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp); void bnxt_free_vnic_mem(struct bnxt *bp); int bnxt_alloc_vnic_mem(struct bnxt *bp); int bnxt_vnic_grp_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic); -void prandom_bytes(void *dest_ptr, size_t len); +void bnxt_prandom_bytes(void *dest_ptr, size_t len); uint16_t bnxt_rte_to_hwrm_hash_types(uint64_t rte_type); int bnxt_rte_to_hwrm_hash_level(struct bnxt *bp, uint64_t hash_f, uint32_t lvl); uint64_t bnxt_hwrm_to_rte_rss_level(struct bnxt *bp, uint32_t mode); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.724775900 +0800 +++ 0041-net-bnxt-use-prefix-on-global-function.patch 2021-06-12 06:53:56.200000000 +0800 @@ -1 +1 @@ -From c02bbaa96b9f585021e02530ed4c7748f0db9188 Mon Sep 17 00:00:00 2001 +From 8965b6689600dbe98b8a970029b37616ec233e1a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit c02bbaa96b9f585021e02530ed4c7748f0db9188 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index e3906b4779..844bf1520f 100644 +index 514a5ed433..b8020d9e98 100644 @@ -25 +27 @@ -@@ -1404,8 +1404,8 @@ skip_vnic_alloc: +@@ -1397,8 +1397,8 @@ use_vnic: @@ -37 +39 @@ -index 14ad33b4e8..de5c14566d 100644 +index 1602fb2b88..007f7e93c9 100644 @@ -59 +61 @@ -index 00a664c8b8..37b452f281 100644 +index f173a02f97..07c7aeac0d 100644