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 305B6C433EF for ; Tue, 10 May 2022 23:28:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C4166B0072; Tue, 10 May 2022 19:28:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 971B86B0073; Tue, 10 May 2022 19:28:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83A376B0075; Tue, 10 May 2022 19:28:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 758BE6B0072 for ; Tue, 10 May 2022 19:28:51 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 59FCC3250A for ; Tue, 10 May 2022 23:28:51 +0000 (UTC) X-FDA: 79451425662.02.067DA31 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 3B18AA0005 for ; Tue, 10 May 2022 23:28:33 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C5A6C61924; Tue, 10 May 2022 23:28:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1992FC385CE; Tue, 10 May 2022 23:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1652225329; bh=ikWDZ5omzUevzm24g0W0XI1vrgjTWyvleM5mOfiDXhA=; h=Date:From:To:Subject:In-Reply-To:References:From; b=G7h1MqOdJ0wz0GeWOIcl1IgA7Idfc1WJy/dr+bnPbypVuOylfTIuhfSwhxYNoIcco re9ll660lLwq06l+fkfI/HHBZ1dF/xdXKB3UWPFOu04Dy3Qeu0H7NJ1PPZMytK6lo4 y0IeyvTgijDeS/AqzhBfHDPiC2DcolLkacyhm/xo= Date: Tue, 10 May 2022 16:28:47 -0700 From: Andrew Morton To: Baolin Wang , mike.kravetz@oracle.com, catalin.marinas@arm.com, will@kernel.org, songmuchun@bytedance.com, tsbogend@alpha.franken.de, James.Bottomley@HansenPartnership.com, deller@gmx.de, mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, ysato@users.osdn.me, dalias@libc.org, davem@davemloft.net, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v3 2/3] mm: rmap: Fix CONT-PTE/PMD size hugetlb issue when migration Message-Id: <20220510162847.d9cf3c767e755a54699fb121@linux-foundation.org> In-Reply-To: <20220510161739.fdea4d78dde8471033aab22b@linux-foundation.org> References: <20220510161739.fdea4d78dde8471033aab22b@linux-foundation.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Stat-Signature: 7hg8tr1pu3ojadzmrqjuh54br8hyn3q4 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 3B18AA0005 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=G7h1MqOd; spf=pass (imf25.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Rspam-User: X-HE-Tag: 1652225313-740713 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 Tue, 10 May 2022 16:17:39 -0700 Andrew Morton wrote: > > + > > +static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, > > + unsigned long addr, pte_t *ptep) > > +{ > > + return ptep_get(ptep); > > +} > > + > > +static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, > > + pte_t *ptep, pte_t pte) > > +{ > > +} > > #endif /* CONFIG_HUGETLB_PAGE */ > > > > This blows up nommu (arm allnoconfig): > > In file included from fs/io_uring.c:71: > ./include/linux/hugetlb.h: In function 'huge_ptep_clear_flush': > ./include/linux/hugetlb.h:1100:16: error: implicit declaration of function 'ptep_get' [-Werror=implicit-function-declaration] > 1100 | return ptep_get(ptep); > | ^~~~~~~~ > > > huge_ptep_clear_flush() is only used in CONFIG_NOMMU=n files, so I simply > zapped this change. > Well that wasn't a great success. Doing this instead. It's pretty nasty - something nicer would be nicer please. --- a/include/linux/hugetlb.h~mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-fix +++ a/include/linux/hugetlb.h @@ -1094,6 +1094,7 @@ static inline void set_huge_swap_pte_at( { } +#ifdef CONFIG_MMU static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) { @@ -1104,6 +1105,7 @@ static inline void set_huge_pte_at(struc pte_t *ptep, pte_t pte) { } +#endif #endif /* CONFIG_HUGETLB_PAGE */ static inline spinlock_t *huge_pte_lock(struct hstate *h, _