From: kan.liang@intel.com
To: davem@davemloft.net, linux-kernel@vger.kernel.org,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org
Cc: jeffrey.t.kirsher@intel.com, mingo@redhat.com,
peterz@infradead.org, kuznet@ms2.inr.ac.ru, jmorris@namei.org,
yoshfuji@linux-ipv6.org, kaber@trash.net,
akpm@linux-foundation.org, keescook@chromium.org,
viro@zeniv.linux.org.uk, gorcunov@openvz.org,
john.stultz@linaro.org, aduyck@mirantis.com, ben@decadent.org.uk,
decot@googlers.com, jesse.brandeburg@intel.com,
andi@firstfloor.org, Kan Liang <kan.liang@intel.com>
Subject: [RFC PATCH 21/30] net/policy: introduce netpolicy_pick_queue
Date: Sun, 17 Jul 2016 23:56:15 -0700 [thread overview]
Message-ID: <1468824984-65318-22-git-send-email-kan.liang@intel.com> (raw)
In-Reply-To: <1468824984-65318-1-git-send-email-kan.liang@intel.com>
From: Kan Liang <kan.liang@intel.com>
This function will be used to get assigned queues by policy and ptr.
If it's first time, get_avail_queue will be called to find the available
object from the given policy object list.
Signed-off-by: Kan Liang <kan.liang@intel.com>
---
include/linux/netpolicy.h | 5 ++
net/core/netpolicy.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+)
diff --git a/include/linux/netpolicy.h b/include/linux/netpolicy.h
index 89361d9..e20820d 100644
--- a/include/linux/netpolicy.h
+++ b/include/linux/netpolicy.h
@@ -97,6 +97,7 @@ extern void update_netpolicy_sys_map(void);
extern int netpolicy_register(struct netpolicy_reg *reg,
enum netpolicy_name policy);
extern void netpolicy_unregister(struct netpolicy_reg *reg);
+extern int netpolicy_pick_queue(struct netpolicy_reg *reg, bool is_rx);
#else
static inline void update_netpolicy_sys_map(void)
{
@@ -111,6 +112,10 @@ static inline void netpolicy_unregister(struct netpolicy_reg *reg)
{
}
+static inline int netpolicy_pick_queue(struct netpolicy_reg *reg, bool is_rx)
+{
+ return 0;
+}
#endif
#endif /*__LINUX_NETPOLICY_H*/
diff --git a/net/core/netpolicy.c b/net/core/netpolicy.c
index 13ab5e1..6992d08 100644
--- a/net/core/netpolicy.c
+++ b/net/core/netpolicy.c
@@ -289,6 +289,125 @@ static void put_queue(struct net_device *dev,
atomic_dec(&tx_obj->refcnt);
}
+static struct netpolicy_object *get_avail_queue(struct net_device *dev,
+ enum netpolicy_name policy,
+ bool is_rx)
+{
+ int dir = is_rx ? NETPOLICY_RX : NETPOLICY_TX;
+ struct netpolicy_object *tmp, *obj = NULL;
+ int val = -1;
+
+ /* Check if net policy is supported */
+ if (!dev || !dev->netpolicy)
+ return NULL;
+
+ /* The system should have queues which support the request policy. */
+ if ((policy != dev->netpolicy->cur_policy) &&
+ (dev->netpolicy->cur_policy != NET_POLICY_MIX))
+ return NULL;
+
+ spin_lock(&dev->np_ob_list_lock);
+ list_for_each_entry(tmp, &dev->netpolicy->obj_list[dir][policy], list) {
+ if ((val > atomic_read(&tmp->refcnt)) ||
+ (val == -1)) {
+ val = atomic_read(&tmp->refcnt);
+ obj = tmp;
+ }
+ }
+ spin_unlock(&dev->np_ob_list_lock);
+
+ if (WARN_ON(!obj))
+ return NULL;
+ atomic_inc(&obj->refcnt);
+
+ return obj;
+}
+
+/**
+ * netpolicy_pick_queue() - Find assigned queue
+ * @reg: NET policy register info
+ * @is_rx: RX queue or TX queue
+ *
+ * This function intends to find the assigned queue according to policy and
+ * ptr. If it's first time, get_avail_queue will be called to find the
+ * available object from the given policy object list. Then the object info
+ * will be updated in the hash table.
+ *
+ * Return: negative on failure, otherwise on the assigned queue
+ */
+int netpolicy_pick_queue(struct netpolicy_reg *reg, bool is_rx)
+{
+ struct netpolicy_record *old_record, *new_record;
+ struct net_device *dev = reg->dev;
+ enum netpolicy_name cur_policy;
+ unsigned long ptr_id = (uintptr_t)reg->ptr;
+ int queue = -1;
+
+ if (!dev || !dev->netpolicy)
+ goto err;
+
+ cur_policy = dev->netpolicy->cur_policy;
+ if ((reg->policy == NET_POLICY_NONE) ||
+ (cur_policy == NET_POLICY_NONE))
+ return queue;
+
+ if (((cur_policy != NET_POLICY_MIX) && (cur_policy != reg->policy)) ||
+ ((cur_policy == NET_POLICY_MIX) && (reg->policy == NET_POLICY_CPU))) {
+ pr_warn("NETPOLICY: %s current device policy %s doesn't support required policy %s! Remove net policy settings!\n",
+ dev->name, policy_name[cur_policy],
+ policy_name[reg->policy]);
+ goto err;
+ }
+
+ old_record = netpolicy_record_search(ptr_id);
+ if (!old_record) {
+ pr_warn("NETPOLICY: doesn't registered. Remove net policy settings!\n");
+ goto err;
+ }
+
+ new_record = kzalloc(sizeof(*new_record), GFP_KERNEL);
+ if (!new_record)
+ return -ENOMEM;
+ memcpy(new_record, old_record, sizeof(*new_record));
+
+ if (is_rx) {
+ if (!new_record->rx_obj) {
+ new_record->rx_obj = get_avail_queue(dev, new_record->policy, is_rx);
+ if (!new_record->dev)
+ new_record->dev = dev;
+ if (!new_record->rx_obj) {
+ kfree(new_record);
+ return -ENOTSUPP;
+ }
+ }
+ queue = new_record->rx_obj->queue;
+ } else {
+ if (!new_record->tx_obj) {
+ new_record->tx_obj = get_avail_queue(dev, new_record->policy, is_rx);
+ if (!new_record->dev)
+ new_record->dev = dev;
+ if (!new_record->tx_obj) {
+ kfree(new_record);
+ return -ENOTSUPP;
+ }
+ }
+ queue = new_record->tx_obj->queue;
+ }
+
+ /* update record */
+ spin_lock_bh(&np_hashtable_lock);
+ hlist_replace_rcu(&old_record->hash_node, &new_record->hash_node);
+ spin_unlock_bh(&np_hashtable_lock);
+ kfree(old_record);
+
+ return queue;
+
+err:
+ netpolicy_unregister(reg);
+ return -EINVAL;
+}
+EXPORT_SYMBOL(netpolicy_pick_queue);
+
/**
* netpolicy_register() - Register per socket/task policy request
* @reg: NET policy register info
--
2.5.5
next prev parent reply other threads:[~2016-07-18 14:27 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-18 6:55 [RFC PATCH 00/30] Kernel NET policy kan.liang
2016-07-18 6:55 ` [RFC PATCH 01/30] net: introduce " kan.liang
2016-07-18 6:55 ` [RFC PATCH 02/30] net/netpolicy: init " kan.liang
2016-07-18 6:55 ` [RFC PATCH 03/30] i40e/netpolicy: Implement ndo_netpolicy_init kan.liang
2016-07-18 6:55 ` [RFC PATCH 04/30] net/netpolicy: get driver information kan.liang
2016-07-18 6:55 ` [RFC PATCH 05/30] i40e/netpolicy: implement ndo_get_irq_info kan.liang
2016-07-18 6:56 ` [RFC PATCH 06/30] net/netpolicy: get CPU information kan.liang
2016-07-18 6:56 ` [RFC PATCH 07/30] net/netpolicy: create CPU and queue mapping kan.liang
2016-07-18 6:56 ` [RFC PATCH 08/30] net/netpolicy: set and remove irq affinity kan.liang
2016-07-18 6:56 ` [RFC PATCH 09/30] net/netpolicy: enable and disable net policy kan.liang
2016-07-18 6:56 ` [RFC PATCH 10/30] net/netpolicy: introduce netpolicy object kan.liang
2016-07-18 6:56 ` [RFC PATCH 11/30] net/netpolicy: set net policy by policy name kan.liang
2016-07-18 6:56 ` [RFC PATCH 12/30] i40e/netpolicy: implement ndo_set_net_policy kan.liang
2016-07-18 6:56 ` [RFC PATCH 13/30] i40e/netpolicy: add three new net policies kan.liang
2016-07-18 6:56 ` [RFC PATCH 14/30] net/netpolicy: add MIX policy kan.liang
2016-07-18 6:56 ` [RFC PATCH 15/30] i40e/netpolicy: add MIX policy support kan.liang
2016-07-18 6:56 ` [RFC PATCH 16/30] net/netpolicy: net device hotplug kan.liang
2016-07-18 6:56 ` [RFC PATCH 17/30] net/netpolicy: support CPU hotplug kan.liang
2016-07-18 6:56 ` [RFC PATCH 18/30] net/netpolicy: handle channel changes kan.liang
2016-07-18 6:56 ` [RFC PATCH 19/30] net/netpolicy: implement netpolicy register kan.liang
2016-07-18 6:56 ` [RFC PATCH 20/30] net/netpolicy: introduce per socket netpolicy kan.liang
2016-07-18 6:56 ` kan.liang [this message]
2016-07-18 6:56 ` [RFC PATCH 22/30] net/netpolicy: set tx queues according to policy kan.liang
2016-07-18 6:56 ` [RFC PATCH 23/30] i40e/ethtool: support RX_CLS_LOC_ANY kan.liang
2016-07-18 16:21 ` Alexander Duyck
2016-07-18 6:56 ` [RFC PATCH 24/30] net/netpolicy: set rx queues according to policy kan.liang
2016-07-18 6:56 ` [RFC PATCH 25/30] net/netpolicy: introduce per task net policy kan.liang
2016-07-18 6:56 ` [RFC PATCH 26/30] net/netpolicy: set per task policy by proc kan.liang
2016-07-18 6:56 ` [RFC PATCH 27/30] net/netpolicy: fast path for finding the queues kan.liang
2016-07-18 6:56 ` [RFC PATCH 28/30] net/netpolicy: optimize for queue pair kan.liang
2016-07-18 6:56 ` [RFC PATCH 29/30] net/netpolicy: limit the total record number kan.liang
2016-07-18 6:56 ` [RFC PATCH 30/30] Documentation/networking: Document net policy kan.liang
2016-07-18 16:58 ` Randy Dunlap
2016-07-18 15:18 ` [RFC PATCH 00/30] Kernel NET policy Florian Westphal
2016-07-18 15:45 ` Andi Kleen
2016-07-18 17:52 ` Cong Wang
2016-07-18 20:14 ` Liang, Kan
2016-07-18 20:19 ` Cong Wang
2016-07-18 20:24 ` Liang, Kan
2016-07-18 19:04 ` Hannes Frederic Sowa
2016-07-18 19:43 ` Andi Kleen
2016-07-18 21:51 ` Hannes Frederic Sowa
2016-07-19 1:49 ` Liang, Kan
2016-07-19 5:03 ` David Miller
2016-07-19 13:43 ` Liang, Kan
2016-07-18 15:51 ` Liang, Kan
2016-07-18 16:17 ` Florian Westphal
2016-07-18 17:40 ` Liang, Kan
2016-07-18 16:34 ` Tom Herbert
2016-07-18 17:58 ` Liang, Kan
2016-07-18 16:22 ` Daniel Borkmann
2016-07-18 18:30 ` Liang, Kan
2016-07-18 20:51 ` Daniel Borkmann
2016-07-18 17:00 ` Alexander Duyck
2016-07-18 19:45 ` Liang, Kan
2016-07-18 19:49 ` Andi Kleen
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=1468824984-65318-22-git-send-email-kan.liang@intel.com \
--to=kan.liang@intel.com \
--cc=aduyck@mirantis.com \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=ben@decadent.org.uk \
--cc=davem@davemloft.net \
--cc=decot@googlers.com \
--cc=gorcunov@openvz.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=jmorris@namei.org \
--cc=john.stultz@linaro.org \
--cc=kaber@trash.net \
--cc=keescook@chromium.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yoshfuji@linux-ipv6.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
Powered by JetHome