* Re: [PATCH 11/11] netlink: add documentation for memory mapped I/O
From: Jan Engelhardt @ 2012-08-20 10:32 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Florian.Westphal, netdev, netfilter-devel
In-Reply-To: <1345443532-3707-12-git-send-email-kaber@trash.net>
On Monday 2012-08-20 08:18, Patrick McHardy wrote:
>+
>+RX and TX rings
>+----------------
>+
>+Each ring contains a number of continous memory blocks, containing frames of
>+fixed size dependant on the parameters used for ring setup.
dependent
>+The blocks are only visible to the kernel, from the point of view of user-space
>+the ring just contains the frames in a continous memory zone.
...to the kernel; from the user-space point of view, the ring...
continuous (multiple occurrences)
>+Ring frames
>+------------
>+
>+Each frames contain a frame header, consisting of a synchronization word and some
Each frame contains a frame header,
>+The possible values in the status word are:
>+
>+- NL_MMAP_STATUS_UNUSED:
>+ RX ring: frame belongs to the kernel and contains no message
The frame (mult)
>+ for user-space. Approriate action is to invoke poll()
>+ to wait for new messages.
The appropriate (mult)
>+ if (hdr->nm_status == NL_MMAP_STATUS_VALID)
>+ /* Regular memory mapped frame */
>+ nlh = (void *hdr) + NL_MMAP_HDRLEN;
(void *)hdr + NL_MMAP_HDRLEN
^ permalink raw reply
* [PATCH] tcp: fix possible socket refcount problem
From: Eric Dumazet @ 2012-08-20 10:22 UTC (permalink / raw)
To: Fengguang Wu; +Cc: David Miller, networking
In-Reply-To: <1345380682.5158.201.camel@edumazet-glaptop>
From: Eric Dumazet <edumazet@google.com>
Commit 6f458dfb40 (tcp: improve latencies of timer triggered events)
added bug leading to following trace :
[ 2866.131281] IPv4: Attempt to release TCP socket in state 1 ffff880019ec0000
[ 2866.131726]
[ 2866.132188] =========================
[ 2866.132281] [ BUG: held lock freed! ]
[ 2866.132281] 3.6.0-rc1+ #622 Not tainted
[ 2866.132281] -------------------------
[ 2866.132281] kworker/0:1/652 is freeing memory ffff880019ec0000-ffff880019ec0a1f, with a lock still held there!
[ 2866.132281] (sk_lock-AF_INET-RPC){+.+...}, at: [<ffffffff81903619>] tcp_sendmsg+0x29/0xcc6
[ 2866.132281] 4 locks held by kworker/0:1/652:
[ 2866.132281] #0: (rpciod){.+.+.+}, at: [<ffffffff81083567>] process_one_work+0x1de/0x47f
[ 2866.132281] #1: ((&task->u.tk_work)){+.+.+.}, at: [<ffffffff81083567>] process_one_work+0x1de/0x47f
[ 2866.132281] #2: (sk_lock-AF_INET-RPC){+.+...}, at: [<ffffffff81903619>] tcp_sendmsg+0x29/0xcc6
[ 2866.132281] #3: (&icsk->icsk_retransmit_timer){+.-...}, at: [<ffffffff81078017>] run_timer_softirq+0x1ad/0x35f
[ 2866.132281]
[ 2866.132281] stack backtrace:
[ 2866.132281] Pid: 652, comm: kworker/0:1 Not tainted 3.6.0-rc1+ #622
[ 2866.132281] Call Trace:
[ 2866.132281] <IRQ> [<ffffffff810bc527>] debug_check_no_locks_freed+0x112/0x159
[ 2866.132281] [<ffffffff818a0839>] ? __sk_free+0xfd/0x114
[ 2866.132281] [<ffffffff811549fa>] kmem_cache_free+0x6b/0x13a
[ 2866.132281] [<ffffffff818a0839>] __sk_free+0xfd/0x114
[ 2866.132281] [<ffffffff818a08c0>] sk_free+0x1c/0x1e
[ 2866.132281] [<ffffffff81911e1c>] tcp_write_timer+0x51/0x56
[ 2866.132281] [<ffffffff81078082>] run_timer_softirq+0x218/0x35f
[ 2866.132281] [<ffffffff81078017>] ? run_timer_softirq+0x1ad/0x35f
[ 2866.132281] [<ffffffff810f5831>] ? rb_commit+0x58/0x85
[ 2866.132281] [<ffffffff81911dcb>] ? tcp_write_timer_handler+0x148/0x148
[ 2866.132281] [<ffffffff81070bd6>] __do_softirq+0xcb/0x1f9
[ 2866.132281] [<ffffffff81a0a00c>] ? _raw_spin_unlock+0x29/0x2e
[ 2866.132281] [<ffffffff81a1227c>] call_softirq+0x1c/0x30
[ 2866.132281] [<ffffffff81039f38>] do_softirq+0x4a/0xa6
[ 2866.132281] [<ffffffff81070f2b>] irq_exit+0x51/0xad
[ 2866.132281] [<ffffffff81a129cd>] do_IRQ+0x9d/0xb4
[ 2866.132281] [<ffffffff81a0a3ef>] common_interrupt+0x6f/0x6f
[ 2866.132281] <EOI> [<ffffffff8109d006>] ? sched_clock_cpu+0x58/0xd1
[ 2866.132281] [<ffffffff81a0a172>] ? _raw_spin_unlock_irqrestore+0x4c/0x56
[ 2866.132281] [<ffffffff81078692>] mod_timer+0x178/0x1a9
[ 2866.132281] [<ffffffff818a00aa>] sk_reset_timer+0x19/0x26
[ 2866.132281] [<ffffffff8190b2cc>] tcp_rearm_rto+0x99/0xa4
[ 2866.132281] [<ffffffff8190dfba>] tcp_event_new_data_sent+0x6e/0x70
[ 2866.132281] [<ffffffff8190f7ea>] tcp_write_xmit+0x7de/0x8e4
[ 2866.132281] [<ffffffff818a565d>] ? __alloc_skb+0xa0/0x1a1
[ 2866.132281] [<ffffffff8190f952>] __tcp_push_pending_frames+0x2e/0x8a
[ 2866.132281] [<ffffffff81904122>] tcp_sendmsg+0xb32/0xcc6
[ 2866.132281] [<ffffffff819229c2>] inet_sendmsg+0xaa/0xd5
[ 2866.132281] [<ffffffff81922918>] ? inet_autobind+0x5f/0x5f
[ 2866.132281] [<ffffffff810ee7f1>] ? trace_clock_local+0x9/0xb
[ 2866.132281] [<ffffffff8189adab>] sock_sendmsg+0xa3/0xc4
[ 2866.132281] [<ffffffff810f5de6>] ? rb_reserve_next_event+0x26f/0x2d5
[ 2866.132281] [<ffffffff8103e6a9>] ? native_sched_clock+0x29/0x6f
[ 2866.132281] [<ffffffff8103e6f8>] ? sched_clock+0x9/0xd
[ 2866.132281] [<ffffffff810ee7f1>] ? trace_clock_local+0x9/0xb
[ 2866.132281] [<ffffffff8189ae03>] kernel_sendmsg+0x37/0x43
[ 2866.132281] [<ffffffff8199ce49>] xs_send_kvec+0x77/0x80
[ 2866.132281] [<ffffffff8199cec1>] xs_sendpages+0x6f/0x1a0
[ 2866.132281] [<ffffffff8107826d>] ? try_to_del_timer_sync+0x55/0x61
[ 2866.132281] [<ffffffff8199d0d2>] xs_tcp_send_request+0x55/0xf1
[ 2866.132281] [<ffffffff8199bb90>] xprt_transmit+0x89/0x1db
[ 2866.132281] [<ffffffff81999bcd>] ? call_connect+0x3c/0x3c
[ 2866.132281] [<ffffffff81999d92>] call_transmit+0x1c5/0x20e
[ 2866.132281] [<ffffffff819a0d55>] __rpc_execute+0x6f/0x225
[ 2866.132281] [<ffffffff81999bcd>] ? call_connect+0x3c/0x3c
[ 2866.132281] [<ffffffff819a0f33>] rpc_async_schedule+0x28/0x34
[ 2866.132281] [<ffffffff810835d6>] process_one_work+0x24d/0x47f
[ 2866.132281] [<ffffffff81083567>] ? process_one_work+0x1de/0x47f
[ 2866.132281] [<ffffffff819a0f0b>] ? __rpc_execute+0x225/0x225
[ 2866.132281] [<ffffffff81083a6d>] worker_thread+0x236/0x317
[ 2866.132281] [<ffffffff81083837>] ? process_scheduled_works+0x2f/0x2f
[ 2866.132281] [<ffffffff8108b7b8>] kthread+0x9a/0xa2
[ 2866.132281] [<ffffffff81a12184>] kernel_thread_helper+0x4/0x10
[ 2866.132281] [<ffffffff81a0a4b0>] ? retint_restore_args+0x13/0x13
[ 2866.132281] [<ffffffff8108b71e>] ? __init_kthread_worker+0x5a/0x5a
[ 2866.132281] [<ffffffff81a12180>] ? gs_change+0x13/0x13
[ 2866.308506] IPv4: Attempt to release TCP socket in state 1 ffff880019ec0000
[ 2866.309689] =============================================================================
[ 2866.310254] BUG TCP (Not tainted): Object already free
[ 2866.310254] -----------------------------------------------------------------------------
[ 2866.310254]
The bug comes from the fact that timer set in sk_reset_timer() can run
before we actually do the sock_hold(). socket refcount reaches zero and
we free the socket too soon.
timer handler is not allowed to reduce socket refcnt if socket is owned
by the user, or we need to change sk_reset_timer() implementation.
We should take a reference on the socket in case TCP_DELACK_TIMER_DEFERRED
or TCP_DELACK_TIMER_DEFERRED bit are set in tsq_flags
Also fix a typo in tcp_delack_timer(), where TCP_WRITE_TIMER_DEFERRED
was used instead of TCP_DELACK_TIMER_DEFERRED.
For consistency, use same socket refcount change for TCP_MTU_REDUCED_DEFERRED,
even if not fired from a timer.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Tested-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
net/ipv4/tcp_ipv4.c | 8 +++++---
net/ipv4/tcp_output.c | 14 +++++++++-----
net/ipv4/tcp_timer.c | 6 ++++--
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 7678237..6278a11 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -417,10 +417,12 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
if (code == ICMP_FRAG_NEEDED) { /* PMTU discovery (RFC1191) */
tp->mtu_info = info;
- if (!sock_owned_by_user(sk))
+ if (!sock_owned_by_user(sk)) {
tcp_v4_mtu_reduced(sk);
- else
- set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags);
+ } else {
+ if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED, &tp->tsq_flags))
+ sock_hold(sk);
+ }
goto out;
}
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 20dfd89..d046326 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -910,14 +910,18 @@ void tcp_release_cb(struct sock *sk)
if (flags & (1UL << TCP_TSQ_DEFERRED))
tcp_tsq_handler(sk);
- if (flags & (1UL << TCP_WRITE_TIMER_DEFERRED))
+ if (flags & (1UL << TCP_WRITE_TIMER_DEFERRED)) {
tcp_write_timer_handler(sk);
-
- if (flags & (1UL << TCP_DELACK_TIMER_DEFERRED))
+ __sock_put(sk);
+ }
+ if (flags & (1UL << TCP_DELACK_TIMER_DEFERRED)) {
tcp_delack_timer_handler(sk);
-
- if (flags & (1UL << TCP_MTU_REDUCED_DEFERRED))
+ __sock_put(sk);
+ }
+ if (flags & (1UL << TCP_MTU_REDUCED_DEFERRED)) {
sk->sk_prot->mtu_reduced(sk);
+ __sock_put(sk);
+ }
}
EXPORT_SYMBOL(tcp_release_cb);
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 6df36ad..b774a03 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -252,7 +252,8 @@ static void tcp_delack_timer(unsigned long data)
inet_csk(sk)->icsk_ack.blocked = 1;
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED);
/* deleguate our work to tcp_release_cb() */
- set_bit(TCP_WRITE_TIMER_DEFERRED, &tcp_sk(sk)->tsq_flags);
+ if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED, &tcp_sk(sk)->tsq_flags))
+ sock_hold(sk);
}
bh_unlock_sock(sk);
sock_put(sk);
@@ -481,7 +482,8 @@ static void tcp_write_timer(unsigned long data)
tcp_write_timer_handler(sk);
} else {
/* deleguate our work to tcp_release_cb() */
- set_bit(TCP_WRITE_TIMER_DEFERRED, &tcp_sk(sk)->tsq_flags);
+ if (!test_and_set_bit(TCP_WRITE_TIMER_DEFERRED, &tcp_sk(sk)->tsq_flags))
+ sock_hold(sk);
}
bh_unlock_sock(sk);
sock_put(sk);
^ permalink raw reply related
* Re: [RFC PATCH 0/5] net: socket bind to file descriptor introduced
From: Stanislav Kinsbursky @ 2012-08-20 10:18 UTC (permalink / raw)
To: Eric W. Biederman
Cc: tglx@linutronix.de, mingo@redhat.com, davem@davemloft.net,
hpa@zytor.com, thierry.reding@avionic-design.de,
bfields@redhat.com, eric.dumazet@gmail.com, Pavel Emelianov,
neilb@suse.de, netdev@vger.kernel.org, x86@kernel.org,
linux-kernel@vger.kernel.org, paul.gortmaker@windriver.com,
viro@zeniv.linux.org.uk, gorcunov@openvz.org,
akpm@linux-foundation.org, tim.c.chen@linux.intel.com,
devel@openvz.org
In-Reply-To: <87y5lf7d37.fsf@xmission.com>
16.08.2012 07:03, Eric W. Biederman пишет:
> Stanislav Kinsbursky <skinsbursky@parallels.com> writes:
>
>> This patch set introduces new socket operation and new system call:
>> sys_fbind(), which allows to bind socket to opened file.
>> File to bind to can be created by sys_mknod(S_IFSOCK) and opened by
>> open(O_PATH).
>>
>> This system call is especially required for UNIX sockets, which has name
>> lenght limitation.
>>
>> The following series implements...
>
> Hmm. I just realized this patchset is even sillier than I thought.
>
> Stanislav is the problem you are ultimately trying to solve nfs clients
> in a container connecting to the wrong user space rpciod?
>
Hi, Eric.
The problem you mentioned was the reason why I started to think about this.
But currently I believe, that limitations in unix sockets connect or bind should
be removed, because it will be useful it least for CRIU project.
> Aka net/sunrpc/xprtsock.c:xs_setup_local only taking an absolute path
> and then creating a delayed work item to actually open the unix domain
> socket?
>
> The straight correct and straight forward thing to do appears to be:
> - Capture the root from current->fs in xs_setup_local.
> - In xs_local_finish_connect change current->fs.root to the captured
> version of root before kernel_connect, and restore current->fs.root
> after kernel_connect.
>
> It might not be a bad idea to implement open on unix domain sockets in
> a filesystem as create(AF_LOCAL)+connect() which would allow you to
> replace __sock_create + kernel_connect with a simple file_open_root.
>
I like the idea of introducing new family (AF_LOCAL_AT for example) and new
sockaddr for connecting or binding from specified root. The only thing I'm
worrying is passing file descriptor to unix bind or connect routine. Because
this approach doesn't provide easy way to use such family and sockaddr in kernel
(like in NFS example).
> But I think the simple scheme of:
> struct path old_root;
> old_root = current->fs.root;
> kernel_connect(...);
> current->fs.root = old_root;
>
> Is more than sufficient and will remove the need for anything
> except a purely local change to get nfs clients to connect from
> containers.
>
That was my first idea. And probably it would be worth to change all fs_struct
to support sockets with relative path.
What do you think about it?
> Eric
>
--
Best regards,
Stanislav Kinsbursky
^ permalink raw reply
* Re: [PATCH net v2] net: tcp: move sk_rx_dst_set call after tcp_create_openreq_child()
From: David Miller @ 2012-08-20 10:04 UTC (permalink / raw)
To: eric.dumazet; +Cc: ncardwell, netdev, edumazet
In-Reply-To: <1345383675.5158.202.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 19 Aug 2012 15:41:15 +0200
> On Sun, 2012-08-19 at 09:30 -0400, Neal Cardwell wrote:
>> This commit removes the sk_rx_dst_set calls from
>> tcp_create_openreq_child(), because at that point the icsk_af_ops
>> field of ipv6_mapped TCP sockets has not been set to its proper final
>> value.
>>
>> Instead, to make sure we get the right sk_rx_dst_set variant
>> appropriate for the address family of the new connection, we have
>> tcp_v{4,6}_syn_recv_sock() directly call the appropriate function
>> shortly after the call to tcp_create_openreq_child() returns.
>>
>> This also moves inet6_sk_rx_dst_set() to avoid a forward declaration
>> with the new approach.
>>
>> Signed-off-by: Neal Cardwell <ncardwell@google.com>
>> Reported-by: Artem Savkov <artem.savkov@gmail.com>
>> Cc: Eric Dumazet <edumazet@google.com>
>> ---
>> net/ipv4/tcp_ipv4.c | 1 +
>> net/ipv4/tcp_minisocks.c | 2 --
>> net/ipv6/tcp_ipv6.c | 25 +++++++++++++------------
>> 3 files changed, 14 insertions(+), 14 deletions(-)
>
> Thanks Neal !
>
> Acked-by: Eric Dumazet <edumazet@google.com>
Applied, thanks everyone.
^ permalink raw reply
* Re: [PATCH] net/core/dev.c: fix kernel-doc warning
From: David Miller @ 2012-08-20 10:01 UTC (permalink / raw)
To: rdunlap; +Cc: netdev
In-Reply-To: <5030351C.8080000@xenotime.net>
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sat, 18 Aug 2012 17:36:44 -0700
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix kernel-doc warning:
>
> Warning(net/core/dev.c:5745): No description found for parameter 'dev'
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Applied, thanks.
^ permalink raw reply
* Re: [Patch] netconsole: remove a redundant netconsole_target_put()
From: David Miller @ 2012-08-20 10:00 UTC (permalink / raw)
To: amwang; +Cc: netdev, stable
In-Reply-To: <1345309340-15499-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Sun, 19 Aug 2012 01:02:20 +0800
> This netconsole_target_put() is obviously redundant, and it
> causes a kernel segfault when removing a bridge device which has
> netconsole running on it.
>
> This is caused by:
>
> commit 8d8fc29d02a33e4bd5f4fa47823c1fd386346093
> Author: Amerigo Wang <amwang@redhat.com>
> Date: Thu May 19 21:39:10 2011 +0000
>
> netpoll: disable netpoll when enslave a device
>
> Cc: David Miller <davem@davemloft.net>
> (for all 3.x stable releases)
> Cc: stable@vger.kernel.org
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH]: net: ipv6: fix oops in inet_putpeer()
From: David Miller @ 2012-08-20 9:58 UTC (permalink / raw)
To: kaber; +Cc: netdev
In-Reply-To: <Pine.GSO.4.63.1208181729020.7404@stinky-local.trash.net>
From: Patrick McHardy <kaber@trash.net>
Date: Sat, 18 Aug 2012 17:32:31 +0200 (MEST)
> The attached patch fixes an oops in inet_putpeer(). Please see the
> changelog entry for details.
>
> An alternative fix would be to check whether rt6_peer_ptr() returns
> NULL before invoking inet_putpeer(), but properly initializing the
> peer looks cleaner to me.
This is fine for now, applied, thanks Patrick.
There was a built-in assumption that xfrm_fill_dst() would run to
completion before we'd try to release these things, because there in
xfrm6_policy.c's xfrm6_fill_dst, we'd do the rt6_transfer_peer().
But that's obviously not the case if errors happen meanwhile.
^ permalink raw reply
* Re: [PATCH] net/stmmac: fix issue of clk_get for Loongson1B.
From: David Miller @ 2012-08-20 9:52 UTC (permalink / raw)
To: keguang.zhang; +Cc: netdev, linux-kernel, peppe.cavallaro
In-Reply-To: <1345284983-12610-1-git-send-email-keguang.zhang@gmail.com>
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Sat, 18 Aug 2012 18:16:23 +0800
> When getting clock, give a chance to the CPUs without DT support,
> which use Common Clock Framework, such as Loongson1B.
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] ipv4: Use netinet->inet_opt in inet_csk_route_child_sock()
From: David Miller @ 2012-08-20 9:51 UTC (permalink / raw)
To: christoph.paasch; +Cc: netdev
In-Reply-To: <1345239312-19266-1-git-send-email-christoph.paasch@uclouvain.be>
From: Christoph Paasch <christoph.paasch@uclouvain.be>
Date: Fri, 17 Aug 2012 23:35:12 +0200
> @@ -404,7 +404,7 @@ struct dst_entry *inet_csk_route_child_sock(struct sock *sk,
> {
> const struct inet_request_sock *ireq = inet_rsk(req);
> struct inet_sock *newinet = inet_sk(newsk);
> - struct ip_options_rcu *opt = ireq->opt;
> + struct ip_options_rcu *opt = rcu_dereference(newinet->inet_opt);
> struct net *net = sock_net(sk);
We're not inside of a rcu_read_lock() protected section, so this access
is not legitimate. If you enabled RCU lock debugging, you would have
triggered a warning in the kernel log.
^ permalink raw reply
* Re: [PATCH] caif: Do not dereference NULL in chnl_recv_cb()
From: David Miller @ 2012-08-20 9:48 UTC (permalink / raw)
To: sjur.brandeland; +Cc: jj, linux-kernel, netdev, daniel.martensson
In-Reply-To: <81C3A93C17462B4BBD7E272753C1057923B924D522@EXDCVYMBSTM005.EQ1STM.local>
From: Sjur BRENDELAND <sjur.brandeland@stericsson.com>
Date: Mon, 20 Aug 2012 08:33:35 +0200
>> In net/caif/chnl_net.c::chnl_recv_cb() we call skb_header_pointer()
>> which may return NULL, but we do not check for a NULL pointer before
>> dereferencing it.
>> This patch adds such a NULL check and properly free's allocated memory
>> and return an error (-EINVAL) on failure - much better than crashing..
>>
>> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
>
> Thank you for fixing this, the patch looks good to me.
> Acked-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH 0/5] netfilter fixes for 3.6-rc
From: David Miller @ 2012-08-20 9:45 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel, netdev
In-Reply-To: <1345212573-3076-1-git-send-email-pablo@netfilter.org>
From: pablo@netfilter.org
Date: Fri, 17 Aug 2012 16:09:28 +0200
> The following five patches contain fixes for 3.6-rc, they are:
>
> * Two fixes for message parsing in the SIP conntrack helper, from
> Patrick McHardy.
>
> * One fix for the SIP helper introduced in the user-space cthelper
> infrastructure, from Patrick McHardy.
>
> * fix missing appropriate locking while modifying one conntrack entry
> from the nfqueue integration code, from myself.
>
> * fix possible access to uninitiliazed timer in the nf_conntrack
> expectation infrastructure, from myself.
>
> You can pull these changes from:
>
> git://1984.lsi.us.es/nf
Pulled, thanks Pablo.
^ permalink raw reply
* Re: [patch net-next] team: add support for non-ethernet devices
From: David Miller @ 2012-08-20 9:42 UTC (permalink / raw)
To: jiri; +Cc: netdev
In-Reply-To: <1345212048-1378-1-git-send-email-jiri@resnulli.us>
From: Jiri Pirko <jiri@resnulli.us>
Date: Fri, 17 Aug 2012 16:00:48 +0200
> This is resolved by two things:
> 1) allow dev_addr of different length than ETH_ALEN
> 2) during port add, check for dev->type and change it if necessary
>
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Looks good, applied, thanks Jiri.
^ permalink raw reply
* Re: [PATCH v1.1] af_packet: don't emit packet on orig fanout group
From: David Miller @ 2012-08-20 9:37 UTC (permalink / raw)
To: eric; +Cc: netdev
In-Reply-To: <1345190578-28722-1-git-send-email-eric@regit.org>
From: Eric Leblond <eric@regit.org>
Date: Fri, 17 Aug 2012 10:02:58 +0200
> If a packet is emitted on one socket in one group of fanout sockets,
> it is transmitted again. It is thus read again on one of the sockets
> of the fanout group. This result in a loop for software which
> generate packets when receiving one.
> This retransmission is not the intended behavior: a fanout group
> must behave like a single socket. The packet should not be
> transmitted on a socket if it originates from a socket belonging
> to the same fanout group.
>
> This patch fixes the issue by changing the transmission check to
> take fanout group info account.
>
> Reported-by: Aleksandr Kotov <a1k@mail.ru>
> Signed-off-by: Eric Leblond <eric@regit.org>
Applied, thanks a lot Eric.
^ permalink raw reply
* Re: [PATCH 0/3] fix error return code
From: David Miller @ 2012-08-20 9:33 UTC (permalink / raw)
To: Julia.Lawall; +Cc: netdev, kernel-janitors, linux-kernel
In-Reply-To: <1345189618-13758-1-git-send-email-Julia.Lawall@lip6.fr>
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Fri, 17 Aug 2012 09:46:55 +0200
> These patches fix cases where the return code appears to be unintentially
> nonnegative.
All applied, thanks Julia.
^ permalink raw reply
* Re: [net-next 0/9][pull request] Intel Wired LAN Driver Updates
From: David Miller @ 2012-08-20 9:31 UTC (permalink / raw)
To: peter.p.waskiewicz.jr; +Cc: netdev, gospo, sassmann
In-Reply-To: <1345157318-23731-1-git-send-email-peter.p.waskiewicz.jr@intel.com>
From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Date: Thu, 16 Aug 2012 15:48:29 -0700
> This series contains multiple updates to the ixgbe driver.
>
> The following are changes since commit 02644a17457414f38e29f32d5c640b06d08fa092:
> sctp: fix bogus if statement in sctp_auth_recv_cid()
>
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next master
Pulled, thanks a lot PJ.
^ permalink raw reply
* Re: regression with poll(2)
From: Eric Dumazet @ 2012-08-20 9:30 UTC (permalink / raw)
To: Mel Gorman
Cc: Sage Weil, davem, netdev, linux-kernel, ceph-devel, neilb,
a.p.zijlstra, michaelc, emunson, sebastian, cl, akpm, torvalds
In-Reply-To: <20120820090443.GA3275@suse.de>
On Mon, 2012-08-20 at 10:04 +0100, Mel Gorman wrote:
> Can the following patch be tested please? It is reported to fix an fio
> regression that may be similar to what you are experiencing but has not
> been picked up yet.
>
> -
This seems to help here.
Boot your machine with "mem=768M" or a bit less depending on your setup,
and try a netperf.
-> before patch :
# netperf
MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to
localhost.localdomain () port 0 AF_INET
Recv Send Send
Socket Socket Message Elapsed
Size Size Size Time Throughput
bytes bytes bytes secs. 10^6bits/sec
87380 16384 16384 14.00 6.05
-> after patch :
Recv Send Send
Socket Socket Message Elapsed
Size Size Size Time Throughput
bytes bytes bytes secs. 10^6bits/sec
87380 16384 16384 10.00 18509.73
^ permalink raw reply
* Re: [RFC PATCH net-next 0/9] tipc: misc updates for 3.7
From: David Miller @ 2012-08-20 9:27 UTC (permalink / raw)
To: paul.gortmaker; +Cc: netdev, jon.maloy, ying.xue
In-Reply-To: <1345154954-12526-1-git-send-email-paul.gortmaker@windriver.com>
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 16 Aug 2012 18:09:05 -0400
> This series gets some more largely trivial things out of
> the way. Most interesting are:
>
> 1) fix lockdep splat from bearer init by pushing the setup
> off to schedule_work.
>
> 2) simplification of configuration by removal of a couple of
> tuning knobs which used to have low default values.
>
> The remainder are largely innocuous, I think. I did wonder
> if there was an alternate/better way to handle the splat though.
>
> I've done my own local testing of this series on today's net-next
> commit 2ea214929d601 ("Merge branch 'for-davem' ... wireless-next")
>
> I'll wait a couple of days to allow for any possible feedback and
> change requests, and then send a pull request after that.
All applied, thanks Paul.
It's less useful for you to build the GIT tree "later", at least for
me.
If the patches are good and there is no feedback asking for changes,
I want to be able to just pull them into my tree immediately as I
did here.
Thanks.
^ permalink raw reply
* Re: [PATCH 0/2] packet: Report fanout and rings via diag
From: David Miller @ 2012-08-20 9:23 UTC (permalink / raw)
To: xemul; +Cc: netdev
In-Reply-To: <502D125A.40701@parallels.com>
From: Pavel Emelyanov <xemul@parallels.com>
Date: Thu, 16 Aug 2012 19:31:38 +0400
> After this the packet diag module reports everything that can be
> configured on a packet socket via AF_PACKET-specific API.
>
> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Applied to net-next, thanks.
^ permalink raw reply
* Re: [patch] gre: information leak in ip6_tnl_ioctl()
From: David Miller @ 2012-08-20 9:21 UTC (permalink / raw)
To: dan.carpenter
Cc: xeb, kuznet, jmorris, yoshfuji, kaber, netdev, kernel-janitors
In-Reply-To: <20120816131404.GA23188@elgon.mountain>
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 16 Aug 2012 16:14:04 +0300
> There is a one byte hole between p->hop_limit and p->flowinfo where
> stack memory is leaked to the user. This was introduced in c12b395a46
> "gre: Support GRE over IPv6".
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks Dan.
^ permalink raw reply
* Re: [PATCH] smsc75xx: add missing entry to MAINTAINERS
From: David Miller @ 2012-08-20 9:20 UTC (permalink / raw)
To: steve.glendinning; +Cc: linux-kernel, netdev, trivial
In-Reply-To: <1345103618-22753-1-git-send-email-steve.glendinning@shawell.net>
From: Steve Glendinning <steve.glendinning@shawell.net>
Date: Thu, 16 Aug 2012 08:53:38 +0100
> Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
Applied.
^ permalink raw reply
* Re: [PATCH 001/001] smsc95xx: Fix hard_header_len
From: David Miller @ 2012-08-20 9:19 UTC (permalink / raw)
To: steve; +Cc: bhutchings, jimbob.betts, netdev
In-Reply-To: <CAKh2mn6fr8WjT-2h_A3zmKv3xs26AamXcpJgtK5wFPQ1BXuheg@mail.gmail.com>
From: Steve Glendinning <steve@shawell.net>
Date: Fri, 17 Aug 2012 09:35:04 +0100
>> hard_header_len is set to ETH_HLEN by alloc_etherdev() (in the
>> ether_setup() callback). Any extra headroom you want before the
>> Ethernet header should indeed be specified in needed_headroom.
>
> Thanks Ben, looks like this patch is doing it the right way then.
>
> Acked-By: Steve Glendinning <steve.glendinning@shawell.net>
This patch needs to be submitted with a proper signoff.
^ permalink raw reply
* Re: [PATCH net] net: qmi_wwan: new devices: UML290 and K5006-Z
From: David Miller @ 2012-08-20 9:17 UTC (permalink / raw)
To: bjorn-yOkvZcmFvRU
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA,
dcbw-H+wXaHxf7aLQT0dZR+AlfA, tschaefer-zqRNUXuvxA0b1SvskN2V4Q
In-Reply-To: <1345038177-29189-1-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org>
From: Bjørn Mork <bjorn-yOkvZcmFvRU@public.gmane.org>
Date: Wed, 15 Aug 2012 15:42:57 +0200
> Newer firmware versions for the Pantech UML290 use a different
> subclass ID. The Windows driver match on both IDs, so we do
> that as well.
>
> The ZTE (Vodafone) K5006-Z is a new device.
>
> Cc: Dan Williams <dcbw-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: Thomas Schäfer <tschaefer-zqRNUXuvxA0b1SvskN2V4Q@public.gmane.org>
> Signed-off-by: Bjørn Mork <bjorn-yOkvZcmFvRU@public.gmane.org>
Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] net: sh_eth: Add eth support for R8A7779 device
From: David Miller @ 2012-08-20 9:17 UTC (permalink / raw)
To: phil.edworthy
Cc: netdev, linux-sh, kuninori.morimoto.gx, yoshihiro.shimoda.uh
In-Reply-To: <1345012409-12915-1-git-send-email-phil.edworthy@renesas.com>
From: Phil Edworthy <phil.edworthy@renesas.com>
Date: Wed, 15 Aug 2012 07:33:29 +0100
> Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH 2/2] [v2] netdev/phy: skip disabled mdio-mux nodes
From: David Miller @ 2012-08-20 9:16 UTC (permalink / raw)
To: timur; +Cc: grant.likely, david.daney, netdev, devicetree-discuss
In-Reply-To: <1344986424-14360-2-git-send-email-timur@freescale.com>
From: Timur Tabi <timur@freescale.com>
Date: Tue, 14 Aug 2012 18:20:24 -0500
> The mdio-mux driver scans all child mdio nodes, without regard to whether
> the node is actually used. Some device trees include all possible
> mdio-mux nodes and rely on the boot loader to disable those that are not
> present, based on some run-time configuration. Those nodes need to be
> skipped.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] dt: introduce for_each_available_child_of_node, of_get_next_available_child
From: David Miller @ 2012-08-20 9:16 UTC (permalink / raw)
To: timur; +Cc: grant.likely, david.daney, netdev, devicetree-discuss
In-Reply-To: <1344986424-14360-1-git-send-email-timur@freescale.com>
From: Timur Tabi <timur@freescale.com>
Date: Tue, 14 Aug 2012 18:20:23 -0500
> Macro for_each_child_of_node() makes it easy to iterate over all of the
> children for a given device tree node, including those nodes that are
> marked as unavailable (i.e. status = "disabled").
>
> Introduce for_each_available_child_of_node(), which is like
> for_each_child_of_node(), but it automatically skips unavailable nodes.
> This also requires the introduction of helper function
> of_get_next_available_child(), which returns the next available child
> node.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
Applied.
^ 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