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 B114DC3DA79 for ; Fri, 30 Dec 2022 01:12:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 474D18E0003; Thu, 29 Dec 2022 20:12:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 424D28E0001; Thu, 29 Dec 2022 20:12:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3142C8E0003; Thu, 29 Dec 2022 20:12:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1ED168E0001 for ; Thu, 29 Dec 2022 20:12:55 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E3881801B3 for ; Fri, 30 Dec 2022 01:12:54 +0000 (UTC) X-FDA: 80297198268.06.DABEDE5 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by imf22.hostedemail.com (Postfix) with ESMTP id A90BFC000D for ; Fri, 30 Dec 2022 01:12:52 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf22.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.40 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672362773; 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:in-reply-to: references; bh=Fn8CaapX2uBzNcHLvV2QH2LQpWpDs2Djiqkkl35bf/w=; b=c1HZ4eoUYma4c3MxJmpGxGeINDUCzKftAh6nqoinMzgrn5MXFUVyPsA2WWpprL2zxWamh/ P8jpWRwnOL9wEdnqTNSgcTzJ8vN3kgmsa4X6elHj7+VINcm/VysVLaV/+lnuBa4bXpSIVV fcS/yhRTeyUIzK6TrNMuSc8hxU2VFSI= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf22.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.40 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672362773; a=rsa-sha256; cv=none; b=FY97IZftamYrFIRgYw0IU9gyiOSEZiW42CqIA89V+ZPl9oH8WeRsW1pTz4xIx2V+c4co0k iUmadFlsrajWIgOQPL7Uf8xeDl+zwP6QE9IU5j+0fx3hUzindRciJmX/BxQUUjHaVt73Mh JQj/P7T8DZNb7yfy1+QFQac8qW+TlLo= Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4NjnLV0XKMz8R039; Fri, 30 Dec 2022 09:12:50 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl2.zte.com.cn with SMTP id 2BU1CiXg057579; Fri, 30 Dec 2022 09:12:44 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Fri, 30 Dec 2022 09:12:44 +0800 (CST) Date: Fri, 30 Dec 2022 09:12:44 +0800 (CST) X-Zmail-TransId: 2b0363ae3b0c59fb2628 X-Mailer: Zmail v1.0 Message-ID: <202212300912449061763@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIHY1IDEvNl0ga3NtOiBhYnN0cmFjdCB0aGUgZnVuY3Rpb24gdHJ5X3RvX2dldF9vbGRfcm1hcF9pdGVt?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl2.zte.com.cn 2BU1CiXg057579 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 63AE3B12.000 by FangMail milter! X-FangMail-Envelope: 1672362770/4NjnLV0XKMz8R039/63AE3B12.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63AE3B12.000/4NjnLV0XKMz8R039 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A90BFC000D X-Stat-Signature: rtptji4sxsawbafxcfzj8tfob836kpgw X-Rspam-User: X-HE-Tag: 1672362772-617569 X-HE-Meta: U2FsdGVkX1969PBi1Ihm9lw35WXxcKk+ia1n1hMHwUIZm+9iZaMW93tIN+BDnKsPorFwKCkykPHJ/HUpP60mwyyYkf8mqSiIkauSosvEh+V2gc5eA20Sf8IUJNpp/Lwx8TxDOxxkIKWgELcj8AFmcYL71er6u83nZkeNq4MtppiPS6v7HRXDYL0wMUaIxiOI9v/s5nW/z8LK9jvfs/hngpkbo8h7iX8VE7ZGnNuTw5Z5wsu6o6sxj5P1LTudtINywiPiDIl/q5FJeVzskbfm0PW+bJuvfmC2IvAHM7G9aTTwfwByach3v0rgr/WZ40kzjOTdKlN2eSHgYcFHWr779CzE7j6G7Ptrkzwo5FGC89Fk5qRZgk87GA+1wdlOg3ugJjV3dQwp+q2bVlFnd+KkHS2OS4SIXJ3WMv6Ov795vsmT5WZKjX3MBcTXAbitnfF38tlKZNbCRje0djeTQlmZP+MOBIs9i0PN+lGKeWrgEzZmCTgLcxAg+hdkq+oP+lSwtEyURK4FfqLXVlw5SgKMbLstzfolaVto/iZzBi1j2sSZYcPl2BqXs6zP2LF5aluDWljLulX3F0X6LQqw6ux1XngNqj8kdhADFajkRPdJxGvCt2rMLEXF9+JRUwG47tCE2EWp9eA80eS6DSaYWQe/tisEjEDD2LB9JWWDLv7a9yUFbF3H5XvVJt1EIDCl7MluCdXSo6k/4mjCfySU6TZNhb1NDiuuTyEgNzBZbLOvvXEwQSxuy7X/OrQVwPwkJzQ+GBItgkxgwTkZqSBFavHWo1tyRrodL5pZ8BY6aXsZ0hlj5cmxlMXYHY3uxQ3ApytgVV8d2EJUFzOEktHR7yKkye9F1Jm38LOpSN0mbdzIrgm3fSP3ZpiuazoxhPj3NRhNZr8pY5ld7to82AZYRF2BG8r3pLinyquHKCrqlIuLAGLLvK+Z9+Gz5bDCmj+JS+2m/SCXamo9huKUif11gYV f4Q== 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: From: xu xin A new function try_to_get_old_rmap_item is abstracted from get_next_rmap_item. This function will be reused by the subsequent patches about counting ksm_zero_pages. The patch improves the readability and reusability of KSM code. Signed-off-by: xu xin Cc: David Hildenbrand Cc: Claudio Imbrenda Cc: Xuexin Jiang Reviewed-by: Xiaokai Ran Reviewed-by: Yang Yang --- mm/ksm.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 83e2f74ae7da..5b0a7343ff4a 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2214,23 +2214,36 @@ static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_ite } } -static struct ksm_rmap_item *get_next_rmap_item(struct ksm_mm_slot *mm_slot, - struct ksm_rmap_item **rmap_list, - unsigned long addr) +static struct ksm_rmap_item *try_to_get_old_rmap_item(unsigned long addr, + struct ksm_rmap_item **rmap_list) { - struct ksm_rmap_item *rmap_item; - while (*rmap_list) { - rmap_item = *rmap_list; + struct ksm_rmap_item *rmap_item = *rmap_list; if ((rmap_item->address & PAGE_MASK) == addr) return rmap_item; if (rmap_item->address > addr) break; *rmap_list = rmap_item->rmap_list; + /* Running here indicates it's vma has been UNMERGEABLE */ remove_rmap_item_from_tree(rmap_item); free_rmap_item(rmap_item); } + return NULL; +} + +static struct ksm_rmap_item *get_next_rmap_item(struct ksm_mm_slot *mm_slot, + struct ksm_rmap_item **rmap_list, + unsigned long addr) +{ + struct ksm_rmap_item *rmap_item; + + /* lookup if we have a old rmap_item matching the addr*/ + rmap_item = try_to_get_old_rmap_item(addr, rmap_list); + if (rmap_item) + return rmap_item; + + /* Need to allocate a new rmap_item */ rmap_item = alloc_rmap_item(); if (rmap_item) { /* It has already been zeroed */ -- 2.15.2