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 85FF2A054A for ; Tue, 25 Oct 2022 17:09:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8223942C3C; Tue, 25 Oct 2022 17:09:34 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0370042C41 for ; Tue, 25 Oct 2022 17:09:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wrkMm4H4Zw7VAAj6tq6Sp1lJVuw6Pl2ypwARqK6m1Go=; b=IeudzBN3K+wDcjZVOXyrFHENThMi7XzD/Px4I1v0fQK+E8PGPq4JeXAIPEsba1e3M1QjRM h+faJg2ZxdXX3Co1+iyVCLkibAA/ah3J/7+6D9LBoq72vP4d65rk3x4XKAYNZ1ucoY+o6v 38V/mrCVJhROx5SHLEFGLfbMN2h3LLY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-C2jO0aKbNxK9RC5hR3SJkg-1; Tue, 25 Oct 2022 11:09:23 -0400 X-MC-Unique: C2jO0aKbNxK9RC5hR3SJkg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 601341C0BC67; Tue, 25 Oct 2022 15:09:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E5964B400F; Tue, 25 Oct 2022 15:09:20 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Grzegorz Siwik , Qiming Yang , dpdk stable Subject: patch 'net/ice/base: ignore promiscuous already exist' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:54 +0100 Message-Id: <20221025150734.142189-59-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.3 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/01/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/65e2ff5b1e0a471b267fdf66f1ff28024df9ba1b Thanks. Kevin --- >From 65e2ff5b1e0a471b267fdf66f1ff28024df9ba1b Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Aug 2022 03:31:44 -0400 Subject: [PATCH] net/ice/base: ignore promiscuous already exist [ upstream commit 68834871b24d60c89029a43e20be1187673d0529 ] Ignore ERR_ALREADY_EXISTS error when setting promiscuous mode. This fix is needed because the driver could set promiscuous mode when it still has not cleared properly. Promiscuous mode could be set only once, so setting it second time will be rejected. Fixes: 60ff6f5ce2d8 ("net/ice/base: consolidate VF promiscuous mode") Signed-off-by: Grzegorz Siwik Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 5a001222bc..c94d15934b 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -6232,5 +6232,5 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, promisc_mask, vlan_id, lport, sw); - if (status) + if (status && status != ICE_ERR_ALREADY_EXISTS) break; } -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.880140839 +0100 +++ 0059-net-ice-base-ignore-promiscuous-already-exist.patch 2022-10-25 14:18:58.456798252 +0100 @@ -1 +1 @@ -From 68834871b24d60c89029a43e20be1187673d0529 Mon Sep 17 00:00:00 2001 +From 65e2ff5b1e0a471b267fdf66f1ff28024df9ba1b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 68834871b24d60c89029a43e20be1187673d0529 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 6863696d9d..91a959e10f 100644 +index 5a001222bc..c94d15934b 100644 @@ -26 +27 @@ -@@ -6281,5 +6281,5 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, +@@ -6232,5 +6232,5 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,