From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ori Kam Subject: Re: [PATCH v2 3/3] net/mlx5: update modify header using Direct Verbs Date: Tue, 2 Apr 2019 16:34:02 +0000 Message-ID: References: <1553177917-43297-1-git-send-email-dekelp@mellanox.com> <1554218001-62012-4-git-send-email-dekelp@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc: "dev@dpdk.org" , Dekel Peled To: Dekel Peled , Adrien Mazarguil , "wenzhuo.lu@intel.com" , "jingjing.wu@intel.com" , "bernard.iremonger@intel.com" , Yongseok Koh , Shahaf Shuler Return-path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10052.outbound.protection.outlook.com [40.107.1.52]) by dpdk.org (Postfix) with ESMTP id C3C934CA9 for ; Tue, 2 Apr 2019 18:34:06 +0200 (CEST) In-Reply-To: <1554218001-62012-4-git-send-email-dekelp@mellanox.com> Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: dev On Behalf Of Dekel Peled > Sent: Tuesday, April 2, 2019 6:13 PM > To: Adrien Mazarguil ; wenzhuo.lu@intel.com; > jingjing.wu@intel.com; bernard.iremonger@intel.com; Yongseok Koh > ; Shahaf Shuler > Cc: dev@dpdk.org; Ori Kam ; Dekel Peled > > Subject: [dpdk-dev] [PATCH v2 3/3] net/mlx5: update modify header using > Direct Verbs >=20 > This patch implements additional actions of packet header > modifications. >=20 > Add actions: > - INC_TCP_SEQ - Increase sequence number in the outermost TCP header. > - DEC_TCP_SEQ - Decrease sequence number in the outermost TCP header. > - INC_TCP_ACK - Increase acknowledgment number in the outermost TCP > header. > - DEC_TCP_ACK - Decrease acknowledgment number in the outermost TCP > header. >=20 > Original work by Xiaoyu Min. >=20 > Signed-off-by: Dekel Peled > --- > drivers/net/mlx5/mlx5_flow.h | 10 +- > drivers/net/mlx5/mlx5_flow_dv.c | 239 > ++++++++++++++++++++++++++++++++++++++++ > drivers/net/mlx5/mlx5_prm.h | 12 ++ > 3 files changed, 260 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index e1e798b..c49e245 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -113,6 +113,10 @@ > #define MLX5_FLOW_ACTION_NVGRE_DECAP (1u << 25) > #define MLX5_FLOW_ACTION_RAW_ENCAP (1u << 26) > #define MLX5_FLOW_ACTION_RAW_DECAP (1u << 27) > +#define MLX5_FLOW_ACTION_INC_TCP_SEQ (1u << 28) > +#define MLX5_FLOW_ACTION_DEC_TCP_SEQ (1u << 29) > +#define MLX5_FLOW_ACTION_INC_TCP_ACK (1u << 30) > +#define MLX5_FLOW_ACTION_DEC_TCP_ACK (1u << 31) >=20 > #define MLX5_FLOW_FATE_ACTIONS \ > (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | > MLX5_FLOW_ACTION_RSS) > @@ -134,7 +138,11 @@ > MLX5_FLOW_ACTION_SET_TTL | \ > MLX5_FLOW_ACTION_DEC_TTL | \ > MLX5_FLOW_ACTION_SET_MAC_SRC | \ > - MLX5_FLOW_ACTION_SET_MAC_DST) > + MLX5_FLOW_ACTION_SET_MAC_DST | \ > + MLX5_FLOW_ACTION_INC_TCP_SEQ | \ > + MLX5_FLOW_ACTION_DEC_TCP_SEQ | \ > + MLX5_FLOW_ACTION_INC_TCP_ACK | \ > + MLX5_FLOW_ACTION_DEC_TCP_ACK) >=20 > #ifndef IPPROTO_MPLS > #define IPPROTO_MPLS 137 > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c > index 966dad9..eadd93f 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -126,6 +126,8 @@ struct field_modify_info modify_udp[] =3D { > struct field_modify_info modify_tcp[] =3D { > {2, 0, MLX5_MODI_OUT_TCP_SPORT}, > {2, 2, MLX5_MODI_OUT_TCP_DPORT}, > + {4, 4, MLX5_MODI_OUT_TCP_SEQ_NUM}, > + {4, 8, MLX5_MODI_OUT_TCP_ACK_NUM}, > {0, 0, 0}, > }; >=20 > @@ -512,6 +514,98 @@ struct field_modify_info modify_tcp[] =3D { > } >=20 > /** > + * Convert modify-header increment/decrement TCP Sequence number > + * to DV specification. > + * > + * @param[in,out] resource > + * Pointer to the modify-header resource. > + * @param[in] action > + * Pointer to action specification. > + * @param[out] error > + * Pointer to the error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_convert_action_modify_tcp_seq > + (struct mlx5_flow_dv_modify_hdr_resource *resource, > + const struct rte_flow_action *action, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_action_modify_tcp_seq *conf =3D > + (const struct rte_flow_action_modify_tcp_seq *)(action->conf); > + uint64_t value =3D rte_be_to_cpu_32(conf->value); > + struct rte_flow_item item; > + struct rte_flow_item_tcp tcp; > + struct rte_flow_item_tcp tcp_mask; > + > + memset(&tcp, 0, sizeof(tcp)); > + memset(&tcp_mask, 0, sizeof(tcp_mask)); > + if (action->type =3D=3D RTE_FLOW_ACTION_TYPE_DEC_TCP_SEQ) > + /* > + * The HW has no decrement operation, only increment > operation. > + * To simulate decrement X from Y using increment operation > + * we need to add UINT32_MAX X times to Y. > + * Each adding of UINT32_MAX decrements Y by 1. > + */ > + value *=3D UINT32_MAX; > + tcp.hdr.sent_seq =3D rte_cpu_to_be_32((uint32_t)value); > + tcp_mask.hdr.sent_seq =3D RTE_BE32(UINT32_MAX); > + item.type =3D RTE_FLOW_ITEM_TYPE_TCP; > + item.spec =3D &tcp; > + item.mask =3D &tcp_mask; > + return flow_dv_convert_modify_action(&item, modify_tcp, resource, > + MLX5_MODIFICATION_TYPE_ADD, > error); > +} > + > +/** > + * Convert modify-header increment/decrement TCP Acknowledgment > number > + * to DV specification. > + * > + * @param[in,out] resource > + * Pointer to the modify-header resource. > + * @param[in] action > + * Pointer to action specification. > + * @param[out] error > + * Pointer to the error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_convert_action_modify_tcp_ack > + (struct mlx5_flow_dv_modify_hdr_resource *resource, > + const struct rte_flow_action *action, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_action_modify_tcp_ack *conf =3D > + (const struct rte_flow_action_modify_tcp_ack *)(action->conf); > + uint64_t value =3D rte_be_to_cpu_32(conf->value); > + struct rte_flow_item item; > + struct rte_flow_item_tcp tcp; > + struct rte_flow_item_tcp tcp_mask; > + > + memset(&tcp, 0, sizeof(tcp)); > + memset(&tcp_mask, 0, sizeof(tcp_mask)); > + if (action->type =3D=3D RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK) > + /* > + * The HW has no decrement operation, only increment > operation. > + * To simulate decrement X from Y using increment operation > + * we need to add UINT32_MAX X times to Y. > + * Each adding of UINT32_MAX decrements Y by 1. > + */ > + value *=3D UINT32_MAX; > + tcp.hdr.recv_ack =3D rte_cpu_to_be_32((uint32_t)value); > + tcp_mask.hdr.recv_ack =3D RTE_BE32(UINT32_MAX); > + item.type =3D RTE_FLOW_ITEM_TYPE_TCP; > + item.spec =3D &tcp; > + item.mask =3D &tcp_mask; > + return flow_dv_convert_modify_action(&item, modify_tcp, resource, > + MLX5_MODIFICATION_TYPE_ADD, > error); > +} > + > +/** > * Validate META item. > * > * @param[in] dev > @@ -1385,6 +1479,96 @@ struct field_modify_info modify_tcp[] =3D { > } >=20 > /** > + * Validate the modify-header actions of increment/decrement > + * TCP Sequence-number. > + * > + * @param[in] action_flags > + * Holds the actions detected until now. > + * @param[in] action > + * Pointer to the modify action. > + * @param[in] item_flags > + * Holds the items detected. > + * @param[out] error > + * Pointer to error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_validate_action_modify_tcp_seq(const uint64_t action_flags, > + const struct rte_flow_action *action, > + const uint64_t item_flags, > + struct rte_flow_error *error) > +{ > + int ret =3D 0; > + > + ret =3D flow_dv_validate_action_modify_hdr(action_flags, action, error)= ; > + if (!ret) { > + if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L4_TCP)) > + return rte_flow_error_set(error, EINVAL, > + > RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, "no TCP item in" > + " pattern"); > + if ((action->type =3D=3D RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ > && > + (action_flags & MLX5_FLOW_ACTION_DEC_TCP_SEQ)) > || > + (action->type =3D=3D RTE_FLOW_ACTION_TYPE_DEC_TCP_SEQ > && > + (action_flags & MLX5_FLOW_ACTION_INC_TCP_SEQ))) > + return rte_flow_error_set(error, EINVAL, > + > RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "cannot decrease and > increase" > + " TCP sequence number" > + " at the same time"); > + } > + return ret; > +} > + > +/** > + * Validate the modify-header actions of increment/decrement > + * TCP Acknowledgment number. > + * > + * @param[in] action_flags > + * Holds the actions detected until now. > + * @param[in] action > + * Pointer to the modify action. > + * @param[in] item_flags > + * Holds the items detected. > + * @param[out] error > + * Pointer to error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_validate_action_modify_tcp_ack(const uint64_t action_flags, > + const struct rte_flow_action *action, > + const uint64_t item_flags, > + struct rte_flow_error *error) > +{ > + int ret =3D 0; > + > + ret =3D flow_dv_validate_action_modify_hdr(action_flags, action, error)= ; > + if (!ret) { > + if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L4_TCP)) > + return rte_flow_error_set(error, EINVAL, > + > RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, "no TCP item in" > + " pattern"); > + if ((action->type =3D=3D RTE_FLOW_ACTION_TYPE_INC_TCP_ACK > && > + (action_flags & MLX5_FLOW_ACTION_DEC_TCP_ACK)) > || > + (action->type =3D=3D RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK > && > + (action_flags & MLX5_FLOW_ACTION_INC_TCP_ACK))) > + return rte_flow_error_set(error, EINVAL, > + > RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "cannot decrease and > increase" > + " TCP acknowledgment > number" > + " at the same time"); > + } > + return ret; > +} > + > +/** > * Validate the modify-header TTL actions. > * > * @param[in] action_flags > @@ -1962,6 +2146,40 @@ struct field_modify_info modify_tcp[] =3D { >=20 > MLX5_FLOW_ACTION_SET_TTL : >=20 > MLX5_FLOW_ACTION_DEC_TTL; > break; > + case RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ: > + case RTE_FLOW_ACTION_TYPE_DEC_TCP_SEQ: > + ret =3D flow_dv_validate_action_modify_tcp_seq > + (action_flags, > + actions, > + item_flags, > + error); > + if (ret < 0) > + return ret; > + /* Count all modify-header actions as one action. */ > + if (!(action_flags & > MLX5_FLOW_MODIFY_HDR_ACTIONS)) > + ++actions_n; > + action_flags |=3D actions->type =3D=3D > + > RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ ? > + > MLX5_FLOW_ACTION_INC_TCP_SEQ : > + > MLX5_FLOW_ACTION_DEC_TCP_SEQ; > + break; > + case RTE_FLOW_ACTION_TYPE_INC_TCP_ACK: > + case RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK: > + ret =3D flow_dv_validate_action_modify_tcp_ack > + (action_flags, > + actions, > + item_flags, > + error); > + if (ret < 0) > + return ret; > + /* Count all modify-header actions as one action. */ > + if (!(action_flags & > MLX5_FLOW_MODIFY_HDR_ACTIONS)) > + ++actions_n; > + action_flags |=3D actions->type =3D=3D > + > RTE_FLOW_ACTION_TYPE_INC_TCP_ACK ? > + > MLX5_FLOW_ACTION_INC_TCP_ACK : > + > MLX5_FLOW_ACTION_DEC_TCP_ACK; > + break; > default: > return rte_flow_error_set(error, ENOTSUP, >=20 > RTE_FLOW_ERROR_TYPE_ACTION, > @@ -3089,6 +3307,27 @@ struct field_modify_info modify_tcp[] =3D { > return -rte_errno; > action_flags |=3D MLX5_FLOW_ACTION_SET_TTL; > break; > + case RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ: > + case RTE_FLOW_ACTION_TYPE_DEC_TCP_SEQ: > + if (flow_dv_convert_action_modify_tcp_seq(&res, > actions, > + error)) > + return -rte_errno; > + action_flags |=3D actions->type =3D=3D > + > RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ ? > + MLX5_FLOW_ACTION_INC_TCP_SEQ : > + MLX5_FLOW_ACTION_DEC_TCP_SEQ; > + break; > + > + case RTE_FLOW_ACTION_TYPE_INC_TCP_ACK: > + case RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK: > + if (flow_dv_convert_action_modify_tcp_ack(&res, > actions, > + error)) > + return -rte_errno; > + action_flags |=3D actions->type =3D=3D > + > RTE_FLOW_ACTION_TYPE_INC_TCP_ACK ? > + MLX5_FLOW_ACTION_INC_TCP_ACK : > + MLX5_FLOW_ACTION_DEC_TCP_ACK; > + break; > case RTE_FLOW_ACTION_TYPE_END: > actions_end =3D true; > if (action_flags & > MLX5_FLOW_MODIFY_HDR_ACTIONS) { > diff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h > index da1219e..d5c5d3c 100644 > --- a/drivers/net/mlx5/mlx5_prm.h > +++ b/drivers/net/mlx5/mlx5_prm.h > @@ -336,6 +336,18 @@ enum mlx5_modification_field { > MLX5_MODI_IN_IPV6_HOPLIMIT, > MLX5_MODI_META_DATA_REG_A, > MLX5_MODI_META_DATA_REG_B =3D 0x50, > + MLX5_MODI_META_REG_C_0, > + MLX5_MODI_META_REG_C_1, > + MLX5_MODI_META_REG_C_2, > + MLX5_MODI_META_REG_C_3, > + MLX5_MODI_META_REG_C_4, > + MLX5_MODI_META_REG_C_5, > + MLX5_MODI_META_REG_C_6, > + MLX5_MODI_META_REG_C_7, > + MLX5_MODI_OUT_TCP_SEQ_NUM, > + MLX5_MODI_IN_TCP_SEQ_NUM, > + MLX5_MODI_OUT_TCP_ACK_NUM, > + MLX5_MODI_IN_TCP_ACK_NUM =3D 0x5C, > }; >=20 > /* Modification sub command. */ > -- > 1.8.3.1 Thanks, Acked-by: Ori Kam