From nobody Thu Mar 13 16:03:26 2025 X-Original-To: dev-commits-src-main@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 4ZDC3262Cqz5qrfB; Thu, 13 Mar 2025 16:03:26 +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 4ZDC322bL5z3R4C; Thu, 13 Mar 2025 16:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741881806; 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=ENeuKukG4ZaAW+rbDi05a25e9WCt5XGHHR/tb9I583g=; b=SD2IuccU/HPIa88WOSEfFtvb9vj0wL0Ux+hs4N7kUvKSJCrhNKzlAKLdRqb5EI8I7ObVS4 sqMQf7v3eLC2DUZeVsdad7jy/W8UPMmP88DONXk/KOCCVE1GwIFQYlY6+4sBOyfp6lY9Q/ TcfpDLPPpP6ZxjSMc5NFCsT7T+pXk6U1xeKlHuwlIsM7meXIgTnJNlhApbv6kYwWyk1FlE g1rjEQ9sq5Ccj+qxCuZ2tdRUGlk+LmfRU5EUGxW4VItNo7G47vQnliFf5OD5SXSCk47hRt vAhu2mzuELzB3ORLr5OahCCVFDj6yUpArAJQgW+2N8z5DLjME83ccORqQ4ytTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741881806; a=rsa-sha256; cv=none; b=HkSmm8kM7Trt7i7uVV+4Ayta0HycTmtrTiFrfynRE0DGN9XXUPNn80btp3Oss3cBYFlykf Lzsn3sR0jFnPCu5cZLHlpGDAAGXBpWNdI5bCVSh9+2xWAM+GFNawTuQkgB+/MPgfaNARwi VmKsJkJ9PiAcdlbO2ck/VHaCFXnfQe4ANSQmOFkE7sptnls5gZp053boB3SOKG+cE07+hK Dvd9AOYhgCEHiHsuLtywfj7GdxcR7iQC6xfLZtLBGwlKpubEozt39iv3NlQj1Z+4TXuITF NrtHznUWNIy6foBSU6tbnf+3/jNHKN5VEkOFOJG1qt45I8DZGhggu6CpHdXX2w== 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=1741881806; 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=ENeuKukG4ZaAW+rbDi05a25e9WCt5XGHHR/tb9I583g=; b=fAOrbSuYDf50Lc7Nip1S6kknBSCE05hxWsrC1c7Dq/0A9WhmkAvI+gqUSWkCELDrKqVGOP Twni1W9Dlmp29ykc9UQ8xdMHOwH5KvplmnchdrSqSzSrC/12oB9tx0vUDSli8zcfHg+rnN 2E7Rl4Fd+HpBes2TsZSwibUWPeXCSWUPQETpI7WTtA9qnwHsGVeEpJ8VYyXOpySpwIo2lC ZIUt/o3lhzy6tlMlaa9yXo/au4xPFmgEpfBV5L7+h9mWogjh3rhvdyqrmmutFO0m+TpcN9 dyi1b++RFm4IMlfXfNdoEP+UDhraOUnvT0GHVWT/BeoLriKhmtuYiMswCR7OWA== 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 4ZDC3228Lnz14bd; Thu, 13 Mar 2025 16:03:26 +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 52DG3QCQ048903; Thu, 13 Mar 2025 16:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DG3QdV048900; Thu, 13 Mar 2025 16:03:26 GMT (envelope-from git) Date: Thu, 13 Mar 2025 16:03:26 GMT Message-Id: <202503131603.52DG3QdV048900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 016f40466afc - main - mlx5en: fix rq->wqe_sz usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 016f40466afc029df28d699650237b182aa88211 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=016f40466afc029df28d699650237b182aa88211 commit 016f40466afc029df28d699650237b182aa88211 Author: Konstantin Belousov AuthorDate: 2025-03-02 08:58:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-13 16:01:59 +0000 mlx5en: fix rq->wqe_sz usage Define it as the size of the single data segment in wqe. Reviewed by: Ariel Ehrenberg , Slava Shwartsman Sponsored by: NVidia networking MFC after: 1 week --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 12 ++++++------ sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 16 ++++++---------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 8b2acddb869a..2c83492bdaa9 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -1226,9 +1226,9 @@ mlx5e_create_rq(struct mlx5e_channel *c, BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - nsegs * MLX5E_MAX_RX_BYTES, /* maxsize */ + nsegs * wqe_sz, /* maxsize */ nsegs, /* nsegments */ - nsegs * MLX5E_MAX_RX_BYTES, /* maxsegsize */ + nsegs * wqe_sz, /* maxsegsize */ 0, /* flags */ NULL, NULL, /* lockfunc, lockfuncarg */ &rq->dma_tag))) @@ -2317,18 +2317,18 @@ mlx5e_close_channel_wait(struct mlx5e_channel *c) static int mlx5e_get_wqe_sz(struct mlx5e_priv *priv, u32 *wqe_sz, u32 *nsegs) { - u32 r, n; + u32 r, n, maxs; - r = priv->params.hw_lro_en ? priv->params.lro_wqe_sz : + maxs = priv->params.hw_lro_en ? priv->params.lro_wqe_sz : MLX5E_SW2MB_MTU(if_getmtu(priv->ifp)); - r = r > MCLBYTES ? MJUMPAGESIZE : MCLBYTES; + r = maxs > MCLBYTES ? MJUMPAGESIZE : MCLBYTES; /* * n + 1 must be a power of two, because stride size must be. * Stride size is 16 * (n + 1), as the first segment is * control. */ - n = roundup_pow_of_two(1 + howmany(r, MLX5E_MAX_RX_BYTES)) - 1; + n = roundup_pow_of_two(1 + howmany(maxs, r)) - 1; if (n > MLX5E_MAX_BUSDMA_RX_SEGS) return (-ENOMEM); diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 11f60d33bb74..3aef10109720 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -45,25 +45,21 @@ mlx5e_alloc_rx_wqe(struct mlx5e_rq *rq, if (rq->mbuf[ix].mbuf != NULL) return (0); - mb_head = mb = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, - MLX5E_MAX_RX_BYTES); + mb_head = mb = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rq->wqe_sz); if (unlikely(mb == NULL)) return (-ENOMEM); - mb->m_len = MLX5E_MAX_RX_BYTES; - mb->m_pkthdr.len = MLX5E_MAX_RX_BYTES; + mb->m_len = rq->wqe_sz; + mb->m_pkthdr.len = rq->wqe_sz; for (i = 1; i < rq->nsegs; i++) { - if (mb_head->m_pkthdr.len >= rq->wqe_sz) - break; - mb = mb->m_next = m_getjcl(M_NOWAIT, MT_DATA, 0, - MLX5E_MAX_RX_BYTES); + mb = mb->m_next = m_getjcl(M_NOWAIT, MT_DATA, 0, rq->wqe_sz); if (unlikely(mb == NULL)) { m_freem(mb_head); return (-ENOMEM); } - mb->m_len = MLX5E_MAX_RX_BYTES; - mb_head->m_pkthdr.len += MLX5E_MAX_RX_BYTES; + mb->m_len = rq->wqe_sz; + mb_head->m_pkthdr.len += rq->wqe_sz; } /* rewind to first mbuf in chain */ mb = mb_head;