From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9FD78206F18; Tue, 8 Apr 2025 12:23:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744114998; cv=none; b=h2dUVQWYsul4uEKUmvTckIq8Ko+ViyyXQl8OlLOjKn9eyoDkASDRjU2+EJJFFph8vu7TkmxNQY6ugvHCXUXUsaa5ZMGYWa4jOed3bLyjGC3iGaKy7/h6CbmopsWVY3b7lqUSuwSZnLBo6bOTSatZaNlPNO8bS8aPcL9DtKPjP4w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744114998; c=relaxed/simple; bh=6uXz+sbUBmMrDz29m7Q8vLQ6NVXekGoHxSbTb4snlb4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gYXPE86L4LC+xueIpPZRdA54C80xcwLuJEs48Oz1smHGpzMyX+A/q2ROFL84lUy2XrXjQifoC20aXN2km00JnqO9HuMQum/QBkfMM8zwQCxBMTfYkdKMuIuta6VxcP47FHkTWjXoHVBr/n17eEsGSg3DS1kSIUqMKHprNPoi5hE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ztu1JcSf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ztu1JcSf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 310E5C4CEE5; Tue, 8 Apr 2025 12:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744114998; bh=6uXz+sbUBmMrDz29m7Q8vLQ6NVXekGoHxSbTb4snlb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ztu1JcSfYNQxzKB5d1fBX8P2h4dJOviGSljr/JPhCB1LL1rwEKIs8p056I6viB6B6 amknrrZQC3u20QRtwsRkJX1sA+SF9+r5LEhn8jzO5mA+snSDkCC7Kb4MqqI+vrkc/m 1vKk0nCfUQIx3SyaOKs+IiCae5QjWeWnucMb6Ymc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , Josh Poimboeuf , Ingo Molnar , Linus Torvalds , Sasha Levin Subject: [PATCH 6.13 295/499] sched/smt: Always inline sched_smt_active() Date: Tue, 8 Apr 2025 12:48:27 +0200 Message-ID: <20250408104858.571138616@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104851.256868745@linuxfoundation.org> References: <20250408104851.256868745@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josh Poimboeuf [ Upstream commit 09f37f2d7b21ff35b8b533f9ab8cfad2fe8f72f6 ] sched_smt_active() can be called from noinstr code, so it should always be inlined. The CONFIG_SCHED_SMT version already has __always_inline. Do the same for its !CONFIG_SCHED_SMT counterpart. Fixes the following warning: vmlinux.o: error: objtool: intel_idle_ibrs+0x13: call to sched_smt_active() leaves .noinstr.text section Fixes: 321a874a7ef8 ("sched/smt: Expose sched_smt_present static key") Reported-by: kernel test robot Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Cc: Linus Torvalds Link: https://lore.kernel.org/r/1d03907b0a247cf7fb5c1d518de378864f603060.1743481539.git.jpoimboe@kernel.org Closes: https://lore.kernel.org/r/202503311434.lyw2Tveh-lkp@intel.com/ Signed-off-by: Sasha Levin --- include/linux/sched/smt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/sched/smt.h b/include/linux/sched/smt.h index fb1e295e7e63e..166b19af956f8 100644 --- a/include/linux/sched/smt.h +++ b/include/linux/sched/smt.h @@ -12,7 +12,7 @@ static __always_inline bool sched_smt_active(void) return static_branch_likely(&sched_smt_present); } #else -static inline bool sched_smt_active(void) { return false; } +static __always_inline bool sched_smt_active(void) { return false; } #endif void arch_smt_update(void); -- 2.39.5