Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
From: laijs@cn.fujitsu.com (Lai Jiangshan)
Subject: [lttng-dev] [PATCH 12/12] add rculfhash-mm-mmap.c memory management
Date: Mon, 28 Nov 2011 16:08:08 +0800	[thread overview]
Message-ID: <1322467688-2930-13-git-send-email-laijs@cn.fujitsu.com> (raw)
In-Reply-To: <1322467688-2930-1-git-send-email-laijs@cn.fujitsu.com>

Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
---
 Makefile.am          |    3 +-
 rculfhash-internal.h |    7 +++
 rculfhash-mm-mmap.c  |  147 ++++++++++++++++++++++++++++++++++++++++++++++++++
 urcu/rculfhash.h     |    1 +
 4 files changed, 157 insertions(+), 1 deletions(-)
 create mode 100644 rculfhash-mm-mmap.c

diff --git a/Makefile.am b/Makefile.am
index 853ecd5..91a9fd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,8 @@ if COMPAT_FUTEX
 COMPAT+=compat_futex.c
 endif
 
-RCULFHASH=rculfhash.c rculfhash-mm-order.c rculfhash-mm-chunk.c
+RCULFHASH = rculfhash.c rculfhash-mm-order.c rculfhash-mm-chunk.c \
+		rculfhash-mm-mmap.c
 
 lib_LTLIBRARIES = liburcu-common.la \
 		liburcu.la liburcu-qsbr.la \
diff --git a/rculfhash-internal.h b/rculfhash-internal.h
index fda4251..5e65685 100644
--- a/rculfhash-internal.h
+++ b/rculfhash-internal.h
@@ -103,6 +103,13 @@ struct cds_lfht {
 		 * size). chunks improve cache locality for small index orders
 		 */
 		struct cds_lfht_node *tbl_chunk[0];
+
+		/*
+		 * Contains all the room of buckets without memory allocated.
+		 * All the per order-index-level bucket node tables will be
+		 * allocated inside it when used.
+		 */
+		struct cds_lfht_node *tbl_buckets;
 	};
 };
 
