From patchwork Thu May 5 11:00:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 9023511 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EA012BF29F for ; Thu, 5 May 2016 10:59:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF9D4203C1 for ; Thu, 5 May 2016 10:59:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 06E7320395 for ; Thu, 5 May 2016 10:59:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757209AbcEEK66 (ORCPT ); Thu, 5 May 2016 06:58:58 -0400 Received: from mail-lf0-f54.google.com ([209.85.215.54]:35827 "EHLO mail-lf0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756701AbcEEK65 (ORCPT ); Thu, 5 May 2016 06:58:57 -0400 Received: by mail-lf0-f54.google.com with SMTP id j8so91363278lfd.2 for ; Thu, 05 May 2016 03:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/SimEgx7DhoTTOBIz8usGgquPt0lebVJq5+dXGCL7YU=; b=wP49ySmAc/mX5qBnEaIrer3Hn13yqDPZ5WSlbsJkWCdnk5/IbsIL95MF8kftO+/AHi RV6I9pup0j+V0LMOV84ANtK9kd/Z7TMpE6q6O4+BhJ7/we+75hTH0yd8ZZbwR0oRPlxE b7xocj5m/lklseTj2evg/wrrduVD0pV84VDpo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/SimEgx7DhoTTOBIz8usGgquPt0lebVJq5+dXGCL7YU=; b=avgfZVJIoTRu7r8HaYXXBYtwhDm6zgIdfnWe/TAf+6+9a65y5jkEab29XBRJ6bvosq DHDdU7aLFZbxejJlNzdYmFGuax6ceSzs+sSPwta7uWc09MK3TWWWBqDiPK+r9ESvArk3 ElXG9lvL/Be1MKXCZvuTXIQRyhxj9RxrjkMg5z85qQptan7ioh7R4WlaBJQQKH2+4Jrf YIem+5T11DJ/vHU/nLBKbdVc7jsjcgKNZh08rTRV09KxGAEY48jwHuG/akj1ByaGuzul HlnBNbUMLBDdL+YsXR+rjaj0sI/p/QSka2ZHESpxPwCVWwRiftYoD+Q6B5RM+cJo6YF8 Qklg== X-Gm-Message-State: AOPr4FV5YsuSJ1COJGHZiNy6A9D/awCsg/Pu/0+pEGj7s/yeOBi9dWvv3T8ahW1bBjwPC0rOnajmnI6FthhdfQ5ABqIVTTnytO1vac897zDVGFBv9G7HY/FMfluboEZyPY05MgFkTWlIzDoAtYJ9myLeP5rijL3nWGiGC8qk2Q29n/DXb940tAlMKLCwaKEVoNvnlYk= X-Received: by 10.25.206.130 with SMTP id e124mr6540097lfg.41.1462445935557; Thu, 05 May 2016 03:58:55 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id ez1sm1399251lbc.29.2016.05.05.03.58.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 May 2016 03:58:54 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, dave.taht@gmail.com, make-wifi-fast@lists.bufferbloat.net, codel@lists.bufferbloat.net, apenwarr@gmail.com, Michal Kazior Subject: [PATCHv4 5/5] mac80211: add debug knobs for codel Date: Thu, 5 May 2016 13:00:39 +0200 Message-Id: <1462446039-1070-6-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462446039-1070-1-git-send-email-michal.kazior@tieto.com> References: <1460636302-31161-1-git-send-email-michal.kazior@tieto.com> <1462446039-1070-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds a few debugfs entries to make it easier to test, debug and experiment. Signed-off-by: Michal Kazior --- Notes: v4: * stats adjustments (in-kernel codel has more of them) net/mac80211/debugfs.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 43592b6f79f0..c7cfedc61fc4 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -124,6 +124,15 @@ static const struct file_operations name## _ops = { \ res; \ }) +#define DEBUGFS_RW_BOOL(arg) \ +({ \ + int res; \ + int val; \ + res = mac80211_parse_buffer(userbuf, count, ppos, "%d", &val); \ + arg = !!(val); \ + res; \ +}) + DEBUGFS_READONLY_FILE(fq_flows_cnt, "%u", local->fq.flows_cnt); DEBUGFS_READONLY_FILE(fq_backlog, "%u", @@ -132,6 +141,16 @@ DEBUGFS_READONLY_FILE(fq_overlimit, "%u", local->fq.overlimit); DEBUGFS_READONLY_FILE(fq_collisions, "%u", local->fq.collisions); +DEBUGFS_READONLY_FILE(codel_maxpacket, "%u", + local->cstats.maxpacket); +DEBUGFS_READONLY_FILE(codel_drop_count, "%u", + local->cstats.drop_count); +DEBUGFS_READONLY_FILE(codel_drop_len, "%u", + local->cstats.drop_len); +DEBUGFS_READONLY_FILE(codel_ecn_mark, "%u", + local->cstats.ecn_mark); +DEBUGFS_READONLY_FILE(codel_ce_mark, "%u", + local->cstats.ce_mark); DEBUGFS_RW_FILE(fq_limit, DEBUGFS_RW_EXPR_FQ("%u", &local->fq.limit), @@ -139,6 +158,18 @@ DEBUGFS_RW_FILE(fq_limit, DEBUGFS_RW_FILE(fq_quantum, DEBUGFS_RW_EXPR_FQ("%u", &local->fq.quantum), "%u", local->fq.quantum); +DEBUGFS_RW_FILE(codel_interval, + DEBUGFS_RW_EXPR_FQ("%u", &local->cparams.interval), + "%u", local->cparams.interval); +DEBUGFS_RW_FILE(codel_target, + DEBUGFS_RW_EXPR_FQ("%u", &local->cparams.target), + "%u", local->cparams.target); +DEBUGFS_RW_FILE(codel_mtu, + DEBUGFS_RW_EXPR_FQ("%u", &local->cparams.mtu), + "%u", local->cparams.mtu); +DEBUGFS_RW_FILE(codel_ecn, + DEBUGFS_RW_BOOL(local->cparams.ecn), + "%d", local->cparams.ecn ? 1 : 0); #ifdef CONFIG_PM static ssize_t reset_write(struct file *file, const char __user *user_buf, @@ -333,6 +364,15 @@ void debugfs_hw_add(struct ieee80211_local *local) DEBUGFS_ADD(fq_collisions); DEBUGFS_ADD(fq_limit); DEBUGFS_ADD(fq_quantum); + DEBUGFS_ADD(codel_maxpacket); + DEBUGFS_ADD(codel_drop_count); + DEBUGFS_ADD(codel_drop_len); + DEBUGFS_ADD(codel_ecn_mark); + DEBUGFS_ADD(codel_ce_mark); + DEBUGFS_ADD(codel_interval); + DEBUGFS_ADD(codel_target); + DEBUGFS_ADD(codel_mtu); + DEBUGFS_ADD(codel_ecn); statsd = debugfs_create_dir("statistics", phyd);