linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] blk-rq-qos: remove redundant finish_wait to rq_qos_wait.
@ 2020-06-28 13:56 Guo Xuenan
  2020-06-28 14:11 ` Jens Axboe
       [not found] ` <20200714232123.GA49251@lca.pw>
  0 siblings, 2 replies; 4+ messages in thread
From: Guo Xuenan @ 2020-06-28 13:56 UTC (permalink / raw)
  To: axboe, linux-block; +Cc: guoxuenan, wangli74, fangwei1

It is no need do finish_wait twice after acquiring inflight.

Signed-off-by: Guo Xuenan <guoxuenan@huawei.com>
---
 block/blk-rq-qos.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index 656460636ad3..18f3eab9f768 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -273,8 +273,6 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
 		if (data.got_token)
 			break;
 		if (!has_sleeper && acquire_inflight_cb(rqw, private_data)) {
-			finish_wait(&rqw->wait, &data.wq);
-
 			/*
 			 * We raced with wbt_wake_function() getting a token,
 			 * which means we now have two. Put our local token
-- 
2.25.4


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

* Re: [PATCH v2] blk-rq-qos: remove redundant finish_wait to rq_qos_wait.
  2020-06-28 13:56 [PATCH v2] blk-rq-qos: remove redundant finish_wait to rq_qos_wait Guo Xuenan
@ 2020-06-28 14:11 ` Jens Axboe
       [not found] ` <20200714232123.GA49251@lca.pw>
  1 sibling, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2020-06-28 14:11 UTC (permalink / raw)
  To: Guo Xuenan, linux-block; +Cc: wangli74, fangwei1

On 6/28/20 7:56 AM, Guo Xuenan wrote:
> It is no need do finish_wait twice after acquiring inflight.

Thanks, applied.

-- 
Jens Axboe


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

* Re: [PATCH v2] blk-rq-qos: remove redundant finish_wait to rq_qos_wait.
       [not found] ` <20200714232123.GA49251@lca.pw>
@ 2020-07-15  2:19   ` Stephen Rothwell
  2020-07-15 15:32     ` Jens Axboe
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2020-07-15  2:19 UTC (permalink / raw)
  To: Qian Cai
  Cc: Guo Xuenan, axboe, linux-block, wangli74, fangwei1, ming.lei,
	josef, linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]

Hi all,

On Tue, 14 Jul 2020 19:21:24 -0400 Qian Cai <cai@lca.pw> wrote:
>
> On Sun, Jun 28, 2020 at 09:56:25AM -0400, Guo Xuenan wrote:
> > It is no need do finish_wait twice after acquiring inflight.
> > 
> > Signed-off-by: Guo Xuenan <guoxuenan@huawei.com>
> > ---
> >  block/blk-rq-qos.c | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
> > index 656460636ad3..18f3eab9f768 100644
> > --- a/block/blk-rq-qos.c
> > +++ b/block/blk-rq-qos.c
> > @@ -273,8 +273,6 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
> >  		if (data.got_token)
> >  			break;
> >  		if (!has_sleeper && acquire_inflight_cb(rqw, private_data)) {
> > -			finish_wait(&rqw->wait, &data.wq);
> > -
> >  			/*
> >  			 * We raced with wbt_wake_function() getting a token,
> >  			 * which means we now have two. Put our local token
> > -- 
> > 2.25.4  
> 
> Reverting this commit fixed an issue that swapping workloads will stall for
> days without being able to make any progress below.

I have reverted that commit from linux-next today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

* Re: [PATCH v2] blk-rq-qos: remove redundant finish_wait to rq_qos_wait.
  2020-07-15  2:19   ` Stephen Rothwell
@ 2020-07-15 15:32     ` Jens Axboe
  0 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2020-07-15 15:32 UTC (permalink / raw)
  To: Stephen Rothwell, Qian Cai
  Cc: Guo Xuenan, linux-block, wangli74, fangwei1, ming.lei, josef,
	linux-next, linux-kernel

On 7/14/20 8:19 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 14 Jul 2020 19:21:24 -0400 Qian Cai <cai@lca.pw> wrote:
>>
>> On Sun, Jun 28, 2020 at 09:56:25AM -0400, Guo Xuenan wrote:
>>> It is no need do finish_wait twice after acquiring inflight.
>>>
>>> Signed-off-by: Guo Xuenan <guoxuenan@huawei.com>
>>> ---
>>>  block/blk-rq-qos.c | 2 --
>>>  1 file changed, 2 deletions(-)
>>>
>>> diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
>>> index 656460636ad3..18f3eab9f768 100644
>>> --- a/block/blk-rq-qos.c
>>> +++ b/block/blk-rq-qos.c
>>> @@ -273,8 +273,6 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
>>>  		if (data.got_token)
>>>  			break;
>>>  		if (!has_sleeper && acquire_inflight_cb(rqw, private_data)) {
>>> -			finish_wait(&rqw->wait, &data.wq);
>>> -
>>>  			/*
>>>  			 * We raced with wbt_wake_function() getting a token,
>>>  			 * which means we now have two. Put our local token
>>> -- 
>>> 2.25.4  
>>
>> Reverting this commit fixed an issue that swapping workloads will stall for
>> days without being able to make any progress below.
> 
> I have reverted that commit from linux-next today.

Thanks, I'll revert it locally too.

-- 
Jens Axboe


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

end of thread, other threads:[~2020-07-15 15:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-28 13:56 [PATCH v2] blk-rq-qos: remove redundant finish_wait to rq_qos_wait Guo Xuenan
2020-06-28 14:11 ` Jens Axboe
     [not found] ` <20200714232123.GA49251@lca.pw>
2020-07-15  2:19   ` Stephen Rothwell
2020-07-15 15:32     ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).