From patchwork Sat Oct 5 20:01:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13823461 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 E89F2CFB42D for ; Sat, 5 Oct 2024 20:01:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E0E4F6B0322; Sat, 5 Oct 2024 16:01:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DBD916B0324; Sat, 5 Oct 2024 16:01:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD3F26B0325; Sat, 5 Oct 2024 16:01:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AF3896B0324 for ; Sat, 5 Oct 2024 16:01:40 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A6353160B78 for ; Sat, 5 Oct 2024 20:01:34 +0000 (UTC) X-FDA: 82640618508.17.0627FE6 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id EC0C740004 for ; Sat, 5 Oct 2024 20:01:32 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="Z/SaG68C"; dmarc=none; spf=none (imf04.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=1728158347; 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=r1TD4WBdGO2XPAwJg8Qd5sGpfdJ6iNoLJ7St3AezfDY=; b=FeyVmWjtxt73t8TMXLrYqUJt4q8bjn7YtTfpkTu1rMYktqI/eOau7UsWE1GtlZt3D3zsiB irx1PO9mSXJr1g1LPAByShzNYifnxn2GGSvmzk73iuLRJKG5cKklPsd5kribTKby+lMc3v DhrgwGoucjs4KJZKhhxGkCfljNOlMX4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728158347; a=rsa-sha256; cv=none; b=F4MKtAxLEuA2U1xoVfGs3M9crpfvSqXkIF5fS6D0Sz3tf22nemtmXwF/w5i8c+/MlHDBX5 Q/cl/s9//5ZcC4TckOyl7ZCTwnVdLwnDa7Sjcs/mKJJBOIhsU50OsV17uI3pm6obosJrpi mR9Px+4uaMZjZSsoODBWG0PdwL0POBA= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="Z/SaG68C"; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org 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=r1TD4WBdGO2XPAwJg8Qd5sGpfdJ6iNoLJ7St3AezfDY=; b=Z/SaG68C9UCwS+ny/MUqnvEoSF kptiyaIY3zPV6i3JPatrJtY9qxJMgfUgVtC2BoFjWbYptcMFujNFR7Ra6dRscg33fvY2JZizUcPhc L59Df4AKbLKRB1Sesw/HsE7nbE/utaRCb1nOLNVBnyo5IrnfUCqQo6SImm4ikH9BoHZq6mgX3I0/F CVc0sweWhlqdjzuTNnJL47Oh87bFg6fJ5gVNXt+07J2fN42TqSj6jeCc0QIj6Acm8WoF7iQqHT9Rg 61Ir7oRyYwmoFIZHuLjPvxo6BrsP2MqosEkFoL3+MAz5Jsd2XnGTbnk4oSDj16CB6kxCNEV2kq3gD SINrFUeg==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1sxAxw-0000000DYZd-2Ntw; Sat, 05 Oct 2024 20:01:24 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 2/7] mm: Use page_pgoff() in more places Date: Sat, 5 Oct 2024 21:01:13 +0100 Message-ID: <20241005200121.3231142-3-willy@infradead.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241005200121.3231142-1-willy@infradead.org> References: <20241005200121.3231142-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: EC0C740004 X-Stat-Signature: ygfuns5g5a9efhohqdobt6pyeo47kmua X-Rspam-User: X-HE-Tag: 1728158492-205586 X-HE-Meta: U2FsdGVkX18A4yiw2KlDl1rghzItqe7FKnLDrjW+lfxo2Oc2oUgxxEEUy+zJE86d2Kf1N9/8/886Spwt0lewtg5weZahtK/Yt7PCCsenuV/llem8mWoylpuVF2MtsIlYwvlb2wY+Gh0PyRQWPCJQBBydXzdlPQsZS4L/mb09UhwtzS7rpTvkRuKCPOBVhAER+OHUtfjtSyycP9Lt+w5VXS1fY/lKweRQYT6Jxik0tdKOZ9mMa7fOLfMCaeu33DxkwQEZmF0vPk4U5LdHWFOFK0H63ZCbQtdRl+5SP3NlqA9qzS+3kpeqVxxJdRym3zP4u0qGUmYe91+nnknbxrx7GfrvJz3+IqRRqTPuCkd9ZvfwqnxTJ4gN+AKygkqR/tgYoDR5QAsPp7vJEC7KHl4dRArcI8+RFNRqyjIV4WChihZDzx+m45GTAL5HgkINrPEWNdbtRoS9iAZgmEHX5MYUusJBG9YjQQj3JcOYKjNZqG9WMKLka74xq0hrJxI+Xo6nDMcZbx2ajr8niWWfMpfEsjebjTGqg3gW/j3Q6tquKh3O2ZMzgvfXsVoAkVNA+yczbiEl5H0TJGf8p3sJv4nf/2oxwWhZKDs4ytejws8cfHWMCyIhqLPBnnwcq5/U+xDIupaLYTzudGIZRAoziL5HZSn6Sj2z0D0B1N9BQ0vZsx3d76+nQ61a9GW/JAHapz48hNQEylqDrhNasYGd+V0hTVP0s3TOuadNdLgeMEpZRjHxsRzJSvjoErL92E28chz5i8QlrHzSUT0J0SWOTMHcdZg+LI5CnMtMG2imhozI3OQt24ODJevUpkQnisTFjhSVZdpbPQ1KVK11Dz0Ck6h8fvBB0tu7DdDZSLb6tNUsRXsHZ0HsGR5FreBYM+WS37R68OajxZ+LXFjrvQHTa8xokdn4soNJFOYwFuSsUzksvzTZPy3NUl6EUL7kjOSHld3Z5MtX1KV8lE7K8wsixmG HxJ2QYEz O7qcSRug0l5upM0Wba/RsSzgRTQtcbaz3NbEvRhdgHxxO1XnUORdGy5u2sCgqKe621MowETBBbELBpsj8eYDp9afyixApXoZQ4fo7fpFpEA93jU5hhU7+NcwZcgDsD2LJp8k1ehEs2U0WNC2zc0lwJCSu2GmcFOJsfnClBL8Q2O8/DL4I8dTdKcivedcU0j8LB/aPIUjP35EZMphLdh4uZHshIPMCKPjwbqclXYK6v2m50zsK+dOhVMWrft1k8nWk+4QhWjae4GS/GwHSxP6cRU5TorSHY2IwgRbe 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: There are several places which currently open-code page_pgoff(), convert them to call it. Signed-off-by: Matthew Wilcox (Oracle) --- kernel/futex/core.c | 2 +- mm/page_vma_mapped.c | 3 +-- mm/rmap.c | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/futex/core.c b/kernel/futex/core.c index 136768ae2637..342dc4dd328b 100644 --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -399,7 +399,7 @@ int get_futex_key(u32 __user *uaddr, unsigned int flags, union futex_key *key, key->both.offset |= FUT_OFF_INODE; /* inode-based key */ key->shared.i_seq = get_inode_sequence_number(inode); - key->shared.pgoff = folio->index + folio_page_idx(folio, page); + key->shared.pgoff = page_pgoff(folio, page); rcu_read_unlock(); } diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index ae5cc42aa208..ade3c6833587 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -328,7 +328,6 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) unsigned long page_mapped_in_vma(struct page *page, struct vm_area_struct *vma) { struct folio *folio = page_folio(page); - pgoff_t pgoff = folio->index + folio_page_idx(folio, page); struct page_vma_mapped_walk pvmw = { .pfn = page_to_pfn(page), .nr_pages = 1, @@ -336,7 +335,7 @@ unsigned long page_mapped_in_vma(struct page *page, struct vm_area_struct *vma) .flags = PVMW_SYNC, }; - pvmw.address = vma_address(vma, pgoff, 1); + pvmw.address = vma_address(vma, page_pgoff(folio, page), 1); if (pvmw.address == -EFAULT) goto out; if (!page_vma_mapped_walk(&pvmw)) diff --git a/mm/rmap.c b/mm/rmap.c index 3b11f8b6935d..90df71c640bf 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -775,7 +775,6 @@ static bool should_defer_flush(struct mm_struct *mm, enum ttu_flags flags) unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma) { struct folio *folio = page_folio(page); - pgoff_t pgoff; if (folio_test_anon(folio)) { struct anon_vma *page__anon_vma = folio_anon_vma(folio); @@ -793,8 +792,7 @@ unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma) } /* The !page__anon_vma above handles KSM folios */ - pgoff = folio->index + folio_page_idx(folio, page); - return vma_address(vma, pgoff, 1); + return vma_address(vma, page_pgoff(folio, page), 1); } /*