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=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,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 CFD47C43381 for ; Thu, 28 Feb 2019 07:13:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6DB520842 for ; Thu, 28 Feb 2019 07:13:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731626AbfB1HNo (ORCPT ); Thu, 28 Feb 2019 02:13:44 -0500 Received: from terminus.zytor.com ([198.137.202.136]:57265 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730965AbfB1HNo (ORCPT ); Thu, 28 Feb 2019 02:13:44 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x1S7D9ho2939842 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 27 Feb 2019 23:13:09 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x1S7D8952939838; Wed, 27 Feb 2019 23:13:08 -0800 Date: Wed, 27 Feb 2019 23:13:08 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Bart Van Assche Message-ID: Cc: bvanassche@acm.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, longman@redhat.com, akpm@linux-foundation.org, tglx@linutronix.de, johannes@sipsolutions.net, torvalds@linux-foundation.org, paulmck@linux.vnet.ibm.com, will.deacon@arm.com, peterz@infradead.org Reply-To: will.deacon@arm.com, peterz@infradead.org, johannes@sipsolutions.net, torvalds@linux-foundation.org, tglx@linutronix.de, paulmck@linux.vnet.ibm.com, akpm@linux-foundation.org, hpa@zytor.com, longman@redhat.com, bvanassche@acm.org, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <20190214230058.196511-18-bvanassche@acm.org> References: <20190214230058.196511-18-bvanassche@acm.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] locking/lockdep: Verify whether lock objects are small enough to be used as class keys Git-Commit-ID: 4bf508621855613ca2ac782f70c3171e0e8bb011 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4bf508621855613ca2ac782f70c3171e0e8bb011 Gitweb: https://git.kernel.org/tip/4bf508621855613ca2ac782f70c3171e0e8bb011 Author: Bart Van Assche AuthorDate: Thu, 14 Feb 2019 15:00:52 -0800 Committer: Ingo Molnar CommitDate: Thu, 28 Feb 2019 07:55:46 +0100 locking/lockdep: Verify whether lock objects are small enough to be used as class keys Signed-off-by: Bart Van Assche Signed-off-by: Peter Zijlstra (Intel) Cc: Andrew Morton Cc: Johannes Berg Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Waiman Long Cc: Will Deacon Cc: johannes.berg@intel.com Cc: tj@kernel.org Link: https://lkml.kernel.org/r/20190214230058.196511-18-bvanassche@acm.org Signed-off-by: Ingo Molnar --- kernel/locking/lockdep.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 630be9ac6253..84427441824e 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -758,6 +758,17 @@ static bool assign_lock_key(struct lockdep_map *lock) { unsigned long can_addr, addr = (unsigned long)lock; +#ifdef __KERNEL__ + /* + * lockdep_free_key_range() assumes that struct lock_class_key + * objects do not overlap. Since we use the address of lock + * objects as class key for static objects, check whether the + * size of lock_class_key objects does not exceed the size of + * the smallest lock object. + */ + BUILD_BUG_ON(sizeof(struct lock_class_key) > sizeof(raw_spinlock_t)); +#endif + if (__is_kernel_percpu_address(addr, &can_addr)) lock->key = (void *)can_addr; else if (__is_module_percpu_address(addr, &can_addr))