From patchwork Thu Jul 6 19:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13304093 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 EB207EB64DD for ; Thu, 6 Jul 2023 19:52:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 131EA8D0001; Thu, 6 Jul 2023 15:52:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E3586B0074; Thu, 6 Jul 2023 15:52:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F13268D0001; Thu, 6 Jul 2023 15:52:58 -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 DEC456B0072 for ; Thu, 6 Jul 2023 15:52:58 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A558880658 for ; Thu, 6 Jul 2023 19:52:58 +0000 (UTC) X-FDA: 80982235236.04.D41DD3F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id E4EA92000F for ; Thu, 6 Jul 2023 19:52:56 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=BlrT6SRX; dmarc=none; spf=none (imf13.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=1688673177; 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:references:dkim-signature; bh=ibKA7cJWIuNC398aiEZy3aoxqL6Z0BDXADtYspweMzA=; b=SjuqBvDJZzGXh4LAE5qjRCB3Qs5D967x6HzXzmfsgpn/H9gYMJeHchrbc/3MHDlk8oUHrC VN7mUWPhRBLhrhcaioEGq5YvD8uN9vw3OnIRV1Y3BHwc2IJMjeCb+858zap7EBfCTPptgc YNeZB5VcBFsS36TB4PQnpqbqRqIlWl4= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=BlrT6SRX; dmarc=none; spf=none (imf13.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=1688673177; a=rsa-sha256; cv=none; b=Ebct4oub699RiW21cf3f13UF5Wgcv7eTtWSwIXGXD9BuIh2Udy3li5khaoPgCzM2Uxjrht KH0glzXu3zc3jWDixJH9U2eXfYYl0M/lrmIu0GLiJUFYtq6WcjAafCUFgAdflh54XsD9kH P7g0IpKZ5+Xe/9uyMt7/X5/yn3zuvNI= 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: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=ibKA7cJWIuNC398aiEZy3aoxqL6Z0BDXADtYspweMzA=; b=BlrT6SRX5lIIww97jjw9Ts8ldL WiosF7/yNHPFMDeGTRAkvtk03GS/+CsS+VufmP2Dc0F3c00xM1tlxx+9s2LYuTCtcXdcZAsZ2mHw8 Ai0HohiVLF+o5/PDyH6ZQP629Zbb+PJLUPw0xpu5zUsn80DMAIDzA6fNUAnt7/BDqdjBru3Wc2n5H 4MZnvac/8cr4+shrw5YbW4LlW1QLbhpiV1wgdhjRURIuATWJIO7d35ckRWcUPB7KxIB4NdyJN6wYs JjK2tVggHGaRcCrlVYJUtPL05+hnTz/KuJfaXc32Bj8+LNWuAj+qgNtx1BBg/qpLzj6bejrY4O9eM GkBgYT2w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qHV25-00BMMj-9b; Thu, 06 Jul 2023 19:52:53 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH] rmap: Pass the folio to __page_check_anon_rmap() Date: Thu, 6 Jul 2023 20:52:51 +0100 Message-Id: <20230706195251.2707542-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: E4EA92000F X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: zuc339erpj9sw5nwmxeoghn6mb5sakg3 X-HE-Tag: 1688673176-588340 X-HE-Meta: U2FsdGVkX1/XdUJYQD4oB6JBi42V6LsKBSBYfQB/RVTfGD5nDs30fRRH2TN8qWIkZoFUMLiwGyBzwNdr2qxdOTKcfZHv0NxPEbjpqwSiNtAfFYnNMmjTGxwhX8hSM2OLBuDhsQzsm3GyGI8GsUxoGRe6+xv/GfI1flrefsGtkTCHWReT0tZigUZqpMaNt/4JghPQweOzRbmlU417cgMibpH0NYSkH068DKjp6pbBtlQDJ7tCFVAl4UTpiKz5YlX+U9Wubi6cCcL55NEh8RawZDjE4LGaMCNldxgmk9UGrBGBbfaVuI1nlOIhP5mSJs55H6AC9GrXRM7lnYCRpbkyDBlKz7WG+vmZOYzPIazWAPk8mD9t1sPFBfyRP4xjrJ7dV2dKOVHP1xq4vy0OxHEyp1ljQNz1mhebNhnbNmDcol8ktLB1/pN+qHr1eiWLiSD+nbICKqB0Ffom/lxPyTcbkIm0lP0obD6Pejwd5tZvpOTyUfUd4xG8RU7I5p+HzSFzBFRtQ4hzKjBUFPd8C0VulqMpPLXI8G2BM3lEaK1GuE64/DzbNgrAwGBGFNkTbJQmEhbBa9r7Kv9Koq5BkPGd3JluerpSh3NMZxBIg3ECoyT7YJ2bVl8lWgCU65tzR6Bk4NvuUcO2G0+lBleT+dtPynNKPICl5YmKN5JpttoK+GpG6IIRSZ1w/Dq7aQ2lov43NPzeEDREVK8f88NJAjMax6ACxVnR+4oUgEuLaj1tBG8xORtU+TNDYvptqSyir3lhufXIT8YVOHXYPqH9kNvNm55y+JWdHkbfD6/WqOd8IAKswW264cevXkLy7mdkN08Lry2Mqs0ZMyjLfOC1X+sKOowvYTn5+Pjk4Shvy2bJmyGc5kJUjCThZm1dfkIDLgXIM5FxEHaiX2up2bPOnQPbVGFP0Xj/V23bvad1LHZDZBCg8z6+icbWHuMRwvVTgDIxSkfrAhil9A3Z+uhnVBl oBkZR1DL eAiOvPj2GGH0Cl0CjsibRIssdtCSchPmo5x1pIMS1g6W3XPrx0aeEdm+EWlUFMQh40VgdK1cTdCJnoIuRbZo4zby8XyJSzWuGzGeLjy6N3D5pdHoBEwQl9q4aNkqWHUUiVeUtM8/6Ewy7ouawqgMBlndM2+lqZMjVsMiENymMlMZb6EQixmOptQiOczwyRgQJeM4cHIUcPZFK8HIVIdPmVQgAq+SJdQjuCE+e 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: The lone caller already has the folio, so pass it in instead of deriving it from the page again. Signed-off-by: Matthew Wilcox (Oracle) --- mm/rmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 0c0d8857dfce..2668f5ea3534 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1175,14 +1175,14 @@ static void __page_set_anon_rmap(struct folio *folio, struct page *page, /** * __page_check_anon_rmap - sanity check anonymous rmap addition - * @page: the page to add the mapping to + * @folio: The folio containing @page. + * @page: the page to check the mapping of * @vma: the vm area in which the mapping is added * @address: the user virtual address mapped */ -static void __page_check_anon_rmap(struct page *page, +static void __page_check_anon_rmap(struct folio *folio, struct page *page, struct vm_area_struct *vma, unsigned long address) { - struct folio *folio = page_folio(page); /* * The page's anon-rmap details (mapping and index) are guaranteed to * be set up correctly at this point. @@ -1262,7 +1262,7 @@ void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, __page_set_anon_rmap(folio, page, vma, address, !!(flags & RMAP_EXCLUSIVE)); else - __page_check_anon_rmap(page, vma, address); + __page_check_anon_rmap(folio, page, vma, address); } mlock_vma_folio(folio, vma, compound);