From patchwork Fri Jul 27 07:24:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Klassert X-Patchwork-Id: 143013 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp489474ljj; Fri, 27 Jul 2018 00:25:03 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcQBGdi+T9EcFqdpnuFK/3q5XwwOkN84ZmiUVYYVur5w8LJ+RobU6mcDhBeHNqsUqci+gJK X-Received: by 2002:a63:81c3:: with SMTP id t186-v6mr5029985pgd.413.1532676303184; Fri, 27 Jul 2018 00:25:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532676303; cv=none; d=google.com; s=arc-20160816; b=QJuphzYsGCc/qfgpYpgemVC3utFPloMWtnwDjexDlcYMPcghD7b2O8dzMtC8JSnWUf CxgX/fcb+EsGD2zhoJJiOBRLkI7wTC/8dwliAbCoK2hcEyydO9B6hkjWrRyDovdgEc/q MrB1fL/zKGwiIQmxVklI+iaIMiVVGwmudbPhk8nCaa6/n2o+daZWYIxi/c98k60u5cRd xKauQBuRXDuR5AEfVKPLZOc/1hCclSya81xtiT6ddKfyMA6gQoa/hyrQdX3mgY87SbBh QoFjMRX3+YBRrENzXv/0gRGgDwN+umapFFYv9X3+YE3qS6zuOSWvqixN/Nq7PX2B5A4V Nsgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=mIxUwJ0KcCOTT/+cs+HG9VOuvjWMcFZJs4/2P8Muya4=; b=mNGIrrwbXMj8KKCivAZXVHJq6QUPIT1/TjnEn8qNIbCrOGUvz0f69f4gTQcEshfKNG aOpJ2pcYrlrRCmzok3ud50SBhhYpFCnGbe8+qQYltwM8v/MoOWvOKEZz9lR2NF95TMMc ek9u5upa98GhvaUfs0aqk2gJlVdCPzpZwaOzHJkrof9zDVt9nMvmVNQkPF8O4Bv+TkaH XuzB5mOcsbKgNoMV2IJ4TcOvtUSnkQ3MWN/exU242PSt/U+VEWkOmAGW/URmCTG2Aggv pGmEJyI7v1MmHtsotODyJnRfN7O6R8/olWeOeV3CdXCbHpn5wv1quRN+o39UBs96lWUN jYLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-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 w13-v6si2913643plp.51.2018.07.27.00.25.02; Fri, 27 Jul 2018 00:25:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-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 netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730189AbeG0Ipf (ORCPT + 10 others); Fri, 27 Jul 2018 04:45:35 -0400 Received: from a.mx.secunet.com ([62.96.220.36]:57462 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729483AbeG0Ipc (ORCPT ); Fri, 27 Jul 2018 04:45:32 -0400 Received: from localhost (localhost [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id CEF52201BF; Fri, 27 Jul 2018 11:24:41 +0200 (CEST) X-Virus-Scanned: by secunet Received: from a.mx.secunet.com ([127.0.0.1]) by localhost (a.mx.secunet.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zMNYOW7dcp83; Fri, 27 Jul 2018 11:24:40 +0200 (CEST) Received: from mail-essen-01.secunet.de (mail-essen-01.secunet.de [10.53.40.204]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a.mx.secunet.com (Postfix) with ESMTPS id 97A0A201C6; Fri, 27 Jul 2018 11:24:38 +0200 (CEST) Received: from gauss2.secunet.de (10.182.7.193) by mail-essen-01.secunet.de (10.53.40.204) with Microsoft SMTP Server id 14.3.399.0; Fri, 27 Jul 2018 09:24:53 +0200 Received: by gauss2.secunet.de (Postfix, from userid 1000) id D893C3182135; Fri, 27 Jul 2018 09:24:52 +0200 (CEST) From: Steffen Klassert To: David Miller CC: Herbert Xu , Steffen Klassert , Subject: [PATCH 08/14] ipv6: xfrm: use 64-bit timestamps Date: Fri, 27 Jul 2018 09:24:43 +0200 Message-ID: <20180727072449.11896-9-steffen.klassert@secunet.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180727072449.11896-1-steffen.klassert@secunet.com> References: <20180727072449.11896-1-steffen.klassert@secunet.com> MIME-Version: 1.0 X-G-Data-MailSecurity-for-Exchange-State: 0 X-G-Data-MailSecurity-for-Exchange-Error: 0 X-G-Data-MailSecurity-for-Exchange-Sender: 23 X-G-Data-MailSecurity-for-Exchange-Server: d65e63f7-5c15-413f-8f63-c0d707471c93 X-EXCLAIMER-MD-CONFIG: 2c86f778-e09b-4440-8b15-867914633a10 X-G-Data-MailSecurity-for-Exchange-Guid: 27B7980B-3CF0-46EC-8682-AAB8E922935F Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann get_seconds() is deprecated because it can overflow on 32-bit architectures. For the xfrm_state->lastused member, we treat the data as a 64-bit number already, so we just need to use the right accessor that works on both 32-bit and 64-bit machines. Signed-off-by: Arnd Bergmann Signed-off-by: Steffen Klassert --- include/net/xfrm.h | 2 +- net/ipv6/xfrm6_mode_ro.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.14.1 diff --git a/include/net/xfrm.h b/include/net/xfrm.h index a5378613a49c..1350e2cf0749 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -227,7 +227,7 @@ struct xfrm_state { long saved_tmo; /* Last used time */ - unsigned long lastused; + time64_t lastused; struct page_frag xfrag; diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c index 07d36573f50b..da28e4407b8f 100644 --- a/net/ipv6/xfrm6_mode_ro.c +++ b/net/ipv6/xfrm6_mode_ro.c @@ -55,7 +55,7 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb) __skb_pull(skb, hdr_len); memmove(ipv6_hdr(skb), iph, hdr_len); - x->lastused = get_seconds(); + x->lastused = ktime_get_real_seconds(); return 0; }