From patchwork Mon Dec 11 15:56:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487478 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 CCDE0C4167B for ; Mon, 11 Dec 2023 15:58:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B86E6B0142; Mon, 11 Dec 2023 10:58:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 547116B0144; Mon, 11 Dec 2023 10:58:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 397F46B0145; Mon, 11 Dec 2023 10:58:40 -0500 (EST) 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 22D486B0142 for ; Mon, 11 Dec 2023 10:58:40 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E3963806F2 for ; Mon, 11 Dec 2023 15:58:39 +0000 (UTC) X-FDA: 81554995158.24.F83E1A1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 1EAF940018 for ; Mon, 11 Dec 2023 15:58:37 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DTzUNQUA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702310318; 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=Bl7kAOkMik26idrH9JyJnR9t8BI/kVxIDTOYx+vyhms=; b=H1ZyqFMVD2YAnSe6CV+dx7wgNxB0YiJyzRTLZVwgRzs04JsmJUW1kxRuwFGUP35g51FPM4 8mzbetb8iXnqZKHM2wIRenfJGWIlXlN6Gm3XHHS0hj6xVCzXsvg+P09dtI63ZYejzLWyhs Jv1wxYE2pwaq0PtsQoqYuYOOtaX82do= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DTzUNQUA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702310318; a=rsa-sha256; cv=none; b=CyV3/nPh/LbfnXhrNRPD4/9j8qIVDgy49/cCpCLHc4douMcrYlHN5mwWyvQbFQhLU2nQLn 2fC8I8abN0gGe+y2eJM39zH8hrTGxLfw+uQqMVljWU0nM1BqmSvdOxhdwzl5aOceQsE4QO FtSb8r3aCjVTtCtVWXWjJIDUnU8upZY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bl7kAOkMik26idrH9JyJnR9t8BI/kVxIDTOYx+vyhms=; b=DTzUNQUAUT6rGI35uEqjRNLq5avGqAPz9XzN+bxFGv3gRtbNtil4nXsEPjcfXABMHidKJQ NF7o7lrMFHmoch3GF4XKcJpmOWi4IYdp6wsud6Y4Is8yWrxCfNEFvwggkmB+h3EbU9fRFM A4BeN/xZJZHgubdkx7k5yc9UvYOvdMc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-382-bVYLacyzO7-p7IF_oXo34w-1; Mon, 11 Dec 2023 10:58:31 -0500 X-MC-Unique: bVYLacyzO7-p7IF_oXo34w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D01CC280640D; Mon, 11 Dec 2023 15:58:30 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 945CB1121306; Mon, 11 Dec 2023 15:58:28 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu Subject: [PATCH v1 37/39] mm/rmap: remove page_try_dup_anon_rmap() Date: Mon, 11 Dec 2023 16:56:50 +0100 Message-ID: <20231211155652.131054-38-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1EAF940018 X-Stat-Signature: 5h9wfra7xumz35z3ccdx9o5ddgx7wdms X-Rspam-User: X-HE-Tag: 1702310317-972181 X-HE-Meta: U2FsdGVkX18uIfLBBzsYrosf2qe4e47T4ruczDzQXNGSDLEI/j5PM/BA/MXI/l/fg5dnIz+TdaEmt1KpHSVIh0X5uJgD/frEUjDVr2/hJUnZM+45bgzEFvzlceZgBuqZhwTg5JDMkTEnCvZxfQht5B3UXD3Q9Oxm/uF6kV6I4K1oN7TLE0U2ItgsFafv/Vff1q3q2OFDqDIu1iYK7H03x4PxDLuZeyvEFviXxcbhVVnBeCHZRBL+5lSYno24H/FbjEvSDASnMAy9D6MFViV0jvBSG1KEWT0NkpgoC8Ml5Q822UIn9L8sRjRetPhWvKzm3u93/nHfk+lONdbv/W457xeeaTQk3jHNncsV1pZlzOQlCH6aXjK5HEANKURRD8kkvPpxRzhl2w5Yxbko0WWqnn6g/PmmGC5vt/trAcgI3f0jRAGnNbLe39ovM3sh7GO7K0yZAcs1VDQZviCnzGLE7HaQGJfxvd9xohv+3EatSE0dL225EoWoIoGzYAwYvgaJQqmfxXyinc8JIFh3lqRc5MckkVwfTMJ82NadHXPRThlEFnSHkScPKId4i38Pl3JLSjSJmlh8WiZyIR9+auUp7YeYgr55o/x7dY6ezxtYiymLwqlKsF7kISAofGEg7yTAaP27Ab+aHcCtOnfDTKxlRqkNPsXRAxspBefJXuDRXkxbjsg9N/35DwvQKc5F56cbxojynkjcg1krwfWcqxPVYV3BDN+pAAHvhJr39f98CxKYZolTKshB3B8oNc/zpx1Q0U6rezj4RawzpxpFaZH8HZoPcXATDCmyBxE2moCyBnoI5OOQpsuV09ZD2z6nWxtT2eo7cKQx3gvpwM1LQljl2xm2l9XbGm8F9l2fwujSl1y1i51jr00cVx9Tj6YV+kSCR/YxwlK76y4kyx+TJuryW9rUFq0ZQCGjxbXH30/qKCs/5pXulGvjJ6nzzi3iZQS4TDTG5chsYT40u8tpZOg r4aRMCm3 ofYcvMRk+sz6fG0fvMiSc/vmgnNbuYhwf++klcHsQ/lfpCBPiFlclKPX40Vw+qrSoAkl4wt9ECiH9PaAbxZES0XyFsf5N1sLe0L+1RvdjLuYESx3sqr6pyuoRZlXAC7XWiFrcCT+IOMq3t9cAFKeWhwy6P6lNpnWDVc3zCoyXHH5S7PI4dhAD7t5jFLJirxkEJ3UL7QW42mKD48Ho4iR+ObJ+ww== 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: All users are gone, remove page_try_dup_anon_rmap() and any remaining traces. Signed-off-by: David Hildenbrand --- include/linux/rmap.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index c6d8a02ecd56..1e37ee6ae0ba 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -256,7 +256,7 @@ void hugetlb_add_anon_rmap(struct folio *, struct vm_area_struct *, void hugetlb_add_new_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address); -/* See page_try_dup_anon_rmap() */ +/* See folio_try_dup_anon_rmap_*() */ static inline int hugetlb_try_dup_anon_rmap(struct folio *folio, struct vm_area_struct *vma) { @@ -481,16 +481,6 @@ static inline int folio_try_dup_anon_rmap_pmd(struct folio *folio, #endif } -static inline int page_try_dup_anon_rmap(struct page *page, bool compound, - struct vm_area_struct *vma) -{ - struct folio *folio = page_folio(page); - - if (likely(!compound)) - return folio_try_dup_anon_rmap_pte(folio, page, vma); - return folio_try_dup_anon_rmap_pmd(folio, page, vma); -} - /** * page_try_share_anon_rmap - try marking an exclusive anonymous page possibly * shared to prepare for KSM or temporary unmapping @@ -499,8 +489,8 @@ static inline int page_try_dup_anon_rmap(struct page *page, bool compound, * The caller needs to hold the PT lock and has to have the page table entry * cleared/invalidated. * - * This is similar to page_try_dup_anon_rmap(), however, not used during fork() - * to duplicate a mapping, but instead to prepare for KSM or temporarily + * This is similar to folio_try_dup_anon_rmap_*(), however, not used during + * fork() to duplicate a mapping, but instead to prepare for KSM or temporarily * unmapping a page (swap, migration) via folio_remove_rmap_*(). * * Marking the page shared can only fail if the page may be pinned; device