* [Patch net-next] net_sched: move tp->root allocation into route4_init()
@ 2015-03-05 4:11 Cong Wang
2015-03-05 4:11 ` [Patch net-next] net_sched: move tp->root allocation into fw_init() Cong Wang
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Cong Wang @ 2015-03-05 4:11 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, Jamal Hadi Salim
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
net/sched/cls_route.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 2ecd246..bb8a602 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -258,6 +258,13 @@ static unsigned long route4_get(struct tcf_proto *tp, u32 handle)
static int route4_init(struct tcf_proto *tp)
{
+ struct route4_head *head;
+
+ head = kzalloc(sizeof(struct route4_head), GFP_KERNEL);
+ if (head == NULL)
+ return -ENOBUFS;
+
+ rcu_assign_pointer(tp->root, head);
return 0;
}
@@ -484,13 +491,6 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
return -EINVAL;
err = -ENOBUFS;
- if (head == NULL) {
- head = kzalloc(sizeof(struct route4_head), GFP_KERNEL);
- if (head == NULL)
- goto errout;
- rcu_assign_pointer(tp->root, head);
- }
-
f = kzalloc(sizeof(struct route4_filter), GFP_KERNEL);
if (!f)
goto errout;
--
1.8.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Patch net-next] net_sched: move tp->root allocation into fw_init()
2015-03-05 4:11 [Patch net-next] net_sched: move tp->root allocation into route4_init() Cong Wang
@ 2015-03-05 4:11 ` Cong Wang
2015-03-05 13:10 ` Jamal Hadi Salim
2015-03-06 2:31 ` David Miller
2015-03-05 13:09 ` [Patch net-next] net_sched: move tp->root allocation into route4_init() Jamal Hadi Salim
` (2 subsequent siblings)
3 siblings, 2 replies; 7+ messages in thread
From: Cong Wang @ 2015-03-05 4:11 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, Jamal Hadi Salim
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
net/sched/cls_fw.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index a5269f7..9d9aa3e 100644
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -33,6 +33,7 @@
struct fw_head {
u32 mask;
+ bool mask_set;
struct fw_filter __rcu *ht[HTSIZE];
struct rcu_head rcu;
};
@@ -113,6 +114,14 @@ static unsigned long fw_get(struct tcf_proto *tp, u32 handle)
static int fw_init(struct tcf_proto *tp)
{
+ struct fw_head *head;
+
+ head = kzalloc(sizeof(struct fw_head), GFP_KERNEL);
+ if (head == NULL)
+ return -ENOBUFS;
+
+ head->mask_set = false;
+ rcu_assign_pointer(tp->root, head);
return 0;
}
@@ -286,17 +295,11 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
if (!handle)
return -EINVAL;
- if (head == NULL) {
- u32 mask = 0xFFFFFFFF;
+ if (!head->mask_set) {
+ head->mask = 0xFFFFFFFF;
if (tb[TCA_FW_MASK])
- mask = nla_get_u32(tb[TCA_FW_MASK]);
-
- head = kzalloc(sizeof(struct fw_head), GFP_KERNEL);
- if (head == NULL)
- return -ENOBUFS;
- head->mask = mask;
-
- rcu_assign_pointer(tp->root, head);
+ head->mask = nla_get_u32(tb[TCA_FW_MASK]);
+ head->mask_set = true;
}
f = kzalloc(sizeof(struct fw_filter), GFP_KERNEL);
--
1.8.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Patch net-next] net_sched: move tp->root allocation into route4_init()
2015-03-05 4:11 [Patch net-next] net_sched: move tp->root allocation into route4_init() Cong Wang
2015-03-05 4:11 ` [Patch net-next] net_sched: move tp->root allocation into fw_init() Cong Wang
@ 2015-03-05 13:09 ` Jamal Hadi Salim
2015-03-05 14:26 ` Sergei Shtylyov
2015-03-06 2:31 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: Jamal Hadi Salim @ 2015-03-05 13:09 UTC (permalink / raw)
To: Cong Wang, netdev
On 03/04/15 23:11, Cong Wang wrote:
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
cheers,
jamal
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch net-next] net_sched: move tp->root allocation into route4_init()
2015-03-05 4:11 [Patch net-next] net_sched: move tp->root allocation into route4_init() Cong Wang
2015-03-05 4:11 ` [Patch net-next] net_sched: move tp->root allocation into fw_init() Cong Wang
2015-03-05 13:09 ` [Patch net-next] net_sched: move tp->root allocation into route4_init() Jamal Hadi Salim
@ 2015-03-05 14:26 ` Sergei Shtylyov
2015-03-06 2:31 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: Sergei Shtylyov @ 2015-03-05 14:26 UTC (permalink / raw)
To: Cong Wang, netdev; +Cc: Jamal Hadi Salim
Hello.
On 3/5/2015 7:11 AM, Cong Wang wrote:
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> ---
> net/sched/cls_route.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
> diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
> index 2ecd246..bb8a602 100644
> --- a/net/sched/cls_route.c
> +++ b/net/sched/cls_route.c
> @@ -258,6 +258,13 @@ static unsigned long route4_get(struct tcf_proto *tp, u32 handle)
>
> static int route4_init(struct tcf_proto *tp)
> {
> + struct route4_head *head;
> +
> + head = kzalloc(sizeof(struct route4_head), GFP_KERNEL);
Hm, checkpatch.pl should have suggested using sizeof(*head) instead...
> + if (head == NULL)
And using !head instead.
> + return -ENOBUFS;
> +
> + rcu_assign_pointer(tp->root, head);
> return 0;
> }
WBR, Sergei
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Patch net-next] net_sched: move tp->root allocation into route4_init()
2015-03-05 4:11 [Patch net-next] net_sched: move tp->root allocation into route4_init() Cong Wang
` (2 preceding siblings ...)
2015-03-05 14:26 ` Sergei Shtylyov
@ 2015-03-06 2:31 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2015-03-06 2:31 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev, jhs
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Wed, 4 Mar 2015 20:11:43 -0800
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-03-06 2:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-05 4:11 [Patch net-next] net_sched: move tp->root allocation into route4_init() Cong Wang
2015-03-05 4:11 ` [Patch net-next] net_sched: move tp->root allocation into fw_init() Cong Wang
2015-03-05 13:10 ` Jamal Hadi Salim
2015-03-06 2:31 ` David Miller
2015-03-05 13:09 ` [Patch net-next] net_sched: move tp->root allocation into route4_init() Jamal Hadi Salim
2015-03-05 14:26 ` Sergei Shtylyov
2015-03-06 2:31 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).