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 1327343239; Sun, 29 Oct 2023 19:24:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E98440E54; Sun, 29 Oct 2023 19:23:49 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2046.outbound.protection.outlook.com [40.107.243.46]) by mails.dpdk.org (Postfix) with ESMTP id 03F4640E25 for ; Sun, 29 Oct 2023 19:23:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dfk8oXyoZaO09GTL93FRtycqGjIVPN1FqgMBN9JQhlVbJ1oFO+kn1D+J7w7iR4MHnp/O3SsyWPSu3l3J2kK3m7O1BafDP0nfaNm53eIwnj9tXBAIsYJBOBbeHQiWngPIIJ4935/klmbr/QdbGwm0j4Pl3bRDCqbFkZk3BFhnP+z7FJjDhfFYtS5IzEsConriZDoezZbNT3gRlhDozzCOfjurx8hHNopWOYu1ogMTJw9MeZ5J+vCWjSP7xK3TXBZNyycX7kXUp7O2n+bZdASVsH3QrH8V9lUPwGNbaDCJMA1b1RCK1MQFlzDyZadt/hkoXWOh6ZNGP235F06gcgsZhg== 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=R629zivdjMOa4KNfhdvRx/WxpZlAIg/hgkeYuWNmV80=; b=NA6MylPolJcltDaw0xPHxZi3V1QPXHGSEgughbZYlIPizS/vEY3RWqOm2XKbltY+q3eOGUndLcCSVX+F0aHkHR3I8StmB90VnPGm2Uw1zV5sj87xZn7LRWiPsWIbAsTfN/3QJ3IaCjAa5OXFFYnb1d6Al0mrWR9zAif8g5peLkdScjbIzRdWrawqx1xkUNsDyPobDVs4wLjBo7vf9SbFXdYXX0q1AVIjavveGKJBXz1pcTynGyLhV+NMSdUCOfUiHrhhrmAQQV60HwdLyAmoBKOWJTSW+12slWAQGiHd0/hSaF/Cs7LFeb18i49y4EYxXkoLrk7oVisQylyZMccmJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 (0) 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=R629zivdjMOa4KNfhdvRx/WxpZlAIg/hgkeYuWNmV80=; b=jpYHRAAgsxg4kd4jHkDfyZuQINSYW42dVrt8tKnCwwbaGVpdwvPrPs/phIS/sxF1VgtUGBo4zYMXG6DhYpIbBXJc09qj8zJClUSDFqlCQoX9k2ujKU7p4zl4Tyz9k/HNQQgqKE0uCfRGM0ziIxjMO17160uNOncOhe6Bxd+l8YX202LT42irFaWmJ6FXl+6JiHktbsW8gt8O1NQHb317GCMiajIfAVuqbDIaaZ1Y7zvKhJgr9Oh21ckyFsxMTZDrWAn97XYtrhkTxm66BliJdt8tasHmJLRfVdjxmn9gbelnkigwInYg1O8++AUhg9ldb1JXOPIUxR/TklY8CTF1sw== Received: from BYAPR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:74::21) by SN7PR12MB7933.namprd12.prod.outlook.com (2603:10b6:806:342::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.26; Sun, 29 Oct 2023 18:23:45 +0000 Received: from CO1PEPF000044EF.namprd05.prod.outlook.com (2603:10b6:a03:74:cafe::2b) by BYAPR05CA0044.outlook.office365.com (2603:10b6:a03:74::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.14 via Frontend Transport; Sun, 29 Oct 2023 18:23:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044EF.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 29 Oct 2023 18:23:44 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 29 Oct 2023 11:23:35 -0700 Received: from nvidia.com (10.126.231.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.41; Sun, 29 Oct 2023 11:23:32 -0700 From: Gregory Etelson To: CC: , , , "Ori Kam" , Matan Azrad , Viacheslav Ovsiienko , Suanming Mou Subject: [PATCH 06/13] net/mlx5: merge REG_C aliases Date: Sun, 29 Oct 2023 20:22:53 +0200 Message-ID: <20231029182300.227879-7-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231029182300.227879-1-getelson@nvidia.com> References: <20231029182300.227879-1-getelson@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EF:EE_|SN7PR12MB7933:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d93a498-c47f-48fb-57ab-08dbd8ac2faa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M0oAu3QQu4/AJr2EcnKlg71oNgwr3NMjiZdAQ3Dyef7+qxiDocr6zyo8qPqD5IQ/nW3LxI3NMjMxm6zC1AKiUVYDE1+VoVz6Y9ztuc/Bngg1DD38tmRxskdhVUnsYCS5nMeVZeKC/BmqFWaf5bWAsFHhm+CwRTU98GFne3QsJzfBJG9k4JpYXTckupW33T3mw9AZwUEMcsF4trjYta3aiPGuye+AGYPT5ZzJGuFCrxcQwSz+Sge9M42Iwbf7UldLaFdxj6O6BENakg2xjrXqkeDOo7hSGpwdAlVZw902KAC4ZQWQlOO1CBcgGGO/hvEkDoUkvyfImHG11THHjK99BVhF8wMIEIPHNpzR5LR28aposef6KCfTu492SonGO0nPzDc7tfXtgh+rA5H84fd/ua+QNuv7nrcOOE/xnJtuqaQy8XHT80CU357nKssgRKK1uLYNh7qT0I5Xq2mj1jPQIdh7BXEL61UfUucGwZcAcJwFPKzfbUGUTJ1E2DhChTckhtA0k1OxwfEi4pPbnpxY5Wqlsufad+puy43nHdkRDAhso2fBAAa9Qev0Y2Y26quIKzvvk204CAIVnmx9dPmeU0qcuQVIxqQrtDp0IG11yphE6Dca1r6A4xuYT9g621+/WVxOhVqQt+xbejdZFFGZGub1fISSueMw8NF67aVBJ9QSmrRtvb1IClMz/Z5kEkfNp9v0KkVB09dvMw/4TrHdAkbLcMPHxdbX5CtPWb0QVCZ2s69QJsIz0JkX3yuXQKAR X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(396003)(136003)(39860400002)(376002)(230922051799003)(82310400011)(451199024)(64100799003)(186009)(1800799009)(46966006)(40470700004)(36840700001)(36756003)(40460700003)(26005)(16526019)(6286002)(1076003)(83380400001)(7636003)(336012)(426003)(5660300002)(356005)(6666004)(7696005)(2616005)(107886003)(82740400003)(8936002)(8676002)(47076005)(54906003)(316002)(41300700001)(6916009)(36860700001)(40480700001)(55016003)(86362001)(478600001)(70586007)(70206006)(2906002)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2023 18:23:44.7005 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0d93a498-c47f-48fb-57ab-08dbd8ac2faa 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7933 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 Merge `mtr_color_reg` and `mlx5_flow_hw_aso_tag` into `aso_reg` Signed-off-by: Gregory Etelson Acked-by: Ori Kam --- drivers/net/mlx5/linux/mlx5_os.c | 10 +++++----- drivers/net/mlx5/mlx5.h | 3 +-- drivers/net/mlx5/mlx5_flow.c | 16 ++++++++-------- drivers/net/mlx5/mlx5_flow.h | 3 +-- drivers/net/mlx5/mlx5_flow_dv.c | 7 ++++--- drivers/net/mlx5/mlx5_flow_hw.c | 3 +-- drivers/net/mlx5/mlx5_flow_meter.c | 4 ++-- 7 files changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 96d32d11d8..ed273e14cf 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1328,14 +1328,14 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, * Prefer REG_C_3 if it is available. */ if (reg_c_mask & (1 << (REG_C_3 - REG_C_0))) - sh->registers.mtr_color_reg = REG_C_3; + sh->registers.aso_reg = REG_C_3; else - sh->registers.mtr_color_reg = + sh->registers.aso_reg = ffs(reg_c_mask) - 1 + REG_C_0; priv->mtr_en = 1; priv->mtr_reg_share = hca_attr->qos.flow_meter; DRV_LOG(DEBUG, "The REG_C meter uses is %d", - sh->registers.mtr_color_reg); + sh->registers.aso_reg); } } if (hca_attr->qos.sup && hca_attr->qos.flow_meter_aso_sup) { @@ -1360,7 +1360,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, sh->tunnel_header_2_3 = 1; #endif #ifdef HAVE_MLX5_DR_CREATE_ACTION_ASO - if (hca_attr->flow_hit_aso && sh->registers.mtr_color_reg == REG_C_3) { + if (hca_attr->flow_hit_aso && sh->registers.aso_reg == REG_C_3) { sh->flow_hit_aso_en = 1; err = mlx5_flow_aso_age_mng_init(sh); if (err) { @@ -1374,7 +1374,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, defined (HAVE_MLX5_DR_ACTION_ASO_CT) /* HWS create CT ASO SQ based on HWS configure queue number. */ if (sh->config.dv_flow_en != 2 && - hca_attr->ct_offload && sh->registers.mtr_color_reg == REG_C_3) { + hca_attr->ct_offload && sh->registers.aso_reg == REG_C_3) { err = mlx5_flow_aso_ct_mng_init(sh); if (err) { err = -err; diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 01cb21fc93..99a2ad88ed 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1376,8 +1376,7 @@ struct mlx5_hws_cnt_svc_mng { #define MLX5_FLOW_HW_TAGS_MAX 8 struct mlx5_dev_registers { - enum modify_reg mlx5_flow_hw_aso_tag; - enum modify_reg mtr_color_reg; /* Meter color match REG_C. */ + enum modify_reg aso_reg; enum modify_reg hw_avl_tags[MLX5_FLOW_HW_TAGS_MAX]; }; diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 3ddc3ba772..ad9a2f2273 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1364,23 +1364,23 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev, * should use the meter color register for match. */ if (priv->mtr_reg_share) - return reg->mtr_color_reg; + return reg->aso_reg; else - return reg->mtr_color_reg != REG_C_2 ? REG_C_2 : + return reg->aso_reg != REG_C_2 ? REG_C_2 : REG_C_3; case MLX5_MTR_COLOR: case MLX5_ASO_FLOW_HIT: case MLX5_ASO_CONNTRACK: case MLX5_SAMPLE_ID: /* All features use the same REG_C. */ - MLX5_ASSERT(reg->mtr_color_reg != REG_NON); - return reg->mtr_color_reg; + MLX5_ASSERT(reg->aso_reg != REG_NON); + return reg->aso_reg; case MLX5_COPY_MARK: /* * Metadata COPY_MARK register using is in meter suffix sub * flow while with meter. It's safe to share the same register. */ - return reg->mtr_color_reg != REG_C_2 ? REG_C_2 : REG_C_3; + return reg->aso_reg != REG_C_2 ? REG_C_2 : REG_C_3; case MLX5_APP_TAG: /* * If meter is enable, it will engage the register for color @@ -1389,7 +1389,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev, * match. * If meter is disable, free to use all available registers. */ - start_reg = reg->mtr_color_reg != REG_C_2 ? REG_C_2 : + start_reg = reg->aso_reg != REG_C_2 ? REG_C_2 : (priv->mtr_reg_share ? REG_C_3 : REG_C_4); skip_mtr_reg = !!(priv->mtr_en && start_reg == REG_C_2); if (id > (uint32_t)(REG_C_7 - start_reg)) @@ -1407,7 +1407,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev, * color register. */ if (skip_mtr_reg && priv->sh->flow_mreg_c - [id + start_reg - REG_C_0] >= reg->mtr_color_reg) { + [id + start_reg - REG_C_0] >= reg->aso_reg) { if (id >= (uint32_t)(REG_C_7 - start_reg)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, @@ -6480,7 +6480,7 @@ flow_sample_split_prep(struct rte_eth_dev *dev, * metadata regC is REG_NON, back to use application tag * index 0. */ - if (unlikely(priv->sh->registers.mtr_color_reg == REG_NON)) + if (unlikely(priv->sh->registers.aso_reg == REG_NON)) ret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, 0, error); else ret = mlx5_flow_get_reg_id(dev, MLX5_SAMPLE_ID, 0, error); diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index ed8804dd0f..643f9f4329 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1666,7 +1666,6 @@ flow_hw_get_wire_port(struct ibv_context *ibctx) * Convert metadata or tag to the actual register. * META: Can only be used to match in the FDB in this stage, fixed C_1. * TAG: C_x expect meter color reg and the reserved ones. - * TODO: Per port / device, FDB or NIC for Meta matching. */ static __rte_always_inline int flow_hw_get_reg_id(struct rte_eth_dev *dev, @@ -1695,7 +1694,7 @@ flow_hw_get_reg_id(struct rte_eth_dev *dev, return REG_A; case RTE_FLOW_ITEM_TYPE_CONNTRACK: case RTE_FLOW_ITEM_TYPE_METER_COLOR: - return reg->mlx5_flow_hw_aso_tag; + return reg->aso_reg; case RTE_FLOW_ITEM_TYPE_TAG: if (id == MLX5_LINEAR_HASH_TAG_INDEX) return REG_C_3; diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 024023abb5..9268a07c84 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -2026,7 +2026,8 @@ mlx5_flow_field_id_to_modify_info if (priv->sh->config.dv_flow_en == 2) reg = flow_hw_get_reg_id - (dev, RTE_FLOW_ITEM_TYPE_METER_COLOR, 0); + (dev, + RTE_FLOW_ITEM_TYPE_METER_COLOR, 0); else reg = mlx5_flow_get_reg_id(dev, MLX5_MTR_COLOR, 0, error); @@ -3923,7 +3924,7 @@ flow_dv_validate_item_meter_color(struct rte_eth_dev *dev, }; int ret; - if (priv->sh->registers.mtr_color_reg == REG_NON) + if (priv->sh->registers.aso_reg == REG_NON) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item, "meter color register" @@ -8375,7 +8376,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, return ret; if ((action_flags & MLX5_FLOW_ACTION_SET_TAG) && tag_id == 0 && - priv->sh->registers.mtr_color_reg == REG_NON) + priv->sh->registers.aso_reg == REG_NON) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "sample after tag action causes metadata tag index 0 corruption"); diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 86e2891241..1c79a92fb3 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -8470,7 +8470,7 @@ void flow_hw_init_tags_set(struct rte_eth_dev *dev) * The CAPA is global for common device but only used in net. * It is shared per eswitch domain. */ - unset |= 1 << mlx5_regc_index(reg->mtr_color_reg); + unset |= 1 << mlx5_regc_index(reg->aso_reg); unset |= 1 << mlx5_regc_index(REG_C_6); if (sh->config.dv_esw_en) unset |= 1 << mlx5_regc_index(REG_C_0); @@ -8481,7 +8481,6 @@ void flow_hw_init_tags_set(struct rte_eth_dev *dev) if (!!((1 << i) & masks)) reg->hw_avl_tags[j++] = mlx5_regc_value(i); } - reg->mlx5_flow_hw_aso_tag = reg->mtr_color_reg; } static int diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index eb88dfe39c..7cbf772ea4 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -67,7 +67,7 @@ mlx5_flow_meter_action_create(struct mlx5_priv *priv, val = (ebs_eir >> ASO_DSEG_EBS_MAN_OFFSET) & ASO_DSEG_MAN_MASK; MLX5_SET(flow_meter_parameters, fmp, ebs_mantissa, val); mtr_init.next_table = def_policy->sub_policy.tbl_rsc->obj; - mtr_init.reg_c_index = priv->sh->registers.mtr_color_reg - REG_C_0; + mtr_init.reg_c_index = priv->sh->registers.aso_reg - REG_C_0; mtr_init.flow_meter_parameter = fmp; mtr_init.flow_meter_parameter_sz = MLX5_ST_SZ_BYTES(flow_meter_parameters); @@ -1618,7 +1618,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv, return ret; } else { /* Fill command parameters. */ - mod_attr.reg_c_index = sh->registers.mtr_color_reg - REG_C_0; + mod_attr.reg_c_index = sh->registers.aso_reg - REG_C_0; mod_attr.flow_meter_parameter = in; mod_attr.flow_meter_parameter_sz = MLX5_ST_SZ_BYTES(flow_meter_parameters); -- 2.39.2