From patchwork Mon Feb 20 15:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 59543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1378648wrn; Mon, 20 Feb 2023 07:53:22 -0800 (PST) X-Google-Smtp-Source: AK7set/8WHRH63MqPDCsvDG57AdrDgI+JFjy71NkHuMIXQC4gGV7Ver1lKIeLLoNF15lrB+jQX/z X-Received: by 2002:aa7:dbd7:0:b0:4ab:ed5:dd46 with SMTP id v23-20020aa7dbd7000000b004ab0ed5dd46mr198088edt.6.1676908402602; Mon, 20 Feb 2023 07:53:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676908402; cv=none; d=google.com; s=arc-20160816; b=y/cPhccH2+5fSZPVCArZ+B6f/4+Mow3xEdq+tsrA1pd9cnl4QOmZ1vXVrzi2uPk6iZ IjdVZL1pMjIdJQodX+xsuCdtihL0VA9JeEIgNIHYoFKwnnvGiSCC3ko//O2b82Bnw8G6 FvUbFiV319ydBXCMZU6kfc7sbsEvIio+BbeA1hdZApTAJql7lp/M/Qd3OilxPfcA4hri UN13w+4UwsXW3NtxnM/bk/efJukOW6hUFryV09nlDIG2plI/jKTxsmqEpX8/y5LiGLJ8 mxLOHeKfVS2/nflxfHMK8RAo+4Esh7fkpJ3cb2ELRKiOvMO/zP5dO+X7A85j38e8gN4u ihXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=/s67nkNVHqTuf5UpgBU18NmigToUYZLEH7nb9lZ35j4=; b=OD7Pl5PKXg/GP+TJ4Uy2hWcsSS7BC1j0IBdNVI38Hb22FLrh6ql6foYlXkykU2lBLw MwTlrkafuzNYLFRunbxpwn/pcbziHJwEQ9ILB61Z8Xhve4Gas5EdyO40Etr8MMdUCZKr SyNE6y/AfViap7Lr+R8cIxPjub6xhC4nJgupQ2dyHTpGiCUsSJXQ5B83uBqIFvsVPCJr ia2bzVz6nUuW0vGDK3YeV3eJQabD3eIqD1s0dzQe5S4YyyNuw2d527uI/ezlNfYOqC3d C5/sUpnmx+AfmN54W8PA4iYBj7sp7VyiwE2qqNmpFSB//RN45TB/0bjqXDCSM30/WoD0 MiIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=fiUUHc+Y; 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=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b17-20020aa7cd11000000b004acdca43498si838852edw.564.2023.02.20.07.52.59; Mon, 20 Feb 2023 07:53:22 -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=@alien8.de header.s=dkim header.b=fiUUHc+Y; 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=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231802AbjBTPYx (ORCPT + 99 others); Mon, 20 Feb 2023 10:24:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232403AbjBTPYs (ORCPT ); Mon, 20 Feb 2023 10:24:48 -0500 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BC007A9B for ; Mon, 20 Feb 2023 07:24:17 -0800 (PST) Received: from zn.tnic (p5de8e9fe.dip0.t-ipconnect.de [93.232.233.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 399C91EC04CC; Mon, 20 Feb 2023 16:23:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1676906629; 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:in-reply-to:references; bh=/s67nkNVHqTuf5UpgBU18NmigToUYZLEH7nb9lZ35j4=; b=fiUUHc+YBo6z5tr3C98eBRYmDjEY+0LQ1DekTNttlp+IfJQLkQnMA+yVfHe3U3ZFyQV2mW TwSrsnl7cn9+mk10MdMyFcyNbnrlVLsDPMGAUXBCr2ed8jsVQ1HBbzhBdxkF4tAOmlGFzX aOeoDSAmo4wKZkr9TeV9l6ZNDLAIkFk= Date: Mon, 20 Feb 2023 16:23:45 +0100 From: Borislav Petkov To: Linus Torvalds Cc: x86-ml , lkml Subject: [GIT PULL] x86/alternatives for v6.3-rc1 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1758365904864626167?= X-GMAIL-MSGID: =?utf-8?q?1758365904864626167?= Hi Linus, please pull some x86 alternatives improvements for 6.3. Thx. --- The following changes since commit 1b929c02afd37871d5afb9d498426f83432e71c2: Linux 6.2-rc1 (2022-12-25 13:41:39 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_alternatives_for_v6.3_rc1 for you to fetch changes up to 923510c88d2b7d947c4217835fd9ca6bd65cc56c: x86/static_call: Add support for Jcc tail-calls (2023-01-31 15:05:31 +0100) ---------------------------------------------------------------- - Teach the static_call patching infrastructure to handle conditional tall calls properly which can be static calls too - Add proper struct alt_instr.flags which controls different aspects of insn patching behavior ---------------------------------------------------------------- Borislav Petkov (AMD) (1): x86/alternatives: Add alt_instr.flags Peter Zijlstra (3): x86/alternatives: Introduce int3_emulate_jcc() x86/alternatives: Teach text_poke_bp() to patch Jcc.d32 instructions x86/static_call: Add support for Jcc tail-calls arch/x86/include/asm/alternative.h | 132 +++++++++++++++----------- arch/x86/include/asm/text-patching.h | 31 ++++++ arch/x86/kernel/alternative.c | 76 ++++++++++----- arch/x86/kernel/kprobes/core.c | 38 ++------ arch/x86/kernel/static_call.c | 50 +++++++++- tools/objtool/arch/x86/include/arch/special.h | 6 +- 6 files changed, 218 insertions(+), 115 deletions(-)