From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3836577-1523239668-3-14454446539350418668 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= 1523239667; b=BK/CtBLXWEBt6HQOXUFbGzLWmgpYhwOFphRDo+DUjRxa3kWvvS DAStXOVOYf4xtPp0NPNV9Df0TZAAan8dhcGHDJk78mk8asGIvLQJWW8n2a6EwkJo NYodvRAbd3f0M4w7Kv6ZsKEdJszSonJ6PL8fd0P/OzzKtJfBXr7yWze5TCNUcoW1 7EPm5WZXN4d4OyPrhKc7wfry/jXqJ8KDzMasuPIscVkwYTSsmE9yhMOeThoi2tHW piY2zc/rZNwSbBX9oBqxefTOiT/LjU4xfNmCi0jAAAiSEXxmqflDfWfG46fkndND Zs6JPx1mL6nbRhpkfb4kDKgqK38t5di2tyCQ== 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=1523239667; bh=w6FXLNY9G/ Jo22NlqPfpK0LIemLxgD4DyXA25o2rT9w=; b=b6rP/2WhrRiuOxiXdzVNWL3Poh 9vLoH5cOgeoVken4zD8m5+Xx40+7MrwnnmhcjUxrh+VccEcr4khJfgo+tM/H3XDb n25V50Tj8vGYuR7G/TprOp1g7hjaY9XLlBB2PamvdqkmDhqoEE94NqBEtu+mxg2y oy7vpk+YybpSU17ONCBe/A3KiTTrHn530vcj2SFs4P/QAF0k3zNMw9NrhhcFXURx cAofsCxcnLeDUmzZKBm4GDsj92emVFcXGLHfqJKKbFjjurZklCdaVEuxAhKurnCo /h0v27psoBXwwoQv7RA7GEwFyDRPbNvNYI3TKpz+pPXnPyfKVNyJNKP0QSjA== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=c6n/ZWvg 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: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=c6n/ZWvg 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: MS4wfEhF9KnYOZsYWNgBkhO9avAoe0zBvavN4r0jmX94jLbWnAmx7t2qAhS7J7Z38yMnGEcWB6h3llEtwenILXDkmBu5VzJQLAAxAznnIo81PeIT8BCfClfC 4OH4JF3uJ+BPg37pVehxMlBpW1P54Z8a6QFUbyxGnwKltDCoAsVDyr4gnt74DXspdgSvkX2/70g6/cuvzsD/Y0xi+ACZvP5FMpSZtO0oEZ992IxeDRD9BqKj X-CM-Analysis: v=2.3 cv=Tq3Iegfh 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 S1756253AbeDICHN (ORCPT ); Sun, 8 Apr 2018 22:07:13 -0400 Received: from mail-cys01nam02on0107.outbound.protection.outlook.com ([104.47.37.107]:40886 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756256AbeDIAbX (ORCPT ); Sun, 8 Apr 2018 20:31:23 -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.9 174/293] MIPS: VDSO: Add implementation of clock_gettime() fallback Thread-Topic: [PATCH AUTOSEL for 4.9 174/293] MIPS: VDSO: Add implementation of clock_gettime() fallback Thread-Index: AQHTz5k4pM0dugySr0yQpi2cLA+z1w== Date: Mon, 9 Apr 2018 00:25:10 +0000 Message-ID: <20180409002239.163177-174-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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;DM5PR2101MB1126;7:nux26CNS+9/aaUEgKoodO1LBHxH2YV2nWaZi2kUQBOjtJa8AzGfByC3sYOmuUh5PdYMdBREYKpsgs9C2m/dcH11hbJ/50r+kCmw8DApNQR+47H7qN47Xu2cJIKE9J3QKti8mOzbQrcTsR9YK3n3Lr7q2jNi7dhfjrlHcoPY8JiRUyTvwd+tt8k2I0X1lb5aISNwZck/mF2A/4yR9PdwQzwPzh1mh8qaSyf9kP3Cnq59GsGrPd+FqDrVZDYfFeF16;20:Bo4tM+rJH30kqgG04sn8PEufz3mRFENVTrWVEGJsrVaAm9D2ciY9MbNNOQlpxI7v6vI4UPh1mJBcIcHb0c0CabmX0r+TSCbQIjBGLH0XkBJFD+1n4wk+nGM1CUHjPMcbGWb+S0nh6vS03jTpljTS1csKy+ZJrxfCXWSO17m970U= X-MS-Office365-Filtering-Correlation-Id: 66f7c7b9-832f-48e7-cbd9-08d59db13724 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020);SRVR:DM5PR2101MB1126; x-ms-traffictypediagnostic: DM5PR2101MB1126: 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)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1126;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1126; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(39380400002)(396003)(39860400002)(346002)(376002)(189003)(199004)(2616005)(476003)(81156014)(8676002)(81166006)(3846002)(486006)(2900100001)(6436002)(186003)(478600001)(72206003)(110136005)(54906003)(6306002)(2906002)(86612001)(6666003)(2501003)(26005)(10090500001)(102836004)(6512007)(6116002)(14454004)(966005)(5250100002)(10290500003)(1076002)(446003)(3280700002)(3660700001)(11346002)(8936002)(25786009)(6506007)(106356001)(4326008)(107886003)(36756003)(105586002)(7416002)(53936002)(86362001)(66066001)(6486002)(99286004)(5660300001)(316002)(22452003)(305945005)(76176011)(97736004)(68736007)(7736002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1126;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: eXBkZxpTa/bVuGDtBYLxKr0/WSeKa1dam/MfXtsnV4GOKHW60pJUh/UgpzHRR/vg2swDb5+RmiAloQQdA8O9VeCDsbkjeJU+JzpptZ1lqEf7ey1R1CmYOuTrS14iHdlZzbkSxM2yo7KfM5lGSFdnOW/UXqufzh6FfLFkW0B8EpKs670ZVc1hMnF3UMZkMp95lU04T6P2OskI4MBn842+w6iDl5uUyk2Sf/BEUnj+msCIhBk5SqigDar2HqM/n6whrW16aN29+zV/dz4CW2NUQRGRXHW6tR8AXCqEgp1d8+VMGsumUGgXBLTGR/jlZXtZpEZRWGv69PxThId8RgZU+/Sh61AiUo7pj5zhOicSI/BTsORW2qADL10rH10nzz6Q6JJBgOHQ2vaefTeYqkdrqU+XKJTSCXDnUYo2WMUJwqY= 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: 66f7c7b9-832f-48e7-cbd9-08d59db13724 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:25:10.9407 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1126 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