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 1399AA034F for ; Wed, 10 Nov 2021 07:49:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E25040683; Wed, 10 Nov 2021 07:49:27 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2082.outbound.protection.outlook.com [40.107.92.82]) by mails.dpdk.org (Postfix) with ESMTP id 3D74040E28 for ; Wed, 10 Nov 2021 07:49:25 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QG2nnoGYl2hnduiCTdSc4d7Y6MQAMq6++ZeEYuqUUuiK8rmpzmssEfDdwjfb+/YTCLFEUXBwkUecCwAyz6jdcjZyq0thz/fylfRjI3GNlE6TgGzI7cpktO0e9CKY1veZbb9D7MLCJK7Bp2NmRz44ZJKOsfFxNFJyVAkILx8l6Qrckbe+oejsypW5NjMrC8rwD5cvkSYMG3L+XRKBp4w9l4kDaJ1ENCpAIg3/zmD54pcIYzrwZPFjtnm3prOY+lOYNuBoCx4Zsx8N4Ulmzl/qmEKGAOyNhGyzXpG1m6KgPveC8tQDDxU1sxQxf7dkasgJ+JD2tRzwxRkiLFoKMXHUqA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HkLzx/JRG6pRMDdLFNaGThEyfM5REX8lk+k0HLhwAmA=; b=hHqxs3ZIXK/OTzn+cLvjG5VUnIvl4Z/v2h2OxcQBeaCYB732EWc2y05Uz1sdrFMAc7DZn1kZ3PtfFKhC62hADCdVkIizuf7WMPX73+E/3pNmfRVAKTonlrdnaWIE9cCmFXrp0IoDJujO6KW463cTE3f+/2TsRfD3g/Ngq35ZYl8eTblhioG9K9SNGx0iY2y//N5qaaAhEH28hxyyy4WYUP+SZL5PfF2A20vQ+IWiMtyQXhNV/8f3SED8iAiBOk51BoGZwfj+MSeRJe19PB9ewZbLrtNMgWu56NnjI2RhY3Kr7B/Y6sA2jv79Z9kQa3Xk3aP8seY+faVUtcbiYaCMjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=HkLzx/JRG6pRMDdLFNaGThEyfM5REX8lk+k0HLhwAmA=; b=cSsormrdDqiVVVjaQsMhpuPwD60R0YjOHOKC4T4Y8Qj4WByFlONNKgJUkejZbnifrYuENs1cvqJylaZ1mDc6sphaeBxdXDxmvAVJKbF6o5Kga/v2SBGRn7nOLMAoGPIRU1ji28we/cbm93eg+SbonJeiln0QBF3SG9GZIfQaLoyRAus9lrYWIBwh0v5gQWiCnTP4JkKu5SY1JWyxxTxvoyWuienBKyMjiKBzuNEEj18sTsPqpn2ISN6UmGNKIsQ4bDm85NkFntFp2ivAL1PQiIajG6dR2Q4CBBbOZ4hq9u2MCZW3YAkv+9GguCBwTScyia4fH45kQlJPtcrNmwoPsg== Received: from BN8PR12CA0009.namprd12.prod.outlook.com (2603:10b6:408:60::22) by CY4PR1201MB0199.namprd12.prod.outlook.com (2603:10b6:910:1c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Wed, 10 Nov 2021 06:49:23 +0000 Received: from BN8NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:408:60:cafe::df) by BN8PR12CA0009.outlook.office365.com (2603:10b6:408:60::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:49:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;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 BN8NAM11FT034.mail.protection.outlook.com (10.13.176.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:49:22 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:49:20 +0000 From: Xueming Li To: Ferruh Yigit CC: Luca Boccassi , Jasvinder Singh , dpdk stable Date: Wed, 10 Nov 2021 14:30:36 +0800 Message-ID: <20211110063216.2744012-153-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b29e86f7-3daf-4284-c65c-08d9a4163a63 X-MS-TrafficTypeDiagnostic: CY4PR1201MB0199: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AsHA6BzhjLuqTv9k7m2RRLKI/3imRXn5uOt+JJgbxoeX5CFyzIQG/LU2LZUb3m5wpQfg5ZGrm/nyYJBELIOj+nynzqI0r2b7WOijj07GmfWRQqyYLvABVn1t8gsTzAlj17TQhqb3jfr30cmqIIH7dh9ATjPKvwyYYxSDRQIbTmRw9Srzxkn6NMZ8bJeWoWML6OtHSF/Z0yGjLmc8qBpbGu1HHEEwkQvOJL/bttnCFO1aL0ap03+Be02PqdvFxdX1IYMtd8Cpl8SBJXd6wyfG4Cfk4xSuPc3nvGiMRoH79QHKED1yZN9lGdJIXXp/8qrmY1cptdNgWcZ/38bc1xxSTvZPibXjK8jdixVpIFwwxT633m6KOmmwGkigy3aWLtpZFFvoWfBZ6rkuBSnIjdldj9Ubh+ofL4RyVK1YKg182VOoYbk2vy6TkAJMu4pK8A+8jnUWWsWX/TbhOjzjkshAxb4r6fteP77qpcIjIU1vlLpgnH/vnuJuCzFVcj7FROBcAyAfMF01sgR71T+teTmhNHq/nrMdhS7wkyxiqeykoHjqO3iHFjBG/BPEoZnxAeyvjM9tiqSbda2afK7BRacMtHyyI/l8PTfTAloUsPQQPvM6ZcxtyH/niPfJMzYmyFxk/4WygqNmaYQh7fH66WyZiWfw2m2SKGkamYZ1aUyJOGbyebz4SNPewmsS/KYgBjsncWx1npAPgpZq2cxUQDi2vug9V/QIVzpPpZcg/9ZfaDIQLLPgvAt/REtpqIC3wdzp/iVE9cHs+mXXa4Hs3UYS6ttfiwwiLUIb0j6oN9O+dR+r+WNBXJ64M0qpAKisnXe3Xz9K4YBMW11MPF9eu01P0w== 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)(36840700001)(46966006)(4001150100001)(966005)(2616005)(86362001)(186003)(1076003)(6666004)(356005)(8936002)(4326008)(8676002)(55016002)(16526019)(5660300002)(47076005)(2906002)(70206006)(70586007)(53546011)(26005)(83380400001)(36860700001)(336012)(316002)(6286002)(36756003)(426003)(82310400003)(508600001)(7696005)(36906005)(6916009)(54906003)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:49:22.3819 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b29e86f7-3daf-4284-c65c-08d9a4163a63 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: BN8NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0199 Subject: [dpdk-stable] patch 'net/softnic: fix useless address check' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/0f775b1258eff675d4f809a6470829d130b5b63d Thanks. Xueming Li --- >From 0f775b1258eff675d4f809a6470829d130b5b63d Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Mon, 4 Oct 2021 18:27:22 +0100 Subject: [PATCH] net/softnic: fix useless address check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 675a6c18746694a8e19a0256b16bd6b3e8dcbfd2 ] Reported by "gcc (GCC) 12.0.0 20211003 (experimental)": ./drivers/net/softnic/rte_eth_softnic_cli.c: In function ‘tmgr_hierarchy_default’: ./drivers/net/softnic/rte_eth_softnic_cli.c:634:73: error: the comparison will always evaluate as ‘true’ for the address of ‘tc_valid’ will never be NULL [-Werror=address] 634 | (¶ms->shared_shaper_id.tc_valid[0]) ? 1 : 0, | ^ Fixing it by removing useless check. Fixes: 1af2dc5111ce ("net/softnic: add command for default tmgr hierarchy") Fixes: 5eb676d74fc8 ("net/softnic: add config flexibility to TM") Signed-off-by: Ferruh Yigit Acked-by: Jasvinder Singh --- drivers/net/softnic/rte_eth_softnic_cli.c | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c index 932ec15f49..b04e78c6e0 100644 --- a/drivers/net/softnic/rte_eth_softnic_cli.c +++ b/drivers/net/softnic/rte_eth_softnic_cli.c @@ -631,7 +631,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[0], .shared_shaper_id = &shared_shaper_id[0], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[0]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[0]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -641,7 +641,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[1], .shared_shaper_id = &shared_shaper_id[1], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[1]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[1]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -651,7 +651,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[2], .shared_shaper_id = &shared_shaper_id[2], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[2]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[2]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -661,7 +661,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[3], .shared_shaper_id = &shared_shaper_id[3], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[3]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[3]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -671,7 +671,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[4], .shared_shaper_id = &shared_shaper_id[4], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[4]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[4]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -681,7 +681,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[5], .shared_shaper_id = &shared_shaper_id[5], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[5]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[5]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -691,7 +691,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[6], .shared_shaper_id = &shared_shaper_id[6], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[6]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[6]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -701,7 +701,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[7], .shared_shaper_id = &shared_shaper_id[7], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[7]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[7]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -711,7 +711,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[8], .shared_shaper_id = &shared_shaper_id[8], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[8]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[8]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -721,7 +721,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[9], .shared_shaper_id = &shared_shaper_id[9], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[9]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[9]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -731,7 +731,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[10], .shared_shaper_id = &shared_shaper_id[10], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[10]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[10]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -741,7 +741,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[11], .shared_shaper_id = &shared_shaper_id[11], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[11]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[11]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, @@ -751,7 +751,7 @@ tmgr_hierarchy_default(struct pmd_internals *softnic, .shaper_profile_id = params->shaper_profile_id.tc[12], .shared_shaper_id = &shared_shaper_id[12], .n_shared_shapers = - (¶ms->shared_shaper_id.tc_valid[12]) ? 1 : 0, + (params->shared_shaper_id.tc_valid[12]) ? 1 : 0, .nonleaf = { .n_sp_priorities = 1, }, -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.692159266 +0800 +++ 0152-net-softnic-fix-useless-address-check.patch 2021-11-10 14:17:01.940745518 +0800 @@ -1 +1 @@ -From 675a6c18746694a8e19a0256b16bd6b3e8dcbfd2 Mon Sep 17 00:00:00 2001 +From 0f775b1258eff675d4f809a6470829d130b5b63d Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 675a6c18746694a8e19a0256b16bd6b3e8dcbfd2 ] @@ -23 +25,0 @@ -Cc: stable@dpdk.org