From nobody Mon Mar 23 21:28:29 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=GREg3yDkRiMs8zQvjADI4CQUzKej3ovLemN2GxTj7Rnvk1MtHRfpM/fjh3ag6TRuiMEvazl0eRg+cezKlCcrIxuLmxK1GyXx2PYYt5boN8xXtFs6qyXN6JqF517FgiDkih4jP1EcXTL9FjEow8jhJb6nq7PomHHVZ3sbm+8g0vw= 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=R+PpHjFLzvQIrf2KVCkmF/XhxpN/XcwoIQUr9KmYFoI=; b=igEGeAI0IOlggYAH4LUYFEtq147AM7UosLIj41a+nxSJ2tqRn11w35enzUuGN4aqlxg+5IxJuQfYzB6tMoTSXZD5tg7rd2ynXn0cHuld+uQ91j1b++hFXyZJzQKbJfkJz19LsnMenDtL4FZmh20yNCYDueb8ga9I5eWKN7gpyXk= 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 177401894691518.258106986397934; Fri, 20 Mar 2026 08:02:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1258112.1552311 (Exim 4.92) (envelope-from ) id 1w3bMW-0003iU-84; Fri, 20 Mar 2026 15:02:08 +0000 Received: by outflank-mailman (output) from mailman id 1258112.1552311; Fri, 20 Mar 2026 15:02:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w3bMW-0003iI-4c; Fri, 20 Mar 2026 15:02:08 +0000 Received: by outflank-mailman (input) for mailman id 1258112; Fri, 20 Mar 2026 15:02:06 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w3bMU-0001ko-8s for xen-devel@lists.xenproject.org; Fri, 20 Mar 2026 15:02:06 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c0859742-246d-11f1-9ccf-f158ae23cfc8; Fri, 20 Mar 2026 16:02:02 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (unknown [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 2D76A4D27B; Fri, 20 Mar 2026 15:02:00 +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 0D3EF42866; Fri, 20 Mar 2026 15:02:00 +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 /qksAmhhvWneXAAAD6G6ig (envelope-from ); Fri, 20 Mar 2026 15:02:00 +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: c0859742-246d-11f1-9ccf-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1774018922; 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=R+PpHjFLzvQIrf2KVCkmF/XhxpN/XcwoIQUr9KmYFoI=; b=KOvbaB3/47LkpwEa0g8TBdgM8H2CK5iLpCFU8NDRvvyvpRfg2v20GO5UNslIn6e9Lvstuf DAWr2KkK3AF+mWQCKrpeSwLh3haqLt3IzsJzVAugaAIokFFn1bSUme1PZhyqYwCc3ztbFy kMuQPWkbBw6JjeVnkFv/XLqwTgJcTIE= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1774018920; 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=R+PpHjFLzvQIrf2KVCkmF/XhxpN/XcwoIQUr9KmYFoI=; b=EUb/g56efp1Yf5qeMEHjfrDKfGpmopQp0grGgajiCZG26XH05kKKOZaUZZD73DCEFfiqyi oAg7v+SU6ez7b7U3XkFtw0Ie1eNQLUieFrJu97ix/SzZGnjT7wTAAy49ND/WvKCrOtGQwh m4oZuXitluJ0EXPZVM2wbufGDBf1hgA= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Julien Grall , Anthony PERARD Subject: [PATCH v2 07/12] tools/xenstored: use per-domain quota settings Date: Fri, 20 Mar 2026 16:01:15 +0100 Message-ID: <20260320150120.874878-8-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-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:mid,suse.com:email,vates.tech:email] X-Spam-Flag: NO X-ZohoMail-DKIM: pass (identity @suse.com) (identity @suse.com) X-ZM-MESSAGEID: 1774018947813158500 Content-Type: text/plain; charset="utf-8" Initialize the per-domain quota values with the global ones at domain introduction. Use the per-domain quota settings when checking for current values to exceed the quota. Add per-domain quota support to live update. Signed-off-by: Juergen Gross Reviewed-by: Anthony PERARD --- V2: - fix commit message (Anthony Perard) - rename "len" to "rec_len" in dump_state_domain() (Anthony Perard) --- tools/xenstored/domain.c | 60 ++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index b82f2d5167..7a8d285e64 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -392,6 +392,9 @@ void wrl_apply_debit_trans_commit(struct connection *co= nn) =20 static unsigned int domain_get_soft_quota(struct domain *d, enum accitem w= hat) { + if (d && d->acc[what].val[Q_IDX_SOFT] !=3D Q_VAL_DISABLED) + return d->acc[what].val[Q_IDX_SOFT]; + return quotas[what].val[Q_IDX_SOFT]; } =20 @@ -400,6 +403,9 @@ static bool domain_quota_val_exceeds(struct domain *d, = enum accitem what, { unsigned int quota =3D quotas[what].val[Q_IDX_HARD]; =20 + if (d->acc[what].val[Q_IDX_HARD] !=3D Q_VAL_DISABLED) + quota =3D d->acc[what].val[Q_IDX_HARD]; + if (!quota || !domid_is_unprivileged(d->domid)) return false; =20 @@ -824,6 +830,7 @@ static struct domain *alloc_domain(const void *context,= unsigned int domid, uint64_t unique_id) { struct domain *domain; + unsigned int q; =20 domain =3D talloc_zero(context, struct domain); if (!domain) { @@ -837,6 +844,11 @@ static struct domain *alloc_domain(const void *context= , unsigned int domid, domain->introduced =3D false; domain->features =3D XENSTORE_FEATURES; =20 + for (q =3D 0; q < ACC_N; q++) { + domain->acc[q].val[Q_IDX_HARD] =3D quotas[q].val[Q_IDX_HARD]; + domain->acc[q].val[Q_IDX_SOFT] =3D quotas[q].val[Q_IDX_SOFT]; + } + if (hashtable_add(domhash, &domain->domid, domain)) { talloc_free(domain); errno =3D ENOMEM; @@ -2118,25 +2130,39 @@ static int dump_state_domain(const void *k, void *v= , void *arg) { struct domain *domain =3D v; FILE *fp =3D arg; - struct xs_state_domain sd; - struct xs_state_record_header head; - - head.type =3D XS_STATE_TYPE_DOMAIN; - head.length =3D sizeof(sd); - memset(&sd, 0, sizeof(sd)); - sd.domain_id =3D domain->domid; + struct xs_state_domain *sd; + struct xs_state_record_header *head; + void *record; + unsigned int n_quota; + unsigned int rec_len; + size_t ret; =20 - if (lu_status->version > 1) - sd.features =3D domain->features; + n_quota =3D get_quota_size(domain->acc, &rec_len); + rec_len +=3D n_quota * sizeof(sd->quota_val[0]); + rec_len +=3D sizeof(*sd); + rec_len =3D ROUNDUP(rec_len, 3); =20 - if (fwrite(&head, sizeof(head), 1, fp) !=3D 1) - return 1; - if (fwrite(&sd, sizeof(sd), 1, fp) !=3D 1) - return 1; - if (dump_state_align(fp)) + record =3D talloc_size(NULL, rec_len + sizeof(*head)); + if (!record) return 1; =20 - return 0; + head =3D record; + head->type =3D XS_STATE_TYPE_DOMAIN; + head->length =3D rec_len; + + sd =3D (struct xs_state_domain *)(head + 1); + sd->domain_id =3D domain->domid; + sd->n_quota =3D n_quota; + sd->features =3D (lu_status->version > 1) ? domain->features : 0; + + build_quota_data(domain->acc, sd->quota_val, + (char *)(sd->quota_val + n_quota)); + + ret =3D fwrite(record, rec_len + sizeof(*head), 1, fp); + + talloc_free(record); + + return (ret !=3D 1 || dump_state_align(fp)) ? 1 : 0; } =20 const char *dump_state_domains(FILE *fp) @@ -2153,6 +2179,8 @@ void read_state_domain(const void *ctx, const void *s= tate, unsigned int version) { const struct xs_state_domain *sd =3D state; struct domain *domain; + unsigned int n_quota =3D sd->n_quota; + const char *name =3D (const char *)(sd->quota_val + n_quota); =20 domain =3D find_domain_struct(sd->domain_id); if (!domain) @@ -2160,6 +2188,8 @@ void read_state_domain(const void *ctx, const void *s= tate, unsigned int version) =20 if (version > 1) domain->features =3D sd->features; + + parse_quota_data(sd->quota_val, name, n_quota, domain->acc); } =20 const char *dump_state_glb_quota(FILE *fp) --=20 2.53.0