From: Wei Wang <weiwan@google.com>
To: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>,
Hannes Frederic Sowa <hannes@stressinduktion.org>,
Eric Dumazet <edumazet@google.com>, Felix Fietkau <nbd@nbd.name>,
Hillf Danton <hdanton@sina.com>
Subject: [PATCH net-next v4 3/3] net: add sysfs attribute to control napi threaded mode
Date: Tue, 8 Dec 2020 16:54:44 -0800 [thread overview]
Message-ID: <20201209005444.1949356-4-weiwan@google.com> (raw)
In-Reply-To: <20201209005444.1949356-1-weiwan@google.com>
This patch adds a new sysfs attribute to the network device class.
Said attribute provides a per-device control to enable/disable the
threaded mode for all the napi instances of the given network device.
Co-developed-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Co-developed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Co-developed-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Wei Wang <weiwan@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
---
net/core/net-sysfs.c | 70 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 94fff0700bdd..d14dc1da4c97 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -538,6 +538,75 @@ static ssize_t phys_switch_id_show(struct device *dev,
}
static DEVICE_ATTR_RO(phys_switch_id);
+static ssize_t threaded_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct net_device *netdev = to_net_dev(dev);
+ struct napi_struct *n;
+ bool enabled;
+ int ret;
+
+ if (!rtnl_trylock())
+ return restart_syscall();
+
+ if (!dev_isalive(netdev)) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ if (list_empty(&netdev->napi_list)) {
+ ret = -EOPNOTSUPP;
+ goto unlock;
+ }
+
+ n = list_first_entry(&netdev->napi_list, struct napi_struct, dev_list);
+ enabled = !!test_bit(NAPI_STATE_THREADED, &n->state);
+
+ ret = sprintf(buf, fmt_dec, enabled);
+
+unlock:
+ rtnl_unlock();
+ return ret;
+}
+
+static void dev_disable_threaded_all(struct net_device *dev)
+{
+ struct napi_struct *napi;
+
+ list_for_each_entry(napi, &dev->napi_list, dev_list)
+ napi_set_threaded(napi, false);
+}
+
+static int modify_napi_threaded(struct net_device *dev, unsigned long val)
+{
+ struct napi_struct *napi;
+ int ret;
+
+ if (list_empty(&dev->napi_list))
+ return -EOPNOTSUPP;
+
+ list_for_each_entry(napi, &dev->napi_list, dev_list) {
+ ret = napi_set_threaded(napi, !!val);
+ if (ret) {
+ /* Error occurred on one of the napi,
+ * reset threaded mode on all napi.
+ */
+ dev_disable_threaded_all(dev);
+ break;
+ }
+ }
+
+ return ret;
+}
+
+static ssize_t threaded_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ return netdev_store(dev, attr, buf, len, modify_napi_threaded);
+}
+static DEVICE_ATTR_RW(threaded);
+
static struct attribute *net_class_attrs[] __ro_after_init = {
&dev_attr_netdev_group.attr,
&dev_attr_type.attr,
@@ -570,6 +639,7 @@ static struct attribute *net_class_attrs[] __ro_after_init = {
&dev_attr_proto_down.attr,
&dev_attr_carrier_up_count.attr,
&dev_attr_carrier_down_count.attr,
+ &dev_attr_threaded.attr,
NULL,
};
ATTRIBUTE_GROUPS(net_class);
--
2.29.2.576.ga3fc446d84-goog
next prev parent reply other threads:[~2020-12-09 0:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 0:54 [PATCH net-next v4 0/3] implement kthread based napi poll Wei Wang
2020-12-09 0:54 ` [PATCH net-next v4 1/3] net: extract napi poll functionality to __napi_poll() Wei Wang
2020-12-09 0:54 ` [PATCH net-next v4 2/3] net: implement threaded-able napi poll loop support Wei Wang
2020-12-12 22:50 ` Jakub Kicinski
2020-12-12 22:55 ` Jakub Kicinski
2020-12-14 17:59 ` Wei Wang
2020-12-14 19:02 ` Jakub Kicinski
2020-12-14 19:45 ` Wei Wang
2020-12-14 20:33 ` Jakub Kicinski
2020-12-14 21:12 ` Wei Wang
2020-12-09 0:54 ` Wei Wang [this message]
2020-12-12 22:59 ` [PATCH net-next v4 3/3] net: add sysfs attribute to control napi threaded mode Jakub Kicinski
2020-12-14 18:02 ` Wei 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=20201209005444.1949356-4-weiwan@google.com \
--to=weiwan@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hannes@stressinduktion.org \
--cc=hdanton@sina.com \
--cc=kuba@kernel.org \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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).