From nobody Thu Mar 20 03:14:13 2025 X-Original-To: dev-commits-src-all@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 4ZJ9fH0QLYz5r9dv; Thu, 20 Mar 2025 03:14:15 +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 4ZJ9fG1B5gz3wWm; Thu, 20 Mar 2025 03:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440454; 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=2/70n/EwSV7k0GvX+KmlITiQFbXAxatmeCjHY8XJOso=; b=lQrNwuUr4gntuTFN3fRygo9n5c2DVtt2v7BS3v0zwUg1K/wh2htkbUL3mxbf3uldm2BgbN viJeeQsERv5MWwIkzPTkNDrkhnsCm5M2L+jjBWHPr2IliWbd40077IIsrzFcKjeq+5hJRt VNBRghrrDw7gB+jF7wtEsuEhEYEXMinHSAUHHxOm8nnJFDwbRU7VSGeSWzkqs71UNzrhJt 0MwfLKynebIj0AgcZE8fGto73xp6PxQnOXLlvMcAIYmAbLvdiJUQc5g08S7hIr4yOutdSQ o7CVZvZq1cW5i81KOYd51xVvx/Is5UcQZs7EUBpSCTNpEei+D/dj8PANfkEHUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440454; a=rsa-sha256; cv=none; b=exFVzGxhg6awX+M2u8GKkycIcp959SxC6SNxGdnZkfZYAYwCdENgMpMzlfRUpNhDsyUmhW uqZEdChC/UHrPP3LMQJHuAEOSRHe4YbRJah1NHFK+JbnvhMKQ3UrHdmxcywQd+xh+44Lp7 oAhms5SRN2ajro8vawzGIEVBWyTTgu9GeQf0DCHw6moD2fetCMw3Uj6meZ8kB6BTwyDjmi UZ/Wl/cdPN1LxlmtNw/p7bDQM23S2pPLTEKUPbjS7iJYW0DlYVgpBwv2PmL2VEsah7QjvS pIzn5KpfcCaizprqcM75p31ouAjXo7Vqe08QJdLvePMxXejgLDqHHMunO8UmbQ== 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=1742440454; 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=2/70n/EwSV7k0GvX+KmlITiQFbXAxatmeCjHY8XJOso=; b=HXcoLiu1E5kgf/jbDirLO1rLFtZ5wI5pAWGq/1RPSWOKJDuwlKyoGRWc2eKzmCMP1u4Pmf wrCmRodXlJNpNVqSDGr31xo+hxASxd54WqbPPQ85lg+7P76H/lvjLq7j4f9iB36LMbF2BM +GyqFkND48MXBnEc3tCv7Q7Y9Z5o4UsKbhTlliuSpUktsLjv0HhV9/h5P6xpeHsCp1MQ2m Tm11DJQ66IwAj3T/FFH/PLiQEPjpPIrGiRSJ4++uY3yXdk3qepoZLFomC+Iw6maemZV/EN TZJrIN2cRSuCxrDiBQeqRDhAHvwxEg2z+KaI0KXl5dlI0/74cGwppZl7/J2p+g== 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 4ZJ9fG0nlYzpBm; Thu, 20 Mar 2025 03:14:14 +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 52K3EEbV086532; Thu, 20 Mar 2025 03:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3ED0r086529; Thu, 20 Mar 2025 03:14:13 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:13 GMT Message-Id: <202503200314.52K3ED0r086529@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: 466623f29d5f - stable/14 - mlx5en: fix rq->wqe_sz usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 466623f29d5f46013160734768424c7cb76486e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=466623f29d5f46013160734768424c7cb76486e1 commit 466623f29d5f46013160734768424c7cb76486e1 Author: Konstantin Belousov AuthorDate: 2025-03-02 08:58:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5en: fix rq->wqe_sz usage (cherry picked from commit 016f40466afc029df28d699650237b182aa88211) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 14 ++++++-------- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 16 ++++++---------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 8f424f7ebecd..4e3e66abf6d9 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -1221,9 +1221,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))) @@ -2310,20 +2310,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. */ - for (n = howmany(r, MLX5E_MAX_RX_BYTES); !powerof2(n + 1); n++) - ; - + 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 8e0c943bf1fe..2ed2060d5a5d 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -44,25 +44,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;