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 85C1CC6FA82 for ; Fri, 2 Sep 2022 19:48:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA5EC800F4; Fri, 2 Sep 2022 15:47:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 563FF80113; Fri, 2 Sep 2022 15:47:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E1D480117; Fri, 2 Sep 2022 15:47:06 -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 17CD9800F4 for ; Fri, 2 Sep 2022 15:47:05 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E701A120B36 for ; Fri, 2 Sep 2022 19:47:04 +0000 (UTC) X-FDA: 79868178768.18.741895D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 8BA7840044 for ; Fri, 2 Sep 2022 19:47:04 +0000 (UTC) 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=jffQg3X6ia+ruwQoAslti3TKgRaqtkf3QGIvjwSuigM=; b=iZC2Sq2q58FdU4Xs3fDG1I/TQQ j2F29iqowulLanfN/2JaTeBDuBkI7OyRODH23wSFK7jI/uJ/PRGgtEJG/S57+csrenGCttxa2FDZT IPkfjnMCZ2zmmbI/i9Oo6p4WHqExEci4Y2Zqlrz5r0/2kJ/MEPQHGmVSmc5RnBadWlkKMA/ouBwX6 fDGDoo2DMu4PkQBLQ/kEJrzxvQFWltO/VBQUN42BnD+IQZ9cxMl+7wVopZ1HRqyLfB9IDG5y5laSv wt6v//pjgKXxmEK3xtJSkDxxdkjNbwqS9xrP2x0EcqrQu03bT8PQ8fnLzSS/isNz6h835qCAimtAl ZZ14PwAw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd5-007IhQ-TJ; Fri, 02 Sep 2022 19:47:03 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 49/57] rmap: Convert page_move_anon_rmap() to use a folio Date: Fri, 2 Sep 2022 20:46:45 +0100 Message-Id: <20220902194653.1739778-50-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148024; 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=jffQg3X6ia+ruwQoAslti3TKgRaqtkf3QGIvjwSuigM=; b=wr7+TL8hZnc7E2aR1ypZUf/C5HlcW/m9SzmcDgYGpyJGeZ2gKy7WNWCDP/KlWuJrzOnzLq VudEbelRUeY0lZ8+C0w3oOYHsZNUOCfb3at57PZFPSMPtwkNvCapjU93NgN/VtY7/VS2dx zefIggRfS6rHqlQJeEIiYMAGaCNzmxU= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=iZC2Sq2q; dmarc=none; spf=none (imf07.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=1662148024; a=rsa-sha256; cv=none; b=sqxMMtkGOxF+72FeAXbG6N8Bz1op3rWjQB1wUpUPZKCu3dA/6uoUGlN0bCFneoi5+deeoD x6Wd2ACgWtkR8iLVntzJqERwPN+OdNVx0VGF7dkAVk+A+Jwj0qxO4uY7TxhEpFxox/3iIw 9x9MAzdzDSTMW1eOb6AlAYO70GEUyI8= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8BA7840044 Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=iZC2Sq2q; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: 9qo46uco9q5cpu4zopqsbjriwhzog7pu X-HE-Tag: 1662148024-152661 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: Removes one call to compound_head() and a reference to page->mapping. Signed-off-by: Matthew Wilcox (Oracle) --- mm/rmap.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 93d5a6f793d2..76ebfc8beb7e 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1101,22 +1101,20 @@ int pfn_mkclean_range(unsigned long pfn, unsigned long nr_pages, pgoff_t pgoff, */ void page_move_anon_rmap(struct page *page, struct vm_area_struct *vma) { - struct anon_vma *anon_vma = vma->anon_vma; - struct page *subpage = page; - - page = compound_head(page); + void *anon_vma = vma->anon_vma; + struct folio *folio = page_folio(page); - VM_BUG_ON_PAGE(!PageLocked(page), page); + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_VMA(!anon_vma, vma); - anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; + anon_vma += PAGE_MAPPING_ANON; /* * Ensure that anon_vma and the PAGE_MAPPING_ANON bit are written * simultaneously, so a concurrent reader (eg folio_referenced()'s * folio_test_anon()) will not see one without the other. */ - WRITE_ONCE(page->mapping, (struct address_space *) anon_vma); - SetPageAnonExclusive(subpage); + WRITE_ONCE(folio->mapping, anon_vma); + SetPageAnonExclusive(page); } /** -- 2.35.1