From nobody Tue Jun 28 06:19:31 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 87754878F36; Tue, 28 Jun 2022 06:19:31 +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 4LXDvl3MzRz4SyP; Tue, 28 Jun 2022 06:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656397171; 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=qqarRJpMMhwVMhdWENG9KFI2vrSfR0n+upUB0s+jC38=; b=cqdxGa1b+l7mEBmVTU43bOJ1MgOpHnjjJaW7Crtjay2rBPIxbpjoSZJb38dFNcFEvtwcSt YLMFfJtn1MTa9l3m1XMlKr9W1MdqXIVq+7ROZRnKNT+unD1p3hs9qPCkcy1DRfV2yAP8rn uazIqRMu5dwweSpeIb/hSgwOXwWGyZxIT9Zd46ycfjLXAYEjPtwDDYK04z2sp1EwYHiP5a FruNMs2l980Yg1ZLBj6Ps43obKaiQi6rBw/SVcEO1PWztGjd0ghRez4OdNHcvuUkZ/+67Q 32bvYqPefofJDfpxBAiZ+x1DvAYtF20oEgom/GRlm3hAxboEdrGkprVKohI1jA== 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 53C2217673; Tue, 28 Jun 2022 06:19:31 +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 25S6JVWK093751; Tue, 28 Jun 2022 06:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25S6JVx4093750; Tue, 28 Jun 2022 06:19:31 GMT (envelope-from git) Date: Tue, 28 Jun 2022 06:19:31 GMT Message-Id: <202206280619.25S6JVx4093750@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: a0ffae30c593 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: a0ffae30c593d829bc9cdd7b32017352e501d247 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656397171; 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=qqarRJpMMhwVMhdWENG9KFI2vrSfR0n+upUB0s+jC38=; b=sNz8dBGCg9AN4CZG9eBQ80IoNwFEryTWikqKhKRCs+HhWzf4TN6BgwNXKtWBQjZhQo+AWs VistyHCcH86k2M/d7do4pnM2P/zi4HyMS/ngMG2QAg/LKu1fBvAMlfZzWMXjLaQrFsP5Il HE201LSwGJFhU93NcJSM6BmLjPjvJpr2ie+Dkz+yIyh70uyOUVZbYbk6r723iBdWHX5Gaq MT2kxR4iwzuAiNJN9TsNj59UKIj71jOqjBeg6y9kQORkkU4Qlw3FnFQ6OXPRzdRj5MWLDd /YpV8gRETRYGA4L0YVeLziICkK/qMTYQRjuAsI60IYYMSifpViFqbRakhhcwqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656397171; a=rsa-sha256; cv=none; b=xWBfibzCssvkHftbB47GWWmunbV/b7F97Z45nfLvXQkulkliAIIjkkIcG+ZqBglbmsrmlG ileXxHy8Lhpb87GvXaZxZ9t+vHNnkR564P7oSycTjSdHGomMrcbpJfBJRYkEW7VMTwDaBt AX7gmHWNGmQ2mbRBKer2Azhcoh3V39/dccz0G9tCb0ZX6hIPDp8+zvjdYm0W7p/0GUXASx KF+DhqrcLuq/WmAvYSwv31PzU5Tq7nWA3Rw6K4hg7MOXOEUGJ2KYQ5brw6S5FjHifvkf6r Vk5rIhXy0eKzOEsGm8eTITqVG9EIv+MKHZ7Za6yGt+MZZ85FFDgFkH2NAFatxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=a0ffae30c593d829bc9cdd7b32017352e501d247 commit a0ffae30c593d829bc9cdd7b32017352e501d247 Author: Hans Petter Selasky AuthorDate: 2022-06-23 09:31:17 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-28 06:17:20 +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-v6.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c index 29547672651d..f8fc9e670d2b 100644 --- a/sys/arm/arm/busdma_machdep-v6.c +++ b/sys/arm/arm/busdma_machdep-v6.c @@ -1274,10 +1274,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;