1. 03 Feb, 2015 6 commits
    • Arnd Bergmann's avatar
      net: hip04: add missing MODULE_LICENSE · 4c0c46be
      Arnd Bergmann authored
      The hip04 ethernet driver causes a new compile-time warning
      when built as a loadable module:
      
      WARNING: modpost: missing MODULE_LICENSE() in drivers/net/ethernet/hisilicon/hip04_eth.o
      see include/linux/module.h for more information
      
      This adds the license as "GPL", which matches the header of the file.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarDing Tianhong <dingtianhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4c0c46be
    • Florian Westphal's avatar
      net: dctcp: loosen requirement to assert ECT(0) during 3WHS · 843c2fdf
      Florian Westphal authored
      One deployment requirement of DCTCP is to be able to run
      in a DC setting along with TCP traffic. As Glenn Judd's
      NSDI'15 paper "Attaining the Promise and Avoiding the Pitfalls
      of TCP in the Datacenter" [1] (tba) explains, one way to
      solve this on switch side is to split DCTCP and TCP traffic
      in two queues per switch port based on the DSCP: one queue
      soley intended for DCTCP traffic and one for non-DCTCP traffic.
      
      For the DCTCP queue, there's the marking threshold K as
      explained in commit e3118e83 ("net: tcp: add DCTCP congestion
      control algorithm") for RED marking ECT(0) packets with CE.
      For the non-DCTCP queue, there's f.e. a classic tail drop queue.
      As already explained in e3118e83, running DCTCP at scale
      when not marking SYN/SYN-ACK packets with ECT(0) has severe
      consequences as for non-ECT(0) packets, traversing the RED
      marking DCTCP queue will result in a severe reduction of
      connection probability.
      
      This is due to the DCTCP queue being dominated by ECT(0) traffic
      and switches handle non-ECT traffic in the RED marking queue
      after passing K as drops, where K is usually a low watermark
      in order to leave enough tailroom for bursts. Splitting DCTCP
      traffic among several queues (ECN and non-ECN queue) is being
      considered a terrible idea in the network community as it
      splits single flows across multiple network paths.
      
      Therefore, commit e3118e83 implements this on Linux as
      ECT(0) marked traffic, as we argue that marking all packets
      of a DCTCP flow is the only viable solution and also doesn't
      speak against the draft.
      
      However, recently, a DCTCP implementation for FreeBSD hit also
      their mainline kernel [2]. In order to let them play well
      together with Linux' DCTCP, we would need to loosen the
      requirement that ECT(0) has to be asserted during the 3WHS as
      not implemented in FreeBSD. This simplifies the ECN test and
      lets DCTCP work together with FreeBSD.
      
      Joint work with Daniel Borkmann.
      
        [1] https://www.usenix.org/conference/nsdi15/technical-sessions/presentation/judd
        [2] https://github.com/freebsd/freebsd/commit/8ad879445281027858a7fa706d13e458095b595fSigned-off-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Cc: Glenn Judd <glenn.judd@morganstanley.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      843c2fdf
    • David S. Miller's avatar
      Merge branch 'net-timestamp' · 69422416
      David S. Miller authored
      Willem de Bruijn says:
      
      ====================
      net-timestamp: blinding
      
      Changes
        (v2 -> v3)
        - rebase only: v2 did not make it to patchwork / netdev
        (v1 -> v2)
        - fix capability check in patch 2
            this could be moved into net/core/sock.c as sk_capable_nouser()
        (rfc -> v1)
        - dropped patch 4: timestamp batching
            due to complexity, as discussed
        - dropped patch 5: default mode
            because it does not really cover all use cases, as discussed
        - added documentation
        - minor fix, see patch 2
      
      Two issues were raised during recent timestamping discussions:
      1. looping full packets on the error queue exposes packet headers
      2. TCP timestamping with retransmissions generates many timestamps
      
      This RFC patchset is an attempt at addressing both without breaking
      legacy behavior.
      
      Patch 1 reintroduces the "no payload" timestamp option, which loops
      timestamps onto an empty skb. This reduces the pressure on SO_RCVBUF
      from looping many timestamps. It does not reduce the number of recv()
      calls needed to process them. The timestamp cookie mechanism developed
      in http://patchwork.ozlabs.org/patch/427213/ did, but this is
      considerably simpler.
      
      Patch 2 then gives administrators the power to block all timestamp
      requests that contain data by unprivileged users. I proposed this
      earlier as a backward compatible workaround in the discussion of
      
        net-timestamp: pull headers for SOCK_STREAM
        http://patchwork.ozlabs.org/patch/414810/
      
      Patch 3 only updates the txtimestamp example to test this option.
      Verified that with option '-n', length is zero in all cases and
      option '-I' (PKTINFO) stops working.
      ====================
      Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      69422416
    • Willem de Bruijn's avatar
      net-timestamp: no-payload option in txtimestamp test · 23685923
      Willem de Bruijn authored
      Demonstrate how SOF_TIMESTAMPING_OPT_TSONLY can be used and
      test the implementation.
      Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      23685923
    • Willem de Bruijn's avatar
      net-timestamp: no-payload only sysctl · b245be1f
      Willem de Bruijn authored
      Tx timestamps are looped onto the error queue on top of an skb. This
      mechanism leaks packet headers to processes unless the no-payload
      options SOF_TIMESTAMPING_OPT_TSONLY is set.
      
      Add a sysctl that optionally drops looped timestamp with data. This
      only affects processes without CAP_NET_RAW.
      
      The policy is checked when timestamps are generated in the stack.
      It is possible for timestamps with data to be reported after the
      sysctl is set, if these were queued internally earlier.
      
      No vulnerability is immediately known that exploits knowledge
      gleaned from packet headers, but it may still be preferable to allow
      administrators to lock down this path at the cost of possible
      breakage of legacy applications.
      Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
      
      ----
      
      Changes
        (v1 -> v2)
        - test socket CAP_NET_RAW instead of capable(CAP_NET_RAW)
        (rfc -> v1)
        - document the sysctl in Documentation/sysctl/net.txt
        - fix access control race: read .._OPT_TSONLY only once,
              use same value for permission check and skb generation.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b245be1f
    • Willem de Bruijn's avatar
      net-timestamp: no-payload option · 49ca0d8b
      Willem de Bruijn authored
      Add timestamping option SOF_TIMESTAMPING_OPT_TSONLY. For transmit
      timestamps, this loops timestamps on top of empty packets.
      
      Doing so reduces the pressure on SO_RCVBUF. Payload inspection and
      cmsg reception (aside from timestamps) are no longer possible. This
      works together with a follow on patch that allows administrators to
      only allow tx timestamping if it does not loop payload or metadata.
      Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
      
      ----
      
      Changes (rfc -> v1)
        - add documentation
        - remove unnecessary skb->len test (thanks to Richard Cochran)
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      49ca0d8b
  2. 02 Feb, 2015 11 commits
  3. 01 Feb, 2015 15 commits
    • David S. Miller's avatar
      Merge branch 'hso-next' · 2caabb3d
      David S. Miller authored
      Olivier Sobrie says:
      
      ====================
      hso: fix some problems in the disconnect path
      
      These patches attempt to fix some problems I observed when the hso
      device is disconnected.
      Several patches of this serie are fixing crashes or memleaks when a
      hso device is disconnected.
      This serie of patches is based on v3.18.
      
      changes in v2:
       - Last patch of the serie dropped since another patch fix the issue.
         See http://marc.info/?l=linux-usb&m=142186699418489 for more info.
      
       - Added an extra patch avoiding name conflicts for the rfkill interface.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2caabb3d
    • Olivier Sobrie's avatar
      hso: fix rfkill name conflicts · 38121067
      Olivier Sobrie authored
      By using only the usb interface number for the rfkill name, we might
      have a name conflicts in case two similar hso devices are connected.
      
      In this patch, the name of the hso rfkill interface embed the value
      of a counter that is incremented each time a new rfkill interface is
      added.
      Suggested-by: default avatarDan Williams <dcbw@redhat.com>
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      38121067
    • Olivier Sobrie's avatar
      hso: add missing cancel_work_sync in disconnect() · cc491970
      Olivier Sobrie authored
      For hso serial devices, two cancel_work_sync were missing in the
      disconnect method.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cc491970
    • Olivier Sobrie's avatar
      hso: update serial_table in usb disconnect method · 301d3b7e
      Olivier Sobrie authored
      The serial_table is used to map the minor number of the usb serial device
      to its associated context. The table is updated in the probe method and
      in hso_serial_ref_free() which is called either from the tty cleanup
      method or from the usb disconnect method.
      This patch ensures that the serial_table is updated in the disconnect
      method and no more from the cleanup method to avoid the following
      potential race condition.
      
       - hso_disconnect() is called for usb interface "x". Because the serial
         port was open and because the cleanup method of the tty_port hasn't
         been called yet, hso_serial_ref_free() is not run.
       - hso_probe() is called and fails for a new hso serial usb interface
         "y". The function hso_free_interface() is called and iterates
         over the element of serial_table to find the device associated to
         the usb interface context.
         If the usb interface context of usb interface "y" has been created
         at the same place as for usb interface "x", then the cleanup
         functions are called for usb interfaces "x" and "y" and
         hso_serial_ref_free() is called for both interfaces.
       - release_tty() is called for serial port linked to usb interface "x"
         and possibly crash because the tty_port structure contained in the
         hso_device structure has been freed.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      301d3b7e
    • Olivier Sobrie's avatar
      hso: move tty_unregister outside hso_serial_common_free() · 69b377b3
      Olivier Sobrie authored
      The function hso_serial_common_free() is called either by the cleanup
      method of the tty or by the usb disconnect method.
      In the former case, the usb_disconnect() has been already called
      and the sysfs group associated to the device has been removed.
      By calling tty_unregister directly from the usb_disconnect() method,
      we avoid a warning due to the removal of the sysfs group of the usb
      device.
      
      Example of warning:
      ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 778 at fs/sysfs/group.c:225 sysfs_remove_group+0x50/0x94()
      sysfs group c0645a88 not found for kobject 'ttyHS5'
      Modules linked in:
      CPU: 0 PID: 778 Comm: kworker/0:3 Tainted: G        W      3.18.0+ #105
      Workqueue: events release_one_tty
      [<c000dfe4>] (unwind_backtrace) from [<c000c014>] (show_stack+0x14/0x1c)
      [<c000c014>] (show_stack) from [<c0016bac>] (warn_slowpath_common+0x5c/0x7c)
      [<c0016bac>] (warn_slowpath_common) from [<c0016c60>] (warn_slowpath_fmt+0x30/0x40)
      [<c0016c60>] (warn_slowpath_fmt) from [<c00ddd14>] (sysfs_remove_group+0x50/0x94)
      [<c00ddd14>] (sysfs_remove_group) from [<c0221e44>] (device_del+0x30/0x190)
      [<c0221e44>] (device_del) from [<c0221fb0>] (device_unregister+0xc/0x18)
      [<c0221fb0>] (device_unregister) from [<c0221fec>] (device_destroy+0x30/0x3c)
      [<c0221fec>] (device_destroy) from [<c01fe1dc>] (tty_unregister_device+0x2c/0x5c)
      [<c01fe1dc>] (tty_unregister_device) from [<c029a428>] (hso_serial_common_free+0x2c/0x88)
      [<c029a428>] (hso_serial_common_free) from [<c029a4c0>] (hso_serial_ref_free+0x3c/0xb8)
      [<c029a4c0>] (hso_serial_ref_free) from [<c01ff430>] (release_one_tty+0x30/0x84)
      [<c01ff430>] (release_one_tty) from [<c00271d4>] (process_one_work+0x21c/0x3c8)
      [<c00271d4>] (process_one_work) from [<c0027758>] (worker_thread+0x3d8/0x560)
      [<c0027758>] (worker_thread) from [<c002be4c>] (kthread+0xc0/0xcc)
      [<c002be4c>] (kthread) from [<c0009630>] (ret_from_fork+0x14/0x24)
      ---[ end trace cb88537fdc8fa208 ]---
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      69b377b3
    • Olivier Sobrie's avatar
      hso: replace reset_device work by usb_queue_reset_device() · 26c1f1f5
      Olivier Sobrie authored
      There is no need for a dedicated reset work in the hso driver since
      there is already a reset work foreseen in usb_interface that does
      the same.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      26c1f1f5
    • Olivier Sobrie's avatar
      hso: rename hso_dev into serial in hso_free_interface() · f6516b69
      Olivier Sobrie authored
      In other functions of the driver, variables of type "struct hso_serial"
      are denoted by "serial" and variables of type "struct hso_device" are
      denoted by "hso_dev". This patch makes the hso_free_interface()
      consistent with these notations.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f6516b69
    • Olivier Sobrie's avatar
      hso: fix small indentation error · 79927679
      Olivier Sobrie authored
      Simply remove the useless extra tab.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      79927679
    • Olivier Sobrie's avatar
      hso: fix memory leak in hso_create_rfkill() · 2e6d01ff
      Olivier Sobrie authored
      When the rfkill interface was created, a buffer containing the name
      of the rfkill node was allocated. This buffer was never freed when the
      device disappears.
      
      To fix the problem, we put the name given to rfkill_alloc() in
      the hso_net structure.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2e6d01ff
    • Olivier Sobrie's avatar
      hso: fix memory leak when device disconnects · 295fc56f
      Olivier Sobrie authored
      In the disconnect path, tx_buffer should freed like tx_data to avoid
      a memory leak when the device disconnects.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      295fc56f
    • Olivier Sobrie's avatar
      hso: fix crash when device disappears while serial port is open · 29bd3bc1
      Olivier Sobrie authored
      When the device disappear, the function hso_disconnect() is called to
      perform cleanup. In the cleanup function, hso_free_interface() calls
      tty_port_tty_hangup() in view of scheduling a work to hang up the tty if
      needed. If the port was not open then hso_serial_ref_free() is called
      directly to cleanup everything. Otherwise, hso_serial_ref_free() is called
      when the last fd associated to the port is closed.
      
      For each open port, tty_release() will call the close method,
      hso_serial_close(), which drops the last kref and call
      hso_serial_ref_free() which unregisters, destroys the tty port
      and finally frees the structure in which the tty_port structure
      is included. Later, in tty_release(), more precisely when release_tty()
      is called, the tty_port previously freed is accessed to cancel
      the tty buf workqueue and it leads to a crash.
      
      In view of avoiding this crash, we add a cleanup method that is called
      at the end of the hangup process and we drop the last kref in this
      function when all the ports have been closed, when tty_port is no
      more needed and when it is safe to free the structure containing the
      tty_port structure.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      29bd3bc1
    • Olivier Sobrie's avatar
      hso: remove useless header file timer.h · 3ac856c1
      Olivier Sobrie authored
      No timer related function is used in this driver.
      Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3ac856c1
    • Eric Dumazet's avatar
      ipv4: icmp: use percpu allocation · 349c9e3c
      Eric Dumazet authored
      Get rid of nr_cpu_ids and use modern percpu allocation.
      
      Note that the sockets themselves are not yet allocated
      using NUMA affinity.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      349c9e3c
    • Karicheri, Muralidharan's avatar
      drivers: net: cpsw: make cpsw_ale.c a module to allow re-use on Keystone · 58c11b5f
      Karicheri, Muralidharan authored
      NetCP on Keystone has cpsw ale function similar to other TI SoCs
      and this driver is re-used. To allow both ti cpsw and keystone netcp
      to re-use the driver, convert the cpsw ale to a module and configure
      it through Kconfig option CONFIG_TI_CPSW_ALE. Currently it is statically
      linked to both TI CPSW and NetCP and this causes issues when the above
      drivers are built as dynamic modules. This patch addresses this issue
      
      While at it, fix the Makefile and code to build both netcp_core and
      netcp_ethss as dynamic modules. This is needed to support arm allmodconfig.
      This also requires exporting of API calls provided by netcp_core so that
      both the above can be dynamic modules.
      Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
      Acked-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
      Tested-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      58c11b5f
    • Kenneth Klette Jonassen's avatar
      tcp: use SACK RTTs for CC · 932eb763
      Kenneth Klette Jonassen authored
      Current behavior only passes RTTs from sequentially acked data to CC.
      
      If sender gets a combined ACK for segment 1 and SACK for segment 3, then the
      computed RTT for CC is the time between sending segment 1 and receiving SACK
      for segment 3.
      
      Pass the minimum computed RTT from any acked data to CC, i.e. time between
      sending segment 3 and receiving SACK for segment 3.
      Signed-off-by: default avatarKenneth Klette Jonassen <kennetkl@ifi.uio.no>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      932eb763
  4. 31 Jan, 2015 7 commits
  5. 29 Jan, 2015 1 commit