From patchwork Wed Sep 6 15:03:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13375718 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 B25C8EE14A7 for ; Wed, 6 Sep 2023 15:03:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A1DA44016D; Wed, 6 Sep 2023 11:03:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 003B2440151; Wed, 6 Sep 2023 11:03:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D70BC44016D; Wed, 6 Sep 2023 11:03:41 -0400 (EDT) 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 BFCAA440151 for ; Wed, 6 Sep 2023 11:03:41 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8F2A9160D81 for ; Wed, 6 Sep 2023 15:03:41 +0000 (UTC) X-FDA: 81206491842.14.E2754CD Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by imf04.hostedemail.com (Postfix) with ESMTP id DC77140062 for ; Wed, 6 Sep 2023 15:03:38 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b="s56TOG/g"; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=dsbymiPb; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf04.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694012619; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=X7/kZB7lpmBCw2k1unMB2GujXf55nXH6oT8ByqeAnAs=; b=tA5h65ebd0wKNIYuGhFvWEg78woV13O44fUyZWMBWSUe7HoxS8scTJFN7rqqsRXzix27yk mEWLlyjA7t39mYJSmDjv003gdwIzYioU/A3GqCDK9Iz2E9Ory0aCNVErx8G9jhl888/me8 WN0+Nv+5ddJIeH+y6c/z9LhjtitKxAk= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b="s56TOG/g"; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=dsbymiPb; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf04.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694012619; a=rsa-sha256; cv=none; b=Gd95r0sX6dcvKufrJ9xnKGAjyMJHMHkLiTsqssO2zVnqSAdPLMnN4ciMghSYul1u0UhVWM TOuMRKGm+9pMTmICgUo6R1zYLbml8+oUCZ7F+PowQnxYgSMzzI/9ArtD/pjbzvGJOhoZAY o+weEtDkU1ENVncboGiNNPOQEaOG6UQ= Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 40E453200904; Wed, 6 Sep 2023 11:03:36 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 06 Sep 2023 11:03:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to; s=fm1; t= 1694012615; x=1694099015; bh=X7/kZB7lpmBCw2k1unMB2GujXf55nXH6oT8 ByqeAnAs=; b=s56TOG/g3wW3xdiIqMGnd+ngS6IcPFOJrgFciXKXnjSSlKj8Inc gmOg53MxNHCTU+4MczmgLmSph3GPf+dxfRb5d6RJmtabLNp16TcmtIQeYj53m14O T9BvHZZ5HcHgHl2ccLvCgVbR73GsLu1VXPNu3K4/bCMRea5wTpWW5oZ1x1+N4HlC 3IYNRuCZ5ehUJ3fAsJRaVmkV/AAy2x85yhX4BDK94tR7AWi73acL19o92+oj+JaQ bxr3F/dwKY/UI39cMU59sNCk+jk8xeMn9LMBSBDkK3iJu8rw5/KD7x8+nf1+Jlo6 C9z4I3J/habuZfvWzbufCWdsbiCRpIWnEpQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1694012615; x=1694099015; bh=X7/kZB7lpmBCw2k1unMB2GujXf55nXH6oT8 ByqeAnAs=; b=dsbymiPbH/noxVmpwQtJWj92IfMyXpQwtT4715YnPxEu8wfhQ42 K/L4u3Gk9fzKNgeCzhS3sqGqqIn2mvqETe1CUukPuAINgN+pmvIlIKnWQOAU6C7i V6BNXA4eyYrWCUB+JCg9pY1yEPjtOqcwNGDY6C5T+uXMqDP2hQ6F+PAOyiLMN1TI lPtzNPQ1+eAkE2XV7vOH5lSQdPC7Qm3rHP9+4DITK2enroBBmsRHzh/gaNAvNeaE a4nIdAya9YboYqVIE3dYeHcqGgD3oxb1oiG7d3MC8X3KYlchpUuk+QwYKS8RSkJi aSdUgeOU/Bs85BZdWwyEJXsRdfOqvu990nw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudehfedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne goufhorhhtvggutfgvtghiphdvucdlgedtmdenucfjughrpefhvfevufffkffojghfrhgg gfestdhqredtredttdenucfhrhhomhepkghiucgjrghnuceoiihirdihrghnsehsvghnth drtghomheqnecuggftrfgrthhtvghrnhepgeeghedugfduuddvleehheetgeeltdetieev uefhffevkefhveeufeeiieejgedvnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrg hmpehmrghilhhfrhhomhepiihirdihrghnsehsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 6 Sep 2023 11:03:34 -0400 (EDT) From: Zi Yan To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org Cc: Zi Yan , Andrew Morton , Thomas Bogendoerfer , "Matthew Wilcox (Oracle)" , David Hildenbrand , Mike Kravetz , Muchun Song , "Mike Rapoport (IBM)" , stable@vger.kernel.org Subject: [PATCH v2 5/5] mips: use nth_page() in place of direct struct page manipulation. Date: Wed, 6 Sep 2023 11:03:09 -0400 Message-Id: <20230906150309.114360-6-zi.yan@sent.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230906150309.114360-1-zi.yan@sent.com> References: <20230906150309.114360-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: DC77140062 X-Stat-Signature: 83hkpz5g87nefddn5cdi8aqpyw7bkjf3 X-HE-Tag: 1694012618-662023 X-HE-Meta: U2FsdGVkX1/v6Y6rD5gv72a0/VvWKg5eTtUrNre5zK5EiCyfJ2uj3KUauZ/NcH0h78SCks36AdfVpuzy8k+dpSvYh20PcZd9PCR4W0VJ4IaGVQ+Cm/RJVaKPSDLIfDjd999ZXSOeMU21IVpta1LBh5biF3C6ibUjLfpv/N9FuEKRsl/7Q0mufdZwFr+NqbQgkdwQ0JcZ5nCtWIoAliaSCSQbY2A5IhYugK/+la2AQRZNmoemtAVQQY2atspg1cafy6/TOUmswlG+8UPuwwMCczf4vqCOmz5cHgMJoHRzmDjcxJkriKYtWQH5ldq+iM/6ZftlUXaPHTFu5BmkVQ87sc6LdGeD5nXNVS9gAWRUgSiHYb+VJUb1NlsX3waT+KwY1uYcHuey4jDtpZNu8Aq16lHDjgfQnXBplE5EwuIqoSZP/cIpW1dX3BFIXqq+XSkyTtaKxDxjndpVHIYfFOnY3yM7DG7E72bIKyu0HT4mulASl78iUrZ6hwX8gUQ+gMBgHMtG2LnUL7d3y1AbJnIql9htnX2/CmAT/x05jMyK401ybza2zl581PQWfDqOvAjPSlRqro55GMx2/adPRMibnen/Hl2JS+8OrjOkRKgUVuZTmk4/ya29fJqPikk56pjGCFbF7TBY+7NBDa7+OBqbEGvCSQVw8TDq/++XzccNTrho+OKiiGgAjX5vXY635PypB8/UoS6uD7xIT8LKjMLq9GJQp+Fu2Jk5oFQA4y8mw7FTo5u4OCKpBA/ChKxAYJgmktrTQlQBPbtov6h9G9F0xomJvpP//9uBrlkB9urHSJee13tqKZKIY3MxnYaMeHyXZ4HrZscyfUX9ksstQhk42mAPxYjjQS2n9xwN76A65/+IbwUrai/ZHcI85y6YHPtgiRSLkkCRZ7DUgHGKrscszycm9CyLJqcQGwy9ATfa0xGpCMCJ9EGuzomiVXmNJf6grS05mixo8bkLpfCD0lw lEBTBZQV 9OIX4gXEij6vvx6Btj7lVvx0KkumL7NMZogGGYzF2Pxx+7l/zxVrCJIMoECIh/FFOzUo/o0mwH70gwVWVCC98TofTnbiYd8OZACm5LzixR4RtzgF7rptJ6hElA1N+6n9cjnGhiWEoKZob9GBr0ui78YfRl13ussDuhPRdBvsqCdvuS/QYAx3mmuDmP7u52K00gLxlaitK1ekgstTCYScox0RXzwfiLCX3YE7vW7UNvJ/I9FO9lOcMv++0XKTi7AMgFwWNxMCxo+2t5am7g6Vsh0HfdMr3PGHIf40tquQKphhm/qcS4cUOaWws4ptVX9e0ZwCQzzdHr5Zpq6JVqN9PDA8BlXYNOLMWx9a2PqrP8UpT/cRq2XKxvmmZRdHY2j7ezDhVcdVptO7/W4g4AYyiB8SJHd7oXbRZpMlbzcWWtQpdvr3wCP6Y5+t0AjDTmQunLngO25wF79yvRO6nDiwAGLm4QdzPFSj8lVNqEKEaIzLBT29CUTUQxMW9UCNkcu50JYm4 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: From: Zi Yan __flush_dcache_pages() is called during hugetlb migration via migrate_pages() -> migrate_hugetlbs() -> unmap_and_move_huge_page() -> move_to_new_folio() -> flush_dcache_folio(). And with hugetlb and without sparsemem vmemmap, struct page is not guaranteed to be contiguous beyond a section. Use nth_page() instead. Fixes: 15fa3e8e3269 ("mips: implement the new page table range API") Cc: Signed-off-by: Zi Yan --- arch/mips/mm/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 02042100e267..7f830634dbe7 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c @@ -117,7 +117,7 @@ void __flush_dcache_pages(struct page *page, unsigned int nr) * get faulted into the tlb (and thus flushed) anyways. */ for (i = 0; i < nr; i++) { - addr = (unsigned long)kmap_local_page(page + i); + addr = (unsigned long)kmap_local_page(nth_page(page, i)); flush_data_cache_page(addr); kunmap_local((void *)addr); }