Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Shiraz Saleem <shiraz.saleem@intel.com>
Cc: stable@vger.kernel.org, Mike Marciniszyn <mike.marciniszyn@intel.com>
Subject: Re: [PATCH 5.15.x] RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned
Date: Fri, 26 Jan 2024 17:28:18 -0800	[thread overview]
Message-ID: <2024012630-animating-patriarch-6f6d@gregkh> (raw)
In-Reply-To: <20240126202144.323-1-shiraz.saleem@intel.com>

On Fri, Jan 26, 2024 at 02:21:43PM -0600, Shiraz Saleem wrote:
> From: Mike Marciniszyn <mike.marciniszyn@intel.com>
> 
> [ Upstream commit 0a5ec366de7e94192669ba08de6ed336607fd282 ]
> 
> The SQ is shared for between kernel and used by storing the kernel page
> pointer and passing that to a kmap_atomic().
> 
> This then requires that the alignment is PAGE_SIZE aligned.
> 
> Fix by adding an iWarp specific alignment check.
> 
> The patch needed to be reworked because the separate routines
> present upstream are not there in older irdma drivers.
> 
> Fixes: e965ef0e7b2c ("RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp")
> Link: https://lore.kernel.org/r/20231129202143.1434-3-shiraz.saleem@intel.com
> Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
> Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> ---
>  drivers/infiniband/hw/irdma/verbs.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
> index 745712e1d7de..e02f541430ad 100644
> --- a/drivers/infiniband/hw/irdma/verbs.c
> +++ b/drivers/infiniband/hw/irdma/verbs.c
> @@ -2783,6 +2783,11 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
>  
>  	switch (req.reg_type) {
>  	case IRDMA_MEMREG_TYPE_QP:
> +		/* iWarp: Catch page not starting on OS page boundary */
> +		if (!rdma_protocol_roce(&iwdev->ibdev, 1) &&
> +		    ib_umem_offset(iwmr->region))
> +			return -EINVAL;
> +
>  		total = req.sq_pages + req.rq_pages + shadow_pgcnt;
>  		if (total > iwmr->page_cnt) {
>  			err = -EINVAL;
> -- 
> 1.8.3.1
> 
> 

You obviously did not test this change, as it fails to build, so why ask
for it to be backported?  I've dropped all of these now from both 6.1.y
and 5.15.y, please be more careful in the future.

thanks,

greg k-h

  parent reply	other threads:[~2024-01-27  1:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-26 20:21 [PATCH 5.15.x] RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned Shiraz Saleem
2024-01-26 20:21 ` [PATCH 5.15.x] RDMA/irdma: Fix support for 64k pages Shiraz Saleem
2024-01-27  1:20   ` Greg KH
2024-01-27  1:28 ` Greg KH [this message]
2024-01-29 16:21   ` [PATCH 5.15.x] RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned Saleem, Shiraz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2024012630-animating-patriarch-6f6d@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=mike.marciniszyn@intel.com \
    --cc=shiraz.saleem@intel.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox