From patchwork Thu Jun 13 06:47:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 13696201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E430FC27C4F for ; Thu, 13 Jun 2024 06:47:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC3E110E21A; Thu, 13 Jun 2024 06:47:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=linutronix.de header.i=@linutronix.de header.b="cYgAJnpS"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="EYCQIcpn"; dkim-atps=neutral Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 089B110E21A for ; Thu, 13 Jun 2024 06:47:20 +0000 (UTC) Date: Thu, 13 Jun 2024 08:47:16 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1718261237; 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; bh=/CXw70mCHvpUr8NeCp2YOgRcPe5bung9/II6E+Snxc8=; b=cYgAJnpSmdlaRQq3IC9RDvOUM4M9cjGZeMRgL3rPJnnPzo6efWcTWC0ALjkVX8/lW3NJr2 nBwEQomnwz4nt7BpJDsDyn44WvekX3VUVOjYnOomc6h771yLgWmI2NcFHqXGo357fY8i43 vQfrnrs0pCmb1bJeNuI0FbBgpigCYxTsPnVETBjmEWnxeUtGbSRnx/lIzaZEbMt3EUhhGB Gyr6H4TRCiS1tov0x8Bpm87MWVnlprsVBdPhUJ/kecKwSikvjXnY4SkxMnlYq/vsZyf8/3 j7YelowHKey+RAWAS0noA0zeAZ/utGWXogCiCB8+JL9/y/IaYJsNT2R4poDXDg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1718261237; 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; bh=/CXw70mCHvpUr8NeCp2YOgRcPe5bung9/II6E+Snxc8=; b=EYCQIcpnujem9GuUZ6+9adYOY+5AmiEk9PejjKlAUtdjWmVo6zMuKZ/2OwFQUSqguiXV6g URsNwpMwHkBOg/Cg== From: Sebastian Andrzej Siewior To: dri-devel@lists.freedesktop.org Cc: Christian Koenig , Daniel Vetter , David Airlie , Huang Rui , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Subject: [PATCH REPOST] drm/ttm/tests: Let ttm_bo_test consider different ww_mutex implementation. Message-ID: <20240613064716.WxAIvb9K@linutronix.de> MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" PREEMPT_RT has a different locking implementation for ww_mutex. The base mutex of struct ww_mutex is declared as struct WW_MUTEX_BASE. The latter is defined as `mutex' for non-PREEMPT_RT builds and `rt_mutex' for PREEMPT_RT builds. Using mutex_lock() directly on the base mutex in ttm_bo_reserve_deadlock() leads to compile error on PREEMPT_RT. The locking-selftest has its own defines to deal with this and it is probably best to defines the needed one within the test program since their usefulness is limited outside of well known selftests. Provide ww_mutex_base_lock() which points to the correct function for PREEMPT_RT and non-PREEMPT_RT builds. Fixes: 995279d280d1e ("drm/ttm/tests: Add tests for ttm_bo functions") Signed-off-by: Sebastian Andrzej Siewior --- Repost of https://lore.kernel.org/r/20240404102534.QTa80QPY@linutronix.de drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/ttm/tests/ttm_bo_test.c +++ b/drivers/gpu/drm/ttm/tests/ttm_bo_test.c @@ -18,6 +18,12 @@ #define BO_SIZE SZ_8K +#ifdef CONFIG_PREEMPT_RT +#define ww_mutex_base_lock(b) rt_mutex_lock(b) +#else +#define ww_mutex_base_lock(b) mutex_lock(b) +#endif + struct ttm_bo_test_case { const char *description; bool interruptible; @@ -142,7 +148,7 @@ static void ttm_bo_reserve_deadlock(stru bo2 = ttm_bo_kunit_init(test, test->priv, BO_SIZE); ww_acquire_init(&ctx1, &reservation_ww_class); - mutex_lock(&bo2->base.resv->lock.base); + ww_mutex_base_lock(&bo2->base.resv->lock.base); /* The deadlock will be caught by WW mutex, don't warn about it */ lock_release(&bo2->base.resv->lock.base.dep_map, 1);