1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
|
From b584b9b95687655f4f9f5c37fea3b1eea3f32886 Mon Sep 17 00:00:00 2001
From: Juergen Gross <jgross@suse.com>
Date: Tue, 13 Sep 2022 07:35:10 +0200
Subject: [PATCH 61/87] tools/xenstore: add control command for setting and
showing quota
Add a xenstore-control command "quota" to:
- show current quota settings
- change quota settings
- show current quota related values of a domain
Note that in the case the new quota is lower than existing one,
Xenstored may continue to handle requests from a domain exceeding the
new limit (depends on which one has been broken) and the amount of
resource used will not change. However the domain will not be able to
create more resource (associated to the quota) until it is back to below
the limit.
This is part of XSA-326.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Julien Grall <jgrall@amazon.com>
(cherry picked from commit 9c484bef83496b683b0087e3bd2a560da4aa37af)
---
docs/misc/xenstore.txt | 11 +++
tools/xenstore/xenstored_control.c | 111 +++++++++++++++++++++++++++++
tools/xenstore/xenstored_domain.c | 33 +++++++++
tools/xenstore/xenstored_domain.h | 2 +
4 files changed, 157 insertions(+)
diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt
index 334dc8b6fdf5..a7d006519ae8 100644
--- a/docs/misc/xenstore.txt
+++ b/docs/misc/xenstore.txt
@@ -366,6 +366,17 @@ CONTROL <command>|[<parameters>|]
print|<string>
print <string> to syslog (xenstore runs as daemon) or
to console (xenstore runs as stubdom)
+ quota|[set <name> <val>|<domid>]
+ without parameters: print the current quota settings
+ with "set <name> <val>": set the quota <name> to new value
+ <val> (The admin should make sure all the domain usage is
+ below the quota. If it is not, then Xenstored may continue to
+ handle requests from the domain as long as the resource
+ violating the new quota setting isn't increased further)
+ with "<domid>": print quota related accounting data for
+ the domain <domid>
+ quota-soft|[set <name> <val>]
+ like the "quota" command, but for soft-quota.
help <supported-commands>
return list of supported commands for CONTROL
diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c
index adb8d51b043b..1031a81c3874 100644
--- a/tools/xenstore/xenstored_control.c
+++ b/tools/xenstore/xenstored_control.c
@@ -196,6 +196,115 @@ static int do_control_log(void *ctx, struct connection *conn,
return 0;
}
+struct quota {
+ const char *name;
+ int *quota;
+ const char *descr;
+};
+
+static const struct quota hard_quotas[] = {
+ { "nodes", "a_nb_entry_per_domain, "Nodes per domain" },
+ { "watches", "a_nb_watch_per_domain, "Watches per domain" },
+ { "transactions", "a_max_transaction, "Transactions per domain" },
+ { "outstanding", "a_req_outstanding,
+ "Outstanding requests per domain" },
+ { "transaction-nodes", "a_trans_nodes,
+ "Max. number of accessed nodes per transaction" },
+ { "memory", "a_memory_per_domain_hard,
+ "Total Xenstore memory per domain (error level)" },
+ { "node-size", "a_max_entry_size, "Max. size of a node" },
+ { "path-max", "a_max_path_len, "Max. length of a node path" },
+ { "permissions", "a_nb_perms_per_node,
+ "Max. number of permissions per node" },
+ { NULL, NULL, NULL }
+};
+
+static const struct quota soft_quotas[] = {
+ { "memory", "a_memory_per_domain_soft,
+ "Total Xenstore memory per domain (warning level)" },
+ { NULL, NULL, NULL }
+};
+
+static int quota_show_current(const void *ctx, struct connection *conn,
+ const struct quota *quotas)
+{
+ char *resp;
+ unsigned int i;
+
+ resp = talloc_strdup(ctx, "Quota settings:\n");
+ if (!resp)
+ return ENOMEM;
+
+ for (i = 0; quotas[i].quota; i++) {
+ resp = talloc_asprintf_append(resp, "%-17s: %8d %s\n",
+ quotas[i].name, *quotas[i].quota,
+ quotas[i].descr);
+ if (!resp)
+ return ENOMEM;
+ }
+
+ send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1);
+
+ return 0;
+}
+
+static int quota_set(const void *ctx, struct connection *conn,
+ char **vec, int num, const struct quota *quotas)
+{
+ unsigned int i;
+ int val;
+
+ if (num != 2)
+ return EINVAL;
+
+ val = atoi(vec[1]);
+ if (val < 1)
+ return EINVAL;
+
+ for (i = 0; quotas[i].quota; i++) {
+ if (!strcmp(vec[0], quotas[i].name)) {
+ *quotas[i].quota = val;
+ send_ack(conn, XS_CONTROL);
+ return 0;
+ }
+ }
+
+ return EINVAL;
+}
+
+static int quota_get(const void *ctx, struct connection *conn,
+ char **vec, int num)
+{
+ if (num != 1)
+ return EINVAL;
+
+ return domain_get_quota(ctx, conn, atoi(vec[0]));
+}
+
+static int do_control_quota(void *ctx, struct connection *conn,
+ char **vec, int num)
+{
+ if (num == 0)
+ return quota_show_current(ctx, conn, hard_quotas);
+
+ if (!strcmp(vec[0], "set"))
+ return quota_set(ctx, conn, vec + 1, num - 1, hard_quotas);
+
+ return quota_get(ctx, conn, vec, num);
+}
+
+static int do_control_quota_s(void *ctx, struct connection *conn,
+ char **vec, int num)
+{
+ if (num == 0)
+ return quota_show_current(ctx, conn, soft_quotas);
+
+ if (!strcmp(vec[0], "set"))
+ return quota_set(ctx, conn, vec + 1, num - 1, soft_quotas);
+
+ return EINVAL;
+}
+
#ifdef __MINIOS__
static int do_control_memreport(void *ctx, struct connection *conn,
char **vec, int num)
@@ -847,6 +956,8 @@ static struct cmd_s cmds[] = {
{ "memreport", do_control_memreport, "[<file>]" },
#endif
{ "print", do_control_print, "<string>" },
+ { "quota", do_control_quota, "[set <name> <val>|<domid>]" },
+ { "quota-soft", do_control_quota_s, "[set <name> <val>]" },
{ "help", do_control_help, "" },
};
diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c
index 94fd561e9de4..e7c6886ccf47 100644
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -31,6 +31,7 @@
#include "xenstored_domain.h"
#include "xenstored_transaction.h"
#include "xenstored_watch.h"
+#include "xenstored_control.h"
#include <xenevtchn.h>
#include <xenctrl.h>
@@ -345,6 +346,38 @@ static struct domain *find_domain_struct(unsigned int domid)
return NULL;
}
+int domain_get_quota(const void *ctx, struct connection *conn,
+ unsigned int domid)
+{
+ struct domain *d = find_domain_struct(domid);
+ char *resp;
+ int ta;
+
+ if (!d)
+ return ENOENT;
+
+ ta = d->conn ? d->conn->transaction_started : 0;
+ resp = talloc_asprintf(ctx, "Domain %u:\n", domid);
+ if (!resp)
+ return ENOMEM;
+
+#define ent(t, e) \
+ resp = talloc_asprintf_append(resp, "%-16s: %8d\n", #t, e); \
+ if (!resp) return ENOMEM
+
+ ent(nodes, d->nbentry);
+ ent(watches, d->nbwatch);
+ ent(transactions, ta);
+ ent(outstanding, d->nboutstanding);
+ ent(memory, d->memory);
+
+#undef ent
+
+ send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1);
+
+ return 0;
+}
+
static struct domain *alloc_domain(const void *context, unsigned int domid)
{
struct domain *domain;
diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h
index 633c9a0a0a1f..904faa923afb 100644
--- a/tools/xenstore/xenstored_domain.h
+++ b/tools/xenstore/xenstored_domain.h
@@ -87,6 +87,8 @@ 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);
+int domain_get_quota(const void *ctx, struct connection *conn,
+ unsigned int domid);
/* Special node permission handling. */
int set_perms_special(struct connection *conn, const char *name,
--
2.37.4
|