From patchwork Wed May 24 15:26:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13254179 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD9FFC77B7A for ; Wed, 24 May 2023 15:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VWtBfPH0OxJI9CPaNh33FNEM25Hl5BfXQniqcQjkmDw=; b=nNVSCPXvH/5+ND e8l0L8PWIa4mgv8b0X4SAHHvAYQi0WGh7W0C1wqH9dII/AlmkJQxM9xQFiWPaSjfzpgID7EYab+j9 1T4eqzG9GcFUH75oh5zSbVdR1XQ7/oYnO+P35eCL12m5NKolYXn1GD/6h9Jzmogw4F6/koKP8oCNU E+O7yh7C2PTqtg6lgN0ITDAQDx2mdAKyjHt9PDgPWs6HctFuGd6VddFbqipD+6Ps8sx1F66DBam3/ 4HFoDxQ3TiDwalfYHbEFp5qAcZGq/D3UkpU9Gv50bF1Gtk07/YX9sMrglRa8aww3W1htfyhtZMcsU K5yL8OiB5qIS2wnLmtyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1qO4-00Dpkz-0N; Wed, 24 May 2023 15:26:52 +0000 Received: from mout.gmx.net ([212.227.17.21]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1qO0-00Dpji-0W for linux-arm-kernel@lists.infradead.org; Wed, 24 May 2023 15:26:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1684941998; i=deller@gmx.de; bh=+7ESBTMnHGzg+BKexPIHQjMLlUGjKMaqw4IK8630UvE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=VUgJ0nXppL2cSoQPfPaZ9sFoxXNPq3sAWnlS2eRSnwHoGM5lbpghuqTKcBqWr9TDX RUsG/RFliWFIYSrqEI05t/eIeRWNPqVyrZAwx7GxnoLF3fVr6lvlCthH4DJZ/Jhb16 669t/7BzI8s69lwdGSilAdF6c/JFoe+j3AmbP7hUwxdxd3hJMkd932eketQdzP9NY5 GTWCklCGS+Wuiu3nbXe4y25H6BVN8GkQXkvVxr8sgJXYEQXm8cgWhNN2AIpbAYEotr HjdIl7dnTtbp8S72+y+7QGsAZt2Czp3J9+AE0y2dMQFVN+NHtJBvFPjvDKmU77XqSi HYRkvFP580uLA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([94.134.145.4]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mlw7f-1qS4a526J1-00j47c; Wed, 24 May 2023 17:26:38 +0200 From: Helge Deller To: linux@armlinux.org.uk, dinguyen@kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Cc: Helge Deller , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] arm: Fix flush_dcache_page() for usage from irq context Date: Wed, 24 May 2023 17:26:31 +0200 Message-Id: <20230524152633.203927-2-deller@gmx.de> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230524152633.203927-1-deller@gmx.de> References: <20230524152633.203927-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:tUOwkAD2Hwce0F7HpGXdFvczL1Vky+pJRPAudFb5SqpMeggqADn B/fQ3hYtCFp2le+aYewHIkulKDk774tIryq4+2qkyw3mjaF0HIG659O24ZDTrNfPlyMck6t dO6+9pQO60addIt/pr8QsTme9dFEhBQBJSZ3/xQRtY8INuwR+D0OVhig/RM7AWJKaCTkUjk zXnUkLghltylQ/1QDAHXA== UI-OutboundReport: notjunk:1;M01:P0:x5fMiYGFG/Y=;QxAs8oUyx99ZIokWpAiA7fEQnee mG3XQQGTRp0m0H8wQATcLxS6FSwRgYHVbRC7IahhpHsH0eToisxnnlA/6blF72C7sWn+lemem 9S7u2P4gKqzJnKVw2SifzUlVrKyPsXC3YP1p04CZGvjVZ1HeUJLrDZFkohNFfS6q/NbpD2kFT p8V6sRTxxqJ6RslEGOssl56LSUxpFNQiGWpc/t4ausZGt5jc4dC/7OKL9FNsPoejR4tVu31Qd 06+Sgd2jzwXfNi1rST8rzNDaXfRbJ4iqK32ctzf5GWJfT1BKtQ7RSWPntt5I64DaUk99d4vt1 SInwnAqiXHonKeEOB7B/hqS9ZvQA/BYtLF+cGf1YJm56ZLEV/G8UVTDZo+eQkKyjai+OxP1AS ZmWWQP6PT4BaQ1pDffWQ4Hd2/XE8Sr0LoOr5USvmzUbhaxJv35Hw+2Wb3Ov40d8dZTYFgeBen cTlNnyalUGAt3R+uNeFsXsYCSliyCb8AtMRrbZ0BB5fi2nLUetg3xIHccqLgR+Y7v+CIgCW9S aAOSWzjX2XZ5wwKRKfEpJirlsEyDg8KJBud3VfSB60QP7JsDQyoKDhcQNDSxNzIAe9Mf1CzRp hbks40j1tb/w4bZ665MgamCQr1GNdllwUtOISrD2uKpczgm+cJ3Fwuvji+yfX00+YqgiZVk60 GGkGOeR7z2fOa43Y6nRrXVoDpotPHPIRs4RpLwoEqXURg75iCHsIwryEbOPyko/bkyXZpZwPl S0f6O8GTTrgSe+DSd258j5WNIjxczc1XtsP62zkiO2bfWDYgbrXseHRRIuWBgmxLqYCEho5ZQ 8D7MCYvCRF+ygs+4f5sB2h5QUCyeZfNP4hFA3+lhEE/jpj0JW9IZUvZbsJNWbZhb6nh5fWldN BVMdtXDy+hURct4nW5J+dP2pJAkzNEirnzmL/krZZRQH4+kG3eoiHRRj1fOh1yWItxVY0QKHy fYBNzn82UH+cn1smT46PEofvVmM= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230524_082648_677498_DEBB4012 X-CRM114-Status: GOOD ( 13.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since at least kernel 6.1, flush_dcache_page() is called with IRQs disabled, e.g. from aio_complete(). But the current implementation for flush_dcache_page() on ARM unintentionally re-enables IRQs, which may lead to deadlocks. Fix it by using xa_lock_irqsave() and xa_unlock_irqrestore() for the flush_dcache_mmap_*lock() macros instead. Cc: Russell King (Oracle) Cc: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Helge Deller Reviewed-by: Arnd Bergmann --- arch/arm/include/asm/cacheflush.h | 4 ++++ arch/arm/mm/flush.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.38.1 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index a094f964c869..5b8a1ef0dc50 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -315,6 +315,10 @@ static inline void flush_anon_page(struct vm_area_struct *vma, #define flush_dcache_mmap_lock(mapping) xa_lock_irq(&mapping->i_pages) #define flush_dcache_mmap_unlock(mapping) xa_unlock_irq(&mapping->i_pages) +#define flush_dcache_mmap_lock_irqsave(mapping, flags) \ + xa_lock_irqsave(&mapping->i_pages, flags) +#define flush_dcache_mmap_unlock_irqrestore(mapping, flags) \ + xa_unlock_irqrestore(&mapping->i_pages, flags) /* * We don't appear to need to do anything here. In fact, if we did, we'd diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 7ff9feea13a6..d57ec9165520 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c @@ -238,6 +238,7 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p { struct mm_struct *mm = current->active_mm; struct vm_area_struct *mpnt; + unsigned long flags; pgoff_t pgoff; /* @@ -248,7 +249,7 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p */ pgoff = page->index; - flush_dcache_mmap_lock(mapping); + flush_dcache_mmap_lock_irqsave(mapping, flags); vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) { unsigned long offset; @@ -262,7 +263,7 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p offset = (pgoff - mpnt->vm_pgoff) << PAGE_SHIFT; flush_cache_page(mpnt, mpnt->vm_start + offset, page_to_pfn(page)); } - flush_dcache_mmap_unlock(mapping); + flush_dcache_mmap_unlock_irqrestore(mapping, flags); } #if __LINUX_ARM_ARCH__ >= 6