From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 81DD9A04B5 for ; Tue, 27 Oct 2020 11:15:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7278B2BAA; Tue, 27 Oct 2020 11:15:14 +0100 (CET) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id D759D2BAA for ; Tue, 27 Oct 2020 11:15:12 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from ophirmu@nvidia.com) with SMTP; 27 Oct 2020 12:15:07 +0200 Received: from nvidia.com (pegasus05.mtr.labs.mlnx [10.210.16.100]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 09RAF6NV032276; Tue, 27 Oct 2020 12:15:06 +0200 From: Ophir Munk To: Ophir Munk Cc: stable@dpdk.org Date: Tue, 27 Oct 2020 10:15:03 +0000 Message-Id: <20201027101503.16295-1-ophirmu@nvidia.com> X-Mailer: git-send-email 2.8.4 Subject: [dpdk-stable] [PATCH v1] common/mlx5/linux: replace malloc and free in glue X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" This commit replaces mlx5_malloc and mlx5_free calls with Linux calls malloc and free in file mlx5_glue.c. The current mlx5_malloc calls have no flags, alignment or socket selection, so they are equivalent to calling malloc. Rdma core itself is using malloc. When using mlx5_malloc the glue library is dependent on common_mlx5 library which must be compiled first. Not doing so and in case ibverbs_link=dlopen will result in compilation failure: mlx5_glue.c: undefined reference to `mlx5_malloc'. To make all of this simpler and remove the common_mlx5 dependency - this commit does the alloc/free replacements. Fixes: 66914d19d135 ("common/mlx5: convert control path memory to unified malloc") Cc: stable@dpdk.org Signed-off-by: Ophir Munk Acked-by: Matan Azrad --- drivers/common/mlx5/linux/mlx5_glue.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_glue.c b/drivers/common/mlx5/linux/mlx5_glue.c index 47b7e98..89539e7 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.c +++ b/drivers/common/mlx5/linux/mlx5_glue.c @@ -8,7 +8,6 @@ #include #include #include -#include /* * Not needed by this file; included to work around the lack of off_t * definition for mlx5dv.h with unpatched rdma-core versions. @@ -16,7 +15,6 @@ #include #include "mlx5_glue.h" -#include "../mlx5_malloc.h" static int mlx5_glue_fork_init(void) @@ -186,7 +184,7 @@ mlx5_glue_destroy_flow_action(void *action) res = ibv_destroy_flow_action(attr->action); break; } - mlx5_free(action); + free(action); return res; #endif #else @@ -619,7 +617,7 @@ mlx5_glue_dv_create_flow_action_counter(void *counter_obj, uint32_t offset) struct mlx5dv_flow_action_attr *action; (void)offset; - action = mlx5_malloc(0, sizeof(*action), 0, SOCKET_ID_ANY); + action = malloc(sizeof(*action)); if (!action) return NULL; action->type = MLX5DV_FLOW_ACTION_COUNTERS_DEVX; @@ -643,7 +641,7 @@ mlx5_glue_dv_create_flow_action_dest_ibv_qp(void *qp) #else struct mlx5dv_flow_action_attr *action; - action = mlx5_malloc(0, sizeof(*action), 0, SOCKET_ID_ANY); + action = malloc(sizeof(*action)); if (!action) return NULL; action->type = MLX5DV_FLOW_ACTION_DEST_IBV_QP; @@ -688,7 +686,7 @@ mlx5_glue_dv_create_flow_action_modify_header (void)domain; (void)flags; - action = mlx5_malloc(0, sizeof(*action), 0, SOCKET_ID_ANY); + action = malloc(sizeof(*action)); if (!action) return NULL; action->type = MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION; @@ -728,7 +726,7 @@ mlx5_glue_dv_create_flow_action_packet_reformat (void)flags; struct mlx5dv_flow_action_attr *action; - action = mlx5_malloc(0, sizeof(*action), 0, SOCKET_ID_ANY); + action = malloc(sizeof(*action)); if (!action) return NULL; action->type = MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION; @@ -758,7 +756,7 @@ mlx5_glue_dv_create_flow_action_tag(uint32_t tag) #else /* HAVE_MLX5DV_DR */ struct mlx5dv_flow_action_attr *action; - action = mlx5_malloc(0, sizeof(*action), 0, SOCKET_ID_ANY); + action = malloc(sizeof(*action)); if (!action) return NULL; action->type = MLX5DV_FLOW_ACTION_TAG; -- 2.8.4