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 DA0C6C46CA3 for ; Mon, 11 Dec 2023 16:22:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B22B6B0151; Mon, 11 Dec 2023 11:22:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 662656B0152; Mon, 11 Dec 2023 11:22:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 529246B0153; Mon, 11 Dec 2023 11:22:22 -0500 (EST) 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 3FF3D6B0151 for ; Mon, 11 Dec 2023 11:22:22 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1B9431607E8 for ; Mon, 11 Dec 2023 16:22:22 +0000 (UTC) X-FDA: 81555054924.13.B97326E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 505D280031 for ; Mon, 11 Dec 2023 16:22:18 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=wSA7DBhZ; spf=none (imf02.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=1702311740; 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=ps1ZUrGA7WXV5WZey1e9J5DohthDss4AMbHUVlXoCqk=; b=NMFTUOe3j+Sm4hrWpL3EcfnhHFxsZVktaiO07MB0ZqLJnpbTEgFL5IEr+PAZit3Y8ItKeL T5R3W6O5vlWs7cIN/vJsmtfo2Rpom/lucRQo8lqJYCYYfQeMbqaCuZY8+H4iTNViEqfz3M Bhu+AN1EN3scbg6BvtmAcZeyMCq204s= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=wSA7DBhZ; spf=none (imf02.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702311740; a=rsa-sha256; cv=none; b=CWd4dd5AqGrK3/D8xrgckpgEUX6stYO8oQQs+vgj70CURSfWhMunMQ3JU6vBQGbrJ4plhH 4ktw5aSSxmmnK3twpT0I8eOVS7OEStOIdmf9XAiS0u++CclVM+SOEHcAZaIKzg45E54sQr ZIxJu4hR4M9CzjoU7vTRtkU65CZWtkI= 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=ps1ZUrGA7WXV5WZey1e9J5DohthDss4AMbHUVlXoCqk=; b=wSA7DBhZFfzAO/QVTA0C5/m6Ug ACEThTTtI7n3x7vM5Q4u/01lkGdNoXF7VCxIRy73RF5QNaS7zJa7Ay27TUiVnjeJMaUO13509ZV5E /YT8LLL8pli5r6T8Ob7yrJy+2mPkniqlzfCkPmRJTljKUsPxCN5tUa8dAuqV6tpvbgqplTx6TvNH5 kViCHu9gvlYUi60DrehgFM6342QFW7yEZZgstiPXY6nsAZeqm06vBWbWx+SxUWojymoYSGWTJZkW9 ALrJpcB843c/qjXqrrtwFmjvzJVNLGQp0m1hydnnQXrVOFSEBuJOLEnKV08jbxQMVoIsrpXqWxH4O j2z7X78g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1rCj2u-0090JP-9L; Mon, 11 Dec 2023 16:22:16 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 4/9] mm: Remove some calls to page_add_new_anon_rmap() Date: Mon, 11 Dec 2023 16:22:09 +0000 Message-Id: <20231211162214.2146080-5-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20231211162214.2146080-1-willy@infradead.org> References: <20231211162214.2146080-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 505D280031 X-Rspam-User: X-Stat-Signature: zrg3eka9haurqsaokew9j53u94ax5z61 X-Rspamd-Server: rspam01 X-HE-Tag: 1702311738-839188 X-HE-Meta: U2FsdGVkX19Mo6m8zxuhadsnb4R6qcDBBWJLBBE7IxdJMfASKPo8NbencQdp7Wzhf0J5XgNQ7oCtXXS6HW420EtN4vDK3G7mL9sorkSSf/LqapyVnZcwB+xN6oBW1GCGRr8zllFVbPl8ncLMqVcJx3Fl/Khf4LA8T2BdLDZCPxgqU0XLTphp6+q7zJusOS2MwNTiBkWl1qNyNK1HCm2icgJXPku2MgbPUKGvATxSOzmDffDmjXOTWfQxUJ5nma5aD+3AtoDgjs5O1oTsN4FuTBaat+mKycY8bMEa62fWKck6VRsW6so2i/K/dZP3ZHRXCRp6G+cZFbkNB7xyNhJrazeMvxS22pu7e0NDbsWiMVHw8UH8fJk/C9kYDvs/CHbgrHzc3OXiAbJqkPV5R9aKeg0L8o05qZHJSeew+l2yqgR2zRd6BCm4N1vtfO8dkR/i6KJkFps7I9dTIiUgzczOUlyctK1qDD79rCF8bPZd0eAy+Ua789dpQxjbeaymSSjTDECGguYmohH/Y+WuHC2gbltcmH4mJdPNBR1YTvjJC0ZobVZKiAvdM6bpsMc4p3kNVx+Zp6Deh5ARKlxReR4te14H4YJocxo3AeIXruI2DXEWXy+aO51ZqJ6mdSDkUQeqsUVLFcTS2ZXS+SEnZwYUvJXUjh1oWFcfgp9grU8zYfX0i3N7BPvKNb3jo1+x3BTG6fKAZK2qUqPaC19vPLABWY2BZ/S73TAekLMJjUoFPxPUREGQlFEdpiw6Yt5FlA5qYqGKZkjmmmJ5OH9s8nefa6FgHAZ+sjEbDEIp+OMtWaOyH/xXerAk2OBVin3Twh8nnqXXQ8r7kDrpkWxZXfa/Cv/oV1GKkfc6feAKkC7Yh8uqAbdZcYEcL9VBIcPIIqbZh3+3OS2/ZS4ywMzXQZ0EWMlVRQfh0x/p4dk23WWHpdZPH/FOZ2rfkKQjwXHhf0vIA6jhf0z/FezQmx56B9o XXLoTsqU RqrWz1aX1WfnRfhktFk+p5H2kpX+Wi/6pHjnhDZ6WSi96cKQxcYLARM2vCki6dqMjdF3FNhg0dok4C8srp41G/f4Pdq7iYar4O0DA2n9ZUvzujXXdZ0vPHueMiqbVFs+sxqDW09aE2e/7hZBJBK9E+vHw4nB5TOYSXU5FNWUon8/ez3E1jQ/PKp8uRssu7hn0fGYQB70LzTwWVaKaDJV3W+nfrP3w48fZhIfX 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: We already have the folio in these functions, we just need to use it. folio_add_new_anon_rmap() didn't exist at the time they were converted to folios. Signed-off-by: Matthew Wilcox (Oracle) --- kernel/events/uprobes.c | 2 +- mm/memory.c | 2 +- mm/userfaultfd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 435aac1d8c27..8b115fc43f04 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -181,7 +181,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, if (new_page) { folio_get(new_folio); - page_add_new_anon_rmap(new_page, vma, addr); + folio_add_new_anon_rmap(new_folio, vma, addr); folio_add_lru_vma(new_folio, vma); } else /* no new page, just dec_mm_counter for old_page */ diff --git a/mm/memory.c b/mm/memory.c index 318f923134e4..c03a7729d5b4 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4068,7 +4068,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) /* ksm created a completely new copy */ if (unlikely(folio != swapcache && swapcache)) { - page_add_new_anon_rmap(page, vma, vmf->address); + folio_add_new_anon_rmap(folio, vma, vmf->address); folio_add_lru_vma(folio, vma); } else { page_add_anon_rmap(page, vma, vmf->address, rmap_flags); diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 71d0281f1162..2d8b03a009b4 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -116,7 +116,7 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd, folio_add_lru(folio); page_add_file_rmap(page, dst_vma, false); } else { - page_add_new_anon_rmap(page, dst_vma, dst_addr); + folio_add_new_anon_rmap(folio, dst_vma, dst_addr); folio_add_lru_vma(folio, dst_vma); } -- 2.42.0