From patchwork Wed Jun 9 13:21:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 55091 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 91ADEB7D81 for ; Wed, 9 Jun 2010 23:21:36 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OMLDm-00028g-Eh; Wed, 09 Jun 2010 14:21:30 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OMLDj-00027C-Kl for kernel-team@lists.ubuntu.com; Wed, 09 Jun 2010 14:21:28 +0100 Received: from [10.0.2.5] (unknown [10.0.2.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id 8B39A24C8B4; Wed, 9 Jun 2010 06:20:44 -0700 (PDT) Message-ID: <4C0F9554.105@canonical.com> Date: Wed, 09 Jun 2010 07:21:24 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100423 Thunderbird/3.0.4 MIME-Version: 1.0 To: Leann Ogasawara Subject: Maverick pull request, LP591416 - 2.6.35-rc2 CONFIG_RPS=y fills log with noise Cc: Kernel team list X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: tim.gardner@canonical.com List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Leann, This patch fixes the noise injected into the kernel log for servers that have multi-receive queue adapters. I'd like to see this applied soon (and uploaded) since I'm not sure what action upstream is taking on this. I can't seem to get any traction there. As soon as I see what they're gonna do I'll send a correction. rtg diff --git a/net/core/dev.c b/net/core/dev.c index d03470f..0852608 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2253,7 +2253,7 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb, if (skb_rx_queue_recorded(skb)) { u16 index = skb_get_rx_queue(skb); if (unlikely(index >= dev->num_rx_queues)) { - if (net_ratelimit()) { + if (dev->num_rx_queues > 1 && net_ratelimit()) { pr_warning("%s received packet on queue " "%u, but number of RX queues is %u\n", dev->name, index, dev->num_rx_queues);