From patchwork Wed Jul 21 08:34:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 96137 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 5281BA0C50; Wed, 21 Jul 2021 10:35:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D46DC40689; Wed, 21 Jul 2021 10:35:13 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2062.outbound.protection.outlook.com [40.107.212.62]) by mails.dpdk.org (Postfix) with ESMTP id 74F904014E for ; Wed, 21 Jul 2021 10:35:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K6J7mjTLKr6N3akyYFmsUx1f+9t6ptV9gxNYv/4wPQQdQ/kShiyJOZPdrcIRkq7w0vuXifdUnbDW/Tnm/tMiWh9YvsSzDNdwKBQ3I4p5jz5z8rtMEjwTt/RfcPoU2SrFkc/J+iy/q/AqJagtBYjJU6+FChjYATLwdqkKj/j6K4Le4R6BIB2qp9peYYk+U6EJSsbBkAyacDHZ7sK5yclbC6WEO1GmTvjgezM0oM1PQhHlEtsmbBhHP5KBZsYClra9tD+TZ0+YGywEmaIs0nvWAymKiIkbld9fnzLxQHoNrbC9NoKJPjAjfj6RoFUA9aLKxoA6/c/klbWzmjhyrMCKOA== 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=3r+yopiIvZW7fz1QRxSIda3vxW89Sd6La7UuPoINRlQ=; b=gwlkgu4FmRpdQs1JsWPepofz0pqOFrySNfF0d3hefMZx3LUygK4fEB1UYO4IgA8BLJe5ZG80Tf7lckQeh7ZYT8RO31jkc1XadvE188akWKYPuuYLj+v4SyKksu6xr40ETKCEEyhEkAdcgwNVTfNroJOlIIk5Q9Z5hL+OAPZOGXfDnnh5lqO2Qb1E3HbyYev238wlKpm89KOxLrMDutd6rSj/TckkrlQZ7MW5aIMV3BzshWbkzHNzykUYM3WHsk3DYo/FOGE2OBL2Y6jHQGmMrXApC9ka4iNaecg66Y4nxPbvK3wkWkvmb7Wnjfo/H+3pHFfp0SZb91//zFhkrSj0qA== 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=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=3r+yopiIvZW7fz1QRxSIda3vxW89Sd6La7UuPoINRlQ=; b=iTd6F0Mgp25D6PZe8ORolAYmzJg9mad4M+FjS+IkHfLx511z/c0OVO6bIWxC6P2Mg8JDzEOwktBbZZcl92uKRB8mCgZvnqyoaxEh85JlPr9p+ERke5kGilz5tLZ15emdmYHOR2/T73Cce0xhMmU1/i1M5qga8lk0WNvvOC9Ruy4Merw4nF9CVEF/0RHH0o4FHESWGKzpJtROjqUJebfaz/FT0tmUsMwlMJwYRj3rYZhYHPCNVrmkklAMlhw/9WsHD6fexkkYTYfgIBUO7ZXVXQxq8WbMxVCKnT+UtqjFV2ZXuQ9DkgoNZ108J4RwxrKPpgNtaqCT0KAAU+4bfkqLfQ== Received: from DM5PR19CA0012.namprd19.prod.outlook.com (2603:10b6:3:151::22) by BY5PR12MB3795.namprd12.prod.outlook.com (2603:10b6:a03:1a9::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24; Wed, 21 Jul 2021 08:35:10 +0000 Received: from DM6NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:3:151:cafe::87) by DM5PR19CA0012.outlook.office365.com (2603:10b6:3:151::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Wed, 21 Jul 2021 08:35:10 +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 DM6NAM11FT067.mail.protection.outlook.com (10.13.172.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4352.24 via Frontend Transport; Wed, 21 Jul 2021 08:35:09 +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; Wed, 21 Jul 2021 08:35:07 +0000 From: Suanming Mou To: , CC: , , Date: Wed, 21 Jul 2021 11:34:48 +0300 Message-ID: <20210721083448.14598-1-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 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: b1b2743d-072e-4ecd-3f9b-08d94c227369 X-MS-TrafficTypeDiagnostic: BY5PR12MB3795: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:321; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rh73zxe0ToziK0622k0St15C/WHQCY2iIWyuVAn3Dew9lrP6b+eo+dHYsadGcUTODoLFPDwdjCkIYtXA3Y89UCqlUeFoyJT1u37RqawSyegJbh8w0LQ8RUEb3MkBseLYe9B2YKH2gv3AM9LJMAUNcGxfOoxduwbwN7pWBnBUt15kHhNuSBW+vW2AsKRH92orTdoLsu6JwgHb+woXPowL3TU1BF5VMPc//PQBZW7lplSrfTRlG8BE56gX25gQBjoogPFIJFwrTckqUSeOLiaVd8zRTmc3qn1F9NYPrap1UIt/TO4AlaO2szdt8pRMdhNjgc4tYfyMVHjOb/fkjHWAzxKoYukY3F7kZLoU1PhL9AZmrjOCLGmA4jOoM1YF20lLbdJFRYYsTWdKD9XKzbRSsvpIFYyrZtZigmR7PYwGevLVUpmciGYET6Zc0YUUnPhlK8zY2OachUv4G/nS9sOy65rrM/vTeeCWoYspFAb/9DXy2AjKwy2zMefSobkC9f/1W0xj7ITOcODJ7HRNvNq8PWgbH49CXMo3AEQjfJFDDBUwJbCiHij4RtcxcTmHwIukItsO3OZe6ZCw2Vn80AihVH4fQ7pTfaFwKqvJHmqlqEiZ4mD5mY0fBD0fwC67JpmbNMzy9J0QSzYgJau/VgdJP6S6Df7OB8fCS8QaILn+7wOEoVK1ZMrtEypjK1ijwfqNFv2q/bz856L9iGAC7IM0sidn9uT6x8los/quM8JXoMI= 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)(39860400002)(136003)(346002)(396003)(376002)(36840700001)(46966006)(426003)(47076005)(7696005)(36756003)(1076003)(5660300002)(336012)(36860700001)(70586007)(2616005)(70206006)(110136005)(4326008)(7636003)(316002)(54906003)(26005)(8936002)(82310400003)(2906002)(6636002)(107886003)(36906005)(82740400003)(6286002)(86362001)(16526019)(478600001)(83380400001)(356005)(8676002)(6666004)(186003)(55016002)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2021 08:35:09.7442 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1b2743d-072e-4ecd-3f9b-08d94c227369 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: DM6NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3795 Subject: [dpdk-dev] [PATCH] net/mlx5: fix indexed pools allocate on Windows 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" Currently, the flow indexed pools are allocated per port, the allocation was missing in Windows code. This commit fixes the the Windows flow indexed pools are not allocated issue. Fixes: b4edeaf3efd5 ("net/mlx5: replace flow list with indexed pool") Signed-off-by: Suanming Mou Acked-by: Tal Shnaiderman Tested-by: Odi Assli Acked-by: Matan Azrad --- drivers/net/mlx5/windows/mlx5_os.c | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c index 5da362a9d5..a31fafc90d 100644 --- a/drivers/net/mlx5/windows/mlx5_os.c +++ b/drivers/net/mlx5/windows/mlx5_os.c @@ -35,6 +35,44 @@ static const char *MZ_MLX5_PMD_SHARED_DATA = "mlx5_pmd_shared_data"; /* Spinlock for mlx5_shared_data allocation. */ static rte_spinlock_t mlx5_shared_data_lock = RTE_SPINLOCK_INITIALIZER; +/* rte flow indexed pool configuration. */ +static struct mlx5_indexed_pool_config icfg[] = { + { + .size = sizeof(struct rte_flow), + .trunk_size = 64, + .need_lock = 1, + .release_mem_en = 0, + .malloc = mlx5_malloc, + .free = mlx5_free, + .per_core_cache = 0, + .type = "ctl_flow_ipool", + }, + { + .size = sizeof(struct rte_flow), + .trunk_size = 64, + .grow_trunk = 3, + .grow_shift = 2, + .need_lock = 1, + .release_mem_en = 0, + .malloc = mlx5_malloc, + .free = mlx5_free, + .per_core_cache = 1 << 14, + .type = "rte_flow_ipool", + }, + { + .size = sizeof(struct rte_flow), + .trunk_size = 64, + .grow_trunk = 3, + .grow_shift = 2, + .need_lock = 1, + .release_mem_en = 0, + .malloc = mlx5_malloc, + .free = mlx5_free, + .per_core_cache = 0, + .type = "mcp_flow_ipool", + }, +}; + /** * Initialize shared data between primary and secondary process. * @@ -317,6 +355,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, char name[RTE_ETH_NAME_MAX_LEN]; int own_domain_id = 0; uint16_t port_id; + int i; /* Build device name. */ strlcpy(name, dpdk_dev->name, sizeof(name)); @@ -584,6 +623,14 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, mlx5_set_min_inline(spawn, config); /* Store device configuration on private structure. */ priv->config = *config; + for (i = 0; i < MLX5_FLOW_TYPE_MAXI; i++) { + icfg[i].release_mem_en = !!config->reclaim_mode; + if (config->reclaim_mode) + icfg[i].per_core_cache = 0; + priv->flows[i] = mlx5_ipool_create(&icfg[i]); + if (!priv->flows[i]) + goto error; + } /* Create context for virtual machine VLAN workaround. */ priv->vmwa_context = NULL; if (config->dv_flow_en) {