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 CDADD43CE7 for ; Mon, 18 Mar 2024 16:39:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C4C0A40695; Mon, 18 Mar 2024 16:39:53 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id A4E1D40289 for ; Mon, 18 Mar 2024 16:39:52 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-33ed5b6bf59so1764432f8f.0 for ; Mon, 18 Mar 2024 08:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710776392; x=1711381192; 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=rXcr/kSctr8qwxjF4wSCEXTsjolwMCcW9EgsKiw1DE4=; b=XnsbVGQ9cXAAhvKEBBH5ihHB0ELIjp9C/9FPbQ9J4TsQ1eeVqH5yKgKypJDY6GzNM9 EgTUBmy9v7A8LYXpFHiBe8b0hD4194Zfiz7qs/xN1vJDY+1XQtHTDh95nRaV2kgD7dmm bTwQv2L7tdaNm/nK2hcAX02gAyA6GUZm6b3fO7pxp/8fjuaMz3/3DQLpoIzt6P4HBNoD u/rrfCWcABT9ScixUJwu4MJsN/0IPjgXIzlNtUNW/1xGKTRywKUbG16P1nqSM5KTq2cF LdDNG4vRkAB7E8FHP8n9glE8Iqg3DXVg2AKdO9VwGwhsS8oiAH5UybhkrzbMVo3e8wRY C//g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710776392; x=1711381192; 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=rXcr/kSctr8qwxjF4wSCEXTsjolwMCcW9EgsKiw1DE4=; b=kDXIyN0VGcFbtZrpu1XDkCp02zEkPc2qcugCPNZgaO55dA5Fof8K+RYlpg1bVDzhxE xfNGzbpsOMCH+Fz2/MRCL7cD84WeH/YsjnswjisOFlgVgpBD8ztw2u8x9D9beEk1Y5R4 KthzsOjkmIdOA7Q1VEiMOTBceF6IEAblRVdRGKhuifEIrvz5OP4lS75IsqLbrdRtG+ql jm2QCSmNBShYs2OnCWf77O8za3T+UBONRK3p7K4zbWQMBOd7f8n5FtzW2NUTLgNpV0Ft o+NGN3kl/qCrV/zmS/9rcgulnp/ZJnArd/kA0VMFC0dgAUqEZGZxmex1gkLq44wkeKqP /aGQ== X-Forwarded-Encrypted: i=1; AJvYcCVsGQcbxQmK5cw6LQn4A0dG0gwHgInPf/5RIxsHfTJeXDgUFN3oo2977JLqMiVilum6WZPdNWC04g5vXp1D1nk= X-Gm-Message-State: AOJu0Yz2fsCrGxiOqlARzo1BkiF1FKtKj+8xtGtkD8iHkiGf2PpFPf9c 09UoHYsuVgchLajQdCNwM26cVHgsgaNqZxqn+s4NLH0Rx3ugX+xfFYMg3llKv+8= X-Google-Smtp-Source: AGHT+IG/AM+fzepCSSKpf2rjsjdC4A3Vo9ZWSfknLAEVpL/4deI+WAVhBLrHohUPhZC51jhFLal4BA== X-Received: by 2002:a5d:58ca:0:b0:33e:867:b288 with SMTP id o10-20020a5d58ca000000b0033e0867b288mr7908967wrf.63.1710776392222; Mon, 18 Mar 2024 08:39:52 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id s6-20020a5d69c6000000b0033e9f6997c7sm10010167wrw.66.2024.03.18.08.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 08:39:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Chaoyong He Cc: Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix switch domain free check' has been queued to stable release 22.11.5 Date: Mon, 18 Mar 2024 15:39:00 +0000 Message-Id: <20240318153919.3407921-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318153919.3407921-1-luca.boccassi@gmail.com> References: <20240314000957.2810803-61-luca.boccassi@gmail.com> <20240318153919.3407921-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/20/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/75b8660005baf365fdcf579ac04577082da4f6dc Thanks. Luca Boccassi --- >From 75b8660005baf365fdcf579ac04577082da4f6dc Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Thu, 14 Mar 2024 15:40:17 +0800 Subject: [PATCH] net/nfp: fix switch domain free check [ upstream commit 5b1b9f9c11bedb672cdf01c834d6c341d50a0f1e ] CI found calling 'rte_eth_switch_domain_free()' without checking return value. Coverity issue: 414936 Fixes: 20eaa8e2ebae ("net/nfp: free switch domain ID on close") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 8490d179a9..bc1df0d369 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -1176,7 +1176,8 @@ nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev) nfp_cpp_area_free(pf_dev->ctrl_area); rte_free(app_fw_flower->pf_hw); nfp_flow_priv_uninit(pf_dev); - rte_eth_switch_domain_free(app_fw_flower->switch_domain_id); + if (rte_eth_switch_domain_free(app_fw_flower->switch_domain_id) != 0) + PMD_DRV_LOG(WARNING, "Failed to free switch domain for device"); rte_free(app_fw_flower); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-18 12:58:39.682008222 +0000 +++ 0010-net-nfp-fix-switch-domain-free-check.patch 2024-03-18 12:58:39.111344667 +0000 @@ -1 +1 @@ -From 5b1b9f9c11bedb672cdf01c834d6c341d50a0f1e Mon Sep 17 00:00:00 2001 +From 75b8660005baf365fdcf579ac04577082da4f6dc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5b1b9f9c11bedb672cdf01c834d6c341d50a0f1e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 97219ff379..303f6bd3f6 100644 +index 8490d179a9..bc1df0d369 100644 @@ -24 +25,2 @@ -@@ -793,7 +793,8 @@ nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev) +@@ -1176,7 +1176,8 @@ nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev) + nfp_cpp_area_free(pf_dev->ctrl_area); @@ -26 +27,0 @@ - nfp_mtr_priv_uninit(pf_dev);