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 76CE9A0A0E for ; Mon, 10 May 2021 18:06:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 704924003E; Mon, 10 May 2021 18:06:32 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2088.outbound.protection.outlook.com [40.107.237.88]) by mails.dpdk.org (Postfix) with ESMTP id 7D0A14003E for ; Mon, 10 May 2021 18:06:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LOFbAECITuZ8r/8FkUneCOKV1ZVvBsAKFsNrtP4vQUVc/dDn+rm3OXX77WK49xPlCC9qVO+jLrO84xuPgrymvvSYTaVWdPF98KNJVjgSJaoAIHqU1nmc1RvGAE7ExCSHwtzJfv55SnaFIwEM49Ov7FmzkYGLDgmRAsEz23NHWdZqcoYVX4+SleQVQuqUs5AkVepEGjjj7b/0sc9Yf3j/mibV9LzbltyuR7NODF3X5gOrRQ/o/uTk5Vc/bDhYEPoisw1hJYRIKy5Y3jzknhaIa0oY/xi8eIgobF+R8XqtJdh8KjiVgu5VlxQrnE+A7x1erRH8rjqpfN9ZW2MiS4CRPQ== 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=TmmL4+OlG2RRWBYedRraUvEnU80uOJ1C1mzE5KIDBnY=; b=FdsYvV/dUPYkEISD3aWBvExtUDnCHicUqCpmab0serNmBY9pGleJwByjuHw1M10U4D+Lww6zDt9gkiC13Xw0m284zVRVxie2JjSZE9N60lRdcE//0rYuHROc1BSIP0y5Dgd6xODGXhbuZmFfNXOtXHiC2tO/6XhgM02G/XFQUYjnsG9eh+ay345KMmgCabRdLDJWCA38qpdHi8cxT1lBKcEYOfvthC9eRQ6AmH4euXpHoUwGykn8t55WLM4/LqrfbMA72TgN8oZJghBaQKkNZA/yHN6MxFzcA39s31Ca4cq4kTQUY2VXZRHivi1tjuVbth1z81ED+2GdEjk1YKRqtA== 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=TmmL4+OlG2RRWBYedRraUvEnU80uOJ1C1mzE5KIDBnY=; b=RQJcA1pCc8FalJSysSh3rzPTmwlnPF62KJP6rDa/pt/koD/6alGThgrH+yh/zdYJ8CzRCPM9yCGYmhGZXH8jdh8vALgwWXjr5dz68kkUFBOnLiuw+WgDPZct1GPLMGv9w+hXAKkJNDiozaGADNgohyvMImnBz+basCreLyGqlfprEm8a3NUUpAo/RZ4bDvkUnVretAWSVj6s5z4Sp1Ls4quXiuA8nYgZBlKGJC/6IVokBZlxSkb+Kqgw+/1jOm69d+aWTrP3cQ1kbz5HwsR6eRVzIh/Qa0ik0v9JhlffVt0gbidPBuIqI2lgSqLVOLtvyr/dddEaSiXu1DDqIleUtA== Received: from BN9PR03CA0873.namprd03.prod.outlook.com (2603:10b6:408:13c::8) by BN6PR12MB1409.namprd12.prod.outlook.com (2603:10b6:404:1e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:06:29 +0000 Received: from BN8NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13c:cafe::f0) by BN9PR03CA0873.outlook.office365.com (2603:10b6:408:13c::8) 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:06:29 +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 BN8NAM11FT022.mail.protection.outlook.com (10.13.176.112) 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:06:29 +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:06:23 +0000 From: Xueming Li To: Alvin Zhang CC: Luca Boccassi , Zhimin Huang , Qi Zhang , dpdk stable Date: Mon, 10 May 2021 23:59:42 +0800 Message-ID: <20210510160258.30982-33-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: 06bc8af2-9f02-4d0d-dae4-08d913cd923f X-MS-TrafficTypeDiagnostic: BN6PR12MB1409: 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: gYzbjIYXl9LTRUR2IpwL2xIeZf8IUgU0JlNl4gFPtF+RLDRpZAXzr3PpzcsNBzLYnQvTyf6S2xOSXyRdn9DhlB3ttn7wr4hGhWSPT4p2v5DEw7HGXwH1ePFzh+vZYq1tD2fpaZg/cpYcggJFPkzaY/1GfO2hFRjw/uZrCM0deo/WyEIy9Gsn3T57t/by/8KH+m8gjk3een2od/bfU964oBaDIQg6140xzMrIs7DVWdyrIynWKRJLYJxS7GRPjB1GQrIWpsrgfPI7Wa1+UyHiG5DZCD5WS+7T53YqmkiuRqy9UlSdFDCrFdt6hoAW+GTzWWJ3er5Gn1Wdsxx9JuZ7m6TLiswa5GDsaexPq2My9G2RRP637q2r5sjndF43Qr7wzfe5482Cqjzm/QpXVf3ky6WZHHaUCqhuVJqVchMHH5wNSQvF96ABnq2HTW/X5UHFjIhrNGoduNYRQD6W0BF7w5UNicmxDXczPx9iPOz4WQOllZzYO5noPrPYoSDHgr2xOivHLAuKourz/jPgmxEScESr0iSOEew4h8UdXYueQTQLW70vWIInWkhg9apSgwJa/PFkNj19bTZWaQeBa7RrhlL00BYgNSU16DcBpim16ri8SJV273KwzrHb/kqwvh5H8q3ObjNRKjRTxgt+MVqLPiyEZY8l3bhXL9GyxozzeU+DXs6/418trGoJQWBvOpsZHEIZJE0sOOQmnMJYtX95mSRkmSPynS4Qb6WpsqPbngaomsMuAeAY4udc/aTUbqcKLzqCaddTCoBvLKD3wYsHew== 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)(136003)(376002)(39860400002)(346002)(396003)(36840700001)(46966006)(82310400003)(47076005)(7636003)(54906003)(8936002)(2616005)(6916009)(82740400003)(2906002)(83380400001)(426003)(8676002)(1076003)(356005)(966005)(36756003)(478600001)(5660300002)(4326008)(6666004)(55016002)(336012)(70206006)(70586007)(53546011)(26005)(7696005)(19627235002)(36860700001)(316002)(186003)(36906005)(16526019)(6286002)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:06:29.0068 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06bc8af2-9f02-4d0d-dae4-08d913cd923f 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: BN8NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1409 Subject: [dpdk-stable] patch 'net/ice: fix VLAN filter with PF' 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/f27ac1c00932691e806d55dc66be578bd57cf7fc Thanks. Xueming Li --- >From f27ac1c00932691e806d55dc66be578bd57cf7fc Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Fri, 19 Feb 2021 13:13:46 +0800 Subject: [PATCH] net/ice: fix VLAN filter with PF Cc: Luca Boccassi [ upstream commit da996000e8ea513ee47e3e01f0f4e709e66cec07 ] The macro flag DEV_RX_OFFLOAD_VLAN_FILTER is used to enable/disable Rx VLAN filter, but not Tx VLAN filter. Therefore, Tx VLAN filter should not be enabled/disabled in function ice_vsi_config_vlan_filter called after checking DEV_RX_OFFLOAD_VLAN_FILTER flag. In addition, the kernel driver doesn't enable/disable the TX VLAN filter in the similar function ice_cfg_vlan_pruning. This patch removes the setting about the TX VLAN filter in function ice_vsi_config_vlan_filter. Fixes: e0dcf94a0d7f ("net/ice: support VLAN ops") Signed-off-by: Alvin Zhang Tested-by: Zhimin Huang Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 70e5f74b2f..d789650652 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -4039,20 +4039,16 @@ ice_vsi_config_vlan_filter(struct ice_vsi *vsi, bool on) { struct ice_hw *hw = ICE_VSI_TO_HW(vsi); struct ice_vsi_ctx ctxt; - uint8_t sec_flags, sw_flags2; + uint8_t sw_flags2; int ret = 0; - sec_flags = ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA << - ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S; sw_flags2 = ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA; - if (on) { - vsi->info.sec_flags |= sec_flags; + if (on) vsi->info.sw_flags2 |= sw_flags2; - } else { - vsi->info.sec_flags &= ~sec_flags; + else vsi->info.sw_flags2 &= ~sw_flags2; - } + vsi->info.sw_id = hw->port_info->sw_id; (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info)); ctxt.info.valid_sections = -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.551984200 +0800 +++ 0034-net-ice-fix-VLAN-filter-with-PF.patch 2021-05-10 23:59:26.360000000 +0800 @@ -1 +1 @@ -From da996000e8ea513ee47e3e01f0f4e709e66cec07 Mon Sep 17 00:00:00 2001 +From f27ac1c00932691e806d55dc66be578bd57cf7fc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit da996000e8ea513ee47e3e01f0f4e709e66cec07 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index dfd99ace94..8999d441ac 100644 +index 70e5f74b2f..d789650652 100644 @@ -31 +33 @@ -@@ -4011,20 +4011,16 @@ ice_vsi_config_vlan_filter(struct ice_vsi *vsi, bool on) +@@ -4039,20 +4039,16 @@ ice_vsi_config_vlan_filter(struct ice_vsi *vsi, bool on)