Skip to content

Commit

Permalink
[PKT_SCHED]: GRED: Cleanup and remove unnecessary code
Browse files Browse the repository at this point in the history 
Removes unnecessary includes, initializers, and simplifies
the code a bit.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
  • Loading branch information
Thomas Graf authored and Thomas Graf committed Nov 5, 2005
1 parent 6214e65 commit 1e4dfaf
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 95 deletions.
48 changes: 22 additions & 26 deletions include/linux/pkt_sched.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,38 +194,34 @@ enum

#define TCA_GRED_MAX (__TCA_GRED_MAX - 1)

#define TCA_SET_OFF TCA_GRED_PARMS
struct tc_gred_qopt
{
__u32 limit; /* HARD maximal queue length (bytes)
*/
__u32 qth_min; /* Min average length threshold (bytes)
*/
__u32 qth_max; /* Max average length threshold (bytes)
*/
__u32 DP; /* upto 2^32 DPs */
__u32 backlog;
__u32 qave;
__u32 forced;
__u32 early;
__u32 other;
__u32 pdrop;

unsigned char Wlog; /* log(W) */
unsigned char Plog; /* log(P_max/(qth_max-qth_min)) */
unsigned char Scell_log; /* cell size for idle damping */
__u8 prio; /* prio of this VQ */
__u32 packets;
__u32 bytesin;
__u32 limit; /* HARD maximal queue length (bytes) */
__u32 qth_min; /* Min average length threshold (bytes) */
__u32 qth_max; /* Max average length threshold (bytes) */
__u32 DP; /* upto 2^32 DPs */
__u32 backlog;
__u32 qave;
__u32 forced;
__u32 early;
__u32 other;
__u32 pdrop;
__u8 Wlog; /* log(W) */
__u8 Plog; /* log(P_max/(qth_max-qth_min)) */
__u8 Scell_log; /* cell size for idle damping */
__u8 prio; /* prio of this VQ */
__u32 packets;
__u32 bytesin;
};

/* gred setup */
struct tc_gred_sopt
{
__u32 DPs;
__u32 def_DP;
__u8 grio;
__u8 pad1;
__u16 pad2;
__u32 DPs;
__u32 def_DP;
__u8 grio;
__u8 pad1;
__u16 pad2;
};

/* HTB section */
Expand Down
100 changes: 31 additions & 69 deletions net/sched/sch_gred.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,50 +15,18 @@
* from Ren Liu
* - More error checks
*
*
*
* For all the glorious comments look at Alexey's sch_red.c
* For all the glorious comments look at include/net/red.h
*/

#include <linux/config.h>
#include <linux/module.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/bitops.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/in.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/if_ether.h>
#include <linux/inet.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/notifier.h>
#include <net/ip.h>
#include <net/route.h>
#include <linux/skbuff.h>
#include <net/sock.h>
#include <net/pkt_sched.h>
#include <net/red.h>

#if 1 /* control */
#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
#else
#define DPRINTK(format,args...)
#endif

#if 0 /* data */
#define D2PRINTK(format,args...) printk(KERN_DEBUG format,##args)
#else
#define D2PRINTK(format,args...)
#endif

#define GRED_DEF_PRIO (MAX_DPs / 2)
#define GRED_VQ_MASK (MAX_DPs - 1)

Expand All @@ -72,7 +40,7 @@ struct gred_sched_data
u32 bytesin; /* bytes seen on virtualQ so far*/
u32 packetsin; /* packets seen on virtualQ so far*/
u32 backlog; /* bytes on the virtualQ */
u8 prio; /* the prio of this vq */
u8 prio; /* the prio of this vq */

struct red_parms parms;
struct red_stats stats;
Expand All @@ -87,8 +55,8 @@ struct gred_sched
{
struct gred_sched_data *tab[MAX_DPs];
unsigned long flags;
u32 DPs;
u32 def;
u32 DPs;
u32 def;
struct red_parms wred_set;
};

Expand Down Expand Up @@ -172,13 +140,11 @@ static inline void gred_store_wred_set(struct gred_sched *table,
table->wred_set.qavg = q->parms.qavg;
}

static int
gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)
static int gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)
{
struct gred_sched_data *q=NULL;
struct gred_sched *t= qdisc_priv(sch);
unsigned long qavg = 0;
int i=0;
u16 dp = tc_index_to_dp(skb);

if (dp >= t->DPs || (q = t->tab[dp]) == NULL) {
Expand All @@ -200,26 +166,23 @@ gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)
skb->tc_index = (skb->tc_index & ~GRED_VQ_MASK) | dp;
}

