|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v2 10/24] libxl: make sure callers of libxl_device_pci_list() free the list after use
From: Paul Durrant <pdurrant@xxxxxxxxxx>
A previous patch introduced libxl_device_pci_list_free() which should be used
by callers of libxl_device_pci_list() to properly dispose of the exported
'libxl_device_pci' types and the free the memory holding them. Whilst all
current callers do ensure the memory is freed, only the code in xl's
pcilist() function actually calls libxl_device_pci_dispose(). As it stands
this laxity does not lead to any memory leaks, but the simple addition of
.e.g. a 'string' into the idl definition of 'libxl_device_pci' would lead
to leaks.
This patch makes sure all callers of libxl_device_pci_list() can call
libxl_device_pci_list_free() by keeping copies of 'libxl_device_pci'
structures inline in 'pci_add_state' and 'pci_remove_state' (and also making
sure these are properly disposed at the end of the operations) rather
than keeping pointers to the structures returned by libxl_device_pci_list().
Signed-off-by: Paul Durrant <pdurrant@xxxxxxxxxx>
---
Cc: Ian Jackson <iwj@xxxxxxxxxxxxxx>
Cc: Wei Liu <wl@xxxxxxx>
Cc: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
tools/libs/light/libxl_pci.c | 68 ++++++++++++++++++++----------------
tools/xl/xl_pci.c | 3 +-
2 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index ff37dc5b5921..a69cba793583 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1006,7 +1006,7 @@ typedef struct pci_add_state {
libxl__xswait_state xswait;
libxl__ev_qmp qmp;
libxl__ev_time timeout;
- libxl_device_pci *pci;
+ libxl_device_pci pci;
libxl_domid pci_domid;
} pci_add_state;
@@ -1078,7 +1078,7 @@ static void pci_add_qemu_trad_watch_state_cb(libxl__egc
*egc,
/* Convenience aliases */
libxl_domid domid = pas->domid;
- libxl_device_pci *pci = pas->pci;
+ libxl_device_pci *pci = &pas->pci;
rc = check_qemu_running(gc, domid, xswa, rc, state);
if (rc == ERROR_NOT_READY)
@@ -1099,7 +1099,7 @@ static void pci_add_qmp_device_add(libxl__egc *egc,
pci_add_state *pas)
/* Convenience aliases */
libxl_domid domid = pas->domid;
- libxl_device_pci *pci = pas->pci;
+ libxl_device_pci *pci = &pas->pci;
libxl__ev_qmp *const qmp = &pas->qmp;
rc = libxl__ev_time_register_rel(ao, &pas->timeout,
@@ -1180,7 +1180,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc,
int dev_slot, dev_func;
/* Convenience aliases */
- libxl_device_pci *pci = pas->pci;
+ libxl_device_pci *pci = &pas->pci;
if (rc) goto out;
@@ -1281,7 +1281,7 @@ static void pci_add_dm_done(libxl__egc *egc,
/* Convenience aliases */
bool starting = pas->starting;
- libxl_device_pci *pci = pas->pci;
+ libxl_device_pci *pci = &pas->pci;
bool hvm = libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM;
libxl__ev_qmp_dispose(gc, &pas->qmp);
@@ -1497,7 +1497,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t
domid,
GCNEW(pas);
pas->aodev = aodev;
pas->domid = domid;
- pas->pci = pci;
+
+ libxl_device_pci_copy(CTX, &pas->pci, pci);
+ pci = &pas->pci;
+
pas->starting = starting;
pas->callback = device_pci_add_stubdom_done;
@@ -1536,12 +1539,6 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t
domid,
stubdomid = libxl_get_stubdom_id(ctx, domid);
if (stubdomid != 0) {
- libxl_device_pci *pci_s;
-
- GCNEW(pci_s);
- libxl_device_pci_init(pci_s);
- libxl_device_pci_copy(CTX, pci_s, pci);
- pas->pci = pci_s;
pas->callback = device_pci_add_stubdom_wait;
do_pci_add(egc, stubdomid, pas); /* must be last */
@@ -1600,7 +1597,7 @@ static void device_pci_add_stubdom_done(libxl__egc *egc,
/* Convenience aliases */
libxl_domid domid = pas->domid;
- libxl_device_pci *pci = pas->pci;
+ libxl_device_pci *pci = &pas->pci;
if (rc) goto out;
@@ -1651,7 +1648,7 @@ static void device_pci_add_done(libxl__egc *egc,
EGC_GC;
libxl__ao_device *aodev = pas->aodev;
libxl_domid domid = pas->domid;
- libxl_device_pci *pci = pas->pci;
+ libxl_device_pci *pci = &pas->pci;
if (rc) {
LOGD(ERROR, domid,
@@ -1661,6 +1658,7 @@ static void device_pci_add_done(libxl__egc *egc,
rc);
pci_info_xs_remove(gc, pci, "domid");
}
+ libxl_device_pci_dispose(pci);
aodev->rc = rc;
aodev->callback(egc, aodev);
}
@@ -1767,7 +1765,7 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc,
uint32_t domid,
typedef struct pci_remove_state {
libxl__ao_device *aodev;
libxl_domid domid;
- libxl_device_pci *pci;
+ libxl_device_pci pci;
bool force;
bool hvm;
unsigned int orig_vdev;
@@ -1809,23 +1807,26 @@ static void do_pci_remove(libxl__egc *egc,
pci_remove_state *prs)
{
STATE_AO_GC(prs->aodev->ao);
libxl_ctx *ctx = libxl__gc_owner(gc);
- libxl_device_pci *assigned;
+ libxl_device_pci *pcis;
+ bool attached;
uint32_t domid = prs->domid;
libxl_domain_type type = libxl__domain_type(gc, domid);
- libxl_device_pci *pci = prs->pci;
+ libxl_device_pci *pci = &prs->pci;
int rc, num;
uint32_t domainid = domid;
- assigned = libxl_device_pci_list(ctx, domid, &num);
- if (assigned == NULL) {
+ pcis = libxl_device_pci_list(ctx, domid, &num);
+ if (!pcis) {
rc = ERROR_FAIL;
goto out_fail;
}
- libxl__ptr_add(gc, assigned);
+
+ attached = is_pci_in_array(pcis, num, pci->domain,
+ pci->bus, pci->dev, pci->func);
+ libxl_device_pci_list_free(pcis, num);
rc = ERROR_INVAL;
- if ( !is_pci_in_array(assigned, num, pci->domain,
- pci->bus, pci->dev, pci->func) ) {
+ if (!attached) {
LOGD(ERROR, domainid, "PCI device not attached to this domain");
goto out_fail;
}
@@ -1925,7 +1926,7 @@ static void
pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc,
/* Convenience aliases */
libxl_domid domid = prs->domid;
- libxl_device_pci *const pci = prs->pci;
+ libxl_device_pci *const pci = &prs->pci;
rc = check_qemu_running(gc, domid, xswa, rc, state);
if (rc == ERROR_NOT_READY)
@@ -1947,7 +1948,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc,
int rc;
/* Convenience aliases */
- libxl_device_pci *const pci = prs->pci;
+ libxl_device_pci *const pci = &prs->pci;
rc = libxl__ev_time_register_rel(ao, &prs->timeout,
pci_remove_timeout,
@@ -2017,7 +2018,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc,
/* Convenience aliases */
libxl__ao *const ao = prs->aodev->ao;
- libxl_device_pci *const pci = prs->pci;
+ libxl_device_pci *const pci = &prs->pci;
if (rc) goto out;
@@ -2072,7 +2073,7 @@ static void pci_remove_timeout(libxl__egc *egc,
libxl__ev_time *ev,
pci_remove_state *prs = CONTAINER_OF(ev, *prs, timeout);
/* Convenience aliases */
- libxl_device_pci *const pci = prs->pci;
+ libxl_device_pci *const pci = &prs->pci;
LOGD(WARN, prs->domid, "timed out waiting for DM to remove "
PCI_PT_QDEV_ID, pci->bus, pci->dev, pci->func);
@@ -2093,7 +2094,7 @@ static void pci_remove_detached(libxl__egc *egc,
bool isstubdom;
/* Convenience aliases */
- libxl_device_pci *const pci = prs->pci;
+ libxl_device_pci *const pci = &prs->pci;
libxl_domid domid = prs->domid;
/* Cleaning QMP states ASAP */
@@ -2156,7 +2157,7 @@ static void pci_remove_done(libxl__egc *egc,
if (rc) goto out;
- libxl__device_pci_remove_xenstore(gc, prs->domid, prs->pci);
+ libxl__device_pci_remove_xenstore(gc, prs->domid, &prs->pci);
out:
device_pci_remove_common_next(egc, prs, rc);
}
@@ -2174,7 +2175,10 @@ static void libxl__device_pci_remove_common(libxl__egc
*egc,
GCNEW(prs);
prs->aodev = aodev;
prs->domid = domid;
- prs->pci = pci;
+
+ libxl_device_pci_copy(CTX, &prs->pci, pci);
+ pci = &prs->pci;
+
prs->force = force;
libxl__xswait_init(&prs->xswait);
libxl__ev_qmp_init(&prs->qmp);
@@ -2209,7 +2213,7 @@ static void device_pci_remove_common_next(libxl__egc *egc,
EGC_GC;
/* Convenience aliases */
- libxl_device_pci *const pci = prs->pci;
+ libxl_device_pci *const pci = &prs->pci;
libxl__ao_device *const aodev = prs->aodev;
const unsigned int pfunc_mask = prs->pfunc_mask;
const unsigned int orig_vdev = prs->orig_vdev;
@@ -2240,6 +2244,7 @@ out:
if (!rc) pci_info_xs_remove(gc, pci, "domid");
+ libxl_device_pci_dispose(pci);
aodev->rc = rc;
aodev->callback(egc, aodev);
}
@@ -2342,7 +2347,6 @@ void libxl__device_pci_destroy_all(libxl__egc *egc,
uint32_t domid,
pcis = libxl_device_pci_list(CTX, domid, &num);
if ( pcis == NULL )
return;
- libxl__ptr_add(gc, pcis);
for (i = 0; i < num; i++) {
/* Force remove on shutdown since, on HVM, qemu will not always
@@ -2353,6 +2357,8 @@ void libxl__device_pci_destroy_all(libxl__egc *egc,
uint32_t domid,
libxl__device_pci_remove_common(egc, domid, pcis + i, true,
aodev);
}
+
+ libxl_device_pci_list_free(pcis, num);
}
int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid,
diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c
index 34fcf5a4fadf..7c0f102ac7b7 100644
--- a/tools/xl/xl_pci.c
+++ b/tools/xl/xl_pci.c
@@ -35,9 +35,8 @@ static void pcilist(uint32_t domid)
printf("%02x.%01x %04x:%02x:%02x.%01x\n",
(pcis[i].vdevfn >> 3) & 0x1f, pcis[i].vdevfn & 0x7,
pcis[i].domain, pcis[i].bus, pcis[i].dev, pcis[i].func);
- libxl_device_pci_dispose(&pcis[i]);
}
- free(pcis);
+ libxl_device_pci_list_free(pcis, num);
}
int main_pcilist(int argc, char **argv)
--
2.20.1
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |