Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <73859883-78c4-1080-7846-e8d644ad397a@redhat.com>
Date:   Tue, 4 Oct 2022 12:01:13 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.12.0
Subject: Re: [RFC PATCH 01/11] locking/ww_mutex: Remove wakeups from under
 mutex::wait_lock
Content-Language: en-US
To:     Connor O'Brien <connoro@google.com>, linux-kernel@vger.kernel.org
Cc:     kernel-team@android.com, John Stultz <jstultz@google.com>,
        Joel Fernandes <joelaf@google.com>,
        Qais Yousef <qais.yousef@arm.com>,
        Ingo Molnar <mingo@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Juri Lelli <juri.lelli@redhat.com>,
        Vincent Guittot <vincent.guittot@linaro.org>,
        Dietmar Eggemann <dietmar.eggemann@arm.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>,
        Daniel Bristot de Oliveira <bristot@redhat.com>,
        Valentin Schneider <vschneid@redhat.com>,
        Will Deacon <will@kernel.org>,
        Boqun Feng <boqun.feng@gmail.com>,
        "Paul E . McKenney" <paulmck@kernel.org>
References: <20221003214501.2050087-1-connoro@google.com>
 <20221003214501.2050087-2-connoro@google.com>
From:   Waiman Long <longman@redhat.com>
In-Reply-To: <20221003214501.2050087-2-connoro@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 10/3/22 17:44, Connor O'Brien wrote:
> diff --git a/kernel/locking/ww_mutex.h b/kernel/locking/ww_mutex.h
> index 56f139201f24..dfc174cd96c6 100644
> --- a/kernel/locking/ww_mutex.h
> +++ b/kernel/locking/ww_mutex.h
> @@ -161,6 +161,11 @@ static inline void lockdep_assert_wait_lock_held(struct rt_mutex *lock)
>   
>   #endif /* WW_RT */
>   
> +void ww_ctx_wake(struct ww_acquire_ctx *ww_ctx)
> +{
> +	wake_up_q(&ww_ctx->wake_q);
> +}
> +
>   /*
>    * Wait-Die:
>    *   The newer transactions are killed when:
> @@ -284,7 +289,7 @@ __ww_mutex_die(struct MUTEX *lock, struct MUTEX_WAITER *waiter,
>   #ifndef WW_RT
>   		debug_mutex_wake_waiter(lock, waiter);
>   #endif
> -		wake_up_process(waiter->task);
> +		wake_q_add(&ww_ctx->wake_q, waiter->task);
>   	}
>   
>   	return true;
> @@ -331,7 +336,7 @@ static bool __ww_mutex_wound(struct MUTEX *lock,
>   		 * wakeup pending to re-read the wounded state.
>   		 */
>   		if (owner != current)
> -			wake_up_process(owner);
> +			wake_q_add(&ww_ctx->wake_q, owner);
>   
>   		return true;
>   	}
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index ee28253c9ac0..617e737392be 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -1013,6 +1013,13 @@ void wake_up_q(struct wake_q_head *head)
>   		wake_up_process(task);
>   		put_task_struct(task);
>   	}
> +	/*
> +	 * XXX connoro: seems this is needed now that ww_ctx_wake() passes in a
> +	 * wake_q_head that is embedded in struct ww_acquire_ctx rather than
> +	 * declared locally.
> +	 */
> +	head->first = node;
> +	head->lastp = &head->first;
>   }
>   

You shouldn't do wake_q_init() here in wake_up_q(). Instead, you should 
do it in ww_ctx_wake() right after the wake_up_q() call.

Cheers,
Longman