/* sum up all the qaves of prios <= to ours to get the new qave*/
/* sum up all the qaves of prios <= to ours to get the new qave */
if (!gred_wred_mode(t) && gred_rio_mode(t)) {
for (i=0;i<t->DPs;i++) {
if ((!t->tab[i]) || (i==q->DP))
continue;

if (t->tab[i]->prio < q->prio &&
int i;

for (i = 0; i < t->DPs; i++) {
if (t->tab[i] && t->tab[i]->prio < q->prio &&
!red_is_idling(&t->tab[i]->parms))
qavg +=t->tab[i]->parms.qavg;
}

}

q->packetsin++;
q->bytesin+=skb->len;
q->bytesin += skb->len;

if (gred_wred_mode(t)) {
qavg = 0;
if (gred_wred_mode(t))
gred_load_wred_set(t, q);
}

q->parms.qavg = red_calc_qavg(&q->parms, gred_backlog(t, q, sch));

Expand Down Expand Up @@ -258,8 +221,7 @@ gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)
return NET_XMIT_CN;
}

static int
gred_requeue(struct sk_buff *skb, struct Qdisc* sch)
static int gred_requeue(struct sk_buff *skb, struct Qdisc* sch)
{
struct gred_sched *t = qdisc_priv(sch);
struct gred_sched_data *q;
Expand All @@ -279,16 +241,15 @@ gred_requeue(struct sk_buff *skb, struct Qdisc* sch)
return qdisc_requeue(skb, sch);
}

static struct sk_buff *
gred_dequeue(struct Qdisc* sch)
static struct sk_buff *gred_dequeue(struct Qdisc* sch)
{
struct sk_buff *skb;
struct gred_sched_data *q;
struct gred_sched *t= qdisc_priv(sch);
struct gred_sched *t = qdisc_priv(sch);

skb = qdisc_dequeue_head(sch);

if (skb) {
struct gred_sched_data *q;
u16 dp = tc_index_to_dp(skb);

if (dp >= t->DPs || (q = t->tab[dp]) == NULL) {
Expand All @@ -315,13 +276,12 @@ gred_dequeue(struct Qdisc* sch)
static unsigned int gred_drop(struct Qdisc* sch)
{
struct sk_buff *skb;

struct gred_sched_data *q;
struct gred_sched *t= qdisc_priv(sch);
struct gred_sched *t = qdisc_priv(sch);

skb = qdisc_dequeue_tail(sch);
if (skb) {
unsigned int len = skb->len;
struct gred_sched_data *q;
u16 dp = tc_index_to_dp(skb);

if (dp >= t->DPs || (q = t->tab[dp]) == NULL) {
Expand Down Expand Up @@ -351,15 +311,16 @@ static unsigned int gred_drop(struct Qdisc* sch)
static void gred_reset(struct Qdisc* sch)
{
int i;
struct gred_sched_data *q;
struct gred_sched *t= qdisc_priv(sch);
struct gred_sched *t = qdisc_priv(sch);

qdisc_reset_queue(sch);

for (i=0;i<t->DPs;i++) {
q= t->tab[i];
if (!q)
continue;
for (i = 0; i < t->DPs; i++) {
struct gred_sched_data *q = t->tab[i];

if (!q)
continue;

red_restart(&q->parms);
q->backlog = 0;
}
Expand Down Expand Up @@ -590,15 +551,13 @@ static void gred_destroy(struct Qdisc *sch)
struct gred_sched *table = qdisc_priv(sch);
int i;

for (i = 0;i < table->DPs; i++) {
for (i = 0; i < table->DPs; i++) {
if (table->tab[i])
gred_destroy_vq(table->tab[i]);
}
}

static struct Qdisc_ops gred_qdisc_ops = {
.next = NULL,
.cl_ops = NULL,
.id = "gred",
.priv_size = sizeof(struct gred_sched),
.enqueue = gred_enqueue,
Expand All @@ -617,10 +576,13 @@ static int __init gred_module_init(void)
{
return register_qdisc(&gred_qdisc_ops);
}
static void __exit gred_module_exit(void)

static void __exit gred_module_exit(void)
{
unregister_qdisc(&gred_qdisc_ops);
}

module_init(gred_module_init)
module_exit(gred_module_exit)

MODULE_LICENSE("GPL");

0 comments on commit 1e4dfaf

Please sign in to comment.