[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190426003348.30745-3-pablo@netfilter.org>
Date: Fri, 26 Apr 2019 02:33:39 +0200
From: Pablo Neira Ayuso <pablo@...filter.org>
To: netfilter-devel@...r.kernel.org
Cc: davem@...emloft.net, netdev@...r.kernel.org, jiri@...lanox.com,
john.hurley@...ronome.com, jakub.kicinski@...ronome.com,
ogerlitz@...lanox.com
Subject: [PATCH net-next,RFC 2/9] net: sched: add tcf_block_cb_alloc()
Add a new helper function to allocate tcf_block_cb objects.
Signed-off-by: Pablo Neira Ayuso <pablo@...filter.org>
---
include/net/pkt_cls.h | 2 ++
net/sched/cls_api.c | 23 +++++++++++++++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index d5e7a1af346f..8ddfbe94e253 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -71,6 +71,8 @@ static inline struct Qdisc *tcf_block_q(struct tcf_block *block)
return block->q;
}
+struct tcf_block_cb *tcf_block_cb_alloc(tc_setup_cb_t *cb,
+ void *cb_ident, void *cb_priv);
void *tcf_block_cb_priv(struct tcf_block_cb *block_cb);
struct tcf_block_cb *tcf_block_cb_lookup(struct tcf_block *block,
tc_setup_cb_t *cb, void *cb_ident);
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 71ec0a34100d..ddfccf31aac9 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -749,6 +749,23 @@ unsigned int tcf_block_cb_decref(struct tcf_block_cb *block_cb)
}
EXPORT_SYMBOL(tcf_block_cb_decref);
+struct tcf_block_cb *tcf_block_cb_alloc(tc_setup_cb_t *cb,
+ void *cb_ident, void *cb_priv)
+{
+ struct tcf_block_cb *block_cb;
+
+ block_cb = kzalloc(sizeof(*block_cb), GFP_KERNEL);
+ if (!block_cb)
+ return NULL;
+
+ block_cb->cb = cb;
+ block_cb->cb_ident = cb_ident;
+ block_cb->cb_priv = cb_priv;
+
+ return block_cb;
+}
+EXPORT_SYMBOL(tcf_block_cb_alloc);
+
struct tcf_block_cb *__tcf_block_cb_register(struct tcf_block *block,
tc_setup_cb_t *cb, void *cb_ident,
void *cb_priv,
@@ -764,12 +781,10 @@ struct tcf_block_cb *__tcf_block_cb_register(struct tcf_block *block,
if (err)
return ERR_PTR(err);
- block_cb = kzalloc(sizeof(*block_cb), GFP_KERNEL);
+ block_cb = tcf_block_cb_alloc(cb, cb_ident, cb_priv);
if (!block_cb)
return ERR_PTR(-ENOMEM);
- block_cb->cb = cb;
- block_cb->cb_ident = cb_ident;
- block_cb->cb_priv = cb_priv;
+
list_add(&block_cb->list, &block->cb_list);
return block_cb;
}
--
2.11.0
Powered by blists - more mailing lists