From patchwork Tue Feb 25 01:12:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle McMartin X-Patchwork-Id: 323812 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 89B5E2C00C4 for ; Tue, 25 Feb 2014 12:12:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752595AbaBYBMh (ORCPT ); Mon, 24 Feb 2014 20:12:37 -0500 Received: from merlin.infradead.org ([205.233.59.134]:55856 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752161AbaBYBMg (ORCPT ); Mon, 24 Feb 2014 20:12:36 -0500 Received: from kyle by merlin.infradead.org with local (Exim 4.80.1 #2 (Red Hat Linux)) id 1WI6ZQ-0000De-M0; Tue, 25 Feb 2014 01:12:28 +0000 Date: Mon, 24 Feb 2014 20:12:28 -0500 From: Kyle McMartin To: Borislav Petkov Cc: Realtek linux nic maintainers , Francois Romieu , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] r8169: initialize rtl8169_stats seqlock Message-ID: <20140225011228.GC14970@merlin.infradead.org> References: <20140224231748.GA18598@pd.tnic> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140224231748.GA18598@pd.tnic> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kyle McMartin Boris reports he's seeing: > [ 9.195943] INFO: trying to register non-static key. > [ 9.196031] the code is fine but needs lockdep annotation. > [ 9.196031] turning off the locking correctness validator. > [ 9.196031] CPU: 1 PID: 933 Comm: modprobe Not tainted 3.14.0-rc4+ #1 with the r8169 driver. These are occuring because the seqcount embedded in u64_stats_sync on 32-bit SMP is uninitialized which is making lockdep unhappy. Signed-off-by: Kyle McMartin Tested-by: Borislav Petkov --- Patch is only compile tested by me, as these initializers will disappear on 64-bit. -- 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 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7118,6 +7118,8 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } mutex_init(&tp->wk.mutex); + u64_stats_init(&tp->rx_stats.syncp); + u64_stats_init(&tp->tx_stats.syncp); /* Get MAC address */ for (i = 0; i < ETH_ALEN; i++)