From nobody Tue Jun 28 06:20:53 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 2DA4F87933E; Tue, 28 Jun 2022 06:20:54 +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 4LXDxL0rC1z4T0n; Tue, 28 Jun 2022 06:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656397254; 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=qjvH1jEnq5bYM77hvJsto74Ha5LbZCcmqJZZwKDBAsM=; b=pHMnqDE5MxQEtoOQv2x0rFiBi9nwZJ4+LgKGOeVqBOCBiDQg9apukblOu90KLwszBWzJYr 9e0NaMf21Fncta+OA8tk9/Hvn3JTCeZqV2amJxRiewzHaOJQe4xRGKb1A+SjcP3ZD9Ust4 6AlEdHu9rOtkFD+NmGW1JzvVu374u88wHsOVZG9/jx2Re1yfT6QkUqTqyK1snQfgoio+eI VkgApadUfI84VmQE7CmFaygN+IgE9hr+pSy9I7pHjaWg9KH0fyNJaCVtdlj8Q4Hgjhd4x5 4T8clka/j4L0W0ivleY4zxXg/k0nAUSgZ5PoPZNeT/ygZKDRG4zkycawUFbsTg== 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 F205E1767F; Tue, 28 Jun 2022 06:20:53 +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 25S6KrpG002409; Tue, 28 Jun 2022 06:20:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25S6KrFp002408; Tue, 28 Jun 2022 06:20:53 GMT (envelope-from git) Date: Tue, 28 Jun 2022 06:20:53 GMT Message-Id: <202206280620.25S6KrFp002408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 78088c5714e0 - stable/13 - busdma: Protect ARM busdma bounce page counters using the bounce page lock. 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78088c5714e065058e8b18595d31a2c115cc00d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656397254; 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=qjvH1jEnq5bYM77hvJsto74Ha5LbZCcmqJZZwKDBAsM=; b=fvzJNwiP3ATjh0+xb2urT06SIan6+90fWK4o27NlQFDy4AF6XALbg6npB0ckczJZMbMwIc kcINHNB9MCvtmm8YyatjuYwFrdTiwyYbsinFZ+mTZAWK4GqJWGCTXvLgbrrWmcVmzDYC/j gZdvc7L0t4oEqcMVglnOero0USSz6AWnUkmMzib0vdS1IoHAJNfhryZ8VderURGby/2U+d bejJ2qwCjKco0emaD/BUdx6xCkQtAZzwbas2MF7YVIrIJmyWwBcGiglL4OFvqZYwcP444X c9SPJi6xOdusB/vrcZdwCPEz0A+CsMMcsmoniVQLtXT9Go+G35dYVpHa8dnXjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656397254; a=rsa-sha256; cv=none; b=QIDKwg/ytHPUI5a0DHTefjpkpViTSWNy/gZeCctK20O0sxZOb0UWUPfFOfAMYHqAu2EmUo jz1baX924rNR77Mu5BWqI657GaPuQn20V0ql+amCwIYUL0S1cXP0CRT5gB/qJtWvooDFAc d0z/0q2v0LgfHYvkfykXbfjKx9cvG5jz09VNRyYUeGwBCskEeTKT9hD1+7v7m94siqYW4T cD/qlKNhzzxSr3O/w6qQFvN+oisWTyQThymvOFaNbLw5lW5txVHcfvj/GbA221inyOe0Ry c+swktN26Mm2X62iIMgtx86NZHUnfKPrr3Z+mEvLZMbkjdzSjcW7cSRJ/9HWrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=78088c5714e065058e8b18595d31a2c115cc00d6 commit 78088c5714e065058e8b18595d31a2c115cc00d6 Author: Hans Petter Selasky AuthorDate: 2022-06-23 09:31:17 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-28 06:20:34 +0000 busdma: Protect ARM busdma bounce page counters using the bounce page lock. In bus_dmamap_unload() on ARM, the counters for free_bpages and reserved_bpages appear to be vulnerable to unprotected read-modify-write operations that result in accounting that looks like a page leak. This was noticed on a 2GB quad core i.MX6 system that has more than one device attached via FTDI based USB serial connection. Submitted by: John Hein Differential Revision: https://reviews.freebsd.org/D35553 PR: 264836 Sponsored by: NVIDIA Networking (cherry picked from commit 6c4b6f55f77d8d7cee1b277bd6579a77d6890ef9) --- sys/arm/arm/busdma_machdep.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index 11c306526e0d..6137e4261b26 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -1292,10 +1292,13 @@ bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) free_bounce_page(dmat, bpage); } - bz = dmat->bounce_zone; - bz->free_bpages += map->pagesreserved; - bz->reserved_bpages -= map->pagesreserved; - map->pagesreserved = 0; + if (map->pagesreserved != 0) { + mtx_lock(&bounce_lock); + bz->free_bpages += map->pagesreserved; + bz->reserved_bpages -= map->pagesreserved; + mtx_unlock(&bounce_lock); + map->pagesreserved = 0; + } map->pagesneeded = 0; } map->sync_count = 0;