From patchwork Tue Jul 26 12:48:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Krause X-Patchwork-Id: 652911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rzVJx2Mf6z9stY for ; Wed, 27 Jul 2016 06:36:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=0ALxS6AT; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 794308B615; Tue, 26 Jul 2016 20:36:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1SnyIamd2IY2; Tue, 26 Jul 2016 20:36:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EE83E8B68F; Tue, 26 Jul 2016 20:36:28 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E714F1C1F38 for ; Tue, 26 Jul 2016 12:48:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E123D87F3C for ; Tue, 26 Jul 2016 12:48:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mdxXtB1Y-wJX for ; Tue, 26 Jul 2016 12:48:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f196.google.com (mail-io0-f196.google.com [209.85.223.196]) by hemlock.osuosl.org (Postfix) with ESMTPS id 559BF87999 for ; Tue, 26 Jul 2016 12:48:53 +0000 (UTC) Received: by mail-io0-f196.google.com with SMTP id g86so1319325ioj.1 for ; Tue, 26 Jul 2016 05:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=1R56o2iihtGurLxliKMwg7M6f4o78raKTjnEMspZOY0=; b=0ALxS6ATKwiTj1zepS3rGePbEd1FGJufyzVYMuBGVTn1MJvl3SbAQh3Bgma+kwbcf6 gNBpKkeTctPzJv3TTWCeUssaNrsiK9cfvf94ALypyYDrHF7RQEOqCs35NDxK9W132l0d cghSAQoV2A/1N/edfds3zBytnQBs2WSaft+atrmSLqEUiPcR9mmEkB9n9dMLT00LDsGI 4WM1VHHlEtoISvvx+cPDj2YIfzMGoGouA8IV2BJ0Ig0Dv2PqDOoasRjTnK36zrnRiebY 2bmtlUKTjkWf+CG0FU/LWgv9AcqKy1B4DaP/yZKnrGypbCJxWwrBu6XxeqETv0MJTdaw RyKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=1R56o2iihtGurLxliKMwg7M6f4o78raKTjnEMspZOY0=; b=YK75+X1AdxVtU8hlxmrGPKG5f/bfKt2J0Q8cm8eGrPLRo9fm//ZPMvitowpmhNO2io GO/1EnaccMr01ALvtVR+cYdTkQr9QmH7hGLGikgS2HBXrj2XETjW9k+q/Q1OGbedT0PJ PbwSLIe8Of19FDt8t7VditrCichCHYJD1PWCroiejPvE4OucYxuJ57OJlmbuWJpbT/ZY uJ8xfHGdlC8bFJoUul1zYlC5Yi8dCOgaKQMtC3MfK3xlsTLEJP8Ov5YIrdlNlrHHElrl zyEtVGd/+A+3I4LdNjaz0VC7Gdx8i+/m/6c0+xpF0Kfu9krrlo18VBEO+QYgt/uuwZtn 9O3Q== X-Gm-Message-State: AEkoouucaEUPP7Ti8fxaeVsyP6P66InBKm/s3pHTT8nwdPzhB60Vyl34TFSuoA6X9mp33w== X-Received: by 10.107.34.72 with SMTP id i69mr26110862ioi.13.1469537332665; Tue, 26 Jul 2016 05:48:52 -0700 (PDT) Received: from [192.168.0.10] (CPEbc4dfb2691f3-CMbc4dfb2691f0.cpe.net.cable.rogers.com. [99.250.193.223]) by smtp.googlemail.com with ESMTPSA id o201sm454823iod.16.2016.07.26.05.48.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jul 2016 05:48:51 -0700 (PDT) To: Thomas Gleixner , Fengguang Wu References: <20160726035003.GA15095@wfg-t540p.sh.intel.com> <1469524492.17736.3.camel@edumazet-glaptop3.roam.corp.google.com> <20160726093224.GA10339@wfg-t540p.sh.intel.com> From: nick Message-ID: <8578bb16-cd04-e8a5-c7f4-be061ede95b4@gmail.com> Date: Tue, 26 Jul 2016 08:48:50 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: X-Mailman-Approved-At: Tue, 26 Jul 2016 20:36:27 +0000 Cc: Eric Dumazet , netdev@vger.kernel.org, LKML , Ye Xiaolong , intel-wired-lan@lists.osuosl.org, Satyam Sharma Subject: Re: [Intel-wired-lan] [e1000_netpoll] BUG: sleeping function called from invalid context at kernel/irq/manage.c:110 X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" On 2016-07-26 05:50 AM, Thomas Gleixner wrote: > On Tue, 26 Jul 2016, Fengguang Wu wrote: >> --- a/drivers/net/ethernet/intel/e1000/e1000_main.c >> +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c >> @@ -3797,7 +3797,7 @@ static irqreturn_t e1000_intr(int irq, void *data) >> hw->get_link_status = 1; >> /* guard against interrupt when we're going down */ >> if (!test_bit(__E1000_DOWN, &adapter->flags)) >> - schedule_delayed_work(&adapter->watchdog_task, 1); >> + mod_timer(&adapter->watchdog_timer, jiffies + 1); > > ROTFL .... > Thomas, Yes it's a pretty funny typo, below is a patch that fixes the build error as reported by kbuild robot: From 013dbc315c452d37d565e9c27b90b02239b5a1bb Mon Sep 17 00:00:00 2001 From: Nicholas Krause Date: Tue, 26 Jul 2016 08:43:56 -0400 Subject: [PATCH] use atomic mod timer rather then schedule work Signed-off-by: Nicholas Krause --- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index f42129d..e1830af 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -3797,7 +3797,7 @@ static irqreturn_t e1000_intr(int irq, void *data) hw->get_link_status = 1; /* guard against interrupt when we're going down */ if (!test_bit(__E1000_DOWN, &adapter->flags)) - schedule_delayed_work(&adapter->watchdog_task, 1); + mod_work(&adapter->watchdog_task, jiffies + 1); } /* disable interrupts, without the synchronize_irq bit */