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 70595A00C2 for ; Thu, 3 Nov 2022 10:30:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CC624114E; Thu, 3 Nov 2022 10:30:14 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 06B3240693 for ; Thu, 3 Nov 2022 10:30:13 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id n39-20020a05600c3ba700b003cf71011cddso3315823wms.1 for ; Thu, 03 Nov 2022 02:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=Gre1Oh2mntjIVrBgA2SkFc1IWHnJpF5g1TY0uOsxILg=; b=BlUp3FOkTYFuolX9kNmKNfYf1lqVMuvtpQHo3owr4/rHtaITf19vMJqdLHSkGpDdZF ZEyfEfIcLiZw/kJIFnc5cUmcVu1UjHmIUNQHgBtdI7sPWlhbRsLvGjl76Dh8cfVubl+3 EiSnAMmZHLGVpSYE6OeVmWQ0CyrT6LPb4Pvr4WjntB7j+RbIUzwBYXFj/ZVk12etxN/D RqYgb/0kioEmqlst3A2E69eZ3K9TfHicv73VDwW+tHoj6bzWUdD7cE3Q8JHM6dC0Lf1+ M37qBABLcR0cGaRn6eKHBOJZ6Y6GtFmCP2FXjav0hFZV01cPhn/DBAHKVQK91AXqhx+K aNYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Gre1Oh2mntjIVrBgA2SkFc1IWHnJpF5g1TY0uOsxILg=; b=UAYVejdNzqzHc8ohWcyTL3vSTW5qRjQ0FGzLt1PPu0SkyqcAF8KZbpCgs/lNgTSNSm ux5hoThfzHlEVy08Y4Etzx5j996Prv0Wrjz8qJHJbQuLQGnST+UCYVmL9L7CATEsYdC+ wj4pWfdYhe6ujdUKjX0beKxMxkYnG0zcd2aFCzKzb1m8SMVI1ry9WQTQ9WLKAQNELgDs kBdR2b1GFahS3SSOAcsC9NfmKc0OL/hDLZhDwAUmexbnOqj0AJn8O0pZ//p6/6vVL6g2 jKKSv4AR+XV6SHT/yIICXxW6jQdZCX6S3SYPVzQzW5kqcHZB5CpegdpxftKrQRjdB4p1 bQ2w== X-Gm-Message-State: ACrzQf06E/CZPPkgFb634urvexPGoNrdcG/+0yeUz5XN+X5eUJPOzW0T 8vjfOtIMoyk6/3/KW53896HdmbcUSsEQvALF X-Google-Smtp-Source: AMsMyM7Sl3eTGSOE2UVNWrnvnud7Sxps2+FzQuOFUMNzMZ1QOSozXKnGldc90tBXKk8MXfQ7JPun+Q== X-Received: by 2002:a05:600c:6889:b0:3cd:d83b:7993 with SMTP id fn9-20020a05600c688900b003cdd83b7993mr28046930wmb.143.1667467812667; Thu, 03 Nov 2022 02:30:12 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id m4-20020adfe0c4000000b0022dc6e76bbdsm344469wri.46.2022.11.03.02.30.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:30:12 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.7 Date: Thu, 3 Nov 2022 09:26:56 +0000 Message-Id: <20221103092758.1099402-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-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 20.11.7 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/05/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/ec69b0c7250c369ccefcaa2df400578b3828d5ea Thanks. Luca Boccassi --- >From ec69b0c7250c369ccefcaa2df400578b3828d5ea 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 c0de28ac58..16ddfc09c7 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -5549,7 +5549,7 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, status = _ice_set_vsi_promisc(hw, vsi_handle, promisc_mask, vlan_id, lport, sw); - if (status) + if (status && status != ICE_ERR_ALREADY_EXISTS) break; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:27.739987988 +0000 +++ 0038-net-ice-base-ignore-promiscuous-already-exist.patch 2022-11-03 09:27:25.409423137 +0000 @@ -1 +1 @@ -From 68834871b24d60c89029a43e20be1187673d0529 Mon Sep 17 00:00:00 2001 +From ec69b0c7250c369ccefcaa2df400578b3828d5ea 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 c0de28ac58..16ddfc09c7 100644 @@ -26 +27 @@ -@@ -6280,7 +6280,7 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, +@@ -5549,7 +5549,7 @@ _ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,