| Message ID | 20190723071255.6588-1-leon@kernel.org |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | [mlx5-next] net/mlx5: Fix modify_cq_in alignment | expand |
From: Leon Romanovsky <leon@kernel.org> Date: Tue, 23 Jul 2019 10:12:55 +0300 > From: Edward Srouji <edwards@mellanox.com> > > Fix modify_cq_in alignment to match the device specification. > After this fix the 'cq_umem_valid' field will be in the right offset. > > Cc: <stable@vger.kernel.org> # 4.19 > Fixes: bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits") > Signed-off-by: Edward Srouji <edwards@mellanox.com> > Reviewed-by: Yishai Hadas <yishaih@mellanox.com> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Very confusing submission on many levels. Coming from a Mellanox developer using a kernel.org email address. Targetting the mlx5-next tree, yet CC:'ing stable. A networking change, for which stable submissions are handled by me by hand and not via CC:'ing stable.
On Tue, Jul 23, 2019 at 11:28:50AM -0700, David Miller wrote: > From: Leon Romanovsky <leon@kernel.org> > Date: Tue, 23 Jul 2019 10:12:55 +0300 > > > From: Edward Srouji <edwards@mellanox.com> > > > > Fix modify_cq_in alignment to match the device specification. > > After this fix the 'cq_umem_valid' field will be in the right offset. > > > > Cc: <stable@vger.kernel.org> # 4.19 > > Fixes: bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits") > > Signed-off-by: Edward Srouji <edwards@mellanox.com> > > Reviewed-by: Yishai Hadas <yishaih@mellanox.com> > > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> > > Very confusing submission on many levels. > > Coming from a Mellanox developer using a kernel.org email address. It works for us and was proven internally as the best way to have setup which always works. > > Targetting the mlx5-next tree, yet CC:'ing stable. This patch was found by RDMA team, needed by RDMA but changes are located in code accessible by mlx5_core part. This is why mlx5-next. > > A networking change, for which stable submissions are handled by me by > hand and not via CC:'ing stable. The intention was to have this patch in shared mlx5 branch, which is picked by RDMA too. This "Cc: stable@..." together with merge through RDMA will ensure that such patch will be part of stable automatically. I can remove "Cc: ..." line if you think that it is inappropriate to have such line in patch in mlx5-next. Thanks
From: Leon Romanovsky <leon@kernel.org> Date: Tue, 23 Jul 2019 22:04:14 +0300 > The intention was to have this patch in shared mlx5 branch, which is > picked by RDMA too. This "Cc: stable@..." together with merge through > RDMA will ensure that such patch will be part of stable automatically. Why wouldn't it come via Saeed's usual mlx5 bug fix pull requests to me?
On Tue, 2019-07-23 at 22:04 +0300, Leon Romanovsky wrote: > On Tue, Jul 23, 2019 at 11:28:50AM -0700, David Miller wrote: > > From: Leon Romanovsky <leon@kernel.org> > > Date: Tue, 23 Jul 2019 10:12:55 +0300 > > > > > From: Edward Srouji <edwards@mellanox.com> > > > > > > Fix modify_cq_in alignment to match the device specification. > > > After this fix the 'cq_umem_valid' field will be in the right > > > offset. > > > > > > Cc: <stable@vger.kernel.org> # 4.19 > > > Fixes: bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID > > > bits") > > > Signed-off-by: Edward Srouji <edwards@mellanox.com> > > > Reviewed-by: Yishai Hadas <yishaih@mellanox.com> > > > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> > > > > Very confusing submission on many levels. > > > > Coming from a Mellanox developer using a kernel.org email address. > > It works for us and was proven internally as the best way to have > setup which always works. > > > Targetting the mlx5-next tree, yet CC:'ing stable. > > This patch was found by RDMA team, needed by RDMA but changes are > located > in code accessible by mlx5_core part. This is why mlx5-next. > Leon, mlx5-next "hence the -next" is NOT meant for fixes, it is indeed confusing what you are trying to do here, Dave's system works perfectly for us. > > A networking change, for which stable submissions are handled by me > > by > > hand and not via CC:'ing stable. > > The intention was to have this patch in shared mlx5 branch, which is > picked by RDMA too. This "Cc: stable@..." together with merge through > RDMA will ensure that such patch will be part of stable > automatically. > > I can remove "Cc: ..." line if you think that it is inappropriate to > have such line in patch in mlx5-next. No, if this was meant to land in -stable then it should go to -rc via net branch not to mlx5-next, let's save everybody's time and energy here. no point in arguing.. I will take this to my net queue and submit to Dave's net branch, as we always do for mlx5 fixes. for next time, mlx5 fixes should always go to net branch first, then it is just a matter of days to see the fix in -rc and queued up to -stable. > > Thanks
On Tue, 2019-07-23 at 13:02 -0700, David Miller wrote: > From: Leon Romanovsky <leon@kernel.org> > Date: Tue, 23 Jul 2019 22:04:14 +0300 > > > The intention was to have this patch in shared mlx5 branch, which > > is > > picked by RDMA too. This "Cc: stable@..." together with merge > > through > > RDMA will ensure that such patch will be part of stable > > automatically. > > Why wouldn't it come via Saeed's usual mlx5 bug fix pull requests to > me? That should have been the plan in first place, i will handle this, thanks Dave and sorry for any inconvenience. I will apply this patch to my (mlx5) net queue, will submit to net shortly. Leon can merge the next -rc when this patch lands there. meanwhile, Leon can also merge my (mlx5) net queue which is always based on latest -rc. https://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git/log/?h=net-mlx5
On Tue, Jul 23, 2019 at 08:34:07PM +0000, Saeed Mahameed wrote: > On Tue, 2019-07-23 at 13:02 -0700, David Miller wrote: > > From: Leon Romanovsky <leon@kernel.org> > > Date: Tue, 23 Jul 2019 22:04:14 +0300 > > > > > The intention was to have this patch in shared mlx5 branch, which > > > is > > > picked by RDMA too. This "Cc: stable@..." together with merge > > > through > > > RDMA will ensure that such patch will be part of stable > > > automatically. > > > > Why wouldn't it come via Saeed's usual mlx5 bug fix pull requests to > > me? > > That should have been the plan in first place, i will handle this, > thanks Dave and sorry for any inconvenience. > > I will apply this patch to my (mlx5) net queue, will submit to net > shortly. OK, whatever works for you best. Thanks
On Tue, 2019-07-23 at 22:04 +0300, Leon Romanovsky wrote: > On Tue, Jul 23, 2019 at 11:28:50AM -0700, David Miller wrote: > > From: Leon Romanovsky <leon@kernel.org> > > Date: Tue, 23 Jul 2019 10:12:55 +0300 > > > > > From: Edward Srouji <edwards@mellanox.com> > > > > > > Fix modify_cq_in alignment to match the device specification. > > > After this fix the 'cq_umem_valid' field will be in the right > > > offset. > > > > > > Cc: <stable@vger.kernel.org> # 4.19 > > > Fixes: bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID > > > bits") Leon, I applied this patch to my tree, it got marked for -stable 4.20 and not 4.19, i checked manually and indeed the offending patch came to light only on 4.20
On Wed, Jul 24, 2019 at 08:56:08PM +0000, Saeed Mahameed wrote: > On Tue, 2019-07-23 at 22:04 +0300, Leon Romanovsky wrote: > > On Tue, Jul 23, 2019 at 11:28:50AM -0700, David Miller wrote: > > > From: Leon Romanovsky <leon@kernel.org> > > > Date: Tue, 23 Jul 2019 10:12:55 +0300 > > > > > > > From: Edward Srouji <edwards@mellanox.com> > > > > > > > > Fix modify_cq_in alignment to match the device specification. > > > > After this fix the 'cq_umem_valid' field will be in the right > > > > offset. > > > > > > > > Cc: <stable@vger.kernel.org> # 4.19 > > > > Fixes: bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID > > > > bits") > > Leon, I applied this patch to my tree, it got marked for -stable 4.20 > and not 4.19, i checked manually and indeed the offending patch came to > light only on 4.20 Thanks >
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index b3d5752657d9..ec571fd7fcf8 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -5975,10 +5975,12 @@ struct mlx5_ifc_modify_cq_in_bits { struct mlx5_ifc_cqc_bits cq_context; - u8 reserved_at_280[0x40]; + u8 reserved_at_280[0x60]; u8 cq_umem_valid[0x1]; - u8 reserved_at_2c1[0x5bf]; + u8 reserved_at_2e1[0x1f]; + + u8 reserved_at_300[0x580]; u8 pas[0][0x40]; };