From patchwork Thu Oct 6 15:03:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vesker X-Patchwork-Id: 117467 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 3E67CA00C2; Thu, 6 Oct 2022 17:04:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E23E942CA9; Thu, 6 Oct 2022 17:04:17 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2059.outbound.protection.outlook.com [40.107.92.59]) by mails.dpdk.org (Postfix) with ESMTP id 9C36942C9D for ; Thu, 6 Oct 2022 17:04:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E++BiaHRnjUnZyT8rcqGT3q0NjQzb9ewewPY96xWIY/qhuJ8wDN0WVW3U7Uzky+1nfQKJJbuk9t4frD1Nvj4LbC17f1j/zUSrTrLgA8uMIo89tsrHazgl1EDQv28Hs/1gqRinYUT4S/U4BqmacDStVfmxmxvqZFFmVi/i2mIy2C3a+tijB7J3C9Sr8FovxRGhOnlLKR0F0ui5m4HxfZc24/JunYZLkpms9bD9NuDe4ZP3Gy0Q8kdgxkkTM4bvbdTCpyxkInURwqo01ukUb1sxHVmz4DnrzRssNJrrCzXwEI1RHUUu1XZUizCow6ZsiJhP5i9n+cL+rBTsHUs/TkxEA== 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=A6Cc6sNyoLF+VfNqPFgFZCD+26h2eCqUe8QNy76fqu8=; b=gQ+2EAadxfLbG9ex/W8NTfpnCEKs7H4yeDiSxTg1C3KpThc3GoaRv1e5RZDfVcsCW9KtBT+oCiTQCWDE4k13B3qJ8ftzcWCpjYBeymRUW6/bcUytmPhrCvAJ1kHeM7SkMn8JR1PQCwvX4RiculluCWExp9MgvzzISttUYDgKJEy0kUKvcYHyg6WdBTC8jzAj+A0/9O4WMmXvdBFTpPGQP1coOLB2vW7akCiGDBvR1a2kCaN2bHgbwl6t+8iUYVKzBhsZqyJxos31LzIX1fjbAxUxPJm78eqUFBxUK68VTkv2hPLRkeCWA3Bc5TivbiPYIdGLYJcWprzBwy8js11WeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net 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=A6Cc6sNyoLF+VfNqPFgFZCD+26h2eCqUe8QNy76fqu8=; b=Hk5tguMdPE7Z9cVjRNbveIb8r/piRmdIdTRxrQri9zFnLEzWIcBFSbQPqVLlgN+oULl57cdQQWpzrzGP/l0cs1LBI1i+P3RULs5lIvcyZ+u/yH5hRCA7nUlePTw9N6DQF4a+ErC9mf78pRoD9UrTmd+VDhSQJJhVVa1Sye2LOEk8CPjqF0+yIEtaxJ8qyt9MWupLab3PpjefynQXAgLubrQBHSBvEXZ0NPE979u61PTHsBJl5EIEUYP5DI1mRqE80fGHEZpcSKxZLsgbG/RrQ9nzjZXn+UPxG0M2q2IK8H4k6Mk7MxNocnPuVxxJl1UgXP7DpLIU4RiOh42QCHTWeA== Received: from BN9PR03CA0776.namprd03.prod.outlook.com (2603:10b6:408:13a::31) by SJ0PR12MB5438.namprd12.prod.outlook.com (2603:10b6:a03:3ba::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Thu, 6 Oct 2022 15:04:13 +0000 Received: from BN8NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13a:cafe::8) by BN9PR03CA0776.outlook.office365.com (2603:10b6:408:13a::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.26 via Frontend Transport; Thu, 6 Oct 2022 15:04:13 +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 BN8NAM11FT013.mail.protection.outlook.com (10.13.176.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10 via Frontend Transport; Thu, 6 Oct 2022 15:04:13 +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.26; Thu, 6 Oct 2022 08:04: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, 6 Oct 2022 08:03:57 -0700 From: Alex Vesker To: , , , , Matan Azrad CC: , , Bing Zhao Subject: [v2 06/19] net/mlx5: provide the available tag registers Date: Thu, 6 Oct 2022 18:03:12 +0300 Message-ID: <20221006150325.660-7-valex@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20221006150325.660-1-valex@nvidia.com> References: <20220922190345.394-1-valex@nvidia.com> <20221006150325.660-1-valex@nvidia.com> MIME-Version: 1.0 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: BN8NAM11FT013:EE_|SJ0PR12MB5438:EE_ X-MS-Office365-Filtering-Correlation-Id: be002803-d64d-4e55-a8f2-08daa7ac07ca 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: mBdBkDP9WJpI4mdwOPu3L7q0iH78q575TEmL3jXntnYJkrYkFvtv1B3RoUMbuZnDlWgS9D1mksxvBxz4WXi5rFJDRkZGQze7b1ng2JD/th2oUauSOvpkdy+jFllZyoDRTRyNDiwgIgua6jRsDz+vKSZ84Z15ghQhKM3S7aFK7vFlWGOzrWNImedVZieeD0szwvOj+dV8V+XXIswLpxiL8QEim/ZxGXDjjUpktuqbOK5vDcw/0NOoWuBgjrqBFVChbo1fktBQ+GDH1BH/DZ8VcW4I6IpQxL6W2xOYTSeU1JbamMif2YZr8178xRn73Fkj/7xIe0s3iaMyqkVMIntecgHm2nK0TgpZnbSl8i5taYnryLIW/0xPHUUk2mSIzzOXhGJJ7aFBEXjxvfid0Avfp8OgJQHO9IInaSTeaoUOgJyYI5AAlgOGmvICwzJ9sRqMyP9mHUdEM2GoqgiuLeDvoGYbOmXoyV8VhmfKNgEHVuPpCeEpCmLOfCeyvdC5NSTi1ZztM0jhWHPeqs0FM7Rw8pWNjjIYES1hOd0nMM518Y6I5Ynv+j8Bo/+zwZoD/GRCT3QrOfezbimTkMszbD+qTL9be8Z8qHss6+mxrHYA8xrQqWnMRL20NrP7dIS2TcE9ywNUgt0X5I/D3vHvTBUTQz5GtCNi+J7ttimIP4rUbAAV4fszVZzrAxdaxbsWy9uvMUxdzS6zJ0MzAOyBF/sajWB7JsGQgBFiI746JVELpD2vdJwZytD+nw7j2tW7fsQezrqbw8+ooC27r06IxRrkXWIq2XP9TgIVKiZ/XWDpNx0= 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:(13230022)(4636009)(396003)(39860400002)(376002)(136003)(346002)(451199015)(36840700001)(40470700004)(46966006)(36756003)(86362001)(36860700001)(336012)(16526019)(1076003)(186003)(2616005)(83380400001)(316002)(110136005)(356005)(82740400003)(7636003)(47076005)(426003)(107886003)(6286002)(26005)(7696005)(478600001)(6636002)(6666004)(54906003)(70586007)(70206006)(8676002)(4326008)(8936002)(82310400005)(5660300002)(2906002)(41300700001)(40460700003)(40480700001)(55016003)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2022 15:04:13.0938 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be002803-d64d-4e55-a8f2-08daa7ac07ca 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: BN8NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5438 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 | 5 ++- 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, 123 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 1036b870de..1d77b49aac 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1543,8 +1543,11 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, rte_rwlock_init(&priv->ind_tbls_lock); if (priv->vport_meta_mask) flow_hw_set_port_info(eth_dev); - if (priv->sh->config.dv_flow_en == 2) + if (priv->sh->config.dv_flow_en == 2) { + /* Only HWS requires this information. */ + flow_hw_init_tags_set(eth_dev); return eth_dev; + } /* Port representor shares the same max priority with pf port. */ if (!priv->sh->flow_priority_check_flag) { /* Supported Verbs flow priority number detection. */ diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index ad561bd86d..cb1a670954 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1946,6 +1946,8 @@ mlx5_dev_close(struct rte_eth_dev *dev) flow_hw_resource_release(dev); #endif flow_hw_clear_port_info(dev); + if (priv->sh->config.dv_flow_en == 2) + flow_hw_clear_tags_set(dev); if (priv->rxq_privs != NULL) { /* XXX race condition if mlx5_rx_burst() is still running. */ rte_delay_us_sleep(1000); diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 95ecbea39e..ea63c29bf9 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1200,6 +1200,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 acf1467bf6..45109001ca 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 2eb2b46060..cae1a64def 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1328,6 +1328,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. @@ -1367,9 +1371,32 @@ flow_hw_get_wire_port(struct ibv_context *ibctx) return NULL; } +/* + * 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 fe809a83b9..78c741bb91 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -2237,6 +2237,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. *