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 X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7047DC433DF for ; Fri, 21 Aug 2020 23:50:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 34FF42067C for ; Fri, 21 Aug 2020 23:50:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QTu8cn3V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34FF42067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 53CBC8D008E; Fri, 21 Aug 2020 19:50:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 478508D0008; Fri, 21 Aug 2020 19:50:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A7A48D008E; Fri, 21 Aug 2020 19:50:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id 0659C8D0008 for ; Fri, 21 Aug 2020 19:50:12 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id BFCC1181AC9C6 for ; Fri, 21 Aug 2020 23:50:11 +0000 (UTC) X-FDA: 77176221822.19.songs27_1d0e2522703d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 988981ACEAD for ; Fri, 21 Aug 2020 23:50:11 +0000 (UTC) X-HE-Tag: songs27_1d0e2522703d X-Filterd-Recvd-Size: 6010 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Fri, 21 Aug 2020 23:50:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598053810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E50SJh9B+Sgxu1xn3HyIGnKmtONG1p5IzDx7ax6fnpw=; b=QTu8cn3VnX3bdxQGl8QHqwPXZllcbiNFM9eeqzlDGwWqTbVKsS9nqoGl+InPVkgLRbroeV pWSnJEvu2BipF8gZe12P7Kdicq2o9me2mfhtVX5w5Z05qvXB3QBw5jJ6bUiC0OzXsXy0bA yOjp1CSVExFfG2LbvgYTv9avZDRBJJ4= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-519-8gr51bGaOj2JR9Af0ToizQ-1; Fri, 21 Aug 2020 19:50:06 -0400 X-MC-Unique: 8gr51bGaOj2JR9Af0ToizQ-1 Received: by mail-qv1-f71.google.com with SMTP id z10so2324005qvm.0 for ; Fri, 21 Aug 2020 16:50:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E50SJh9B+Sgxu1xn3HyIGnKmtONG1p5IzDx7ax6fnpw=; b=DWcP/KHKT9xDvS7WfN4xuj9uK8z89oo9F2wkdB2nsJgV0WrM9riq6Qf54DKqCEK2yM VUFBEJODmFG/XEPMtLoztevT0nzPTRvyCFP0NCsfnDXLbwSAQGXWfdOleCR0vkLBwVHT ozu2kZaHx7Pqg7fjx0TiMZUAQKRIQPyfOcfL+IShKZakWcU4TmhjiTk8nG6slkJqTZpr 4KPpQNPQZ3LI/8v+3G8ub1WfhhyigtcaOnYlqXiS49HK6/3rDvHU/okXtwpXviXe2dRz 60ZhYrI5fNDrZ7k86hoptZLnT+lpgg58vvbB7OcTnNzMN7LHrJJbbT9Xo1YhajWxt4lY NBBQ== X-Gm-Message-State: AOAM530KEAeXLFMHfVEEB8PG79uTX/qCXwZW8LgHcrTh5iYBGxSBvde1 s5TyC2ZP7XeqsgP51CopKlpp5mn/yK7/wM5gA52iZdbvRWw+3sXgjraeWgjYne1fJBDVRB1737I lO2Uw2j4h0fw= X-Received: by 2002:a05:620a:209b:: with SMTP id e27mr4796659qka.431.1598053806058; Fri, 21 Aug 2020 16:50:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy53upk9EFMrc/Hax1cL9L3oXvTx888A7mxN/O3e0tiSOWTQPvbIxHAhvX5TvNLa8j2FJcWIA== X-Received: by 2002:a05:620a:209b:: with SMTP id e27mr4796632qka.431.1598053805795; Fri, 21 Aug 2020 16:50:05 -0700 (PDT) Received: from localhost.localdomain (bras-vprn-toroon474qw-lp130-11-70-53-122-15.dsl.bell.ca. [70.53.122.15]) by smtp.gmail.com with ESMTPSA id t69sm2821600qka.73.2020.08.21.16.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 16:50:05 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: "Maya B . Gokhale" , Linus Torvalds , Yang Shi , Marty Mcfadden , peterx@redhat.com, Kirill Shutemov , Oleg Nesterov , Jann Horn , Jan Kara , Kirill Tkhai , Andrea Arcangeli , Christoph Hellwig , Andrew Morton Subject: [PATCH 2/4] mm/ksm: Remove reuse_ksm_page() Date: Fri, 21 Aug 2020 19:49:56 -0400 Message-Id: <20200821234958.7896-3-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200821234958.7896-1-peterx@redhat.com> References: <20200821234958.7896-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 988981ACEAD X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable 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: Remove the function as the last reference has gone away with the do_wp_pa= ge() changes. Signed-off-by: Peter Xu --- include/linux/ksm.h | 7 ------- mm/ksm.c | 25 ------------------------- 2 files changed, 32 deletions(-) diff --git a/include/linux/ksm.h b/include/linux/ksm.h index e48b1e453ff5..161e8164abcf 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -53,8 +53,6 @@ struct page *ksm_might_need_to_copy(struct page *page, =20 void rmap_walk_ksm(struct page *page, struct rmap_walk_control *rwc); void ksm_migrate_page(struct page *newpage, struct page *oldpage); -bool reuse_ksm_page(struct page *page, - struct vm_area_struct *vma, unsigned long address); =20 #else /* !CONFIG_KSM */ =20 @@ -88,11 +86,6 @@ static inline void rmap_walk_ksm(struct page *page, static inline void ksm_migrate_page(struct page *newpage, struct page *o= ldpage) { } -static inline bool reuse_ksm_page(struct page *page, - struct vm_area_struct *vma, unsigned long address) -{ - return false; -} #endif /* CONFIG_MMU */ #endif /* !CONFIG_KSM */ =20 diff --git a/mm/ksm.c b/mm/ksm.c index 0aa2247bddd7..74d6bfff27c4 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2657,31 +2657,6 @@ void rmap_walk_ksm(struct page *page, struct rmap_= walk_control *rwc) goto again; } =20 -bool reuse_ksm_page(struct page *page, - struct vm_area_struct *vma, - unsigned long address) -{ -#ifdef CONFIG_DEBUG_VM - if (WARN_ON(is_zero_pfn(page_to_pfn(page))) || - WARN_ON(!page_mapped(page)) || - WARN_ON(!PageLocked(page))) { - dump_page(page, "reuse_ksm_page"); - return false; - } -#endif - - if (PageSwapCache(page) || !page_stable_node(page)) - return false; - /* Prohibit parallel get_ksm_page() */ - if (!page_ref_freeze(page, 1)) - return false; - - page_move_anon_rmap(page, vma); - page->index =3D linear_page_index(vma, address); - page_ref_unfreeze(page, 1); - - return true; -} #ifdef CONFIG_MIGRATION void ksm_migrate_page(struct page *newpage, struct page *oldpage) { --=20 2.26.2