From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6B61730F529; Mon, 13 Oct 2025 15:20:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368829; cv=none; b=SDTEDZced8d5+ahYIPZoZpet1OM1d0GFGUDKWCL+0h6qh5oICg1PoiUKOLXYGdoE3xF9QFKYhrorL4TKAbT+72WOSurJSmBNgeXtkGZvJkaci1230UaPTvL6EEpuEG+Lln5yPrNgqwfCCJQCk3mVpLHubXERLutpaqaTn+fl67I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368829; c=relaxed/simple; bh=U5Sa7W3wntIUXwBEIvxwAI9pVrePJioZoT4ci+wcrFs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dHwZlVLs6LdVb4POSadtKiJOEgjv+F00VYK8WRnyv7Rpun7wkqsfAurRhgnUS45f55WtujVpw2vEUUb+Fuw3lzViQ5991txR+EAqeRAhf7Xo0zzydpqexJgMNbrB0K5TdPv2iq/8SuCpilvk8gvMQ2dBy2giqgqjlJOydAXXOe8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=y3lC8d1n; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="y3lC8d1n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76929C116C6; Mon, 13 Oct 2025 15:20:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760368828; bh=U5Sa7W3wntIUXwBEIvxwAI9pVrePJioZoT4ci+wcrFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y3lC8d1n+t3b6C8qVSJxTpqnUDwekrJf1ybXcJfCkTuaN0hYmJ1DfZfQhslfry/Xh PCHxC9fNVfFY0YZtyM2XAtgCPX0y8wIqCs35T4b6C2BEdkJmtnei2YFm9i5QU/dhd4 qGlGtn6109URbdE7zjmjCQKzYfTnwVub3qJTb3MY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Uros Bizjak , "Borislav Petkov (AMD)" , Sasha Levin Subject: [PATCH 6.17 034/563] x86/vdso: Fix output operand size of RDPID Date: Mon, 13 Oct 2025 16:38:15 +0200 Message-ID: <20251013144412.525502981@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013144411.274874080@linuxfoundation.org> References: <20251013144411.274874080@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Uros Bizjak [ Upstream commit ac9c408ed19d535289ca59200dd6a44a6a2d6036 ] RDPID instruction outputs to a word-sized register (64-bit on x86_64 and 32-bit on x86_32). Use an unsigned long variable to store the correct size. LSL outputs to 32-bit register, use %k operand prefix to always print the 32-bit name of the register. Use RDPID insn mnemonic while at it as the minimum binutils version of 2.30 supports it. [ bp: Merge two patches touching the same function into a single one. ] Fixes: ffebbaedc861 ("x86/vdso: Introduce helper functions for CPU and node number") Signed-off-by: Uros Bizjak Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/20250616095315.230620-1-ubizjak@gmail.com Signed-off-by: Sasha Levin --- arch/x86/include/asm/segment.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h index 77d8f49b92bdd..f59ae7186940a 100644 --- a/arch/x86/include/asm/segment.h +++ b/arch/x86/include/asm/segment.h @@ -244,7 +244,7 @@ static inline unsigned long vdso_encode_cpunode(int cpu, unsigned long node) static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node) { - unsigned int p; + unsigned long p; /* * Load CPU and node number from the GDT. LSL is faster than RDTSCP @@ -254,10 +254,10 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node) * * If RDPID is available, use it. */ - alternative_io ("lsl %[seg],%[p]", - ".byte 0xf3,0x0f,0xc7,0xf8", /* RDPID %eax/rax */ + alternative_io ("lsl %[seg],%k[p]", + "rdpid %[p]", X86_FEATURE_RDPID, - [p] "=a" (p), [seg] "r" (__CPUNODE_SEG)); + [p] "=r" (p), [seg] "r" (__CPUNODE_SEG)); if (cpu) *cpu = (p & VDSO_CPUNODE_MASK); -- 2.51.0