Skip to content
  1. Sep 06, 2019
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next · 1e46c09e
      David S. Miller authored
      
      
      Daniel Borkmann says:
      
      ====================
      The following pull-request contains BPF updates for your *net-next* tree.
      
      The main changes are:
      
      1) Add the ability to use unaligned chunks in the AF_XDP umem. By
         relaxing where the chunks can be placed, it allows to use an
         arbitrary buffer size and place whenever there is a free
         address in the umem. Helps more seamless DPDK AF_XDP driver
         integration. Support for i40e, ixgbe and mlx5e, from Kevin and
         Maxim.
      
      2) Addition of a wakeup flag for AF_XDP tx and fill rings so the
         application can wake up the kernel for rx/tx processing which
         avoids busy-spinning of the latter, useful when app and driver
         is located on the same core. Support for i40e, ixgbe and mlx5e,
         from Magnus and Maxim.
      
      3) bpftool fixes for printf()-like functions so compiler can actually
         enforce checks, bpftool build system improvements for custom output
         directories, and addition of 'bpftool map freeze' command, from Quentin.
      
      4) Support attaching/detaching XDP programs from 'bpftool net' command,
         from Daniel.
      
      5) Automatic xskmap cleanup when AF_XDP socket is released, and several
         barrier/{read,write}_once fixes in AF_XDP code, from Björn.
      
      6) Relicense of bpf_helpers.h/bpf_endian.h for future libbpf
         inclusion as well as libbpf versioning improvements, from Andrii.
      
      7) Several new BPF kselftests for verifier precision tracking, from Alexei.
      
      8) Several BPF kselftest fixes wrt endianess to run on s390x, from Ilya.
      
      9) And more BPF kselftest improvements all over the place, from Stanislav.
      
      10) Add simple BPF map op cache for nfp driver to batch dumps, from Jakub.
      
      11) AF_XDP socket umem mapping improvements for 32bit archs, from Ivan.
      
      12) Add BPF-to-BPF call and BTF line info support for s390x JIT, from Yauheni.
      
      13) Small optimization in arm64 JIT to spare 1 insns for BPF_MOD, from Jerin.
      
      14) Fix an error check in bpf_tcp_gen_syncookie() helper, from Petar.
      
      15) Various minor fixes and cleanups, from Nathan, Masahiro, Masanari,
          Peter, Wei, Yue.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1e46c09e
    • Colin Ian King's avatar
      lan743x: remove redundant assignment to variable rx_process_result · f9bcfe21
      Colin Ian King authored
      
      
      The variable rx_process_result is being initialized with a value that
      is never read and is being re-assigned immediately afterwards. The
      assignment is redundant, so replace it with the return from function
      lan743x_rx_process_packet.
      
      Addresses-Coverity: ("Unused value")
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f9bcfe21
    • David S. Miller's avatar
      Merge branch 'ravb-remove-use-of-undocumented-registers' · 5b1ab1ae
      David S. Miller authored
      
      
      Simon Horman says:
      
      ====================
      ravb: remove use of undocumented registers
      
      this short series cleans up the RAVB driver a little.
      
      The first patch corrects the spelling of the FBP field of SFO register.
      This register field is unused and should have no run-time effect.
      
      The remaining patches remove the use of undocumented registers
      after some consultation with the internal Renesas BSP team.
      
      Changes in v2:
      * Corrected mangled state of first patch
      * Patches 2/4 and 3/4 split out of a large patch
      * Accumulated acks
      * Tweaked changelog
      * Claimed authorship of all patches
      
      v1 of this series was tested on the following platforms.
      No behaviour change is expected in v2.
      * E3 Ebisu
      * H3 Salvator-XS (ES2.0)
      * M3-W Salvator-XS
      * M3-N Salvator-XS
      * RZ/G1C iW-RainboW-G23S
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5b1ab1ae
    • Simon Horman's avatar
      ravb: TROCR register is only present on R-Car Gen3 · fd8ab76a
      Simon Horman authored
      
      
      Only use the TROCR register on R-Car Gen3 as it is not present on other
      SoCs.
      
      Offsets used for the undocumented registers are considered reserved and
      should not be written to. After some internal investigation with Renesas it
      remains unclear why this driver accesses these fields on R-Car Gen2 but
      regardless of what the historical reasons are the current code is
      considered incorrect.
      
      Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
      Acked-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fd8ab76a
    • Simon Horman's avatar
      ravb: remove undocumented endianness selection · 2d957a7e
      Simon Horman authored
      
      
      This patch removes the use of the undocumented BOC bit of the CCC register.
      
      Current documentation for EtherAVB (ravb) describes the offset of what the
      driver uses as the BOC bit as reserved and that only a value of 0 should be
      written. After some internal investigation with Renesas it remains unclear
      why this driver accesses these fields but regardless of what the historical
      reasons are the current code is considered incorrect.
      
      Based on work by Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
      
      Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2d957a7e
    • Simon Horman's avatar
      ravb: remove undocumented counter processing · 009a4703
      Simon Horman authored
      
      
      This patch removes the use of the undocumented counter registers
      CDCR, LCCR, CERCR, CEECR.
      
      Offsets used for undocumented registers are considered reserved and
      should not be written to. After some internal investigation with Renesas
      it remains unclear why this driver accesses these fields but regardless of
      what the historical reasons are the current code is considered incorrect.
      
      Based on work by Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
      
      Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      009a4703
    • Simon Horman's avatar
      ravb: correct typo in FBP field of SFO register · 845e4b80
      Simon Horman authored
      
      
      The field name is FBP rather than FPB.
      
      This field is unused and could equally be removed from the driver entirely.
      But there seems no harm in leaving as documentation of the presence of the
      field.
      
      Based on work by Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
      
      Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
      Acked-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      845e4b80
    • David S. Miller's avatar
      Merge branch 'net-hns3-add-some-bugfixes-and-cleanups' · 7250a9d2
      David S. Miller authored
      
      
      Huazhong Tan says:
      
      ====================
      net: hns3: add some bugfixes and cleanups
      
      This patch-set includes bugfixes and cleanups for the HNS3
      ethernet controller driver.
      
      [patch 01/07] fixes an error when setting VLAN offload.
      
      [patch 02/07] fixes an double free issue when setting ringparam.
      
      [patch 03/07] fixes a mis-assignment of hdev->reset_level.
      
      [patch 04/07] adds a checking for client's validity.
      
      [patch 05/07] simplifies bool variable's assignment.
      
      [patch 06/07] disables loopback when initializing.
      
      [patch 07/07] makes internal function to static.
      
      Change log:
      V1->V2: fixes comment from Sergei Shtylyov.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7250a9d2
    • Guojia Liao's avatar
      net: hns3: make hclge_dbg_get_m7_stats_info static · 91f8ff09
      Guojia Liao authored
      
      
      hclge_dbg_get_m7_info is used only in the hclge_debugfs.c,
      so it should be declared with static.
      
      Signed-off-by: default avatarGuojia Liao <liaoguojia@huawei.com>
      Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      91f8ff09
    • Yufeng Mo's avatar
      net: hns3: disable loopback setting in hclge_mac_init · 1cbc662d
      Yufeng Mo authored
      
      
      If the selftest and reset are performed at the same time, the loopback
      setting may be still in the enable state after the reset. As a result,
      packets cannot be sent out.
      
      This patch fixes this issue by disabling loopback in hclge_mac_init.
      
      Signed-off-by: default avatarYufeng Mo <moyufeng@huawei.com>
      Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1cbc662d
    • Guojia Liao's avatar
      net: hns3: remove explicit conversion to bool · 1483fa49
      Guojia Liao authored
      
      
      Relational and logical operators evaluate to bool,
      explicit conversion is overly verbose and unnecessary.
      
      Signed-off-by: default avatarGuojia Liao <liaoguojia@huawei.com>
      Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1483fa49
    • Peng Li's avatar
      net: hns3: add client node validity judgment · b7cf22b7
      Peng Li authored
      
      
      HNS3 driver can only unregister client which included in hnae3_client_list.
      This patch adds the client node validity judgment.
      
      Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
      Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b7cf22b7
    • Huazhong Tan's avatar
      net: hns3: fix mis-assignment to hdev->reset_level in hclge_reset · 525a294e
      Huazhong Tan authored
      
      
      Since hclge_get_reset_level may return HNAE3_NONE_RESET,
      so hdev->reset_level can not be assigned with the return
      value in the hclge_reset(), otherwise, it will cause
      the use of hdev->reset_level in hclge_reset_event get
      into error.
      
      Fixes: 012fcb52 ("net: hns3: activate reset timer when calling reset_event")
      Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      525a294e
    • Huazhong Tan's avatar
      net: hns3: fix double free bug when setting ringparam · 323a2ac5
      Huazhong Tan authored
      
      
      The system will panic when change the ringparam in HNS3 drivers:
      
      [ 1459.627727] hns3 0000:bd:00.0 eth6: Changing Tx/Rx ring ds from 1024/1024 to 24/24
      [ 1459.635766] hns3 0000:bd:00.0 eth6: link down
      [ 1459.640788] BUG: Bad page state in process ethtool  pfn:203f75c18
      [ 1459.646940] page:ffff7ee4ffd70600 refcount:0 mapcount:0 mapping:ffff993fff40f400 index:0x0 compound_mapcount: 0
      [ 1459.656987] flags: 0x9fffe00000010200(slab|head)
      [ 1459.661591] raw: 9fffe00000010200 dead000000000100 dead000000000122 ffff993fff40f400
      [ 1459.669302] raw: 0000000000000000 0000000080100010 00000000ffffffff 0000000000000000
      [ 1459.677016] page dumped because: PAGE_FLAGS_CHECK_AT_FREE flag(s) set
      [ 1459.683432] bad because of flags: 0x200(slab)
      [ 1459.687775] Modules linked in: ib_ipoib ib_umad rpcrdma ib_iser libiscsi scsi_transport_iscsi hns_roce_hw_v2 crct10dif_ce hns3 ses hclge hnae3 hisi_hpre hisi_zip qm uacce ip_tables x_tables hisi_sas_v3_hw hisi_sas_main libsas scsi_transport_sas
      [ 1459.709329] CPU: 14 PID: 17244 Comm: ethtool Tainted: G           O      5.3.0-rc4-00415-gc86f057 #1
      [ 1459.718419] Hardware name: Huawei TaiShan 2280 V2/BC82AMDC, BIOS 2280-V2 CS V3.B040.01 07/26/2019
      [ 1459.727248] Call trace:
      [ 1459.729688]  dump_backtrace+0x0/0x150
      [ 1459.733335]  show_stack+0x24/0x30
      [ 1459.736639]  dump_stack+0xa0/0xc4
      [ 1459.739943]  bad_page+0xf0/0x158
      [ 1459.743157]  free_pages_check_bad+0x84/0xa0
      [ 1459.747322]  __free_pages_ok+0x348/0x378
      [ 1459.751228]  page_frag_free+0x80/0x88
      [ 1459.754877]  skb_free_head+0x38/0x48
      [ 1459.758436]  skb_release_data+0x134/0x160
      [ 1459.762427]  skb_release_all+0x30/0x40
      [ 1459.766158]  consume_skb+0x38/0x108
      [ 1459.769633]  __dev_kfree_skb_any+0x58/0x68
      [ 1459.773718]  hns3_fini_ring+0x48/0x58 [hns3]
      [ 1459.777970]  hns3_set_ringparam+0x2a8/0x418 [hns3]
      [ 1459.782741]  dev_ethtool+0x5f4/0x2080
      [ 1459.786390]  dev_ioctl+0x190/0x3d8
      [ 1459.789777]  sock_do_ioctl+0xf8/0x220
      [ 1459.793423]  sock_ioctl+0x3bc/0x490
      [ 1459.796896]  do_vfs_ioctl+0xc4/0x868
      [ 1459.800454]  ksys_ioctl+0x8c/0xa0
      [ 1459.803752]  __arm64_sys_ioctl+0x28/0x38
      [ 1459.807658]  el0_svc_common.constprop.0+0xe0/0x1e0
      [ 1459.812426]  el0_svc_handler+0x34/0x90
      [ 1459.816158]  el0_svc+0x10/0x14
      [ 1459.819220] Disabling lock debugging due to kernel taint
      [ 1459.825182] ------------[ cut here ]------------
      
      Since ndo_stop will reclaim the RX's skb allocated by the driver,
      so the backed up ring parameter should not keep this info.
      
      Fixes: a723fb8e ("net: hns3: refine for set ring parameters")
      Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      323a2ac5
    • Jian Shen's avatar
      net: hns3: fix error VF index when setting VLAN offload · d9c0f275
      Jian Shen authored
      
      
      In original codes, the VF index used incorrectly in function
      hclge_set_vlan_rx_offload_cfg() and hclge_set_vlan_rx_offload_cfg().
      When VF id is greater than 8, for example 9, it will set the
      same bit with VF id 1.
      
      This patch fixes it by using  vport->vport_id % HCLGE_VF_NUM_PER_CMD /
      HCLGE_VF_NUM_PER_BYTE as the array index, instead of vport->vport_id /
      HCLGE_VF_NUM_PER_CMD.
      
      Fixes: 052ece6d ("net: hns3: add ethtool related offload command")
      Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
      Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d9c0f275
    • Andy Shevchenko's avatar
      stmmac: platform: adjust messages and move to dev level · c3a502de
      Andy Shevchenko authored
      
      
      This patch amends the error and warning messages across the platform driver.
      It includes the following changes:
       - append \n to the end of messages
       - change pr_* macros to dev_*
      
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c3a502de
    • Jose Abreu's avatar
      net: phy: Do not check Link status when loopback is enabled · fe4a7a41
      Jose Abreu authored
      
      
      While running stmmac selftests I found that in my 1G setup some tests
      were failling when running with PHY loopback enabled.
      
      It looks like when loopback is enabled the PHY will report that Link is
      down even though there is a valid connection.
      
      As in loopback mode the data will not be sent anywhere we can bypass the
      logic of checking if Link is valid thus saving unecessary reads.
      
      Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fe4a7a41
    • David Dai's avatar
      net_sched: act_police: add 2 new attributes to support police 64bit rate and peakrate · d1967e49
      David Dai authored
      
      
      For high speed adapter like Mellanox CX-5 card, it can reach upto
      100 Gbits per second bandwidth. Currently htb already supports 64bit rate
      in tc utility. However police action rate and peakrate are still limited
      to 32bit value (upto 32 Gbits per second). Add 2 new attributes
      TCA_POLICE_RATE64 and TCA_POLICE_RATE64 in kernel for 64bit support
      so that tc utility can use them for 64bit rate and peakrate value to
      break the 32bit limit, and still keep the backward binary compatibility.
      
      Tested-by: default avatarDavid Dai <zdai@linux.vnet.ibm.com>
      Signed-off-by: default avatarDavid Dai <zdai@linux.vnet.ibm.com>
      Acked-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d1967e49
    • Paul Blakey's avatar
      net: openvswitch: Set OvS recirc_id from tc chain index · 95a7233c
      Paul Blakey authored
      
      
      Offloaded OvS datapath rules are translated one to one to tc rules,
      for example the following simplified OvS rule:
      
      recirc_id(0),in_port(dev1),eth_type(0x0800),ct_state(-trk) actions:ct(),recirc(2)
      
      Will be translated to the following tc rule:
      
      $ tc filter add dev dev1 ingress \
      	    prio 1 chain 0 proto ip \
      		flower tcp ct_state -trk \
      		action ct pipe \
      		action goto chain 2
      
      Received packets will first travel though tc, and if they aren't stolen
      by it, like in the above rule, they will continue to OvS datapath.
      Since we already did some actions (action ct in this case) which might
      modify the packets, and updated action stats, we would like to continue
      the proccessing with the correct recirc_id in OvS (here recirc_id(2))
      where we left off.
      
      To support this, introduce a new skb extension for tc, which
      will be used for translating tc chain to ovs recirc_id to
      handle these miss cases. Last tc chain index will be set
      by tc goto chain action and read by OvS datapath.
      
      Signed-off-by: default avatarPaul Blakey <paulb@mellanox.com>
      Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
      Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
      Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      95a7233c
    • zhong jiang's avatar
      nfp: Drop unnecessary continue in nfp_net_pf_alloc_vnics · 47e25277
      zhong jiang authored
      
      
      Continue is not needed at the bottom of a loop.
      
      Signed-off-by: default avatarzhong jiang <zhongjiang@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      47e25277
  2. Sep 05, 2019