* [PATCH net-next 0/4] net: qualcomm: rmnet: Add 64 bit stats and GRO
@ 2017-10-25 4:55 Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 1/4] net: qualcomm: rmnet: Fix the return value of rmnet_rx_handler() Subash Abhinov Kasiviswanathan
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Subash Abhinov Kasiviswanathan @ 2017-10-25 4:55 UTC (permalink / raw)
To: davem, netdev; +Cc: Subash Abhinov Kasiviswanathan
This series adds support for 64 bit per cpu stats and GRO
Patches 1-2 are cleanups of return code and a redundant condition
Patch 3 adds support for 64 bit per cpu stats
Patch 4 adds support for GRO using GRO cells
Subash Abhinov Kasiviswanathan (4):
net: qualcomm: rmnet: Fix the return value of rmnet_rx_handler()
net: qualcomm: rmnet: Always assign rmnet dev in deaggregation path
net: qualcomm: rmnet: Add support for 64 bit stats
net: qualcomm: rmnet: Add support for GRO
drivers/net/ethernet/qualcomm/rmnet/Kconfig | 1 +
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 6 +-
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 16 ++++
.../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 38 ++++------
drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 3 +-
.../ethernet/qualcomm/rmnet/rmnet_map_command.c | 4 +-
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 85 ++++++++++++++++++++--
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 2 +-
8 files changed, 118 insertions(+), 37 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next 1/4] net: qualcomm: rmnet: Fix the return value of rmnet_rx_handler()
2017-10-25 4:55 [PATCH net-next 0/4] net: qualcomm: rmnet: Add 64 bit stats and GRO Subash Abhinov Kasiviswanathan
@ 2017-10-25 4:55 ` Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 2/4] net: qualcomm: rmnet: Always assign rmnet dev in deaggregation path Subash Abhinov Kasiviswanathan
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Subash Abhinov Kasiviswanathan @ 2017-10-25 4:55 UTC (permalink / raw)
To: davem, netdev; +Cc: Subash Abhinov Kasiviswanathan
Since packet is always consumed by rmnet_rx_handler(), we always
return RX_HANDLER_CONSUMED. There is no need to pass on this
value through multiple functions.
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
---
.../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 31 +++++++++-------------
drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 3 +--
.../ethernet/qualcomm/rmnet/rmnet_map_command.c | 4 +--
3 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index df3d2d1..5dd186d 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -43,7 +43,7 @@ static void rmnet_set_skb_proto(struct sk_buff *skb)
/* Generic handler */
-static rx_handler_result_t
+static void
rmnet_deliver_skb(struct sk_buff *skb)
{
skb_reset_transport_header(skb);
@@ -53,12 +53,11 @@ static void rmnet_set_skb_proto(struct sk_buff *skb)
skb->pkt_type = PACKET_HOST;
skb_set_mac_header(skb, 0);
netif_receive_skb(skb);
- return RX_HANDLER_CONSUMED;
}
/* MAP handler */
-static rx_handler_result_t
+static void
__rmnet_map_ingress_handler(struct sk_buff *skb,
struct rmnet_port *port)
{
@@ -91,31 +90,27 @@ static void rmnet_set_skb_proto(struct sk_buff *skb)
skb_pull(skb, sizeof(struct rmnet_map_header));
skb_trim(skb, len);
rmnet_set_skb_proto(skb);
- return rmnet_deliver_skb(skb);
+ rmnet_deliver_skb(skb);
+ return;
free_skb:
kfree_skb(skb);
- return RX_HANDLER_CONSUMED;
}
-static rx_handler_result_t
+static void
rmnet_map_ingress_handler(struct sk_buff *skb,
struct rmnet_port *port)
{
struct sk_buff *skbn;
- int rc;
if (port->ingress_data_format & RMNET_INGRESS_FORMAT_DEAGGREGATION) {
while ((skbn = rmnet_map_deaggregate(skb)) != NULL)
__rmnet_map_ingress_handler(skbn, port);
consume_skb(skb);
- rc = RX_HANDLER_CONSUMED;
} else {
- rc = __rmnet_map_ingress_handler(skb, port);
+ __rmnet_map_ingress_handler(skb, port);
}
-
- return rc;
}
static int rmnet_map_egress_handler(struct sk_buff *skb,
@@ -149,15 +144,13 @@ static int rmnet_map_egress_handler(struct sk_buff *skb,
return RMNET_MAP_SUCCESS;
}
-static rx_handler_result_t
+static void
rmnet_bridge_handler(struct sk_buff *skb, struct net_device *bridge_dev)
{
if (bridge_dev) {
skb->dev = bridge_dev;
dev_queue_xmit(skb);
}
-
- return RX_HANDLER_CONSUMED;
}
/* Ingress / Egress Entry Points */
@@ -168,13 +161,12 @@ static int rmnet_map_egress_handler(struct sk_buff *skb,
*/
rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)
{
- int rc = RX_HANDLER_CONSUMED;
struct sk_buff *skb = *pskb;
struct rmnet_port *port;
struct net_device *dev;
if (!skb)
- return RX_HANDLER_CONSUMED;
+ goto done;
dev = skb->dev;
port = rmnet_get_port(dev);
@@ -182,14 +174,15 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)
switch (port->rmnet_mode) {
case RMNET_EPMODE_VND:
if (port->ingress_data_format & RMNET_INGRESS_FORMAT_MAP)
- rc = rmnet_map_ingress_handler(skb, port);
+ rmnet_map_ingress_handler(skb, port);
break;
case RMNET_EPMODE_BRIDGE:
- rc = rmnet_bridge_handler(skb, port->bridge_ep);
+ rmnet_bridge_handler(skb, port->bridge_ep);
break;
}
- return rc;
+done:
+ return RX_HANDLER_CONSUMED;
}
/* Modifies packet as per logical endpoint configuration and egress data format
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
index ce2302c..3af3fe7 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
@@ -80,7 +80,6 @@ struct rmnet_map_header {
struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb);
struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb,
int hdrlen, int pad);
-rx_handler_result_t rmnet_map_command(struct sk_buff *skb,
- struct rmnet_port *port);
+void rmnet_map_command(struct sk_buff *skb, struct rmnet_port *port);
#endif /* _RMNET_MAP_H_ */
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c
index 74d362f..51e6049 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c
@@ -76,8 +76,7 @@ static void rmnet_map_send_ack(struct sk_buff *skb,
/* Process MAP command frame and send N/ACK message as appropriate. Message cmd
* name is decoded here and appropriate handler is called.
*/
-rx_handler_result_t rmnet_map_command(struct sk_buff *skb,
- struct rmnet_port *port)
+void rmnet_map_command(struct sk_buff *skb, struct rmnet_port *port)
{
struct rmnet_map_control_command *cmd;
unsigned char command_name;
@@ -102,5 +101,4 @@ rx_handler_result_t rmnet_map_command(struct sk_buff *skb,
}
if (rc == RMNET_MAP_COMMAND_ACK)
rmnet_map_send_ack(skb, rc);
- return RX_HANDLER_CONSUMED;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next 2/4] net: qualcomm: rmnet: Always assign rmnet dev in deaggregation path
2017-10-25 4:55 [PATCH net-next 0/4] net: qualcomm: rmnet: Add 64 bit stats and GRO Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 1/4] net: qualcomm: rmnet: Fix the return value of rmnet_rx_handler() Subash Abhinov Kasiviswanathan
@ 2017-10-25 4:55 ` Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 3/4] net: qualcomm: rmnet: Add support for 64 bit stats Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 4/4] net: qualcomm: rmnet: Add support for GRO Subash Abhinov Kasiviswanathan
3 siblings, 0 replies; 7+ messages in thread
From: Subash Abhinov Kasiviswanathan @ 2017-10-25 4:55 UTC (permalink / raw)
To: davem, netdev; +Cc: Subash Abhinov Kasiviswanathan
The rmnet device needs to assigned for all packets in the
deaggregation path based on the mux id, so the check is not needed.
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
---
drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 5dd186d..1ea9783 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -83,8 +83,7 @@ static void rmnet_set_skb_proto(struct sk_buff *skb)
if (!ep)
goto free_skb;
- if (port->ingress_data_format & RMNET_INGRESS_FORMAT_DEMUXING)
- skb->dev = ep->egress_dev;
+ skb->dev = ep->egress_dev;
/* Subtract MAP header */
skb_pull(skb, sizeof(struct rmnet_map_header));
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next 3/4] net: qualcomm: rmnet: Add support for 64 bit stats
2017-10-25 4:55 [PATCH net-next 0/4] net: qualcomm: rmnet: Add 64 bit stats and GRO Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 1/4] net: qualcomm: rmnet: Fix the return value of rmnet_rx_handler() Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 2/4] net: qualcomm: rmnet: Always assign rmnet dev in deaggregation path Subash Abhinov Kasiviswanathan
@ 2017-10-25 4:55 ` Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 4/4] net: qualcomm: rmnet: Add support for GRO Subash Abhinov Kasiviswanathan
3 siblings, 0 replies; 7+ messages in thread
From: Subash Abhinov Kasiviswanathan @ 2017-10-25 4:55 UTC (permalink / raw)
To: davem, netdev; +Cc: Subash Abhinov Kasiviswanathan
Implement 64 bit per cpu stats.
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
---
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 14 ++++
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 76 ++++++++++++++++++++--
2 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
index 60115e6..9586703d 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
@@ -41,9 +41,23 @@ struct rmnet_port {
extern struct rtnl_link_ops rmnet_link_ops;
+struct rmnet_vnd_stats {
+ u64 rx_pkts;
+ u64 rx_bytes;
+ u64 tx_pkts;
+ u64 tx_bytes;
+ u32 tx_drops;
+};
+
+struct rmnet_pcpu_stats {
+ struct rmnet_vnd_stats stats;
+ struct u64_stats_sync syncp;
+};
+
struct rmnet_priv {
u8 mux_id;
struct net_device *real_dev;
+ struct rmnet_pcpu_stats __percpu *pcpu_stats;
};
struct rmnet_port *rmnet_get_port(struct net_device *real_dev);
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
index 12bd0bb..b0befa1 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
@@ -27,14 +27,28 @@
void rmnet_vnd_rx_fixup(struct sk_buff *skb, struct net_device *dev)
{
- dev->stats.rx_packets++;
- dev->stats.rx_bytes += skb->len;
+ struct rmnet_priv *priv = netdev_priv(dev);
+ struct rmnet_pcpu_stats *pcpu_ptr;
+
+ pcpu_ptr = this_cpu_ptr(priv->pcpu_stats);
+
+ u64_stats_update_begin(&pcpu_ptr->syncp);
+ pcpu_ptr->stats.rx_pkts++;
+ pcpu_ptr->stats.rx_bytes += skb->len;
+ u64_stats_update_end(&pcpu_ptr->syncp);
}
void rmnet_vnd_tx_fixup(struct sk_buff *skb, struct net_device *dev)
{
- dev->stats.tx_packets++;
- dev->stats.tx_bytes += skb->len;
+ struct rmnet_priv *priv = netdev_priv(dev);
+ struct rmnet_pcpu_stats *pcpu_ptr;
+
+ pcpu_ptr = this_cpu_ptr(priv->pcpu_stats);
+
+ u64_stats_update_begin(&pcpu_ptr->syncp);
+ pcpu_ptr->stats.tx_pkts++;
+ pcpu_ptr->stats.tx_bytes += skb->len;
+ u64_stats_update_end(&pcpu_ptr->syncp);
}
/* Network Device Operations */
@@ -48,7 +62,7 @@ static netdev_tx_t rmnet_vnd_start_xmit(struct sk_buff *skb,
if (priv->real_dev) {
rmnet_egress_handler(skb);
} else {
- dev->stats.tx_dropped++;
+ this_cpu_inc(priv->pcpu_stats->stats.tx_drops);
kfree_skb(skb);
}
return NETDEV_TX_OK;
@@ -70,12 +84,64 @@ static int rmnet_vnd_get_iflink(const struct net_device *dev)
return priv->real_dev->ifindex;
}
+static int rmnet_vnd_init(struct net_device *dev)
+{
+ struct rmnet_priv *priv = netdev_priv(dev);
+
+ priv->pcpu_stats = alloc_percpu(struct rmnet_pcpu_stats);
+ if (!priv->pcpu_stats)
+ return -ENOMEM;
+
+ return 0;
+}
+
+static void rmnet_vnd_uninit(struct net_device *dev)
+{
+ struct rmnet_priv *priv = netdev_priv(dev);
+
+ free_percpu(priv->pcpu_stats);
+}
+
+static void rmnet_get_stats64(struct net_device *dev,
+ struct rtnl_link_stats64 *s)
+{
+ struct rmnet_priv *priv = netdev_priv(dev);
+ struct rmnet_vnd_stats total_stats;
+ struct rmnet_pcpu_stats *pcpu_ptr;
+ unsigned int cpu, start;
+
+ memset(&total_stats, 0, sizeof(struct rmnet_vnd_stats));
+
+ for_each_possible_cpu(cpu) {
+ pcpu_ptr = this_cpu_ptr(priv->pcpu_stats);
+
+ do {
+ start = u64_stats_fetch_begin_irq(&pcpu_ptr->syncp);
+ total_stats.rx_pkts += pcpu_ptr->stats.rx_pkts;
+ total_stats.rx_bytes += pcpu_ptr->stats.rx_bytes;
+ total_stats.tx_pkts += pcpu_ptr->stats.tx_pkts;
+ total_stats.tx_bytes += pcpu_ptr->stats.tx_bytes;
+ } while (u64_stats_fetch_retry_irq(&pcpu_ptr->syncp, start));
+
+ total_stats.tx_drops += pcpu_ptr->stats.tx_drops;
+ }
+
+ s->rx_packets = total_stats.rx_pkts;
+ s->rx_bytes = total_stats.rx_bytes;
+ s->tx_packets = total_stats.tx_pkts;
+ s->tx_bytes = total_stats.tx_bytes;
+ s->tx_dropped = total_stats.tx_drops;
+}
+
static const struct net_device_ops rmnet_vnd_ops = {
.ndo_start_xmit = rmnet_vnd_start_xmit,
.ndo_change_mtu = rmnet_vnd_change_mtu,
.ndo_get_iflink = rmnet_vnd_get_iflink,
.ndo_add_slave = rmnet_add_bridge,
.ndo_del_slave = rmnet_del_bridge,
+ .ndo_init = rmnet_vnd_init,
+ .ndo_uninit = rmnet_vnd_uninit,
+ .ndo_get_stats64 = rmnet_get_stats64,
};
/* Called by kernel whenever a new rmnet<n> device is created. Sets MTU,
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next 4/4] net: qualcomm: rmnet: Add support for GRO
2017-10-25 4:55 [PATCH net-next 0/4] net: qualcomm: rmnet: Add 64 bit stats and GRO Subash Abhinov Kasiviswanathan
` (2 preceding siblings ...)
2017-10-25 4:55 ` [PATCH net-next 3/4] net: qualcomm: rmnet: Add support for 64 bit stats Subash Abhinov Kasiviswanathan
@ 2017-10-25 4:55 ` Subash Abhinov Kasiviswanathan
2017-10-25 14:00 ` Eric Dumazet
3 siblings, 1 reply; 7+ messages in thread
From: Subash Abhinov Kasiviswanathan @ 2017-10-25 4:55 UTC (permalink / raw)
To: davem, netdev; +Cc: Subash Abhinov Kasiviswanathan
Add gro_cells so that rmnet devices can call gro_cells_receive
instead of netif_receive_skb.
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
---
drivers/net/ethernet/qualcomm/rmnet/Kconfig | 1 +
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 6 +++---
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 2 ++
drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 4 +++-
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 9 ++++++++-
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 2 +-
6 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/qualcomm/rmnet/Kconfig b/drivers/net/ethernet/qualcomm/rmnet/Kconfig
index 6e2587a..9bb06d2 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/Kconfig
+++ b/drivers/net/ethernet/qualcomm/rmnet/Kconfig
@@ -5,6 +5,7 @@
menuconfig RMNET
tristate "RmNet MAP driver"
default n
+ select GRO_CELLS
---help---
If you select this, you will enable the RMNET module which is used
for handling data in the multiplexing and aggregation protocol (MAP)
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
index 71bee1a..5ce4287 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
@@ -191,7 +191,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev,
return 0;
err2:
- rmnet_vnd_dellink(mux_id, port, ep);
+ rmnet_vnd_dellink(mux_id, port, ep, dev);
err1:
rmnet_unregister_real_device(real_dev, port);
err0:
@@ -221,7 +221,7 @@ static void rmnet_dellink(struct net_device *dev, struct list_head *head)
if (ep) {
hlist_del_init_rcu(&ep->hlnode);
rmnet_unregister_bridge(dev, port);
- rmnet_vnd_dellink(mux_id, port, ep);
+ rmnet_vnd_dellink(mux_id, port, ep, dev);
kfree(ep);
}
rmnet_unregister_real_device(real_dev, port);
@@ -239,7 +239,7 @@ static int rmnet_dev_walk_unreg(struct net_device *rmnet_dev, void *data)
ep = rmnet_get_endpoint(d->port, mux_id);
if (ep) {
hlist_del_init_rcu(&ep->hlnode);
- rmnet_vnd_dellink(mux_id, d->port, ep);
+ rmnet_vnd_dellink(mux_id, d->port, ep, rmnet_dev);
kfree(ep);
}
netdev_upper_dev_unlink(rmnet_dev, d->real_dev);
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
index 9586703d..c19259e 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
@@ -14,6 +14,7 @@
*/
#include <linux/skbuff.h>
+#include <net/gro_cells.h>
#ifndef _RMNET_CONFIG_H_
#define _RMNET_CONFIG_H_
@@ -58,6 +59,7 @@ struct rmnet_priv {
u8 mux_id;
struct net_device *real_dev;
struct rmnet_pcpu_stats __percpu *pcpu_stats;
+ struct gro_cells gro_cells;
};
struct rmnet_port *rmnet_get_port(struct net_device *real_dev);
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 1ea9783..29842cc 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -46,13 +46,15 @@ static void rmnet_set_skb_proto(struct sk_buff *skb)
static void
rmnet_deliver_skb(struct sk_buff *skb)
{
+ struct rmnet_priv *priv = netdev_priv(skb->dev);
+
skb_reset_transport_header(skb);
skb_reset_network_header(skb);
rmnet_vnd_rx_fixup(skb, skb->dev);
skb->pkt_type = PACKET_HOST;
skb_set_mac_header(skb, 0);
- netif_receive_skb(skb);
+ gro_cells_receive(&priv->gro_cells, skb);
}
/* MAP handler */
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
index b0befa1..45a97eb 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
@@ -149,6 +149,8 @@ static void rmnet_get_stats64(struct net_device *dev,
*/
void rmnet_vnd_setup(struct net_device *rmnet_dev)
{
+ struct rmnet_priv *priv = netdev_priv(rmnet_dev);
+
rmnet_dev->netdev_ops = &rmnet_vnd_ops;
rmnet_dev->mtu = RMNET_DFLT_PACKET_SIZE;
rmnet_dev->needed_headroom = RMNET_NEEDED_HEADROOM;
@@ -162,6 +164,8 @@ void rmnet_vnd_setup(struct net_device *rmnet_dev)
rmnet_dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST);
rmnet_dev->needs_free_netdev = true;
+
+ gro_cells_init(&priv->gro_cells, rmnet_dev);
}
/* Exposed API */
@@ -196,11 +200,14 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,
}
int rmnet_vnd_dellink(u8 id, struct rmnet_port *port,
- struct rmnet_endpoint *ep)
+ struct rmnet_endpoint *ep, struct net_device *rmnet_dev)
{
+ struct rmnet_priv *priv = netdev_priv(rmnet_dev);
+
if (id >= RMNET_MAX_LOGICAL_EP || !ep->egress_dev)
return -EINVAL;
+ gro_cells_destroy(&priv->gro_cells);
ep->egress_dev = NULL;
port->nr_rmnet_devs--;
return 0;
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h
index 71e4c32..18cd5f6c 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h
@@ -22,7 +22,7 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,
struct net_device *real_dev,
struct rmnet_endpoint *ep);
int rmnet_vnd_dellink(u8 id, struct rmnet_port *port,
- struct rmnet_endpoint *ep);
+ struct rmnet_endpoint *ep, struct net_device *rmnet_dev);
void rmnet_vnd_rx_fixup(struct sk_buff *skb, struct net_device *dev);
void rmnet_vnd_tx_fixup(struct sk_buff *skb, struct net_device *dev);
u8 rmnet_vnd_get_mux(struct net_device *rmnet_dev);
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 4/4] net: qualcomm: rmnet: Add support for GRO
2017-10-25 4:55 ` [PATCH net-next 4/4] net: qualcomm: rmnet: Add support for GRO Subash Abhinov Kasiviswanathan
@ 2017-10-25 14:00 ` Eric Dumazet
2017-10-25 18:00 ` Subash Abhinov Kasiviswanathan
0 siblings, 1 reply; 7+ messages in thread
From: Eric Dumazet @ 2017-10-25 14:00 UTC (permalink / raw)
To: Subash Abhinov Kasiviswanathan, Tom Herbert; +Cc: davem, netdev
On Tue, 2017-10-24 at 22:55 -0600, Subash Abhinov Kasiviswanathan wrote:
> Add gro_cells so that rmnet devices can call gro_cells_receive
> instead of netif_receive_skb.
>
> void rmnet_vnd_setup(struct net_device *rmnet_dev)
> {
> + struct rmnet_priv *priv = netdev_priv(rmnet_dev);
> +
> rmnet_dev->netdev_ops = &rmnet_vnd_ops;
> rmnet_dev->mtu = RMNET_DFLT_PACKET_SIZE;
> rmnet_dev->needed_headroom = RMNET_NEEDED_HEADROOM;
> @@ -162,6 +164,8 @@ void rmnet_vnd_setup(struct net_device *rmnet_dev)
> rmnet_dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST);
>
> rmnet_dev->needs_free_netdev = true;
> +
> + gro_cells_init(&priv->gro_cells, rmnet_dev);
> }
You need to check return code and abort if memory could not be
allocated.
There is a reason this helper has _init() prefix, it does not belong to
_setup() since a _setup() is not expected to fail.
Please take a look at other gro_cells_init() callers, and you will
notice that it is called from ndo_init()
You might have copied the only buggy caller (vxlan).
Tom, if you read me fix vxlan, thanks !
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 4/4] net: qualcomm: rmnet: Add support for GRO
2017-10-25 14:00 ` Eric Dumazet
@ 2017-10-25 18:00 ` Subash Abhinov Kasiviswanathan
0 siblings, 0 replies; 7+ messages in thread
From: Subash Abhinov Kasiviswanathan @ 2017-10-25 18:00 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Tom Herbert, davem, netdev
> You need to check return code and abort if memory could not be
> allocated.
>
> There is a reason this helper has _init() prefix, it does not belong to
> _setup() since a _setup() is not expected to fail.
>
> Please take a look at other gro_cells_init() callers, and you will
> notice that it is called from ndo_init()
>
> You might have copied the only buggy caller (vxlan).
>
> Tom, if you read me fix vxlan, thanks !
Hi Eric
Thanks for pointing this out. I'll change this in v2.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-10-25 18:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-25 4:55 [PATCH net-next 0/4] net: qualcomm: rmnet: Add 64 bit stats and GRO Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 1/4] net: qualcomm: rmnet: Fix the return value of rmnet_rx_handler() Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 2/4] net: qualcomm: rmnet: Always assign rmnet dev in deaggregation path Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 3/4] net: qualcomm: rmnet: Add support for 64 bit stats Subash Abhinov Kasiviswanathan
2017-10-25 4:55 ` [PATCH net-next 4/4] net: qualcomm: rmnet: Add support for GRO Subash Abhinov Kasiviswanathan
2017-10-25 14:00 ` Eric Dumazet
2017-10-25 18:00 ` Subash Abhinov Kasiviswanathan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.