Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio
Pull VFIO fix from Alex Williamson:
"Fix deadlock in mbochs sample driver (Alexey Khoroshilov)"
* tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio:
sample: vfio-mdev: avoid deadlock in mdev_access()
+3
-1
+3
-1
samples/vfio-mdev/mbochs.c
+3
-1
samples/vfio-mdev/mbochs.c
···
178
178
return "(invalid)";
179
179
}
180
180
181
+
static struct page *__mbochs_get_page(struct mdev_state *mdev_state,
182
+
pgoff_t pgoff);
181
183
static struct page *mbochs_get_page(struct mdev_state *mdev_state,
182
184
pgoff_t pgoff);
183
185
···
396
394
MBOCHS_MEMORY_BAR_OFFSET + mdev_state->memsize) {
397
395
pos -= MBOCHS_MMIO_BAR_OFFSET;
398
396
poff = pos & ~PAGE_MASK;
399
-
pg = mbochs_get_page(mdev_state, pos >> PAGE_SHIFT);
397
+
pg = __mbochs_get_page(mdev_state, pos >> PAGE_SHIFT);
400
398
map = kmap(pg);
401
399
if (is_write)
402
400
memcpy(map + poff, buf, count);