Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-5.5b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Two fixes: one for a resource accounting bug in some configurations
and a fix for another patch which went into rc1"
* tag 'for-linus-5.5b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/balloon: fix ballooned page accounting without hotplug enabled
xen-blkback: prevent premature module unload
+12
-1
+10
drivers/block/xen-blkback/xenbus.c
+10
drivers/block/xen-blkback/xenbus.c
···
171
171
blkif->domid = domid;
172
172
atomic_set(&blkif->refcnt, 1);
173
173
init_completion(&blkif->drain_complete);
174
+
175
+
/*
176
+
* Because freeing back to the cache may be deferred, it is not
177
+
* safe to unload the module (and hence destroy the cache) until
178
+
* this has completed. To prevent premature unloading, take an
179
+
* extra module reference here and release only when the object
180
+
* has been freed back to the cache.
181
+
*/
182
+
__module_get(THIS_MODULE);
174
183
INIT_WORK(&blkif->free_work, xen_blkif_deferred_free);
175
184
176
185
return blkif;
···
329
320
330
321
/* Make sure everything is drained before shutting down */
331
322
kmem_cache_free(xen_blkif_cachep, blkif);
323
+
module_put(THIS_MODULE);
332
324
}
333
325
334
326
int __init xen_blkif_interface_init(void)
+2
-1
drivers/xen/balloon.c
+2
-1
drivers/xen/balloon.c
···
394
394
#else
395
395
static enum bp_state reserve_additional_memory(void)
396
396
{
397
-
balloon_stats.target_pages = balloon_stats.current_pages;
397
+
balloon_stats.target_pages = balloon_stats.current_pages +
398
+
balloon_stats.target_unpopulated;
398
399
return BP_ECANCELED;
399
400
}
400
401
#endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */