* [PATCH net-next 0/9] sctp: Basic support for network namespaces
From: Eric W. Biederman @ 2012-08-06 18:38 UTC (permalink / raw)
To: David Miller
Cc: Vlad Yasevich, linux-sctp, netdev, linux-kernel, Jan Ariyasu,
Jan Ariyasu, Neil Horman, Thomas Graf, Xi Wang
In-Reply-To: <87mx27rig7.fsf@xmission.com>
The other day I wanted to play around with sctp and did a basic pass to
make sctp per network namespace, so that I could play more conviniently.
Apparently this is an idea who's time has come because Jan Ariyasu also
made a similar set of changes.
I have played around some with these changes and have confirmed that
sctp_test from lksctp-tools works without problems.
Compared to Jan's changes I have per network namespace association and
endpoint hash table lookups, my patch has per network namespace mib
statistics, my changes don't contiain per network namespace tunables
and my patchset only touches about half as many lines as Jan's change.
So for both correctness and simplicity reasons it looks like the
practical way to handle this is to merge my changes and get Jan rebase
his tunable changes on top.
include/net/net_namespace.h | 4 +
include/net/netns/sctp.h | 37 +++++
include/net/sctp/sctp.h | 44 +++----
include/net/sctp/structs.h | 28 +----
net/sctp/associola.c | 9 +-
net/sctp/bind_addr.c | 14 +-
net/sctp/chunk.c | 2 +-
net/sctp/endpointola.c | 12 +-
net/sctp/input.c | 109 +++++++++------
net/sctp/ipv6.c | 36 +++---
net/sctp/output.c | 2 +-
net/sctp/outqueue.c | 18 ++-
net/sctp/proc.c | 58 +++++---
net/sctp/protocol.c | 305 ++++++++++++++++++++++---------------------
net/sctp/sm_statefuns.c | 208 ++++++++++++++++++-----------
net/sctp/socket.c | 29 +++--
net/sctp/ulpqueue.c | 18 ++-
17 files changed, 533 insertions(+), 400 deletions(-)
Eric W. Biederman (9):
sctp: Make the port hash table use struct net in it's key.
sctp: Make the endpoint hashtable handle multiple network namespaces
sctp: Make the association hashtable handle multiple network namespaces
sctp: Make the address lists per network namespace
sctp: Make the ctl_sock per network namespace
sctp: Move the percpu sockets counter out of sctp_proc_init
sctp: Make the proc files per network namespace.
sctp: Enable sctp in all network namespaces
sctp: Make the mib per network namespace
^ permalink raw reply
* [PATCH] net: Use PTR_RET rather than if(IS_ERR(.. [1]
From: Thomas Meyer @ 2012-08-06 17:51 UTC (permalink / raw)
To: "[acme
The semantic patch that makes this change is available
in scripts/coccinelle/api/ptr_ret.cocci.
More information about semantic patching is available at
http://coccinelle.lip6.fr/
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
---
diff -u -p a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -996,9 +996,7 @@ static int __init cops_module_init(void)
printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n",
cardname);
cops_dev = cops_probe(-1);
- if (IS_ERR(cops_dev))
- return PTR_ERR(cops_dev);
- return 0;
+ return PTR_RET(cops_dev);
}
static void __exit cops_module_exit(void)
diff -u -p a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1243,9 +1243,7 @@ static int __init ltpc_module_init(void)
"ltpc: Autoprobing is not recommended for modules\n");
dev_ltpc = ltpc_probe();
- if (IS_ERR(dev_ltpc))
- return PTR_ERR(dev_ltpc);
- return 0;
+ return PTR_RET(dev_ltpc);
}
module_init(ltpc_module_init);
#endif
^ permalink raw reply
* Re: [PATCH net-next] igb: use build_skb()
From: Eric Dumazet @ 2012-08-06 18:21 UTC (permalink / raw)
To: Alexander Duyck; +Cc: Jeff Kirsher, netdev
In-Reply-To: <50200066.6060905@intel.com>
On Mon, 2012-08-06 at 10:35 -0700, Alexander Duyck wrote:
> I was planning to move igb over to an ixgbe style receive path at some
> point anyway. Since it seems like this is now a higher priority I
> figured I would try to get the patches for it implemented in the next
> week or so. Would there be any issue with us rejecting this patch and
> instead switching igb over to the ixgbe style path?
It seems I missed this part.
I use igb on my dev machine, not on prod machines, so if you are moving
igb to ixgbe, I can certainly can maintain my patch in my tree, while
you make your changes.
^ permalink raw reply
* Re: [PATCH 00/13] SCTP: Enable netns
From: Eric W. Biederman @ 2012-08-06 18:20 UTC (permalink / raw)
To: Jan Ariyasu
Cc: Vlad Yasevich, David S. Miller, linux-sctp, netdev, linux-kernel,
Jan Ariyasu
In-Reply-To: <1344115837-6150-1-git-send-email-jan.ariyasu@hp.com>
Jan Ariyasu <jan.ariyasu@gmail.com> writes:
> The following set of patches enable network-namespaces for the SCTP protocol.
>
> The multitude of global parameters are stored in a net_generic
> structure, and the bulk of the patches enable the protocol to access
> the parameters on a per-namespace basis. The first five patches
> enable netns handling of the protocol, procfs and sysfs.
I am going to do something to muddy the waters here, that I had hoped to
avoid when I saw your patchset.
A few weeks ago I wanted to play with sctp and also made a network
namespace enabled version. I am not deeply attached to my changes,
however when comparing the differences I realized that your code fails
to make the lookup of associations per network namespace.
Given that we only have source and destination port to lookup
assoications by this almost guarantees one network namespace can
accidentially use the association of another network namespace meerly
by reusing the same ports.
The downside with my version is that it does not make all of the sctp
tunables per network namespace the way yours does, but making all of
the tunables per network namespace should be straight forward from
my base.
My patchset also misses some nice to haves like making the association
id allocation per network namespace. It is not important for
correctness of the code but it might allow an information leak between
namespaces.
So Jan I am going to send my patchset and hopefully you can rebase your
changes to make all of the tunables per network namespace on top of
mine.
Since my patchset is half the size of your I think that is the most
reasonable way to go.
Eric
^ permalink raw reply
* Re: [PATCH net-next] igb: use build_skb()
From: Eric Dumazet @ 2012-08-06 18:08 UTC (permalink / raw)
To: Alexander Duyck; +Cc: Jeff Kirsher, netdev
In-Reply-To: <50200066.6060905@intel.com>
On Mon, 2012-08-06 at 10:35 -0700, Alexander Duyck wrote:
> On 08/02/2012 08:51 AM, Eric Dumazet wrote:
> > From: Eric Dumazet <edumazet@google.com>
> >
> > By using netdev_alloc_frag() & build_skb() instead of legacy
> > netdev_alloc_skb_ip_align() calls, we reduce number of cache misses in
> > RX path and size of working set.
> >
> > For a given rx workload, number of 'inuse' sk_buff can be reduced to a
> > very minimum, especially when packets are dropped by our stack.
> >
> > (Before this patch, default sk_buff allocation was 2048 sk_buffs in rx
> > ring buffer)
> >
> > They are initialized right before being delivered to stack, so can stay
> > hot in cpu caches.
> >
> > Ethernet header prefetching is more effective (old prefetch of skb->data
> > paid a stall to access skb->data pointer)
> >
> > I have 15% performance increase in a RX stress test, removing SLUB slow
> > path in the profiles.
> >
> > Signed-off-by: Eric Dumazet <edumazet@google.com>
> > Cc: Alexander Duyck <alexander.h.duyck@intel.com>
> > ---
> > drivers/net/ethernet/intel/igb/igb.h | 8 ++
> > drivers/net/ethernet/intel/igb/igb_ethtool.c | 14 ++--
> > drivers/net/ethernet/intel/igb/igb_main.c | 56 ++++++++++-------
> > 3 files changed, 49 insertions(+), 29 deletions(-)
> >
> [...]
> > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> > index b7c2d50..8b732c9 100644
> > --- a/drivers/net/ethernet/intel/igb/igb_main.c
> > +++ b/drivers/net/ethernet/intel/igb/igb_main.c
> [...]
> > @@ -6091,6 +6095,15 @@ static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, int budget)
> > next_rxd = IGB_RX_DESC(rx_ring, i);
> > prefetch(next_rxd);
> >
> > + if (!skb) {
> > + skb = build_skb(data, IGB_FRAGSZ);
> > + if (unlikely(!skb)) {
> > + rx_ring->rx_stats.alloc_failed++;
> > + buffer_info->data = data;
> > + goto next_desc;
> > + }
> > + skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);
> > + }
> > /*
> > * This memory barrier is needed to keep us from reading
> > * any other fields out of the rx_desc until we know the
> This logic is broken. If an allocation failure occurs it would leave
> the data in the ring and could possibly give you a corrupted packet.
>
> I was planning to move igb over to an ixgbe style receive path at some
> point anyway. Since it seems like this is now a higher priority I
> figured I would try to get the patches for it implemented in the next
> week or so. Would there be any issue with us rejecting this patch and
> instead switching igb over to the ixgbe style path?
I checked again and I believe logic is fine, exactly like driver before
this patch.
If skb cannot be allocated, the data part is reused for next frame.
( buffer_info->data = data; goto next_desc; )
^ permalink raw reply
* Re: [PATCH] net:appletalk:ddp:fixed coding style issue relating to
From: Ben Hutchings @ 2012-08-06 17:57 UTC (permalink / raw)
To: Jeffrin Jose; +Cc: acme, davem, netdev, linux-kernel
In-Reply-To: <1344274298-4711-1-git-send-email-ahiliation@yahoo.co.in>
On Mon, 2012-08-06 at 23:01 +0530, Jeffrin Jose wrote:
> Fixed coding style issue relating to indentation
> in net/appletalk/ddp.c found by checkpatch.pl tool.
>
> Signed-off-by: Jeffrin Jose <ahiliation@yahoo.co.in>
> ---
> net/appletalk/ddp.c | 26 +++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
> index 8685296..4023fca 100644
> --- a/net/appletalk/ddp.c
> +++ b/net/appletalk/ddp.c
> @@ -1796,7 +1796,7 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
>
> switch (cmd) {
> /* Protocol layer */
> - case TIOCOUTQ: {
> + case TIOCOUTQ: {
> long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
>
> if (amount < 0)
[...]
The whole of the switch body should be shifted left by one tab, not just
the case-labels.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH net-next] igb: use build_skb()
From: Alexander Duyck @ 2012-08-06 17:35 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Jeff Kirsher, netdev
In-Reply-To: <1343922692.9299.231.camel@edumazet-glaptop>
On 08/02/2012 08:51 AM, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> By using netdev_alloc_frag() & build_skb() instead of legacy
> netdev_alloc_skb_ip_align() calls, we reduce number of cache misses in
> RX path and size of working set.
>
> For a given rx workload, number of 'inuse' sk_buff can be reduced to a
> very minimum, especially when packets are dropped by our stack.
>
> (Before this patch, default sk_buff allocation was 2048 sk_buffs in rx
> ring buffer)
>
> They are initialized right before being delivered to stack, so can stay
> hot in cpu caches.
>
> Ethernet header prefetching is more effective (old prefetch of skb->data
> paid a stall to access skb->data pointer)
>
> I have 15% performance increase in a RX stress test, removing SLUB slow
> path in the profiles.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Alexander Duyck <alexander.h.duyck@intel.com>
> ---
> drivers/net/ethernet/intel/igb/igb.h | 8 ++
> drivers/net/ethernet/intel/igb/igb_ethtool.c | 14 ++--
> drivers/net/ethernet/intel/igb/igb_main.c | 56 ++++++++++-------
> 3 files changed, 49 insertions(+), 29 deletions(-)
>
[...]
> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> index b7c2d50..8b732c9 100644
> --- a/drivers/net/ethernet/intel/igb/igb_main.c
> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
[...]
> @@ -6091,6 +6095,15 @@ static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, int budget)
> next_rxd = IGB_RX_DESC(rx_ring, i);
> prefetch(next_rxd);
>
> + if (!skb) {
> + skb = build_skb(data, IGB_FRAGSZ);
> + if (unlikely(!skb)) {
> + rx_ring->rx_stats.alloc_failed++;
> + buffer_info->data = data;
> + goto next_desc;
> + }
> + skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);
> + }
> /*
> * This memory barrier is needed to keep us from reading
> * any other fields out of the rx_desc until we know the
This logic is broken. If an allocation failure occurs it would leave
the data in the ring and could possibly give you a corrupted packet.
I was planning to move igb over to an ixgbe style receive path at some
point anyway. Since it seems like this is now a higher priority I
figured I would try to get the patches for it implemented in the next
week or so. Would there be any issue with us rejecting this patch and
instead switching igb over to the ixgbe style path?
Thanks,
Alex
^ permalink raw reply
* [PATCH] net:appletalk:ddp:fixed coding style issue relating to
From: Jeffrin Jose @ 2012-08-06 17:31 UTC (permalink / raw)
To: acme, davem; +Cc: netdev, linux-kernel, Jeffrin Jose
Fixed coding style issue relating to indentation
in net/appletalk/ddp.c found by checkpatch.pl tool.
Signed-off-by: Jeffrin Jose <ahiliation@yahoo.co.in>
---
net/appletalk/ddp.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 8685296..4023fca 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1796,7 +1796,7 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
switch (cmd) {
/* Protocol layer */
- case TIOCOUTQ: {
+ case TIOCOUTQ: {
long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
if (amount < 0)
@@ -1804,7 +1804,7 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
rc = put_user(amount, (int __user *)argp);
break;
}
- case TIOCINQ: {
+ case TIOCINQ: {
/*
* These two are safe on a single CPU system as only
* user tasks fiddle here
@@ -1817,27 +1817,27 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
rc = put_user(amount, (int __user *)argp);
break;
}
- case SIOCGSTAMP:
+ case SIOCGSTAMP:
rc = sock_get_timestamp(sk, argp);
break;
- case SIOCGSTAMPNS:
+ case SIOCGSTAMPNS:
rc = sock_get_timestampns(sk, argp);
break;
/* Routing */
- case SIOCADDRT:
- case SIOCDELRT:
+ case SIOCADDRT:
+ case SIOCDELRT:
rc = -EPERM;
if (capable(CAP_NET_ADMIN))
rc = atrtr_ioctl(cmd, argp);
break;
/* Interface */
- case SIOCGIFADDR:
- case SIOCSIFADDR:
- case SIOCGIFBRDADDR:
- case SIOCATALKDIFADDR:
- case SIOCDIFADDR:
- case SIOCSARP: /* proxy AARP */
- case SIOCDARP: /* proxy AARP */
+ case SIOCGIFADDR:
+ case SIOCSIFADDR:
+ case SIOCGIFBRDADDR:
+ case SIOCATALKDIFADDR:
+ case SIOCDIFADDR:
+ case SIOCSARP: /* proxy AARP */
+ case SIOCDARP: /* proxy AARP */
rtnl_lock();
rc = atif_ioctl(cmd, argp);
rtnl_unlock();
--
1.7.10
^ permalink raw reply related
* Atheros Communications Inc. AR8121/AR8113/AR8114 Gigabit or Fast Ethernet (rev b0) 1.0.0.7 md5 corrupted using NFS
From: Marco Castiglione @ 2012-08-06 17:02 UTC (permalink / raw)
To: netdev
Hi,
I have a problem with :
Ethernet controller: Atheros Communications Inc. AR8121/AR8113/AR8114
Gigabit or Fast Ethernet (rev b0)
Subsystem: ASUSTeK Computer Inc. Device 831c
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr-
Stepping- SERR+ FastB2B- DisINTx+
Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort-
<TAbort- <MAbort- >SERR- <PERR- INTx-
Latency: 0, Cache Line Size: 64 bytes
Interrupt: pin A routed to IRQ 46
Region 0: Memory at fbec0000 (64-bit, non-prefetchable) [size=256K]
Region 2: I/O ports at dc00 [size=128]
Capabilities: <access denied>
Kernel driver in use: ATL1E
The driver working fine except for nfs3 and nfs4
If I try to copy a file bigger of 400 mb the file get corrupted, If I try
with multiple files I have a kernel oops
I tried different system and service (Ftp,samba) and they working fine.
I also tried to set nfs to use udp, it kinda fix the problem but only in
part (I get 1 on 3 big file with md5 mismatch).
I notice in almost every kernel from 2.6 to now 3.2.15 the driver is the
same version
Filename: /lib/modules/3.2.0-2-amd64/
kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
version: 1.0.0.7-NAPI
license: GPL
description: Atheros 1000M Ethernet Network Driver
author: Atheros Corporation, <xiong.huang@atheros.com>, Jie Yang <
jie.yang@atheros.com>
srcversion: 6E5949327D7FDF32D5F4A5B
alias: pci:v00001969d00001066sv*sd*bc*sc*i*
alias: pci:v00001969d00001026sv*sd*bc*sc*i*
depends:
intree: Y
vermagic: 3.2.0-2-amd64 SMP mod_unload modversions
parm: tx_desc_cnt:Transmit description count (array of int)
parm: rx_mem_size:memory size of rx buffer(KB) (array of int)
parm: media_type:MediaType Select (array of int)
parm: int_mod_timer:Interrupt Moderator Timer (array of int)
I found on ubuntu website the last version of the driver is 1.0.1.14 with
this change log :
1.0.1.14
1. don't define napi_struct in kcompat.h when GRO isn't supported.
1.0.1.13
1. fix AR8151-A hang when plug in LAN cable by cleaning bit1 of
REG(0x1114).
1.0.1.12
1. fix tpd, rfd, rrs, configure error for powerpc
1.0.1.11
1. only save power when WOL enable.
1.0.1.10
1. add l1d 2.0 support.
2. fix atl1c_phy_power_saving bug.
1.0.1.9
1. fix AR8131 reset error TX pending.
2. add AR8152 description.
1.0.1.8
1. add L2CB V2.0 support.
1.0.1.7
1. fix L0s/L1 bug.
2. update suspend procedure.
1.0.1.6
1. fix valn error.
2. use common task instead of reset task and link change task.
3. reset phy when link down.
1.0.1.5
1. change rx mod.
1.0.1.4
1. add l1d support.
1.0.1.3
1. fix TSO error.
1.0.1.2
1. fix compile error for kernel >= 2.6.30.
1.0.1.1
1. add L2cB support.
1.0.0.10
1. fix memory leak when power suspend.
1.0.0.9
1. do power saving when bootup with link lost.
2. remove ATL1C_INTR_CLEAR_ON_READ for power saving
1.0.0.8
1. remove dump_stack(), which was used for debugging.
So I found out the TSO is corrupt in the current version and that explain
with the udp setting do the trick.
Now I tried to compile the new version from
AR81Family-linux-v1.0.1.14.tar.gz but was made for the 2.6 so I can't
compile.( <http://goog_56610235>
http://media.cdn.ubuntu-de.org/forum/attachments/2666793/AR81Family-linux-
v1.0.1.14_10.10.tar.gz
)
The Atheros support and web page is gone after Qualcomm acquisition and the
patch I found on Ubuntu forum don't work either (
http://ubuntuforums.org/attachment.php?attachmentid=182141&d=1296221015)
I found out lots of people have the same issue and they using samba at the
moment.
My temp solution is use a usb/eth adapter with ax8112 chipset but it run at
100mbps.
SO my request is this : Is possible for somebody of the kernel team look
the code inside AR81Family-linux-v1.0.1.14.tar.gz and update the one in
the kernel 3.x?
Thank you for you time and consideration
^ permalink raw reply
* Re: ethtool 3.5 released
From: Ben Hutchings @ 2012-08-06 16:41 UTC (permalink / raw)
To: Naoto MATSUMOTO; +Cc: netdev
In-Reply-To: <20120806102723.D637.C42C3789@sakura.ad.jp>
On Mon, 2012-08-06 at 10:27 +0900, Naoto MATSUMOTO wrote:
> Dear Ben.
>
> FYI(For Your Information)
> This is Naoto MATSUMOTO, Senior Researcher, SAKURA Internet.
>
> We tried ethtool 3.5 on 40GbE NIC(Mellanox), it's result here.
> -----------------------------------------------------------------------
> # ./ethtool --version
> ethtool version 3.5
>
> # ./ethtool eth1
> Settings for eth1:
> Supported ports: [ TP ]
> Supported link modes: 10000baseT/Full
> Supported pause frame use: No
> Supports auto-negotiation: No
> Advertised link modes: 10000baseT/Full
> Advertised pause frame use: No
> Advertised auto-negotiation: No
> Speed: 40000Mb/s
> Duplex: Full
> Port: Twisted Pair
40G twisted-pair, eh?
> PHYAD: 0
> Transceiver: internal
> Auto-negotiation: off
> MDI-X: Unknown
> Supports Wake-on: d
> Wake-on: d
> Current message level: 0x00000014 (20)
> link ifdown
> Link detected: yes
>
>
> Our 40GbE NIC Firmware/Dirver status are here.
> -----------------------------------------------------------------------
> Mellanox ConnectX HCA Ethernet driver v1.5.8.3 (June 2012)
> Ethernet controller: Mellanox Technologies MT27500 Family [ConnectX-3]
> Firmware Version: 2.10.800
> -----------------------------------------------------------------------
>
>
> And We were testing 10GbE(Intel) NIC and your 40GbE NIC in our lab
> using ethtool with added some debug code.
I work for Solarflare, not Mellanox... and the patch adding 40G link
modes came from Parav Pandit at Emulex.
[...]
> It's firmware problem I thinks. But Just Information for you ;-)
Also, the 40G link mode flags were only just defined, so the driver
probably has yet to be updated.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* WARNING: at net/ipv4/tcp.c:1598 tcp_recvmsg+0x641/0xd30()
From: Dave Jones @ 2012-08-06 15:46 UTC (permalink / raw)
To: netdev; +Cc: Fedora Kernel Team
We just got an automated report of this WARN being hit in 3.5
> backtrace:
> :WARNING: at net/ipv4/tcp.c:1598 tcp_recvmsg+0x641/0xd30()
> :Hardware name: P5Q DELUXE
> :recvmsg bug: copied 99F66400 seq 99F6A4A8 rcvnxt 99F6CDAD fl 0
> : [<ffffffff811848e6>] do_sync_read+0xe6/0x120
> : [<ffffffff81275eea>] ? inode_has_perm.isra.31.constprop.61+0x2a/0x30
> : [<ffffffff81272f32>] ? security_file_permission+0x92/0xb0
> : [<ffffffff81184d81>] ? rw_verify_area+0x61/0xf0
> : [<ffffffff811852cd>] vfs_read+0x15d/0x180
> : [<ffffffff8118533a>] sys_read+0x4a/0x90
> : [<ffffffff8160fc29>] system_call_fastpath+0x16/0x1b
1594 /* Now that we have two receive queues this
1595 * shouldn't happen.
1596 */
1597 if (WARN(before(*seq, TCP_SKB_CB(skb)->seq),
1598 "recvmsg bug: copied %X seq %X rcvnxt %X fl %X\n",
1599 *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt,
1600 flags))
1601 break;
Hopefully this means more to you guys than it does to me.
Dave
^ permalink raw reply
* [PATCH net] net_sched: act: Delete estimator in error path.
From: Hiroaki SHIMODA @ 2012-08-06 15:45 UTC (permalink / raw)
To: davem; +Cc: netdev
Some action modules free struct tcf_common in their error path
while estimator is still active. This results in est_timer()
dereference freed memory.
Add gen_kill_estimator() in ipt, pedit and simple action.
Signed-off-by: Hiroaki SHIMODA <shimoda.hiroaki@gmail.com>
---
net/sched/act_ipt.c | 7 ++++++-
net/sched/act_pedit.c | 5 ++++-
net/sched/act_simple.c | 5 ++++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 60e281a..58fb3c7 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -185,7 +185,12 @@ err3:
err2:
kfree(tname);
err1:
- kfree(pc);
+ if (ret == ACT_P_CREATED) {
+ if (est)
+ gen_kill_estimator(&pc->tcfc_bstats,
+ &pc->tcfc_rate_est);
+ kfree_rcu(pc, tcfc_rcu);
+ }
return err;
}
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 26aa2f6..45c53ab 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -74,7 +74,10 @@ static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est,
p = to_pedit(pc);
keys = kmalloc(ksize, GFP_KERNEL);
if (keys == NULL) {
- kfree(pc);
+ if (est)
+ gen_kill_estimator(&pc->tcfc_bstats,
+ &pc->tcfc_rate_est);
+ kfree_rcu(pc, tcfc_rcu);
return -ENOMEM;
}
ret = ACT_P_CREATED;
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 3922f2a..3714f60 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -131,7 +131,10 @@ static int tcf_simp_init(struct nlattr *nla, struct nlattr *est,
d = to_defact(pc);
ret = alloc_defdata(d, defdata);
if (ret < 0) {
- kfree(pc);
+ if (est)
+ gen_kill_estimator(&pc->tcfc_bstats,
+ &pc->tcfc_rate_est);
+ kfree_rcu(pc, tcfc_rcu);
return ret;
}
d->tcf_action = parm->action;
--
1.7.8.6
^ permalink raw reply related
* Re: [PATCH 1/8] netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup()
From: Eric Dumazet @ 2012-08-06 15:20 UTC (permalink / raw)
To: Cong Wang; +Cc: netdev, David S. Miller
In-Reply-To: <1344263012-4031-2-git-send-email-amwang@redhat.com>
On Mon, 2012-08-06 at 22:23 +0800, Cong Wang wrote:
> slave_enable_netpoll() and __netpoll_setup() may be called
> with read_lock() held, so should use GFP_ATOMIC to allocate
> memory. Eric suggested to pass gfp flags to __netpoll_setup().
>
> Cc: Eric Dumazet <eric.dumazet@gmail.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Cong Wang <amwang@redhat.com>
> ---
You based this on net-next, but didnt add the net-next suffix in your
[PATCH ...] description.
Signed-off-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply
* [PATCH] net: ipv6: fix TCP early demux
From: Eric Dumazet @ 2012-08-06 15:09 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Eric Dumazet <edumazet@google.com>
IPv6 needs a cookie in dst_check() call.
We need to add rx_dst_cookie and provide a family independent
sk_rx_dst_set(sk, skb) method to properly support IPv6 TCP early demux.
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
Note: we could group sk_rx_dst/rx_dst_ifindex/rx_dst_cookie
in same cache line (in sk)
include/linux/ipv6.h | 1 +
include/net/inet_connection_sock.h | 1 +
include/net/inet_sock.h | 9 ---------
net/ipv4/tcp_input.c | 4 +++-
net/ipv4/tcp_ipv4.c | 13 ++++++++++---
net/ipv4/tcp_minisocks.c | 2 +-
net/ipv6/tcp_ipv6.c | 27 +++++++++++++++++++++++++--
7 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 379e433..879db26 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -369,6 +369,7 @@ struct ipv6_pinfo {
__u8 rcv_tclass;
__u32 dst_cookie;
+ __u32 rx_dst_cookie;
struct ipv6_mc_socklist __rcu *ipv6_mc_list;
struct ipv6_ac_socklist *ipv6_ac_list;
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 5ee66f5..ba1d361 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -39,6 +39,7 @@ struct inet_connection_sock_af_ops {
int (*queue_xmit)(struct sk_buff *skb, struct flowi *fl);
void (*send_check)(struct sock *sk, struct sk_buff *skb);
int (*rebuild_header)(struct sock *sk);
+ void (*sk_rx_dst_set)(struct sock *sk, const struct sk_buff *skb);
int (*conn_request)(struct sock *sk, struct sk_buff *skb);
struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb,
struct request_sock *req,
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 83b567f..613cfa4 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -249,13 +249,4 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
return flags;
}
-static inline void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
-{
- struct dst_entry *dst = skb_dst(skb);
-
- dst_hold(dst);
- sk->sk_rx_dst = dst;
- inet_sk(sk)->rx_dst_ifindex = skb->skb_iif;
-}
-
#endif /* _INET_SOCK_H */
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 2fd2bc9..85308b9 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5392,6 +5392,8 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
{
struct tcp_sock *tp = tcp_sk(sk);
+ if (unlikely(sk->sk_rx_dst == NULL))
+ inet_csk(sk)->icsk_af_ops->sk_rx_dst_set(sk, skb);
/*
* Header prediction.
* The code loosely follows the one in the famous
@@ -5605,7 +5607,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb)
tcp_set_state(sk, TCP_ESTABLISHED);
if (skb != NULL) {
- inet_sk_rx_dst_set(sk, skb);
+ icsk->icsk_af_ops->sk_rx_dst_set(sk, skb);
security_inet_conn_established(sk, skb);
}
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 42b2a6a..272241f 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1627,9 +1627,6 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
sk->sk_rx_dst = NULL;
}
}
- if (unlikely(sk->sk_rx_dst == NULL))
- inet_sk_rx_dst_set(sk, skb);
-
if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) {
rsk = sk;
goto reset;
@@ -1872,10 +1869,20 @@ static struct timewait_sock_ops tcp_timewait_sock_ops = {
.twsk_destructor= tcp_twsk_destructor,
};
+static void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
+{
+ struct dst_entry *dst = skb_dst(skb);
+
+ dst_hold(dst);
+ sk->sk_rx_dst = dst;
+ inet_sk(sk)->rx_dst_ifindex = skb->skb_iif;
+}
+
const struct inet_connection_sock_af_ops ipv4_specific = {
.queue_xmit = ip_queue_xmit,
.send_check = tcp_v4_send_check,
.rebuild_header = inet_sk_rebuild_header,
+ .sk_rx_dst_set = inet_sk_rx_dst_set,
.conn_request = tcp_v4_conn_request,
.syn_recv_sock = tcp_v4_syn_recv_sock,
.net_header_len = sizeof(struct iphdr),
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 232a90c..d9c9dce 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -387,7 +387,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req,
struct tcp_sock *oldtp = tcp_sk(sk);
struct tcp_cookie_values *oldcvp = oldtp->cookie_values;
- inet_sk_rx_dst_set(newsk, skb);
+ newicsk->icsk_af_ops->sk_rx_dst_set(newsk, skb);
/* TCP Cookie Transactions require space for the cookie pair,
* as it differs for each connection. There is no need to
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index c66b90f..5a439e9 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1447,7 +1447,17 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
opt_skb = skb_clone(skb, sk_gfp_atomic(sk, GFP_ATOMIC));
if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
+ struct dst_entry *dst = sk->sk_rx_dst;
+
sock_rps_save_rxhash(sk, skb);
+ if (dst) {
+ if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif ||
+ dst->ops->check(dst, np->rx_dst_cookie) == NULL) {
+ dst_release(dst);
+ sk->sk_rx_dst = NULL;
+ }
+ }
+
if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len))
goto reset;
if (opt_skb)
@@ -1705,9 +1715,9 @@ static void tcp_v6_early_demux(struct sk_buff *skb)
struct dst_entry *dst = sk->sk_rx_dst;
struct inet_sock *icsk = inet_sk(sk);
if (dst)
- dst = dst_check(dst, 0);
+ dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);
if (dst &&
- icsk->rx_dst_ifindex == inet6_iif(skb))
+ icsk->rx_dst_ifindex == skb->skb_iif)
skb_dst_set_noref(skb, dst);
}
}
@@ -1719,10 +1729,23 @@ static struct timewait_sock_ops tcp6_timewait_sock_ops = {
.twsk_destructor= tcp_twsk_destructor,
};
+static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
+{
+ struct dst_entry *dst = skb_dst(skb);
+ const struct rt6_info *rt = (const struct rt6_info *)dst;
+
+ dst_hold(dst);
+ sk->sk_rx_dst = dst;
+ inet_sk(sk)->rx_dst_ifindex = skb->skb_iif;
+ if (rt->rt6i_node)
+ inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
+}
+
static const struct inet_connection_sock_af_ops ipv6_specific = {
.queue_xmit = inet6_csk_xmit,
.send_check = tcp_v6_send_check,
.rebuild_header = inet6_sk_rebuild_header,
+ .sk_rx_dst_set = inet6_sk_rx_dst_set,
.conn_request = tcp_v6_conn_request,
.syn_recv_sock = tcp_v6_syn_recv_sock,
.net_header_len = sizeof(struct ipv6hdr),
^ permalink raw reply related
* [PATCH 2/2] documentation: dt: bindings: cpsw: fixing the examples for directly using it in dts file
From: Mugunthan V N @ 2012-08-06 15:05 UTC (permalink / raw)
To: netdev
Cc: davem, devicetree-discuss, linux-arm-kernel, linux-omap,
Mugunthan V N
In-Reply-To: <1344265558-5724-1-git-send-email-mugunthanvnm@ti.com>
Fixing the cpsw device tree example to make it simpler to copy pastable to dts
file and use it directly.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
---
Documentation/devicetree/bindings/net/cpsw.txt | 101 ++++++++++++-----------
1 files changed, 53 insertions(+), 48 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index acca48c..dcaabe9 100644
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt
@@ -11,6 +11,7 @@ Required properties:
- cpdma_channels : Specifies number of channels in CPDMA
- host_port_no : Specifies host port shift
- cpdma_reg_ofs : Specifies CPDMA submodule register offset
+- cpdma_sram_ofs : Specifies CPDMA SRAM offset
- ale_reg_ofs : Specifies ALE submodule register offset
- ale_entries : Specifies No of entries ALE can hold
- host_port_reg_ofs : Specifies host port register offset
@@ -43,62 +44,66 @@ Examples:
reg = <0x4A100000 0x1000>;
interrupts = <55 0x4>;
interrupt-parent = <&intc>;
- cpdma_channels = 8;
- host_port_no = 0;
- cpdma_reg_ofs = 0x800;
- ale_reg_ofs = 0xd00;
- ale_entries = 1024;
- host_port_reg_ofs = 0x108;
- hw_stats_reg_ofs = 0x900;
- bd_ram_ofs = 0x2000;
- bd_ram_size = 0x2000;
- no_bd_ram = 0;
- rx_descs = 64;
- mac_control = 0x20;
- slaves = 2;
- slave@0 {
- slave_reg_ofs = 0x208;
- sliver_reg_ofs = 0xd80;
- phy_id = "davinci_mdio-0:00"
- mac-address = [00 04 9F 01 1B B8];
+ cpdma_channels = <8>;
+ host_port_no = <0>;
+ cpdma_reg_ofs = <0x800>;
+ cpdma_sram_ofs = <0xa00>;
+ ale_reg_ofs = <0xd00>;
+ ale_entries = <1024>;
+ host_port_reg_ofs = <0x108>;
+ hw_stats_reg_ofs = <0x900>;
+ bd_ram_ofs = <0x2000>;
+ bd_ram_size = <0x2000>;
+ no_bd_ram = <0>;
+ rx_descs = <64>;
+ mac_control = <0x20>;
+ slaves = <2>;
+ cpsw_emac0: slave@0 {
+ slave_reg_ofs = <0x208>;
+ sliver_reg_ofs = <0xd80>;
+ phy_id = "davinci_mdio.16:00";
+ /* Filled in by U-Boot */
+ mac-address = [ 00 00 00 00 00 00 ];
};
- slave@1 {
- slave_reg_ofs = 0x208;
- sliver_reg_ofs = 0xd80;
- phy_id = "davinci_mdio-0:01"
- mac-address = [00 04 9F 01 1B B9];
+ cpsw_emac1: slave@1 {
+ slave_reg_ofs = <0x308>;
+ sliver_reg_ofs = <0xdc0>;
+ phy_id = "davinci_mdio.16:01";
+ /* Filled in by U-Boot */
+ mac-address = [ 00 00 00 00 00 00 ];
};
};
(or)
-
mac: ethernet@4A100000 {
compatible = "ti,cpsw";
ti,hwmods = "cpgmac0";
- cpdma_channels = 8;
- host_port_no = 0;
- cpdma_reg_ofs = 0x800;
- ale_reg_ofs = 0xd00;
- ale_entries = 1024;
- host_port_reg_ofs = 0x108;
- hw_stats_reg_ofs = 0x900;
- bd_ram_ofs = 0x2000;
- bd_ram_size = 0x2000;
- no_bd_ram = 0;
- rx_descs = 64;
- mac_control = 0x20;
- slaves = 2;
- slave@0 {
- slave_reg_ofs = 0x208;
- sliver_reg_ofs = 0xd80;
- phy_id = "davinci_mdio-0:00"
- mac-address = [00 04 9F 01 1B B8];
+ cpdma_channels = <8>;
+ host_port_no = <0>;
+ cpdma_reg_ofs = <0x800>;
+ cpdma_sram_ofs = <0xa00>;
+ ale_reg_ofs = <0xd00>;
+ ale_entries = <1024>;
+ host_port_reg_ofs = <0x108>;
+ hw_stats_reg_ofs = <0x900>;
+ bd_ram_ofs = <0x2000>;
+ bd_ram_size = <0x2000>;
+ no_bd_ram = <0>;
+ rx_descs = <64>;
+ mac_control = <0x20>;
+ slaves = <2>;
+ cpsw_emac0: slave@0 {
+ slave_reg_ofs = <0x208>;
+ sliver_reg_ofs = <0xd80>;
+ phy_id = "davinci_mdio.16:00";
+ /* Filled in by U-Boot */
+ mac-address = [ 00 00 00 00 00 00 ];
};
- slave@1 {
- slave_reg_ofs = 0x208;
- sliver_reg_ofs = 0xd80;
- phy_id = "davinci_mdio-0:01"
- mac-address = [00 04 9F 01 1B B9];
+ cpsw_emac1: slave@1 {
+ slave_reg_ofs = <0x308>;
+ sliver_reg_ofs = <0xdc0>;
+ phy_id = "davinci_mdio.16:01";
+ /* Filled in by U-Boot */
+ mac-address = [ 00 00 00 00 00 00 ];
};
-
};
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/2] drivers: net: ethernet: davince_mdio: device tree implementation
From: Mugunthan V N @ 2012-08-06 15:05 UTC (permalink / raw)
To: netdev
Cc: davem, devicetree-discuss, linux-arm-kernel, linux-omap,
Mugunthan V N
In-Reply-To: <1344265558-5724-1-git-send-email-mugunthanvnm@ti.com>
device tree implementation for davinci mdio driver
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
---
.../devicetree/bindings/net/davinci-mdio.txt | 33 ++++++++++++++++
drivers/net/ethernet/ti/davinci_mdio.c | 41 ++++++++++++++++++--
2 files changed, 70 insertions(+), 4 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/davinci-mdio.txt
diff --git a/Documentation/devicetree/bindings/net/davinci-mdio.txt b/Documentation/devicetree/bindings/net/davinci-mdio.txt
new file mode 100644
index 0000000..72efaaf
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/davinci-mdio.txt
@@ -0,0 +1,33 @@
+TI SoC Davinci MDIO Controller Device Tree Bindings
+---------------------------------------------------
+
+Required properties:
+- compatible : Should be "ti,davinci_mdio"
+- reg : physical base address and size of the davinci mdio
+ registers map
+- bus_freq : Mdio Bus frequency
+
+Optional properties:
+- ti,hwmods : Must be "davinci_mdio"
+
+Note: "ti,hwmods" field is used to fetch the base address and irq
+resources from TI, omap hwmod data base during device registration.
+Future plan is to migrate hwmod data base contents into device tree
+blob so that, all the required data will be used from device tree dts
+file.
+
+Examples:
+
+ mdio: davinci_mdio@4A101000 {
+ compatible = "ti,cpsw";
+ reg = <0x4A101000 0x1000>;
+ bus_freq = <1000000>;
+ };
+
+(or)
+
+ mdio: davinci_mdio@4A101000 {
+ compatible = "ti,cpsw";
+ ti,hwmods = "davinci_mdio";
+ bus_freq = <1000000>;
+ };
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index cd7ee20..573f3be 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -36,6 +36,8 @@
#include <linux/io.h>
#include <linux/pm_runtime.h>
#include <linux/davinci_emac.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
/*
* This timeout definition is a worst-case ultra defensive measure against
@@ -289,6 +291,25 @@ static int davinci_mdio_write(struct mii_bus *bus, int phy_id,
return 0;
}
+static int davinci_mdio_probe_dt(struct mdio_platform_data *data,
+ struct platform_device *pdev)
+{
+ struct device_node *node = pdev->dev.of_node;
+ u32 prop;
+
+ if (!node)
+ return -EINVAL;
+
+ if (of_property_read_u32(node, "bus_freq", &prop)) {
+ pr_err("Missing bus_freq property in the DT.\n");
+ return -EINVAL;
+ }
+ data->bus_freq = prop;
+
+ return 0;
+}
+
+
static int __devinit davinci_mdio_probe(struct platform_device *pdev)
{
struct mdio_platform_data *pdata = pdev->dev.platform_data;
@@ -304,8 +325,6 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev)
return -ENOMEM;
}
- data->pdata = pdata ? (*pdata) : default_pdata;
-
data->bus = mdiobus_alloc();
if (!data->bus) {
dev_err(dev, "failed to alloc mii bus\n");
@@ -313,14 +332,22 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev)
goto bail_out;
}
+ if (dev->of_node) {
+ if (davinci_mdio_probe_dt(&data->pdata, pdev))
+ data->pdata = default_pdata;
+ snprintf(data->bus->id, MII_BUS_ID_SIZE, "%s", pdev->name);
+ } else {
+ data->pdata = pdata ? (*pdata) : default_pdata;
+ snprintf(data->bus->id, MII_BUS_ID_SIZE, "%s-%x",
+ pdev->name, pdev->id);
+ }
+
data->bus->name = dev_name(dev);
data->bus->read = davinci_mdio_read,
data->bus->write = davinci_mdio_write,
data->bus->reset = davinci_mdio_reset,
data->bus->parent = dev;
data->bus->priv = data;
- snprintf(data->bus->id, MII_BUS_ID_SIZE, "%s-%x",
- pdev->name, pdev->id);
pm_runtime_enable(&pdev->dev);
pm_runtime_get_sync(&pdev->dev);
@@ -454,11 +481,17 @@ static const struct dev_pm_ops davinci_mdio_pm_ops = {
.resume = davinci_mdio_resume,
};
+static const struct of_device_id davinci_mdio_of_mtable[] = {
+ { .compatible = "ti,davinci_mdio", },
+ { /* sentinel */ },
+};
+
static struct platform_driver davinci_mdio_driver = {
.driver = {
.name = "davinci_mdio",
.owner = THIS_MODULE,
.pm = &davinci_mdio_pm_ops,
+ .of_match_table = of_match_ptr(davinci_mdio_of_mtable),
},
.probe = davinci_mdio_probe,
.remove = __devexit_p(davinci_mdio_remove),
--
1.7.0.4
^ permalink raw reply related
* [PATCH 0/2] Add device tree support for davinci_mdio driver and fix cpsw DT binding documentation
From: Mugunthan V N @ 2012-08-06 15:05 UTC (permalink / raw)
To: netdev
Cc: Mugunthan V N, devicetree-discuss, linux-omap, davem,
linux-arm-kernel
This patch set adds support for device tree for Davinci MDIO driver and fixes
CPSW DT binding documentation to make it copy pastable to dts file.
This patch set is tested with the following git tree on AM335X Beagle Bone
https://github.com/hvaibhav/am335x-linux/tree/am335x-upstream-staging-cpsw
Mugunthan V N (2):
drivers: net: ethernet: davince_mdio: device tree implementation
documentation: dt: bindings: cpsw: fixing the examples for directly
using it in dts file
Documentation/devicetree/bindings/net/cpsw.txt | 101 ++++++++++---------
.../devicetree/bindings/net/davinci-mdio.txt | 33 +++++++
drivers/net/ethernet/ti/davinci_mdio.c | 41 +++++++-
3 files changed, 123 insertions(+), 52 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/davinci-mdio.txt
^ permalink raw reply
* RE: pch_gbe: dont-copy-payload (was [PATCH 1/4] ...)
From: Eric Dumazet @ 2012-08-06 14:52 UTC (permalink / raw)
To: Andy Cress; +Cc: netdev
In-Reply-To: <40680C535D6FE6498883F1640FACD44D0122CF12@ka-exchange-1.kontronamerica.local>
On Mon, 2012-08-06 at 07:19 -0700, Andy Cress wrote:
> I found out why the proposed dont-copy-payload patch didn't work with
> this pch_gbe NIC.
> This NIC PHY requires 64-byte-aligned DMA, and the transmit buffers
> won't be transferred if skb->data is not 64-byte-aligned. Apparently
> the data copy has a by-product of aligning the buffers.
>
> I tried using skb_reserve(skb,64) in pch_gbe_alloc_tx_buffers and
> pch-gbe_alloc_rx_buffers, but that didn't seem to resolve it.
>
> How can I make sure that the transmit data buffers are
> 64-byte-aligned?
>
There is no support for such requirement in linux stacks.
Only solution for the driver is to copy all frames to 64-byte-aligned
bounce buffers.
^ permalink raw reply
* [BUG] af_packet: loop at reception when using fanout
From: Eric Leblond @ 2012-08-06 14:21 UTC (permalink / raw)
To: netdev, David Miller
[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]
Hello,
When using fanout mode on a AF_PACKET socket, the packet sent via one of
the fanout socket are sent back to one of the socket in the fanout set.
I've read the code and the error seems to be in dev.c.
The code check if skb->sk is not equal to ptype->af_packet_priv but in
the fanout case, we should check that skb->sk is not in the sockets of
the fanout set.
Here's how could look a possible implementation of the fix:
diff --git a/net/core/dev.c b/net/core/dev.c
index 1cb0d8a..63d144f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1654,7 +1654,12 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
*/
if ((ptype->dev == dev || !ptype->dev) &&
(ptype->af_packet_priv == NULL ||
- (struct sock *)ptype->af_packet_priv != skb->sk)) {
+ (((struct sock *)ptype->af_packet_priv != skb->sk)
+ &&
+ /* MISSING CHECK: af_packet_priv skb->sk one of the socket in fanout id of skb */
+ ! packet_sk_in_fanout(ptype, skb->sk)
+ )
+ ) {
if (pt_prev) {
deliver_skb(skb2, pt_prev, skb->dev);
pt_prev = ptype;
If this is done, we will have to export one function from the af_packet
module and I don't like the idea. If it is correct way to do it I can
implement this and propose a patch.
BR,
--
Eric Leblond
Blog: http://home.regit.org/ - Portfolio: http://regit.500px.com/
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related
* [PATCH 8/8] bridge: use list_for_each_entry() in netpoll functions
From: Cong Wang @ 2012-08-06 14:23 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, Stephen Hemminger
In-Reply-To: <1344263012-4031-1-git-send-email-amwang@redhat.com>
We don't delete 'p' from the list in the loop,
so we can just use list_for_each_entry().
Cc: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
net/bridge/br_device.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index f41ba40..32211fa 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -206,21 +206,20 @@ static void br_poll_controller(struct net_device *br_dev)
static void br_netpoll_cleanup(struct net_device *dev)
{
struct net_bridge *br = netdev_priv(dev);
- struct net_bridge_port *p, *n;
+ struct net_bridge_port *p;
- list_for_each_entry_safe(p, n, &br->port_list, list) {
+ list_for_each_entry(p, &br->port_list, list)
br_netpoll_disable(p);
- }
}
static int br_netpoll_setup(struct net_device *dev, struct netpoll_info *ni,
gfp_t gfp)
{
struct net_bridge *br = netdev_priv(dev);
- struct net_bridge_port *p, *n;
+ struct net_bridge_port *p;
int err = 0;
- list_for_each_entry_safe(p, n, &br->port_list, list) {
+ list_for_each_entry(p, &br->port_list, list) {
if (!p->dev)
continue;
err = br_netpoll_enable(p, gfp);
--
1.7.7.6
^ permalink raw reply related
* [PATCH 5/8] netpoll: use netpoll_rx_on() in netpoll_rx()
From: Cong Wang @ 2012-08-06 14:23 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, David S. Miller
In-Reply-To: <1344263012-4031-1-git-send-email-amwang@redhat.com>
The logic of the code is same, just call netpoll_rx_on().
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
include/linux/netpoll.h | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 5d881c3..2d178ba 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -63,6 +63,13 @@ static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
#ifdef CONFIG_NETPOLL
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+ struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
+
+ return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags);
+}
+
static inline bool netpoll_rx(struct sk_buff *skb)
{
struct netpoll_info *npinfo;
@@ -70,11 +77,11 @@ static inline bool netpoll_rx(struct sk_buff *skb)
bool ret = false;
local_irq_save(flags);
- npinfo = rcu_dereference_bh(skb->dev->npinfo);
- if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags))
+ if (!netpoll_rx_on(skb))
goto out;
+ npinfo = rcu_dereference_bh(skb->dev->npinfo);
spin_lock(&npinfo->rx_lock);
/* check rx_flags again with the lock held */
if (npinfo->rx_flags && __netpoll_rx(skb, npinfo))
@@ -86,13 +93,6 @@ out:
return ret;
}
-static inline int netpoll_rx_on(struct sk_buff *skb)
-{
- struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
-
- return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags);
-}
-
static inline int netpoll_receive_skb(struct sk_buff *skb)
{
if (!list_empty(&skb->dev->napi_list))
--
1.7.7.6
^ permalink raw reply related
* [PATCH 6/8] netpoll: take rcu_read_lock_bh() in netpoll_send_skb_on_dev()
From: Cong Wang @ 2012-08-06 14:23 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, David S. Miller
In-Reply-To: <1344263012-4031-1-git-send-email-amwang@redhat.com>
This patch fixes several problems in the call path of
netpoll_send_skb_on_dev():
1. We already disable IRQ's before calling netpoll_send_skb_on_dev(),
so we don't need to disable IRQ's again.
2. All the callees of netpoll_send_skb_on_dev() should use
rcu_dereference_bh() to dereference ->npinfo.
3. Rename arp_reply() to netpoll_arp_reply(), the former is too generic.
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
net/core/netpoll.c | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index d055bb0..174346a 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -54,7 +54,7 @@ static atomic_t trapped;
MAX_UDP_CHUNK)
static void zap_completion_queue(void);
-static void arp_reply(struct sk_buff *skb);
+static void netpoll_arp_reply(struct sk_buff *skb, struct netpoll_info *npinfo);
static unsigned int carrier_timeout = 4;
module_param(carrier_timeout, uint, 0644);
@@ -170,7 +170,8 @@ static void poll_napi(struct net_device *dev)
list_for_each_entry(napi, &dev->napi_list, dev_list) {
if (napi->poll_owner != smp_processor_id() &&
spin_trylock(&napi->poll_lock)) {
- budget = poll_one_napi(dev->npinfo, napi, budget);
+ budget = poll_one_napi(rcu_dereference_bh(dev->npinfo),
+ napi, budget);
spin_unlock(&napi->poll_lock);
if (!budget)
@@ -185,13 +186,14 @@ static void service_arp_queue(struct netpoll_info *npi)
struct sk_buff *skb;
while ((skb = skb_dequeue(&npi->arp_tx)))
- arp_reply(skb);
+ netpoll_arp_reply(skb, npi);
}
}
static void netpoll_poll_dev(struct net_device *dev)
{
const struct net_device_ops *ops;
+ struct netpoll_info *ni = rcu_dereference_bh(dev->npinfo);
if (!dev || !netif_running(dev))
return;
@@ -206,17 +208,18 @@ static void netpoll_poll_dev(struct net_device *dev)
poll_napi(dev);
if (dev->flags & IFF_SLAVE) {
- if (dev->npinfo) {
+ if (ni) {
struct net_device *bond_dev = dev->master;
struct sk_buff *skb;
- while ((skb = skb_dequeue(&dev->npinfo->arp_tx))) {
+ struct netpoll_info *bond_ni = rcu_dereference_bh(bond_dev->npinfo);
+ while ((skb = skb_dequeue(&ni->arp_tx))) {
skb->dev = bond_dev;
- skb_queue_tail(&bond_dev->npinfo->arp_tx, skb);
+ skb_queue_tail(&bond_ni->arp_tx, skb);
}
}
}
- service_arp_queue(dev->npinfo);
+ service_arp_queue(ni);
zap_completion_queue();
}
@@ -302,6 +305,7 @@ static int netpoll_owner_active(struct net_device *dev)
return 0;
}
+/* call with IRQ disabled */
void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
struct net_device *dev)
{
@@ -309,8 +313,11 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
unsigned long tries;
const struct net_device_ops *ops = dev->netdev_ops;
/* It is up to the caller to keep npinfo alive. */
- struct netpoll_info *npinfo = np->dev->npinfo;
+ struct netpoll_info *npinfo;
+
+ WARN_ON_ONCE(!irqs_disabled());
+ npinfo = rcu_dereference_bh(np->dev->npinfo);
if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {
__kfree_skb(skb);
return;
@@ -319,11 +326,9 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
/* don't get messages out of order, and no recursion */
if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) {
struct netdev_queue *txq;
- unsigned long flags;
txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
- local_irq_save(flags);
/* try until next clock tick */
for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
tries > 0; --tries) {
@@ -347,10 +352,9 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
}
WARN_ONCE(!irqs_disabled(),
- "netpoll_send_skb(): %s enabled interrupts in poll (%pF)\n",
+ "netpoll_send_skb_on_dev(): %s enabled interrupts in poll (%pF)\n",
dev->name, ops->ndo_start_xmit);
- local_irq_restore(flags);
}
if (status != NETDEV_TX_OK) {
@@ -423,9 +427,8 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
}
EXPORT_SYMBOL(netpoll_send_udp);
-static void arp_reply(struct sk_buff *skb)
+static void netpoll_arp_reply(struct sk_buff *skb, struct netpoll_info *npinfo)
{
- struct netpoll_info *npinfo = skb->dev->npinfo;
struct arphdr *arp;
unsigned char *arp_ptr;
int size, type = ARPOP_REPLY, ptype = ETH_P_ARP;
--
1.7.7.6
^ permalink raw reply related
* [PATCH 7/8] bridge: add some comments for NETDEV_RELEASE
From: Cong Wang @ 2012-08-06 14:23 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, Stephen Hemminger
In-Reply-To: <1344263012-4031-1-git-send-email-amwang@redhat.com>
Add comments on why we don't notify NETDEV_RELEASE.
Cc: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
net/bridge/br_if.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 171fd6b..910f4aa 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -427,6 +427,10 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
if (!p || p->br != br)
return -EINVAL;
+ /*
+ * We don't notify NETDEV_RELEASE event, as this will
+ * stop netconsole on the bridge.
+ */
del_nbp(p);
spin_lock_bh(&br->lock);
--
1.7.7.6
^ permalink raw reply related
* [PATCH 4/8] netpoll: take rcu_read_lock_bh() in netpoll_rx()
From: Cong Wang @ 2012-08-06 14:23 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, David S. Miller
In-Reply-To: <1344263012-4031-1-git-send-email-amwang@redhat.com>
In __netpoll_rx(), it dereferences ->npinfo without rcu_dereference_bh(),
this patch fixes it by using the 'npinfo' passed from netpoll_rx()
where it is already dereferenced with rcu_dereference_bh().
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
include/linux/netpoll.h | 4 ++--
net/core/netpoll.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 907812e..5d881c3 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -52,7 +52,7 @@ void netpoll_set_trap(int trap);
void __netpoll_cleanup(struct netpoll *np);
void __netpoll_free_rcu(struct netpoll *np);
void netpoll_cleanup(struct netpoll *np);
-int __netpoll_rx(struct sk_buff *skb);
+int __netpoll_rx(struct sk_buff *skb, struct netpoll_info *npinfo);
void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
struct net_device *dev);
static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
@@ -77,7 +77,7 @@ static inline bool netpoll_rx(struct sk_buff *skb)
spin_lock(&npinfo->rx_lock);
/* check rx_flags again with the lock held */
- if (npinfo->rx_flags && __netpoll_rx(skb))
+ if (npinfo->rx_flags && __netpoll_rx(skb, npinfo))
ret = true;
spin_unlock(&npinfo->rx_lock);
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index dc17f1d..d055bb0 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -543,13 +543,12 @@ static void arp_reply(struct sk_buff *skb)
spin_unlock_irqrestore(&npinfo->rx_lock, flags);
}
-int __netpoll_rx(struct sk_buff *skb)
+int __netpoll_rx(struct sk_buff *skb, struct netpoll_info *npinfo)
{
int proto, len, ulen;
int hits = 0;
const struct iphdr *iph;
struct udphdr *uh;
- struct netpoll_info *npinfo = skb->dev->npinfo;
struct netpoll *np, *tmp;
if (list_empty(&npinfo->rx_np))
--
1.7.7.6
^ permalink raw reply related
* [PATCH 3/8] netconsole: do not release spin_lock when calling __netpoll_cleanup
From: Cong Wang @ 2012-08-06 14:23 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, David S. Miller
In-Reply-To: <1344263012-4031-1-git-send-email-amwang@redhat.com>
With the previous patch applied, __netpoll_cleanup() is non-block now,
so we don't need to release the spin_lock before calling it.
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
drivers/net/netconsole.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index f9347ea..f0ad56c 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -640,12 +640,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
* rtnl_lock already held
*/
if (nt->np.dev) {
- spin_unlock_irqrestore(
- &target_list_lock,
- flags);
__netpoll_cleanup(&nt->np);
- spin_lock_irqsave(&target_list_lock,
- flags);
dev_put(nt->np.dev);
nt->np.dev = NULL;
netconsole_target_put(nt);
--
1.7.7.6
^ 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