On Wed, Mar 18, 2020 at 11:33:46PM +0000, Saeed Mahameed wrote:
> On Wed, 2020-03-18 at 11:52 +0200, Leon Romanovsky wrote:
> > From: Mark Zhang <markz@xxxxxxxxxxxx>
> >
> > When this is enabled, UDP source port for RoCEv2 packets are defined
> > by software instead of firmware.
> >
> > Signed-off-by: Mark Zhang <markz@xxxxxxxxxxxx>
> > Reviewed-by: Maor Gottlieb <maorg@xxxxxxxxxxxx>
> > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
> > ---
> > .../net/ethernet/mellanox/mlx5/core/main.c | 39
> > +++++++++++++++++++
> > include/linux/mlx5/mlx5_ifc.h | 5 ++-
> > 2 files changed, 43 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c
> > b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> > index 6b38ec72215a..bdc73370297b 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> > @@ -585,6 +585,39 @@ static int handle_hca_cap(struct mlx5_core_dev
> > *dev)
> > return err;
> > }
> >
> > +static int handle_hca_cap_roce(struct mlx5_core_dev *dev)
> > +{
> > + int set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);
> > + void *set_hca_cap;
> > + void *set_ctx;
> > + int err;
> > +
> > + if (!MLX5_CAP_GEN(dev, roce))
> > + return 0;
> > +
> > + err = mlx5_core_get_caps(dev, MLX5_CAP_ROCE);
> > + if (err)
> > + return err;
> > +
> > + if (MLX5_CAP_ROCE(dev, sw_r_roce_src_udp_port) ||
> > + !MLX5_CAP_ROCE_MAX(dev, sw_r_roce_src_udp_port))
> > + return 0;
> > +
> > + set_ctx = kzalloc(set_sz, GFP_KERNEL);
> > + if (!set_ctx)
> > + return -ENOMEM;
> > +
>
> all the sisters of this function allocate this and free it
> consecutively, why not allocate it from outside once, pass it to all
> handle_hca_cap_xyz functions, each one will memset it and reuse it.
> see below.
Agree, I'll do it.
>
> > + set_hca_cap = MLX5_ADDR_OF(set_hca_cap_in, set_ctx,
> > capability);
> > + memcpy(set_hca_cap, dev->caps.hca_cur[MLX5_CAP_ROCE],
> > + MLX5_ST_SZ_BYTES(roce_cap));
> > + MLX5_SET(roce_cap, set_hca_cap, sw_r_roce_src_udp_port, 1);
> > +
> > + err = set_caps(dev, set_ctx, set_sz,
> > MLX5_SET_HCA_CAP_OP_MOD_ROCE);
> > +
>
> Do we really need to fail the whole driver if we just try to set a non
> mandatory cap ?
It is less important what caused to failure, but the fact that basic
mlx5_cmd_exec() failed during initialization flow. I think that it
is bad enough to stop the driver, because its operation is going to
be unreliable.
Please share your end-result decision on that and I'll align to it.
>
> > + kfree(set_ctx);
> > + return err;
> > +}
> > +
> > static int set_hca_cap(struct mlx5_core_dev *dev)
> > {
> > int err;
>
> let's allocate the set_ctx in this parent function and pass it to all
> hca cap handlers;
>
> set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);
> set_ctx = kzalloc(set_sz, GFP_KERNEL);
I'm doing it now.
Thanks
