Netdev List
 help / color / mirror / Atom feed
From: Yishai Hadas <yishaih@nvidia.com>
To: Leon Romanovsky <leon@kernel.org>
Cc: <jgg@ziepe.ca>, <linux-rdma@vger.kernel.org>,
	<netdev@vger.kernel.org>, <saeedm@nvidia.com>,
	<tariqt@nvidia.com>, <mbloch@nvidia.com>, <kuba@kernel.org>,
	<pabeni@redhat.com>, <edumazet@kernel.org>, <davem@davemloft.net>,
	<andrew+netdev@lunn.ch>, <dtatulea@nvidia.com>,
	<moshe@nvidia.com>, <maorg@nvidia.com>
Subject: Re: [PATCH V1 rdma-next 20/24] RDMA/mlx5: Clamp log_max_cq_sz shift in CQ size checks
Date: Mon, 16 Nov 2026 18:28:22 +0200	[thread overview]
Message-ID: <2c2246aa-9343-44a1-8174-425ef35546be@nvidia.com> (raw)
In-Reply-To: <20261116093548.GE11319@unreal>

On 16/11/2026 11:35, Leon Romanovsky wrote:
> On Tue, Nov 10, 2026 at 03:43:16PM +0200, Yishai Hadas wrote:
>> The CQ create and resize paths check the requested size against
>> 1 << log_max_cq_sz. The cap is 8 bits wide, so an untrusted NIC can
>> report 31 or more, which makes the shift undefined. A large limit also
>> lets the rounded up CQ size exceed INT_MAX, and it is then truncated
>> when passed on as an int.
>>
>> Such a size also overflows the CQ buffer size, entries * cqe_size,
>> which create_cq_user() and alloc_cq_frag_buf() compute as an int. A
>> user CQ buffer smaller than the CQ the NIC is given then passes the
>> umem size check, and a kernel CQ gets a zero-sized buffer that
>> init_cq_frag_buf() writes to.
>>
>> Take the limit from MLX5_CAP_GEN_LOGSZ_U64(), round up in 64 bits, and
>> reject sizes above INT_MAX. Compute the buffer size with
>> check_mul_overflow(), as resize_user() already does.
>>
>> Signed-off-by: Yishai Hadas <yishaih@nvidia.com>
>> ---
>>   drivers/infiniband/hw/mlx5/cq.c | 52 ++++++++++++++++++++++++---------
>>   1 file changed, 39 insertions(+), 13 deletions(-)
> 
> <...>
> 
>> +/*
>> + * Next power of 2 above entries. It can be 2^32, which doesn't fit the
>> + * unsigned long of roundup_pow_of_two() on 32-bit archs.
> 
> This is not correct. unsigned long in the kernel continue to be 64bits
> even for 32bits archs.
> 

On 32-bit archs long is 32 bits, like int, see BITS_PER_LONG [1], so
roundup_pow_of_two() can't return 2^32 there.

We can consider two options for V2:
1. Keep this helper, which rounds up in 64 bits, and reject sizes above 
INT_MAX after rounding up, as in V1.

2. Drop the helper and reject sizes above INT_MAX / 2 before rounding 
up, so roundup_pow_of_two() can be used as before:

if (attr->cqe > INT_MAX / 2)
	return -EINVAL;
entries = roundup_pow_of_two(entries + 1);

Both accept the same sizes. Which do you prefer?

[1] 
https://elixir.bootlin.com/linux/v7.4-rc1/source/include/asm-generic/bitsperlong.h#L8

Yishai

  reply	other threads:[~2026-11-16 16:28 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-10 13:42 [PATCH V1 rdma-next 00/24] mlx5: Adversarial mode for confidential computing guests Yishai Hadas
2026-11-10 13:42 ` [PATCH V1 rdma-next 01/24] net/mlx5: Add mlx5_trigger_health_work_force() Yishai Hadas
2026-11-10 13:42 ` [PATCH V1 rdma-next 02/24] net/mlx5: Derive adversarial mode from CC guest memory encryption Yishai Hadas
2026-11-16  9:45   ` Leon Romanovsky
2026-11-10 13:42 ` [PATCH V1 rdma-next 03/24] net/mlx5: Add capability filtering in adversarial mode Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 04/24] net/mlx5: Catch too low max number of EQs Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 05/24] net/mlx5: Add macros for reading log-based caps Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 06/24] RDMA/mlx5: Reject QP transport types not enabled by FW capability Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 07/24] RDMA/mlx5: Require IB_QPT_DRIVER for the DC vendor QP types Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 08/24] RDMA/mlx5: Derive mlx5_ib_adversarial_mode global from mlx5_core adversarial API Yishai Hadas
2026-11-16  8:57   ` Leon Romanovsky
2026-11-16 14:12     ` Yishai Hadas
2026-11-16 14:21       ` Leon Romanovsky
2026-11-10 13:43 ` [PATCH V1 rdma-next 09/24] RDMA/core: Suppress kverbs_provider for adversarial_mode devices Yishai Hadas
2026-11-16  8:58   ` Leon Romanovsky
2026-11-16 14:14     ` Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 10/24] RDMA/mlx5: Remove duplicate mlx5_ib_umr_context struct Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 11/24] RDMA/mlx5: Introduce per-CQ poll_one hook in mlx5_ib_cq Yishai Hadas
2026-11-16  9:01   ` Leon Romanovsky
2026-11-16 15:57     ` Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 12/24] RDMA/mlx5: Add shadow FIFO infrastructure for UMR completions Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 13/24] RDMA/mlx5: Verify UMR CQ polling against a hostile NIC Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 14/24] RDMA/mlx5: Keep the UMR QP failed once a forged CQE is detected Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 15/24] RDMA/mlx5: Block generic CQ poll path in adversarial mode Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 16/24] RDMA/core: Set the CQ comp_handler after its poll context is set up Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 17/24] RDMA/mlx5: Ignore completion events for a kernel CQ that is not ready Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 18/24] RDMA/mlx5: Validate EQE port and GSI port before indexing devr.ports[] Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 19/24] RDMA/mlx5: Validate firmware RQ/SQ state before sqrq_trans[] lookup Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 20/24] RDMA/mlx5: Clamp log_max_cq_sz shift in CQ size checks Yishai Hadas
2026-11-16  9:35   ` Leon Romanovsky
2026-11-16 16:28     ` Yishai Hadas [this message]
2026-11-10 13:43 ` [PATCH V1 rdma-next 21/24] RDMA/mlx5: Clamp log_max_* shifts in QP and WQ limit checks Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 22/24] RDMA/mlx5: Clamp log_max_* shifts in query_device and ucontext paths Yishai Hadas
2026-11-16  9:06   ` Leon Romanovsky
2026-11-10 13:43 ` [PATCH V1 rdma-next 23/24] RDMA/core: Report and enforce adversarial mode via GET_CONTEXT Yishai Hadas
2026-11-10 13:43 ` [PATCH V1 rdma-next 24/24] RDMA/mlx5: Advertise adversarial mode via ib_device::adversarial_mode Yishai Hadas

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=2c2246aa-9343-44a1-8174-425ef35546be@nvidia.com \
    --to=yishaih@nvidia.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=dtatulea@nvidia.com \
    --cc=edumazet@kernel.org \
    --cc=jgg@ziepe.ca \
    --cc=kuba@kernel.org \
    --cc=leon@kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=maorg@nvidia.com \
    --cc=mbloch@nvidia.com \
    --cc=moshe@nvidia.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=saeedm@nvidia.com \
    --cc=tariqt@nvidia.com \
    /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