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 6F52FA0A0E for ; Mon, 10 May 2021 18:25:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 66FD44003E; Mon, 10 May 2021 18:25:47 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2043.outbound.protection.outlook.com [40.107.237.43]) by mails.dpdk.org (Postfix) with ESMTP id AC9C64003E for ; Mon, 10 May 2021 18:25:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JDaleFyquKNoT1+DctMI4tXL1Kp+dk8//2NpyxgjcoUkMtdnfyM1LXjefNYVCHwmTijQEYhTC1HmfRERLmqbY00M4JQo0/QkhaZ0m+aZjmwbH+pGOMEHHkCdXwJNnJRCMimlHpAtpvQZg8qhLiYKNX/Yw0eM/7mfbk9raNcnGBXQqCcJze9QXGGBFTM//1c1GKQ43LUCeCT5KJoJJAdMohRjIwjmYMv3mkJX6zChliM93kNT8hsof3u+iCxXIlZxfYrwbE9/EZVZOQ3aqL1uQ0mZaNQAcKfR0s2/XG1A2vsmi9so9hKKKtFRKTRh7Icha3i3u87qBuTe/BZFjI+KqA== 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-SenderADCheck; bh=4tY2SY4O2anPlwyoRGUfxP+lBb66M1BXfS1+vkPudbM=; b=h6Z3+z5hin9MvtRsre7KcGwraxyD941FfW1JMlJ6NaoIw3Bl7VwNONHusLykV/z3YhrfKK8KOqJms9nMPp7r6Dgj/wRh6lRQ4Eqxu/U7/sJVYtXaeqMpRxKH0axGhrkfov7has4ICO5xLxGTN9rtQLkloAsJDKXVL9gE2GejZuGTpFi8iFJwNSYq2MOR2ahSgPFmOXxksFAQ9upw2iTVD1mqINIwLR1hXGBg4o5Ha6J+D7Ol7umzEoGeO+l7da7itM2MD3S1mtuGDQImZbesYnc6+HLPBsLChK6FtKJlvWoZlUby0T9YlZeG7mCFFcJVpE37lD+u+xYH/isdMzVO5w== 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=none sp=none 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=4tY2SY4O2anPlwyoRGUfxP+lBb66M1BXfS1+vkPudbM=; b=JSqQd4/TejhDPMD2lit4v5wKDfbFhcNs36WkfMgpZuM2qiUKd84rkPj4VpxEqGs6E2xB9auJOnmJ9OhgkaUAisdPUHfzTsQlRT665qK3zjAJFCgZdpOu87ek9jlWT8F6a19F4fdAUXzbHcPE42dkBwhiUWLd2k9TjvF/tipkxP2+He13fkFeVImwEeYTX/kuuELwThRlbpN1nH8DrdCgzs7LATmZBU6y7yHvG9yd/mh1MVKig6f/R1pXpKUgYD0GscOhe0y15SYt3hWJXER2Rh0OyucQOuqPX2IrSnuI74wn1ddwop0hDf+NBs/p84yYuB5yVf6gsltaWTaK00hpqQ== Received: from BN6PR17CA0001.namprd17.prod.outlook.com (2603:10b6:404:65::11) by DM6PR12MB3962.namprd12.prod.outlook.com (2603:10b6:5:1ce::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24; Mon, 10 May 2021 16:25:45 +0000 Received: from BN8NAM11FT029.eop-nam11.prod.protection.outlook.com (2603:10b6:404:65:cafe::18) by BN6PR17CA0001.outlook.office365.com (2603:10b6:404:65::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:25:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; 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 BN8NAM11FT029.mail.protection.outlook.com (10.13.177.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:25:45 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:25:42 +0000 From: Xueming Li To: Siwar Zitouni CC: Luca Boccassi , Thibaut Collet , Qi Zhang , dpdk stable Date: Tue, 11 May 2021 00:02:55 +0800 Message-ID: <20210510160258.30982-226-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e58c9e9-3a2e-4e5a-bb12-08d913d04364 X-MS-TrafficTypeDiagnostic: DM6PR12MB3962: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3+yz7YcGErbGsAt8mcnR3V4l0Dx9ZBVfyNtmGf2wSKpF+rtYNKkPVmYqWfgBfUenn5AHa18bjUpQOz/o+V02qnHaVgYOcYxxoi7rMkFblewa9NwRelltmzQEUs+Wsy3NmjxVPadT/1V0q/fY73x3Fc3jKPGuEgWd6Onh7BMjA4VBlOAMzprb3x+oQmuxrfwnz3hrf2QxHp5EG3ArqUahiKIBE8Gku7vKYilNRXJAT1abXaXcQsjn0JfD9039uoE1/GoMuqfBKVwSzaNKoZIHzeaHM9/gY0T9YRjBhUO2Dhpui5PvqsJdQCCvpWqIYSTKOV4BfrlqV/fNRdtA8AwII2PgXDY6zpTdJrkGIWbI2/+hGnr+aXPtdoRY15TWFEKSIp5zek9glILyQdQUPX9VnfQ29RPUAUWSOyRIzWqf089qwIURbhQAGmBU60j6Jt7/83MBwhmsmV2rRzt8qrcDSEgOC/ikBBJ7dhtRSaxeiRFisaYnW5ev/X+7eOwyRSHS9iIGBsSLGrTHIPXeKpzt7d4vAmMSbyU1UByF+Z6I8FGoGQIa0/wQ9pvNClp5/NqrCWeEkkJw5wxrVbMkhs0wbKh6oqYStYwjQr46LcDRZRhPRtvBuxU65h1tNY5jyNW4GJho1aJjfDUjpO7hzE+HrzhbR68gPO2wPJKOrYfrjGuC3SAxZUUk8yjwRuZv465uocaqI1HNk/laTaaC0js+2VuuxN6h/pQPu+8FIC3usVk= 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)(346002)(39860400002)(396003)(376002)(136003)(46966006)(36840700001)(70206006)(70586007)(316002)(82310400003)(26005)(6916009)(36756003)(8676002)(8936002)(83380400001)(2906002)(54906003)(36860700001)(186003)(36906005)(47076005)(16526019)(86362001)(55016002)(53546011)(2616005)(5660300002)(336012)(6286002)(478600001)(6666004)(1076003)(356005)(426003)(4326008)(7636003)(7696005)(966005)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:25:45.2697 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e58c9e9-3a2e-4e5a-bb12-08d913d04364 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: BN8NAM11FT029.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3962 Subject: [dpdk-stable] patch 'net/ice: fix disabling promiscuous mode' has been queued to stable release 20.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/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/abb66bf463983bf8434f2af99db8da62d905ce00 Thanks. Xueming Li --- >From abb66bf463983bf8434f2af99db8da62d905ce00 Mon Sep 17 00:00:00 2001 From: Siwar Zitouni Date: Mon, 19 Apr 2021 14:53:48 +0200 Subject: [PATCH] net/ice: fix disabling promiscuous mode Cc: Luca Boccassi [ upstream commit fa1d598844a73765cf26676ce3d219589ba57114 ] When promiscuous mode is disabled, allmulticast is also disabled, even if it was previously enabled. Add a test in ice_promisc_disable() to check if allmulticast should be kept enabled. Fixes: c945e4bf9063 ("net/ice: support promiscuous mode") Signed-off-by: Thibaut Collet Signed-off-by: Siwar Zitouni Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 7c20936123..f30199fc23 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -4459,8 +4459,11 @@ ice_promisc_disable(struct rte_eth_dev *dev) uint8_t pmask; int ret = 0; - pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX | - ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX; + if (dev->data->all_multicast == 1) + pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX; + else + pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX | + ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX; status = ice_clear_vsi_promisc(hw, vsi->idx, pmask, 0); if (status != ICE_SUCCESS) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:32.410654200 +0800 +++ 0227-net-ice-fix-disabling-promiscuous-mode.patch 2021-05-10 23:59:26.710000000 +0800 @@ -1 +1 @@ -From fa1d598844a73765cf26676ce3d219589ba57114 Mon Sep 17 00:00:00 2001 +From abb66bf463983bf8434f2af99db8da62d905ce00 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit fa1d598844a73765cf26676ce3d219589ba57114 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 84d1735255..da9e85bd7c 100644 +index 7c20936123..f30199fc23 100644 @@ -26 +28 @@ -@@ -4526,8 +4526,11 @@ ice_promisc_disable(struct rte_eth_dev *dev) +@@ -4459,8 +4459,11 @@ ice_promisc_disable(struct rte_eth_dev *dev)