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 75B79C43381 for ; Wed, 6 Jan 2021 14:50:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 319142311C for ; Wed, 6 Jan 2021 14:50:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727030AbhAFOuE (ORCPT ); Wed, 6 Jan 2021 09:50:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726581AbhAFOtt (ORCPT ); Wed, 6 Jan 2021 09:49:49 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A645C061358 for ; Wed, 6 Jan 2021 06:49:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=USeyIOBG4gtWe+I6lOFfTmZTGrldZP1FUBRZhAnoMYw=; b=mkB5u5GfqPQzuX0ZfU1Q0t9lfK rJzR80lyaDnoOEUr6cCJATrjG024GyielP1i9TT8nNO0JU5Xb+e3ArWVEQCA+MJ3WydNCDEI44XK4 FEPUWwmNUaelpEM3/bfIjj4aQeHo4nqr6Y8sS0RS/XOebDywMG2Kj4hfLq75PPSUqrQBm2dlKUB5O sDfpkN8g+lAp3LrofDjNPILG4Ft1MCgocle5mWBC/uObqV/vOMcb4gs0wEjlyVmsiNIC/UgCYD1XA J8eSJQ9YlAex6sMKLluQvUhx+oNBBYeCl7/asAxCCYzhGYLesmTHAHXxJdGP6J6QJK27Lgs9tpu8T CTBegK2A==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1kxA3H-002QUX-Ow; Wed, 06 Jan 2021 14:45:34 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id B75E930785A; Wed, 6 Jan 2021 15:44:42 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id A6C602029C72D; Wed, 6 Jan 2021 15:44:42 +0100 (CET) Message-ID: <20210106144017.592595176@infradead.org> User-Agent: quilt/0.66 Date: Wed, 06 Jan 2021 15:36:22 +0100 From: Peter Zijlstra To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, rdunlap@infradead.org, jpoimboe@redhat.com, sfr@canb.auug.org.au, tony.luck@intel.com Subject: [PATCH 3/6] locking/lockdep: Cure noinstr fail References: <20210106143619.479313782@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the compiler doesn't feel like inlining, it causes a noinstr fail: vmlinux.o: warning: objtool: lock_is_held_type()+0xb: call to lockdep_enabled() leaves .noinstr.text section Fixes: 4d004099a668 ("lockdep: Fix lockdep recursion") Reported-by: Randy Dunlap Signed-off-by: Peter Zijlstra (Intel) --- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -79,7 +79,7 @@ module_param(lock_stat, int, 0644); DEFINE_PER_CPU(unsigned int, lockdep_recursion); EXPORT_PER_CPU_SYMBOL_GPL(lockdep_recursion); -static inline bool lockdep_enabled(void) +static __always_inline bool lockdep_enabled(void) { if (!debug_locks) return false;