[tip:,x86/urgent] x86/vdso: Choose the right GDT_ENTRY_CPUNODE for 32-bit getcpu() on 64-bit kernel
| Message ID | 169148017876.27769.3198852854990349550.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2328759vqr;
Tue, 8 Aug 2023 11:55:33 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IHP0F7Z1VgIeDswIKdh1jVO3/wwNQo1vD6TjG6rTnZeO4MIxODs8JJTZQFAKN9TAgltV7gA
X-Received: by 2002:a17:903:41c8:b0:1b3:d6c8:7008 with SMTP id
u8-20020a17090341c800b001b3d6c87008mr531998ple.57.1691520933409;
Tue, 08 Aug 2023 11:55:33 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1691520933; cv=none;
d=google.com; s=arc-20160816;
b=KBHu7Aa/bv74HuzrU1CFGLYDcPRgVgI4DBbizOdZzAB1EzCQjGmQAm7VGK2aBtkALT
XZvHv8Qcf+nbeO1Tt/LK/xVa/ostF+FyyvH5aDzm5ir3J1RpYzqqor2CyihHaPwmEH57
84StJnG/RRIYK5HlyOEPLYaeLI3l+BSpr+S70s8FzoKcxcFJHnYjhlmVbHoS5vVXJ+ov
E2srV08yD7iqWIxab/QHzFZaPoQu9e7W7Kr24Cz+5SW3K1kavbrAOse1MP3Nz3bEK2dL
0UPQ1QeDGHhhhDbr8Ii9MuL58i+Dwd4pJAuf0bnreFtGf7c9+REp8VaTHqX27vp6fiD3
Uzfw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:robot-unsubscribe
:robot-id:message-id:mime-version:references:in-reply-to:cc:subject
:to:reply-to:sender:from:dkim-signature:dkim-signature:date;
bh=U7r8h0H0D8Ip7rjL8jbIAPWfrJNA1pNePARCqpWioHo=;
fh=md6dFe0iXirokScceVWwzlonmizJsOzjH7pdCCfEg/Q=;
b=rUn1YfT0n4TlZHCh+qxU9K7dnXI2qlOgWlyJ+qNWyGfr+VmjSVwH2qzgtsBlx6pvzU
OJWSU+mWDuSC7H2TVdSEyC3SSpRZABIOfr5LAJ7xA93qpOMsMsqcgdDD0ylIROA3TODW
YqeGVAwiYMv9pZR6uZzDCiQrb+rSMazkjX010RQ83zrh2XhVhCbEFCW3Bu8ruKNN/iKu
24A3W5oTbsQ5OYK7+MBl1U8aihaQ1dEALOxMmsQPUxTySnmqOqsiFYK+Vv0W6p0RknBe
oBw+CnZf6SGveVaGru9eGGXrlmEAZAbQ9/C8NkrtRHrnAzDwn0gEHWGXVI2dq4AnDVxL
6uwA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=EguxfNjn;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e
header.b=PpYstp+A;
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
t6-20020a1709027fc600b001bc8af2bc6bsi816364plb.170.2023.08.08.11.55.19;
Tue, 08 Aug 2023 11:55:33 -0700 (PDT)
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=EguxfNjn;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e
header.b=PpYstp+A;
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 S233436AbjHHQqP (ORCPT <rfc822;aaronkmseo@gmail.com> + 99 others);
Tue, 8 Aug 2023 12:46:15 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43342 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232505AbjHHQpS (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 8 Aug 2023 12:45:18 -0400
Received: from galois.linutronix.de (Galois.linutronix.de
[IPv6:2a0a:51c0:0:12e:550::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BAAEC1;
Tue, 8 Aug 2023 08:56:20 -0700 (PDT)
Date: Tue, 08 Aug 2023 07:36:18 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1691480179;
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=U7r8h0H0D8Ip7rjL8jbIAPWfrJNA1pNePARCqpWioHo=;
b=EguxfNjnjczzI0CxdMU/Hap8xpfHMrU4//46auIUQeti1iJt0F9cBumPY03Ql/S37i9VLA
pydrlIl8hQtJDFueZSBiUxxfLQmCfzXi7KIax1u476MyRblYvF5GNwPf2itcyz2PJn+Vo5
dBp0hqw0AR/o8I4iVInVJrClanmfw8gOwbJeu8r5kFoPQ6oUpC+poYMXmp5iI5JiVOXkcc
ZpRMG3bnDQYPlHw6XbhMVZ/egJzXV22JilkhbAFF228xbHeYP+lAMh1kQTovBTL2Fl0wp8
RDXK/8bw23k7vijSJvHq7Kt2JW5ELxgIos6UDglVLBgAG13h3GcyiXvqd4+MQw==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1691480179;
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=U7r8h0H0D8Ip7rjL8jbIAPWfrJNA1pNePARCqpWioHo=;
b=PpYstp+ASPKlfU8X8ecM6EpVrIQzPmGpktkVUxVROx+aYRjAZaTy1H44aJP8KYJxXqVw7m
JyUlXGF9FrxXDbAg==
From: "tip-bot2 for Xin Li" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: x86/urgent] x86/vdso: Choose the right GDT_ENTRY_CPUNODE for
32-bit getcpu() on 64-bit kernel
Cc: kernel test robot <yujie.liu@intel.com>,
Shan Kang <shan.kang@intel.com>, Xin Li <xin3.li@intel.com>,
Thomas Gleixner <tglx@linutronix.de>, x86@kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20230322061758.10639-1-xin3.li@intel.com>
References: <20230322061758.10639-1-xin3.li@intel.com>
MIME-Version: 1.0
Message-ID: <169148017876.27769.3198852854990349550.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from
these emails
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DATE_IN_PAST_06_12,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,
RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
autolearn=no 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1773688254628587877
X-GMAIL-MSGID: 1773688254628587877
|
| Series |
[tip:,x86/urgent] x86/vdso: Choose the right GDT_ENTRY_CPUNODE for 32-bit getcpu() on 64-bit kernel
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Aug. 8, 2023, 7:36 a.m. UTC
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 39163d5479285a36522b6e8f9cc568cc4987db08
Gitweb: https://git.kernel.org/tip/39163d5479285a36522b6e8f9cc568cc4987db08
Author: Xin Li <xin3.li@intel.com>
AuthorDate: Tue, 21 Mar 2023 23:17:58 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 08 Aug 2023 09:31:43 +02:00
x86/vdso: Choose the right GDT_ENTRY_CPUNODE for 32-bit getcpu() on 64-bit kernel
The vDSO getcpu() reads CPU ID from the GDT_ENTRY_CPUNODE entry when the RDPID
instruction is not available. And GDT_ENTRY_CPUNODE is defined as 28 on 32-bit
Linux kernel and 15 on 64-bit. But the 32-bit getcpu() on 64-bit Linux kernel
is compiled with 32-bit Linux kernel GDT_ENTRY_CPUNODE, i.e., 28, beyond the
64-bit Linux kernel GDT limit. Thus, it just fails _silently_.
When BUILD_VDSO32_64 is defined, choose the 64-bit Linux kernel GDT definitions
to compile the 32-bit getcpu().
Fixes: 877cff5296faa6e ("x86/vdso: Fake 32bit VDSO build on 64bit compile for vgetcpu")
Reported-by: kernel test robot <yujie.liu@intel.com>
Reported-by: Shan Kang <shan.kang@intel.com>
Signed-off-by: Xin Li <xin3.li@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230322061758.10639-1-xin3.li@intel.com
Link: https://lore.kernel.org/oe-lkp/202303020903.b01fd1de-yujie.liu@intel.com
---
arch/x86/include/asm/segment.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h index 794f696..9d6411c 100644 --- a/arch/x86/include/asm/segment.h +++ b/arch/x86/include/asm/segment.h @@ -56,7 +56,7 @@ #define GDT_ENTRY_INVALID_SEG 0 -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86_32) && !defined(BUILD_VDSO32_64) /* * The layout of the per-CPU GDT under Linux: *