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 66390C4167B for ; Mon, 11 Dec 2023 16:30:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 028776B011D; Mon, 11 Dec 2023 11:30:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F19536B0137; Mon, 11 Dec 2023 11:30:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE1716B013C; Mon, 11 Dec 2023 11:30:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C968A6B011D for ; Mon, 11 Dec 2023 11:30:04 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A44A6C06E9 for ; Mon, 11 Dec 2023 16:30:04 +0000 (UTC) X-FDA: 81555074328.01.458225C Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf07.hostedemail.com (Postfix) with ESMTP id 832F340025 for ; Mon, 11 Dec 2023 16:30:02 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf07.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702312202; 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; bh=HVjZ2rMqq1lNyVLFT7YzuKYr/UaSB0hu1L4ajD0rYHE=; b=yxW4EakzMA7urPB+BirMwRP68dHTwizUORew7pXT8+PgCcjEe4op2oTsKqNL6Gaq39VrzL kT/+RPHLE1ry/4z3tA1nfsdkLKfHhrZywxaSYo8EyNmoLupdMAJC8zUEdDbqZW8QKlcXV/ EwgmsNr4EOzRi8lZjSenMW6zN29EtX8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf07.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702312202; a=rsa-sha256; cv=none; b=8rocNzBNOf82EOMPpbvmh5NwFIboMBJje/QVw4I1VveL9rj5zev86YGXRIrmBWUnMQc4mg NNBgWDZQlrjPXoX8JZe7dh8la3Ur9YnUsITpiC0axvmLZTj6Khou3xh0yi4xuIdRqehdc0 ytb9QehS3GyxD3uhLzWsQ7IX4Zozcms= 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 3DDFE1007; Mon, 11 Dec 2023 08:30:48 -0800 (PST) Received: from [10.57.73.30] (unknown [10.57.73.30]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2028F3F738; Mon, 11 Dec 2023 08:30:00 -0800 (PST) Message-ID: Date: Mon, 11 Dec 2023 16:29:59 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 06/39] mm/rmap: add hugetlb sanity checks Content-Language: en-GB To: David Hildenbrand , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu References: <20231211155652.131054-1-david@redhat.com> <20231211155652.131054-7-david@redhat.com> From: Ryan Roberts In-Reply-To: <20231211155652.131054-7-david@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: xjhaihm16ksgmt7qynpzam6z4wnna8rq X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 832F340025 X-HE-Tag: 1702312202-652976 X-HE-Meta: U2FsdGVkX19Hm3tVU1+0B5VcxugrGIsnjrNO4iDiJk1SHWa1OfHd38BY920Mlqu66bIun7Y/z+hlEZMfb6r5QKpsYFTqEGZLoWG7DmfZ5Ke5Gerf6IcImHaeOjWMYhPz8nuPX1BByPOLKwJMxPvoCBBXoj3nyjQ9idW6ARKSZA5Pu/8ahBTLB4s12gGRgQDd4ztbsw8DwuFFgGJpKF4ZfLRCTzZEd8Z7U2GrqAXO0MANCFQ432iwQRISP0Cr/1Dgkhsy4zub7YpfjKuahTzWCLCJCYRR8Dqlrs2LhcmRRU1x36CJ9zFSKiOHOCOhdaGsMqt0v8dB/e36K5hCBXZfmTbVEfCGOiP5qyboYQmiEDLmTWXwU+u+/fOio08I+z/cEZUItJKkmJdfpfLOa9csjeogNVFaZjkvuK3Z/osaSBY81t6QifGPLIBoEaaSLe9WvMDcbl87wyrjkjkbq0E3vulEwCJ8LfljKlSkoIkxrItaqwR0HjHedDug+GngK/E+tVOtISyhepfIOCiviLR56G4TX/3xuBbcJphpdMJoHjNnL4k0Mh4+oJRE1UXjSO+tAwkL7N0poUEb9jDVGiHxzTpbUB4uEV0+WUHSAk5yl+kgwl/530DOAM3Ky0x+Yb2wvJt1XkVazwU1vC0o7fof7wqo+bxIDFif/8g6qwfbe0Pi91e9I9IUgT6MpgunufgDjUtrHQjQsryLZFd27+BCpUyMIpUWOIxSGZ/1HLgjfzyZ4S01UEzuGR5hQwpVIsL379Qt5QTDVIoGB4AZcdRv9LtsiXxq0W7B+hLmsYpnIxGc5j64ZnQ+ty26TD8rrAUIkI08L3CyOjzgNvWWydCC1VMMN4JusvUaHSL6en/zDEN9U8WzbFyCO+VnCT6dRdEEwW4Z/emZlgFFy5Z3WWxIYOdVTYD3RF6BusE/W1wRR7m8ypcQfPZQsw1ZAYZZKb9WUJnO+qrOd3aJDDu1vdJ 0fPdHo0n BdlRtLlwCf8Mr1mG8KsomM9zD8jpHHsRdfVmzjUyS0Nq9yB/ttqVtXcw+rdfvNTPHr8NH1yT57wIZLNWTgqltVA6yNTMooEnPS6MAfuBaVtlZYtmOxuEpcyc5yqnh+VnyteSq95YzfG7x9SXQvUnU38hkmvEQG51yqWP7f3kRAgbJM2eA/D8+BUnV0Qale/WrF35QhPGo4aiWCmgOMjcjXwZNIct5fyrDqkXV 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 11/12/2023 15:56, David Hildenbrand wrote: > Let's make sure we end up with the right folios in the right functions. > > Signed-off-by: David Hildenbrand Reviewed-by: Ryan Roberts > --- > include/linux/rmap.h | 7 +++++++ > mm/rmap.c | 6 ++++++ > 2 files changed, 13 insertions(+) > > diff --git a/include/linux/rmap.h b/include/linux/rmap.h > index 4c0650e9f6db..e3857d26b944 100644 > --- a/include/linux/rmap.h > +++ b/include/linux/rmap.h > @@ -217,6 +217,7 @@ void hugetlb_add_new_anon_rmap(struct folio *, struct vm_area_struct *, > static inline int hugetlb_try_dup_anon_rmap(struct folio *folio, > struct vm_area_struct *vma) > { > + VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio); > VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio); > > if (PageAnonExclusive(&folio->page)) { > @@ -231,6 +232,7 @@ static inline int hugetlb_try_dup_anon_rmap(struct folio *folio, > /* See page_try_share_anon_rmap() */ > static inline int hugetlb_try_share_anon_rmap(struct folio *folio) > { > + VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio); > VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio); > VM_WARN_ON_FOLIO(!PageAnonExclusive(&folio->page), folio); > > @@ -253,6 +255,7 @@ static inline int hugetlb_try_share_anon_rmap(struct folio *folio) > > static inline void hugetlb_add_file_rmap(struct folio *folio) > { > + VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio); > VM_WARN_ON_FOLIO(folio_test_anon(folio), folio); > > atomic_inc(&folio->_entire_mapcount); > @@ -260,11 +263,15 @@ static inline void hugetlb_add_file_rmap(struct folio *folio) > > static inline void hugetlb_remove_rmap(struct folio *folio) > { > + VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio); > + > atomic_dec(&folio->_entire_mapcount); > } > > static inline void __page_dup_rmap(struct page *page, bool compound) > { > + VM_WARN_ON(folio_test_hugetlb(page_folio(page))); > + > if (compound) { > struct folio *folio = (struct folio *)page; > > diff --git a/mm/rmap.c b/mm/rmap.c > index e210ac1b73de..41597da14f26 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -1343,6 +1343,7 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, > { > int nr = folio_nr_pages(folio); > > + VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); > VM_BUG_ON_VMA(address < vma->vm_start || > address + (nr << PAGE_SHIFT) > vma->vm_end, vma); > __folio_set_swapbacked(folio); > @@ -1395,6 +1396,7 @@ void folio_add_file_rmap_range(struct folio *folio, struct page *page, > unsigned int nr_pmdmapped = 0, first; > int nr = 0; > > + VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); > VM_WARN_ON_FOLIO(compound && !folio_test_pmd_mappable(folio), folio); > > /* Is page being mapped by PTE? Is this its first map to be added? */ > @@ -1480,6 +1482,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, > bool last; > enum node_stat_item idx; > > + VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); > VM_BUG_ON_PAGE(compound && !PageHead(page), page); > > /* Is page being unmapped by PTE? Is this its last map to be removed? */ > @@ -2632,6 +2635,7 @@ void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc) > void hugetlb_add_anon_rmap(struct folio *folio, struct vm_area_struct *vma, > unsigned long address, rmap_t flags) > { > + VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio); > VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio); > > atomic_inc(&folio->_entire_mapcount); > @@ -2644,6 +2648,8 @@ void hugetlb_add_anon_rmap(struct folio *folio, struct vm_area_struct *vma, > void hugetlb_add_new_anon_rmap(struct folio *folio, > struct vm_area_struct *vma, unsigned long address) > { > + VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio); > + > BUG_ON(address < vma->vm_start || address >= vma->vm_end); > /* increment count (starts at -1) */ > atomic_set(&folio->_entire_mapcount, 0);