* [PATCH rdma-rc] RDMA/mlx5: Set GRH fields in query QP on RoCE
@ 2020-04-13 13:20 Leon Romanovsky
2020-04-22 18:44 ` Jason Gunthorpe
0 siblings, 1 reply; 3+ messages in thread
From: Leon Romanovsky @ 2020-04-13 13:20 UTC (permalink / raw)
To: Doug Ledford, Jason Gunthorpe
Cc: Aharon Landau, Dasaratharaman Chandramouli, Don Hiatt, linux-rdma,
Maor Gottlieb, Niranjana Vishwanathapura, Sean Hefty
From: Aharon Landau <aharonl@mellanox.com>
GRH fields such as sgid_index, hop limit and etc. are set in the
QP context when QP is created/modified.
Currently, when query QP is performed, we fill the GRH fields only
if the GRH bit is set in the QP context, but this bit is not set
for RoCE. Adjust the check so we will set all relevant data for
the RoCE too.
Fixes: d8966fcd4c25 ("IB/core: Use rdma_ah_attr accessor functions")
Signed-off-by: Aharon Landau <aharonl@mellanox.com>
Reviewed-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/infiniband/hw/mlx5/qp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 1456db4b6295..a4f8e7c7ed24 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -5558,13 +5558,13 @@ static void to_rdma_ah_attr(struct mlx5_ib_dev *ibdev,
rdma_ah_set_path_bits(ah_attr, path->grh_mlid & 0x7f);
rdma_ah_set_static_rate(ah_attr,
path->static_rate ? path->static_rate - 5 : 0);
- if (path->grh_mlid & (1 << 7)) {
+
+ if (path->grh_mlid & (1 << 7) ||
+ ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE) {
u32 tc_fl = be32_to_cpu(path->tclass_flowlabel);
- rdma_ah_set_grh(ah_attr, NULL,
- tc_fl & 0xfffff,
- path->mgid_index,
- path->hop_limit,
+ rdma_ah_set_grh(ah_attr, NULL, tc_fl & 0xfffff,
+ path->mgid_index, path->hop_limit,
(tc_fl >> 20) & 0xff);
rdma_ah_set_dgid_raw(ah_attr, path->rgid);
}
--
2.25.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH rdma-rc] RDMA/mlx5: Set GRH fields in query QP on RoCE
2020-04-13 13:20 [PATCH rdma-rc] RDMA/mlx5: Set GRH fields in query QP on RoCE Leon Romanovsky
@ 2020-04-22 18:44 ` Jason Gunthorpe
2020-04-23 5:07 ` Leon Romanovsky
0 siblings, 1 reply; 3+ messages in thread
From: Jason Gunthorpe @ 2020-04-22 18:44 UTC (permalink / raw)
To: Leon Romanovsky
Cc: Doug Ledford, Aharon Landau, Dasaratharaman Chandramouli,
Don Hiatt, linux-rdma, Maor Gottlieb, Niranjana Vishwanathapura,
Sean Hefty
On Mon, Apr 13, 2020 at 04:20:28PM +0300, Leon Romanovsky wrote:
> From: Aharon Landau <aharonl@mellanox.com>
>
> GRH fields such as sgid_index, hop limit and etc. are set in the
> QP context when QP is created/modified.
>
> Currently, when query QP is performed, we fill the GRH fields only
> if the GRH bit is set in the QP context, but this bit is not set
> for RoCE. Adjust the check so we will set all relevant data for
> the RoCE too.
>
> Fixes: d8966fcd4c25 ("IB/core: Use rdma_ah_attr accessor functions")
> Signed-off-by: Aharon Landau <aharonl@mellanox.com>
> Reviewed-by: Maor Gottlieb <maorg@mellanox.com>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
> drivers/infiniband/hw/mlx5/qp.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
> index 1456db4b6295..a4f8e7c7ed24 100644
> --- a/drivers/infiniband/hw/mlx5/qp.c
> +++ b/drivers/infiniband/hw/mlx5/qp.c
> @@ -5558,13 +5558,13 @@ static void to_rdma_ah_attr(struct mlx5_ib_dev *ibdev,
> rdma_ah_set_path_bits(ah_attr, path->grh_mlid & 0x7f);
> rdma_ah_set_static_rate(ah_attr,
> path->static_rate ? path->static_rate - 5 : 0);
> - if (path->grh_mlid & (1 << 7)) {
> +
> + if (path->grh_mlid & (1 << 7) ||
> + ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE) {
> u32 tc_fl = be32_to_cpu(path->tclass_flowlabel);
>
> - rdma_ah_set_grh(ah_attr, NULL,
> - tc_fl & 0xfffff,
> - path->mgid_index,
> - path->hop_limit,
> + rdma_ah_set_grh(ah_attr, NULL, tc_fl & 0xfffff,
> + path->mgid_index, path->hop_limit,
Why is whitespace reformatting in a -rc patch? I dropped this.
Applied to for-rc
Jason
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH rdma-rc] RDMA/mlx5: Set GRH fields in query QP on RoCE
2020-04-22 18:44 ` Jason Gunthorpe
@ 2020-04-23 5:07 ` Leon Romanovsky
0 siblings, 0 replies; 3+ messages in thread
From: Leon Romanovsky @ 2020-04-23 5:07 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: Doug Ledford, Aharon Landau, Dasaratharaman Chandramouli,
Don Hiatt, linux-rdma, Maor Gottlieb, Niranjana Vishwanathapura,
Sean Hefty
On Wed, Apr 22, 2020 at 03:44:45PM -0300, Jason Gunthorpe wrote:
> On Mon, Apr 13, 2020 at 04:20:28PM +0300, Leon Romanovsky wrote:
> > From: Aharon Landau <aharonl@mellanox.com>
> >
> > GRH fields such as sgid_index, hop limit and etc. are set in the
> > QP context when QP is created/modified.
> >
> > Currently, when query QP is performed, we fill the GRH fields only
> > if the GRH bit is set in the QP context, but this bit is not set
> > for RoCE. Adjust the check so we will set all relevant data for
> > the RoCE too.
> >
> > Fixes: d8966fcd4c25 ("IB/core: Use rdma_ah_attr accessor functions")
> > Signed-off-by: Aharon Landau <aharonl@mellanox.com>
> > Reviewed-by: Maor Gottlieb <maorg@mellanox.com>
> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > ---
> > drivers/infiniband/hw/mlx5/qp.c | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
> > index 1456db4b6295..a4f8e7c7ed24 100644
> > --- a/drivers/infiniband/hw/mlx5/qp.c
> > +++ b/drivers/infiniband/hw/mlx5/qp.c
> > @@ -5558,13 +5558,13 @@ static void to_rdma_ah_attr(struct mlx5_ib_dev *ibdev,
> > rdma_ah_set_path_bits(ah_attr, path->grh_mlid & 0x7f);
> > rdma_ah_set_static_rate(ah_attr,
> > path->static_rate ? path->static_rate - 5 : 0);
> > - if (path->grh_mlid & (1 << 7)) {
> > +
> > + if (path->grh_mlid & (1 << 7) ||
> > + ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE) {
> > u32 tc_fl = be32_to_cpu(path->tclass_flowlabel);
> >
> > - rdma_ah_set_grh(ah_attr, NULL,
> > - tc_fl & 0xfffff,
> > - path->mgid_index,
> > - path->hop_limit,
> > + rdma_ah_set_grh(ah_attr, NULL, tc_fl & 0xfffff,
> > + path->mgid_index, path->hop_limit,
>
> Why is whitespace reformatting in a -rc patch? I dropped this.
I'm running clang formatter before posting patches.
Thanks
>
> Applied to for-rc
>
> Jason
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-23 5:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-13 13:20 [PATCH rdma-rc] RDMA/mlx5: Set GRH fields in query QP on RoCE Leon Romanovsky
2020-04-22 18:44 ` Jason Gunthorpe
2020-04-23 5:07 ` Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).