From patchwork Wed Jul 11 12:29:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 141731 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp229069ljj; Wed, 11 Jul 2018 05:30:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdCyZ3H7TU2N8Ttkoc5k7r+ZTl8z3F/4SxPiFcrBHo/l70pr5/9WKcfoL5rDwSeSXLzttN0 X-Received: by 2002:a65:5348:: with SMTP id w8-v6mr22254906pgr.247.1531312233848; Wed, 11 Jul 2018 05:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531312233; cv=none; d=google.com; s=arc-20160816; b=t1o65sMA3meuxMhCrihDUjB/QVU9orGpjfKfC+HNZiUldouKegO1dnYZJwEIApGWpe OWQdRO0HoG3bhdf0DY2eG2ip/eUTZyRqNlqczYPsBnf52arWAd027TFSE/SngW3mzA/1 wJhYgOe7VLMMjpnGc+ngWGhqkmNWlcTjoC5ETnI8j4ho0bwQke8kkMuPm4pKDjISE5bN Lrcv93ofyCUr3Mm0N+6d0n4bvuyBilisUJvvel+y11VPBD0kOimOL4IccAve4YFt12M7 lpHBE0n/VapzyN4mHbeoNTZUBjUkRzi6mo8AukOtD3AynT/ILsWP6sVGM8qnJ9shWF6p pOqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=9PZczrw06uS4SGSfXwpCkmVyxV/3glh2YdqE1+bkFQg=; b=E1fvoKMTbNVUFKClMtmW5E/IP4gpArCyrs1Wevo3RP/97SPj09fz9A30/cgDXTvTDT TmBQXYkAuSLuGBiEsA9bTQdE0DRLhXf0bxQ5QoqQgZiDSh8S3zhJ0NhkiH1dwyyWiY0w JQFGLFe0d7DgCZCEkngkHhK/OPIk1w0I/7yYFyZuNj/uQS+Rafl1ClyHfgRA5vAX+4NV Efb+c0EPp/mGvEhM7dOXfjg3ETb6zXFr7cMwm4iMM50shMsiJhA2bEOtt2/fiHugArXH 32a6a0oblV+9hXVAfj9cSd++K0FRctVwTsfDtFXxqVGOWjLpeMdEJzOgLheTGUDzPre9 DfOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f18-v6si18030022pgd.16.2018.07.11.05.30.33; Wed, 11 Jul 2018 05:30:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387393AbeGKMeg (ORCPT + 23 others); Wed, 11 Jul 2018 08:34:36 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:46999 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732286AbeGKMeg (ORCPT ); Wed, 11 Jul 2018 08:34:36 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MZsqM-1fND0L0E4U-00LXUS; Wed, 11 Jul 2018 14:30:07 +0200 From: Arnd Bergmann To: Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi , "David S. Miller" Cc: Arnd Bergmann , Intiyaz Basha , Rick Farrington , Veerasenareddy Burru , Vijaya Mohan Guvva , Weilin Chang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] [RESEND] liquidio: use ktime_get_real_ts64() instead of getnstimeofday64() Date: Wed, 11 Jul 2018 14:29:52 +0200 Message-Id: <20180711123003.453442-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:f0Gc1creoeJGRDRruAZySEn3SVXoLVoHTVCD04Mh+oydOkGUi64 yBU+MGkbfQA6TPR02Lfrxhl80TDD+U0uzhzKseDcQalm/sS3TD1FJicDxyxx6e+TDl+NMwY 2pqdv07W8u1PK2q8BwPCV4i2LAO3bAL3KDJS6owp5WBq/Mnpk5TL0JT0AvBi+Hrhmpe7WEn OTPogzWahdrTicgbkXZ6g== X-UI-Out-Filterresults: notjunk:1; V01:K0:uP4fpjTe0Kc=:VIjAXcw2DJNanSxM8UK5hW vYJLL7mQKjwr9qSCPjIGANvlxp+GGMBQXcG91YDcIO/Hl1K35Ezg5wkLZzWUGQ3/BWyIiRiTd 4ogR9sv8K0dfWbZwolVGCKgji0iqitc1+lFNk8xlZw2WffjChXBoRxTQrlw2KzA3cEbe6RvjZ AAGhPTNmp7ZATgb5mV5WxAenW2JxTHsVubGHgY6+AKHnhSqDdGmwxmeMTIMIGNDag9gDAYwxg Z2gvh3vMSAZlgOsczhqQZ3pSoXrPTFPrGnEQ7WtCXjtulrj4LCZamSIZMeCU5NgZI51qHB/1e m3+t10s8Xy+AbTviaWpB9Uuc/5cT7+ozWbODFFZFXrjm3LjVMIRLA/Byk6QqsdaaWomtH/JkK 9OpRGunnC0CEsi8cPNhjKimaif86cKEep2brpNakN9kYq04HJdxd3N5WwpYCUfMt35sPKQIbt l/U0L+VeA9lNkvGaNShAr6vhp8dnzfnlMNKd1vDlmYXOcIhPYnEIHjIalv73btLKMM8J1okGz NPzRRhABDH2A1vaHJToB/XpSQjuScZEiWnC2wlBfKxvGygOSJQcNCaZXPz8XIedvU/7+FGE3m TIyOs3gsTzK05RYoWwWP9aSxlQK2yEcf/iRugDRfY9k8CFAnzFylXF9XvVynlX+DF9Uv0um4f Llu0hnyGqO2xHScK51h6Kff6v9ASuylYGYlQ00h0Wz4Q6jjLRcvmiA3qLq7DUNhr8QPg= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The two do the same thing, but we want to have a consistent naming in the kernel. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/octeon_console.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 Acked-by: Felix Manlunas diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 19d03fc24305..30884ad0a509 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -687,7 +687,7 @@ static void lio_sync_octeon_time(struct work_struct *work) lt = (struct lio_time *)sc->virtdptr; /* Get time of the day */ - getnstimeofday64(&ts); + ktime_get_real_ts64(&ts); lt->sec = ts.tv_sec; lt->nsec = ts.tv_nsec; octeon_swap_8B_data((u64 *)lt, (sizeof(struct lio_time)) / 8); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c index 7f97ae48efed..0cc2338d8d2a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c @@ -902,7 +902,7 @@ int octeon_download_firmware(struct octeon_device *oct, const u8 *data, * * Octeon always uses UTC time. so timezone information is not sent. */ - getnstimeofday64(&ts); + ktime_get_real_ts64(&ts); ret = snprintf(boottime, MAX_BOOTTIME_SIZE, " time_sec=%lld time_nsec=%ld", (s64)ts.tv_sec, ts.tv_nsec); From patchwork Wed Jul 11 12:29:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 141732 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp229310ljj; Wed, 11 Jul 2018 05:30:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeoncFIbgvTAqLiguX96i8pfyOgDX0Xau2GGijqhUAVjrmnJckpsYhVR80AsEUPLKgT5/TO X-Received: by 2002:a62:828a:: with SMTP id w132-v6mr17113644pfd.121.1531312246066; Wed, 11 Jul 2018 05:30:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531312246; cv=none; d=google.com; s=arc-20160816; b=cmr9nqHm+bC5OKyQygUaZvrexTRmlVELfzdjbQdKcFbWZ/CDJOOEMCGXyi6L8oTwcI JduRsxppyrPc2PllAyAg2rOL/53NM5jiwk2sTJpnMJH6ki57cBWp6tlrv5dvhr9WblT2 evg75TH2/qLYM+h6YVD83JCteZQIc4NmNRwjcmYk2g1LrPDWjCdWDsSMXbfOiO+n9a2m mkbZELxdO01iLGN62slSSoggVhO2KAe+We5mi57cQD8Q9kTRDBpAvH7qPrEdXvSzXC6F ddpW8s6V5isB768kWqYSiRv1nJPvEiUUZKINkUbkUR8cJbtrC/xwArlzHZ3gtPWLWM98 z0Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=8sbwhjT6gMy3E4e2S36+Dt4DPBHkSe8l4A4PyxwOCA0=; b=Wk5LrXBQcQjAJCAuyo2gOMsTxQ6ZFjzIvYrIIc+1c+Rl2J7+jnJc98Py8tkJn3EyUM 6SpzZit9PPpJcpTuOm9/7d6CVeWhelW2KbPN3rNq+mQKb+k/0yuObJC/Uc3nPz90mDPr JhKuFMXg96X2ViG0NHJG1elqi5+Xirk7sJk9wXPniZ8kuQ3sJlHNpvFvKZI3apk/2k9/ FbXR1/+3FvmqA20s/wmoO4EmZGE1G2tNNXwS7nUViHltBTAyIuz4FIDwqVSHcIFEoFF3 uI4s9BJMiz0Vd1q8lyaJl/1iekyyNootYkFWI1JIZBhmCNHXPGIkTo7P4YmIc5Dlr/MD pNxg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o3-v6si19730195pld.50.2018.07.11.05.30.45; Wed, 11 Jul 2018 05:30:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387411AbeGKMet (ORCPT + 23 others); Wed, 11 Jul 2018 08:34:49 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56370 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732995AbeGKMet (ORCPT ); Wed, 11 Jul 2018 08:34:49 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0M9j7n-1fnMrk1oIJ-00Cymj; Wed, 11 Jul 2018 14:30:35 +0200 From: Arnd Bergmann To: Jakub Kicinski , "David S. Miller" Cc: Arnd Bergmann , John Hurley , Simon Horman , Pieter Jansen van Vuuren , Jiri Pirko , oss-drivers@netronome.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] [RESEND] nfp: avoid using getnstimeofday64() Date: Wed, 11 Jul 2018 14:29:53 +0200 Message-Id: <20180711123003.453442-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180711123003.453442-1-arnd@arndb.de> References: <20180711123003.453442-1-arnd@arndb.de> X-Provags-ID: V03:K1:gF3CG1bMAMzEzNZP4a+fJhMwv4Xn5C33s+MzBiNGTKSmj4BEhBs +rQWiF4o6N8JcYdZ8TwqljIMEdEdN/alKQo+GhwM/YWfFawA0NfiYBAgW24YAJq0Pp97Xi1 coi4OtO35JgFmMXUn2J8FuKUm4PIrw1C6IW7CqkKeNO/l4D6O60xH1K4TMUa1kcZwNJQYLC t2g62qJxMsb9svXqhk2LA== X-UI-Out-Filterresults: notjunk:1; V01:K0:J3C33a3p81Q=:CUIEsHvDd9YQ44EG9GmFOb FqnXDLLoSQl2z/K4bsnLtRlJ93J8gRZQGR10668n7lnlc77vSl7M44rNTXpVdZQ8LZXkaf5Rk 0efmjK2mKQYkKbMgJ5xgK9WnAF88/ct09YNIrVYo/5gM0RVka8FWz7RJI4tRRiq21qcl5yInh gcq88EhghFeapBRWRCHEsTyQN3uLVUcgWoEKxMkuRK5I4bjSMdYrbo0wahpcCfwR9LV4LPdfD /T1+BhEAECMv5LYxxrBw4kmi/zUExjcvf3MUAQ/mHp7wCOkwPboqjJouaQBhECgKcsIMGGS3i z/7M1TxaBYoeVIPD7S/T+18khgay/mg7XzgiKonujcYJq66dmR5v+Mkbrbx/luKwkoa+sqHxk ew2q9PKFUVX7QAztmUaLlFlg80eT3vRYqYnKVgmOSQ4HrKay44AemGzz6JtFwrGv/N44KFmTh eetH3fF3Ro5eXxjs1ZiysDDhx2Gz24ceAoyaqzdd5U2YaD1jh00nRfdknsxlBc+8wEwWIrNU7 eFT6n5ML9luaZHbBgko9uKOsyvopYEoR8kWJW/7Jvyjwn0B6vbvi3dczT/glwrff3vM0Ystz2 Wk81xdyy52gdpFklrcGShN2BzzM+EHsG/p/QeL7vc+5QRW4GQsp0IiUCDq+wpx0Pek61p4IQN sipCopIWz2Dcu3qjPGDebaJBiXKWji72ucpz5cSdA5oisfcPbdq8VoGW34iBI7auHyVo= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org getnstimeofday64 is deprecated in favor of the ktime_get() family of functions. The direct replacement would be ktime_get_real_ts64(), but I'm picking the basic ktime_get() instead: - using a ktime_t simplifies the code compared to timespec64 - using monotonic time instead of real time avoids issues caused by a concurrent settimeofday() or during a leap second adjustment. Acked-by: Jakub Kicinski Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/netronome/nfp/flower/main.h | 2 +- drivers/net/ethernet/netronome/nfp/flower/metadata.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h index bbe5764d26cb..ef2114d13387 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/main.h +++ b/drivers/net/ethernet/netronome/nfp/flower/main.h @@ -73,7 +73,7 @@ struct nfp_app; struct nfp_fl_mask_id { struct circ_buf mask_id_free_list; - struct timespec64 *last_used; + ktime_t *last_used; u8 init_unallocated; }; diff --git a/drivers/net/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c index 93fb809f50d1..c098730544b7 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/metadata.c +++ b/drivers/net/ethernet/netronome/nfp/flower/metadata.c @@ -158,7 +158,6 @@ static int nfp_release_mask_id(struct nfp_app *app, u8 mask_id) { struct nfp_flower_priv *priv = app->priv; struct circ_buf *ring; - struct timespec64 now; ring = &priv->mask_ids.mask_id_free_list; /* Checking if buffer is full. */ @@ -169,8 +168,7 @@ static int nfp_release_mask_id(struct nfp_app *app, u8 mask_id) ring->head = (ring->head + NFP_FLOWER_MASK_ELEMENT_RS) % (NFP_FLOWER_MASK_ENTRY_RS * NFP_FLOWER_MASK_ELEMENT_RS); - getnstimeofday64(&now); - priv->mask_ids.last_used[mask_id] = now; + priv->mask_ids.last_used[mask_id] = ktime_get(); return 0; } @@ -178,7 +176,7 @@ static int nfp_release_mask_id(struct nfp_app *app, u8 mask_id) static int nfp_mask_alloc(struct nfp_app *app, u8 *mask_id) { struct nfp_flower_priv *priv = app->priv; - struct timespec64 delta, now; + ktime_t reuse_timeout; struct circ_buf *ring; u8 temp_id, freed_id; @@ -198,10 +196,10 @@ static int nfp_mask_alloc(struct nfp_app *app, u8 *mask_id) memcpy(&temp_id, &ring->buf[ring->tail], NFP_FLOWER_MASK_ELEMENT_RS); *mask_id = temp_id; - getnstimeofday64(&now); - delta = timespec64_sub(now, priv->mask_ids.last_used[*mask_id]); + reuse_timeout = ktime_add_ns(priv->mask_ids.last_used[*mask_id], + NFP_FL_MASK_REUSE_TIME_NS); - if (timespec64_to_ns(&delta) < NFP_FL_MASK_REUSE_TIME_NS) + if (ktime_before(ktime_get(), reuse_timeout)) goto err_not_found; memcpy(&ring->buf[ring->tail], &freed_id, NFP_FLOWER_MASK_ELEMENT_RS);