From nobody Mon Feb 9 19:06:21 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=1680678567; cv=none; d=zohomail.com; s=zohoarc; b=YGZtiFtKk3lopttn/VgPmCAmcLoo/0A/+2CMO1CgpZi8gAfasGVom9d9q/mmgIC1qKzm9xTaJZpuaaAaPh5DqXjn+Jzl8pNopCAR9ZR7p8Am+xSq9C0wspCLrebWOQwFetW0bBjvo/Cq8dvdFcHpr+XA5DbSfmL22YYXcAi1pL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680678567; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9+svNodvtqEzi347VmDVhAeqbmPB+a6CEyNMcH7A/78=; b=bYh4ah0U9bjibvNSEjUiW7es5wOLDyiblPHIAhckTM3WpvAiYu2K9Etjst7rLNn5/EhBYjyY/V2INTqmVFISthfCr4hSvv3hWHpTyWVudS+rt+GZdtRTP+9UwQ0vYO50kjZVeJlFXNGe/BwjX5s7HT0MYmejkjqC5TNtnaQJ/Rk= 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 1680678567836621.8963901733057; Wed, 5 Apr 2023 00:09:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.518260.804622 (Exim 4.92) (envelope-from ) id 1pjxGM-0007T6-9d; Wed, 05 Apr 2023 07:08:58 +0000 Received: by outflank-mailman (output) from mailman id 518260.804622; Wed, 05 Apr 2023 07:08:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pjxGM-0007ST-6U; Wed, 05 Apr 2023 07:08:58 +0000 Received: by outflank-mailman (input) for mailman id 518260; Wed, 05 Apr 2023 07:08:57 +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 1pjxCL-0002Et-ML for xen-devel@lists.xenproject.org; Wed, 05 Apr 2023 07:04:49 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 26c01ddb-d380-11ed-b464-930f4c7d94ae; Wed, 05 Apr 2023 09:04:47 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AA1E22058E; Wed, 5 Apr 2023 07:04:47 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7B8FD13A31; Wed, 5 Apr 2023 07:04:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id aC3eHI8dLWTyEwAAMHmgww (envelope-from ); Wed, 05 Apr 2023 07:04:47 +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: 26c01ddb-d380-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1680678287; 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=9+svNodvtqEzi347VmDVhAeqbmPB+a6CEyNMcH7A/78=; b=tnoiNvEK7wVRD3t0XP4Hb9wj9DRqF9BbSyC6DqYylJERvPZPE+SKEm+XT2wW86hDrWy8xB /v4wAUytR0s5QLSPDUknaFsDXTnPllXZP5H+DTDJbjKcl4L5+PBWKVbQU4+YHfxlPv2odP WPjJIR4tQYibRtvRn3i3I3iBFXgM4ig= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH v4 10/13] tools/xenstore: switch transaction accounting to generic accounting Date: Wed, 5 Apr 2023 09:03:46 +0200 Message-Id: <20230405070349.25293-11-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230405070349.25293-1-jgross@suse.com> References: <20230405070349.25293-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1680678569359100005 Content-Type: text/plain; charset="utf-8" As transaction accounting is active for unprivileged domains only, it can easily be added to the generic per-domain accounting. Signed-off-by: Juergen Gross --- 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(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_cor= e.c index 2d481fcad9..88c569b7d5 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2083,7 +2083,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 =3D=3D 0 && + if (lu_is_pending() && conn->ta_start_time =3D=3D 0 && conn->in->hdr.msg.type =3D=3D XS_TRANSACTION_START) { trace("Delaying transaction start for connection %p req_id %u\n", conn, conn->in->hdr.msg.req_id); @@ -2190,7 +2190,6 @@ struct connection *new_connection(const struct interf= ace_funcs *funcs) new->funcs =3D funcs; new->is_ignored =3D false; new->is_stalled =3D false; - new->transaction_started =3D 0; INIT_LIST_HEAD(&new->out_list); INIT_LIST_HEAD(&new->acc_list); INIT_LIST_HEAD(&new->ref_list); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_cor= e.h index 5a11dc1231..3564d85d7d 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -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; =20 /* List of delayed requests. */ diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_d= omain.c index 1caa60bb14..40bcc1dbfa 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -419,12 +419,10 @@ int domain_get_quota(const void *ctx, struct connecti= on *conn, { struct domain *d =3D find_domain_struct(domid); char *resp; - int ta; =20 if (!d) return ENOENT; =20 - ta =3D d->conn ? d->conn->transaction_started : 0; resp =3D talloc_asprintf(ctx, "Domain %u:\n", domid); if (!resp) return ENOMEM; @@ -435,7 +433,7 @@ int domain_get_quota(const void *ctx, struct connection= *conn, =20 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]); =20 @@ -1297,6 +1295,23 @@ void domain_outstanding_dec(struct connection *conn,= unsigned int domid) domain_acc_add(conn, domid, ACC_OUTST, -1, true); } =20 +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 =3D WRL_FACTOR; static wrl_creditt wrl_config_rate =3D WRL_RATE * WRL_FACTOR; static wrl_creditt wrl_config_dburst =3D WRL_DBURST * WRL_FACTOR; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_d= omain.h index 0d61bf4344..abc766f343 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -31,6 +31,7 @@ enum accitem { ACC_WATCH =3D ACC_TR_N, ACC_OUTST, ACC_MEM, + ACC_TRANS, ACC_N, /* Number of elements per domain. */ }; =20 @@ -112,6 +113,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); =20 diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xensto= red_transaction.c index 11c8bcec84..1c14b8579a 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -479,8 +479,7 @@ int do_transaction_start(const void *ctx, struct connec= tion *conn, if (conn->transaction) return EBUSY; =20 - if (domain_is_unprivileged(conn) && - conn->transaction_started > quota_max_transaction) + if (domain_transaction_get(conn) > quota_max_transaction) return ENOSPC; =20 /* Attach transaction to ctx for autofree until it's complete */ @@ -505,9 +504,9 @@ int do_transaction_start(const void *ctx, struct connec= tion *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 =3D time(NULL); - conn->transaction_started++; + domain_transaction_inc(conn); wrl_ntransactions++; =20 snprintf(id_str, sizeof(id_str), "%u", trans->id); @@ -533,8 +532,8 @@ int do_transaction_end(const void *ctx, struct connecti= on *conn, =20 conn->transaction =3D 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 =3D 0; =20 chk_quota =3D trans->node_created && domain_is_unprivileged(conn); @@ -588,7 +587,6 @@ void conn_delete_all_transactions(struct connection *co= nn) =20 assert(conn->transaction =3D=3D NULL); =20 - conn->transaction_started =3D 0; conn->ta_start_time =3D 0; } =20 --=20 2.35.3