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 CFDF5C6FD1F for ; Tue, 26 Mar 2024 17:10:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C8336B009B; Tue, 26 Mar 2024 13:10:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 345106B009E; Tue, 26 Mar 2024 13:10:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20ED96B00A1; Tue, 26 Mar 2024 13:10:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0A44A6B009E for ; Tue, 26 Mar 2024 13:10:54 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E01DF1A0CB2 for ; Tue, 26 Mar 2024 17:10:53 +0000 (UTC) X-FDA: 81939829986.26.3FC3B50 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id 3188016000C for ; Tue, 26 Mar 2024 17:10:51 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jhVmfrdL; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711473052; a=rsa-sha256; cv=none; b=uR3TeLuw6T9Xjsj96Sj/3m+sTNN8aaMyClBDWqo89VGv31zTI6X/a02NqxNW3ZKqrTkuXJ zu8v2lQXMtZyn81Jfd0ktIiZ+SJVK9V0gUW2q7dzBgqXmCwCTqdObGm2SOI+7D3UyjhzS7 p8cs4WLQti+OIMpVdiNsb9LdOoglqgI= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jhVmfrdL; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711473052; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eh+y/Gz3jtyBErmulO4A9pG+bQi4rxb/s4S22X7OGTQ=; b=klyv6rl6aloXjCbvMv6W5ZWbzUcW10/xNwEyIB0Be+ZdKkxzu6RIkdrDgp71Ki8lwa2dcb TgggZGgFaadYDu/ex3mSpmYecAzMlHZK3bZzE5hp/qnKwfaX6qzsDLwxxN7xAVQuOLx1by J4Ba+HaDswrmS8SK31l1pqCNKl5IQ9g= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=eh+y/Gz3jtyBErmulO4A9pG+bQi4rxb/s4S22X7OGTQ=; b=jhVmfrdL7c+z5L40IDU0Uwc4IV acR5z9GRmHu73ObY3ewFem+eB5Xnabb11CghpJOagk+YWZJFQH5we8sQTM0LDuZivmDycqwyC+3aS +obiHMxYCyeHqJeL0BK6QNDPADlseeyVzgDlEdyxIYgUOq/Jm5myBO5ckemclAFcaQpj1bm2Nqqpp cOBDbZ7bmYef8Y/hnivD0pb4yRoXxbLDvMhP76CxqZIpWgpB/RcGv/3frbDSVrEiCsrSLBjBUWzHD LNjNRj0KEiCtsdOD2Ud+ZxZfm0EE4VHERJKzaJJrEkUWu6SM0if9wPYdJwYc1f/ULvTHol5RJv8bH 7t+w7TDA==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpAJz-00000001is1-3n3U; Tue, 26 Mar 2024 17:10:47 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Svetly Todorov Subject: [PATCH 02/10] xtensa: Remove uses of PG_arch_1 on individual pages Date: Tue, 26 Mar 2024 17:10:24 +0000 Message-ID: <20240326171045.410737-3-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240326171045.410737-1-willy@infradead.org> References: <20240326171045.410737-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 3188016000C X-Stat-Signature: i7i9pndm6xatff519iuyf89t9rokskm1 X-HE-Tag: 1711473051-945318 X-HE-Meta: U2FsdGVkX1/Z0F4/SjVocGTh9R5fXACOZW7I5tiLTngxbqnkvxA2UMis05s+mKaDqWhvQiu9QJApJxOk2eEdk8PRkOAs8SE5SmI9bZTNGkiIZdxJY+eM0EnIasEoPzjoTqQxNXBrpgh40nz7yEvb5km/cAWeALgcQA8uJHxI83xOhBRCrWiwZRtTIkka0veFA/BGJh8CdMF+ikYGMVaawtGvI0P+wu+t4WsiiV7pDizEqqkmARg7+d53IiuZTJGgHRAMcTmKl3HUmfj4WRmzTw4L5TywHBmrSnlmalfVeLMzZZdI2yOXHBl9+TEUX7YXCT+7qxB/5qIPVyHGCt3RnXBKO54jHrDJiydQWmjY+ZSSiHLSyX6uON1rXZtrvahcGAeGgWk0ZB0DIz3aPc5HBKFpcNnR+J55OmQn+dfZCu9f4Xx2NE9hfP7DJlruLVLtupj+sfXslnUcy272MJUTPAh0ssV8vB3Ynx4I3u3seMMVCkkgvMWSlZfIGWMn/Yc1R3wvz019qwW+aTwciL0KqBiwdgsJWiMufOkpYlOCaFzv01aBrGfjQ7hL9acdHzidv9YWof4GGhCv15Cfmb+ifsZ/zTJtwZ6ZCCKGW09K98ziQoICBtTvXSalwMwCTKHW/WnzBqc6GpBPYRL/07YMvkQ1olOcqwld7ogYrd3240z0a/iQsYp/u4sHU2+uHFc1T2COtIFpwhBPzHY1RXX2MI1kYAiUPKHgdmEA4DQyeOZq98zQKUvbvVT+4Oh31r7ZSJSKCcDNvsBWN2rGr1l8GQVEcfW9q9OGhZTWcBw4UlimlHB/xBPFuPhqEywhsgeGboCNYzptUZ3/rJa/BhKNOZmpXHAOXTk0aooRNDtjpa0fqiWvU9rJk2t79Gng/tAbevJCfvFHMFqX450YYG4xIQ5YsBdqGCJi3tzdN5nSSFeb1X2vFPmfDZ8+uGC9c/cf2rktBlTLTxhsZ2I9On8 bNveY9tU gN/WPhaSZCFEfyRRxTTitW2kg5wUG8xVYYy343EddR7kXn2NksDy2HZwwEqqu3A9FgaM3BMIZ3r90jTwTg+7v0Hxp4GywboSeVkJ/639SOSCzqZKUFMCmsYHjMQN+qsVNPigEt27AMKthRizeZCBwj4rXg1vb8CuZhCTYGvfH3JfUKgMIipZZH/43HFL2aAFk/0ACuEOpMr7x3jdgYU1IKZeJRKSbBy3OoB5IvRHpGd6+XNXL8aaLGtLd/DEV7yTzkCT9XYpyWxfksNa/Y0H32AZXsRJnUDVO8pyJ 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: Since switching to the new page table range API, we disregard the PG_arch_1 (aka dcache dirty) flag on tail pages, and only pay attention to it on the folio. Fix these two missed spots where we were setting it on arbitrary pages. Reported-by: Svetly Todorov Signed-off-by: Matthew Wilcox (Oracle) --- arch/xtensa/mm/cache.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/mm/cache.c b/arch/xtensa/mm/cache.c index 7ec66a79f472..23be0e7516ce 100644 --- a/arch/xtensa/mm/cache.c +++ b/arch/xtensa/mm/cache.c @@ -87,12 +87,13 @@ static inline void *coherent_kvaddr(struct page *page, unsigned long base, void clear_user_highpage(struct page *page, unsigned long vaddr) { + struct folio *folio = page_folio(page); unsigned long paddr; void *kvaddr = coherent_kvaddr(page, TLBTEMP_BASE_1, vaddr, &paddr); preempt_disable(); kmap_invalidate_coherent(page, vaddr); - set_bit(PG_arch_1, &page->flags); + set_bit(PG_arch_1, folio_flags(folio, 0)); clear_page_alias(kvaddr, paddr); preempt_enable(); } @@ -101,6 +102,7 @@ EXPORT_SYMBOL(clear_user_highpage); void copy_user_highpage(struct page *dst, struct page *src, unsigned long vaddr, struct vm_area_struct *vma) { + struct folio *folio = page_folio(dst); unsigned long dst_paddr, src_paddr; void *dst_vaddr = coherent_kvaddr(dst, TLBTEMP_BASE_1, vaddr, &dst_paddr); @@ -109,7 +111,7 @@ void copy_user_highpage(struct page *dst, struct page *src, preempt_disable(); kmap_invalidate_coherent(dst, vaddr); - set_bit(PG_arch_1, &dst->flags); + set_bit(PG_arch_1, folio_flags(folio, 0)); copy_page_alias(dst_vaddr, src_vaddr, dst_paddr, src_paddr); preempt_enable(); } -- 2.43.0