From owner-svn-src-head@freebsd.org  Mon Sep  7 20:05:19 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 09BF63D5261;
 Mon,  7 Sep 2020 20:05:19 +0000 (UTC)
 (envelope-from bdragon@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 "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BlfQk6VGvz4fhH;
 Mon,  7 Sep 2020 20:05:18 +0000 (UTC)
 (envelope-from bdragon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C25F824BAC;
 Mon,  7 Sep 2020 20:05:18 +0000 (UTC)
 (envelope-from bdragon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 087K5ICb047507;
 Mon, 7 Sep 2020 20:05:18 GMT (envelope-from bdragon@FreeBSD.org)
Received: (from bdragon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 087K5Iic047506;
 Mon, 7 Sep 2020 20:05:18 GMT (envelope-from bdragon@FreeBSD.org)
Message-Id: <202009072005.087K5Iic047506@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdragon set sender to
 bdragon@FreeBSD.org using -f
From: Brandon Bergren <bdragon@FreeBSD.org>
Date: Mon, 7 Sep 2020 20:05:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r365428 - head/sys/sys
X-SVN-Group: head
X-SVN-Commit-Author: bdragon
X-SVN-Commit-Paths: head/sys/sys
X-SVN-Commit-Revision: 365428
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Sep 2020 20:05:19 -0000

Author: bdragon
Date: Mon Sep  7 20:05:18 2020
New Revision: 365428
URL: https://svnweb.freebsd.org/changeset/base/365428

Log:
  Fix vdso compat32 timekeeping on !=x86.
  
  Since x86 is the only 32-bit arch that has a 32-bit time_t, adjust the
  private bintime32 struct in vdso to only use a 32 bit sec on amd64.
  
  This matches the existing behavior in the compat code.
  
  Noticed while implementing vdso timekeeping on powerpc.
  
  This should also theoretically fix vdso timekeeping for arm binaries on
  aarch64.
  
  See tools attached to https://reviews.freebsd.org/D26347 for testing.
  
  Reviewed by:	kib (in irc)
  Sponsored by:	Tag1 Consulting, Inc.

Modified:
  head/sys/sys/vdso.h

Modified: head/sys/sys/vdso.h
==============================================================================
--- head/sys/sys/vdso.h	Mon Sep  7 19:35:30 2020	(r365427)
+++ head/sys/sys/vdso.h	Mon Sep  7 20:05:18 2020	(r365428)
@@ -102,8 +102,16 @@ struct vdso_sv_tk *alloc_sv_tk(void);
 #define	VDSO_TH_NUM	4
 
 #ifdef COMPAT_FREEBSD32
+
+/*
+ * i386 is the only arch with a 32 bit time_t.
+ */
 struct bintime32 {
+#if defined(__amd64__)
 	uint32_t	sec;
+#else
+	uint64_t	sec;
+#endif
 	uint32_t	frac[2];
 };