From patchwork Sat Dec 30 11:31:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 183993 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp3038029dyb; Sat, 30 Dec 2023 03:31:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IEwMLEEnoMdQiEnFFgGlOkxwPN1RlOoI+maMQKURKOXesqR17UP4+GvBIlVW5jviJvZiK1y X-Received: by 2002:a17:902:d38c:b0:1d0:6ffe:a22 with SMTP id e12-20020a170902d38c00b001d06ffe0a22mr13952966pld.128.1703935901332; Sat, 30 Dec 2023 03:31:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703935901; cv=none; d=google.com; s=arc-20160816; b=ZQZxjvnP9NxPqGu2clvKL4lxzt5fETs9J25f7IU+S5GeLkRDtPKRpaMfanrVz1jMJT dbFbsDExyNh75qBhv/BOkEHCSQdraNSrlEWJzmuhXUaW/N/lR1p+PpsnFVZqf6SJJgMy GZGbvsSGAsFctKOn5W7rn/CpuW9M5L+muE9ZxNKoQhs2cOHSXOM+NhY4gW2ekMK1Kh0e tZP4Tu+m545+Jl+3/6EDNzn0EsN1hTqvyZpNRVXoH3yPvkvksSoFAFZjdJoIpiiWomtn 3Re0no7ZthI9mO6pkroTQSFS9lkeR2WMKMqQrKrIIrjRi2X+SDybsi7fHHqL6wR3g1Ea hlbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=5YekaI+XSXzVudCa+DmlL/evq5KrMF9TXWnC3KY0bLQ=; fh=rR8KC3MdVVkWqW1DLWNOtxrtJ4e446FIKUSpWnemrcA=; b=F8I2IAdEOiSLDz4n18MM+z5ieQ9B40M3F0BDNOM6jQTcBlUqNt1A2KD2tsxx3NNKx8 MzgEnMP9B7AklJUiwvQ1B4P2xwYBC1Y9bc6buqzPOz+XInMWbUiDbK5iVk2jjJ7SHG7c mOoXTHWGy98itTtNmHEvu+COYkSkLcxQjXd++lxIgLzI+l9bS0Bl1WEg0YdxW69Fulsz 9SKQcV/PFh/h6fqsmVMXV3yj4XySdR9j7mJvBbIaADfZlfZJLkLsHrNLR7eN0TLVB9hT yqcFtqlM5ZE+7Qa7CxNtp2qzZL9DDCb/BwuKpI8vSStOellel0Y0lQs7M+fXOCguHxr3 xEfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3ECxP8U6; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel+bounces-13401-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13401-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id k1-20020a17090a9d8100b0028c89449750si6379067pjp.67.2023.12.30.03.31.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Dec 2023 03:31:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13401-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3ECxP8U6; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel+bounces-13401-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13401-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2267F2821E6 for ; Sat, 30 Dec 2023 11:31:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 912108821; Sat, 30 Dec 2023 11:31:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="3ECxP8U6"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="aBHPInxp" X-Original-To: linux-kernel@vger.kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 0441A7487; Sat, 30 Dec 2023 11:31:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Sat, 30 Dec 2023 11:31:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1703935883; 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=5YekaI+XSXzVudCa+DmlL/evq5KrMF9TXWnC3KY0bLQ=; b=3ECxP8U6giePTZVmturwNcYulTP+uV0UjbT0pGvUNxHoaYaCLZP1/mdIp5SpJoNm6A73rc eLNrZbwLRhX0h0bTzH0RPNHQNqL7G+nSiV46RynPrXxhn8Z2F8EjLfPKEO2djjaaNDgoCs GAGwZdZtLBf2tLPW/SzU4oPTIp52dmtLML62Qt6LzVzU0VJ56TRFLA2OPvKs4LjPDkEKA2 9pTHD579KvPQKY/3BBR3OIxonxKoGYmad7mVQeELOkKfbubVrJJPbr/iYp6wAvAkaNCXpG obLg+sql0CSY8+D3fuBVBiK+agRDWwDFEsz3xCAKfFZh26HV/N2ShCLi2MHwxw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1703935883; 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=5YekaI+XSXzVudCa+DmlL/evq5KrMF9TXWnC3KY0bLQ=; b=aBHPInxpfgK/+hOHdOxeLwNb+dNyKN6/xkja7EtxbnXaqwrRzqxlfRe4ymHzol/jYbXuRm tgt3OJyEIJLc1QCQ== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/paravirt] x86/alternative: Correct feature bit debug output Cc: "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231206110636.GBZXBVvCWj2IDjVk4c@fat_crate.local> References: <20231206110636.GBZXBVvCWj2IDjVk4c@fat_crate.local> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170393588213.398.4263924144760280684.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786706291842629449 X-GMAIL-MSGID: 1786706291842629449 The following commit has been merged into the x86/paravirt branch of tip: Commit-ID: 7991ed43587d1106315208cc289c851d6915d4a3 Gitweb: https://git.kernel.org/tip/7991ed43587d1106315208cc289c851d6915d4a3 Author: Borislav Petkov (AMD) AuthorDate: Sat, 30 Dec 2023 12:20:04 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Sat, 30 Dec 2023 12:25:55 +01:00 x86/alternative: Correct feature bit debug output In https://lore.kernel.org/r/20231206110636.GBZXBVvCWj2IDjVk4c@fat_crate.local I wanted to adjust the alternative patching debug output to the new changes introduced by da0fe6e68e10 ("x86/alternative: Add indirect call patching") but removed the '*' which denotes the ->x86_capability word. The correct output should be, for example: [ 0.230071] SMP alternatives: feat: 11*32+15, old: (entry_SYSCALL_64_after_hwframe+0x5a/0x77 (ffffffff81c000c2) len: 16), repl: (ffffffff89ae896a, len: 5) flags: 0x0 while the incorrect one says "... 1132+15" currently. Add back the '*'. Fixes: da0fe6e68e10 ("x86/alternative: Add indirect call patching") Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20231206110636.GBZXBVvCWj2IDjVk4c@fat_crate.local --- arch/x86/kernel/alternative.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index f26983a..f7ea108 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -498,7 +498,7 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, continue; } - DPRINTK(ALT, "feat: %d32+%d, old: (%pS (%px) len: %d), repl: (%px, len: %d) flags: 0x%x", + DPRINTK(ALT, "feat: %d*32+%d, old: (%pS (%px) len: %d), repl: (%px, len: %d) flags: 0x%x", a->cpuid >> 5, a->cpuid & 0x1f, instr, instr, a->instrlen,