* Re: net/ipv6: use-after-free in sock_wfree
From: Andrey Konovalov @ 2017-01-09 19:06 UTC (permalink / raw)
To: Eric Dumazet
Cc: David S. Miller, Alexey Kuznetsov, James Morris,
Hideaki YOSHIFUJI, Patrick McHardy, netdev, LKML, Dmitry Vyukov,
Kostya Serebryany, syzkaller
In-Reply-To: <CANn89iLX+GPK6WWcz76T_z4_hMv4aNy8nREVqGKP-q+UqQNOxA@mail.gmail.com>
On Mon, Jan 9, 2017 at 6:21 PM, Eric Dumazet <edumazet@google.com> wrote:
> On Mon, Jan 9, 2017 at 9:11 AM, Andrey Konovalov <andreyknvl@google.com> wrote:
>> On Mon, Jan 9, 2017 at 6:08 PM, Andrey Konovalov <andreyknvl@google.com> wrote:
>>> Hi!
>>>
>>> I've got the following error report while running the syzkaller fuzzer.
>>>
>>> On commit a121103c922847ba5010819a3f250f1f7fc84ab8 (4.10-rc3).
>>>
>>> A reproducer is attached.
>>>
>>> ==================================================================
>>> BUG: KASAN: use-after-free in sock_wfree+0x118/0x120
>>> Read of size 8 at addr ffff880062da0060 by task a.out/4140
>>>
>>> page:ffffea00018b6800 count:1 mapcount:0 mapping: (null)
>>> index:0x0 compound_mapcount: 0
>>> flags: 0x100000000008100(slab|head)
>>> raw: 0100000000008100 0000000000000000 0000000000000000 0000000180130013
>>> raw: dead000000000100 dead000000000200 ffff88006741f140 0000000000000000
>>> page dumped because: kasan: bad access detected
>>>
>>> CPU: 0 PID: 4140 Comm: a.out Not tainted 4.10.0-rc3+ #59
>>> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
>>> Call Trace:
>>> __dump_stack lib/dump_stack.c:15
>>> dump_stack+0x292/0x398 lib/dump_stack.c:51
>>> describe_address mm/kasan/report.c:262
>>> kasan_report_error+0x121/0x560 mm/kasan/report.c:370
>>> kasan_report mm/kasan/report.c:392
>>> __asan_report_load8_noabort+0x3e/0x40 mm/kasan/report.c:413
>>> sock_flag ./arch/x86/include/asm/bitops.h:324
>>> sock_wfree+0x118/0x120 net/core/sock.c:1631
>>> skb_release_head_state+0xfc/0x250 net/core/skbuff.c:655
>>> skb_release_all+0x15/0x60 net/core/skbuff.c:668
>>> __kfree_skb+0x15/0x20 net/core/skbuff.c:684
>>> kfree_skb+0x16e/0x4e0 net/core/skbuff.c:705
>>> inet_frag_destroy+0x121/0x290 net/ipv4/inet_fragment.c:304
>>> inet_frag_put ./include/net/inet_frag.h:133
>>> nf_ct_frag6_gather+0x1125/0x38b0 net/ipv6/netfilter/nf_conntrack_reasm.c:617
>>> ipv6_defrag+0x21b/0x350 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c:68
>>> nf_hook_entry_hookfn ./include/linux/netfilter.h:102
>>> nf_hook_slow+0xc3/0x290 net/netfilter/core.c:310
>>> nf_hook ./include/linux/netfilter.h:212
>>> __ip6_local_out+0x52c/0xaf0 net/ipv6/output_core.c:160
>>> ip6_local_out+0x2d/0x170 net/ipv6/output_core.c:170
>>> ip6_send_skb+0xa1/0x340 net/ipv6/ip6_output.c:1722
>>> ip6_push_pending_frames+0xb3/0xe0 net/ipv6/ip6_output.c:1742
>>> rawv6_push_pending_frames net/ipv6/raw.c:613
>>> rawv6_sendmsg+0x2cff/0x4130 net/ipv6/raw.c:927
>>> inet_sendmsg+0x164/0x5b0 net/ipv4/af_inet.c:744
>>> sock_sendmsg_nosec net/socket.c:635
>>> sock_sendmsg+0xca/0x110 net/socket.c:645
>>> sock_write_iter+0x326/0x620 net/socket.c:848
>>> new_sync_write fs/read_write.c:499
>>> __vfs_write+0x483/0x760 fs/read_write.c:512
>>> vfs_write+0x187/0x530 fs/read_write.c:560
>>> SYSC_write fs/read_write.c:607
>>> SyS_write+0xfb/0x230 fs/read_write.c:599
>>> entry_SYSCALL_64_fastpath+0x1f/0xc2 arch/x86/entry/entry_64.S:203
>>> RIP: 0033:0x7ff26e6f5b79
>>> RSP: 002b:00007ff268e0ed98 EFLAGS: 00000206 ORIG_RAX: 0000000000000001
>>> RAX: ffffffffffffffda RBX: 00007ff268e0f9c0 RCX: 00007ff26e6f5b79
>>> RDX: 0000000000000010 RSI: 0000000020f50fe1 RDI: 0000000000000003
>>> RBP: 00007ff26ebc1220 R08: 0000000000000000 R09: 0000000000000000
>>> R10: 0000000000000000 R11: 0000000000000206 R12: 0000000000000000
>>> R13: 00007ff268e0f9c0 R14: 00007ff26efec040 R15: 0000000000000003
>>>
>>> The buggy address belongs to the object at ffff880062da0000
>>> which belongs to the cache RAWv6 of size 1504
>>> The buggy address ffff880062da0060 is located 96 bytes inside
>>> of 1504-byte region [ffff880062da0000, ffff880062da05e0)
>>>
>>> Freed by task 4113:
>>> save_stack_trace+0x16/0x20 arch/x86/kernel/stacktrace.c:57
>>> save_stack+0x43/0xd0 mm/kasan/kasan.c:502
>>> set_track mm/kasan/kasan.c:514
>>> kasan_slab_free+0x73/0xc0 mm/kasan/kasan.c:578
>>> slab_free_hook mm/slub.c:1352
>>> slab_free_freelist_hook mm/slub.c:1374
>>> slab_free mm/slub.c:2951
>>> kmem_cache_free+0xb2/0x2c0 mm/slub.c:2973
>>> sk_prot_free net/core/sock.c:1377
>>> __sk_destruct+0x49c/0x6e0 net/core/sock.c:1452
>>> sk_destruct+0x47/0x80 net/core/sock.c:1460
>>> __sk_free+0x57/0x230 net/core/sock.c:1468
>>> sk_free+0x23/0x30 net/core/sock.c:1479
>>> sock_put ./include/net/sock.h:1638
>>> sk_common_release+0x31e/0x4e0 net/core/sock.c:2782
>>> rawv6_close+0x54/0x80 net/ipv6/raw.c:1214
>>> inet_release+0xed/0x1c0 net/ipv4/af_inet.c:425
>>> inet6_release+0x50/0x70 net/ipv6/af_inet6.c:431
>>> sock_release+0x8d/0x1e0 net/socket.c:599
>>> sock_close+0x16/0x20 net/socket.c:1063
>>> __fput+0x332/0x7f0 fs/file_table.c:208
>>> ____fput+0x15/0x20 fs/file_table.c:244
>>> task_work_run+0x19b/0x270 kernel/task_work.c:116
>>> exit_task_work ./include/linux/task_work.h:21
>>> do_exit+0x186b/0x2800 kernel/exit.c:839
>>> do_group_exit+0x149/0x420 kernel/exit.c:943
>>> SYSC_exit_group kernel/exit.c:954
>>> SyS_exit_group+0x1d/0x20 kernel/exit.c:952
>>> entry_SYSCALL_64_fastpath+0x1f/0xc2 arch/x86/entry/entry_64.S:203
>>>
>>> Allocated by task 4115:
>>> save_stack_trace+0x16/0x20 arch/x86/kernel/stacktrace.c:57
>>> save_stack+0x43/0xd0 mm/kasan/kasan.c:502
>>> set_track mm/kasan/kasan.c:514
>>> kasan_kmalloc+0xad/0xe0 mm/kasan/kasan.c:605
>>> kasan_slab_alloc+0x12/0x20 mm/kasan/kasan.c:544
>>> slab_post_alloc_hook mm/slab.h:432
>>> slab_alloc_node mm/slub.c:2708
>>> slab_alloc mm/slub.c:2716
>>> kmem_cache_alloc+0x1af/0x250 mm/slub.c:2721
>>> sk_prot_alloc+0x65/0x2a0 net/core/sock.c:1334
>>> sk_alloc+0x105/0x1010 net/core/sock.c:1396
>>> inet6_create+0x44d/0x1150 net/ipv6/af_inet6.c:183
>>> __sock_create+0x4f6/0x880 net/socket.c:1199
>>> sock_create net/socket.c:1239
>>> SYSC_socket net/socket.c:1269
>>> SyS_socket+0xf9/0x230 net/socket.c:1249
>>> entry_SYSCALL_64_fastpath+0x1f/0xc2 arch/x86/entry/entry_64.S:203
>>>
>>> Memory state around the buggy address:
>>> ffff880062d9ff00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>>> ffff880062d9ff80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>>>>ffff880062da0000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>>> ^
>>> ffff880062da0080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>>> ffff880062da0100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>>> ==================================================================
>>
>> Sometimes this reproducer leads to another report:
>
> Looks very similar to issue fixed in 8282f27449bf15548cb82c77b6e04ee0ab827bdc
>
> Could you try :
Hi Eric,
This patch fixes the issue.
Thanks!
>
> diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c
> b/net/ipv6/netfilter/nf_conntrack_reasm.c
> index 9948b5ce52dad3a823edede517f17069bd7226dc..986d4ca38832b17703b09e50209ec133885c7276
> 100644
> --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
> +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
> @@ -589,6 +589,7 @@ int nf_ct_frag6_gather(struct net *net, struct
> sk_buff *skb, u32 user)
> hdr = ipv6_hdr(skb);
> fhdr = (struct frag_hdr *)skb_transport_header(skb);
>
> + skb_orphan(skb);
> fq = fq_find(net, fhdr->identification, user, &hdr->saddr, &hdr->daddr,
> skb->dev ? skb->dev->ifindex : 0, ip6_frag_ecn(hdr));
> if (fq == NULL) {
> diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
> index 6b78bab27755b2758f3c8ecd5b9c6d61615af4b6..fdec2a4cc559ab956c58d26535bdf010c0a8964a
> 100644
> --- a/net/openvswitch/conntrack.c
> +++ b/net/openvswitch/conntrack.c
> @@ -367,7 +367,6 @@ static int handle_fragments(struct net *net,
> struct sw_flow_key *key,
> } else if (key->eth.type == htons(ETH_P_IPV6)) {
> enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
>
> - skb_orphan(skb);
> memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm));
> err = nf_ct_frag6_gather(net, skb, user);
> if (err) {
^ permalink raw reply
* Re: net/ipv6: use-after-free in sock_wfree
From: Eric Dumazet @ 2017-01-09 19:08 UTC (permalink / raw)
To: Andrey Konovalov
Cc: David S. Miller, Alexey Kuznetsov, James Morris,
Hideaki YOSHIFUJI, Patrick McHardy, netdev, LKML, Dmitry Vyukov,
Kostya Serebryany, syzkaller
In-Reply-To: <CAAeHK+y3W7O3Uanr3=2rnew+unabjt6+SCAMebq1RVKsJ0QkDw@mail.gmail.com>
On Mon, Jan 9, 2017 at 11:06 AM, Andrey Konovalov <andreyknvl@google.com> wrote:
>
> Hi Eric,
>
> This patch fixes the issue.
>
> Thanks!
Thanks Andrey.
Could you please post your .config for next KASAN reports ?
I am asking this because I could not reproduce the issue with my own
builds, so I had to guess but could not test the fix myself.
Thanks !
^ permalink raw reply
* Re: [PATCH v3 net-next 0/4] Introduce The SipHash PRF
From: David Miller @ 2017-01-09 19:08 UTC (permalink / raw)
To: Jason; +Cc: ebiggers3, jeanphilippe.aumasson, gregkh, netdev, linux-kernel
In-Reply-To: <20170108125403.16355-1-Jason@zx2c4.com>
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 8 Jan 2017 13:53:59 +0100
> This patch series introduces SipHash into the kernel.
Series applied, thanks Jason.
^ permalink raw reply
* [PATCH net] net: skb_flow_get_be16() can be static
From: Eric Dumazet @ 2017-01-09 19:18 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Eric Dumazet <edumazet@google.com>
Removes following sparse complain :
net/core/flow_dissector.c:70:8: warning: symbol 'skb_flow_get_be16'
was not declared. Should it be static?
Fixes: 972d3876faa8 ("flow dissector: ICMP support")
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
net/core/flow_dissector.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index fe4e1531976c3a36127b6ad4af33f24534af4c52..1b7673aac59d51a5f8b5ef3f2076f1440c017fae 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -67,8 +67,8 @@ EXPORT_SYMBOL(skb_flow_dissector_init);
* The function will try to retrieve a be32 entity at
* offset poff
*/
-__be16 skb_flow_get_be16(const struct sk_buff *skb, int poff, void *data,
- int hlen)
+static __be16 skb_flow_get_be16(const struct sk_buff *skb, int poff,
+ void *data, int hlen)
{
__be16 *u, _u;
^ permalink raw reply related
* Re: [PATCH stable 4.1] openvswitch: gre: filter gre packets
From: Uri Foox @ 2017-01-09 19:20 UTC (permalink / raw)
To: Joe Stringer; +Cc: Pravin B Shelar, netdev
In-Reply-To: <CAEHWh-=vAhqEVQwO_9tDxGNdpoQD=XFN36j5HAV9YHjOD-UeMg@mail.gmail.com>
On Mon, Jan 9, 2017 at 2:07 PM, Uri Foox <uri@zoey.com> wrote:
> This patch was marked Not Applicable and so was
> https://patchwork.ozlabs.org/patch/559944/ which is the same thing from a
> year ago. Why are both of these not applicable?
>
> On Mon, Jan 9, 2017 at 1:48 PM, Joe Stringer <joe@ovn.org> wrote:
>>
>> On 8 January 2017 at 06:14, Pravin B Shelar <pshelar@ovn.org> wrote:
>> > OVS can only process L2 packets. But OVS GRE receive handler
>> > can accept IP-GRE packets. When such packet is processed by
>> > OVS datapath it can trigger following assert failure due
>> > to insufficient linear data in skb. Following patch filters
>> > received packets to avoid this issue.
>> >
>> > [68240.441681] ------------[ cut here ]------------
>> > [68240.496918] kernel BUG at
>> > /build/linux-lts-trusty-D60X6T/linux-lts-trusty-3.13.0/include/linux/skbuff.h:1486!
>> > [68240.615520] invalid opcode: 0000 [#1] SMP
>> > [68241.953939] RIP: [<ffffffffa052b4fe>] __skb_pull.part.7+0x4/0x6
>> > [openvswitch]
>> > [68243.099945] Call Trace:
>> > [68243.129188] <IRQ>
>> > [68243.152204] [<ffffffffa0524e64>] ovs_flow_extract+0x664/0x720
>> > [openvswitch]
>> > [68243.314912] [<ffffffffa0523a80>]
>> > ovs_dp_process_received_packet+0x60/0x130 [openvswitch]
>> > [68243.481559] [<ffffffffa0529e3a>] ovs_vport_receive+0x2a/0x30
>> > [openvswitch]
>> > [68243.564884] [<ffffffffa052b374>] gre_rcv+0xa4/0xb8 [openvswitch]
>> > [68243.637802] [<ffffffffa03e2795>] gre_cisco_rcv+0x75/0xbc [gre]
>> > [68243.708621] [<ffffffffa03e22f5>] gre_rcv+0x65/0x90 [gre]
>> > [68243.773214] [<ffffffff816941d8>] ip_local_deliver_finish+0xa8/0x220
>> > [68243.849244] [<ffffffff816944db>] ip_local_deliver+0x4b/0x90
>> > [68243.916951] [<ffffffff81693ed1>] ip_rcv_finish+0x121/0x380
>> > [68243.983627] [<ffffffff816947a6>] ip_rcv+0x286/0x380
>> > [68244.043023] [<ffffffff8165b80a>]
>> > __netif_receive_skb_core+0x61a/0x760
>> > [68244.121122] [<ffffffff8165b971>] __netif_receive_skb+0x21/0x70
>> > [68244.191942] [<ffffffff8165c131>] process_backlog+0xb1/0x190
>> > [68244.259642] [<ffffffff8165ca09>] net_rx_action+0x139/0x280
>> > [68244.326305] [<ffffffff8107367d>] __do_softirq+0xed/0x360
>> > [68244.390887] [<ffffffff81073c8e>] irq_exit+0x11e/0x140
>> > [68244.452358] [<ffffffff8177d873>] do_IRQ+0x63/0xe0
>> > [68244.509674] [<ffffffff817728ad>] common_interrupt+0x6d/0x6d
>> > [68245.392237] RIP [<ffffffffa052b4fe>] __skb_pull.part.7+0x4/0x6
>> > [openvswitch]
>> > [68245.520082] ---[ end trace 383bac9f3e676970 ]---
>> >
>> > Fixes: aa310701e7 ("openvswitch: Add gre tunnel support.")
>> > Reported-by: Uri Foox <uri@zoey.com>
>> > CC: Joe Stringer <joe@ovn.org>
>> > Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
>>
>> Acked-by: Joe Stringer <joe@ovn.org>
>
This patch was marked Not Applicable and so was
https://patchwork.ozlabs.org/patch/559944/ which is the same thing
from a year ago. Why are both of these not applicable? This is a real
issue and has caused downtime for multiple people.
^ permalink raw reply
* Re: [PATCH stable 4.1] openvswitch: gre: filter gre packets
From: David Miller @ 2017-01-09 19:23 UTC (permalink / raw)
To: uri; +Cc: joe, pshelar, netdev
In-Reply-To: <CAEHWh-=DKLWxX6min7LBcUrTsNgBoUmBB6Bkj-oNgs_yYuN2vA@mail.gmail.com>
From: Uri Foox <uri@zoey.com>
Date: Mon, 9 Jan 2017 14:20:48 -0500
> On Mon, Jan 9, 2017 at 2:07 PM, Uri Foox <uri@zoey.com> wrote:
>> This patch was marked Not Applicable and so was
>> https://patchwork.ozlabs.org/patch/559944/ which is the same thing from a
>> year ago. Why are both of these not applicable?
>>
>> On Mon, Jan 9, 2017 at 1:48 PM, Joe Stringer <joe@ovn.org> wrote:
>>>
>>> On 8 January 2017 at 06:14, Pravin B Shelar <pshelar@ovn.org> wrote:
>>> > OVS can only process L2 packets. But OVS GRE receive handler
>>> > can accept IP-GRE packets. When such packet is processed by
>>> > OVS datapath it can trigger following assert failure due
>>> > to insufficient linear data in skb. Following patch filters
>>> > received packets to avoid this issue.
>>> >
>>> > [68240.441681] ------------[ cut here ]------------
>>> > [68240.496918] kernel BUG at
>>> > /build/linux-lts-trusty-D60X6T/linux-lts-trusty-3.13.0/include/linux/skbuff.h:1486!
>>> > [68240.615520] invalid opcode: 0000 [#1] SMP
>>> > [68241.953939] RIP: [<ffffffffa052b4fe>] __skb_pull.part.7+0x4/0x6
>>> > [openvswitch]
>>> > [68243.099945] Call Trace:
>>> > [68243.129188] <IRQ>
>>> > [68243.152204] [<ffffffffa0524e64>] ovs_flow_extract+0x664/0x720
>>> > [openvswitch]
>>> > [68243.314912] [<ffffffffa0523a80>]
>>> > ovs_dp_process_received_packet+0x60/0x130 [openvswitch]
>>> > [68243.481559] [<ffffffffa0529e3a>] ovs_vport_receive+0x2a/0x30
>>> > [openvswitch]
>>> > [68243.564884] [<ffffffffa052b374>] gre_rcv+0xa4/0xb8 [openvswitch]
>>> > [68243.637802] [<ffffffffa03e2795>] gre_cisco_rcv+0x75/0xbc [gre]
>>> > [68243.708621] [<ffffffffa03e22f5>] gre_rcv+0x65/0x90 [gre]
>>> > [68243.773214] [<ffffffff816941d8>] ip_local_deliver_finish+0xa8/0x220
>>> > [68243.849244] [<ffffffff816944db>] ip_local_deliver+0x4b/0x90
>>> > [68243.916951] [<ffffffff81693ed1>] ip_rcv_finish+0x121/0x380
>>> > [68243.983627] [<ffffffff816947a6>] ip_rcv+0x286/0x380
>>> > [68244.043023] [<ffffffff8165b80a>]
>>> > __netif_receive_skb_core+0x61a/0x760
>>> > [68244.121122] [<ffffffff8165b971>] __netif_receive_skb+0x21/0x70
>>> > [68244.191942] [<ffffffff8165c131>] process_backlog+0xb1/0x190
>>> > [68244.259642] [<ffffffff8165ca09>] net_rx_action+0x139/0x280
>>> > [68244.326305] [<ffffffff8107367d>] __do_softirq+0xed/0x360
>>> > [68244.390887] [<ffffffff81073c8e>] irq_exit+0x11e/0x140
>>> > [68244.452358] [<ffffffff8177d873>] do_IRQ+0x63/0xe0
>>> > [68244.509674] [<ffffffff817728ad>] common_interrupt+0x6d/0x6d
>>> > [68245.392237] RIP [<ffffffffa052b4fe>] __skb_pull.part.7+0x4/0x6
>>> > [openvswitch]
>>> > [68245.520082] ---[ end trace 383bac9f3e676970 ]---
>>> >
>>> > Fixes: aa310701e7 ("openvswitch: Add gre tunnel support.")
>>> > Reported-by: Uri Foox <uri@zoey.com>
>>> > CC: Joe Stringer <joe@ovn.org>
>>> > Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
>>>
>>> Acked-by: Joe Stringer <joe@ovn.org>
>>
>
> This patch was marked Not Applicable and so was
> https://patchwork.ozlabs.org/patch/559944/ which is the same thing
> from a year ago. Why are both of these not applicable? This is a real
> issue and has caused downtime for multiple people.
I mark patches that are -stable backports at "not applicate" because they do
not apply to the net or net-next tree.
If you bothered to check my -stable queue on patchwork, this patch is in
there.
^ permalink raw reply
* Re: [PATCH 2/2] ARM: dts: dra72-evm-revc: enable irqs for dp83867 eth phys
From: Grygorii Strashko @ 2017-01-09 19:25 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Mugunthan V N, linux-omap, Sekhar Nori, netdev
In-Reply-To: <20170106215451.GI2630@atomide.com>
On 01/06/2017 03:54 PM, Tony Lindgren wrote:
> * Grygorii Strashko <grygorii.strashko@ti.com> [170106 12:56]:
>> TI DRA72-EVM Rev C has two DP83867 ethernet phys which support IRQ
>> generation in case of phy/link status changes. The INT/PWDN lines from both
>> DP83867 phys are wired to DRA7 gpio6.16, so reflect the same in DT.
>
> Hmm not seeing the patch 1/2 here.. Can this one be queued separately?
> Is it for v4.11 or a fix?
This is for next (v4.11) and there is just a mistake in subj, Sry.
>> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
>> ---
>> arch/arm/boot/dts/dra72-evm-revc.dts | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/dra72-evm-revc.dts b/arch/arm/boot/dts/dra72-evm-revc.dts
>> index c3d939c..3ecac56 100644
>> --- a/arch/arm/boot/dts/dra72-evm-revc.dts
>> +++ b/arch/arm/boot/dts/dra72-evm-revc.dts
>> @@ -68,6 +68,8 @@
>> ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;
>> ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
>> ti,min-output-impedance;
>> + interrupt-parent = <&gpio6>;
>> + interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
>> };
>>
>> dp83867_1: ethernet-phy@3 {
>> @@ -75,6 +77,8 @@
>> ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_25_NS>;
>> ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;
>> ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
>> - ti,min-output-imepdance;
>> + ti,min-output-impedance;
>> + interrupt-parent = <&gpio6>;
>> + interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
>> };
>> };
>> --
>> 2.10.1.dirty
>>
--
regards,
-grygorii
^ permalink raw reply
* Re: [PATCH] cls_u32: don't bother explicitly initializing ->divisor to zero
From: David Miller @ 2017-01-09 19:27 UTC (permalink / raw)
To: 00moses.alexander00; +Cc: jhs, netdev, linux-kernel
In-Reply-To: <20170108164946.GA10605@gmail.com>
From: Alexandru Moise <00moses.alexander00@gmail.com>
Date: Sun, 8 Jan 2017 18:49:46 +0200
> This struct member is already initialized to zero upon root_ht's
> allocation via kzalloc().
>
> Signed-off-by: Alexandru Moise <00moses.alexander00@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] net: ethernet: ti: cpsw: extend limits for cpsw_get/set_ringparam
From: David Miller @ 2017-01-09 19:29 UTC (permalink / raw)
To: ivan.khoronzhuk
Cc: netdev, mugunthanvnm, linux-omap, grygorii.strashko, linux-kernel
In-Reply-To: <1483906347-7567-1-git-send-email-ivan.khoronzhuk@linaro.org>
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Date: Sun, 8 Jan 2017 22:12:27 +0200
> Allow to set number of descs close to possible values. In case of
> minimum limit it's equal to number of channels to be able to set
> at least one desc per channel. For maximum limit leave enough descs
> number for tx channels.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Applied, thank you.
^ permalink raw reply
* Re: [net-next PATCH 1/3] Revert "icmp: avoid allocating large struct on stack"
From: Joe Perches @ 2017-01-09 19:33 UTC (permalink / raw)
To: Eric Dumazet, Cong Wang
Cc: Jesper Dangaard Brouer, Linux Kernel Network Developers
In-Reply-To: <1483985224.21472.3.camel@edumazet-glaptop3.roam.corp.google.com>
On Mon, 2017-01-09 at 10:07 -0800, Eric Dumazet wrote:
> On Mon, 2017-01-09 at 09:59 -0800, Cong Wang wrote:
[]
> > Facepalm...
[]
> We are in 2017. Whatever was said in 2013 is irrelevant.
Unless you morph into the PEOTUS, as a
general statement, this is untrue.
^ permalink raw reply
* [PATCH] [v3] net: qcom/emac: add ethtool support
From: Timur Tabi @ 2017-01-09 18:03 UTC (permalink / raw)
To: David Miller, Florian Fainelli, netdev, Alok Chauhan
Add support for some ethtool methods: get/set link settings, get/set
message level, get statistics, get link status, get ring params, get
pause params, and restart autonegotiation.
The code to collect the hardware statistics is moved into its own
function so that it can be used by "get statistics" method.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
Notes:
I don't trust my implementation of emac_get_pauseparam. I feel like
I'm missing something.
v3: rebase onto latest net-next
v2: added emac_get_pauseparam and emac_get_ringparam
drivers/net/ethernet/qualcomm/emac/Makefile | 2 +-
drivers/net/ethernet/qualcomm/emac/emac-ethtool.c | 185 ++++++++++++++++++++++
drivers/net/ethernet/qualcomm/emac/emac.c | 52 +++---
drivers/net/ethernet/qualcomm/emac/emac.h | 3 +
4 files changed, 221 insertions(+), 21 deletions(-)
create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
diff --git a/drivers/net/ethernet/qualcomm/emac/Makefile b/drivers/net/ethernet/qualcomm/emac/Makefile
index 7a66879..fc57ced 100644
--- a/drivers/net/ethernet/qualcomm/emac/Makefile
+++ b/drivers/net/ethernet/qualcomm/emac/Makefile
@@ -4,6 +4,6 @@
obj-$(CONFIG_QCOM_EMAC) += qcom-emac.o
-qcom-emac-objs := emac.o emac-mac.o emac-phy.o emac-sgmii.o \
+qcom-emac-objs := emac.o emac-mac.o emac-phy.o emac-sgmii.o emac-ethtool.o \
emac-sgmii-fsm9900.o emac-sgmii-qdf2432.o \
emac-sgmii-qdf2400.o
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c b/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
new file mode 100644
index 0000000..cfc57d2
--- /dev/null
+++ b/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
@@ -0,0 +1,185 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/ethtool.h>
+#include <linux/phy.h>
+
+#include "emac.h"
+
+static const char * const emac_ethtool_stat_strings[] = {
+ "rx_ok",
+ "rx_bcast",
+ "rx_mcast",
+ "rx_pause",
+ "rx_ctrl",
+ "rx_fcs_err",
+ "rx_len_err",
+ "rx_byte_cnt",
+ "rx_runt",
+ "rx_frag",
+ "rx_sz_64",
+ "rx_sz_65_127",
+ "rx_sz_128_255",
+ "rx_sz_256_511",
+ "rx_sz_512_1023",
+ "rx_sz_1024_1518",
+ "rx_sz_1519_max",
+ "rx_sz_ov",
+ "rx_rxf_ov",
+ "rx_align_err",
+ "rx_bcast_byte_cnt",
+ "rx_mcast_byte_cnt",
+ "rx_err_addr",
+ "rx_crc_align",
+ "rx_jabbers",
+ "tx_ok",
+ "tx_bcast",
+ "tx_mcast",
+ "tx_pause",
+ "tx_exc_defer",
+ "tx_ctrl",
+ "tx_defer",
+ "tx_byte_cnt",
+ "tx_sz_64",
+ "tx_sz_65_127",
+ "tx_sz_128_255",
+ "tx_sz_256_511",
+ "tx_sz_512_1023",
+ "tx_sz_1024_1518",
+ "tx_sz_1519_max",
+ "tx_1_col",
+ "tx_2_col",
+ "tx_late_col",
+ "tx_abort_col",
+ "tx_underrun",
+ "tx_rd_eop",
+ "tx_len_err",
+ "tx_trunc",
+ "tx_bcast_byte",
+ "tx_mcast_byte",
+ "tx_col",
+};
+
+#define EMAC_STATS_LEN ARRAY_SIZE(emac_ethtool_stat_strings)
+
+static u32 emac_get_msglevel(struct net_device *netdev)
+{
+ struct emac_adapter *adpt = netdev_priv(netdev);
+
+ return adpt->msg_enable;
+}
+
+static void emac_set_msglevel(struct net_device *netdev, u32 data)
+{
+ struct emac_adapter *adpt = netdev_priv(netdev);
+
+ adpt->msg_enable = data;
+}
+
+static int emac_get_sset_count(struct net_device *netdev, int sset)
+{
+ switch (sset) {
+ case ETH_SS_STATS:
+ return EMAC_STATS_LEN;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static void emac_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
+{
+ unsigned int i;
+
+ switch (stringset) {
+ case ETH_SS_STATS:
+ for (i = 0; i < EMAC_STATS_LEN; i++) {
+ strlcpy(data, emac_ethtool_stat_strings[i],
+ ETH_GSTRING_LEN);
+ data += ETH_GSTRING_LEN;
+ }
+ break;
+ }
+}
+
+static void emac_get_ethtool_stats(struct net_device *netdev,
+ struct ethtool_stats *stats,
+ u64 *data)
+{
+ struct emac_adapter *adpt = netdev_priv(netdev);
+
+ spin_lock(&adpt->stats.lock);
+
+ emac_update_hw_stats(adpt);
+ memcpy(data, &adpt->stats, EMAC_STATS_LEN * sizeof(u64));
+
+ spin_unlock(&adpt->stats.lock);
+}
+
+static int emac_nway_reset(struct net_device *netdev)
+{
+ struct phy_device *phydev = netdev->phydev;
+
+ if (!phydev)
+ return -ENODEV;
+
+ return genphy_restart_aneg(phydev);
+}
+
+static void emac_get_ringparam(struct net_device *netdev,
+ struct ethtool_ringparam *ring)
+{
+ struct emac_adapter *adpt = netdev_priv(netdev);
+
+ ring->rx_max_pending = EMAC_MAX_RX_DESCS;
+ ring->tx_max_pending = EMAC_MAX_TX_DESCS;
+ ring->rx_pending = adpt->rx_desc_cnt;
+ ring->tx_pending = adpt->tx_desc_cnt;
+}
+
+static void emac_get_pauseparam(struct net_device *netdev,
+ struct ethtool_pauseparam *pause)
+{
+ struct phy_device *phydev = netdev->phydev;
+
+ if (phydev) {
+ if (phydev->autoneg)
+ pause->autoneg = 1;
+ if (phydev->pause)
+ pause->rx_pause = 1;
+ if (phydev->pause != phydev->asym_pause)
+ pause->tx_pause = 1;
+ }
+}
+
+static const struct ethtool_ops emac_ethtool_ops = {
+ .get_link_ksettings = phy_ethtool_get_link_ksettings,
+ .set_link_ksettings = phy_ethtool_set_link_ksettings,
+
+ .get_msglevel = emac_get_msglevel,
+ .set_msglevel = emac_set_msglevel,
+
+ .get_sset_count = emac_get_sset_count,
+ .get_strings = emac_get_strings,
+ .get_ethtool_stats = emac_get_ethtool_stats,
+
+ .get_ringparam = emac_get_ringparam,
+ .get_pauseparam = emac_get_pauseparam,
+
+ .nway_reset = emac_nway_reset,
+
+ .get_link = ethtool_op_get_link,
+};
+
+void emac_set_ethtool_ops(struct net_device *netdev)
+{
+ netdev->ethtool_ops = &emac_ethtool_ops;
+}
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index 40ebe01..6ffe192 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -311,45 +311,56 @@ static int emac_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
return phy_mii_ioctl(netdev->phydev, ifr, cmd);
}
-/* Provide network statistics info for the interface */
-static void emac_get_stats64(struct net_device *netdev,
- struct rtnl_link_stats64 *net_stats)
+/**
+ * emac_update_hw_stats - read the EMAC stat registers
+ *
+ * Reads the stats registers and write the values to adpt->stats.
+ *
+ * adpt->stats.lock must be held while calling this function,
+ * and while reading from adpt->stats.
+ */
+void emac_update_hw_stats(struct emac_adapter *adpt)
{
- struct emac_adapter *adpt = netdev_priv(netdev);
- unsigned int addr = REG_MAC_RX_STATUS_BIN;
struct emac_stats *stats = &adpt->stats;
u64 *stats_itr = &adpt->stats.rx_ok;
- u32 val;
-
- spin_lock(&stats->lock);
+ void __iomem *base = adpt->base;
+ unsigned int addr;
+ addr = REG_MAC_RX_STATUS_BIN;
while (addr <= REG_MAC_RX_STATUS_END) {
- val = readl_relaxed(adpt->base + addr);
- *stats_itr += val;
+ *stats_itr += readl_relaxed(base + addr);
stats_itr++;
addr += sizeof(u32);
}
/* additional rx status */
- val = readl_relaxed(adpt->base + EMAC_RXMAC_STATC_REG23);
- adpt->stats.rx_crc_align += val;
- val = readl_relaxed(adpt->base + EMAC_RXMAC_STATC_REG24);
- adpt->stats.rx_jabbers += val;
+ stats->rx_crc_align += readl_relaxed(base + EMAC_RXMAC_STATC_REG23);
+ stats->rx_jabbers += readl_relaxed(base + EMAC_RXMAC_STATC_REG24);
/* update tx status */
addr = REG_MAC_TX_STATUS_BIN;
- stats_itr = &adpt->stats.tx_ok;
+ stats_itr = &stats->tx_ok;
while (addr <= REG_MAC_TX_STATUS_END) {
- val = readl_relaxed(adpt->base + addr);
- *stats_itr += val;
- ++stats_itr;
+ *stats_itr += readl_relaxed(base + addr);
+ stats_itr++;
addr += sizeof(u32);
}
/* additional tx status */
- val = readl_relaxed(adpt->base + EMAC_TXMAC_STATC_REG25);
- adpt->stats.tx_col += val;
+ stats->tx_col += readl_relaxed(base + EMAC_TXMAC_STATC_REG25);
+}
+
+/* Provide network statistics info for the interface */
+static void emac_get_stats64(struct net_device *netdev,
+ struct rtnl_link_stats64 *net_stats)
+{
+ struct emac_adapter *adpt = netdev_priv(netdev);
+ struct emac_stats *stats = &adpt->stats;
+
+ spin_lock(&stats->lock);
+
+ emac_update_hw_stats(adpt);
/* return parsed statistics */
net_stats->rx_packets = stats->rx_ok;
@@ -618,6 +629,7 @@ static int emac_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, netdev);
SET_NETDEV_DEV(netdev, &pdev->dev);
+ emac_set_ethtool_ops(netdev);
adpt = netdev_priv(netdev);
adpt->netdev = netdev;
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.h b/drivers/net/ethernet/qualcomm/emac/emac.h
index 0c76e6c..4b8483c 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac.h
+++ b/drivers/net/ethernet/qualcomm/emac/emac.h
@@ -332,4 +332,7 @@ struct emac_adapter {
void emac_reg_update32(void __iomem *addr, u32 mask, u32 val);
irqreturn_t emac_isr(int irq, void *data);
+void emac_set_ethtool_ops(struct net_device *netdev);
+void emac_update_hw_stats(struct emac_adapter *adpt);
+
#endif /* _EMAC_H_ */
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply related
* Re: [PATCH net-next 0/4] net: dsa: Make dsa_switch_ops const
From: David Miller @ 2017-01-09 19:34 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, andrew, vivien.didelot
In-Reply-To: <20170108225208.15431-1-f.fainelli@gmail.com>
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Sun, 8 Jan 2017 14:52:04 -0800
> This patch series allows us to annotate dsa_switch_ops with a const
> qualifier.
I kinda suspect this will have minor conflicts with the ops overwrite
bug fix I applied to 'net' right?
I think I'll wait until I merge net into net-next before I try to
apply this, and that should happend soon'ish. I'm just waiting for
Linus to take in my pull request.
^ permalink raw reply
* Re: [patch net-next 0/5] mlxsw: small driver update
From: David Miller @ 2017-01-09 19:36 UTC (permalink / raw)
To: jiri; +Cc: netdev, idosch, eladr, yotamg, nogahf, arkadis
In-Reply-To: <1483957548-3531-1-git-send-email-jiri@resnulli.us>
From: Jiri Pirko <jiri@resnulli.us>
Date: Mon, 9 Jan 2017 11:25:43 +0100
> This patchset contains various small "non-net" fixes and enhancements.
Series applied, thanks Jiri.
^ permalink raw reply
* Re: [PATCH net-next v2 0/2] net/sched: act_csum: add support for SCTP checksum
From: David Miller @ 2017-01-09 19:37 UTC (permalink / raw)
To: dcaratti; +Cc: jhs, nicolas.dichtel, netdev
In-Reply-To: <cover.1483957003.git.dcaratti@redhat.com>
From: Davide Caratti <dcaratti@redhat.com>
Date: Mon, 9 Jan 2017 11:24:19 +0100
> This series extends current act_csum functionality to allow computation of
> SCTP checksums. Patch 1 ensures LIBCRC32C will be selected if NET_ACT_CSUM
> is selected. Patch 2 extends act_csum to handle IPPROTO_SCTP protocol in
> IPv4/IPv6 header, and eventually compute the CRC32c value.
>
> v2:
> - style fix in tc_csum.h
> - avoid nested if statement in act_csum.c
Series applied, thanks.
^ permalink raw reply
* Re: [PATCH net-next 0/4] net: dsa: Make dsa_switch_ops const
From: Florian Fainelli @ 2017-01-09 19:39 UTC (permalink / raw)
To: David Miller; +Cc: netdev, andrew, vivien.didelot
In-Reply-To: <20170109.143417.1830765753133219802.davem@davemloft.net>
On 01/09/2017 11:34 AM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Sun, 8 Jan 2017 14:52:04 -0800
>
>> This patch series allows us to annotate dsa_switch_ops with a const
>> qualifier.
>
> I kinda suspect this will have minor conflicts with the ops overwrite
> bug fix I applied to 'net' right?
That is correct.
>
> I think I'll wait until I merge net into net-next before I try to
> apply this, and that should happend soon'ish. I'm just waiting for
> Linus to take in my pull request.
Sure thing, thanks!
--
Florian
^ permalink raw reply
* [PATCH net-next 0/4] net: switchdev: Avoid sleep in atomic with DSA
From: Florian Fainelli @ 2017-01-09 19:44 UTC (permalink / raw)
To: netdev; +Cc: davem, vivien.didelot, andrew, jiri, Florian Fainelli
Hi all,
This patch series is to resolve a sleeping function called in atomic context
debug splat that we observe with DSA.
Let me know what you think, I was also wondering if we should just always
make switchdev_port_vlan_fill() set SWITCHDEV_F_DEFER, but was afraid this
could cause invalid contexts to be used for rocker, mlxsw, i40e etc.
Thanks!
Florian Fainelli (4):
net: switchdev: Prepare for deferred functions modifying objects
net: switchdev: Add object dump deferred operation
net: switchdev: Add switchdev_port_bridge_getlink_deferred
net: dsa: Utilize switchdev_port_bridge_getlink_deferred()
include/net/switchdev.h | 3 +
net/dsa/slave.c | 2 +-
net/switchdev/switchdev.c | 171 +++++++++++++++++++++++++++++++++++++---------
3 files changed, 141 insertions(+), 35 deletions(-)
--
2.9.3
^ permalink raw reply
* [PATCH net-next 1/4] net: switchdev: Prepare for deferred functions modifying objects
From: Florian Fainelli @ 2017-01-09 19:45 UTC (permalink / raw)
To: netdev; +Cc: davem, vivien.didelot, andrew, jiri, Florian Fainelli
In-Reply-To: <20170109194503.10713-1-f.fainelli@gmail.com>
In preparation for adding support for deferred dump operations, allow
specifying a deferred function whose signature allows read/write
objects.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/switchdev/switchdev.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 017801f9dbaa..3d70ad02c617 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -100,11 +100,14 @@ static DEFINE_SPINLOCK(deferred_lock);
typedef void switchdev_deferred_func_t(struct net_device *dev,
const void *data);
+typedef void switchdev_deferred_func_rw_t(struct net_device *dev,
+ void *data);
struct switchdev_deferred_item {
struct list_head list;
struct net_device *dev;
switchdev_deferred_func_t *func;
+ switchdev_deferred_func_rw_t *func_rw;
unsigned long data[0];
};
@@ -138,7 +141,10 @@ void switchdev_deferred_process(void)
ASSERT_RTNL();
while ((dfitem = switchdev_deferred_dequeue())) {
- dfitem->func(dfitem->dev, dfitem->data);
+ if (dfitem->func)
+ dfitem->func(dfitem->dev, dfitem->data);
+ else if (dfitem->func_rw)
+ dfitem->func_rw(dfitem->dev, dfitem->data);
dev_put(dfitem->dev);
kfree(dfitem);
}
@@ -156,7 +162,8 @@ static DECLARE_WORK(deferred_process_work, switchdev_deferred_process_work);
static int switchdev_deferred_enqueue(struct net_device *dev,
const void *data, size_t data_len,
- switchdev_deferred_func_t *func)
+ switchdev_deferred_func_t *func,
+ switchdev_deferred_func_rw_t *func_rw)
{
struct switchdev_deferred_item *dfitem;
@@ -165,6 +172,7 @@ static int switchdev_deferred_enqueue(struct net_device *dev,
return -ENOMEM;
dfitem->dev = dev;
dfitem->func = func;
+ dfitem->func_rw = func_rw;
memcpy(dfitem->data, data, data_len);
dev_hold(dev);
spin_lock_bh(&deferred_lock);
@@ -312,7 +320,8 @@ static int switchdev_port_attr_set_defer(struct net_device *dev,
const struct switchdev_attr *attr)
{
return switchdev_deferred_enqueue(dev, attr, sizeof(*attr),
- switchdev_port_attr_set_deferred);
+ switchdev_port_attr_set_deferred,
+ NULL);
}
/**
@@ -441,7 +450,8 @@ static int switchdev_port_obj_add_defer(struct net_device *dev,
const struct switchdev_obj *obj)
{
return switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj),
- switchdev_port_obj_add_deferred);
+ switchdev_port_obj_add_deferred,
+ NULL);
}
/**
@@ -511,7 +521,8 @@ static int switchdev_port_obj_del_defer(struct net_device *dev,
const struct switchdev_obj *obj)
{
return switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj),
- switchdev_port_obj_del_deferred);
+ switchdev_port_obj_del_deferred,
+ NULL);
}
/**
--
2.9.3
^ permalink raw reply related
* [PATCH net-next 3/4] net: switchdev: Add switchdev_port_bridge_getlink_deferred
From: Florian Fainelli @ 2017-01-09 19:45 UTC (permalink / raw)
To: netdev; +Cc: davem, vivien.didelot, andrew, jiri, Florian Fainelli
In-Reply-To: <20170109194503.10713-1-f.fainelli@gmail.com>
Add switchdev_port_bridge_getlink_deferred() which does a deferred
object dump operation, this is required for e.g: DSA switches which
typically have sleeping I/O operations which is incompatible with being
in atomic context obviously.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
include/net/switchdev.h | 3 ++
net/switchdev/switchdev.c | 79 ++++++++++++++++++++++++++++++++++++++---------
2 files changed, 67 insertions(+), 15 deletions(-)
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index eba80c4fc56f..087761b0df49 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -189,6 +189,9 @@ int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u32 filter_mask,
int nlflags);
+int switchdev_port_bridge_getlink_deferred(struct sk_buff *skb, u32 pid,
+ u32 seq, struct net_device *dev,
+ u32 filter_mask, int nlflags);
int switchdev_port_bridge_setlink(struct net_device *dev,
struct nlmsghdr *nlh, u16 flags);
int switchdev_port_bridge_dellink(struct net_device *dev,
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 4fa9972d72d2..ab614a9dd872 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -776,12 +776,14 @@ static int switchdev_port_vlan_dump_cb(struct switchdev_obj *obj)
return err;
}
-static int switchdev_port_vlan_fill(struct sk_buff *skb, struct net_device *dev,
- u32 filter_mask)
+static int __switchdev_port_vlan_fill(struct sk_buff *skb,
+ struct net_device *dev,
+ u32 filter_mask, u32 obj_flags)
{
struct switchdev_vlan_dump dump = {
.vlan.obj.orig_dev = dev,
.vlan.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
+ .vlan.obj.flags = obj_flags,
.skb = skb,
.filter_mask = filter_mask,
};
@@ -802,17 +804,27 @@ static int switchdev_port_vlan_fill(struct sk_buff *skb, struct net_device *dev,
return err == -EOPNOTSUPP ? 0 : err;
}
-/**
- * switchdev_port_bridge_getlink - Get bridge port attributes
- *
- * @dev: port device
- *
- * Called for SELF on rtnl_bridge_getlink to get bridge port
- * attributes.
- */
-int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
- struct net_device *dev, u32 filter_mask,
- int nlflags)
+static int switchdev_port_vlan_fill_deferred(struct sk_buff *skb,
+ struct net_device *dev,
+ u32 filter_mask)
+{
+ return __switchdev_port_vlan_fill(skb, dev, filter_mask,
+ SWITCHDEV_F_DEFER);
+}
+
+static int switchdev_port_vlan_fill(struct sk_buff *skb,
+ struct net_device *dev,
+ u32 filter_mask)
+{
+ return __switchdev_port_vlan_fill(skb, dev, filter_mask, 0);
+}
+
+static int __switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid,
+ u32 seq, struct net_device *dev,
+ u32 filter_mask, int nlflags,
+ int (*fill_cb)(struct sk_buff *skb,
+ struct net_device *d,
+ u32 filter_mask))
{
struct switchdev_attr attr = {
.orig_dev = dev,
@@ -829,12 +841,49 @@ int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
if (err && err != -EOPNOTSUPP)
return err;
- return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode,
+ return ndo_dflt_bridge_getlink(skb, pid, seq, d, mode,
attr.u.brport_flags, mask, nlflags,
- filter_mask, switchdev_port_vlan_fill);
+ filter_mask, fill_cb);
+}
+
+/**
+ * switchdev_port_bridge_getlink - Get bridge port attributes
+ *
+ * @dev: port device
+ *
+ * Called for SELF on rtnl_bridge_getlink to get bridge port
+ * attributes.
+ */
+int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
+ struct net_device *dev, u32 filter_mask,
+ int nlflags)
+{
+ return __switchdev_port_bridge_getlink(skb, pid, seq, dev, filter_mask,
+ nlflags,
+ switchdev_port_vlan_fill);
}
EXPORT_SYMBOL_GPL(switchdev_port_bridge_getlink);
+/**
+ * switchdev_port_bridge_getlink_deferred - Get bridge port attributes
+ * (deferred variant)
+ *
+ * @dev: port device
+ *
+ * Called for SELF on rtnl_bridge_getlink to get bridge port
+ * attributes.
+ */
+int switchdev_port_bridge_getlink_deferred(struct sk_buff *skb, u32 pid,
+ u32 seq, struct net_device *dev,
+ u32 filter_mask,
+ int nlflags)
+{
+ return __switchdev_port_bridge_getlink(skb, pid, seq, dev, filter_mask,
+ nlflags,
+ switchdev_port_vlan_fill_deferred);
+}
+EXPORT_SYMBOL_GPL(switchdev_port_bridge_getlink_deferred);
+
static int switchdev_port_br_setflag(struct net_device *dev,
struct nlattr *nlattr,
unsigned long brport_flag)
--
2.9.3
^ permalink raw reply related
* [PATCH net-next 2/4] net: switchdev: Add object dump deferred operation
From: Florian Fainelli @ 2017-01-09 19:45 UTC (permalink / raw)
To: netdev; +Cc: davem, vivien.didelot, andrew, jiri, Florian Fainelli
In-Reply-To: <20170109194503.10713-1-f.fainelli@gmail.com>
Add plumbing required to perform dump operations in a deferred context,
this mostly wraps the existing switchdev_obj_port_dump() function into a
switchdev_obj_port_dump_now() and adds two wrappers (normal and
deferred) around.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/switchdev/switchdev.c | 71 +++++++++++++++++++++++++++++++++++++----------
1 file changed, 57 insertions(+), 14 deletions(-)
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 3d70ad02c617..4fa9972d72d2 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -545,26 +545,15 @@ int switchdev_port_obj_del(struct net_device *dev,
}
EXPORT_SYMBOL_GPL(switchdev_port_obj_del);
-/**
- * switchdev_port_obj_dump - Dump port objects
- *
- * @dev: port device
- * @id: object ID
- * @obj: object to dump
- * @cb: function to call with a filled object
- *
- * rtnl_lock must be held.
- */
-int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj,
- switchdev_obj_dump_cb_t *cb)
+static int switchdev_port_obj_dump_now(struct net_device *dev,
+ struct switchdev_obj *obj,
+ switchdev_obj_dump_cb_t *cb)
{
const struct switchdev_ops *ops = dev->switchdev_ops;
struct net_device *lower_dev;
struct list_head *iter;
int err = -EOPNOTSUPP;
- ASSERT_RTNL();
-
if (ops && ops->switchdev_port_obj_dump)
return ops->switchdev_port_obj_dump(dev, obj, cb);
@@ -580,6 +569,60 @@ int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj,
return err;
}
+
+struct switchdev_obj_dump_deferred_item {
+ struct switchdev_obj obj;
+ switchdev_obj_dump_cb_t *cb;
+};
+
+static void switchdev_port_obj_dump_deferred(struct net_device *dev,
+ void *data)
+{
+ struct switchdev_obj_dump_deferred_item *i = data;
+ struct switchdev_obj *obj = &i->obj;
+ int err;
+
+ err = switchdev_port_obj_dump_now(dev, obj, i->cb);
+ if (err && err != -EOPNOTSUPP)
+ netdev_err(dev, "failed (err=%d) to dump object (id=%d)\n",
+ err, obj->id);
+ if (obj->complete)
+ obj->complete(dev, err, obj->complete_priv);
+}
+
+static int switchdev_port_obj_dump_defer(struct net_device *dev,
+ struct switchdev_obj *obj,
+ switchdev_obj_dump_cb_t *cb)
+{
+ struct switchdev_obj_dump_deferred_item item;
+
+ memcpy(&item.obj, obj, switchdev_obj_size(obj));
+ item.cb = cb;
+
+ return switchdev_deferred_enqueue(dev, &item, sizeof(item),
+ NULL,
+ switchdev_port_obj_dump_deferred);
+}
+
+/**
+ * switchdev_port_obj_dump - Dump port objects
+ *
+ * @dev: port device
+ * @id: object ID
+ * @obj: object to dump
+ * @cb: function to call with a filled object
+ *
+ * rtnl_lock must be held and must not be in atomic section,
+ * in case SWITCHDEV_F_DEFER flag is not set.
+ */
+int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj,
+ switchdev_obj_dump_cb_t *cb)
+{
+ if (obj->flags & SWITCHDEV_F_DEFER)
+ return switchdev_port_obj_dump_defer(dev, obj, cb);
+ ASSERT_RTNL();
+ return switchdev_port_obj_dump_now(dev, obj, cb);
+}
EXPORT_SYMBOL_GPL(switchdev_port_obj_dump);
static RAW_NOTIFIER_HEAD(switchdev_notif_chain);
--
2.9.3
^ permalink raw reply related
* [PATCH net-next 4/4] net: dsa: Utilize switchdev_port_bridge_getlink_deferred()
From: Florian Fainelli @ 2017-01-09 19:45 UTC (permalink / raw)
To: netdev; +Cc: davem, vivien.didelot, andrew, jiri, Florian Fainelli
In-Reply-To: <20170109194503.10713-1-f.fainelli@gmail.com>
Fixes the following sleeping in atomic splat:
[ 69.008021] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:752
[ 69.016523] in_atomic(): 1, irqs_disabled(): 0, pid: 1528, name: bridge
[ 69.023167] INFO: lockdep is turned off.
[ 69.027118] CPU: 1 PID: 1528 Comm: bridge Not tainted 4.10.0-rc2-00131-g719651624789-dirty #205
[ 69.035840] Hardware name: Broadcom STB (Flattened Device Tree)
[ 69.041796] [<c020fc40>] (unwind_backtrace) from [<c020ba28>] (show_stack+0x10/0x14)
[ 69.049570] [<c020ba28>] (show_stack) from [<c04fb91c>] (dump_stack+0xb0/0xdc)
[ 69.056823] [<c04fb91c>] (dump_stack) from [<c0244d00>] (___might_sleep+0x1a4/0x2a4)
[ 69.064599] [<c0244d00>] (___might_sleep) from [<c08f3eb8>] (mutex_lock_nested+0x28/0x7d8)
[ 69.072897] [<c08f3eb8>] (mutex_lock_nested) from [<c0674dbc>] (b53_vlan_dump+0x2c/0x104)
[ 69.081105] [<c0674dbc>] (b53_vlan_dump) from [<c08eba88>] (switchdev_port_obj_dump_now+0x30/0x6c)
[ 69.090094] [<c08eba88>] (switchdev_port_obj_dump_now) from [<c08ebb00>] (switchdev_port_obj_dump+0x3c/0x98)
[ 69.099950] [<c08ebb00>] (switchdev_port_obj_dump) from [<c08ebc34>] (switchdev_port_vlan_fill+0x68/0x90)
[ 69.109550] [<c08ebc34>] (switchdev_port_vlan_fill) from [<c07f13a4>] (ndo_dflt_bridge_getlink+0x28c/0x4fc)
[ 69.119320] [<c07f13a4>] (ndo_dflt_bridge_getlink) from [<c08eb2c8>] (switchdev_port_bridge_getlink+0xc4/0xd4)
[ 69.129350] [<c08eb2c8>] (switchdev_port_bridge_getlink) from [<c07f0b10>] (rtnl_bridge_getlink+0x12c/0x28c)
[ 69.139206] [<c07f0b10>] (rtnl_bridge_getlink) from [<c0802e28>] (netlink_dump+0xe8/0x268)
[ 69.147495] [<c0802e28>] (netlink_dump) from [<c0803864>] (__netlink_dump_start+0x12c/0x18c)
[ 69.155958] [<c0803864>] (__netlink_dump_start) from [<c07f3c34>] (rtnetlink_rcv_msg+0x11c/0x228)
[ 69.164857] [<c07f3c34>] (rtnetlink_rcv_msg) from [<c0805e3c>] (netlink_rcv_skb+0xc4/0xd8)
[ 69.173145] [<c0805e3c>] (netlink_rcv_skb) from [<c07f1110>] (rtnetlink_rcv+0x28/0x30)
[ 69.181087] [<c07f1110>] (rtnetlink_rcv) from [<c080577c>] (netlink_unicast+0x16c/0x238)
[ 69.189201] [<c080577c>] (netlink_unicast) from [<c0805c3c>] (netlink_sendmsg+0x350/0x364)
[ 69.197493] [<c0805c3c>] (netlink_sendmsg) from [<c07beab0>] (sock_sendmsg+0x14/0x24)
[ 69.205350] [<c07beab0>] (sock_sendmsg) from [<c07bfdbc>] (SyS_sendto+0xb8/0xe0)
[ 69.212769] [<c07bfdbc>] (SyS_sendto) from [<c07bfdfc>] (SyS_send+0x18/0x20)
[ 69.219841] [<c07bfdfc>] (SyS_send) from [<c0208100>] (ret_fast_syscall+0x0/0x1c)
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/dsa/slave.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 5cd5b8137c08..b38536f951ea 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1038,7 +1038,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
.ndo_netpoll_cleanup = dsa_slave_netpoll_cleanup,
.ndo_poll_controller = dsa_slave_poll_controller,
#endif
- .ndo_bridge_getlink = switchdev_port_bridge_getlink,
+ .ndo_bridge_getlink = switchdev_port_bridge_getlink_deferred,
.ndo_bridge_setlink = switchdev_port_bridge_setlink,
.ndo_bridge_dellink = switchdev_port_bridge_dellink,
.ndo_get_phys_port_id = dsa_slave_get_phys_port_id,
--
2.9.3
^ permalink raw reply related
* Re: [PATCH net v2 5/5] net: qcom/emac: fix of_node and phydev leaks
From: Timur Tabi @ 2017-01-09 19:49 UTC (permalink / raw)
To: Johan Hovold, David S. Miller
Cc: Florian Fainelli, Madalin Bucur, Andrew Lunn, Vivien Didelot,
netdev, linux-kernel
In-Reply-To: <1480011691-13278-6-git-send-email-johan@kernel.org>
On 11/24/2016 12:21 PM, Johan Hovold wrote:
> + if (!has_acpi_companion(&pdev->dev))
> + put_device(&adpt->phydev->mdio.dev);
I was wondering if, instead of calling put_device() only on non-ACPI systems,
would it be better if on an ACPI system I called get_device() manually? That
is, some thing like this:
int emac_phy_config(struct platform_device *pdev, struct emac_adapter *adpt)
{
...
if (has_acpi_companion(&pdev->dev)) {
...
get_device(&mii_bus->dev);
} else {
...
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply
* Re: [PATCH net-next] alx: add feature flag for rx checksumming
From: David Miller @ 2017-01-09 19:53 UTC (permalink / raw)
To: tobias.regnery; +Cc: netdev, jcliburn, chris.snook
In-Reply-To: <20170109121555.4592-1-tobias.regnery@gmail.com>
From: Tobias Regnery <tobias.regnery@gmail.com>
Date: Mon, 9 Jan 2017 13:15:55 +0100
> The code to handle rx checksumming was in the driver since its introduction
> but for reasons unknown the feature flag was left out. Now it is possible
> to enable this feature with ethtool.
>
> Tested on my AR8161 ethernet card, there are no regressions observed in
> netperf if this feature is enabled.
>
> Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH v6 0/3] adding new glue driver dwmac-dwc-qos-eth
From: David Miller @ 2017-01-09 19:54 UTC (permalink / raw)
To: Joao.Pinto
Cc: lars.persson, niklass, swarren, treding, netdev, nathan.sullivan
In-Reply-To: <cover.1483964586.git.jpinto@synopsys.com>
From: Joao Pinto <Joao.Pinto@synopsys.com>
Date: Mon, 9 Jan 2017 12:35:07 +0000
> This patch set contains the porting of the synopsys/dwc_eth_qos.c driver
> to the stmmac structure. This operation resulted in the creation of a new
> platform glue driver called dwmac-dwc-qos-eth which was based in the
> dwc_eth_qos as is.
>
> dwmac-dwc-qos-eth inherited dwc_eth_qos DT bindings, to assure that current
> and old users can continue to use it as before. We can see this driver as
> being deprecated, since all new development will be done in stmmac.
>
> Please check each patch for implementation details.
Series applied, thanks Joao.
^ permalink raw reply
* [PATCH net] net: dsa: Ensure validity of dst->ds[0]
From: Florian Fainelli @ 2017-01-09 19:58 UTC (permalink / raw)
To: netdev; +Cc: davem, vivien.didelot, andrew, Florian Fainelli
It is perfectly possible to have non zero indexed switches being present
in a DSA switch tree, in such a case, we will be deferencing a NULL
pointer while dsa_cpu_port_ethtool_{setup,restore}. Be more defensive
and ensure that dst->ds[0] is valid before doing anything with it.
Fixes: 0c73c523cf73 ("net: dsa: Initialize CPU port ethtool ops per tree")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/dsa/dsa2.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 5fff951a0a49..da3862124545 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -394,9 +394,11 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst)
return err;
}
- err = dsa_cpu_port_ethtool_setup(dst->ds[0]);
- if (err)
- return err;
+ if (dst->ds[0]) {
+ err = dsa_cpu_port_ethtool_setup(dst->ds[0]);
+ if (err)
+ return err;
+ }
/* If we use a tagging format that doesn't have an ethertype
* field, make sure that all packets from this point on get
@@ -433,7 +435,8 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst)
dsa_ds_unapply(dst, ds);
}
- dsa_cpu_port_ethtool_restore(dst->ds[0]);
+ if (dst->ds[0])
+ dsa_cpu_port_ethtool_restore(dst->ds[0]);
pr_info("DSA: tree %d unapplied\n", dst->tree);
dst->applied = false;
--
2.9.3
^ permalink raw reply related
* Re: [GIT] Networking
From: Linus Torvalds @ 2017-01-09 20:08 UTC (permalink / raw)
To: David Miller, Kalle Valo, Larry Finger
Cc: Andrew Morton, Network Development, Linux Kernel Mailing List
In-Reply-To: <20170108.223847.1035900535306187665.davem@davemloft.net>
On Sun, Jan 8, 2017 at 7:38 PM, David Miller <davem@davemloft.net> wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Hmm. This still doesn't contain the rtlwifi oops fix that was posted
back before christmas.
Kalle said it was applied to the wireless-drivers tree as commit
60f59ce02785 in his tree, but it's never gotten to me.
What's up? It's three weeks later, and people are hitting the bug.
Linus
^ 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