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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C0D5EB64DC for ; Mon, 17 Jul 2023 18:39:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230192AbjGQSjY (ORCPT ); Mon, 17 Jul 2023 14:39:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230447AbjGQSjT (ORCPT ); Mon, 17 Jul 2023 14:39:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0875DF7 for ; Mon, 17 Jul 2023 11:39:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8656E611F3 for ; Mon, 17 Jul 2023 18:39:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5676C433CB; Mon, 17 Jul 2023 18:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1689619156; bh=YQKwsC2o8x0iYynPU/7OmVBDvhS7NPW2zlnFNLsXxHs=; h=Date:To:From:Subject:From; b=Wb310RqBx7zLe0TPLtLST9LOqf2t0Q4JdNHyn0Wy5JTcw/fEgNGUE8sN7v59DTX0U NEqtqVhJKnOptbJceSSMjht0m1dOzK0BHkDiUO3LzaXJU9rG5lQ6pU6XAjCSbzU02l gnE/NJZyk6aPmSYefFG6/3qm7qCbixaRop9Xa6S8= Date: Mon, 17 Jul 2023 11:39:16 -0700 To: mm-commits@vger.kernel.org, torvalds@linux-foundation.org, oliver.sang@intel.com, Liam.Howlett@oracle.com, akpm@linux-foundation.org From: Andrew Morton Subject: + maple_tree-relax-lockdep-checks-for-on-stack-trees.patch added to mm-unstable branch Message-Id: <20230717183916.D5676C433CB@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: maple_tree: relax lockdep checks for on-stack trees has been added to the -mm mm-unstable branch. Its filename is maple_tree-relax-lockdep-checks-for-on-stack-trees.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple_tree-relax-lockdep-checks-for-on-stack-trees.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: "Liam R. Howlett" Subject: maple_tree: relax lockdep checks for on-stack trees Date: Fri, 14 Jul 2023 15:55:49 -0400 To support early release of the maple tree locks, do not lockdep check the lock if it is set to NULL. This is intended for the special case on-stack use of tracking entries and not for general use. Link: https://lkml.kernel.org/r/20230714195551.894800-3-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett Cc: Linus Torvalds Cc: Oliver Sang Signed-off-by: Andrew Morton --- include/linux/maple_tree.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/include/linux/maple_tree.h~maple_tree-relax-lockdep-checks-for-on-stack-trees +++ a/include/linux/maple_tree.h @@ -182,7 +182,9 @@ enum maple_type { #ifdef CONFIG_LOCKDEP typedef struct lockdep_map *lockdep_map_p; -#define mt_lock_is_held(mt) lock_is_held(mt->ma_external_lock) +#define mt_lock_is_held(mt) \ + (!(mt)->ma_external_lock || lock_is_held((mt)->ma_external_lock)) + #define mt_set_external_lock(mt, lock) \ (mt)->ma_external_lock = &(lock)->dep_map #else _ Patches currently in -mm which might be from Liam.Howlett@oracle.com are mm-mlock-fix-vma-iterator-conversion-of-apply_vma_lock_flags.patch maple_tree-fix-32-bit-mas_next-testing.patch maple_tree-fix-node-allocation-testing-on-32-bit.patch mm-mmap-clean-up-validate_mm-calls.patch maple_tree-relax-lockdep-checks-for-on-stack-trees.patch mm-mmap-change-detached-vma-locking-scheme.patch maple_tree-be-more-strict-about-locking.patch