From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7830C433DB for ; Wed, 10 Feb 2021 11:50:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6AE564E3B for ; Wed, 10 Feb 2021 11:50:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229649AbhBJLt3 (ORCPT ); Wed, 10 Feb 2021 06:49:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:32882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbhBJLpk (ORCPT ); Wed, 10 Feb 2021 06:45:40 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2512464E2A; Wed, 10 Feb 2021 11:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612957494; bh=7TkHMquWewApmsNtom3Sk5kqBfrt9Txj5xLN/pBrQbQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DL62wACXYBcjnG+VbxBoQ4TYtFlxHK8gFj0AxepZjo6k1qqDqCpBL9Y6A0SgOCgXF PNIrogaCWaCeEUIZCmh62iBX0N/x4R8rrXqFBUvBf5QwDCi5aSNHxQJJ8KzteVPR4L jMMhqfzhPDf9dRrRi9DzsOrFnUn1i7Z3WmuFhNfUrO+N2mcRC5T3paGOCIWP3rajLt +i+fPsbpHP4P+jNSrpnof2o+WFq1tgN2Nc0ALIG+ZwHzxZCkD+Tckx/k09YvnerwJC GxPr7xqtz4iAyOV0qSZdbtR7qZutK2JXNmFv1tRdDs3oKeNdaVTnm9bF8saT3H+Sol o3Mk1/eEziGlA== Date: Wed, 10 Feb 2021 11:44:48 +0000 From: Will Deacon To: Guenter Roeck Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Catalin Marinas , Jan Kara , Minchan Kim , Andrew Morton , "Kirill A . Shutemov" , Linus Torvalds , Vinayak Menon , Hugh Dickins , kernel-team@android.com Subject: Re: [PATCH v3 1/8] mm: Cleanup faultaround and finish_fault() codepaths Message-ID: <20210210114448.GA28682@willie-the-truck> References: <20210114175934.13070-1-will@kernel.org> <20210114175934.13070-2-will@kernel.org> <20210209202449.GA104837@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210209202449.GA104837@roeck-us.net> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 09, 2021 at 12:24:49PM -0800, Guenter Roeck wrote: > On Thu, Jan 14, 2021 at 05:59:27PM +0000, Will Deacon wrote: > > From: "Kirill A. Shutemov" > > > > alloc_set_pte() has two users with different requirements: in the > > faultaround code, it called from an atomic context and PTE page table > > has to be preallocated. finish_fault() can sleep and allocate page table > > as needed. > > > > PTL locking rules are also strange, hard to follow and overkill for > > finish_fault(). > > > > Let's untangle the mess. alloc_set_pte() has gone now. All locking is > > explicit. > > > > The price is some code duplication to handle huge pages in faultaround > > path, but it should be fine, having overall improvement in readability. > > > > Link: https://lore.kernel.org/r/20201229132819.najtavneutnf7ajp@box > > Signed-off-by: Kirill A. Shutemov > > [will: s/from from/from/ in comment; spotted by willy] > > Signed-off-by: Will Deacon > > --- > > fs/xfs/xfs_file.c | 6 +- > > include/linux/mm.h | 12 ++- > > include/linux/pgtable.h | 11 +++ > > mm/filemap.c | 177 ++++++++++++++++++++++++++--------- > > mm/memory.c | 199 ++++++++++++---------------------------- > > 5 files changed, 213 insertions(+), 192 deletions(-) > > > > When building microblaze:mmu_defconfig: > > mm/filemap.c: In function 'filemap_map_pages': > mm/filemap.c:3153:3: error: implicit declaration of function 'update_mmu_cache'; did you mean 'update_mmu_tlb'? > > Bisect log attached. Looks like a missing include. Will --->8 >From 076f93117c067d5b6caab4773c6d6da130859cc4 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Wed, 10 Feb 2021 11:15:11 +0000 Subject: [PATCH] mm: filemap: Fix microblaze build failure with 'mmu_defconfig' Commit f9ce0be71d1f ("mm: Cleanup faultaround and finish_fault() codepaths") added a call to 'update_mmu_cache()' in mm/filemap.c, which breaks the build for microblaze: | mm/filemap.c: In function 'filemap_map_pages': | mm/filemap.c:3153:3: error: implicit declaration of function 'update_mmu_cache'; did you mean 'update_mmu_tlb'? Include asm/tlbflush.h in mm/filemap.c to make sure that the function (or indeed, macro) is available. Reported-by: Guenter Roeck Link: https://lore.kernel.org/r/20210209202449.GA104837@roeck-us.net Signed-off-by: Will Deacon --- mm/filemap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/filemap.c b/mm/filemap.c index fb7a8d9b5603..2ca13227747b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -43,6 +43,7 @@ #include #include #include +#include #include "internal.h" #define CREATE_TRACE_POINTS -- 2.30.0.478.g8a0d178c01-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2501C433DB for ; Wed, 10 Feb 2021 11:46:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5777A64E40 for ; Wed, 10 Feb 2021 11:46:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5777A64E40 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bmihD1YXChqbFA/SNKWzJmcixGoh6bZQtdNQkc5mjzY=; b=UykCEiA3jDegcIqFSu7pRD51z V9qe7w0JPEp+78PXw5r6OFZusC9XpxWpPCuzTcEJK2+OLX4aAxwhU1yTRGPvAqVp5zB7QmOc6GTi1 XId1Ej+L2/WINHzVnSxpDElHc0cGwUkNQ5ea451G3BtxPIMKubyAltcyzSf8czLRd8HlYbMmVDEls w7vyCwbTsljVmattW9+KfSH/MSCxFhv+RiPs7EgHrmK92jLz/AhU8aF9xihMjQLzV0VNee5SYeb4I d/g09ck8Z3Mzo8YTTLH180MIvfrj/FkpoRW1Epibt5IKbYL2inxyPe0pFGbYD8VfFc3W0KHTJPKpa cRf4Tlvbw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9nvW-00012h-J6; Wed, 10 Feb 2021 11:44:58 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9nvT-000115-C5 for linux-arm-kernel@lists.infradead.org; Wed, 10 Feb 2021 11:44:56 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2512464E2A; Wed, 10 Feb 2021 11:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612957494; bh=7TkHMquWewApmsNtom3Sk5kqBfrt9Txj5xLN/pBrQbQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DL62wACXYBcjnG+VbxBoQ4TYtFlxHK8gFj0AxepZjo6k1qqDqCpBL9Y6A0SgOCgXF PNIrogaCWaCeEUIZCmh62iBX0N/x4R8rrXqFBUvBf5QwDCi5aSNHxQJJ8KzteVPR4L jMMhqfzhPDf9dRrRi9DzsOrFnUn1i7Z3WmuFhNfUrO+N2mcRC5T3paGOCIWP3rajLt +i+fPsbpHP4P+jNSrpnof2o+WFq1tgN2Nc0ALIG+ZwHzxZCkD+Tckx/k09YvnerwJC GxPr7xqtz4iAyOV0qSZdbtR7qZutK2JXNmFv1tRdDs3oKeNdaVTnm9bF8saT3H+Sol o3Mk1/eEziGlA== Date: Wed, 10 Feb 2021 11:44:48 +0000 From: Will Deacon To: Guenter Roeck Subject: Re: [PATCH v3 1/8] mm: Cleanup faultaround and finish_fault() codepaths Message-ID: <20210210114448.GA28682@willie-the-truck> References: <20210114175934.13070-1-will@kernel.org> <20210114175934.13070-2-will@kernel.org> <20210209202449.GA104837@roeck-us.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210209202449.GA104837@roeck-us.net> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210210_064455_705603_92166742 X-CRM114-Status: GOOD ( 23.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-team@android.com, Jan Kara , Minchan Kim , Catalin Marinas , Hugh Dickins , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Vinayak Menon , "Kirill A . Shutemov" , Andrew Morton , Linus Torvalds , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Feb 09, 2021 at 12:24:49PM -0800, Guenter Roeck wrote: > On Thu, Jan 14, 2021 at 05:59:27PM +0000, Will Deacon wrote: > > From: "Kirill A. Shutemov" > > > > alloc_set_pte() has two users with different requirements: in the > > faultaround code, it called from an atomic context and PTE page table > > has to be preallocated. finish_fault() can sleep and allocate page table > > as needed. > > > > PTL locking rules are also strange, hard to follow and overkill for > > finish_fault(). > > > > Let's untangle the mess. alloc_set_pte() has gone now. All locking is > > explicit. > > > > The price is some code duplication to handle huge pages in faultaround > > path, but it should be fine, having overall improvement in readability. > > > > Link: https://lore.kernel.org/r/20201229132819.najtavneutnf7ajp@box > > Signed-off-by: Kirill A. Shutemov > > [will: s/from from/from/ in comment; spotted by willy] > > Signed-off-by: Will Deacon > > --- > > fs/xfs/xfs_file.c | 6 +- > > include/linux/mm.h | 12 ++- > > include/linux/pgtable.h | 11 +++ > > mm/filemap.c | 177 ++++++++++++++++++++++++++--------- > > mm/memory.c | 199 ++++++++++++---------------------------- > > 5 files changed, 213 insertions(+), 192 deletions(-) > > > > When building microblaze:mmu_defconfig: > > mm/filemap.c: In function 'filemap_map_pages': > mm/filemap.c:3153:3: error: implicit declaration of function 'update_mmu_cache'; did you mean 'update_mmu_tlb'? > > Bisect log attached. Looks like a missing include. Will --->8 >From 076f93117c067d5b6caab4773c6d6da130859cc4 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Wed, 10 Feb 2021 11:15:11 +0000 Subject: [PATCH] mm: filemap: Fix microblaze build failure with 'mmu_defconfig' Commit f9ce0be71d1f ("mm: Cleanup faultaround and finish_fault() codepaths") added a call to 'update_mmu_cache()' in mm/filemap.c, which breaks the build for microblaze: | mm/filemap.c: In function 'filemap_map_pages': | mm/filemap.c:3153:3: error: implicit declaration of function 'update_mmu_cache'; did you mean 'update_mmu_tlb'? Include asm/tlbflush.h in mm/filemap.c to make sure that the function (or indeed, macro) is available. Reported-by: Guenter Roeck Link: https://lore.kernel.org/r/20210209202449.GA104837@roeck-us.net Signed-off-by: Will Deacon --- mm/filemap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/filemap.c b/mm/filemap.c index fb7a8d9b5603..2ca13227747b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -43,6 +43,7 @@ #include #include #include +#include #include "internal.h" #define CREATE_TRACE_POINTS -- 2.30.0.478.g8a0d178c01-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel