[PATCH] sched/core: add __sched tag for io_schedule()

[PATCH] sched/core: add __sched tag for io_schedule()

[Gao Xiang]

non-inline io_schedule() was introduced in
commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
Keep in line with io_schedule_timeout, Otherwise
"/proc/<pid>/wchan" will report io_schedule()
rather than its callers when waiting io.

Reported-by: Jilong Kou <koujilong@huawei.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 102dfcf0a29a..361d60423c11 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5122,7 +5122,7 @@ long __sched io_schedule_timeout(long timeout)
 }
 EXPORT_SYMBOL(io_schedule_timeout);
 
-void io_schedule(void)
+void __sched io_schedule(void)
 {
 	int token;
 
-- 
2.17.1

Re: [PATCH] sched/core: add __sched tag for io_schedule()

[Tejun Heo]

On Fri, May 31, 2019 at 04:29:12PM +0800, Gao Xiang wrote:
> non-inline io_schedule() was introduced in
> commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
> Keep in line with io_schedule_timeout, Otherwise
> "/proc/<pid>/wchan" will report io_schedule()
> rather than its callers when waiting io.
> 
> Reported-by: Jilong Kou <koujilong@huawei.com>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>

Acked-by: Tejun Heo <tj@kernel.org>

Thanks.

-- 
tejun

Re: [PATCH] sched/core: add __sched tag for io_schedule()

[Gao Xiang]

On 2019/5/31 22:37, Tejun Heo wrote:
> On Fri, May 31, 2019 at 04:29:12PM +0800, Gao Xiang wrote:
>> non-inline io_schedule() was introduced in
>> commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
>> Keep in line with io_schedule_timeout, Otherwise
>> "/proc/<pid>/wchan" will report io_schedule()
>> rather than its callers when waiting io.
>>
>> Reported-by: Jilong Kou <koujilong@huawei.com>
>> Cc: Tejun Heo <tj@kernel.org>
>> Cc: Ingo Molnar <mingo@redhat.com>
>> Cc: Peter Zijlstra <peterz@infradead.org>
>> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
> 
> Acked-by: Tejun Heo <tj@kernel.org>

Cc: <stable@vger.kernel.org> # 4.11+

Thanks Tejun. This patch will be needed for io performance analysis
since we found that Android systrace tool cannot show the callers of
iowait raised from io_schedule() on linux-4.14 LTS kernel.

Hi Andrew, could you kindly take this patch?

Thanks,
Gao Xiang

> 
> Thanks.
> 

Re: [PATCH] sched/core: add __sched tag for io_schedule()

[Peter Zijlstra]

On Fri, May 31, 2019 at 04:29:12PM +0800, Gao Xiang wrote:
> non-inline io_schedule() was introduced in
> commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
> Keep in line with io_schedule_timeout, Otherwise
> "/proc/<pid>/wchan" will report io_schedule()
> rather than its callers when waiting io.
> 
> Reported-by: Jilong Kou <koujilong@huawei.com>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>

This is lacking a Fixes: tag.

Re: [PATCH] sched/core: add __sched tag for io_schedule()

[Gao Xiang]

Hi Peter,

On 2019/6/3 16:58, Peter Zijlstra wrote:
> On Fri, May 31, 2019 at 04:29:12PM +0800, Gao Xiang wrote:
>> non-inline io_schedule() was introduced in
>> commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
>> Keep in line with io_schedule_timeout, Otherwise
>> "/proc/<pid>/wchan" will report io_schedule()
>> rather than its callers when waiting io.
>>
>> Reported-by: Jilong Kou <koujilong@huawei.com>
>> Cc: Tejun Heo <tj@kernel.org>
>> Cc: Ingo Molnar <mingo@redhat.com>
>> Cc: Peter Zijlstra <peterz@infradead.org>
>> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
> 
> This is lacking a Fixes: tag.
> 

OK, thanks for pointing out. It seems enough to resend this patch.
I will resend this patch with all necessary tags.

Thanks,
Gao Xiang

[PATCH v2] sched/core: add __sched tag for io_schedule()

[Gao Xiang]

non-inline io_schedule() was introduced in
commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
Keep in line with io_schedule_timeout, Otherwise
"/proc/<pid>/wchan" will report io_schedule()
rather than its callers when waiting io.

Reported-by: Jilong Kou <koujilong@huawei.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Tejun Heo <tj@kernel.org>
Fixes: 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
Cc: <stable@vger.kernel.org> # 4.11+
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
change log v2:
 - add missing tags

 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 874c427742a9..4d5962232a55 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5123,7 +5123,7 @@ long __sched io_schedule_timeout(long timeout)
 }
 EXPORT_SYMBOL(io_schedule_timeout);
 
