[PATCH] mlx5: Expose correct page_size_cap in device attributes

[PATCH] mlx5: Expose correct page_size_cap in device attributes

[Sagi Grimberg]

Should be all the page sizes that are supported by the
device.

Reported-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
Signed-off-by: Sagi Grimberg <sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
 drivers/infiniband/hw/mlx5/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 725f857..a90ef7a 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -212,6 +212,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
 	int err = -ENOMEM;
 	int max_rq_sg;
 	int max_sq_sg;
+	u64 min_page_size = 1ull << MLX5_CAP_GEN(mdev, log_pg_sz);
 
 	if (uhw->inlen || uhw->outlen)
 		return -EINVAL;
@@ -264,7 +265,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
 	props->hw_ver		   = mdev->pdev->revision;
 
 	props->max_mr_size	   = ~0ull;
-	props->page_size_cap	   = 1ull << MLX5_CAP_GEN(mdev, log_pg_sz);
+	props->page_size_cap	   = ~(min_page_size - 1);
 	props->max_qp		   = 1 << MLX5_CAP_GEN(mdev, log_max_qp);
 	props->max_qp_wr	   = 1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
 	max_rq_sg =  MLX5_CAP_GEN(mdev, max_wqe_sz_rq) /
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] mlx5: Expose correct page_size_cap in device attributes

[Jason Gunthorpe]

On Tue, Jul 21, 2015 at 02:40:12PM +0300, Sagi Grimberg wrote:
> Should be all the page sizes that are supported by the
> device.
> 
> Reported-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
> Signed-off-by: Sagi Grimberg <sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
>  drivers/infiniband/hw/mlx5/main.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Reviewed-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>

The math looks better now

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] mlx5: Expose correct page_size_cap in device attributes

[Doug Ledford]

[-- Attachment #1: Type: text/plain, Size: 1659 bytes --]

On 07/21/2015 07:40 AM, Sagi Grimberg wrote:
> Should be all the page sizes that are supported by the
> device.
> 
> Reported-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
> Signed-off-by: Sagi Grimberg <sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> ---
>  drivers/infiniband/hw/mlx5/main.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
> index 725f857..a90ef7a 100644
> --- a/drivers/infiniband/hw/mlx5/main.c
> +++ b/drivers/infiniband/hw/mlx5/main.c
> @@ -212,6 +212,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
>  	int err = -ENOMEM;
>  	int max_rq_sg;
>  	int max_sq_sg;
> +	u64 min_page_size = 1ull << MLX5_CAP_GEN(mdev, log_pg_sz);
>  
>  	if (uhw->inlen || uhw->outlen)
>  		return -EINVAL;
> @@ -264,7 +265,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
>  	props->hw_ver		   = mdev->pdev->revision;
>  
>  	props->max_mr_size	   = ~0ull;
> -	props->page_size_cap	   = 1ull << MLX5_CAP_GEN(mdev, log_pg_sz);
> +	props->page_size_cap	   = ~(min_page_size - 1);
>  	props->max_qp		   = 1 << MLX5_CAP_GEN(mdev, log_max_qp);
>  	props->max_qp_wr	   = 1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
>  	max_rq_sg =  MLX5_CAP_GEN(mdev, max_wqe_sz_rq) /
> 

I assume this prevents the driver from working at all on certain arches
(like ppc with 64k page size)?  It looks obviously correct enough that
I've picked it up for 4.2-rc.  Thanks.

-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
              GPG KeyID: 0E572FDD



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

Re: [PATCH] mlx5: Expose correct page_size_cap in device attributes

[Jason Gunthorpe]

On Thu, Jul 23, 2015 at 05:41:38PM -0400, Doug Ledford wrote:

> I assume this prevents the driver from working at all on certain arches
> (like ppc with 64k page size)?

Nothing uses page_size_cap correctly, so it has no impact.

Sagi, that is a good point, your generic code for the cleanup series
really should check that PAGE_SIZE is in page_size_cap and at least
fail the mr allocation if it isn't...

Maybe that would be enough to drop SRP's bogus usage of it...

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] mlx5: Expose correct page_size_cap in device attributes

[Doug Ledford]

[-- Attachment #1: Type: text/plain, Size: 752 bytes --]

On 07/23/2015 05:48 PM, Jason Gunthorpe wrote:
> On Thu, Jul 23, 2015 at 05:41:38PM -0400, Doug Ledford wrote:
> 
>> I assume this prevents the driver from working at all on certain arches
>> (like ppc with 64k page size)?
> 
> Nothing uses page_size_cap correctly, so it has no impact.

OK, then I'm going to skip this for 4.2-rc and bump it on out to 4.3.

> Sagi, that is a good point, your generic code for the cleanup series
> really should check that PAGE_SIZE is in page_size_cap and at least
> fail the mr allocation if it isn't...
> 
> Maybe that would be enough to drop SRP's bogus usage of it...
> 
> Jason
> 


-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
              GPG KeyID: 0E572FDD



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

Re: [PATCH] mlx5: Expose correct page_size_cap in device attributes

[Sagi Grimberg]

On 7/24/2015 12:48 AM, Jason Gunthorpe wrote:
> On Thu, Jul 23, 2015 at 05:41:38PM -0400, Doug Ledford wrote:
>
>> I assume this prevents the driver from working at all on certain arches
>> (like ppc with 64k page size)?
>
> Nothing uses page_size_cap correctly, so it has no impact.
>
> Sagi, that is a good point, your generic code for the cleanup series
> really should check that PAGE_SIZE is in page_size_cap and at least
> fail the mr allocation if it isn't...

Yea, that's doable...
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html