From patchwork Fri May 8 12:34:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 226138 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=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 6215FC38A2A for ; Fri, 8 May 2020 13:14:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 241F924967 for ; Fri, 8 May 2020 13:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588943661; bh=2hNUwwDf2Ia5fvc6hr/O4FylkL379FZKlUpR4j/MaSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v+uwD6Rl+FU42K0dDPZb243CDgBPjUGeoYr/vOGt4XI/dIBJ2eBXnAC9bXw0Qpajq n0sKi3m1evyY1zy6G1YUMoq48yxxkVh5CJjkmA03onHUtt1Kot/JN9A+V1K7t78ZaE jUW6xNm1nailw+vXOIGIz7hfjDzJ0MD6DqQUYagg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729205AbgEHNOT (ORCPT ); Fri, 8 May 2020 09:14:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:49596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728365AbgEHMrQ (ORCPT ); Fri, 8 May 2020 08:47:16 -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 B58C22145D; Fri, 8 May 2020 12:47:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942036; bh=2hNUwwDf2Ia5fvc6hr/O4FylkL379FZKlUpR4j/MaSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ttoJELWeu6FskRIzIcuuTmbu3WMITnxngR1SRz/glPkGsxXB/iHFq8RyIV0fsNOJK 2HsaEk8JgGz6UfKj9P+cUVCCg1DsZaH59FdQaTDxSU/hf1A4VtL9b5Cwllm0Y6VlYm KaxjUnxKhLKd2dpDaPoKJ6ldOL4f8batgkvdL3V4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , John Fastabend , "David S. Miller" Subject: [PATCH 4.4 269/312] fq_codel: return non zero qlen in class dumps Date: Fri, 8 May 2020 14:34:20 +0200 Message-Id: <20200508123143.352128332@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@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: Eric Dumazet commit aafddbf0cffeb790f919436285328c762279b5d4 upstream. We properly scan the flow list to count number of packets, but John passed 0 to gnet_stats_copy_queue() so we report a zero value to user space instead of the result. Fixes: 640158536632 ("net: sched: restrict use of qstats qlen") Signed-off-by: Eric Dumazet Cc: John Fastabend Acked-by: John Fastabend Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_fq_codel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c @@ -588,7 +588,7 @@ static int fq_codel_dump_class_stats(str qs.backlog = q->backlogs[idx]; qs.drops = flow->dropped; } - if (gnet_stats_copy_queue(d, NULL, &qs, 0) < 0) + if (gnet_stats_copy_queue(d, NULL, &qs, qs.qlen) < 0) return -1; if (idx < q->flows_cnt) return gnet_stats_copy_app(d, &xstats, sizeof(xstats));