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=ham 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 9387EC433E0 for ; Mon, 28 Dec 2020 12:53:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2984B208D5 for ; Mon, 28 Dec 2020 12:53:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2984B208D5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 20A2A8D0002; Mon, 28 Dec 2020 07:53:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BAE28D0001; Mon, 28 Dec 2020 07:53:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D0E58D0002; Mon, 28 Dec 2020 07:53:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0116.hostedemail.com [216.40.44.116]) by kanga.kvack.org (Postfix) with ESMTP id EBD288D0001 for ; Mon, 28 Dec 2020 07:53:55 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B5AF21EE6 for ; Mon, 28 Dec 2020 12:53:55 +0000 (UTC) X-FDA: 77642683230.14.car53_0411a5127494 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 98DAA18229835 for ; Mon, 28 Dec 2020 12:53:55 +0000 (UTC) X-HE-Tag: car53_0411a5127494 X-Filterd-Recvd-Size: 6268 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Mon, 28 Dec 2020 12:53:55 +0000 (UTC) Received: by mail-lf1-f52.google.com with SMTP id x20so23600260lfe.12 for ; Mon, 28 Dec 2020 04:53:54 -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=e/ofUiCRRpB4u/ncszNNbx4yVQ41aGMLvWQFS35RvZk=; b=LtOrTYXJm5GCAEJmyygo6av6ilVjte7nrHfuv67gXDpKd+J+pPdTCcxYoIGp1dX2w5 Ihd5Qc2FtGU3gkA9UCXFeBOVXtmF3FnWevd7p76cvCLgY3D+rXxSsU67PTKPx5J3a9zf uElwOP/OCHcUtHiAe6BZzxxUfgrYLg2Z7S38iArnEgsXBm7Vdj8wuG58GjfYodS8aTsq t0CWf/hY4H5bnuF+Baqp67r1D0d25zzn6kMkxzTUWCUgm15TmoKXiO8s6vvrzcjs5BmL 56zSFKosBDPZB9Q+jEXFPoy/z3+8D1EQY1QWh/kndY66e3IQB0KG8w+ANVgwfrdXZJAC 5ZeQ== 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=e/ofUiCRRpB4u/ncszNNbx4yVQ41aGMLvWQFS35RvZk=; b=EhjSJpqe7+GrAcstPC3VwzIDnHqWPT0O36Ql7fYEOck/jppUqQKuNOV69n6Aby2jmr K0b2AYBck0UNuib6cy8SRk18mkyYsHSjdtp19J1JmrDdVwjno+U0Kubfz0HIQGCs8Wp4 LKKai+8mkTmukU3HthUZEQi4mwM5H6G93WGNH5fSZvSRNYMGtBRycQa0pE/dS2+Ln0VQ beWxgh6okNq1hKcheJqdiTSgcZBQPRrF/i1QNT99dmQ1aUYvzeZ/dcX6t2IY2EQN7Q0Q PJLIDMRaNfyVlVt9rCpXy900y4axEBJiEYYhxgaIOtGreg88aL6AvsHIRbLV5e/TEygi Unzg== X-Gm-Message-State: AOAM533zniO8xGnFuxHWSkTSUGmvKTkdCbnf4fJRcvVf0tzTql50w1u8 HHH43V9TCCq/AGbtm1gpP+Qg5Q== X-Google-Smtp-Source: ABdhPJyF06z1uqFK1T0R7uip1K18Ag78t+cj6KkROGIX8ECc9cTa2pWQCwBOjCm+YlSORX87suNs5A== X-Received: by 2002:a05:651c:205b:: with SMTP id t27mr22712768ljo.368.1609160033448; Mon, 28 Dec 2020 04:53:53 -0800 (PST) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id j26sm200426lfh.251.2020.12.28.04.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 04:53:52 -0800 (PST) Received: by box.localdomain (Postfix, from userid 1000) id 89D9A100F3B; Mon, 28 Dec 2020 15:53:52 +0300 (+03) Date: Mon, 28 Dec 2020 15:53:52 +0300 From: "Kirill A. Shutemov" To: Hugh Dickins Cc: Linus Torvalds , 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: <20201228125352.phnj2x2ci3kwfld5@box> References: <20201226204335.dikqkrkezqet6oqf@box> <20201226224016.dxjmordcfj75xgte@box> <20201227234853.5mjyxcybucts3kbq@box> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Sun, Dec 27, 2020 at 10:43:44PM -0800, Hugh Dickins wrote: > On Sun, 27 Dec 2020, Linus Torvalds wrote: > > On Sun, Dec 27, 2020 at 3:48 PM Kirill A. Shutemov wrote: > > > > > > I did what Hugh proposed and it got clear to my eyes. It gets somewhat > > > large, but take a look. > > > > Ok, it's not that much bigger, and the end result is certainly much > > clearer wrt locking. > > > > So that last version of yours with the fix for the uninitialized 'ret' > > variable looks good to me. > > > > Of course, I've said that before, and have been wrong. So ... > > And guess what... it's broken. > > I folded it into testing rc1: segfault on cc1, systemd > "Journal file corrupted, rotating", seen on more than one machine. > > I've backed it out, rc1 itself seems fine, I'll leave rc1 under > load overnight, then come back to the faultaround patch tomorrow; > won't glance at it tonight, but maybe Kirill will guess what's wrong. So far I only found one more pin leak and always-true check. I don't see how can it lead to crash or corruption. Keep looking. diff --git a/mm/filemap.c b/mm/filemap.c index c5da09f3f363..87671284de62 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2966,8 +2966,7 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, unsigned long address, mmap_miss--; vmf->address += (xas.xa_index - last_pgoff) << PAGE_SHIFT; - if (vmf->pte) - vmf->pte += xas.xa_index - last_pgoff; + vmf->pte += xas.xa_index - last_pgoff; last_pgoff = xas.xa_index; if (!pte_none(*vmf->pte)) diff --git a/mm/memory.c b/mm/memory.c index e51638b92e7c..829f5056dd1c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3785,13 +3785,16 @@ vm_fault_t finish_fault(struct vm_fault *vmf) vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl); + ret = 0; /* Re-check under ptl */ if (likely(pte_none(*vmf->pte))) do_set_pte(vmf, page); + else + ret = VM_FAULT_NOPAGE; update_mmu_tlb(vma, vmf->address, vmf->pte); pte_unmap_unlock(vmf->pte, vmf->ptl); - return 0; + return ret; } static unsigned long fault_around_bytes __read_mostly = -- Kirill A. Shutemov