* Re: [PATCH net-next] net: depca: Omit check for multicast bit in netdev_for_each_mc_addr
From: David Miller @ 2011-07-01 6:56 UTC (permalink / raw)
To: tklauser; +Cc: netdev
In-Reply-To: <1309349715-1604-1-git-send-email-tklauser@distanz.ch>
From: Tobias Klauser <tklauser@distanz.ch>
Date: Wed, 29 Jun 2011 14:15:15 +0200
> There is no need to check for the address being a multicast address in
> the netdev_for_each_mc_addr loop, so remove it.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6] jme: Cleanup PM operations after using new PM API
From: David Miller @ 2011-07-01 6:55 UTC (permalink / raw)
To: cooldavid; +Cc: netdev, arieslee, devinchiu
In-Reply-To: <1309261110-11883-1-git-send-email-cooldavid@cooldavid.org>
From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
Date: Tue, 28 Jun 2011 19:38:30 +0800
> From: Guo-Fu Tseng <cooldavid@cooldavid.org>
>
> 1. Using enum name instead of numeric value.
> 2. device_set_wakeup_enable expect bool argument
> adding !!() to the argument to be passed.
> 3. Remove non-jme-hardware related operations from
> jme_clear_pm()
> 4. Reuse jme_clear_pm() in jme_resume() and jme_powersave_phy()
>
> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 1/2] jme: Fix compile warning introduced by new pm macro
From: David Miller @ 2011-07-01 6:54 UTC (permalink / raw)
To: cooldavid; +Cc: netdev, arieslee, devinchiu
In-Reply-To: <1309238615-25590-1-git-send-email-cooldavid@cooldavid.org>
From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
Date: Tue, 28 Jun 2011 13:23:34 +0800
> From: Guo-Fu Tseng <cooldavid@cooldavid.org>
>
> SIMPLE_DEV_PM_OPS is using SET_SYSTEM_SLEEP_PM_OPS
> and SET_SYSTEM_SLEEP_PM_OPS is empty when CONFIG_PM_SLEEP
> is not defined.
>
> Switching #ifdef CONFIG_PM to #ifdef CONFIG_PM_SLEEP
>
> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Applied
^ permalink raw reply
* Re: [PATCH] Exclude duplicated checking for iface-up. This flags is checked in 'is_skb_forwardable' function, which is subroutine of 'dev_forward_skb'.
From: David Miller @ 2011-07-01 6:55 UTC (permalink / raw)
To: alex.bluesman.smirnov; +Cc: netdev
In-Reply-To: <1309267844-29334-1-git-send-email-alex.bluesman.smirnov@gmail.com>
From: alex.bluesman.smirnov@gmail.com
Date: Tue, 28 Jun 2011 17:30:44 +0400
> From: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
>
> Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Applied.
Please put the verbose patch description in the body of your
email message, right before the signoffs, not in the subject.
The subject provides a "summary" not the entire description.
^ permalink raw reply
* Re: [PATCH] can: remove useless defaults in Kconfig
From: David Miller @ 2011-07-01 6:54 UTC (permalink / raw)
To: kurt.van.dijck-/BeEPy95v10
Cc: socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20110627150013.GB1874-MxZ6Iy/zr/UdbCeoMzGj59i2O/JbrIOy@public.gmane.org>
From: Kurt Van Dijck <kurt.van.dijck-/BeEPy95v10@public.gmane.org>
Date: Mon, 27 Jun 2011 17:00:13 +0200
> There's no need for "default N' (or 'default n') as it's default.
>
> Signed-off-by: Kurt Van Dijck <kurt.van.dijck-/BeEPy95v10@public.gmane.org>
> Acked-by: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Applied to net-next-2.6
^ permalink raw reply
* Re: [RFC patch net-next-2.6] net: allow multiple rx_handler registration
From: Michał Mirosław @ 2011-07-01 6:36 UTC (permalink / raw)
To: Jiri Pirko
Cc: Stephen Hemminger, netdev, davem, kaber, fubar, eric.dumazet,
nicolas.2p.debian, andy
In-Reply-To: <20110630172257.GB2056@minipsycho>
2011/6/30 Jiri Pirko <jpirko@redhat.com>:
> Thu, Jun 30, 2011 at 06:27:12PM CEST, shemminger@vyatta.com wrote:
>>On Thu, 30 Jun 2011 17:16:49 +0200
>>Jiri Pirko <jpirko@redhat.com> wrote:
>>
>>> For some net topos it is necessary to have multiple "soft-net-devices"
>>> hooked on one netdev. For example very common is to have
>>> eth<->(br+vlan). Vlan is not using rh_handler (yet) but also for example
>>> macvlan would be useful to have hooked on same netdev as br.
>>>
>>> This patch introduces rx_handler list. size struct net_device stays
>>> intact. Measured performance regression on eth-br topo is ~1% (on received
>>> pkts generated by pktgen) and on eth-bond topo it is ~0.25%
>>>
>>> On br I think that the performance can be brought back maybe by using per-cpu
>>> variables to store port in rx_path (I must check this)
>>>
>>> Please comment.
>>>
>>> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
>>
>>I am ok with the infrastructure, but why should Vlan use rh_handle.
>
> Well why it shoudln't. It would fit into what rx_handler is here for - the
> code would be more unified. Also net_device struct would lose struct
> vlan_group __rcu *vlgrp pointer (and reducing net_device size is always
> good thing).
>
>>It is wrong to allow macvlan and bridge to share same device.
>>Right now the code blocks users from doing lots of stupid things.
>
> Right, this is since rx_handler was introduced. Before that all these
> stupid configs were allowed. It's possible easily to forbid unwanted
> configs by checking priv flags.
We could introduce a catch-all macvlan/vlan device that would take
addresses/VLANs which are not covered by other configured
macvlans/vlans. This would allow clearer configuration and would make
the evaluation order explicit. As a bonus, this will give another
device to put tcpdump on. ;-)
Best Regards,
Michał Mirosław
^ permalink raw reply
* Re: [Bugme-new] [Bug 38102] New: BUG kmalloc-2048: Poison overwritten
From: Alexey Zaytsev @ 2011-07-01 6:01 UTC (permalink / raw)
To: Andrew Morton; +Cc: netdev, Gary Zambrano, bugme-daemon
In-Reply-To: <20110629145135.5179fb0c.akpm@linux-foundation.org>
On Thu, Jun 30, 2011 at 01:51, Andrew Morton <akpm@linux-foundation.org> wrote:
>
> (switched to email. Please respond via emailed reply-to-all, not via the
> bugzilla web interface).
>
> On Thu, 23 Jun 2011 17:33:54 GMT
> bugzilla-daemon@bugzilla.kernel.org wrote:
>
>> https://bugzilla.kernel.org/show_bug.cgi?id=38102
>>
>> Summary: BUG kmalloc-2048: Poison overwritten
>> Product: Drivers
>> Version: 2.5
>> Kernel Version: 3.0.0-rc4
>
> Looks like a 2.6.38->2.6.39 regression, perhaps a memory scribble in b44.
Actually, not sure about the version. 39 was the first one I've been
using in the scenario. Checking older versions now.
And git-log does not show a lot of changes to the b44 driver, so it
might be something unrelated.
^ permalink raw reply
* Re: [RFC patch net-next-2.6] net: allow multiple rx_handler registration
From: Jiri Pirko @ 2011-07-01 5:45 UTC (permalink / raw)
To: Nicolas de Pesloüan
Cc: netdev, davem, shemminger, kaber, fubar, eric.dumazet, andy,
Ben Greear
In-Reply-To: <4E0CD39C.8060209@gmail.com>
Thu, Jun 30, 2011 at 09:50:52PM CEST, nicolas.2p.debian@gmail.com wrote:
>Le 30/06/2011 17:16, Jiri Pirko a écrit :
>>For some net topos it is necessary to have multiple "soft-net-devices"
>>hooked on one netdev. For example very common is to have
>>eth<->(br+vlan). Vlan is not using rh_handler (yet) but also for example
>>macvlan would be useful to have hooked on same netdev as br.
>>
>>This patch introduces rx_handler list. size struct net_device stays
>>intact. Measured performance regression on eth-br topo is ~1% (on received
>>pkts generated by pktgen) and on eth-bond topo it is ~0.25%
>>
>>On br I think that the performance can be brought back maybe by using per-cpu
>>variables to store port in rx_path (I must check this)
>>
>>Please comment.
>>
>>Signed-off-by: Jiri Pirko<jpirko@redhat.com>
>
>I like the idea of this patch.
>
>I didn't take time for a technical review yet, but I'm not sure
>ordering should be static, depending on the kind of device (bond, br,
>macvlan). Ordering is currently static, because it is hard coded.
>
>I think rx_handler_prio should be exposed to userspace, to allow user
>setup to decide the exact order. Default order should be safe, but
>user should be allowed to force a different order for special setups.
Hmm I didn't think about this. Not sure about the right way how to expose
this.
>
> Nicolas.
^ permalink raw reply
* Re: [PATCH 0/2] netpoll: Trivial updates
From: Cong Wang @ 2011-07-01 4:05 UTC (permalink / raw)
To: Joe Perches; +Cc: linux-kernel, netdev
In-Reply-To: <1309493039.7277.26.camel@Joe-Laptop>
于 2011年07月01日 12:03, Joe Perches 写道:
> On Fri, 2011-07-01 at 12:00 +0800, Cong Wang wrote:
>> 于 2011年07月01日 11:55, Joe Perches 写道:
>>> On Fri, 2011-07-01 at 11:49 +0800, Cong Wang wrote:
>>>> 于 2011年07月01日 11:35, Joe Perches 写道:
>>>>>> BTW, you can kill the export of netpoll_send_skb_on_dev() too.
>>>>> Not too sure about that.
>>>>> It's used in netpoll.h by netpoll_send_skb.
>>>>> It could be called from anywhere.
>>>>> It's currently called/used by bonding.h.
>>> Read what I wrote.
>>> Look up one level at where it's used by netpoll.h.
>> Then move netpoll_send_skb(), export it instead of netpoll_send_skb_on_dev()...
>
> Submit that if you choose.
Well, you are on it, I am fine to leave as it is, as you agree these
changes are all trivial. :)
^ permalink raw reply
* Re: [PATCH 0/2] netpoll: Trivial updates
From: Joe Perches @ 2011-07-01 4:03 UTC (permalink / raw)
To: Cong Wang; +Cc: linux-kernel, netdev
In-Reply-To: <4E0D4651.7000005@redhat.com>
On Fri, 2011-07-01 at 12:00 +0800, Cong Wang wrote:
> 于 2011年07月01日 11:55, Joe Perches 写道:
> > On Fri, 2011-07-01 at 11:49 +0800, Cong Wang wrote:
> >> 于 2011年07月01日 11:35, Joe Perches 写道:
> >>>> BTW, you can kill the export of netpoll_send_skb_on_dev() too.
> >>> Not too sure about that.
> >>> It's used in netpoll.h by netpoll_send_skb.
> >>> It could be called from anywhere.
> >>> It's currently called/used by bonding.h.
> > Read what I wrote.
> > Look up one level at where it's used by netpoll.h.
> Then move netpoll_send_skb(), export it instead of netpoll_send_skb_on_dev()...
Submit that if you choose.
^ permalink raw reply
* Re: [PATCH 0/2] netpoll: Trivial updates
From: Cong Wang @ 2011-07-01 4:00 UTC (permalink / raw)
To: Joe Perches; +Cc: linux-kernel, netdev
In-Reply-To: <1309492522.7277.25.camel@Joe-Laptop>
于 2011年07月01日 11:55, Joe Perches 写道:
> On Fri, 2011-07-01 at 11:49 +0800, Cong Wang wrote:
>> 于 2011年07月01日 11:35, Joe Perches 写道:
>>>> BTW, you can kill the export of netpoll_send_skb_on_dev() too.
>>> Not too sure about that.
>>> It's used in netpoll.h by netpoll_send_skb.
>>> It could be called from anywhere.
>>> It's currently called/used by bonding.h.
>> % git grep netpoll_send_skb_on_dev .
>> include/linux/netpoll.h:void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
>> include/linux/netpoll.h: netpoll_send_skb_on_dev(np, skb, np->dev);
>> net/core/netpoll.c:void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
>> net/core/netpoll.c:EXPORT_SYMBOL(netpoll_send_skb_on_dev);
>> No modules use it...
>
> Read what I wrote.
>
> Look up one level at where it's used by netpoll.h.
>
Then move netpoll_send_skb(), export it instead of netpoll_send_skb_on_dev()...
^ permalink raw reply
* Re: [PATCH 0/2] netpoll: Trivial updates
From: Joe Perches @ 2011-07-01 3:55 UTC (permalink / raw)
To: Cong Wang; +Cc: linux-kernel, netdev
In-Reply-To: <4E0D43C3.5090502@redhat.com>
On Fri, 2011-07-01 at 11:49 +0800, Cong Wang wrote:
> 于 2011年07月01日 11:35, Joe Perches 写道:
> >> BTW, you can kill the export of netpoll_send_skb_on_dev() too.
> > Not too sure about that.
> > It's used in netpoll.h by netpoll_send_skb.
> > It could be called from anywhere.
> > It's currently called/used by bonding.h.
> % git grep netpoll_send_skb_on_dev .
> include/linux/netpoll.h:void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
> include/linux/netpoll.h: netpoll_send_skb_on_dev(np, skb, np->dev);
> net/core/netpoll.c:void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
> net/core/netpoll.c:EXPORT_SYMBOL(netpoll_send_skb_on_dev);
> No modules use it...
Read what I wrote.
Look up one level at where it's used by netpoll.h.
^ permalink raw reply
* Re: [PATCH 0/2] netpoll: Trivial updates
From: Cong Wang @ 2011-07-01 3:49 UTC (permalink / raw)
To: Joe Perches; +Cc: linux-kernel, netdev
In-Reply-To: <1309491349.7277.22.camel@Joe-Laptop>
于 2011年07月01日 11:35, Joe Perches 写道:
>
>> BTW, you can kill the export of netpoll_send_skb_on_dev() too.
>
> Not too sure about that.
>
> It's used in netpoll.h by netpoll_send_skb.
> It could be called from anywhere.
> It's currently called/used by bonding.h.
% git grep netpoll_send_skb_on_dev .
include/linux/netpoll.h:void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
include/linux/netpoll.h: netpoll_send_skb_on_dev(np, skb, np->dev);
net/core/netpoll.c:void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
net/core/netpoll.c:EXPORT_SYMBOL(netpoll_send_skb_on_dev);
No modules use it...
^ permalink raw reply
* Re: [PATCH 0/2] netpoll: Trivial updates
From: Joe Perches @ 2011-07-01 3:35 UTC (permalink / raw)
To: Cong Wang; +Cc: linux-kernel, netdev
In-Reply-To: <4E0D3E80.5080209@redhat.com>
On Fri, 2011-07-01 at 11:26 +0800, Cong Wang wrote:
> 于 2011年07月01日 09:08, Joe Perches 写道:
> > cc: WANG Cong<amwang@redhat.com>
> > Joe Perches (2):
> > netpoll: Remove unused EXPORT_SYMBOLs of netpoll_poll and netpoll_poll_dev
> > netpoll: Remove trivial wrapper function netpoll_poll
> > include/linux/netpoll.h | 2 --
> > net/core/netpoll.c | 13 +++----------
> > 2 files changed, 3 insertions(+), 12 deletions(-)
> I am fine with patch 1/2, but not 2/2, since it is trivial,
> why touch it? With netpoll_poll(), we don't need to explore the
> details of struct netpoll, I think it is nice to have it.
Shrug. Neither is used. Keep things minimal.
> BTW, you can kill the export of netpoll_send_skb_on_dev() too.
Not too sure about that.
It's used in netpoll.h by netpoll_send_skb.
It could be called from anywhere.
It's currently called/used by bonding.h.
cheers, Joe
^ permalink raw reply
* Re: [PATCH 0/2] netpoll: Trivial updates
From: Cong Wang @ 2011-07-01 3:26 UTC (permalink / raw)
To: Joe Perches; +Cc: linux-kernel, netdev
In-Reply-To: <cover.1309482314.git.joe@perches.com>
于 2011年07月01日 09:08, Joe Perches 写道:
> cc: WANG Cong<amwang@redhat.com>
>
> Joe Perches (2):
> netpoll: Remove unused EXPORT_SYMBOLs of netpoll_poll and netpoll_poll_dev
> netpoll: Remove trivial wrapper function netpoll_poll
>
> include/linux/netpoll.h | 2 --
> net/core/netpoll.c | 13 +++----------
> 2 files changed, 3 insertions(+), 12 deletions(-)
>
I am fine with patch 1/2, but not 2/2, since it is trivial,
why touch it? With netpoll_poll(), we don't need to explore the
details of struct netpoll, I think it is nice to have it.
BTW, you can kill the export of netpoll_send_skb_on_dev() too.
Thanks.
^ permalink raw reply
* [PATCH 2/2] netpoll: Remove wrapper function netpoll_poll
From: Joe Perches @ 2011-07-01 1:08 UTC (permalink / raw)
To: linux-kernel; +Cc: WANG Cong, David S. Miller, netdev
In-Reply-To: <cover.1309482314.git.joe@perches.com>
Too trivial to live.
cc: WANG Cong <amwang@redhat.com>
Signed-off-by: Joe Perches <joe@perches.com>
---
net/core/netpoll.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 4ce595e..adf84dd 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -209,11 +209,6 @@ static void netpoll_poll_dev(struct net_device *dev)
zap_completion_queue();
}
-static void netpoll_poll(struct netpoll *np)
-{
- netpoll_poll_dev(np->dev);
-}
-
static void refill_skbs(void)
{
struct sk_buff *skb;
@@ -273,7 +268,7 @@ repeat:
if (!skb) {
if (++count < 10) {
- netpoll_poll(np);
+ netpoll_poll_dev(np->dev);
goto repeat;
}
return NULL;
@@ -334,7 +329,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
}
/* tickle device maybe there is some cleanup */
- netpoll_poll(np);
+ netpoll_poll_dev(np->dev);
udelay(USEC_PER_POLL);
}
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 1/2] netpoll: Remove unused EXPORT_SYMBOLs of netpoll_poll and netpoll_poll_dev
From: Joe Perches @ 2011-07-01 1:08 UTC (permalink / raw)
To: linux-kernel; +Cc: WANG Cong, David S. Miller, netdev
In-Reply-To: <cover.1309482314.git.joe@perches.com>
Unused symbols waste space.
Commit 0e34e93177fb
"(netpoll: add generic support for bridge and bonding devices)"
added the symbol more than a year ago with the promise of "future use".
Because it is so far unused, remove it for now.
It can be easily readded if or when it actually needs to be used.
cc: WANG Cong <amwang@redhat.com>
Signed-off-by: Joe Perches <joe@perches.com>
---
include/linux/netpoll.h | 2 --
net/core/netpoll.c | 6 ++----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 79358bb..5dfa091 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -40,8 +40,6 @@ struct netpoll_info {
struct netpoll *netpoll;
};
-void netpoll_poll_dev(struct net_device *dev);
-void netpoll_poll(struct netpoll *np);
void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
void netpoll_print_options(struct netpoll *np);
int netpoll_parse_options(struct netpoll *np, char *opt);
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 18d9cbd..4ce595e 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -177,7 +177,7 @@ static void service_arp_queue(struct netpoll_info *npi)
}
}
-void netpoll_poll_dev(struct net_device *dev)
+static void netpoll_poll_dev(struct net_device *dev)
{
const struct net_device_ops *ops;
@@ -208,13 +208,11 @@ void netpoll_poll_dev(struct net_device *dev)
zap_completion_queue();
}
-EXPORT_SYMBOL(netpoll_poll_dev);
-void netpoll_poll(struct netpoll *np)
+static void netpoll_poll(struct netpoll *np)
{
netpoll_poll_dev(np->dev);
}
-EXPORT_SYMBOL(netpoll_poll);
static void refill_skbs(void)
{
--
1.7.6.rc1
^ permalink raw reply related
* [PATCH 0/2] netpoll: Trivial updates
From: Joe Perches @ 2011-07-01 1:08 UTC (permalink / raw)
To: linux-kernel; +Cc: WANG Cong, netdev
cc: WANG Cong <amwang@redhat.com>
Joe Perches (2):
netpoll: Remove unused EXPORT_SYMBOLs of netpoll_poll and netpoll_poll_dev
netpoll: Remove trivial wrapper function netpoll_poll
include/linux/netpoll.h | 2 --
net/core/netpoll.c | 13 +++----------
2 files changed, 3 insertions(+), 12 deletions(-)
--
1.7.6.rc1
^ permalink raw reply
* Potential locking issue in sunrpc
From: Ben Greear @ 2011-06-30 23:12 UTC (permalink / raw)
To: netdev
This method in sched.c says we should have a lock for ASYNC
/*
* Make an RPC task runnable.
*
* Note: If the task is ASYNC, this must be called with
* the spinlock held to protect the wait queue operation.
*/
static void rpc_make_runnable(struct rpc_task *task)
However, I don't think the lock is being taken for
the call path starting with rpcb_call_async in
rpcb_clnt.c:
rpcb_call_async
rpc_run_task
rpc_execute
rpc_make_runnable
Is the comment on the make_runnable method wrong, or are we missing locking?
Thanks,
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply
* [net-2.6 PATCH 2/3] qlge: Fix printk priority so chip fatal errors are always reported.
From: Ron Mercer @ 2011-06-30 20:02 UTC (permalink / raw)
To: davem; +Cc: netdev, ron.mercer, jitendra.kalsaria, ameen.rahman
In-Reply-To: <1308855049.6688.19.camel@Joe-Laptop>
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Precedence of the printk should be at higher level so chip fatal
errors are always reported.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
---
drivers/net/qlge/qlge_main.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 4fbefcf..6b4ff97 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -2170,23 +2170,20 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev,
return;
case CAM_LOOKUP_ERR_EVENT:
- netif_err(qdev, link, qdev->ndev,
- "Multiple CAM hits lookup occurred.\n");
- netif_err(qdev, drv, qdev->ndev,
- "This event shouldn't occur.\n");
+ netdev_err(qdev->ndev, "Multiple CAM hits lookup occurred.\n");
+ netdev_err(qdev->ndev, "This event shouldn't occur.\n");
ql_queue_asic_error(qdev);
return;
case SOFT_ECC_ERROR_EVENT:
- netif_err(qdev, rx_err, qdev->ndev,
- "Soft ECC error detected.\n");
+ netdev_err(qdev->ndev, "Soft ECC error detected.\n");
ql_queue_asic_error(qdev);
break;
case PCI_ERR_ANON_BUF_RD:
- netif_err(qdev, rx_err, qdev->ndev,
- "PCI error occurred when reading anonymous buffers from rx_ring %d.\n",
- ib_ae_rsp->q_id);
+ netdev_err(qdev->ndev, "PCI error occurred when reading "
+ "anonymous buffers from rx_ring %d.\n",
+ ib_ae_rsp->q_id);
ql_queue_asic_error(qdev);
break;
@@ -2441,11 +2438,10 @@ static irqreturn_t qlge_isr(int irq, void *dev_id)
*/
if (var & STS_FE) {
ql_queue_asic_error(qdev);
- netif_err(qdev, intr, qdev->ndev,
- "Got fatal error, STS = %x.\n", var);
+ netdev_err(qdev->ndev, "Got fatal error, STS = %x.\n", var);
var = ql_read32(qdev, ERR_STS);
- netif_err(qdev, intr, qdev->ndev,
- "Resetting chip. Error Status Register = 0x%x\n", var);
+ netdev_err(qdev->ndev, "Resetting chip. "
+ "Error Status Register = 0x%x\n", var);
return IRQ_HANDLED;
}
--
1.6.0.2
^ permalink raw reply related
* [net-2.6 PATCH 3/3] qlge:Version change to v1.00.00.29
From: Ron Mercer @ 2011-06-30 20:02 UTC (permalink / raw)
To: davem; +Cc: netdev, ron.mercer, jitendra.kalsaria, ameen.rahman
In-Reply-To: <1308855049.6688.19.camel@Joe-Laptop>
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
---
drivers/net/qlge/qlge.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index b2c8612..ca306fd 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -16,7 +16,7 @@
*/
#define DRV_NAME "qlge"
#define DRV_STRING "QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION "v1.00.00.27.00.00-01"
+#define DRV_VERSION "v1.00.00.29.00.00-01"
#define WQ_ADDR_ALIGN 0x3 /* 4 byte alignment */
--
1.6.0.2
^ permalink raw reply related
* [net-2.6 PATCH 1/3] qlge:Fix crash caused by mailbox execution on wedged chip.
From: Ron Mercer @ 2011-06-30 20:02 UTC (permalink / raw)
To: davem; +Cc: netdev, ron.mercer, jitendra.kalsaria, ameen.rahman
In-Reply-To: <1308855049.6688.19.camel@Joe-Laptop>
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
When we are in a recover process from a chip fatal error,
driver should skip over execution of mailbox commands during
resetting chip.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
---
drivers/net/qlge/qlge.h | 1 +
drivers/net/qlge/qlge_main.c | 20 +++++++++++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index d328507..b2c8612 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -1996,6 +1996,7 @@ enum {
QL_LB_LINK_UP = 10,
QL_FRC_COREDUMP = 11,
QL_EEH_FATAL = 12,
+ QL_ASIC_RECOVERY = 14, /* We are in ascic recovery. */
};
/* link_status bit definitions */
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 930ae45..4fbefcf 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -2152,6 +2152,10 @@ void ql_queue_asic_error(struct ql_adapter *qdev)
* thread
*/
clear_bit(QL_ADAPTER_UP, &qdev->flags);
+ /* Set asic recovery bit to indicate reset process that we are
+ * in fatal error recovery process rather than normal close
+ */
+ set_bit(QL_ASIC_RECOVERY, &qdev->flags);
queue_delayed_work(qdev->workqueue, &qdev->asic_reset_work, 0);
}
@@ -3818,11 +3822,17 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
end_jiffies = jiffies +
max((unsigned long)1, usecs_to_jiffies(30));
- /* Stop management traffic. */
- ql_mb_set_mgmnt_traffic_ctl(qdev, MB_SET_MPI_TFK_STOP);
+ /* Check if bit is set then skip the mailbox command and
+ * clear the bit, else we are in normal reset process.
+ */
+ if (!test_bit(QL_ASIC_RECOVERY, &qdev->flags)) {
+ /* Stop management traffic. */
+ ql_mb_set_mgmnt_traffic_ctl(qdev, MB_SET_MPI_TFK_STOP);
- /* Wait for the NIC and MGMNT FIFOs to empty. */
- ql_wait_fifo_empty(qdev);
+ /* Wait for the NIC and MGMNT FIFOs to empty. */
+ ql_wait_fifo_empty(qdev);
+ } else
+ clear_bit(QL_ASIC_RECOVERY, &qdev->flags);
ql_write32(qdev, RST_FO, (RST_FO_FR << 16) | RST_FO_FR);
--
1.6.0.2
^ permalink raw reply related
* Re: [PATCH 0/4] dynamic_debug
From: Jason Baron @ 2011-06-30 19:51 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev, linux-kernel, greg
In-Reply-To: <cover.1309457340.git.joe@perches.com>
On Thu, Jun 30, 2011 at 11:14:33AM -0700, Joe Perches wrote:
> Some improvements and cleanups to dynamic_debug
>
> btw Jason:
>
> You're not listed in MAINTAINERS for dynamic_debug.[ch].
> Maybe you should add yourself.
>
Yes, I need to do that.
Thanks,
-Jason
> Joe Perches (4):
> dynamic_debug: Add __dynamic_dev_dbg
> dynamic_debug: Consolidate prefix output to single routine
> dynamic_debug: Remove uses of KERN_CONT in dynamic_emit_prefix
> dynamic_debug: Convert printks to pr_<level>
>
> drivers/base/core.c | 5 +-
> include/linux/device.h | 5 ++
> include/linux/dynamic_debug.h | 10 +++-
> lib/dynamic_debug.c | 133 +++++++++++++++++++++++++++--------------
> 4 files changed, 103 insertions(+), 50 deletions(-)
>
> --
> 1.7.6.rc1
>
^ permalink raw reply
* Re: [RFC patch net-next-2.6] net: allow multiple rx_handler registration
From: Nicolas de Pesloüan @ 2011-06-30 19:50 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, davem, shemminger, kaber, fubar, eric.dumazet, andy,
Ben Greear
In-Reply-To: <1309447009-8898-1-git-send-email-jpirko@redhat.com>
Le 30/06/2011 17:16, Jiri Pirko a écrit :
> For some net topos it is necessary to have multiple "soft-net-devices"
> hooked on one netdev. For example very common is to have
> eth<->(br+vlan). Vlan is not using rh_handler (yet) but also for example
> macvlan would be useful to have hooked on same netdev as br.
>
> This patch introduces rx_handler list. size struct net_device stays
> intact. Measured performance regression on eth-br topo is ~1% (on received
> pkts generated by pktgen) and on eth-bond topo it is ~0.25%
>
> On br I think that the performance can be brought back maybe by using per-cpu
> variables to store port in rx_path (I must check this)
>
> Please comment.
>
> Signed-off-by: Jiri Pirko<jpirko@redhat.com>
I like the idea of this patch.
I didn't take time for a technical review yet, but I'm not sure ordering should be static, depending
on the kind of device (bond, br, macvlan). Ordering is currently static, because it is hard coded.
I think rx_handler_prio should be exposed to userspace, to allow user setup to decide the exact
order. Default order should be safe, but user should be allowed to force a different order for
special setups.
Nicolas.
^ permalink raw reply
* Re: [RFC patch net-next-2.6] net: allow multiple rx_handler registration
From: Ben Greear @ 2011-06-30 18:53 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, davem, shemminger, kaber, fubar, eric.dumazet,
nicolas.2p.debian, andy
In-Reply-To: <20110630182855.GD2056@minipsycho>
On 06/30/2011 11:28 AM, Jiri Pirko wrote:
> Thu, Jun 30, 2011 at 08:13:59PM CEST, greearb@candelatech.com wrote:
>> On 06/30/2011 08:16 AM, Jiri Pirko wrote:
>>> For some net topos it is necessary to have multiple "soft-net-devices"
>>> hooked on one netdev. For example very common is to have
>>> eth<->(br+vlan). Vlan is not using rh_handler (yet) but also for example
>>> macvlan would be useful to have hooked on same netdev as br.
>>>
>>> This patch introduces rx_handler list. size struct net_device stays
>>> intact. Measured performance regression on eth-br topo is ~1% (on received
>>> pkts generated by pktgen) and on eth-bond topo it is ~0.25%
>>>
>>> On br I think that the performance can be brought back maybe by using per-cpu
>>> variables to store port in rx_path (I must check this)
>>
>>> +enum rx_handler_prio {
>>> + RX_HANDLER_PRIO_BRIDGE,
>>> + RX_HANDLER_PRIO_BOND,
>>> + RX_HANDLER_PRIO_MACVLAN,
>>> +};
>>
>> Maybe add RX_HANDLER_PRIO_LATER, RX_HANDLER_PRIO_FIRST
>> for other modules that want to link
>> here, but don't have specific ordering other than before
>> or after these specific types?
>>
>> Or maybe start PRIO_BRIDGE at 100, BOND 110, MACVLAN 120
>> to leave gaps.
>
> I was thinking about this. But that would be useful only for out of the
> tree drivers. For in tree drivers, new prio would be just inserted
> whereever.
There might be a reason to add a hook at various places, depending
on user prefs. I don't know of one now, so it could stay as is and
we could change it later if the need came up. I assume this PRIO stuff is
purely private to the kernel, so it should be easy to change...
Thanks,
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox