| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <6241b491-2957-e80a-6ba5-c1f2138d84e0@nvidia.com>
Date: Wed, 22 Sep 2021 10:23:36 +0300
From: Roi Dayan <roid@...dia.com>
To: Abhiram R N <abhiramrn@...il.com>
CC: <arn@...hat.com>, <hakhande@...hat.com>, <saeedm@...dia.com>,
"Leon Romanovsky" <leon@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
"Jakub Kicinski" <kuba@...nel.org>, <netdev@...r.kernel.org>,
<linux-rdma@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH net-next v6] net/mlx5e: Add extack msgs related to TC for
better debug
On 2021-09-22 9:30 AM, Abhiram R N wrote:
> As multiple places EOPNOTSUPP and EINVAL is returned from driver
> it becomes difficult to understand the reason only with error code.
> With the netlink extack message exact reason will be known and will
> aid in debugging.
>
> Signed-off-by: Abhiram R N <abhiramrn@...il.com>
> ---
> V5->V6: Removed changelog from commit msg
> V4->V5: Addressed comments (Rephrasing of msgs)
> V3->V4: Rebased net-next (Fixed the merge conflicts in net-next branch)
> V2->V3: Addressed comments (Rephrasing of msgs)
> V1->V2: Addressed comments (Removed redundant msgs, rephrasing of msgs)
>
> .../net/ethernet/mellanox/mlx5/core/en_tc.c | 106 +++++++++++++-----
> 1 file changed, 76 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> index ba8164792016..0fda231c07cd 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> @@ -1896,8 +1896,10 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv,
> bool needs_mapping, sets_mapping;
> int err;
>
> - if (!mlx5e_is_eswitch_flow(flow))
> + if (!mlx5e_is_eswitch_flow(flow)) {
> + NL_SET_ERR_MSG_MOD(extack, "Match on tunnel is not supported");
> return -EOPNOTSUPP;
> + }
>
> needs_mapping = !!flow->attr->chain;
> sets_mapping = flow_requires_tunnel_mapping(flow->attr->chain, f);
> @@ -2269,8 +2271,10 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
> addr_type = match.key->addr_type;
>
> /* the HW doesn't support frag first/later */
> - if (match.mask->flags & FLOW_DIS_FIRST_FRAG)
> + if (match.mask->flags & FLOW_DIS_FIRST_FRAG) {
> + NL_SET_ERR_MSG_MOD(extack, "Match on frag first/later is not supported");
> return -EOPNOTSUPP;
> + }
>
> if (match.mask->flags & FLOW_DIS_IS_FRAGMENT) {
> MLX5_SET(fte_match_set_lyr_2_4, headers_c, frag, 1);
> @@ -2437,8 +2441,11 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
> switch (ip_proto) {
> case IPPROTO_ICMP:
> if (!(MLX5_CAP_GEN(priv->mdev, flex_parser_protocols) &
> - MLX5_FLEX_PROTO_ICMP))
> + MLX5_FLEX_PROTO_ICMP)) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "Match on Flex protocols for ICMP is not supported");
> return -EOPNOTSUPP;
> + }
> MLX5_SET(fte_match_set_misc3, misc_c_3, icmp_type,
> match.mask->type);
> MLX5_SET(fte_match_set_misc3, misc_v_3, icmp_type,
> @@ -2450,8 +2457,11 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
> break;
> case IPPROTO_ICMPV6:
> if (!(MLX5_CAP_GEN(priv->mdev, flex_parser_protocols) &
> - MLX5_FLEX_PROTO_ICMPV6))
> + MLX5_FLEX_PROTO_ICMPV6)) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "Match on Flex protocols for ICMPV6 is not supported");
> return -EOPNOTSUPP;
> + }
> MLX5_SET(fte_match_set_misc3, misc_c_3, icmpv6_type,
> match.mask->type);
> MLX5_SET(fte_match_set_misc3, misc_v_3, icmpv6_type,
> @@ -2557,15 +2567,19 @@ static int pedit_header_offsets[] = {
> #define pedit_header(_ph, _htype) ((void *)(_ph) + pedit_header_offsets[_htype])
>
> static int set_pedit_val(u8 hdr_type, u32 mask, u32 val, u32 offset,
> - struct pedit_headers_action *hdrs)
> + struct pedit_headers_action *hdrs,
> + struct netlink_ext_ack *extack)
> {
> u32 *curr_pmask, *curr_pval;
>
> curr_pmask = (u32 *)(pedit_header(&hdrs->masks, hdr_type) + offset);
> curr_pval = (u32 *)(pedit_header(&hdrs->vals, hdr_type) + offset);
>
> - if (*curr_pmask & mask) /* disallow acting twice on the same location */
> + if (*curr_pmask & mask) { /* disallow acting twice on the same location */
> + NL_SET_ERR_MSG_MOD(extack,
> + "curr_pmask and new mask same. Acting twice on same location");
> goto out_err;
> + }
>
> *curr_pmask |= mask;
> *curr_pval |= (val & mask);
> @@ -2898,7 +2912,7 @@ parse_pedit_to_modify_hdr(struct mlx5e_priv *priv,
> val = act->mangle.val;
> offset = act->mangle.offset;
>
> - err = set_pedit_val(htype, ~mask, val, offset, &hdrs[cmd]);
> + err = set_pedit_val(htype, ~mask, val, offset, &hdrs[cmd], extack);
> if (err)
> goto out_err;
>
> @@ -2918,8 +2932,10 @@ parse_pedit_to_reformat(struct mlx5e_priv *priv,
> u32 mask, val, offset;
> u32 *p;
>
> - if (act->id != FLOW_ACTION_MANGLE)
> + if (act->id != FLOW_ACTION_MANGLE) {
> + NL_SET_ERR_MSG_MOD(extack, "Unsupported action id");
> return -EOPNOTSUPP;
> + }
>
> if (act->mangle.htype != FLOW_ACT_MANGLE_HDR_TYPE_ETH) {
> NL_SET_ERR_MSG_MOD(extack, "Only Ethernet modification is supported");
> @@ -3368,12 +3384,16 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
> u32 action = 0;
> int err, i;
>
> - if (!flow_action_has_entries(flow_action))
> + if (!flow_action_has_entries(flow_action)) {
> + NL_SET_ERR_MSG_MOD(extack, "Flow action doesn't have any entries");
> return -EINVAL;
> + }
>
> if (!flow_action_hw_stats_check(flow_action, extack,
> - FLOW_ACTION_HW_STATS_DELAYED_BIT))
> + FLOW_ACTION_HW_STATS_DELAYED_BIT)) {
> + NL_SET_ERR_MSG_MOD(extack, "Flow action HW stats type is not supported");
> return -EOPNOTSUPP;
> + }
>
> nic_attr = attr->nic_attr;
> nic_attr->flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;
> @@ -3462,7 +3482,8 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
> flow_flag_set(flow, CT);
> break;
> default:
> - NL_SET_ERR_MSG_MOD(extack, "The offload action is not supported");
> + NL_SET_ERR_MSG_MOD(extack,
> + "The offload action is not supported in NIC action");
> return -EOPNOTSUPP;
> }
> }
> @@ -3517,19 +3538,25 @@ static bool is_merged_eswitch_vfs(struct mlx5e_priv *priv,
> static int parse_tc_vlan_action(struct mlx5e_priv *priv,
> const struct flow_action_entry *act,
> struct mlx5_esw_flow_attr *attr,
> - u32 *action)
> + u32 *action,
> + struct netlink_ext_ack *extack)
> {
> u8 vlan_idx = attr->total_vlan;
>
> - if (vlan_idx >= MLX5_FS_VLAN_DEPTH)
> + if (vlan_idx >= MLX5_FS_VLAN_DEPTH) {
> + NL_SET_ERR_MSG_MOD(extack, "Total vlans used is greater than supported");
> return -EOPNOTSUPP;
> + }
>
> switch (act->id) {
> case FLOW_ACTION_VLAN_POP:
> if (vlan_idx) {
> if (!mlx5_eswitch_vlan_actions_supported(priv->mdev,
> - MLX5_FS_VLAN_DEPTH))
> + MLX5_FS_VLAN_DEPTH)) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "vlan pop action is not supported");
> return -EOPNOTSUPP;
> + }
>
> *action |= MLX5_FLOW_CONTEXT_ACTION_VLAN_POP_2;
> } else {
> @@ -3545,20 +3572,27 @@ static int parse_tc_vlan_action(struct mlx5e_priv *priv,
>
> if (vlan_idx) {
> if (!mlx5_eswitch_vlan_actions_supported(priv->mdev,
> - MLX5_FS_VLAN_DEPTH))
> + MLX5_FS_VLAN_DEPTH)) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "vlan push action is not supported for vlan depth > 1");
> return -EOPNOTSUPP;
> + }
>
> *action |= MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2;
> } else {
> if (!mlx5_eswitch_vlan_actions_supported(priv->mdev, 1) &&
> (act->vlan.proto != htons(ETH_P_8021Q) ||
> - act->vlan.prio))
> + act->vlan.prio)) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "vlan push action is not supported");
> return -EOPNOTSUPP;
> + }
>
> *action |= MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH;
> }
> break;
> default:
> + NL_SET_ERR_MSG_MOD(extack, "Unexpected action id for VLAN");
> return -EINVAL;
> }
>
> @@ -3592,7 +3626,8 @@ static struct net_device *get_fdb_out_dev(struct net_device *uplink_dev,
> static int add_vlan_push_action(struct mlx5e_priv *priv,
> struct mlx5_flow_attr *attr,
> struct net_device **out_dev,
> - u32 *action)
> + u32 *action,
> + struct netlink_ext_ack *extack)
> {
> struct net_device *vlan_dev = *out_dev;
> struct flow_action_entry vlan_act = {
> @@ -3603,7 +3638,7 @@ static int add_vlan_push_action(struct mlx5e_priv *priv,
> };
> int err;
>
> - err = parse_tc_vlan_action(priv, &vlan_act, attr->esw_attr, action);
> + err = parse_tc_vlan_action(priv, &vlan_act, attr->esw_attr, action, extack);
> if (err)
> return err;
>
> @@ -3614,14 +3649,15 @@ static int add_vlan_push_action(struct mlx5e_priv *priv,
> return -ENODEV;
>
> if (is_vlan_dev(*out_dev))
> - err = add_vlan_push_action(priv, attr, out_dev, action);
> + err = add_vlan_push_action(priv, attr, out_dev, action, extack);
>
> return err;
> }
>
> static int add_vlan_pop_action(struct mlx5e_priv *priv,
> struct mlx5_flow_attr *attr,
> - u32 *action)
> + u32 *action,
> + struct netlink_ext_ack *extack)
> {
> struct flow_action_entry vlan_act = {
> .id = FLOW_ACTION_VLAN_POP,
> @@ -3631,7 +3667,7 @@ static int add_vlan_pop_action(struct mlx5e_priv *priv,
> nest_level = attr->parse_attr->filter_dev->lower_level -
> priv->netdev->lower_level;
> while (nest_level--) {
> - err = parse_tc_vlan_action(priv, &vlan_act, attr->esw_attr, action);
> + err = parse_tc_vlan_action(priv, &vlan_act, attr->esw_attr, action, extack);
> if (err)
> return err;
> }
> @@ -3753,12 +3789,16 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
> int err, i, if_count = 0;
> bool mpls_push = false;
>
> - if (!flow_action_has_entries(flow_action))
> + if (!flow_action_has_entries(flow_action)) {
> + NL_SET_ERR_MSG_MOD(extack, "Flow action doesn't have any entries");
> return -EINVAL;
> + }
>
> if (!flow_action_hw_stats_check(flow_action, extack,
> - FLOW_ACTION_HW_STATS_DELAYED_BIT))
> + FLOW_ACTION_HW_STATS_DELAYED_BIT)) {
> + NL_SET_ERR_MSG_MOD(extack, "Flow action HW stats type is not supported");
> return -EOPNOTSUPP;
> + }
>
> esw_attr = attr->esw_attr;
> parse_attr = attr->parse_attr;
> @@ -3902,14 +3942,14 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
> if (is_vlan_dev(out_dev)) {
> err = add_vlan_push_action(priv, attr,
> &out_dev,
> - &action);
> + &action, extack);
> if (err)
> return err;
> }
>
> if (is_vlan_dev(parse_attr->filter_dev)) {
> err = add_vlan_pop_action(priv, attr,
> - &action);
> + &action, extack);
> if (err)
> return err;
> }
> @@ -3955,10 +3995,13 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
> break;
> case FLOW_ACTION_TUNNEL_ENCAP:
> info = act->tunnel;
> - if (info)
> + if (info) {
> encap = true;
> - else
> + } else {
> + NL_SET_ERR_MSG_MOD(extack,
> + "Zero tunnel attributes is not supported");
> return -EOPNOTSUPP;
> + }
>
> break;
> case FLOW_ACTION_VLAN_PUSH:
> @@ -3972,7 +4015,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
> act, parse_attr, hdrs,
> &action, extack);
> } else {
> - err = parse_tc_vlan_action(priv, act, esw_attr, &action);
> + err = parse_tc_vlan_action(priv, act, esw_attr, &action, extack);
> }
> if (err)
> return err;
> @@ -4025,7 +4068,8 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
> flow_flag_set(flow, SAMPLE);
> break;
> default:
> - NL_SET_ERR_MSG_MOD(extack, "The offload action is not supported");
> + NL_SET_ERR_MSG_MOD(extack,
> + "The offload action is not supported in FDB action");
> return -EOPNOTSUPP;
> }
> }
> @@ -4733,8 +4777,10 @@ static int scan_tc_matchall_fdb_actions(struct mlx5e_priv *priv,
> return -EOPNOTSUPP;
> }
>
> - if (!flow_action_basic_hw_stats_check(flow_action, extack))
> + if (!flow_action_basic_hw_stats_check(flow_action, extack)) {
> + NL_SET_ERR_MSG_MOD(extack, "Flow action HW stats type is not supported");
> return -EOPNOTSUPP;
> + }
>
> flow_action_for_each(i, act, flow_action) {
> switch (act->id) {
>
thanks
Reviewed-by: Roi Dayan <roid@...dia.com>
Powered by blists - more mailing lists