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 C1286A0548 for ; Sun, 28 Nov 2021 16:02:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B890840FDF; Sun, 28 Nov 2021 16:02:10 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2077.outbound.protection.outlook.com [40.107.94.77]) by mails.dpdk.org (Postfix) with ESMTP id 8B6854068E for ; Sun, 28 Nov 2021 16:02:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MJ/UoWo6Ivlf0MlylwxvMf3y1D5MZMo+nw1VjET0LPOVGhNm4kEYb0EV8miaRbi0YO6s4w0r0scABKghAKsZ5w8Im1rfs+biGng6Q2ns40CqpK/opErPwFsTE0+EjayjbTlsY0q1M/CeV39xxwc8TbUxIitsNXE6bSSc0IlLJcI8AlIY/urnU0idpRpJVyjQjsW+4ChYXxXx1HTx37k5Q+C9gGrLH0ct/tZWppH5hf0lbRlAyZxUyxOUyeKpVvPNSz/UabRPYVSFeftQub+3MMptAYEJTQcNITVX7zVWP9HZM8s09sWgUbdTCmD/ca9dkLt07RMkGxyOvf6aviZADA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sV59a6ve6sURYHLmDUlOHIm+4QDTjOWaBtQinanUstc=; b=RHw21yn17F8RKH1EL8wMp+v7virrbJL87VlIIY46EBSv7zM1O6xOybYb9hr+fg0fpZPmYOI3ClZ6eXmNSpHpnBKHjwPvLyu7EiCDu5xFSTOIaqhJhDx7xoekcO+gNhx+VkK+t+Tuv5KR1uxi1m0UStBfqPKB+mWEegEWf/1nwLJ3KUrkrpBtOlUjgP+MnPPJlB/sCwiqdCSaQ2ixsp/fMHWHZfMObufx9bH1ytvGLzCtKMS80KkZSJ1xbPEMflbqNpVlZrLVdmGz3EfjhaDLNMHtrP+88n/bJ3PgvgZ5OjD5VnEf4YvIC9QwdLP1rwllXQUSXrQKY81w2KTd2n7NLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=sV59a6ve6sURYHLmDUlOHIm+4QDTjOWaBtQinanUstc=; b=qG2Agamg/5jth4uUA7mmYx6oWpsde9UKr8Uu1scV1BdWubEy2v1StE+CdDQmiOEJR1WUfL0M9tvvk1lR37NfzmFvmUm7VakQC5dvsf+nD+fRFwe34fym9RsH3OHxiMMHLajWGhhThWABmdDG3Y3c7aJXZNj92v/b3z/B5Pj8pD4kO1fG/smMC5JtsDhfSoaIye+1yLwNzGdVMBlbSkghpBNR56WzTfxysdiWIOx3hWWGJMIGUw0X/9NaN5MX87Pv73jPKIoYHd7ab4EuOlKpdvBwAWv34NfkNzf2P/KgjhMXimTRapp2+rz0+35NJwOnoK5w948EgRABiIFo8ovRqQ== Received: from BN1PR10CA0025.namprd10.prod.outlook.com (2603:10b6:408:e0::30) by DM4PR12MB5197.namprd12.prod.outlook.com (2603:10b6:5:394::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Sun, 28 Nov 2021 15:02:08 +0000 Received: from BN8NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e0:cafe::c5) by BN1PR10CA0025.outlook.office365.com (2603:10b6:408:e0::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Sun, 28 Nov 2021 15:02:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;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 BN8NAM11FT026.mail.protection.outlook.com (10.13.177.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:02:07 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 15:02:06 +0000 From: Xueming Li To: Xiaoyu Min CC: Luca Boccassi , Matan Azrad , "dpdk stable" Subject: patch 'net/mlx4: fix empty Ethernet spec with VLAN' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:54:10 +0800 Message-ID: <20211128145423.3974892-67-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b0782d1-fdc1-4196-2d65-08d9b2800c21 X-MS-TrafficTypeDiagnostic: DM4PR12MB5197: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bl3n8g2vSAr9Hxrwdx7xpSOHFRGe1cHcK4D7c831JJroK8QBq/ZStXy/Z92T1D4HZKobrtVlpC4ShA1e2tL9yOBdAU/vb9vjADFoniW3uWnPVMbVQOpVaKLEo7QQwGazu0Y9ka11bA+9M1H4Rv1sAueD0Lm0XSBYVVk9waKsgm32/uBX8MWbmRmjK+GFI3ZH1HHMOY1jEwBgOuLnX1U7EJIU9IB5A6s/WJZI0HRO4CNUcs7VHCaUaL0miKMuJjEChuqOA/FxTcVsgm/lkOrllCAif2g+EKao9nRU8zpmbJ2PjGiXYQBsSEUE8/GBX2WhcfYIiZH6BinXnB9vr+oH3p1mQy9borKIl3nWCwLO0WQuhAE9Ebf0WnbfWmOyX5Pu2RA9d/PRcmfWBGb7it/iWdocBiFJhK6cW45ta9Uzv88oqT4vt6wgIOeILzyiqiAnVkeWIUadGIZV4CV71BEx4VVxaxxB09DhUGyOBT4yXKX3o7MABWufR3fz66Kp0dAO4mAE64JygV+KUZRBPzGY5Tzxhx0+CsALkNN9HcMHqdLj+yd3Ogooq411KHDPI5c8myxxTs4Nhqw9FIAfQK2Pzlitg0+A3d/Xgcd7xuxF13INoXbWi/lH6wGHYUg2lof3ZP2w66IPIPxcwxoSDFG7G2lAUCX+xbGaQS63GX3/k3Up573w/L771k9rG3gTsb+QxiZhem433CRnNuEWuyTXuZLvWogDWaa2Lfb4DeHuf5MU8/a8MZa13CrRpcziEl2QXYxOjCn4VJ2QfiPotPKeONkGDoWbLi2iSvroo2bU36dBqbXcJTQxgNzX3tqUul6ozFreKQn5tMlMXJ9n9C76Uw== 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)(46966006)(36840700001)(7696005)(16526019)(966005)(86362001)(37006003)(186003)(508600001)(82310400004)(55016003)(6666004)(4326008)(54906003)(53546011)(316002)(6286002)(8676002)(36860700001)(1076003)(6636002)(2616005)(356005)(47076005)(2906002)(8936002)(336012)(36756003)(5660300002)(70586007)(426003)(7636003)(4001150100001)(83380400001)(26005)(6862004)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:02:07.7085 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b0782d1-fdc1-4196-2d65-08d9b2800c21 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: BN8NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5197 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.4 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/30/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/b1c95cef1d78246b4b0f815fe3fd149f9db92b67 Thanks. Xueming Li --- >From b1c95cef1d78246b4b0f815fe3fd149f9db92b67 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Mon, 22 Nov 2021 21:53:29 +0800 Subject: [PATCH] net/mlx4: fix empty Ethernet spec with VLAN Cc: Xueming Li [ upstream commit d564eea7ce7fe66f6b4210956b8907f663d30734 ] When the ETH spec is empty MLX4 PMD doesn't allow match other criteria, which means the flow should be promisc one. Currently, PMD validates this by setting flow->promisc bit when ETH spec is empty and checking whether there is other rte_flow_item followed when flow->promisc is on. However, commit [1] adds support to match traffic only on VLAN id, the above validation logic should be changed accordingly. This patch changes the above validate logic by skipping flow->promisc check if this item is VLAN. [1]: Fixes: c0d239263156 ("net/mlx4: support flow w/o ETH spec and with VLAN") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx4/mlx4_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c index 418e3c6bb0..cf231e5944 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -713,7 +713,8 @@ fill: flow->internal = 1; continue; } - if (flow->promisc || flow->allmulti) { + if ((item->type != RTE_FLOW_ITEM_TYPE_VLAN && flow->promisc) || + flow->allmulti) { msg = "mlx4 does not support additional matching" " criteria combined with indiscriminate" " matching on Ethernet headers"; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.606898220 +0800 +++ 0066-net-mlx4-fix-empty-Ethernet-spec-with-VLAN.patch 2021-11-28 22:41:03.413539290 +0800 @@ -1 +1 @@ -From d564eea7ce7fe66f6b4210956b8907f663d30734 Mon Sep 17 00:00:00 2001 +From b1c95cef1d78246b4b0f815fe3fd149f9db92b67 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d564eea7ce7fe66f6b4210956b8907f663d30734 ] @@ -21 +23,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index 2e1b6c87e9..9d7247cf81 100644 +index 418e3c6bb0..cf231e5944 100644