From nobody Mon Mar 23 21:24:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1774018946; cv=none; d=zohomail.com; s=zohoarc; b=Hm+0c7RfRdbovkQnPDgeTttdchp/GsS0DO+X3fXJMTdN4vKUOLIB10zLmW7xeN/PtpTIQ8VwodwZTAyLxbqEdUfH4u+1EnylDbUNjNoHswp9g7uZV0h/XHWuYuS7DWGO5gDYua55kyCFpTLvtmyOj0gDtiOafqzpyRH+ojW96YY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774018946; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JqiRC8vY/BabN/ScKXSBNzHtV8BG2Sr2nwnaVeRBWB4=; b=PmeUG9nc62m9Rak+kuAdRucUQuSC5Dent8370wSMuAWXpdGAxi47tZ8OsJz7tPKQWrQYzOsoDUp3ShmY6noDuV/7DpE1qbY/fcOKFCi4iDewW5voAXRuQOQNT9LzTFKXDHUuBSakD60l87uUS4FlxQ+X/cIaU9pmxv29QANswBM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1774018946077911.209472757707; Fri, 20 Mar 2026 08:02:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1258105.1552303 (Exim 4.92) (envelope-from ) id 1w3bML-0003Ao-Sa; Fri, 20 Mar 2026 15:01:57 +0000 Received: by outflank-mailman (output) from mailman id 1258105.1552303; Fri, 20 Mar 2026 15:01:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w3bML-0003Af-NV; Fri, 20 Mar 2026 15:01:57 +0000 Received: by outflank-mailman (input) for mailman id 1258105; Fri, 20 Mar 2026 15:01:56 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w3bMK-0001Ve-Sz for xen-devel@lists.xenproject.org; Fri, 20 Mar 2026 15:01:56 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bcaca997-246d-11f1-b164-2bf370ae4941; Fri, 20 Mar 2026 16:01:56 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B637D4D27B; Fri, 20 Mar 2026 15:01:54 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 948E942866; Fri, 20 Mar 2026 15:01:54 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 8GkuI2JhvWnZXAAAD6G6ig (envelope-from ); Fri, 20 Mar 2026 15:01:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bcaca997-246d-11f1-b164-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1774018915; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JqiRC8vY/BabN/ScKXSBNzHtV8BG2Sr2nwnaVeRBWB4=; b=E1bB3zzQ9LYXvcwwL0yv+0OWTBTjjskmRHpH6qF5xj5O5qhY/gb4Q2tcMsWo9j1nuyBDi7 eNHLAnucRw6g7JGjPdY4UKH8OkVF5KhzpMwrxQiacPIGifBOgLCwEg/2y1QQNKRRnlUb/r /2HkFi1LzV0RO49bRHNiKF1hJmg7Jj0= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=KM6joA7O DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1774018914; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JqiRC8vY/BabN/ScKXSBNzHtV8BG2Sr2nwnaVeRBWB4=; b=KM6joA7OitlDGMXG+C0o6AK8mDsKWfk11xwGvlgM06RWH2LQPnNPKROxxOXc48wgvngYYL zo5aHOUYFOjX6pq/iaYDjtOYQZmBqo8piUcz3nocJHpEMHcFLR0KOvpB8IhM+o/HAnf7cy UMKop0m7iI4zoeztaaHUOzo1Qh09MWA= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Julien Grall , Anthony PERARD Subject: [PATCH v2 06/12] tools/xenstored: split acc[] array in struct domain Date: Fri, 20 Mar 2026 16:01:14 +0100 Message-ID: <20260320150120.874878-7-jgross@suse.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320150120.874878-1-jgross@suse.com> References: <20260320150120.874878-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[vates.tech:email,suse.com:dkim,suse.com:mid,suse.com:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Queue-Id: B637D4D27B X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) (identity @suse.com) X-ZM-MESSAGEID: 1774018947214154100 Content-Type: text/plain; charset="utf-8" Prepare using per-domain quota by splitting the acc[] array in struct domain into an array with the current accounting data, and an array of type struct quota for the per-domain quota and the seen max value of the domain. Signed-off-by: Juergen Gross Reviewed-by: Anthony PERARD --- tools/xenstored/domain.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index cfc8fd0cb4..b82f2d5167 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -143,10 +143,8 @@ struct domain bool introduced; =20 /* Accounting data for this domain. */ - struct acc { - unsigned int val; - unsigned int max; - } acc[ACC_N]; + unsigned int acc_val[ACC_N]; + struct quota acc[ACC_N]; =20 /* Memory quota data for this domain. */ bool soft_quota_reported; @@ -413,7 +411,7 @@ bool domain_quota_add_exceeds(struct domain *d, enum ac= citem what, int add) if (add < 0 || !d) return false; =20 - return domain_quota_val_exceeds(d, what, d->acc[what].val + add); + return domain_quota_val_exceeds(d, what, d->acc_val[what] + add); } =20 static bool check_indexes(XENSTORE_RING_IDX cons, XENSTORE_RING_IDX prod) @@ -585,7 +583,7 @@ static int domain_tree_remove_sub(const void *ctx, stru= ct connection *conn, ret =3D WALK_TREE_SKIP_CHILDREN; } =20 - return domain->acc[ACC_NODES].val ? ret : WALK_TREE_SUCCESS_STOP; + return domain->acc_val[ACC_NODES] ? ret : WALK_TREE_SUCCESS_STOP; } =20 static void domain_tree_remove(struct domain *domain) @@ -593,7 +591,7 @@ static void domain_tree_remove(struct domain *domain) int ret; struct walk_funcs walkfuncs =3D { .enter =3D domain_tree_remove_sub }; =20 - if (domain->acc[ACC_NODES].val) { + if (domain->acc_val[ACC_NODES]) { ret =3D walk_node_tree(domain, NULL, "/", &walkfuncs, domain); if (ret =3D=3D WALK_TREE_ERROR_STOP) syslog(LOG_ERR, @@ -789,7 +787,7 @@ int domain_get_quota(const void *ctx, struct connection= *conn, continue; resp =3D talloc_asprintf_append(resp, "%-17s: %8u (max %8u)\n", quota_adm[i].name, - d->acc[i].val, d->acc[i].max); + d->acc_val[i], d->acc[i].max); if (!resp) return ENOMEM; } @@ -1673,10 +1671,10 @@ static int domain_acc_add_valid(struct domain *d, e= num accitem what, int add) { unsigned int val; =20 - assert(what < ARRAY_SIZE(d->acc)); + assert(what < ARRAY_SIZE(d->acc_val)); =20 - if ((add < 0 && -add > d->acc[what].val) || - (add > 0 && (INT_MAX - d->acc[what].val) < add)) { + if ((add < 0 && -add > d->acc_val[what]) || + (add > 0 && (INT_MAX - d->acc_val[what]) < add)) { /* * In a transaction when a node is being added/removed AND the * same node has been added/removed outside the transaction in @@ -1687,7 +1685,7 @@ static int domain_acc_add_valid(struct domain *d, enu= m accitem what, int add) return (add < 0) ? 0 : INT_MAX; } =20 - val =3D d->acc[what].val + add; + val =3D d->acc_val[what] + add; domain_acc_valid_max(d, what, val); =20 return val; @@ -1746,10 +1744,10 @@ static int domain_acc_add(struct connection *conn, = unsigned int domid, } =20 trace_acc("global change domid %u: what=3D%u %u add %d\n", domid, what, - d->acc[what].val, add); - d->acc[what].val =3D domain_acc_add_valid(d, what, add); + d->acc_val[what], add); + d->acc_val[what] =3D domain_acc_add_valid(d, what, add); =20 - return d->acc[what].val; + return d->acc_val[what]; } =20 void acc_drop(struct connection *conn) @@ -1793,7 +1791,7 @@ static int domain_reset_global_acc_sub(const void *k,= void *v, void *arg) unsigned int i; =20 for (i =3D 0; i < ACC_N; i++) - d->acc[i].max =3D d->acc[i].val; + d->acc[i].max =3D d->acc_val[i]; =20 return 0; } @@ -2233,7 +2231,7 @@ static int domain_check_acc_init_sub(const void *k, v= oid *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 =3D -d->acc[ACC_NODES].val; + dom->nodes =3D -d->acc_val[ACC_NODES]; =20 if (hashtable_add(domains, &dom->domid, dom)) { talloc_free(dom); @@ -2288,7 +2286,7 @@ static int domain_check_acc_cb(const void *k, void *v= , void *arg) if (!d) return 0; =20 - d->acc[ACC_NODES].val +=3D dom->nodes; + d->acc_val[ACC_NODES] +=3D dom->nodes; =20 return 0; } --=20 2.53.0