* [patch net-next v2 07/11] tbf: ignore max_size check for gso skbs
From: Jiri Pirko @ 2013-02-08 18:59 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, jhs, kuznet, j.vimal
In-Reply-To: <1360349981-27801-1-git-send-email-jiri@resnulli.us>
This check made bigger packets incorrectly dropped. Remove this
limitation for gso skbs.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
---
net/sched/sch_tbf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index e05710a..dc562a8 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -121,7 +121,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch)
struct tbf_sched_data *q = qdisc_priv(sch);
int ret;
- if (qdisc_pkt_len(skb) > q->max_size)
+ if (qdisc_pkt_len(skb) > q->max_size && !skb_is_gso(skb))
return qdisc_reshape_fail(skb, sch);
ret = qdisc_enqueue(skb, q->qdisc);
--
1.8.1.2
^ permalink raw reply related
* [patch net-next v2 06/11] tbf: improved accuracy at high rates
From: Jiri Pirko @ 2013-02-08 18:59 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, jhs, kuznet, j.vimal
In-Reply-To: <1360349981-27801-1-git-send-email-jiri@resnulli.us>
Current TBF uses rate table computed by the "tc" userspace program,
which has the following issue:
The rate table has 256 entries to map packet lengths to
token (time units). With TSO sized packets, the 256 entry granularity
leads to loss/gain of rate, making the token bucket inaccurate.
Thus, instead of relying on rate table, this patch explicitly computes
the time and accounts for packet transmission times with nanosecond
granularity.
This is a followup to 56b765b79e9a78dc7d3f8850ba5e5567205a3ecd
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
---
net/sched/sch_tbf.c | 60 ++++++++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 31 deletions(-)
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 4b056c15..e05710a 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -19,6 +19,7 @@
#include <linux/errno.h>
#include <linux/skbuff.h>
#include <net/netlink.h>
+#include <net/sch_generic.h>
#include <net/pkt_sched.h>
@@ -100,23 +101,21 @@
struct tbf_sched_data {
/* Parameters */
u32 limit; /* Maximal length of backlog: bytes */
- u32 buffer; /* Token bucket depth/rate: MUST BE >= MTU/B */
+ s64 buffer; /* Token bucket depth/rate: MUST BE >= MTU/B */
u32 mtu;
u32 max_size;
- struct qdisc_rate_table *R_tab;
- struct qdisc_rate_table *P_tab;
+ struct psched_ratecfg rate;
+ struct psched_ratecfg peak;
+ bool peak_present;
/* Variables */
- long tokens; /* Current number of B tokens */
- long ptokens; /* Current number of P tokens */
+ s64 tokens; /* Current number of B tokens */
+ s64 ptokens; /* Current number of P tokens */
psched_time_t t_c; /* Time check-point */
struct Qdisc *qdisc; /* Inner qdisc, default - bfifo queue */
struct qdisc_watchdog watchdog; /* Watchdog timer */
};
-#define L2T(q, L) qdisc_l2t((q)->R_tab, L)
-#define L2T_P(q, L) qdisc_l2t((q)->P_tab, L)
-
static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch)
{
struct tbf_sched_data *q = qdisc_priv(sch);
@@ -157,23 +156,23 @@ static struct sk_buff *tbf_dequeue(struct Qdisc *sch)
if (skb) {
psched_time_t now;
- long toks;
- long ptoks = 0;
+ s64 toks;
+ s64 ptoks = 0;
unsigned int len = qdisc_pkt_len(skb);
- now = psched_get_time();
- toks = psched_tdiff_bounded(now, q->t_c, q->buffer);
+ now = ktime_to_ns(ktime_get());
+ toks = min_t(s64, now - q->t_c, q->buffer);
- if (q->P_tab) {
+ if (q->peak_present) {
ptoks = toks + q->ptokens;
if (ptoks > (long)q->mtu)
ptoks = q->mtu;
- ptoks -= L2T_P(q, len);
+ ptoks -= (s64) psched_l2t_ns(&q->peak, len);
}
toks += q->tokens;
- if (toks > (long)q->buffer)
+ if (toks > q->buffer)
toks = q->buffer;
- toks -= L2T(q, len);
+ toks -= (s64) psched_l2t_ns(&q->rate, len);
if ((toks|ptoks) >= 0) {
skb = qdisc_dequeue_peeked(q->qdisc);
@@ -214,7 +213,7 @@ static void tbf_reset(struct Qdisc *sch)
qdisc_reset(q->qdisc);
sch->q.qlen = 0;
- q->t_c = psched_get_time();
+ q->t_c = ktime_to_ns(ktime_get());
q->tokens = q->buffer;
q->ptokens = q->mtu;
qdisc_watchdog_cancel(&q->watchdog);
@@ -295,12 +294,17 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt)
q->limit = qopt->limit;
q->mtu = qopt->mtu;
q->max_size = max_size;
- q->buffer = qopt->buffer;
+ q->buffer = PSCHED_TICKS2NS(qopt->buffer);
q->tokens = q->buffer;
q->ptokens = q->mtu;
- swap(q->R_tab, rtab);
- swap(q->P_tab, ptab);
+ psched_ratecfg_precompute(&q->rate, rtab->rate.rate);
+ if (ptab) {
+ psched_ratecfg_precompute(&q->peak, ptab->rate.rate);
+ q->peak_present = true;
+ } else {
+ q->peak_present = false;
+ }
sch_tree_unlock(sch);
err = 0;
@@ -319,7 +323,7 @@ static int tbf_init(struct Qdisc *sch, struct nlattr *opt)
if (opt == NULL)
return -EINVAL;
- q->t_c = psched_get_time();
+ q->t_c = ktime_to_ns(ktime_get());
qdisc_watchdog_init(&q->watchdog, sch);
q->qdisc = &noop_qdisc;
@@ -331,12 +335,6 @@ static void tbf_destroy(struct Qdisc *sch)
struct tbf_sched_data *q = qdisc_priv(sch);
qdisc_watchdog_cancel(&q->watchdog);
-
- if (q->P_tab)
- qdisc_put_rtab(q->P_tab);
- if (q->R_tab)
- qdisc_put_rtab(q->R_tab);
-
qdisc_destroy(q->qdisc);
}
@@ -352,13 +350,13 @@ static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb)
goto nla_put_failure;
opt.limit = q->limit;
- opt.rate = q->R_tab->rate;
- if (q->P_tab)
- opt.peakrate = q->P_tab->rate;
+ opt.rate.rate = psched_ratecfg_getrate(&q->rate);
+ if (q->peak_present)
+ opt.peakrate.rate = psched_ratecfg_getrate(&q->peak);
else
memset(&opt.peakrate, 0, sizeof(opt.peakrate));
opt.mtu = q->mtu;
- opt.buffer = q->buffer;
+ opt.buffer = PSCHED_NS2TICKS(q->buffer);
if (nla_put(skb, TCA_TBF_PARMS, sizeof(opt), &opt))
goto nla_put_failure;
--
1.8.1.2
^ permalink raw reply related
* [patch net-next v2 05/11] sch: make htb_rate_cfg and functions around that generic
From: Jiri Pirko @ 2013-02-08 18:59 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, jhs, kuznet, j.vimal
In-Reply-To: <1360349981-27801-1-git-send-email-jiri@resnulli.us>
As it is going to be used in tbf as well, push these to generic code.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
---
include/net/sch_generic.h | 19 ++++++++++++++
net/sched/sch_generic.c | 37 +++++++++++++++++++++++++++
net/sched/sch_htb.c | 65 +++++++----------------------------------------
3 files changed, 65 insertions(+), 56 deletions(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 2d06c2a..2761c90 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -679,4 +679,23 @@ static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask,
}
#endif
+struct psched_ratecfg {
+ u64 rate_bps;
+ u32 mult;
+ u32 shift;
+};
+
+static inline u64 psched_l2t_ns(const struct psched_ratecfg *r,
+ unsigned int len)
+{
+ return ((u64)len * r->mult) >> r->shift;
+}
+
+extern void psched_ratecfg_precompute(struct psched_ratecfg *r, u32 rate);
+
+static inline u32 psched_ratecfg_getrate(const struct psched_ratecfg *r)
+{
+ return r->rate_bps >> 3;
+}
+
#endif
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 5d81a44..ffad481 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -25,6 +25,7 @@
#include <linux/rcupdate.h>
#include <linux/list.h>
#include <linux/slab.h>
+#include <net/sch_generic.h>
#include <net/pkt_sched.h>
#include <net/dst.h>
@@ -896,3 +897,39 @@ void dev_shutdown(struct net_device *dev)
WARN_ON(timer_pending(&dev->watchdog_timer));
}
+
+void psched_ratecfg_precompute(struct psched_ratecfg *r, u32 rate)
+{
+ u64 factor;
+ u64 mult;
+ int shift;
+
+ r->rate_bps = rate << 3;
+ r->shift = 0;
+ r->mult = 1;
+ /*
+ * Calibrate mult, shift so that token counting is accurate
+ * for smallest packet size (64 bytes). Token (time in ns) is
+ * computed as (bytes * 8) * NSEC_PER_SEC / rate_bps. It will
+ * work as long as the smallest packet transfer time can be
+ * accurately represented in nanosec.
+ */
+ if (r->rate_bps > 0) {
+ /*
+ * Higher shift gives better accuracy. Find the largest
+ * shift such that mult fits in 32 bits.
+ */
+ for (shift = 0; shift < 16; shift++) {
+ r->shift = shift;
+ factor = 8LLU * NSEC_PER_SEC * (1 << r->shift);
+ mult = div64_u64(factor, r->rate_bps);
+ if (mult > UINT_MAX)
+ break;
+ }
+
+ r->shift = shift - 1;
+ factor = 8LLU * NSEC_PER_SEC * (1 << r->shift);
+ r->mult = div64_u64(factor, r->rate_bps);
+ }
+}
+EXPORT_SYMBOL(psched_ratecfg_precompute);
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 2b22544..03c2692 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -38,6 +38,7 @@
#include <linux/workqueue.h>
#include <linux/slab.h>
#include <net/netlink.h>
+#include <net/sch_generic.h>
#include <net/pkt_sched.h>
/* HTB algorithm.
@@ -71,12 +72,6 @@ enum htb_cmode {
HTB_CAN_SEND /* class can send */
};
-struct htb_rate_cfg {
- u64 rate_bps;
- u32 mult;
- u32 shift;
-};
-
/* interior & leaf nodes; props specific to leaves are marked L: */
struct htb_class {
struct Qdisc_class_common common;
@@ -124,8 +119,8 @@ struct htb_class {
int filter_cnt;
/* token bucket parameters */
- struct htb_rate_cfg rate;
- struct htb_rate_cfg ceil;
+ struct psched_ratecfg rate;
+ struct psched_ratecfg ceil;
s64 buffer, cbuffer; /* token bucket depth/rate */
psched_tdiff_t mbuffer; /* max wait time */
s64 tokens, ctokens; /* current number of tokens */
@@ -168,45 +163,6 @@ struct htb_sched {
struct work_struct work;
};
-static u64 l2t_ns(struct htb_rate_cfg *r, unsigned int len)
-{
- return ((u64)len * r->mult) >> r->shift;
-}
-
-static void htb_precompute_ratedata(struct htb_rate_cfg *r)
-{
- u64 factor;
- u64 mult;
- int shift;
-
- r->shift = 0;
- r->mult = 1;
- /*
- * Calibrate mult, shift so that token counting is accurate
- * for smallest packet size (64 bytes). Token (time in ns) is
- * computed as (bytes * 8) * NSEC_PER_SEC / rate_bps. It will
- * work as long as the smallest packet transfer time can be
- * accurately represented in nanosec.
- */
- if (r->rate_bps > 0) {
- /*
- * Higher shift gives better accuracy. Find the largest
- * shift such that mult fits in 32 bits.
- */
- for (shift = 0; shift < 16; shift++) {
- r->shift = shift;
- factor = 8LLU * NSEC_PER_SEC * (1 << r->shift);
- mult = div64_u64(factor, r->rate_bps);
- if (mult > UINT_MAX)
- break;
- }
-
- r->shift = shift - 1;
- factor = 8LLU * NSEC_PER_SEC * (1 << r->shift);
- r->mult = div64_u64(factor, r->rate_bps);
- }
-}
-
/* find class in global hash table using given handle */
static inline struct htb_class *htb_find(u32 handle, struct Qdisc *sch)
{
@@ -632,7 +588,7 @@ static inline void htb_accnt_tokens(struct htb_class *cl, int bytes, s64 diff)
if (toks > cl->buffer)
toks = cl->buffer;
- toks -= (s64) l2t_ns(&cl->rate, bytes);
+ toks -= (s64) psched_l2t_ns(&cl->rate, bytes);
if (toks <= -cl->mbuffer)
toks = 1 - cl->mbuffer;
@@ -645,7 +601,7 @@ static inline void htb_accnt_ctokens(struct htb_class *cl, int bytes, s64 diff)
if (toks > cl->cbuffer)
toks = cl->cbuffer;
- toks -= (s64) l2t_ns(&cl->ceil, bytes);
+ toks -= (s64) psched_l2t_ns(&cl->ceil, bytes);
if (toks <= -cl->mbuffer)
toks = 1 - cl->mbuffer;
@@ -1134,9 +1090,9 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
memset(&opt, 0, sizeof(opt));
- opt.rate.rate = cl->rate.rate_bps >> 3;
+ opt.rate.rate = psched_ratecfg_getrate(&cl->rate);
opt.buffer = PSCHED_NS2TICKS(cl->buffer);
- opt.ceil.rate = cl->ceil.rate_bps >> 3;
+ opt.ceil.rate = psched_ratecfg_getrate(&cl->ceil);
opt.cbuffer = PSCHED_NS2TICKS(cl->cbuffer);
opt.quantum = cl->quantum;
opt.prio = cl->prio;
@@ -1503,11 +1459,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
cl->prio = TC_HTB_NUMPRIO - 1;
}
- cl->rate.rate_bps = (u64)hopt->rate.rate << 3;
- cl->ceil.rate_bps = (u64)hopt->ceil.rate << 3;
-
- htb_precompute_ratedata(&cl->rate);
- htb_precompute_ratedata(&cl->ceil);
+ psched_ratecfg_precompute(&cl->rate, hopt->rate.rate);
+ psched_ratecfg_precompute(&cl->ceil, hopt->ceil.rate);
cl->buffer = PSCHED_TICKS2NS(hopt->buffer);
cl->cbuffer = PSCHED_TICKS2NS(hopt->buffer);
--
1.8.1.2
^ permalink raw reply related
* [patch net-next v2 04/11] htb: initialize cl->tokens and cl->ctokens correctly
From: Jiri Pirko @ 2013-02-08 18:59 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, jhs, kuznet, j.vimal
In-Reply-To: <1360349981-27801-1-git-send-email-jiri@resnulli.us>
These are in ns so convert from ticks to ns.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
---
net/sched/sch_htb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 547912e9..2b22544 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1459,8 +1459,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
cl->parent = parent;
/* set class to be in HTB_CAN_SEND state */
- cl->tokens = hopt->buffer;
- cl->ctokens = hopt->cbuffer;
+ cl->tokens = PSCHED_TICKS2NS(hopt->buffer);
+ cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer);
cl->mbuffer = 60 * PSCHED_TICKS_PER_SEC; /* 1min */
cl->t_c = psched_get_time();
cl->cmode = HTB_CAN_SEND;
--
1.8.1.2
^ permalink raw reply related
* [patch net-next v2 03/11] htb: remove pointless first initialization of buffer and cbuffer
From: Jiri Pirko @ 2013-02-08 18:59 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, jhs, kuznet, j.vimal
In-Reply-To: <1360349981-27801-1-git-send-email-jiri@resnulli.us>
these are initialized correctly couple of lines later in the function.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
---
net/sched/sch_htb.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 14a83dc..547912e9 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1503,9 +1503,6 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
cl->prio = TC_HTB_NUMPRIO - 1;
}
- cl->buffer = hopt->buffer;
- cl->cbuffer = hopt->cbuffer;
-
cl->rate.rate_bps = (u64)hopt->rate.rate << 3;
cl->ceil.rate_bps = (u64)hopt->ceil.rate << 3;
--
1.8.1.2
^ permalink raw reply related
* [patch net-next v2 02/11] htb: fix values in opt dump
From: Jiri Pirko @ 2013-02-08 18:59 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, jhs, kuznet, j.vimal
In-Reply-To: <1360349981-27801-1-git-send-email-jiri@resnulli.us>
in htb_change_class() cl->buffer and cl->buffer are stored in ns.
So in dump, convert them back to psched ticks.
Note this was introduced by:
commit 56b765b79e9a78dc7d3f8850ba5e5567205a3ecd
htb: improved accuracy at high rates
Please consider this for -net/-stable.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
---
net/sched/sch_htb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 476992c..14a83dc 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1135,9 +1135,9 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
memset(&opt, 0, sizeof(opt));
opt.rate.rate = cl->rate.rate_bps >> 3;
- opt.buffer = cl->buffer;
+ opt.buffer = PSCHED_NS2TICKS(cl->buffer);
opt.ceil.rate = cl->ceil.rate_bps >> 3;
- opt.cbuffer = cl->cbuffer;
+ opt.cbuffer = PSCHED_NS2TICKS(cl->cbuffer);
opt.quantum = cl->quantum;
opt.prio = cl->prio;
opt.level = cl->level;
--
1.8.1.2
^ permalink raw reply related
* [patch net-next v2 01/11] htb: use PSCHED_TICKS2NS()
From: Jiri Pirko @ 2013-02-08 18:59 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, jhs, kuznet, j.vimal
In-Reply-To: <1360349981-27801-1-git-send-email-jiri@resnulli.us>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
---
net/sched/sch_htb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 51561ea..476992c 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1512,8 +1512,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
htb_precompute_ratedata(&cl->rate);
htb_precompute_ratedata(&cl->ceil);
- cl->buffer = hopt->buffer << PSCHED_SHIFT;
- cl->cbuffer = hopt->buffer << PSCHED_SHIFT;
+ cl->buffer = PSCHED_TICKS2NS(hopt->buffer);
+ cl->cbuffer = PSCHED_TICKS2NS(hopt->buffer);
sch_tree_unlock(sch);
--
1.8.1.2
^ permalink raw reply related
* [patch net-next v2 00/11] couple of net/sched fixes+improvements
From: Jiri Pirko @ 2013-02-08 18:59 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, jhs, kuznet, j.vimal
v1->v2:
- made struct psched_ratecfg const in params of couple of inline functions
(patch "sch: make htb_rate_cfg and functions around that generic")
- fixes misspelled "peak"
(patch "tbf: improved accuracy at high rates")
- added last 4 patches to this set
Jiri Pirko (11):
htb: use PSCHED_TICKS2NS()
htb: fix values in opt dump
htb: remove pointless first initialization of buffer and cbuffer
htb: initialize cl->tokens and cl->ctokens correctly
sch: make htb_rate_cfg and functions around that generic
tbf: improved accuracy at high rates
tbf: ignore max_size check for gso skbs
tbf: fix value set for q->ptokens
act_police: move struct tcf_police to act_police.c
act_police: improved accuracy at high rates
act_police: remove <=mtu check for gso skbs
include/net/act_api.h | 15 ------
include/net/sch_generic.h | 19 +++++++
net/sched/act_police.c | 124 +++++++++++++++++++++++++---------------------
net/sched/sch_generic.c | 37 ++++++++++++++
net/sched/sch_htb.c | 80 ++++++------------------------
net/sched/sch_tbf.c | 71 +++++++++++++-------------
6 files changed, 173 insertions(+), 173 deletions(-)
--
1.8.1.2
^ permalink raw reply
* Re: [PATCH] linux-3.8-rc6 Fix Missing Allocation Failure Checks
From: David Miller @ 2013-02-08 18:50 UTC (permalink / raw)
To: syrine.tl; +Cc: matt.fleming, sage, isdn, megaraidlinux, linux-kernel, netdev
In-Reply-To: <CAETb2JMQ05RGuBuaoD39Db1j9--sth-3u+JXG6jaZkTvQyVkPw@mail.gmail.com>
From: syrine tlili <syrine.tl@gmail.com>
Date: Fri, 8 Feb 2013 15:35:52 +0100
> --- linux-3.8-rc6-vanilla/arch/x86/platform/efi/efi.c 2013-02-01
> 02:08:14.000000000 +0100
Your email client corrupted the patch by breaking up long lines
amongst other things.
Please read Documentation/email-clients.txt to learn how to fix
this properly.
Before posting this patch for yet another time, email the patch to
yourself, and do not post the patch until you can successfully apply
the patch you receive in that test email to yourself.
Thanks.
^ permalink raw reply
* Re: [PATCH] rtlwifi: rtl8192cu: Add new USB ID
From: Larry Finger @ 2013-02-08 18:50 UTC (permalink / raw)
To: Joe Perches; +Cc: linville, linux-wireless, netdev, Stable
In-Reply-To: <1360348677.2268.7.camel@joe-AO722>
On 02/08/2013 12:37 PM, Joe Perches wrote:
> On Fri, 2013-02-08 at 12:28 -0600, Larry Finger wrote:
>> A new model of the RTL8188CUS has appeared.
> []
>> diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
>> index 577c0dc..a73a17b 100644
>> --- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
>> +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
>> @@ -285,6 +285,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {
>> {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},
>> /* RTL8188CUS-VL */
>> {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)},
>> + {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x819a, rtl92cu_hal_cfg)},
>> /* 8188 Combo for BC4 */
>> {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
>
> One day would you please do a s/_VENDOR_/_VENDOR_/g
Sure, even though that particular command would not accomplish what you want. I
know what you meant. :)
Larry
^ permalink raw reply
* RE: [E1000-devel] How to enable Adaptive RX on
From: Wyborny, Carolyn @ 2013-02-08 18:47 UTC (permalink / raw)
To: Dhanasekaran Anbalagan; +Cc: e1000-devel, netdev, Ben Hutchings
In-Reply-To: <CAJzooYdDQ4hHEpeJ+XV=+QvpqBST5r53RuY8R-4Y9=1xyAGwmw@mail.gmail.com>
> -----Original Message-----
> From: Dhanasekaran Anbalagan [mailto:bugcy013@gmail.com]
> Sent: Tuesday, February 05, 2013 12:14 PM
> To: Ben Hutchings
> Cc: e1000-devel; netdev
> Subject: Re: [E1000-devel] How to enable Adaptive RX on
>
> Hi Bean,
>
> Is there any specific modules here, we need enable the coalescing, with our
> kernel so the Adaptive RX turn on.
>
> please guide me.
I am the igb driver owner at Intel. Ben is correct, igb does not have an adaptive coalescing implementation. We have implemented instead the rx_usecs parameter you can use to set an interrupt rate that optimizes your traffic scenario. Start with a value in the range of 2000 to 3000 and adjust up or down in order to find the best setting. You will be likely wanting maximum throughput without too much cpu utilization.
Thanks,
Carolyn
Carolyn Wyborny
Linux Development
Networking Division
Intel Corporation
^ permalink raw reply
* Re: [PATCH] rtlwifi: rtl8192cu: Add new USB ID
From: Joe Perches @ 2013-02-08 18:37 UTC (permalink / raw)
To: Larry Finger; +Cc: linville, linux-wireless, netdev, Stable
In-Reply-To: <1360348098-8687-1-git-send-email-Larry.Finger@lwfinger.net>
On Fri, 2013-02-08 at 12:28 -0600, Larry Finger wrote:
> A new model of the RTL8188CUS has appeared.
[]
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
> index 577c0dc..a73a17b 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
> @@ -285,6 +285,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {
> {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},
> /* RTL8188CUS-VL */
> {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)},
> + {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x819a, rtl92cu_hal_cfg)},
> /* 8188 Combo for BC4 */
> {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
One day would you please do a s/_VENDOR_/_VENDOR_/g
^ permalink raw reply
* Re: [PATCH] tg3: Add BCM57766 to PCI device table
From: Nithin Nayak Sujir @ 2013-02-08 18:27 UTC (permalink / raw)
To: Joerie de Gram; +Cc: mchan, netdev
In-Reply-To: <1360279864-8732-1-git-send-email-j.de.gram@gmail.com>
On 02/07/2013 03:31 PM, Joerie de Gram wrote:
> The BCM57766 (as found in recent Apple mac mini models) appears to be
> supported by the driver, but lacks an entry in the PCI device table.
>
Hi Joerie,
There is some additional code that needs to go in along with the 57766 device ID.
We have a combined patchset that we will be posting shortly.
Thanks,
Nithin.
> Signed-off-by: Joerie de Gram <j.de.gram@gmail.com>
> ---
> drivers/net/ethernet/broadcom/tg3.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
> index bdb0869..214b27e 100644
> --- a/drivers/net/ethernet/broadcom/tg3.c
> +++ b/drivers/net/ethernet/broadcom/tg3.c
> @@ -323,6 +323,7 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
> {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57785)},
> {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57761)},
> {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57765)},
> + {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57766)},
> {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57791),
> .driver_data = TG3_DRV_DATA_FLAG_10_100_ONLY},
> {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57795),
>
^ permalink raw reply
* [PATCH] rtlwifi: rtl8192cu: Add new USB ID
From: Larry Finger @ 2013-02-08 18:28 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry Finger, netdev, Stable
A new model of the RTL8188CUS has appeared.
Reported-and-tested-by: Thomas Rosenkrantz <tom.rosary@googlemail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
---
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 577c0dc..a73a17b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -285,6 +285,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {
{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},
/* RTL8188CUS-VL */
{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x819a, rtl92cu_hal_cfg)},
/* 8188 Combo for BC4 */
{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
--
1.8.1
^ permalink raw reply related
* SS utility and UDP Sockets
From: Jonathan @ 2013-02-08 18:20 UTC (permalink / raw)
To: netdev
Hello:
I apologize in advance if this isn't the right mailing list for this
question.
I think I've found a bug in the "ss" command from the iproute2 package.
The "ss" command is not listing UDP sockets when given the "-4 -a"
option combination. Since TCP and UDP sockets can both be IPv4, this is
somewhat unexpected.
As you can see below, this seems to be a bug in the option parsing, as
it works as expected when combined with the "-tu" or "-u" options. (I
expected the output of "ss -4 -a" and "ss -tu -4 -a" to be identical.)
[root@router-20130128 xinetd.d]# ss -4 -a
State Recv-Q Send-Q Local
Address:Port Peer Address:Port
LISTEN 0 64 *:time *:*
LISTEN 0 128 *:ssh
*:*
ESTAB 0 0 172.30.1.72:ssh 172.30.1.61:43687
ESTAB 0 0 172.30.1.72:ssh 172.30.1.61:43602
[root@router-20130128 xinetd.d]# ss -tu -4 -a
Netid State Recv-Q Send-Q Local
Address:Port Peer Address:Port
udp UNCONN 0 0
*:time *:*
tcp LISTEN 0 64
*:time *:*
tcp LISTEN 0 128
*:ssh *:*
tcp ESTAB 0 0 172.30.1.72:ssh 172.30.1.61:43687
tcp ESTAB 0 0 172.30.1.72:ssh 172.30.1.61:43602
[root@router-20130128 xinetd.d]# ss -4 -u -a
State Recv-Q Send-Q Local
Address:Port Peer Address:Port
UNCONN 0 0 *:time *:*
I'm using the "iproute2 3.6.0-2" package from Arch Linux.
Thanks!
Jonathan
^ permalink raw reply
* Re: [PATCH] netpoll: cleanup sparse warnings
From: Neil Horman @ 2013-02-08 18:14 UTC (permalink / raw)
To: Eric Dumazet; +Cc: netdev, fengguang.wu, David Miller
In-Reply-To: <1360341883.28557.106.camel@edumazet-glaptop>
On Fri, Feb 08, 2013 at 08:44:43AM -0800, Eric Dumazet wrote:
> On Fri, 2013-02-08 at 10:47 -0500, Neil Horman wrote:
>
> > Actually, I think all we need to do is take the rcu_read_lock and use
> > rcu_dereference directly. __netpoll_cleanup doesn't actually change the
> > dev->npinfo pointer itself, thats handled by the caller, always under protection
> > of the rtnl, so here we just need to ensure that no one changes npifo while
> > we're using it
>
> SGTM ;)
>
Testing it out now. The more I look at this the more I'm concerned that there
are other problems with netpoll in the release path. Shocking...I know :)
Neil
>
>
^ permalink raw reply
* Re: [PATCH v5 00/45] CPU hotplug: stop_machine()-free CPU hotplug
From: Srivatsa S. Bhat @ 2013-02-08 18:09 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: linux-doc, peterz, fweisbec, linux-kernel, walken, mingo,
linux-arch, xiaoguangrong, wangyun, paulmck, nikunj, linux-pm,
Rusty Russell, rostedt, rjw, namhyung, tglx, linux-arm-kernel,
netdev, oleg, sbw, tj, akpm, linuxppc-dev, vincent.guittot
In-Reply-To: <51152B81.2050501@linux.vnet.ibm.com>
On 02/08/2013 10:14 PM, Srivatsa S. Bhat wrote:
> On 02/08/2013 09:11 PM, Russell King - ARM Linux wrote:
>> On Thu, Feb 07, 2013 at 11:41:34AM +0530, Srivatsa S. Bhat wrote:
>>> On 02/07/2013 09:44 AM, Rusty Russell wrote:
>>>> "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com> writes:
>>>>> On 01/22/2013 01:03 PM, Srivatsa S. Bhat wrote:
>>>>> Avg. latency of 1 CPU offline (ms) [stop-cpu/stop-m/c latency]
>>>>>
>>>>> # online CPUs Mainline (with stop-m/c) This patchset (no stop-m/c)
>>>>>
>>>>> 8 17.04 7.73
>>>>>
>>>>> 16 18.05 6.44
>>>>>
>>>>> 32 17.31 7.39
>>>>>
>>>>> 64 32.40 9.28
>>>>>
>>>>> 128 98.23 7.35
>>>>
>>>> Nice!
>>>
>>> Thank you :-)
>>>
>>>> I wonder how the ARM guys feel with their quad-cpu systems...
>>>>
>>>
>>> That would be definitely interesting to know :-)
>>
>> That depends what exactly you'd like tested (and how) and whether you'd
>> like it to be a test-chip based quad core, or an OMAP dual-core SoC.
>>
>
> The effect of stop_machine() doesn't really depend on the CPU architecture
> used underneath or the platform. It depends only on the _number_ of
> _logical_ CPUs used.
>
> And stop_machine() has 2 noticeable drawbacks:
> 1. It makes the hotplug operation itself slow
> 2. and it causes disruptions to the workloads running on the other
> CPUs by hijacking the entire machine for significant amounts of time.
>
> In my experiments (mentioned above), I tried to measure how my patchset
> improves (reduces) the duration of hotplug (CPU offline) itself. Which is
> also slightly indicative of the impact it has on the rest of the system.
>
> But what would be nice to test, is a setup where the workloads running on
> the rest of the system are latency-sensitive, and measure the impact of
> CPU offline on them, with this patchset applied. That would tell us how
> far is this useful in making CPU hotplug less disruptive on the system.
>
> Of course, it would be nice to also see whether we observe any reduction
> in hotplug duration itself (point 1 above) on ARM platforms with lot
> of CPUs. [This could potentially speed up suspend/resume, which is used
> rather heavily on ARM platforms].
>
> The benefits from this patchset over mainline (both in terms of points
> 1 and 2 above) is expected to increase, with increasing number of CPUs in
> the system.
>
Adding Vincent to CC, who had previously evaluated the performance and
latency implications of CPU hotplug on ARM platforms, IIRC.
Regards,
Srivatsa S. Bhat
^ permalink raw reply
* Re: [net-next 05/10] igb: Update igb to use a path similar to ixgbe to determine when to stop Tx
From: Alexander Duyck @ 2013-02-08 17:11 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Jeff Kirsher, davem, netdev, gospo, sassmann
In-Reply-To: <1360326369.28557.95.camel@edumazet-glaptop>
On 2/8/2013 4:26 AM, Eric Dumazet wrote:
> On Fri, 2013-02-08 at 02:39 -0800, Jeff Kirsher wrote:
>> From: Alexander Duyck <alexander.h.duyck@intel.com>
>>
>> After reviewing the igb and ixgbe code I realized there are a few issues in
>> how the code is structured. Specifically we are not checking the size of the
>> buffers being used in transmits and we are not using the same value to
>> determine when to stop or start a Tx queue. As such the code is prone to be
>> buggy.
>>
>> This patch makes it so that we have one value DESC_NEEDED that we will use for
>> starting and stopping the queue. In addition we will check the size of
>> buffers being used when setting up a transmit so as to avoid a possible buffer
>> overrun if we were to receive a frame with a block of data larger than 32K in
>> skb->data.
>>
>> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
>> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> ---
>> drivers/net/ethernet/intel/igb/igb.h | 13 +++++++++++--
>> drivers/net/ethernet/intel/igb/igb_main.c | 32 ++++++++++++++++++-------------
>> 2 files changed, 30 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
>> index afdb8bb..d27edbc 100644
>> --- a/drivers/net/ethernet/intel/igb/igb.h
>> +++ b/drivers/net/ethernet/intel/igb/igb.h
>> @@ -139,8 +139,6 @@ struct vf_data_storage {
>> #define IGB_RX_HDR_LEN IGB_RXBUFFER_256
>> #define IGB_RX_BUFSZ IGB_RXBUFFER_2048
>>
>> -/* How many Tx Descriptors do we need to call netif_wake_queue ? */
>> -#define IGB_TX_QUEUE_WAKE 16
>> /* How many Rx Buffers do we bundle into one write to the hardware ? */
>> #define IGB_RX_BUFFER_WRITE 16 /* Must be power of 2 */
>>
>> @@ -169,6 +167,17 @@ enum igb_tx_flags {
>> #define IGB_TX_FLAGS_VLAN_MASK 0xffff0000
>> #define IGB_TX_FLAGS_VLAN_SHIFT 16
>>
>> +/*
>> + * The largest size we can write to the descriptor is 65535. In order to
>> + * maintain a power of two alignment we have to limit ourselves to 32K.
>> + */
>> +#define IGB_MAX_TXD_PWR 15
>> +#define IGB_MAX_DATA_PER_TXD (1 << IGB_MAX_TXD_PWR)
>> +
>> +/* Tx Descriptors needed, worst case */
>> +#define TXD_USE_COUNT(S) DIV_ROUND_UP((S), IGB_MAX_DATA_PER_TXD)
>> +#define DESC_NEEDED (MAX_SKB_FRAGS + 4)
>> +
>> /* wrapper around a pointer to a socket buffer,
>> * so a DMA handle can be stored along with the buffer */
>> struct igb_tx_buffer {
>> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
>> index ebf8384..e69dd4f 100644
>> --- a/drivers/net/ethernet/intel/igb/igb_main.c
>> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
>> @@ -4434,13 +4434,6 @@ static void igb_tx_olinfo_status(struct igb_ring *tx_ring,
>> tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
>> }
>>
>> -/*
>> - * The largest size we can write to the descriptor is 65535. In order to
>> - * maintain a power of two alignment we have to limit ourselves to 32K.
>> - */
>> -#define IGB_MAX_TXD_PWR 15
>> -#define IGB_MAX_DATA_PER_TXD (1<<IGB_MAX_TXD_PWR)
>> -
>> static void igb_tx_map(struct igb_ring *tx_ring,
>> struct igb_tx_buffer *first,
>> const u8 hdr_len)
>> @@ -4609,15 +4602,27 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
>> struct igb_tx_buffer *first;
>> int tso;
>> u32 tx_flags = 0;
>> +#if PAGE_SIZE > IGB_MAX_DATA_PER_TXD
>> + unsigned short f;
>> +#endif
>> + u16 count = TXD_USE_COUNT(skb_headlen(skb));
>> __be16 protocol = vlan_get_protocol(skb);
>> u8 hdr_len = 0;
>>
>> - /* need: 1 descriptor per page,
>> + /*
>> + * need: 1 descriptor per page * PAGE_SIZE/IGB_MAX_DATA_PER_TXD,
>> + * + 1 desc for skb_headlen/IGB_MAX_DATA_PER_TXD,
>> * + 2 desc gap to keep tail from touching head,
>> - * + 1 desc for skb->data,
>> * + 1 desc for context descriptor,
>> - * otherwise try next time */
>> - if (igb_maybe_stop_tx(tx_ring, skb_shinfo(skb)->nr_frags + 4)) {
>> + * otherwise try next time
>> + */
>> +#if PAGE_SIZE > IGB_MAX_DATA_PER_TXD
> This code assumes a frag is at most PAGE_SIZE, but its not true.
>
>> + for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
>> + count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);
>> +#else
>> + count += skb_shinfo(skb)->nr_frags;
>> +#endif
> Current practical limit is 32768 bytes on x86
For igb the IGB_MAX_DATA_PER_TXD is 32K as well. So if I am not
mistaken we should be fine. The only time we risk exceeding that is if
we have 64K page size. It sounds like we may need to work in the ixgbe
driver though since I believe the limit for it is only 16K per descriptor.
I will also submit an update for this patch that replaces PAGE_SIZE with
NETDEV_FRAG_PAGE_MAX_SIZE in order to keep the two in sync.
Thanks,
Alex
^ permalink raw reply
* Re: [PATCH v5 00/45] CPU hotplug: stop_machine()-free CPU hotplug
From: Srivatsa S. Bhat @ 2013-02-08 16:44 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: linux-doc, peterz, fweisbec, linux-kernel, walken, mingo,
linux-arch, xiaoguangrong, wangyun, paulmck, nikunj, linux-pm,
Rusty Russell, rostedt, rjw, namhyung, tglx, linux-arm-kernel,
netdev, oleg, sbw, tj, akpm, linuxppc-dev
In-Reply-To: <20130208154113.GV17833@n2100.arm.linux.org.uk>
On 02/08/2013 09:11 PM, Russell King - ARM Linux wrote:
> On Thu, Feb 07, 2013 at 11:41:34AM +0530, Srivatsa S. Bhat wrote:
>> On 02/07/2013 09:44 AM, Rusty Russell wrote:
>>> "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com> writes:
>>>> On 01/22/2013 01:03 PM, Srivatsa S. Bhat wrote:
>>>> Avg. latency of 1 CPU offline (ms) [stop-cpu/stop-m/c latency]
>>>>
>>>> # online CPUs Mainline (with stop-m/c) This patchset (no stop-m/c)
>>>>
>>>> 8 17.04 7.73
>>>>
>>>> 16 18.05 6.44
>>>>
>>>> 32 17.31 7.39
>>>>
>>>> 64 32.40 9.28
>>>>
>>>> 128 98.23 7.35
>>>
>>> Nice!
>>
>> Thank you :-)
>>
>>> I wonder how the ARM guys feel with their quad-cpu systems...
>>>
>>
>> That would be definitely interesting to know :-)
>
> That depends what exactly you'd like tested (and how) and whether you'd
> like it to be a test-chip based quad core, or an OMAP dual-core SoC.
>
The effect of stop_machine() doesn't really depend on the CPU architecture
used underneath or the platform. It depends only on the _number_ of
_logical_ CPUs used.
And stop_machine() has 2 noticeable drawbacks:
1. It makes the hotplug operation itself slow
2. and it causes disruptions to the workloads running on the other
CPUs by hijacking the entire machine for significant amounts of time.
In my experiments (mentioned above), I tried to measure how my patchset
improves (reduces) the duration of hotplug (CPU offline) itself. Which is
also slightly indicative of the impact it has on the rest of the system.
But what would be nice to test, is a setup where the workloads running on
the rest of the system are latency-sensitive, and measure the impact of
CPU offline on them, with this patchset applied. That would tell us how
far is this useful in making CPU hotplug less disruptive on the system.
Of course, it would be nice to also see whether we observe any reduction
in hotplug duration itself (point 1 above) on ARM platforms with lot
of CPUs. [This could potentially speed up suspend/resume, which is used
rather heavily on ARM platforms].
The benefits from this patchset over mainline (both in terms of points
1 and 2 above) is expected to increase, with increasing number of CPUs in
the system.
Regards,
Srivatsa S. Bhat
^ permalink raw reply
* Re: [PATCH] netpoll: cleanup sparse warnings
From: Eric Dumazet @ 2013-02-08 16:44 UTC (permalink / raw)
To: Neil Horman; +Cc: netdev, fengguang.wu, David Miller
In-Reply-To: <20130208154727.GB8771@hmsreliant.think-freely.org>
On Fri, 2013-02-08 at 10:47 -0500, Neil Horman wrote:
> Actually, I think all we need to do is take the rcu_read_lock and use
> rcu_dereference directly. __netpoll_cleanup doesn't actually change the
> dev->npinfo pointer itself, thats handled by the caller, always under protection
> of the rtnl, so here we just need to ensure that no one changes npifo while
> we're using it
SGTM ;)
^ permalink raw reply
* Re: [patch net-next 7/7] tbf: ignore max_size check for gso skbs
From: Eric Dumazet @ 2013-02-08 16:43 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, edumazet, jhs, kuznet
In-Reply-To: <1360328327-7144-8-git-send-email-jiri@resnulli.us>
On Fri, 2013-02-08 at 13:58 +0100, Jiri Pirko wrote:
> This check made bigger packets incorrectly dropped. Remove this
> limitation for gso skbs.
>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
> net/sched/sch_tbf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
> index 35bfd49..7ee5bff 100644
> --- a/net/sched/sch_tbf.c
> +++ b/net/sched/sch_tbf.c
> @@ -121,7 +121,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch)
> struct tbf_sched_data *q = qdisc_priv(sch);
> int ret;
>
> - if (qdisc_pkt_len(skb) > q->max_size)
> + if (qdisc_pkt_len(skb) > q->max_size && !skb_is_gso(skb))
> return qdisc_reshape_fail(skb, sch);
>
> ret = qdisc_enqueue(skb, q->qdisc);
Acked-by: Eric Dumazet <edumazet@gogle.com>
^ permalink raw reply
* Re: [patch net-next 6/7] tbf: improved accuracy at high rates
From: Eric Dumazet @ 2013-02-08 16:42 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, edumazet, jhs, kuznet
In-Reply-To: <1360328327-7144-7-git-send-email-jiri@resnulli.us>
On Fri, 2013-02-08 at 13:58 +0100, Jiri Pirko wrote:
> Current TBF uses rate table computed by the "tc" userspace program,
> which has the following issue:
>
> The rate table has 256 entries to map packet lengths to
> token (time units). With TSO sized packets, the 256 entry granularity
> leads to loss/gain of rate, making the token bucket inaccurate.
>
> Thus, instead of relying on rate table, this patch explicitly computes
> the time and accounts for packet transmission times with nanosecond
> granularity.
>
> This is a followup to 56b765b79e9a78dc7d3f8850ba5e5567205a3ecd
>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
> net/sched/sch_tbf.c | 60 ++++++++++++++++++++++++++---------------------------
> 1 file changed, 29 insertions(+), 31 deletions(-)
>
> diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
> index 4b056c15..35bfd49 100644
> --- a/net/sched/sch_tbf.c
> +++ b/net/sched/sch_tbf.c
> @@ -19,6 +19,7 @@
> #include <linux/errno.h>
> #include <linux/skbuff.h>
> #include <net/netlink.h>
> +#include <net/sch_generic.h>
> #include <net/pkt_sched.h>
>
>
> @@ -100,23 +101,21 @@
> struct tbf_sched_data {
> /* Parameters */
> u32 limit; /* Maximal length of backlog: bytes */
> - u32 buffer; /* Token bucket depth/rate: MUST BE >= MTU/B */
> + s64 buffer; /* Token bucket depth/rate: MUST BE >= MTU/B */
> u32 mtu;
> u32 max_size;
> - struct qdisc_rate_table *R_tab;
> - struct qdisc_rate_table *P_tab;
> + struct psched_ratecfg rate;
> + struct psched_ratecfg peek;
> + bool peek_present;
>
Seems good to me, I'll add my Ack when you resend it with 'peak' typo
and after my tests.
^ permalink raw reply
* Re: [patch net-next 5/7] sch: make htb_rate_cfg and functions around that generic
From: Eric Dumazet @ 2013-02-08 16:39 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, edumazet, jhs, kuznet
In-Reply-To: <1360328327-7144-6-git-send-email-jiri@resnulli.us>
On Fri, 2013-02-08 at 13:58 +0100, Jiri Pirko wrote:
> As it is going to be used in tbf as well, push these to generic code.
>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
> include/net/sch_generic.h | 18 +++++++++++++
> net/sched/sch_generic.c | 37 +++++++++++++++++++++++++++
> net/sched/sch_htb.c | 65 +++++++----------------------------------------
> 3 files changed, 64 insertions(+), 56 deletions(-)
>
> diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
> index 2d06c2a..c7e5512 100644
> --- a/include/net/sch_generic.h
> +++ b/include/net/sch_generic.h
> @@ -679,4 +679,22 @@ static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask,
> }
> #endif
>
> +struct psched_ratecfg {
> + u64 rate_bps;
> + u32 mult;
> + u32 shift;
> +};
> +
> +static inline u64 psched_l2t_ns(struct psched_ratecfg *r, unsigned int len)
const struct psched_ratecfg *r
> +{
> + return ((u64)len * r->mult) >> r->shift;
> +}
> +
> +extern void psched_ratecfg_precompute(struct psched_ratecfg *r, u32 rate);
> +
> +static inline u32 psched_ratecfg_getrate(struct psched_ratecfg *r)
const struct psched_ratecfg *r
> +{
> + return r->rate_bps >> 3;
> +}
> +
other than that, patch is fine.
Acked-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply
* Re: [patch net-next 4/7] htb: initialize cl->tokens and cl->ctokens correctly
From: Eric Dumazet @ 2013-02-08 16:36 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, edumazet, jhs, kuznet
In-Reply-To: <1360328327-7144-5-git-send-email-jiri@resnulli.us>
On Fri, 2013-02-08 at 13:58 +0100, Jiri Pirko wrote:
> These are in ns so convert from ticks to ns.
>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
> net/sched/sch_htb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
> index 547912e9..2b22544 100644
> --- a/net/sched/sch_htb.c
> +++ b/net/sched/sch_htb.c
> @@ -1459,8 +1459,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
> cl->parent = parent;
>
> /* set class to be in HTB_CAN_SEND state */
> - cl->tokens = hopt->buffer;
> - cl->ctokens = hopt->cbuffer;
> + cl->tokens = PSCHED_TICKS2NS(hopt->buffer);
> + cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer);
> cl->mbuffer = 60 * PSCHED_TICKS_PER_SEC; /* 1min */
> cl->t_c = psched_get_time();
> cl->cmode = HTB_CAN_SEND;
Acked-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply
* Re: [patch net-next 3/7] htb: remove pointless first initialization of buffer and cbuffer
From: Eric Dumazet @ 2013-02-08 16:35 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, edumazet, jhs, kuznet
In-Reply-To: <1360328327-7144-4-git-send-email-jiri@resnulli.us>
On Fri, 2013-02-08 at 13:58 +0100, Jiri Pirko wrote:
> these are initialized correctly couple of lines later in the function.
>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
> net/sched/sch_htb.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
> index 14a83dc..547912e9 100644
> --- a/net/sched/sch_htb.c
> +++ b/net/sched/sch_htb.c
> @@ -1503,9 +1503,6 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
> cl->prio = TC_HTB_NUMPRIO - 1;
> }
>
> - cl->buffer = hopt->buffer;
> - cl->cbuffer = hopt->cbuffer;
> -
> cl->rate.rate_bps = (u64)hopt->rate.rate << 3;
> cl->ceil.rate_bps = (u64)hopt->ceil.rate << 3;
>
Acked-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox