From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 214F63B4E9A for ; Mon, 29 Jun 2026 06:56:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782716198; cv=none; b=jqpogcUA+xWx0u11Fhcb9FouIAsc5I3zi2YV3iU/PwkZgm6sIICRzyWNVQPJohRRPQGxU8gNYcrK7xsgakoZKo/zSP0erzMsmZoIR7xJUm5lzaJQ4N+gAuIiQ36SU+Yn8j9KeSdvjlETq/4IgN7nivAMy16MuJIVGvsszp5ls0w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782716198; c=relaxed/simple; bh=Z216N1hxIoDVxRknTOObr9G88dXIwAgQHbwhqi8HS4U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wy7ID7Edi5/4HQ8qkrHWRBmY6CMNhKh+Lw86Y7r++M7dry54ls6aLrpA8Nt0t7WMCbT0p30aN9Ifrc/hZrO7Uc6uweVxXg7phpa8GxNxqLhM8yZN8istld3yjQbdHaQJkpYNjRBUxszz5yj5JBIgExtPaCvi719yv1zBV5v9rqw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=QQTlvMN+; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=QQTlvMN+; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="QQTlvMN+"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="QQTlvMN+" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 20BD471266; Mon, 29 Jun 2026 06:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1782716193; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UI30Lv/5hKm+XbwsilEBT1bWehIL5w4ezCyReNwM2co=; b=QQTlvMN+mKjyEOuTTrdnFX5aFk71XllQYVrJNHJgpaD/iCLyE0r+tUdf12TseNhz9JVxQE sFuJQVLpuoBQCZKdNKOV5TnOelama5pMcdBK+SMaM2luMi4vhG4tQ4MrVOkojmOkGLSdZ5 0H/UWVom0xE8lMN6yxTjmnA3voAn2Q8= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1782716193; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UI30Lv/5hKm+XbwsilEBT1bWehIL5w4ezCyReNwM2co=; b=QQTlvMN+mKjyEOuTTrdnFX5aFk71XllQYVrJNHJgpaD/iCLyE0r+tUdf12TseNhz9JVxQE sFuJQVLpuoBQCZKdNKOV5TnOelama5pMcdBK+SMaM2luMi4vhG4tQ4MrVOkojmOkGLSdZ5 0H/UWVom0xE8lMN6yxTjmnA3voAn2Q8= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C05C7779A8; Mon, 29 Jun 2026 06:56:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id IQCILSAXQmrUQQAAD6G6ig (envelope-from ); Mon, 29 Jun 2026 06:56:32 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , "Xin Li (Intel)" Subject: [PATCH v4 08/18] x86/extable: Add support for immediate form MSR instructions Date: Mon, 29 Jun 2026 08:55:34 +0200 Message-ID: <20260629065544.3643253-9-jgross@suse.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260629065544.3643253-1-jgross@suse.com> References: <20260629065544.3643253-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Flag: NO X-Spam-Score: -6.80 X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLfdszjqhz8kzzb9uwpzdm8png)]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:email,suse.com:mid,zytor.com:email]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Level: Signed-off-by: Xin Li (Intel) Signed-off-by: Juergen Gross --- V2: - new patch, taken from the RFC v2 MSR refactor series by Xin Li V3: - use instruction decoder (Peter Zijlstra) V4: - don't assume %rax for immediate form (Andrew Cooper) --- arch/x86/mm/extable.c | 46 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index ceb8d03191ab..9974785c8968 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -166,25 +166,59 @@ static bool ex_handler_uaccess(const struct exception_table_entry *fixup, static bool ex_handler_msr(const struct exception_table_entry *fixup, struct pt_regs *regs, bool wrmsr, bool safe, int reg) { + unsigned long *regptr; + struct insn insn; + bool imm_insn; + u32 msr; + + imm_insn = insn_decode_kernel(&insn, (void *)regs->ip) && + insn.vex_prefix.nbytes; + msr = imm_insn ? insn.immediate.value : (u32)regs->cx; + regptr = imm_insn ? insn_get_modrm_reg_ptr(&insn, regs) : ®s->ax; + if (unlikely(!regptr)) { + pr_err("Inconsistent %sMSR access instruction data at rIP: 0x%lx (%pS)!\n", + wrmsr ? "WR" : "RD", regs->ip, (void *)regs->ip); + show_stack_regs(regs); + goto out; + } + if (__ONCE_LITE_IF(!safe && wrmsr)) { - pr_warn("unchecked MSR access error: WRMSR to 0x%x (tried to write 0x%08x%08x) at rIP: 0x%lx (%pS)\n", - (unsigned int)regs->cx, (unsigned int)regs->dx, - (unsigned int)regs->ax, regs->ip, (void *)regs->ip); + /* + * To maintain consistency with existing RDMSR and WRMSR(NS) instructions, + * the register operand for immediate form MSR instructions is ALWAYS + * encoded as RAX in for reading or writing the MSR value. + */ + u64 msr_val = *regptr; + + if (!imm_insn) { + /* + * On processors that support the Intel 64 architecture, the + * high-order 32 bits of each of RAX and RDX are ignored. + */ + msr_val &= 0xffffffff; + msr_val |= (u64)regs->dx << 32; + } + + pr_warn("unchecked MSR access error: WRMSR to 0x%x (tried to write 0x%016llx) at rIP: 0x%lx (%pS)\n", + msr, msr_val, regs->ip, (void *)regs->ip); show_stack_regs(regs); } if (__ONCE_LITE_IF(!safe && !wrmsr)) { pr_warn("unchecked MSR access error: RDMSR from 0x%x at rIP: 0x%lx (%pS)\n", - (unsigned int)regs->cx, regs->ip, (void *)regs->ip); + msr, regs->ip, (void *)regs->ip); show_stack_regs(regs); } if (!wrmsr) { /* Pretend that the read succeeded and returned 0. */ - regs->ax = 0; - regs->dx = 0; + *regptr = 0; + + if (!imm_insn) + regs->dx = 0; } + out: if (safe) *pt_regs_nr(regs, reg) = -EIO; -- 2.54.0