tools/xenstore
cover tools/xenstore
This series reworks the Xenstore internal accounting to use a uniform generic framework. It is adding some additional useful diagnostic information, like accounting trace and max. per-domain and global quota values seen.
This series is based on top of the series "tools/xenstore: do some cleanup and fixes".
Juergen Gross (12):
tools/xenstore: manage per-transaction domain accounting data in an
array
tools/xenstore: introduce accounting data array for per-domain values tools/xenstore: add framework to commit accounting data on success
only
tools/xenstore: use accounting buffering for node accounting tools/xenstore: add current connection to domain_memory_add()
parameters
tools/xenstore: use accounting data array for per-domain values tools/xenstore: add accounting trace support tools/xenstore: add TDB access trace support tools/xenstore: switch transaction accounting to generic accounting tools/xenstore: remember global and per domain max accounting values tools/xenstore: use generic accounting for remaining quotas tools/xenstore: switch quota management to be table based
docs/misc/xenstore.txt | 5 +- tools/xenstore/xenstored_control.c | 65 ++-- tools/xenstore/xenstored_core.c | 164 +++++----- tools/xenstore/xenstored_core.h | 23 +- tools/xenstore/xenstored_domain.c | 414 ++++++++++++++++++------- tools/xenstore/xenstored_domain.h | 55 +++- tools/xenstore/xenstored_transaction.c | 22 +- tools/xenstore/xenstored_watch.c | 15 +- 8 files changed, 496 insertions(+), 267 deletions(-)
Signature · 1 line
2.35.3
PATCH 1/12 tools/xenstore: manage per-transaction domain accounting data in an array
In order to prepare keeping accounting data in an array instead of using independent fields, switch the struct changed_domain accounting data to that scheme, for now only using an array with one element.
In order to be able to extend this scheme add the needed indexing enum to xenstored_domain.h.
--- tools/xenstore/xenstored_domain.c | 17 +++++++++-------- tools/xenstore/xenstored_domain.h | 5 +++++ 2 files changed, 14 insertions(+), 8 deletions(-)
tools/xenstore/xenstored_domain.c +9 -8
@@ -99,8 +99,8 @@ struct changed_domain/* Identifier of the changed domain. */ unsigned int domid; -/* Amount by which this domain's nbentry field has changed. */ -int nbentry; +/* Accounting data. */ +int acc[ACC_TR_N ]; };static struct hashtable *domhash;
@@ -558,7 +558,7 @@ int acc_fix_domains(struct list_head *head, bool update)int cnt;list_for_each_entry (cd, head, list) { - cnt =domain_nbentry_fix (cd->domid, cd->nbentry, update); + cnt =domain_nbentry_fix (cd->domid, cd->acc[ACC_NODES ], update);if (!update) {if (cnt >= quota_nb_entry_per_domain)return ENOSPC ;
@@ -603,8 +603,8 @@ static struct changed_domain *acc_get_changed_domain(const void *ctx,return cd; } -static int acc_add_dom_nbentry (const void *ctx,struct list_head *head,int val, -unsigned int domid) +static int acc_add_changed_dom (const void *ctx,struct list_head *head, +unsigned int what,int val,unsigned int domid) {struct changed_domain *cd;
@@ -613,9 +613,9 @@ static int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val,return 0 ; errno =0 ; - cd->nbentry += val; + cd->acc[what] += val; -return cd->nbentry; +return cd->acc[what]; }static void domain_conn_reset (struct domain *domain)
@@ -1076,7 +1076,8 @@ static int domain_nbentry_add(struct connection *conn, unsigned int domid,if (conn && conn->transaction) { head =transaction_get_changed_domains (conn->transaction); - ret =acc_add_dom_nbentry (conn->transaction, head, add, domid); + ret =acc_add_changed_dom (conn->transaction, head,ACC_NODES , + add, domid);if (errno) {fail_transaction (conn->transaction);return -1 ;
tools/xenstore/xenstored_domain.h +5 -0
@@ -19,6 +19,11 @@#ifndef _XENSTORED_DOMAIN_H#define _XENSTORED_DOMAIN_H +enum { +ACC_NODES , +ACC_TR_N /* Number of elements per transaction and domain. */ +}; +void handle_event (void );void check_domains (void );
Signature · 1 line
2.35.3
Re: [PATCH 01/12] tools/xenstore: manage per-transaction domain accounting data in an array
Hi Juergen,
Quoted 38 lines · Juergen Gross
In order to prepare keeping accounting data in an array instead of using independent fields, switch the struct
changed_domainaccounting data to that scheme, for now only using an array with one element.In order to be able to extend this scheme add the needed indexing enum to
xenstored_domain.h.Signed-off-by Juergen Gross <[email protected]>--- tools/xenstore/xenstored_domain.c | 17 +++++++++-------- tools/xenstore/xenstored_domain.h | 5 +++++ 2 files changed, 14 insertions(+), 8 deletions(-)tools/xenstore/xenstored_domain.c +3
-3@@ -99,8 +99,8 @@ struct changed_domain/* Identifier of the changed domain. */ unsigned int domid; -/* Amount by which this domain's nbentry field has changed. */ -int nbentry; +/* Accounting data. */ +int acc[ACC_TR_N ]; };static struct hashtable *domhash;@@ -558,7 +558,7 @@ int acc_fix_domains(struct list_head *head, bool update)int cnt;list_for_each_entry (cd, head, list) { - cnt =domain_nbentry_fix (cd->domid, cd->nbentry, update); + cnt =domain_nbentry_fix (cd->domid, cd->acc[ACC_NODES ], update);if (!update) {if (cnt >= quota_nb_entry_per_domain)return ENOSPC ;
tools/xenstore/xenstored_domain.c static struct changed_domain *acc_get_changed_domain(const void *ctx, · line 607
Quoted 7 lines
tools/xenstore/xenstored_domain.c +2
-2@@ -603,8 +603,8 @@ static struct changed_domain *acc_get_changed_domain(const void *ctx,return cd; } -static int acc_add_dom_nbentry (const void *ctx,struct list_head *head,int val, -unsigned int domid) +static int acc_add_changed_dom (const void *ctx,struct list_head *head, +unsigned int what,int val,unsigned int domid)
AFAIU "what" will be a value from the enum. So let's do some hardening and use the type "enum ...".
tools/xenstore/xenstored_domain.c static int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val, · line 616
Quoted 8 lines
tools/xenstore/xenstored_domain.c +0
-1{struct changed_domain *cd;@@ -613,9 +613,9 @@ static int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val,return 0 ; errno =0 ; - cd->nbentry += val;
I would consider to adding an assert() (or possibly runtime check) to confirm the 'what' is smaller than the array size.
Quoted 23 lines
tools/xenstore/xenstored_domain.c +4
-2+ cd->acc[what] += val; -return cd->nbentry; +return cd->acc[what]; }static void domain_conn_reset (struct domain *domain)@@ -1076,7 +1076,8 @@ static int domain_nbentry_add(struct connection *conn, unsigned int domid,if (conn && conn->transaction) { head =transaction_get_changed_domains (conn->transaction); - ret =acc_add_dom_nbentry (conn->transaction, head, add, domid); + ret =acc_add_changed_dom (conn->transaction, head,ACC_NODES , + add, domid);if (errno) {fail_transaction (conn->transaction);return -1 ;tools/xenstore/xenstored_domain.h +0
-0@@ -19,6 +19,11 @@#ifndef _XENSTORED_DOMAIN_H
tools/xenstore/xenstored_domain.h line 29
Quoted 10 lines
tools/xenstore/xenstored_domain.h +5
-0#define _XENSTORED_DOMAIN_H +enum { +ACC_NODES , +ACC_TR_N /* Number of elements per transaction and domain. */ +}; +void handle_event (void );void check_domains (void );
Cheers,
Signature · 1 line
Julien Grall
Re: [PATCH 01/12] tools/xenstore: manage per-transaction domain accounting data in an array
Quoted 39 lines · Julien Grall
Hi Juergen,
Quoted 36 lines · Juergen Gross
In order to prepare keeping accounting data in an array instead of using independent fields, switch the struct
changed_domainaccounting data to that scheme, for now only using an array with one element.In order to be able to extend this scheme add the needed indexing enum to
xenstored_domain.h.Signed-off-by Juergen Gross <[email protected]>---
tools/xenstore/xenstored_domain.c| 17 +++++++++--------tools/xenstore/xenstored_domain.h| 5 +++++2 files changed, 14 insertions(+), 8 deletions(-)tools/xenstore/xenstored_domain.c +3
-3@@ -99,8 +99,8 @@ struct changed_domain /* Identifier of the changed domain. */ unsigned int domid; - /* Amount by which this domain's nbentry field has changed. */ - int nbentry; + /* Accounting data. */ + int acc[ACC_TR_N]; }; static struct hashtable *domhash;@@ -558,7 +558,7 @@ int acc_fix_domains(struct list_head *head, bool update) int cnt; list_for_each_entry(cd, head, list) { - cnt = domain_nbentry_fix(cd->domid, cd->nbentry, update); + cnt = domain_nbentry_fix(cd->domid, cd->acc[ACC_NODES], update); if (!update) { if (cnt >= quota_nb_entry_per_domain) return ENOSPC;@@ -603,8 +603,8 @@ static struct changed_domain *acc_get_changed_domain(const void *ctx,
Quoted 8 lines
tools/xenstore/xenstored_domain.c static struct changed_domain *acc_get_changed_domain(const void *ctx, · line 607
Quoted 6 lines
tools/xenstore/xenstored_domain.c +2
-2return cd; } -static int acc_add_dom_nbentry (const void *ctx,struct list_head *head,int val, - unsigned int domid) +static int acc_add_changed_dom (const void *ctx,struct list_head *head, + unsigned int what, int val, unsigned int domid)AFAIU "what" will be a value from the enum. So let's do some hardening and use the type "enum ...".
Yes, will do that (and in the following patches, too).
Quoted 10 lines
tools/xenstore/xenstored_domain.c static int acc_add_dom_nbentry(const void *ctx, struct · line 616
Quoted 8 lines
tools/xenstore/xenstored_domain.c +0
-1{ struct changed_domain *cd;@@ -613,9 +613,9 @@ static int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val, return 0; errno = 0; - cd->nbentry += val;I would consider to adding an
assert()(or possibly runtime check) to confirm the 'what' is smaller than the array size.
Okay.
Juergen
PATCH 2/12 tools/xenstore: introduce accounting data array for per-domain values
In reply to Juergen GrossIntroduce the scheme of an accounting data array for per-domain accounting data and use it initially for the number of nodes owned by a domain.
Make the accounting data type to be unsigned int, as no data is allowed to be negative at any time.
--- tools/xenstore/xenstored_domain.c | 55 ++++++++++++++++++++----------- tools/xenstore/xenstored_domain.h | 5 +-- 2 files changed, 38 insertions(+), 22 deletions(-)
tools/xenstore/xenstored_domain.c +35 -20
@@ -69,8 +69,8 @@ struct domain/* Has domain been officially introduced? */ bool introduced; -/* number of entry from this domain in the store */ -int nbentry; +/* Accounting data for this domain. */ +unsigned int acc[ACC_N ];/* Amount of memory allocated for this domain. */ int memory;
@@ -246,7 +246,7 @@ static int domain_tree_remove_sub(const void *ctx, struct connection *conn,if (keep_orphans) {set_tdb_key (node->name, &key); - domain->nbentry--; +domain_nbentry_dec (NULL , domain->domid); node->perms.p[0 ].id = priv_domid; node->acc.memory =0 ;domain_nbentry_inc (NULL , priv_domid);
@@ -270,7 +270,7 @@ static int domain_tree_remove_sub(const void *ctx, struct connection *conn, ret =WALK_TREE_SKIP_CHILDREN ; } -return domain->nbentry >0 ? ret :WALK_TREE_SUCCESS_STOP ; +return domain->acc[ACC_NODES ] ? ret :WALK_TREE_SUCCESS_STOP ; }static void domain_tree_remove (struct domain *domain)
@@ -278,7 +278,7 @@ static void domain_tree_remove(struct domain *domain)int ret;struct walk_funcs walkfuncs = { .enter = domain_tree_remove_sub }; -if (domain->nbentry >0 ) { +if (domain->acc[ACC_NODES ]) { ret =walk_node_tree (domain,NULL ,"/" , &walkfuncs, domain);if (ret ==WALK_TREE_ERROR_STOP ) syslog(LOG_ERR,
@@ -441,7 +441,7 @@ int domain_get_quota(const void *ctx, struct connection *conn, resp = talloc_asprintf_append(resp, "%-16s: %8d\n", #t, e); \ if (!resp) return ENOMEM -ent (nodes, d->nbentry); +ent (nodes, d->acc[ACC_NODES ]);ent (watches, d->nbwatch);ent (transactions, ta);ent (outstanding, d->nboutstanding);
@@ -1050,8 +1050,21 @@ int domain_adjust_node_perms(struct node *node)return 0 ; } -static int domain_nbentry_add (struct connection *conn,unsigned int domid, -int add,bool dom_exists) +static int domain_acc_add_chk (struct domain *d,unsigned int what,int add, +unsigned int domid) +{ +if ((add <0 && -add > d->acc[what]) || + (d->acc[what] + add) >INT_MAX ) { +syslog (LOG_ERR ,"Accounting error: domain %u type %u val %u\n" , + domid, what, d->acc[what] + add); +return (add <0 ) ?0 :INT_MAX ; + } + +return d->acc[what] + add; +} + +static int domain_acc_add (struct connection *conn,unsigned int domid, +unsigned int what,int add,bool dom_exists) {struct domain *d;struct list_head *head;
@@ -1074,47 +1087,49 @@ static int domain_nbentry_add(struct connection *conn, unsigned int domid, } } -if (conn && conn->transaction) { +if (conn && conn->transaction && what <ACC_TR_N ) { head =transaction_get_changed_domains (conn->transaction); - ret =acc_add_changed_dom (conn->transaction, head,ACC_NODES , + ret =acc_add_changed_dom (conn->transaction, head, what, add, domid);if (errno) {fail_transaction (conn->transaction);return -1 ; } -return d->nbentry + ret; +return domain_acc_add_chk (d, what, ret, domid); } - d->nbentry += add; + d->acc[what] =domain_acc_add_chk (d, what, add, domid); -return d->nbentry; +return d->acc[what]; }int domain_nbentry_inc (struct connection *conn,unsigned int domid) { -return (domain_nbentry_add (conn, domid,1 , false) <0 ) ? errno :0 ; +return (domain_acc_add (conn, domid,ACC_NODES ,1 , false) <0 ) + ? errno :0 ; }int domain_nbentry_dec (struct connection *conn,unsigned int domid) { -return (domain_nbentry_add (conn, domid,-1 , true) <0 ) ? errno :0 ; +return (domain_acc_add (conn, domid,ACC_NODES ,-1 , true) <0 ) + ? errno :0 ; }int domain_nbentry_fix (unsigned int domid,int num,bool update) {int ret; - ret =domain_nbentry_add (NULL , domid, update ? num :0 , update); + ret =domain_acc_add (NULL , domid,ACC_NODES , update ? num :0 , update);if (ret <0 || update)return ret;return domid_is_unprivileged (domid) ? ret + num :0 ; } -int domain_nbentry (struct connection *conn) +unsigned int domain_nbentry (struct connection *conn) {return domain_is_unprivileged (conn) - ?domain_nbentry_add (conn, conn->id,0 , true) :0 ; + ?domain_acc_add (conn, conn->id,ACC_NODES ,0 , true) :0 ; }static bool domain_chk_quota (struct domain *domain,int mem)
@@ -1591,7 +1606,7 @@ static int domain_check_acc_init_sub(void *k, void *v, void *arg)* If everything is correct incrementing the value for each node will * result in dom->nodes being 0 at the end. */ - dom->nodes = -d->nbentry; + dom->nodes = -d->acc[ACC_NODES ];if (!hashtable_insert (domains, &dom->domid, dom)) {talloc_free (dom);
@@ -1646,7 +1661,7 @@ static int domain_check_acc_sub(void *k, void *v, void *arg)if (!d)return 0 ; - d->nbentry += dom->nodes; + d->acc[ACC_NODES ] += dom->nodes;return 0 ; }
tools/xenstore/xenstored_domain.h +3 -2
@@ -21,7 +21,8 @@enum {ACC_NODES , -ACC_TR_N /* Number of elements per transaction and domain. */ +ACC_TR_N ,/* Number of elements per transaction and domain. */ +ACC_N =ACC_TR_N /* Number of elements per domain. */ };void handle_event (void );
@@ -72,7 +73,7 @@ int domain_alloc_permrefs(struct node_perms *perms);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); +unsigned int domain_nbentry (struct connection *conn);int domain_memory_add (unsigned int domid,int mem,bool no_quota_check);/*
Signature · 1 line
2.35.3
PATCH 3/12 tools/xenstore: add framework to commit accounting data on success only
In reply to Juergen GrossInstead of modifying accounting data and undo those modifications in case of an error during further processing, add a framework for collecting the needed changes and commit them only when the whole operation has succeeded.
This scheme can reuse large parts of the per transaction accounting. The changed_domain handling can be reused, but the array size of the accounting data should be possible to be different for both use cases.
--- tools/xenstore/xenstored_core.c | 5 +++ tools/xenstore/xenstored_core.h | 3 ++ tools/xenstore/xenstored_domain.c | 61 ++++++++++++++++++++++++++++--- tools/xenstore/xenstored_domain.h | 5 ++- 4 files changed, 67 insertions(+), 7 deletions(-)
tools/xenstore/xenstored_core.c +5 -0
@@ -1027,6 +1027,9 @@ static void send_error(struct connection *conn, int error)break ; } } + +acc_drop (conn); +send_reply (conn,XS_ERROR , xsd_errors[i].errstring,strlen (xsd_errors[i].errstring) +1 ); }
@@ -1064,6 +1067,7 @@ void send_reply(struct connection *conn, enum xsd_sockmsg_type type, } conn->in =NULL ; +acc_commit (conn);/* Update relevant header fields and fill in the message body. */ bdata->hdr.msg.type = type;
@@ -2186,6 +2190,7 @@ struct connection *new_connection(const struct interface_funcs *funcs) new->is_stalled = false; new->transaction_started =0 ;INIT_LIST_HEAD (&new->out_list); +INIT_LIST_HEAD (&new->acc_list);INIT_LIST_HEAD (&new->ref_list);INIT_LIST_HEAD (&new->watches);INIT_LIST_HEAD (&new->transaction_list);
tools/xenstore/xenstored_core.h +3 -0
@@ -139,6 +139,9 @@ struct connectionstruct list_head out_list;uint64_t timeout_msec; +/* Not yet committed accounting data (valid if in != NULL). */ +struct list_head acc_list; +/* Referenced requests no longer pending. */ struct list_head ref_list;
tools/xenstore/xenstored_domain.c +55 -6
108 lines not on this page · raw message
tools/xenstore/xenstored_domain.h +4 -1
@@ -20,7 +20,8 @@#define _XENSTORED_DOMAIN_Henum { -ACC_NODES , +ACC_REQ_N ,/* Number of elements per request and domain. */ +ACC_NODES =ACC_REQ_N ,ACC_TR_N ,/* Number of elements per transaction and domain. */ ACC_N =ACC_TR_N /* Number of elements per domain. */ };
@@ -103,6 +104,8 @@ 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); +void acc_drop (struct connection *conn); +void acc_commit (struct connection *conn);/* Write rate limiting */
Signature · 1 line
2.35.3
PATCH 4/12 tools/xenstore: use accounting buffering for node accounting
In reply to Juergen GrossAdd the node accounting to the accounting information buffering in order to avoid having to undo it in case of failure.
--- tools/xenstore/xenstored_core.c | 21 ++------------------- tools/xenstore/xenstored_domain.h | 4 ++-- 2 files changed, 4 insertions(+), 21 deletions(-)
tools/xenstore/xenstored_core.c +2 -19
@@ -1442,7 +1442,6 @@ 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_nbentry_dec (conn, node->perms.p[0 ].id);/* * It is not possible to easily revert the changes in a transaction.
@@ -1788,27 +1787,11 @@ static int do_set_perms(const void *ctx, struct connection *conn, old_perms = node->perms;domain_nbentry_dec (conn, node->perms.p[0 ].id); node->perms = perms; -if (domain_nbentry_inc (conn, node->perms.p[0 ].id)) { - node->perms = old_perms; -/* -* This should never fail because we had a reference on the -* domain before and Xenstored is single-threaded. -*/ -domain_nbentry_inc (conn, node->perms.p[0 ].id); +if (domain_nbentry_inc (conn, node->perms.p[0 ].id))return ENOMEM ; - } -if (write_node (conn, node, false)) { -int saved_errno = errno; - -domain_nbentry_dec (conn, node->perms.p[0 ].id); - node->perms = old_perms; -/* No failure possible as above. */ -domain_nbentry_inc (conn, node->perms.p[0 ].id); - - errno = saved_errno; +if (write_node (conn, node, false))return errno; - }fire_watches (conn, ctx, name, node, false, &old_perms);send_ack (conn,XS_SET_PERMS );
tools/xenstore/xenstored_domain.h +2 -2
@@ -20,9 +20,9 @@#define _XENSTORED_DOMAIN_Henum { +ACC_NODES ,ACC_REQ_N ,/* Number of elements per request and domain. */ -ACC_NODES =ACC_REQ_N , -ACC_TR_N ,/* Number of elements per transaction and domain. */ +ACC_TR_N =ACC_REQ_N ,/* Number of elements per transaction and domain. */ ACC_N =ACC_TR_N /* Number of elements per domain. */ };
Signature · 1 line
2.35.3
PATCH 5/12 tools/xenstore: add current connection to domain_memory_add() parameters
In reply to Juergen GrossIn order to enable switching memory accounting to the generic array based accounting, add the current connection to the parameters of domain_memory_add().
This requires to add the connection to some other functions, too.
--- tools/xenstore/xenstored_core.c | 28 ++++++++++++++++------------ tools/xenstore/xenstored_domain.c | 3 ++- tools/xenstore/xenstored_domain.h | 14 +++++++++----- tools/xenstore/xenstored_watch.c | 11 ++++++----- 4 files changed, 33 insertions(+), 23 deletions(-)
tools/xenstore/xenstored_core.c +16 -12
@@ -246,7 +246,8 @@ static void free_buffered_data(struct buffered_data *out, } } -domain_memory_add_nochk (conn->id, -out->hdr.msg.len -sizeof (out->hdr)); +domain_memory_add_nochk (conn, conn->id, + -out->hdr.msg.len -sizeof (out->hdr));if (out->hdr.msg.type ==XS_WATCH_EVENT ) { req = out->pend.req;
@@ -631,24 +632,25 @@ int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data,* nodes to new owners. */ if (old_acc.memory) -domain_memory_add_nochk (old_domid, +domain_memory_add_nochk (conn, old_domid, -old_acc.memory - key->dsize); - ret =domain_memory_add (new_domid, data->dsize + key->dsize, - no_quota_check); + ret =domain_memory_add (conn, new_domid, + data->dsize + key->dsize, no_quota_check);if (ret) {/* Error path, so no quota check. */ if (old_acc.memory) -domain_memory_add_nochk (old_domid, +domain_memory_add_nochk (conn, old_domid, old_acc.memory + key->dsize);return ret; }/* TDB should set errno, but doesn't even set ecode AFAICT. */ if (tdb_store (tdb_ctx, *key, *data,TDB_REPLACE ) !=0 ) { -domain_memory_add_nochk (new_domid, -data->dsize - key->dsize); +domain_memory_add_nochk (conn, new_domid, + -data->dsize - key->dsize);/* Error path, so no quota check. */ if (old_acc.memory) -domain_memory_add_nochk (old_domid, +domain_memory_add_nochk (conn, old_domid, old_acc.memory + key->dsize); errno =EIO ;return errno;
@@ -683,7 +685,7 @@ int do_tdb_delete(struct connection *conn, TDB_DATA *key,if (acc->memory) { domid =get_acc_domid (conn, key, acc->domid); -domain_memory_add_nochk (domid, -acc->memory - key->dsize); +domain_memory_add_nochk (conn, domid, -acc->memory - key->dsize); }return 0 ;
@@ -1056,11 +1058,13 @@ void send_reply(struct connection *conn, enum xsd_sockmsg_type type,if (len <=DEFAULT_BUFFER_SIZE ) { bdata->buffer = bdata->default_buffer;/* Don't check quota, path might be used for returning error. */ -domain_memory_add_nochk (conn->id, len +sizeof (bdata->hdr)); +domain_memory_add_nochk (conn, conn->id, + len +sizeof (bdata->hdr)); }else { bdata->buffer =talloc_array (bdata, char, len);if (!bdata->buffer || -domain_memory_add_chk (conn->id, len +sizeof (bdata->hdr))) { +domain_memory_add_chk (conn, conn->id, + len +sizeof (bdata->hdr))) {send_error (conn,ENOMEM );return ; }
@@ -1126,7 +1130,7 @@ void send_event(struct buffered_data *req, struct connection *conn, } } -if (domain_memory_add_chk (conn->id, len +sizeof (bdata->hdr))) { +if (domain_memory_add_chk (conn, conn->id, len +sizeof (bdata->hdr))) {talloc_free (bdata);return ; }
@@ -3287,7 +3291,7 @@ static void add_buffered_data(struct buffered_data *bdata,* be smaller. So ignore it. The limit will be applied for any resource * after the state has been fully restored. */ -domain_memory_add_nochk (conn->id, len +sizeof (bdata->hdr)); +domain_memory_add_nochk (conn, conn->id, len +sizeof (bdata->hdr)); } void read_state_buffered_data(const void *ctx, struct connection *conn,
tools/xenstore/xenstored_domain.c +2 -1
@@ -1230,7 +1230,8 @@ static bool domain_chk_quota(struct domain *domain, int mem)return false; } -int domain_memory_add (unsigned int domid,int mem,bool no_quota_check) +int domain_memory_add (struct connection *conn,unsigned int domid,int mem, +bool no_quota_check) {struct domain *domain;
tools/xenstore/xenstored_domain.h +9 -5
@@ -75,25 +75,29 @@ 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);unsigned int domain_nbentry (struct connection *conn); -int domain_memory_add (unsigned int domid,int mem,bool no_quota_check); +int domain_memory_add (struct connection *conn,unsigned int domid,int mem, +bool no_quota_check);/* * domain_memory_add_chk(): to be used when memory quota should be checked. * Not to be used when specifying a negative mem value, as lowering the used * memory should always be allowed. */ -static inline int domain_memory_add_chk (unsigned int domid,int mem) +static inline int domain_memory_add_chk (struct connection *conn, +unsigned int domid,int mem) { -return domain_memory_add (domid, mem, false); +return domain_memory_add (conn, domid, mem, false); } +/* * domain_memory_add_nochk(): to be used when memory quota should not be * checked, e.g. when lowering memory usage, or in an error case for undoing * a previous memory adjustment. */ -static inline void domain_memory_add_nochk (unsigned int domid,int mem) +static inline void domain_memory_add_nochk (struct connection *conn, +unsigned int domid,int mem) { -domain_memory_add (domid, mem, true); +domain_memory_add (conn, domid, mem, true); }void domain_watch_inc (struct connection *conn);void domain_watch_dec (struct connection *conn);
tools/xenstore/xenstored_watch.c +6 -5
@@ -199,7 +199,7 @@ static struct watch *add_watch(struct connection *conn, char *path, char *token, watch->token =talloc_strdup (watch, token);if (!watch->node || !watch->token) goto nomem; -if (domain_memory_add (conn->id,strlen (path) +strlen (token), +if (domain_memory_add (conn, conn->id,strlen (path) +strlen (token), no_quota_check)) goto nomem;
@@ -274,8 +274,9 @@ int do_unwatch(const void *ctx, struct connection *conn,list_for_each_entry (watch, &conn->watches, list) {if (streq (watch->node, node) &&streq (watch->token, vec[1 ])) {list_del (&watch->list); -domain_memory_add_nochk (conn->id, -strlen (watch->node) - -strlen (watch->token)); +domain_memory_add_nochk (conn, conn->id, + -strlen (watch->node) - +strlen (watch->token));talloc_free (watch);domain_watch_dec (conn);send_ack (conn,XS_UNWATCH );
@@ -291,8 +292,8 @@ void conn_delete_all_watches(struct connection *conn) while ((watch = list_top(&conn->watches, struct watch, list))) {list_del (&watch->list); -domain_memory_add_nochk (conn->id, -strlen (watch->node) - -strlen (watch->token)); +domain_memory_add_nochk (conn, conn->id, -strlen (watch->node) - +strlen (watch->token));talloc_free (watch);domain_watch_dec (conn); }
Signature · 1 line
2.35.3
PATCH 6/12 tools/xenstore: use accounting data array for per-domain values
In reply to Juergen GrossAdd the accounting of per-domain usage of Xenstore memory, watches, and outstanding requests to the array based mechanism.
--- tools/xenstore/xenstored_core.c | 8 +-- tools/xenstore/xenstored_domain.c | 111 +++++++++++------------------- tools/xenstore/xenstored_domain.h | 10 +-- 3 files changed, 52 insertions(+), 77 deletions(-)
tools/xenstore/xenstored_core.c +4 -4
@@ -255,7 +255,7 @@ static void free_buffered_data(struct buffered_data *out, req->pend.ref.event_cnt--;if (!req->pend.ref.event_cnt && !req->on_out_list) {if (req->on_ref_list) { -domain_outstanding_domid_dec ( +domain_outstanding_dec (conn, req->pend.ref.domid);list_del (&req->list); }
@@ -271,7 +271,7 @@ static void free_buffered_data(struct buffered_data *out, out->on_ref_list = true;return ; }else -domain_outstanding_dec (conn); +domain_outstanding_dec (conn, conn->id);talloc_free (out); }
@@ -1081,7 +1081,7 @@ void send_reply(struct connection *conn, enum xsd_sockmsg_type type,/* Queue for later transmission. */ list_add_tail (&bdata->list, &conn->out_list); bdata->on_out_list = true; -domain_outstanding_inc (conn); +domain_outstanding_inc (conn, conn->id); }/*
@@ -3285,7 +3285,7 @@ static void add_buffered_data(struct buffered_data *bdata,* request have been delivered. */ if (bdata->hdr.msg.type !=XS_WATCH_EVENT ) -domain_outstanding_inc (conn); +domain_outstanding_inc (conn, conn->id);/* * We are restoring the state after Live-Update and the new quota may * be smaller. So ignore it. The limit will be applied for any resource
tools/xenstore/xenstored_domain.c +42 -69
179 lines not on this page · raw message
tools/xenstore/xenstored_domain.h +6 -4
@@ -23,7 +23,10 @@ enum {ACC_NODES ,ACC_REQ_N ,/* Number of elements per request and domain. */ ACC_TR_N =ACC_REQ_N ,/* Number of elements per transaction and domain. */ - ACC_N = ACC_TR_N /* Number of elements per domain. */ +ACC_WATCH =ACC_TR_N , +ACC_OUTST , +ACC_MEM , + ACC_N /* Number of elements per domain. */ };void handle_event (void );
@@ -102,9 +105,8 @@ static inline void domain_memory_add_nochk(struct connection *conn,void domain_watch_inc (struct connection *conn);void domain_watch_dec (struct connection *conn);int domain_watch (struct connection *conn); -void domain_outstanding_inc (struct connection *conn); -void domain_outstanding_dec (struct connection *conn); -void domain_outstanding_domid_dec (unsigned int domid); +void domain_outstanding_inc (struct connection *conn,unsigned int domid); +void domain_outstanding_dec (struct connection *conn,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);
Signature · 1 line
2.35.3
PATCH 7/12 tools/xenstore: add accounting trace support
In reply to Juergen GrossAdd a new trace switch "acc" and the related trace calls.
The "acc" switch is off per default.
--- tools/xenstore/xenstored_core.c | 2 +- tools/xenstore/xenstored_core.h | 1 + tools/xenstore/xenstored_domain.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-)
tools/xenstore/xenstored_core.c +1 -1
@@ -2737,7 +2737,7 @@ static void set_quota(const char *arg, bool soft)/* Sorted by bit values of TRACE_* flags. Flag is (1u << index). */ const char *trace_switches[] = { -"obj" ,"io" ,"wrl" , +"obj" ,"io" ,"wrl" ,"acc" ,NULL };
tools/xenstore/xenstored_core.h +1 -0
@@ -294,6 +294,7 @@ extern unsigned int trace_flags;#define TRACE_OBJ 0x00000001#define TRACE_IO 0x00000002#define TRACE_WRL 0x00000004 +#define TRACE_ACC 0x00000008extern const char *trace_switches[];int set_trace_switch (const char *arg);
tools/xenstore/xenstored_domain.c +10 -0
@@ -546,6 +546,12 @@ static struct domain *find_domain_by_domid(unsigned int domid)return (d && d->introduced) ? d :NULL ; } +#define trace_acc (...) \ +do { \ + if (trace_flags & TRACE_ACC) \ + trace("acc: " __VA_ARGS__); \ +} while (0) +int acc_fix_domains (struct list_head *head,bool update) {struct changed_domain *cd;
@@ -609,6 +615,8 @@ static int acc_add_changed_dom(const void *ctx, struct list_head *head,return 0 ; errno =0 ; +trace_acc ("local change domid %u: what=%u %d add %d\n" , domid, what, + cd->acc[what], val); cd->acc[what] += val;return cd->acc[what];
@@ -1111,6 +1119,8 @@ static int domain_acc_add(struct connection *conn, unsigned int domid,return domain_acc_add_chk (d, what, ret, domid); } +trace_acc ("global change domid %u: what=%u %u add %d\n" , domid, what, + d->acc[what], add); d->acc[what] =domain_acc_add_chk (d, what, add, domid);return d->acc[what];
Signature · 1 line
2.35.3
PATCH 8/12 tools/xenstore: add TDB access trace support
In reply to Juergen GrossAdd a new trace switch "tdb" and the related trace calls.
The "tdb" switch is off per default.
--- tools/xenstore/xenstored_core.c | 8 +++++++- tools/xenstore/xenstored_core.h | 6 ++++++ tools/xenstore/xenstored_transaction.c | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-)
tools/xenstore/xenstored_core.c +7 -1
@@ -589,6 +589,8 @@ static void get_acc_data(TDB_DATA *key, struct node_account_data *acc)if (old_data.dptr ==NULL ) { acc->memory =0 ; }else { +trace_tdb ("read %s size %zu\n" , key->dptr, + old_data.dsize + key->dsize); hdr = (void *)old_data.dptr; acc->memory = old_data.dsize; acc->domid = hdr->perms[0 ].id;
@@ -655,6 +657,7 @@ int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, errno =EIO ;return errno; } +trace_tdb ("store %s size %zu\n" , key->dptr, data->dsize + key->dsize);if (acc) {/* Don't use new_domid, as it might be a transaction node. */
@@ -682,6 +685,7 @@ int do_tdb_delete(struct connection *conn, TDB_DATA *key, errno =EIO ;return errno; } +trace_tdb ("delete %s\n" , key->dptr);if (acc->memory) { domid =get_acc_domid (conn, key, acc->domid);
@@ -731,6 +735,8 @@ struct node *read_node(struct connection *conn, const void *ctx, goto error; } +trace_tdb ("read %s size %zu\n" , key.dptr, data.dsize + key.dsize); + node->parent =NULL ;talloc_steal (node, data.dptr);
@@ -2737,7 +2743,7 @@ static void set_quota(const char *arg, bool soft)/* Sorted by bit values of TRACE_* flags. Flag is (1u << index). */ const char *trace_switches[] = { -"obj" ,"io" ,"wrl" ,"acc" , +"obj" ,"io" ,"wrl" ,"acc" ,"tdb" ,NULL };
tools/xenstore/xenstored_core.h +6 -0
@@ -295,8 +295,14 @@ extern unsigned int trace_flags;#define TRACE_IO 0x00000002#define TRACE_WRL 0x00000004#define TRACE_ACC 0x00000008 +#define TRACE_TDB 0x00000010extern const char *trace_switches[];int set_trace_switch (const char *arg); +#define trace_tdb (...) \ +do { \ + if (trace_flags & TRACE_TDB) \ + trace("tdb: " __VA_ARGS__); \ +} while (0)extern TDB_CONTEXT *tdb_ctx;extern int dom0_domid;
tools/xenstore/xenstored_transaction.c +6 -1
@@ -366,8 +366,11 @@ static int finalize_transaction(struct connection *conn,if (tdb_error (tdb_ctx) !=TDB_ERR_NOEXIST )return EIO ; gen =NO_GENERATION ; - }else + }else { +trace_tdb ("read %s size %zu\n" , key.dptr, + key.dsize + data.dsize); gen = hdr->generation; + }talloc_free (data.dptr);if (i->generation != gen)return EAGAIN ;
@@ -391,6 +394,8 @@ static int finalize_transaction(struct connection *conn,set_tdb_key (i->trans_name, &ta_key); data =tdb_fetch (tdb_ctx, ta_key);if (data.dptr) { +trace_tdb ("read %s size %zu\n" , ta_key.dptr, + ta_key.dsize + data.dsize); hdr = (void *)data.dptr; hdr->generation = ++generation; *is_corrupt |= do_tdb_write(conn, &key, &data,
Signature · 1 line
2.35.3
PATCH 9/12 tools/xenstore: switch transaction accounting to generic accounting
In reply to Juergen GrossAs transaction accounting is active for unprivileged domains only, it can easily be added to the generic per-domain accounting.
--- tools/xenstore/xenstored_core.c | 3 +-- tools/xenstore/xenstored_core.h | 1 - tools/xenstore/xenstored_domain.c | 21 ++++++++++++++++++--- tools/xenstore/xenstored_domain.h | 4 ++++ tools/xenstore/xenstored_transaction.c | 12 +++++------- 5 files changed, 28 insertions(+), 13 deletions(-)
tools/xenstore/xenstored_core.c +1 -2
@@ -2074,7 +2074,7 @@ static void consider_message(struct connection *conn)* stalled. This will ignore new requests until Live-Update happened * or it was aborted. */ -if (lu_is_pending () && conn->transaction_started ==0 && +if (lu_is_pending () && conn->ta_start_time ==0 && conn->in->hdr.msg.type ==XS_TRANSACTION_START ) {trace ("Delaying transaction start for connection %p req_id %u\n" , conn, conn->in->hdr.msg.req_id);
@@ -2181,7 +2181,6 @@ struct connection *new_connection(const struct interface_funcs *funcs) new->funcs = funcs; new->is_ignored = false; new->is_stalled = false; - new->transaction_started =0 ;INIT_LIST_HEAD (&new->out_list);INIT_LIST_HEAD (&new->acc_list);INIT_LIST_HEAD (&new->ref_list);
tools/xenstore/xenstored_core.h +0 -1
@@ -151,7 +151,6 @@ struct connection/* List of in-progress transactions. */ struct list_head transaction_list;uint32_t next_transaction_id; -unsigned int transaction_started;time_t ta_start_time;/* List of delayed requests. */
tools/xenstore/xenstored_domain.c +18 -3
@@ -421,12 +421,10 @@ int domain_get_quota(const void *ctx, struct connection *conn, {struct domain *d =find_domain_struct (domid);char *resp; -int ta;if (!d)return ENOENT ; - ta = d->conn ? d->conn->transaction_started :0 ; resp =talloc_asprintf (ctx,"Domain %u:\n" , domid);if (!resp)return ENOMEM ;
@@ -437,7 +435,7 @@ int domain_get_quota(const void *ctx, struct connection *conn,ent (nodes, d->acc[ACC_NODES ]);ent (watches, d->acc[ACC_WATCH ]); -ent (transactions, ta); +ent (transactions, d->acc[ACC_TRANS ]);ent (outstanding, d->acc[ACC_OUTST ]);ent (memory, d->acc[ACC_MEM ]);
@@ -1292,6 +1290,23 @@ void domain_outstanding_dec(struct connection *conn, unsigned int domid)domain_acc_add (conn, domid,ACC_OUTST ,-1 , true); } +void domain_transaction_inc (struct connection *conn) +{ +domain_acc_add (conn, conn->id,ACC_TRANS ,1 , true); +} + +void domain_transaction_dec (struct connection *conn) +{ +domain_acc_add (conn, conn->id,ACC_TRANS ,-1 , true); +} + +unsigned int domain_transaction_get (struct connection *conn) +{ +return (domain_is_unprivileged (conn)) + ?domain_acc_add (conn, conn->id,ACC_TRANS ,0 , true) + :0 ; +} +static wrl_creditt wrl_config_writecost =WRL_FACTOR ;static wrl_creditt wrl_config_rate =WRL_RATE *WRL_FACTOR ;static wrl_creditt wrl_config_dburst =WRL_DBURST *WRL_FACTOR ;
tools/xenstore/xenstored_domain.h +4 -0
@@ -26,6 +26,7 @@ enum {ACC_WATCH =ACC_TR_N ,ACC_OUTST ,ACC_MEM , +ACC_TRANS , ACC_N /* Number of elements per domain. */ };
@@ -107,6 +108,9 @@ void domain_watch_dec(struct connection *conn);int domain_watch (struct connection *conn);void domain_outstanding_inc (struct connection *conn,unsigned int domid);void domain_outstanding_dec (struct connection *conn,unsigned int domid); +void domain_transaction_inc (struct connection *conn); +void domain_transaction_dec (struct connection *conn); +unsigned int domain_transaction_get (struct connection *conn);int domain_get_quota (const void *ctx,struct connection *conn,unsigned int domid);int acc_fix_domains (struct list_head *head,bool update);
tools/xenstore/xenstored_transaction.c +5 -7
@@ -471,8 +471,7 @@ int do_transaction_start(const void *ctx, struct connection *conn,if (conn->transaction)return EBUSY ; -if (domain_is_unprivileged (conn) && - conn->transaction_started > quota_max_transaction) +if (domain_transaction_get (conn) > quota_max_transaction)return ENOSPC ;/* Attach transaction to ctx for autofree until it's complete */
@@ -497,9 +496,9 @@ int do_transaction_start(const void *ctx, struct connection *conn,list_add_tail (&trans->list, &conn->transaction_list);talloc_steal (conn, trans);talloc_set_destructor (trans, destroy_transaction); -if (!conn->transaction_started) +if (!conn->ta_start_time) conn->ta_start_time =time (NULL ); - conn->transaction_started++; +domain_transaction_inc (conn); wrl_ntransactions++;snprintf (id_str,sizeof (id_str),"%u" , trans->id);
@@ -524,8 +523,8 @@ int do_transaction_end(const void *ctx, struct connection *conn, conn->transaction =NULL ;list_del (&trans->list); - conn->transaction_started--; -if (!conn->transaction_started) +domain_transaction_dec (conn); +if (list_empty (&conn->transaction_list)) conn->ta_start_time =0 ;/* Attach transaction to ctx for auto-cleanup */
@@ -576,7 +575,6 @@ void conn_delete_all_transactions(struct connection *conn)assert (conn->transaction ==NULL ); - conn->transaction_started =0 ; conn->ta_start_time =0 ; }
Signature · 1 line
2.35.3
PATCH 10/12 tools/xenstore: remember global and per domain max accounting values
In reply to Juergen GrossAdd saving the maximum values of the different accounting data seen per domain and (for unprivileged domains) globally, and print those values via the xenstore-control quota command. Add a sub-command for resetting the global maximum values seen.
This should help for a decision how to set the related quotas.
--- docs/misc/xenstore.txt | 5 +- tools/xenstore/xenstored_control.c | 22 ++++++- tools/xenstore/xenstored_domain.c | 102 +++++++++++++++++++++++------ tools/xenstore/xenstored_domain.h | 2 + 4 files changed, 109 insertions(+), 22 deletions(-)
docs/misc/xenstore.txt +4 -1
@@ -415,7 +415,7 @@ CONTROL <command>|[<parameters>|] print|<string> print <string> to syslog (xenstore runs as daemon) or to console (xenstore runs as stubdom) - quota|[set <name> <val>|<domid>] + quota|[set <name> <val>|<domid>|max [-r]] without parameters: print the current quota settings with "set <name> <val>": set the quota <name> to new value <val> (The admin should make sure all the domain usage is
@@ -424,6 +424,9 @@ CONTROL <command>|[<parameters>|] violating the new quota setting isn't increased further) with "<domid>": print quota related accounting data for the domain <domid> + with "max [-r]": show global per-domain maximum values of all + unprivileged domains, optionally reset the values by adding + "-r" quota-soft|[set <name> <val>] like the "quota" command, but for soft-quota. trace|[+|-<switch>]
tools/xenstore/xenstored_control.c +21 -1
@@ -306,6 +306,22 @@ static int quota_get(const void *ctx, struct connection *conn,return domain_get_quota (ctx, conn,atoi (vec[0 ])); } +static int quota_max (const void *ctx,struct connection *conn, +char **vec,int num) +{ +if (num >1 ) +return EINVAL ; + +if (num ==1 ) { +if (!strcmp (vec[0 ],"-r" )) +domain_reset_global_acc (); +else +return EINVAL ; + } + +return domain_max_global_acc (ctx, conn); +} +static int do_control_quota (const void *ctx,struct connection *conn,char **vec,int num) {
@@ -315,6 +331,9 @@ static int do_control_quota(const void *ctx, struct connection *conn,if (!strcmp (vec[0 ],"set" ))return quota_set (ctx, conn, vec +1 , num -1 , hard_quotas); +if (!strcmp (vec[0 ],"max" )) +return quota_max (ctx, conn, vec +1 , num -1 ); +return quota_get (ctx, conn, vec, num); }
@@ -978,7 +997,8 @@ static struct cmd_s cmds[] = { { "memreport", do_control_memreport, "[<file>]" }, #endif { "print", do_control_print, "<string>" }, - { "quota", do_control_quota, "[set <name> <val>|<domid>]" }, + { "quota", do_control_quota, + "[set <name> <val>|<domid>|max [-r]]" }, { "quota-soft", do_control_quota_s, "[set <name> <val>]" }, { "help", do_control_help, "" }, };
tools/xenstore/xenstored_domain.c +82 -20
176 lines not on this page · raw message
tools/xenstore/xenstored_domain.h +2 -0
@@ -116,6 +116,8 @@ int domain_get_quota(const void *ctx, struct connection *conn,int acc_fix_domains (struct list_head *head,bool update);void acc_drop (struct connection *conn);void acc_commit (struct connection *conn); +int domain_max_global_acc (const void *ctx,struct connection *conn); +void domain_reset_global_acc (void );/* Write rate limiting */
Signature · 1 line
2.35.3
PATCH 11/12 tools/xenstore: use generic accounting for remaining quotas
In reply to Juergen GrossThe maxrequests, node size, number of node permissions, and path length quota are a little bit special, as they are either active in transactions only (maxrequests), or they are just per item instead of count values. Nevertheless being able to know the maximum number of those quota related values per domain would be beneficial, so add them to the generic accounting.
The per domain value will never show current numbers other than zero, but the maximum number seen can be gathered the same way as the number of nodes during a transaction.
To be able to use the const qualifier for a new function switch domain_is_unprivileged() to take a const pointer, too.
--- tools/xenstore/xenstored_core.c | 14 +++++------ tools/xenstore/xenstored_core.h | 2 +- tools/xenstore/xenstored_domain.c | 34 +++++++++++++++++++++----- tools/xenstore/xenstored_domain.h | 6 +++++ tools/xenstore/xenstored_transaction.c | 4 +-- tools/xenstore/xenstored_watch.c | 2 +- 6 files changed, 45 insertions(+), 17 deletions(-)
tools/xenstore/xenstored_core.c +7 -7
@@ -799,8 +799,8 @@ int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, + node->perms.num *sizeof (node->perms.p[0 ]) + node->datalen + node->childlen; -if (!no_quota_check &&domain_is_unprivileged (conn) && - data.dsize >= quota_max_entry_size) { +if (domain_max_chk (conn,ACC_NODESZ , data.dsize, quota_max_entry_size) + && !no_quota_check) { errno =ENOSPC ;return errno; }
@@ -956,7 +956,7 @@ static struct node *get_node(struct connection *conn, {struct node *node; -if (!name || !is_valid_nodename (name)) { +if (!name || !is_valid_nodename (conn, name)) { errno =EINVAL ;return NULL ; }
@@ -1172,7 +1172,7 @@ static bool valid_chars(const char *node) "0123456789-/_@") == strlen(node)); } -bool is_valid_nodename (const char *node) +bool is_valid_nodename (const struct connection *conn,const char *node) {int local_off =0 ;unsigned int domid;
@@ -1192,7 +1192,8 @@ bool is_valid_nodename(const char *node)if (sscanf (node,"/local/domain/%5u/%n" , &domid, &local_off) !=1 ) local_off =0 ; -if (strlen (node) > local_off + quota_max_path_len) +if (domain_max_chk (conn,ACC_PATHLEN ,strlen (node) - local_off, + quota_max_path_len))return false;return valid_chars (node);
@@ -1766,8 +1767,7 @@ static int do_set_perms(const void *ctx, struct connection *conn,return EINVAL ; perms.num--; -if (domain_is_unprivileged (conn) && - perms.num > quota_nb_perms_per_node) +if (domain_max_chk (conn,ACC_NPERM , perms.num, quota_nb_perms_per_node))return ENOSPC ; permstr = in->buffer +strlen (in->buffer) +1 ;
tools/xenstore/xenstored_core.h +1 -1
@@ -252,7 +252,7 @@ void check_store(void);void corrupt (struct connection *conn,const char *fmt, ...);/* Is this a valid node name? */ -bool is_valid_nodename (const char *node); +bool is_valid_nodename (const struct connection *conn,const char *node);/* Get name of parent node. */ char *get_parent (const void *ctx,const char *node);
tools/xenstore/xenstored_domain.c +28 -6
@@ -435,7 +435,7 @@ int domain_get_quota(const void *ctx, struct connection *conn,return ENOMEM ;#define ent (t, e) \ - resp = talloc_asprintf_append(resp, "%-16s: %8u (max: %8u\n", #t, \ + resp = talloc_asprintf_append(resp, "%-17s: %8u (max: %8u\n", #t, \ d->acc[e].val, d->acc[e].max); \ if (!resp) return ENOMEM
@@ -444,6 +444,7 @@ int domain_get_quota(const void *ctx, struct connection *conn,ent (transactions,ACC_TRANS );ent (outstanding,ACC_OUTST );ent (memory,ACC_MEM ); +ent (transaction-nodes,ACC_TRANSNODES );#undef ent
@@ -461,7 +462,7 @@ int domain_max_global_acc(const void *ctx, struct connection *conn)return ENOMEM ;#define ent (t, e) \ - resp = talloc_asprintf_append(resp, "%-16s: %8u\n", #t, \ + resp = talloc_asprintf_append(resp, "%-17s: %8u\n", #t, \ acc_global_max[e]); \ if (!resp) return ENOMEM
@@ -470,6 +471,7 @@ int domain_max_global_acc(const void *ctx, struct connection *conn)ent (transactions,ACC_TRANS );ent (outstanding,ACC_OUTST );ent (memory,ACC_MEM ); +ent (transaction-nodes,ACC_TRANSNODES );#undef ent
@@ -1084,6 +1086,15 @@ int domain_adjust_node_perms(struct node *node)return 0 ; } +static void domain_acc_chk_max (struct domain *d,unsigned int what, +unsigned int val,unsigned int domid) +{ +if (val > d->acc[what].max) + d->acc[what].max = val; +if (val > acc_global_max[what] &&domid_is_unprivileged (domid)) + acc_global_max[what] = val; +} +static int domain_acc_add_chk (struct domain *d,unsigned int what,int add,unsigned int domid) {
@@ -1097,10 +1108,7 @@ static int domain_acc_add_chk(struct domain *d, unsigned int what, int add, } val = d->acc[what].val + add; -if (val > d->acc[what].max) - d->acc[what].max = val; -if (val > acc_global_max[what] &&domid_is_unprivileged (domid)) - acc_global_max[what] = val; +domain_acc_chk_max (d, what, val, domid);return val; }
@@ -1216,6 +1224,20 @@ void domain_reset_global_acc(void)hashtable_iterate (domhash, domain_reset_global_acc_sub,NULL ); } +bool domain_max_chk (const struct connection *conn,unsigned int what, +unsigned int val,unsigned int quota) +{ +if (!conn || !conn->domain) +return false; + +if (domain_is_unprivileged (conn) && val > quota) +return true; + +domain_acc_chk_max (conn->domain, what, val, conn->id); + +return false; +} +int domain_nbentry_inc (struct connection *conn,unsigned int domid) {return (domain_acc_add (conn, domid,ACC_NODES ,1 , false) <0 )
tools/xenstore/xenstored_domain.h +6 -0
@@ -27,6 +27,10 @@ enum {ACC_OUTST ,ACC_MEM ,ACC_TRANS , +ACC_TRANSNODES , +ACC_NPERM , +ACC_PATHLEN , +ACC_NODESZ , ACC_N /* Number of elements per domain. */ };
@@ -118,6 +122,8 @@ void acc_drop(struct connection *conn);void acc_commit (struct connection *conn);int domain_max_global_acc (const void *ctx,struct connection *conn);void domain_reset_global_acc (void ); +bool domain_max_chk (const struct connection *conn,unsigned int what, +unsigned int val,unsigned int quota);/* Write rate limiting */
tools/xenstore/xenstored_transaction.c +2 -2
@@ -244,8 +244,8 @@ int access_node(struct connection *conn, struct node *node, i =find_accessed_node (trans, node->name);if (!i) { -if (trans->nodes >= quota_trans_nodes && -domain_is_unprivileged (conn)) { +if (domain_max_chk (conn,ACC_TRANSNODES , trans->nodes +1 , + quota_trans_nodes)) { ret =ENOSPC ; goto err; }
tools/xenstore/xenstored_watch.c +1 -1
@@ -176,7 +176,7 @@ static int check_watch_path(struct connection *conn, const void *ctx, *path =canonicalize (conn, ctx, *path);if (!*path)return errno; -if (!is_valid_nodename (*path)) +if (!is_valid_nodename (conn, *path)) goto inval; }
Signature · 1 line
2.35.3
PATCH 12/12 tools/xenstore: switch quota management to be table based
In reply to Juergen GrossInstead of having individual quota variables switch to a table based approach like the generic accounting. Include all the related data in the same table and add accessor functions.
This enables to use the command line --quota parameter for setting all possible quota values, keeping the previous parameters for compatibility.
---
V2:
- new patch
One further remark: it would be rather easy to add soft-quota for all the other quotas (similar to the memory one). This could be used as an early warning for the need to raise global quota.
--- tools/xenstore/xenstored_control.c | 43 ++------ tools/xenstore/xenstored_core.c | 85 ++++++++-------- tools/xenstore/xenstored_core.h | 10 -- tools/xenstore/xenstored_domain.c | 130 +++++++++++++++++-------- tools/xenstore/xenstored_domain.h | 12 ++- tools/xenstore/xenstored_transaction.c | 5 +- tools/xenstore/xenstored_watch.c | 2 +- 7 files changed, 154 insertions(+), 133 deletions(-)
tools/xenstore/xenstored_control.c +8 -35
@@ -221,35 +221,6 @@ static int do_control_trace(const void *ctx, struct connection *conn,return 0 ; } -struct quota { -const char *name; -int *quota; -const char *descr; -}; - -static const struct quota hard_quotas[] = { - {"nodes" , "a_nb_entry_per_domain,"Nodes per domain" }, - {"watches" , "a_nb_watch_per_domain,"Watches per domain" }, - {"transactions" , "a_max_transaction,"Transactions per domain" }, - {"outstanding" , "a_req_outstanding, -"Outstanding requests per domain" }, - {"transaction-nodes" , "a_trans_nodes, -"Max. number of accessed nodes per transaction" }, - {"memory" , "a_memory_per_domain_hard, -"Total Xenstore memory per domain (error level)" }, - {"node-size" , "a_max_entry_size,"Max. size of a node" }, - {"path-max" , "a_max_path_len,"Max. length of a node path" }, - {"permissions" , "a_nb_perms_per_node, -"Max. number of permissions per node" }, - {NULL ,NULL ,NULL } -}; - -static const struct quota soft_quotas[] = { - {"memory" , "a_memory_per_domain_soft, -"Total Xenstore memory per domain (warning level)" }, - {NULL ,NULL ,NULL } -}; -static int quota_show_current (const void *ctx,struct connection *conn,const struct quota *quotas) {
@@ -260,9 +231,11 @@ static int quota_show_current(const void *ctx, struct connection *conn,if (!resp)return ENOMEM ; -for (i =0 ; quotas[i].quota; i++) { +for (i =0 ; i <ACC_N ; i++) { +if (!quotas[i].name) +continue ; resp =talloc_asprintf_append (resp,"%-17s: %8d %s\n" , - quotas[i].name, *quotas[i].quota, + quotas[i].name, quotas[i].val, quotas[i].descr);if (!resp)return ENOMEM ;
@@ -274,7 +247,7 @@ static int quota_show_current(const void *ctx, struct connection *conn, }static int quota_set (const void *ctx,struct connection *conn, -char **vec,int num,const struct quota *quotas) +char **vec,int num,struct quota *quotas) {unsigned int i;int val;
@@ -286,9 +259,9 @@ static int quota_set(const void *ctx, struct connection *conn,if (val <1 )return EINVAL ; -for (i =0 ; quotas[i].quota; i++) { -if (!strcmp (vec[0 ], quotas[i].name)) { - *quotas[i].quota = val; +for (i =0 ; i <ACC_N ; i++) { +if (quotas[i].name && !strcmp (vec[0 ], quotas[i].name)) { + quotas[i].val = val;send_ack (conn,XS_CONTROL );return 0 ; }
tools/xenstore/xenstored_core.c +44 -41
178 lines not on this page · raw message
tools/xenstore/xenstored_core.h +0 -10
@@ -307,16 +307,6 @@ extern TDB_CONTEXT *tdb_ctx;extern int dom0_domid;extern int dom0_event;extern int priv_domid; -extern int quota_nb_watch_per_domain; -extern int quota_max_transaction; -extern int quota_max_entry_size; -extern int quota_nb_perms_per_node; -extern int quota_max_path_len; -extern int quota_nb_entry_per_domain; -extern int quota_req_outstanding; -extern int quota_trans_nodes; -extern int quota_memory_per_domain_soft; -extern int quota_memory_per_domain_hard;extern bool keep_orphans;extern unsigned int timeout_watch_event_msec;
tools/xenstore/xenstored_domain.c +88 -42
211 lines not on this page · raw message
tools/xenstore/xenstored_domain.h +11 -1
@@ -34,6 +34,16 @@ enum { ACC_N /* Number of elements per domain. */ }; +struct quota { +const char *name; +const char *descr; +unsigned int val; +unsigned int max; +}; + +extern struct quota hard_quotas[ACC_N ]; +extern struct quota soft_quotas[ACC_N ]; +void handle_event (void );void check_domains (void );
@@ -123,7 +133,7 @@ void acc_commit(struct connection *conn);int domain_max_global_acc (const void *ctx,struct connection *conn);void domain_reset_global_acc (void );bool domain_max_chk (const struct connection *conn,unsigned int what, -unsigned int val,unsigned int quota); +unsigned int val);/* Write rate limiting */
tools/xenstore/xenstored_transaction.c +2 -3
@@ -244,8 +244,7 @@ int access_node(struct connection *conn, struct node *node, i =find_accessed_node (trans, node->name);if (!i) { -if (domain_max_chk (conn,ACC_TRANSNODES , trans->nodes +1 , - quota_trans_nodes)) { +if (domain_max_chk (conn,ACC_TRANSNODES , trans->nodes +1 )) { ret =ENOSPC ; goto err; }
@@ -471,7 +470,7 @@ int do_transaction_start(const void *ctx, struct connection *conn,if (conn->transaction)return EBUSY ; -if (domain_transaction_get (conn) > quota_max_transaction) +if (domain_transaction_get (conn) > hard_quotas[ACC_TRANS ].val)return ENOSPC ;/* Attach transaction to ctx for autofree until it's complete */
tools/xenstore/xenstored_watch.c +1 -1
@@ -239,7 +239,7 @@ int do_watch(const void *ctx, struct connection *conn, struct buffered_data *in)return EEXIST ; } -if (domain_watch (conn) > quota_nb_watch_per_domain) +if (domain_watch (conn) > hard_quotas[ACC_WATCH ].val)return E2BIG ; watch =add_watch (conn, vec[0 ], vec[1 ], relative, false);
Signature · 1 line
2.35.3