From patchwork Wed Jun 1 20:42:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heiko Carstens X-Patchwork-Id: 98263 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 F2D59B6F86 for ; Thu, 2 Jun 2011 06:42:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759983Ab1FAUmh (ORCPT ); Wed, 1 Jun 2011 16:42:37 -0400 Received: from mtagate4.uk.ibm.com ([194.196.100.164]:50845 "EHLO mtagate4.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759971Ab1FAUmg (ORCPT ); Wed, 1 Jun 2011 16:42:36 -0400 Received: from d06nrmr1507.portsmouth.uk.ibm.com (d06nrmr1507.portsmouth.uk.ibm.com [9.149.38.233]) by mtagate4.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p51KgZ8O021831; Wed, 1 Jun 2011 20:42:35 GMT Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p51KgZSr2568268; Wed, 1 Jun 2011 21:42:35 +0100 Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p51KgYRO017973; Wed, 1 Jun 2011 14:42:34 -0600 Received: from localhost (ICON-9-164-142-56.megacenter.de.ibm.com [9.164.142.56]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p51KgYoL017970; Wed, 1 Jun 2011 14:42:34 -0600 Date: Wed, 1 Jun 2011 22:42:34 +0200 From: Heiko Carstens To: Eric Dumazet Cc: Frank Blaschka , davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org Subject: Re: [BUG] net: cpu offline cause napi stall Message-ID: <20110601204233.GA2410@osiris.boeblingen.de.ibm.com> References: <20110601103356.GA45482@tuxmaker.boeblingen.de.ibm.com> <1306930399.3476.1.camel@edumazet-laptop> <20110601163628.GA2418@osiris.boeblingen.de.ibm.com> <1306947321.2890.5.camel@edumazet-laptop> <20110601181253.GA2374@osiris.boeblingen.de.ibm.com> <1306958592.3946.0.camel@edumazet-laptop> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1306958592.3946.0.camel@edumazet-laptop> 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 On Wed, Jun 01, 2011 at 10:03:12PM +0200, Eric Dumazet wrote: > Le mercredi 01 juin 2011 à 20:12 +0200, Heiko Carstens a écrit : > > On Wed, Jun 01, 2011 at 06:55:21PM +0200, Eric Dumazet wrote: > > > > + /* Append NAPI poll list from offline CPU. */ > > > > + list_splice_init(&oldsd->poll_list, &sd->poll_list); > > > > > > > > raise_softirq_irqoff(NET_TX_SOFTIRQ); > > > > local_irq_enable(); > > > > > > Please make sure we raise NET_RX_SOFTIRQ on new cpu if necessary. > > > > Well, see two lines below the list_splice_init() call ;) > > I see nothing... NET_TX_SOFTIRQ and NET_RX_SOFTIRQ are not the same Indeed. I must be blind. --- 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/net/core/dev.c b/net/core/dev.c index 6561021..6189dac 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5981,6 +5981,11 @@ static int dev_cpu_callback(struct notifier_block *nfb, oldsd->output_queue = NULL; oldsd->output_queue_tailp = &oldsd->output_queue; } + /* Append NAPI poll list from offline CPU. */ + if (!list_empty(&oldsd->poll_list)) { + list_splice_init(&oldsd->poll_list, &sd->poll_list); + raise_softirq_irqoff(NET_RX_SOFTIRQ); + } raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_enable();