diff --git a/rculfhash-mm-mmap.c b/rculfhash-mm-mmap.c
new file mode 100644
index 0000000..26aa2ed
--- /dev/null
+++ b/rculfhash-mm-mmap.c
@@ -0,0 +1,147 @@
+/*
+ * rculfhash-mm-mmap.c
+ *
+ * mmap/reservation based memory management for Lock-Free RCU Hash Table
+ *
+ * Copyright 2011 - Lai Jiangshan <laijs at cn.fujitsu.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <unistd.h>
+#include <sys/mman.h>
+#include <rculfhash-internal.h>
+
+/* reserve inaccessible memory space without allocation any memory */
+static void *memory_map(size_t length)
+{
+	void *ret = mmap(NULL, length, PROT_NONE,
+			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+	assert(ret != MAP_FAILED);
+	return ret;
+}
+
+static void memory_unmap(void *ptr, size_t length)
+{
+	int ret = munmap(ptr, length);
+
+	assert(ret == 0);
+}
+
+static void memory_populate(void *ptr, size_t length)
+{
+	void *ret = mmap(ptr, length, PROT_READ | PROT_WRITE,
+			MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+	assert(ret == ptr);
+}
+
+/*
+ * Discard garbage memory and avoid system save it when try to swap it out.
+ * Make it still reserved, inaccessible.
+ */
+static void memory_discard(void *ptr, size_t length)
+{
+	void *ret = mmap(ptr, length, PROT_NONE,
+			MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+	assert(ret == ptr);
+}
+
+static
+void cds_lfht_alloc_bucket_table(struct cds_lfht *ht, unsigned long order)
+{
+	if (order == 0) {
+		if (ht->min_nr_alloc_buckets == ht->max_nr_buckets) { /* small table */
+			ht->tbl_buckets = calloc(ht->max_nr_buckets, sizeof(*ht->tbl_buckets));
+			assert(ht->tbl_buckets);
+			return;
+		}
+		/* large table */
+		ht->tbl_buckets = memory_map(ht->max_nr_buckets * sizeof(*ht->tbl_buckets));
+		memory_populate(ht->tbl_buckets, ht->min_nr_alloc_buckets * sizeof(*ht->tbl_buckets));
+	} else if (order > ht->min_alloc_buckets_order) { /* large table */
+		unsigned long len = 1UL << (order - 1);
+
+		assert(ht->min_nr_alloc_buckets < ht->max_nr_buckets);
+		memory_populate(ht->tbl_buckets + len, len * sizeof(*ht->tbl_buckets));
+	}
+	/* Nothing to do for 0 < order && order <= ht->min_alloc_buckets_order */
+}
+
+/*
+ * cds_lfht_free_bucket_table() should be called with decreasing order.
+ * When cds_lfht_free_bucket_table(0) is called, it means the whole
+ * lfht is destroyed.
+ */
+static
+void cds_lfht_free_bucket_table(struct cds_lfht *ht, unsigned long order)
+{
+	if (order == 0) {
+		if (ht->min_nr_alloc_buckets == ht->max_nr_buckets) { /* small table */
+			poison_free(ht->tbl_buckets);
+			return;
+		}
+		/* large table */
+		memory_unmap(ht->tbl_buckets, ht->max_nr_buckets * sizeof(*ht->tbl_buckets));
+	} else if (order > ht->min_alloc_buckets_order) { /* large table */
+		unsigned long len = 1UL << (order - 1);
+
+		assert(ht->min_nr_alloc_buckets < ht->max_nr_buckets);
+		memory_discard(ht->tbl_buckets + len, len * sizeof(*ht->tbl_buckets));
+	}
+	/* Nothing to do for 0 < order && order <= ht->min_alloc_buckets_order */
+}
+
+static
+struct cds_lfht_node *bucket_at(struct cds_lfht *ht, unsigned long index)
+{
+	return &ht->tbl_buckets[index];
+}
+
+static
+struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
+		unsigned long max_nr_buckets)
+{
+	struct cds_lfht *ht;
+	unsigned long page_bucket_size = getpagesize() / sizeof(*ht->tbl_buckets);
+
+	if (max_nr_buckets <= page_bucket_size) /* small table */
+		min_nr_alloc_buckets = max_nr_buckets;
+	else /* large table */
+		min_nr_alloc_buckets = max(min_nr_alloc_buckets, page_bucket_size);
+
+
+	ht = calloc(1, sizeof(struct cds_lfht));
+	assert(ht);
+
+	ht->mm = &cds_lfht_mm_mmap;
+
+	ht->min_nr_alloc_buckets = min_nr_alloc_buckets;
+	ht->min_alloc_buckets_order = get_count_order_ulong(min_nr_alloc_buckets);
+	ht->max_nr_buckets = max_nr_buckets;
+
+	ht->bucket_at = bucket_at;
+
+	return ht;
+}
+
+const struct cds_lfht_mm_type cds_lfht_mm_mmap = {
+	.alloc_cds_lfht = alloc_cds_lfht,
+	.alloc_bucket_table = cds_lfht_alloc_bucket_table,
+	.free_bucket_table = cds_lfht_free_bucket_table,
+	.bucket_at = bucket_at,
+};
diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 54e0cd8..ec91e35 100644
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -106,6 +106,7 @@ struct cds_lfht_mm_type {
 
 extern const struct cds_lfht_mm_type cds_lfht_mm_order;
 extern const struct cds_lfht_mm_type cds_lfht_mm_chunk;
+extern const struct cds_lfht_mm_type cds_lfht_mm_mmap;
 
 /*
  * _cds_lfht_new - API used by cds_lfht_new wrapper. Do not use directly.
-- 
1.7.4.4




  parent reply	other threads:[~2011-11-28  8:08 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-28  8:07 [lttng-dev] [PATCH 00/12] rculfhash memory managements Lai Jiangshan
2011-11-28  8:07 ` [lttng-dev] [PATCH 01/12] introduce bucket_at() and improve readability Lai Jiangshan
2011-11-28 13:01   ` Mathieu Desnoyers
2011-11-28  8:07 ` [lttng-dev] [PATCH 02/12] proper wrapper for bucket table alloc and free Lai Jiangshan
2011-11-28 13:02   ` Mathieu Desnoyers
2011-11-28  8:07 ` [lttng-dev] [PATCH 03/12] it is not required that ht->t.size >= ht->min_table_size now Lai Jiangshan
2011-11-28 13:07   ` Mathieu Desnoyers
2011-11-28  8:08 ` [lttng-dev] [PATCH 04/12] remove struct rcu_level Lai Jiangshan
2011-11-28 13:08   ` Mathieu Desnoyers
2011-11-28  8:08 ` [lttng-dev] [PATCH 05/12] rename min_alloc_size/min_alloc_order Lai Jiangshan
2011-11-28 13:14   ` Mathieu Desnoyers
2011-11-28  8:08 ` [lttng-dev] [PATCH 06/12] add max_nr_buckets argument Lai Jiangshan
2011-11-28 13:24   ` Mathieu Desnoyers
2011-11-28  8:08 ` [lttng-dev] [PATCH 07/12] Add rcu_flavor Lai Jiangshan
2011-11-28 13:23   ` Mathieu Desnoyers
2011-11-28  8:08 ` [lttng-dev] [PATCH 08/12] use rcu_flavor for rculfhash Lai Jiangshan
2011-11-28 13:24   ` Mathieu Desnoyers
2011-11-28  8:08 ` [lttng-dev] [PATCH 09/12] remove struct rcu_table Lai Jiangshan
2011-11-28 13:25   ` Mathieu Desnoyers
2011-11-28  8:08 ` [lttng-dev] [PATCH 10/12] move memory management code out as rculfhash-mm-order.c Lai Jiangshan
2011-11-28 13:27   ` Mathieu Desnoyers
2011-11-28  8:08 ` [lttng-dev] [PATCH 11/12] add rculfhash-mm-chunk.c memory management Lai Jiangshan
2011-11-28 13:33   ` Mathieu Desnoyers
2011-11-28  8:08 ` Lai Jiangshan [this message]
2011-11-28 13:43   ` [lttng-dev] [PATCH 12/12] add rculfhash-mm-mmap.c " Mathieu Desnoyers
2011-11-28 14:05     ` Lai Jiangshan
2011-11-28 14:15       ` Mathieu Desnoyers
2011-11-28 13:43 ` [lttng-dev] [PATCH 00/12] rculfhash memory managements Mathieu Desnoyers
2011-11-28 14:23   ` Lai Jiangshan
2011-11-28 14:39     ` Mathieu Desnoyers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322467688-2930-13-git-send-email-laijs@cn.fujitsu.com \
    --to=laijs@cn.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox