From patchwork Sat Jul 16 14:08:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 649109 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rsBRR0FbQz9s0M for ; Sun, 17 Jul 2016 00:20:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru header.b=z4PRioDA; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751495AbcGPOUA (ORCPT ); Sat, 16 Jul 2016 10:20:00 -0400 Received: from forwardcorp1j.cmail.yandex.net ([5.255.227.106]:33642 "EHLO forwardcorp1j.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751451AbcGPOT7 (ORCPT ); Sat, 16 Jul 2016 10:19:59 -0400 X-Greylist: delayed 657 seconds by postgrey-1.27 at vger.kernel.org; Sat, 16 Jul 2016 10:19:59 EDT Received: from smtpcorp1o.mail.yandex.net (smtpcorp1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::30]) by forwardcorp1j.cmail.yandex.net (Yandex) with ESMTP id 5F9792068E; Sat, 16 Jul 2016 17:08:59 +0300 (MSK) Received: from smtpcorp1o.mail.yandex.net (localhost [127.0.0.1]) by smtpcorp1o.mail.yandex.net (Yandex) with ESMTP id 46F6D41A0045; Sat, 16 Jul 2016 17:08:59 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:5::1:f9]) by smtpcorp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id FcAhk6Aj93-8xHudQHc; Sat, 16 Jul 2016 17:08:59 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1468678139; bh=ekmF2DpWQOhHuxl+J0GooohUtcSj1qFuhHQnSRv/aYA=; h=Subject:From:To:Cc:Date:Message-ID; b=z4PRioDAMgBGHJyRgZA8kpLQgkqSf7sdzuIqDp+GsD8RuIP0CYkirNBxNqJGla6WK /e3MlTNGBQaMFapK0e8T0mbCi9IDq+78k0v2EcxjASVhZ45S2+0bUtRd4s50d+2r7E DXg4RpUJxqZlnvX9AWlRjiS7CLvw3SVhptVNDue8= Authentication-Results: smtpcorp1o.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] net/sched/sch_htb: clamp xstats tokens to fit into 32-bit int From: Konstantin Khlebnikov To: "David S. Miller" Cc: netdev@vger.kernel.org, Eric Dumazet , Jamal Hadi Salim , linux-kernel@vger.kernel.org Date: Sat, 16 Jul 2016 17:08:56 +0300 Message-ID: <146867813621.23552.6234170020058724059.stgit@buzz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In kernel HTB keeps tokens in signed 64-bit in nanoseconds. In netlink protocol these values are converted into pshed ticks (64ns for now) and truncated to 32-bit. In struct tc_htb_xstats fields "tokens" and "ctokens" are declared as unsigned 32-bit but they could be negative thus tool 'tc' prints them as signed. Big values loose higher bits and/or become negative. This patch clamps tokens in xstat into range from INT_MIN to INT_MAX. In this way it's easier to understand what's going on here. Signed-off-by: Konstantin Khlebnikov --- net/sched/sch_htb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 62f9d8100c6e..052f84d6cc23 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1140,8 +1140,10 @@ htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d) if (!cl->level && cl->un.leaf.q) qlen = cl->un.leaf.q->q.qlen; - cl->xstats.tokens = PSCHED_NS2TICKS(cl->tokens); - cl->xstats.ctokens = PSCHED_NS2TICKS(cl->ctokens); + cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens), + INT_MIN, INT_MAX); + cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens), + INT_MIN, INT_MAX); if (gnet_stats_copy_basic(d, NULL, &cl->bstats) < 0 || gnet_stats_copy_rate_est(d, NULL, &cl->rate_est) < 0 ||