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 E874AA0C47; Tue, 6 Jul 2021 15:34:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D0B3413C3; Tue, 6 Jul 2021 15:33:36 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2048.outbound.protection.outlook.com [40.107.244.48]) by mails.dpdk.org (Postfix) with ESMTP id D3149413AC for ; Tue, 6 Jul 2021 15:33:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aMJBP8TLqoV90myogAhnGfzI/E1svEabvN25ZlK4+tAMTF+Mcx8UudzbLutHHjhCP7tIjfvW/p4w5xz1b9JO8OmgHAru4iixHVTsRcDqi0WQAr/KmKOl7qoGrX8TnkYBYzCH/Dk7ra2ODlvPPg4sbFBLEANu4CcvoteJLOe80AOw+vqcgaoY43AR+RszvDM+7ZJ5Zf4EW3iXlipZ77rWwbUuRSjvlIXBsj7NZc/2bryxcRwruxdlaAZauM/188gE+YMXyFiEmheZJ0/Uty8P9f3vqY9nogXZqfs+XsYKR462a9cM02sqB9y0sHIftppWVk71jMIOMbFHN+F5xWfIEg== 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=9qfPyW29CXMgX9RDjk7CiwDw8FuesJQMVpmU2KYUKyQ=; b=S/eiG2YtoEulcYidcn4PSuEw7oidU0g48ao+y3yiiDXUNTYuIFiHhgCLWeu+z7n9T9/H7RnJchKnCbWFlWefPYQhtnmFlijaiFzTZrUE77/NfILyUH8QFP/uNGePo6aLmVVx8RfdWvj6Ux58HSlyQNg6Xc7RiwFLw5YbpgDpW/CZ+RhWwdgjDozsvevdRGmzzPT0OZWP3FfbNWH/ZWXO+HlzF5UsSOdRR8/Zyzp1q0q3mG/GPQDCl5CJeDHchCG5IkKX5P4pLNQQSjFKE1WYJX6XMhXG0qwVcGXI7hZwJYD5fEA+P1aRlurF0mLstCGAeTUA8GC7P0gXgD4PwX5vtA== 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=9qfPyW29CXMgX9RDjk7CiwDw8FuesJQMVpmU2KYUKyQ=; b=XFQFaGNZsk3BF2mT0THdHqm1qe2/gAdWYCLxY/BL+oH1/p1Exs8Bh5zGCCq3erhnckrsMdvkn0Fut2WTwuVdp6d6g53fdbpHkBRVQIZH2J0z3wZxwLOwNJykpCUcRzIujKCoEwLL9vWBtxJV5wMG2zJuFa9dxi+/CVCohw7+6autBVToACzx0+zAFTNwpMm0a2s0V0JXZ8ksgySzfNdqyymYJ2HCFM0OnI/av46JRBdf0g+cHTxei0JAB3G6qP8KGVC23HOMCZW+Wo4nsf6jG5pTGT2XYwikmZdyj/53QxG52FfL5H1mdkLxBknxld+Gql16Cio5Y4j/9IssBMGq9A== Received: from BN0PR02CA0047.namprd02.prod.outlook.com (2603:10b6:408:e5::22) by DM6PR12MB4957.namprd12.prod.outlook.com (2603:10b6:5:20d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.26; Tue, 6 Jul 2021 13:33:31 +0000 Received: from BN8NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::eb) by BN0PR02CA0047.outlook.office365.com (2603:10b6:408:e5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Tue, 6 Jul 2021 13:33:31 +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 BN8NAM11FT047.mail.protection.outlook.com (10.13.177.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Tue, 6 Jul 2021 13:33:30 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 6 Jul 2021 13:33:27 +0000 From: Suanming Mou To: , CC: , , Date: Tue, 6 Jul 2021 16:32:37 +0300 Message-ID: <20210706133257.3353-7-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210706133257.3353-1-suanmingm@nvidia.com> References: <20210527093403.1153127-1-suanmingm@nvidia.com> <20210706133257.3353-1-suanmingm@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f975777d-a04f-4bb9-cba3-08d94082a535 X-MS-TrafficTypeDiagnostic: DM6PR12MB4957: 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: pfYFm2QGnDKjzx1+stSqFEqlFQqqr0D6Vws6zZmwkBL+zhklokmDQhuKNOpvN8kRSPJ8WNsmCdOhDNHM41D/HLyx2OLgvYNbz06sL9F63yXh7cwOl4DH4g1jzKc4znyMKpgPtKrpDt8MCZ6VB2WHI6RHrMEmK+btHjzYcx8Tmrh1iTeEQzN5CNfuTeLq8SQn/b/AT8XapprBjHZYkmJYpBLtfAnvBMFt51Iqfv9kJjzV8bP7wT7kXjS/TPip//BQVOoJr3fNntRm22OcnzmRruSJmzjcrz+kiWzaEmrOSBe8YeU7Cw5Sm1UTq/hmPjjhWo1LU7+gNonX16q8UzvJYKD/oAtEk2RS/B40MGloVBiYX5Fgcwhy2KfDk9k4V3RyxTKgYU1vo/RfVapLf40UfEkJVoQkkOqAPQ+Mo9OjaO/qopDeBuHI10EwQGQarIKt3YGSDtfeZYBqaDt1Cs1CZnEWNLEvm2stHAx2Yd9+2Ma/ytJzypPelbfoxJklMrk5TzvBOO6w9nv4OXqVYYiDrnZq1bt2Ico1TX20+S6mM7/Fp4QLGpxg9PJMX1JmjDISM6azbIdcciU/EEblCbX6YIGQMkooZpisGhnfszodFVEE81ClL8WJOyn9ZbSBXoZed9mPlWxX8j06fItrYpjns0d94hLC2ACKTbfg3W2q6iIZcbGKBynzDqmPhit2uPpArAVgi2mqBAJPPWZ61ynftA== 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)(36840700001)(46966006)(5660300002)(70206006)(8676002)(70586007)(7696005)(16526019)(36906005)(498600001)(6636002)(8936002)(82310400003)(186003)(54906003)(36756003)(110136005)(426003)(86362001)(2616005)(6666004)(83380400001)(6286002)(1076003)(2906002)(55016002)(7636003)(336012)(47076005)(26005)(4326008)(36860700001)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2021 13:33:30.9599 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f975777d-a04f-4bb9-cba3-08d94082a535 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: BN8NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4957 Subject: [dpdk-dev] [PATCH v4 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 840d8cf57f..a186ee577f 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 d9b6acaafd..81c95e0beb 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -523,11 +523,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 eee3926c06..bca8339361 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -5000,21 +5000,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; @@ -5616,10 +5616,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