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 D5B0FC02183 for ; Tue, 14 Jan 2025 15:03:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6837E280003; Tue, 14 Jan 2025 10:03:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 60D54280002; Tue, 14 Jan 2025 10:03:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45FF6280003; Tue, 14 Jan 2025 10:03:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1FC81280002 for ; Tue, 14 Jan 2025 10:03:41 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D1C6EC0B31 for ; Tue, 14 Jan 2025 15:03:40 +0000 (UTC) X-FDA: 83006376600.03.7DC84CE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 2CBA114000A for ; Tue, 14 Jan 2025 15:03:37 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WzyHnM5O; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736867018; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=EVcF0mu+oOpfopIC/ZRaz1f1Q3v6efqkEhKRWk3onBA=; b=XB7KB9ZnenfDKYfHpz41gjIda3WVL3BmNCqkdsC9N5TGjRoY+LA/tGMlLvrBYRvUebmKDW ABQrKKP2flJEOYzEVmOEHUNwWArf0v/gvV1ccc5nJV1WcQgSHSEsoux2ke4zJKOUzovVYK 9j6J6hX+KDIuTBTY7eWBQR2w5S7fvWc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736867018; a=rsa-sha256; cv=none; b=pojwh+GFni6mUMYzOPI84sK9hnZjwP6RDbov9TVLxGvyhiDPyAJm/36K4fxmbhkBJZ/T5Z tx+eM5khDBaErGivKOshlkGqDAFqe+gaJ7rPQGXuzPuirIqeJoLlV13s0IMTm3+oueZ0Ul 5Y97TzFT9zdPakr/K8hf57VG/eUj1u0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WzyHnM5O; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736867017; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=EVcF0mu+oOpfopIC/ZRaz1f1Q3v6efqkEhKRWk3onBA=; b=WzyHnM5OmgzZoYMTGaimQd6F956nnnhkXemAbZDw3r5em9gy4hbQRV4Lf6W6oOXKLMBYRe x5KYrVNIb6OzUjKIwcYk13A2I4xeHWBTEMzr6XbYXMp4lkERAXxEuzeLwCvFYHsaACKbSb LeghWLrj91rZWqyD32Z/z0GklWBLcp8= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-519-asDS0VSFMleLDW-PNfcs1Q-1; Tue, 14 Jan 2025 10:03:36 -0500 X-MC-Unique: asDS0VSFMleLDW-PNfcs1Q-1 X-Mimecast-MFC-AGG-ID: asDS0VSFMleLDW-PNfcs1Q Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-385d6ee042eso3375669f8f.0 for ; Tue, 14 Jan 2025 07:03:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736867014; x=1737471814; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=EVcF0mu+oOpfopIC/ZRaz1f1Q3v6efqkEhKRWk3onBA=; b=O6dEKOIg7+UcA6My2BXGi2S9SW9LKUYa+YN5Ge/FJwPg8CQwhaYYqNwk2cBey8gnUa K/ghpDCvPR+Wwa55pcF0pk1VBHk2C0Qk6cG5pZ/J3I6OgDfAYuAKTOWSeAqhTVIVPbnA Wn1QT09XaMJuc/xhDi4LOTyrQbh3lvh/UFBShs1DOp9w/ah4DSXgURMnkMoGvK/py5jP v24o4Lizy+MYVW7bsG1RqrOG1GRhk7d5j9rKa2L4q72VB9e8gK9Awfkcb7V+1sSY7KHl Od/rYt1PG8EBoxkx1w2KfCA9eDok/l4GHZvlnYxfXFLHZYC9TW8IiXxwvPTjlPzUMcW7 2G7w== X-Forwarded-Encrypted: i=1; AJvYcCU3wMfPreukul8n7wCol2UzAGPHfBk4o3Zgx7Rud+2ttdx8/OYBOq6/I8znw5cl3QF2ZnYxywn1ag==@kvack.org X-Gm-Message-State: AOJu0Yx3V/uCZKxhIn2pDfqcv33sbDC+DIGF6VE9u16Kc1P08T5Tfwxj 5vTiTkrQYooTDsFMvpmDXpp1yLzBymhfxr8nFm3//Uf6ltKqlvL5M7r70Ui5oQByw0ysrSxbU8K 4zHcFinHtqGsqgD1vZq2gj67YrqRPAM2vKtpuNW0PUvm7I4dY X-Gm-Gg: ASbGncs3RcaOyAcVIPsGFO8RAVUFFbybhuV6Nqk6NF7U6AR5JHaNjGAqP9t7oTFo7vh JB4aKC4akz/AQkQv/Uund4wpw3rKwxQhTa2XVnjKOxLQ0FJ45DGod1DoJidasl62k7vScK7f5cs Xpg84Z3GuxkvKoUB0GwrorGMPilpw7BQIkAQUsG7D9ZRXiNzWdhS8tx6q+MOC5qWNQODFJWTqG1 OrUGwgATztJHq2WN4Sz0zceyOKKXFVvzVqODyFLJ5BureRk6b43ITUxlNfJcmQn5MP7IO9wr2vP TttoJfwiOtcJILIHU/gJTrXdkjRiHaKKJJ8vEm8SFUUQVg/p5ym+yZKaSffnKpw0gEqfuOhgCkm e+MPMAukh X-Received: by 2002:adf:c08d:0:b0:38a:87cc:fb42 with SMTP id ffacd0b85a97d-38a87ccfc9cmr18854434f8f.21.1736867012202; Tue, 14 Jan 2025 07:03:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHM3HjhBhsAPB1JfMTMphs8VamtwcWCRs8AeFhEVZ770be4gDgdSn1pqkoBasZXrNwqQMUsQg== X-Received: by 2002:adf:c08d:0:b0:38a:87cc:fb42 with SMTP id ffacd0b85a97d-38a87ccfc9cmr18854332f8f.21.1736867011446; Tue, 14 Jan 2025 07:03:31 -0800 (PST) Received: from ?IPV6:2003:cb:c738:3100:8133:26cf:7877:94aa? (p200300cbc7383100813326cf787794aa.dip0.t-ipconnect.de. [2003:cb:c738:3100:8133:26cf:7877:94aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9d8fc51sm180089645e9.7.2025.01.14.07.03.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Jan 2025 07:03:31 -0800 (PST) Message-ID: Date: Tue, 14 Jan 2025 16:03:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 12/26] mm/memory: Enhance insert_page_into_pte_locked() to create writable mappings To: Alistair Popple , akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: alison.schofield@intel.com, lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev References: <68974d46091eea460f404f8ced3c6de5964c9ec4.1736488799.git-series.apopple@nvidia.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <68974d46091eea460f404f8ced3c6de5964c9ec4.1736488799.git-series.apopple@nvidia.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Y75jFVTOrc6X2jyC94nfPwV1YVVRF6MKmqSWt3GuCNQ_1736867014 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 2CBA114000A X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: mp9erm9xid1oq7nuyafbgbx891ru4wz6 X-HE-Tag: 1736867017-177376 X-HE-Meta: U2FsdGVkX1/lEVZqpbWHXPSgOirpL+pVoFMmpSkD8Zw0Dm6RZR2mUyxKZ7YFYRvjSzsKO0khfG++pWA27qf27bnGKYyOoM+70HSDLLwgm0BFIJhsvnkj1A2Um9L4f2SU4xZ9qznDeX743+MIVwgdpRG2ZkoEEqgdVQH7sieBmKs/Mo/czFmBJMKMSUMyRH0OFZsok0BpDgy71y349VAe/y23px3K5LHE4CC3W+R4M5vT7Cgx6eRZhi9xZWtmjMb9njVDjUr2Fas+iyZTGfCELbFSJx9FxQsx2h5YtlxsDF0XX6n26/vxBlT8o3n/2yKy+tLzvGZkS/+Pqh2iZe1IwiSOcwp+2FKHj5dLpDllnUeaXPhZLE0uqmiTvHioPamAhTde4To7uzk+CY1xR9EPqfr/o5RdxXqFBQNkqob5Q4XxthUi0ZpDX2vHY9oIZazw50mNvWawuHfQLc/LuZWDm0t+GgEN+/eiYQP19FkAzFDh0d3eRnq+ULRlu49UkoNPGUv9G8mphkNSK2uR8kQg81SN4E5cGpKoJcTnfiCuWllHsDZGO92N/N7QdE36USb1h/j5ex6n7yZzABDlMBCYcVbIHTlMWDBuPbzkmpWLYilgVaTApQlBVO2yy7gsW5jnvF6e2XmfmJhIBnAfTU9US7gKmukaJjLpzaErPwQoo6kDWvroX7HIAPp+0PU45iHvBbMEZX8IM6L2t0A4/xXF6HuX+xIQw7K2AvmeKIE/PK5UMugm/A+iAQTDFaxjpCS8HBOWOd8J6yU0QgYvZPXjgdmCDeke3di+ekEk7MuorMM8DTeW7scndmLrw2VsLK7AcYWQiL6kG1vAd1XJ4ijHgYeZj6nirMsHfnx84KmJsZzGr3tQwtKwHEaou3SymQ4rxwilfbcD1fibiNgkEr0OKLAL/qs2CZCoRlxsZEV5Oy1dTeP/TSj+yxIJTw4sSQ23N12lB4Ph3k/bCsmZh3J FIUwDk6G Xp5i/cEOCp6fGwMDMGvws3t/Ig5rCWwwlEKuX0e5kadEuakyJJr13qbY4uAdwf+YJgvb/BsZ/ooefbPrqeij2NtEolrcYL1HYnDY359Xia2E06GoSbOPqP4cF1xbmKcgXTHD8jxpJdeAbHqMhGhYyG2U8SuTPBvgqErIuAKSxNHn53T5i3XB4AnMVHuR258Fyos0f/h/I2aFr+Ayz/a1bUUgIqrsXin6tmZuaHaKYuJG16rKBBlFQ/ZCfpagJLkZ6wfc5DvwTLBbS4IR5UE4lawd4rGckyFgfohhiWkpbGCjO2uMQiP1cjePBumbY7CWathEbRj3PWlYhp76M6ybxESjOJ0ClSKhPJ6IyxC+8AJN06YIR572TmTia7IfVdkIv1Ssj0VO2Ue2xpidjYKI0K8WFm9N4nEhpLqwh/JSZqltBwBGkiOCHVBjI2SqE3AgnlnbM9k3dslzksaf6T1l3yNH5cQPf+hHd/WLiaJx9ySAvc84rqWSZC2yX/N5g5CW96HgZVuzT4ObKaBrHbPRzdfHWiZjvgRoO9m56O2v1TvG+WC1rKOYtXRbLbA== 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: List-Subscribe: List-Unsubscribe: On 10.01.25 07:00, Alistair Popple wrote: > In preparation for using insert_page() for DAX, enhance > insert_page_into_pte_locked() to handle establishing writable > mappings. Recall that DAX returns VM_FAULT_NOPAGE after installing a > PTE which bypasses the typical set_pte_range() in finish_fault. > > Signed-off-by: Alistair Popple > Suggested-by: Dan Williams > > --- > > Changes for v5: > - Minor comment/formatting fixes suggested by David Hildenbrand > > Changes since v2: > > - New patch split out from "mm/memory: Add dax_insert_pfn" > --- > mm/memory.c | 37 +++++++++++++++++++++++++++++-------- > 1 file changed, 29 insertions(+), 8 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 06bb29e..8531acb 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -2126,19 +2126,40 @@ static int validate_page_before_insert(struct vm_area_struct *vma, > } > > static int insert_page_into_pte_locked(struct vm_area_struct *vma, pte_t *pte, > - unsigned long addr, struct page *page, pgprot_t prot) > + unsigned long addr, struct page *page, > + pgprot_t prot, bool mkwrite) > { > struct folio *folio = page_folio(page); > + pte_t entry = ptep_get(pte); > pte_t pteval; > Just drop "entry" and reuse "pteval"; even saves you from one bug below :) pte_t pteval = ptep_get(pte); > - if (!pte_none(ptep_get(pte))) > - return -EBUSY; > + if (!pte_none(entry)) { > + if (!mkwrite) > + return -EBUSY; > + > + /* see insert_pfn(). */ > + if (pte_pfn(entry) != page_to_pfn(page)) { > + WARN_ON_ONCE(!is_zero_pfn(pte_pfn(entry))); > + return -EFAULT; > + } > + entry = maybe_mkwrite(entry, vma); > + entry = pte_mkyoung(entry); > + if (ptep_set_access_flags(vma, addr, pte, entry, 1)) > + update_mmu_cache(vma, addr, pte); > + return 0; > + } > + > /* Ok, finally just insert the thing.. */ > pteval = mk_pte(page, prot); > if (unlikely(is_zero_folio(folio))) { > pteval = pte_mkspecial(pteval); > } else { > folio_get(folio); > + entry = mk_pte(page, prot); we already do "pteval = mk_pte(page, prot);" above? And I think your change here does not do what you want, because you modify the new "entry" but we do set_pte_at(vma->vm_mm, addr, pte, pteval); below ... > + if (mkwrite) { > + entry = pte_mkyoung(entry); > + entry = maybe_mkwrite(pte_mkdirty(entry), vma); > + } So again, better just reuse pteval :) -- Cheers, David / dhildenb