From patchwork Tue Jul 6 13:32:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 95408 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 49B79A0C47; Tue, 6 Jul 2021 15:36:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A1FA4147D; Tue, 6 Jul 2021 15:33:59 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2086.outbound.protection.outlook.com [40.107.92.86]) by mails.dpdk.org (Postfix) with ESMTP id AF9334146F for ; Tue, 6 Jul 2021 15:33:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MF4dEaajjMibdg0NaAXiYeQ4LQ4K7LM9wzRWOsVkcauRWNUACM4bm4cOJY/8I/axSvorJsWw/n1K0ase2eeBRstry7DSwdoGZhXNY80Ftu7It/Xw045NVF98sn7py48R/txzL3iXq1xNlZdAA8Xk0SKLRYuEp3tWXsRLOAnEB/KWvE+bBDT3/VlhJmwPiI0IRWIHmvZt0WvguLqiaygvQ4KbgPEp0qbFp7G0CcmZpRw4uqCSTkG7gya63CayYce98kzdiBIDT0hzdbvJYrK9ob03dxRRnVfr4FHXOUk2VNePKyQ66bHss4ovO1qogIAE5gnCLtaqUBAgRwp09m9L5Q== 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=VSl3W4V7LJZUHsvx9UJodNUvk92eigIZU7WBz6vX7Y8=; b=RJp+XCGsPE1rKTqw6Z++gGesE6NThO3ufcYkEn5jVGA2UjyLhFcN76jlTAEAL0+oqoqN9m0dfy3zWZ3he2jMyndzriY/ZtmFOCDCiSY09hkQxeObmwgDkuZR/UByNt8OE4oqSDzFTpseMhRSnnNhCig1yu58eHFbvGS+MWlP/BPaHFpygj+PMiAWFbpukr+lmv7wxRXwajsIni5mIpBrLHiCU/ti8XpaAXXpyUFmwK3ENXFWTyHHRhd6Fja5MmAiliYtPX6kq00xGozUZfIufkHc+sCFvGR7/yWwFn47nH75jHg7XhBUgMIUl98SvYYwZQx30OraB2zaD8kHBY7Wng== 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=VSl3W4V7LJZUHsvx9UJodNUvk92eigIZU7WBz6vX7Y8=; b=hHpSxUyLwfKzXEwPkfpLP9skGfkHhzgO9pJydHWdQROJ5HIndrP0naCdIsITlSQi1uqFrfWQU6MxD0JCSo7LVt3rIcskyemwqAGj99tY1n88QRaR0O2YTdU83rASG9D/Osd8mlSREiA/YSUodh9xpLKxplXf39yYojFGvPH7r2HYf0LBQ3/EH/S79QNVwtkNxDyoHzu48H0s7q3OGmFRmFGcJDWr6uD3o1G374eH7XbVsssp0VuzS93duldraUmCQ2gh0nPy1RccDEoNX7E6Oofm9T0829KLWAb3jO3kpYj+txS//Wpr8KiGWzOk/732QVdVyfdp+OqiWHTu8t8Wow== Received: from BN9PR03CA0626.namprd03.prod.outlook.com (2603:10b6:408:106::31) by MWHPR12MB1645.namprd12.prod.outlook.com (2603:10b6:301:b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.27; Tue, 6 Jul 2021 13:33:56 +0000 Received: from BN8NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:408:106:cafe::69) by BN9PR03CA0626.outlook.office365.com (2603:10b6:408:106::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Tue, 6 Jul 2021 13:33:55 +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 BN8NAM11FT056.mail.protection.outlook.com (10.13.177.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Tue, 6 Jul 2021 13:33:55 +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.2; Tue, 6 Jul 2021 13:33:53 +0000 From: Suanming Mou To: , CC: , , Date: Tue, 6 Jul 2021 16:32:52 +0300 Message-ID: <20210706133257.3353-22-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210706133257.3353-1-suanmingm@nvidia.com> References: <20210527093403.1153127-1-suanmingm@nvidia.com> <20210706133257.3353-1-suanmingm@nvidia.com> MIME-Version: 1.0 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: 8e358042-79f3-4d68-be14-08d94082b3de X-MS-TrafficTypeDiagnostic: MWHPR12MB1645: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:628; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w7S3ho00VPRC2sFmX9/ZD99oQ25tBrJnPE+D1PPjEpLha7XAO3mdNHwieLKEPvh7a+1LBCeV8of8spvYLwfgDCEUIb9eN6rdLC9fH/JXuFWcmTgRi0gNDDNQ16gWY4f5zsfQYO2TCSKiW9DiOzzlZ58vWHGM/S4be5sf40Hb5YmyCdpgammrQhPeGanwxA7Jn6252eLZi1+dLd3wBf5rGzH75l+rkT8DPrzqqrZaeE0Ul93WtShokm+GUsXYKLeBsFeCPjiBAz4rQReQYK8V513nR5hLG51687ob2fOMfhNqE0hqOZXA8MLui8U52xIz1MKZaAhsWTJVBw6xZnfk0NnwCPT44jKZfX/6MWeU3rFZxfZVGQ+gqcYdIikStMJIU8xFmPzzBPy9FB60h1pfR6QPi9KXN5aXbvwiKYR+hHWalBgQy5a+S3DXlB9/tedxLe542f/VIY798fteBeCRjVFaNzV7xCtzBVg2CxYX4ktFU0rA0tAMIMgWjPIxzNXVSyENN8APG8QIaIgSm1T4NB2VOknxKC/d4P5+QYdf4GvgXfN8+RfshDSWVBEifjSB+qDoL4s2mlk/xZfOJhOHVkkRBrNdpcJHWKoUO4s+IKpEgE1ufAyhs6DlcTo79JliCWKYOfSjxXYHtR/eg5IrPoN7ghtWM/c5/QCknu8wByDS3iauiGIoshRaQdpLcW3g0K6kUp5RtMypJiYVZgkAxw== 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)(376002)(346002)(136003)(39860400002)(396003)(46966006)(36840700001)(16526019)(70206006)(86362001)(36756003)(2906002)(5660300002)(26005)(186003)(82740400003)(6636002)(36860700001)(2616005)(8676002)(356005)(83380400001)(7636003)(7696005)(110136005)(54906003)(478600001)(47076005)(82310400003)(4326008)(1076003)(316002)(70586007)(8936002)(426003)(6286002)(36906005)(55016002)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2021 13:33:55.5522 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e358042-79f3-4d68-be14-08d94082b3de 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: BN8NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1645 Subject: [dpdk-dev] [PATCH v4 21/26] net/mlx5: adjust the hash bucket size X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" With the new per core optimization to the list, the hash bucket size can be tuned to a more accurate number. This commit adjusts the hash bucket size. Signed-off-by: Suanming Mou Acked-by: Matan Azrad --- drivers/net/mlx5/linux/mlx5_os.c | 2 +- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5_defs.h | 6 +++--- drivers/net/mlx5/mlx5_flow.c | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 468d8173c4..cfb33251cf 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -50,7 +50,7 @@ #include "mlx5_nl.h" #include "mlx5_devx.h" -#define MLX5_TAGS_HLIST_ARRAY_SIZE 8192 +#define MLX5_TAGS_HLIST_ARRAY_SIZE (1 << 15) #ifndef HAVE_IBV_MLX5_MOD_MPW #define MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED (1 << 2) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 499d8449ac..08e795ea4c 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -373,7 +373,7 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = { #define MLX5_FLOW_MIN_ID_POOL_SIZE 512 #define MLX5_ID_GENERATION_ARRAY_FACTOR 16 -#define MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE 4096 +#define MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE 1024 /** * Decide whether representor ID is a HPF(host PF) port on BF2. diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 906aa43c5a..ca67ce8213 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -178,15 +178,15 @@ sizeof(struct rte_ipv4_hdr)) /* Size of the simple hash table for metadata register table. */ -#define MLX5_FLOW_MREG_HTABLE_SZ 4096 +#define MLX5_FLOW_MREG_HTABLE_SZ 64 #define MLX5_FLOW_MREG_HNAME "MARK_COPY_TABLE" #define MLX5_DEFAULT_COPY_ID UINT32_MAX /* Size of the simple hash table for header modify table. */ -#define MLX5_FLOW_HDR_MODIFY_HTABLE_SZ (1 << 16) +#define MLX5_FLOW_HDR_MODIFY_HTABLE_SZ (1 << 15) /* Size of the simple hash table for encap decap table. */ -#define MLX5_FLOW_ENCAP_DECAP_HTABLE_SZ (1 << 16) +#define MLX5_FLOW_ENCAP_DECAP_HTABLE_SZ (1 << 12) /* Hairpin TX/RX queue configuration parameters. */ #define MLX5_HAIRPIN_QUEUE_STRIDE 6 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 367fbc8e4a..b92ebe9029 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -8642,7 +8642,7 @@ mlx5_flow_tunnel_allocate(struct rte_eth_dev *dev, DRV_LOG(ERR, "Tunnel ID %d exceed max limit.", id); return NULL; } - tunnel->groups = mlx5_hlist_create("tunnel groups", 1024, false, true, + tunnel->groups = mlx5_hlist_create("tunnel groups", 64, false, true, priv->sh, mlx5_flow_tunnel_grp2tbl_create_cb, mlx5_flow_tunnel_grp2tbl_match_cb, @@ -8751,8 +8751,7 @@ int mlx5_alloc_tunnel_hub(struct mlx5_dev_ctx_shared *sh) return -ENOMEM; LIST_INIT(&thub->tunnels); rte_spinlock_init(&thub->sl); - thub->groups = mlx5_hlist_create("flow groups", - rte_align32pow2(MLX5_MAX_TABLES), + thub->groups = mlx5_hlist_create("flow groups", 64, false, true, sh, mlx5_flow_tunnel_grp2tbl_create_cb, mlx5_flow_tunnel_grp2tbl_match_cb,