From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Date: Thu, 7 Dec 2017 01:50:33 +0100
From: Ingo Molnar <mingo@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Ingo Molnar <mingo@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Al Viro <viro@zeniv.linux.org.uk>,
        Jason Baron <jbaron@akamai.com>, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] sched/wait: assert the wait_queue_head lock is held
 in __wake_up_common
Message-ID: <20171207005033.5fpojl43xlfyqvth@gmail.com>
References: <20171206235230.19425-1-hch@lst.de>
 <20171206235230.19425-3-hch@lst.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171206235230.19425-3-hch@lst.de>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-fsdevel.vger.kernel.org>


* Christoph Hellwig <hch@lst.de> wrote:

> Better ensure we actually hold the lock using lockdep than just commenting
> on it.  Due to the various exported _locked interfaces it is far too easy
> to get the locking wrong.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  kernel/sched/wait.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c
> index 98feab7933c7..347c06c8222e 100644
> --- a/kernel/sched/wait.c
> +++ b/kernel/sched/wait.c
> @@ -76,6 +76,8 @@ static int __wake_up_common(struct wait_queue_head *wq_head, unsigned int mode,
>  	wait_queue_entry_t *curr, *next;
>  	int cnt = 0;
>  
> +	lockdep_assert_held(&wq_head->lock);
> +
>  	if (bookmark && (bookmark->flags & WQ_FLAG_BOOKMARK)) {
>  		curr = list_next_entry(bookmark, entry);

Makes sense. Would you like to carry this patch together with the epoll patch, to 
be able to test them both? If yes then:

  Acked-by: Ingo Molnar <mingo@kernel.org>

... otherwise I can pick this up into the scheduler tree as well.

Thanks,

	Ingo