From patchwork Sun Aug 19 00:52:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 1342021 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by patchwork2.kernel.org (Postfix) with ESMTP id 787F2DF266 for ; Sun, 19 Aug 2012 00:55:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7J0qOKS002688; Sat, 18 Aug 2012 20:52:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7J0qMV9021994 for ; Sat, 18 Aug 2012 20:52:22 -0400 Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.17]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7J0qHQE016369; Sat, 18 Aug 2012 20:52:17 -0400 Received: from mail-bk0-f46.google.com (mail-bk0-f46.google.com [209.85.214.46]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7J0q5IH012870; Sat, 18 Aug 2012 20:52:15 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so1935907bkw.33 for ; Sat, 18 Aug 2012 17:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=zZpz2NrxfOhQrHZjN1Dtmyo3Tq5JLm2NFXxMtLOt0F0=; b=p3P4VwO/iGuGc6eh0f5EryOFPL2bMBNiMliY1UwiRul76TGUTmLaja83khxnISvnqe C4TRd/XK72aV2xITGY+DLkZE0B3We7tFcXUWWhW2A8Fww5isOfPoGsZkDY5vaBOPhjPr GySvEY4EAfpBO9267ZVuev7d7s106joR4D39QWfqPwm4l/pJs/z4CAigS5dY9tm9ltMw BKfvfmNZ5Idh4i7Fd5hxUAKvx4EzsBKv7iS6S/3EXKafx79lRtY64BdEsfkXPH7pYJ+8 Ym/OAUhTxZmO3VtT0EuB36AUxsp7VpKiJVeRTluXvH/lo+vitlXi3FMiGXxukbN94RHo TWpQ== Received: by 10.204.143.138 with SMTP id v10mr3204607bku.114.1345337535316; Sat, 18 Aug 2012 17:52:15 -0700 (PDT) Received: from localhost.localdomain (95-89-78-76-dynip.superkabel.de. [95.89.78.76]) by mx.google.com with ESMTPS id c18sm4724437bkv.8.2012.08.18.17.52.12 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 18 Aug 2012 17:52:14 -0700 (PDT) From: Sasha Levin To: torvalds@linux-foundation.org Date: Sun, 19 Aug 2012 02:52:17 +0200 Message-Id: <1345337550-24304-5-git-send-email-levinsasha928@gmail.com> In-Reply-To: <1345337550-24304-1-git-send-email-levinsasha928@gmail.com> References: <1345337550-24304-1-git-send-email-levinsasha928@gmail.com> X-RedHat-Spam-Score: -2.45 (BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.17 X-loop: dm-devel@redhat.com Cc: snitzer@redhat.com, fweisbec@gmail.com, Trond.Myklebust@netapp.com, bfields@fieldses.org, paul.gortmaker@windriver.com, dm-devel@redhat.com, agk@redhat.com, aarcange@redhat.com, rds-devel@oss.oracle.com, eric.dumazet@gmail.com, venkat.x.venkatsubra@oracle.com, ccaulfie@redhat.com, mingo@elte.hu, dev@openvswitch.org, jesse@nicira.com, josh@joshtriplett.org, rostedt@goodmis.org, lw@cn.fujitsu.com, mathieu.desnoyers@efficios.com, Sasha Levin , axboe@kernel.dk, linux-nfs@vger.kernel.org, edumazet@google.com, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ejt@redhat.com, ebiederm@xmission.com, tj@kernel.org, teigland@redhat.com, akpm@linux-foundation.org, davem@davemloft.net Subject: [dm-devel] [PATCH v2 03/16] mm, ksm: use new hashtable implementation X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Switch ksm to use the new hashtable implementation. This reduces the amount of generic unrelated code in the ksm module. Signed-off-by: Sasha Levin --- mm/ksm.c | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 9638620..dd4d6af 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -156,9 +156,8 @@ struct rmap_item { static struct rb_root root_stable_tree = RB_ROOT; static struct rb_root root_unstable_tree = RB_ROOT; -#define MM_SLOTS_HASH_SHIFT 10 -#define MM_SLOTS_HASH_HEADS (1 << MM_SLOTS_HASH_SHIFT) -static struct hlist_head mm_slots_hash[MM_SLOTS_HASH_HEADS]; +#define MM_SLOTS_HASH_BITS 10 +static DEFINE_HASHTABLE(mm_slots_hash, MM_SLOTS_HASH_BITS); static struct mm_slot ksm_mm_head = { .mm_list = LIST_HEAD_INIT(ksm_mm_head.mm_list), @@ -275,26 +274,21 @@ static inline void free_mm_slot(struct mm_slot *mm_slot) static struct mm_slot *get_mm_slot(struct mm_struct *mm) { - struct mm_slot *mm_slot; - struct hlist_head *bucket; struct hlist_node *node; + struct mm_slot *slot; + + hash_for_each_possible(mm_slots_hash, slot, node, link, (unsigned long)mm) + if (slot->mm == mm) + return slot; - bucket = &mm_slots_hash[hash_ptr(mm, MM_SLOTS_HASH_SHIFT)]; - hlist_for_each_entry(mm_slot, node, bucket, link) { - if (mm == mm_slot->mm) - return mm_slot; - } return NULL; } static void insert_to_mm_slots_hash(struct mm_struct *mm, struct mm_slot *mm_slot) { - struct hlist_head *bucket; - - bucket = &mm_slots_hash[hash_ptr(mm, MM_SLOTS_HASH_SHIFT)]; mm_slot->mm = mm; - hlist_add_head(&mm_slot->link, bucket); + hash_add(mm_slots_hash, &mm_slot->link, (unsigned long)mm); } static inline int in_stable_tree(struct rmap_item *rmap_item) @@ -647,7 +641,7 @@ static int unmerge_and_remove_all_rmap_items(void) ksm_scan.mm_slot = list_entry(mm_slot->mm_list.next, struct mm_slot, mm_list); if (ksm_test_exit(mm)) { - hlist_del(&mm_slot->link); + hash_del(&mm_slot->link); list_del(&mm_slot->mm_list); spin_unlock(&ksm_mmlist_lock); @@ -1385,7 +1379,7 @@ next_mm: * or when all VM_MERGEABLE areas have been unmapped (and * mmap_sem then protects against race with MADV_MERGEABLE). */ - hlist_del(&slot->link); + hash_del(&slot->link); list_del(&slot->mm_list); spin_unlock(&ksm_mmlist_lock); @@ -1552,7 +1546,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) { - hlist_del(&mm_slot->link); + hash_del(&mm_slot->link); list_del(&mm_slot->mm_list); easy_to_free = 1; } else { @@ -2028,6 +2022,9 @@ static int __init ksm_init(void) */ hotplug_memory_notifier(ksm_memory_callback, 100); #endif + + hash_init(mm_slots_hash); + return 0; out_free: