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 95D59A0C4B; Mon, 12 Jul 2021 03:48:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C6CFF41177; Mon, 12 Jul 2021 03:47:42 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2083.outbound.protection.outlook.com [40.107.237.83]) by mails.dpdk.org (Postfix) with ESMTP id 0B1C240E50 for ; Mon, 12 Jul 2021 03:47:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D0XfXDQWxkesnWJqnoYRagVohFo8jakFlSma2dAbXNsvI2rf5O7brJFKo4upx9hRXiENUIYac/8EEz3c4UjT7y0k/PzseuLzm9aG2OH7mECP97jzTqyi6cFPFEQhGBJ1DHO5aURE37hJ0ODkAbv1THxk81W0cgwONVDtnjEpbH1BN1V8aqqfaD3V8Flh8iWcmqDp+zAEJUBRq6cuNIT7f5OfsxgQ3mvIbZLyONOzV6xxZm9ShjrLATEntokHBuJud3xfWW33PogLNZxEMYqcOH8Nk3G8Dm0s7YQyUsLAoRBH5+kZFw0EMBK2gm6b0W86hC2egyEvrHll3pgD+NLuHw== 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=Vo99VEqiXzkwPcFZouEk6iet0TEwsbJz9uDGIKFLMKbS5qir0i9j7F0PB8yVukeoRCNd0/NcYzlsUHjorzGocsAc77X+UChwP2tepip7cmzTlYyq609LAQvdpFLnRZlqUFZFkwPGke19kjMir3oZeuAvxUpa9x4YhMZUdD+XW68+AGNA8Nj89vntLTt5/P4z6nFm002WcTp6zAryvRBRr7LnxXBne57Eoxw3OLZr/HlhGUnO/Fv4X7k2Z9/1A4ehVnJkBXKDNAmunZ1mJMYvmkCT78bzKGHG77VdtC3vldfRmWwe5NNQILTIPN9bZLm74l/c5k+xUYgjTm9/V/SXdA== 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=FndWJnw/aTojN73hzdyDblz9rSWPFhyCx6/uiA9sU5qyWsvBaruAYVI6K7+2gq7Opoi7wYv2tKukllG0egZMfJ03+kZIpZwf+jspMkYRd9NiDm4JDNyU04ev3EJId5anrv5Kll+kLXdMoVDyDHNpBfEJcJqkiETJzisgqvsuNSHFVVsgti+qdUIjvum1GwYjMXpMz0SyXStcbefBcnipBofxOLWNCwerJfXprjT36KfTS/KGWOt5vj28Bhk6QoFkikZO2H7xXKD88Mlf94jffQ3Sw5pzOhc4IJzsw93hSbFuhW3qgoyPsGLvEhWTgXg0BSurtSidbeB6uqeb0JRSnw== Received: from BN6PR13CA0020.namprd13.prod.outlook.com (2603:10b6:404:10a::30) by MWHPR12MB1375.namprd12.prod.outlook.com (2603:10b6:300:10::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.21; Mon, 12 Jul 2021 01:47:38 +0000 Received: from BN8NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:404:10a:cafe::f5) by BN6PR13CA0020.outlook.office365.com (2603:10b6:404:10a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.10 via Frontend Transport; Mon, 12 Jul 2021 01:47:38 +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 BN8NAM11FT013.mail.protection.outlook.com (10.13.176.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4308.20 via Frontend Transport; Mon, 12 Jul 2021 01:47:38 +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; Mon, 12 Jul 2021 01:47:21 +0000 From: Suanming Mou To: , CC: , , Date: Mon, 12 Jul 2021 04:46:34 +0300 Message-ID: <20210712014654.32428-7-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210712014654.32428-1-suanmingm@nvidia.com> References: <20210527093403.1153127-1-suanmingm@nvidia.com> <20210712014654.32428-1-suanmingm@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.5] 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: 6251a901-c4bf-44da-fa29-08d944d70766 X-MS-TrafficTypeDiagnostic: MWHPR12MB1375: 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: j9mfl8s/MT7n7iqtvEKZg+ogColgjTvridS7FF4jUC3nHy2/3IGEBu9h8LSDkhIesUDxVxIAnRS5nrm0Apg3ZuPpz132wbE3XvM3if2OrrJWHV+RKygglDqopdedOF3fPdHSIzMH6QHZIIXbooxnx0tjxEWUZ/K/G7fhtj+Yp8Aird9TfrAn8pamLdmVXUCG3mgCNcFk/cUPx1rLnFcm2ugWp3m01GZFmqgMsJ7nPoiLrNiltag1ekOTnY9ZTGJDc9YWUh1kLAWBBRKUMbT1593rmGM3qcyTZwNQmniTCJU84mhOjIWnezkqNfSd8ud8Nc852dbUIVVNykr0dtF71VMhVOdpXsa4HLwCFKpNFGrORKEnOefcL102nNVhro49P927CQoM7lQ2xXb3IlzCROSJWSPi9KaZ9Lp0Y426gY1n69lRJlNJazMCnS3xGXTMoQt5w1Tgr7j7BNNDrEEz2DDwyQaKDLxzixRxME23yJP5h3BkW2M/FYRyFPxLjg858GsBN6w6VmH9cgdh3l3nnPlXGtAvotNGuFh31ol0Pjgc/myuhm7CmTAlAZF9Q1VyUa4Cww7eIhx2gckpk1G7H2W6ZgTyyG/RBOjZjATUaOaw5cRifrU562UiCAuxGacDRgdc824bqrbFyQMcxmaj3KFzqNw39D/8n+wds3l+4Qo8f2GtvW1We6k2hz0IwJrnqXFl5LDXxIVsOwFMrfBoabqxQ2W1uy88LwGiOroQkpQ= 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)(396003)(136003)(376002)(346002)(39860400002)(46966006)(36840700001)(5660300002)(47076005)(7696005)(356005)(82740400003)(70206006)(7636003)(83380400001)(4326008)(86362001)(6636002)(426003)(6666004)(36860700001)(70586007)(2616005)(8676002)(54906003)(478600001)(8936002)(36756003)(336012)(82310400003)(26005)(16526019)(110136005)(34020700004)(36906005)(1076003)(316002)(186003)(2906002)(55016002)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2021 01:47:38.0663 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6251a901-c4bf-44da-fa29-08d944d70766 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: BN8NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1375 Subject: [dpdk-dev] [PATCH v5 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