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 C986FA034F for ; Wed, 10 Nov 2021 07:33:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD84D40142; Wed, 10 Nov 2021 07:33:22 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2086.outbound.protection.outlook.com [40.107.93.86]) by mails.dpdk.org (Postfix) with ESMTP id 826AB40142 for ; Wed, 10 Nov 2021 07:33:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T/GrIF+KAUgpeq8LO0TtgWcs0WhhIIF38otFgidJE5RgJWJykvTQ6swbGKezX53hIPjgdOBx9sRlV0L78xo8Uui08URZ6OhkOVRHL3sV0zp9mnvN0b8eMmA9JAE6UfM9/QJBivdSrRBEsxGgeZj4RqIv/9X0m6HBHHDZSqR0EPxe4l1plbq3FVPKfOuCI3ccsFDNm+Vzfynyj8+Te7tGrfebCBm6m4zJNbREzw6Aj4aFUcWYd4KI4Rsy4jG3n2snXpAMoy+bRn8BV0nMlMG9WgYfYwFtKjVvwE6F5ku+wgIuD84P58i5Oj4CIeWUm1gZLkg1XcRgNPO3hs4oxMz8vg== 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=Bue3s8zib4ZOkKZnCZfTPCF/bSJrn6Edp7sBYev06Dc=; b=kjhJce7yx0xKmyl8C9In5MQosi6KfYXZULdjEHLoP0hKLOohvh4d3vn4GsO6+TzLO9se/yvcxOmeHjv1QyIl+K62apQbcO/M9MXszyjf61zt06oojI+Te/PjgsZPfQaqketfplZA86Tc1UxAsofDZyiLlRHV0dFyF+jZbl+amz7ME9BD8RPnK1naLSFyWbYTLjMMcDX1vorC/CQaNfWKPfL0s7JgpQ5JE8Kx8wRm6jOEOZnSU6CRP6zpkHyuSw3j9YegB0cLcdwCwnYM4ZYvJ6//H43ZNgesc18L0+iW/dEsiI39PWcIufss5Mzch6uvOVfPgsJNQsC9RvyAiY2A/g== 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=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=Bue3s8zib4ZOkKZnCZfTPCF/bSJrn6Edp7sBYev06Dc=; b=tlADdmZTH6kRj3YS5GxpoOj477zXUqSbjeyzlxutTqnRWhdC0qPAO+b85kW1SayrXxxE47KSGZHxuqfX+1FHI0YuM9v1sq4n0X+LiLRvkFFCjDrOzL8BiW/AS8tExQAEirPtrxcOYORD09ErTEYbzBuOqXpkvIf+wetmv3bwUyo9nd/YJemLzuSx8/zsSqfCAeAZ6GZr5aCIqR4VRJwhI+3R3IubXM3u4Snt76foQ3X9ByE6h8bXgmmmeT0JuiJhJiUXQ/Pz5Aw6x1T/PWKwo3956wuytTatvOGmEYUYnz+Hy4yUea8KXK59BsSO1rC2K9U8SljMbIAtSum0hBBzhg== Received: from DM6PR13CA0057.namprd13.prod.outlook.com (2603:10b6:5:134::34) by CY4PR12MB1415.namprd12.prod.outlook.com (2603:10b6:903:43::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16; Wed, 10 Nov 2021 06:33:18 +0000 Received: from DM6NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::d7) by DM6PR13CA0057.outlook.office365.com (2603:10b6:5:134::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.7 via Frontend Transport; Wed, 10 Nov 2021 06:33:18 +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 DM6NAM11FT053.mail.protection.outlook.com (10.13.173.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:33:18 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:33:14 +0000 From: Xueming Li To: Simei Su CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Wed, 10 Nov 2021 14:28:10 +0800 Message-ID: <20211110063216.2744012-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] 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: ee9af190-27a5-4c38-36ff-08d9a413fbc6 X-MS-TrafficTypeDiagnostic: CY4PR12MB1415: 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: /7Yjh9ZuhgFLNz9bH1vVIXjmuNEkwmF5HhyGNR6mP1D2TbRrnhOs/bhWwMeUpbbxDSgYTpfK75MgCw/yhPmUE0MqIe20iJx3ATydZpqZ3AAXYtyyXcnhkavRaA4Qo7XAOdenId3HryeTizlOlBKvXyI2ZXkrXblnelDd06ROl0F5UVLj3k1XigIPmS8jnUGQZ3qU2uuleVQzzp6+6mWMqmiMTizk9wliju3UQSpQ80iU5lLm1SjeGUQKAJObBKZrA3zUHZ8TlkDWIZOuipsIi70KCzXx21Twpi8FdhTzRyEMeCitOXbYIhOe143PRCe17RvFmMpqqdC0uBFZY8pXj39W0eDT4POghlB54G0U40YJc5qw7a+5YaoovSOjYS9JW4dYonVRyIPxK4x9/NuQ/m8WCEvYfRHlKC8bGttldnGpAXCALyQNf6POxkaFeu+pb0qokInLW83ucitLg26RS5ad+I+tYQifcUqny0AMJFNThJynrslWV39vM7Z2vRsWwrgyPwGc5lJWW7PisO0k3sqs/+GGUwoEMePKvRLRueinnKRBqseSbsFCts7ML0Ij5Fd+gqBcTF+J6EVv+uZ2CQVSpRlgMFGFfhQMGVq14orO6MJmf5ODdcKlfnh0NdLLfekrMYduOnbvQpCZKiGu80AHtMnfUGHGWJ5buwsjDmikBa1cMKixUKhBec42lxYLI9vbo0kQQM+0vp6YV76b/X13sgBoSQiT5iEd/UCpVqP7ndGIdmlKIYQpxVYOYaGsXk0gL+LrGEs3UEDPSo6YFzmf9ljMOKpzDJ5nXT/SRNcONOc0t5CumR3Szyf4thw1lmvwDW+XHbbw7lDK7div3Q== 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)(36840700001)(46966006)(70586007)(36756003)(36860700001)(70206006)(966005)(86362001)(508600001)(83380400001)(6666004)(6286002)(55016002)(7636003)(82310400003)(1076003)(356005)(6916009)(53546011)(7696005)(4001150100001)(186003)(16526019)(26005)(54906003)(47076005)(316002)(2616005)(8936002)(8676002)(5660300002)(4326008)(2906002)(336012)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:33:18.4001 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee9af190-27a5-4c38-36ff-08d9a413fbc6 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: DM6NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1415 Subject: [dpdk-stable] patch 'net/ice: fix max entry number for ACL normal priority' has been queued to stable release 20.11.4 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.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/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/e2eae48793251ed86eda5176e7b4c9d3c4ad2b5b Thanks. Xueming Li --- >From e2eae48793251ed86eda5176e7b4c9d3c4ad2b5b Mon Sep 17 00:00:00 2001 From: Simei Su Date: Wed, 28 Jul 2021 10:24:29 +0800 Subject: [PATCH] net/ice: fix max entry number for ACL normal priority Cc: Xueming Li [ upstream commit 4f72c21fdffa9074f0df9d5855522735ec61f4d7 ] For ACL, there are three entry priorities: LOW, NORMAL, HIGH. Low priority starts from the highest index, 25% of total entries; Normal priority starts from the highest index, 50% of total entries; High priority starts from the lowest index, 25% of total entries. Each TCAM block has 512 entries of 40 bits. Currently, there is a scenario in which multiple TCAM blocks are cascaded. It means the total entries are 512. The default priority is NORMAL, so the max entry is 256, not 512. This patch changes the max entry number for NORMAL priority. Fixes: 40d466fa9f76 ("net/ice: support ACL filter in DCF") Signed-off-by: Simei Su Acked-by: Qi Zhang --- drivers/net/ice/ice_acl_filter.c | 4 ++-- drivers/net/ice/ice_ethdev.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/ice_acl_filter.c b/drivers/net/ice/ice_acl_filter.c index f7dbe53574..95b235e470 100644 --- a/drivers/net/ice/ice_acl_filter.c +++ b/drivers/net/ice/ice_acl_filter.c @@ -430,7 +430,7 @@ ice_acl_hw_set_conf(struct ice_pf *pf, struct ice_fdir_fltr *input, /* For IPV4_OTHER type, should add entry for all types. * For IPV4_UDP/TCP/SCTP type, only add entry for each. */ - if (slot_id < MAX_ACL_ENTRIES) { + if (slot_id < MAX_ACL_NORMAL_ENTRIES) { entry_id = ((uint64_t)flow_type << 32) | slot_id; ret = ice_flow_add_entry(hw, blk, flow_type, entry_id, pf->main_vsi->idx, @@ -444,7 +444,7 @@ ice_acl_hw_set_conf(struct ice_pf *pf, struct ice_fdir_fltr *input, pf->acl.hw_entry_id[slot_id] = hw_entry; } else { PMD_DRV_LOG(ERR, "Exceed the maximum entry number(%d)" - " HW supported!", MAX_ACL_ENTRIES); + " HW supported!", MAX_ACL_NORMAL_ENTRIES); return -1; } diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index c1b432c1ef..cba2e46eff 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -50,7 +50,7 @@ #define ICE_PKG_FILE_SEARCH_PATH_UPDATES "/lib/firmware/updates/intel/ice/ddp/" #define ICE_MAX_PKG_FILENAME_SIZE 256 -#define MAX_ACL_ENTRIES 512 +#define MAX_ACL_NORMAL_ENTRIES 256 /** * vlan_id is a 12 bit number. @@ -400,7 +400,7 @@ struct ice_acl_conf { struct ice_acl_info { struct ice_acl_conf conf; struct rte_bitmap *slots; - uint64_t hw_entry_id[MAX_ACL_ENTRIES]; + uint64_t hw_entry_id[MAX_ACL_NORMAL_ENTRIES]; }; struct ice_pf { -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:02.402145540 +0800 +++ 0006-net-ice-fix-max-entry-number-for-ACL-normal-priority.patch 2021-11-10 14:17:01.740747155 +0800 @@ -1 +1 @@ -From 4f72c21fdffa9074f0df9d5855522735ec61f4d7 Mon Sep 17 00:00:00 2001 +From e2eae48793251ed86eda5176e7b4c9d3c4ad2b5b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4f72c21fdffa9074f0df9d5855522735ec61f4d7 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 33756099c6..0c15a7036c 100644 +index f7dbe53574..95b235e470 100644 @@ -50 +52 @@ -index edafdf168b..b4bf651c1c 100644 +index c1b432c1ef..cba2e46eff 100644 @@ -62 +64 @@ -@@ -408,7 +408,7 @@ struct ice_acl_conf { +@@ -400,7 +400,7 @@ struct ice_acl_conf {