From patchwork Mon Dec 12 10:08:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 32297 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2155850wrr; Mon, 12 Dec 2022 02:15:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf4XWeL0D876CRpMZxViaT0dlbFpSMzYnBWmC9UcSE8MZZi2Q6rPlxqw4fKDm5G/B9PHgaqC X-Received: by 2002:a17:903:1341:b0:189:e4e:792c with SMTP id jl1-20020a170903134100b001890e4e792cmr14845073plb.64.1670840155829; Mon, 12 Dec 2022 02:15:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670840155; cv=none; d=google.com; s=arc-20160816; b=iukTnt8ojyiORoYqk78xYBVAe5h7v5ggnNVgTxUGj5fUDJQ6eyG4EpDTaNuw58ChJq TsSGFk+3g/SKqpuQCwbnY+JMRX0fOzjxKyDaQBDg3ypbqQBWEvSFnybtd/q4CSfLadTv BzlNDJ4ROWfpW8ARSrMnbdcSnHko6YYYoxnP1737cjaZ0gdmf6J17cbgN+unHDxh0Gvc emWFRALXQgdXU47U1f5TZfgo5qReWRmgFcBg1PEN+lPqE0ZaBTAAP0Otjs8Wef5lLWZW bBu/EeBAG0dV5MTLokGKPdV10MJqYOLkrmrfMjqYyr8Q4Eln5tAz92iIFDoeJg4kafi6 1SzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:content-transfer-encoding :message-id:subject:cc:to:dkim-signature:dkim-signature:from; bh=H9vo2DtiADdIfw1vXZpWgFmc8ynuZRSwE8Yti4cc1KU=; b=LSSyCDj6gx8byIQzoHze5n/TTXvpTHWTQYyMr2I3K+LygLAq3ePpj9EkSNMp5R83eb u2wYymAeZyyZ5JukfcY8S5MdiXvKXfdbQK/qpHdvBFykXoVr9NNZ10gzY5QveiWdxHHn iitwBrPPGuEnYzjM3/13SjOKfe9QBbOuEptupjoQ16MoXm56kUysFcCgdwy4TKSzgllJ FkVzFH0yld7O6haiB1guyZYsf474MhDL7dnIzJdETSmvggzr4heT4q7LxMftguf7tom2 zn8CyNm4zYwEqCeLcS/RU180uxA8TcRDIPeMvsEH9UoLXlUCnTU+24a84J8+p4kGoa6r 6n+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=4ursBoKg; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=KeZcX3St; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f1-20020a170902ce8100b00189f1431481si9719803plg.370.2022.12.12.02.15.42; Mon, 12 Dec 2022 02:15:55 -0800 (PST) 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 header.i=@linutronix.de header.s=2020 header.b=4ursBoKg; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=KeZcX3St; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231622AbiLLKJG (ORCPT + 99 others); Mon, 12 Dec 2022 05:09:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231370AbiLLKJC (ORCPT ); Mon, 12 Dec 2022 05:09:02 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82D4C2D9 for ; Mon, 12 Dec 2022 02:09:01 -0800 (PST) From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1670839739; h=from:from: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; bh=H9vo2DtiADdIfw1vXZpWgFmc8ynuZRSwE8Yti4cc1KU=; b=4ursBoKgY5M2zpBTlvUvjffA8ut5xn9fUk4NNo7worF8CgCDvv6nyVMIxyB8bZ92rERVUj S3fXXECcVKKXID7gFgMMyB4vC2GZAICiFIFlC64FZ9SvgoX5lFbh12Lmb06OHQot8xrI5m mnbR+4P/WBKJpAqSoqSLi8oQsMKUvnoM6R/4ejKGcPTcRCExn56ddchRaq6K/5aHsVPCZV JgNZ+xdLPoYYk5lIp3awSuZtbeafw1N3R0zFtZxK4+Cu1pKM5y/behEqOR7c8sSw+OzoJ9 cgrPRStnmkjdgRS1QCdNPjx1O+y9/w+9XW5mfovGmNdolXXNxZknJboIjHgq7Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1670839739; h=from:from: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; bh=H9vo2DtiADdIfw1vXZpWgFmc8ynuZRSwE8Yti4cc1KU=; b=KeZcX3StaZyq33WfX7OqhlQekf2bOg/Aes99MF0lKoE59nKGjO8/RuYx5Syqh+MEBTAEwb 9uDyLxjEVtkOWNBw== To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, x86@kernel.org Subject: [GIT pull] x86/urgent for v6.2-rc1 Message-ID: <167083907785.564878.11381307641454805335.tglx@xen13.tec.linutronix.de> MIME-Version: 1.0 Date: Mon, 12 Dec 2022 11:08:59 +0100 (CET) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752002887469837665?= X-GMAIL-MSGID: =?utf-8?q?1752002887469837665?= Linus, please pull the latest x86/urgent branch from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2022-12-12 up to: 45be2ad007a9: x86/vdso: Conditionally export __vdso_sgx_enter_enclave() Three small x86 fixes which did not make it into 6.1: - Remove a superfluous noinline which prevents GCC-7.3 to optimize a stub function away. - Allow uprobes on REP NOP and do not treat them like word-sized branch instructions. - Make the VDSO symbol export of __vdso_sgx_enter_enclave() depend on CONFIG_X86_SGX to prevent build fails with newer LLVM versions which rightfully detect that there is no function behind the symbol. Thanks, tglx ------------------> Miaohe Lin (1): x86/alternative: Remove noinline from __ibt_endbr_seal[_end]() stubs Nathan Chancellor (1): x86/vdso: Conditionally export __vdso_sgx_enter_enclave() Oleg Nesterov (1): uprobes/x86: Allow to probe a NOP instruction with 0x66 prefix arch/x86/entry/vdso/vdso.lds.S | 2 ++ arch/x86/kernel/alternative.c | 2 +- arch/x86/kernel/uprobes.c | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/vdso/vdso.lds.S b/arch/x86/entry/vdso/vdso.lds.S index 4bf48462fca7..e8c60ae7a7c8 100644 --- a/arch/x86/entry/vdso/vdso.lds.S +++ b/arch/x86/entry/vdso/vdso.lds.S @@ -27,7 +27,9 @@ VERSION { __vdso_time; clock_getres; __vdso_clock_getres; +#ifdef CONFIG_X86_SGX __vdso_sgx_enter_enclave; +#endif local: *; }; } diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 5cadcea035e0..beaf9fc44e2f 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -624,7 +624,7 @@ void __init_or_module noinline apply_ibt_endbr(s32 *start, s32 *end) #else -void __init_or_module noinline apply_ibt_endbr(s32 *start, s32 *end) { } +void __init_or_module apply_ibt_endbr(s32 *start, s32 *end) { } #endif /* CONFIG_X86_KERNEL_IBT */ diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index b63cf8f7745e..6c07f6daaa22 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -722,8 +722,9 @@ static int branch_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn) switch (opc1) { case 0xeb: /* jmp 8 */ case 0xe9: /* jmp 32 */ - case 0x90: /* prefix* + nop; same as jmp with .offs = 0 */ break; + case 0x90: /* prefix* + nop; same as jmp with .offs = 0 */ + goto setup; case 0xe8: /* call relative */ branch_clear_offset(auprobe, insn); @@ -753,6 +754,7 @@ static int branch_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn) return -ENOTSUPP; } +setup: auprobe->branch.opc1 = opc1; auprobe->branch.ilen = insn->length; auprobe->branch.offs = insn->immediate.value;