From patchwork Wed Jan 9 16:10:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 1022504 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43ZYyl28XWz9sD9 for ; Thu, 10 Jan 2019 03:11:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732100AbfAIQLK (ORCPT ); Wed, 9 Jan 2019 11:11:10 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:52301 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731169AbfAIQLJ (ORCPT ); Wed, 9 Jan 2019 11:11:09 -0500 Received: by mail-wm1-f65.google.com with SMTP id m1so8241925wml.2 for ; Wed, 09 Jan 2019 08:11:08 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=us0Z12KFG6S+4rMUDrnbIGX+kknZrgzG/scqJWajnRI=; b=Iwcl4sng8tBQuFACsygdm/i6GFklnobhwQctPLxn8grlkuVB1H9f0ZDSjFoxnSP014 s3aUzwgXTScrKCF67h+fWoYY+uoWiQZ2spWjolVBBu0vDXfA7SHHTeCqzzRhbp/8Zj7i lOgYe+ajORSTNID84B1zxb59e2R35CEFfiYQD4aXbaJD49dAItuG1z4PyV/kr8/JHtxk wh6xCQ1bAMDNwMuTpjGBSsMBHYp6ZamlHdxS3lQfH/SBO/uLXAIobBiIgIHLUy9DDR2J xRyYP+NrYmULqQVE2PHuLT9EGfDwiHzFS+l3lzfzmaCRcdxKfV3iWDmsVVA/Eq2OyDHh uB5g== X-Gm-Message-State: AJcUukdy2yXkZIyYZS33OCNFTOk6e2vg49PEaLDp1lSq+EstFBni0hOC 4WYzjFPFF/44y6SouzzereCeUWuFI2Y= X-Google-Smtp-Source: ALg8bN4tRnb8NUR6xyvZBWKzXeD/ac1lIbXfGG/mIHGedMdlUKSr5Ikcz1ge6+xS9MEYDOVGWhzvig== X-Received: by 2002:a1c:b14:: with SMTP id 20mr6477102wml.103.1547050268033; Wed, 09 Jan 2019 08:11:08 -0800 (PST) Received: from tohojo-x1-rh.localdomain (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id k128sm16768740wmd.37.2019.01.09.08.11.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jan 2019 08:11:07 -0800 (PST) Received: by tohojo-x1-rh.localdomain (Postfix, from userid 1000) id 038081833C1; Wed, 9 Jan 2019 17:11:06 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: netdev@vger.kernel.org Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH v2] sch_api: Change signature of qdisc_tree_reduce_backlog() to use ints Date: Wed, 9 Jan 2019 17:10:57 +0100 Message-Id: <20190109161057.18146-1-toke@redhat.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There are now several places where qdisc_tree_reduce_backlog() is called with a negative number of packets (to signal an increase in number of packets in the queue). Rather than rely on overflow behaviour, change the function signature to use signed integers to communicate this usage to people reading the code. Signed-off-by: Toke Høiland-Jørgensen --- include/net/sch_generic.h | 3 +-- net/sched/sch_api.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 9481f2c142e2..7a4957599874 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -580,8 +580,7 @@ struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue, void qdisc_reset(struct Qdisc *qdisc); void qdisc_put(struct Qdisc *qdisc); void qdisc_put_unlocked(struct Qdisc *qdisc); -void qdisc_tree_reduce_backlog(struct Qdisc *qdisc, unsigned int n, - unsigned int len); +void qdisc_tree_reduce_backlog(struct Qdisc *qdisc, int n, int len); #ifdef CONFIG_NET_SCHED int qdisc_offload_dump_helper(struct Qdisc *q, enum tc_setup_type type, void *type_data); diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 7e4d1ccf4c87..03e26e8d0ec9 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -758,8 +758,7 @@ static u32 qdisc_alloc_handle(struct net_device *dev) return 0; } -void qdisc_tree_reduce_backlog(struct Qdisc *sch, unsigned int n, - unsigned int len) +void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len) { bool qdisc_is_offloaded = sch->flags & TCQ_F_OFFLOADED; const struct Qdisc_class_ops *cops;