From patchwork Mon Feb 6 14:57:45 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: 53335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2280622wrn; Mon, 6 Feb 2023 07:01:00 -0800 (PST) X-Google-Smtp-Source: AK7set/tj2iXMLsxz3ntlyhImbGKJ5QoMF4rG0ETDgGcr4wX7w/vfJnkB75UTzCmRToGtTMowIR1 X-Received: by 2002:a17:906:358b:b0:88e:35:427f with SMTP id o11-20020a170906358b00b0088e0035427fmr18021915ejb.73.1675695660502; Mon, 06 Feb 2023 07:01:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675695660; cv=none; d=google.com; s=arc-20160816; b=vYJWFbueReaZuXzlsNDNX/7fmej3wA6spSrJlb1Mwk/C/VntxLaysmTvDTjp2LmCS3 isCjyjmTOFsvI7BNuV/4Z9SVaZG6sJ8bsaAjD0GlEtLDeQzW6GLZ7Q4Sc+iACL4IA8FQ XAhfvhf5GiLy0fX2Oy2OwhrAT35MyMt42JMXwEypdZR/zmhUDm6W1ffQ0UBB6sSNw4+J AbyM8dFh1zMdbaJ+scwTUNQCkLufZU5bl14BBsAuqZhPmvM5Mx3Z0Do1e/omSpSXe7PU mCPNe5jbz+gRn0+rEYUVu0Ha3HjwNUbbFZQd569lgMWppK5rSL70LEpE2TV+/bQlVJ6o eIHA== 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=u0cRwDFFeyyBCcpfxEvnKuN5Z21qRvhqvSRSuq4tsBg=; b=m6UZy/9ArHSGYol6V7OcvSWZ47Mq9v2UQjQZFFjRFy89kztmc6I7W6yJPH9nBO4eBF OcBXeUukcB+++sVybIHdfnu8+ss7MY6KepRhwr81sw6hQJS4nn3OhyfFgRQxh7N6eH3x tGUhMYsMLHCrWBnzvvlfttcEPVGRjE6Q64/92mPV3a918ZBV3hlH1nxV396S0njPJnLp UbgjZ0x/rrNf7yI0vFZfb1NkK2VUm1dZ0L4Q2F8068tidpR8DaxYg6bjCeRwShgCvXLV AwxtezRj362jLHum8yWMMp1dUcBiHbvRysk0YcpNiGM6PQGhiN2gRRCR0Zwh29ScSnbc LGmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=EjJFnkjq; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=A1NIFZCb; 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 uj41-20020a170907c9a900b0087b12541eb1si11509617ejc.74.2023.02.06.07.00.37; Mon, 06 Feb 2023 07:01:00 -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=@linutronix.de header.s=2020 header.b=EjJFnkjq; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=A1NIFZCb; 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 S230473AbjBFO5x (ORCPT + 99 others); Mon, 6 Feb 2023 09:57:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229781AbjBFO5t (ORCPT ); Mon, 6 Feb 2023 09:57:49 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F3B1173F; Mon, 6 Feb 2023 06:57:47 -0800 (PST) Date: Mon, 06 Feb 2023 14:57:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1675695466; 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=u0cRwDFFeyyBCcpfxEvnKuN5Z21qRvhqvSRSuq4tsBg=; b=EjJFnkjqsCCxCZnM626quE/i0qaaMnz7pMAiEI9x/ImElucEJoxTGRD0cllVJxcQzluESU /byi0Dvzi3b3e004/RZX31J6yCNRvmrrWAY2/99C8JVM2/+OkqHdRbl1bO0HTDt0hyWgUd veSSMzJfQ3ExHG7rlQksGldxmDBHFOpEN6Z3ewCGp0CzCPYl1M2F6GWA2J3ROAMTY1tWwj btsU21FaRfn+2w8U9HMdmwA850GfCxHICOsrDUc0A1nWueGKIZEJ2C9s6OP6NaICBS/GdG qMTGrdnxbMgEH+y78kYN17z6GHXdcmaBDtqfyJc5U/kg20wsTcldLA5NdH4Fbg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1675695466; 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=u0cRwDFFeyyBCcpfxEvnKuN5Z21qRvhqvSRSuq4tsBg=; b=A1NIFZCbz+D6Y6JJWfVzZHH967C50Ic2BcjMb2N96WWxdGkHjyAmdzXp1snVNgHkFEytwd B6g+FiwjT7jwd4CA== From: "tip-bot2 for Sebastian Andrzej Siewior" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/vdso] x86/vdso: Provide getcpu for x86-32. Cc: Sebastian Andrzej Siewior , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221125094216.3663444-3-bigeasy@linutronix.de> References: <20221125094216.3663444-3-bigeasy@linutronix.de> MIME-Version: 1.0 Message-ID: <167569546559.4906.16477266241418977603.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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?1750460832871547519?= X-GMAIL-MSGID: =?utf-8?q?1757094252418280842?= The following commit has been merged into the x86/vdso branch of tip: Commit-ID: 92d33063c081a82d25dd08a9cce03947c8ed9164 Gitweb: https://git.kernel.org/tip/92d33063c081a82d25dd08a9cce03947c8ed9164 Author: Sebastian Andrzej Siewior AuthorDate: Fri, 25 Nov 2022 10:42:15 +01:00 Committer: Thomas Gleixner CommitterDate: Mon, 06 Feb 2023 15:48:54 +01:00 x86/vdso: Provide getcpu for x86-32. Wire up __vdso_getcpu() for x86-32. The 64bit version is reused with trivial modifications. Contrary to vclock_gettime.c there is no requirement to fake any defines in the case of 32bit VDSO on a 64bit kernel because the GDT entry from which the CPU and node information is read is always the native one. Adopt vdso_getcpu.c by: - removing the unneeded time* header files which lead to compile errors for 32bit. - adding segment.h which provides vdso_read_cpunode() and the defines required by it. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20221125094216.3663444-3-bigeasy@linutronix.de --- arch/x86/entry/vdso/Makefile | 3 ++- arch/x86/entry/vdso/vdso32/vdso32.lds.S | 1 + arch/x86/entry/vdso/vdso32/vgetcpu.c | 2 ++ arch/x86/entry/vdso/vgetcpu.c | 3 +-- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 arch/x86/entry/vdso/vdso32/vgetcpu.c diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 838613a..1506a22 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -29,7 +29,7 @@ VDSO32-$(CONFIG_IA32_EMULATION) := y # files to link into the vdso vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vobjs32-y := vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o -vobjs32-y += vdso32/vclock_gettime.o +vobjs32-y += vdso32/vclock_gettime.o vdso32/vgetcpu.o vobjs-$(CONFIG_X86_SGX) += vsgx.o # files to link into kernel @@ -104,6 +104,7 @@ $(vobjs): KBUILD_AFLAGS += -DBUILD_VDSO CFLAGS_REMOVE_vclock_gettime.o = -pg CFLAGS_REMOVE_vdso32/vclock_gettime.o = -pg CFLAGS_REMOVE_vgetcpu.o = -pg +CFLAGS_REMOVE_vdso32/vgetcpu.o = -pg CFLAGS_REMOVE_vsgx.o = -pg # diff --git a/arch/x86/entry/vdso/vdso32/vdso32.lds.S b/arch/x86/entry/vdso/vdso32/vdso32.lds.S index c772099..8a3be07 100644 --- a/arch/x86/entry/vdso/vdso32/vdso32.lds.S +++ b/arch/x86/entry/vdso/vdso32/vdso32.lds.S @@ -28,6 +28,7 @@ VERSION __vdso_time; __vdso_clock_getres; __vdso_clock_gettime64; + __vdso_getcpu; }; LINUX_2.5 { diff --git a/arch/x86/entry/vdso/vdso32/vgetcpu.c b/arch/x86/entry/vdso/vdso32/vgetcpu.c new file mode 100644 index 0000000..b777f84 --- /dev/null +++ b/arch/x86/entry/vdso/vdso32/vgetcpu.c @@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "../vgetcpu.c" diff --git a/arch/x86/entry/vdso/vgetcpu.c b/arch/x86/entry/vdso/vgetcpu.c index b88a82b..0a9007c 100644 --- a/arch/x86/entry/vdso/vgetcpu.c +++ b/arch/x86/entry/vdso/vgetcpu.c @@ -7,8 +7,7 @@ #include #include -#include -#include +#include notrace long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)