From nobody Sun Sep 06 00:14:04 2026 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 4hcrKT40hKz6rMhN for ; Sun, 06 Sep 2026 00:14:05 +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 4hcrKT0NT8z3JP7 for ; Sun, 06 Sep 2026 00:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788653645; 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=nqyzMxIodw9YpR9eL70t7CCwU+Zp8Mw8xel5Z4WSGdI=; b=G+kXDC7jAG+xE8YF0Ru+CmZYb81p39dKbx9/WkMRMJxNGqbGp6oag8jrbVWO6kDOP2DpJk cCMx1v5IyMw5IoLncWjOGQoew6pv7+RXqkyiJ/c6pJKp+VkoSg01AnuJuCpluiGXN3qpUa nf/ybSmOlcVP2D6KHsMpexRwBlZjazC3x602ac4uyoRcrq8+7c5nCKxcXvncATvJqoj/nX oqofcaupnfETJzjM85x/T3fr+FRCgVn3hemvdx/DPCmUWqj797J4VIbNpiyubYt9BwU7wy O6iVuMTxIDRBPcUKzoKaJeTuSGSEgGWAcsQnwKZ44FfMO7GRHVEOBFPIejrgRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788653645; a=rsa-sha256; cv=none; b=bKRoZcjh+PDndg19OFtqmrllaGLedvJ+Fl/rA0ixKcOniEwH4Rn+2b0Q8dj3oEAQ83HsQH G6PwBKjLZNMMUefh0A9w8l7R01kyoThQw5lkojIZrLeNoR49D4KyNDB27SV64y48M3kkoc 0XT53swZlWB5wfZzU2YnqmF7LljpIcMsW/RRFMxe3Tb2Jc1zJ0MBdSTbufLHEEt2Ol6xIF UVuwdPeeIOOr6+lY+vqaQLHYbLcU7F9psVEl/6WlLrF3sbiD7+iL+pN09XVNH6B8Lme5RY nbh1jYaFXgfiTTuzQjS+ai2TuRK1UUtopMi1K8vXur088wy5r64TWfVaFb9Diw== 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=1788653645; 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=nqyzMxIodw9YpR9eL70t7CCwU+Zp8Mw8xel5Z4WSGdI=; b=sOfxakLcF6ADA1xzatRJveMqbJH+P5/0mZndjFRjF2NrObjrEm7YhDNYxHfSPPfvY+TLjl E2AEV03tBIOprwIblDsU/fboAVuyyrsJuG0ZA7eke7OQIdPnA8SFI+BYjaBQSanTjA0Iml QHovZx+1dRx5guHc0Xqjasm2hb+mVKDtZAVjxKcT4eqQtTMOLJke0bxH2NHHDlGPwR7VkD fOgjhsx2suDq74FQfEic5MmR5PsR1UaKkh/G36GnADe0OMKTyZ8TLL2S+JPMqT/snPXfGB syhxSAkoQi43YoqA5JWzYlAxQmne4GHDdE/hsaoTJZcT6IZyM92wqtWvzpYUFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcrKS6ZTHz16JY for ; Sun, 06 Sep 2026 00:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26abe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 06 Sep 2026 00:14:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Zishun Yi From: Bjoern A. Zeeb Subject: git: 33574d47d9de - main - LinuxKPI: Correct nents passed to dma_{un,}map_sg_attrs() 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 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/main X-Git-Reftype: branch X-Git-Commit: 33574d47d9dea317b9a4bfe543c4f20be6a565ef Auto-Submitted: auto-generated Date: Sun, 06 Sep 2026 00:14:04 +0000 Message-Id: <6a9cb04c.26abe.40d4d2f8@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=33574d47d9dea317b9a4bfe543c4f20be6a565ef commit 33574d47d9dea317b9a4bfe543c4f20be6a565ef Author: Zishun Yi AuthorDate: 2026-09-05 20:12:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-06 00:12:48 +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) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D57842 --- 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 e7589056ae46..8caf88273846 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -448,7 +448,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; @@ -461,7 +461,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); }