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 B3093A0C48; Tue, 13 Jul 2021 10:46:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C4F741214; Tue, 13 Jul 2021 10:45:34 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2079.outbound.protection.outlook.com [40.107.94.79]) by mails.dpdk.org (Postfix) with ESMTP id 5EABE411EA for ; Tue, 13 Jul 2021 10:45:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c/p9T2RiNLmUVFOdFMGuG5JcLyGBGbAYuE3twpDF3oyugaCMDv7TQrvQS0okvzI0NJloopF/VWCOx6WFHF1mZZl9QHi+rkLebcfwHTUvthaCRv0EwCoQo4q2xCXi0osVVGV54dp1pqr7PE3u+JmAotNh4opPzB+9VDqCnK+F6GiENk81wN4ooDmGwhmYQPyEcYZSXQPsS0NyX2OHpWrSRfdQuKGe4QurIe8IOyYWJMJwbuu39LgQFUrrF8Isk2FDwN0JQ5DdVOC4s1tPr7Yh/JX8nscb/UFPXF1qIaGWuzdR5jhypAXUEnqH8NPQsQ7FDvYCVy7xyaEixjNcwB0Gow== 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=VJ6n5XCyymo678ARUwuc0ssHjrbTcVSZ3t3U/BADWuw=; b=fn7IxRiqvysXvXCgeKmwC+cKNG0IpE5mOMxypUm6fOEyHp5L07B6ETNxSDTp3g8lX9w5dWOSkE3G+fWUp/D0q0RuRg3eUtvIxnDy2P2UHZYXjBLO7kTisMTwTi4IpxhFqMNV1IZB4Zg3UZWqlleVGB3EQ3fDM3Ib96sjB5RgozDCG+M8yvM1c+hsq0RQJWYbn/0x0H3FeqsKpZi8NNo5YPsYVWJTo8MKg4uX18+CUjIvP2AclGXWDQ74Ejk3U3SGrCC0eIm4UG9mNJS/D1Wkz3NH7Eopo7L4FrFtuLqV/Fpao8Hw50jy8mY1mUS9u7LPM0uljePNqDA3GPEN2G4AFw== 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=none 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=VJ6n5XCyymo678ARUwuc0ssHjrbTcVSZ3t3U/BADWuw=; b=ayDWKSn/+hBAJRKqRhmzY8u6uXNrO9GdRhv+gg9BVQOpoiKtQgZFMJlB8QkcMPF5CrnAkVpmVdkFDt/q8I8wn/L6EXoB/ZrzL5djvQf5rysfhQI4YUyxui1QTSTFWs5PCGJXD9gaIxmAF8yf1TiGnvpIZh8N645Z3NAuyfMiTKt/IUTdmCz37scDNPrJc2qrcgyGp88cQ0KFxdy4a5ZsZq7smUVXUXluhIA86hMMDFaHyzvIqL80EEY+Md1M3tWas+kUDWAyj9tBq2VLRF3YSobf+7WHFp+Eq9nD6aHva7h9llDP153qlALcXXngsxsu2GX9EFiRd50VdGPWleqtlQ== Received: from DM5PR21CA0040.namprd21.prod.outlook.com (2603:10b6:3:ed::26) by CH2PR12MB4150.namprd12.prod.outlook.com (2603:10b6:610:a6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.19; Tue, 13 Jul 2021 08:45:29 +0000 Received: from DM6NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ed:cafe::e4) by DM5PR21CA0040.outlook.office365.com (2603:10b6:3:ed::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.4 via Frontend Transport; Tue, 13 Jul 2021 08:45:29 +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 DM6NAM11FT035.mail.protection.outlook.com (10.13.172.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4308.20 via Frontend Transport; Tue, 13 Jul 2021 08:45:29 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 13 Jul 2021 08:45:27 +0000 From: Suanming Mou To: , CC: , , Date: Tue, 13 Jul 2021 11:44:40 +0300 Message-ID: <20210713084500.19964-7-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210713084500.19964-1-suanmingm@nvidia.com> References: <20210527093403.1153127-1-suanmingm@nvidia.com> <20210713084500.19964-1-suanmingm@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f39b0d8-16d5-4ede-333f-08d945da9181 X-MS-TrafficTypeDiagnostic: CH2PR12MB4150: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u6oPJ/sPhTMnkjjtThZGGzlp1dnjnf1U+zLwtq9Cpwl4d0gSqxQaTZHsaY9LTEz2p06mmqPCDzypww6oOOFDa8+PfGjN6PIuEeqX4lh59ZsUx1f5pGL6vyNDXEmLRzoyKR3uY5M04KO5TmbsUJ0AZ6jYuwr9/Adb1clIh4HJRto2lKIWbq7xijmMBd+Qa7413JYLBTcMyDd9SsIGhhkCHIKI5OuHviGPJPGQOVpi3k2GM6L3rqCi26vc0+ktzAZ6tWRd5dqnoJk7hzyYc3o1Q2oh1DpFtUAXz4N6Dsy0hThYwT6UZ6hmHBJlO4wemo/DVgsDXTXRKTUhD0zB7dXjJvSNLn5nWmAvyPAx4FlUXjwi4wP0amq3yf86C6RViRYybaDySRdPBk7EzeAydv0ri58YIN0nHyZ6IXzfNXny5W+nOlMrZAhmfarwiK1N3DeeI8KusQk+1knIW8J7JDTBlgOn8WlknVlmesV7a95MOCWDvoCOQLzyW8if4lSsd1HCYlhppw8j2cZD8Qb89zoPycsEL1r7IO8ok5k0/yUl2wybBzw2yj6kMoGFxaRheqFh3UFIOYANANvU1RBdP+VCCmtlpM2CBuHUxxdqd4pmqKs0NHmHtxrjHsa71ZK44wGlo5MstzPWdit0DLt77m4n0pJw1wkB1sCdpM+GiQzkhnEYhCcpCZa4uXWDn6WseHqEtvNIQdfwM+EVwZb9psZqDIuBmUFbPzclaEipnwA9KkA= 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)(346002)(396003)(39860400002)(136003)(376002)(36840700001)(46966006)(478600001)(8676002)(7636003)(2906002)(4326008)(82740400003)(7696005)(55016002)(70206006)(26005)(36756003)(186003)(356005)(86362001)(5660300002)(70586007)(83380400001)(16526019)(2616005)(8936002)(110136005)(6636002)(6666004)(82310400003)(34020700004)(426003)(1076003)(36906005)(6286002)(336012)(316002)(47076005)(54906003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2021 08:45:29.4766 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f39b0d8-16d5-4ede-333f-08d945da9181 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: DM6NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4150 Subject: [dpdk-dev] [PATCH v6 06/26] net/mlx5: optimize modify header action memory 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" From: Matan Azrad Define the types of the modify header action fields to be with the minimum size needed for the optional values range. Signed-off-by: Matan Azrad Acked-by: Suanming Mou --- drivers/common/mlx5/linux/mlx5_glue.h | 1 + drivers/net/mlx5/linux/mlx5_flow_os.h | 3 ++- drivers/net/mlx5/mlx5_flow.h | 6 +++--- drivers/net/mlx5/mlx5_flow_dv.c | 13 ++++++------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h index 61f40d5478..f39ef2dac7 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.h +++ b/drivers/common/mlx5/linux/mlx5_glue.h @@ -78,6 +78,7 @@ struct mlx5dv_devx_async_cmd_hdr; enum mlx5dv_dr_domain_type { unused, }; struct mlx5dv_dr_domain; struct mlx5dv_dr_action; +#define MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL 1 #endif #ifndef HAVE_MLX5DV_DR_DEVX_PORT diff --git a/drivers/net/mlx5/linux/mlx5_flow_os.h b/drivers/net/mlx5/linux/mlx5_flow_os.h index cee685015b..1926d26410 100644 --- a/drivers/net/mlx5/linux/mlx5_flow_os.h +++ b/drivers/net/mlx5/linux/mlx5_flow_os.h @@ -225,7 +225,8 @@ mlx5_flow_os_create_flow_action_modify_header(void *ctx, void *domain, (struct mlx5_flow_dv_modify_hdr_resource *)resource; *action = mlx5_glue->dv_create_flow_action_modify_header - (ctx, res->ft_type, domain, res->flags, + (ctx, res->ft_type, domain, res->root ? + MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL : 0, actions_len, (uint64_t *)res->actions); return (*action) ? 0 : -1; } diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index adadcfa425..f1ebc153f2 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -524,11 +524,11 @@ struct mlx5_flow_dv_modify_hdr_resource { void *action; /**< Modify header action object. */ /* Key area for hash list matching: */ uint8_t ft_type; /**< Flow table type, Rx or Tx. */ - uint32_t actions_num; /**< Number of modification actions. */ - uint64_t flags; /**< Flags for RDMA API. */ + uint8_t actions_num; /**< Number of modification actions. */ + bool root; /**< Whether action is in root table. */ struct mlx5_modification_cmd actions[]; /**< Modification actions. */ -}; +} __rte_packed; /* Modify resource key of the hash organization. */ union mlx5_flow_modify_hdr_key { diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 49bc85f7b3..0f8b916991 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -5006,21 +5006,21 @@ flow_dv_validate_action_port_id(struct rte_eth_dev *dev, * * @param dev * Pointer to rte_eth_dev structure. - * @param flags - * Flags bits to check if root level. + * @param root + * Whether action is on root table. * * @return * Max number of modify header actions device can support. */ static inline unsigned int flow_dv_modify_hdr_action_max(struct rte_eth_dev *dev __rte_unused, - uint64_t flags) + bool root) { /* * There's no way to directly query the max capacity from FW. * The maximal value on root table should be assumed to be supported. */ - if (!(flags & MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL)) + if (!root) return MLX5_MAX_MODIFY_NUM; else return MLX5_ROOT_TBL_MODIFY_NUM; @@ -5622,10 +5622,9 @@ flow_dv_modify_hdr_resource_register }; uint64_t key64; - resource->flags = dev_flow->dv.group ? 0 : - MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL; + resource->root = !dev_flow->dv.group; if (resource->actions_num > flow_dv_modify_hdr_action_max(dev, - resource->flags)) + resource->root)) return rte_flow_error_set(error, EOVERFLOW, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "too many modify header items"); -- 2.25.1