From patchwork Fri Jul 2 06:17:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 95158 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 67C87A0A0C; Fri, 2 Jul 2021 08:19:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 855C041354; Fri, 2 Jul 2021 08:18:45 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2060.outbound.protection.outlook.com [40.107.92.60]) by mails.dpdk.org (Postfix) with ESMTP id A05DD4134F for ; Fri, 2 Jul 2021 08:18:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H2XXgujsEzokJjktKEbJ1vm+U/EKnLg5gDmUa0n/f0ttDk3lgwhWFXpf17BCktrnyzQaPZRCYRAjigfGOD0SRJbg1a2TQE/e2znTvJ1HpknuzQgGO1S2Toqtvo1ArAfFzFnWP3IVbZj9daztUnpj8ubUOwzgd+YN7wC4lhf0XiVKPJvuzrQLTjAOCjWmmMUX2LRzlQWlKMADpphMP0O/YoPPlDznLT9j+bCE2PshF7X5fmQ+cxLBctF52U7MIY8G9ZkObulGY01nvm/KZ8jq5lG/dhPneqU21XNEXNlOMGV/tCyb/ZeMCDt7JFMEaIakirUyVuVykVXDBPphg1zw+Q== 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=mqWksTbUuNbubtfEH5KeXNyjZFFqr65kn1RuNFMVbok=; b=Bag2ohPikdwPgpD/M2GEFkp4h0eMlLiaWP91WaoiAs81pRDPsJ3IL0ICt27DWt46BMgD0NaJVO0j2/zD2E01erbJv/vgSY5/qVRN/TuQe9Tg5GrdUOcRkneLtzSrpW0lOUfItSr+aizWgkPtlR/jVSDXL1QPVBcvGLVcxXNCqBLy2QJ+ySqCcch7bhcv5G8vB4+oF5r3CalMhWKATQtSV5z7E3ppCZJdBTx/CjUg/d98mAUUlwa4LuNCO1SadzLX6nyvB1LCK/PZkfakT5+I6XHVpHBS13PVxtErFGinuKx4FbhtD6gpL4vUVEOM6P/6r5vq8/YGtZvfb0woqjrqMw== 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=mqWksTbUuNbubtfEH5KeXNyjZFFqr65kn1RuNFMVbok=; b=t8KYUHEsm23oPdM/Ys5RIaVMYF6e/ay4hRkhdFY1d/UX+H1fjDljRGm0SDYgIjuZ9iNBiTsiboJ4alXcTL2mSf9+04q4gccAuS/gZPyuLylKSgf9UZ+rAwxa9u1AEwsQ5QXaikRI6J2BpqRqpAkb/qyCKezAmS1WgkhUz3VpISTAm3QrNIMazXdHfYYk1AcL8cDyFxAwwzTagqitfBN/0Q/smfQIaDju+dDfv6LZQ6/dYC1VoFjQKbhAJm2scnkGnZbujTNfqzqlAoh/xHA7bv1G9QINXiFmbBljlbg3B7L/2h10VSPI3IcE0DPLLgqYRIty6kjbddHXCBujCVOB5Q== Received: from MW4PR03CA0120.namprd03.prod.outlook.com (2603:10b6:303:b7::35) by BN8PR12MB3283.namprd12.prod.outlook.com (2603:10b6:408:9f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Fri, 2 Jul 2021 06:18:42 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b7:cafe::51) by MW4PR03CA0120.outlook.office365.com (2603:10b6:303:b7::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.21 via Frontend Transport; Fri, 2 Jul 2021 06:18:40 +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 CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Fri, 2 Jul 2021 06:18:40 +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; Fri, 2 Jul 2021 06:18:38 +0000 From: Suanming Mou To: , CC: , , Date: Fri, 2 Jul 2021 09:17:59 +0300 Message-ID: <20210702061816.10454-6-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210702061816.10454-1-suanmingm@nvidia.com> References: <20210527093403.1153127-1-suanmingm@nvidia.com> <20210702061816.10454-1-suanmingm@nvidia.com> MIME-Version: 1.0 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: 35c1ebae-07c6-4ea3-7365-08d93d213c5b X-MS-TrafficTypeDiagnostic: BN8PR12MB3283: 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: hB2QCRyOJjR60/EtKFgi0YORbpJtubFQ78rSERBr4y7FKokDcg04xZ2D8VlJbWyTHnWsnVATt6RAEA/MhY7xdAhMThRrIRPieqkg6KcId2ijvDCCAZOWwUnBDYb6XLTK3yrvvU/4ffiklsQdPlQiKs4pW3KT0uFxvfBgVLqyzV6frpA2BI5n9VMM32VvMd3nK7QcayawtX1U3BiJ8pqQlwE0SR3LHjkDYs4yL3oeDJu+OkjHOWRG5bQLvMumQP9RPw2+CAYhvMgeOLasmxhR/4Hp629TBClQuGEJbXK6Tlpjtpfhiu9PrBXuJO+VAdwR+IhsCcxgPVKccS0SxOZGbjDM/aeRzDzusZ2z+zTaud+BDBWu1OeB2FtHo1ZurmwL3xKw0JD6FGYZCph+tzv94jXvtyyzWQfyceZ0ZzjbuoJQhUcXRlCYBqEdxK6gC6BEsVMB1iT0DuFYLuYypQiOLCQOpQmou6ZxFCbgVzekszbGUa2qHM2x+AFy0Q5spUplcYG97CgheTGDiw6Ge/j2wT1s7nl8J5n196y1GmxRVRnjueoR0drdTd6prqcwOHQO2z1lcCfXYb5WNIU2SOhJBWfMbfnuZ2kQGJfOzJhmV+bxk2Kl96ql7wNi5ucwCm3h3vB3yTeS8urvodSXoLos8krnMYtI9jxWWKwBB9bl+WDTJ12AgOhaCh8aaSv16Pzi9GHrSowlGs7SBB3Jp9bT9Q== 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)(39860400002)(396003)(136003)(376002)(346002)(36840700001)(46966006)(26005)(186003)(316002)(8936002)(70206006)(86362001)(5660300002)(70586007)(478600001)(16526019)(6666004)(6636002)(36860700001)(8676002)(2906002)(110136005)(82740400003)(7636003)(55016002)(54906003)(82310400003)(47076005)(6286002)(4326008)(2616005)(1076003)(336012)(36906005)(426003)(7696005)(36756003)(356005)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2021 06:18:40.4357 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35c1ebae-07c6-4ea3-7365-08d93d213c5b 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: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3283 Subject: [dpdk-dev] [PATCH v3 05/22] 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 e898c571da..a7c1cf05da 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; @@ -5582,10 +5582,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");