Message ID | 20220808193430.3378317-53-willy@infradead.org (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 ED2A6C00140 for <linux-mm@archiver.kernel.org>; Mon, 8 Aug 2022 19:35:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45DCE940022; Mon, 8 Aug 2022 15:35:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AD956B0075; Mon, 8 Aug 2022 15:35:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12BCE940022; Mon, 8 Aug 2022 15:35:48 -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 B84F56B0074 for <linux-mm@kvack.org>; Mon, 8 Aug 2022 15:35:48 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 94D98C019A for <linux-mm@kvack.org>; Mon, 8 Aug 2022 19:35:48 +0000 (UTC) X-FDA: 79777430376.25.2CEEEB4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id 53BF54016A for <linux-mm@kvack.org>; Mon, 8 Aug 2022 19:35:48 +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=SLtFH9Ktf5rT30cGnE4FvYlOFxqPubA96OX3PYhEr0k=; b=LZSXiNHaQoAM/EL87HPlcxHQIl ZvFGoywLZzGZcwUZIc5A4O8ZHkwNAZktHo7COrkBjuQU1k/Mjjd//eHQvaHuD7poUMQ3xsHThqF0T r6CZavquDHThoDRv7a54xZ6S1YmJU2iYVD7a4DhkmmFwh1c1cbIt2cMsr9S1txJ8Cp+oBKV0OIwCb DwRc2iodVVjpKbNH6G5tm280cdNH7JMk3/6X3GyYvGL1TziZTsGc27eenuuY+c/gKTIi02hL3T6cF YQtTAvv0GI/rujya1gTRTfRluQftH7tQ/BMRm/W7fT5n7Q2RNp+NqcvgfDO3eZzQluTCW+98WO3+h NDdXqesQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XS-00EB2F-R1; Mon, 08 Aug 2022 19:35:46 +0000 From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, hughd@google.com Subject: [PATCH 52/59] rmap: Convert page_move_anon_rmap() to use a folio Date: Mon, 8 Aug 2022 20:34:20 +0100 Message-Id: <20220808193430.3378317-53-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987348; a=rsa-sha256; cv=none; b=C5nRWOcqFOIpw+eNVgZCNR0dgAShoZQs0ouT8esnx7gFOQIj7faXjj7i5P8LCzTzW5/8bE 2DJlBkSMx4Uo/PoaoROf7qCN/8uJYh5mhvXVGtwgYl6jlrIBHNy1NKn0p46E8B2W47E3+R hd7JI9VXexuOji14QQZE79eL9R8meBE= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LZSXiNHa; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987348; 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=SLtFH9Ktf5rT30cGnE4FvYlOFxqPubA96OX3PYhEr0k=; b=jEqRnlY+IpmtSz+S1PXd5aqLWMbUAy0njO8vztj92tAYPEoiTxm6SMXLfKTatZbrpp7Lus Rx1u2oId88bY0fyULBORpSZ6cs43GFvA579VyuX4Wxkbc4uoAU6OBdCKOEq/5Ln/p779cs l8djCKU1RRwOf8Uc2iF2cJPOnqSos7o= X-Stat-Signature: ae4oh5aags38wy1b8dw9x13uay9m6c3w X-Rspamd-Queue-Id: 53BF54016A Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LZSXiNHa; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1659987348-808133 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: <linux-mm.kvack.org> |
Series |
MM folio changes for 6.1
|
expand
|
diff --git a/mm/rmap.c b/mm/rmap.c index edc06c52bc82..aaab1c1078b4 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1098,22 +1098,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); } /**
Removes one call to compound_head() and a reference to page->mapping. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- mm/rmap.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)