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 4D1BAA0C41 for ; Tue, 30 Nov 2021 17:40:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 42C36411CB; Tue, 30 Nov 2021 17:40:28 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id D4A0441177 for ; Tue, 30 Nov 2021 17:40:27 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id AECFF3FFF1 for ; Tue, 30 Nov 2021 16:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290427; bh=YCETd/5gJ7gDI2VSDdNlcm6dIr6Ec6PWJcY2OaHSU+A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=jqfdrFWEFShNOlJuwny3I9YG1oa5LbuSWhsSdx8B/uDUhVc2lRAO0C7R6oshXGHQX lJj1buJ18tg3P2592ywqP5XGYb3RfYlOCyM2r+sgRU9aKVOfD8Tiyd5NkA+pYa3VKG 6EBV10BRSz3H11JUkG3ZDuSilhHvZFAypcn9S2rPAn8HKvQ/OtDfcRbIW1erG9nstR fvMWUU0RmzhAGEiN9G0+Tf4/sw4VZSK22ejEc5KoUI8+gIFEzz+GLhGRdjJ0z0Uogf fIC5jdQWeISqMI7Ve9iUCg+iDn3x/mnN+Xf7H5HS8EVQPAJyMVFGSpw0t1EpiVguSf Uf0bMT3ycGk0A== Received: by mail-ed1-f72.google.com with SMTP id y9-20020aa7c249000000b003e7bf7a1579so17437473edo.5 for ; Tue, 30 Nov 2021 08:40:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YCETd/5gJ7gDI2VSDdNlcm6dIr6Ec6PWJcY2OaHSU+A=; b=zqRiJSG+dJIZsTGdi+2s72IrGZ7STc03rkrgUS10E81p848TWnRtXUXjTw+hRn69Os nuEoaemFHIWGMS7pz63FvmT/OPx+OvJhgCsMMo2HlkxM5JoC8i3W4TJrUYWS4aXdM6cy +vj3Io2zGDSyDmY1oUVn5G8+ObJf4M0ZqIid0vN146F8XQH1Vws14k7i/EZs8D0iI1qe tyIQuPcq0UUVnh3qnw9Z9/RvTW+3lr1P3goOJgf8H1igAIDWjYawkhjvUWtYvkljKqbQ +Jdk9m/5gtVpwfqsXO5FocA83MZTOVIdil9p0IaZsRP2K1FKrJaj7x+7TGcQtZEvcjRl FVWQ== X-Gm-Message-State: AOAM533qt6CLr217zBL0vlNwbCebeLhX6ZFEN3Qmx6SlkX1lcTqn9bOU fDFMx/szPqFvGVU+3aeCO3wYi9Zc2NoExSLXCkB5M+Yp4hLbHlkf+82JeGfrSB448gibSHS2nQ6 6dKQE4yoOus3rlpSRq+cq4DY1 X-Received: by 2002:a05:6402:34c1:: with SMTP id w1mr43793edc.179.1638290427447; Tue, 30 Nov 2021 08:40:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLm55gGCwywmKfJMhsxZZmwH7v0kUCtllyC/WdPzQt1ep0JffQ5aCrjjlEQrAmUqgRntui4Q== X-Received: by 2002:a05:6402:34c1:: with SMTP id w1mr43769edc.179.1638290427269; Tue, 30 Nov 2021 08:40:27 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id c7sm9711627ejd.91.2021.11.30.08.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:40:26 -0800 (PST) From: christian.ehrhardt@canonical.com To: Ferruh Yigit Cc: Jasvinder Singh , dpdk stable Subject: patch 'net/softnic: fix useless address check' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:49 +0100 Message-Id: <20211130163605.2460997-85-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/eaa0d764d28c4540fb624a1c1cf11705db63ccab Thanks. Christian Ehrhardt --- >From eaa0d764d28c4540fb624a1c1cf11705db63ccab 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 [ 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 bc95f16439..aa9971579e 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.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:10.898623380 +0100 +++ 0085-net-softnic-fix-useless-address-check.patch 2021-11-30 16:50:05.870874117 +0100 @@ -1 +1 @@ -From 675a6c18746694a8e19a0256b16bd6b3e8dcbfd2 Mon Sep 17 00:00:00 2001 +From eaa0d764d28c4540fb624a1c1cf11705db63ccab Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 675a6c18746694a8e19a0256b16bd6b3e8dcbfd2 ] + @@ -23 +24,0 @@ -Cc: stable@dpdk.org @@ -32 +33 @@ -index 932ec15f49..b04e78c6e0 100644 +index bc95f16439..aa9971579e 100644