From patchwork Fri May 24 08:56:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13672862 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 63C52C25B7D for ; Fri, 24 May 2024 08:57:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE33A6B0092; Fri, 24 May 2024 04:57:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D6A806B0093; Fri, 24 May 2024 04:57:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0C6B6B0095; Fri, 24 May 2024 04:57:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A46BB6B0092 for ; Fri, 24 May 2024 04:57:41 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 560B3120921 for ; Fri, 24 May 2024 08:57:41 +0000 (UTC) X-FDA: 82152686322.23.CDD60AF Received: from out-184.mta1.migadu.com (out-184.mta1.migadu.com [95.215.58.184]) by imf28.hostedemail.com (Postfix) with ESMTP id 4AE40C0003 for ; Fri, 24 May 2024 08:57:39 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KzK2wgoY; spf=pass (imf28.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.184 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716541059; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YHfQsO4NVTRNBD9ihuMdP3lZwpfoz/pqOUOarvdBcXM=; b=QnRQYI8KLGGzhqmVP2E1AbjoAEgmtOZtb2a7Q4dN4OaC+41u5vnwE90lUaJ15c5QBDUAaJ CPQNasgh3mpXKX7Fh+2dTbSW76tRQeUynP/CLoC8Y2WD6IdWYomp3XzHF5C7GVfW/4eHlB fZHiCODTI2ViRQ0rqtx+Y8Nd4UT1rio= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716541059; a=rsa-sha256; cv=none; b=j6ZirGF/wMBpUttIARNZPJBb54c1sNER/IcPwkOqFaHjys5VZDfLhnQBgFVZwFSpW/hCXP rYqZ8SWovXzbxoigvRCZpf5VLz136uLMb691Y5+cJAA0/2N0BeQqGGyxaavJyYZT14E3OY HTMB7m0o2U3Me1m+dZasD7jhz9vB/CY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KzK2wgoY; spf=pass (imf28.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.184 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Envelope-To: linux-mm@kvack.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716541057; 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=YHfQsO4NVTRNBD9ihuMdP3lZwpfoz/pqOUOarvdBcXM=; b=KzK2wgoYer0vn4GzZWGWDfZ/tEhEAAuly8IRy9wsz+ICAhFVcu1u7w0U2xgEzapA1beUxr Cg2RxMRwAs8u8ZeUyZCjq5yDfqpMWfTtf7foWhd11ZGZBNVmSH3cwAsudxn5P3p1OhqWa2 1T//kN+DQM8ZtlnL6O0rW8oo4QuAuMg= X-Envelope-To: hughd@google.com X-Envelope-To: chengming.zhou@linux.dev X-Envelope-To: zhouchengming@bytedance.com X-Envelope-To: shr@devkernel.io X-Envelope-To: david@redhat.com X-Envelope-To: akpm@linux-foundation.org X-Envelope-To: aarcange@redhat.com X-Envelope-To: linux-kernel@vger.kernel.org X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Fri, 24 May 2024 16:56:50 +0800 Subject: [PATCH 1/4] mm/ksm: refactor out try_to_merge_with_zero_page() MIME-Version: 1.0 Message-Id: <20240524-b4-ksm-scan-optimize-v1-1-053b31bd7ab4@linux.dev> References: <20240524-b4-ksm-scan-optimize-v1-0-053b31bd7ab4@linux.dev> In-Reply-To: <20240524-b4-ksm-scan-optimize-v1-0-053b31bd7ab4@linux.dev> To: Andrew Morton , david@redhat.com, aarcange@redhat.com, hughd@google.com, shr@devkernel.io Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zhouchengming@bytedance.com, Chengming Zhou X-Developer-Signature: v=1; a=ed25519-sha256; t=1716541051; l=3157; i=chengming.zhou@linux.dev; s=20240508; h=from:subject:message-id; bh=JxsnAPdpaUy+vf0sl0PZjYU5lyGNxjQTcWpShsy4QXs=; b=+IclB6lAEN9i9mpmGfuCQ9JjgV8dqoL221kOWpl1/LyLcUwK7iGdiv9V31dGtFNFcnBd483w1 oZJ5Bw1PSUwBuBpDWFbZ8IR5pOHuMwXOhMQ8PA7CAvcviaO3yj6FgCI X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=kx40VUetZeR6MuiqrM7kPCcGakk1md0Az5qHwb6gBdU= X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: yygohpugyhokgwutxgkes9fcq9t3bbd5 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4AE40C0003 X-HE-Tag: 1716541059-355326 X-HE-Meta: U2FsdGVkX1+PqPAQzsHXJeBVSjyHRTlrdEIeifQc8oJM7r1L0WxeTzZC7TuigTJKMAYxBi4M05v88Uu4GtBwdnSzHrEKcAoAS3JstpdZi4EFmIGjC+Cv3zrbSAIPYK3pTZZ3dSQ79M0KUq4hOKBI+xD5mMfE/U2IIqppruZ+xPbi6IOQSFOoSasM8ZLhwzepfyCNBGsfBGH9Rok2wZsSaDicxmTO+kx/oypypWZIsez5WkxfJKX19gqukV68aT0X7lIhEnKbkND99JXCvVfLoCnj5TEctsO/ocaAEO3x1s9VbiBZJzZ0BzQdwIchCnoUIJDjZLO5NiwIWNJU9gl1b0aee6+F/XF+GZ6X0Bm1kq/SaryI1TfPE1ByaCSMARemZu7Xk15z9qiJSj4SMYZvFarxl7rv9wtQ50morKTpLVrwSMXUMUS17/oaco6QLYrZC++25KBNyBiTdFmsQl4s+38xuJkOMnkf9sJASBLZyt0+u+kauPIpcYKKAAw5J7Ypz9b0Ms+I9eoUkifXMEhjUcJgBhblnrEzaDt+BiZtCpHIP3SLXv3hcopR3NqrhQ8Oc7dfaNp3hB3KCDjtPpU9VRKVnrIFbEOAe2GCOt6xjBCA6arojdPwpq8JkPxzk8dedQpBfAhSd7NyhxSTD1jN0BjoPSrvCYC7I19QzlVWQ4rd8ebZeJof0C4gYJZusfdfOBYJiU84kVCylj3529ZCgmMBAZ5DkK/nQcQJnCG+w3913pGwRzXzwnIL3ZLmDuASH4w53zL00qXyCiXgtpUeYDQGnSlY+cqIDYuC9bRpbuNdcAHon2IketBY5ry39cgMaZcphXYwl0hEBHr0IfSKiG0mFj81uKmz 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: In preparation for later changes, refactor out a new function called try_to_merge_with_zero_page(), which tries to merge with zero page. Signed-off-by: Chengming Zhou --- mm/ksm.c | 67 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 4dc707d175fa..cbd4ba7ea974 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1531,6 +1531,41 @@ static int try_to_merge_one_page(struct vm_area_struct *vma, return err; } +/* This function returns 0 if the pages were merged, -EFAULT otherwise. */ +static int try_to_merge_with_zero_page(struct ksm_rmap_item *rmap_item, + struct page *page) +{ + struct mm_struct *mm = rmap_item->mm; + int err = -EFAULT; + + /* + * Same checksum as an empty page. We attempt to merge it with the + * appropriate zero page if the user enabled this via sysfs. + */ + if (ksm_use_zero_pages && (rmap_item->oldchecksum == zero_checksum)) { + struct vm_area_struct *vma; + + mmap_read_lock(mm); + vma = find_mergeable_vma(mm, rmap_item->address); + if (vma) { + err = try_to_merge_one_page(vma, page, + ZERO_PAGE(rmap_item->address)); + trace_ksm_merge_one_page( + page_to_pfn(ZERO_PAGE(rmap_item->address)), + rmap_item, mm, err); + } else { + /* + * If the vma is out of date, we do not need to + * continue. + */ + err = 0; + } + mmap_read_unlock(mm); + } + + return err; +} + /* * try_to_merge_with_ksm_page - like try_to_merge_two_pages, * but no new kernel page is allocated: kpage must already be a ksm page. @@ -2305,7 +2340,6 @@ static void stable_tree_append(struct ksm_rmap_item *rmap_item, */ static noinline void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_item) { - struct mm_struct *mm = rmap_item->mm; struct ksm_rmap_item *tree_rmap_item; struct page *tree_page = NULL; struct ksm_stable_node *stable_node; @@ -2374,36 +2408,9 @@ static noinline void cmp_and_merge_page(struct page *page, struct ksm_rmap_item return; } - /* - * Same checksum as an empty page. We attempt to merge it with the - * appropriate zero page if the user enabled this via sysfs. - */ - if (ksm_use_zero_pages && (checksum == zero_checksum)) { - struct vm_area_struct *vma; + if (!try_to_merge_with_zero_page(rmap_item, page)) + return; - mmap_read_lock(mm); - vma = find_mergeable_vma(mm, rmap_item->address); - if (vma) { - err = try_to_merge_one_page(vma, page, - ZERO_PAGE(rmap_item->address)); - trace_ksm_merge_one_page( - page_to_pfn(ZERO_PAGE(rmap_item->address)), - rmap_item, mm, err); - } else { - /* - * If the vma is out of date, we do not need to - * continue. - */ - err = 0; - } - mmap_read_unlock(mm); - /* - * In case of failure, the page was not really empty, so we - * need to continue. Otherwise we're done. - */ - if (!err) - return; - } tree_rmap_item = unstable_tree_search_insert(rmap_item, page, &tree_page); if (tree_rmap_item) {