* Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE")
@ 2022-07-23 3:44 Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.9] Ignore failure to unmap -1 Demi Marie Obenour
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Demi Marie Obenour @ 2022-07-23 3:44 UTC (permalink / raw)
To: Boris Ostrovsky, Juergen Gross, Stefano Stabellini, Greg Kroah-Hartman
Cc: Demi Marie Obenour, xen-devel, linux-kernel, stable
This series backports upstream commit 166d3863231667c4f64dee72b77d1102cdfad11f
to all supported stable kernel trees.
--
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4.9] Ignore failure to unmap -1
2022-07-23 3:44 Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Demi Marie Obenour
@ 2022-07-23 3:44 ` Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.14] " Demi Marie Obenour
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Demi Marie Obenour @ 2022-07-23 3:44 UTC (permalink / raw)
To: Boris Ostrovsky, Juergen Gross, Stefano Stabellini, Greg Kroah-Hartman
Cc: Demi Marie Obenour, xen-devel, linux-kernel, stable
[ Upstream commit 166d3863231667c4f64dee72b77d1102cdfad11f ]
The error paths of gntdev_mmap() can call unmap_grant_pages() even
though not all of the pages have been successfully mapped. This will
trigger the WARN_ON()s in __unmap_grant_pages_done(). The number of
warnings can be very large; I have observed thousands of lines of
warnings in the systemd journal.
Avoid this problem by only warning on unmapping failure if the handle
being unmapped is not -1. The handle field of any page that was not
successfully mapped will be -1, so this catches all cases where
unmapping can legitimately fail.
Suggested-by: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Fixes: 36cd49b071fc ("xen/gntdev: Avoid blocking in unmap_grant_pages()")
---
drivers/xen/gntdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 2c3248e71e9c1a3e032b847d177b02855cdda1a1..a6585854a85fc6fffc16c3498ba73fbee84ad6ca 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -390,7 +390,8 @@ 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 &&
+ map->unmap_ops[offset+i].handle != -1);
pr_debug("unmap handle=%d st=%d\n",
map->unmap_ops[offset+i].handle,
map->unmap_ops[offset+i].status);
--
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4.14] Ignore failure to unmap -1
2022-07-23 3:44 Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.9] Ignore failure to unmap -1 Demi Marie Obenour
@ 2022-07-23 3:44 ` Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.19] " Demi Marie Obenour
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Demi Marie Obenour @ 2022-07-23 3:44 UTC (permalink / raw)
To: Boris Ostrovsky, Juergen Gross, Stefano Stabellini, Greg Kroah-Hartman
Cc: Demi Marie Obenour, xen-devel, stable
[ Upstream commit 166d3863231667c4f64dee72b77d1102cdfad11f ]
The error paths of gntdev_mmap() can call unmap_grant_pages() even
though not all of the pages have been successfully mapped. This will
trigger the WARN_ON()s in __unmap_grant_pages_done(). The number of
warnings can be very large; I have observed thousands of lines of
warnings in the systemd journal.
Avoid this problem by only warning on unmapping failure if the handle
being unmapped is not -1. The handle field of any page that was not
successfully mapped will be -1, so this catches all cases where
unmapping can legitimately fail.
Suggested-by: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Fixes: 2fe26a9a7048 ("xen/gntdev: Avoid blocking in unmap_grant_pages()")
---
drivers/xen/gntdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 2827015604fbaa45f0ca60c342bbf71ce4132dec..799173755b785e2f3e2483855f75af1eba8e9373 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -393,7 +393,8 @@ 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 &&
+ map->unmap_ops[offset+i].handle != -1);
pr_debug("unmap handle=%d st=%d\n",
map->unmap_ops[offset+i].handle,
map->unmap_ops[offset+i].status);
--
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4.19] Ignore failure to unmap -1
2022-07-23 3:44 Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.9] Ignore failure to unmap -1 Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.14] " Demi Marie Obenour
@ 2022-07-23 3:44 ` Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 5.4] " Demi Marie Obenour
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Demi Marie Obenour @ 2022-07-23 3:44 UTC (permalink / raw)
To: Boris Ostrovsky, Juergen Gross, Stefano Stabellini, Greg Kroah-Hartman
Cc: Demi Marie Obenour, xen-devel, stable
[ Upstream commit 166d3863231667c4f64dee72b77d1102cdfad11f ]
The error paths of gntdev_mmap() can call unmap_grant_pages() even
though not all of the pages have been successfully mapped. This will
trigger the WARN_ON()s in __unmap_grant_pages_done(). The number of
warnings can be very large; I have observed thousands of lines of
warnings in the systemd journal.
Avoid this problem by only warning on unmapping failure if the handle
being unmapped is not -1. The handle field of any page that was not
successfully mapped will be -1, so this catches all cases where
unmapping can legitimately fail.
Suggested-by: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Fixes: 73e9e72247b9 ("xen/gntdev: Avoid blocking in unmap_grant_pages()")
---
drivers/xen/gntdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 492084814f55d8ed46d2d656db75b28a91dd7f06..27d955c5d9f9076266f77b9fedfa1a6a2ba08f56 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -416,7 +416,8 @@ 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 &&
+ map->unmap_ops[offset+i].handle != -1);
pr_debug("unmap handle=%d st=%d\n",
map->unmap_ops[offset+i].handle,
map->unmap_ops[offset+i].status);
--
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5.4] Ignore failure to unmap -1
2022-07-23 3:44 Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Demi Marie Obenour
` (2 preceding siblings ...)
2022-07-23 3:44 ` [PATCH 4.19] " Demi Marie Obenour
@ 2022-07-23 3:44 ` Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 5.10] " Demi Marie Obenour
2022-07-23 14:52 ` Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Greg Kroah-Hartman
5 siblings, 0 replies; 8+ messages in thread
From: Demi Marie Obenour @ 2022-07-23 3:44 UTC (permalink / raw)
To: Boris Ostrovsky, Juergen Gross, Stefano Stabellini, Greg Kroah-Hartman
Cc: Demi Marie Obenour, xen-devel, stable
[ Upstream commit 166d3863231667c4f64dee72b77d1102cdfad11f ]
The error paths of gntdev_mmap() can call unmap_grant_pages() even
though not all of the pages have been successfully mapped. This will
trigger the WARN_ON()s in __unmap_grant_pages_done(). The number of
warnings can be very large; I have observed thousands of lines of
warnings in the systemd journal.
Avoid this problem by only warning on unmapping failure if the handle
being unmapped is not -1. The handle field of any page that was not
successfully mapped will be -1, so this catches all cases where
unmapping can legitimately fail.
Suggested-by: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Fixes: ee25841221c1 ("xen/gntdev: Avoid blocking in unmap_grant_pages()")
---
drivers/xen/gntdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index f464793477650e631c8928e85c1990c5964c2e94..bba849e5d8a7b4d54925b842fbe3c6792e0f0214 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -413,7 +413,8 @@ 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 &&
+ map->unmap_ops[offset+i].handle != -1);
pr_debug("unmap handle=%d st=%d\n",
map->unmap_ops[offset+i].handle,
map->unmap_ops[offset+i].status);
--
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5.10] Ignore failure to unmap -1
2022-07-23 3:44 Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Demi Marie Obenour
` (3 preceding siblings ...)
2022-07-23 3:44 ` [PATCH 5.4] " Demi Marie Obenour
@ 2022-07-23 3:44 ` Demi Marie Obenour
2022-07-23 14:52 ` Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Greg Kroah-Hartman
5 siblings, 0 replies; 8+ messages in thread
From: Demi Marie Obenour @ 2022-07-23 3:44 UTC (permalink / raw)
To: Boris Ostrovsky, Juergen Gross, Stefano Stabellini, Greg Kroah-Hartman
Cc: Demi Marie Obenour, xen-devel, stable
[ Upstream commit 166d3863231667c4f64dee72b77d1102cdfad11f ]
The error paths of gntdev_mmap() can call unmap_grant_pages() even
though not all of the pages have been successfully mapped. This will
trigger the WARN_ON()s in __unmap_grant_pages_done(). The number of
warnings can be very large; I have observed thousands of lines of
warnings in the systemd journal.
Avoid this problem by only warning on unmapping failure if the handle
being unmapped is not -1. The handle field of any page that was not
successfully mapped will be -1, so this catches all cases where
unmapping can legitimately fail.
Suggested-by: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Fixes: 79963021fd71 ("xen/gntdev: Avoid blocking in unmap_grant_pages()")
---
drivers/xen/gntdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index f415c056ff8ab8d808ee2bacfaa3cad57af28204..54fee4087bf1078803c230ad2081aafa8415cf53 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -401,7 +401,8 @@ 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 &&
+ map->unmap_ops[offset+i].handle != -1);
pr_debug("unmap handle=%d st=%d\n",
map->unmap_ops[offset+i].handle,
map->unmap_ops[offset+i].status);
--
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE")
2022-07-23 3:44 Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Demi Marie Obenour
` (4 preceding siblings ...)
2022-07-23 3:44 ` [PATCH 5.10] " Demi Marie Obenour
@ 2022-07-23 14:52 ` Greg Kroah-Hartman
5 siblings, 0 replies; 8+ messages in thread
From: Greg Kroah-Hartman @ 2022-07-23 14:52 UTC (permalink / raw)
To: Demi Marie Obenour
Cc: Boris Ostrovsky, Juergen Gross, Stefano Stabellini, xen-devel,
linux-kernel, stable
On Fri, Jul 22, 2022 at 11:44:10PM -0400, Demi Marie Obenour wrote:
> This series backports upstream commit 166d3863231667c4f64dee72b77d1102cdfad11f
> to all supported stable kernel trees.
All now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4.19] Ignore failure to unmap -1
2022-07-08 16:37 gntdev warning fixes Demi Marie Obenour
@ 2022-07-08 16:37 ` Demi Marie Obenour
0 siblings, 0 replies; 8+ messages in thread
From: Demi Marie Obenour @ 2022-07-08 16:37 UTC (permalink / raw)
To: Juergen Gross, Greg KH, Stefano Stabellini, Oleksandr Tyshchenko,
Demi Marie Obenour
Cc: Linux kernel regressions, stable, Linux kernel mailing list,
Xen developer discussion
The error paths of gntdev_mmap() can call unmap_grant_pages() even
though not all of the pages have been successfully mapped. This will
trigger the WARN_ON()s in __unmap_grant_pages_done(). The number of
warnings can be very large; I have observed thousands of lines of
warnings in the systemd journal.
Avoid this problem by only warning on unmapping failure if the handle
being unmapped is not -1. The handle field of any page that was not
successfully mapped will be -1, so this catches all cases wherr
unmapping can legitimately fail.
Suggested-by: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Fixes: 73e9e72247b9 ("xen/gntdev: Avoid blocking in unmap_grant_pages()")
---
drivers/xen/gntdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 492084814f55d8ed46d2d656db75b28a91dd7f06..27d955c5d9f9076266f77b9fedfa1a6a2ba08f56 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -416,7 +416,8 @@ 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 &&
+ map->unmap_ops[offset+i].handle != -1);
pr_debug("unmap handle=%d st=%d\n",
map->unmap_ops[offset+i].handle,
map->unmap_ops[offset+i].status);
--
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-07-23 14:52 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-23 3:44 Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.9] Ignore failure to unmap -1 Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.14] " Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 4.19] " Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 5.4] " Demi Marie Obenour
2022-07-23 3:44 ` [PATCH 5.10] " Demi Marie Obenour
2022-07-23 14:52 ` Backport of 166d38632316 ("xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE") Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2022-07-08 16:37 gntdev warning fixes Demi Marie Obenour
2022-07-08 16:37 ` [PATCH 4.19] Ignore failure to unmap -1 Demi Marie Obenour
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.