public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling
@ 2018-02-07 22:22 Simon Gaiser
  2018-02-07 22:22 ` [PATCH 2/2] xen: xenbus: WARN_ON XS_TRANSACTION_{START,END} misuse Simon Gaiser
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Simon Gaiser @ 2018-02-07 22:22 UTC (permalink / raw)
  To: xen-devel
  Cc: Simon Gaiser, stable, Boris Ostrovsky, Juergen Gross,
	linux-kernel

Commit fd8aa9095a95 ("xen: optimize xenbus driver for multiple
concurrent xenstore accesses") made a subtle change to the semantic of
xenbus_dev_request_and_reply() and xenbus_transaction_end().

Before on an error response to XS_TRANSACTION_END
xenbus_dev_request_and_reply() would not decrement the active
transaction counter. But xenbus_transaction_end() has always counted the
transaction as finished regardless of the response.

The new behavior is that xenbus_dev_request_and_reply() and
xenbus_transaction_end() will always count the transaction as finished
regardless the response code (handled in xs_request_exit()).

But xenbus_dev_frontend tries to end a transaction on closing of the
device if the XS_TRANSACTION_END failed before. Trying to close the
transaction twice corrupts the reference count. So fix this by also
considering a transaction closed if we have sent XS_TRANSACTION_END once
regardless of the return code.

Cc: <stable@vger.kernel.org> # 4.11
Fixes: fd8aa9095a95 ("xen: optimize xenbus driver for multiple concurrent xenstore accesses")
Signed-off-by: Simon Gaiser <simon@invisiblethingslab.com>
---
 drivers/xen/xenbus/xenbus_dev_frontend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index f3b089b7c0b6..d2edbc79384a 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -365,7 +365,7 @@ void xenbus_dev_queue_reply(struct xb_req_data *req)
 			if (WARN_ON(rc))
 				goto out;
 		}
-	} else if (req->msg.type == XS_TRANSACTION_END) {
+	} else if (req->type == XS_TRANSACTION_END) {
 		trans = xenbus_get_transaction(u, req->msg.tx_id);
 		if (WARN_ON(!trans))
 			goto out;
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2018-03-02 15:12 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-07 22:22 [PATCH 1/2] xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling Simon Gaiser
2018-02-07 22:22 ` [PATCH 2/2] xen: xenbus: WARN_ON XS_TRANSACTION_{START,END} misuse Simon Gaiser
2018-02-10 16:57   ` Boris Ostrovsky
2018-02-11  1:27     ` Simon Gaiser
2018-02-11 15:28       ` Boris Ostrovsky
2018-02-10 16:53 ` [PATCH 1/2] xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling Boris Ostrovsky
2018-02-12  8:49 ` Juergen Gross
2018-02-12  9:06   ` Juergen Gross
2018-02-20  4:56     ` Simon Gaiser
2018-03-02 14:19       ` Juergen Gross
2018-03-02 14:58         ` Simon Gaiser
2018-03-02 15:12           ` Juergen Gross

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox