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 257D9A04DB; Mon, 16 Nov 2020 10:14:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D8D01C914; Mon, 16 Nov 2020 10:13:52 +0100 (CET) Received: from hqnvemgate25.nvidia.com (hqnvemgate25.nvidia.com [216.228.121.64]) by dpdk.org (Postfix) with ESMTP id 0123EC902 for ; Mon, 16 Nov 2020 10:13:49 +0100 (CET) Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Mon, 16 Nov 2020 01:13:40 -0800 Received: from nvidia.com (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 16 Nov 2020 09:13:45 +0000 From: Gregory Etelson To: CC: , , , Viacheslav Ovsiienko , Shahaf Shuler Date: Mon, 16 Nov 2020 11:13:23 +0200 Message-ID: <20201116091326.10511-4-getelson@nvidia.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201116091326.10511-1-getelson@nvidia.com> References: <20201111071417.21177-1-getelson@nvidia.com> <20201116091326.10511-1-getelson@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1605518020; bh=dBLrfjTzWKBnUmvo/6TPCg+6xgVFZ4cpCpbC6CAEI1M=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:Content-Type: X-Originating-IP:X-ClientProxiedBy; b=EeCh8VOeaIQxcgFs0UqK6oqUPooVsl/98W81SEPmZZ1BOipOjCkfBfFJ1FnjAcyZF QRwDlN/i5rMAGo7SqGSxiC2RIn1X+aIB+hdoZIdfXx7vAeUd6U4rLmUuRB/EGoxFLt i1lfgVObmBo9C8PUrycxHE3hAMGqHAYMHkkQq2DFWWfESUkz0QYthIDHK03/vKamhr Z3JhI2XYMPUpbya5buVbDuvjTNVP0rOzHVT6hA3fToejbbwAhSMcUUsZ2gXAYknE6T fD3CvNnn7tpcyPd7p1rRm3sTRvhF97MzsF1yti3y/3F2BYBGyqzIzu7VYZTjOJiByN yZ5YfbJ0JNocg== Subject: [dpdk-dev] [PATCH v3 3/6] net/mlx5: fix structure passing method in function call X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Tunnel offload implementation introduced 64 bit-field flow_grp_info structure. Since the structure size is 64 bits, the code passed that type by value in function calls. The patch changes that structure passing method to reference. Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload") Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 20 +++++++++++--------- drivers/net/mlx5/mlx5_flow.h | 4 ++-- drivers/net/mlx5/mlx5_flow_dv.c | 10 +++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index e4fe78df4c..4216d3d18d 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -6769,9 +6769,11 @@ mlx5_flow_tunnel_grp2tbl_create_cb(struct mlx5_hlist= *list, =20 static int flow_group_to_table(uint32_t port_id, uint32_t group, uint32_t *table, - struct flow_grp_info grp_info, struct rte_flow_error *error) + const struct flow_grp_info *grp_info, + struct rte_flow_error *error) { - if (grp_info.transfer && grp_info.external && grp_info.fdb_def_rule) { + if (grp_info->transfer && grp_info->external && + grp_info->fdb_def_rule) { if (group =3D=3D UINT32_MAX) return rte_flow_error_set (error, EINVAL, @@ -6828,25 +6830,25 @@ int mlx5_flow_group_to_table(struct rte_eth_dev *dev, const struct mlx5_flow_tunnel *tunnel, uint32_t group, uint32_t *table, - struct flow_grp_info grp_info, + const struct flow_grp_info *grp_info, struct rte_flow_error *error) { int ret; bool standard_translation; =20 - if (!grp_info.skip_scale && grp_info.external && + if (!grp_info->skip_scale && grp_info->external && group < MLX5_MAX_TABLES_EXTERNAL) group *=3D MLX5_FLOW_TABLE_FACTOR; if (is_tunnel_offload_active(dev)) { - standard_translation =3D !grp_info.external || - grp_info.std_tbl_fix; + standard_translation =3D !grp_info->external || + grp_info->std_tbl_fix; } else { standard_translation =3D true; } DRV_LOG(DEBUG, "port %u group=3D%#x transfer=3D%d external=3D%d fdb_def_rule=3D%d trans= late=3D%s", - dev->data->port_id, group, grp_info.transfer, - grp_info.external, grp_info.fdb_def_rule, + dev->data->port_id, group, grp_info->transfer, + grp_info->external, grp_info->fdb_def_rule, standard_translation ? "STANDARD" : "TUNNEL"); if (standard_translation) ret =3D flow_group_to_table(dev->data->port_id, group, table, @@ -7343,7 +7345,7 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, miss_attr.priority =3D MLX5_TNL_MISS_RULE_PRIORITY; miss_attr.group =3D jump_data->group; ret =3D mlx5_flow_group_to_table(dev, tunnel, jump_data->group, - &flow_table, grp_info, error); + &flow_table, &grp_info, error); if (ret) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_CONF, diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index fbc6173fcb..c33c0fee7c 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1273,8 +1273,8 @@ tunnel_use_standard_attr_group_translate int mlx5_flow_group_to_table(struct rte_eth_dev *dev, const struct mlx5_flow_tunnel *tunnel, uint32_t group, uint32_t *table, - struct flow_grp_info flags, - struct rte_flow_error *error); + const struct flow_grp_info *flags, + struct rte_flow_error *error); uint64_t mlx5_flow_hashfields_adjust(struct mlx5_flow_rss_desc *rss_desc, int tunnel, uint64_t layer_types, uint64_t hash_fields); diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_d= v.c index 62d9ca9ffb..25ab9adee6 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3935,7 +3935,7 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, target_group =3D ((const struct rte_flow_action_jump *)action->conf)->group; ret =3D mlx5_flow_group_to_table(dev, tunnel, target_group, &table, - grp_info, error); + &grp_info, error); if (ret) return ret; if (attributes->group =3D=3D target_group && @@ -5103,7 +5103,7 @@ static int flow_dv_validate_attributes(struct rte_eth_dev *dev, const struct mlx5_flow_tunnel *tunnel, const struct rte_flow_attr *attributes, - struct flow_grp_info grp_info, + const struct flow_grp_info *grp_info, struct rte_flow_error *error) { struct mlx5_priv *priv =3D dev->data->dev_private; @@ -5258,7 +5258,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struc= t rte_flow_attr *attr, } grp_info.std_tbl_fix =3D tunnel_use_standard_attr_group_translate (dev, tunnel, attr, items, actions); - ret =3D flow_dv_validate_attributes(dev, tunnel, attr, grp_info, error); + ret =3D flow_dv_validate_attributes(dev, tunnel, attr, &grp_info, error); if (ret < 0) return ret; is_root =3D (uint64_t)ret; @@ -9597,7 +9597,7 @@ flow_dv_translate(struct rte_eth_dev *dev, grp_info.std_tbl_fix =3D tunnel_use_standard_attr_group_translate (dev, tunnel, attr, items, actions); ret =3D mlx5_flow_group_to_table(dev, tunnel, attr->group, &table, - grp_info, error); + &grp_info, error); if (ret) return ret; dev_flow->dv.group =3D table; @@ -9944,7 +9944,7 @@ flow_dv_translate(struct rte_eth_dev *dev, ret =3D mlx5_flow_group_to_table(dev, tunnel, jump_group, &table, - grp_info, error); + &grp_info, error); if (ret) return ret; tbl =3D flow_dv_tbl_resource_get(dev, table, attr->egress, --=20 2.29.2