From: Stephen Hemminger <shemminger@vyatta•com>
To: David Miller <davem@davemloft•net>
Cc: netdev@vger•kernel.org
Subject: [PATCH 6/9] netem: distribution table changes
Date: Fri, 06 Aug 2010 12:35:54 -0700 [thread overview]
Message-ID: <20100806193559.022225705@vyatta.com> (raw)
In-Reply-To: 20100806193548.007978639@vyatta.com
[-- Attachment #1: netem-dist-vmalloc.patch --]
[-- Type: text/plain, Size: 1408 bytes --]
Fix some issues with distribution table in netem:
* Make maximum size visible to user space
* Use vmalloc to avoid allocating large physical contiguous memory.
(maybe this should use flex array?)
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/include/linux/pkt_sched.h 2010-08-02 16:22:42.197329627 -0700
+++ b/include/linux/pkt_sched.h 2010-08-03 08:29:43.926514463 -0700
@@ -466,6 +466,7 @@ struct tc_netem_corrupt {
};
#define NETEM_DIST_SCALE 8192
+#define NETEM_DIST_MAX 16384
/* DRR */
--- a/net/sched/sch_netem.c 2010-08-03 08:29:39.546593787 -0700
+++ b/net/sched/sch_netem.c 2010-08-03 08:29:43.926514463 -0700
@@ -321,10 +321,10 @@ static int get_dist_table(struct Qdisc *
struct disttable *d;
int i;
- if (n > 65536)
+ if (n > NETEM_DIST_MAX)
return -EINVAL;
- d = kmalloc(sizeof(*d) + n*sizeof(d->table[0]), GFP_KERNEL);
+ d = vmalloc(sizeof(*d) + n*sizeof(d->table[0]));
if (!d)
return -ENOMEM;
@@ -332,7 +332,7 @@ static int get_dist_table(struct Qdisc *
for (i = 0; i < n; i++)
d->table[i] = data[i];
- kfree(q->delay_dist);
+ vfree(q->delay_dist);
q->delay_dist = d;
return 0;
@@ -559,7 +559,7 @@ static void netem_destroy(struct Qdisc *
qdisc_watchdog_cancel(&q->watchdog);
qdisc_destroy(q->qdisc);
- kfree(q->delay_dist);
+ vfree(q->delay_dist);
}
static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
next prev parent reply other threads:[~2010-08-06 19:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100806193548.007978639@vyatta.com>
2010-08-06 19:35 ` [PATCH 1/9] net classifier: dont allow filters on semi-classful qdisc Stephen Hemminger
2010-08-06 21:24 ` Jarek Poplawski
2010-08-06 21:58 ` Stephen Hemminger
2010-08-06 22:23 ` [PATCH] sfq: add dummy bind/unbind handles Stephen Hemminger
2010-08-06 23:17 ` Jarek Poplawski
2010-08-08 5:45 ` David Miller
2010-08-08 7:04 ` Jarek Poplawski
2010-08-09 15:01 ` Franchoze Eric
2010-08-06 22:26 ` [PATCH 1/9] net classifier: dont allow filters on semi-classful qdisc Jarek Poplawski
2010-08-08 5:59 ` David Miller
2010-08-06 19:35 ` [PATCH 2/9] net classifier: deinline bind/unbind functions Stephen Hemminger
2010-08-06 19:35 ` [PATCH 3/9] u32 classifier: fix sparse warnings Stephen Hemminger
2010-08-06 19:35 ` [PATCH 4/9] netem: add locking around changes Stephen Hemminger
2010-08-06 19:35 ` [PATCH 5/9] netem: cleanup dump code Stephen Hemminger
2010-08-06 19:35 ` Stephen Hemminger [this message]
2010-08-06 19:35 ` [PATCH 7/9] netem: dump distribution table Stephen Hemminger
2010-08-06 19:35 ` [PATCH 8/9] netem - revised correlated loss generator Stephen Hemminger
2010-08-06 19:35 ` [PATCH 9/9] netem: restore no jitter option Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100806193559.022225705@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox