From nobody Thu Apr 21 19:02:36 2022 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 58B9B1992B51; Thu, 21 Apr 2022 19:02:37 +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 4Kkn3c6jHWz3CGQ; Thu, 21 Apr 2022 19:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650567757; 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=gPXJDcHITHSMSqR68WYWGmvjlmuOVDdE6ULtONirpgQ=; b=Sf/1/S/j1CSWwRFLccGac/UiBRWWXqb0PL3qcZFD25t+FP+QhLQLUlK2RHy7e8kwJGccah fZ4EteILIqZ7zCN5eneCS7FVfP/2guWDPvYRSWYToye2vU955Ln7KT/MhkIdqVOfr6pAXQ o0M4UDxHVQfRiKZ51bJHuP+Sig5X5ZOyIxif54K88pu/OOUt2v9xla7MeA5agXTfYR750G YXS2/Z9GiOd2+ycZQOfPyWD6m/OvOn/fkw9hk0g7mQKHdAVlTc4Rh0Oi8Vh2rUUUch6OOi jV1oS+GFahZbdsFN31wJsIQ88EGL5AxMipidtlENkk7RdIetjRxaAnxDjtvg1g== 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 AE08665DB; Thu, 21 Apr 2022 19:02:36 +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 23LJ2aQC035869; Thu, 21 Apr 2022 19:02:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LJ2aqi035868; Thu, 21 Apr 2022 19:02:36 GMT (envelope-from git) Date: Thu, 21 Apr 2022 19:02:36 GMT Message-Id: <202204211902.23LJ2aqi035868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d4ab3a8d4f06 - main - busdma_bounce: Add free_bounce_pages helper function. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4ab3a8d4f06855892423f95b979697781660213 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650567757; 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=gPXJDcHITHSMSqR68WYWGmvjlmuOVDdE6ULtONirpgQ=; b=XS9NhUmk+QBPlZKTPWJ9S0jMeRDpXw7uYJMDx78ic11/KT9nGxYAHdypGISta38LKh8JPB C3u9JHm6L1ISNSuVZ4zZ8e5CDpU2eLLFaZwcBEpewDx5lQ5+dd71QzwX8D5WWqk8zeAGrs pdn+pJ8jcWixUkYrMsrwpjgeKMNUKl6koAMfK9pfMy0xdAMu7GavnRH0LauPoGMlz+uxog d6pciGdQlTg3wAy7ogVnCt4zYnPWxCcI8PYWz4DQPxjEmq2uep34OwAAZMYq6Uaa0wZUYP OkMBPpEu0ez3eor17FC+ubGCuY3Kr6WLQlQwAF8E2XrJ87Mrd3BLFtjyazlB9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650567757; a=rsa-sha256; cv=none; b=CURv3mBPuH37+FWfOzmu9QOJqYJhUU80ICfTr4TJIGH5kzA4wlAMaFoQs9Wx3RYEQqvHkG gBwRGCFGZBJebHlyVdIDSs3ive0KZPZhEaKv6yZjMu7n6kFrxhflErG8FU7uMk1MWO4ddH bh8bySn9N4h0Hx+wDx032sHqm/8B4nH5MkYxT/aNMuCV+oVCAzMqkhD/spIdZCXP0yaHJn UaI/O9Hpzw4Ni12J3wZYDcNfLtraSYD0mrYll35LwvuXIof0ASNQaXgoRT/UNReFh3b589 x38WFoXMmi3zAN4EQRrQcCrxBdt8nlUY1zqNyotIz6L32XH0q/YybuejjZ2Xlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d4ab3a8d4f06855892423f95b979697781660213 commit d4ab3a8d4f06855892423f95b979697781660213 Author: John Baldwin AuthorDate: 2022-04-21 17:42:14 +0000 Commit: John Baldwin CommitDate: 2022-04-21 17:42:14 +0000 busdma_bounce: Add free_bounce_pages helper function. Deduplicate code to iterate over the bpages list in a bus_dmamap_t freeing bounce pages during bus_dmamap_unload. Reviewed by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D34967 --- sys/arm/arm/busdma_machdep.c | 6 +----- sys/arm64/arm64/busdma_bounce.c | 8 +------- sys/kern/subr_busdma_bounce.c | 11 +++++++++++ sys/powerpc/powerpc/busdma_machdep.c | 7 +------ sys/riscv/riscv/busdma_bounce.c | 8 +------- sys/x86/x86/busdma_bounce.c | 7 +------ 6 files changed, 16 insertions(+), 31 deletions(-) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index ccf593b11aa5..b4110a9c7d84 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -1178,14 +1178,10 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map, void bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) { - struct bounce_page *bpage; struct bounce_zone *bz; if ((bz = dmat->bounce_zone) != NULL) { - while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - STAILQ_REMOVE_HEAD(&map->bpages, links); - free_bounce_page(dmat, bpage); - } + free_bounce_pages(dmat, map); bz = dmat->bounce_zone; bz->free_bpages += map->pagesreserved; diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index afaa1ef8510d..ce28e07d83a6 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -969,13 +969,7 @@ bounce_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map, static void bounce_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) { - struct bounce_page *bpage; - - while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - STAILQ_REMOVE_HEAD(&map->bpages, links); - free_bounce_page(dmat, bpage); - } - + free_bounce_pages(dmat, map); map->sync_count = 0; map->flags &= ~DMAMAP_MBUF; } diff --git a/sys/kern/subr_busdma_bounce.c b/sys/kern/subr_busdma_bounce.c index 586998e01673..243da8e9487f 100644 --- a/sys/kern/subr_busdma_bounce.c +++ b/sys/kern/subr_busdma_bounce.c @@ -420,6 +420,17 @@ free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage) wakeup(&bounce_map_callbacklist); } +static void +free_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map) +{ + struct bounce_page *bpage; + + while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { + STAILQ_REMOVE_HEAD(&map->bpages, links); + free_bounce_page(dmat, bpage); + } +} + static void busdma_thread(void *dummy __unused) { diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index 666f40d4edd7..3108b60599d4 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -801,17 +801,12 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map, void bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) { - struct bounce_page *bpage; - if (dmat->iommu) { IOMMU_UNMAP(dmat->iommu, map->segments, map->nsegs, dmat->iommu_cookie); map->nsegs = 0; } - while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - STAILQ_REMOVE_HEAD(&map->bpages, links); - free_bounce_page(dmat, bpage); - } + free_bounce_pages(dmat, map); } void diff --git a/sys/riscv/riscv/busdma_bounce.c b/sys/riscv/riscv/busdma_bounce.c index 25e676203fbb..5680e7702a2a 100644 --- a/sys/riscv/riscv/busdma_bounce.c +++ b/sys/riscv/riscv/busdma_bounce.c @@ -810,13 +810,7 @@ bounce_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map, static void bounce_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) { - struct bounce_page *bpage; - - while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - STAILQ_REMOVE_HEAD(&map->bpages, links); - free_bounce_page(dmat, bpage); - } - + free_bounce_pages(dmat, map); map->sync_count = 0; } diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index abbf64fd3965..925a1d633f7c 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/busdma_bounce.c @@ -907,15 +907,10 @@ bounce_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map, static void bounce_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) { - struct bounce_page *bpage; - if (map == NULL) return; - while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - STAILQ_REMOVE_HEAD(&map->bpages, links); - free_bounce_page(dmat, bpage); - } + free_bounce_pages(dmat, map); } static void