From patchwork Wed Oct 21 21:19:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 36639 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 3ABF7B7B99 for ; Thu, 22 Oct 2009 08:19:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755398AbZJUVTP (ORCPT ); Wed, 21 Oct 2009 17:19:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754160AbZJUVTP (ORCPT ); Wed, 21 Oct 2009 17:19:15 -0400 Received: from mail-fx0-f218.google.com ([209.85.220.218]:52429 "EHLO mail-fx0-f218.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754147AbZJUVTN (ORCPT ); Wed, 21 Oct 2009 17:19:13 -0400 Received: by fxm18 with SMTP id 18so8271571fxm.37 for ; Wed, 21 Oct 2009 14:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=n/1LK6+wOXJpJI8jmbkQ70Sff+Uf0OYHcgI5AgD3Rs4=; b=cLpuvJ4ge/2Ht4vjcFr/fhWszkkI24o8qrqw0AnCsSXnbAObV0XVu0KYSSPVWp+xxq S57agwAwrL4QeEq+teGtYB8wxBMjBd+jJffUm2nxshbDT4BNT28vMADRHE94/LkYc7Z5 Ym3DhROIzfI1C+NvNSKHgTRxKOxe4WNCpoYl4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=JZ72rzqskUJWCyOkph+jxnsoWwCDDYF0EcIu1wGj7PExG5v3s3B10d10CgOqgKFEOn W+rUBKMHXMLPep61EYybZgBb64uXMbb74XoqqJD+zjexdjM/NB7GvL6Yt6QKRPOvVHTu HvYDJm2XgJyD8U0xnfkVG7RCy2r25SYzu5g7w= Received: by 10.204.3.19 with SMTP id 19mr8367402bkl.151.1256159956744; Wed, 21 Oct 2009 14:19:16 -0700 (PDT) Received: from ami.dom.local (public65730.xdsl.centertel.pl [79.162.128.194]) by mx.google.com with ESMTPS id e17sm863416fke.56.2009.10.21.14.19.13 (version=SSLv3 cipher=RC4-MD5); Wed, 21 Oct 2009 14:19:15 -0700 (PDT) Date: Wed, 21 Oct 2009 23:19:06 +0200 From: Jarek Poplawski To: Tilman Schmidt Cc: David Miller , johannes@sipsolutions.net, hidave.darkstar@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, linux-wireless@vger.kernel.org, linux-ppp@vger.kernel.org, netdev@vger.kernel.org, paulus@samba.org, Michael Buesch , Oliver Hartkopp Subject: [PATCH] net: Adjust softirq raising in __napi_schedule Message-ID: <20091021211906.GA11401@ami.dom.local> References: <4AD31213.6020006@imap.cc> <20091015114052.GA9870@ff.dom.local> <4AD76184.6030900@gmail.com> <4ADF5710.4030505@imap.cc> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4ADF5710.4030505@imap.cc> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Oct 21, 2009 at 08:46:40PM +0200, Tilman Schmidt wrote: ... > I have tested your patch and I can confirm that it fixes the messages. > I have not noticed any ill effects. OK. So, in any case, here is this next variant/proposal. Thanks, Jarek P. ------------------------> net: Adjust softirq raising in __napi_schedule This patch changes __raise_softirq_irqoff() to raise_softirq_irqoff() in __napi_schedule() to enable proper softirq scheduling from process context. The main intent is to let use netif_rx() universally, and make netif_rx_ni() redundant. Currently using netif_rx() instead of netif_rx_ni() triggers: "NOHZ: local_softirq_pending 08" warnings, but additional cost of one "if" on the fast path doesn't seem to justify maintaining it separately. This patch is based on the analysis, suggestions and the original patch for mac80211 by: Michael Buesch Another patch calling netif_rx variants conditionally was done by: Oliver Hartkopp Reported-by: Michael Buesch Reported-by: Oliver Hartkopp Reported-by: Tilman Schmidt Diagnosed-by: Michael Buesch Tested-by: Tilman Schmidt Signed-off-by: Jarek Poplawski --- net/core/dev.c | 2 +- 1 files changed, 1 insertions(+), 1 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/net/core/dev.c b/net/core/dev.c index 28b0b9e..7fc4009 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2728,7 +2728,7 @@ void __napi_schedule(struct napi_struct *n) local_irq_save(flags); list_add_tail(&n->poll_list, &__get_cpu_var(softnet_data).poll_list); - __raise_softirq_irqoff(NET_RX_SOFTIRQ); + raise_softirq_irqoff(NET_RX_SOFTIRQ); local_irq_restore(flags); } EXPORT_SYMBOL(__napi_schedule);