* Re: tbf/htb qdisc limitations
From: Jarek Poplawski @ 2010-10-17 20:36 UTC (permalink / raw)
To: Bill Fink; +Cc: Eric Dumazet, Rick Jones, Steven Brudenell, netdev
In-Reply-To: <20101016212434.72ae5250.billfink@mindspring.com>
On Sat, Oct 16, 2010 at 09:24:34PM -0400, Bill Fink wrote:
> On Sat, 16 Oct 2010, Jarek Poplawski wrote:
...
> > http://code.google.com/p/pspacer/wiki/HTBon10GbE
> >
> > If it doesn't help reconsider hfsc.
>
> Thanks for the link. From his results, it appears you can
> get better accuracy by keeping TSO/GSO enabled and upping
> the tc mtu parameter to 64000. I will have to try that out.
Sure, but you have to remember that scheduler doesn't know real packet
sizes and rate tables are less accurate especially for smaller packets,
so it depends on conditions.
> For the very high bandwidth cases I tend to deal with, would
> there be any advantage to further reducing the PSCHED_SHIFT
> from its current value of 6?
If you don't use low rates and/or large buffers it might be a good
idea, especially on x64 (for 32-bit longs htb needs some change for
this value below 5).
Jarek P.
^ permalink raw reply
* Re: [PATCH] niu: introduce temp variables to avoid sparse warnings when swapping in-situ
From: David Miller @ 2010-10-17 20:43 UTC (permalink / raw)
To: harvey.harrison; +Cc: netdev
In-Reply-To: <1287032353-30314-1-git-send-email-harvey.harrison@gmail.com>
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 13 Oct 2010 21:59:13 -0700
> Suppress a large block of warnings like:
> drivers/net/niu.c:7094:38: warning: incorrect type in assignment (different base types)
> drivers/net/niu.c:7094:38: expected restricted __be32 [usertype] ip4src
> drivers/net/niu.c:7094:38: got unsigned long long
> drivers/net/niu.c:7104:17: warning: cast from restricted __be32
> ...
>
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] stmmac: remove ifdef NETIF_F_TSO from stmmac_ethtool.c
From: David Miller @ 2010-10-17 20:44 UTC (permalink / raw)
To: peppe.cavallaro; +Cc: netdev
In-Reply-To: <1287035659-17988-1-git-send-email-peppe.cavallaro@st.com>
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Thu, 14 Oct 2010 07:54:19 +0200
> Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Reported-by: Armando Visconti <armando.visconti@st.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] tcp: sack lost marking fixes
From: David Miller @ 2010-10-17 20:46 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev, ycheng, lennart.schulte
In-Reply-To: <alpine.DEB.2.00.1010141429150.26447@wel-95.cs.helsinki.fi>
From: "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Thu, 14 Oct 2010 14:42:30 +0300 (EEST)
> When only fast rexmit should be done, tcp_mark_head_lost marks
> L too far. Also, sacked_upto below 1 is perfectly valid number,
> the packets == 0 then needs to be trapped elsewhere.
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Applied to net-next-2.6
^ permalink raw reply
* Re: [PATCH] tcp: use correct counters in CA_CWR state too
From: David Miller @ 2010-10-17 20:47 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <alpine.DEB.2.00.1010141450290.26447@wel-95.cs.helsinki.fi>
From: "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Thu, 14 Oct 2010 14:52:09 +0300 (EEST)
> As CWR is stronger than CA_Disorder state, we can miscount
> SACK/Reno failure into other timeouts. Not a bad problem as
> it can happen only due to ECN, FRTO detecting spurious RTO
> or xmit error which are the only callers of tcp_enter_cwr.
> And even then losses and RTO must still follow thereafter
> to actually end up into the relevant code paths.
>
> Compile tested.
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Also applied to net-next-2.6, thanks.
^ permalink raw reply
* Re: [PATCH net-next] netns: reorder fields in struct net
From: David Miller @ 2010-10-17 20:49 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1287071778.2712.73.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 14 Oct 2010 17:56:18 +0200
> In a network bench, I noticed an unfortunate false sharing between
> 'loopback_dev' and 'count' fields in "struct net".
>
> 'count' is written each time a socket is created or destroyed, while
> loopback_dev might be often read in routing code.
>
> Move loopback_dev in a read mostly section of "struct net"
>
> Note: struct netns_xfrm is cache line aligned on SMP.
> (It contains a "struct dst_ops")
> Move it at the end to avoid holes, and reduce sizeof(struct net) by 128
> bytes on ia32.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thanks Eric.
^ permalink raw reply
* Re: [PATCH net-next] drivers/net/pch_gbe: Use DEFINE_PCI_DEVICE_TABLE
From: David Miller @ 2010-10-17 20:51 UTC (permalink / raw)
To: joe; +Cc: masa-korg, netdev, linux-kernel
In-Reply-To: <1287086150.1117.608.camel@Joe-Laptop>
From: Joe Perches <joe@perches.com>
Date: Thu, 14 Oct 2010 12:55:50 -0700
> Use the standard macro to put this table in __devinitconst.
>
> Compiled, untested.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Applied, thanks.
^ permalink raw reply
* 2.6.36-rc8-git3: Reported regressions 2.6.34 -> 2.6.35
From: Rafael J. Wysocki @ 2010-10-17 20:53 UTC (permalink / raw)
To: Linux Kernel Mailing List
Cc: Maciej Rutecki, Florian Mickler, Andrew Morton, Linus Torvalds,
Kernel Testers List, Network Development, Linux ACPI,
Linux PM List, Linux SCSI List, Linux Wireless List, DRI
This message contains a list of some post-2.6.34 regressions introduced before
2.6.35, for which there are no fixes in the mainline known to the tracking team.
If any of them have been fixed already, please let us know.
If you know of any other unresolved post-2.6.34 regressions, please let us know
either and we'll add them to the list. Also, please let us know if any
of the entries below are invalid.
Each entry from the list will be sent additionally in an automatic reply to
this message with CCs to the people involved in reporting and handling the
issue.
Listed regressions statistics:
Date Total Pending Unresolved
----------------------------------------
2010-10-17 141 19 15
2010-10-10 143 23 19
2010-10-03 141 21 17
2010-09-26 139 24 21
2010-09-20 137 27 25
2010-09-12 135 26 25
2010-08-30 124 38 34
2010-08-01 100 27 23
2010-07-23 94 33 25
2010-07-09 79 45 37
2010-06-21 46 37 26
2010-06-09 15 13 10
Unresolved regressions
----------------------
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=20002
Subject : x86_64 2.6.35.* kernels and Intel Xeon X5550
Submitter : Marc Aurele La France <tsi@ualberta.ca>
Date : 2010-10-07 17:17 (11 days old)
Message-ID : <alpine.WNT.2.00.1010071055420.1672@cluij.ucs.ualberta.ca>
References : http://marc.info/?l=linux-kernel&m=128647187628706&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=19302
Subject : PROBLEM: kernel crash on USB-modem (Huawei E1750) hangup.
Submitter : O01eg <O01eg@yandex.ru>
Date : 2010-09-26 19:50 (22 days old)
Message-ID : <op.vjnn1up1yohvy1@localhost>
References : http://marc.info/?l=linux-kernel&m=128553111709569&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=18522
Subject : cdrom drive doesn't detect removal
Submitter : Maxim Levitsky <maximlevitsky@gmail.com>
Date : 2010-09-12 9:49 (36 days old)
First-Bad-Commit: http://git.kernel.org/linus/6b4517a7913a09d3259bb1d21c9cb300f12294bd
Message-ID : <1284284969.2928.18.camel@maxim-laptop>
References : http://marc.info/?l=linux-kernel&m=128428499013930&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=17812
Subject : Kernel completely frozen when memory is full
Submitter : Mickey86 <mikael.cordon@gmail.com>
Date : 2010-09-05 13:09 (43 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=17261
Subject : Freezes on bootup
Submitter : Dan Dart <dandart@googlemail.com>
Date : 2010-08-29 09:00 (50 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16691
Subject : IPW5100: iwlagn broken with 2.6.34.x to 2.6.35.2 update
Submitter : Can Celasun <dcelasun@gmail.com>
Date : 2010-08-21 08:28 (58 days old)
References : http://www.spinics.net/lists/linux-wireless/msg57237.html
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16562
Subject : 2.6.35: cpu_idle bug report / on i7 870 cpu (x86_64)
Submitter : Justin Piszcz <jpiszcz@lucidpixels.com>
Date : 2010-08-06 22:09 (73 days old)
Message-ID : <alpine.DEB.2.00.1008061800530.5241@p34.internal.lan>
References : http://marc.info/?l=linux-kernel&m=128113260904048&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16549
Subject : 2.6.35: suspicious rcu_dereference_check() usage
Submitter : Vladislav Bolkhovitin <vst@vlnb.net>
Date : 2010-08-04 10:56 (75 days old)
Message-ID : <4C594740.1090608@vlnb.net>
References : http://marc.info/?l=linux-kernel&m=128091938215177&w=2
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16525
Subject : unexpected high load since 2.6.35
Submitter : MadLoisae@gmx.net <MadLoisae@gmx.net>
Date : 2010-08-02 20:53 (77 days old)
Message-ID : <4C573041.1070103@gmx.net>
References : http://marc.info/?l=linux-kernel&m=128078243726655&w=2
http://lkml.org/lkml/2010/9/14/105
http://lkml.org/lkml/2010/9/27/328
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16515
Subject : [bisected] Radeon rv280 can't boot on kernel 2.6.35.
Submitter : Albert Gall <ss3vdr@gmail.com>
Date : 2010-08-04 16:10 (75 days old)
First-Bad-Commit: http://git.kernel.org/linus/https://bugzilla.kernel.org/attachment.cgi?id=27350
Handled-By : Alex Deucher <alexdeucher@gmail.com>
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16488
Subject : [i915] Framebuffer ID error after suspend/hibernate leading to X crash
Submitter : Milan Bouchet-Valat <nalimilan@club.fr>
Date : 2010-08-01 08:55 (78 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16458
Subject : Bluetooth disabled after resume
Submitter : AttilaN <attila123456@gmail.com>
Date : 2010-07-25 09:33 (85 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16380
Subject : Loop devices act strangely in 2.6.35
Submitter : Artem S. Tashkinov <t.artem@mailcity.com>
Date : 2010-07-13 23:21 (97 days old)
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16265
Subject : Why is kslowd accumulating so much CPU time?
Submitter : Theodore Ts'o <tytso@mit.edu>
Date : 2010-06-09 18:36 (131 days old)
First-Bad-Commit: http://git.kernel.org/linus/fbf81762e385d3d45acad057b654d56972acf58c
Message-ID : <E1OMQ88-0002a1-Gb@closure.thunk.org>
References : http://marc.info/?l=linux-kernel&m=127610857819033&w=4
http://bugs.freedesktop.org/show_bug.cgi?id=29536
Handled-By : Chris Wilson <chris@chris-wilson.co.uk>
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16221
Subject : 2.6.35-rc2-git5 -- [drm:drm_mode_getfb] *ERROR* invalid framebuffer id
Submitter : Miles Lane <miles.lane@gmail.com>
Date : 2010-06-11 20:31 (129 days old)
Message-ID : <AANLkTim0jVRyqkwlGOcrg_XTvUQwcBYfWJX-aRzkkrLG@mail.gmail.com>
References : http://marc.info/?l=linux-kernel&m=127628828119623&w=2
Regressions with patches
------------------------
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=17772
Subject : Unable to locate IOAPIC for GSI *
Submitter : zersaa <zersaa@gmail.com>
Date : 2010-09-04 21:28 (44 days old)
Handled-By : Eric W. Biederman <ebiederm@xmission.com>
Patch : https://patchwork.kernel.org/patch/104501/
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16891
Subject : Kernel panic while loading intel module during boot
Submitter : Anisse Astier <anisse@astier.eu>
Date : 2010-08-24 13:19 (55 days old)
Handled-By : Anisse Astier <anisse@astier.eu>
Patch : https://bugzilla.kernel.org/attachment.cgi?id=32602
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16312
Subject : WARNING: at fs/fs-writeback.c:1127 __mark_inode_dirty
Submitter : Zdenek Kabelac <zdenek.kabelac@gmail.com>
Date : 2010-06-28 9:40 (112 days old)
Message-ID : <AANLkTin24fr5O4_q5Xbo9Y_NKkEmtcp6Hgmr9_4qXaFz@mail.gmail.com>
References : http://marc.info/?l=linux-kernel&m=127771804806465&w=2
http://lkml.indiana.edu/hypermail/linux/kernel/1007.3/00884.html
Handled-By : Jan Kara <jack@suse.cz>
Jan Kara <jack@suse.cz>
Patch : https://bugzilla.kernel.org/attachment.cgi?id=30282
Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=16228
Subject : BUG/boot failure on Dell Precision T3500 (pci/ahci_stop_engine)
Submitter : Brian Bloniarz <brian.bloniarz@gmail.com>
Date : 2010-06-16 17:57 (124 days old)
Handled-By : Bjorn Helgaas <bjorn.helgaas@hp.com>
Patch : https://patchwork.kernel.org/patch/189182/
https://patchwork.kernel.org/patch/189232/
https://patchwork.kernel.org/patch/189242/
https://patchwork.kernel.org/patch/189252/
For details, please visit the bug entries and follow the links given in
references.
As you can see, there is a Bugzilla entry for each of the listed regressions.
There also is a Bugzilla entry used for tracking the regressions introduced
between 2.6.34 and 2.6.35, unresolved as well as resolved, at:
http://bugzilla.kernel.org/show_bug.cgi?id=16055
Please let the tracking team know if there are any Bugzilla entries that
should be added to the list in there.
Thanks!
^ permalink raw reply
* Re: [PATCH net-next 0/8] tg3: Updates and EEE support
From: David Miller @ 2010-10-17 20:58 UTC (permalink / raw)
To: mcarlson; +Cc: netdev, andy
In-Reply-To: <1287088665-22135-1-git-send-email-mcarlson@broadcom.com>
From: "Matt Carlson" <mcarlson@broadcom.com>
Date: Thu, 14 Oct 2010 13:37:37 -0700
> This patchset integrates a few minor changes and adds EEE support
> for the 5717 and 57765 asic revs.
All applied, please send an update if that EEE register
address needs fixing, etc.
Thanks.
^ permalink raw reply
* Re: Bug#595265: linux-image-2.6.32-5-686: Nerwork card fails to come up again after suspend
From: Ben Hutchings @ 2010-10-18 0:23 UTC (permalink / raw)
To: François Romieu; +Cc: Arnout Boelens, 595265, netdev
In-Reply-To: <201010171116.00514.aboelens@engin.umass.edu>
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
Arnout Boelens reported that his RTL8111/8168B fails to link-up after
suspend and resume, both under Debian's kernel based on 2.6.32 and under
2.6.36-rc6. Full details are at <http://bugs.debian.org/595265>, though
the log isn't very informative:
[31837.396594] PM: Finishing wakeup.
[31837.396597] Restarting tasks ... done.
[31840.267267] r8169: eth0: link down
Can you suggest how to investigate this further?
Ben.
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply
* Re: [PATCH] IPv4: Remove check for ipv4_is_lbcast() that will always return false
From: Andy Walls @ 2010-10-18 0:25 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-kernel, kuznet, jmorris, kaber
In-Reply-To: <20101012.122841.183039561.davem@davemloft.net>
On Tue, 2010-10-12 at 12:28 -0700, David Miller wrote:
> From: Andy Walls <awalls@md.metrocast.net>
> Date: Sun, 10 Oct 2010 12:10:21 -0400
>
> > In making an IPv4 routing decision, packets with an all 1's broadcast
> > destination are accepted as input packets, before being checked for being a
> > martian. Remove the martian check for the all 1's broadcast destination
> > address. Make the initial check for the all 1's broadcast destination
> > address easier to read.
> >
> > Signed-off-by: Andy Walls <awalls@md.metrocast.net>
>
> Your email client corrupted this patch, by turning tab characters
> into spaces, amongst other things.
No, that was me in a rush, thoughtlessly cutting and pasting into the
e-mail client window.
I will resubmit shortly. Sorry for the wasting your time on the
malformed submission.
Regards,
Andy
> Please give Documentation/email-clients.txt a read and resubmit this
> patch after you have these issues sorted out.
>
> Thank you.
^ permalink raw reply
* [PATCH] IPv4: route.c: Change checks against 0xffffffff to ipv4_is_lbcast()
From: Andy Walls @ 2010-10-18 1:11 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-kernel, kuznet, jmorris, kaber
Change a few checks against the hardcoded broadcast address,
0xffffffff, to ipv4_is_lbcast(). Remove some existing checks
using ipv4_is_lbcast() that are now obviously superfluous.
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
---
net/ipv4/route.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 3f56b6e..d78c764 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2124,7 +2124,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
ipv4_is_loopback(saddr))
goto martian_source;
- if (daddr == htonl(0xFFFFFFFF) || (saddr == 0 && daddr == 0))
+ if (ipv4_is_lbcast(daddr) || (saddr == 0 && daddr == 0))
goto brd_input;
/* Accept zero addresses only to limited broadcast;
@@ -2133,8 +2133,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
if (ipv4_is_zeronet(saddr))
goto martian_source;
- if (ipv4_is_lbcast(daddr) || ipv4_is_zeronet(daddr) ||
- ipv4_is_loopback(daddr))
+ if (ipv4_is_zeronet(daddr) || ipv4_is_loopback(daddr))
goto martian_destination;
/*
@@ -2370,11 +2369,11 @@ static int __mkroute_output(struct rtable **result,
if (ipv4_is_loopback(fl->fl4_src) && !(dev_out->flags&IFF_LOOPBACK))
return -EINVAL;
- if (fl->fl4_dst == htonl(0xFFFFFFFF))
+ if (ipv4_is_lbcast(fl->fl4_dst))
res->type = RTN_BROADCAST;
else if (ipv4_is_multicast(fl->fl4_dst))
res->type = RTN_MULTICAST;
- else if (ipv4_is_lbcast(fl->fl4_dst) || ipv4_is_zeronet(fl->fl4_dst))
+ else if (ipv4_is_zeronet(fl->fl4_dst))
return -EINVAL;
if (dev_out->flags & IFF_LOOPBACK)
@@ -2543,7 +2542,7 @@ static int ip_route_output_slow(struct net *net, struct rtable **rp,
if (oldflp->oif == 0 &&
(ipv4_is_multicast(oldflp->fl4_dst) ||
- oldflp->fl4_dst == htonl(0xFFFFFFFF))) {
+ ipv4_is_lbcast(oldflp->fl4_dst))) {
/* It is equivalent to inet_addr_type(saddr) == RTN_LOCAL */
dev_out = ip_dev_find(net, oldflp->fl4_src);
if (dev_out == NULL)
@@ -2592,7 +2591,7 @@ static int ip_route_output_slow(struct net *net, struct rtable **rp,
}
if (ipv4_is_local_multicast(oldflp->fl4_dst) ||
- oldflp->fl4_dst == htonl(0xFFFFFFFF)) {
+ ipv4_is_lbcast(oldflp->fl4_dst)) {
if (!fl.fl4_src)
fl.fl4_src = inet_select_addr(dev_out, 0,
RT_SCOPE_LINK);
--
1.7.2.3
^ permalink raw reply related
* Re: [PATCH 1/6] r8169: check dma mapping failures
From: Stanislaw Gruszka @ 2010-10-18 7:01 UTC (permalink / raw)
To: Denis Kirjanov; +Cc: Francois Romieu, netdev, David S. Miller
In-Reply-To: <AANLkTimwwhBJdoXcvSt-wdTGv5biHJj094s0TutFM66N@mail.gmail.com>
On Fri, Oct 15, 2010 at 06:23:55PM +0400, Denis Kirjanov wrote:
> Right, we should pass TX_BUSY to upper layers only when the device hw
> queue is full
>
> On Fri, Oct 15, 2010 at 5:41 PM, Francois Romieu <romieu@fr.zoreil.com> wrote:
> > Stanislaw Gruszka <sgruszka@redhat.com> :
> >> Check possible dma mapping errors and do clean up if it happens,
> >> when sending frames stop the tx queue.
> >
> > Almost ok: NETDEV_TX_BUSY can not be used like that. Afaik the DMA
> > failure path in the driver really wants a NETDEV_TX_OK (and a device
> > stats update, though missing in tg3 ?).
Ok, I will change that and repost on top of currently applied Eric's
patch.
Stanislaw
^ permalink raw reply
* linux-next: build failure after merge of the final tree (net tree related)
From: Stephen Rothwell @ 2010-10-18 7:36 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, stephen hemminger
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
net/tipc/core.c:249: error: __ksymtab_tipc_get_mode causes a section type conflict
Caused by commit 31e3c3f6f1f9b154981a0e6620df700463db30ee ("tipc: cleanup
function namespace") which made the EXPORTed function tipc_get_mode() static.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net tree related)
From: David Miller @ 2010-10-18 8:06 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, shemminger
In-Reply-To: <20101018183616.ef5cde84.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Oct 2010 18:36:16 +1100
> net/tipc/core.c:249: error: __ksymtab_tipc_get_mode causes a section type conflict
>
> Caused by commit 31e3c3f6f1f9b154981a0e6620df700463db30ee ("tipc: cleanup
> function namespace") which made the EXPORTed function tipc_get_mode() static.
>
> I have reverted that commit for today.
Thanks I just pushed this fix:
--------------------
tipc: Kill tipc_get_mode() completely.
It's completely unused and exporting a static symbol
makes no sense and breaks the build.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/tipc/core.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/net/tipc/core.c b/net/tipc/core.c
index c005303..e2a09eb 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -96,11 +96,6 @@ int tipc_net_id;
int tipc_remote_management;
-static int tipc_get_mode(void)
-{
- return tipc_mode;
-}
-
/**
* tipc_buf_acquire - creates a TIPC message buffer
* @size: message size (including TIPC header)
@@ -246,7 +241,6 @@ MODULE_VERSION(TIPC_MOD_VER);
EXPORT_SYMBOL(tipc_attach);
EXPORT_SYMBOL(tipc_detach);
-EXPORT_SYMBOL(tipc_get_mode);
EXPORT_SYMBOL(tipc_createport);
EXPORT_SYMBOL(tipc_deleteport);
EXPORT_SYMBOL(tipc_ownidentity);
--
1.7.3.1
^ permalink raw reply related
* RE: [PATCH v12 12/17] Add mp(mediate passthru) device.
From: Xin, Xiaohui @ 2010-10-18 8:30 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: netdev@vger.kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, mingo@elte.hu, davem@davemloft.net,
herbert@gondor.hengli.com.au, jdike@linux.intel.com
In-Reply-To: <20101003131254.GB19184@redhat.com>
>-----Original Message-----
>From: Michael S. Tsirkin [mailto:mst@redhat.com]
>Sent: Sunday, October 03, 2010 9:13 PM
>To: Xin, Xiaohui
>Cc: netdev@vger.kernel.org; kvm@vger.kernel.org; linux-kernel@vger.kernel.org;
>mingo@elte.hu; davem@davemloft.net; herbert@gondor.hengli.com.au;
>jdike@linux.intel.com
>Subject: Re: [PATCH v12 12/17] Add mp(mediate passthru) device.
>
>On Thu, Sep 30, 2010 at 10:04:30PM +0800, xiaohui.xin@intel.com wrote:
>> From: Xin Xiaohui <xiaohui.xin@intel.com>
>>
>> The patch add mp(mediate passthru) device, which now
>> based on vhost-net backend driver and provides proto_ops
>> to send/receive guest buffers data from/to guest vitio-net
>> driver.
>>
>> Signed-off-by: Xin Xiaohui <xiaohui.xin@intel.com>
>> Signed-off-by: Zhao Yu <yzhao81new@gmail.com>
>> Reviewed-by: Jeff Dike <jdike@linux.intel.com>
>
>So you plan to rewrite all this to make this code part of macvtap?
>
V13 exports functions which can be reused by macvtap to get zero-copy.
Currently, I'm adding code in macvtap and trying to make it work.
Thanks
Xiaohui
^ permalink raw reply
* Re: [patch] ns83820: spin_lock_irq() => spin_lock()
From: David Miller @ 2010-10-18 8:53 UTC (permalink / raw)
To: error27; +Cc: netdev, kernel-janitors, mingo
In-Reply-To: <20101013191852.GD6060@bicker>
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 13 Oct 2010 21:18:53 +0200
> This is essentially cosmetic. At this point the IRQs are already
> disabled because we called spin_lock_irq(&dev->rx_info.lock).
>
> The real bug here was fixed back in 2006 in 3a10ccebe: "[PATCH] lock
> validator: fix ns83820.c irq-flags bug". Prior to that patch, it was
> a "spin_lock_irq is not nestable" type bug. The 2006 patch changes the
> unlock to not re-enable IRQs, which eliminates the potential deadlock.
>
> But this bit was missed. We should change the lock function as well so
> it balances nicely.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Applied.
^ permalink raw reply
* Re: [patch] gianfar: fix double lock typo
From: David Miller @ 2010-10-18 8:55 UTC (permalink / raw)
To: error27; +Cc: Sandeep.Kumar, netdev, kernel-janitors
In-Reply-To: <20101013191954.GE6060@bicker>
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 13 Oct 2010 21:19:55 +0200
> This should be a _restore() instead of a _save().
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Good find, applied, thanks!
^ permalink raw reply
* Re: [RFC PATCH 1/9] ipvs network name space aware
From: Daniel Lezcano @ 2010-10-18 8:59 UTC (permalink / raw)
To: Hans Schillstrom; +Cc: lvs-devel, netdev, netfilter-devel, horms, ja, wensong
In-Reply-To: <201010081316.46690.hans.schillstrom@ericsson.com>
On 10/08/2010 01:16 PM, Hans Schillstrom wrote:
> This part contains the include files
> where include/net/netns/ip_vs.h is new and contains all moved vars.
>
> SUMMARY
>
> include/net/ip_vs.h | 136 ++++---
> include/net/net_namespace.h | 2 +
> include/net/netns/ip_vs.h | 112 +++++
>
> Signed-off-by:Hans Schillstrom<hans.schillstrom@ericsson.com>
> ---
>
>
[ ... ]
> #ifdef CONFIG_IP_VS_IPV6
> diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
> index bd10a79..b59cdc5 100644
> --- a/include/net/net_namespace.h
> +++ b/include/net/net_namespace.h
> @@ -15,6 +15,7 @@
> #include<net/netns/ipv4.h>
> #include<net/netns/ipv6.h>
> #include<net/netns/dccp.h>
> +#include<net/netns/ip_vs.h>
> #include<net/netns/x_tables.h>
> #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
> #include<net/netns/conntrack.h>
> @@ -91,6 +92,7 @@ struct net {
> struct sk_buff_head wext_nlevents;
> #endif
> struct net_generic *gen;
> + struct netns_ipvs *ipvs;
> };
>
IMHO, it would be better to use the net_generic infra-structure instead
of adding a new field in the netns structure.
^ permalink raw reply
* [PATCH net-next 1/6] bnx2x: Optimized the branching in the bnx2x_rx_int()
From: Dmitry Kravkov @ 2010-10-18 9:02 UTC (permalink / raw)
To: davem, netdev; +Cc: eilong, vladz
From: Vladislav Zolotarov <vladz@broadcom.com>
Optimized the branching in the bnx2x_rx_int() based on the fact
that FP CQE will always have at least one of START or STOP flags set,
so if not both bits are set and START bit is not set,
then it's a STOP bit that is set.
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_cmn.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index 97ef674..cb2a3d6 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -507,8 +507,11 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
pad = cqe->fast_path_cqe.placement_offset;
- /* If CQE is marked both TPA_START and TPA_END
- it is a non-TPA CQE */
+ /* - If CQE is marked both TPA_START and TPA_END it is
+ * a non-TPA CQE.
+ * - FP CQE will always have either TPA_START or/and
+ * TPA_STOP flags set.
+ */
if ((!fp->disable_tpa) &&
(TPA_TYPE(cqe_fp_flags) !=
(TPA_TYPE_START | TPA_TYPE_END))) {
@@ -526,9 +529,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
bnx2x_set_skb_rxhash(bp, cqe, skb);
goto next_rx;
- }
-
- if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_END) {
+ } else { /* TPA_STOP */
DP(NETIF_MSG_RX_STATUS,
"calling tpa_stop on queue %d\n",
queue);
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 2/6] bnx2x: remove redundant commands during error handling
From: Dmitry Kravkov @ 2010-10-18 9:05 UTC (permalink / raw)
To: davem, netdev; +Cc: Eilon Greenstein, Vladislav Zolotarov
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_cmn.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index ddf90e1..3f0540c 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1288,8 +1288,6 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
if (rc) {
BNX2X_ERR("HW init failed, aborting\n");
bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE, 0);
- bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP, 0);
- bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE, 0);
goto load_error2;
}
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 5/6] bnx2x: remove unnecessary FUNC_FLG_RSS flag and related
From: Dmitry Kravkov @ 2010-10-18 9:08 UTC (permalink / raw)
To: davem, netdev; +Cc: Eilon Greenstein, Vladislav Zolotarov
As suggested by: Joe Perches <joe@perches.com>
Although RSS is meaningless when there is a single HW queue we
still need it enabled in order to have HW Rx hash generated.
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x.h | 13 ++-----
drivers/net/bnx2x/bnx2x_main.c | 70 +++++++++++++++++-----------------------
2 files changed, 34 insertions(+), 49 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index c49b643..556cad5 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1180,15 +1180,10 @@ struct bnx2x {
TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV6_TCP_CAPABILITY
/* func init flags */
-#define FUNC_FLG_RSS 0x0001
-#define FUNC_FLG_STATS 0x0002
-/* removed FUNC_FLG_UNMATCHED 0x0004 */
-#define FUNC_FLG_TPA 0x0008
-#define FUNC_FLG_SPQ 0x0010
-#define FUNC_FLG_LEADING 0x0020 /* PF only */
-
-#define FUNC_CONFIG(flgs) ((flgs) & (FUNC_FLG_RSS | FUNC_FLG_TPA | \
- FUNC_FLG_LEADING))
+#define FUNC_FLG_STATS 0x0001
+#define FUNC_FLG_TPA 0x0002
+#define FUNC_FLG_SPQ 0x0004
+#define FUNC_FLG_LEADING 0x0008 /* PF only */
struct rxq_pause_params {
u16 bd_th_lo;
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index ead524b..012c093 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -2284,35 +2284,31 @@ void bnx2x_rxq_set_mac_filters(struct bnx2x *bp, u16 cl_id, u32 filters)
void bnx2x_func_init(struct bnx2x *bp, struct bnx2x_func_init_params *p)
{
- if (FUNC_CONFIG(p->func_flgs)) {
- struct tstorm_eth_function_common_config tcfg = {0};
-
- /* tpa */
- if (p->func_flgs & FUNC_FLG_TPA)
- tcfg.config_flags |=
- TSTORM_ETH_FUNCTION_COMMON_CONFIG_ENABLE_TPA;
-
- /* set rss flags */
- if (p->func_flgs & FUNC_FLG_RSS) {
- u16 rss_flgs = (p->rss->mode <<
- TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_MODE_SHIFT);
-
- if (p->rss->cap & RSS_IPV4_CAP)
- rss_flgs |= RSS_IPV4_CAP_MASK;
- if (p->rss->cap & RSS_IPV4_TCP_CAP)
- rss_flgs |= RSS_IPV4_TCP_CAP_MASK;
- if (p->rss->cap & RSS_IPV6_CAP)
- rss_flgs |= RSS_IPV6_CAP_MASK;
- if (p->rss->cap & RSS_IPV6_TCP_CAP)
- rss_flgs |= RSS_IPV6_TCP_CAP_MASK;
-
- tcfg.config_flags |= rss_flgs;
- tcfg.rss_result_mask = p->rss->result_mask;
+ struct tstorm_eth_function_common_config tcfg = {0};
+ u16 rss_flgs;
- }
+ /* tpa */
+ if (p->func_flgs & FUNC_FLG_TPA)
+ tcfg.config_flags |=
+ TSTORM_ETH_FUNCTION_COMMON_CONFIG_ENABLE_TPA;
- storm_memset_func_cfg(bp, &tcfg, p->func_id);
- }
+ /* set rss flags */
+ rss_flgs = (p->rss->mode <<
+ TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_MODE_SHIFT);
+
+ if (p->rss->cap & RSS_IPV4_CAP)
+ rss_flgs |= RSS_IPV4_CAP_MASK;
+ if (p->rss->cap & RSS_IPV4_TCP_CAP)
+ rss_flgs |= RSS_IPV4_TCP_CAP_MASK;
+ if (p->rss->cap & RSS_IPV6_CAP)
+ rss_flgs |= RSS_IPV6_CAP_MASK;
+ if (p->rss->cap & RSS_IPV6_TCP_CAP)
+ rss_flgs |= RSS_IPV6_TCP_CAP_MASK;
+
+ tcfg.config_flags |= rss_flgs;
+ tcfg.rss_result_mask = p->rss->result_mask;
+
+ storm_memset_func_cfg(bp, &tcfg, p->func_id);
/* Enable the function in the FW */
storm_memset_vf_to_pf(bp, p->func_id, p->pf_id);
@@ -2479,23 +2475,17 @@ void bnx2x_pf_init(struct bnx2x *bp)
else
flags |= FUNC_FLG_TPA;
+ /* function setup */
+
/**
* Although RSS is meaningless when there is a single HW queue we
* still need it enabled in order to have HW Rx hash generated.
- *
- * if (is_eth_multi(bp))
- * flags |= FUNC_FLG_RSS;
*/
- flags |= FUNC_FLG_RSS;
-
- /* function setup */
- if (flags & FUNC_FLG_RSS) {
- rss.cap = (RSS_IPV4_CAP | RSS_IPV4_TCP_CAP |
- RSS_IPV6_CAP | RSS_IPV6_TCP_CAP);
- rss.mode = bp->multi_mode;
- rss.result_mask = MULTI_MASK;
- func_init.rss = &rss;
- }
+ rss.cap = (RSS_IPV4_CAP | RSS_IPV4_TCP_CAP |
+ RSS_IPV6_CAP | RSS_IPV6_TCP_CAP);
+ rss.mode = bp->multi_mode;
+ rss.result_mask = MULTI_MASK;
+ func_init.rss = &rss;
func_init.func_flgs = flags;
func_init.pf_id = BP_FUNC(bp);
--
1.7.2.2
^ permalink raw reply related
* [PATCH net-next 0/6] bnx2x: patch series
From: Dmitry Kravkov @ 2010-10-18 8:59 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong, vladz
Hi Dave,
This is the respin of previous series with following changes:
1. removed patch with gso_size
2. removed FUNC_FLG_RSS flag and appropriate "if"s (as suggested by Joe Perches)
3. update version
Please, consider applying to net-next
Thanks
Dmitry
^ permalink raw reply
* [PATCH net-next 6/6] bnx2x: update version to 1.60.00-2
From: Dmitry Kravkov @ 2010-10-18 9:08 UTC (permalink / raw)
To: davem, netdev; +Cc: Eilon Greenstein, Vladislav Zolotarov
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 7d7af10..b387717 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -20,8 +20,8 @@
* (you will need to reboot afterwards) */
/* #define BNX2X_STOP_ON_ERROR */
-#define DRV_MODULE_VERSION "1.60.00-1"
-#define DRV_MODULE_RELDATE "2010/10/06"
+#define DRV_MODULE_VERSION "1.60.00-2"
+#define DRV_MODULE_RELDATE "2010/10/18"
#define BNX2X_BC_VER 0x040200
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
--
1.7.2.2
^ permalink raw reply related
* [PATCH net-next 3/6] bnx2x: do not deal with power if no capability
From: Dmitry Kravkov @ 2010-10-18 9:10 UTC (permalink / raw)
To: davem, netdev; +Cc: Eilon Greenstein, Vladislav Zolotarov
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_cmn.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index 3f0540c..9a3208e 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1520,6 +1520,12 @@ int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state)
{
u16 pmcsr;
+ /* If there is no power capability, silently succeed */
+ if (!bp->pm_cap) {
+ DP(NETIF_MSG_HW, "No power capability. Breaking.\n");
+ return 0;
+ }
+
pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL, &pmcsr);
switch (state) {
--
1.7.1
^ permalink raw reply related
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