tools/xenstore: do some cleanup and fixes
v3 cover tools/xenstore: do some cleanup and fixes
This is a first run of post-XSA patches which piled up during the development phase of all the recent Xenstore related XSA patches.
At least the first 5 patches are completely independent from each other. After those the dependencies are starting to be more complex.
This is a mixture of small fixes, enhancements and cleanups.
Changes in V3:
- patches 2, 3, and 5 of V2 have been applied already
- new patch 12
- addressed comments
Changes in V2:
- patches 1+2 of V1 have been applied already
- addressed comments
- new patch 19
Juergen Gross (17):
tools/xenstore: let talloc_free() preserve errno tools/xenstore: remove all watches when a domain has stopped tools/xenstore: add hashlist for finding struct domain by domid tools/xenstore: introduce dummy nodes for special watch paths tools/xenstore: replace watch->relative_path with a prefix length tools/xenstore: move changed domain handling tools/xenstore: change per-domain node accounting interface tools/xenstore: don't allow creating too many nodes in a transaction tools/xenstore: replace literal domid 0 with dom0_domid tools/xenstore: make domain_is_unprivileged() an inline function tools/xenstore: let chk_domain_generation() return a bool tools/xenstore: don't let hashtable_remove() return the removed value tools/xenstore: switch hashtable to use the talloc framework tools/xenstore: make log macro globally available tools/xenstore: introduce trace classes
tools/xenstore: let check_store() check the accounting data tools/xenstore: make output of "xenstore-control help" more pretty
docs/misc/xenstore.txt | 10 +- tools/xenstore/hashtable.c | 104 ++--- tools/xenstore/hashtable.h | 7 +- tools/xenstore/talloc.c | 21 +- tools/xenstore/xenstored_control.c | 36 +- tools/xenstore/xenstored_core.c | 266 +++++++---- tools/xenstore/xenstored_core.h | 31 ++ tools/xenstore/xenstored_domain.c | 620 +++++++++++++------------ tools/xenstore/xenstored_domain.h | 21 +- tools/xenstore/xenstored_transaction.c | 76 +-- tools/xenstore/xenstored_transaction.h | 7 +- tools/xenstore/xenstored_watch.c | 36 +- 12 files changed, 652 insertions(+), 583 deletions(-)
Signature · 1 line
2.35.3
PATCH v3 1/17 tools/xenstore: let talloc_free() preserve errno
Today talloc_free() is not guaranteed to preserve errno, especially in case a custom destructor is being used.
So preserve errno in talloc_free().
This allows to remove some errno saving outside of talloc.c.
---
V2:
- drop wrapper (Julien Grall)
--- tools/xenstore/talloc.c | 21 +++++++++++++-------- tools/xenstore/xenstored_core.c | 2 -- 2 files changed, 13 insertions(+), 10 deletions(-)
tools/xenstore/talloc.c +13 -8
@@ -541,38 +541,39 @@ static void talloc_free_children(void *ptr)*/ int talloc_free (void *ptr) { +int saved_errno = errno;struct talloc_chunk *tc;if (ptr ==NULL ) { -return -1 ; + goto err; } tc =talloc_chunk_from_ptr (ptr);if (tc->null_refs) { tc->null_refs--; -return -1 ; + goto err; }if (tc->refs) {talloc_reference_destructor (tc->refs); -return -1 ; + goto err; }if (tc->flags &TALLOC_FLAG_LOOP ) {/* we have a free loop - stop looping */ -return 0 ; + goto success; }if (tc->destructor) {talloc_destructor_t d = tc->destructor;if (d == (talloc_destructor_t)-1 ) { -return -1 ; + goto err; } tc->destructor = (talloc_destructor_t)-1 ;if (d (ptr) ==-1 ) { tc->destructor = d; -return -1 ; + goto err; } tc->destructor =NULL ; }
@@ -594,10 +595,14 @@ int talloc_free(void *ptr) tc->flags |=TALLOC_FLAG_FREE ;free (tc); + success: + errno = saved_errno;return 0 ; -} - + err: + errno = saved_errno; +return -1 ; +}/* A talloc version of realloc. The context argument is only used if
tools/xenstore/xenstored_core.c +0 -2
@@ -771,9 +771,7 @@ struct node *read_node(struct connection *conn, const void *ctx,return node; error: - err = errno;talloc_free (node); - errno = err;return NULL ; }
Signature · 1 line
2.35.3
Re: [PATCH v3 01/17] tools/xenstore: let talloc_free() preserve errno
Hi Juergen,
Quoted 8 lines · Juergen Gross
Today
talloc_free()is not guaranteed to preserve errno, especially in case a custom destructor is being used.So preserve errno in
talloc_free().This allows to remove some errno saving outside of
talloc.c.Signed-off-by Juergen Gross <[email protected]>
Cheers,
Quoted 89 lines
---
V2:
- drop wrapper (Julien Grall)--- tools/xenstore/talloc.c | 21 +++++++++++++-------- tools/xenstore/xenstored_core.c | 2 -- 2 files changed, 13 insertions(+), 10 deletions(-)tools/xenstore/talloc.c +13
-8@@ -541,38 +541,39 @@ static void talloc_free_children(void *ptr)*/ int talloc_free (void *ptr) { +int saved_errno = errno;struct talloc_chunk *tc;if (ptr ==NULL ) { -return -1 ; + goto err; } tc =talloc_chunk_from_ptr (ptr);if (tc->null_refs) { tc->null_refs--; -return -1 ; + goto err; }if (tc->refs) {talloc_reference_destructor (tc->refs); -return -1 ; + goto err; }if (tc->flags &TALLOC_FLAG_LOOP ) {/* we have a free loop - stop looping */ -return 0 ; + goto success; }if (tc->destructor) {talloc_destructor_t d = tc->destructor;if (d == (talloc_destructor_t)-1 ) { -return -1 ; + goto err; } tc->destructor = (talloc_destructor_t)-1 ;if (d (ptr) ==-1 ) { tc->destructor = d; -return -1 ; + goto err; } tc->destructor =NULL ; }@@ -594,10 +595,14 @@ int talloc_free(void *ptr) tc->flags |=TALLOC_FLAG_FREE ;free (tc); + success: + errno = saved_errno;return 0 ; -} - + err: + errno = saved_errno; +return -1 ; +}/* A talloc version of realloc. The context argument is only used if tools/xenstore/xenstored_core.c +0
-2@@ -771,9 +771,7 @@ struct node *read_node(struct connection *conn, const void *ctx,return node; error: - err = errno;talloc_free (node); - errno = err;return NULL ; }
Signature · 1 line
Julien Grall
PATCH v3 2/17 tools/xenstore: remove all watches when a domain has stopped
In reply to Juergen GrossWhen a domain has been released by Xen tools, remove all its registered watches. This avoids sending watch events to the dead domain when all the nodes related to it are being removed by the Xen tools.
---
V2:
- move call to do_release() (Julien Grall)
--- tools/xenstore/xenstored_domain.c | 3 +++ 1 file changed, 3 insertions(+)
tools/xenstore/xenstored_domain.c +3 -0
@@ -740,6 +740,9 @@ int do_release(const void *ctx, struct connection *conn,if (IS_ERR (domain))return -PTR_ERR (domain); +/* Avoid triggering watch events when the domain's nodes are deleted. */ +conn_delete_all_watches (domain->conn); +talloc_free (domain->conn);send_ack (conn,XS_RELEASE );
Signature · 1 line
2.35.3
PATCH v3 3/17 tools/xenstore: add hashlist for finding struct domain by domid
In reply to Juergen GrossToday finding a struct domain by its domain id requires to scan the list of domains until finding the correct domid.
Add a hashlist for being able to speed this up. This allows to remove the linking of struct domain in a list. Note that the list of changed domains per transaction is kept as a list, as there are no known use cases with more than 4 domains being touched in a single transaction (this would be a device handled by a driver domain and being assigned to a HVM domain with device model in a stubdom, plus the control domain).
Some simple performance tests comparing the scanning and hashlist have shown that the hashlist will win as soon as more than 6 entries need to be scanned.
---
V2:
- add comment, fix return value of check_domain() (Julien Grall)
--- tools/xenstore/xenstored_domain.c | 102 ++++++++++++++++++------------ 1 file changed, 60 insertions(+), 42 deletions(-)
tools/xenstore/xenstored_domain.c +60 -42
@@ -48,8 +48,6 @@ static struct node_perms dom_introduce_perms;struct domain { -struct list_head list; -/* The id of this domain */ unsigned int domid;
@@ -96,7 +94,7 @@ struct domainbool wrl_delay_logged; }; -static LIST_HEAD (domains); +static struct hashtable *domhash;static bool check_indexes (XENSTORE_RING_IDX cons,XENSTORE_RING_IDX prod) {
@@ -309,7 +307,7 @@ static int destroy_domain(void *_domain)domain_tree_remove (domain); -list_del (&domain->list); +hashtable_remove (domhash, &domain->domid);if (!domain->introduced)return 0 ;
@@ -341,43 +339,50 @@ static bool get_domain_info(unsigned int domid, xc_dominfo_t *dominfo) dominfo->domid == domid; } -void check_domains (void ) +static int check_domain (const void *k,void *v,void *arg) {xc_dominfo_t dominfo; -struct domain *domain;struct connection *conn; -int notify =0 ;bool dom_valid; +struct domain *domain = v; +bool *notify = arg; - again: -list_for_each_entry (domain, &domains, list) { - dom_valid =get_domain_info (domain->domid, &dominfo); -if (!domain->introduced) { -if (!dom_valid) { -talloc_free (domain); - goto again; - } -continue ; - } -if (dom_valid) { -if ((dominfo.crashed || dominfo.shutdown) - && !domain->shutdown) { - domain->shutdown = true; - notify =1 ; - } -if (!dominfo.dying) -continue ; - } -if (domain->conn) { -/* domain is a talloc child of domain->conn. */ - conn = domain->conn; - domain->conn =NULL ; -talloc_unlink (talloc_autofree_context (), conn); - notify =0 ;/* destroy_domain() fires the watch */ - goto again; + dom_valid =get_domain_info (domain->domid, &dominfo); +if (!domain->introduced) { +if (!dom_valid) +talloc_free (domain); +return 0 ; + } +if (dom_valid) { +if ((dominfo.crashed || dominfo.shutdown) + && !domain->shutdown) { + domain->shutdown = true; + *notify = true; } +if (!dominfo.dying) +return 0 ; + } +if (domain->conn) { +/* domain is a talloc child of domain->conn. */ + conn = domain->conn; + domain->conn =NULL ; +talloc_unlink (talloc_autofree_context (), conn); + *notify = false;/* destroy_domain() fires the watch */ + +/* Above unlink might result in 2 domains being freed! */ +return 1 ; } +return 0 ; +} + +void check_domains (void ) +{ +bool notify = false; + +while (hashtable_iterate (domhash, check_domain, ¬ify)) + ; +if (notify)fire_watches (NULL ,NULL ,"@releaseDomain" ,NULL , true,NULL ); }
@@ -415,13 +420,7 @@ static char *talloc_domain_path(const void *context, unsigned int domid)static struct domain *find_domain_struct (unsigned int domid) { -struct domain *i; - -list_for_each_entry (i, &domains, list) { -if (i->domid == domid) -return i; - } -return NULL ; +return hashtable_search (domhash, &domid); } int domain_get_quota(const void *ctx, struct connection *conn,
@@ -470,9 +469,13 @@ static struct domain *alloc_domain(const void *context, unsigned int domid) domain->generation = generation; domain->introduced = false; -talloc_set_destructor (domain, destroy_domain); +if (!hashtable_insert (domhash, &domain->domid, domain)) { +talloc_free (domain); + errno =ENOMEM ; +return NULL ; + } -list_add (&domain->list, &domains); +talloc_set_destructor (domain, destroy_domain);return domain; }
@@ -906,10 +909,25 @@ void dom0_init(void)xenevtchn_notify (xce_handle, dom0->port); } +static unsigned int domhash_fn (void *k) +{ +return *(unsigned int *)k; +} + +static int domeq_fn (void *key1,void *key2) +{ +return *(unsigned int *)key1 == *(unsigned int *)key2; +} +void domain_init (int evtfd) {int rc; +/* Start with a random rather low domain count for the hashtable. */ + domhash =create_hashtable (8 , domhash_fn, domeq_fn,0 ); +if (!domhash) +barf_perror ("Failed to allocate domain hashtable" ); + xc_handle = talloc(talloc_autofree_context(), xc_interface*);if (!xc_handle)barf_perror ("Failed to allocate domain handle" );
Signature · 1 line
2.35.3
PATCH v3 4/17 tools/xenstore: introduce dummy nodes for special watch paths
In reply to Juergen GrossInstead of special casing the permission handling and watch event firing for the special watch paths "@introduceDomain" and "@releaseDomain", use static dummy nodes added to the data base when starting Xenstore.
The node accounting needs to reflect that change by adding the special nodes in the domain_entry_fix() call in setup_structure().
Note that this requires to rework the calls of fire_watches() for the special events in order to avoid leaking memory.
Move the check for a valid node name from get_node() to get_node_canonicalized(), as it allows to use get_node() for the special nodes, too.
In order to avoid read and write accesses to the special nodes use a special variant for obtaining the current node data for the permission handling.
This allows to simplify quite some code. In future sub-nodes of the special nodes will be possible due to this change, allowing more fine grained permission control of special events for specific domains.
---
V2:
- add get_spec_node()
- expand commit message (Julien Grall)
V3:
- modify get_acc_domid() comment (Julien Grall)
- log error in fire_special_watches() (Julien Grall)
--- tools/xenstore/xenstored_control.c | 3 - tools/xenstore/xenstored_core.c | 94 ++++++++++------- tools/xenstore/xenstored_domain.c | 164 ++++------------------------- tools/xenstore/xenstored_domain.h | 6 -- tools/xenstore/xenstored_watch.c | 17 +-- 5 files changed, 83 insertions(+), 201 deletions(-)
tools/xenstore/xenstored_control.c +0 -3
@@ -676,9 +676,6 @@ static const char *lu_dump_state(const void *ctx, struct connection *conn)if (ret) goto out; ret =dump_state_connections (fp); -if (ret) - goto out; - ret =dump_state_special_nodes (fp);if (ret) goto out; ret =dump_state_nodes (fp, ctx);
tools/xenstore/xenstored_core.c +58 -36
158 lines not on this page · raw message
tools/xenstore/xenstored_domain.c +23 -141
218 lines not on this page · raw message
tools/xenstore/xenstored_domain.h +0 -6
@@ -99,11 +99,6 @@ void domain_outstanding_domid_dec(unsigned int domid);int domain_get_quota (const void *ctx,struct connection *conn,unsigned int domid); -/* Special node permission handling. */ -int set_perms_special (struct connection *conn,const char *name, -struct node_perms *perms); -bool check_perms_special (const char *name,struct connection *conn); -/* Write rate limiting */ #define WRL_FACTOR 1000/* for fixed-point arithmetic */
@@ -132,7 +127,6 @@ void wrl_apply_debit_direct(struct connection *conn);void wrl_apply_debit_trans_commit (struct connection *conn);const char *dump_state_connections (FILE *fp); -const char *dump_state_special_nodes (FILE *fp);void read_state_connection (const void *ctx,const void *state);
tools/xenstore/xenstored_watch.c +2 -15
@@ -46,13 +46,6 @@ struct watchchar *node; }; -static bool check_special_event (const char *name) -{ -assert (name); - -return strstarts (name,"@" ); -} -/* Is child a subnode of parent, or equal? */ static bool is_child (const char *child,const char *parent) {
@@ -153,14 +146,8 @@ void fire_watches(struct connection *conn, const void *ctx, const char *name,/* Create an event for each watch. */ list_for_each_entry (i, &connections, list) { -/* introduce/release domain watches */ -if (check_special_event (name)) { -if (!check_perms_special (name, i)) -continue ; - }else { -if (!watch_permitted (i, ctx, name, node, perms)) -continue ; - } +if (!watch_permitted (i, ctx, name, node, perms)) +continue ;list_for_each_entry (watch, &i->watches, list) {if (exact) {
Signature · 1 line
2.35.3
Re: [PATCH v3 04/17] tools/xenstore: introduce dummy nodes for special watch paths
Hi Juergen,
Quoted 4 lines · Juergen Gross
tools/xenstore/xenstored_domain.c +4
-0+static void fire_special_watches (const char *name) +{ +void *ctx =talloc_new (NULL ); +struct node *node;
tools/xenstore/xenstored_domain.c static void domain_tree_remove(struct domain *domain) · line 293
Quoted 10 lines
tools/xenstore/xenstored_domain.c +10
-0+ +if (!ctx) +return ; + + node =read_node (NULL , ctx, name); + +if (node) +fire_watches (NULL , ctx, name, node, true,NULL ); +else +syslog (LOG_ERR ,"special node %s not found\n" , name);
NIT: How about using log() so it is also printed in the trace log? This would be handy to avoid having to check multiple log files.
With or without:
Cheers,
Signature · 1 line
Julien Grall
Re: [PATCH v3 04/17] tools/xenstore: introduce dummy nodes for special watch paths
Quoted 19 lines · Julien Grall
Hi Juergen,
Quoted 4 lines · Juergen Gross
tools/xenstore/xenstored_domain.c +4
-0+static void fire_special_watches (const char *name) +{ + void *ctx = talloc_new(NULL); + struct node *node;tools/xenstore/xenstored_domain.c static void domain_tree_remove(struct domain *domain) · line 293
Quoted 10 lines
tools/xenstore/xenstored_domain.c +10
-0+ + if (!ctx) + return; + + node = read_node(NULL, ctx, name); + + if (node) + fire_watches(NULL, ctx, name, node, true, NULL); + else + syslog(LOG_ERR, "special node %s not found\n", name);NIT: How about using
log()so it is also printed in the trace log? This would be handy to avoid having to check multiple log files.
This would require to move patch 14 in front of this one.
I think this is possible without problems.
Quoted 4 lines
With or without:
Reviewed-by Julien Grall <[email protected]>
Thanks,
Juergen
PATCH v3 5/17 tools/xenstore: replace watch->relative_path with a prefix length
In reply to Juergen GrossInstead of storing a pointer to the path which is prepended to relative paths in struct watch, just use the length of the prepended path.
It should be noted that the now removed special case of the relative path being "" in get_watch_path() can't happen at all.
---
V2:
- don't open code get_watch_path() (Julien Grall)
V3:
- drop needless modification of dump_state_watches() (Julien Grall)
--- tools/xenstore/xenstored_watch.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
tools/xenstore/xenstored_watch.c +4 -15
@@ -39,8 +39,8 @@ struct watch/* Current outstanding events applying to this watch. */ struct list_head events; -/* Is this relative to connnection's implicit path? */ -const char *relative_path; +/* Offset into path for skipping prefix (used for relative paths). */ +unsigned int prefix_len;char *token;char *node;
@@ -66,15 +66,7 @@ static bool is_child(const char *child, const char *parent)static const char *get_watch_path (const struct watch *watch,const char *name) { -const char *path = name; - -if (watch->relative_path) { - path +=strlen (watch->relative_path); -if (*path =='/' )/* Could be "" */ - path++; - } - -return path; +return name + watch->prefix_len; }/*
@@ -211,10 +203,7 @@ static struct watch *add_watch(struct connection *conn, char *path, char *token, no_quota_check)) goto nomem; -if (relative) - watch->relative_path =get_implicit_path (conn); -else - watch->relative_path =NULL ; + watch->prefix_len = relative ?strlen (get_implicit_path (conn)) +1 :0 ;INIT_LIST_HEAD (&watch->events);
Signature · 1 line
2.35.3
Re: [PATCH v3 05/17] tools/xenstore: replace watch->relative_path with a prefix length
Hi Juergen,
Quoted 8 lines · Juergen Gross
Instead of storing a pointer to the path which is prepended to relative paths in struct watch, just use the length of the prepended path.
It should be noted that the now removed special case of the relative path being "" in
get_watch_path()can't happen at all.Signed-off-by Juergen Gross <[email protected]>
Cheers,
Signature · 1 line
Julien Grall
PATCH v3 6/17 tools/xenstore: move changed domain handling
In reply to Juergen GrossMove all code related to struct changed_domain from xenstored_transaction.c to xenstored_domain.c.
This will be needed later in order to simplify the accounting data updates in cases of errors during a request.
Split the code to have a more generic base framework.
---
V2:
- remove unrelated change (Julien Grall)
V3:
- modify acc_add_dom_nbentry() interface (Julien Grall)
--- tools/xenstore/xenstored_domain.c | 78 ++++++++++++++++++++++++++ tools/xenstore/xenstored_domain.h | 3 + tools/xenstore/xenstored_transaction.c | 64 ++------------------- 3 files changed, 85 insertions(+), 60 deletions(-)
tools/xenstore/xenstored_domain.c +78 -0
@@ -91,6 +91,18 @@ struct domainbool wrl_delay_logged; }; +struct changed_domain +{ +/* List of all changed domains. */ +struct list_head list; + +/* Identifier of the changed domain. */ +unsigned int domid; + +/* Amount by which this domain's nbentry field has changed. */ +int nbentry; +}; +static struct hashtable *domhash;static bool check_indexes (XENSTORE_RING_IDX cons,XENSTORE_RING_IDX prod)
@@ -543,6 +555,72 @@ static struct domain *find_domain_by_domid(unsigned int domid)return (d && d->introduced) ? d :NULL ; } +int acc_fix_domains (struct list_head *head,bool update) +{ +struct changed_domain *cd; +int cnt; + +list_for_each_entry (cd, head, list) { + cnt =domain_entry_fix (cd->domid, cd->nbentry, update); +if (!update) { +if (cnt >= quota_nb_entry_per_domain) +return ENOSPC ; +if (cnt <0 ) +return ENOMEM ; + } + } + +return 0 ; +} + +static struct changed_domain *acc_find_changed_domain (struct list_head *head, +unsigned int domid) +{ +struct changed_domain *cd; + +list_for_each_entry (cd, head, list) { +if (cd->domid == domid) +return cd; + } + +return NULL ; +} + +static struct changed_domain *acc_get_changed_domain (const void *ctx, +struct list_head *head, +unsigned int domid) +{ +struct changed_domain *cd; + + cd =acc_find_changed_domain (head, domid); +if (cd) +return cd; + + cd = talloc_zero(ctx, struct changed_domain); +if (!cd) +return NULL ; + + cd->domid = domid; +list_add_tail (&cd->list, head); + +return cd; +} + +int acc_add_dom_nbentry (const void *ctx,struct list_head *head,int val, +unsigned int domid) +{ +struct changed_domain *cd; + + cd =acc_get_changed_domain (ctx, head, domid); +if (!cd) +return 0 ; + + errno =0 ; + cd->nbentry += val; + +return cd->nbentry; +} +static void domain_conn_reset (struct domain *domain) {struct connection *conn = domain->conn;
tools/xenstore/xenstored_domain.h +3 -0
@@ -98,6 +98,9 @@ void domain_outstanding_dec(struct connection *conn);void domain_outstanding_domid_dec (unsigned int domid);int domain_get_quota (const void *ctx,struct connection *conn,unsigned int domid); +int acc_fix_domains (struct list_head *head,bool update); +int acc_add_dom_nbentry (const void *ctx,struct list_head *head,int val, +unsigned int domid);/* Write rate limiting */
tools/xenstore/xenstored_transaction.c +4 -60
104 lines not on this page · raw message
Signature · 1 line
2.35.3
Re: [PATCH v3 06/17] tools/xenstore: move changed domain handling
Hi Juergen,
Quoted 9 lines · Juergen Gross
Move all code related to struct
changed_domainfromxenstored_transaction.ctoxenstored_domain.c.This will be needed later in order to simplify the accounting data updates in cases of errors during a request.
Split the code to have a more generic base framework.
Signed-off-by Juergen Gross <[email protected]>
Cheers,
Signature · 1 line
Julien Grall
PATCH v3 7/17 tools/xenstore: change per-domain node accounting interface
In reply to Juergen GrossRework the interface and the internals of the per-domain node accounting:
- rename the functions to domain_nbentry_*() in order to better match the related counter name
- switch from node pointer to domid as interface, as all nodes have the owner filled in
- use a common internal function for adding a value to the counter
For the transaction case add a helper function to get the list head of the per-transaction changed domains, enabling to eliminate the transaction_entry_*() functions.
---
V3:
- add get_node_owner() (Julien Grall)
- rename domain_nbentry_add() parameter (Julien Grall)
- avoid negative entry count (Julien Grall)
--- tools/xenstore/xenstored_core.c | 33 ++++--- tools/xenstore/xenstored_domain.c | 126 ++++++++++++------------- tools/xenstore/xenstored_domain.h | 10 +- tools/xenstore/xenstored_transaction.c | 15 +-- tools/xenstore/xenstored_transaction.h | 7 +- 5 files changed, 86 insertions(+), 105 deletions(-)
tools/xenstore/xenstored_core.c +19 -14
@@ -700,6 +700,11 @@ int do_tdb_delete(struct connection *conn, TDB_DATA *key,return 0 ; } +static unsigned int get_node_owner (const struct node *node) +{ +return node->perms.p[0 ].id; +} +/* * If it fails, returns NULL and sets errno. * Temporary memory allocations will be done with ctx.
@@ -752,13 +757,13 @@ struct node *read_node(struct connection *conn, const void *ctx,/* Permissions are struct xs_permissions. */ node->perms.p = hdr->perms; - node->acc.domid = node->perms.p[0 ].id; + node->acc.domid =get_node_owner (node); node->acc.memory = data.dsize;if (domain_adjust_node_perms (node)) goto error;/* If owner is gone reset currently accounted memory size. */ -if (node->acc.domid != node->perms.p[0 ].id) +if (node->acc.domid !=get_node_owner (node)) node->acc.memory =0 ;/* Data is binary blob (usually ascii, no nul). */
@@ -1459,7 +1464,7 @@ static void destroy_node_rm(struct connection *conn, struct node *node)static int destroy_node (struct connection *conn,struct node *node) {destroy_node_rm (conn, node); -domain_entry_dec (conn, node); +domain_nbentry_dec (conn,get_node_owner (node));/* * It is not possible to easily revert the changes in a transaction.
@@ -1498,7 +1503,7 @@ static struct node *create_node(struct connection *conn, const void *ctx,for (i = node; i; i = i->parent) {/* i->parent is set for each new node, so check quota. */ if (i->parent && -domain_entry (conn) >= quota_nb_entry_per_domain) { +domain_nbentry (conn) >= quota_nb_entry_per_domain) { ret =ENOSPC ; goto err; }
@@ -1509,7 +1514,7 @@ static struct node *create_node(struct connection *conn, const void *ctx,/* Account for new node */ if (i->parent) { -if (domain_entry_inc (conn, i)) { +if (domain_nbentry_inc (conn,get_node_owner (i))) {destroy_node_rm (conn, i);return NULL ; }
@@ -1662,7 +1667,7 @@ static int delnode_sub(const void *ctx, struct connection *conn, watch_exact =strcmp (root, node->name);fire_watches (conn, ctx, node->name, node, watch_exact,NULL ); -domain_entry_dec (conn, node); +domain_nbentry_dec (conn,get_node_owner (node));return WALK_TREE_RM_CHILDENTRY ; }
@@ -1798,29 +1803,29 @@ static int do_set_perms(const void *ctx, struct connection *conn,/* Unprivileged domains may not change the owner. */ if (domain_is_unprivileged (conn) && - perms.p[0 ].id != node->perms.p[0 ].id) + perms.p[0 ].id !=get_node_owner (node))return EPERM ; old_perms = node->perms; -domain_entry_dec (conn, node); +domain_nbentry_dec (conn,get_node_owner (node)); node->perms = perms; -if (domain_entry_inc (conn, node)) { +if (domain_nbentry_inc (conn,get_node_owner (node))) { node->perms = old_perms;/* * This should never fail because we had a reference on the * domain before and Xenstored is single-threaded. */ -domain_entry_inc (conn, node); +domain_nbentry_inc (conn,get_node_owner (node));return ENOMEM ; }if (write_node (conn, node, false)) {int saved_errno = errno; -domain_entry_dec (conn, node); +domain_nbentry_dec (conn,get_node_owner (node)); node->perms = old_perms;/* No failure possible as above. */ -domain_entry_inc (conn, node); +domain_nbentry_inc (conn,get_node_owner (node)); errno = saved_errno;return errno;
@@ -2392,7 +2397,7 @@ void setup_structure(bool live_update)manual_node ("/tool/xenstored" ,NULL );manual_node ("@releaseDomain" ,NULL );manual_node ("@introduceDomain" ,NULL ); -domain_entry_fix (dom0_domid,5 , true); +domain_nbentry_fix (dom0_domid,5 , true); }check_store ();
@@ -3400,7 +3405,7 @@ void read_state_node(const void *ctx, const void *state)if (write_node_raw (NULL , &key, node, true))barf ("write node error restoring node" ); -if (domain_entry_inc (&conn, node)) +if (domain_nbentry_inc (&conn,get_node_owner (node)))barf ("node accounting error restoring node" );talloc_free (node);
tools/xenstore/xenstored_domain.c +58 -68
172 lines not on this page · raw message
tools/xenstore/xenstored_domain.h +4 -6
@@ -66,10 +66,10 @@ int domain_adjust_node_perms(struct node *node);int domain_alloc_permrefs (struct node_perms *perms);/* Quota manipulation */ -int domain_entry_inc (struct connection *conn,struct node *); -void domain_entry_dec (struct connection *conn,struct node *); -int domain_entry_fix (unsigned int domid,int num,bool update); -int domain_entry (struct connection *conn); +int domain_nbentry_inc (struct connection *conn,unsigned int domid); +int domain_nbentry_dec (struct connection *conn,unsigned int domid); +int domain_nbentry_fix (unsigned int domid,int num,bool update); +int domain_nbentry (struct connection *conn);int domain_memory_add (unsigned int domid,int mem,bool no_quota_check);/*
@@ -99,8 +99,6 @@ void domain_outstanding_domid_dec(unsigned int domid);int domain_get_quota (const void *ctx,struct connection *conn,unsigned int domid);int acc_fix_domains (struct list_head *head,bool update); -int acc_add_dom_nbentry (const void *ctx,struct list_head *head,int val, -unsigned int domid);/* Write rate limiting */
tools/xenstore/xenstored_transaction.c +2 -13
@@ -548,20 +548,9 @@ int do_transaction_end(const void *ctx, struct connection *conn,return 0 ; } -void transaction_entry_inc (struct transaction *trans,unsigned int domid) +struct list_head *transaction_get_changed_domains (struct transaction *trans) { -if (!acc_add_dom_nbentry (trans, &trans->changed_domains,1 , domid)) { -/* Let the transaction fail. */ - trans->fail = true; - } -} - -void transaction_entry_dec (struct transaction *trans,unsigned int domid) -{ -if (!acc_add_dom_nbentry (trans, &trans->changed_domains,-1 , domid)) { -/* Let the transaction fail. */ - trans->fail = true; - } +return &trans->changed_domains; }void fail_transaction (struct transaction *trans)
tools/xenstore/xenstored_transaction.h +3 -4
@@ -36,10 +36,6 @@ int do_transaction_end(const void *ctx, struct connection *conn,struct transaction *transaction_lookup (struct connection *conn,uint32_t id); -/* inc/dec entry number local to trans while changing a node */ -void transaction_entry_inc (struct transaction *trans,unsigned int domid); -void transaction_entry_dec (struct transaction *trans,unsigned int domid); -/* This node was accessed. */ int __must_check access_node (struct connection *conn,struct node *node,enum node_access_type type,TDB_DATA *key);
@@ -54,6 +50,9 @@ void transaction_prepend(struct connection *conn, const char *name,/* Mark the transaction as failed. This will prevent it to be committed. */ void fail_transaction (struct transaction *trans); +/* Get the list head of the changed domains. */ +struct list_head *transaction_get_changed_domains (struct transaction *trans); +void conn_delete_all_transactions (struct connection *conn);int check_transactions (struct hashtable *hash);
Signature · 1 line
2.35.3
Re: [PATCH v3 07/17] tools/xenstore: change per-domain node accounting interface
Quoted 34 lines · Juergen Gross
Rework the interface and the internals of the per-domain node accounting:
- rename the functions to domain_nbentry_*() in order to better match the related counter name
- switch from node pointer to domid as interface, as all nodes have the owner filled in
- use a common internal function for adding a value to the counter
For the transaction case add a helper function to get the list head of the per-transaction changed domains, enabling to eliminate the transaction_entry_*() functions.
Signed-off-by Juergen Gross <[email protected]>---
V3:
- addget_node_owner()(Julien Grall)
- renamedomain_nbentry_add()parameter (Julien Grall)
- avoid negative entry count (Julien Grall)--- tools/xenstore/xenstored_core.c | 33 ++++--- tools/xenstore/xenstored_domain.c | 126 ++++++++++++------------- tools/xenstore/xenstored_domain.h | 10 +- tools/xenstore/xenstored_transaction.c | 15 +-- tools/xenstore/xenstored_transaction.h | 7 +- 5 files changed, 86 insertions(+), 105 deletions(-)tools/xenstore/xenstored_core.c +0
-0
tools/xenstore/xenstored_core.c int do_tdb_delete(struct connection *conn, TDB_DATA *key, · line 706
Quoted 7 lines
tools/xenstore/xenstored_core.c +4
-0@@ -700,6 +700,11 @@ int do_tdb_delete(struct connection *conn, TDB_DATA *key,return 0 ; } +static unsigned int get_node_owner (const struct node *node) +{ +return node->perms.p[0 ].id; +}
I have moved this helper as inline function to xenstored_core.h now, as it will be needed in xenstored_domain.c, too.
Juergen
PATCH v3 8/17 tools/xenstore: don't allow creating too many nodes in a transaction
In reply to Juergen GrossThe accounting for the number of nodes of a domain in an active transaction is not working correctly, as it allows to create arbitrary number of nodes. The transaction will finally fail due to exceeding the number of nodes quota, but before closing the transaction an unprivileged guest could cause Xenstore to use a lot of memory.
--- tools/xenstore/xenstored_domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/xenstore/xenstored_domain.c +2 -3
@@ -1129,9 +1129,8 @@ int domain_nbentry_fix(unsigned int domid, int num, bool update)int domain_nbentry (struct connection *conn) { -return (domain_is_unprivileged (conn)) - ? conn->domain->nbentry - :0 ; +return domain_is_unprivileged (conn) + ?domain_nbentry_add (conn, conn->id,0 , true) :0 ; }static bool domain_chk_quota (struct domain *domain,int mem)
Signature · 1 line
2.35.3
Re: [PATCH v3 08/17] tools/xenstore: don't allow creating too many nodes in a transaction
Hi Juergen,
Quoted 7 lines · Juergen Gross
The accounting for the number of nodes of a domain in an active transaction is not working correctly, as it allows to create arbitrary number of nodes. The transaction will finally fail due to exceeding the number of nodes quota, but before closing the transaction an unprivileged guest could cause Xenstore to use a lot of memory.
Signed-off-by Juergen Gross <[email protected]>
Is the rest of the series depend on this patch? I am asking this because I still need to go through your second series before forging an opinion on this patch.
Yet, I would like to reduce the number of inflight patches :).
Cheers,
Quoted 20 lines
--- tools/xenstore/xenstored_domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)tools/xenstore/xenstored_domain.c +2
-3@@ -1129,9 +1129,8 @@ int domain_nbentry_fix(unsigned int domid, int num, bool update)int domain_nbentry (struct connection *conn) { -return (domain_is_unprivileged (conn)) - ? conn->domain->nbentry - :0 ; +return domain_is_unprivileged (conn) + ?domain_nbentry_add (conn, conn->id,0 , true) :0 ; }static bool domain_chk_quota (struct domain *domain,int mem)
Signature · 1 line
Julien Grall
Re: [PATCH v3 08/17] tools/xenstore: don't allow creating too many nodes in a transaction
Quoted 9 lines · Julien Grall
Hi Juergen,
Quoted 6 lines · Juergen Gross
The accounting for the number of nodes of a domain in an active transaction is not working correctly, as it allows to create arbitrary number of nodes. The transaction will finally fail due to exceeding the number of nodes quota, but before closing the transaction an unprivileged guest could cause Xenstore to use a lot of memory.
Quoted 3 lines
Quoted 1 line
Signed-off-by Juergen Gross <[email protected]>Is the rest of the series depend on this patch? I am asking this because I still need to go through your second series before forging an opinion on this patch.
I think the rest should apply without this one. There shouldn't be any functional dependency.
Quoted 1 line
Yet, I would like to reduce the number of inflight patches :).
+1
Juergen
PATCH v3 9/17 tools/xenstore: replace literal domid 0 with dom0_domid
In reply to Juergen GrossThere are some places left where dom0 is associated with domid 0.
Use dom0_domid instead.
--- tools/xenstore/xenstored_core.c | 5 +++-- tools/xenstore/xenstored_domain.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-)
tools/xenstore/xenstored_core.c +3 -2
@@ -2316,9 +2316,10 @@ static void accept_connection(int sock)return ; conn =new_connection (&socket_funcs); -if (conn) +if (conn) { conn->fd = fd; -else + conn->id = dom0_domid; + }else close(fd); }#endif
tools/xenstore/xenstored_domain.c +4 -4
@@ -326,7 +326,7 @@ static int destroy_domain(void *_domain)if (domain->interface) {/* Domain 0 was mapped by dom0_init, so it must be unmapped using munmap() and not the grant unmap call. */ -if (domain->domid ==0 ) +if (domain->domid == dom0_domid)unmap_xenbus (domain->interface);else unmap_interface (domain->interface);
@@ -410,7 +410,7 @@ void handle_event(void)static bool domid_is_unprivileged (unsigned int domid) { -return domid !=0 && domid != priv_domid; +return domid != dom0_domid && domid != priv_domid; }bool domain_is_unprivileged (struct connection *conn)
@@ -798,7 +798,7 @@ static struct domain *onearg_domain(struct connection *conn,return ERR_PTR (-EINVAL ); domid =atoi (domid_str); -if (!domid) +if (domid == dom0_domid)return ERR_PTR (-EINVAL );return find_connected_domain (domid);
@@ -1004,7 +1004,7 @@ static int chk_domain_generation(unsigned int domid, uint64_t gen) {struct domain *d; -if (!xc_handle && domid ==0 ) +if (!xc_handle && domid == dom0_domid)return 1 ; d =find_domain_struct (domid);
Signature · 1 line
2.35.3
PATCH v3 10/17 tools/xenstore: make domain_is_unprivileged() an inline function
In reply to Juergen Grossclang 14 is complaining about a NULL dereference for constructs like:
domain_is_unprivileged(conn) ? conn->in : NULL
as it can't know that domain_is_unprivileged(conn) will return false if conn is NULL.
Fix that by making domain_is_unprivileged() an inline function (and related to that domid_is_unprivileged(), too).
In order not having to make struct domain public, use conn->id instead of conn->domain->domid for the test.
--- tools/xenstore/xenstored_core.h | 10 ++++++++++ tools/xenstore/xenstored_domain.c | 11 ----------- tools/xenstore/xenstored_domain.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)
tools/xenstore/xenstored_core.h +10 -0
@@ -297,6 +297,16 @@ void unmap_xenbus(void *interface);static inline int xenbus_master_domid (void ) {return dom0_domid; } +static inline bool domid_is_unprivileged (unsigned int domid) +{ +return domid != dom0_domid && domid != priv_domid; +} + +static inline bool domain_is_unprivileged (const struct connection *conn) +{ +return conn &&domid_is_unprivileged (conn->id); +} +/* Return the event channel used by xenbus. */ evtchn_port_t xenbus_evtchn (void );
tools/xenstore/xenstored_domain.c +0 -11
@@ -408,17 +408,6 @@ void handle_event(void)barf_perror ("Failed to write to event fd" ); } -static bool domid_is_unprivileged (unsigned int domid) -{ -return domid != dom0_domid && domid != priv_domid; -} - -bool domain_is_unprivileged (struct connection *conn) -{ -return conn && conn->domain && -domid_is_unprivileged (conn->domain->domid); -} -static char *talloc_domain_path (const void *context,unsigned int domid) {return talloc_asprintf (context,"/local/domain/%u" , domid);
tools/xenstore/xenstored_domain.h +0 -2
@@ -59,8 +59,6 @@ void ignore_connection(struct connection *conn, unsigned int err);/* Returns the implicit path of a connection (only domains have this) */ const char *get_implicit_path (const struct connection *conn); -bool domain_is_unprivileged (struct connection *conn); -/* Remove node permissions for no longer existing domains. */ int domain_adjust_node_perms (struct node *node);int domain_alloc_permrefs (struct node_perms *perms);
Signature · 1 line
2.35.3
PATCH v3 11/17 tools/xenstore: let chk_domain_generation() return a bool
In reply to Juergen GrossInstead of returning 0 or 1 let chk_domain_generation() return a boolean value.
Simplify the only caller by removing the ret variable.
--- tools/xenstore/xenstored_domain.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
tools/xenstore/xenstored_domain.c +8 -10
@@ -985,20 +985,20 @@ void domain_deinit(void)* count (used for testing whether a node permission is older than a domain). * * Return values: -* 0: domain has higher generation count (it is younger than a node with the -* given count), or domain isn't existing any longer -* 1: domain is older than the node +* false: domain has higher generation count (it is younger than a node with +* the given count), or domain isn't existing any longer +* true: domain is older than the node */ -static int chk_domain_generation (unsigned int domid,uint64_t gen) +static bool chk_domain_generation (unsigned int domid,uint64_t gen) {struct domain *d;if (!xc_handle && domid == dom0_domid) -return 1 ; +return true; d =find_domain_struct (domid); -return (d && d->generation <= gen) ?1 :0 ; +return d && d->generation <= gen; }/*
@@ -1033,14 +1033,12 @@ int domain_alloc_permrefs(struct node_perms *perms)int domain_adjust_node_perms (struct node *node) {unsigned int i; -int ret;for (i =1 ; i < node->perms.num; i++) {if (node->perms.p[i].perms &XS_PERM_IGNORE )continue ; - ret =chk_domain_generation (node->perms.p[i].id, - node->generation); -if (!ret) +if (!chk_domain_generation (node->perms.p[i].id, + node->generation)) node->perms.p[i].perms |=XS_PERM_IGNORE ; }
Signature · 1 line
2.35.3
PATCH v3 12/17 tools/xenstore: don't let hashtable_remove() return the removed value
In reply to Juergen GrossLetting hashtable_remove() return the value of the removed element is not used anywhere in Xenstore, and it conflicts with a hashtable created specifying the HASHTABLE_FREE_VALUE flag.
So just drop returning the value.
---
V3:
- new patch
--- tools/xenstore/hashtable.c | 10 +++++----- tools/xenstore/hashtable.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)
tools/xenstore/hashtable.c +5 -5
@@ -214,7 +214,7 @@ hashtable_search(struct hashtable *h, void *k) }/*****************************************************************************/ -void */* returns value associated with key */ +int hashtable_remove (struct hashtable *h,void *k) {/* TODO: consider compacting the table when the load factor drops enough,
@@ -222,7 +222,6 @@ hashtable_remove(struct hashtable *h, void *k)struct entry *e;struct entry **pE; -void *v;unsigned int hashvalue, index; hashvalue =hash (h,k);
@@ -236,16 +235,17 @@ hashtable_remove(struct hashtable *h, void *k) { *pE = e->next; h->entrycount--; - v = e->v;if (h->flags &HASHTABLE_FREE_KEY )free (e->k); +if (h->flags &HASHTABLE_FREE_VALUE ) +free (e->v);free (e); -return v; +return 1 ; } pE = &(e->next); e = e->next; } -return NULL ; +return 0 ; }/*****************************************************************************/
tools/xenstore/hashtable.h +2 -2
@@ -68,10 +68,10 @@ hashtable_search(struct hashtable *h, void *k);* @name hashtable_remove * @param h the hashtable to remove the item from * @param k the key to search for - does not claim ownership -* @return the value associated with the key, or NULL if none found +* @return 0 if element not found */ -void */* returns value */ +int hashtable_remove (struct hashtable *h,void *k);/*****************************************************************************
Signature · 1 line
2.35.3
Re: [PATCH v3 12/17] tools/xenstore: don't let hashtable_remove() return the removed value
Hi Juergen,
Quoted 5 lines · Juergen Gross
Letting
hashtable_remove()return the value of the removed element is not used anywhere in Xenstore, and it conflicts with a hashtable created specifying theHASHTABLE_FREE_VALUEflag.So just drop returning the value.
Any reason this can't be void? If there are, then I would consider to return a bool as the return can only be 2 values.
Quoted 32 lines
Signed-off-by Juergen Gross <[email protected]>---
V3:
- new patch--- tools/xenstore/hashtable.c | 10 +++++----- tools/xenstore/hashtable.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)tools/xenstore/hashtable.c +1
-2@@ -214,7 +214,7 @@ hashtable_search(struct hashtable *h, void *k) }/*****************************************************************************/ -void */* returns value associated with key */ +int hashtable_remove (struct hashtable *h,void *k) {/* TODO: consider compacting the table when the load factor drops enough, @@ -222,7 +222,6 @@ hashtable_remove(struct hashtable *h, void *k)struct entry *e;struct entry **pE; -void *v;unsigned int hashvalue, index; hashvalue =hash (h,k);
tools/xenstore/hashtable.c hashtable_remove(struct hashtable *h, void *k) · line 241
Quoted 8 lines
tools/xenstore/hashtable.c +2
-1@@ -236,16 +235,17 @@ hashtable_remove(struct hashtable *h, void *k) { *pE = e->next; h->entrycount--; - v = e->v;if (h->flags &HASHTABLE_FREE_KEY )free (e->k); +if (h->flags &HASHTABLE_FREE_VALUE ) +free (e->v);
I don't quite understand how this change is related to this patch.
Quoted 19 lines
tools/xenstore/hashtable.c +2
-2free (e); -return v; +return 1 ; } pE = &(e->next); e = e->next; } -return NULL ; +return 0 ; }/*****************************************************************************/ tools/xenstore/hashtable.h +0
-0@@ -68,10 +68,10 @@ hashtable_search(struct hashtable *h, void *k);* @name hashtable_remove * @param h the hashtable to remove the item from
tools/xenstore/hashtable.h hashtable_search(struct hashtable *h, void *k); · line 77
Quoted 10 lines
tools/xenstore/hashtable.h +2
-2* @param k the key to search for - does not claim ownership -* @return the value associated with the key, or NULL if none found +* @return 0 if element not found */ -void */* returns value */ +int hashtable_remove (struct hashtable *h,void *k);/*****************************************************************************
Cheers,
Signature · 1 line
Julien Grall
Re: [PATCH v3 12/17] tools/xenstore: don't let hashtable_remove() return the removed value
Quoted 10 lines · Julien Grall
Hi Juergen,
Quoted 5 lines · Juergen Gross
Letting
hashtable_remove()return the value of the removed element is not used anywhere in Xenstore, and it conflicts with a hashtable created specifying theHASHTABLE_FREE_VALUEflag.So just drop returning the value.
Any reason this can't be void? If there are, then I would consider to return a bool as the return can only be 2 values.
I think you are right. Switching to void should be fine.
Quoted 32 lines
Quoted 32 lines
Signed-off-by Juergen Gross <[email protected]>---
V3:
- new patch
---
tools/xenstore/hashtable.c| 10 +++++-----
tools/xenstore/hashtable.h| 4 ++--2 files changed, 7 insertions(+), 7 deletions(-)tools/xenstore/hashtable.c +1
-2@@ -214,7 +214,7 @@ hashtable_search(struct hashtable *h, void *k) } /*****************************************************************************/ -void */* returns value associated with key */ +int hashtable_remove(struct hashtable *h, void *k) { /* TODO: consider compacting the table when the load factor drops enough,@@ -222,7 +222,6 @@ hashtable_remove(struct hashtable *h, void *k) struct entry *e; struct entry **pE; - void *v; unsigned int hashvalue, index; hashvalue = hash(h,k);@@ -236,16 +235,17 @@ hashtable_remove(struct hashtable *h, void *k) { *pE = e->next;
Quoted 8 lines
tools/xenstore/hashtable.c hashtable_remove(struct hashtable *h, void *k) · line 241
Quoted 6 lines
tools/xenstore/hashtable.c +2
-1h->entrycount--; - v = e->v; if (h->flags & HASHTABLE_FREE_KEY) free(e->k); + if (h->flags & HASHTABLE_FREE_VALUE) + free(e->v);I don't quite understand how this change is related to this patch.
With not returning the value pointer any longer there would be no way for the caller to free it, so it must be freed by hashtable_remove() if the related flag was set.
I can add a sentence to the commit message.
Juergen
Re: [PATCH v3 12/17] tools/xenstore: don't let hashtable_remove() return the removed value
Quoted 56 lines · Juergen Gross
Quoted 10 lines · Julien Grall
Hi Juergen,
Quoted 5 lines · Juergen Gross
Letting
hashtable_remove()return the value of the removed element is not used anywhere in Xenstore, and it conflicts with a hashtable created specifying theHASHTABLE_FREE_VALUEflag.So just drop returning the value.
Any reason this can't be void? If there are, then I would consider to return a bool as the return can only be 2 values.
I think you are right. Switching to void should be fine.
Quoted 33 lines
Quoted 33 lines
Signed-off-by Juergen Gross <[email protected]>---
V3:
- new patch
---
tools/xenstore/hashtable.c| 10 +++++-----
tools/xenstore/hashtable.h| 4 ++--2 files changed, 7 insertions(+), 7 deletions(-)tools/xenstore/hashtable.c +1
-2@@ -214,7 +214,7 @@ hashtable_search(struct hashtable *h, void *k) }/*****************************************************************************/ -void */* returns value associated with key */ +int hashtable_remove(struct hashtable *h, void *k) { /* TODO: consider compacting the table when the load factor drops enough,@@ -222,7 +222,6 @@ hashtable_remove(struct hashtable *h, void *k) struct entry *e; struct entry **pE; - void *v; unsigned int hashvalue, index; hashvalue = hash(h,k);@@ -236,16 +235,17 @@ hashtable_remove(struct hashtable *h, void *k) { *pE = e->next;Quoted 8 lines
tools/xenstore/hashtable.c hashtable_remove(struct hashtable *h, void *k) · line 241
Quoted 6 lines
tools/xenstore/hashtable.c +2
-1h->entrycount--; - v = e->v; if (h->flags & HASHTABLE_FREE_KEY) free(e->k); + if (h->flags & HASHTABLE_FREE_VALUE) + free(e->v);I don't quite understand how this change is related to this patch.
Quoted 3 lines
With not returning the value pointer any longer there would be no way for the caller to free it, so it must be freed by
hashtable_remove()if the related flag was set.
That makes sense now. Thanks for the explanation.
Quoted 2 lines
I can add a sentence to the commit message.
Yes please.
The rest of this patch looks good to me.
Cheers,
Signature · 1 line
Julien Grall
PATCH v3 13/17 tools/xenstore: switch hashtable to use the talloc framework
In reply to Juergen GrossInstead of using malloc() and friends, let the hashtable implementation use the talloc framework.
This is more consistent with the rest of xenstored and it allows to track memory usage via "xenstore-control memreport".
---
V3:
- make key and value children of element (if flagged)
--- tools/xenstore/hashtable.c | 98 +++++++++++-------------------- tools/xenstore/hashtable.h | 3 +- tools/xenstore/xenstored_core.c | 5 +- tools/xenstore/xenstored_domain.c | 2 +- 4 files changed, 38 insertions(+), 70 deletions(-)
tools/xenstore/hashtable.c +33 -65
@@ -6,6 +6,8 @@#include <string.h> #include <math.h> #include <stdint.h> +#include <stdarg.h> +#include "talloc.h" struct entry {
@@ -50,7 +52,7 @@ indexFor(unsigned int tablelength, unsigned int hashvalue) {/*****************************************************************************/ struct hashtable * -create_hashtable (unsigned int minsize, +create_hashtable (const void *ctx,unsigned int minsize,unsigned int (*hashf) (void *),int (*eqf) (void *,void *),unsigned int flags)
@@ -66,10 +68,10 @@ create_hashtable(unsigned int minsize,if (primes[pindex] > minsize) { size = primes[pindex];break ; } } - h = (struct hashtable *)calloc (1 ,sizeof (struct hashtable )); + h = talloc_zero(ctx, struct hashtable);if (NULL == h) goto err0; - h->table = (struct entry **)calloc (size,sizeof (struct entry *)); + h->table = talloc_zero_array(h, struct entry *, size);if (NULL == h->table) goto err1;
@@ -83,7 +85,7 @@ create_hashtable(unsigned int minsize,return h; err1: -free (h); +talloc_free (h); err0:return NULL ; }
@@ -115,47 +117,32 @@ hashtable_expand(struct hashtable *h)if (h->primeindex == (prime_table_length -1 ))return 0 ; newsize = primes[++(h->primeindex)]; - newtable = (struct entry **)calloc (newsize,sizeof (struct entry *)); -if (NULL != newtable) + newtable = talloc_realloc(h, h->table, struct entry *, newsize); +if (!newtable) { -/* This algorithm is not 'stable'. ie. it reverses the list -* when it transfers entries between the tables */ -for (i =0 ; i < h->tablelength; i++) { -while (NULL != (e = h->table[i])) { - h->table[i] = e->next; - index =indexFor (newsize,e->h); + h->primeindex--; +return 0 ; + } + + h->table = newtable; +memset (newtable + h->tablelength,0 , + (newsize - h->tablelength) *sizeof (*newtable)); +for (i =0 ; i < h->tablelength; i++) { +for (pE = &(newtable[i]), e = *pE; e !=NULL ; e = *pE) { + index =indexFor (newsize, e->h); +if (index == i) + { + pE = &(e->next); + } +else + { + *pE = e->next; e->next = newtable[index]; newtable[index] = e; } } -free (h->table); - h->table = newtable; - } -/* Plan B: realloc instead */ -else - { - newtable = (struct entry **) -realloc (h->table, newsize *sizeof (struct entry *)); -if (NULL == newtable) { (h->primeindex)--;return 0 ; } - h->table = newtable; -memset (newtable + h->tablelength,0 , - (newsize - h->tablelength) *sizeof (*newtable)); -for (i =0 ; i < h->tablelength; i++) { -for (pE = &(newtable[i]), e = *pE; e !=NULL ; e = *pE) { - index =indexFor (newsize,e->h); -if (index == i) - { - pE = &(e->next); - } -else - { - *pE = e->next; - e->next = newtable[index]; - newtable[index] = e; - } - } - } } + h->tablelength = newsize; h->loadlimit = (unsigned int ) (((uint64_t )newsize * max_load_factor) /100 );
@@ -184,12 +171,16 @@ hashtable_insert(struct hashtable *h, void *k, void *v)* element may be ok. Next time we insert, we'll try expanding again.*/ hashtable_expand (h); } - e = (struct entry *)calloc (1 ,sizeof (struct entry )); + e = talloc_zero(h, struct entry);if (NULL == e) { --(h->entrycount);return 0 ; }/*oom*/ e->h =hash (h,k); index =indexFor (h->tablelength,e->h); e->k = k; +if (h->flags &HASHTABLE_FREE_KEY ) +talloc_steal (e, k); e->v = v; +if (h->flags &HASHTABLE_FREE_VALUE ) +talloc_steal (e, v); e->next = h->table[index]; h->table[index] = e;return -1 ;
@@ -235,11 +226,7 @@ hashtable_remove(struct hashtable *h, void *k) { *pE = e->next; h->entrycount--; -if (h->flags &HASHTABLE_FREE_KEY ) -free (e->k); -if (h->flags &HASHTABLE_FREE_VALUE ) -free (e->v); -free (e); +talloc_free (e);return 1 ; } pE = &(e->next);
@@ -279,26 +266,7 @@ hashtable_iterate(struct hashtable *h,void hashtable_destroy (struct hashtable *h) { -unsigned int i; -struct entry *e, *f; -struct entry **table = h->table; - -for (i =0 ; i < h->tablelength; i++) - { - e = table[i]; -while (NULL != e) - { - f = e; - e = e->next; -if (h->flags &HASHTABLE_FREE_KEY ) -free (f->k); -if (h->flags &HASHTABLE_FREE_VALUE ) -free (f->v); -free (f); - } - } -free (h->table); -free (h); +talloc_free (h); }/*
tools/xenstore/hashtable.h +2 -1
@@ -9,6 +9,7 @@ struct hashtable;* create_hashtable * @name create_hashtable +* @param ctx talloc context to use for allocations * @param minsize minimum initial size of hashtable * @param hashfunction function for hashing keys * @param key_eq_fn function for determining key equality
@@ -22,7 +23,7 @@ struct hashtable;#define HASHTABLE_FREE_KEY (1U << 1)struct hashtable * -create_hashtable (unsigned int minsize, +create_hashtable (const void *ctx,unsigned int minsize,unsigned int (*hashfunction) (void *),int (*key_eq_fn) (void *,void *), unsigned int flags
tools/xenstore/xenstored_core.c +2 -3
@@ -2424,11 +2424,10 @@ static int keys_equal_fn(void *key1, void *key2)int remember_string (struct hashtable *hash,const char *str) { -char *k =malloc (strlen (str) +1 ); +char *k =talloc_strdup (NULL , str);if (!k)return 0 ; -strcpy (k, str);return hashtable_insert (hash, k, (void *)1 ); }
@@ -2523,7 +2522,7 @@ void check_store(void) };/* Don't free values (they are all void *1) */ - reachable =create_hashtable (16 , hash_from_key_fn, keys_equal_fn, + reachable =create_hashtable (NULL ,16 , hash_from_key_fn, keys_equal_fn,HASHTABLE_FREE_KEY );if (!reachable) {log ("check_store: ENOMEM" );
tools/xenstore/xenstored_domain.c +1 -1
@@ -931,7 +931,7 @@ void domain_init(int evtfd)int rc;/* Start with a random rather low domain count for the hashtable. */ - domhash =create_hashtable (8 , domhash_fn, domeq_fn,0 ); + domhash =create_hashtable (NULL ,8 , domhash_fn, domeq_fn,0 );if (!domhash)barf_perror ("Failed to allocate domain hashtable" );
Signature · 1 line
2.35.3
Re: [PATCH v3 13/17] tools/xenstore: switch hashtable to use the talloc framework
Hi Juergen,
Quoted 7 lines · Juergen Gross
Instead of using
malloc()and friends, let the hashtable implementation use the talloc framework.This is more consistent with the rest of xenstored and it allows to track memory usage via "xenstore-control memreport".
Signed-off-by Juergen Gross <[email protected]>
Cheers,
Signature · 1 line
Julien Grall
PATCH v3 14/17 tools/xenstore: make log macro globally available
In reply to Juergen GrossMove the definition of the log() macro to xenstored_core.h in order to make it usable from other source files, too.
While at it preserve errno from being modified.
--- tools/xenstore/xenstored_core.c | 14 -------------- tools/xenstore/xenstored_core.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-)
tools/xenstore/xenstored_core.c +0 -14
@@ -88,20 +88,6 @@ TDB_CONTEXT *tdb_ctx = NULL;static const char *sockmsg_string (enum xsd_sockmsg_type type); -#define log (...) \ - do { \ - char *s = talloc_asprintf(NULL, __VA_ARGS__); \ - if (s) { \ - trace("%s\n", s); \ - syslog(LOG_ERR, "%s\n", s); \ - talloc_free(s); \ - } else { \ - trace("talloc failure during logging\n"); \ - syslog(LOG_ERR, "talloc failure during logging\n"); \ - } \ - } while (0) - -int quota_nb_entry_per_domain =1000 ;int quota_nb_watch_per_domain =128 ;int quota_max_entry_size =2048 ;/* 2K */
tools/xenstore/xenstored_core.h +15 -0
@@ -267,6 +267,21 @@ void trace(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));void reopen_log (void );void close_log (void ); +#define log (...) \ + do { \ + int _saved_errno = errno; \ + char *s = talloc_asprintf(NULL, __VA_ARGS__); \ + if (s) { \ + trace("%s\n", s); \ + syslog(LOG_ERR, "%s\n", s); \ + talloc_free(s); \ + } else { \ + trace("talloc failure during logging\n"); \ + syslog(LOG_ERR, "talloc failure during logging\n"); \ + } \ + errno = _saved_errno; \ + } while (0) +extern int orig_argc;extern char **orig_argv;
Signature · 1 line
2.35.3
PATCH v3 15/17 tools/xenstore: introduce trace classes
In reply to Juergen GrossMake the xenstored internal trace configurable by adding classes which can be switched on and off independently from each other.
Define the following classes:
- obj: Creation and deletion of interesting "objects" (watch, transaction, connection)
- io: incoming requests and outgoing responses
- wrl: write limiting
Per default "obj" and "io" are switched on.
Entries written via trace() will always be printed (if tracing is on at all).
Add the capability to control the trace settings via the "log" command and via a new "--log-control" command line option.
Add a missing trace_create() call for creating a transaction.
---
V2:
- keep "log" and "logfile" command names (Julien Grall)
--- docs/misc/xenstore.txt | 10 +++-- tools/xenstore/xenstored_control.c | 31 +++++++++++++-- tools/xenstore/xenstored_core.c | 55 ++++++++++++++++++++++++-- tools/xenstore/xenstored_core.h | 6 +++ tools/xenstore/xenstored_domain.c | 27 +++++++------ tools/xenstore/xenstored_transaction.c | 1 + 6 files changed, 106 insertions(+), 24 deletions(-)
docs/misc/xenstore.txt +6 -4
@@ -409,10 +409,12 @@ CONTROL <command>|[<parameters>|] error string in case of failure. -s can return "BUSY" in case of an active transaction, a retry of -s can be done in that case. - log|on - turn xenstore logging on - log|off - turn xenstore logging off + log|[on|off|+<switch>|-<switch>] + without parameters: show possible log switches + on: turn xenstore logging on + off: turn xenstore logging off + +<switch>: activates log entries for <switch>, + -<switch>: deactivates log entries for <switch> logfile|<file-name> log to specified file memreport|[<file-name>]
tools/xenstore/xenstored_control.c +28 -3
@@ -182,6 +182,28 @@ static int do_control_check(const void *ctx, struct connection *conn,static int do_control_log (const void *ctx,struct connection *conn,char **vec,int num) { +int ret; + +if (num ==0 ) { +char *resp =talloc_asprintf (ctx,"Log switch settings:\n" ); +unsigned int idx; +bool on; + +if (!resp) +return ENOMEM ; +for (idx =0 ; trace_switches[idx]; idx++) { + on = trace_flags & (1u << idx); + resp =talloc_asprintf_append (resp,"%-8s: %s\n" , + trace_switches[idx], + on ?"on" :"off" ); +if (!resp) +return ENOMEM ; + } + +send_reply (conn,XS_CONTROL , resp,strlen (resp) +1 ); +return 0 ; + } +if (num !=1 )return EINVAL ;
@@ -189,8 +211,11 @@ static int do_control_log(const void *ctx, struct connection *conn,reopen_log (); else if (!strcmp(vec[0], "off")) close_log(); - else - return EINVAL; + else { + ret =set_trace_switch (vec[0 ]); +if (ret) +return ret; + }send_ack (conn,XS_CONTROL );return 0 ;
@@ -923,7 +948,7 @@ static int do_control_help(const void *, struct connection *, char **, int);static struct cmd_s cmds[] = { {"check" , do_control_check,"" }, - {"log" , do_control_log,"on|off" }, + {"log" , do_control_log,"[on|off|+<switch>|-<switch>]" }, #ifndef NO_LIVE_UPDATE/*
tools/xenstore/xenstored_core.c +51 -4
106 lines not on this page · raw message
tools/xenstore/xenstored_core.h +6 -0
@@ -287,6 +287,12 @@ extern char **orig_argv;extern char *tracefile;extern int tracefd; +extern unsigned int trace_flags; +#define TRACE_OBJ 0x00000001 +#define TRACE_IO 0x00000002 +#define TRACE_WRL 0x00000004 +extern const char *trace_switches[]; +int set_trace_switch (const char *arg);extern TDB_CONTEXT *tdb_ctx;extern int dom0_domid;
tools/xenstore/xenstored_domain.c +14 -13
@@ -1260,6 +1260,12 @@ static long wrl_ndomains;static wrl_creditt wrl_reserve;/* [-wrl_config_newdoms_dburst, +_gburst ] */ static time_t wrl_log_last_warning;/* 0: no previous warning */ +#define trace_wrl (...) \ +do { \ + if (trace_flags & TRACE_WRL) \ + trace("wrl: " __VA_ARGS__); \ +} while (0) +void wrl_gettime_now (struct wrl_timestampt *now_wt) {struct timespec now_ts;
@@ -1365,12 +1371,9 @@ void wrl_credit_update(struct domain *domain, struct wrl_timestampt now) domain->wrl_timestamp = now; -trace ("wrl: dom %4d %6ld msec %9ld credit %9ld reserve" -" %9ld discard\n" , - domain->domid, - msec, - (long )domain->wrl_credit, (long )wrl_reserve, - (long )surplus); +trace_wrl ("dom %4d %6ld msec %9ld credit %9ld reserve %9ld discard\n" , + domain->domid, msec, (long )domain->wrl_credit, + (long )wrl_reserve, (long )surplus); } void wrl_check_timeout(struct domain *domain,
@@ -1402,10 +1405,9 @@ void wrl_check_timeout(struct domain *domain,if (*ptimeout==-1 || wakeup < *ptimeout) *ptimeout = wakeup; -trace ("wrl: domain %u credit=%ld (reserve=%ld) SLEEPING for %d\n" , - domain->domid, - (long )domain->wrl_credit, (long )wrl_reserve, - wakeup); +trace_wrl ("domain %u credit=%ld (reserve=%ld) SLEEPING for %d\n" , + domain->domid, (long )domain->wrl_credit, (long )wrl_reserve, + wakeup); }#define WRL_LOG (now, ...) \
@@ -1423,9 +1425,8 @@ void wrl_apply_debit_actual(struct domain *domain)wrl_credit_update (domain, now); domain->wrl_credit -= wrl_config_writecost; -trace ("wrl: domain %u credit=%ld (reserve=%ld)\n" , - domain->domid, - (long )domain->wrl_credit, (long )wrl_reserve); +trace_wrl ("domain %u credit=%ld (reserve=%ld)\n" , domain->domid, + (long )domain->wrl_credit, (long )wrl_reserve);if (domain->wrl_credit <0 ) {if (!domain->wrl_delay_logged) {
tools/xenstore/xenstored_transaction.c +1 -0
@@ -475,6 +475,7 @@ int do_transaction_start(const void *ctx, struct connection *conn,if (!trans)return ENOMEM ; +trace_create (trans,"transaction" );INIT_LIST_HEAD (&trans->accessed);INIT_LIST_HEAD (&trans->changed_domains); trans->conn = conn;
Signature · 1 line
2.35.3
Re: [PATCH v3 15/17] tools/xenstore: introduce trace classes
Hi Juergen,
Quoted 18 lines · Juergen Gross
tools/xenstore/xenstored_core.c +3
-0@@ -2604,6 +2607,8 @@ static void usage(void)" -N, --no-fork to request that the daemon does not fork,\n" " -P, --output-pid to request that the pid of the daemon is output,\n" " -T, --trace-file <file> giving the file for logging, and\n" +" --trace-control=+<switch> activate a specific <switch>\n" +" --trace-control=-<switch> deactivate a specific <switch>\n" " -E, --entry-nb <nb> limit the number of entries per domain,\n" " -S, --entry-size <size> limit the size of entry per domain, and\n" " -W, --watch-nb <nb> limit the number of watches per domain,\n" @@ -2647,6 +2652,7 @@ static struct option options[] = { { "output-pid", 0, NULL, 'P' }, { "entry-size", 1, NULL, 'S' }, { "trace-file", 1, NULL, 'T' }, + { "trace-control", 1, NULL, 1 }, { "transaction", 1, NULL, 't' }, { "perm-nb", 1, NULL, 'A' }, { "path-max", 1, NULL, 'M' },
tools/xenstore/xenstored_core.c static void set_quota(const char *arg, bool soft) · line 2731
Quoted 5 lines
tools/xenstore/xenstored_core.c +2
-0@@ -2721,6 +2727,43 @@ static void set_quota(const char *arg, bool soft)barf ("unknown quota \"%s\"\n" , arg); } +/* Sorted by bit values of TRACE_* flags. Flag is (1u << index). */ +const char *trace_switches[] = {
AFAICT, this array is not meant to be modified. So you want a second const.
Quoted 3 lines
tools/xenstore/xenstored_core.c +3
-0+"obj" ,"io" ,"wrl" , + NULL +};
[...]
tools/xenstore/xenstored_core.h extern char **orig_argv; · line 293
Quoted 12 lines
tools/xenstore/xenstored_core.h +4
-0@@ -287,6 +287,12 @@ extern char **orig_argv;extern char *tracefile;extern int tracefd; +extern unsigned int trace_flags; +#define TRACE_OBJ 0x00000001 +#define TRACE_IO 0x00000002 +#define TRACE_WRL 0x00000004
I would add a comment on top to explain that the value should be kept in sync with trace_switches.
Cheers,
Signature · 1 line
Julien Grall
Re: [PATCH v3 15/17] tools/xenstore: introduce trace classes
Quoted 19 lines · Julien Grall
Hi Juergen,
Quoted 16 lines · Juergen Gross
(quoted diff) +0
-0@@ -2604,6 +2607,8 @@ static void usage(void)" -N, --no-fork to request that the daemon does not fork,\n" " -P, --output-pid to request that the pid of the daemon is output,\n" " -T, --trace-file <file> giving the file for logging, and\n"
+" --trace-control=+<switch> activate a specific <switch>\n" +" --trace-control=-<switch> deactivate a specific <switch>\n" " -E, --entry-nb <nb> limit the number of entries per domain,\n" " -S, --entry-size <size> limit the size of entry per domain, and\n" " -W, --watch-nb <nb> limit the number of watches per domain,\n"tools/xenstore/xenstored_core.c +1
-0@@ -2647,6 +2652,7 @@ static struct option options[] = { { "output-pid", 0, NULL, 'P' }, { "entry-size", 1, NULL, 'S' }, { "trace-file", 1, NULL, 'T' }, + { "trace-control", 1, NULL, 1 }, { "transaction", 1, NULL, 't' }, { "perm-nb", 1, NULL, 'A' },
Quoted 8 lines
tools/xenstore/xenstored_core.c static void set_quota(const char *arg, bool soft) · line 2730
Quoted 6 lines
tools/xenstore/xenstored_core.c +2
-0{ "path-max", 1, NULL, 'M' },@@ -2721,6 +2727,43 @@ static void set_quota(const char *arg, bool soft) barf("unknown quota \"%s\"\n", arg); } +/* Sorted by bit values of TRACE_* flags. Flag is (1u << index). */ +const char *trace_switches[] = {AFAICT, this array is not meant to be modified. So you want a second const.
Yes, you are right.
Quoted 7 lines
Quoted 4 lines
tools/xenstore/xenstored_core.c +3
-0+ "obj", "io", "wrl", + NULL +};[...]
Quoted 12 lines
tools/xenstore/xenstored_core.h extern char **orig_argv; · line 292
Quoted 11 lines
tools/xenstore/xenstored_core.h +4
-0@@ -287,6 +287,12 @@ extern char **orig_argv; extern char *tracefile; extern int tracefd; +extern unsigned int trace_flags; +#define TRACE_OBJ 0x00000001 +#define TRACE_IO 0x00000002 +#define TRACE_WRL 0x00000004I would add a comment on top to explain that the value should be kept in sync with
trace_switches.
Okay.
Juergen
PATCH v3 16/17 tools/xenstore: let check_store() check the accounting data
In reply to Juergen GrossToday check_store() is only testing the correctness of the node tree.
Add verification of the accounting data (number of nodes) and correct the data if it is wrong.
Do the initial check_store() call only after Xenstore entries of a live update have been read.
--- tools/xenstore/xenstored_core.c | 62 ++++++++++++++++------ tools/xenstore/xenstored_domain.c | 86 +++++++++++++++++++++++++++++++ tools/xenstore/xenstored_domain.h | 4 ++ 3 files changed, 137 insertions(+), 15 deletions(-)
tools/xenstore/xenstored_core.c +47 -15
@@ -2389,8 +2389,6 @@ void setup_structure(bool live_update)manual_node ("@introduceDomain" ,NULL );domain_nbentry_fix (dom0_domid,5 , true); } - -check_store (); }static unsigned int hash_from_key_fn (void *k)
@@ -2433,20 +2431,28 @@ int remember_string(struct hashtable *hash, const char *str)* As we go, we record each node in the given reachable hashtable. These * entries will be used later in clean_store. */ + +struct check_store_data { +struct hashtable *reachable; +struct hashtable *domains; +}; +static int check_store_step (const void *ctx,struct connection *conn,struct node *node,void *arg) { -struct hashtable *reachable = arg; +struct check_store_data *data = arg; -if (hashtable_search (reachable, (void *)node->name)) { +if (hashtable_search (data->reachable, (void *)node->name)) {log ("check_store: '%s' is duplicated!" , node->name);return recovery ?WALK_TREE_RM_CHILDENTRY :WALK_TREE_SKIP_CHILDREN ; } -if (!remember_string (reachable, node->name)) +if (!remember_string (data->reachable, node->name))return WALK_TREE_ERROR_STOP ; +domain_check_acc_add (node, data->domains); +return WALK_TREE_OK ; }
@@ -2496,37 +2502,61 @@ static int clean_store_(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA val,* Given the list of reachable nodes, iterate over the whole store, and * remove any that were not reached. */ -static void clean_store (struct hashtable *reachable) +static void clean_store (struct check_store_data *data) { -tdb_traverse (tdb_ctx, &clean_store_, reachable); +tdb_traverse (tdb_ctx, &clean_store_, data->reachable); +domain_check_acc (data->domains); } +int check_store_path (const char *name,struct check_store_data *data) +{ +struct node *node; + + node =read_node (NULL ,NULL , name); +if (!node) { +log ("check_store: error %d reading special node '%s'" , errno, + name); +return errno; + } + +return check_store_step (NULL ,NULL , node, data); +}void check_store (void ) { -struct hashtable *reachable;struct walk_funcs walkfuncs = { .enter = check_store_step, .enoent = check_store_enoent, }; +struct check_store_data data;/* Don't free values (they are all void *1) */ - reachable =create_hashtable (NULL ,16 , hash_from_key_fn, keys_equal_fn, -HASHTABLE_FREE_KEY ); -if (!reachable) { + data.reachable =create_hashtable (NULL ,16 , hash_from_key_fn, + keys_equal_fn,HASHTABLE_FREE_KEY ); +if (!data.reachable) {log ("check_store: ENOMEM" );return ; } + data.domains =domain_check_acc_init (); +if (!data.domains) { +log ("check_store: ENOMEM" ); + goto out_hash; + } +log ("Checking store ..." ); -if (walk_node_tree (NULL ,NULL ,"/" , &walkfuncs, reachable)) { +if (walk_node_tree (NULL ,NULL ,"/" , &walkfuncs, &data)) {if (errno ==ENOMEM )log ("check_store: ENOMEM" ); - }else if (!check_transactions (reachable)) -clean_store (reachable); + }else if (!check_store_path ("@introduceDomain" , &data) && + !check_store_path ("@releaseDomain" , &data) && + !check_transactions (data.reachable)) +clean_store (&data);log ("Checking store complete." ); -hashtable_destroy (reachable); +hashtable_destroy (data.domains); + out_hash: +hashtable_destroy (data.reachable); }
@@ -2925,6 +2955,8 @@ int main(int argc, char *argv[])lu_read_state ();#endif +check_store (); +/* Get ready to listen to the tools. */ initialize_fds (&sock_pollfd_idx, &timeout);
tools/xenstore/xenstored_domain.c +86 -0
92 lines not on this page · raw message
tools/xenstore/xenstored_domain.h +4 -0
@@ -129,4 +129,8 @@ const char *dump_state_connections(FILE *fp);void read_state_connection (const void *ctx,const void *state); +struct hashtable *domain_check_acc_init (void ); +void domain_check_acc_add (const struct node *node,struct hashtable *domains); +void domain_check_acc (struct hashtable *domains); +#endif /* _XENSTORED_DOMAIN_H */
Signature · 1 line
2.35.3
Re: [PATCH v3 16/17] tools/xenstore: let check_store() check the accounting data
Hi Juergen,
Quoted 3 lines · Juergen Gross
Today
check_store()is only testing the correctness of the node tree.Add verification of the accounting data (number of nodes) and correct
NIT: one too many space before 'and'.
Quoted 4 lines
the data if it is wrong.
Do the initial
check_store()call only after Xenstore entries of a live update have been read.
Can you clarify whether this is needed for the rest of the patch, or simply a nice thing to have in general?
Quoted 29 lines
Signed-off-by Juergen Gross <[email protected]>--- tools/xenstore/xenstored_core.c | 62 ++++++++++++++++------ tools/xenstore/xenstored_domain.c | 86 +++++++++++++++++++++++++++++++ tools/xenstore/xenstored_domain.h | 4 ++ 3 files changed, 137 insertions(+), 15 deletions(-)tools/xenstore/xenstored_core.c +4
-2@@ -2389,8 +2389,6 @@ void setup_structure(bool live_update)manual_node ("@introduceDomain" ,NULL );domain_nbentry_fix (dom0_domid,5 , true); } - -check_store (); }static unsigned int hash_from_key_fn (void *k)@@ -2433,20 +2431,28 @@ int remember_string(struct hashtable *hash, const char *str)* As we go, we record each node in the given reachable hashtable. These * entries will be used later in clean_store. */ + +struct check_store_data { +struct hashtable *reachable; +struct hashtable *domains;
tools/xenstore/xenstored_core.c int remember_string(struct hashtable *hash, const char *str) · line 2445
Quoted 10 lines
tools/xenstore/xenstored_core.c +4
-2+}; +static int check_store_step (const void *ctx,struct connection *conn,struct node *node,void *arg) { -struct hashtable *reachable = arg; +struct check_store_data *data = arg; -if (hashtable_search (reachable, (void *)node->name)) { +if (hashtable_search (data->reachable, (void *)node->name)) {
IIUC the cast is only necessary because hashtable_search() expects a non-const value. I can't think for a reason for the key to be non-const. So I will look to send a follow-up patch.
tools/xenstore/xenstored_core.c int remember_string(struct hashtable *hash, const char *str) · line 2452
Quoted 7 lines
tools/xenstore/xenstored_core.c +7
-0+ +void domain_check_acc_add (const struct node *node,struct hashtable *domains) +{ +struct domain_acc *dom; +unsigned int domid; + + domid = node->perms.p[0 ].id;
This could be replaced with get_node_owner().
tools/xenstore/xenstored_core.c int remember_string(struct hashtable *hash, const char *str)
Quoted 8 lines
tools/xenstore/xenstored_core.c +8
-0+ dom =hashtable_search (domains, &domid); +if (!dom) +log ("Node %s owned by unknown domain %u" , node->name, domid); +else + dom->nodes++; +} + +static int domain_check_acc_sub (const void *k,void *v,void *arg)
I find the suffix 'sub' misleading because we have a function with a very similar name (instead suffixed 'sub'). Yet, AFAICT, it is not meant to substract.
So I would prefix with '_cb' instead.
Cheers,
Signature · 1 line
Julien Grall
Re: [PATCH v3 16/17] tools/xenstore: let check_store() check the accounting data
Quoted 7 lines · Julien Grall
Hi Juergen,
Quoted 3 lines · Juergen Gross
Today
check_store()is only testing the correctness of the node tree.Add verification of the accounting data (number of nodes) and correct
Quoted 8 lines
NIT: one too many space before 'and'.
Quoted 4 lines
the data if it is wrong.
Do the initial
check_store()call only after Xenstore entries of a live update have been read.Can you clarify whether this is needed for the rest of the patch, or simply a nice thing to have in general?
I'll add: "This is wanted to make sure the accounting data is correct after a live update."
Quoted 33 lines
Quoted 33 lines
Signed-off-by Juergen Gross <[email protected]>---
tools/xenstore/xenstored_core.c | 62 ++++++++++++++++------tools/xenstore/xenstored_domain.c| 86 +++++++++++++++++++++++++++++++tools/xenstore/xenstored_domain.h| 4 ++3 files changed, 137 insertions(+), 15 deletions(-)tools/xenstore/xenstored_core.c +6
-2@@ -2389,8 +2389,6 @@ void setup_structure(bool live_update) manual_node("@introduceDomain", NULL); domain_nbentry_fix(dom0_domid, 5, true); } - - check_store(); } static unsigned int hash_from_key_fn(void *k)@@ -2433,20 +2431,28 @@ int remember_string(struct hashtable *hash, const char*str) * As we go, we record each node in the given reachable hashtable. These * entries will be used later in clean_store. */ + +struct check_store_data { + struct hashtable *reachable; + struct hashtable *domains; +}; + static int check_store_step(const void *ctx, struct connection *conn,
Quoted 8 lines
tools/xenstore/xenstored_core.c int remember_string(struct hashtable *hash, const char *str) · line 2445
Quoted 6 lines
tools/xenstore/xenstored_core.c +2
-2struct node *node, void *arg) { - struct hashtable *reachable = arg; + struct check_store_data *data = arg; - if (hashtable_search(reachable, (void *)node->name)) { + if (hashtable_search(data->reachable, (void *)node->name)) {IIUC the cast is only necessary because
hashtable_search()expects a non-const value. I can't think for a reason for the key to be non-const. So I will look to send a follow-up patch.
It is possible, but nasty, due to talloc_free() not taking a const pointer.
Quoted 10 lines
tools/xenstore/xenstored_core.c int remember_string(struct hashtable *hash, const char · line 2452
Quoted 8 lines
tools/xenstore/xenstored_core.c +7
-0+ +void domain_check_acc_add (const struct node *node,struct hashtable *domains) +{ + struct domain_acc *dom; + unsigned int domid; + + domid = node->perms.p[0].id;This could be replaced with
get_node_owner().
Indeed.
Quoted 12 lines
tools/xenstore/xenstored_core.c int remember_string(struct hashtable *hash, const char
Quoted 9 lines
tools/xenstore/xenstored_core.c +8
-0+ dom = hashtable_search(domains, &domid); + if (!dom) + log("Node %s owned by unknown domain %u", node->name, domid); + else + dom->nodes++; +} + +static int domain_check_acc_sub (const void *k,void *v,void *arg)I find the suffix 'sub' misleading because we have a function with a very similar name (instead suffixed 'sub'). Yet, AFAICT, it is not meant to substract.
Quoted 1 line
So I would prefix with '
_cb' instead.
Fine with me.
Juergen
Re: [PATCH v3 16/17] tools/xenstore: let check_store() check the accounting data
Hi Juergen,
Quoted 12 lines · Juergen Gross
Quoted 11 lines · Julien Grall
Hi Juergen,
Quoted 3 lines · Juergen Gross
Today
check_store()is only testing the correctness of the node tree.Add verification of the accounting data (number of nodes) and correct
NIT: one too many space before 'and'.
Quoted 2 lines
the data if it is wrong.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Do the initial
check_store()call only after Xenstore entries of a live update have been read.Can you clarify whether this is needed for the rest of the patch, or simply a nice thing to have in general?
I'll add: "This is wanted to make sure the accounting data is correct after a live update."
Fine with me.
Quoted 43 lines
Quoted 34 lines
Quoted 34 lines
Signed-off-by Juergen Gross <[email protected]>---
tools/xenstore/xenstored_core.c | 62 ++++++++++++++++------tools/xenstore/xenstored_domain.c| 86 +++++++++++++++++++++++++++++++tools/xenstore/xenstored_domain.h| 4 ++3 files changed, 137 insertions(+), 15 deletions(-)tools/xenstore/xenstored_core.c +6
-2@@ -2389,8 +2389,6 @@ void setup_structure(bool live_update) manual_node("@introduceDomain", NULL); domain_nbentry_fix(dom0_domid, 5, true); } - - check_store(); } static unsigned int hash_from_key_fn(void *k)@@ -2433,20 +2431,28 @@ int remember_string(struct hashtable *hash,const char *str) * As we go, we record each node in the given reachable hashtable. These * entries will be used later in clean_store. */ + +struct check_store_data { + struct hashtable *reachable; + struct hashtable *domains; +}; + static int check_store_step(const void *ctx, struct connection *conn,Quoted 8 lines
tools/xenstore/xenstored_core.c int remember_string(struct hashtable *hash, const char *str) · line 2445
Quoted 6 lines
tools/xenstore/xenstored_core.c +2
-2struct node *node, void *arg) { - struct hashtable *reachable = arg; + struct check_store_data *data = arg; - if (hashtable_search(reachable, (void *)node->name)) { + if (hashtable_search(data->reachable, (void *)node->name)) {IIUC the cast is only necessary because
hashtable_search()expects a non-const value. I can't think for a reason for the key to be non-const. So I will look to send a follow-up patch.
Quoted 1 line
It is possible, but nasty, due to
talloc_free()not taking a const pointer.
I am not sure I understand your reasoning. Looking at hashtable_search(), I don't see a call to talloc_free().
Anyway, this is not directly related to this patch. So I will have a look separately.
Cheers,
Signature · 1 line
Julien Grall
Re: [PATCH v3 16/17] tools/xenstore: let check_store() check the accounting data
Quoted 68 lines · Julien Grall
Hi Juergen,
Quoted 12 lines · Juergen Gross
Quoted 11 lines · Julien Grall
Hi Juergen,
Quoted 3 lines · Juergen Gross
Today
check_store()is only testing the correctness of the node tree.Add verification of the accounting data (number of nodes) and correct
NIT: one too many space before 'and'.
Quoted 2 lines
the data if it is wrong.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Do the initial
check_store()call only after Xenstore entries of a live update have been read.Can you clarify whether this is needed for the rest of the patch, or simply a nice thing to have in general?
I'll add: "This is wanted to make sure the accounting data is correct after a live update."
Fine with me.
Quoted 43 lines
Quoted 42 lines
Quoted 30 lines
Signed-off-by Juergen Gross <[email protected]>---
tools/xenstore/xenstored_core.c | 62 ++++++++++++++++------tools/xenstore/xenstored_domain.c| 86 +++++++++++++++++++++++++++++++tools/xenstore/xenstored_domain.h| 4 ++3 files changed, 137 insertions(+), 15 deletions(-)tools/xenstore/xenstored_core.c +3
-2@@ -2389,8 +2389,6 @@ void setup_structure(bool live_update) manual_node("@introduceDomain", NULL); domain_nbentry_fix(dom0_domid, 5, true); } - - check_store(); } static unsigned int hash_from_key_fn(void *k)@@ -2433,20 +2431,28 @@ int remember_string(struct hashtable *hash, constchar *str) * As we go, we record each node in the given reachable hashtable. These * entries will be used later in clean_store. */ + +struct check_store_data { + struct hashtable *reachable;tools/xenstore/xenstored_core.c int remember_string(struct hashtable *hash, const · line 2445
Quoted 10 lines
tools/xenstore/xenstored_core.c +5
-2+ struct hashtable *domains; +}; + static int check_store_step(const void *ctx, struct connection *conn, struct node *node, void *arg) { - struct hashtable *reachable = arg; + struct check_store_data *data = arg; - if (hashtable_search(reachable, (void *)node->name)) { + if (hashtable_search(data->reachable, (void *)node->name)) {IIUC the cast is only necessary because
hashtable_search()expects a non-const value. I can't think for a reason for the key to be non-const. So I will look to send a follow-up patch.
Quoted 3 lines
Quoted 1 line
It is possible, but nasty, due to
talloc_free()not taking a const pointer.I am not sure I understand your reasoning. Looking at
hashtable_search(), I don't see a call totalloc_free().
Oh, I thought you were referring to the key in general.
Juergen
PATCH v3 17/17 tools/xenstore: make output of "xenstore-control help" more pretty
In reply to Juergen GrossUsing a tab for separating the command from the options in the output of "xenstore-control help" results in a rather ugly list.
Use a fixed size for the command instead.
---
V2:
- new patch
--- tools/xenstore/xenstored_control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/xenstore/xenstored_control.c +1 -1
@@ -996,7 +996,7 @@ static int do_control_help(const void *ctx, struct connection *conn,if (!resp)return ENOMEM ;for (cmd =0 ; cmd <ARRAY_SIZE (cmds); cmd++) { - resp =talloc_asprintf_append (resp,"%s\t%s\n" , + resp =talloc_asprintf_append (resp,"%-15s %s\n" , cmds[cmd].cmd, cmds[cmd].pars);if (!resp)return ENOMEM ;
Signature · 1 line
2.35.3
Re: [PATCH v3 17/17] tools/xenstore: make output of "xenstore-control help" more pretty
Hi Juergen,
Quoted 6 lines · Juergen Gross
Using a tab for separating the command from the options in the output of "xenstore-control help" results in a rather ugly list.
Use a fixed size for the command instead.
Signed-off-by Juergen Gross <[email protected]>
Cheers,
Signature · 1 line
Julien Grall
Quoted 5 lines · Juergen Gross
This is a first run of post-XSA patches which piled up during the development phase of all the recent Xenstore related XSA patches.
At least the first 5 patches are completely independent from each other. After those the dependencies are starting to be more complex.
The same was said in v2, yet three(?) of the early patches were committed already. Hence with a look towards committing I wonder in how far the 5 above is accurate.
Jan
Quoted 10 lines · Jan Beulich
Quoted 5 lines · Juergen Gross
This is a first run of post-XSA patches which piled up during the development phase of all the recent Xenstore related XSA patches.
At least the first 5 patches are completely independent from each other. After those the dependencies are starting to be more complex.
The same was said in v2, yet three(?) of the early patches were committed already. Hence with a look towards committing I wonder in how far the 5 above is accurate.
I think it is still true, maybe even patch 6 could be applied, but that one would require at least some context editing (changes of patch 4 are visible in the patch file).
Juergen