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 88B54A0547 for ; Mon, 21 Jun 2021 16:51:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A12DA40040; Mon, 21 Jun 2021 16:51:42 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2049.outbound.protection.outlook.com [40.107.95.49]) by mails.dpdk.org (Postfix) with ESMTP id 7286240040 for ; Mon, 21 Jun 2021 16:51:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kiTcjqEijb0RYFUM6faxDSwaH8c+uXB70NAwJD+Br7Y1Qw5OXgne4x1BhUfKlw6W65pcPkTu4rfoPJpAdwptLuWOuu3ADjQEN0WS2n6aBRdgTRyzdwBPVwXzAX6s07+hwDzXg8X1TtspIyHPIxVoYo0w/QXpMIEfjcNeL5TycSiuDrnIwps0tDt6ktEwmbvDEJ/ZHDcIGTeOyT8N3Fq/hUjp9RbN4dCZpZ1SsezoZhrLCGN1qCLmMC+y9ExezzDCH/43Soldmn9YkH3CYoqvB5xtubwzVfZUeFBmwhoY8qR50WJ5hEDes5zkGZRNmLqsWFa6SJ/PVn2s+Oc1tzj/Lw== 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=AanGyryA3aT6NZpejUU4ptbHBwytifSobnNzONBuCa0=; b=iV3LC+zqcGnCS9x0fTqYW9J5VbiEYeJnvgwxrhZLLa8GF/ffvbl2ZuoSshlN3F5PXa7/y1xcXYdBBO51ZsYspBlXRhKBruDWQP7IGbF/qiADwaJxH0y5LjdwYx6A/ADATpWNSW0R7Mlq436Czk4W1zyVd/glCGXMIb6FD+8Rht9Ibt8xM/rLmJhBs24O4dcBtkDLf+EmRd/5RYuI+UKZqIRp0+RJHOi0e1pO7oHTpPYfaeiV/yGUYxAjGJyuwU0u4sW/xovOVBVF+M4+9XH38712PaGfjMFKbSIDieR1SrZa2YT4fngyELVxNLDTQAAX/n4XuhOSwK6iG6+0WlTHpw== 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=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=AanGyryA3aT6NZpejUU4ptbHBwytifSobnNzONBuCa0=; b=WIkcSv1YdPfsw85tGbZ5TutgpF6UC4frPbSaZKMRK7GJlc+/L/teVEzHHgruFUt00Tv6zS6mL2L+/23YsQY1Z6R+9vpioBrLtDy97E5CYagVDHfP240TYfQuaD8PJcRPQLR+pBf0F3Y53gPt2zzNfB65SkeFvXOzaTPXNa0QEG7oGXJj8flXSGtqaZzkgBNtkXXT3Q+eK+tpaFB/2K9/Kt0loZY6VuKXwDB2EsfzqHIATCGbwvKOFPFn66VERt9p4U8gWyL3vRx3nvVqaJkJGEOiAeSs9L6rcjmhlNKQZDRaJRVtD8G5D2vOCghZekMItv4XIvGc13K8bxQvgWnY6A== Received: from MWHPR2201CA0060.namprd22.prod.outlook.com (2603:10b6:301:16::34) by CY4PR12MB1670.namprd12.prod.outlook.com (2603:10b6:910:4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Mon, 21 Jun 2021 14:51:38 +0000 Received: from CO1NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:301:16:cafe::34) by MWHPR2201CA0060.outlook.office365.com (2603:10b6:301:16::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18 via Frontend Transport; Mon, 21 Jun 2021 14:51:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 CO1NAM11FT061.mail.protection.outlook.com (10.13.175.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4242.16 via Frontend Transport; Mon, 21 Jun 2021 14:51:37 +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.2; Mon, 21 Jun 2021 14:51:35 +0000 From: Lior Margalit To: Christian Ehrhardt CC: Matan Azrad , Lior Margalit , Date: Mon, 21 Jun 2021 17:51:05 +0300 Message-ID: <20210621145105.963179-1-lmargalit@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] 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: 4b69d4b1-d2b9-47e2-1c29-08d934c41275 X-MS-TrafficTypeDiagnostic: CY4PR12MB1670: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4Yfh3HLpdKngdPvewIl169JlVBMy8XHlxmHkRtvPMSRs+ADMIcfQfV1Fl30QdcaVpGBw4S4jxY+AjX01FHfwIM6m3c9gnExwtpocrSRqYQGjTEZoELOkUKsOviw323SA9WyDMT4eFyxQVGb3wU9Snh1isRYnfrcV0LHelyaTuaA1zxNB69FB4mKEMm4kaQ4nR7ZDvelQ5WgsoWiRDLMKh6rm4PLCTuejjXR1n9vQH5kscdVhNIcuK7dplEuAfxaWAGnrTpkSoU411yBt11AzrxQoQ2UmNpn9kk2e5qdlfTbeFKnWdlvbIF05MwHHxG2noWhfk+n6OHyML1qChnoV4J+NAI6RbZaIsn9Q3xdNszL7D6dKk7ZttdUdn9fYaKevheUngAZDCszjb7oz7gfm1bkrrhvRLgR1//6hmUhJkEfECY73eVn8jMMJkx+lxf3MCfJYGyzf/2D5d5TYt/dMLy29XMFGINGhdLSgftw/hMK0+/NR+8PjJ40hY6oqF6Bl4dYd1BQQJGqdaFT0j5syg3UYfOsAzqtVI7lCNJqb9kSRbufnUtO+FrPFMHdi2nqSlHAPg3G+dDcB3ySugxTMf1BQ91HKcMU3R37BBbR2JuM1lQbUgB2bY+4HWknWIdV052HfiJuTRIY7eXl7wULublvbRTrY/Fn+Xqlb9S2Msnk= 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)(396003)(136003)(346002)(376002)(39860400002)(36840700001)(46966006)(6916009)(47076005)(36906005)(336012)(70586007)(426003)(82310400003)(36860700001)(36756003)(8676002)(54906003)(1076003)(4326008)(83380400001)(2616005)(316002)(478600001)(26005)(82740400003)(6666004)(7696005)(70206006)(86362001)(356005)(7636003)(16526019)(55016002)(6286002)(186003)(8936002)(5660300002)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2021 14:51:37.6485 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b69d4b1-d2b9-47e2-1c29-08d934c41275 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: CO1NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1670 Subject: [dpdk-stable] [PATCH v1] ethdev:: fix redundant flow after RSS expansion 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" [ upstream commit c1d397a67eed3b9d7adce5e73c5352de040b3b65 ] When RSS expand, if there is no expansion happened but completion happened because user only input next protocol field instead of item i.e, ether type == 0x8100 instead of VLAN, an extra flow is created with missing item in order to filter traffic strictly. However, after [1] and [2] the rte_flow_item_eth itself is enough to filter out VLAN traffic, the VLAN item is not needed. [1]: commit 09315fc83861 ("ethdev: add VLAN attributes to ethernet and VLAN items") [2]: commit 86b59a1af671 ("net/mlx5: support VLAN matching fields") This redundant flow will cause failure in some scenarios on group 0 due to they are the same FTE. Fixes: 4ed05fcd441b ("ethdev: add flow API to expand RSS flows") Cc: stable@dpdk.org Signed-off-by: Lior Margalit --- lib/librte_ethdev/rte_flow.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 9964a241c..cf0b46780 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -1204,23 +1204,5 @@ rte_flow_expand_rss(struct rte_flow_expand_rss *buf, size_t size, } node = *next_node ? &graph[*next_node] : NULL; }; - /* no expanded flows but we have missed item, create one rule for it */ - if (buf->entries == 1 && missed != 0) { - elt = 2; - lsize += elt * sizeof(*item) + user_pattern_size; - if (lsize <= size) { - buf->entry[buf->entries].priority = 1; - buf->entry[buf->entries].pattern = addr; - buf->entries++; - flow_items[0].type = missed_item.type; - flow_items[1].type = RTE_FLOW_ITEM_TYPE_END; - rte_memcpy(addr, buf->entry[0].pattern, - user_pattern_size); - addr = (void *)(((uintptr_t)addr) + user_pattern_size); - rte_memcpy(addr, flow_items, elt * sizeof(*item)); - addr = (void *)(((uintptr_t)addr) + - elt * sizeof(*item)); - } - } return lsize; } -- 2.25.1