From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: xen-devel@lists.xenproject.org, konrad@kernel.org
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH v1 03/12] tmem: Wrap tmem dedup code with CONFIG_TMEM_DEDUP
Date: Wed, 28 Sep 2016 05:42:17 -0400 [thread overview]
Message-ID: <1475055746-22401-4-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1475055746-22401-1-git-send-email-konrad.wilk@oracle.com>
This config is not defined anywhere but it makes it way
easier to figure out what code to deal with.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
v1: First submission.
---
xen/common/tmem.c | 57 ++++++++++++++++++++++++++++++++++++++++++----
xen/common/tmem_control.c | 2 ++
xen/common/tmem_xen.c | 2 ++
xen/include/xen/tmem_xen.h | 4 ++++
4 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index efaafc4..8327218 100644
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -71,10 +71,14 @@ struct tmem_page_descriptor {
pagesize_t size; /* 0 == PAGE_SIZE (pfp), -1 == data invalid,
else compressed data (cdata). */
uint32_t index;
+#ifdef CONFIG_TMEM_DEDUP
/* Must hold pcd_tree_rwlocks[firstbyte] to use pcd pointer/siblings. */
uint16_t firstbyte; /* NON_SHAREABLE->pfp otherwise->pcd. */
+#endif
bool_t eviction_attempted; /* CHANGE TO lifetimes? (settable). */
+#ifdef CONFIG_TMEM_DEDUP
struct list_head pcd_siblings;
+#endif
union {
struct page_info *pfp; /* Page frame pointer. */
char *cdata; /* Compressed data. */
@@ -94,15 +98,20 @@ struct tmem_page_content_descriptor {
char *cdata; /* If compression_enabled. */
char *tze; /* If !compression_enabled, trailing zeroes eliminated. */
};
+#ifdef CONFIG_TMEM_DEDUP
struct list_head pgp_list;
struct rb_node pcd_rb_tree_node;
uint32_t pgp_ref_count;
+#endif
pagesize_t size; /* If compression_enabled -> 0<size<PAGE_SIZE (*cdata)
* else if tze, 0<=size<PAGE_SIZE, rounded up to mult of 8
* else PAGE_SIZE -> *pfp. */
};
+
+#ifdef CONFIG_TMEM_DEDUP
struct rb_root pcd_tree_roots[256]; /* Choose based on first byte of page. */
rwlock_t pcd_tree_rwlocks[256]; /* Poor man's concurrency for now. */
+#endif
static int tmem_initialized = 0;
@@ -262,6 +271,7 @@ static void tmem_persistent_pool_page_put(void *page_va)
*/
#define NOT_SHAREABLE ((uint16_t)-1UL)
+#ifdef CONFIG_TMEM_DEDUP
static int pcd_copy_to_client(xen_pfn_t cmfn, struct tmem_page_descriptor *pgp)
{
uint8_t firstbyte = pgp->firstbyte;
@@ -485,6 +495,7 @@ unlock:
write_unlock(&pcd_tree_rwlocks[firstbyte]);
return ret;
}
+#endif
/************ PAGE DESCRIPTOR MANIPULATION ROUTINES *******************/
@@ -503,12 +514,14 @@ static struct tmem_page_descriptor *pgp_alloc(struct tmem_object_root *obj)
INIT_LIST_HEAD(&pgp->global_eph_pages);
INIT_LIST_HEAD(&pgp->us.client_eph_pages);
pgp->pfp = NULL;
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled() )
{
pgp->firstbyte = NOT_SHAREABLE;
pgp->eviction_attempted = 0;
INIT_LIST_HEAD(&pgp->pcd_siblings);
}
+#endif
pgp->size = -1;
pgp->index = -1;
pgp->timestamp = get_cycles();
@@ -533,9 +546,12 @@ static void pgp_free_data(struct tmem_page_descriptor *pgp, struct tmem_pool *po
if ( pgp->pfp == NULL )
return;
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE )
pcd_disassociate(pgp,pool,0); /* pgp->size lost. */
- else if ( pgp_size )
+ else
+#endif
+ if ( pgp_size )
tmem_free(pgp->cdata, pool);
else
tmem_free_page(pgp->us.obj->pool,pgp->pfp);
@@ -1085,6 +1101,8 @@ static struct client *client_create(domid_t cli_id)
client->cli_id = cli_id;
client->compress = tmem_compression_enabled();
+#ifdef CONFIG_TMEM_DEDUP
+#endif
client->shared_auth_required = tmem_shared_auth();
for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++)
client->shared_auth_uuid[i][0] =
@@ -1141,13 +1159,16 @@ static bool_t tmem_try_to_evict_pgp(struct tmem_page_descriptor *pgp, bool_t *ho
{
struct tmem_object_root *obj = pgp->us.obj;
struct tmem_pool *pool = obj->pool;
+#ifdef CONFIG_TMEM_DEDUP
struct client *client = pool->client;
uint16_t firstbyte = pgp->firstbyte;
+#endif
if ( pool->is_dying )
return 0;
if ( spin_trylock(&obj->obj_spinlock) )
{
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled() )
{
firstbyte = pgp->firstbyte;
@@ -1166,6 +1187,7 @@ static bool_t tmem_try_to_evict_pgp(struct tmem_page_descriptor *pgp, bool_t *ho
goto pcd_unlock;
}
}
+#endif
if ( obj->pgp_count > 1 )
return 1;
if ( write_trylock(&pool->pool_rwlock) )
@@ -1173,10 +1195,12 @@ static bool_t tmem_try_to_evict_pgp(struct tmem_page_descriptor *pgp, bool_t *ho
*hold_pool_rwlock = 1;
return 1;
}
+#ifdef CONFIG_TMEM_DEDUP
pcd_unlock:
if ( tmem_dedup_enabled() )
write_unlock(&pcd_tree_rwlocks[firstbyte]);
obj_unlock:
+#endif
spin_unlock(&obj->obj_spinlock);
}
return 0;
@@ -1232,11 +1256,13 @@ found:
ASSERT_SPINLOCK(&obj->obj_spinlock);
pgp_del = pgp_delete_from_obj(obj, pgp->index);
ASSERT(pgp_del == pgp);
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE )
{
ASSERT(pgp->pcd->pgp_ref_count == 1 || pgp->eviction_attempted);
pcd_disassociate(pgp,pool,1);
}
+#endif
/* pgp already delist, so call pgp_free directly. */
pgp_free(pgp);
@@ -1303,9 +1329,11 @@ static int do_tmem_put_compress(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn
else if ( (size == 0) || (size >= tmem_mempool_maxalloc) ) {
ret = 0;
goto out;
+#ifdef CONFIG_TMEM_DEDUP
} else if ( tmem_dedup_enabled() && !is_persistent(pgp->us.obj->pool) ) {
if ( (ret = pcd_associate(pgp,dst,size)) == -ENOMEM )
goto out;
+#endif
} else if ( (p = tmem_malloc(size,pgp->us.obj->pool)) == NULL ) {
ret = -ENOMEM;
goto out;
@@ -1365,11 +1393,13 @@ copy_uncompressed:
ret = tmem_copy_from_client(pgp->pfp, cmfn, tmem_cli_buf_null);
if ( ret < 0 )
goto bad_copy;
+#ifdef CONFIG_PAGE_DEDUP
if ( tmem_dedup_enabled() && !is_persistent(pool) )
{
if ( pcd_associate(pgp,NULL,0) == -ENOMEM )
goto failed_dup;
}
+#endif
done:
/* Successfully replaced data, clean up and return success. */
@@ -1506,6 +1536,7 @@ copy_uncompressed:
if ( ret < 0 )
goto bad_copy;
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled() && !is_persistent(pool) )
{
if ( pcd_associate(pgp, NULL, 0) == -ENOMEM )
@@ -1514,6 +1545,7 @@ copy_uncompressed:
goto del_pgp_from_obj;
}
}
+#endif
insert_page:
if ( !is_persistent(pool) )
@@ -1601,10 +1633,13 @@ static int do_tmem_get(struct tmem_pool *pool,
return 0;
}
ASSERT(pgp->size != -1);
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled() && !is_persistent(pool) &&
pgp->firstbyte != NOT_SHAREABLE )
rc = pcd_copy_to_client(cmfn, pgp);
- else if ( pgp->size != 0 )
+ else
+#endif
+ if ( pgp->size != 0 )
{
rc = tmem_decompress_to_client(cmfn, pgp->cdata, pgp->size, clibuf);
}
@@ -2362,29 +2397,41 @@ unsigned long tmem_freeable_pages(void)
/* Called at hypervisor startup. */
static int __init init_tmem(void)
{
- int i;
if ( !tmem_enabled() )
return 0;
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled() )
+ {
+ unsigned int i;
+
for (i = 0; i < 256; i++ )
{
pcd_tree_roots[i] = RB_ROOT;
rwlock_init(&pcd_tree_rwlocks[i]);
}
-
+ }
+#endif
if ( !tmem_mempool_init() )
return 0;
if ( tmem_init() )
{
printk("tmem: initialized comp=%d dedup=%d tze=%d\n",
- tmem_compression_enabled(), tmem_dedup_enabled(), tmem_tze_enabled());
+ tmem_compression_enabled(),
+#ifdef CONFIG_TMEM_DEDUP
+ tmem_dedup_enabled(),
+#else
+ 0,
+#endif
+ tmem_tze_enabled());
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled()&&tmem_compression_enabled()&&tmem_tze_enabled() )
{
tmem_tze_disable();
printk("tmem: tze and compression not compatible, disabling tze\n");
}
+#endif
tmem_initialized = 1;
}
else
diff --git a/xen/common/tmem_control.c b/xen/common/tmem_control.c
index ca34852..565e50b 100644
--- a/xen/common/tmem_control.c
+++ b/xen/common/tmem_control.c
@@ -274,6 +274,7 @@ static int __tmemc_set_var(struct client *client, uint32_t subop, uint32_t arg1)
atomic_add(client->weight,&tmem_global.client_weight_total);
break;
case XEN_SYSCTL_TMEM_OP_SET_COMPRESS:
+#ifdef CONFIG_TMEM_DEDUP
if ( tmem_dedup_enabled() )
{
tmem_client_warn("tmem: compression %s for all %ss, cannot be changed when tmem_dedup is enabled\n",
@@ -281,6 +282,7 @@ static int __tmemc_set_var(struct client *client, uint32_t subop, uint32_t arg1)
tmem_client_str);
return -1;
}
+#endif
client->compress = arg1 ? 1 : 0;
tmem_client_info("tmem: compression %s for %s=%d\n",
arg1 ? "enabled" : "disabled",tmem_cli_id_str,cli_id);
diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c
index 71cb7d5..9a2bfed 100644
--- a/xen/common/tmem_xen.c
+++ b/xen/common/tmem_xen.c
@@ -20,8 +20,10 @@ boolean_param("tmem", opt_tmem);
bool_t __read_mostly opt_tmem_compress = 0;
boolean_param("tmem_compress", opt_tmem_compress);
+#ifdef CONFIG_TMEM_DEDUP
bool_t __read_mostly opt_tmem_dedup = 0;
boolean_param("tmem_dedup", opt_tmem_dedup);
+#endif
bool_t __read_mostly opt_tmem_tze = 0;
boolean_param("tmem_tze", opt_tmem_tze);
diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h
index 582951a..52f87b1 100644
--- a/xen/include/xen/tmem_xen.h
+++ b/xen/include/xen/tmem_xen.h
@@ -41,11 +41,13 @@ static inline bool_t tmem_compression_enabled(void)
return opt_tmem_compress;
}
+#ifdef CONFIG_TMEM_DEDUP
extern bool_t opt_tmem_dedup;
static inline bool_t tmem_dedup_enabled(void)
{
return opt_tmem_dedup;
}
+#endif
extern bool_t opt_tmem_tze;
static inline bool_t tmem_tze_enabled(void)
@@ -192,6 +194,7 @@ static inline struct client *tmem_client_from_cli_id(domid_t cli_id)
return c;
}
+#ifdef CONFIG_TMEM_DEDUP
static inline uint8_t tmem_get_first_byte(struct page_info *pfp)
{
const uint8_t *p = __map_domain_page(pfp);
@@ -288,6 +291,7 @@ static inline void tmem_tze_copy_from_pfp(void *tva, struct page_info *pfp, page
unmap_domain_page(p);
}
+#endif
/* these typedefs are in the public/tmem.h interface
typedef XEN_GUEST_HANDLE(void) cli_mfn_t;
--
2.4.11
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-09-28 9:42 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-28 9:42 [PATCH v1] Tmem cleanups/improvements for v4.8 Konrad Rzeszutek Wilk
2016-09-28 9:42 ` [PATCH v1 01/12] libxc/tmem/restore: Remove call to XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION Konrad Rzeszutek Wilk
2016-09-28 11:00 ` Wei Liu
2016-09-28 9:42 ` [PATCH v1 02/12] tmem: Retire XEN_SYSCTL_TMEM_OP_[SET_CAP|SAVE_GET_CLIENT_CAP] Konrad Rzeszutek Wilk
2016-09-28 11:00 ` Wei Liu
2016-09-28 15:03 ` Konrad Rzeszutek Wilk
2016-09-28 12:10 ` Jan Beulich
2016-09-30 14:04 ` Konrad Rzeszutek Wilk
2016-09-28 9:42 ` Konrad Rzeszutek Wilk [this message]
2016-09-28 12:18 ` [PATCH v1 03/12] tmem: Wrap tmem dedup code with CONFIG_TMEM_DEDUP Jan Beulich
2016-09-28 9:42 ` [PATCH v1 04/12] tmem: Wrap tmem tze code with CONFIG_TMEM_TZE Konrad Rzeszutek Wilk
2016-09-28 12:19 ` Jan Beulich
2016-09-28 9:42 ` [PATCH v1 05/12] tmem: Delete deduplication (and tze) code Konrad Rzeszutek Wilk
2016-09-28 12:34 ` Jan Beulich
2016-09-28 15:05 ` Konrad Rzeszutek Wilk
2016-09-28 9:42 ` [PATCH v1 06/12] tmem: Move client weight, frozen, live_migrating, and compress Konrad Rzeszutek Wilk
2016-09-28 12:39 ` Jan Beulich
2016-09-28 9:42 ` [PATCH v1 07/12] tmem/libxc: Squash XEN_SYSCTL_TMEM_OP_[SET|SAVE] Konrad Rzeszutek Wilk
2016-09-28 11:06 ` Wei Liu
2016-09-28 12:50 ` Jan Beulich
2016-09-28 9:42 ` [PATCH v1 08/12] tmem: Handle 'struct tmem_info' as a seperate field in the Konrad Rzeszutek Wilk
2016-09-28 11:00 ` Wei Liu
2016-09-28 12:56 ` Jan Beulich
2016-09-30 14:36 ` Konrad Rzeszutek Wilk
2016-09-30 14:56 ` Jan Beulich
2016-09-30 16:51 ` Konrad Rzeszutek Wilk
2016-09-28 9:42 ` [PATCH v1 09/12] tmem: Check version and maxpools when XEN_SYSCTL_TMEM_SET_CLIENT_INFO Konrad Rzeszutek Wilk
2016-09-28 11:00 ` Wei Liu
2016-09-28 12:58 ` Jan Beulich
2016-09-28 9:42 ` [PATCH v1 10/12] tmem: Unify XEN_SYSCTL_TMEM_OP_[[SAVE_[BEGIN|END]|RESTORE_BEGIN] Konrad Rzeszutek Wilk
2016-09-28 11:06 ` Wei Liu
2016-09-28 13:00 ` Jan Beulich
2016-09-28 9:42 ` [PATCH v1 11/12] tmem/xc_tmem_control: Rename 'arg1' to 'len' and 'arg2' to arg Konrad Rzeszutek Wilk
2016-09-28 11:07 ` Wei Liu
2016-09-28 9:42 ` [PATCH v1 12/12] tmem: Batch and squash XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_[FLAGS, NPAGES, UUID] in one sub-call: XEN_SYSCTL_TMEM_OP_GET_POOLS Konrad Rzeszutek Wilk
2016-09-28 11:07 ` Wei Liu
2016-09-28 13:11 ` Jan Beulich
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=1475055746-22401-4-git-send-email-konrad.wilk@oracle.com \
--to=konrad.wilk@oracle.com \
--cc=konrad@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/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;
as well as URLs for NNTP newsgroup(s).