From patchwork Mon Jun 1 17:53:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 224907 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9ED8C433E0 for ; Mon, 1 Jun 2020 18:53:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 798E220679 for ; Mon, 1 Jun 2020 18:53:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037625; bh=ohgHCoXnqjkR1LxSbvAxL5/wdzT6FIc09ykVLQTK/wM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v2un64NU502Pcu828J4ARwcQ075sZzLVMrs5QvoJQga9EpYnSlA1zlS27WowRUmQx ubVBCeVS4ORwWceAFwVVEFWum6Dfp4axz7qgP6VpvgjisKX6vkRaKNTRqQQ6GPaZ8h wZbrhLZSqtnJqjQQA3ovOL6hjf4G3p23xAps/6LE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728059AbgFASCp (ORCPT ); Mon, 1 Jun 2020 14:02:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:45976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729965AbgFASCo (ORCPT ); Mon, 1 Jun 2020 14:02:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7084B2065C; Mon, 1 Jun 2020 18:02:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034563; bh=ohgHCoXnqjkR1LxSbvAxL5/wdzT6FIc09ykVLQTK/wM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H8Lfc3oVXTTY46MPU2Dk7xIhtS7AKxXy8rT+vTXlRgT9UZDCEdMKRQ9+cOfJHOHI9 RYQUsSKeaeOLPm0edZBZsqvSYqQiaVmumZS3dJGT0Ka3kkAaVS//AS3YzXBfiAsgnx xv6FJiT7/mN+/X95awO853t9c/pevL9YrTBTaozk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jamal Hadi Salim , Roman Mashak , "David S. Miller" Subject: [PATCH 4.19 10/95] net sched: fix reporting the first-time use timestamp Date: Mon, 1 Jun 2020 19:53:10 +0200 Message-Id: <20200601174022.499707903@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174020.759151073@linuxfoundation.org> References: <20200601174020.759151073@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Roman Mashak [ Upstream commit b15e62631c5f19fea9895f7632dae9c1b27fe0cd ] When a new action is installed, firstuse field of 'tcf_t' is explicitly set to 0. Value of zero means "new action, not yet used"; as a packet hits the action, 'firstuse' is stamped with the current jiffies value. tcf_tm_dump() should return 0 for firstuse if action has not yet been hit. Fixes: 48d8ee1694dd ("net sched actions: aggregate dumping of actions timeinfo") Cc: Jamal Hadi Salim Signed-off-by: Roman Mashak Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/net/act_api.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -67,7 +67,8 @@ static inline void tcf_tm_dump(struct tc { dtm->install = jiffies_to_clock_t(jiffies - stm->install); dtm->lastuse = jiffies_to_clock_t(jiffies - stm->lastuse); - dtm->firstuse = jiffies_to_clock_t(jiffies - stm->firstuse); + dtm->firstuse = stm->firstuse ? + jiffies_to_clock_t(jiffies - stm->firstuse) : 0; dtm->expires = jiffies_to_clock_t(stm->expires); }