-void io_schedule(void)
+void __sched io_schedule(void)
 {
 	int token;
 
-- 
2.17.1

Re: [PATCH v2] sched/core: add __sched tag for io_schedule()

[Peter Zijlstra]

On Mon, Jun 03, 2019 at 05:13:38PM +0800, Gao Xiang wrote:
> non-inline io_schedule() was introduced in
> commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
> Keep in line with io_schedule_timeout, Otherwise
> "/proc/<pid>/wchan" will report io_schedule()
> rather than its callers when waiting io.
> 
> Reported-by: Jilong Kou <koujilong@huawei.com>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Acked-by: Tejun Heo <tj@kernel.org>
> Fixes: 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
> Cc: <stable@vger.kernel.org> # 4.11+
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>

Thanks

Re: [PATCH v2] sched/core: add __sched tag for io_schedule()

[Gao Xiang]

Friendly ping...

Thanks,
Gao Xiang

On 2019/6/3 17:13, Gao Xiang wrote:
> non-inline io_schedule() was introduced in
> commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
> Keep in line with io_schedule_timeout, Otherwise
> "/proc/<pid>/wchan" will report io_schedule()
> rather than its callers when waiting io.
> 
> Reported-by: Jilong Kou <koujilong@huawei.com>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Acked-by: Tejun Heo <tj@kernel.org>
> Fixes: 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
> Cc: <stable@vger.kernel.org> # 4.11+
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
> ---
> change log v2:
>  - add missing tags
> 
>  kernel/sched/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 874c427742a9..4d5962232a55 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -5123,7 +5123,7 @@ long __sched io_schedule_timeout(long timeout)
>  }
>  EXPORT_SYMBOL(io_schedule_timeout);
>  
> -void io_schedule(void)
> +void __sched io_schedule(void)
>  {
>  	int token;
>  
> 

[tip:sched/core] sched/core: Add __sched tag for io_schedule()

[tip-bot for Gao Xiang]

Commit-ID:  e3b929b0a184edb35531153c5afcaebb09014f9d
Gitweb:     https://git.kernel.org/tip/e3b929b0a184edb35531153c5afcaebb09014f9d
Author:     Gao Xiang <gaoxiang25@huawei.com>
AuthorDate: Mon, 3 Jun 2019 17:13:38 +0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 17 Jun 2019 12:15:56 +0200

sched/core: Add __sched tag for io_schedule()

Non-inline io_schedule() was introduced in:

  commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")

Keep in line with io_schedule_timeout(), otherwise "/proc/<pid>/wchan" will
report io_schedule() rather than its callers when waiting for IO.

Reported-by: Jilong Kou <koujilong@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Miao Xie <miaoxie@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
Link: https://lkml.kernel.org/r/20190603091338.2695-1-gaoxiang25@huawei.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 29984d8c41f0..cd047927f707 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5122,7 +5122,7 @@ long __sched io_schedule_timeout(long timeout)
 }
 EXPORT_SYMBOL(io_schedule_timeout);
 
-void io_schedule(void)
+void __sched io_schedule(void)
 {
 	int token;