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 6941AA0553; Thu, 20 Oct 2022 17:59:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D412842B82; Thu, 20 Oct 2022 17:59:14 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2070.outbound.protection.outlook.com [40.107.102.70]) by mails.dpdk.org (Postfix) with ESMTP id DCBEF41614 for ; Thu, 20 Oct 2022 17:59:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z7BO/9FSTC1ncJUFhJcvV/zNTGkr1ApOQYtEiEgaP3aTYO+77SbMTElEp/fasZzY9dTmK5E2C0XUSzh4XC3UpN8mcnpMLFH7DniJLlRrssN4EybmG3WkkFiG69qm5b+CnEgkj3qSVhAn/jiEhSDhxS/Hn7p5Xczsqz3kDbqAOA+N8JHJGm5GDNWT/H5o9njUKmRXW/NzwQK4B7pJ58N5O4EBQkd6D/2wXD0WqDdE3TPhOXPJZ51Ef2JX4tYBJSZoSk0FR1O3lL+LbOgm/E4VHMylLrQkVAQDPsr06cPgI6x26/oPCOQ9RFiirLSynoFBf0TW9yNbYIpysre4ZC37qg== 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=2uk/LeM+zf8rIrwiDy2ECYocvuAw1CAp86TNoHNHm60=; b=UO4mgKDhq/tk5nkMAqHuqeRwnNOcRr5nbJOYQKZCvT3rjXSH9XN6/78sRS6KHZ34zZRWrHy3+bTbClfnooc/vmw88e6MJJnqb7phmu39h3w17A9LeytXZ6vQ03hbAIDtSDJdkzLFie0esCGvIgAsWkiy7IsZIzoq31xO6OzM/aHQDyqFX9WkCfkZ70EgxZSE8UCFAPJJIknsg3mHwGnknfVn1FCc0cOheIIDLHyuuwjbH/e48SvLD7HmM8zcr5w+ilPGWwNeMQ87qXqjPU5j1QYRDS4Uu9tkxaHEG0j/lWNczxPE/ysYtB+UW5RsbQK2/28cqjycCCs19HpNpxpWNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject 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=2uk/LeM+zf8rIrwiDy2ECYocvuAw1CAp86TNoHNHm60=; b=fEPv9s8mayHYsHc/Xhyw/vcyDFC9Uvsl5GoKcP0Bnqd8pY/iYpQzzZkfdCa7V3VGUicKKw3odFSD/SOAPOdc93wpQuH9PTHFq+80LuyJ1OJB4M+e6aX38ZzY01ZEDbV1BWxFhoKSVDgXBQMqP+i7KL+oqInB6IaV36+H1m9aWHGODI0/rWwGrarTn5OI486DXYzq9zMPdlkfQ8G9/gupqEZKu1BxMekBGTgnIbQz+LiSol5FkqRle2GFExZpzqQwgyDxzkJK8wu8ZMMnfhW1PYrudhl/jn/eQUuRgJui1+qOcBVbWjcgE5YsC6ETGaXvhGHlBRZ/yiafuaDFbLTlzQ== Received: from DM6PR02CA0057.namprd02.prod.outlook.com (2603:10b6:5:177::34) by BN9PR12MB5066.namprd12.prod.outlook.com (2603:10b6:408:133::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Thu, 20 Oct 2022 15:59:10 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:177:cafe::c1) by DM6PR02CA0057.outlook.office365.com (2603:10b6:5:177::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.35 via Frontend Transport; Thu, 20 Oct 2022 15:59:10 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=nvidia.com; Received-SPF: None (protection.outlook.com: nvidia.com does not designate permitted sender hosts) Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16 via Frontend Transport; Thu, 20 Oct 2022 15:59:09 +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; Thu, 20 Oct 2022 08:59:00 -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; Thu, 20 Oct 2022 08:58:58 -0700 From: Alex Vesker To: , , , , Matan Azrad CC: , , Bing Zhao Subject: [v6 06/18] net/mlx5: provide the available tag registers Date: Thu, 20 Oct 2022 18:57:36 +0300 Message-ID: <20221020155749.16643-7-valex@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20221020155749.16643-1-valex@nvidia.com> References: <20220922190345.394-1-valex@nvidia.com> <20221020155749.16643-1-valex@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT011:EE_|BN9PR12MB5066:EE_ X-MS-Office365-Filtering-Correlation-Id: f89aafdf-8dc0-4c47-5599-08dab2b40682 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Eh/XDtT1orxQEIoiezy0MTcHCNIVv5KgI2IsBXjeToHqXBRoov5te3CExmtF14RwtNe0C/5w9YgvtnIeraIDqtYRqIxAi7IHYKQgeU01gXD1VjojJYFhr2dNOE+UwJuiXKMwQbQeZEjJsIXKBNurT1sDpoELUqOJbUc3qwwsD73AdrjzRL8e/YfVGwt9C1wsqtz2YmqoKiZ5bCla3JiedRDr4byCnGHZFxWI3Y8PyD52/bE/BgU+UGgxYLChQzskkBW680fypNYmpdWRqaHxmqSZmV4bQnmUXUNxF0bazt3rmyn1HDDnTStS9TfutSVRSjvymfFFDksJNiyK9xeSdhxGvPUe7eIRR8cfAdvYfoWwBp+eCFtkZsXrQJCcd/+MH4AM1rgy8DLGADLrNZoCrn4HlZqTMWnMrRcjHsmVtQo0GWASGjLjogLXb2FNTKl1m0smHyx9G7/KDE8LY/GjZUFZ4SeCL+ev1fXwsQpuUS/+eNWhFtnqwHJd6h/CFSRe3QQu2Osj/SVSY8C8CcNsa7PX9EOtFr5PpvJ+YUQSp5GQP+slC6JS+ntgWAG1XFl1bwq1SpLZ95eRpTJWSI+i5PSZXpAP2u6qvzBxXkpfS2K3Mjw+s8tKdca29bmcvf34F9c2Ga/W2lAwevVENdoX3RKPsBFO0ZFCh2M1RGHa3JudjdBNDFWGoQ7zwHJivnBLjNAFI8S4DQN5p1SM8/8X566mHioA+iEgf65QWyzJm6VEv8O8gX9+mooSnPrHUYmWEA6ol7SY68ncJAkxPIKCHlxRsAOViIb8n4HcCqNj6Lg= 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)(376002)(136003)(39860400002)(346002)(396003)(451199015)(46966006)(40470700004)(36840700001)(110136005)(54906003)(4326008)(8676002)(6666004)(82310400005)(5660300002)(6636002)(40460700003)(356005)(70586007)(36860700001)(478600001)(2906002)(86362001)(36756003)(41300700001)(1076003)(70206006)(316002)(8936002)(107886003)(16526019)(7696005)(336012)(83380400001)(186003)(47076005)(426003)(6286002)(40480700001)(82740400003)(26005)(2616005)(55016003)(7636003)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 15:59:09.8002 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f89aafdf-8dc0-4c47-5599-08dab2b40682 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5066 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 From: Bing Zhao The available tags that can be used by the application are fixed after startup. A global array is used to store the information and transfer the TAG item directly from the ID to the REG_C_x. Signed-off-by: Bing Zhao --- drivers/net/mlx5/linux/mlx5_os.c | 2 + drivers/net/mlx5/mlx5.c | 2 + drivers/net/mlx5/mlx5.h | 1 + drivers/net/mlx5/mlx5_defs.h | 2 + drivers/net/mlx5/mlx5_flow.c | 11 +++++ drivers/net/mlx5/mlx5_flow.h | 27 ++++++++++++ drivers/net/mlx5/mlx5_flow_hw.c | 76 ++++++++++++++++++++++++++++++++ 7 files changed, 121 insertions(+) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index d1e7bcce57..12f503474a 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1558,6 +1558,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, #ifdef HAVE_IBV_FLOW_DV_SUPPORT if (priv->vport_meta_mask) flow_hw_set_port_info(eth_dev); + /* Only HWS requires this information. */ + flow_hw_init_tags_set(eth_dev); return eth_dev; #else DRV_LOG(ERR, "DV support is missing for HWS."); diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 1d10932619..b39ef1ecbe 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1945,6 +1945,8 @@ mlx5_dev_close(struct rte_eth_dev *dev) #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) flow_hw_resource_release(dev); flow_hw_clear_port_info(dev); + if (priv->sh->config.dv_flow_en == 2) + flow_hw_clear_tags_set(dev); #endif if (priv->rxq_privs != NULL) { /* XXX race condition if mlx5_rx_burst() is still running. */ diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index c2c3ed81fa..aa328c3bc9 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1205,6 +1205,7 @@ struct mlx5_dev_ctx_shared { uint32_t drop_action_check_flag:1; /* Check Flag for drop action. */ uint32_t flow_priority_check_flag:1; /* Check Flag for flow priority. */ uint32_t metadata_regc_check_flag:1; /* Check Flag for metadata REGC. */ + uint32_t hws_tags:1; /* Check if tags info for HWS initialized. */ uint32_t max_port; /* Maximal IB device port index. */ struct mlx5_bond_info bond; /* Bonding information. */ struct mlx5_common_device *cdev; /* Backend mlx5 device. */ diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 018d3f0f0c..585afb0a98 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -139,6 +139,8 @@ #define MLX5_XMETA_MODE_META32 2 /* Provide info on patrial hw miss. Implies MLX5_XMETA_MODE_META16 */ #define MLX5_XMETA_MODE_MISS_INFO 3 +/* Only valid in HWS, 32bits extended META without MARK support in FDB. */ +#define MLX5_XMETA_MODE_META32_HWS 4 /* Tx accurate scheduling on timestamps parameters. */ #define MLX5_TXPP_WAIT_INIT_TS 1000ul /* How long to wait timestamp. */ diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 72f4374c07..1543d7f75e 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -39,6 +39,17 @@ */ struct flow_hw_port_info mlx5_flow_hw_port_infos[RTE_MAX_ETHPORTS]; +/* + * A global structure to save the available REG_C_x for tags usage. + * The Meter color REG (ASO) and the last available one will be reserved + * for PMD internal usage. + * Since there is no "port" concept in the driver, it is assumed that the + * available tags set will be the minimum intersection. + * 3 - in FDB mode / 5 - in legacy mode + */ +uint32_t mlx5_flow_hw_avl_tags_init_cnt; +enum modify_reg mlx5_flow_hw_avl_tags[MLX5_FLOW_HW_TAGS_MAX] = {REG_NON}; + struct tunnel_default_miss_ctx { uint16_t *queue; __extension__ diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index c0c719dd8b..98ae7c6bda 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1334,6 +1334,10 @@ struct flow_hw_port_info { extern struct flow_hw_port_info mlx5_flow_hw_port_infos[RTE_MAX_ETHPORTS]; +#define MLX5_FLOW_HW_TAGS_MAX 8 +extern uint32_t mlx5_flow_hw_avl_tags_init_cnt; +extern enum modify_reg mlx5_flow_hw_avl_tags[]; + /* * Get metadata match tag and mask for given rte_eth_dev port. * Used in HWS rule creation. @@ -1375,9 +1379,32 @@ flow_hw_get_wire_port(struct ibv_context *ibctx) } #endif +/* + * 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(enum rte_flow_item_type type, uint32_t id) +{ + switch (type) { + case RTE_FLOW_ITEM_TYPE_META: + return REG_C_1; + case RTE_FLOW_ITEM_TYPE_TAG: + MLX5_ASSERT(id < MLX5_FLOW_HW_TAGS_MAX); + return mlx5_flow_hw_avl_tags[id]; + default: + return REG_NON; + } +} + void flow_hw_set_port_info(struct rte_eth_dev *dev); void flow_hw_clear_port_info(struct rte_eth_dev *dev); +void flow_hw_init_tags_set(struct rte_eth_dev *dev); +void flow_hw_clear_tags_set(struct rte_eth_dev *dev); + typedef int (*mlx5_flow_validate_t)(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, const struct rte_flow_item items[], diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 765e5164cb..03725649c8 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -2240,6 +2240,82 @@ flow_hw_clear_port_info(struct rte_eth_dev *dev) info->is_wire = 0; } +/* + * Initialize the information of available tag registers and an intersection + * of all the probed devices' REG_C_Xs. + * PS. No port concept in steering part, right now it cannot be per port level. + * + * @param[in] dev + * Pointer to the rte_eth_dev structure. + */ +void flow_hw_init_tags_set(struct rte_eth_dev *dev) +{ + struct mlx5_priv *priv = dev->data->dev_private; + uint32_t meta_mode = priv->sh->config.dv_xmeta_en; + uint8_t masks = (uint8_t)priv->sh->cdev->config.hca_attr.set_reg_c; + uint32_t i, j; + enum modify_reg copy[MLX5_FLOW_HW_TAGS_MAX] = {REG_NON}; + uint8_t unset = 0; + uint8_t copy_masks = 0; + + /* + * The CAPA is global for common device but only used in net. + * It is shared per eswitch domain. + */ + if (!!priv->sh->hws_tags) + return; + unset |= 1 << (priv->mtr_color_reg - REG_C_0); + unset |= 1 << (REG_C_6 - REG_C_0); + if (meta_mode == MLX5_XMETA_MODE_META32_HWS) { + unset |= 1 << (REG_C_1 - REG_C_0); + unset |= 1 << (REG_C_0 - REG_C_0); + } + masks &= ~unset; + if (mlx5_flow_hw_avl_tags_init_cnt) { + for (i = 0; i < MLX5_FLOW_HW_TAGS_MAX; i++) { + if (mlx5_flow_hw_avl_tags[i] != REG_NON && !!((1 << i) & masks)) { + copy[mlx5_flow_hw_avl_tags[i] - REG_C_0] = + mlx5_flow_hw_avl_tags[i]; + copy_masks |= (1 << i); + } + } + if (copy_masks != masks) { + j = 0; + for (i = 0; i < MLX5_FLOW_HW_TAGS_MAX; i++) + if (!!((1 << i) & copy_masks)) + mlx5_flow_hw_avl_tags[j++] = copy[i]; + } + } else { + j = 0; + for (i = 0; i < MLX5_FLOW_HW_TAGS_MAX; i++) { + if (!!((1 << i) & masks)) + mlx5_flow_hw_avl_tags[j++] = + (enum modify_reg)(i + (uint32_t)REG_C_0); + } + } + priv->sh->hws_tags = 1; + mlx5_flow_hw_avl_tags_init_cnt++; +} + +/* + * Reset the available tag registers information to NONE. + * + * @param[in] dev + * Pointer to the rte_eth_dev structure. + */ +void flow_hw_clear_tags_set(struct rte_eth_dev *dev) +{ + struct mlx5_priv *priv = dev->data->dev_private; + + if (!priv->sh->hws_tags) + return; + priv->sh->hws_tags = 0; + mlx5_flow_hw_avl_tags_init_cnt--; + if (!mlx5_flow_hw_avl_tags_init_cnt) + memset(mlx5_flow_hw_avl_tags, REG_NON, + sizeof(enum modify_reg) * MLX5_FLOW_HW_TAGS_MAX); +} + /** * Create shared action. * -- 2.18.1