Thu, Jun 13, 2019 at 07:59:54AM CEST, leon@xxxxxxxxxx wrote:
>On Thu, Jun 13, 2019 at 04:32:25AM +0000, Parav Pandit wrote:
>>
>>
>> > -----Original Message-----
>> > From: Leon Romanovsky <leon@xxxxxxxxxx>
>> > Sent: Wednesday, June 12, 2019 5:50 PM
>> > To: Doug Ledford <dledford@xxxxxxxxxx>; Jason Gunthorpe
>> > <jgg@xxxxxxxxxxxx>
>> > Cc: Leon Romanovsky <leonro@xxxxxxxxxxxx>; RDMA mailing list <linux-
>> > rdma@xxxxxxxxxxxxxxx>; Maor Gottlieb <maorg@xxxxxxxxxxxx>; Mark Bloch
>> > <markb@xxxxxxxxxxxx>; Parav Pandit <parav@xxxxxxxxxxxx>; Petr Vorel
>> > <pvorel@xxxxxxx>; Saeed Mahameed <saeedm@xxxxxxxxxxxx>; linux-
>> > netdev <netdev@xxxxxxxxxxxxxxx>; Jiri Pirko <jiri@xxxxxxxxxxxx>
>> > Subject: [PATCH mlx5-next v1 1/4] net/mlx5: Declare more strictly devlink
>> > encap mode
>> >
>> > From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
>> >
>> > Devlink has UAPI declaration for encap mode, so there is no need to be
>> > loose on the data get/set by drivers.
>> >
>> > Update call sites to use enum devlink_eswitch_encap_mode instead of plain
>> > u8.
>> >
>> > Suggested-by: Parav Pandit <parav@xxxxxxxxxxxx>
>> > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
>> > ---
>> > drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 8 +++++---
>> > .../net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 ++++--
>> > include/net/devlink.h | 6 ++++--
>> > net/core/devlink.c | 6 ++++--
>> > 4 files changed, 17 insertions(+), 9 deletions(-)
>> >
>> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
>> > b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
>> > index ed3fad689ec9..e264dfc64a6e 100644
>> > --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
>> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
>> > @@ -175,7 +175,7 @@ struct mlx5_esw_offload {
>> > DECLARE_HASHTABLE(mod_hdr_tbl, 8);
>> > u8 inline_mode;
>> > u64 num_flows;
>> > - u8 encap;
>> > + enum devlink_eswitch_encap_mode encap;
>> > };
>> >
>> > /* E-Switch MC FDB table hash node */
>> > @@ -356,9 +356,11 @@ int mlx5_devlink_eswitch_inline_mode_set(struct
>> > devlink *devlink, u8 mode,
>> > struct netlink_ext_ack *extack);
>> > int mlx5_devlink_eswitch_inline_mode_get(struct devlink *devlink, u8
>> > *mode); int mlx5_eswitch_inline_mode_get(struct mlx5_eswitch *esw, int
>> > nvfs, u8 *mode); -int mlx5_devlink_eswitch_encap_mode_set(struct devlink
>> > *devlink, u8 encap,
>> > +int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink,
>> > + enum devlink_eswitch_encap_mode
>> > encap,
>> > struct netlink_ext_ack *extack);
>> > -int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink, u8
>> > *encap);
>> > +int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,
>> > + enum devlink_eswitch_encap_mode
>> > *encap);
>> > void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8
>> > rep_type);
>> >
>> > int mlx5_eswitch_add_vlan_action(struct mlx5_eswitch *esw, diff --git
>> > a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>> > b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>> > index e09ae27485ee..f1571163143d 100644
>> > --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>> > @@ -2137,7 +2137,8 @@ int mlx5_eswitch_inline_mode_get(struct
>> > mlx5_eswitch *esw, int nvfs, u8 *mode)
>> > return 0;
>> > }
>> >
>> > -int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8
>> > encap,
>> > +int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink,
>> > + enum devlink_eswitch_encap_mode
>> > encap,
>> > struct netlink_ext_ack *extack)
>> > {
>> > struct mlx5_core_dev *dev = devlink_priv(devlink); @@ -2186,7
>> > +2187,8 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink
>> > *devlink, u8 encap,
>> > return err;
>> > }
>> >
>> > -int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink, u8
>> > *encap)
>> > +int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,
>> > + enum devlink_eswitch_encap_mode
>> > *encap)
>> > {
>> > struct mlx5_core_dev *dev = devlink_priv(devlink);
>> > struct mlx5_eswitch *esw = dev->priv.eswitch; diff --git
>> > a/include/net/devlink.h b/include/net/devlink.h index
>> > 1c4adfb4195a..7a34fc586def 100644
>> > --- a/include/net/devlink.h
>> > +++ b/include/net/devlink.h
>> > @@ -530,8 +530,10 @@ struct devlink_ops {
>> > int (*eswitch_inline_mode_get)(struct devlink *devlink, u8
>> > *p_inline_mode);
>> > int (*eswitch_inline_mode_set)(struct devlink *devlink, u8
>> > inline_mode,
>> > struct netlink_ext_ack *extack);
>> > - int (*eswitch_encap_mode_get)(struct devlink *devlink, u8
>> > *p_encap_mode);
>> > - int (*eswitch_encap_mode_set)(struct devlink *devlink, u8
>> > encap_mode,
>> > + int (*eswitch_encap_mode_get)(struct devlink *devlink,
>> > + enum devlink_eswitch_encap_mode
>> > *p_encap_mode);
>> > + int (*eswitch_encap_mode_set)(struct devlink *devlink,
>> > + enum devlink_eswitch_encap_mode
>> > encap_mode,
>> > struct netlink_ext_ack *extack);
>> > int (*info_get)(struct devlink *devlink, struct devlink_info_req *req,
>> > struct netlink_ext_ack *extack);
>> > diff --git a/net/core/devlink.c b/net/core/devlink.c index
>> > d43bc52b8840..47ae69363b07 100644
>> > --- a/net/core/devlink.c
>> > +++ b/net/core/devlink.c
>> > @@ -1552,7 +1552,8 @@ static int devlink_nl_eswitch_fill(struct sk_buff
>> > *msg, struct devlink *devlink,
>> > u32 seq, int flags)
>> > {
>> > const struct devlink_ops *ops = devlink->ops;
>> > - u8 inline_mode, encap_mode;
>> > + enum devlink_eswitch_encap_mode encap_mode;
>> > + u8 inline_mode;
>> > void *hdr;
>> > int err = 0;
>> > u16 mode;
>> > @@ -1628,7 +1629,8 @@ static int devlink_nl_cmd_eswitch_set_doit(struct
>> > sk_buff *skb, {
>> > struct devlink *devlink = info->user_ptr[0];
>> > const struct devlink_ops *ops = devlink->ops;
>> > - u8 inline_mode, encap_mode;
>> > + enum devlink_eswitch_encap_mode encap_mode;
>> > + u8 inline_mode;
>> > int err = 0;
>> > u16 mode;
>> >
>> > --
>> > 2.20.1
>>
>> Netdev follows reverse Christmas tree, but otherwise,
>
>It was before this patch, if Jiri is ok with that, I'll change this
>"const struct devlink_ops *ops = devlink->ops;" line while I'll apply
>this patchset to mlx5-net. If not, I'll leave it as is.
Change to what? I don't follow. The patch looks completely fine to me as
it is.
Acked-by: Jiri Pirko <jiri@xxxxxxxxxxxx>
>
>> Reviewed-by: Parav Pandit <parav@xxxxxxxxxxxx>
>
>Thanks
>
>>
