From patchwork Wed Aug 18 12:29:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 62036 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 579F9B70D9 for ; Wed, 18 Aug 2010 22:29:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751331Ab0HRM3f (ORCPT ); Wed, 18 Aug 2010 08:29:35 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:48152 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751112Ab0HRM3e (ORCPT ); Wed, 18 Aug 2010 08:29:34 -0400 Received: by wyb32 with SMTP id 32so726667wyb.19 for ; Wed, 18 Aug 2010 05:29:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=FHfEv+I0s4GBkUJ4J59llJTFJqsynNtr6sBLC4rBras=; b=ToEpSWIavXNvtG39SHWIQpiDoKrz6zxkl1xJ1AJBDAfdw51V3/OqMmVtF/4rz3bxcM OHjOJy1hoRSiL0y2LYwcKW2UDHpTRkfCYGHtCEs+pFZtBPSueNw2T9mXaqv9ioPmys9C ugoY7BKYbvRMDzW1cCWZZTx9pzPBF7A1yvhQ0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=E8dNJH7lNYKfaAtXfQATLeGDT6eC58yMTbyOX1WgMF2Y1902F67Kdj0usG5KQHLSgF tsjdNl4LlN8XXszMhCaxqfHerbEXL6OKCLkF8H3l10zdSuKlRwT3lVdWQ2Lxcvuho0xs 8bHRbFEszEU48SesezMyp5MZYzeDO7mtUxGUI= Received: by 10.227.27.197 with SMTP id j5mr6856650wbc.111.1282134573035; Wed, 18 Aug 2010 05:29:33 -0700 (PDT) Received: from [127.0.0.1] ([85.17.35.125]) by mx.google.com with ESMTPS id a1sm174039wbb.20.2010.08.18.05.29.31 (version=SSLv3 cipher=RC4-MD5); Wed, 18 Aug 2010 05:29:32 -0700 (PDT) Subject: [PATCH] netxen: fix a race in netxen_nic_get_stats() From: Eric Dumazet To: Amit Salecha Cc: David Miller , netdev In-Reply-To: <99737F4847ED0A48AECC9F4A1974A4B80F86E69124@MNEXMB2.qlogic.org> References: <1282128168.2194.49.camel@edumazet-laptop> <99737F4847ED0A48AECC9F4A1974A4B80F86E69124@MNEXMB2.qlogic.org> Date: Wed, 18 Aug 2010 14:29:30 +0200 Message-ID: <1282134570.2194.53.camel@edumazet-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Le mercredi 18 août 2010 à 05:47 -0500, Amit Salecha a écrit : > Same fix will be require for netxen_nic. Indeed, here is netxen part Thanks [PATCH] netxen: fix a race in netxen_nic_get_stats() Dont clear netdev->stats, it might give transient wrong values to concurrent stat readers. Signed-off-by: Eric Dumazet --- drivers/net/netxen/netxen_nic_main.c | 2 -- 1 file changed, 2 deletions(-) -- 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/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index fd86e18..cb30df1 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -2032,8 +2032,6 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev) struct netxen_adapter *adapter = netdev_priv(netdev); struct net_device_stats *stats = &netdev->stats; - memset(stats, 0, sizeof(*stats)); - stats->rx_packets = adapter->stats.rx_pkts + adapter->stats.lro_pkts; stats->tx_packets = adapter->stats.xmitfinished; stats->rx_bytes = adapter->stats.rxbytes;