[peterz-queue:sched/core 3/5] kernel/sched/fair.c:4596:30: error: 'struct cfs_rq' has no member named 'lock'; did you mean 'load'?

[peterz-queue:sched/core 3/5] kernel/sched/fair.c:4596:30: error: 'struct cfs_rq' has no member named 'lock'; did you mean 'load'?

[kbuild test robot]

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

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.git sched/core
head:   f530b3f85f437a7beb09ac49cef3ce771c40715f
commit: d7533f6616e62e1aceaa580bcffa32eb2d36f2ab [3/5] sched/fair: Eliminate bandwidth race between throttling and distribution
config: i386-allyesconfig (attached as .config)
compiler: gcc-7 (Ubuntu 7.5.0-6ubuntu2) 7.5.0
reproduce:
        git checkout d7533f6616e62e1aceaa580bcffa32eb2d36f2ab
        # save the attached .config to linux build tree
        make ARCH=i386 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>

All error/warnings (new ones prefixed by >>):

   In file included from arch/x86/include/asm/bug.h:83:0,
                    from include/linux/bug.h:5,
                    from include/linux/thread_info.h:12,
                    from arch/x86/include/asm/preempt.h:7,
                    from include/linux/preempt.h:78,
                    from include/linux/rcupdate.h:27,
                    from include/linux/rculist.h:11,
                    from include/linux/pid.h:5,
                    from include/linux/sched.h:14,
                    from kernel/sched/sched.h:5,
                    from kernel/sched/fair.c:23:
   kernel/sched/fair.c: In function '__assign_cfs_rq_runtime':
>> kernel/sched/fair.c:4596:30: error: 'struct cfs_rq' has no member named 'lock'; did you mean 'load'?
     lockdep_assert_held(cfs_rq->lock);
                                 ^
   include/asm-generic/bug.h:113:25: note: in definition of macro 'WARN_ON'
     int __ret_warn_on = !!(condition);    \
                            ^~~~~~~~~
   include/linux/lockdep.h:435:27: note: in expansion of macro 'lockdep_is_held'
      WARN_ON(debug_locks && !lockdep_is_held(l)); \
                              ^~~~~~~~~~~~~~~
>> kernel/sched/fair.c:4596:2: note: in expansion of macro 'lockdep_assert_held'
     lockdep_assert_held(cfs_rq->lock);
     ^~~~~~~~~~~~~~~~~~~

vim +4596 kernel/sched/fair.c

  4589	
  4590	/* returns 0 on failure to allocate runtime */
  4591	static int __assign_cfs_rq_runtime(struct cfs_bandwidth *cfs_b,
  4592					   struct cfs_rq *cfs_rq, u64 target_runtime)
  4593	{
  4594		u64 min_amount, amount = 0;
  4595	
> 4596		lockdep_assert_held(cfs_rq->lock);
  4597	
  4598		/* note: this is a positive sum as runtime_remaining <= 0 */
  4599		min_amount = target_runtime - cfs_rq->runtime_remaining;
  4600	
  4601		if (cfs_b->quota == RUNTIME_INF)
  4602			amount = min_amount;
  4603		else {
  4604			start_cfs_bandwidth(cfs_b);
  4605	
  4606			if (cfs_b->runtime > 0) {
  4607				amount = min(cfs_b->runtime, min_amount);
  4608				cfs_b->runtime -= amount;
  4609				cfs_b->idle = 0;
  4610			}
  4611		}
  4612	
  4613		cfs_rq->runtime_remaining += amount;
  4614	
  4615		return cfs_rq->runtime_remaining > 0;
  4616	}
  4617	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 72528 bytes --]

Re: [peterz-queue:sched/core 3/5] kernel/sched/fair.c:4596:30: error: 'struct cfs_rq' has no member named 'lock'; did you mean 'load'?

[Peter Zijlstra]

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

On Thu, Apr 16, 2020 at 12:50:56AM +0800, kbuild test robot wrote:
> > 4596		lockdep_assert_held(cfs_rq->lock);

Bah, I'm an idiot, I'll go fix.