[PATCH 1/1] xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect

[PATCH 1/1] xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect

[Annie Li]

If there is inflight I/O in any non-last queue, blkback returns -EBUSY
directly, and never stops thread of remaining queue and processs them. When
removing vbd device with lots of disk I/O load, some queues with inflight
I/O still have blkback thread running even though the corresponding vbd
device or guest is gone.
And this could cause some problems, for example, if the backend device type
is file, some loop devices and blkback thread always lingers there forever
after guest is destroyed, and this causes failure of umounting repositories
unless rebooting the dom0. So stop all threads properly and return -EBUSY
if any queue has inflight I/O.

Signed-off-by: Annie Li <annie.li@oracle.com>
Reviewed-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
Reviewed-by: Bhavesh Davda <bhavesh.davda@oracle.com>
Reviewed-by: Adnan Misherfi <adnan.misherfi@oracle.com>
---
 drivers/block/xen-blkback/xenbus.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 792da68..2adb859 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -244,6 +244,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
 {
 	struct pending_req *req, *n;
 	unsigned int j, r;
+	bool busy = false;
 
 	for (r = 0; r < blkif->nr_rings; r++) {
 		struct xen_blkif_ring *ring = &blkif->rings[r];
@@ -261,8 +262,10 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
 		 * don't have any discard_io or other_io requests. So, checking
 		 * for inflight IO is enough.
 		 */
-		if (atomic_read(&ring->inflight) > 0)
-			return -EBUSY;
+		if (atomic_read(&ring->inflight) > 0) {
+			busy = true;
+			continue;
+		}
 
 		if (ring->irq) {
 			unbind_from_irqhandler(ring->irq, ring);
@@ -300,6 +303,9 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
 		WARN_ON(i != (XEN_BLKIF_REQS_PER_PAGE * blkif->nr_ring_pages));
 		ring->active = false;
 	}
+	if (busy)
+		return -EBUSY;
+
 	blkif->nr_ring_pages = 0;
 	/*
 	 * blkif->rings was allocated in connect_ring, so we should free it in
-- 
1.9.3

Re: [PATCH 1/1] xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect

[Roger Pau Monné]

On Thu, Aug 17, 2017 at 06:43:46PM -0400, Annie Li wrote:
> If there is inflight I/O in any non-last queue, blkback returns -EBUSY
> directly, and never stops thread of remaining queue and processs them. When
> removing vbd device with lots of disk I/O load, some queues with inflight
> I/O still have blkback thread running even though the corresponding vbd
> device or guest is gone.
> And this could cause some problems, for example, if the backend device type
> is file, some loop devices and blkback thread always lingers there forever
> after guest is destroyed, and this causes failure of umounting repositories
> unless rebooting the dom0. So stop all threads properly and return -EBUSY
> if any queue has inflight I/O.
>
> Signed-off-by: Annie Li <annie.li@oracle.com>
> Reviewed-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
> Reviewed-by: Bhavesh Davda <bhavesh.davda@oracle.com>
> Reviewed-by: Adnan Misherfi <adnan.misherfi@oracle.com>
> ---
>  drivers/block/xen-blkback/xenbus.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
> index 792da68..2adb859 100644
> --- a/drivers/block/xen-blkback/xenbus.c
> +++ b/drivers/block/xen-blkback/xenbus.c
> @@ -244,6 +244,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
>  {
>  	struct pending_req *req, *n;
>  	unsigned int j, r;
> +	bool busy = false;
>  
>  	for (r = 0; r < blkif->nr_rings; r++) {
>  		struct xen_blkif_ring *ring = &blkif->rings[r];
> @@ -261,8 +262,10 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
>  		 * don't have any discard_io or other_io requests. So, checking
>  		 * for inflight IO is enough.
>  		 */
> -		if (atomic_read(&ring->inflight) > 0)
> -			return -EBUSY;
> +		if (atomic_read(&ring->inflight) > 0) {
> +			busy = true;
> +			continue;
> +		}

I guess I'm missing something, but I don't see how this is solving the
problem described in the description.

If the problem is that xen_blkif_disconnect returns without cleaning
all the queues, this patch keeps the current behavior, just that it
will try to remove more queues before returning, as opposed to
returning when finding the first busy queue.

Roger.

Re: [Xen-devel] [PATCH 1/1] xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect

[annie li]

On 8/18/2017 5:14 AM, Roger Pau Monné wrote:
> On Thu, Aug 17, 2017 at 06:43:46PM -0400, Annie Li wrote:
>> If there is inflight I/O in any non-last queue, blkback returns -EBUSY
>> directly, and never stops thread of remaining queue and processs them. When
>> removing vbd device with lots of disk I/O load, some queues with inflight
>> I/O still have blkback thread running even though the corresponding vbd
>> device or guest is gone.
>> And this could cause some problems, for example, if the backend device type
>> is file, some loop devices and blkback thread always lingers there forever
>> after guest is destroyed, and this causes failure of umounting repositories
>> unless rebooting the dom0. So stop all threads properly and return -EBUSY
>> if any queue has inflight I/O.
>>
>> Signed-off-by: Annie Li <annie.li@oracle.com>
>> Reviewed-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
>> Reviewed-by: Bhavesh Davda <bhavesh.davda@oracle.com>
>> Reviewed-by: Adnan Misherfi <adnan.misherfi@oracle.com>
>> ---
>>   drivers/block/xen-blkback/xenbus.c | 10 ++++++++--
>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
>> index 792da68..2adb859 100644
>> --- a/drivers/block/xen-blkback/xenbus.c
>> +++ b/drivers/block/xen-blkback/xenbus.c
>> @@ -244,6 +244,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
>>   {
>>   	struct pending_req *req, *n;
>>   	unsigned int j, r;
>> +	bool busy = false;
>>   
>>   	for (r = 0; r < blkif->nr_rings; r++) {
>>   		struct xen_blkif_ring *ring = &blkif->rings[r];
>> @@ -261,8 +262,10 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
>>   		 * don't have any discard_io or other_io requests. So, checking
>>   		 * for inflight IO is enough.
>>   		 */
>> -		if (atomic_read(&ring->inflight) > 0)
>> -			return -EBUSY;
>> +		if (atomic_read(&ring->inflight) > 0) {
>> +			busy = true;
>> +			continue;
>> +		}
> I guess I'm missing something, but I don't see how this is solving the
> problem described in the description.
>
> If the problem is that xen_blkif_disconnect returns without cleaning
> all the queues, this patch keeps the current behavior, just that it
> will try to remove more queues before returning, as opposed to
> returning when finding the first busy queue.
Before checking inflight, following code stops the blkback thread,
                 if (ring->xenblkd) {
                         kthread_stop(ring->xenblkd);
                         wake_up(&ring->shutdown_wq);
                 }
This patch allows thread of every queue has the chance to get stopped. 
Otherwise, only thread of queue before(including) first busy one get 
stopped, threads of remaining queue will still run, and these blkthread 
and corresponding loop device will linger forever even after guest is 
destroyed.

Thanks
Annie

Re: [Xen-devel] [PATCH 1/1] xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect

[Roger Pau Monné]

On Fri, Aug 18, 2017 at 10:29:15AM -0400, annie li wrote:
> 
> On 8/18/2017 5:14 AM, Roger Pau Monné wrote:
> > On Thu, Aug 17, 2017 at 06:43:46PM -0400, Annie Li wrote:
> > > If there is inflight I/O in any non-last queue, blkback returns -EBUSY
> > > directly, and never stops thread of remaining queue and processs them. When
> > > removing vbd device with lots of disk I/O load, some queues with inflight
> > > I/O still have blkback thread running even though the corresponding vbd
> > > device or guest is gone.
> > > And this could cause some problems, for example, if the backend device type
> > > is file, some loop devices and blkback thread always lingers there forever
> > > after guest is destroyed, and this causes failure of umounting repositories
> > > unless rebooting the dom0. So stop all threads properly and return -EBUSY
> > > if any queue has inflight I/O.
> > > 
> > > Signed-off-by: Annie Li <annie.li@oracle.com>
> > > Reviewed-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
> > > Reviewed-by: Bhavesh Davda <bhavesh.davda@oracle.com>
> > > Reviewed-by: Adnan Misherfi <adnan.misherfi@oracle.com>
> > > ---
> > >   drivers/block/xen-blkback/xenbus.c | 10 ++++++++--
> > >   1 file changed, 8 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
> > > index 792da68..2adb859 100644
> > > --- a/drivers/block/xen-blkback/xenbus.c
> > > +++ b/drivers/block/xen-blkback/xenbus.c
> > > @@ -244,6 +244,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
> > >   {
> > >   	struct pending_req *req, *n;
> > >   	unsigned int j, r;
> > > +	bool busy = false;
> > >   	for (r = 0; r < blkif->nr_rings; r++) {
> > >   		struct xen_blkif_ring *ring = &blkif->rings[r];
> > > @@ -261,8 +262,10 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
> > >   		 * don't have any discard_io or other_io requests. So, checking
> > >   		 * for inflight IO is enough.
> > >   		 */
> > > -		if (atomic_read(&ring->inflight) > 0)
> > > -			return -EBUSY;
> > > +		if (atomic_read(&ring->inflight) > 0) {
> > > +			busy = true;
> > > +			continue;
> > > +		}
> > I guess I'm missing something, but I don't see how this is solving the
> > problem described in the description.
> > 
> > If the problem is that xen_blkif_disconnect returns without cleaning
> > all the queues, this patch keeps the current behavior, just that it
> > will try to remove more queues before returning, as opposed to
> > returning when finding the first busy queue.
> Before checking inflight, following code stops the blkback thread,
>                 if (ring->xenblkd) {
>                         kthread_stop(ring->xenblkd);
>                         wake_up(&ring->shutdown_wq);
>                 }
> This patch allows thread of every queue has the chance to get stopped.
> Otherwise, only thread of queue before(including) first busy one get
> stopped, threads of remaining queue will still run, and these blkthread and
> corresponding loop device will linger forever even after guest is destroyed.

Thanks for the explanation:

Acked-by: Roger Pau Monné <roger.pau@citrix.com>

Roger.

Re: [Xen-devel] [PATCH 1/1] xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect

[Roger Pau Monné]

On Fri, Aug 18, 2017 at 06:24:06PM +0100, Roger Pau Monné wrote:
> On Fri, Aug 18, 2017 at 10:29:15AM -0400, annie li wrote:
> > 
> > On 8/18/2017 5:14 AM, Roger Pau Monné wrote:
> > > On Thu, Aug 17, 2017 at 06:43:46PM -0400, Annie Li wrote:
> > > > If there is inflight I/O in any non-last queue, blkback returns -EBUSY
> > > > directly, and never stops thread of remaining queue and processs them. When
> > > > removing vbd device with lots of disk I/O load, some queues with inflight
> > > > I/O still have blkback thread running even though the corresponding vbd
> > > > device or guest is gone.
> > > > And this could cause some problems, for example, if the backend device type
> > > > is file, some loop devices and blkback thread always lingers there forever
> > > > after guest is destroyed, and this causes failure of umounting repositories
> > > > unless rebooting the dom0. So stop all threads properly and return -EBUSY
> > > > if any queue has inflight I/O.
> > > > 
> > > > Signed-off-by: Annie Li <annie.li@oracle.com>
> > > > Reviewed-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
> > > > Reviewed-by: Bhavesh Davda <bhavesh.davda@oracle.com>
> > > > Reviewed-by: Adnan Misherfi <adnan.misherfi@oracle.com>
> > > > ---
> > > >   drivers/block/xen-blkback/xenbus.c | 10 ++++++++--
> > > >   1 file changed, 8 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
> > > > index 792da68..2adb859 100644
> > > > --- a/drivers/block/xen-blkback/xenbus.c
> > > > +++ b/drivers/block/xen-blkback/xenbus.c
> > > > @@ -244,6 +244,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
> > > >   {
> > > >   	struct pending_req *req, *n;
> > > >   	unsigned int j, r;
> > > > +	bool busy = false;
> > > >   	for (r = 0; r < blkif->nr_rings; r++) {
> > > >   		struct xen_blkif_ring *ring = &blkif->rings[r];
> > > > @@ -261,8 +262,10 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
> > > >   		 * don't have any discard_io or other_io requests. So, checking
> > > >   		 * for inflight IO is enough.
> > > >   		 */
> > > > -		if (atomic_read(&ring->inflight) > 0)
> > > > -			return -EBUSY;
> > > > +		if (atomic_read(&ring->inflight) > 0) {
> > > > +			busy = true;
> > > > +			continue;
> > > > +		}
> > > I guess I'm missing something, but I don't see how this is solving the
> > > problem described in the description.
> > > 
> > > If the problem is that xen_blkif_disconnect returns without cleaning
> > > all the queues, this patch keeps the current behavior, just that it
> > > will try to remove more queues before returning, as opposed to
> > > returning when finding the first busy queue.
> > Before checking inflight, following code stops the blkback thread,
> >                 if (ring->xenblkd) {
> >                         kthread_stop(ring->xenblkd);
> >                         wake_up(&ring->shutdown_wq);
> >                 }
> > This patch allows thread of every queue has the chance to get stopped.
> > Otherwise, only thread of queue before(including) first busy one get
> > stopped, threads of remaining queue will still run, and these blkthread and
> > corresponding loop device will linger forever even after guest is destroyed.
> 
> Thanks for the explanation:
> 
> Acked-by: Roger Pau Monné <roger.pau@citrix.com>

Forgot to add, this needs to be backported to stable branches, so:

Cc: stable@vger.kernel.org

Roger.

Re: [Xen-devel] [PATCH 1/1] xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect

[Konrad Rzeszutek Wilk]

.snip..
> > 
> > Acked-by: Roger Pau Monné <roger.pau@citrix.com>
> 
> Forgot to add, this needs to be backported to stable branches, so:

Annie, could you resend the patch with the tags and an update
to the description to me please?
> 
> Cc: stable@vger.kernel.org
> 
> Roger.
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> https://lists.xen.org/xen-devel

Re: [Xen-devel] [PATCH 1/1] xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect

[annie li]

On 8/23/2017 5:20 PM, Konrad Rzeszutek Wilk wrote:
> ..snip..
>>> Acked-by: Roger Pau Monné <roger.pau@citrix.com>
>> Forgot to add, this needs to be backported to stable branches, so:
> Annie, could you resend the patch with the tags and an update
> to the description to me please?
Done

Thanks
Annie
>> Cc: stable@vger.kernel.org
>>
>> Roger.
>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xen.org
>> https://lists.xen.org/xen-devel