From nobody Thu Mar 20 03:14:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fD6rkNz5rB3P; Thu, 20 Mar 2025 03:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fC6XyJz3wBx; Thu, 20 Mar 2025 03:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8WppelXlaa1lGaVO9wze1dDG9VyiiihC671TTzcTsqY=; b=DGjst01QdaH2ShfoAi6d2EWuJIFH2xwg5JCv8jGd7AG+9GcjsjdJkbbUjnXj54rR5dGbf+ vXtl1NU5zENbq1Vf4R/G0Hd0xPaxOBMqBCLQDJLf3GvG5lk6vXyC30jsYLKEkxXXB5THuY yno0Ep7ah8mlAj+i6Iy4GhJOxMcQ5LKb7I2dM318OYh4k3xfnscFMx8ft/TMFi8Vfvj5/7 EaOSzL3z5I4OsatJeSqnqLFX8cdSpq0qoC1GBpRMKZBV07XC0nyyoin6ZVd6F9YeP2tkfE sWRmHSm1K1eWsjhsVtReP9xIvPeiam1TaCsDJStQq3MWWTB0hrYTK5KtfCFrhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440452; a=rsa-sha256; cv=none; b=ERMpZx+3qtpoVK5uqlBczz0+1hGp312yIZHUUxYAKvHtW4Hf+rp15GIYguxjlaDxMzIATG pxoxiNibzEcqYDkZENyBEYTYSktdOgMHKdykuXRqFK28NPrKGPGixhru83pIjm5+72qbHd 48tV9/GAXus8BmLFoGsntfDU5Qg7BV8B7xu1s8Sapubz+r8/liOLB7n0+44WDvMOuHdudO FEVEqbjD+NH3qtNJeOb1STiFCW/kZ1DMYJmkr/6ITw9D3G4t5pX7K2fOBOKFOXN/mxcxa+ yV/7cqCePFTL2qraalXDr87e8nHFKOHra7ExV6+CZyX9WY0O1e+G2GjB6JpNrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8WppelXlaa1lGaVO9wze1dDG9VyiiihC671TTzcTsqY=; b=QZjiei0rKBbOjEw0eP123qlcpqG2Ro3VB7mcsER2x4GjD4sA8jesLneNN7cOPUvUYC2O6A DPxOPhNge4axE8t6h34jzNAfDvi9OUFUDVLq93lwmAEq4DT4uWe5WCLtD2R892WgVxNwpx 3Ji/aJpGlpJu0kmfNRGKezfscfVhbvpqVpkWEgcpi2mcuGhYThaybVHL9flTGrmQZMIzTq WioD1B5WJz+WsYk2C7lyEpFRF+9yNDW8Vq3UjkxjO99epmqihAhvbwraivX8qcUqJ7Vr8v zghFoBY9B3YD1b70Uuemg8iPdzV65pMxICur1s/8yfwrhDAK09P6GwQuho2lwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9fC5wBZznw5; Thu, 20 Mar 2025 03:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3EBUw086462; Thu, 20 Mar 2025 03:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3EBvU086459; Thu, 20 Mar 2025 03:14:11 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:11 GMT Message-Id: <202503200314.52K3EBvU086459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c083ab4c8bfa - stable/14 - mlx5en: stop arbitrary limiting max wqe size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c083ab4c8bfaf6e6506e2c9552c4fe6590c5b31b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c083ab4c8bfaf6e6506e2c9552c4fe6590c5b31b commit c083ab4c8bfaf6e6506e2c9552c4fe6590c5b31b Author: Konstantin Belousov AuthorDate: 2025-02-27 01:54:31 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5en: stop arbitrary limiting max wqe size (cherry picked from commit 89491b1edb3438ebce84e17fdb6c1acab35df601) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 191a48039a22..8f424f7ebecd 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -2314,17 +2314,7 @@ mlx5e_get_wqe_sz(struct mlx5e_priv *priv, u32 *wqe_sz, u32 *nsegs) r = priv->params.hw_lro_en ? priv->params.lro_wqe_sz : MLX5E_SW2MB_MTU(if_getmtu(priv->ifp)); - if (r > MJUM16BYTES) - return (-ENOMEM); - - if (r > MJUM9BYTES) - r = MJUM16BYTES; - else if (r > MJUMPAGESIZE) - r = MJUM9BYTES; - else if (r > MCLBYTES) - r = MJUMPAGESIZE; - else - r = MCLBYTES; + r = r > MCLBYTES ? MJUMPAGESIZE : MCLBYTES; /* * n + 1 must be a power of two, because stride size must be.