From nobody Mon Jul 04 20:43:45 2022 X-Original-To: dev-commits-src-main@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 C5DB61CFA210; Mon, 4 Jul 2022 20:43:45 +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 4LcHp958Ndz3PQs; Mon, 4 Jul 2022 20:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656967425; 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=fnPmetYpNUIP+pQj6IcT0BpniyEuVQHJXsQyL2lpQHE=; b=dcHC/4puC/526Cvu9yRrwfdd0HQhYV6VeTT2k64AW9FNV2J5vnFbX24ZhWYOLSo3OoY+X5 CTq2uU4A0FoHldWPKQkefo4oppZJhLc5KdebVIAfSgbWAtqSX+2mYY8ij9Z7L88mIBL7ff thUvpErnFYBvA7WebON4CdcH4uW8BAFVqyUafHKt6s9DCBQlgU2Uq9XXTL4aGLZWh8eUHQ aLlyzUSAleDObLzUurlaUCqNo28Q5fz81iC40pi4UC/lAOY7B7SBkS3Trif2K2OZWEeK3N uiOyB2Agc/cg73YmOzz2hO8DyupeKNQjCUHfI6Y1H/StsYDPOHNpEV4q3tJXpw== 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 91E97181F1; Mon, 4 Jul 2022 20:43:45 +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 264KhjWL080603; Mon, 4 Jul 2022 20:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264Khjtc080601; Mon, 4 Jul 2022 20:43:45 GMT (envelope-from git) Date: Mon, 4 Jul 2022 20:43:45 GMT Message-Id: <202207042043.264Khjtc080601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 42317e642645 - main - linux(4): Implement __vdso_time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42317e642645b36e711b5dd560d06a303a492e0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656967425; 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=fnPmetYpNUIP+pQj6IcT0BpniyEuVQHJXsQyL2lpQHE=; b=mH+Gd56PvXrL73arWuZCHDiqnYI8grbDGAPp33/FKtQXnX958ddBpQWMsEZAJTEuWzUklD tdWBH6gbt7l2Qkfr50Cs46w4c+UPvStU8+a5nujY89bgm1gFmqs9YxhRC3sWdiB91JQPzU rV5zd8GjIx598VazkiJ2flr/OrSyxRsjbFmGCiQ0Y6PZiGvbahg4n2QfmHXCUDMAOkJSQJ egta+FETharWp9zuJumj0nU6QqfEU11BOIUj21PCi+KwG9bLaAPwi5TAXMbKyoVqQD0Wnh RCNdBGBfDycL1cYMDMEMMx8iw3xn7pAPH2jbXq+tuWVOFUGsI9nwBKnBHCUfGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656967425; a=rsa-sha256; cv=none; b=awmHda09mVg38bQaRl0x8NV7vKFRRitYsZa3q2w9YNPLGdO5Mtb+7L3CBg1D3rgPU2usAz yVamwp7oPvd2GHciLSf0z3wDXfG7U87g5FjleWBjunf9HGVBGogGBkToFeoTdqd8yVaGUI E7oLZUcBp+yaCy8ZeTJha5GqKOING/0be/gctKWLqYRurgkmDG//MhF2sSEBx8m3c2eUA3 dmQZLtLgJ9SoyeoTzsc6geTld/GtqwyQsIrOkEBGFfzHZEsJG93NZh83i8qoIEfXJmxMis hvN8NbWktEg/r78WzVTuqN0rv9ll+srrxv+yUxQviZZaVBFi01T93geqCi6u1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=42317e642645b36e711b5dd560d06a303a492e0f commit 42317e642645b36e711b5dd560d06a303a492e0f Author: Dmitry Chagin AuthorDate: 2022-07-04 20:41:32 +0000 Commit: Dmitry Chagin CommitDate: 2022-07-04 20:41:32 +0000 linux(4): Implement __vdso_time PR: 240769 MFC after: 3 days --- sys/compat/linux/linux_vdso_gtod.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_vdso_gtod.inc b/sys/compat/linux/linux_vdso_gtod.inc index f101fe81f7f8..8a3840edd87d 100644 --- a/sys/compat/linux/linux_vdso_gtod.inc +++ b/sys/compat/linux/linux_vdso_gtod.inc @@ -372,7 +372,14 @@ __vdso_getcpu(uint32_t *cpu, uint32_t *node, void *cache) int __vdso_time(long *tm) { + struct timeval tv; + int error; - return (__vdso_time_fallback(tm)); + error = freebsd_gettimeofday(&tv, NULL); + if (error != 0) + return (__vdso_time_fallback(tm)); + if (tm != NULL) + *tm = tv.tv_sec; + return (tv.tv_sec); } #endif