From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: jhs@mojatatu.com, Cong Wang <xiyou.wangcong@gmail.com>
Subject: [RFC Patch net-next 2/6] net_sched: introduce tcf_hash_replace()
Date: Thu, 1 Sep 2016 22:57:16 -0700 [thread overview]
Message-ID: <1472795840-31901-3-git-send-email-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <1472795840-31901-1-git-send-email-xiyou.wangcong@gmail.com>
This API is used to replace the old action in hash table
with the new one. It is used by the following patch.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
include/net/act_api.h | 2 ++
net/sched/act_api.c | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/include/net/act_api.h b/include/net/act_api.h
index 82f3c91..a374bab 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -164,6 +164,8 @@ int tcf_hash_create(struct tc_action_net *tn, u32 index, struct nlattr *est,
bool cpustats);
void tcf_hash_cleanup(struct tc_action *a, struct nlattr *est);
void tcf_hash_insert(struct tc_action_net *tn, struct tc_action *a);
+void tcf_hash_replace(struct tc_action_net *tn, struct tc_action **old,
+ struct tc_action *new, int bind);
int __tcf_hash_release(struct tc_action *a, bool bind, bool strict);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 06111aa..db907e5 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -306,6 +306,26 @@ void tcf_hash_insert(struct tc_action_net *tn, struct tc_action *a)
}
EXPORT_SYMBOL(tcf_hash_insert);
+void tcf_hash_replace(struct tc_action_net *tn, struct tc_action **old,
+ struct tc_action *new, int bind)
+{
+ struct tcf_hashinfo *hinfo = tn->hinfo;
+ unsigned int h = tcf_hash(new->tcfa_index, hinfo->hmask);
+
+ spin_lock_bh(&hinfo->lock);
+ if (*old)
+ hlist_replace_rcu(&(*old)->tcfa_head, &new->tcfa_head);
+ else
+ hlist_add_head_rcu(&new->tcfa_head, &hinfo->htab[h]);
+ spin_unlock_bh(&hinfo->lock);
+
+ if (*old)
+ tcf_hash_release(*old, bind);
+
+ rcu_assign_pointer(*old, new);
+}
+EXPORT_SYMBOL(tcf_hash_replace);
+
void tcf_hashinfo_destroy(const struct tc_action_ops *ops,
struct tcf_hashinfo *hinfo)
{
--
2.1.0
next prev parent reply other threads:[~2016-09-02 5:57 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 5:57 [RFC Patch net-next 0/6] net_sched: really switch to RCU for tc actions Cong Wang
2016-09-02 5:57 ` [RFC Patch net-next 1/6] net_sched: use RCU for action hash table Cong Wang
2016-09-06 12:47 ` Jamal Hadi Salim
2016-09-06 22:37 ` Cong Wang
2016-09-02 5:57 ` Cong Wang [this message]
2016-09-06 12:52 ` [RFC Patch net-next 2/6] net_sched: introduce tcf_hash_replace() Jamal Hadi Salim
2016-09-06 22:34 ` Cong Wang
2016-09-02 5:57 ` [RFC Patch net-next 3/6] net_sched: return NULL in tcf_hash_check() Cong Wang
2016-09-02 5:57 ` [RFC Patch net-next 4/6] net_sched: introduce tcf_hash_copy() Cong Wang
2016-09-02 5:57 ` [RFC Patch net-next 5/6] net_sched: use rcu in fast path Cong Wang
2016-09-06 14:52 ` Eric Dumazet
2016-09-08 6:04 ` John Fastabend
2016-09-08 13:28 ` Eric Dumazet
2016-09-08 15:35 ` [PATCH net] net_sched: act_mirred: full rcu conversion Eric Dumazet
2016-09-08 15:47 ` John Fastabend
2016-09-08 15:51 ` Eric Dumazet
2016-09-09 5:26 ` Cong Wang
2016-09-09 12:23 ` Eric Dumazet
2016-09-09 15:52 ` John Fastabend
2016-09-12 6:12 ` Cong Wang
2016-09-12 15:34 ` John Fastabend
2016-09-09 5:24 ` Cong Wang
2016-09-09 5:48 ` Alexei Starovoitov
2016-09-09 5:59 ` Cong Wang
2016-09-09 12:25 ` Eric Dumazet
2016-09-09 12:23 ` Eric Dumazet
2016-09-12 5:46 ` Cong Wang
2016-09-08 15:49 ` [RFC Patch net-next 5/6] net_sched: use rcu in fast path John Fastabend
2016-09-09 5:54 ` Cong Wang
2016-09-09 15:25 ` John Fastabend
2016-09-09 5:49 ` Cong Wang
2016-09-02 5:57 ` [RFC Patch net-next 6/6] net_sched: switch to RCU API for act_mirred Cong Wang
2016-09-02 7:09 ` [RFC Patch net-next 0/6] net_sched: really switch to RCU for tc actions Jiri Pirko
2016-09-02 19:44 ` Cong Wang
2016-09-07 16:23 ` John Fastabend
2016-09-08 6:05 ` John Fastabend
2016-09-09 5:22 ` Cong Wang
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=1472795840-31901-3-git-send-email-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=jhs@mojatatu.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).