Re: [PATCH 6.6 1/5] sched/core: Remove ifdeffery for saved_state

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues:
❌ Build failures detected

The upstream commit SHA1 provided is correct: fbaa6a181a4b1886cbf4214abdf9a2df68471510

WARNING: Author mismatch between patch and upstream commit:
Backport author: Chen Ridong <chenridong@huaweicloud.com>
Commit author: Elliot Berman <quic_eberman@quicinc.com>

Status in newer kernel trees:
6.15.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)

Note: The patch differs from the upstream commit:
---
1:  fbaa6a181a4b ! 1:  b72e2a437525 sched/core: Remove ifdeffery for saved_state
    @@ Metadata
      ## Commit message ##
         sched/core: Remove ifdeffery for saved_state
     
    +    [ Upstream commit fbaa6a181a4b1886cbf4214abdf9a2df68471510 ]
    +
         In preparation for freezer to also use saved_state, remove the
         CONFIG_PREEMPT_RT compilation guard around saved_state.
     
    @@ Commit message
         Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
         Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
         Signed-off-by: Ingo Molnar <mingo@kernel.org>
    +    Signed-off-by: Chen Ridong <chenridong@huawei.com>
     
      ## include/linux/sched.h ##
     @@ include/linux/sched.h: struct task_struct {
    @@ kernel/sched/core.c: int __task_state_match(struct task_struct *p, unsigned int
      int task_state_match(struct task_struct *p, unsigned int state)
      {
     -#ifdef CONFIG_PREEMPT_RT
    + 	int match;
    + 
      	/*
    - 	 * Serialize against current_save_and_set_rtlock_wait_state() and
    - 	 * current_restore_rtlock_saved_state().
    - 	 */
    - 	guard(raw_spinlock_irq)(&p->pi_lock);
    +@@ kernel/sched/core.c: int task_state_match(struct task_struct *p, unsigned int state)
    + 	raw_spin_unlock_irq(&p->pi_lock);
    + 
    + 	return match;
    +-#else
    +-	return __task_state_match(p, state);
     -#endif
    - 	return __task_state_match(p, state);
      }
      
    + /*
     @@ kernel/sched/core.c: bool ttwu_state_match(struct task_struct *p, unsigned int state, int *success)
      
      	*success = !!(match = __task_state_match(p, state));

---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| 6.6                       | Success     | Failed     |