| Message ID | 1317057325-7410-1-git-send-email-brenohl@br.ibm.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Le lundi 26 septembre 2011 à 14:15 -0300, brenohl@br.ibm.com a écrit : > Currently ehea ndo_get_stats can sleep in two places, in a hcall > and in a GFP_KERNEL alloc, which is not correct. > This patch creates a delayed workqueue that grabs the information each 1 > sec from the hardware, and place it into the device structure, so that, > .ndo_get_stats quickly returns the device structure statistics block. > > Signed-off-by: Breno Leitao <brenohl@br.ibm.com> > --- > drivers/net/ethernet/ibm/ehea/ehea.h | 1 + > drivers/net/ethernet/ibm/ehea/ehea_main.c | 26 ++++++++++++++++++++------ > 2 files changed, 21 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/ibm/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h > index 7dd5e6a..0b8e6a9 100644 > --- a/drivers/net/ethernet/ibm/ehea/ehea.h > +++ b/drivers/net/ethernet/ibm/ehea/ehea.h > @@ -459,6 +459,7 @@ struct ehea_port { > struct ehea_mc_list *mc_list; /* Multicast MAC addresses */ > struct ehea_eq *qp_eq; > struct work_struct reset_task; > + struct delayed_work stats_work; > struct mutex port_lock; > char int_aff_name[EHEA_IRQ_NAME_SIZE]; > int allmulti; /* Indicates IFF_ALLMULTI state */ > diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c > index 583bcd3..a10f6b3 100644 > --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c > +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c > @@ -330,17 +330,24 @@ out: > static struct net_device_stats *ehea_get_stats(struct net_device *dev) > { > struct ehea_port *port = netdev_priv(dev); > + > + return &port->stats; > +} Hmm... You should move in ehea_get_stats() all software-computed stats. Only the hardware assisted stats should be gathered/changed from your ehea_update_stats() helper. This way, SNMP readers get accurate stats for all fields but the stats->multicast and stats->rx_errors that are updated once per second. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/26/2011 03:02 PM, Eric Dumazet wrote:
> You should move in ehea_get_stats() all software-computed stats.
Agreed. I am going to resend the patch.
Thanks
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/ibm/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h index 7dd5e6a..0b8e6a9 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea.h +++ b/drivers/net/ethernet/ibm/ehea/ehea.h @@ -459,6 +459,7 @@ struct ehea_port { struct ehea_mc_list *mc_list; /* Multicast MAC addresses */ struct ehea_eq *qp_eq; struct work_struct reset_task; + struct delayed_work stats_work; struct mutex port_lock; char int_aff_name[EHEA_IRQ_NAME_SIZE]; int allmulti; /* Indicates IFF_ALLMULTI state */ diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 583bcd3..a10f6b3 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -330,17 +330,24 @@ out: static struct net_device_stats *ehea_get_stats(struct net_device *dev) { struct ehea_port *port = netdev_priv(dev); + + return &port->stats; +} + +static void ehea_update_stats(struct work_struct *work) +{ + struct ehea_port *port = + container_of(work, struct ehea_port, stats_work.work); + struct net_device *dev = port->netdev; struct net_device_stats *stats = &port->stats; struct hcp_ehea_port_cb2 *cb2; u64 hret, rx_packets, tx_packets, rx_bytes = 0, tx_bytes = 0; int i; - memset(stats, 0, sizeof(*stats)); - cb2 = (void *)get_zeroed_page(GFP_KERNEL); if (!cb2) { - netdev_err(dev, "no mem for cb2\n"); - goto out; + netdev_err(dev, "No mem for cb2. The interface statistics was not be updated\n"); + goto resched; } hret = ehea_h_query_ehea_port(port->adapter->handle, @@ -375,8 +382,10 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev) out_herr: free_page((unsigned long)cb2); -out: - return stats; + +resched: + schedule_delayed_work(&port->stats_work, msecs_to_jiffies(1000)); + } static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes) @@ -2651,6 +2660,7 @@ static int ehea_open(struct net_device *dev) } mutex_unlock(&port->port_lock); + schedule_delayed_work(&port->stats_work, msecs_to_jiffies(1000)); return ret; } @@ -2690,6 +2700,7 @@ static int ehea_stop(struct net_device *dev) set_bit(__EHEA_DISABLE_PORT_RESET, &port->flags); cancel_work_sync(&port->reset_task); + cancel_delayed_work_sync(&port->stats_work); mutex_lock(&port->port_lock); netif_stop_queue(dev); port_napi_disable(port); @@ -3235,10 +3246,12 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, dev->features |= NETIF_F_LRO; INIT_WORK(&port->reset_task, ehea_reset_port); + INIT_DELAYED_WORK(&port->stats_work, ehea_update_stats); init_waitqueue_head(&port->swqe_avail_wq); init_waitqueue_head(&port->restart_wq); + memset(&port->stats, 0, sizeof(struct net_device_stats)); ret = register_netdev(dev); if (ret) { pr_err("register_netdev failed. ret=%d\n", ret); @@ -3278,6 +3291,7 @@ static void ehea_shutdown_single_port(struct ehea_port *port) struct ehea_adapter *adapter = port->adapter; cancel_work_sync(&port->reset_task); + cancel_delayed_work_sync(&port->stats_work); unregister_netdev(port->netdev); ehea_unregister_port(port); kfree(port->mc_list);
Currently ehea ndo_get_stats can sleep in two places, in a hcall and in a GFP_KERNEL alloc, which is not correct. This patch creates a delayed workqueue that grabs the information each 1 sec from the hardware, and place it into the device structure, so that, .ndo_get_stats quickly returns the device structure statistics block. Signed-off-by: Breno Leitao <brenohl@br.ibm.com> --- drivers/net/ethernet/ibm/ehea/ehea.h | 1 + drivers/net/ethernet/ibm/ehea/ehea_main.c | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-)