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 BF9CDC71136 for ; Tue, 17 Jun 2025 09:19:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61FFE6B0092; Tue, 17 Jun 2025 05:19:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D0696B0093; Tue, 17 Jun 2025 05:19:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4981A6B0095; Tue, 17 Jun 2025 05:19:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 361286B0092 for ; Tue, 17 Jun 2025 05:19:44 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A793C161B2E for ; Tue, 17 Jun 2025 09:19:43 +0000 (UTC) X-FDA: 83564345046.24.0667F69 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 01ADF40009 for ; Tue, 17 Jun 2025 09:19:40 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J24VFdGI; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750151981; 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=Pl6PxwbpUS7ADU1xqvtXXrf/iKUynSR5SAu+83BnGX4=; b=FB9oTVCRiA3LgBjCE+ag+XrZcwbLsEwCvi3rZ94Q6ncZKW8SdX4WPGbJTRJtZKcpA3avWf eZ2u2TyiEC9Az+AI9KVzvArRinvxcqrVeLja3mBMOiuRRVSoMRdUu9efxw34+mcTKheYnh WyG99aqo6RTa39d7o3JHgCWPRkAGZkk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750151981; a=rsa-sha256; cv=none; b=uBdObhTGHoPI9lavd8QKi5XxtIq96WVa1X4oHKdXUKG2LNy+Th/3rPTL67XOG/780CTcej +zWQMLLPPvotT/KqOxlCK/ZgZ7THgsxAHrax+HVr/ec9NXgw+r92deOg++Egl0ZLjQhbGF dmSliX7wZPgXYrTcWvdDz0ywQmmouJg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J24VFdGI; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750151980; 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=Pl6PxwbpUS7ADU1xqvtXXrf/iKUynSR5SAu+83BnGX4=; b=J24VFdGI1Z2zNW5lowKImzrZa41MUw9N78xUxZth2XJjoSJShAPhIYTr2htFpfa59Cjdzw XTUEUhkjhRqhQHbdlfuaXujIDXeP1HJQ3+X962gL36RkT2O/PpVH0L02K91PV/XOVVu71Z UnuyuFkDzG9kNouA7GqVHe3zSyVWzwg= 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-126-OEnXz_4AMByWSNjcfLVXuQ-1; Tue, 17 Jun 2025 05:19:38 -0400 X-MC-Unique: OEnXz_4AMByWSNjcfLVXuQ-1 X-Mimecast-MFC-AGG-ID: OEnXz_4AMByWSNjcfLVXuQ_1750151977 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a4e713e05bso2470394f8f.3 for ; Tue, 17 Jun 2025 02:19:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750151977; x=1750756777; 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=Pl6PxwbpUS7ADU1xqvtXXrf/iKUynSR5SAu+83BnGX4=; b=j6KR3xyWu5snDWwV0/iNMeSic70PAyIzL6hWWsQGWyEpC8U6nT+zv+ZPCqas4pzK9y 88HJ6x2sEIHjI2UqY3yi8XM+qlm918gp2GMI+bKl/NE1EXNSHLH0+HsaWBBBpsDvdwIl EW0tU/2kR2BYvrBMaNuH87GNnWskq4QW3TIWVcn7w6zmmfeb6OtlN6E9DD3ZAOmZnxh9 UuN+H+fvzzmty+RH/l4h2eR9730tXFlzjxFIbXE0yKjX3WXOyrMkVGB+PyUn2NeNWkGZ Sfyh//+yq4O/b/KxdEdsMkS/uSUtUNJGdwL2d4eID0+c2eQuPzi4Lh9AsxNKfKny5u/Y suww== X-Gm-Message-State: AOJu0YzSaupCSH0jXwrRl//wn2n6uPXT7yOYvIw9XK6w8c5HYlwg21J0 i2d6rA1AAgU9iuy9xX854o94zfTWA0b/L6jshQ2g3Il4K6/0b5ZsaIELVG1YR4v6c6p7WMQp3DM 2uwR7YeRjDkc2L9f+w5dekEGkRHyvZ0YnlyM4VgPPsZ6IVf+qMmTi X-Gm-Gg: ASbGncumqqZ8qAh36tBKlQ6rWJYrQt2tQEQQlABFWASJoT8eRY4lSzptbM0UcqVifrL +uOiQV/oi3+WC16t4YrAfZdi/vqqG1rRDOzXA+AYrMlnJylqanQA0+0oYHBm9TadmOQlj+7p+XG RkjaHNkUbNGiErcy7wRx7pGJvLqurYpkW66y7UaMLn1AgdQFq8dvjm6Gph53/hgcs2xuHDuQ9U+ YlIf82BuoBhdjh5V+RFj/SkNk4Y1vuRlGPlzaY6nefghLFcZYGAHOKmpk1Q7gMlGTmD9rw/Valm UOMQ9PFslennArrNhaQNlLdDmeBZ9xFvvW5WQbJp+hwOczX6Nf5C7B8Z6yxycULEADDeca3xKMb N31cqbWzKlE2jBnX+7KDbR7YDvDrYKG0EuqNKdhsFVScCiRk= X-Received: by 2002:a05:6000:4202:b0:3a4:dfaa:df8d with SMTP id ffacd0b85a97d-3a572367c45mr11265701f8f.9.1750151977278; Tue, 17 Jun 2025 02:19:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHt8iXJvJT0W2e4sI8GT6VcpVG8jxrePAU09oM8r6xnq4XSbjmN3FC6k4gXR+D2djVSpIQQtw== X-Received: by 2002:a05:6000:4202:b0:3a4:dfaa:df8d with SMTP id ffacd0b85a97d-3a572367c45mr11265656f8f.9.1750151976687; Tue, 17 Jun 2025 02:19:36 -0700 (PDT) Received: from ?IPV6:2003:d8:2f31:700:3851:c66a:b6b9:3490? (p200300d82f3107003851c66ab6b93490.dip0.t-ipconnect.de. [2003:d8:2f31:700:3851:c66a:b6b9:3490]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a568b08e21sm13528866f8f.52.2025.06.17.02.19.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jun 2025 02:19:36 -0700 (PDT) Message-ID: Date: Tue, 17 Jun 2025 11:19:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 01/14] mm: Convert pXd_devmap checks to vma_is_dax To: Alistair Popple , akpm@linux-foundation.org Cc: linux-mm@kvack.org, gerald.schaefer@linux.ibm.com, dan.j.williams@intel.com, jgg@ziepe.ca, willy@infradead.org, linux-kernel@vger.kernel.org, nvdimm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, zhang.lyra@gmail.com, debug@rivosinc.com, bjorn@kernel.org, balbirs@nvidia.com, lorenzo.stoakes@oracle.com, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-cxl@vger.kernel.org, dri-devel@lists.freedesktop.org, John@Groves.net, m.szyprowski@samsung.com, Jason Gunthorpe References: <361009510f346090fad328c53ec228d99bb955ee.1750075065.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: <361009510f346090fad328c53ec228d99bb955ee.1750075065.git-series.apopple@nvidia.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SkSmSxOAML-PY9qdtTGHolnG-0WGAzbJtLmiAvOqLZ0_1750151977 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: 01ADF40009 X-Stat-Signature: cmtph5o9mbhw5nuh53r1s36sj47u9yz1 X-Rspamd-Server: rspam04 X-HE-Tag: 1750151980-498414 X-HE-Meta: U2FsdGVkX1+kC0uV3X1rUKgesjW6cYKBiQp55rqL44MDk9TQpNB3CP0UySszVNFtoDT/QuNjjcXaOVPadlsfjVwa1nx/03y+KgqEPYNJ5EVuLYTcXZ4x+DiHzSv3Yqzce3Ii/x2RirBVS9MYSsmqetLCax1viVhhXCmdSP99S3Q59V37M6EZORPbhgBGqdvrylpVZGveeog5MbE0k9qmsAvO88qvHrM4O5CBYxhUmssyPfpOqBmDAhn2DdN8gADQBXl/NTiINYqYC5c7SCUFGVU6vNWpzMmM1sih3Nf80JUeIF9/0DGmX0+MPTqOtRSvvP2YazrJ7kdjtuCUZIv5EbcZEg5E5AhcSX/CNZjmHcRe5+CL57Xz2Vy1uWT7WOvQKy5AskZ+yI6nLrENGC4Z4KjBqGPcto3HeBZt2sTcTHKaCDVnCvcGw81eMEKCVLbKY7Q5fz6bKCFYJT0kM9Md9RMHgHnRvJ6r/7Ue0I1eRgDe2a8FY2/J6EPp5Psz8aqYVkfB1ZbwejMsVSXoBb109Qa425LX/22trgy8ZaYQw6HUecIxU0FzdpU6PT54ovmL7fzQMzMPmtI1KAkQYycuDZvwkVcMRv44icZj/VAdr5ECZ84rskDZRM7OKB29Xsv6TEfkJZ0xE7yHP8Gh9CBsjYR44BD9aO46uxgNTzRBYYwodg/zHVZA7Hoen0ikU6yu3APA/O0rL1JEStiDAqcLK9aOe4n3iBaJozKTKOheGFNvmoWzZZdxEhmEDckAV81y/hVs6qM2TdAnfMDhnKpEMrNowo7m19cxQPbqKdqDg+Ep5NsO2BWE8ZG8SdDN7GfawBmblowB3jgU14lbV7fqOrPLazYsyu5alqHp/30OJ/qd22UiuMjEc7CgaeRhd0zvTaNsGJlqwAziZ1jxI+9/wVi+KSlCOvtRYPPhmiBdxZVzfXeKJYI3HujkqIH4VBi/0vNiruBvCk1euV9KW15 cgjjlQat IYghiel+v3WK333vlzcmfMG5yOcyF4eSqjT+yHBpChBJiolN2BHHeTcUVaExf67yJtaZX7bM/QxiZForo33ypYlR+28peX9v3a/ddDzj474VNlGb3MgxMK0fJkAZaO4E0+0ni4vPdDH9nqs1FoL6YinXN3Ais7NpTGKtR/uP0nvEGNW2sGj9b4AhuPzGEbVBHht5ZNWThmxuzAEsz7aYO+L2j0N6f0NK4+9/6DX3KlQtkyj72GeMTZjaTgmXlYc5axhmpPsD3l3ERDSfapxWzqgY2ys6S5acQsSKvVMUPgE7unOhC+eplijzWGlbnrJ//e1KpEMAYefFqkD6H5zkQpaqmQKtHEMbDToqIOjty9PrBGdxYr3p2o0tpmh7kxARtqvQ9LOxyD8RKowXO3yZ3eN5VvlAJG0DQhBBYexCkKaSY89PIRr54e70pYrfhihPZuonpf6AOP4HJvjYxiuSFicerIfUgYFPeJ2iCxNenonrcItce82e2zpFCOxHPz8Awpkz62svi0paBAOo6jXK5F+LgjGbKs5AymOGfrAEhVl8y0Yxs80fUlt1GPYGYFafkNLrZ 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 16.06.25 13:58, Alistair Popple wrote: > Currently dax is the only user of pmd and pud mapped ZONE_DEVICE > pages. Therefore page walkers that want to exclude DAX pages can check > pmd_devmap or pud_devmap. However soon dax will no longer set PFN_DEV, > meaning dax pages are mapped as normal pages. > > Ensure page walkers that currently use pXd_devmap to skip DAX pages > continue to do so by adding explicit checks of the VMA instead. > > Signed-off-by: Alistair Popple > Reviewed-by: Jason Gunthorpe > Reviewed-by: Dan Williams > > --- > > Changes from v1: > > - Remove vma_is_dax() check from mm/userfaultfd.c as > validate_move_areas() will already skip DAX VMA's on account of them > not being anonymous. This should be documented in the patch description above. > --- > fs/userfaultfd.c | 2 +- > mm/hmm.c | 2 +- > mm/userfaultfd.c | 6 ------ > 3 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c > index ef054b3..a886750 100644 > --- a/fs/userfaultfd.c > +++ b/fs/userfaultfd.c > @@ -304,7 +304,7 @@ static inline bool userfaultfd_must_wait(struct userfaultfd_ctx *ctx, > goto out; > > ret = false; > - if (!pmd_present(_pmd) || pmd_devmap(_pmd)) > + if (!pmd_present(_pmd) || vma_is_dax(vmf->vma)) > goto out; VMA checks should be done before doing any page table walk. > > if (pmd_trans_huge(_pmd)) { > diff --git a/mm/hmm.c b/mm/hmm.c > index feac861..5311753 100644 > --- a/mm/hmm.c > +++ b/mm/hmm.c > @@ -441,7 +441,7 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned long start, unsigned long end, > return hmm_vma_walk_hole(start, end, -1, walk); > } > > - if (pud_leaf(pud) && pud_devmap(pud)) { > + if (pud_leaf(pud) && vma_is_dax(walk->vma)) { > unsigned long i, npages, pfn; > unsigned int required_fault; > unsigned long *hmm_pfns; Dito. > diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c > index 58b3ad6..8395db2 100644 > --- a/mm/userfaultfd.c > +++ b/mm/userfaultfd.c > @@ -1818,12 +1818,6 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, unsigned long dst_start, > > ptl = pmd_trans_huge_lock(src_pmd, src_vma); > if (ptl) { > - if (pmd_devmap(*src_pmd)) { > - spin_unlock(ptl); > - err = -ENOENT; > - break; > - } > - > /* Check if we can move the pmd without splitting it. */ > if (move_splits_huge_pmd(dst_addr, src_addr, src_start + len) || > !pmd_none(dst_pmdval)) { -- Cheers, David / dhildenb