From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39916C4338F for ; Fri, 30 Jul 2021 14:22:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 216FC6101C for ; Fri, 30 Jul 2021 14:22:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239319AbhG3OWb (ORCPT ); Fri, 30 Jul 2021 10:22:31 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:55954 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239228AbhG3OSC (ORCPT ); Fri, 30 Jul 2021 10:18:02 -0400 Message-ID: <20210730135207.648890657@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1627654676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=xfTiisNqO4bWYKLqxuiAj07QbMu4XhbicsFqzaYisDc=; b=dpTyKpO8HHniB0vx50jVYg4K0ocPPth70H84mCNR9yajWqFhJ+5SroR3X5qt9t+B9E18vN Xt6iR1S1IhSI1f8LKQk4DrAMh636iiaYtR+QsMQuGZUOcSXmFvxrXBLOt44MChDh/l3WTy wi8jOxGhqaa8InFlz5lMHyTa9oYUBqL9XihCGkp7CrGBANFxVXdiGYxBtaOJihZF0g37xq 9gCYjRCUTRj6VNUsNcM524DpCVUznwsUifI4XocbQSpe3TdhC15nsN6V85AkJkYcucZR1L 8MYjIrSmn/M7L9GD1kVye+qY2eRUULDBDGmib453LDkWOUiG3PNX5QRzDIpagw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1627654676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=xfTiisNqO4bWYKLqxuiAj07QbMu4XhbicsFqzaYisDc=; b=gsxMKyRRYe/qe7nFKBk0wu+B8PO61hlg7kAIhu9qUnHH5vj3EbUH46WnrPrMam3p1QHJQm gZ5K5jm/7OkD9lBg== Date: Fri, 30 Jul 2021 15:50:51 +0200 From: Thomas Gleixner To: LKML Cc: Peter Zijlstra , Ingo Molnar , Juri Lelli , Steven Rostedt , Daniel Bristot de Oliveira , Will Deacon , Waiman Long , Boqun Feng , Sebastian Andrzej Siewior , Davidlohr Bueso Subject: [patch 44/63] locking/ww_mutex: Abstract mutex types References: <20210730135007.155909613@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-transfer-encoding: 8-bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra Some ww_mutex helper functions use pointers for the underlying mutex and mutex_waiter. The upcoming rtmutex based implementation needs to share these functions. Add and use defines for the types and replace the direct types in the affected functions. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Thomas Gleixner --- kernel/locking/ww_mutex.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) --- --- a/kernel/locking/ww_mutex.h +++ b/kernel/locking/ww_mutex.h @@ -1,5 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#define MUTEX mutex +#define MUTEX_WAITER mutex_waiter + static inline struct mutex_waiter * __ww_waiter_first(struct mutex *lock) { @@ -143,7 +146,7 @@ static inline bool * __ww_mutex_check_kill() wake any but the earliest context. */ static bool -__ww_mutex_die(struct mutex *lock, struct mutex_waiter *waiter, +__ww_mutex_die(struct MUTEX *lock, struct MUTEX_WAITER *waiter, struct ww_acquire_ctx *ww_ctx) { if (!ww_ctx->is_wait_die) @@ -165,7 +168,7 @@ static bool * the lock holders. Even if multiple waiters may wound the lock holder, * it's sufficient that only one does. */ -static bool __ww_mutex_wound(struct mutex *lock, +static bool __ww_mutex_wound(struct MUTEX *lock, struct ww_acquire_ctx *ww_ctx, struct ww_acquire_ctx *hold_ctx) { @@ -220,9 +223,9 @@ static bool __ww_mutex_wound(struct mute * The current task must not be on the wait list. */ static void -__ww_mutex_check_waiters(struct mutex *lock, struct ww_acquire_ctx *ww_ctx) +__ww_mutex_check_waiters(struct MUTEX *lock, struct ww_acquire_ctx *ww_ctx) { - struct mutex_waiter *cur; + struct MUTEX_WAITER *cur; lockdep_assert_held(&lock->wait_lock); @@ -278,7 +281,7 @@ ww_mutex_set_context_fastpath(struct ww_ } static __always_inline int -__ww_mutex_kill(struct mutex *lock, struct ww_acquire_ctx *ww_ctx) +__ww_mutex_kill(struct MUTEX *lock, struct ww_acquire_ctx *ww_ctx) { if (ww_ctx->acquired > 0) { #ifdef CONFIG_DEBUG_MUTEXES @@ -306,12 +309,12 @@ static __always_inline int * look at waiters before us in the wait-list. */ static inline int -__ww_mutex_check_kill(struct mutex *lock, struct mutex_waiter *waiter, +__ww_mutex_check_kill(struct MUTEX *lock, struct MUTEX_WAITER *waiter, struct ww_acquire_ctx *ctx) { struct ww_mutex *ww = container_of(lock, struct ww_mutex, base); struct ww_acquire_ctx *hold_ctx = READ_ONCE(ww->ctx); - struct mutex_waiter *cur; + struct MUTEX_WAITER *cur; if (ctx->acquired == 0) return 0; @@ -354,11 +357,11 @@ static inline int * Wound-Wait ensure we wound the owning context when it is younger. */ static inline int -__ww_mutex_add_waiter(struct mutex_waiter *waiter, - struct mutex *lock, +__ww_mutex_add_waiter(struct MUTEX_WAITER *waiter, + struct MUTEX *lock, struct ww_acquire_ctx *ww_ctx) { - struct mutex_waiter *cur, *pos = NULL; + struct MUTEX_WAITER *cur, *pos = NULL; bool is_wait_die; if (!ww_ctx) {