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
|
From 5f0749272567c4f7403b9d3f45ab94f91da84a20 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 29 Apr 2016 18:29:45 +0100
Subject: [PATCH 06/14] libxl: Do not trust backend for disk; fix driver domain
disks list
Rework libxl__device_disk_from_xs_be (which takes a backend path) into
to libxl__device_disk_from_xenstore (which takes a libxl path).
libxl__device_disk_from_xenstore now finds the backend path itself,
although it doesn't use it any more for most of its functions. We
rename the variable from be_path to backend_path to make sure we
didn't miss any cases.
All the data collection is now done by reading from the copy in
/libxl.
libxl_device_disk_list and its helper libxl__append_disk_list (which
used to be libxl__append_disk_list_of_type) need extensive rework,
because they now need to specify the /libxl path rather than the
backend path.
To do that they enumerate disks by looking in the appropriate area in
/libxl. Previously they scanned various of the backend directories in
dom0 (which was broken for driver domains). It is no longer necessary
to enumerate the various disk backends, because they all use the same
paths in /devices. libxl__device_disk_from_xenstore will parse the
type out of the backend path, for itself. (Indeed, it did so before -
the now-gone type parameter to libxl__append_disk_list_of_type wasn't
used other than to construct the directory to list.)
Finally, remove a redundant store to pdisk->backend_domid in
libxl__append_disk_list[_of_type]. Even before this commit, that
store was not needed because libxl_device_disk_init (called by
libxl__device_disk_from_xenstore) would zero it. Now it overwrites
the correct backend domid with zero; so remove it.
This is part of XSA-178.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
---
v2: Also fix up COLO reads, following rebase
---
tools/libxl/libxl.c | 84 +++++++++++++++++++++++++++--------------------------
1 file changed, 43 insertions(+), 41 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index df62bcc..cab98e0 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2270,8 +2270,8 @@ void libxl__device_disk_add(libxl__egc *egc, uint32_t domid,
device_disk_add(egc, domid, disk, aodev, NULL, NULL);
}
-static int libxl__device_disk_from_xs_be(libxl__gc *gc,
- const char *be_path,
+static int libxl__device_disk_from_xenstore(libxl__gc *gc,
+ const char *libxl_path,
libxl_device_disk *disk)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -2281,15 +2281,27 @@ static int libxl__device_disk_from_xs_be(libxl__gc *gc,
libxl_device_disk_init(disk);
- rc = sscanf(be_path, "/local/domain/%d/", &disk->backend_domid);
+ const char *backend_path;
+ rc = libxl__xs_read_checked(gc, XBT_NULL,
+ GCSPRINTF("%s/backend", libxl_path),
+ &backend_path);
+ if (rc) goto out;
+
+ if (!backend_path) {
+ LOG(ERROR, "disk %s does not exist (no backend path", libxl_path);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ rc = sscanf(backend_path, "/local/domain/%d/", &disk->backend_domid);
if (rc != 1) {
- LOG(ERROR, "Unable to fetch device backend domid from %s", be_path);
+ LOG(ERROR, "Unable to fetch device backend domid from %s", backend_path);
goto cleanup;
}
/* "params" may not be present; but everything else must be. */
tmp = xs_read(ctx->xsh, XBT_NULL,
- libxl__sprintf(gc, "%s/params", be_path), &len);
+ libxl__sprintf(gc, "%s/params", libxl_path), &len);
if (tmp && strchr(tmp, ':')) {
disk->pdev_path = strdup(strchr(tmp, ':') + 1);
free(tmp);
@@ -2299,31 +2311,31 @@ static int libxl__device_disk_from_xs_be(libxl__gc *gc,
tmp = libxl__xs_read(gc, XBT_NULL,
- libxl__sprintf(gc, "%s/type", be_path));
+ libxl__sprintf(gc, "%s/type", libxl_path));
if (!tmp) {
- LOG(ERROR, "Missing xenstore node %s/type", be_path);
+ LOG(ERROR, "Missing xenstore node %s/type", libxl_path);
goto cleanup;
}
libxl_string_to_backend(ctx, tmp, &(disk->backend));
disk->vdev = xs_read(ctx->xsh, XBT_NULL,
- libxl__sprintf(gc, "%s/dev", be_path), &len);
+ libxl__sprintf(gc, "%s/dev", libxl_path), &len);
if (!disk->vdev) {
- LOG(ERROR, "Missing xenstore node %s/dev", be_path);
+ LOG(ERROR, "Missing xenstore node %s/dev", libxl_path);
goto cleanup;
}
tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf
- (gc, "%s/removable", be_path));
+ (gc, "%s/removable", libxl_path));
if (!tmp) {
- LOG(ERROR, "Missing xenstore node %s/removable", be_path);
+ LOG(ERROR, "Missing xenstore node %s/removable", libxl_path);
goto cleanup;
}
disk->removable = atoi(tmp);
- tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/mode", be_path));
+ tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/mode", libxl_path));
if (!tmp) {
- LOG(ERROR, "Missing xenstore node %s/mode", be_path);
+ LOG(ERROR, "Missing xenstore node %s/mode", libxl_path);
goto cleanup;
}
if (!strcmp(tmp, "w"))
@@ -2332,9 +2344,9 @@ static int libxl__device_disk_from_xs_be(libxl__gc *gc,
disk->readwrite = 0;
tmp = libxl__xs_read(gc, XBT_NULL,
- libxl__sprintf(gc, "%s/device-type", be_path));
+ libxl__sprintf(gc, "%s/device-type", libxl_path));
if (!tmp) {
- LOG(ERROR, "Missing xenstore node %s/device-type", be_path);
+ LOG(ERROR, "Missing xenstore node %s/device-type", libxl_path);
goto cleanup;
}
disk->is_cdrom = !strcmp(tmp, "cdrom");
@@ -2343,15 +2355,17 @@ static int libxl__device_disk_from_xs_be(libxl__gc *gc,
return 0;
cleanup:
+ rc = ERROR_FAIL;
+ out:
libxl_device_disk_dispose(disk);
- return ERROR_FAIL;
+ return rc;
}
int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid,
const char *vdev, libxl_device_disk *disk)
{
GC_INIT(ctx);
- char *dompath, *path;
+ char *dom_xl_path, *libxl_path;
int devid = libxl__device_disk_dev_number(vdev, NULL, NULL);
int rc = ERROR_FAIL;
@@ -2360,39 +2374,34 @@ int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid,
libxl_device_disk_init(disk);
- dompath = libxl__xs_get_dompath(gc, domid);
- if (!dompath) {
+ dom_xl_path = libxl__xs_libxl_path(gc, domid);
+ if (!dom_xl_path) {
goto out;
}
- path = libxl__xs_read(gc, XBT_NULL,
- libxl__sprintf(gc, "%s/device/vbd/%d/backend",
- dompath, devid));
- if (!path)
- goto out;
+ libxl_path = GCSPRINTF("%s/device/vbd/%d", dom_xl_path, devid);
- rc = libxl__device_disk_from_xs_be(gc, path, disk);
+ rc = libxl__device_disk_from_xenstore(gc, libxl_path, disk);
out:
GC_FREE;
return rc;
}
-static int libxl__append_disk_list_of_type(libxl__gc *gc,
+static int libxl__append_disk_list(libxl__gc *gc,
uint32_t domid,
- const char *type,
libxl_device_disk **disks,
int *ndisks)
{
- char *be_path = NULL;
+ char *libxl_dir_path = NULL;
char **dir = NULL;
unsigned int n = 0;
libxl_device_disk *pdisk = NULL, *pdisk_end = NULL;
int rc=0;
int initial_disks = *ndisks;
- be_path = libxl__sprintf(gc, "%s/backend/%s/%d",
- libxl__xs_get_dompath(gc, 0), type, domid);
- dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n);
+ libxl_dir_path = GCSPRINTF("%s/device/vbd",
+ libxl__xs_libxl_path(gc, domid));
+ dir = libxl__xs_directory(gc, XBT_NULL, libxl_dir_path, &n);
if (dir && n) {
libxl_device_disk *tmp;
tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n));
@@ -2403,10 +2412,9 @@ static int libxl__append_disk_list_of_type(libxl__gc *gc,
pdisk_end = *disks + initial_disks + n;
for (; pdisk < pdisk_end; pdisk++, dir++) {
const char *p;
- p = libxl__sprintf(gc, "%s/%s", be_path, *dir);
- if ((rc=libxl__device_disk_from_xs_be(gc, p, pdisk)))
+ p = libxl__sprintf(gc, "%s/%s", libxl_dir_path, *dir);
+ if ((rc=libxl__device_disk_from_xenstore(gc, p, pdisk)))
goto out;
- pdisk->backend_domid = 0;
*ndisks += 1;
}
}
@@ -2422,13 +2430,7 @@ libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int *n
*num = 0;
- rc = libxl__append_disk_list_of_type(gc, domid, "vbd", &disks, num);
- if (rc) goto out_err;
-
- rc = libxl__append_disk_list_of_type(gc, domid, "tap", &disks, num);
- if (rc) goto out_err;
-
- rc = libxl__append_disk_list_of_type(gc, domid, "qdisk", &disks, num);
+ rc = libxl__append_disk_list(gc, domid, &disks, num);
if (rc) goto out_err;
GC_FREE;
--
1.9.1
|
