Maverick pull request, LP591416 - 2.6.35-rc2 CONFIG_RPS=y fills log with noise
 

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
--
Tim Gardner tim.gardner@canonical.com
The following changes since commit b46d39c8935ebca8ca2374484a3a083f0b80ee58:
Leann Ogasawara (1):
UBUNTU: Ubuntu-2.6.35-2.2

are available in the git repository at:

git://kernel.ubuntu.com/rtg/ubuntu-maverick.git lp591416-num-rx-queues

Tim Gardner (1):
UBUNTU: SAUCE: net: Print num_rx_queues imbalance warning only when there are allocated queues

net/core/dev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
From b6e18e34db53e42f287b97a8c818906f2f5d3028 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 8 Jun 2010 17:51:27 -0600
Subject: [PATCH] UBUNTU: SAUCE: net: Print num_rx_queues imbalance warning only when there are allocated queues

BugLink: http://bugs.launchpad.net/bugs/591416

So far no users of skb_record_rx_queue() use alloc_netdev_mq() for
network device initialization, so don't print a warning about num_rx_queues
imbalances in get_rps_cpu() unless they have actually been allocated.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
net/core/dev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

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
",
dev->name, index, dev->num_rx_queues);
--
1.7.0.4

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team