From patchwork Wed Sep 12 16:04:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yishai Hadas X-Patchwork-Id: 10597955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9097814BD for ; Wed, 12 Sep 2018 16:04:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D49F2A5D2 for ; Wed, 12 Sep 2018 16:04:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 712FB2A674; Wed, 12 Sep 2018 16:04:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF0F12A5D2 for ; Wed, 12 Sep 2018 16:04:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726912AbeILVJv (ORCPT ); Wed, 12 Sep 2018 17:09:51 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:41762 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726677AbeILVJu (ORCPT ); Wed, 12 Sep 2018 17:09:50 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yishaih@mellanox.com) with ESMTPS (AES256-SHA encrypted); 12 Sep 2018 19:08:48 +0300 Received: from vnc17.mtl.labs.mlnx (vnc17.mtl.labs.mlnx [10.7.2.17]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w8CG4XWm020183; Wed, 12 Sep 2018 19:04:33 +0300 Received: from vnc17.mtl.labs.mlnx (vnc17.mtl.labs.mlnx [127.0.0.1]) by vnc17.mtl.labs.mlnx (8.13.8/8.13.8) with ESMTP id w8CG4X8A029567; Wed, 12 Sep 2018 19:04:33 +0300 Received: (from yishaih@localhost) by vnc17.mtl.labs.mlnx (8.13.8/8.13.8/Submit) id w8CG4X0m029566; Wed, 12 Sep 2018 19:04:33 +0300 From: Yishai Hadas To: linux-rdma@vger.kernel.org Cc: yishaih@mellanox.com, jgg@mellanox.com, markb@mellanox.com, majd@mellanox.com Subject: [PATCH rdma-core 3/4] mlx5: Add modify header flow action Date: Wed, 12 Sep 2018 19:04:08 +0300 Message-Id: <1536768249-29432-4-git-send-email-yishaih@mellanox.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1536768249-29432-1-git-send-email-yishaih@mellanox.com> References: <1536768249-29432-1-git-send-email-yishaih@mellanox.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mark Bloch Expose a new flow action as DV, modify header. It allows to create a flow action which mutates packet headers. It can be attached to steering rules via ibv_create_flow(). Signed-off-by: Mark Bloch Signed-off-by: Yishai Hadas --- debian/ibverbs-providers.symbols | 2 ++ providers/mlx5/CMakeLists.txt | 2 +- providers/mlx5/libmlx5.map | 5 +++++ providers/mlx5/mlx5_api.h | 3 +++ providers/mlx5/mlx5dv.h | 20 ++++++++++++++++++++ providers/mlx5/verbs.c | 38 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 1 deletion(-) diff --git a/debian/ibverbs-providers.symbols b/debian/ibverbs-providers.symbols index 11ea417..839a744 100644 --- a/debian/ibverbs-providers.symbols +++ b/debian/ibverbs-providers.symbols @@ -12,6 +12,7 @@ libmlx5.so.1 ibverbs-providers #MINVER# MLX5_1.4@MLX5_1.4 17 MLX5_1.5@MLX5_1.5 18 MLX5_1.6@MLX5_1.6 20 + MLX5_1.7@MLX5_1.7 21 mlx5dv_init_obj@MLX5_1.0 13 mlx5dv_init_obj@MLX5_1.2 15 mlx5dv_query_device@MLX5_1.0 13 @@ -24,3 +25,4 @@ libmlx5.so.1 ibverbs-providers #MINVER# mlx5dv_create_flow_matcher@MLX5_1.6 20 mlx5dv_destroy_flow_matcher@MLX5_1.6 20 mlx5dv_create_flow@MLX5_1.6 20 + mlx5dv_create_flow_action_modify_header@MLX5_1.7 21 diff --git a/providers/mlx5/CMakeLists.txt b/providers/mlx5/CMakeLists.txt index 4a0f88b..1d0961c 100644 --- a/providers/mlx5/CMakeLists.txt +++ b/providers/mlx5/CMakeLists.txt @@ -11,7 +11,7 @@ if (MLX5_MW_DEBUG) endif() rdma_shared_provider(mlx5 libmlx5.map - 1 1.6.${PACKAGE_VERSION} + 1 1.7.${PACKAGE_VERSION} buf.c cq.c dbrec.c diff --git a/providers/mlx5/libmlx5.map b/providers/mlx5/libmlx5.map index 7501fa7..80d5654 100644 --- a/providers/mlx5/libmlx5.map +++ b/providers/mlx5/libmlx5.map @@ -40,3 +40,8 @@ MLX5_1.6 { mlx5dv_destroy_flow_matcher; mlx5dv_create_flow; } MLX5_1.5; + +MLX5_1.7 { + global: + mlx5dv_create_flow_action_modify_header; +} MLX5_1.6; diff --git a/providers/mlx5/mlx5_api.h b/providers/mlx5/mlx5_api.h index b87f897..8373b12 100644 --- a/providers/mlx5/mlx5_api.h +++ b/providers/mlx5/mlx5_api.h @@ -37,5 +37,8 @@ #define mlx5dv_flow_action_flags mlx5_ib_uapi_flow_action_flags #define MLX5DV_FLOW_ACTION_FLAGS_REQUIRE_METADATA MLX5_IB_UAPI_FLOW_ACTION_FLAGS_REQUIRE_METADATA +#define mlx5dv_flow_table_type mlx5_ib_uapi_flow_table_type +#define MLX5DV_FLOW_TABLE_TYPE_NIC_RX MLX5_IB_UAPI_FLOW_TABLE_TYPE_NIC_RX +#define MLX5DV_FLOW_TABLE_TYPE_NIC_TX MLX5_IB_UAPI_FLOW_TABLE_TYPE_NIC_TX #endif diff --git a/providers/mlx5/mlx5dv.h b/providers/mlx5/mlx5dv.h index b592029..bee29e0 100644 --- a/providers/mlx5/mlx5dv.h +++ b/providers/mlx5/mlx5dv.h @@ -245,6 +245,26 @@ struct ibv_flow_action *mlx5dv_create_flow_action_esp(struct ibv_context *ctx, struct mlx5dv_flow_action_esp *mlx5_attr); /* + * mlx5dv_create_flow_action_modify_header - Create a flow action which mutates + * a packet. The flow action can be attached to steering rules via + * ibv_create_flow(). + * + * @ctx: RDMA device context to create the action on. + * @actions_sz: The size of *actions* buffer in bytes. + * @actions: A buffer which contains modify actions provided in device spec + * format. + * @ft_type: Defines the flow table type to which the modify + * header action will be attached. + * + * Return a valid ibv_flow_action if successful, NULL otherwise. + */ +struct ibv_flow_action * +mlx5dv_create_flow_action_modify_header(struct ibv_context *ctx, + size_t actions_sz, + uint64_t actions[], + enum mlx5dv_flow_table_type ft_type); + +/* * Most device capabilities are exported by ibv_query_device(...), * but there is HW device-specific information which is important * for data-path, but isn't provided. diff --git a/providers/mlx5/verbs.c b/providers/mlx5/verbs.c index ff40029..1e61f44 100644 --- a/providers/mlx5/verbs.c +++ b/providers/mlx5/verbs.c @@ -3317,6 +3317,44 @@ int mlx5_modify_flow_action_esp(struct ibv_flow_action *action, return ibv_cmd_modify_flow_action_esp(vaction, attr, NULL); } +struct ibv_flow_action *mlx5dv_create_flow_action_modify_header(struct ibv_context *ctx, + size_t actions_sz, + uint64_t actions[], + enum mlx5dv_flow_table_type ft_type) +{ + DECLARE_COMMAND_BUFFER(cmd, UVERBS_OBJECT_FLOW_ACTION, + MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER, + 3); + struct ib_uverbs_attr *handle = fill_attr_out_obj(cmd, + MLX5_IB_ATTR_CREATE_MODIFY_HEADER_HANDLE); + struct verbs_flow_action *action; + int ret; + + fill_attr_in(cmd, MLX5_IB_ATTR_CREATE_MODIFY_HEADER_ACTIONS_PRM, + actions, actions_sz); + fill_attr_const_in(cmd, MLX5_IB_ATTR_CREATE_MODIFY_HEADER_FT_TYPE, + ft_type); + + action = calloc(1, sizeof(*action)); + if (!action) { + errno = ENOMEM; + return NULL; + } + + ret = execute_ioctl(ctx, cmd); + if (ret) { + free(action); + return NULL; + } + + action->action.context = ctx; + action->type = IBV_FLOW_ACTION_UNSPECIFIED; + action->handle = read_attr_obj(MLX5_IB_ATTR_CREATE_MODIFY_HEADER_HANDLE, + handle); + + return &action->action; +} + int mlx5_destroy_flow_action(struct ibv_flow_action *action) { struct verbs_flow_action *vaction =