From nobody Mon Feb 9 16:02:16 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=1674209143; cv=none; d=zohomail.com; s=zohoarc; b=nI/yb48Zl6rHpT2VRAmYrztIMHX1QPR57l8p5rbIOF1iZfFe3gZ9ic5dxc5boUy92jd9KEs1vztHhk80r1bMxYKsIGBl4EX5hsg0bbuwVxJVukNkWVFPFn2JvOjHf+xifElxqNlWD2QRazMghp+72nbgtBbaDNXdaMKYMAhOqng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674209143; 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=7EWkkJhQCjKSg7MUGlJAvzZ4VfhKHOcbcgmv3aDpL24=; b=Dus0+0OY+v3I6NMgtDBe1JjHl1dev3lLsnk8Ow2Z+y4Nz92lJOYgTjSW8OpS/NRphTs4LbqlBXF+lkP3WhhiUGwk96jYWM2uuC0KEgj8CGSF10M4CRW9NyxkKsNU4qhHaJvCakEpeC75Ddx/AYd7WzlaMSK4nipVAZvsi0HDRmw= 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 1674209143111135.46048467882076; Fri, 20 Jan 2023 02:05:43 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.481601.746637 (Exim 4.92) (envelope-from ) id 1pIoGs-0006Sb-PW; Fri, 20 Jan 2023 10:05:18 +0000 Received: by outflank-mailman (output) from mailman id 481601.746637; Fri, 20 Jan 2023 10:05:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pIoGs-0006SQ-L5; Fri, 20 Jan 2023 10:05:18 +0000 Received: by outflank-mailman (input) for mailman id 481601; Fri, 20 Jan 2023 10:05:17 +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 1pIoDE-0001b3-Bs for xen-devel@lists.xenproject.org; Fri, 20 Jan 2023 10:01:32 +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 694b41c5-98a9-11ed-b8d1-410ff93cb8f0; Fri, 20 Jan 2023 11:01:30 +0100 (CET) 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 100C05BD75; Fri, 20 Jan 2023 10:01:30 +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 DB9821390C; Fri, 20 Jan 2023 10:01:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yE5oNHlmymN/RQAAMHmgww (envelope-from ); Fri, 20 Jan 2023 10:01:29 +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: 694b41c5-98a9-11ed-b8d1-410ff93cb8f0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1674208890; 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=7EWkkJhQCjKSg7MUGlJAvzZ4VfhKHOcbcgmv3aDpL24=; b=XB0P0p7jCjOaqjvgDeSGfjSYknn0SlPX5sXw/vClGkBgoZ6sYCjchxMr5YBQy0JT9NV3Ud lHU79laTjsL4ruBowvFRLEyZBZDPRzmeaSwXHrnyt5AGNh6qKZCHdMjYFWWZlO3fuOOxih 7PcUkijUgdfxXsI+EYniWxVZ4QyPFhU= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH v2 10/13] tools/xenstore: switch transaction accounting to generic accounting Date: Fri, 20 Jan 2023 11:00:25 +0100 Message-Id: <20230120100028.11142-11-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230120100028.11142-1-jgross@suse.com> References: <20230120100028.11142-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1674209145308100004 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 49e196e7ae..5b85b69eb2 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 419a144396..6465105b4d 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 d461fd8cc8..4d48e7a9f4 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -417,12 +417,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; @@ -433,7 +431,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 @@ -1295,6 +1293,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 37e14d1c8c..e0562b0b4d 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -26,6 +26,7 @@ enum accitem { ACC_WATCH =3D ACC_TR_N, ACC_OUTST, ACC_MEM, + ACC_TRANS, ACC_N /* Number of elements per domain. */ }; =20 @@ -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); diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xensto= red_transaction.c index 19a1175d1b..ce6a12b576 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -471,8 +471,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 */ @@ -497,9 +496,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); @@ -524,8 +523,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 /* Attach transaction to ctx for auto-cleanup */ @@ -576,7 +575,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