From patchwork Tue Feb 13 03:16:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 200196 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp302847dyb; Mon, 12 Feb 2024 19:19:06 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV7Jtwa6JCg+eKtyUXZmLcSJv5CvBRjI3qljjlx+3wCu3U+mS2fvu9Wy4Kv7I64Je3tKMBhEKsCO+VhGFppz3sdHQA3ig== X-Google-Smtp-Source: AGHT+IGeo4ewz0jgfQ9e7Cpd+4477DJLIP+m4ebrkXN5nVro5/3bh6Fm+vq4YjDu2VGWAp+uvwps X-Received: by 2002:a62:d116:0:b0:6e0:9e94:d085 with SMTP id z22-20020a62d116000000b006e09e94d085mr6755663pfg.14.1707794346564; Mon, 12 Feb 2024 19:19:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707794346; cv=pass; d=google.com; s=arc-20160816; b=zHkZQB1aGblQFEsqbircC5kmUNoYdp+Y8/3CbroJHv5iN01Z54rhtsw3L51BIKdxiu UgE9vVLqDkZZHg883S8VlsxBjn6GVPkGKPC32uogZYRBlqp+8PqRrPMRNB0xSSh7idXA LN5gRHNq0OOYElCACYcYiY26mXQLWhx7FGdwHxDegUXA7KwDlUxRQldzSm6gyyDQ3A+a 1Y9iQYu28YyitzE8yEl96TI1nKPgARk7NSX9/rx4NkBWjj0LcpNq7Gw4zSOh96XVwosD 6rczZtb7gljm7WcX+3pPtaOXOHNmTMBWME5ZGdeEmgnCTsHAwWlw6Np11ICYATl5WkG4 svuA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=+ZLAjPV7sebbsvd3xDxbWzhrfTLokZC3AjL5a7aPY+Y=; fh=eLEPFqYjkfjjDsSYQI+hE9zo8C079RFJhecav0npYPo=; b=gpYsGTujmtVap/HSlkNpMdoSWJnvSNYJ2np8hljPhMRm8otbB2ZD0HlZ3WMbrgesJ7 p1NqBGhOlE93rfq6Gkrvajm1BlXrqy3ZRAleuN7w1LyUXHnL7G3hTtCvNdS4znmtciS9 2A/iv3QRAT3RIJNtAMdC8PTeHIskjvgztIWUNAR8N2gowFAazto74d0O5wctZs1P0vdp /vN3whloE46/KSnv/3J4rqF7cGOIkr7D1mU8eWJCMiWdl8XfgWeqpisE/nQCLQrq/3/w uwS9qjcbK56wxrPRtX3QgclgTqH9pDYczDWa1mIFGmEr/jvsiIkdQ1QhVHiAEDOMgFOr rBsg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SoIbIFy0; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-62901-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-62901-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=2; AJvYcCVnlNFdh3xnCFap/0JSVRqd8aDtA7ZaZTscz0MSYYoj8SBDIa09AkWfvJiiR/WYzSEKsFvZeD8oCm9frZlKwzA/X0eOOw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id e19-20020a637453000000b005dc4fbfb9acsi1277975pgn.583.2024.02.12.19.19.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 19:19:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-62901-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SoIbIFy0; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-62901-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-62901-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id BE352B24060 for ; Tue, 13 Feb 2024 03:18:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D34F111A8; Tue, 13 Feb 2024 03:17:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SoIbIFy0" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C899D8F45 for ; Tue, 13 Feb 2024 03:17:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707794237; cv=none; b=TIEOl+eQEZjGTdLHbJLT3Km5ctV6B8gQWl7+Ygzw7+/ciFLC9svbingvQBWnatlFpLRvnq5CIulO1fy9sSo3dkDxh8wVsL6EO+C7XiXNchiJacm8GjlJl1xw1ScPn+7yDx7zOte8gEKuBPa5tgHZ+BbhndwwWzEBEOQ1ybcHR5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707794237; c=relaxed/simple; bh=HXgAfo4uLv8GHveOmo7cI+pvGtWKUeM5tq7f0Ae9cDY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ue6m6bgCNRse0Sr2ozvvUxqK2NxZKMhuQY0DX13KRq36mlzi/lK/72EUlKkdm1avU9C/d5scREVfurSZPjOJ+2qMdmjXM36BET/VYYXXZZ4M+ukItS0UK195dVL813a9b41h95g0mmqT3X5dRvDMjRTYrcfRAO3NrnfocEsYTCQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SoIbIFy0; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707794234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+ZLAjPV7sebbsvd3xDxbWzhrfTLokZC3AjL5a7aPY+Y=; b=SoIbIFy00MRExQf/nTtuyp/eySoduL8ezkRRpBHQeGfvwg7qUpwmHq5m4Wwf4XNQC/PqA8 EkUPMrxIorc1bn08kPAeKvKm8QcEvGQ1Q0Ye/A+zpyd/TDQY+kMSqpdroYAMynMTBVFLXQ IodDounHEI5CD5Sr0nCGSHWMYD0vlTo= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-61-24-9Ov5uO6qJIF2hSkLm6A-1; Mon, 12 Feb 2024 22:17:10 -0500 X-MC-Unique: 24-9Ov5uO6qJIF2hSkLm6A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DA4F7383CCE4; Tue, 13 Feb 2024 03:17:09 +0000 (UTC) Received: from llong.com (unknown [10.22.33.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37B60AD69; Tue, 13 Feb 2024 03:17:09 +0000 (UTC) From: Waiman Long To: Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Andrew Morton Cc: linux-kernel@vger.kernel.org, George Stark , Waiman Long Subject: [PATCH 2/4] locking/mutex: Clean up mutex.h Date: Mon, 12 Feb 2024 22:16:54 -0500 Message-Id: <20240213031656.1375951-3-longman@redhat.com> In-Reply-To: <20240213031656.1375951-1-longman@redhat.com> References: <20240213031656.1375951-1-longman@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790752165167551171 X-GMAIL-MSGID: 1790752165167551171 CONFIG_DEBUG_MUTEXES and CONFIG_PREEMPT_RT are mutually exclusive. They can't be both set at the same time. Move down the mutex_destroy() function declaration to the bottom of mutex.h to eliminate duplicated mutex_destroy() declaration. Also remove the duplicated mutex_trylock() function declaration in the CONFIG_PREEMPT_RT section. Signed-off-by: Waiman Long Reviewed-by: Boqun Feng --- include/linux/mutex.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 7e208d46ba5b..bad383713db2 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -35,18 +35,10 @@ #ifndef CONFIG_PREEMPT_RT #ifdef CONFIG_DEBUG_MUTEXES - -#define __DEBUG_MUTEX_INITIALIZER(lockname) \ +# define __DEBUG_MUTEX_INITIALIZER(lockname) \ , .magic = &lockname - -extern void mutex_destroy(struct mutex *lock); - #else - # define __DEBUG_MUTEX_INITIALIZER(lockname) - -static inline void mutex_destroy(struct mutex *lock) {} - #endif /** @@ -101,9 +93,6 @@ extern bool mutex_is_locked(struct mutex *lock); extern void __mutex_rt_init(struct mutex *lock, const char *name, struct lock_class_key *key); -extern int mutex_trylock(struct mutex *lock); - -static inline void mutex_destroy(struct mutex *lock) { } #define mutex_is_locked(l) rt_mutex_base_is_locked(&(l)->rtmutex) @@ -170,6 +159,16 @@ extern void mutex_unlock(struct mutex *lock); extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); +#ifdef CONFIG_DEBUG_MUTEXES + +extern void mutex_destroy(struct mutex *lock); + +#else + +static inline void mutex_destroy(struct mutex *lock) {} + +#endif + DEFINE_GUARD(mutex, struct mutex *, mutex_lock(_T), mutex_unlock(_T)) DEFINE_GUARD_COND(mutex, _try, mutex_trylock(_T)) DEFINE_GUARD_COND(mutex, _intr, mutex_lock_interruptible(_T) == 0)