[PATCH 1/2] psi: Remove repeated verbose comment

[PATCH 1/2] psi: Remove repeated verbose comment

[Liu Xinpeng]

Comment in function psi_task_switch,there are two same lines.
...
* runtime state, the cgroup that contains both tasks
* runtime state, the cgroup that contains both tasks
...

Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn>
---
 kernel/sched/psi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 1652f2b..526af84 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -833,7 +833,6 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
 		/*
 		 * When switching between tasks that have an identical
 		 * runtime state, the cgroup that contains both tasks
-		 * runtime state, the cgroup that contains both tasks
 		 * we reach the first common ancestor. Iterate @next's
 		 * ancestors only until we encounter @prev's ONCPU.
 		 */
-- 
1.8.3.1

[PATCH 2/2] psi: Add a missing SPDX license header

[Liu Xinpeng]

Add the missing SPDX license header to
include/linux/psi.h
include/linux/psi_types.h
kernel/sched/psi.c

Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn>
---
 include/linux/psi.h       | 1 +
 include/linux/psi_types.h | 1 +
 kernel/sched/psi.c        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/include/linux/psi.h b/include/linux/psi.h
index 65eb147..a70ca83 100644
--- a/include/linux/psi.h
+++ b/include/linux/psi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PSI_H
 #define _LINUX_PSI_H
 
diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h
index 0a23300..bf50068 100644
--- a/include/linux/psi_types.h
+++ b/include/linux/psi_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PSI_TYPES_H
 #define _LINUX_PSI_TYPES_H
 
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 526af84..3397fa0 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Pressure stall information for CPU, memory and IO
  *
-- 
1.8.3.1

Re: [PATCH 1/2] psi: Remove repeated verbose comment

[Johannes Weiner]

On Mon, Oct 25, 2021 at 11:46:25AM +0800, Liu Xinpeng wrote:
> Comment in function psi_task_switch,there are two same lines.
> ...
> * runtime state, the cgroup that contains both tasks
> * runtime state, the cgroup that contains both tasks
> ...
> 
> Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn>

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

Peter, could you please take this through -tip?

> ---
>  kernel/sched/psi.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
> index 1652f2b..526af84 100644
> --- a/kernel/sched/psi.c
> +++ b/kernel/sched/psi.c
> @@ -833,7 +833,6 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
>  		/*
>  		 * When switching between tasks that have an identical
>  		 * runtime state, the cgroup that contains both tasks
> -		 * runtime state, the cgroup that contains both tasks
>  		 * we reach the first common ancestor. Iterate @next's
>  		 * ancestors only until we encounter @prev's ONCPU.
>  		 */

Re: [PATCH 2/2] psi: Add a missing SPDX license header

[Johannes Weiner]

On Mon, Oct 25, 2021 at 11:46:26AM +0800, Liu Xinpeng wrote:
> Add the missing SPDX license header to
> include/linux/psi.h
> include/linux/psi_types.h
> kernel/sched/psi.c
> 
> Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn>

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

> ---
>  include/linux/psi.h       | 1 +
>  include/linux/psi_types.h | 1 +
>  kernel/sched/psi.c        | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/include/linux/psi.h b/include/linux/psi.h
> index 65eb147..a70ca83 100644
> --- a/include/linux/psi.h
> +++ b/include/linux/psi.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
>  #ifndef _LINUX_PSI_H
>  #define _LINUX_PSI_H
>  
> diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h
> index 0a23300..bf50068 100644
> --- a/include/linux/psi_types.h
> +++ b/include/linux/psi_types.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
>  #ifndef _LINUX_PSI_TYPES_H
>  #define _LINUX_PSI_TYPES_H
>  
> diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
> index 526af84..3397fa0 100644
> --- a/kernel/sched/psi.c
> +++ b/kernel/sched/psi.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * Pressure stall information for CPU, memory and IO
>   *
> -- 
> 1.8.3.1

Re: [PATCH 1/2] psi: Remove repeated verbose comment

[Peter Zijlstra]

On Thu, Nov 04, 2021 at 12:49:51PM -0400, Johannes Weiner wrote:
> On Mon, Oct 25, 2021 at 11:46:25AM +0800, Liu Xinpeng wrote:
> > Comment in function psi_task_switch,there are two same lines.
> > ...
> > * runtime state, the cgroup that contains both tasks
> > * runtime state, the cgroup that contains both tasks
> > ...
> > 
> > Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn>
> 
> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
> 
> Peter, could you please take this through -tip?

Sure, lemme figure out the b4 incantation to grab these patches since
the originals didn't make it to my inbox. They should show up in
tip/sched/core after -rc1 or so if I get the incantation right :-)

[tip: sched/core] psi: Remove repeated verbose comment

[tip-bot2 for Liu Xinpeng]

The following commit has been merged into the sched/core branch of tip:

Commit-ID:     2d3791f116bb3d5b17571dadb8e085e12ae3a3cf
Gitweb:        https://git.kernel.org/tip/2d3791f116bb3d5b17571dadb8e085e12ae3a3cf
Author:        Liu Xinpeng <liuxp11@chinatelecom.cn>
AuthorDate:    Mon, 25 Oct 2021 11:46:25 +08:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 17 Nov 2021 14:48:59 +01:00

psi: Remove repeated verbose comment

Comment in function psi_task_switch,there are two same lines.
...
* runtime state, the cgroup that contains both tasks
* runtime state, the cgroup that contains both tasks
...

Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Link: https://lore.kernel.org/r/1635133586-84611-1-git-send-email-liuxp11@chinatelecom.cn
---
 kernel/sched/psi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 1652f2b..526af84 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -833,7 +833,6 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
 		/*
 		 * When switching between tasks that have an identical
 		 * runtime state, the cgroup that contains both tasks
-		 * runtime state, the cgroup that contains both tasks
 		 * we reach the first common ancestor. Iterate @next's
 		 * ancestors only until we encounter @prev's ONCPU.
 		 */

[tip: sched/core] psi: Add a missing SPDX license header

[tip-bot2 for Liu Xinpeng]

The following commit has been merged into the sched/core branch of tip:

Commit-ID:     2fb75e1b642f49253d8848c9e47e8942f5366221
Gitweb:        https://git.kernel.org/tip/2fb75e1b642f49253d8848c9e47e8942f5366221
Author:        Liu Xinpeng <liuxp11@chinatelecom.cn>
AuthorDate:    Mon, 25 Oct 2021 11:46:26 +08:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 17 Nov 2021 14:48:59 +01:00

psi: Add a missing SPDX license header

Add the missing SPDX license header to
include/linux/psi.h
include/linux/psi_types.h
kernel/sched/psi.c

Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Link: https://lore.kernel.org/r/1635133586-84611-2-git-send-email-liuxp11@chinatelecom.cn
---
 include/linux/psi.h       | 1 +
 include/linux/psi_types.h | 1 +
 kernel/sched/psi.c        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/include/linux/psi.h b/include/linux/psi.h
index 65eb147..a70ca83 100644
--- a/include/linux/psi.h
+++ b/include/linux/psi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PSI_H
 #define _LINUX_PSI_H
 
diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h
index 0a23300..bf50068 100644
--- a/include/linux/psi_types.h
+++ b/include/linux/psi_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PSI_TYPES_H
 #define _LINUX_PSI_TYPES_H
 
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 526af84..3397fa0 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Pressure stall information for CPU, memory and IO
  *