1. 28 6月, 2019 11 次提交
  2. 27 6月, 2019 15 次提交
    • D
      Merge branch 'macb-build-fixes' · 8b89d8da
      David S. Miller 提交于
      Palmer Dabbelt says:
      
      ====================
      net: macb: Fix compilation on systems without COMMON_CLK, v2
      
      Our patch to add support for the FU540-C000 broke compilation on at
      least powerpc allyesconfig, which was found as part of the linux-next
      build regression tests.  This must have somehow slipped through the
      cracks, as the patch has been reverted in linux-next for a while now.
      This patch applies on top of the offending commit, which is the only one
      I've even tried it on as I'm not sure how this subsystem makes it to
      Linus.
      
      This patch set fixes the issue by adding a dependency of COMMON_CLK to
      the MACB Kconfig entry, which avoids the build failure by disabling MACB
      on systems where it wouldn't compile.  All known users of MACB have
      COMMON_CLK, so this shouldn't cause any issues.  This is a significantly
      simpler approach than disabling just the FU540-C000 support.
      
      I've also included a second patch to indicate this is a driver for a
      Cadence device that was originally written by an engineer at Atmel.  The
      only relation is that I stumbled across it when writing the first patch.
      
      Changes since v1 <20190624061603.1704-1-palmer@sifive.com>:
      
      * Disable MACB on systems without COMMON_CLK, instead of just disabling
        the FU540-C000 support on these systems.
      * Update the commit message to reflect the driver was written by Atmel.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8b89d8da
    • P
      net: macb: Kconfig: Rename Atmel to Cadence · 302a7cad
      Palmer Dabbelt 提交于
      The help text makes it look like NET_VENDOR_CADENCE enables support for
      Atmel devices, when in reality it's a driver written by Atmel that
      supports Cadence devices.  This may confuse users that have this device
      on a non-Atmel SoC.
      
      The fix is just s/Atmel/Cadence/, but I did go and re-wrap the Kconfig
      help text as that change caused it to go over 80 characters.
      Signed-off-by: NPalmer Dabbelt <palmer@sifive.com>
      Acked-by: NNicolas Ferre <nicolas.ferre@microchip.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      302a7cad
    • P
      net: macb: Kconfig: Make MACB depend on COMMON_CLK · c536a9aa
      Palmer Dabbelt 提交于
      commit c218ad55 ("macb: Add support for SiFive FU540-C000") added a
      dependency on the common clock framework to the macb driver, but didn't
      express that dependency in Kconfig.  As a result macb now fails to
      compile on systems without COMMON_CLK, which specifically causes a build
      failure on powerpc allyesconfig.
      
      This patch adds the dependency, which results in the macb driver no
      longer being selectable on systems without the common clock framework.
      All known systems that have this device already support the common clock
      framework, so this should not cause trouble for any uses.  Supporting
      both the FU540-C000 and systems without COMMON_CLK is quite ugly.
      
      I've build tested this on powerpc allyesconfig and RISC-V defconfig
      (which selects MACB), but I have not even booted the resulting kernels.
      
      Fixes: c218ad55 ("macb: Add support for SiFive FU540-C000")
      Signed-off-by: NPalmer Dabbelt <palmer@sifive.com>
      Acked-by: NNicolas Ferre <nicolas.ferre@microchip.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c536a9aa
    • D
      Allow 0.0.0.0/8 as a valid address range · 96125bf9
      Dave Taht 提交于
      The longstanding prohibition against using 0.0.0.0/8 dates back
      to two issues with the early internet.
      
      There was an interoperability problem with BSD 4.2 in 1984, fixed in
      BSD 4.3 in 1986. BSD 4.2 has long since been retired.
      
      Secondly, addresses of the form 0.x.y.z were initially defined only as
      a source address in an ICMP datagram, indicating "node number x.y.z on
      this IPv4 network", by nodes that know their address on their local
      network, but do not yet know their network prefix, in RFC0792 (page
      19).  This usage of 0.x.y.z was later repealed in RFC1122 (section
      3.2.2.7), because the original ICMP-based mechanism for learning the
      network prefix was unworkable on many networks such as Ethernet (which
      have longer addresses that would not fit into the 24 "node number"
      bits).  Modern networks use reverse ARP (RFC0903) or BOOTP (RFC0951)
      or DHCP (RFC2131) to find their full 32-bit address and CIDR netmask
      (and other parameters such as default gateways). 0.x.y.z has had
      16,777,215 addresses in 0.0.0.0/8 space left unused and reserved for
      future use, since 1989.
      
      This patch allows for these 16m new IPv4 addresses to appear within
      a box or on the wire. Layer 2 switches don't care.
      
      0.0.0.0/32 is still prohibited, of course.
      Signed-off-by: NDave Taht <dave.taht@gmail.com>
      Signed-off-by: NJohn Gilmore <gnu@toad.com>
      Acked-by: NToke Høiland-Jørgensen <toke@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      96125bf9
    • D
      rtnetlink: skip metrics loop for dst_default_metrics · c22a133a
      David Ahern 提交于
      dst_default_metrics has all of the metrics initialized to 0, so nothing
      will be added to the skb in rtnetlink_put_metrics. Avoid the loop if
      metrics is from dst_default_metrics.
      Signed-off-by: NDavid Ahern <dsahern@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c22a133a
    • D
      Merge branch 'skfp-cleanups' · 4191faa2
      David S. Miller 提交于
      Puranjay Mohan says:
      
      ====================
      net: fddi: skfp: Use PCI generic definitions instead of private duplicates
      
      This patch series removes the private duplicates of PCI definitions in
      favour of generic definitions defined in pci_regs.h.
      
      This driver only uses some of the generic PCI definitons,
      which are included from pci_regs.h and thier private versions
      are removed from skfbi.h with all other private defines.
      
      The skfbi.h defines PCI_REV_ID and other private defines with different
      names, these are renamed to Generic PCI names to make them
      compatible with defines in pci_regs.h.
      
      All unused defines are removed from skfbi.h.
      
      Changes in v5:
      Removed unused PCI definitions which were left in v4
      
      Changes in v4:
      Removed unused PCI definitions which were left in v3
      
      Changes in v3:
      Renamed all local PCI definitions to Generic names.
      Corrected coding style mistakes.
      
      Changes in v2:
      Converted individual patches to a series.
      Made sure that individual patches build correctly
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4191faa2
    • P
      net: fddi: skfp: Remove unused private PCI definitions · 3ce7ee2c
      Puranjay Mohan 提交于
      Remove unused private PCI definitions from skfbi.h because generic PCI
      symbols are already included from pci_regs.h.
      Signed-off-by: NPuranjay Mohan <puranjay12@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3ce7ee2c
    • P
      net: fddi: skfp: Include generic PCI definitions · a08f1c43
      Puranjay Mohan 提交于
      Include the uapi/linux/pci_regs.h header file which contains the generic
      PCI defines.
      Signed-off-by: NPuranjay Mohan <puranjay12@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a08f1c43
    • P
      net: fddi: skfp: Rename local PCI defines to match generic PCI defines · f8da5dac
      Puranjay Mohan 提交于
      Rename the PCI_REV_ID and other local defines to Generic PCI define names
      in skfbi.h and drvfbi.c to make it compatible with the pci_regs.h.
      Signed-off-by: NPuranjay Mohan <puranjay12@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f8da5dac
    • D
      Merge tag 'wireless-drivers-next-for-davem-2019-06-26' of... · a8b79105
      David S. Miller 提交于
      Merge tag 'wireless-drivers-next-for-davem-2019-06-26' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
      
      Kalle Valu says:
      
      ====================
      wireless-drivers-next patches for 5.3
      
      First set of patches for 5.3, but not that many patches this time.
      
      This pull request fails to compile with the tip tree due to
      ktime_get_boot_ns() API changes there. It should be easy for Linus to
      fix it in p54 driver once he pulls this, an example resolution here:
      
      https://lkml.kernel.org/r/20190625160432.533aa140@canb.auug.org.au
      
      Major changes:
      
      airo
      
      * switch to use skcipher interface
      
      p54
      
      * support boottime in scan results
      
      rtw88
      
      * add fast xmit support
      
      * add random mac address on scan support
      
      rt2x00
      
      * add software watchdog to detect hangs, it's disabled by default
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a8b79105
    • J
      net: stmmac: Fix crash observed if PHY does not support EEE · 177d935a
      Jon Hunter 提交于
      If the PHY does not support EEE mode, then a crash is observed when the
      ethernet interface is enabled. The crash occurs, because if the PHY does
      not support EEE, then although the EEE timer is never configured, it is
      still marked as enabled and so the stmmac ethernet driver is still
      trying to update the timer by calling mod_timer(). This triggers a BUG()
      in the mod_timer() because we are trying to update a timer when there is
      no callback function set because timer_setup() was never called for this
      timer.
      
      The problem is caused because we return true from the function
      stmmac_eee_init(), marking the EEE timer as enabled, even when we have
      not configured the EEE timer. Fix this by ensuring that we return false
      if the PHY does not support EEE and hence, 'eee_active' is not set.
      
      Fixes: 74371272 ("net: stmmac: Convert to phylink and remove phylib logic")
      Signed-off-by: NJon Hunter <jonathanh@nvidia.com>
      Tested-by: NThierry Reding <treding@nvidia.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      177d935a
    • J
      net: stmmac: Fix possible deadlock when disabling EEE support · 0867bb97
      Jon Hunter 提交于
      When stmmac_eee_init() is called to disable EEE support, then the timer
      for EEE support is stopped and we return from the function. Prior to
      stopping the timer, a mutex was acquired but in this case it is never
      released and so could cause a deadlock. Fix this by releasing the mutex
      prior to returning from stmmax_eee_init() when stopping the EEE timer.
      
      Fixes: 74371272 ("net: stmmac: Convert to phylink and remove phylib logic")
      Signed-off-by: NJon Hunter <jonathanh@nvidia.com>
      Tested-by: NThierry Reding <treding@nvidia.com>
      Acked-by: NWillem de Bruijn <willemb@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0867bb97
    • E
      ipv6: fix suspicious RCU usage in rt6_dump_route() · 3b525691
      Eric Dumazet 提交于
      syzbot reminded us that rt6_nh_dump_exceptions() needs to be called
      with rcu_read_lock()
      
      net/ipv6/route.c:1593 suspicious rcu_dereference_check() usage!
      
      other info that might help us debug this:
      
      rcu_scheduler_active = 2, debug_locks = 1
      2 locks held by syz-executor609/8966:
       #0: 00000000b7dbe288 (rtnl_mutex){+.+.}, at: netlink_dump+0xe7/0xfb0 net/netlink/af_netlink.c:2199
       #1: 00000000f2d87c21 (&(&tb->tb6_lock)->rlock){+...}, at: spin_lock_bh include/linux/spinlock.h:343 [inline]
       #1: 00000000f2d87c21 (&(&tb->tb6_lock)->rlock){+...}, at: fib6_dump_table.isra.0+0x37e/0x570 net/ipv6/ip6_fib.c:533
      
      stack backtrace:
      CPU: 0 PID: 8966 Comm: syz-executor609 Not tainted 5.2.0-rc5+ #43
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
      Call Trace:
       __dump_stack lib/dump_stack.c:77 [inline]
       dump_stack+0x172/0x1f0 lib/dump_stack.c:113
       lockdep_rcu_suspicious+0x153/0x15d kernel/locking/lockdep.c:5250
       fib6_nh_get_excptn_bucket+0x18e/0x1b0 net/ipv6/route.c:1593
       rt6_nh_dump_exceptions+0x45/0x4d0 net/ipv6/route.c:5541
       rt6_dump_route+0x904/0xc50 net/ipv6/route.c:5640
       fib6_dump_node+0x168/0x280 net/ipv6/ip6_fib.c:467
       fib6_walk_continue+0x4a9/0x8e0 net/ipv6/ip6_fib.c:1986
       fib6_walk+0x9d/0x100 net/ipv6/ip6_fib.c:2034
       fib6_dump_table.isra.0+0x38a/0x570 net/ipv6/ip6_fib.c:534
       inet6_dump_fib+0x93c/0xb00 net/ipv6/ip6_fib.c:624
       rtnl_dump_all+0x295/0x490 net/core/rtnetlink.c:3445
       netlink_dump+0x558/0xfb0 net/netlink/af_netlink.c:2244
       __netlink_dump_start+0x5b1/0x7d0 net/netlink/af_netlink.c:2352
       netlink_dump_start include/linux/netlink.h:226 [inline]
       rtnetlink_rcv_msg+0x73d/0xb00 net/core/rtnetlink.c:5182
       netlink_rcv_skb+0x177/0x450 net/netlink/af_netlink.c:2477
       rtnetlink_rcv+0x1d/0x30 net/core/rtnetlink.c:5237
       netlink_unicast_kernel net/netlink/af_netlink.c:1302 [inline]
       netlink_unicast+0x531/0x710 net/netlink/af_netlink.c:1328
       netlink_sendmsg+0x8ae/0xd70 net/netlink/af_netlink.c:1917
       sock_sendmsg_nosec net/socket.c:646 [inline]
       sock_sendmsg+0xd7/0x130 net/socket.c:665
       sock_write_iter+0x27c/0x3e0 net/socket.c:994
       call_write_iter include/linux/fs.h:1872 [inline]
       new_sync_write+0x4d3/0x770 fs/read_write.c:483
       __vfs_write+0xe1/0x110 fs/read_write.c:496
       vfs_write+0x20c/0x580 fs/read_write.c:558
       ksys_write+0x14f/0x290 fs/read_write.c:611
       __do_sys_write fs/read_write.c:623 [inline]
       __se_sys_write fs/read_write.c:620 [inline]
       __x64_sys_write+0x73/0xb0 fs/read_write.c:620
       do_syscall_64+0xfd/0x680 arch/x86/entry/common.c:301
       entry_SYSCALL_64_after_hwframe+0x49/0xbe
      RIP: 0033:0x4401b9
      Code: 18 89 d0 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 fb 13 fc ff c3 66 2e 0f 1f 84 00 00 00 00
      RSP: 002b:00007ffc8e134978 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
      RAX: ffffffffffffffda RBX: 00000000004002c8 RCX: 00000000004401b9
      RDX: 000000000000001c RSI: 0000000020000000 RDI: 00
      
      Fixes: 1e47b483 ("ipv6: Dump route exceptions if requested")
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Stefano Brivio <sbrivio@redhat.com>
      Cc: David Ahern <dsahern@gmail.com>
      Reviewed-by: NStefano Brivio <sbrivio@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3b525691
    • E
      ipv4: fix suspicious RCU usage in fib_dump_info_fnhe() · 93ed54b1
      Eric Dumazet 提交于
      sysbot reported that we lack appropriate rcu_read_lock()
      protection in fib_dump_info_fnhe()
      
      net/ipv4/route.c:2875 suspicious rcu_dereference_check() usage!
      
      other info that might help us debug this:
      
      rcu_scheduler_active = 2, debug_locks = 1
      1 lock held by syz-executor609/8966:
       #0: 00000000b7dbe288 (rtnl_mutex){+.+.}, at: netlink_dump+0xe7/0xfb0 net/netlink/af_netlink.c:2199
      
      stack backtrace:
      CPU: 0 PID: 8966 Comm: syz-executor609 Not tainted 5.2.0-rc5+ #43
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
      Call Trace:
       __dump_stack lib/dump_stack.c:77 [inline]
       dump_stack+0x172/0x1f0 lib/dump_stack.c:113
       lockdep_rcu_suspicious+0x153/0x15d kernel/locking/lockdep.c:5250
       fib_dump_info_fnhe+0x9d9/0x1080 net/ipv4/route.c:2875
       fn_trie_dump_leaf net/ipv4/fib_trie.c:2141 [inline]
       fib_table_dump+0x64a/0xd00 net/ipv4/fib_trie.c:2175
       inet_dump_fib+0x83c/0xa90 net/ipv4/fib_frontend.c:1004
       rtnl_dump_all+0x295/0x490 net/core/rtnetlink.c:3445
       netlink_dump+0x558/0xfb0 net/netlink/af_netlink.c:2244
       __netlink_dump_start+0x5b1/0x7d0 net/netlink/af_netlink.c:2352
       netlink_dump_start include/linux/netlink.h:226 [inline]
       rtnetlink_rcv_msg+0x73d/0xb00 net/core/rtnetlink.c:5182
       netlink_rcv_skb+0x177/0x450 net/netlink/af_netlink.c:2477
       rtnetlink_rcv+0x1d/0x30 net/core/rtnetlink.c:5237
       netlink_unicast_kernel net/netlink/af_netlink.c:1302 [inline]
       netlink_unicast+0x531/0x710 net/netlink/af_netlink.c:1328
       netlink_sendmsg+0x8ae/0xd70 net/netlink/af_netlink.c:1917
       sock_sendmsg_nosec net/socket.c:646 [inline]
       sock_sendmsg+0xd7/0x130 net/socket.c:665
       sock_write_iter+0x27c/0x3e0 net/socket.c:994
       call_write_iter include/linux/fs.h:1872 [inline]
       new_sync_write+0x4d3/0x770 fs/read_write.c:483
       __vfs_write+0xe1/0x110 fs/read_write.c:496
       vfs_write+0x20c/0x580 fs/read_write.c:558
       ksys_write+0x14f/0x290 fs/read_write.c:611
       __do_sys_write fs/read_write.c:623 [inline]
       __se_sys_write fs/read_write.c:620 [inline]
       __x64_sys_write+0x73/0xb0 fs/read_write.c:620
       do_syscall_64+0xfd/0x680 arch/x86/entry/common.c:301
       entry_SYSCALL_64_after_hwframe+0x49/0xbe
      RIP: 0033:0x4401b9
      Code: 18 89 d0 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 fb 13 fc ff c3 66 2e 0f 1f 84 00 00 00 00
      RSP: 002b:00007ffc8e134978 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
      RAX: ffffffffffffffda RBX: 00000000004002c8 RCX: 00000000004401b9
      RDX: 000000000000001c RSI: 0000000020000000 RDI: 0000000000000003
      RBP: 00000000006ca018 R08: 00000000004002c8 R09: 00000000004002c8
      R10: 0000000000000010 R11: 0000000000000246 R12: 0000000000401a40
      R13: 0000000000401ad0 R14: 0000000000000000 R15: 0000000000000000
      
      Fixes: ee28906f ("ipv4: Dump route exceptions if requested")
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Stefano Brivio <sbrivio@redhat.com>
      Cc: David Ahern <dsahern@gmail.com>
      Reported-by: Nsyzbot <syzkaller@googlegroups.com>
      Reviewed-by: NStefano Brivio <sbrivio@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      93ed54b1
    • J
      Revert "net: ena: ethtool: add extra properties retrieval via get_priv_flags" · eb203bae
      Jakub Kicinski 提交于
      This reverts commit 315c28d2 ("net: ena: ethtool: add extra properties retrieval via get_priv_flags").
      
      As discussed at netconf and on the mailing list we can't allow
      for the the abuse of private flags for exposing arbitrary device
      labels.
      Signed-off-by: NJakub Kicinski <jakub.kicinski@netronome.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      eb203bae
  3. 26 6月, 2019 14 次提交