1. 04 May, 2020 40 commits
    • David S. Miller's avatar
      Merge branch 'net-reduce-dynamic-lockdep-keys' · 354d8614
      David S. Miller authored
      Cong Wang says:
      
      ====================
      net: reduce dynamic lockdep keys
      
      syzbot has been complaining about low MAX_LOCKDEP_KEYS for a
      long time, it is mostly because we register 4 dynamic keys per
      network device.
      
      This patchset reduces the number of dynamic lockdep keys from
      4 to 1 per netdev, by reverting to the previous static keys,
      except for addr_list_lock which still has to be dynamic.
      The second patch removes a bonding-specific key by the way.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      354d8614
    • Cong Wang's avatar
      bonding: remove useless stats_lock_key · e7511f56
      Cong Wang authored
      After commit b3e80d44
      ("bonding: fix lockdep warning in bond_get_stats()") the dynamic
      key is no longer necessary, as we compute nest level at run-time.
      So, we can just remove it to save some lockdep key entries.
      
      Test commands:
       ip link add bond0 type bond
       ip link add bond1 type bond
       ip link set bond0 master bond1
       ip link set bond0 nomaster
       ip link set bond1 master bond0
      
      Reported-and-tested-by: syzbot+aaa6fa4949cc5d9b7b25@syzkaller.appspotmail.com
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Acked-by: default avatarTaehee Yoo <ap420073@gmail.com>
      Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e7511f56
    • Cong Wang's avatar
      net: partially revert dynamic lockdep key changes · 1a33e10e
      Cong Wang authored
      This patch reverts the folowing commits:
      
      commit 064ff66e
      "bonding: add missing netdev_update_lockdep_key()"
      
      commit 53d37497
      "net: avoid updating qdisc_xmit_lock_key in netdev_update_lockdep_key()"
      
      commit 1f26c0d3
      "net: fix kernel-doc warning in <linux/netdevice.h>"
      
      commit ab92d68f
      "net: core: add generic lockdep keys"
      
      but keeps the addr_list_lock_key because we still lock
      addr_list_lock nestedly on stack devices, unlikely xmit_lock
      this is safe because we don't take addr_list_lock on any fast
      path.
      
      Reported-and-tested-by: syzbot+aaa6fa4949cc5d9b7b25@syzkaller.appspotmail.com
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Cc: Taehee Yoo <ap420073@gmail.com>
      Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Acked-by: default avatarTaehee Yoo <ap420073@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1a33e10e
    • David S. Miller's avatar
      Merge branch 'net-ethernet-ti-k3-introduce-common-platform-time-sync-driver-cpts' · ea84c842
      David S. Miller authored
      Grygorii Strashko says:
      
      ====================
      net: ethernet: ti: k3: introduce common platform time sync driver - cpts
      
      This series introduced support for significantly upgraded TI A65x/J721E Common
      platform time sync (CPTS) modules which are part of AM65xx Time Synchronization
      Architecture [1].
      The TI A65x/J721E now contain more than one CPTS instance:
      - MCU CPSW CPTS (IEEE 1588 compliant)
      - Main NAVSS CPTS (central)
      - PCIe CPTS(s) (PTM  compliant)
      - J721E: Main CPSW9g CPTS (IEEE 1588 compliant)
      which can work as separately as interact to each other through Time Sync Router
      (TSR) and Compare Event Router (CER). In addition there are also ICSS-G IEP
      blocks which can perform similar timsync functions, but require FW support.
      More info also available in TRM [2][3]. Not all above modules are available
      to the Linux by as of now as some of them are reserved for RTOS/FW purposes.
      
      The scope of this submission is TI A65x/J721E CPSW CPTS and Main NAVSS CPTS,
      and TSR was used for testing purposes.
                                                                             +---------------------------+
                                                                             | MCU CPSW                  |
      +-------------------+           +------------------------+             |                TS         |
      | Main Navss CPTS   |           | Time Sync Router (TSR) |             |          +-------------+  |
      |                   |           |                        |             |          |             |  |
      |            HW1_TS +<----------+                        |             | +--------v-----+    +--+--+
      |                   |           |                        |             | |        CPTS  |    |Port |
      |              ...  |           |                        |           X+-->HW1_TS        |    |     |
      |            HW8_TS <------------<---------+             |           X|-->HW2_TS        |    +--^--+
      |                   |           |          |             +--------------->HW3_TS        |       |  |
      |                   |           |          |             +--------------->HW4_TS        |       |  |
      |                   |           |          |             |             | |              |       |  |
      |                   |           |          |             |             | |              |       |  |
      |            Genf0  +----------->          (A)---------+ +<--------------+Genf0         |       |  |
      |                   |           |          |             |             | |              |       |  |
      |              ...  |           |          +-----------> <---------------+Genf1     ESTf+-------+  |
      |                   |           |                        |             | |              |          |
      |                   |           |                        |             | +--------------+          |
      |            Genf8  +---------->+                        |             |                           |
      |                   |           |    SYNC0 ...    SYNC3  |             |                           |
      +-------------------+           +------+------------+----+             +---------------------------+
                                             +            +
                                             X            X
      (A) shows possible routing path for MCU CPSW CPTS Genf0 signal as an example.
      
      Main features of the new TI A65x/J721E CPTS modules are:
      - 64-bit timestamp/counter mode support in ns by using add_val
      - implemented in HW PPM and nudge adjustment.
      - control of time sync events via interrupt or polling
      - selection of multiple external reference clock sources
      - hardware timestamp of ext. inputs events (HWx_TS_PUSH)
      - periodic generator function outputs (TS_GENFx)
      - (CPSW only) Ethernet Enhanced Scheduled Traffic Operations (CPTS_ESTFn),
        which drives TSN schedule
      - timestamping of all RX packets bypassing CPTS FIFO
      
      Patch 1 - DT bindings
      Patch 2 - the AM65x/J721E driver
      Patch 3 - enables packet timestamping support in TI AM65x/J721E MCU CPSW driver.
      Patches 4-7 - DT updates.
      
      === PTP Testing:
      
      phc2sys -s CLOCK_REALTIME -c eth0 -m -O 0 -u30
      phc2sys[627.331]: eth0 rms 409912446712787392 max 1587584079521858304 freq  -6665 +/- 35040 delay   832 +/-  27
      phc2sys[657.335]: eth0 rms   33 max   66 freq     -0 +/-  28 delay   820 +/-  30
      phc2sys[687.339]: eth0 rms   37 max   70 freq     -1 +/-  32 delay   830 +/-  29
      phc2sys[717.343]: eth0 rms   33 max   71 freq     -0 +/-  29 delay   828 +/-  23
      phc2sys[747.346]: eth0 rms   35 max   75 freq     -0 +/-  31 delay   829 +/-  26
      phc2sys[777.350]: eth0 rms   37 max   68 freq     -1 +/-  32 delay   825 +/-  25
      phc2sys[807.354]: eth0 rms   28 max   57 freq     -1 +/-  25 delay   824 +/-  21
      phc2sys[837.358]: eth0 rms   43 max   81 freq     -1 +/-  37 delay   836 +/-  23
      phc2sys[867.361]: eth0 rms   33 max   74 freq     +0 +/-  29 delay   828 +/-  24
      phc2sys[897.365]: eth0 rms   35 max   77 freq     -2 +/-  30 delay   824 +/-  25
      phc2sys[927.369]: eth0 rms   28 max   50 freq     +0 +/-  25 delay   825 +/-  25
      
      ptp4l -P -2 -H -i eth0 -l 6 -m -q -p /dev/ptp1 -f ptp.cfg -s
      ptp4l[22095.754]: port 1: MASTER to UNCALIBRATED on RS_SLAVE
      ptp4l[22097.754]: port 1: UNCALIBRATED to SLAVE on MASTER_CLOCK_SELECTED
      ptp4l[22159.757]: rms  317 max 1418 freq    +79 +/- 186 delay   410 +/-   1
      ptp4l[22223.760]: rms    9 max   24 freq    +42 +/-  12 delay   409 +/-   1
      ptp4l[22287.763]: rms   10 max   28 freq    +41 +/-  11 delay   410 +/-   1
      ptp4l[22351.767]: rms   10 max   26 freq    +34 +/-  12 delay   410 +/-   1
      ptp4l[22415.770]: rms   10 max   26 freq    +49 +/-  14 delay   410 +/-   1
      
      === Ext. HW_TS and Genf testing:
      
      For testing purposes Time Sync Router (TSR) can be modeled in DT as pin controller
      +       timesync_router: timesync_router@A40000 {
      +               compatible = "pinctrl-single";
      +               reg = <0x0 0xA40000 0x0 0x800>;
      +               #address-cells = <1>;
      +               #size-cells = <0>;
      +               #pinctrl-cells = <1>;
      +               pinctrl-single,register-width = <32>;
      +               pinctrl-single,function-mask = <0x800007ff>;
      +       };
      
      then signals routing can be done in board file, for example:
      +#define TS_OFFSET(pa, val)     (0x4+(pa)*4) (0x80000000 | val)
      +
      +&timesync_router {
      +       pinctrl-names = "default";
      +       pinctrl-0 = <&mcu_cpts>;
      +
      +       /* Example of the timesync routing */
      +       mcu_cpts: mcu_cpts {
      +               pinctrl-single,pins = <
      +                       /* [cpts genf1] in13 -> out25 [cpts hw4_push] */
      +                       TS_OFFSET(25, 13)
      +                       /* [cpts genf1] in13 -> out0 [main cpts hw1_push] */
      +                       TS_OFFSET(0, 13)
      +                       /* [main cpts genf0] in4 -> out1 [main cpts hw2_push] */
      +                       TS_OFFSET(1, 4)
      +                       /* [main cpts genf0] in4 -> out24 [cpts hw3_push] */
      +                       TS_OFFSET(24, 4)
      +               >;
      +       };
      +};
      
      will create link:
          cpsw cpts Genf1 -> main cpts hw1_push
                          -> cpsw cpts hw4_push
      
          main cpts Genf0 -> main cpts hw2_push
                          -> cpsw cpts hw3_push
      
       testptp -d /dev/ptp0 -i 0 -p 1000000000
       periodic output request okay
       testptp -d /dev/ptp0 -i 1 -e 5
       external time stamp request okay
       event index 1 at 22583.000000025
       event index 1 at 22584.000000025
       event index 1 at 22585.000000025
       event index 1 at 22586.000000025
       event index 1 at 22587.000000025
       testptp -d /dev/ptp1 -i 2 -e 5
       external time stamp request okay
       event index 2 at 1587606764.249304554
       event index 2 at 1587606765.249304467
       event index 2 at 1587606766.249304380
       event index 2 at 1587606767.249304293
       event index 2 at 1587606768.249304206
      
      [1] https://www.ti.com/lit/pdf/spracp7
      [2] https://www.ti.com/lit/pdf/sprz452
      [3] https://www.ti.com/lit/pdf/spruil1
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ea84c842
    • Grygorii Strashko's avatar
      arm64: dts: ti: j721e-main: add main navss cpts node · 461d6d05
      Grygorii Strashko authored
      Add DT node for Main NAVSS CPTS module.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      461d6d05
    • Grygorii Strashko's avatar
      arm64: dts: ti: k3-j721e-mcu: add mcu cpsw cpts node · 29390928
      Grygorii Strashko authored
      Add DT node for The TI J721E MCU CPSW CPTS which is part of MCU CPSW NUSS.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      29390928
    • Grygorii Strashko's avatar
      arm64: dts: ti: k3-am65-main: add main navss cpts node · b3f7e95f
      Grygorii Strashko authored
      Add DT node for Main NAVSS CPTS module.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b3f7e95f
    • Grygorii Strashko's avatar
      arm64: dts: ti: k3-am65-mcu: add cpsw cpts node · 885a26ba
      Grygorii Strashko authored
      Add DT node for the TI AM65x SoC Common Platform Time Sync (CPTS).
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      885a26ba
    • Grygorii Strashko's avatar
      net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support · b1f66a5b
      Grygorii Strashko authored
      The MCU CPSW Common Platform Time Sync (CPTS) provides possibility to
      timestamp TX PTP packets and all RX packets.
      
      This enables corresponding support in TI AM65x/J721E MCU CPSW driver.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b1f66a5b
    • Grygorii Strashko's avatar
      net: ethernet: ti: introduce am654 common platform time sync driver · f6bd5952
      Grygorii Strashko authored
      The CPTS module is used to facilitate host control of time sync operations.
      Main features of CPTS module are:
      - selection of multiple external clock sources
      - control of time sync events via interrupt or polling
      - 64-bit timestamp mode in ns with HW PPM and nudge adjustment.
      - hardware timestamp ext. inputs (HWx_TS_PUSH)
      - timestamp Generator function outputs (TS_GENFx)
      Depending on integration it enables compliance with the IEEE 1588-2008
      standard for a precision clock synchronization protocol, Ethernet Enhanced
      Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time
      Measurement (PTM).
      
      Introduced driver provides Linux PTP hardware clock for each CPTS device
      and network packets timestamping where applicable. CPTS PTP hardware clock
      supports following operations:
          - Set time
          - Get time
          - Shift the clock by a given offset atomically
          - Adjust clock frequency
          - Time stamp external events
          - Periodic output signals
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f6bd5952
    • Grygorii Strashko's avatar
      dt-binding: ti: am65x: document common platform time sync cpts module · 6e87ac74
      Grygorii Strashko authored
      Document device tree bindings for TI AM654/J721E SoC The Common Platform
      Time Sync (CPTS) module. The CPTS module is used to facilitate host control
      of time sync operations. Main features of CPTS module are:
        - selection of multiple external clock sources
        - 64-bit timestamp mode in ns with ppm and nudge adjustment.
        - control of time sync events via interrupt or polling
        - hardware timestamp of ext. events (HWx_TS_PUSH)
        - periodic generator function outputs (TS_GENFx)
        - PPS in combination with timesync router
        - Depending on integration it enables compliance with the IEEE 1588-2008
      standard for a precision clock synchronization protocol, Ethernet Enhanced
      Scheduled Traffic Operations (CPTS_ESTFn) and PCIe Subsystem Precision Time
      Measurement (PTM).
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6e87ac74
    • David S. Miller's avatar
      Merge branch 'devlink-kernel-region-snapshot-id-allocation' · 1248dc00
      David S. Miller authored
      Jakub Kicinski says:
      
      ====================
      devlink: kernel region snapshot id allocation
      
      currently users have to find a free snapshot id to pass
      to the kernel when they are requesting a snapshot to be
      taken.
      
      This set extends the kernel so it can allocate the id
      on its own and send it back to user space in a response.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1248dc00
    • Jakub Kicinski's avatar
      docs: devlink: clarify the scope of snapshot id · aebbd7df
      Jakub Kicinski authored
      In past discussions Jiri explained snapshot ids are cross-region.
      Explain this in the docs.
      
      v3: new patch
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aebbd7df
    • Jakub Kicinski's avatar
      devlink: let kernel allocate region snapshot id · 043b3e22
      Jakub Kicinski authored
      Currently users have to choose a free snapshot id before
      calling DEVLINK_CMD_REGION_NEW. This is potentially racy
      and inconvenient.
      
      Make the DEVLINK_ATTR_REGION_SNAPSHOT_ID optional and try
      to allocate id automatically. Send a message back to the
      caller with the snapshot info.
      
      Example use:
      $ devlink region new netdevsim/netdevsim1/dummy
      netdevsim/netdevsim1/dummy: snapshot 1
      
      $ id=$(devlink -j region new netdevsim/netdevsim1/dummy | \
             jq '.[][][][]')
      $ devlink region dump netdevsim/netdevsim1/dummy snapshot $id
      [...]
      $ devlink region del netdevsim/netdevsim1/dummy snapshot $id
      
      v4:
       - inline the notification code
      v3:
       - send the notification only once snapshot creation completed.
      v2:
       - don't wrap the line containing extack;
       - add a few sentences to the docs.
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      043b3e22
    • Jakub Kicinski's avatar
      devlink: factor out building a snapshot notification · dd86fec7
      Jakub Kicinski authored
      We'll need to send snapshot info back on the socket
      which requested a snapshot to be created. Factor out
      constructing a snapshot description from the broadcast
      notification code.
      
      v3: new patch
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
      Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dd86fec7
    • Eric Dumazet's avatar
      net_sched: sch_fq: add horizon attribute · 39d01050
      Eric Dumazet authored
      QUIC servers would like to use SO_TXTIME, without having CAP_NET_ADMIN,
      to efficiently pace UDP packets.
      
      As far as sch_fq is concerned, we need to add safety checks, so
      that a buggy application does not fill the qdisc with packets
      having delivery time far in the future.
      
      This patch adds a configurable horizon (default: 10 seconds),
      and a configurable policy when a packet is beyond the horizon
      at enqueue() time:
      - either drop the packet (default policy)
      - or cap its delivery time to the horizon.
      
      $ tc -s -d qd sh dev eth0
      qdisc fq 8022: root refcnt 257 limit 10000p flow_limit 100p buckets 1024
       orphan_mask 1023 quantum 10Kb initial_quantum 51160b low_rate_threshold 550Kbit
       refill_delay 40.0ms timer_slack 10.000us horizon 10.000s
       Sent 1234215879 bytes 837099 pkt (dropped 21, overlimits 0 requeues 6)
       backlog 0b 0p requeues 6
        flows 1191 (inactive 1177 throttled 0)
        gc 0 highprio 0 throttled 692 latency 11.480us
        pkts_too_long 0 alloc_errors 0 horizon_drops 21 horizon_caps 0
      
      v2: fixed an overflow on 32bit kernels in fq_init(), reported
          by kbuild test robot <lkp@intel.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Willem de Bruijn <willemb@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      39d01050
    • Jesper Dangaard Brouer's avatar
      net: sched: fallback to qdisc noqueue if default qdisc setup fail · bf6dba76
      Jesper Dangaard Brouer authored
      Currently if the default qdisc setup/init fails, the device ends up with
      qdisc "noop", which causes all TX packets to get dropped.
      
      With the introduction of sysctl net/core/default_qdisc it is possible
      to change the default qdisc to be more advanced, which opens for the
      possibility that Qdisc_ops->init() can fail.
      
      This patch detect these kind of failures, and choose to fallback to
      qdisc "noqueue", which is so simple that its init call will not fail.
      This allows the interface to continue functioning.
      
      V2:
      As this also captures memory failures, which are transient, the
      device is not kept in IFF_NO_QUEUE state.  This allows the net_device
      to retry to default qdisc assignment.
      Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bf6dba76
    • David S. Miller's avatar
      Merge branch 'net-ipa-I-O-map-SMEM-and-IMEM' · 09be4c47
      David S. Miller authored
      Alex Elder says:
      
      ====================
      net: ipa: I/O map SMEM and IMEM
      
      This series adds the definition of two memory regions that must be
      mapped for IPA to access through an SMMU.  It requires the SMMU to
      be defined in the IPA node in the SoC's Device Tree file.
      
      There is no change since version 1 to the content of the code in
      these patches, *however* this time the first patch is an update to
      the binding definition rather than an update to a DTS file.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      09be4c47
    • Alex Elder's avatar
      net: ipa: define SMEM memory region for IPA · a0036bb4
      Alex Elder authored
      Arrange to use an item from SMEM memory for IPA.  SMEM item number
      497 is designated to be used by the IPA.  Specify the item ID and
      size of the region in platform configuration data.  Allocate and get
      a pointer to this region from ipa_mem_init().  The memory must be
      mapped for access through an SMMU.
      Signed-off-by: default avatarAlex Elder <elder@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a0036bb4
    • Alex Elder's avatar
      net: ipa: define IMEM memory region for IPA · 3e313c3f
      Alex Elder authored
      Define a region of IMEM memory available for use by IPA in the
      platform configuration data.  Initialize it from ipa_mem_init().
      The memory must be mapped for access through an SMMU.
      Signed-off-by: default avatarAlex Elder <elder@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3e313c3f
    • Alex Elder's avatar
      net: ipa: redefine struct ipa_mem_data · 3128aae8
      Alex Elder authored
      The ipa_mem_data structure type was never actually used.  Instead,
      the IPA memory regions were defined using the ipa_mem structure.
      
      Redefine struct ipa_mem_data so it encapsulates the array of IPA-local
      memory region descriptors along with the count of entries in that
      array.  Pass just an ipa_mem structure pointer to ipa_mem_init().
      
      Rename the ipa_mem_data[] array ipa_mem_local_data[] to emphasize
      that the memory regions it defines are IPA-local memory.
      Signed-off-by: default avatarAlex Elder <elder@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3128aae8
    • Alex Elder's avatar
      dt-bindings: net: add IPA iommus property · 8456c544
      Alex Elder authored
      The IPA accesses "IMEM" and main system memory through an SMMU, so
      its DT node requires an iommus property to define range of stream IDs
      it uses.
      Signed-off-by: default avatarAlex Elder <elder@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8456c544
    • David S. Miller's avatar
      Merge branch 'net-add-helper-eth_hw_addr_crc' · cad5eaf7
      David S. Miller authored
      Heiner Kallweit says:
      
      ====================
      net: add helper eth_hw_addr_crc
      
      Several drivers use the same code as basis for filter hashes. Therefore
      let's factor it out to a helper. This way drivers don't have to access
      struct netdev_hw_addr internals.
      
      First user is r8169.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cad5eaf7
    • Heiner Kallweit's avatar
      r8169: use new helper eth_hw_addr_crc · bc54ac36
      Heiner Kallweit authored
      Use new helper eth_hw_addr_crc to simplify the code.
      Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bc54ac36
    • Heiner Kallweit's avatar
      net: add helper eth_hw_addr_crc · b86cd700
      Heiner Kallweit authored
      Several drivers use the same code as basis for filter hashes. Therefore
      let's factor it out to a helper. This way drivers don't have to access
      struct netdev_hw_addr internals.
      Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b86cd700
    • Michael Walle's avatar
      net: dsa: felix: allow the device to be disabled · e90c9fce
      Michael Walle authored
      If there is no specific configuration of the felix switch in the device
      tree, but only the default configuration (ie. given by the SoCs dtsi
      file), the probe fails because no CPU port has been set. On the other
      hand you cannot set a default CPU port because that depends on the
      actual board using the switch.
      
      [    2.701300] DSA: tree 0 has no CPU port
      [    2.705167] mscc_felix 0000:00:00.5: Failed to register DSA switch: -22
      [    2.711844] mscc_felix: probe of 0000:00:00.5 failed with error -22
      
      Thus let the device tree disable this device entirely, like it is also
      done with the enetc driver of the same SoC.
      Signed-off-by: default avatarMichael Walle <michael@walle.cc>
      Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e90c9fce
    • David S. Miller's avatar
      Merge branch 'net-smc-add-failover-processing' · 627642f0
      David S. Miller authored
      Karsten Graul says:
      
      ====================
      net/smc: add failover processing
      
      This patch series adds the actual SMC-R link failover processing and
      improved link group termination. There will be one more (very small)
      series after this which will complete the SMC-R link failover support.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      627642f0
    • Karsten Graul's avatar
      net/smc: save SMC-R peer link_uid · 649758ff
      Karsten Graul authored
      During SMC-R link establishment the peers exchange the link_uid that
      is used for debugging purposes. Save the peer link_uid in smc_link so it
      can be retrieved by the smc_diag netlink interface.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      649758ff
    • Karsten Graul's avatar
      net/smc: create improved SMC-R link_uid · 45fa8da0
      Karsten Graul authored
      The link_uid of an SMC-R link is exchanged between SMC peers and its
      value can be used for debugging purposes. Create a unique link_uid
      during link initialization and use it in communication with SMC-R peers.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      45fa8da0
    • Karsten Graul's avatar
      net/smc: improve termination processing · a52bcc91
      Karsten Graul authored
      Add helper smcr_lgr_link_deactivate_all() and eliminate duplicate code.
      In smc_lgr_free(), clear the smc-r links before smc_lgr_free_bufs() is
      called so buffers are already prepared for free. The usage of the soft
      parameter in __smc_lgr_terminate() is no longer needed, smc_lgr_free()
      can be called directly. smc_lgr_terminate_sched() and
      smc_smcd_terminate() set lgr->freeing to indicate that the link group
      will be freed soon to avoid unnecessary schedules of the free worker.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a52bcc91
    • Karsten Graul's avatar
      net/smc: add termination reason and handle LLC protocol violation · 3e0c40af
      Karsten Graul authored
      Allow to set the reason code for the link group termination, and set
      meaningful values before termination processing is triggered. This
      reason code is sent to the peer in the final delete link message.
      When the LLC request or response layer receives a message type that was
      not handled, drop a warning and terminate the link group.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3e0c40af
    • Karsten Graul's avatar
      net/smc: asymmetric link tagging · ad6c111b
      Karsten Graul authored
      New connections must not be assigned to asymmetric links. Add asymmetric
      link tagging using new link variable link_is_asym. The new helpers
      smcr_lgr_set_type() and smcr_lgr_set_type_asym() are called to set the
      state of the link group, and tag all links accordingly.
      smcr_lgr_conn_assign_link() respects the link tagging and will not
      assign new connections to links tagged as asymmetric link.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ad6c111b
    • Karsten Graul's avatar
      net/smc: assign link to a new connection · 56bc3b20
      Karsten Graul authored
      For new connections, assign a link from the link group, using some
      simple load balancing.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      56bc3b20
    • Karsten Graul's avatar
      net/smc: send DELETE_LINK, ALL message and wait for send to complete · f3811fd7
      Karsten Graul authored
      Add smc_llc_send_message_wait() which uses smc_wr_tx_send_wait() to send
      an LLC message and waits for the message send to complete.
      smc_llc_send_link_delete_all() calls the new function to send an
      DELETE_LINK,ALL LLC message. The RFC states that the sender of this type
      of message needs to wait for the completion event of the message
      transmission and can terminate the link afterwards.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f3811fd7
    • Karsten Graul's avatar
      net/smc: wait for departure of an IB message · 09c61d24
      Karsten Graul authored
      Introduce smc_wr_tx_send_wait() to send an IB message and wait for the
      tx completion event of the message. This makes sure that the message is
      no longer in-flight when the function returns.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      09c61d24
    • Karsten Graul's avatar
      net/smc: handle incoming CDC validation message · b286a065
      Karsten Graul authored
      Call smc_cdc_msg_validate() when a CDC message with the failover
      validation bit enabled was received. Validate that the sequence number
      sent with the message is one we already have received. If not, messages
      were lost and the connection is terminated using a new abort_work.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b286a065
    • Karsten Graul's avatar
      net/smc: send failover validation message · 29bd73db
      Karsten Graul authored
      When a connection is switched to a new link then a link validation
      message must be sent to the peer over the new link, containing the
      sequence number of the last CDC message that was sent over the old link.
      The peer will validate if this sequence number is the same or lower then
      the number he received, and abort the connection if messages were lost.
      Add smcr_cdc_msg_send_validation() to send the message validation
      message and call it when a connection was switched in
      smc_switch_cursor().
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      29bd73db
    • Karsten Graul's avatar
      net/smc: switch connections to alternate link · c6f02ebe
      Karsten Graul authored
      Add smc_switch_conns() to switch all connections from a link that is
      going down. Find an other link to switch the connections to, and
      switch each connection to the new link. smc_switch_cursor() updates the
      cursors of a connection to the state of the last successfully sent CDC
      message. When there is no link to switch to, terminate the link group.
      Call smc_switch_conns() when a link is going down.
      And with the possibility that links of connections can switch adapt CDC
      and TX functions to detect and handle link switches.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c6f02ebe
    • Karsten Graul's avatar
      net/smc: save state of last sent CDC message · f0ec4f1d
      Karsten Graul authored
      When a link goes down and all connections of this link need to be
      switched to an other link then the producer cursor and the sequence of
      the last successfully sent CDC message must be known. Add the two fields
      to the SMC connection and update it in the tx completion handler.
      And to allow matching of sequences in error cases reset the seqno to the
      old value in smc_cdc_msg_send() when the actual send failed.
      Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
      Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f0ec4f1d
    • David S. Miller's avatar
      Merge branch 'bnxt_en-Updates-for-net-next' · fc99584e
      David S. Miller authored
      Michael Chan says:
      
      ====================
      bnxt_en: Updates for net-next.
      
      This patchset includes these main changes:
      
      1. Firmware spec. update.
      2. Context memory sizing improvements for the hardware TQM block.
      3. ethtool chip reset improvements and fixes for correctness.
      4. Improve L2 doorbell mapping by mapping only up to the size specified
      by firmware.  This allows the RoCE driver to map the remaining doorbell
      space for its purpose, such as write-combining.
      5. Improve ethtool -S channel statistics by showing only relevant ring
      counters for non-combined channels.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fc99584e