From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754084AbdCBBIz (ORCPT <rfc822;w@1wt.eu>);
        Wed, 1 Mar 2017 20:08:55 -0500
Received: from mail-wm0-f66.google.com ([74.125.82.66]:35192 "EHLO
        mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753779AbdCBBIl (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 1 Mar 2017 20:08:41 -0500
Subject: Re: e1000_netpoll() , BUG: sleeping function called from invalid
 context
To: Thomas Gleixner <tglx@linutronix.de>
References: <ce27a339-78ba-bb38-55ce-790c10f688af@gmail.com>
 <CAM_iQpXb9oj8twRs=XEVu+ALBYQQd=zXd4GMqvXBxTb+-Nt0Ag@mail.gmail.com>
 <0f5cc059-3db3-f0ae-77a5-0a0c872e4874@gmail.com>
 <CAM_iQpU0+F7Qb3cTYxFyGY_uXYF5aLHa8H7YMp4vqS8--+bksg@mail.gmail.com>
 <56df0620-6042-50bb-a929-2e8043369554@gmail.com>
 <CAM_iQpVznUMtGJwC1Toa4X=dVtDigefZavUcQfFPk22YN5BxbA@mail.gmail.com>
 <e7262413-f221-964b-8442-9f0d6fa3a4bf@gmail.com>
 <alpine.DEB.2.20.1703011812150.4005@nanos>
 <396fbe61-daec-ff59-c9d3-f569ae55129f@gmail.com>
 <alpine.DEB.2.20.1703012336520.3684@nanos>
 <0d57aa09-4bf6-15d8-c398-1e5f160dbf83@gmail.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>,
        lkml <linux-kernel@vger.kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>
From: Gabriel C <nix.or.die@gmail.com>
Message-ID: <dffd383c-67cc-d7f1-1d2f-8e9bd9090fa8@gmail.com>
Date: Thu, 2 Mar 2017 01:04:31 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.7.1
MIME-Version: 1.0
In-Reply-To: <0d57aa09-4bf6-15d8-c398-1e5f160dbf83@gmail.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org



>> Does the patch below fix it?
>
> I'll test you patch in a bit and let you know.
>

It seem to work.

But to be really sure I let the box running with this setup over night.


>> 	
>> 8<--------------
>>
>> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
>> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
>> @@ -6716,19 +6716,19 @@ static irqreturn_t e1000_intr_msix(int _
>>
>>  		vector = 0;
>>  		msix_irq = adapter->msix_entries[vector].vector;
>> -		disable_irq(msix_irq);
>> +		disable_hardirq(msix_irq);
>>  		e1000_intr_msix_rx(msix_irq, netdev);
>>  		enable_irq(msix_irq);
>>
>>  		vector++;
>>  		msix_irq = adapter->msix_entries[vector].vector;
>> -		disable_irq(msix_irq);
>> +		disable_hardirq(msix_irq);
>>  		e1000_intr_msix_tx(msix_irq, netdev);
>>  		enable_irq(msix_irq);
>>
>>  		vector++;
>>  		msix_irq = adapter->msix_entries[vector].vector;
>> -		disable_irq(msix_irq);
>> +		disable_hardirq(msix_irq);
>>  		e1000_msix_other(msix_irq, netdev);
>>  		enable_irq(msix_irq);
>>  	}
>>