[PATCH v2 3/3] mac80211: improve PID rate control mechanism by avoiding rate oscillation problem

[PATCH v2 3/3] mac80211: improve PID rate control mechanism by avoiding rate oscillation problem

[wei]

>From Wei YIN <Wei.Yin@nicta.com.au>
Improve PID rate control mechanism by avoiding rate oscillation problem

Signed-off-by: Wei YIN <Wei.Yin@nicta.com.au>
---
kernel 3.3.0
net/mac80211/rc80211_pid_debugfs.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 65 insertions(+), 6 deletions(-)

--- wireless-testing_orig/net/mac80211/rc80211_pid_debugfs.c	2012-02-17 13:59:53.487182968 +1000
+++ wireless-testing/net/mac80211/rc80211_pid_debugfs.c	2012-03-08 14:45:38.727184486 +1000
@@ -1,5 +1,6 @@
 /*
  * Copyright 2007, Mattias Nissler <mattias.nissler@gmx.de>
+ * Copyright 2012, Wei Yin, National ICT Australia <Wei.Yin@nicta.com.au>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -13,12 +14,72 @@
 #include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 
 #include <net/mac80211.h>
 #include "rate.h"
 
 #include "rc80211_pid.h"
+#include <linux/debugfs.h>
+#include <linux/ieee80211.h>
+#include <linux/slab.h>
+#include <linux/export.h>
+
+int
+pid_stats_open(struct inode *inode, struct file *file)
+{
+	struct rc_pid_sta_info *sinfo = inode->i_private;
+	struct rc_pid_debugfs_info *ms;
+	struct rc_pid_rateinfo *rinfo;
+	char *p;
+	int i;
+
+	rinfo = sinfo->rinfo;
+	ms = kmalloc(sizeof(*ms) + 4096, GFP_KERNEL);
+	if (!ms)
+		return -ENOMEM;
+
+	file->private_data = ms;
+	p = ms->buf;
+	p += sprintf(p, "R for current rate;   T for temporary rate\n"
+			"rate    throughput      attempt          fail"
+			"        success         this_FLR\n");
+
+	for (i = 0; i < sinfo->n_rates; i++) {
+		struct rc_pid_rateinfo *pr = &rinfo[i];
+		*(p++) = (i == sinfo->txrate_idx) ? 'R' : ' ';
+		*(p++) = (i == sinfo->tmp_rate_idx) ? 'T' : ' ';
+		p += sprintf(p, "%3u%s", pr->bitrate / 2,
+				(pr->bitrate & 1 ? ".5" : "  "));
+		p += sprintf(p, 
+			 "%6u.%2u     %10lu     %10lu     %10lu        %2u%%\n",
+			 (pr->throughput * 1530 *8 / 1024 / 1024) /100,
+			 (pr->throughput * 1530 *8 / 1024 / 1024) % 100,
+			 pr->attempt, pr->fail, pr->success, 
+			 pr->this_fail == 0 ? 0: 
+			 (pr->this_fail *100 / 
+			 pr->this_attempt) % 100);
+	}
+	
+	ms->len = p - ms->buf;
+
+	return 0;
+}
+
+ssize_t
+pid_stats_read(struct file *file, char __user *buf, size_t len, loff_t *ppos)
+{
+	struct rc_pid_debugfs_info *ms;
+
+	ms = file->private_data;
+	return simple_read_from_buffer(buf, len, ppos, ms->buf, ms->len);
+}
+
+int
+pid_stats_release(struct inode *inode, struct file *file)
+{
+	kfree(file->private_data);
+	return 0;
+}
 
 static void rate_control_pid_event(struct rc_pid_event_buffer *buf,
 				   enum rc_pid_event_type type,
@@ -203,11 +264,9 @@ static ssize_t rate_control_pid_events_r
 
 static const struct file_operations rc_pid_fop_events = {
 	.owner = THIS_MODULE,
-	.read = rate_control_pid_events_read,
-	.poll = rate_control_pid_events_poll,
-	.open = rate_control_pid_events_open,
-	.release = rate_control_pid_events_release,
-	.llseek = noop_llseek,
+	.read = pid_stats_read,
+	.open = pid_stats_open,
+	.release = pid_stats_release,
 };
 
 void rate_control_pid_add_sta_debugfs(void *priv, void *priv_sta,

Re: [PATCH v2 3/3] mac80211: improve PID rate control mechanism by avoiding rate oscillation problem

[Julian Calaby]

Hi Wei,

Again, a couple of minor comments.

On Mon, Mar 12, 2012 at 12:14, wei <yinwei168@gmail.com> wrote:
> From Wei YIN <Wei.Yin@nicta.com.au>
> Improve PID rate control mechanism by avoiding rate oscillation problem
>
> Signed-off-by: Wei YIN <Wei.Yin@nicta.com.au>
> ---
> kernel 3.3.0
> net/mac80211/rc80211_pid_debugfs.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 65 insertions(+), 6 deletions(-)
>
> --- wireless-testing_orig/net/mac80211/rc80211_pid_debugfs.c    2012-02-17 13:59:53.487182968 +1000
> +++ wireless-testing/net/mac80211/rc80211_pid_debugfs.c 2012-03-08 14:45:38.727184486 +1000
> @@ -1,5 +1,6 @@
>  /*
>  * Copyright 2007, Mattias Nissler <mattias.nissler@gmx.de>
> + * Copyright 2012, Wei Yin, National ICT Australia <Wei.Yin@nicta.com.au>
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License version 2 as
> @@ -13,12 +14,72 @@
>  #include <linux/types.h>
>  #include <linux/skbuff.h>
>  #include <linux/slab.h>
> -#include <linux/export.h>

This change should go in a separate patch.

>  #include <net/mac80211.h>
>  #include "rate.h"
>
>  #include "rc80211_pid.h"
> +#include <linux/debugfs.h>
> +#include <linux/ieee80211.h>
> +#include <linux/slab.h>
> +#include <linux/export.h>

Different types of includes should be grouped together, the #include
<linux/*> lines should go with their fellows at the top.

Overall, this is significantly improved over your first patch. Well Done.

Does anyone else have any comments about this?

Thanks,

-- 
Julian Calaby

Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/