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 D6865A0A0E for ; Mon, 10 May 2021 18:07:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC62C40147; Mon, 10 May 2021 18:07:24 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2063.outbound.protection.outlook.com [40.107.93.63]) by mails.dpdk.org (Postfix) with ESMTP id 28BF44003E for ; Mon, 10 May 2021 18:07:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BYLwaUVc9wm3qj+QfawrfrdswG0ucFcQ74K7Z5MCFTTnKevaLJ+nd63YOi8kOhOEPhcpFvTJH6SERmN9+hCHMDRC63e2ccDSrsuU3R807Myz5OzP05eqSJOXua/azUNtju0+aX8tPjgBL4gRz2cGDY3FJ86dtXZASqkL5pKsPxvUoZHTXc761UlUQuhY7Kf4un3Cy3csOL8D+Q9D677+j1u7jZ0Wj1atLB3aIN/xnWleQOFmVNh+k/1Y9+V60Ahi3JVcRCFaIFcIqiwI8GiLnb1DH1sZTwWjjFq/PXhVlC4jkoXS8nTXZ8jpwR+vE1goK3Oe3PcBaELBtVwX8dtCfg== 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=A2ACW8KbBhWQidCvqZhY8EDVUWgqAdTBZBSgeSIDtBQ=; b=Le+1LZDXKpk70vb7czwILO/ppYlq4so4fu3tojfqPRuIMhs48hLrYqbF/cZ6yM28q4ZY0dY0W+PPexHphhOOE9iIiS5naURc+jQeZL9cwYur/DYp6OjiGRmnzhPnf15VRXgS3eUYswcz9DtyzOMLokk3qTR1Y6p1lnaBUVJ8OsRt4ghBUuCvAHgV85p8i2KFSslcp8XO1AaLM/oLVgrxky7sXsd7MC5VOuJKtimtbEOstYRQjC9H6fDAjgpLUwhYy1SsL0gWDY2ZrIcCbweW/5o6mhvQ6KpfkHHQKj8U61dcQEL/HJzSgqyjtWMuG/6t0jrGfztGJCPdliEdoGPpQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.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=A2ACW8KbBhWQidCvqZhY8EDVUWgqAdTBZBSgeSIDtBQ=; b=GLJ4ro2NRDncc+D2uO+N0HmhLY3H0iFhEM5BwrLbWTAmaBFkOkr8T2yHcGwJBzQnH/mIgYFkD2zBR6mNYZK8JotxFLrhP9qucRCbfpKBgRjJWMsNJ3USCcLUz1cZLENrUTaqp5Yx8jOW8dOOmNm4VNZ/mKGGV+Swuw0DYd7UMKNyAXzMaGZecBn/LiPBPSkBX3p63Al2jDaTv+wac9OtL1/j82snRefJqpSki/N5iUUz+HxaRpxKIcNLJ78gb14HIp90JerigusdVnOXT2fjgLseew1POcQQdkfTRCAmFGHiAdJD6a+PYc0CJxrligFfob3PVoMeJKs4DCYzqaoGNA== Received: from BN9PR03CA0297.namprd03.prod.outlook.com (2603:10b6:408:f5::32) by CH2PR12MB4086.namprd12.prod.outlook.com (2603:10b6:610:7c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:07:22 +0000 Received: from BN8NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f5:cafe::84) by BN9PR03CA0297.outlook.office365.com (2603:10b6:408:f5::32) 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:07:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.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 BN8NAM11FT013.mail.protection.outlook.com (10.13.176.182) 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:07:21 +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:07:19 +0000 From: Xueming Li To: Satheesh Paul CC: Luca Boccassi , Jerin Jacob , dpdk stable Date: Mon, 10 May 2021 23:59:51 +0800 Message-ID: <20210510160258.30982-42-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: 6d94511c-d7af-419a-4a4b-08d913cdb198 X-MS-TrafficTypeDiagnostic: CH2PR12MB4086: 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: VwtPIZ+XbcI5LKlImWbLK79jwJAQL/0z+A7E6rRq0UhkcnUM9t0LLchcoCsMXyFVahBdsJtXJll294VGjCz3s4XUUfGYxcbYKau0SKO1HMhwsbWk2KXB6HqizE+o1bZWuMNYQaZ1qccpkvlAR+M9EiF1slRGQdi1CFICYqUDwXKw7+N9eilj2nWluT+Q6+HGVj8WREee65AgYWRzccMrsShUdBYthZL6ZaASHag//Llilv9nW6cjRhvYVdyqIjlU6mbkgZU8VRYj2Poq1nM96+xVxnn6WiJ/yE1N9H27O6xU80PM9D9EyY83UICPJtK3tA3v5qKmhWBElc4+SDbvo4+ZdSUokAXyeiN4l8K4EhAISH4H8VYyS+OMcUC95ybKShVUZYxFOSMdyVH/Rk7rGW+I+bBxSCUTfUz4aoJUirHkNCPyIWh84eLlWxZO8r5drZ2pooyNW5H8de55nfJuBFXNhraMv9SrlG72J+2jIKfV/8D5P2PAGKYAFql7ko6/mZXKB3BwYNa+emkr/3c6jTZHJ/OSppTkUuZa7FzZ2MYm1UhCkKBD+4gsF4oOiNY0N0rTgyUSQHqmex5x725vGPwnjXf3ISBdpP1TQ3WbikjkWromQc+EQHvtAaE/W6O87R6B8LqlGo0cAz0H/zQuqyJdWeBfcbfMaDO7LYousq/IJ5PQFpqRdv/T0N5BsUTdmXMIDC3EDdeUCLs2TaorKSj4vuiwzS+jp6MlKQdPDumngJBqwbxp8DdZyQzuIApryCphvc3mrwha3N63KcQNrw== 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)(39860400002)(346002)(376002)(396003)(46966006)(36840700001)(83380400001)(6666004)(2906002)(4326008)(8936002)(8676002)(478600001)(316002)(426003)(2616005)(16526019)(36906005)(82310400003)(186003)(7636003)(336012)(70586007)(54906003)(70206006)(356005)(82740400003)(5660300002)(86362001)(53546011)(47076005)(36860700001)(26005)(1076003)(966005)(6286002)(36756003)(6916009)(7696005)(55016002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:07:21.6638 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d94511c-d7af-419a-4a4b-08d913cdb198 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: BN8NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4086 Subject: [dpdk-stable] patch 'net/octeontx2: fix VLAN filter' 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/b66b37a2b5305fa4a601c8a1829a51d19f368163 Thanks. Xueming Li --- >From b66b37a2b5305fa4a601c8a1829a51d19f368163 Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Tue, 9 Feb 2021 15:31:13 +0530 Subject: [PATCH] net/octeontx2: fix VLAN filter Cc: Luca Boccassi [ upstream commit c8238116ece889fe356c54930bca791091ab1938 ] This patch fixes incorrect MCAM key preparation when creating MCAM entry to allow VLAN IDs after vlan filtering is enabled on port. Fixes: ba1b3b081edf ("net/octeontx2: support VLAN offloads") Signed-off-by: Satheesh Paul Acked-by: Jerin Jacob --- drivers/net/octeontx2/otx2_vlan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c index 7357b06695..f5161e17a1 100644 --- a/drivers/net/octeontx2/otx2_vlan.c +++ b/drivers/net/octeontx2/otx2_vlan.c @@ -306,12 +306,12 @@ nix_vlan_mcam_config(struct rte_eth_dev *eth_dev, (0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ)) << mkex->lb_lt_offset; - mcam_data = ((uint32_t)vlan_id << 16); - mcam_mask = (BIT_ULL(16) - 1) << 16; + mcam_data = (uint16_t)vlan_id; + mcam_mask = (BIT_ULL(16) - 1); otx2_mbox_memcpy(key_data + mkex->lb_xtract.key_off, - &mcam_data, mkex->lb_xtract.len + 1); + &mcam_data, mkex->lb_xtract.len); otx2_mbox_memcpy(key_mask + mkex->lb_xtract.key_off, - &mcam_mask, mkex->lb_xtract.len + 1); + &mcam_mask, mkex->lb_xtract.len); } /* Adds LB STAG flag to MCAM KW */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.781918600 +0800 +++ 0043-net-octeontx2-fix-VLAN-filter.patch 2021-05-10 23:59:26.380000000 +0800 @@ -1 +1 @@ -From c8238116ece889fe356c54930bca791091ab1938 Mon Sep 17 00:00:00 2001 +From b66b37a2b5305fa4a601c8a1829a51d19f368163 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit c8238116ece889fe356c54930bca791091ab1938 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org