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=-8.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 F2EF2C433E0 for ; Sat, 26 Dec 2020 22:41:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BDDEE221F2 for ; Sat, 26 Dec 2020 22:41:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726179AbgLZWlB (ORCPT ); Sat, 26 Dec 2020 17:41:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726035AbgLZWlB (ORCPT ); Sat, 26 Dec 2020 17:41:01 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0ABCC061757 for ; Sat, 26 Dec 2020 14:40:20 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id s26so16163599lfc.8 for ; Sat, 26 Dec 2020 14:40:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=5xV1Uwr5QvPwGAEEhmKQuNt1ecyJlCF/DYUO0nnGbJA=; b=SSDOvkJaPZLQbLl1/R2yfC0vD8pNo/R7kwvwiR0BP96LI5plYaxX1qyeGTF5DDBAle Mo8kLCOdwcA3MLI3xds9N6DR0mR8YcPh8435LV12lTkVb7z8s/jFxu8aCFrWAzzJUUAx g/GK5Fi4t9MRDLYmUWaK9rgbfXgMXKSeAXeUa+bfRcHPK8APDNC8EGbShpG7KAI36SdC atxEb/OH8TBUcAyQcr1NCjzL/tS0AG1dM0/L+sQKDNLwl6XDx36uavQQdFqhRjWxZVXd E2OjzaZCA2OX8/82QsmFQLLMRPEVEBZN1TaKU3eQST1GmGun+pNtH/lyfbsbsWIW0YOH Nrnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=5xV1Uwr5QvPwGAEEhmKQuNt1ecyJlCF/DYUO0nnGbJA=; b=TtsjOIaNCkneArMLYvx0jMH49rYeTvA5Pv3vEfKXh7H89/ARWpXYR4inzVMnxK/Uj6 4deByjkrNz9kRY2tzcAyu8GZL9XJ57Wrf92K+qIG+TNTcqZC+PcKvDeN8gQIMrM9b+vT MPJVLXJSj3INKojhnoctqwoDyc3rjcvnsf0jGQHBY2cfGEGNVlA9jskBCTFcibwKqje1 MhR3K3/NOqBn2uoVCn+kFHghRu/E2LcbUCa6gsWlp7pXZoJVSP4+JpqacXk910JNn9V7 KETE0nRGde1ppUvQPWdYPo3SRITkBRJgfKT2V798CJbU+CgoDOwrkoDMXt/88tphJ93S Ux8w== X-Gm-Message-State: AOAM532arp+x2BoJLu2UMZpYoK9E+eB0noTaVWqrSyre3mWNP15EmCFs FlqBhrBNmTE9hCg28N8UPa2QqQ== X-Google-Smtp-Source: ABdhPJy9c7fz+61qQ39Hm9FQ6OMVPp5gAk3EtmrlxqSIgqfg7pTj+frNOUo4gc5k5Hr9EwE043FbPA== X-Received: by 2002:a05:651c:1063:: with SMTP id y3mr17737679ljm.431.1609022417964; Sat, 26 Dec 2020 14:40:17 -0800 (PST) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id y26sm5596811ljh.63.2020.12.26.14.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Dec 2020 14:40:17 -0800 (PST) Received: by box.localdomain (Postfix, from userid 1000) id 9EEEC1026FB; Sun, 27 Dec 2020 01:40:16 +0300 (+03) Date: Sun, 27 Dec 2020 01:40:16 +0300 From: "Kirill A. Shutemov" To: Linus Torvalds Cc: Hugh Dickins , Matthew Wilcox , "Kirill A. Shutemov" , Will Deacon , Linux Kernel Mailing List , Linux-MM , Linux ARM , Catalin Marinas , Jan Kara , Minchan Kim , Andrew Morton , Vinayak Menon , Android Kernel Team Subject: Re: [PATCH 1/2] mm: Allow architectures to request 'old' entries when prefaulting Message-ID: <20201226224016.dxjmordcfj75xgte@box> References: <20201219124103.w6isern3ywc7xbur@box> <20201222100047.p5zdb4ghagncq2oe@box> <20201225113157.e7hmluffh56fszfc@box> <20201226204335.dikqkrkezqet6oqf@box> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Dec 26, 2020 at 01:16:09PM -0800, Linus Torvalds wrote: > On Sat, Dec 26, 2020 at 1:04 PM Hugh Dickins wrote: > > > > > > Hold on. I guess this one will suffer from the same bug as the previous. > > I was about to report back, after satisfactory overnight testing of that > > version - provided that one big little bug is fixed: > > > > --- a/mm/filemap.c > > +++ b/mm/filemap.c > > @@ -2919,7 +2919,7 @@ static bool filemap_map_pmd(struct vm_fa > > > > if (pmd_none(*vmf->pmd) && > > PageTransHuge(page) && > > - do_set_pmd(vmf, page)) { > > + do_set_pmd(vmf, page) == 0) { > > unlock_page(page); > > return true; > > } > > I missed that entirely, because when just reading the patch it looks > fine and I didn't look at what do_set_pmd() function returns outside > the patch. > > And maybe it would be better to write it as > > if (pmd_none(*vmf->pmd) && PageTransHuge(page)) { > vm_fault_t ret = do_set_pmd(vmf, page); > if (!ret) { > ... > > instead to make it a bit more explicit about how that return value is > a vm_fault_t there... > > And see my other email about how I suspect there is still a leak in > that patch for the previous test-case. Ughh... Here's the fixup I have so far. It doesn't blow up immediately, but please take a closer look. Who knows what stupid mistake I did this time. :/ diff --git a/mm/filemap.c b/mm/filemap.c index 3a92aaa59b9b..c4b374678e7d 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2837,16 +2837,21 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct page *page) struct mm_struct *mm = vmf->vma->vm_mm; /* Huge page is mapped? No need to proceed. */ - if (pmd_trans_huge(*vmf->pmd)) - return true; - - if (pmd_none(*vmf->pmd) && - PageTransHuge(page) && - do_set_pmd(vmf, page)) { + if (pmd_trans_huge(*vmf->pmd)) { unlock_page(page); + put_page(page); return true; } + if (pmd_none(*vmf->pmd) && PageTransHuge(page)) { + vm_fault_t ret = do_set_pmd(vmf, page); + if (!ret) { + /* The page is mapped successfully, reference consumed. */ + unlock_page(page); + return true; + } + } + if (pmd_none(*vmf->pmd)) { vmf->ptl = pmd_lock(mm, vmf->pmd); if (likely(pmd_none(*vmf->pmd))) { @@ -2867,7 +2872,7 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct page *page) return false; } -static struct page *next_stable_page(struct page *page, struct vm_fault *vmf, +static struct page *next_uptodate_page(struct page *page, struct vm_fault *vmf, struct xa_state *xas, pgoff_t end_pgoff) { struct address_space *mapping = vmf->vma->vm_file->f_mapping; @@ -2914,15 +2919,16 @@ static inline struct page *first_map_page(struct vm_fault *vmf, struct xa_state *xas, pgoff_t end_pgoff) { - return next_stable_page(xas_find(xas, end_pgoff), vmf, xas, end_pgoff); + return next_uptodate_page(xas_find(xas, end_pgoff), + vmf, xas, end_pgoff); } static inline struct page *next_map_page(struct vm_fault *vmf, struct xa_state *xas, pgoff_t end_pgoff) { - return next_stable_page(xas_next_entry(xas, end_pgoff), - vmf, xas, end_pgoff); + return next_uptodate_page(xas_next_entry(xas, end_pgoff), + vmf, xas, end_pgoff); } void filemap_map_pages(struct vm_fault *vmf, -- Kirill A. Shutemov 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=-8.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 A9857C433E0 for ; Sat, 26 Dec 2020 22:42:42 +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 39CEF207A1 for ; Sat, 26 Dec 2020 22:42:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39CEF207A1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name 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=+67OycTywofQMII//r99YWTnI+GLb/cNNW7e7De62ZQ=; b=1wvz5HlU+X78XY6xb/hxHLb6E luSxoToR9KLUXRIVt4FdhzY9k6ruXIXdfJhIjSWoVlbIgJnwugcDyrnVg/OonKNFqfc92YMznEd4a dAEuhW+urkYezQjx0vzV7aMBqISK7JAgOiML2LxUUMWhtSef/mQDuQK5dJLKiWbs7qZAvjQYS0dBl 851HnOIzlWzxjBEO7oPfdf/WCXj+H6w0+vNdwAWSvtM5XSKkdWxqcmaVnAdy+P3OkNQ38heHaMHAt 0GbMb8NaZdF1qMEd8nrYdp9w4ZiqriqzB8SnFTIF5WfP2vayGDCCwwlpybWLa8mHibZEg4RsTjSc7 x6rQYpqwQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ktIEZ-0008I3-LO; Sat, 26 Dec 2020 22:40:23 +0000 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ktIEW-0008HF-TY for linux-arm-kernel@lists.infradead.org; Sat, 26 Dec 2020 22:40:22 +0000 Received: by mail-lf1-x12e.google.com with SMTP id h22so16253313lfu.2 for ; Sat, 26 Dec 2020 14:40:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=5xV1Uwr5QvPwGAEEhmKQuNt1ecyJlCF/DYUO0nnGbJA=; b=SSDOvkJaPZLQbLl1/R2yfC0vD8pNo/R7kwvwiR0BP96LI5plYaxX1qyeGTF5DDBAle Mo8kLCOdwcA3MLI3xds9N6DR0mR8YcPh8435LV12lTkVb7z8s/jFxu8aCFrWAzzJUUAx g/GK5Fi4t9MRDLYmUWaK9rgbfXgMXKSeAXeUa+bfRcHPK8APDNC8EGbShpG7KAI36SdC atxEb/OH8TBUcAyQcr1NCjzL/tS0AG1dM0/L+sQKDNLwl6XDx36uavQQdFqhRjWxZVXd E2OjzaZCA2OX8/82QsmFQLLMRPEVEBZN1TaKU3eQST1GmGun+pNtH/lyfbsbsWIW0YOH Nrnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=5xV1Uwr5QvPwGAEEhmKQuNt1ecyJlCF/DYUO0nnGbJA=; b=mR5MGrryIQ2Jcor9hAQ2M6h4PPcT2NCUQsnj7CdOc5lZZreHPnB7HbOQaKSYjwPmpF AiXBBkkIHBMXALTbjRFw2Ml7yGEWhMQMy8mhP1v1q+uoFc1QAYzk7fBm4Gaj/zLar2nH 3OXsIqjRFpiSKJvzIiUM3kHEorvqRd7XcAPG+QJ7DWtNK85dUkmSNAo5GWlnRrP0KyMg lD4LdTsLS5BlJlxt4e7G7m02cfsm5+oG6fLETkrwNSN4c+qE8ny0M5f1Wqt9gEUq9kIP fuCsLCo8Cb6C/Cnm0OvToNsRwA4nzvcdL38fbcPcbSPqnDaUK4qbbiYFd/el2nCmnYb1 e5RQ== X-Gm-Message-State: AOAM533rYqdhJljLY0po5l5URUyGTHTcjnoaLc/sV5z8zlaK+4w7NwPg 7g7HfZZEyDxRFAbx1kPZhMjapQ== X-Google-Smtp-Source: ABdhPJy9c7fz+61qQ39Hm9FQ6OMVPp5gAk3EtmrlxqSIgqfg7pTj+frNOUo4gc5k5Hr9EwE043FbPA== X-Received: by 2002:a05:651c:1063:: with SMTP id y3mr17737679ljm.431.1609022417964; Sat, 26 Dec 2020 14:40:17 -0800 (PST) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id y26sm5596811ljh.63.2020.12.26.14.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Dec 2020 14:40:17 -0800 (PST) Received: by box.localdomain (Postfix, from userid 1000) id 9EEEC1026FB; Sun, 27 Dec 2020 01:40:16 +0300 (+03) Date: Sun, 27 Dec 2020 01:40:16 +0300 From: "Kirill A. Shutemov" To: Linus Torvalds Subject: Re: [PATCH 1/2] mm: Allow architectures to request 'old' entries when prefaulting Message-ID: <20201226224016.dxjmordcfj75xgte@box> References: <20201219124103.w6isern3ywc7xbur@box> <20201222100047.p5zdb4ghagncq2oe@box> <20201225113157.e7hmluffh56fszfc@box> <20201226204335.dikqkrkezqet6oqf@box> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201226_174021_125311_AB02AECC X-CRM114-Status: GOOD ( 29.49 ) 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: Android Kernel Team , Jan Kara , Minchan Kim , Catalin Marinas , Hugh Dickins , Linux Kernel Mailing List , Matthew Wilcox , Linux-MM , Vinayak Menon , Linux ARM , Andrew Morton , Will Deacon , "Kirill A. Shutemov" 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 Sat, Dec 26, 2020 at 01:16:09PM -0800, Linus Torvalds wrote: > On Sat, Dec 26, 2020 at 1:04 PM Hugh Dickins wrote: > > > > > > Hold on. I guess this one will suffer from the same bug as the previous. > > I was about to report back, after satisfactory overnight testing of that > > version - provided that one big little bug is fixed: > > > > --- a/mm/filemap.c > > +++ b/mm/filemap.c > > @@ -2919,7 +2919,7 @@ static bool filemap_map_pmd(struct vm_fa > > > > if (pmd_none(*vmf->pmd) && > > PageTransHuge(page) && > > - do_set_pmd(vmf, page)) { > > + do_set_pmd(vmf, page) == 0) { > > unlock_page(page); > > return true; > > } > > I missed that entirely, because when just reading the patch it looks > fine and I didn't look at what do_set_pmd() function returns outside > the patch. > > And maybe it would be better to write it as > > if (pmd_none(*vmf->pmd) && PageTransHuge(page)) { > vm_fault_t ret = do_set_pmd(vmf, page); > if (!ret) { > ... > > instead to make it a bit more explicit about how that return value is > a vm_fault_t there... > > And see my other email about how I suspect there is still a leak in > that patch for the previous test-case. Ughh... Here's the fixup I have so far. It doesn't blow up immediately, but please take a closer look. Who knows what stupid mistake I did this time. :/ diff --git a/mm/filemap.c b/mm/filemap.c index 3a92aaa59b9b..c4b374678e7d 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2837,16 +2837,21 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct page *page) struct mm_struct *mm = vmf->vma->vm_mm; /* Huge page is mapped? No need to proceed. */ - if (pmd_trans_huge(*vmf->pmd)) - return true; - - if (pmd_none(*vmf->pmd) && - PageTransHuge(page) && - do_set_pmd(vmf, page)) { + if (pmd_trans_huge(*vmf->pmd)) { unlock_page(page); + put_page(page); return true; } + if (pmd_none(*vmf->pmd) && PageTransHuge(page)) { + vm_fault_t ret = do_set_pmd(vmf, page); + if (!ret) { + /* The page is mapped successfully, reference consumed. */ + unlock_page(page); + return true; + } + } + if (pmd_none(*vmf->pmd)) { vmf->ptl = pmd_lock(mm, vmf->pmd); if (likely(pmd_none(*vmf->pmd))) { @@ -2867,7 +2872,7 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct page *page) return false; } -static struct page *next_stable_page(struct page *page, struct vm_fault *vmf, +static struct page *next_uptodate_page(struct page *page, struct vm_fault *vmf, struct xa_state *xas, pgoff_t end_pgoff) { struct address_space *mapping = vmf->vma->vm_file->f_mapping; @@ -2914,15 +2919,16 @@ static inline struct page *first_map_page(struct vm_fault *vmf, struct xa_state *xas, pgoff_t end_pgoff) { - return next_stable_page(xas_find(xas, end_pgoff), vmf, xas, end_pgoff); + return next_uptodate_page(xas_find(xas, end_pgoff), + vmf, xas, end_pgoff); } static inline struct page *next_map_page(struct vm_fault *vmf, struct xa_state *xas, pgoff_t end_pgoff) { - return next_stable_page(xas_next_entry(xas, end_pgoff), - vmf, xas, end_pgoff); + return next_uptodate_page(xas_next_entry(xas, end_pgoff), + vmf, xas, end_pgoff); } void filemap_map_pages(struct vm_fault *vmf, -- Kirill A. Shutemov _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel