From patchwork Sun Nov 6 03:26:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 119503 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 DFF12A00C5; Sun, 6 Nov 2022 04:26:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F89F40691; Sun, 6 Nov 2022 04:26:39 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64]) by mails.dpdk.org (Postfix) with ESMTP id AB1FE4003C for ; Sun, 6 Nov 2022 04:26:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YItOSdJ2VWbsspPO2MFv0eGsstCVzqvTYdDEQ3pb+z6i9USpt0UHzAjAAO5YRyFfde71vlf3/NOceQu62oNpFtaVFybGzy+Q+UClv36ldvT4teE4oVl/rqyX0WokY9l4gzleoPYWRsA3Z5YsPmKh43AtpXWidD9YvLlzLuZMF1MPbvl4p6bxb2OqYg2cMmpXnhd879KDzgysz5RbA3XEIuH1XVRsHtuStMbUkCnsZXUMlNVMc1A0HjUyaPc41l5k1ylyp11zvCPj8bogUvLSjJmpwsHknar3N2J05cSGRGf2pLHDaombyPA27Dfmtv4Aajfmo7PF/ljbkNeoF9Kt4Q== 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=1lff+qL0OYen2bcBkIhMRCZLJi2Tj8lcUctbJLP1/c8=; b=UBsdJaCAN9WLVMIII/GZC1PtWvxd2aAqo6ksFONMOV69JihbXB0tva3kvluj1b4EdYVsVrp7cRSr/eYUz98QN7EtBMgK+h9ZKxeZiJOKRs1WJIkVbdYjckCe12t1Ly8EukrP7wzDwKffeZpbKZ7kcOyYkB14dfVAHqoTP0yqEmXxNr0s4C2Rm9Jmu4W36Rw3wl8MP4PpRAzHQRq0+g7OtGFvEZ5le8AQ9dHAQ+wOuXttCScQ4mjW+ByarwRaTWHXTVnFK1mDq/oe/EBmoRPp39nx+3+8SCzYk/ef0FJ1TCIKR2kf8lg5praX1FnuQxYu6J71WoWz29eqZjXz7SqheQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=1lff+qL0OYen2bcBkIhMRCZLJi2Tj8lcUctbJLP1/c8=; b=HrDBVpfm32N8TDtJy6Z89xIWLYYRotQDwAh8INlGDJP4JtHAQQDub3119X2HfHesOqkmiO0eDw5O0yT5TG30og2GNci5I6gm39Sm9zCXvHmskD2IJirfDjzI6+blm74qb96a66O+vrirkr2rR0QwIIZbIxE/xHFzMBYF9BN2vtNxW2r9cRGNU/F8FvrkL1sGKivMeZPk9g97nmgdcNnxhwz/xFfWwYjZhIDu7UqVvQBxo4ahyDYqvoZ8USLjugY5n4rZMWGD0Ie9JmvgD7A6noXsEeXF/+8KPwZsKhy/AESYgthobv3pvcekMQwpM2SB3DPlN+kAa8rNEru4QCjqcQ== Received: from BN0PR04CA0190.namprd04.prod.outlook.com (2603:10b6:408:e9::15) by LV2PR12MB5846.namprd12.prod.outlook.com (2603:10b6:408:175::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Sun, 6 Nov 2022 03:26:34 +0000 Received: from BN8NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e9:cafe::41) by BN0PR04CA0190.outlook.office365.com (2603:10b6:408:e9::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25 via Frontend Transport; Sun, 6 Nov 2022 03:26:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT050.mail.protection.outlook.com (10.13.177.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20 via Frontend Transport; Sun, 6 Nov 2022 03:26:34 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Sat, 5 Nov 2022 20:26:33 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Sat, 5 Nov 2022 20:26:32 -0700 From: Suanming Mou To: Matan Azrad , Viacheslav Ovsiienko CC: , Subject: [PATCH v2] net/mlx5: fix Windows flow table and queue routine Date: Sun, 6 Nov 2022 05:26:16 +0200 Message-ID: <20221106032616.17006-1-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20221104115007.14391-1-suanmingm@nvidia.com> References: <20221104115007.14391-1-suanmingm@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT050:EE_|LV2PR12MB5846:EE_ X-MS-Office365-Filtering-Correlation-Id: ebe74926-f8ff-4f6b-9c09-08dabfa6b4c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k93Ps86inQFsqmICw+EPMepdpWzKD7iQOtf/vkzFmvGC3SDpOFalYTuYL8MYeub2/mZqCAEXYYIopN+9IvP7Ls0UsR/ZV4Q98Yj2/W6WQrVj8MOAwgq+0VS5odv843DlPBQnwGdat5ne/RPmYoS2Lur4iWn2gjHkwG+Y5hqqvlsH8vry9cmjSO0jdQwpWelp+AgDR4NxMTwR82VC3fLMLrCpAxFKS5ZExQk8173AZk6gahAdI0wsCnHWiU/ECODZFOZfJrrr+5uJE5iE6QRcp3xTSaE3j2MhaSDQ0iCiJb7IHUQlQeIDzetgb4xp9JSlvgwupJjFUu/Qc2hM3u/3R2Y+JDzNyVXrTr4NNBzeITNSvHjwDREB7tQN2rRDHdl0SQJ6m1n0TAYZ1h12eKzm/Z2fv07VmyXsyoflXgzS+yA+fMlymTp+nvy+xo6sZRa+wPB01pAwtQfGETAAW2aJ/KIwlqQRTQHHmrPKyXfYrTRCZpYu04SqlkHPKFcDUWxltEX3Q7L0GYuqHoHHYMRf3ya2aaPjCBi+gFseN/eEohjEqwZq3vh7A29YBdujOr1J5DqFQco3Q1sDacODhLqTS1KkWO0FMM4qudSLk4K65KbWCikJDBZp7uASfY/HkGPP7GZM8zducaQGIMDetkZunXWaWo/e3tUDkitcFkNo5pVaqobcx0cnnDPKvogDoF8Sa/cT9LZqqM3ipTR3jqVXFJz/0KQvSa3QDSEcN+cmM4ikd4BAhd2jWyts4FuZM66BCkhqeI2xGtjjDJotcsSj3g== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(136003)(396003)(39860400002)(346002)(376002)(451199015)(46966006)(40470700004)(36840700001)(478600001)(54906003)(40480700001)(41300700001)(26005)(8936002)(6636002)(316002)(5660300002)(426003)(70206006)(356005)(70586007)(4326008)(8676002)(110136005)(7636003)(83380400001)(36860700001)(107886003)(86362001)(2616005)(7696005)(6666004)(82740400003)(336012)(1076003)(55016003)(186003)(6286002)(40460700003)(16526019)(47076005)(82310400005)(36756003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 03:26:34.2510 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ebe74926-f8ff-4f6b-9c09-08dabfa6b4c3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5846 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 The macro HAVE_MLX5_HWS_SUPPORT was introduced for HWS only. And HWS was not supported on Windows. So macro HAVE_MLX5_HWS_SUPPORT should be only around the code which HWS uses, but avoid including the code block shared by Linux and Windows. Fixes: 22681deead3e ("net/mlx5/hws: enable hardware steering") Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- v2: - add ack info. - fix typo. --- drivers/net/mlx5/mlx5.c | 4 +++- drivers/net/mlx5/mlx5_devx.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 78234b116c..3f87f83ff0 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1813,12 +1813,14 @@ mlx5_alloc_table_hash_list(struct mlx5_priv *priv __rte_unused) int err = 0; /* Tables are only used in DV and DR modes. */ -#ifdef HAVE_MLX5_HWS_SUPPORT +#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) struct mlx5_dev_ctx_shared *sh = priv->sh; char s[MLX5_NAME_SIZE]; +#ifdef HAVE_MLX5_HWS_SUPPORT if (priv->sh->config.dv_flow_en == 2) return mlx5_alloc_hw_group_hash_list(priv); +#endif MLX5_ASSERT(sh); snprintf(s, sizeof(s), "%s_flow_table", priv->sh->ibdev_name); sh->flow_tbls = mlx5_hlist_create(s, MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE, diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c index 137e7dd4ac..c1305836cf 100644 --- a/drivers/net/mlx5/mlx5_devx.c +++ b/drivers/net/mlx5/mlx5_devx.c @@ -907,6 +907,7 @@ mlx5_devx_hrxq_new(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq, rte_errno = errno; goto error; } +#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) #ifdef HAVE_MLX5_HWS_SUPPORT if (hrxq->hws_flags) { hrxq->action = mlx5dr_action_create_dest_tir @@ -916,6 +917,7 @@ mlx5_devx_hrxq_new(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq, goto error; return 0; } +#endif if (mlx5_flow_os_create_flow_action_dest_devx_tir(hrxq->tir, &hrxq->action)) { rte_errno = errno;