From patchwork Mon Jun 1 17:52:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 225064 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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 07994C433E0 for ; Mon, 1 Jun 2020 18:11:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1FAF207BB for ; Mon, 1 Jun 2020 18:11:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035116; bh=oc9000K0Njl65rxCNw3uZQ0DDNTTXplezompeOn/yzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JDh9Of+gtSEVScWVvuF/fxC3rYqJo9Aaooc5ucjnyAO3L9NHlQtilRacZ4jAhVls9 dwfbikJec64/ZXKLE4CDhYcHIhpTQonEmYYSSnWGWGE2COe0k7qDpt0XqRgsWpqhYu 6FTtIVF3naXSYFSl6H8v7K/JbJcyuQR630Iz288c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731155AbgFASLz (ORCPT ); Mon, 1 Jun 2020 14:11:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:59210 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730263AbgFASLy (ORCPT ); Mon, 1 Jun 2020 14:11:54 -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 B2A532065C; Mon, 1 Jun 2020 18:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035114; bh=oc9000K0Njl65rxCNw3uZQ0DDNTTXplezompeOn/yzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1dlvAFteBtNMPmfe+31vXUXCLhddKCfluBAhpretJEBJSvfkQIQIsnI1yQe8q8p3q 2BYlPOT8jyZh3iWv+Pww7vJmssDONrPYEWJQ2MwH6j1buNVgPL0O/MMQHzXRgrHuXT ts3opHGuHVs+RmrwsMSgmP3u2ZYeqX89jZzjuo+g= 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 5.6 016/177] net sched: fix reporting the first-time use timestamp Date: Mon, 1 Jun 2020 19:52:34 +0200 Message-Id: <20200601174050.034990035@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174048.468952319@linuxfoundation.org> References: <20200601174048.468952319@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 @@ -69,7 +69,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); }