From nobody Sun Jan 02 18:43:00 2022 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 133B419199AD; Sun, 2 Jan 2022 18:43:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JRnnJ5cfmz4VFy; Sun, 2 Jan 2022 18:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A07CA17114; Sun, 2 Jan 2022 18:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 202Ih0r4030100; Sun, 2 Jan 2022 18:43:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 202Ih0lc030099; Sun, 2 Jan 2022 18:43:00 GMT (envelope-from git) Date: Sun, 2 Jan 2022 18:43:00 GMT Message-Id: <202201021843.202Ih0lc030099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: f1e7a532d1ee - main - busdma: _bus_dmamap_addseg repaired 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1e7a532d1ee23033fe0f3beb8eee80c412eeefe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641148980; 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=8Qz1yP5hSXwL26jH2Q5s6+e/n+uHnuk1n+SdSwjPEuQ=; b=VTY3RZbmnj8fEgUOfAIDEHRNLFsLmyA0LTIM/ZHIQr35n0MNwZf8XiUTQWgfCgigP+ipR9 P21sx9pos6S+AROP03/VpFs5Nvc+w+uYlHvA8Y3Ydc42D4hfmIy0SHrrYcfIEVYeUMHY1H po2kvcm8SEXCse0D6ErxsIOeVb8VRzEqufpwI/y6A4mz6LT03FWhfsFwsEzkdoq49iG++V F15vUwUzR1pqKQGZ8RjAJB9TJJn+EQSlA2j4HxC+6nW+xEmDWfpF6/jqMGUJxbr2i5E6jH adBojBzEzY1d39kxzf9vveLiAro/180QAsWdUaNgGgof/jhODl96UARXqT7TRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641148980; a=rsa-sha256; cv=none; b=JVlnJjJzk9Ape+zKwwHvnke0uP8St0Ixsdy1oBmov8Z7lKhTLlrgcWgxolGSsJrp3oY1wr rFLrqPJJsEH0zUnrWZpDIJk07X/QCKsvy+sjiTwVTUBC/Fao0iREKWHqkvcMA1O0LOUbv5 rpY4qJQrjIULNcUIpz83t8xdJTQ5g7jucyjAEps6Z1hdSiZWvolZhey/+DD/XE2KvuF9lq Y1CN/Wyc5VLvxmAPZq7/PotfUnSviV6S3zmo4E2XcsM05544ahlzr5dbswnZzOUo9FKxFN 6asda3z+nlW+GtBhcxDo7UezKOnokZVDityVFex694joqIFs/C8cchzXN4dpNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=f1e7a532d1ee23033fe0f3beb8eee80c412eeefe commit f1e7a532d1ee23033fe0f3beb8eee80c412eeefe Author: Doug Moore AuthorDate: 2022-01-02 18:37:05 +0000 Commit: Doug Moore CommitDate: 2022-01-02 18:37:05 +0000 busdma: _bus_dmamap_addseg repaired A recent change introduced a one-off error into a test allowing coalescing chunks into segments. This fixes that error. broke a check in _bus_dmamap_addseg on many architectures. This change makes it clear that it is not a particular range that is being boundary-checked, but the proposed union of the two adjacent ranges. Reported by: se Reviewed by: se Fixes: c606ab59e7f9 vm_extern: use standard address checkers everywhere Differential Revision: https://reviews.freebsd.org/D33715 --- sys/arm/arm/busdma_machdep.c | 4 ++-- sys/arm64/arm64/busdma_bounce.c | 4 ++-- sys/powerpc/powerpc/busdma_machdep.c | 4 ++-- sys/riscv/riscv/busdma_bounce.c | 4 ++-- sys/x86/x86/busdma_bounce.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index 55e02bc122a1..d2abb0d46dbd 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -1027,8 +1027,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr, } else { if (curaddr == segs[seg].ds_addr + segs[seg].ds_len && (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && - vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len, - dmat->boundary)) + vm_addr_bound_ok(segs[seg].ds_addr, + segs[seg].ds_len + sgsize, dmat->boundary)) segs[seg].ds_len += sgsize; else { if (++seg >= dmat->nsegments) diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index 0597b6ae8187..701411ba5b74 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -787,8 +787,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr, } else { if (curaddr == segs[seg].ds_addr + segs[seg].ds_len && (segs[seg].ds_len + sgsize) <= dmat->common.maxsegsz && - vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len, - dmat->common.boundary)) + vm_addr_bound_ok(segs[seg].ds_addr, + segs[seg].ds_len + sgsize, dmat->common.boundary)) segs[seg].ds_len += sgsize; else { if (++seg >= dmat->common.nsegments) diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index 3826a380f793..f75d3e1efcf9 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -708,8 +708,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr, } else { if (curaddr == segs[seg].ds_addr + segs[seg].ds_len && (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && - vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len, - dmat->boundary)) + vm_addr_bound_ok(segs[seg].ds_addr, + segs[seg].ds_len + sgsize, dmat->boundary)) segs[seg].ds_len += sgsize; else { if (++seg >= dmat->nsegments) diff --git a/sys/riscv/riscv/busdma_bounce.c b/sys/riscv/riscv/busdma_bounce.c index 062f752f5ceb..ffc05e20517f 100644 --- a/sys/riscv/riscv/busdma_bounce.c +++ b/sys/riscv/riscv/busdma_bounce.c @@ -656,8 +656,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr, } else { if (curaddr == segs[seg].ds_addr + segs[seg].ds_len && (segs[seg].ds_len + sgsize) <= dmat->common.maxsegsz && - vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len, - dmat->common.boundary)) + vm_addr_bound_ok(segs[seg].ds_addr, + segs[seg].ds_len + sgsize, dmat->common.boundary)) segs[seg].ds_len += sgsize; else { if (++seg >= dmat->common.nsegments) diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index 7da2ca0631ef..0d17869f8e17 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/busdma_bounce.c @@ -718,8 +718,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t curaddr, } else { if (curaddr == segs[seg].ds_addr + segs[seg].ds_len && (segs[seg].ds_len + sgsize) <= dmat->common.maxsegsz && - vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len, - dmat->common.boundary)) + vm_addr_bound_ok(segs[seg].ds_addr, + segs[seg].ds_len + sgsize, dmat->common.boundary)) segs[seg].ds_len += sgsize; else { if (++seg >= dmat->common.nsegments)