From patchwork Mon Dec 11 21:50:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 847258 X-Patchwork-Delegate: jpettit@nicira.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="c5mW5VqF"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ywcJH0XSLz9t34 for ; Tue, 12 Dec 2017 08:57:35 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7A2B3DAF; Mon, 11 Dec 2017 21:51:16 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1204FD85 for ; Mon, 11 Dec 2017 21:51:14 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9E40F4FF for ; Mon, 11 Dec 2017 21:51:13 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id u19so12562382pfa.12 for ; Mon, 11 Dec 2017 13:51:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4PWXyY7aQDa6DajnWVDtT/pwTd611nrPHYBgqPb/Dv4=; b=c5mW5VqF2jAvRW9E2UacU3vHBtaGp3tfwd7naJMSoWVfTJBmTDs4ddNugNqVNIVZGo zP7Rxv6VSs7sQ+6zq1RbKrAo2u4L6MjOgA4waD7C9vkO0+YPslPrqc787YJJ8orolQcW mHnyAyKeLzisauX6SXCZ3dMj1QKKlK/POrSCZ0EnhRf0mWQpPlTbfhzvAHvaL6aYl5Rr CHnrKHm2+deVIo+950CAKS7wkq7Zx2Ums/0hHaan1V27bEJd79f9zZ4o++U1m0lmKkNY /rSrANZeRuvz6xxGD2fGl8jpOEUULNlmkj5bUAtJ2xLF8gqYWN88kQGFpGSuYWTSVDSm F3EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4PWXyY7aQDa6DajnWVDtT/pwTd611nrPHYBgqPb/Dv4=; b=b99thQLf7IIiD0LM03KBWqTUsKFQHsXn5QDKkDGJtjA8ej2gmq7JSYpMi3zhn9r6st WWZjgXo3wRV3wis9irSPV0xLhqjAW9Fcfz3/fv+S9o3c+tS9tSSy76hi4AbuuA3l3Mxk 0QPeq1xVeSxez6ItwzUZg9NkbYY752w+LFYtOPYqGQuh7zfcToXI6W1K9iaz9aoCJsHZ a2aM5+ME+eUavPsA0I7gZHM89f7ITQD94rgObvJMpBFvwr9wNblOtQvW2bzvEWxCOx6w uYCK9NcInJDbh62T009eplXMMNEffb9Iw5Cg4+J2+lik38JcLE+8X4Cwm1x0TAM31lnU VVDg== X-Gm-Message-State: AKGB3mKTdg9YiY7y8Wv5JHrlLIqgLkdIxQmMA7SEzaxEsimkzvUT4ZEs K3DqJH5B+GjFp7R4NVshtwdbyBul X-Google-Smtp-Source: ACJfBotbdviPXbMKq8UWyH6rswvfb7g42NNs05vL8nJft8ZZvNe4GTbQEjeqAYVEV9kGkWYBfYOL3w== X-Received: by 10.84.195.36 with SMTP id i33mr1710426pld.189.1513029072847; Mon, 11 Dec 2017 13:51:12 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id c185sm25572799pfb.48.2017.12.11.13.51.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Dec 2017 13:51:11 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Dec 2017 13:50:32 -0800 Message-Id: <1513029033-9087-12-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513029033-9087-1-git-send-email-gvrose8192@gmail.com> References: <1513029033-9087-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Arnd Bergmann Subject: [ovs-dev] [PATCH 11/12] datapath: use ktime_get_ts64() instead of ktime_get_ts() X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Arnd Bergmann Upstream commit: commit 311af51dcb5629f04976a8e451673f77e3301041 Author: Arnd Bergmann Date: Mon Nov 27 12:41:38 2017 +0100 openvswitch: use ktime_get_ts64() instead of ktime_get_ts() timespec is deprecated because of the y2038 overflow, so let's convert this one to ktime_get_ts64(). The code is already safe even on 32-bit architectures, since it uses monotonic times. On 64-bit architectures, nothing changes, while on 32-bit architectures this avoids one type conversion. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Cc: Arnd Bergmann Signed-off-by: Greg Rose --- datapath/flow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/datapath/flow.c b/datapath/flow.c index 5da7e3e..c119df2 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -54,12 +54,12 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies) { - struct timespec cur_ts; + struct timespec64 cur_ts; u64 cur_ms, idle_ms; - ktime_get_ts(&cur_ts); + ktime_get_ts64(&cur_ts); idle_ms = jiffies_to_msecs(jiffies - flow_jiffies); - cur_ms = (u64)cur_ts.tv_sec * MSEC_PER_SEC + + cur_ms = (u64)(u32)cur_ts.tv_sec * MSEC_PER_SEC + cur_ts.tv_nsec / NSEC_PER_MSEC; return cur_ms - idle_ms;