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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01822CD4F3B for ; Fri, 22 Sep 2023 09:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QC8srgau4Mmgpw8VczukjScAEBqAGhSl05kALL2T8YA=; b=nkYxBWx3z105+K Mr9g1cB64SVMomxm/er1kJ7319Ij8BkSUgcfurapD0XbDX5GVgQG8jq6hiiE9cA47+tgInwagJJJT bPZdBF0/LMOiKVniIyg7zYk196hlDUce7ukSxMWH12tCT0IJHjWDAj9LhAJXmuo2hFqqXDd2+g2mE V77/hJsDry/iR7bSiiwdMtXBIXrEezYOhP64q2hTRAwS4UgQLKR5pAdVi9RSaFDuQHuq/cxw42EO8 hhnakm8gs2ReKSJlUgUA+J6bqYOKHJVfWcVbBGJMeSdbafWFWhgnOrTbKXpDl0RhPLW7YX49S3RAM cxDqwJh/2MimfihS26cA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qjcZV-008azM-1a; Fri, 22 Sep 2023 09:35:37 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qjcZR-008axm-2Z; Fri, 22 Sep 2023 09:35:35 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4668EDA7; Fri, 22 Sep 2023 02:36:08 -0700 (PDT) Received: from [10.57.65.11] (unknown [10.57.65.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A26293F5A1; Fri, 22 Sep 2023 02:35:26 -0700 (PDT) Message-ID: <9e8d66fb-1d8d-4ce0-86a7-4c8b04557cca@arm.com> Date: Fri, 22 Sep 2023 10:35:25 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 8/8] arm64: hugetlb: Fix set_huge_pte_at() to work with all swap entries Content-Language: en-GB To: Qi Zheng Cc: Catalin Marinas , Will Deacon , "James E.J. Bottomley" , Helge Deller , Nicholas Piggin , Christophe Leroy , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , "David S. Miller" , Arnd Bergmann , Mike Kravetz , Muchun Song , SeongJae Park , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , Lorenzo Stoakes , Anshuman Khandual , Peter Xu , Axel Rasmussen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org References: <20230921162007.1630149-1-ryan.roberts@arm.com> <20230921162007.1630149-9-ryan.roberts@arm.com> <217bb956-b9f6-1057-914b-436d4c775a8b@bytedance.com> <3358e732-8df9-4408-8249-384b102f5d75@arm.com> <6db7e7e0-4db6-f742-436b-1f4d8ae4e490@bytedance.com> From: Ryan Roberts In-Reply-To: <6db7e7e0-4db6-f742-436b-1f4d8ae4e490@bytedance.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230922_023533_927116_2797AE7B X-CRM114-Status: GOOD ( 30.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 22/09/2023 08:54, Qi Zheng wrote: > Hi Ryan, > > On 2023/9/22 15:40, Ryan Roberts wrote: >> On 22/09/2023 03:54, Qi Zheng wrote: >>> Hi Ryan, >>> >>> On 2023/9/22 00:20, Ryan Roberts wrote: >>>> When called with a swap entry that does not embed a PFN (e.g. >>>> PTE_MARKER_POISONED or PTE_MARKER_UFFD_WP), the previous implementation >>>> of set_huge_pte_at() would either cause a BUG() to fire (if >>>> CONFIG_DEBUG_VM is enabled) or cause a dereference of an invalid address >>>> and subsequent panic. >>>> >>>> arm64's huge pte implementation supports multiple huge page sizes, some >>>> of which are implemented in the page table with contiguous mappings. So >>>> set_huge_pte_at() needs to work out how big the logical pte is, so that >>>> it can also work out how many physical ptes (or pmds) need to be >>>> written. It does this by grabbing the folio out of the pte and querying >>>> its size. >>>> >>>> However, there are cases when the pte being set is actually a swap >>>> entry. But this also used to work fine, because for huge ptes, we only >>>> ever saw migration entries and hwpoison entries. And both of these types >>>> of swap entries have a PFN embedded, so the code would grab that and >>>> everything still worked out. >>>> >>>> But over time, more calls to set_huge_pte_at() have been added that set >>>> swap entry types that do not embed a PFN. And this causes the code to go >>>> bang. The triggering case is for the uffd poison test, commit >>>> 99aa77215ad0 ("selftests/mm: add uffd unit test for UFFDIO_POISON"), >>>> which sets a PTE_MARKER_POISONED swap entry. But review shows there are >>>> other places too (PTE_MARKER_UFFD_WP). >>>> >>>> So the root cause is due to commit 18f3962953e4 ("mm: hugetlb: kill >>>> set_huge_swap_pte_at()"), which aimed to simplify the interface to the >>>> core code by removing set_huge_swap_pte_at() (which took a page size >>>> parameter) and replacing it with calls to set_huge_swap_pte_at() where >>>> the size was inferred from the folio, as descibed above. While that >>>> commit didn't break anything at the time, >>> >>> If it didn't break anything at that time, then shouldn't the Fixes tag >>> be added to this commit? >>> >>>> it did break the interface >>>> because it couldn't handle swap entries without PFNs. And since then new >>>> callers have come along which rely on this working. >>> >>> So the Fixes tag should be added only to the commit that introduces the >>> first new callers? >> >> Well I guess it's a matter of point of view; My view is that 18f3962953e4 is the >> buggy change because it broke the interface to not be able to handle swap >> entries which do not contain PFNs. The fact that there were no callers that used >> the interface in this way at the time of the commit is irrelevant in my view. > > I understand your point of view. > > But IIUC, the Fixes tag is used to indicate the version that needs to > backport, but the version where the commit 18f3962953e4 is located > does not need to backport this bugfix patch. > >> But I already added 2 fixes tags; one for the buggy commit, and the other for >> the commit containing the new user of the interface. > > I think 2 fixes tags will cause inconvenience to the maintainers. > I did some Archaeology: $ git rev-list --no-walk=sorted --pretty=oneline \ 05e90bd05eea33fc77d6b11e121e2da01fee379f \ 60dfaad65aa97fb6755b9798a6b3c9e79bcd5930 \ 8a13897fb0daa8f56821f263f0c63661e1c6acae \ 18f3962953e40401b7ed98e8524167282c3e626e \ v6.5 v5.18 v5.17 v5.19 v6.5-rc6 v6.5-rc7 2dde18cd1d8fac735875f2e4987f11817cc0bc2c Linux 6.5 706a741595047797872e669b3101429ab8d378ef Linux 6.5-rc7 8a13897fb0daa8f56821f263f0c63661e1c6acae mm: userfaultfd: support UFFDIO_POISON for hugetlbfs 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 Linux 6.5-rc6 3d7cb6b04c3f3115719235cc6866b10326de34cd Linux 5.19 18f3962953e40401b7ed98e8524167282c3e626e mm: hugetlb: kill set_huge_swap_pte_at() 4b0986a3613c92f4ec1bdc7f60ec66fea135991f Linux 5.18 05e90bd05eea33fc77d6b11e121e2da01fee379f mm/hugetlb: only drop uffd-wp special pte if required 60dfaad65aa97fb6755b9798a6b3c9e79bcd5930 mm/hugetlb: allow uffd wr-protect none ptes f443e374ae131c168a065ea1748feac6b2e76613 Linux 5.17 So it turns out that the PTE_MARKER_UFFD_WP markers were added first, using set_huge_pte_at(). At the time, this should have used set_huge_swap_pte_at(), so was arguably buggy for that reason. However, arm64 does not support UFFD_WP so none of the call sites that set the PTE_MARKER_UFFD_WP marker to the pte ever trigger on arm64. Then "mm: hugetlb: kill set_huge_swap_pte_at()" came along and "broke" the interface, but there were no callers relying on the behavoir that was broken. Then "mm: userfaultfd: support UFFDIO_POISON for hugetlbfs" came along in v6.5-rc7 and started relying on the broken behaviour of set_huge_pte_at(). So on that basis, I agree that the first commit where broken behaviour is observable is "mm: userfaultfd: support UFFDIO_POISON for hugetlbfs". So I will tag that one as "Fixes". (Although if set_huge_pte_at() was an exported symbol, then we would want to mark "mm: hugetlb: kill set_huge_swap_pte_at()"). Thanks, Ryan > Thanks, > Qi > >> >>> >>> Other than that, LGTM. >> >> Thanks! >> >>> >>> Thanks, >>> Qi >>> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel