Commit 339f74e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.19a-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fix from Juergen Gross:
 "Fix for the Xen gntdev driver causing inappropriate WARN() messages"

* tag 'for-linus-5.19a-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE
parents fcd1b2b9 166d3863

drivers/xen/gntdev.c

+4 −2
Original line number Diff line number Diff line
@@ -396,13 +396,15 @@ static void __unmap_grant_pages_done(int result, 
	unsigned int offset = data->unmap_ops - map->unmap_ops;



	for (i = 0; i < data->count; i++) {

		WARN_ON(map->unmap_ops[offset+i].status);

		WARN_ON(map->unmap_ops[offset + i].status != GNTST_okay &&

			map->unmap_ops[offset + i].handle != INVALID_GRANT_HANDLE);

		pr_debug("unmap handle=%d st=%d\n",

			map->unmap_ops[offset+i].handle,

			map->unmap_ops[offset+i].status);

		map->unmap_ops[offset+i].handle = INVALID_GRANT_HANDLE;

		if (use_ptemod) {

			WARN_ON(map->kunmap_ops[offset+i].status);

			WARN_ON(map->kunmap_ops[offset + i].status != GNTST_okay &&

				map->kunmap_ops[offset + i].handle != INVALID_GRANT_HANDLE);

			pr_debug("kunmap handle=%u st=%d\n",

				 map->kunmap_ops[offset+i].handle,

				 map->kunmap_ops[offset+i].status);