From nobody Mon Feb 9 23:39:23 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=1667318737; cv=none; d=zohomail.com; s=zohoarc; b=mok2OVvhVKKdcrYelPGJTAb4FP95Ub+AusYU/aiIZbK2hjwqVeQDQ6Un9ZhHn31Dz/iNXW+twyBtNn6yg71PbIco5ju97/QxQRr1D21s1SO0VH310a/oD94JQbXcp5c9Ptz5lJzmFSdxbiejclv6l9t4QUTGjdGojfWfpGiFk+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667318737; 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=7vX06iot/jRh0KmEBI3quz+d8jYTOyvXE2YRmnqLSRs=; b=ixzQvxjr1A5u5cwTxv7hUs9LgcNGqACIk5Z9WT7OnwKXspW8XcJhZ7CYPUrPREkBswFLhzUvU2+mWUi76HtB3sX18yDgvDhomCo5Dvt8RzI2mL7ITLQ9qwj+uDOHuLRAy9ZXFYa3WjKK76mzg/k4vy2cmPmV9Fz2Ss4QfmJA/Z8= 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 1667318737371324.76480001171; Tue, 1 Nov 2022 09:05:37 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.435050.688075 (Exim 4.92) (envelope-from ) id 1optl7-0005dG-IK; Tue, 01 Nov 2022 16:05:01 +0000 Received: by outflank-mailman (output) from mailman id 435050.688075; Tue, 01 Nov 2022 16:05:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1optl7-0005d1-EP; Tue, 01 Nov 2022 16:05:01 +0000 Received: by outflank-mailman (input) for mailman id 435050; Tue, 01 Nov 2022 16:05:00 +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 1optl6-0003qE-Hh for xen-devel@lists.xenproject.org; Tue, 01 Nov 2022 16:05:00 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ef24b16f-59fe-11ed-8fd0-01056ac49cbb; Tue, 01 Nov 2022 17:04:58 +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-out1.suse.de (Postfix) with ESMTPS id 9FC0C225B2; Tue, 1 Nov 2022 16:04:58 +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 744B31346F; Tue, 1 Nov 2022 16:04:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KboXG6pDYWNXcgAAMHmgww (envelope-from ); Tue, 01 Nov 2022 16:04:58 +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: ef24b16f-59fe-11ed-8fd0-01056ac49cbb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1667318698; 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=7vX06iot/jRh0KmEBI3quz+d8jYTOyvXE2YRmnqLSRs=; b=PC0WXAhF8kSh9wd8H8fXBg8r06PyMz/pWBW4ErY1m+NNfOyJUsnTgFf7ToZFvipTBY6/3W BAeF3S2d7gNdx1TlbvJjSEutukEsk6sI4e6GMPb/6/zJ+pn5nh8na+ceGZ294D4LVY6Brq KosNKnN6Ijjt1zzrH9P3xBqRmz8W0cg= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH 06/12] tools/xenstore: use accounting data array for per-domain values Date: Tue, 1 Nov 2022 17:04:16 +0100 Message-Id: <20221101160422.7212-7-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221101160422.7212-1-jgross@suse.com> References: <20221101160422.7212-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1667318738398100001 Content-Type: text/plain; charset="utf-8" Add the accounting of per-domain usage of Xenstore memory, watches, and outstanding requests to the array based mechanism. Signed-off-by: Juergen Gross --- 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(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_cor= e.c index 8b8900b77c..7bd83a0eaf 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -255,7 +255,7 @@ static void free_buffered_data(struct buffered_data *ou= t, 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 *ou= t, out->on_ref_list =3D true; return; } else - domain_outstanding_dec(conn); + domain_outstanding_dec(conn, conn->id); =20 talloc_free(out); } @@ -1081,7 +1081,7 @@ void send_reply(struct connection *conn, enum xsd_soc= kmsg_type type, /* Queue for later transmission. */ list_add_tail(&bdata->list, &conn->out_list); bdata->on_out_list =3D true; - domain_outstanding_inc(conn); + domain_outstanding_inc(conn, conn->id); } =20 /* @@ -3285,7 +3285,7 @@ static void add_buffered_data(struct buffered_data *b= data, * request have been delivered. */ if (bdata->hdr.msg.type !=3D 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 diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_d= omain.c index 1407ff9e36..cb2a78b597 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -72,19 +72,12 @@ struct domain /* Accounting data for this domain. */ unsigned int acc[ACC_N]; =20 - /* Amount of memory allocated for this domain. */ - int memory; + /* Memory quota data for this domain. */ bool soft_quota_reported; bool hard_quota_reported; time_t mem_last_msg; #define MEM_WARN_MINTIME_SEC 10 =20 - /* number of watch for this domain */ - int nbwatch; - - /* Number of outstanding requests. */ - int nboutstanding; - /* write rate limit */ wrl_creditt wrl_credit; /* [ -wrl_config_writecost, +_dburst ] */ struct wrl_timestampt wrl_timestamp; @@ -200,14 +193,15 @@ static bool domain_can_write(struct connection *conn) =20 static bool domain_can_read(struct connection *conn) { - struct xenstore_domain_interface *intf =3D conn->domain->interface; + struct domain *domain =3D conn->domain; + struct xenstore_domain_interface *intf =3D domain->interface; =20 if (domain_is_unprivileged(conn)) { - if (conn->domain->wrl_credit < 0) + if (domain->wrl_credit < 0) return false; - if (conn->domain->nboutstanding >=3D quota_req_outstanding) + if (domain->acc[ACC_OUTST] >=3D quota_req_outstanding) return false; - if (conn->domain->memory >=3D quota_memory_per_domain_hard && + if (domain->acc[ACC_MEM] >=3D quota_memory_per_domain_hard && quota_memory_per_domain_hard) return false; } @@ -442,10 +436,10 @@ int domain_get_quota(const void *ctx, struct connecti= on *conn, if (!resp) return ENOMEM =20 ent(nodes, d->acc[ACC_NODES]); - ent(watches, d->nbwatch); + ent(watches, d->acc[ACC_WATCH]); ent(transactions, ta); - ent(outstanding, d->nboutstanding); - ent(memory, d->memory); + ent(outstanding, d->acc[ACC_OUTST]); + ent(memory, d->acc[ACC_MEM]); =20 #undef ent =20 @@ -1181,14 +1175,16 @@ unsigned int domain_nbentry(struct connection *conn) ? domain_acc_add(conn, conn->id, ACC_NODES, 0, true) : 0; } =20 -static bool domain_chk_quota(struct domain *domain, int mem) +static bool domain_chk_quota(struct connection *conn, unsigned int mem) { time_t now; + struct domain *domain; =20 - if (!domain || !domid_is_unprivileged(domain->domid) || - (domain->conn && domain->conn->is_ignored)) + if (!conn || !domid_is_unprivileged(conn->id) || + conn->is_ignored) return false; =20 + domain =3D conn->domain; now =3D time(NULL); =20 if (mem >=3D quota_memory_per_domain_hard && @@ -1233,80 +1229,57 @@ static bool domain_chk_quota(struct domain *domain,= int mem) int domain_memory_add(struct connection *conn, unsigned int domid, int mem, bool no_quota_check) { - struct domain *domain; + int ret; =20 - domain =3D find_domain_struct(domid); - if (domain) { - /* - * domain_chk_quota() will print warning and also store whether - * the soft/hard quota has been hit. So check no_quota_check - * *after*. - */ - if (domain_chk_quota(domain, domain->memory + mem) && - !no_quota_check) - return ENOMEM; - domain->memory +=3D mem; - } else { - /* - * The domain the memory is to be accounted for should always - * exist, as accounting is done either for a domain related to - * the current connection, or for the domain owning a node - * (which is always existing, as the owner of the node is - * tested to exist and deleted or replaced by domid 0 if not). - * So not finding the related domain MUST be an error in the - * data base. - */ - errno =3D ENOENT; - corrupt(NULL, "Accounting called for non-existing domain %u\n", - domid); - return ENOENT; - } + ret =3D domain_acc_add(conn, domid, ACC_MEM, 0, true); + if (ret < 0) + return -ret; + + /* + * domain_chk_quota() will print warning and also store whether the + * soft/hard quota has been hit. So check no_quota_check *after*. + */ + if (domain_chk_quota(conn, ret + mem) && !no_quota_check) + return ENOMEM; + + /* + * The domain the memory is to be accounted for should always exist, + * as accounting is done either for a domain related to the current + * connection, or for the domain owning a node (which is always + * existing, as the owner of the node is tested to exist and deleted + * or replaced by domid 0 if not). + * So not finding the related domain MUST be an error in the data base. + */ + domain_acc_add(conn, domid, ACC_MEM, mem, true); =20 return 0; } =20 void domain_watch_inc(struct connection *conn) { - if (!conn || !conn->domain) - return; - conn->domain->nbwatch++; + domain_acc_add(conn, conn->id, ACC_WATCH, 1, true); } =20 void domain_watch_dec(struct connection *conn) { - if (!conn || !conn->domain) - return; - if (conn->domain->nbwatch) - conn->domain->nbwatch--; + domain_acc_add(conn, conn->id, ACC_WATCH, -1, true); } =20 int domain_watch(struct connection *conn) { return (domain_is_unprivileged(conn)) - ? conn->domain->nbwatch + ? domain_acc_add(conn, conn->id, ACC_WATCH, 0, true) : 0; } =20 -void domain_outstanding_inc(struct connection *conn) +void domain_outstanding_inc(struct connection *conn, unsigned int domid) { - if (!conn || !conn->domain) - return; - conn->domain->nboutstanding++; + domain_acc_add(conn, domid, ACC_OUTST, 1, true); } =20 -void domain_outstanding_dec(struct connection *conn) +void domain_outstanding_dec(struct connection *conn, unsigned int domid) { - if (!conn || !conn->domain) - return; - conn->domain->nboutstanding--; -} - -void domain_outstanding_domid_dec(unsigned int domid) -{ - struct domain *d =3D find_domain_by_domid(domid); - - if (d) - d->nboutstanding--; + domain_acc_add(conn, domid, ACC_OUTST, -1, true); } =20 static wrl_creditt wrl_config_writecost =3D WRL_FACTOR; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_d= omain.h index 565b47b17b..91db3342c4 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -23,7 +23,10 @@ enum { ACC_NODES, ACC_REQ_N, /* Number of elements per request and domain. */ ACC_TR_N =3D ACC_REQ_N, /* Number of elements per transaction and domain.= */ - ACC_N =3D ACC_TR_N /* Number of elements per domain. */ + ACC_WATCH =3D ACC_TR_N, + ACC_OUTST, + ACC_MEM, + ACC_N /* Number of elements per domain. */ }; =20 void handle_event(void); @@ -102,9 +105,8 @@ static inline void domain_memory_add_nochk(struct conne= ction *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); --=20 2.35.3