From nobody Mon Feb 20 16:24:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PL76G1BRtz3t212; Mon, 20 Feb 2023 16:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PL76G0l7yz4CxL; Mon, 20 Feb 2023 16:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676910262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ho/p8JZDhghFicpoShR48r4LKbB2y85Hxbf0jcGxJVc=; b=XX8u5tilBCF1jzZIqxKwdY7J7f53DnrliwQxRvu1l+q/2VBIOREWHe2W8QBZY/4RwQz7AX Yp2uNK4npW29zP5Xw6GXbO+s5dkF10OycmNKa3VotcItubmcbh+KmlwB6Zpvda5698vsn1 WY+OL72xSlzzWEjCd4qpIstRzuMzNiPVPz/D4LFgFMLszrsUnMf6AR3Mon+nI2EbrJ+k4m 78ssT7F6ijErghYW/BLHM4K/Llyi19GRTXizsougG2+oWuNF8i95oQ0/zhisq+Fhdzov26 YHj2ON5fbNizCDTBuDyBKvbpvFHafyqpILNHzB1kYli3WK0oJsB/canX6Mwshg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676910262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ho/p8JZDhghFicpoShR48r4LKbB2y85Hxbf0jcGxJVc=; b=XtROzDhDIiwHyoQVsRn6whuSx2UyDgyYW8lhHFgtI7ua21wMKbVd96VUsme3uPI59IulUY 7WgppTyaj3XPHbsk7kRCEvKcEficmtMuLnQL23GS3wUoDAs5/QwaPQASXEfSXPoRORA0TR jSsF+oyJ5HedmXJPfmZnfXD3DjqR7g5f9Y7KDa+Z/Ga/Hm/aOX6wz4CW7XPkfZe4//nvq0 yitJfGZbvKG4fMZUyl5L8I9NkumfAk/uufzGpkDjbC5oMgE0K7yyu78skmzl2JMuUK5ObV 3/4RjN8J8z69c6UmhTQmG7nC9VxxzOAFRc+3j0/GbgFdQR9rgJ2rWzaSeFIVhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676910262; a=rsa-sha256; cv=none; b=rm184EnK3WvwWDZ9uR22Djwll2mkoK/EmrSxzunnxsLYc+c5VDiRk2NWqHXlRZjUelNpBC jZ+897F40JgdGLs/ocfYHRTTQWyK6UAotgrp/wPcTX4ePE2qyqN6CPEmF6hK2/QHWHrgXc pWFX+N5QibZPJZ6VLap1/dNjNsgImiSMopzSM+c13Mh8tDNR+XOjtk0PoPvk/wFudiN3vw T/GXZxUDZXpCdQ7gkDuK26k3AyBslGN0s15dYf9yzpj0Nd/OW0Pv55UgdysOTW7pHNJhuP YH001GziUcHRpFhgVpsm4PbQi++E9uzIRYU25R3EhLB/ChJgE/ggQYffLEz8AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PL76F6vw3znZR; Mon, 20 Feb 2023 16:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31KGOLpF064654; Mon, 20 Feb 2023 16:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KGOLCC064653; Mon, 20 Feb 2023 16:24:21 GMT (envelope-from git) Date: Mon, 20 Feb 2023 16:24:21 GMT Message-Id: <202302201624.31KGOLCC064653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: dadfe099255d - stable/13 - libc: Fall back to rdtsc when using pvclock and rdtscp is not available List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dadfe099255d38c96ce91a9b246294853aace3ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dadfe099255d38c96ce91a9b246294853aace3ea commit dadfe099255d38c96ce91a9b246294853aace3ea Author: Mark Johnston AuthorDate: 2023-02-03 15:53:20 +0000 Commit: Mark Johnston CommitDate: 2023-02-20 16:24:08 +0000 libc: Fall back to rdtsc when using pvclock and rdtscp is not available In preparation for a follow-up revision wherein kvmclock may export timekeeping info to userspace even in the absence of AMDID_RDTSCP, fall back to using rdtsc when rdtscp isn't available. This mimics pvclock_read_time_info() in the kernel. Reviewed by: kib Tested by: Shrikanth R Kamath MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D38341 (cherry picked from commit 26d105199ec89d6eaec8a9ca70e3b05ca65e3aac) --- lib/libc/x86/sys/__vdso_gettc.c | 42 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/lib/libc/x86/sys/__vdso_gettc.c b/lib/libc/x86/sys/__vdso_gettc.c index b3f3de9f4203..7159d46c0113 100644 --- a/lib/libc/x86/sys/__vdso_gettc.c +++ b/lib/libc/x86/sys/__vdso_gettc.c @@ -101,6 +101,13 @@ rdtsc32_mb_lfence(void) return (rdtsc32()); } +static uint64_t +rdtsc_mb_lfence(void) +{ + lfence(); + return (rdtsc()); +} + static u_int rdtsc32_mb_mfence(void) { @@ -108,38 +115,62 @@ rdtsc32_mb_mfence(void) return (rdtsc32()); } +static uint64_t +rdtsc_mb_mfence(void) +{ + mfence(); + return (rdtsc()); +} + static u_int rdtsc32_mb_none(void) { return (rdtsc32()); } +static uint64_t +rdtsc_mb_none(void) +{ + return (rdtsc()); +} + static u_int rdtscp32_(void) { return (rdtscp32()); } +static uint64_t +rdtscp_(void) +{ + return (rdtscp()); +} + struct tsc_selector_tag { u_int (*ts_rdtsc32)(void); + uint64_t (*ts_rdtsc)(void); u_int (*ts_rdtsc_low)(const struct vdso_timehands *); }; static const struct tsc_selector_tag tsc_selector[] = { [0] = { /* Intel, LFENCE */ .ts_rdtsc32 = rdtsc32_mb_lfence, + .ts_rdtsc = rdtsc_mb_lfence, .ts_rdtsc_low = rdtsc_low_mb_lfence, }, [1] = { /* AMD, MFENCE */ .ts_rdtsc32 = rdtsc32_mb_mfence, + .ts_rdtsc = rdtsc_mb_mfence, .ts_rdtsc_low = rdtsc_low_mb_mfence, }, [2] = { /* No SSE2 */ - .ts_rdtsc32 = rdtsc32_mb_none, - .ts_rdtsc_low = rdtsc_low_mb_none, + .ts_rdtsc32 = rdtsc32_mb_none, + .ts_rdtsc = rdtsc_mb_none, + .ts_rdtsc_low = rdtsc_low_mb_none, }, [3] = { /* RDTSCP */ .ts_rdtsc32 = rdtscp32_, + .ts_rdtsc = rdtscp_, .ts_rdtsc_low = rdtscp_low, }, }; @@ -193,6 +224,11 @@ DEFINE_UIFUNC(static, u_int, __vdso_gettc_rdtsc32, (void)) return (tsc_selector[tsc_selector_idx(cpu_feature)].ts_rdtsc32); } +DEFINE_UIFUNC(static, uint64_t, __vdso_gettc_rdtsc, (void)) +{ + return (tsc_selector[tsc_selector_idx(cpu_feature)].ts_rdtsc); +} + #define HPET_DEV_MAP_MAX 10 static volatile char *hpet_dev_map[HPET_DEV_MAP_MAX]; @@ -325,7 +361,7 @@ __vdso_pvclock_gettc(const struct vdso_timehands *th, u_int *tc) version = atomic_load_acq_32(&ti->version); stable = (ti->flags & th->th_x86_pvc_stable_mask) != 0; if (stable) { - tsc = rdtscp(); + tsc = __vdso_gettc_rdtsc(); } else { (void)rdtscp_aux(&cpuid_ti); ti = &pvclock_timeinfos[cpuid_ti];