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 B50D2ECAAA1 for ; Wed, 31 Aug 2022 03:20:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 50EE66B007B; Tue, 30 Aug 2022 23:20:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 499786B007D; Tue, 30 Aug 2022 23:20:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EA138D0001; Tue, 30 Aug 2022 23:20:38 -0400 (EDT) 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 1D0E76B007B for ; Tue, 30 Aug 2022 23:20:38 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D8D02160512 for ; Wed, 31 Aug 2022 03:20:37 +0000 (UTC) X-FDA: 79858435314.25.530665F Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf30.hostedemail.com (Postfix) with ESMTP id 8C4778000F for ; Wed, 31 Aug 2022 03:20:37 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id c66so2948037pfc.10 for ; Tue, 30 Aug 2022 20:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Al2MAS+95n2CdX2+DzZ9586scn02KUFSxAEU+wkQoAw=; b=qJOddgBlJ6QYyyCedtrzab/fiepTxwXPZUhHtVCwS12VTaTT2yX+tNuPdYbeQmsqeh gw9zRMj5RXYKc9GEb4169ocwRzD/4oUrZhYjmbmTFB82XEmRLmrkBhLTtoTXAyC7lAzg yW6Y0fS9iTsdGdRgVBinWppWyPiq2TgP1O4iwdf3OebRHvSD1br7lIl/5NiYzKFGqfih GqhLkTPpGQTfogbYCVnYaN6P1YjWP1wHKb0mlleAbFlm0M5c8jIZ0FnokMggWMi3N6BZ 0t/+cmMwT22FRNiy9Tr6HB81hwBSHa63aUYbE5dXUBcesSQ5KPvH4qDL/rb4VAM4C4Ws ER9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Al2MAS+95n2CdX2+DzZ9586scn02KUFSxAEU+wkQoAw=; b=ikehUKw62/3gf0S6nI8bcm3sXUXpmIBiFt2lTTphYbyRQmCYHwaLG95+H+b2DPlXGe CRmXFv1bAfZgqtDWHlyYuYaVyzo9Y+8E2IQASGN8zD7S36jQmr4MPHNG5hEcr+Obhh9y 6LvnCGFs+iG0BcPEO3kcvJNlwmMF6ptr/jXir1eNLAEDveeIJNxiWDZITzKjZQIN/fCB X2YJUHAWKKqCtlswXtgE7otg1lrbTa8E2DtrnsXtTw2mnfdjSkF2Cv7ftPVmbn4I0XhZ XC3jaAf0e71N/HCWDJBQXnKClVZ2LkLIM7AvAxmnFyRdaO18l7TCDd4C0pedP1eJdcFo rBhQ== X-Gm-Message-State: ACgBeo2zAdECHBaKkVLzMcvKixrbRuimqQ4BC+TkQhj4fnGGQg21ZQQc /QtxEj8zYiCr2tq9mK8yhkk1mw== X-Google-Smtp-Source: AA6agR5hQijp1ihYFHuxOS7SKbB6brdOYfWD5KVgxzapCa+48fl3/7b3bZVzq1jr8Gkh0eEBAfDOyA== X-Received: by 2002:a65:5847:0:b0:42a:df5:1035 with SMTP id s7-20020a655847000000b0042a0df51035mr20339602pgr.248.1661916036655; Tue, 30 Aug 2022 20:20:36 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id i13-20020a170902c94d00b0015e8d4eb1d5sm8633535pla.31.2022.08.30.20.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 20:20:36 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, vbabka@suse.cz, hannes@cmpxchg.org, minchan@kernel.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 6/7] ksm: convert ksm_mm_slot.link to ksm_mm_slot.hash Date: Wed, 31 Aug 2022 11:19:50 +0800 Message-Id: <20220831031951.43152-7-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20220831031951.43152-1-zhengqi.arch@bytedance.com> References: <20220831031951.43152-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=qJOddgBl; spf=pass (imf30.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661916037; a=rsa-sha256; cv=none; b=ymUCyVuN7qtzYFosLRAvrqeG6Fr7dPbfI8vvLVkMb30+WRwRdo2yHLUUufNxbbClE74Jyg ZLHzfHksKvy/5MZ3CB8VOqzQZ95olB8uS+xojQaVx8C+mwIyDlUK66B1poDQjmf+iu6fVo tzpcCQ7d+7j76/w2V4wDgna1tOlBy44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661916037; 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=Al2MAS+95n2CdX2+DzZ9586scn02KUFSxAEU+wkQoAw=; b=WcBTFt9iyMsWUn6ENepNytt+cb/XtqlpEeNVG3lCZ+NgnwjZ0zYWRwXwQzG8wRqAbp+31z IR5ltbdduzmlXWZOOIsSUzhPn+eUU39G3h6q8iLBew4bBaVaqz56AgRj5nd2pxlIQ+wO/N bvm6bDZl3mea2zYJhgSu7bUqEeASmnU= X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 8C4778000F X-Rspam-User: Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=qJOddgBl; spf=pass (imf30.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Stat-Signature: kg8bb6ggp88fptq1mo1u7ypx38i5bbwg X-HE-Tag: 1661916037-109345 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: In order to use common struct mm_slot, convert ksm_mm_slot.link to ksm_mm_slot.hash in advance, no functional change. Signed-off-by: Qi Zheng --- mm/ksm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 8c52aa7e0a02..667efca75b0d 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -113,13 +113,13 @@ /** * struct ksm_mm_slot - ksm information per mm that is being scanned - * @link: link to the mm_slots hash list + * @hash: link to the mm_slots hash list * @mm_node: link into the mm_slots list, rooted in ksm_mm_head * @rmap_list: head for this mm_slot's singly-linked list of rmap_items * @mm: the mm that this information is valid for */ struct ksm_mm_slot { - struct hlist_node link; + struct hlist_node hash; struct list_head mm_node; struct ksm_rmap_item *rmap_list; struct mm_struct *mm; @@ -424,7 +424,7 @@ static struct ksm_mm_slot *get_mm_slot(struct mm_struct *mm) { struct ksm_mm_slot *slot; - hash_for_each_possible(mm_slots_hash, slot, link, (unsigned long)mm) + hash_for_each_possible(mm_slots_hash, slot, hash, (unsigned long)mm) if (slot->mm == mm) return slot; @@ -435,7 +435,7 @@ static void insert_to_mm_slots_hash(struct mm_struct *mm, struct ksm_mm_slot *mm_slot) { mm_slot->mm = mm; - hash_add(mm_slots_hash, &mm_slot->link, (unsigned long)mm); + hash_add(mm_slots_hash, &mm_slot->hash, (unsigned long)mm); } /* @@ -1008,7 +1008,7 @@ static int unmerge_and_remove_all_rmap_items(void) ksm_scan.mm_slot = list_entry(mm_slot->mm_node.next, struct ksm_mm_slot, mm_node); if (ksm_test_exit(mm)) { - hash_del(&mm_slot->link); + hash_del(&mm_slot->hash); list_del(&mm_slot->mm_node); spin_unlock(&ksm_mmlist_lock); @@ -2376,7 +2376,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) * or when all VM_MERGEABLE areas have been unmapped (and * mmap_lock then protects against race with MADV_MERGEABLE). */ - hash_del(&slot->link); + hash_del(&slot->hash); list_del(&slot->mm_node); spin_unlock(&ksm_mmlist_lock); @@ -2570,7 +2570,7 @@ void __ksm_exit(struct mm_struct *mm) mm_slot = get_mm_slot(mm); if (mm_slot && ksm_scan.mm_slot != mm_slot) { if (!mm_slot->rmap_list) { - hash_del(&mm_slot->link); + hash_del(&mm_slot->hash); list_del(&mm_slot->mm_node); easy_to_free = 1; } else { -- 2.20.1