* [PATCH net-next] enic: Add ethtool support to show classifier filters added by the driver
@ 2014-07-11 9:14 Govindarajulu Varadarajan
2014-07-11 21:59 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Govindarajulu Varadarajan @ 2014-07-11 9:14 UTC (permalink / raw)
To: davem, netdev; +Cc: ssujith, benve, Govindarajulu Varadarajan
This patch impliments ethtool_ops->get_rxnfc() to display the classifier
filter added by the driver.
Right now Accelerated RFS is the only feature which adds classifier filters.
So enable get_rxnfc only when CONFIG_RFS_ACCEL = y
Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com>
---
drivers/net/ethernet/cisco/enic/enic_clsf.c | 18 +++++
drivers/net/ethernet/cisco/enic/enic_clsf.h | 1 +
drivers/net/ethernet/cisco/enic/enic_ethtool.c | 99 ++++++++++++++++++++++++++
3 files changed, 118 insertions(+)
diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c
index bc451ba..92752b1 100644
--- a/drivers/net/ethernet/cisco/enic/enic_clsf.c
+++ b/drivers/net/ethernet/cisco/enic/enic_clsf.c
@@ -152,6 +152,24 @@ static struct enic_rfs_fltr_node *htbl_key_search(struct hlist_head *h,
return NULL;
}
+struct enic_rfs_fltr_node *htbl_fltr_search(struct enic *enic, u16 fltr_id)
+{
+ int i;
+
+ for (i = 0; i < (1 << ENIC_RFS_FLW_BITSHIFT); i++) {
+ struct hlist_head *hhead;
+ struct hlist_node *tmp;
+ struct enic_rfs_fltr_node *n;
+
+ hhead = &enic->rfs_h.ht_head[i];
+ hlist_for_each_entry_safe(n, tmp, hhead, node)
+ if (n->fltr_id == fltr_id)
+ return n;
+ }
+
+ return NULL;
+}
+
int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
u16 rxq_index, u32 flow_id)
{
diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.h b/drivers/net/ethernet/cisco/enic/enic_clsf.h
index d572704..8a41a98 100644
--- a/drivers/net/ethernet/cisco/enic/enic_clsf.h
+++ b/drivers/net/ethernet/cisco/enic/enic_clsf.h
@@ -14,6 +14,7 @@ void enic_rfs_flw_tbl_init(struct enic *enic);
void enic_rfs_flw_tbl_free(struct enic *enic);
int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
u16 rxq_index, u32 flow_id);
+struct enic_rfs_fltr_node *htbl_fltr_search(struct enic *enic, u16 fltr_id);
#else
static inline void enic_rfs_flw_tbl_init(struct enic *enic) {}
static inline void enic_rfs_flw_tbl_free(struct enic *enic) {}
diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
index c75f84b..c542082 100644
--- a/drivers/net/ethernet/cisco/enic/enic_ethtool.c
+++ b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
@@ -22,6 +22,7 @@
#include "enic_res.h"
#include "enic.h"
#include "enic_dev.h"
+#include "enic_clsf.h"
struct enic_stat {
char name[ETH_GSTRING_LEN];
@@ -282,6 +283,101 @@ static int enic_set_coalesce(struct net_device *netdev,
return 0;
}
+#ifdef CONFIG_RFS_ACCEL
+static int enic_grxclsrlall(struct enic *enic, struct ethtool_rxnfc *cmd,
+ u32 *rule_locs)
+{
+ int j, ret = 0, cnt = 0;
+
+ cmd->data = enic->rfs_h.max - enic->rfs_h.free;
+ for (j = 0; j < (1 << ENIC_RFS_FLW_BITSHIFT); j++) {
+ struct hlist_head *hhead;
+ struct hlist_node *tmp;
+ struct enic_rfs_fltr_node *n;
+
+ hhead = &enic->rfs_h.ht_head[j];
+ hlist_for_each_entry_safe(n, tmp, hhead, node) {
+ if (cnt == cmd->rule_cnt)
+ return -EMSGSIZE;
+ rule_locs[cnt] = n->fltr_id;
+ cnt++;
+ }
+ }
+ cmd->rule_cnt = cnt;
+
+ return ret;
+}
+
+static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd)
+{
+ struct ethtool_rx_flow_spec *fsp =
+ (struct ethtool_rx_flow_spec *)&cmd->fs;
+ struct enic_rfs_fltr_node *n;
+
+ n = htbl_fltr_search(enic, (u16)fsp->location);
+ if (!n)
+ return -EINVAL;
+ switch (n->keys.ip_proto) {
+ case IPPROTO_TCP:
+ fsp->flow_type = TCP_V4_FLOW;
+ break;
+ case IPPROTO_UDP:
+ fsp->flow_type = UDP_V4_FLOW;
+ break;
+ default:
+ return -EINVAL;
+ break;
+ }
+
+ fsp->h_u.tcp_ip4_spec.ip4src = n->keys.src;
+ fsp->h_u.tcp_ip4_spec.ip4dst = n->keys.dst;
+ fsp->h_u.tcp_ip4_spec.psrc = n->keys.port16[0];
+ fsp->h_u.tcp_ip4_spec.pdst = n->keys.port16[1];
+ fsp->ring_cookie = n->rq_id;
+
+ fsp->m_u.tcp_ip4_spec.ip4src = (__u32)~0;
+ fsp->m_u.tcp_ip4_spec.ip4dst = (__u32)~0;
+ fsp->m_u.tcp_ip4_spec.psrc = (__u16)~0;
+ fsp->m_u.tcp_ip4_spec.pdst = (__u16)~0;
+
+ return 0;
+}
+
+static int enic_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
+ u32 *rule_locs)
+{
+ struct enic *enic = netdev_priv(dev);
+ int ret = 0;
+
+ switch (cmd->cmd) {
+ case ETHTOOL_GRXRINGS:
+ cmd->data = enic->rq_count;
+ break;
+ case ETHTOOL_GRXCLSRLCNT:
+ spin_lock_bh(&enic->rfs_h.lock);
+ cmd->rule_cnt = enic->rfs_h.max - enic->rfs_h.free;
+ cmd->data = enic->rfs_h.max;
+ spin_unlock_bh(&enic->rfs_h.lock);
+ break;
+ case ETHTOOL_GRXCLSRLALL:
+ spin_lock_bh(&enic->rfs_h.lock);
+ ret = enic_grxclsrlall(enic, cmd, rule_locs);
+ spin_unlock_bh(&enic->rfs_h.lock);
+ break;
+ case ETHTOOL_GRXCLSRULE:
+ spin_lock_bh(&enic->rfs_h.lock);
+ ret = enic_grxclsrule(enic, cmd);
+ spin_unlock_bh(&enic->rfs_h.lock);
+ break;
+ default:
+ ret = -EOPNOTSUPP;
+ break;
+ }
+
+ return ret;
+}
+#endif /* CONFIG_RFS_ACCEL */
+
static const struct ethtool_ops enic_ethtool_ops = {
.get_settings = enic_get_settings,
.get_drvinfo = enic_get_drvinfo,
@@ -293,6 +389,9 @@ static const struct ethtool_ops enic_ethtool_ops = {
.get_ethtool_stats = enic_get_ethtool_stats,
.get_coalesce = enic_get_coalesce,
.set_coalesce = enic_set_coalesce,
+#ifdef CONFIG_RFS_ACCEL
+ .get_rxnfc = enic_get_rxnfc,
+#endif
};
void enic_set_ethtool_ops(struct net_device *netdev)
--
2.0.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] enic: Add ethtool support to show classifier filters added by the driver
2014-07-11 9:14 [PATCH net-next] enic: Add ethtool support to show classifier filters added by the driver Govindarajulu Varadarajan
@ 2014-07-11 21:59 ` David Miller
2014-07-12 8:39 ` Govindarajulu Varadarajan
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2014-07-11 21:59 UTC (permalink / raw)
To: _govind; +Cc: netdev, ssujith, benve
From: Govindarajulu Varadarajan <_govind@gmx.com>
Date: Fri, 11 Jul 2014 14:44:11 +0530
> Right now Accelerated RFS is the only feature which adds classifier filters.
> So enable get_rxnfc only when CONFIG_RFS_ACCEL = y
...
> @@ -293,6 +389,9 @@ static const struct ethtool_ops enic_ethtool_ops = {
> .get_ethtool_stats = enic_get_ethtool_stats,
> .get_coalesce = enic_get_coalesce,
> .set_coalesce = enic_set_coalesce,
> +#ifdef CONFIG_RFS_ACCEL
> + .get_rxnfc = enic_get_rxnfc,
> +#endif
No other driver protects this method in this way, please don't do this.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] enic: Add ethtool support to show classifier filters added by the driver
2014-07-11 21:59 ` David Miller
@ 2014-07-12 8:39 ` Govindarajulu Varadarajan
2014-07-13 7:31 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Govindarajulu Varadarajan @ 2014-07-12 8:39 UTC (permalink / raw)
To: David Miller; +Cc: _govind, netdev, ssujith, benve
On Fri, 11 Jul 2014, David Miller wrote:
> From: Govindarajulu Varadarajan <_govind@gmx.com>
> Date: Fri, 11 Jul 2014 14:44:11 +0530
>
>> Right now Accelerated RFS is the only feature which adds classifier filters.
>> So enable get_rxnfc only when CONFIG_RFS_ACCEL = y
> ...
>> @@ -293,6 +389,9 @@ static const struct ethtool_ops enic_ethtool_ops = {
>> .get_ethtool_stats = enic_get_ethtool_stats,
>> .get_coalesce = enic_get_coalesce,
>> .set_coalesce = enic_set_coalesce,
>> +#ifdef CONFIG_RFS_ACCEL
>> + .get_rxnfc = enic_get_rxnfc,
>> +#endif
>
> No other driver protects this method in this way, please don't do this.
>
I will move the ifdef's to .h files and resubmit.
Thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] enic: Add ethtool support to show classifier filters added by the driver
2014-07-12 8:39 ` Govindarajulu Varadarajan
@ 2014-07-13 7:31 ` David Miller
2014-07-14 6:58 ` Govindarajulu Varadarajan
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2014-07-13 7:31 UTC (permalink / raw)
To: _govind; +Cc: netdev, ssujith, benve
From: Govindarajulu Varadarajan <_govind@gmx.com>
Date: Sat, 12 Jul 2014 14:09:15 +0530 (IST)
> On Fri, 11 Jul 2014, David Miller wrote:
>
>> From: Govindarajulu Varadarajan <_govind@gmx.com>
>> Date: Fri, 11 Jul 2014 14:44:11 +0530
>>
>>> Right now Accelerated RFS is the only feature which adds classifier
>>> filters.
>>> So enable get_rxnfc only when CONFIG_RFS_ACCEL = y
>> ...
>>> @@ -293,6 +389,9 @@ static const struct ethtool_ops enic_ethtool_ops =
>>> {
>>> .get_ethtool_stats = enic_get_ethtool_stats,
>>> .get_coalesce = enic_get_coalesce,
>>> .set_coalesce = enic_set_coalesce,
>>> +#ifdef CONFIG_RFS_ACCEL
>>> + .get_rxnfc = enic_get_rxnfc,
>>> +#endif
>>
>> No other driver protects this method in this way, please don't do
>> this.
>>
>
> I will move the ifdef's to .h files and resubmit.
I meant, at all.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] enic: Add ethtool support to show classifier filters added by the driver
2014-07-13 7:31 ` David Miller
@ 2014-07-14 6:58 ` Govindarajulu Varadarajan
2014-07-14 7:24 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Govindarajulu Varadarajan @ 2014-07-14 6:58 UTC (permalink / raw)
To: David Miller; +Cc: _govind, netdev, ssujith, benve
On Sun, 13 Jul 2014, David Miller wrote:
> From: Govindarajulu Varadarajan <_govind@gmx.com>
> Date: Sat, 12 Jul 2014 14:09:15 +0530 (IST)
>
>> On Fri, 11 Jul 2014, David Miller wrote:
>>
>>> From: Govindarajulu Varadarajan <_govind@gmx.com>
>>> Date: Fri, 11 Jul 2014 14:44:11 +0530
>>>
>>>> Right now Accelerated RFS is the only feature which adds classifier
>>>> filters.
>>>> So enable get_rxnfc only when CONFIG_RFS_ACCEL = y
>>> ...
>>>> @@ -293,6 +389,9 @@ static const struct ethtool_ops enic_ethtool_ops =
>>>> {
>>>> .get_ethtool_stats = enic_get_ethtool_stats,
>>>> .get_coalesce = enic_get_coalesce,
>>>> .set_coalesce = enic_set_coalesce,
>>>> +#ifdef CONFIG_RFS_ACCEL
>>>> + .get_rxnfc = enic_get_rxnfc,
>>>> +#endif
>>>
>>> No other driver protects this method in this way, please don't do
>>> this.
>>>
>>
>> I will move the ifdef's to .h files and resubmit.
>
> I meant, at all.
>
You do not like the idea of #ifdef around .get_rxnfc (including moving it to
.h file) or the idea of displaying filters added by RFS?
I am actually considering moving driver filter structures out of
#ifdef CONFIG_RFS_ACCEL, and make it available always. This will allow us to
define .get_rxnfc without any #ifdefs.
This change is anyway needed when I implement .set_rxnfc to added user entered
filters.
This it fine with you?
Thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] enic: Add ethtool support to show classifier filters added by the driver
2014-07-14 6:58 ` Govindarajulu Varadarajan
@ 2014-07-14 7:24 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2014-07-14 7:24 UTC (permalink / raw)
To: _govind; +Cc: netdev, ssujith, benve
From: Govindarajulu Varadarajan <_govind@gmx.com>
Date: Mon, 14 Jul 2014 12:28:58 +0530 (IST)
> I am actually considering moving driver filter structures out of
> #ifdef CONFIG_RFS_ACCEL, and make it available always.
This is what I mean.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-14 7:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-11 9:14 [PATCH net-next] enic: Add ethtool support to show classifier filters added by the driver Govindarajulu Varadarajan
2014-07-11 21:59 ` David Miller
2014-07-12 8:39 ` Govindarajulu Varadarajan
2014-07-13 7:31 ` David Miller
2014-07-14 6:58 ` Govindarajulu Varadarajan
2014-07-14 7:24 ` 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).