From nobody Mon Feb 9 19:05:57 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=1680164261; cv=none; d=zohomail.com; s=zohoarc; b=M2e8nHqJ1dy/NkObQPKLWTgtU2f2EBbMZC9VKG0VzLRSDGaVE+ytRov3HfoCgARsYmWaGmrA1palAZe7O3COZDct+g/Pr+A3r8YEvqRX5+c4MIlF3PEPlpkECKI/Ea7fR3bq5ze5NN00LkDykTcbn+YV/ffD4wr7PtOeilZwT3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680164261; 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=QXKu+Gq/9sz04GypdYkd9erzyn6Y47GdsHFpX0r8ngg=; b=MWqAiqdAiSXl0HlceXrUV6axK7c+7hhMKBkadDvBr2j9qWlVk+k4MzD8sx2gQsertIQYQQ75E5drVzdLwM0A59LfFprij67/bBe8k/EbqbsZh/2mfN7RoUA4lqYZ/tCRTBAJXq2Vg91RIPzCUB/imihVEiPNeEGPFFO7U584lHo= 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 1680164261379838.6320943877994; Thu, 30 Mar 2023 01:17:41 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.516461.800593 (Exim 4.92) (envelope-from ) id 1phnTH-00043I-E7; Thu, 30 Mar 2023 08:17:23 +0000 Received: by outflank-mailman (output) from mailman id 516461.800593; Thu, 30 Mar 2023 08:17:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1phnTH-00042m-9P; Thu, 30 Mar 2023 08:17:23 +0000 Received: by outflank-mailman (input) for mailman id 516461; Thu, 30 Mar 2023 08:17:21 +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 1phnTF-0001oz-Ou for xen-devel@lists.xenproject.org; Thu, 30 Mar 2023 08:17:21 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2001:67c:2178:6::1c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4b017941-ced3-11ed-85db-49a42c6b2330; Thu, 30 Mar 2023 10:17:21 +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-out1.suse.de (Postfix) with ESMTPS id E868121B22; Thu, 30 Mar 2023 08:17:20 +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 B9773138FF; Thu, 30 Mar 2023 08:17:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qbbfK5BFJWQSEgAAMHmgww (envelope-from ); Thu, 30 Mar 2023 08:17:20 +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: 4b017941-ced3-11ed-85db-49a42c6b2330 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1680164240; 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=QXKu+Gq/9sz04GypdYkd9erzyn6Y47GdsHFpX0r8ngg=; b=Gi8he0qySfGgva+mlsJH+ZE/BAVYEajFGkt0vf/vvQUCsU2mvbqs61QbIL5Nh3sscW2wuV YXr+ZkB2Il5boNRFlAcaTdvc/Nb9qTcF6DNaKGFDJWtKSHX61pD2+OFRucqE19iCtPd1Wp FklKQvYGzqmTapLrudjAb4d1a/IVFJE= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH v3 06/13] tools/xenstore: add current connection to domain_memory_add() parameters Date: Thu, 30 Mar 2023 10:16:37 +0200 Message-Id: <20230330081644.11480-7-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230330081644.11480-1-jgross@suse.com> References: <20230330081644.11480-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1680164263801100001 Content-Type: text/plain; charset="utf-8" In order to enable switching memory accounting to the generic array based accounting, add the current connection to the parameters of domain_memory_add(). This requires to add the connection to some other functions, too. Signed-off-by: Juergen Gross --- tools/xenstore/xenstored_core.c | 28 ++++++++++++++++------------ tools/xenstore/xenstored_domain.c | 3 ++- tools/xenstore/xenstored_domain.h | 14 +++++++++----- tools/xenstore/xenstored_watch.c | 11 ++++++----- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_cor= e.c index 92a40ccf3f..88ae674523 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -246,7 +246,8 @@ static void free_buffered_data(struct buffered_data *ou= t, } } =20 - domain_memory_add_nochk(conn->id, -out->hdr.msg.len - sizeof(out->hdr)); + domain_memory_add_nochk(conn, conn->id, + -out->hdr.msg.len - sizeof(out->hdr)); =20 if (out->hdr.msg.type =3D=3D XS_WATCH_EVENT) { req =3D out->pend.req; @@ -631,24 +632,25 @@ int do_tdb_write(struct connection *conn, TDB_DATA *k= ey, TDB_DATA *data, * nodes to new owners. */ if (old_acc.memory) - domain_memory_add_nochk(old_domid, + domain_memory_add_nochk(conn, old_domid, -old_acc.memory - key->dsize); - ret =3D domain_memory_add(new_domid, data->dsize + key->dsize, - no_quota_check); + ret =3D domain_memory_add(conn, new_domid, + data->dsize + key->dsize, no_quota_check); if (ret) { /* Error path, so no quota check. */ if (old_acc.memory) - domain_memory_add_nochk(old_domid, + domain_memory_add_nochk(conn, old_domid, old_acc.memory + key->dsize); return ret; } =20 /* TDB should set errno, but doesn't even set ecode AFAICT. */ if (tdb_store(tdb_ctx, *key, *data, TDB_REPLACE) !=3D 0) { - domain_memory_add_nochk(new_domid, -data->dsize - key->dsize); + domain_memory_add_nochk(conn, new_domid, + -data->dsize - key->dsize); /* Error path, so no quota check. */ if (old_acc.memory) - domain_memory_add_nochk(old_domid, + domain_memory_add_nochk(conn, old_domid, old_acc.memory + key->dsize); errno =3D EIO; return errno; @@ -683,7 +685,7 @@ int do_tdb_delete(struct connection *conn, TDB_DATA *ke= y, =20 if (acc->memory) { domid =3D get_acc_domid(conn, key, acc->domid); - domain_memory_add_nochk(domid, -acc->memory - key->dsize); + domain_memory_add_nochk(conn, domid, -acc->memory - key->dsize); } =20 return 0; @@ -1055,11 +1057,13 @@ void send_reply(struct connection *conn, enum xsd_s= ockmsg_type type, if (len <=3D DEFAULT_BUFFER_SIZE) { bdata->buffer =3D bdata->default_buffer; /* Don't check quota, path might be used for returning error. */ - domain_memory_add_nochk(conn->id, len + sizeof(bdata->hdr)); + domain_memory_add_nochk(conn, conn->id, + len + sizeof(bdata->hdr)); } else { bdata->buffer =3D talloc_array(bdata, char, len); if (!bdata->buffer || - domain_memory_add_chk(conn->id, len + sizeof(bdata->hdr))) { + domain_memory_add_chk(conn, conn->id, + len + sizeof(bdata->hdr))) { send_error(conn, ENOMEM); return; } @@ -1122,7 +1126,7 @@ void send_event(struct buffered_data *req, struct con= nection *conn, } } =20 - if (domain_memory_add_chk(conn->id, len + sizeof(bdata->hdr))) { + if (domain_memory_add_chk(conn, conn->id, len + sizeof(bdata->hdr))) { talloc_free(bdata); return; } @@ -3322,7 +3326,7 @@ static void add_buffered_data(struct buffered_data *b= data, * be smaller. So ignore it. The limit will be applied for any resource * after the state has been fully restored. */ - domain_memory_add_nochk(conn->id, len + sizeof(bdata->hdr)); + domain_memory_add_nochk(conn, conn->id, len + sizeof(bdata->hdr)); } =20 void read_state_buffered_data(const void *ctx, struct connection *conn, diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_d= omain.c index 6c4b8d9b32..aab23a2506 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1235,7 +1235,8 @@ static bool domain_chk_quota(struct domain *domain, i= nt mem) return false; } =20 -int domain_memory_add(unsigned int domid, int mem, bool no_quota_check) +int domain_memory_add(struct connection *conn, unsigned int domid, int mem, + bool no_quota_check) { struct domain *domain; =20 diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_d= omain.h index e669f57b80..5cfd730cf6 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -80,25 +80,29 @@ int domain_nbentry_inc(struct connection *conn, unsigne= d int domid); int domain_nbentry_dec(struct connection *conn, unsigned int domid); int domain_nbentry_fix(unsigned int domid, int num, bool update); unsigned int domain_nbentry(struct connection *conn); -int domain_memory_add(unsigned int domid, int mem, bool no_quota_check); +int domain_memory_add(struct connection *conn, unsigned int domid, int mem, + bool no_quota_check); =20 /* * domain_memory_add_chk(): to be used when memory quota should be checked. * Not to be used when specifying a negative mem value, as lowering the us= ed * memory should always be allowed. */ -static inline int domain_memory_add_chk(unsigned int domid, int mem) +static inline int domain_memory_add_chk(struct connection *conn, + unsigned int domid, int mem) { - return domain_memory_add(domid, mem, false); + return domain_memory_add(conn, domid, mem, false); } + /* * domain_memory_add_nochk(): to be used when memory quota should not be * checked, e.g. when lowering memory usage, or in an error case for undoi= ng * a previous memory adjustment. */ -static inline void domain_memory_add_nochk(unsigned int domid, int mem) +static inline void domain_memory_add_nochk(struct connection *conn, + unsigned int domid, int mem) { - domain_memory_add(domid, mem, true); + domain_memory_add(conn, domid, mem, true); } void domain_watch_inc(struct connection *conn); void domain_watch_dec(struct connection *conn); diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_wa= tch.c index 8ad0229df6..e30cd89be3 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -199,7 +199,7 @@ static struct watch *add_watch(struct connection *conn,= char *path, char *token, watch->token =3D talloc_strdup(watch, token); if (!watch->node || !watch->token) goto nomem; - if (domain_memory_add(conn->id, strlen(path) + strlen(token), + if (domain_memory_add(conn, conn->id, strlen(path) + strlen(token), no_quota_check)) goto nomem; =20 @@ -274,8 +274,9 @@ int do_unwatch(const void *ctx, struct connection *conn, list_for_each_entry(watch, &conn->watches, list) { if (streq(watch->node, node) && streq(watch->token, vec[1])) { list_del(&watch->list); - domain_memory_add_nochk(conn->id, -strlen(watch->node) - - strlen(watch->token)); + domain_memory_add_nochk(conn, conn->id, + -strlen(watch->node) - + strlen(watch->token)); talloc_free(watch); domain_watch_dec(conn); send_ack(conn, XS_UNWATCH); @@ -291,8 +292,8 @@ void conn_delete_all_watches(struct connection *conn) =20 while ((watch =3D list_top(&conn->watches, struct watch, list))) { list_del(&watch->list); - domain_memory_add_nochk(conn->id, -strlen(watch->node) - - strlen(watch->token)); + domain_memory_add_nochk(conn, conn->id, -strlen(watch->node) - + strlen(watch->token)); talloc_free(watch); domain_watch_dec(conn); } --=20 2.35.3