From patchwork Mon Jun 1 17:52:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 225090 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 DD8EBC433DF for ; Mon, 1 Jun 2020 18:06:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B514020872 for ; Mon, 1 Jun 2020 18:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034790; bh=oc9000K0Njl65rxCNw3uZQ0DDNTTXplezompeOn/yzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M6G9UXZitcNvDDpUPkKfhfbPONSeJPn/8rwToNjmBZHM1xSBw80fTAg63ZgjO4eOK vKnzHBdR4PHhU/wYPZADzLLlxTawhHpeHppZzwT7ubNLG6pJELbWCh55wnIxJbYnm6 luLnU7Dg2wiPzH90/f93Ihr0R99PSgPbUW5kC2u4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730465AbgFASG3 (ORCPT ); Mon, 1 Jun 2020 14:06:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:52100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730461AbgFASG3 (ORCPT ); Mon, 1 Jun 2020 14:06:29 -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 EFFB42158C; Mon, 1 Jun 2020 18:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034788; bh=oc9000K0Njl65rxCNw3uZQ0DDNTTXplezompeOn/yzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jESo6LRE1LTjgDuQUt+y7/MSGMn2/PSBY2E5KSMP/iMAtBefLDPKFvKzMXYTeyDVY Z/GODZdZTBMTG1v9xV8lHtjbzw5f2OmqFIbr0UAij1n5G6sSOvGT7j5JZAEhzhqaNM qwFqSU5wuN+8eM0x8cyuyBAWFBCn37KAwWaRJJwM= 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.4 014/142] net sched: fix reporting the first-time use timestamp Date: Mon, 1 Jun 2020 19:52:52 +0200 Message-Id: <20200601174039.414720241@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174037.904070960@linuxfoundation.org> References: <20200601174037.904070960@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); }