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=-20.7 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,MENTIONS_GIT_HOSTING,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 59739C2B9F4 for ; Tue, 22 Jun 2021 12:04:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40D9C613B4 for ; Tue, 22 Jun 2021 12:04:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231304AbhFVMGO (ORCPT ); Tue, 22 Jun 2021 08:06:14 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:56794 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231235AbhFVMF5 (ORCPT ); Tue, 22 Jun 2021 08:05:57 -0400 Date: Tue, 22 Jun 2021 12:03:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1624363420; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qqtesPobExbORom3TGQmLJ6gP59SEzi6pkHdGPfl04Q=; b=4O57v1rgEcr+2dR0ViPBfw1CsyeFS3TQzpmIY8w0gmhgLZfQtNA1gKGGJK7ZNhYqFexCaH ObKbzbk/tFNvorxZfeuwVbSAMw4S1k5e82p3IJVyAWNklqK58UjFsoqg0cU0Elwlx41Cuw OxgEolsVnhe5lkztcfQKQXr/0fIkLQbxTrL5kMx33fjwNMLRzAsVLucFomZsXD+rX0et7C wQ1y5rdW3R3e1JDPWkW+ZrwP0oPe9pQu0YfMTM0bPcFD8hTk6Yd6NrXXJWF7SAC5bsmYxY wwphM4aD9JAXXvb7RUjAiglNAFrF8AtAOgIl8cQzcUn2uV7Br8j/mXJCmPHvvQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1624363420; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qqtesPobExbORom3TGQmLJ6gP59SEzi6pkHdGPfl04Q=; b=L93mDHbuw9BmRfmyNC/AwcHYe5/N+rVCBgfMP/6mgdHdapcGjsyTXGWNi1Dl/wp/r93Wpd Ni2ohBIq8bhgp7Aw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/urgent] x86/entry: Fix noinstr fail in __do_fast_syscall_32() Cc: "Peter Zijlstra (Intel)" , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210621120120.467898710@infradead.org> References: <20210621120120.467898710@infradead.org> MIME-Version: 1.0 Message-ID: <162436341981.395.1786035684192237114.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the objtool/urgent branch of tip: Commit-ID: 240001d4e3041832e8a2654adc3ccf1683132b92 Gitweb: https://git.kernel.org/tip/240001d4e3041832e8a2654adc3ccf1683132b92 Author: Peter Zijlstra AuthorDate: Mon, 21 Jun 2021 13:12:34 +02:00 Committer: Ingo Molnar CommitterDate: Tue, 22 Jun 2021 13:56:42 +02:00 x86/entry: Fix noinstr fail in __do_fast_syscall_32() Fix: vmlinux.o: warning: objtool: __do_fast_syscall_32()+0xf5: call to trace_hardirqs_off() leaves .noinstr.text section Fixes: 5d5675df792f ("x86/entry: Fix entry/exit mismatch on failed fast 32-bit syscalls") Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20210621120120.467898710@infradead.org --- arch/x86/entry/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 7b2542b..a6bf516 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -130,8 +130,8 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs) /* User code screwed up. */ regs->ax = -EFAULT; - instrumentation_end(); local_irq_disable(); + instrumentation_end(); irqentry_exit_to_user_mode(regs); return false; }