From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3695087-1523236844-2-8036333465977762222 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523236843; b=LhDVJ+B97xzIZtLydyfpEpJFEfG+fs1yAVNhG/4AoydirLKuMh QIw4Rf53XoYfTJLmdSjF6y2IsUQSlfuamXlxL3Q4M9C49bBS5rIyKEGfidMWphSQ 2Sm1Vs13dXxhpkdzw5grVo4gkVs8ct+JN3mwLkBGCWgUJM0f+BDyBaHBJPAgOyo9 k2/xW2qef94c6av+Pksw3adrrIptdReZbZf3zhsY19Vs/QBhGSgIfjWvY4FVjvAz 6EhEtPv+XGGGHVkFI693u+ccAQIHGhU980JzPlwscE1xXAehhb+LTaEmWbGcFDNu JhO5T2hQXHMJ5x5qUDpSv797dvI7hcwomPuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=fm2; t=1523236843; bh=w6FXLNY9G/ Jo22NlqPfpK0LIemLxgD4DyXA25o2rT9w=; b=sRg8SNGzdAnbFsJaFV5xSKv8Xj S/mDfaEkO0wuOHB1p/epvOvO7EISnTcTjT24AhLYY0V6+g2mociF6MGUvPINY/qo nguUryvZDXSXEOmpDaeZtm9+KQnkfrgUSlm3aF0eA4ahwLPqVlPlPKVVICH46TLq GeHCGB37oLu+ugfp10vAQHYPE2E5Y6OSaFy8UwQCM1l4gFWiq6vebxfH7uIQnbpY sn2NsgtiaZs475leALEU/LPmM+DQa0HFsO20H5tUYW5FMvE8V6Kg7BoI0DJEkZS1 4hxGda42M1+IL+dx6OTxFFzO1yS6yCrhQDNdv8wFEvmUsGnffgNwUb8/1IAQ== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=WR2Og1o5 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=WR2Og1o5 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfG8jXNGe8hw/sl/yOvpuIoW53CeYssyqjV/BxAAXGOVatU3K9Et/umqMDZUlVjfxcZGWMh0CdQA2x3BlP5JEKtkMWS3edRotje7wlq8/qD6PVg7jhQfX +WneW/D3g8Erw4FmqBosXR0i0oEmodaTM8iNmcBpdMoj/vtFVQasGoGDhpWcDvJ0/VU/FLly2nGAvnWUui6yluBkMjhkEAe2U6+0eqATpyqxdSv1XqOw4ld4 X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=r_1tXGB3AAAA:8 a=WPyIoOwQAAAA:8 a=VwQbUJbxAAAA:8 a=yMhMjlubAAAA:8 a=YoNOeQkuWX5Yf542GRYA:9 a=wPNLvfGTeEIA:10 a=t8nPyN_e6usw4ciXM-Pk:22 a=S-HzPIwwDS8t1QcwSuWs:22 a=AjGcO6oz07-iQ99wixmX:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756994AbeDIBUd (ORCPT ); Sun, 8 Apr 2018 21:20:33 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:14488 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932766AbeDIAhM (ORCPT ); Sun, 8 Apr 2018 20:37:12 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Goran Ferenc , Miodrag Dinic , Aleksandar Markovic , Douglas Leung , James Hogan , Paul Burton , Petar Jovanovic , Raghu Gandham , "linux-mips@linux-mips.org" , Ralf Baechle , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 088/162] MIPS: VDSO: Add implementation of clock_gettime() fallback Thread-Topic: [PATCH AUTOSEL for 4.4 088/162] MIPS: VDSO: Add implementation of clock_gettime() fallback Thread-Index: AQHTz5m6JPnNOUhCHki+WclvGAYoFg== Date: Mon, 9 Apr 2018 00:28:48 +0000 Message-ID: <20180409002738.163941-88-alexander.levin@microsoft.com> References: <20180409002738.163941-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002738.163941-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1031;7:/Md7bapkHRBCtoeUyZzwzP75qns18LSyYmWjyv6iDB5k+bWJSnY5tF96lBjXVBo142T808YRYIZOREF156ij7q7W5DyMhtkP1YowKFAEFl9TxPyWY0a79Z3MRCEE+6/crl6DFSHBm31unDQWe/nwkFvqPGNvqCppRSOvi4neDkXPO9QyfL3GWlJmajiwfazgYpqHnmI33RWmxS5/OpyGO6VylqX7qy0aom5EjcTpXMjbTKs+aON6zsvLYLDGmboJ;20:csEaiZN7D30z9UPnXSjbTRGgfVBCPO9T0MmmigwpROvQNrMvZfd5tHC/XXE5/5QG9x+viGWtY9sk0CEh2OeEKFZ3pacMF8RA8DAqAS8CROk9U38W9xwJ1vI2yoVNHOSo1pXGY/fHTvekotxBtxwYPjWAPFRnXMdEIeTdxO0xeSs= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 6750a2c3-9414-4f21-c380-08d59db205dd x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB1031; x-ms-traffictypediagnostic: DM5PR2101MB1031: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB1031;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1031; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(376002)(366004)(39380400002)(346002)(39860400002)(189003)(199004)(2900100001)(10290500003)(99286004)(76176011)(14454004)(966005)(7736002)(11346002)(26005)(6666003)(86612001)(7416002)(72206003)(478600001)(36756003)(106356001)(66066001)(2616005)(186003)(22452003)(86362001)(68736007)(305945005)(54906003)(102836004)(486006)(110136005)(316002)(6506007)(446003)(107886003)(53936002)(4326008)(105586002)(6306002)(6436002)(6486002)(476003)(6512007)(5660300001)(5250100002)(25786009)(3846002)(6116002)(1076002)(97736004)(3280700002)(2501003)(2906002)(81156014)(8676002)(10090500001)(81166006)(8936002)(3660700001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1031;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: bsmsL3TK9gdI6bUotMnRsdZOCYYQJKS1xt68k6QSkraDwX2UDbBwKe586vRjhmKl/k0MhY7f+iiVszFGYZQJ8t9wpPN8C+Pj05EBYHOPjObBL8Zv0P2galX9Q2b3yq3OIboyYDyX+tk3hfZixY4TffnGI+DGDv1FgDyaieQT8+Wa/7D0q8tCbsTTvvgmlpX/NgEK0RQ+l2pLKg8NAVpQ/gCd20KKLiPCD+TdkwRxqYmAnt7Hmq3Ic9tzIxVb6EP47YI04/88nFlAC+dnJCNKux0aHYrpgzS+6wV+86KlH94gRJY6k8UW9rWOb9T0horTyMUqd3gkrT0zEkX6URGmQD7oeNiw+miG+cVd24jaVOJsSNmMH5F4ex8zOxpaeulayha6w9cGFgPoY1yOKVsXuWty/juDKII1ZJFfBimB5g4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6750a2c3-9414-4f21-c380-08d59db205dd X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:28:48.5209 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1031 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Goran Ferenc [ Upstream commit 180902e08f051f72c89ffa366f4e4f7a8e9c753e ] This patch adds clock_gettime_fallback() function that wraps assembly invocation of clock_gettime() syscall using __NR_clock_gettime. This function is used if pure VDSO implementation of clock_gettime() does not succeed for any reason. For example, it is called if the clkid parameter of clock_gettime() is not one of the clkids listed in the switch-case block of the function __vdso_clock_gettime() (one such case for clkid is CLOCK_BOOTIME). If syscall invocation via __NR_clock_gettime fails, register a3 will be set. So, after the syscall, register a3 is tested and the return value is negated if it's set. Signed-off-by: Goran Ferenc Signed-off-by: Miodrag Dinic Signed-off-by: Aleksandar Markovic Cc: Douglas Leung Cc: James Hogan Cc: Paul Burton Cc: Petar Jovanovic Cc: Raghu Gandham Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16639/ Signed-off-by: Ralf Baechle Signed-off-by: Sasha Levin --- arch/mips/vdso/gettimeofday.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/arch/mips/vdso/gettimeofday.c b/arch/mips/vdso/gettimeofday.c index fd7d433970bf..5f6337545ee2 100644 --- a/arch/mips/vdso/gettimeofday.c +++ b/arch/mips/vdso/gettimeofday.c @@ -20,6 +20,24 @@ #include #include =20 +static __always_inline long clock_gettime_fallback(clockid_t _clkid, + struct timespec *_ts) +{ + register struct timespec *ts asm("a1") =3D _ts; + register clockid_t clkid asm("a0") =3D _clkid; + register long ret asm("v0"); + register long nr asm("v0") =3D __NR_clock_gettime; + register long error asm("a3"); + + asm volatile( + " syscall\n" + : "=3Dr" (ret), "=3Dr" (error) + : "r" (clkid), "r" (ts), "r" (nr) + : "memory"); + + return error ? -ret : ret; +} + static __always_inline int do_realtime_coarse(struct timespec *ts, const union mips_vdso_data *data) { @@ -207,7 +225,7 @@ int __vdso_gettimeofday(struct timeval *tv, struct time= zone *tz) int __vdso_clock_gettime(clockid_t clkid, struct timespec *ts) { const union mips_vdso_data *data =3D get_vdso_data(); - int ret; + int ret =3D -1; =20 switch (clkid) { case CLOCK_REALTIME_COARSE: @@ -223,10 +241,11 @@ int __vdso_clock_gettime(clockid_t clkid, struct time= spec *ts) ret =3D do_monotonic(ts, data); break; default: - ret =3D -ENOSYS; break; } =20 - /* If we return -ENOSYS libc should fall back to a syscall. */ + if (ret) + ret =3D clock_gettime_fallback(clkid, ts); + return ret; } --=20 2.15.1