Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp3213461rwl; Mon, 27 Mar 2023 10:44:43 -0700 (PDT) X-Google-Smtp-Source: AKy350ZNm6DWMPKgaIZ/k0OhqrNf07Y1AuV40SMEdxiliUJvtkPAqwSphwas2jjt9QtolgJOfe6V X-Received: by 2002:aa7:9603:0:b0:627:e342:7f0e with SMTP id q3-20020aa79603000000b00627e3427f0emr11940313pfg.30.1679939083202; Mon, 27 Mar 2023 10:44:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679939083; cv=none; d=google.com; s=arc-20160816; b=UUc50Tu8HXyp9hx6oIRKJ7zxps5maR/P+IMHPIv8FjSSjcClVN07gvmybbJ4rdg6VX fma7UNl1faAEu4HvxiTYB6ps41H+hfcypd1VTxmqJRi5Llg4YZDh2DRT32A9zZzgqQlG XJaGZfYMv8WQUK1YyO0RaVLUTWU8xBSRbBDuLRXBz7UohHDoCEWg9q2HYP3RDNRvTGJs QHzUdYpyxY1/A6LpHUJSu9HgdtLN+XTfbAVXhER2J6MMDTeQ96Rh7xL58mQYgBcANEC8 sgEs/GlBBa2lpR1DPQvW2nBLp44vEii50VaAo5HGfA30/wFkvpp63bMDSkLLeKa43Cci zBsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=xi+9McRtPlTN/EBgexZWmMQt3u7zyZsUNU4NiGaVw5E=; b=LRBa/qdfM7A5xAraTTdFCxy93LtOwde8h8CcERixs1C4eIAMhFnBP9OkXPjlytoPbd GZd8PbJJxTKyU0i+e7Y7Rb5TWCZShAfzCS6zZ5JOtlHzQ+S2/7IleTg+zdvMdP6grM2n hPe9vDB66bJ5hIpYY9yO5ewDlFIxTAll7jwun9fJqaNvhNGEuovb0dozvo32vl2I/1ui w5FADrz0MbUXg1sQxfiFbqWXX9ExPtOgCnb3hdTgh8apBoPXkwKdtsiAnX41VSSWNrmZ RLkUivm1VtvaA4toT6LerSQxCzLdP9k34YOSsI7aMavHyi0zotDUq8N1vaVWxsD6hJZP rIyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@metanate.com header.s=stronger header.b=Ea0fWQBC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=metanate.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d124-20020a621d82000000b0062a3f8af277si11844174pfd.380.2023.03.27.10.44.31; Mon, 27 Mar 2023 10:44:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@metanate.com header.s=stronger header.b=Ea0fWQBC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=metanate.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232606AbjC0RhA (ORCPT + 99 others); Mon, 27 Mar 2023 13:37:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232530AbjC0Rg6 (ORCPT ); Mon, 27 Mar 2023 13:36:58 -0400 Received: from metanate.com (unknown [IPv6:2001:8b0:1628:5005::111]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B35F32117 for ; Mon, 27 Mar 2023 10:36:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=metanate.com; s=stronger; h=Content-Transfer-Encoding:Message-Id:Date: Subject:Cc:To:From:Content-Type:Reply-To:Content-ID:Content-Description: In-Reply-To:References; bh=xi+9McRtPlTN/EBgexZWmMQt3u7zyZsUNU4NiGaVw5E=; b=Ea 0fWQBCPjgN0TeRUT5p2E9N2uL60mguHHPO1ITQbMlfeckXrtYLWZSN37zTtPsMDgBi1U/DWAKAHTO bpMbmM36EPnInvs8tqYpSXJ2TJA6ahFzqUxM29fkAo3uJAKnPGegJF2kbxkhw0rM7/hrNFuN5lIDY U72fu7+1AcVExQcLhjpJl3c7Q/xl6lgGPIyDVtRwPpPrqmN0t7iUByDdknprWdoiDmHXEQhnL9vFg KBJtxojfpazGzh6iyH0kjHnU0balnkqBUEK1YddM/eZn8vj1/dh8G5Bfjxe5yNZeHpM/bk2qORqnG a+m0o9N3Yk0NjZJp+MDGopAsfGgwSpaA==; Received: from [81.174.171.191] (helo=donbot.metanate.com) by email.metanate.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pgqm3-0006gE-5x; Mon, 27 Mar 2023 18:36:52 +0100 From: John Keeping To: linux-trace-kernel@vger.kernel.org Cc: John Keeping , Steven Rostedt , Masami Hiramatsu , Mark Rutland , linux-kernel@vger.kernel.org Subject: [PATCH] ftrace: mark get_lock_parent_ip() __always_inline Date: Mon, 27 Mar 2023 18:36:46 +0100 Message-Id: <20230327173647.1690849-1-john@metanate.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated: YES X-Spam-Status: No, score=1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the compiler decides not to inline this function then preemption tracing will always show an IP inside the preemption disabling path and never the function actually calling preempt_{enable,disable}. Signed-off-by: John Keeping --- include/linux/ftrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 327046f1278d..6954e4ed5bbf 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -964,7 +964,7 @@ static inline void __ftrace_enabled_restore(int enabled) #define CALLER_ADDR5 ((unsigned long)ftrace_return_address(5)) #define CALLER_ADDR6 ((unsigned long)ftrace_return_address(6)) -static inline unsigned long get_lock_parent_ip(void) +static __always_inline unsigned long get_lock_parent_ip(void) { unsigned long addr = CALLER_ADDR0; -- 2.40.0