From nobody Thu Sep 10 09:48:44 2026 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 4hgXth6Rf5z6rm3p for ; Thu, 10 Sep 2026 09:48:44 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgXth37Zyz4b5y for ; Thu, 10 Sep 2026 09:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789033724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ew3ba43FoHrtpoueU9D+SqLO5vR3u0LFzs8abuC64U=; b=bj7uyzPC5B7X9jz/8NtMrkwejravVSzJuSam5TCfWECOtrJN/aqvs6xVXIrzSjnvtAzWhd Dl5sE2WwJ1Zyu5v/8hcXu9YpgG+bPL1GdbqzXX6FbZ8wlYGZYCYHi7BEssML97CtlE8L9u nvdYFrY3FD3QRK9QjV4cZD6PrBgH+ZsgF3asp26/ViwGELJRoXflyGflZDJmhf7s/7d+gV k/NDaCdIC5P+rjjrRetS8gxC3UF67y0i2iIL2accind2sOzsSE/YlClB93bq/0EI5Hxrb4 xVIB2fL1RGsoGDg2j8LyoK5xDk5r/iE+Oqd4iTrUWxSCIsVaWGSO8hsqcBx+GQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789033724; b=LDyNJJ3R54RmhGwsT8+Kqiv4pO6SCBKGhIJ66Ocw5qZGodhw7XX3Cp+2DVaV1QY9MKlpfC 98JLRXJt8cuPtuoYVn56ocQk3uEvTD7gjIFwCJkgfPWkyUw6DDIbp7S5Z8tnmFGKUF8K3R bpGnEl/a14MI2YAMuYBOLaIs5yRa21ym6KH+DyVzbeC2XwdXdvOK/YST9vCSKWu7KSVUH/ RWtItQNaQWL+IfTsU/YYURupvzcYqk7oZTcMiG9yft2oYR3c8nIoPVwVkO9+0A+S8iWkge 0SUAQgw79uVZw8Fwpx//fKCtXJ8s3kXDPmFEOkf72/IaY5kuEBuXvz6VZoF6hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789033724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ew3ba43FoHrtpoueU9D+SqLO5vR3u0LFzs8abuC64U=; b=SBIa1P8LnuTao4PWc6SG5eVduv3JxJr+P8RjzzaCvjyKm+40MMLKKszSXFK/KM1waKGdnD fbBBAm2r6ZQmU08HJrtDGboLaOWyxIcVs8O+PEm/SKMINzbU9e3xb3ck6rHSQvCoYwWrED 23qc1S1p0g4QxdUScUY5yO/JY56ncv+8wX098i75PsrR597N57PunnAUKLQok8mnS5Q7Mf 3mhlGZhGxrQq33ZW2fmxZwB8mM6dJdjDs/Cx0oVLadgjFuD6kGHuYW03pAPw/NwKZllxpu jREEv/h+qJHKDpNJoM1qpE31dXX1c9SIjZ1deMtWVpSIcU39yxushDNGunDVNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hgXth2Cl6zMFM for ; Thu, 10 Sep 2026 09:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 254fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 09:48:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Zishun Yi From: Bjoern A. Zeeb Subject: git: 091ca09a0a66 - stable/15 - LinuxKPI: Correct nents passed to dma_{un,}map_sg_attrs() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 091ca09a0a66f16f793c5e1bbe7e96498f07d737 Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 09:48:44 +0000 Message-Id: <6aa27cfc.254fe.1da681e@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=091ca09a0a66f16f793c5e1bbe7e96498f07d737 commit 091ca09a0a66f16f793c5e1bbe7e96498f07d737 Author: Zishun Yi AuthorDate: 2026-09-05 20:12:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-10 09:46:54 +0000 LinuxKPI: Correct nents passed to dma_{un,}map_sg_attrs() According to Linux documentation the nents argument to dma_unmap_sg() must be the number one passed in, not the number of DMA addresses. In LinuxKPI this means orig_nents and not nents, so adjust this. Given nents and orig_nents should always be the same in LinuxKPI, this should only be a NOP for correctness. Reviewed by: bz, aokblast (LGTM) Differential Revision: https://reviews.freebsd.org/D57842 (cherry picked from commit 33574d47d9dea317b9a4bfe543c4f20be6a565ef) --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index f26bb0e6eb99..173b3e8d3c96 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -431,7 +431,7 @@ dma_map_sgtable(struct device *dev, struct sg_table *sgt, { int nents; - nents = dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs); + nents = dma_map_sg_attrs(dev, sgt->sgl, sgt->orig_nents, dir, attrs); if (nents < 0) return (nents); sgt->nents = nents; @@ -444,7 +444,7 @@ dma_unmap_sgtable(struct device *dev, struct sg_table *sgt, unsigned long attrs) { - dma_unmap_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs); + dma_unmap_sg_attrs(dev, sgt->sgl, sgt->orig_nents, dir, attrs); }