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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8286EC433EF for ; Thu, 16 Dec 2021 07:07:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BBB66B0071; Thu, 16 Dec 2021 02:07:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 945B86B0073; Thu, 16 Dec 2021 02:07:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E5FB6B0074; Thu, 16 Dec 2021 02:07:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0244.hostedemail.com [216.40.44.244]) by kanga.kvack.org (Postfix) with ESMTP id 6FBB66B0071 for ; Thu, 16 Dec 2021 02:07:21 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 30D9387CBD for ; Thu, 16 Dec 2021 07:07:11 +0000 (UTC) X-FDA: 78922775862.07.6203C82 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id A92B0160013 for ; Thu, 16 Dec 2021 07:07:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639638430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nQ+Kpk46ja0vs/b2m8ekD9wFfyzwjf/LHl8S2lBKZxU=; b=IsLES61+yJL/GJWYJP0scRcUR19Niq7L4RAF5kT0jfEny1f1g8qE9WyfeCPm6cQQOO0XPK eEwSzXMCDXkxI9pYGnrE2WZK+0Fs+B0M5b/UjfrULiJuP5OpnB+Hn8BJ0XdAoMyzDo4lrv yTu0x3SnFqDtZdx5zayYYwzdmFAgWgY= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-357-33SBQCJEMuGvMK2yAeTMww-1; Thu, 16 Dec 2021 02:07:05 -0500 X-MC-Unique: 33SBQCJEMuGvMK2yAeTMww-1 Received: by mail-wm1-f70.google.com with SMTP id r10-20020a1c440a000000b003456b2594e0so1308332wma.8 for ; Wed, 15 Dec 2021 23:07:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=nQ+Kpk46ja0vs/b2m8ekD9wFfyzwjf/LHl8S2lBKZxU=; b=wt+48JgClnsB8VCdIm8IVcs5RBW9siyUFu43W8FfOXhDkvaPBq10DYKIgn8cTskyY7 CFBjOu0WXPu8oGhKjoBR2zE0RCy+r6GS2tTZaI/btUo1EmjJGwtldu2qGMGDsq4csOlr ceKf2w6bbEGSUDA69j00aZzpRCFbLTynmj8vUgpwxhCbCzOLBiQaBp+jfcXsAwowIbKr zx107XLJWOVJ5fgwX7SwtZEd0+rEyKkKnkkdWOBYs44oOLssRzyNne2GzAtPAFwubEig Wbg1/rD+U6Fv/m3pEBA+VyqeHSPQbEFgY/XOswa9eCP1yaIKQej4OlKIo+6lNXQc8/Vm Q0JA== X-Gm-Message-State: AOAM530H7MBsxixdxM0SgATAAtjyHBwkjYrjp1FdAJJ0PH3wSvST3Bd6 9M1sMUD0NzUeiQJOQ7YJBYgEg9uPFv/+lq0tiYnwqwwkqkHC9dVqSr1bDIxI//uP2D0k5cmaW/f pT/sMRlc+egs= X-Received: by 2002:a1c:1b8c:: with SMTP id b134mr3573659wmb.44.1639638424562; Wed, 15 Dec 2021 23:07:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwav4mRKCNtGfR52yIgz6K6ln37TyJ5phqOa6m4S7cyT8hD9zfrRfGiph7ff3D1FA16sYT4rg== X-Received: by 2002:a1c:1b8c:: with SMTP id b134mr3573628wmb.44.1639638424284; Wed, 15 Dec 2021 23:07:04 -0800 (PST) Received: from xz-m1.local ([64.64.123.12]) by smtp.gmail.com with ESMTPSA id a1sm5048409wri.89.2021.12.15.23.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 23:07:03 -0800 (PST) Date: Thu, 16 Dec 2021 15:06:54 +0800 From: Peter Xu To: Alistair Popple Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Axel Rasmussen , Nadav Amit , Mike Rapoport , Hugh Dickins , Mike Kravetz , "Kirill A . Shutemov" , Jerome Glisse , Matthew Wilcox , Andrew Morton , David Hildenbrand , Andrea Arcangeli Subject: Re: [PATCH v6 03/23] mm: Check against orig_pte for finish_fault() Message-ID: References: <20211115075522.73795-1-peterx@redhat.com> <1760244.MLhrlNdmRJ@nvdebian> MIME-Version: 1.0 In-Reply-To: <1760244.MLhrlNdmRJ@nvdebian> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A92B0160013 X-Stat-Signature: k1kpgipdamid4cmfaxa6yd96qzzqpjec Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IsLES61+; spf=none (imf08.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1639638426-290709 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 Thu, Dec 16, 2021 at 05:23:40PM +1100, Alistair Popple wrote: > On Thursday, 16 December 2021 4:50:47 PM AEDT Peter Xu wrote: > > On Thu, Dec 16, 2021 at 01:38:33PM +0800, Peter Xu wrote: > > > On Thu, Dec 16, 2021 at 04:01:47PM +1100, Alistair Popple wrote: > > > > On Monday, 15 November 2021 6:55:02 PM AEDT Peter Xu wrote: > > > > > We used to check against none pte and in those cases orig_pte should always be > > > > > none pte anyway. > > > > > > > > Is that always true? From what I can see in handle_pte_fault() orig_pte only > > > > gets initialised in the !pmd_none() case so might not be pte_none. > > > > > > I believe it's true, otherwise I must have overlooked. > > > > > > IMHO it's not "when we set orig_pte" that matters - note that finish_fault() > > > (that this patch modifies) is only called for file-backed memories, and it's > > > only called in do_fault() where the pte is not mapped at all. > > > > > > DAX seems to call it too, but still DAX comes from do_fault() too, afaict. > > > > > > The pte will not be mapped in two cases in handle_pte_fault(): > > > > > > - When pmd_none > > > > > > - When !pmd_none, however if we find that pte_none==true, that's: > > > > > > if (pte_none(vmf->orig_pte)) { > > > pte_unmap(vmf->pte); > > > vmf->pte = NULL; > > > } > > > > > > So when we're already in do_fault(), afaict, orig_pte must be pte_none(). > > > Another side note is that, IIUC pte_none() is a looser check than the > > > pte_val()==0 and it should be arch dependent. > > > > So one more thing I forgot to mention... Of course above is based on the fact > > that orig_pte will be initialized to zero when creating vmf structure, and > > that's done in __handle_mm_fault(): > > > > struct vm_fault vmf = { > > .vma = vma, > > .address = address & PAGE_MASK, > > .flags = flags, > > .pgoff = linear_page_index(vma, address), > > .gfp_mask = __get_fault_gfp_mask(vma), > > }; > > > > I'm not sure whether I should explicitly set it to pte_val(0), in most C > > programs we'll already assume it's a proper reset of orig_pte value in c99 > > initialization format, but if anyone thinks we should do that explicitly plus > > some comments I can do that too. > > Ok, that was really my question. Is: > > if (likely(pte_none(*vmf->pte))) > > equivalent to: > > if (likely(pte_same(*vmf->pte, __pte(0)))) > > for every architecture? Looking at Xtensa for example suggests it might not be: > > arch/xtensa/include/asm/pgtable.h: > # define pte_none(pte) (pte_val(pte) == (_PAGE_CA_INVALID | _PAGE_USER)) Yes, another good question... I never expected arch that has pte_none(pte_val(0))==false.. but indeed xtensa is one of them. I digged a bit more, s390 seems to be the other one. I wondered how it could have worked - I thought e.g. pte_alloc_one() will always return a pgtable page will all zero-filled, whose allocation should require __GFP_ZERO anyway. But then I quickly noticed that pte_alloc_one() is per-arch too.. That explains, because per-arch can re-initialize the default pte values. S390 re-initializes its pgtable pages in arch/s390/mm/pgalloc.c: unsigned long *page_table_alloc(struct mm_struct *mm) memset64((u64 *)table, _PAGE_INVALID, PTRS_PER_PTE); While similarly xtensa has: #define pte_clear(mm,addr,ptep) \ do { update_pte(ptep, __pte(_PAGE_CA_INVALID | _PAGE_USER)); } while (0) The solution should be simple - I could re-introduce FAULT_FLAG_UFFD_WP. That flag used to exist in older versions, e.g. this is v1 of current patchset where it is defined: https://lore.kernel.org/lkml/20210323004912.35132-6-peterx@redhat.com/ I thought this patch can greatly simplify things but I overlooked the pte_none() check you mentioned. So it seems I have no good choice but add that flag back. There's another alternative is we do pte_clear() on vmf->orig_pte as the new way to initialize it. I believe it should work too for s390 and xtensa. Any preference? Thanks, > > > > > > > Thanks, > > > > > > > > > > > > This change prepares us to be able to call do_fault() on !none ptes. For > > > > > example, we should allow that to happen for pte marker so that we can restore > > > > > information out of the pte markers. > > > > > > > > > > Signed-off-by: Peter Xu > > > > > --- > > > > > mm/memory.c | 2 +- > > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > > > diff --git a/mm/memory.c b/mm/memory.c > > > > > index 04662b010005..d5966d9e24c3 100644 > > > > > --- a/mm/memory.c > > > > > +++ b/mm/memory.c > > > > > @@ -4052,7 +4052,7 @@ vm_fault_t finish_fault(struct vm_fault *vmf) > > > > > vmf->address, &vmf->ptl); > > > > > ret = 0; > > > > > /* Re-check under ptl */ > > > > > - if (likely(pte_none(*vmf->pte))) > > > > > + if (likely(pte_same(*vmf->pte, vmf->orig_pte))) > > > > > do_set_pte(vmf, page, vmf->address); > > > > > else > > > > > ret = VM_FAULT_NOPAGE; > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- Peter Xu