1. 29 Jan, 2021 2 commits
    • Jakub Kicinski's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · c358f952
      Jakub Kicinski authored
      drivers/net/can/dev.c
        b552766c ("can: dev: prevent potential information leak in can_fill_info()")
        3e77f70e ("can: dev: move driver related infrastructure into separate subdir")
        0a042c6e ("can: dev: move netlink related code into seperate file")
      
        Code move.
      
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
        57ac4a31 ("net/mlx5e: Correctly handle changing the number of queues when the interface is down")
        214baf22 ("net/mlx5e: Support HTB offload")
      
        Adjacent code changes
      
      net/switchdev/switchdev.c
        20776b46 ("net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP")
        ffb68fc5 ("net: switchdev: remove the transaction structure from port object notifiers")
        bae33f2b ("net: switchdev: remove the transaction structure from port attributes")
      
        Transaction parameter gets dropped otherwise keep the fix.
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      c358f952
    • Jakub Kicinski's avatar
      Merge tag 'mlx5-updates-2021-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux · 24a790da
      Jakub Kicinski authored
      Saeed Mahameed says:
      
      ====================
      mlx5 subfunction support
      
      Parav Pandit says:
      
      This patchset introduces support for mlx5 subfunction (SF).
      
      A subfunction is a lightweight function that has a parent PCI function on
      which it is deployed. mlx5 subfunction has its own function capabilities
      and its own resources. This means a subfunction has its own dedicated
      queues(txq, rxq, cq, eq). These queues are neither shared nor stolen from
      the parent PCI function.
      
      When subfunction is RDMA capable, it has its own QP1, GID table and rdma
      resources neither shared nor stolen from the parent PCI function.
      
      A subfunction has dedicated window in PCI BAR space that is not shared
      with the other subfunctions or parent PCI function. This ensures that all
      class devices of the subfunction accesses only assigned PCI BAR space.
      
      A Subfunction supports eswitch representation through which it supports tc
      offloads. User must configure eswitch to send/receive packets from/to
      subfunction port.
      
      Subfunctions share PCI level resources such as PCI MSI-X IRQs with
      their other subfunctions and/or with its parent PCI function.
      
      Subfunction support is discussed in detail in RFC [1] and [2].
      RFC [1] and extension [2] describes requirements, design and proposed
      plumbing using devlink, auxiliary bus and sysfs for systemd/udev
      support. Functionality of this patchset is best explained using real
      examples further below.
      
      overview:
      --------
      A subfunction can be created and deleted by a user using devlink port
      add/delete interface.
      
      A subfunction can be configured using devlink port function attribute
      before its activated.
      
      When a subfunction is activated, it results in an auxiliary device on
      the host PCI device where it is deployed. A driver binds to the
      auxiliary device that further creates supported class devices.
      
      example subfunction usage sequence:
      -----------------------------------
      Change device to switchdev mode:
      $ devlink dev eswitch set pci/0000:06:00.0 mode switchdev
      
      Add a devlink port of subfunction flavour:
      $ devlink port add pci/0000:06:00.0 flavour pcisf pfnum 0 sfnum 88
      
      Configure mac address of the port function:
      $ devlink port function set ens2f0npf0sf88 hw_addr 00:00:00:00:88:88
      
      Now activate the function:
      $ devlink port function set ens2f0npf0sf88 state active
      
      Now use the auxiliary device and class devices:
      $ devlink dev show
      pci/0000:06:00.0
      auxiliary/mlx5_core.sf.4
      
      $ ip link show
      127: ens2f0np0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
          link/ether 24:8a:07:b3:d1:12 brd ff:ff:ff:ff:ff:ff
          altname enp6s0f0np0
      129: p0sf88: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
          link/ether 00:00:00:00:88:88 brd ff:ff:ff:ff:ff:ff
      
      $ rdma dev show
      43: rdmap6s0f0: node_type ca fw 16.29.0550 node_guid 248a:0703:00b3:d112 sys_image_guid 248a:0703:00b3:d112
      44: mlx5_0: node_type ca fw 16.29.0550 node_guid 0000:00ff:fe00:8888 sys_image_guid 248a:0703:00b3:d112
      
      After use inactivate the function:
      $ devlink port function set ens2f0npf0sf88 state inactive
      
      Now delete the subfunction port:
      $ devlink port del ens2f0npf0sf88
      
      [1] https://lore.kernel.org/netdev/20200519092258.GF4655@nanopsycho/
      [2] https://marc.info/?l=linux-netdev&m=158555928517777&w=2
      
      =================
      
      * tag 'mlx5-updates-2021-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
        net/mlx5: Add devlink subfunction port documentation
        devlink: Extend devlink port documentation for subfunctions
        devlink: Add devlink port documentation
        net/mlx5: SF, Port function state change support
        net/mlx5: SF, Add port add delete functionality
        net/mlx5: E-switch, Add eswitch helpers for SF vport
        net/mlx5: E-switch, Prepare eswitch to handle SF vport
        net/mlx5: SF, Add auxiliary device driver
        net/mlx5: SF, Add auxiliary device support
        net/mlx5: Introduce vhca state event notifier
        devlink: Support get and set state of port function
        devlink: Support add and delete devlink port
        devlink: Introduce PCI SF port flavour and port attribute
        devlink: Prepare code to fill multiple port function attributes
      ====================
      
      Link: https://lore.kernel.org/r/20210122193658.282884-1-saeed@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      24a790da
  2. 28 Jan, 2021 38 commits
    • Linus Torvalds's avatar
      Merge tag 'net-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 909b447d
      Linus Torvalds authored
      Pull networking fixes from Jakub Kicinski:
       "Networking fixes including fixes from can, xfrm, wireless,
        wireless-drivers and netfilter trees. Nothing scary, Intel
        WiFi-related fixes seemed most notable to the users.
      
        Current release - regressions:
      
         - dsa: microchip: ksz8795: fix KSZ8794 port map again to program the
           CPU port correctly
      
        Current release - new code bugs:
      
         - iwlwifi: pcie: reschedule in long-running memory reads
      
        Previous releases - regressions:
      
         - iwlwifi: dbg: don't try to overwrite read-only FW data
      
         - iwlwifi: provide gso_type to GSO packets
      
         - octeontx2: make sure the buffer is 128 byte aligned
      
         - tcp: make TCP_USER_TIMEOUT accurate for zero window probes
      
         - xfrm: fix wraparound in xfrm_policy_addr_delta()
      
         - xfrm: fix oops in xfrm_replay_advance_bmp due to a race between
           CPUs in presence of packet reorder
      
         - tcp: fix TLP timer not set when CA_STATE changes from DISORDER to
           OPEN
      
         - wext: fix NULL-ptr-dereference with cfg80211's lack of commit()
      
        Previous releases - always broken:
      
         - igc: fix link speed advertising
      
         - stmmac: configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA
           addressing
      
         - team: protect features update by RCU to avoid deadlock
      
         - xfrm: fix disable_xfrm sysctl when used on xfrm interfaces
           themselves
      
         - fec: fix temporary RMII clock reset on link up
      
         - can: dev: prevent potential information leak in can_fill_info()
      
        Misc:
      
         - mrp: fix bad packing of MRP test packet structures
      
         - uapi: fix big endian definition of ipv6_rpl_sr_hdr
      
         - add David Ahern to IPv4/IPv6 maintainers"
      
      * tag 'net-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (86 commits)
        rxrpc: Fix memory leak in rxrpc_lookup_local
        mlxsw: spectrum_span: Do not overwrite policer configuration
        selftests: forwarding: Specify interface when invoking mausezahn
        stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing
        net: usb: cdc_ether: added support for Thales Cinterion PLSx3 modem family.
        ibmvnic: Ensure that CRQ entry read are correctly ordered
        MAINTAINERS: add missing header for bonding
        net: decnet: fix netdev refcount leaking on error path
        net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP
        can: dev: prevent potential information leak in can_fill_info()
        net: fec: Fix temporary RMII clock reset on link up
        net: lapb: Add locking to the lapb module
        team: protect features update by RCU to avoid deadlock
        MAINTAINERS: add David Ahern to IPv4/IPv6 maintainers
        net/mlx5: CT: Fix incorrect removal of tuple_nat_node from nat rhashtable
        net/mlx5e: Revert parameters on errors when changing MTU and LRO state without reset
        net/mlx5e: Revert parameters on errors when changing trust state without reset
        net/mlx5e: Correctly handle changing the number of queues when the interface is down
        net/mlx5e: Fix CT rule + encap slow path offload and deletion
        net/mlx5e: Disable hw-tc-offload when MLX5_CLS_ACT config is disabled
        ...
      909b447d
    • Jakub Kicinski's avatar
      Merge branch 'net-sfp-add-support-for-gpon-rtl8672-rtl9601c-and-ubiquiti-u-fiber' · 32e31b78
      Jakub Kicinski authored
      Pali Rohár says:
      
      ====================
      net: sfp: add support for GPON RTL8672/RTL9601C and Ubiquiti U-Fiber
      
      This is fourth version of patches which add workarounds for
      RTL8672/RTL9601C EEPROMs and Ubiquiti U-Fiber Instant SFP.
      ====================
      
      Link: https://lore.kernel.org/r/20210125150228.8523-1-pali@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      32e31b78
    • Pali Rohár's avatar
      net: sfp: add mode quirk for GPON module Ubiquiti U-Fiber Instant · f0b4f847
      Pali Rohár authored
      The Ubiquiti U-Fiber Instant SFP GPON module has nonsensical information
      stored in its EEPROM. It claims to support all transceiver types including
      10G Ethernet. Clear all claimed modes and set only 1000baseX_Full, which is
      the only one supported.
      
      This module has also phys_id set to SFF, and the SFP subsystem currently
      does not allow to use SFP modules detected as SFFs. Add exception for this
      module so it can be detected as supported.
      
      This change finally allows to detect and use SFP GPON module Ubiquiti
      U-Fiber Instant on Linux system.
      
      EEPROM content of this SFP module is (where XX is serial number):
      
      00: 02 04 0b ff ff ff ff ff ff ff ff 03 0c 00 14 c8    ???........??.??
      10: 00 00 00 00 55 42 4e 54 20 20 20 20 20 20 20 20    ....UBNT
      20: 20 20 20 20 00 18 e8 29 55 46 2d 49 4e 53 54 41        .??)UF-INSTA
      30: 4e 54 20 20 20 20 20 20 34 20 20 20 05 1e 00 36    NT      4   ??.6
      40: 00 06 00 00 55 42 4e 54 XX XX XX XX XX XX XX XX    .?..UBNTXXXXXXXX
      50: 20 20 20 20 31 34 30 31 32 33 20 20 60 80 02 41        140123  `??A
      Signed-off-by: default avatarPali Rohár <pali@kernel.org>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      f0b4f847
    • Pali Rohár's avatar
      net: sfp: add workaround for Realtek RTL8672 and RTL9601C chips · 426c6cbc
      Pali Rohár authored
      The workaround for VSOL V2801F brand based GPON SFP modules added in commit
      0d035bed ("net: sfp: VSOL V2801F / CarlitoxxPro CPGOS03-0490 v2.0
      workaround") works only for IDs added explicitly to the list. Since there
      are rebranded modules where OEM vendors put different strings into the
      vendor name field, we cannot base workaround on IDs only.
      
      Moreover the issue which the above mentioned commit tried to work around is
      generic not only to VSOL based modules, but rather to all GPON modules
      based on Realtek RTL8672 and RTL9601C chips.
      
      These include at least the following GPON modules:
      * V-SOL V2801F
      * C-Data FD511GX-RM0
      * OPTON GP801R
      * BAUDCOM BD-1234-SFM
      * CPGOS03-0490 v2.0
      * Ubiquiti U-Fiber Instant
      * EXOT EGS1
      
      These Realtek chips have broken EEPROM emulator which for N-byte read
      operation returns just the first byte of EEPROM data, followed by N-1
      zeros.
      
      Introduce a new function, sfp_id_needs_byte_io(), which detects SFP modules
      with broken EEPROM emulator based on N-1 zeros and switch to 1 byte EEPROM
      reading operation.
      
      Function sfp_i2c_read() now always uses single byte reading when it is
      required and when function sfp_hwmon_probe() detects single byte access,
      it disables registration of hwmon device, because in this case we cannot
      reliably and atomically read 2 bytes as is required by the standard for
      retrieving values from diagnostic area.
      
      (These Realtek chips are broken in a way that violates SFP standards for
      diagnostic interface. Kernel in this case simply cannot do anything less
      of skipping registration of the hwmon interface.)
      
      This patch fixes reading of EEPROM content from SFP modules based on
      Realtek RTL8672 and RTL9601C chips. Diagnostic interface of EEPROM stays
      broken and cannot be fixed.
      
      Fixes: 0d035bed ("net: sfp: VSOL V2801F / CarlitoxxPro CPGOS03-0490 v2.0 workaround")
      Co-developed-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarPali Rohár <pali@kernel.org>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      426c6cbc
    • Takeshi Misawa's avatar
      rxrpc: Fix memory leak in rxrpc_lookup_local · b8323f72
      Takeshi Misawa authored
      Commit 9ebeddef ("rxrpc: rxrpc_peer needs to hold a ref on the rxrpc_local record")
      Then release ref in __rxrpc_put_peer and rxrpc_put_peer_locked.
      
      	struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *local, gfp_t gfp)
      	-               peer->local = local;
      	+               peer->local = rxrpc_get_local(local);
      
      rxrpc_discard_prealloc also need ref release in discarding.
      
      syzbot report:
      BUG: memory leak
      unreferenced object 0xffff8881080ddc00 (size 256):
        comm "syz-executor339", pid 8462, jiffies 4294942238 (age 12.350s)
        hex dump (first 32 bytes):
          00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
          00 00 00 00 0a 00 00 00 00 c0 00 08 81 88 ff ff  ................
        backtrace:
          [<000000002b6e495f>] kmalloc include/linux/slab.h:552 [inline]
          [<000000002b6e495f>] kzalloc include/linux/slab.h:682 [inline]
          [<000000002b6e495f>] rxrpc_alloc_local net/rxrpc/local_object.c:79 [inline]
          [<000000002b6e495f>] rxrpc_lookup_local+0x1c1/0x760 net/rxrpc/local_object.c:244
          [<000000006b43a77b>] rxrpc_bind+0x174/0x240 net/rxrpc/af_rxrpc.c:149
          [<00000000fd447a55>] afs_open_socket+0xdb/0x200 fs/afs/rxrpc.c:64
          [<000000007fd8867c>] afs_net_init+0x2b4/0x340 fs/afs/main.c:126
          [<0000000063d80ec1>] ops_init+0x4e/0x190 net/core/net_namespace.c:152
          [<00000000073c5efa>] setup_net+0xde/0x2d0 net/core/net_namespace.c:342
          [<00000000a6744d5b>] copy_net_ns+0x19f/0x3e0 net/core/net_namespace.c:483
          [<0000000017d3aec3>] create_new_namespaces+0x199/0x4f0 kernel/nsproxy.c:110
          [<00000000186271ef>] unshare_nsproxy_namespaces+0x9b/0x120 kernel/nsproxy.c:226
          [<000000002de7bac4>] ksys_unshare+0x2fe/0x5c0 kernel/fork.c:2957
          [<00000000349b12ba>] __do_sys_unshare kernel/fork.c:3025 [inline]
          [<00000000349b12ba>] __se_sys_unshare kernel/fork.c:3023 [inline]
          [<00000000349b12ba>] __x64_sys_unshare+0x12/0x20 kernel/fork.c:3023
          [<000000006d178ef7>] do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
          [<00000000637076d4>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
      
      Fixes: 9ebeddef ("rxrpc: rxrpc_peer needs to hold a ref on the rxrpc_local record")
      Signed-off-by: default avatarTakeshi Misawa <jeliantsurux@gmail.com>
      Reported-and-tested-by: syzbot+305326672fed51b205f7@syzkaller.appspotmail.com
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Link: https://lore.kernel.org/r/161183091692.3506637.3206605651502458810.stgit@warthog.procyon.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      b8323f72
    • Jakub Kicinski's avatar
      Merge branch 'mlxsw-various-fixes' · 924b171c
      Jakub Kicinski authored
      Ido Schimmel says:
      
      ====================
      mlxsw: Various fixes
      
      Patch #1 fixes wrong invocation of mausezahn in a couple of selftests.
      The tests started failing after Fedora updated their libnet package from
      version 1.1.6 to 1.2.1. With the fix the tests pass regardless of libnet
      version.
      
      Patch #2 fixes an issue in the mirroring to CPU code that results in
      policer configuration being overwritten.
      ====================
      
      Link: https://lore.kernel.org/r/20210128144820.3280295-1-idosch@idosch.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      924b171c
    • Ido Schimmel's avatar
      mlxsw: spectrum_span: Do not overwrite policer configuration · b6f6881a
      Ido Schimmel authored
      The purpose of the delayed work in the SPAN module is to potentially
      update the destination port and various encapsulation parameters of SPAN
      agents that point to a VLAN device or a GRE tap. The destination port
      can change following the insertion of a new route, for example.
      
      SPAN agents that point to a physical port or the CPU port are static and
      never change throughout the lifetime of the SPAN agent. Therefore, skip
      over them in the delayed work.
      
      This fixes an issue where the delayed work overwrites the policer
      that was set on a SPAN agent pointing to the CPU. Modifying the delayed
      work to inherit the original policer configuration is error-prone, as
      the same will be needed for any new parameter.
      
      Fixes: 4039504e ("mlxsw: spectrum_span: Allow setting policer on a SPAN agent")
      Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
      Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      b6f6881a
    • Danielle Ratson's avatar
      selftests: forwarding: Specify interface when invoking mausezahn · 11df27f7
      Danielle Ratson authored
      Specify the interface through which packets should be transmitted so
      that the test will pass regardless of the libnet version against which
      mausezahn is linked.
      
      Fixes: cab14d10 ("selftests: Add version of router_multipath.sh using nexthop objects")
      Fixes: 3d578d87 ("selftests: forwarding: Test IPv4 weighted nexthops")
      Signed-off-by: default avatarDanielle Ratson <danieller@nvidia.com>
      Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      11df27f7
    • Voon Weifeng's avatar
      stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing · 7cfc4486
      Voon Weifeng authored
      Fix an issue where dump stack is printed and Reset Adapter occurs when
      PSE0 GbE or/and PSE1 GbE is/are enabled. EHL PSE0 GbE and PSE1 GbE use
      32 bits DMA addressing whereas EHL PCH GbE uses 64 bits DMA addressing.
      
      [   25.535095] ------------[ cut here ]------------
      [   25.540276] NETDEV WATCHDOG: enp0s29f2 (intel-eth-pci): transmit queue 2 timed out
      [   25.548749] WARNING: CPU: 2 PID: 0 at net/sched/sch_generic.c:443 dev_watchdog+0x259/0x260
      [   25.558004] Modules linked in: 8021q bnep bluetooth ecryptfs snd_hda_codec_hdmi intel_gpy marvell intel_ishtp_loader intel_ishtp_hid iTCO_wdt mei_hdcp iTCO_vendor_support x86_pkg_temp_thermal kvm_intel dwmac_intel stmmac kvm igb pcs_xpcs irqbypass phylink snd_hda_intel intel_rapl_msr pcspkr dca snd_hda_codec i915 i2c_i801 i2c_smbus libphy intel_ish_ipc snd_hda_core mei_me intel_ishtp mei spi_dw_pci 8250_lpss spi_dw thermal dw_dmac_core parport_pc tpm_crb tpm_tis parport tpm_tis_core tpm intel_pmc_core sch_fq_codel uhid fuse configfs snd_sof_pci snd_sof_intel_byt snd_sof_intel_ipc snd_sof_intel_hda_common snd_sof_xtensa_dsp snd_sof snd_soc_acpi_intel_match snd_soc_acpi snd_intel_dspcfg ledtrig_audio snd_soc_core snd_compress ac97_bus snd_pcm snd_timer snd soundcore
      [   25.633795] CPU: 2 PID: 0 Comm: swapper/2 Tainted: G     U            5.11.0-rc4-intel-lts-MISMAIL5+ #5
      [   25.644306] Hardware name: Intel Corporation Elkhart Lake Embedded Platform/ElkhartLake LPDDR4x T4 RVP1, BIOS EHLSFWI1.R00.2434.A00.2010231402 10/23/2020
      [   25.659674] RIP: 0010:dev_watchdog+0x259/0x260
      [   25.664650] Code: e8 3b 6b 60 ff eb 98 4c 89 ef c6 05 ec e7 bf 00 01 e8 fb e5 fa ff 89 d9 4c 89 ee 48 c7 c7 78 31 d2 9e 48 89 c2 e8 79 1b 18 00 <0f> 0b e9 77 ff ff ff 0f 1f 44 00 00 48 c7 47 08 00 00 00 00 48 c7
      [   25.685647] RSP: 0018:ffffb7ca80160eb8 EFLAGS: 00010286
      [   25.691498] RAX: 0000000000000000 RBX: 0000000000000002 RCX: 0000000000000103
      [   25.699483] RDX: 0000000080000103 RSI: 00000000000000f6 RDI: 00000000ffffffff
      [   25.707465] RBP: ffff985709ce0440 R08: 0000000000000000 R09: c0000000ffffefff
      [   25.715455] R10: ffffb7ca80160cf0 R11: ffffb7ca80160ce8 R12: ffff985709ce039c
      [   25.723438] R13: ffff985709ce0000 R14: 0000000000000008 R15: ffff9857068af940
      [   25.731425] FS:  0000000000000000(0000) GS:ffff985864300000(0000) knlGS:0000000000000000
      [   25.740481] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [   25.746913] CR2: 00005567f8bb76b8 CR3: 00000001f8e0a000 CR4: 0000000000350ee0
      [   25.754900] Call Trace:
      [   25.757631]  <IRQ>
      [   25.759891]  ? qdisc_put_unlocked+0x30/0x30
      [   25.764565]  ? qdisc_put_unlocked+0x30/0x30
      [   25.769245]  call_timer_fn+0x2e/0x140
      [   25.773346]  run_timer_softirq+0x1f3/0x430
      [   25.777932]  ? __hrtimer_run_queues+0x12c/0x2c0
      [   25.783005]  ? ktime_get+0x3e/0xa0
      [   25.786812]  __do_softirq+0xa6/0x2ef
      [   25.790816]  asm_call_irq_on_stack+0xf/0x20
      [   25.795501]  </IRQ>
      [   25.797852]  do_softirq_own_stack+0x5d/0x80
      [   25.802538]  irq_exit_rcu+0x94/0xb0
      [   25.806475]  sysvec_apic_timer_interrupt+0x42/0xc0
      [   25.811836]  asm_sysvec_apic_timer_interrupt+0x12/0x20
      [   25.817586] RIP: 0010:cpuidle_enter_state+0xd9/0x370
      [   25.823142] Code: 85 c0 0f 8f 0a 02 00 00 31 ff e8 22 d5 7e ff 45 84 ff 74 12 9c 58 f6 c4 02 0f 85 47 02 00 00 31 ff e8 7b a0 84 ff fb 45 85 f6 <0f> 88 ab 00 00 00 49 63 ce 48 2b 2c 24 48 89 c8 48 6b d1 68 48 c1
      [   25.844140] RSP: 0018:ffffb7ca800f7e80 EFLAGS: 00000206
      [   25.849996] RAX: ffff985864300000 RBX: 0000000000000003 RCX: 000000000000001f
      [   25.857975] RDX: 00000005f2028ea8 RSI: ffffffff9ec5907f RDI: ffffffff9ec62a5d
      [   25.865961] RBP: 00000005f2028ea8 R08: 0000000000000000 R09: 0000000000029d00
      [   25.873947] R10: 000000137b0e0508 R11: ffff9858643294e4 R12: ffff9858643336d0
      [   25.881935] R13: ffffffff9ef74b00 R14: 0000000000000003 R15: 0000000000000000
      [   25.889918]  cpuidle_enter+0x29/0x40
      [   25.893922]  do_idle+0x24a/0x290
      [   25.897536]  cpu_startup_entry+0x19/0x20
      [   25.901930]  start_secondary+0x128/0x160
      [   25.906326]  secondary_startup_64_no_verify+0xb0/0xbb
      [   25.911983] ---[ end trace b4c0c8195d0ba61f ]---
      [   25.917193] intel-eth-pci 0000:00:1d.2 enp0s29f2: Reset adapter.
      
      Fixes: 67c08ac4 ("net: stmmac: add EHL PSE0 & PSE1 1Gbps PCI info and PCI ID")
      Signed-off-by: default avatarVoon Weifeng <weifeng.voon@intel.com>
      Co-developed-by: default avatarMohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
      Signed-off-by: default avatarMohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
      Link: https://lore.kernel.org/r/20210126100844.30326-1-mohammad.athari.ismail@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      7cfc4486
    • Wong, Vee Khee's avatar
      stmmac: intel: Add ADL-S 1Gbps PCI IDs · 88af9bd4
      Wong, Vee Khee authored
      Added PCI IDs for both Ethernet TSN Controllers on the ADL-S.
      
      Also, skip SerDes programming sequences as these are being carried out
      at the BIOS level for ADL-S.
      Signed-off-by: default avatarWong, Vee Khee <vee.khee.wong@intel.com>
      Link: https://lore.kernel.org/r/20210126085832.3814-1-vee.khee.wong@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      88af9bd4
    • Giacinto Cifelli's avatar
      net: usb: cdc_ether: added support for Thales Cinterion PLSx3 modem family. · dad3a72f
      Giacinto Cifelli authored
      lsusb -v for this device:
      
      Bus 003 Device 007: ID 1e2d:0069
      Device Descriptor:
        bLength                18
        bDescriptorType         1
        bcdUSB               2.00
        bDeviceClass          239 Miscellaneous Device
        bDeviceSubClass         2 ?
        bDeviceProtocol         1 Interface Association
        bMaxPacketSize0        64
        idVendor           0x1e2d
        idProduct          0x0069
        bcdDevice            0.00
        iManufacturer           4 Cinterion Wireless Modules
        iProduct                3 PLSx3
        iSerial                 5 fa3c1419
        bNumConfigurations      1
        Configuration Descriptor:
          bLength                 9
          bDescriptorType         2
          wTotalLength          352
          bNumInterfaces         10
          bConfigurationValue     1
          iConfiguration          2 Cinterion Configuration
          bmAttributes         0xe0
            Self Powered
            Remote Wakeup
          MaxPower              500mA
          Interface Association:
            bLength                 8
            bDescriptorType        11
            bFirstInterface         0
            bInterfaceCount         2
            bFunctionClass          2 Communications
            bFunctionSubClass       2 Abstract (modem)
            bFunctionProtocol       1 AT-commands (v.25ter)
            iFunction               0
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        0
            bAlternateSetting       0
            bNumEndpoints           1
            bInterfaceClass         2 Communications
            bInterfaceSubClass      2 Abstract (modem)
            bInterfaceProtocol      1 AT-commands (v.25ter)
            iInterface              0
            CDC Header:
              bcdCDC               1.10
            CDC ACM:
              bmCapabilities       0x02
                line coding and serial state
            CDC Call Management:
              bmCapabilities       0x03
                call management
                use DataInterface
              bDataInterface          1
            CDC Union:
              bMasterInterface        0
              bSlaveInterface         1
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x81  EP 1 IN
              bmAttributes            3
                Transfer Type            Interrupt
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0040  1x 64 bytes
              bInterval               5
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        1
            bAlternateSetting       0
            bNumEndpoints           2
            bInterfaceClass        10 CDC Data
            bInterfaceSubClass      0 Unused
            bInterfaceProtocol      0
            iInterface              0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x82  EP 2 IN
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x01  EP 1 OUT
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
          Interface Association:
            bLength                 8
            bDescriptorType        11
            bFirstInterface         2
            bInterfaceCount         2
            bFunctionClass          2 Communications
            bFunctionSubClass       2 Abstract (modem)
            bFunctionProtocol       1 AT-commands (v.25ter)
            iFunction               0
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        2
            bAlternateSetting       0
            bNumEndpoints           1
            bInterfaceClass         2 Communications
            bInterfaceSubClass      2 Abstract (modem)
            bInterfaceProtocol      1 AT-commands (v.25ter)
            iInterface              0
            CDC Header:
              bcdCDC               1.10
            CDC ACM:
              bmCapabilities       0x02
                line coding and serial state
            CDC Call Management:
              bmCapabilities       0x03
                call management
                use DataInterface
              bDataInterface          3
            CDC Union:
              bMasterInterface        2
              bSlaveInterface         3
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x83  EP 3 IN
              bmAttributes            3
                Transfer Type            Interrupt
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0040  1x 64 bytes
              bInterval               5
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        3
            bAlternateSetting       0
            bNumEndpoints           2
            bInterfaceClass        10 CDC Data
            bInterfaceSubClass      0 Unused
            bInterfaceProtocol      0
            iInterface              0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x84  EP 4 IN
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x02  EP 2 OUT
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
          Interface Association:
            bLength                 8
            bDescriptorType        11
            bFirstInterface         4
            bInterfaceCount         2
            bFunctionClass          2 Communications
            bFunctionSubClass       2 Abstract (modem)
            bFunctionProtocol       1 AT-commands (v.25ter)
            iFunction               0
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        4
            bAlternateSetting       0
            bNumEndpoints           1
            bInterfaceClass         2 Communications
            bInterfaceSubClass      2 Abstract (modem)
            bInterfaceProtocol      1 AT-commands (v.25ter)
            iInterface              0
            CDC Header:
              bcdCDC               1.10
            CDC ACM:
              bmCapabilities       0x02
                line coding and serial state
            CDC Call Management:
              bmCapabilities       0x03
                call management
                use DataInterface
              bDataInterface          5
            CDC Union:
              bMasterInterface        4
              bSlaveInterface         5
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x85  EP 5 IN
              bmAttributes            3
                Transfer Type            Interrupt
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0040  1x 64 bytes
              bInterval               5
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        5
            bAlternateSetting       0
            bNumEndpoints           2
            bInterfaceClass        10 CDC Data
            bInterfaceSubClass      0 Unused
            bInterfaceProtocol      0
            iInterface              0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x86  EP 6 IN
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x03  EP 3 OUT
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
          Interface Association:
            bLength                 8
            bDescriptorType        11
            bFirstInterface         6
            bInterfaceCount         2
            bFunctionClass          2 Communications
            bFunctionSubClass       2 Abstract (modem)
            bFunctionProtocol       1 AT-commands (v.25ter)
            iFunction               0
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        6
            bAlternateSetting       0
            bNumEndpoints           1
            bInterfaceClass         2 Communications
            bInterfaceSubClass      2 Abstract (modem)
            bInterfaceProtocol      1 AT-commands (v.25ter)
            iInterface              0
            CDC Header:
              bcdCDC               1.10
            CDC ACM:
              bmCapabilities       0x02
                line coding and serial state
            CDC Call Management:
              bmCapabilities       0x03
                call management
                use DataInterface
              bDataInterface          7
            CDC Union:
              bMasterInterface        6
              bSlaveInterface         7
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x87  EP 7 IN
              bmAttributes            3
                Transfer Type            Interrupt
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0040  1x 64 bytes
              bInterval               5
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        7
            bAlternateSetting       0
            bNumEndpoints           2
            bInterfaceClass        10 CDC Data
            bInterfaceSubClass      0 Unused
            bInterfaceProtocol      0
            iInterface              0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x88  EP 8 IN
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x04  EP 4 OUT
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
          Interface Association:
            bLength                 8
            bDescriptorType        11
            bFirstInterface         8
            bInterfaceCount         2
            bFunctionClass          2 Communications
            bFunctionSubClass       0
            bFunctionProtocol       0
            iFunction               0
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        8
            bAlternateSetting       0
            bNumEndpoints           1
            bInterfaceClass         2 Communications
            bInterfaceSubClass      6 Ethernet Networking
            bInterfaceProtocol      0
            iInterface              0
            CDC Header:
              bcdCDC               1.10
            CDC Ethernet:
              iMacAddress                      1 00A0C6C14190
              bmEthernetStatistics    0x00000000
              wMaxSegmentSize              16384
              wNumberMCFilters            0x0001
              bNumberPowerFilters              0
            CDC Union:
              bMasterInterface        8
              bSlaveInterface         9
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x89  EP 9 IN
              bmAttributes            3
                Transfer Type            Interrupt
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0040  1x 64 bytes
              bInterval               5
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        9
            bAlternateSetting       0
            bNumEndpoints           0
            bInterfaceClass        10 CDC Data
            bInterfaceSubClass      0 Unused
            bInterfaceProtocol      0
            iInterface              0
          Interface Descriptor:
            bLength                 9
            bDescriptorType         4
            bInterfaceNumber        9
            bAlternateSetting       1
            bNumEndpoints           2
            bInterfaceClass        10 CDC Data
            bInterfaceSubClass      0 Unused
            bInterfaceProtocol      0
            iInterface              0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x8a  EP 10 IN
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
            Endpoint Descriptor:
              bLength                 7
              bDescriptorType         5
              bEndpointAddress     0x05  EP 5 OUT
              bmAttributes            2
                Transfer Type            Bulk
                Synch Type               None
                Usage Type               Data
              wMaxPacketSize     0x0200  1x 512 bytes
              bInterval               0
      Device Qualifier (for other device speed):
        bLength                10
        bDescriptorType         6
        bcdUSB               2.00
        bDeviceClass          239 Miscellaneous Device
        bDeviceSubClass         2 ?
        bDeviceProtocol         1 Interface Association
        bMaxPacketSize0        64
        bNumConfigurations      1
      Device Status:     0x0000
        (Bus Powered)
      Signed-off-by: default avatarGiacinto Cifelli <gciofono@gmail.com>
      Link: https://lore.kernel.org/r/20210126044245.8455-1-gciofono@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      dad3a72f
    • Linus Torvalds's avatar
      Merge tag 'locking-urgent-2021-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c64396cc
      Linus Torvalds authored
      Pull locking fixes from Thomas Gleixner:
       "A set of PI futex fixes:
      
         - Address a longstanding issue where the user space part of the PI
           futex is not writeable. The kernel returns with inconsistent state
           which can in the worst case result in a UAF of a tasks kernel
           stack.
      
           The solution is to establish consistent kernel state which makes
           future operations on the futex fail because user space and kernel
           space state are inconsistent. Not a problem as PI futexes
           fundamentaly require a functional RW mapping and if user space
           pulls the rug under it, then it can keep the pieces it asked for.
      
         - Address an issue where the return value is incorrect in case that
           the futex was acquired after a timeout/signal made the waiter drop
           out of the rtmutex wait.
      
           In one of the corner cases the kernel returned an error code
           despite having successfully acquired the futex"
      
      * tag 'locking-urgent-2021-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        futex: Handle faults correctly for PI futexes
        futex: Simplify fixup_pi_state_owner()
        futex: Use pi_state_update_owner() in put_pi_state()
        rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
        futex: Provide and use pi_state_update_owner()
        futex: Replace pointless printk in fixup_owner()
        futex: Ensure the correct return value from futex_lock_pi()
      c64396cc
    • Eric Dumazet's avatar
      net: reduce indentation level in sk_clone_lock() · bbc20b70
      Eric Dumazet authored
      Rework initial test to jump over init code
      if memory allocation has failed.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Link: https://lore.kernel.org/r/20210127152731.748663-1-eric.dumazet@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      bbc20b70
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.11-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · e5ff2cb9
      Linus Torvalds authored
      Pull xen fixes from Juergen Gross:
      
       - A fix for a regression introduced in 5.11 resulting in Xen dom0
         having problems to correctly initialize Xenstore.
      
       - A fix for avoiding WARN splats when booting as Xen dom0 with
         CONFIG_AMD_MEM_ENCRYPT enabled due to a missing trap handler for the
         #VC exception (even if the handler should never be called).
      
       - A fix for the Xen bklfront driver adapting to the correct but
         unexpected behavior of new qemu.
      
      * tag 'for-linus-5.11-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        x86/xen: avoid warning in Xen pv guest with CONFIG_AMD_MEM_ENCRYPT enabled
        xen: Fix XenStore initialisation for XS_LOCAL
        xen-blkfront: allow discard-* nodes to be optional
      e5ff2cb9
    • Linus Torvalds's avatar
      Merge tag 'asm-generic-fixes-v5.11' of... · 228345bf
      Linus Torvalds authored
      Merge tag 'asm-generic-fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
      
      Pull ia64 fixes from Arnd Bergmann:
       "asm-generic/ia64 fixes, and mark as orphaned
      
        Commit 2b49ddce ("ia64: convert to legacy_timer_tick") from my
        timer series I merged through the asm-generic tree caused a regression
        on all ia64 machines, as bisected by Adrian Glaubitz.
      
        Tony Luck is no longer really working on ia64, so instead of merging
        the fix through his tree, we ended up deciding that I'd merge the fix
        myself along a patch to mark the architecture as Orphaned and a
        compile time warning fix I made while working on the regression"
      
      [ HPE no longer accepts orders for new Itanium hardware, and Intel
        stopped accepting orders a year ago. While intel is still officially
        shipping chips until July 29, 2021, it's unlikely that any such orders
        actually exist.
      
        It's dead, Jim.
                           - Linus ]
      
      * tag 'asm-generic-fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        ia64: Mark architecture as orphaned
        ia64: fix xchg() warning
        ia64: fix timer cleanup regression
      228345bf
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-fixes-v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 7485e08e
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "These are the current arm-soc bug fixes for linux-5.11. I already
        merged a larger set that just came in during the past three days but
        has not had much exposure in linux-next, but this is the subset I
        merged last week.
      
        Most of these are for the NXP i.MX platform (descriptions from their
        pull request):
      
         - Fix pcf2127 reset for imx7d-flex-concentrator board.
         - Fix i.MX6 suspend with Thumb-2 kernel.
         - Fix ethernet-phy address issue on imx6qdl-sr-som board.
         - Fix GPIO3 `gpio-ranges` on i.MX8MP.
         - Select SOC_BUS for IMX_SCU driver to fix build issue.
         - Fix backlight pwm on imx6qdl-kontron-samx6i which is lost from
           #pwm-cells conversion.
         - Fix duplicated bus node name for i.MX8MN SoC.
         - Fix reset register offset on LS1028A SoC.
         - Rename MMC node aliases for imx6q-tbs2910 to keep the MMC device
           index consistent with previous kernel version.
         - Selecting ARM_GIC_V3 on non-CP15 processors to fix one build
           failure with i.MX8M SoC driver.
         - Fix typos with status property on imx6qdl-kontron-samx6i board.
         - Fix duplicated regulator-name on imx6qdl-gw52xx board.
      
        Aside from i.MX, the bugfixes are all over the place:
      
         - Coccinelle found a refcount imbalance on integrator
         - defconfig fix for TI K3
         - A boot regression fix for ST ux500
         - A code preemption fix for the optee driver
         - USB DMA regression on Broadcom Stingray
         - A bogus boot time warning fix for at91 code"
      
      * tag 'arm-soc-fixes-v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
        MAINTAINERS: Include bcm2835 subsequents into search
        arm64: dts: broadcom: Fix USB DMA address translation for Stingray
        drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
        drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs
        tee: optee: replace might_sleep with cond_resched
        firmware: imx: select SOC_BUS to fix firmware build
        arm64: dts: imx8mp: Correct the gpio ranges of gpio3
        ARM: dts: imx6qdl-sr-som: fix some cubox-i platforms
        ARM: imx: build suspend-imx6.S with arm instruction set
        ARM: dts: imx7d-flex-concentrator: fix pcf2127 reset
        ARM: dts: ux500: Reserve memory carveouts
        arm64: defconfig: Drop unused K3 SoC specific options
        bus: arm-integrator-lm: Add of_node_put() before return statement
        ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
        ARM: dts: imx6qdl-kontron-samx6i: fix i2c_lcd/cam default status
        ARM: imx: fix imx8m dependencies
        ARM: dts: tbs2910: rename MMC node aliases
        arm64: dts: ls1028a: fix the offset of the reset register
        arm64: dts: imx8mn: Fix duplicate node name
        ARM: dts: imx6qdl-kontron-samx6i: fix pwms for lcd-backlight
      7485e08e
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · b0dfa64d
      Linus Torvalds authored
      Pull rdma fixes from Jason Gunthorpe:
       "Several recent regressions and some bug fixes:
      
         - Typo corrupting the max_recv_sge for cxgb4
      
         - Regression from re-using kernel enums as a HW AbI in vmw_pvrdma
      
         - Sleeping inside a spinlock in hns
      
         - Revert the attempt to fix devlink deadlocks as the fix is more buggy
      
         - Typo in sysfs_emit_at conversions
      
         - Revert the removal of VLAN support in rxe"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
        Revert "RDMA/rxe: Remove VLAN code leftovers from RXE"
        RDMA/usnic: Fix misuse of sysfs_emit_at
        Revert "RDMA/mlx5: Fix devlink deadlock on net namespace deletion"
        RDMA/hns: Use mutex instead of spinlock for ida allocation
        RDMA/vmw_pvrdma: Fix network_hdr_type reported in WC
        RDMA/cxgb4: Fix the reported max_recv_sge value
      b0dfa64d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid · 25221c99
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
      
       - NULL pointer dereference regression fix for Wacom driver (Jason
         Gerecke)
      
       - functional regression fix for pam handling on some Elan and Synaptics
         touchpads (Kai-Heng Feng)
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
        HID: wacom: Correct NULL dereference on AES pen proximity
        HID: multitouch: Apply MT_QUIRK_CONFIDENCE quirk for multi-input devices
      25221c99
    • Linus Torvalds's avatar
      Merge tag 'media/v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · fc856f1d
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
      
       - a V4L2 core regression at videobuf2 when checking for single-plane
         dmabuf
      
       - a change at uAPI header v4l2-subdev.h, fixing a breakage as BIT()
         macro is not available in userspace
      
       - fix some regressions at RC core due to the usage of microseconds
         everywhere on it
      
       - a fix for a race condition at RC core
      
       - a rename on a newly-introduced kAPI symbol (v4l2_get_link_rate),
         currently used only by a single driver
      
       - Regression fixes for rcar-vin, cedrus, ite-cir, hantro, css, venus,
         and cec drivers.
      
      * tag 'media/v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        media: hantro: Fix reset_raw_fmt initialization
        media: cec: add stm32 driver
        media: cedrus: Fix H264 decoding
        media: v4l2-subdev.h: BIT() is not available in userspace
        media: Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"
        media: rc: ite-cir: fix min_timeout calculation
        media: venus: core: Fix platform driver shutdown
        media: rc: fix timeout handling after switch to microsecond durations
        media: v4l: common: Fix naming of v4l2_get_link_rate
        media: rcar-vin: fix return, use ret instead of zero
        media: ccs: Get static data version minor correctly
        media: ccs-pll: Fix link frequency for C-PHY
        media: rc: ensure that uevent can be read directly after rc device register
      fc856f1d
    • Linus Torvalds's avatar
      Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · a467b073
      Linus Torvalds authored
      Pull clk fixes from Stephen Boyd:
       "A handful of clk driver fixes:
      
         - Build fix for CONFIG_PM=n in the mmp2 driver
      
         - Kconfig warning for unmet dependencies in the i.MX driver
      
         - Make the camera AHB clk always be enabled on qcom sc7180
      
         - Use rate round down semantics for qcom sm8250 SD clks"
      
      * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        clk: mmp2: fix build without CONFIG_PM
        clk: qcom: gcc-sm250: Use floor ops for sdcc clks
        clk: imx: fix Kconfig warning for i.MX SCU clk
        clk: qcom: gcc-sc7180: Mark the camera abh clock always ON
      a467b073
    • Linus Torvalds's avatar
      Merge tag 'sound-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · be4a3385
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Although the incoming fixes haven't settled down yet, all changes here
        are small and mostly device-specific fixes, so nothing look worrisome.
      
         - Yet another USB-audio regression fixes
      
         - HD-audio ID fix and device-specific quirks
      
         - SOF Intel / SoundWire fixes including topology
      
         - ASoC Qualcomm and Mediatek fixes"
      
      * tag 'sound-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
        ALSA: hda/via: Apply the workaround generically for Clevo machines
        ASoC: Intel: sof_sdw: set proper flags for Dell TGL-H SKU 0A5E
        ASoC: qcom: lpass: Fix out-of-bounds DAI ID lookup
        ASoC: mediatek: mt8192-mt6359: add format constraints for RT5682
        ASoC: ak4458: correct reset polarity
        ASoC: SOF: SND_INTEL_DSP_CONFIG dependency
        ASoC: SOF: Intel: soundwire: fix select/depend unmet dependencies
        ALSA: hda: intel-dsp-config: add PCI id for TGL-H
        ALSA: usb-audio: workaround for iface reset issue
        ALSA: pcm: One more dependency for hw constraints
        ALSA: hda/realtek: Enable headset of ASUS B1400CEPE with ALC256
        ASoC: Intel: Skylake: Zero snd_ctl_elem_value
        ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete
        ASoC: qcom: Fix number of HDMI RDMA channels on sc7180
        ASoC: mediatek: mt8183-da7219: ignore TDM DAI link by default
        ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link by default
        ASoC: topology: Properly unregister DAI on removal
        ASoC: topology: Fix memory corruption in soc_tplg_denum_create_values()
        ASoC: qcom: lpass-ipq806x: fix bitwidth regmap field
        ASoC: AMD Renoir - refine DMI entries for some Lenovo products
        ...
      be4a3385
    • Wang Hai's avatar
      Revert "mm/slub: fix a memory leak in sysfs_slab_add()" · 757fed1d
      Wang Hai authored
      This reverts commit dde3c6b7.
      
      syzbot report a double-free bug. The following case can cause this bug.
      
       - mm/slab_common.c: create_cache(): if the __kmem_cache_create() fails,
         it does:
      
      	out_free_cache:
      		kmem_cache_free(kmem_cache, s);
      
       - but __kmem_cache_create() - at least for slub() - will have done
      
      	sysfs_slab_add(s)
      		-> sysfs_create_group() .. fails ..
      		-> kobject_del(&s->kobj); .. which frees s ...
      
      We can't remove the kmem_cache_free() in create_cache(), because other
      error cases of __kmem_cache_create() do not free this.
      
      So, revert the commit dde3c6b7 ("mm/slub: fix a memory leak in
      sysfs_slab_add()") to fix this.
      
      Reported-by: syzbot+d0bd96b4696c1ef67991@syzkaller.appspotmail.com
      Fixes: dde3c6b7 ("mm/slub: fix a memory leak in sysfs_slab_add()")
      Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
      Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      757fed1d
    • Lorenzo Carletti's avatar
      net: dsa: rtl8366rb: standardize init jam tables · d1f3bdd4
      Lorenzo Carletti authored
      In the rtl8366rb driver there are some jam tables which contain
      undocumented values.
      While trying to understand what these tables actually do,
      I noticed a discrepancy in how one of those was treated.
      Most of them were plain u16 arrays, while the ethernet one was
      an u16 matrix.
      By looking at the vendor's droplets of source code these tables came from,
      I found out that they were all originally u16 matrixes.
      
      This commit standardizes the jam tables, turning them all into
      jam_tbl_entry arrays. Each entry contains 2 u16 values.
      This change makes it easier to understand how the jam tables are used
      and also makes it possible for a single function to handle all of them,
      removing some duplicated code.
      Signed-off-by: default avatarLorenzo Carletti <lorenzo.carletti98@gmail.com>
      Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      d1f3bdd4
    • Jakub Kicinski's avatar
      Merge branch 'mlx5-updates-2021-01-26' · 5cc921a3
      Jakub Kicinski authored
      Saeed Mahameed says:
      
      ====================
      mlx5 devlink traps support
      
      Add support for devlink traps [1] reporting in mlx5,
      mlx5 will also report/trap packets filtered due to dest mac steering miss
      
      The first patch in the series defines the new DMAC trap type in devlink
      for this purpose.
      
      Other patches in the series are mlx5 only and they gradually traps support.
      Supported traps:
      
      DMAC: Drops due to destination MAC not configured in the MAC table
      VLAN: Drops due to vlan not configured in the vlan table
      
      Design note:
      devlink instance is managed by the low level mlx5 core layer, mlx5 core will
      serve as an abstraction layer for trap reporting, since we might have multiple
      mlx5 interfaces who might want to report traps on the same device.
      ====================
      
      Link: https://lore.kernel.org/r/20210126232419.175836-1-saeedm@nvidia.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      5cc921a3
    • Aya Levin's avatar
      net/mlx5e: Enable traps according to link state · eb3862a0
      Aya Levin authored
      Avoid trapping packets when the interface is down, and revive them when
      interface is back up. Add API to mlx5 core retrieving the action by trap
      id. Use it to apply traps when interface is up, and disable then when
      interface is down.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      eb3862a0
    • Aya Levin's avatar
      net/mlx5e: Add listener to DMAC filter trap event · 49fdbd23
      Aya Levin authored
      Add support for trapping packets which didn't match any DMAC in the MAC
      table. Add a listener which adds/removes MAC trap rule in the flow
      steering according to the trap's action trap/drop.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      49fdbd23
    • Aya Levin's avatar
      net/mlx5e: Add listener to trap event · 70038b73
      Aya Levin authored
      Add support for listening to blocking events in the ETH driver. Listen
      on trap event. If received, call mlx5e_handle_trap_event() which:
      1) Verifies if driver needs open/close trap-RQ with respect to the
      active traps count.
      2) Inspects trap id and its action (trap/drop) and add/remove the flow
      steering rule accordingly.
      Otherwise, return an error.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      70038b73
    • Aya Levin's avatar
      net/mlx5e: Add trap entity to ETH driver · 5543e989
      Aya Levin authored
      Introduce mlx5e_trap which includes a dedicated RQ and NAPI for trapped
      packets. Trap-RQ processes packets that were destined to be dropped,
      but for debug and visibility sake these packets are trapped and reported
      to devlink.
      Trap-RQ connects between the HW and the driver and is not a part of a
      channel. Open mlx5e_create_rq() and mlx5_core_destroy_rq() as API and
      add dedicate RQ handlers which report to devlink of trapped packets.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      5543e989
    • Aya Levin's avatar
      net/mlx5e: Expose RX dma info helpers · cf747609
      Aya Levin authored
      In order to support RQs outside of channel context, change
      mlx5e_init_di_list() signature to accept NUMA node instead of cpu.
      In addition, expose dma info helpers as API. This API will be used for
      RQ's creation in other files in downstream patches.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      cf747609
    • Aya Levin's avatar
      net/mlx5e: Add flow steering DMAC trap rule · ceef1b66
      Aya Levin authored
      Add flow group to the L2 table to hold the catch-all DMAC rule. Add API
      which adds/removes DMAC trap rule. This rule catches packets that were
      destined to be dropped due to no-match with previous DMAC rules. The
      trap rule steer these packets to the trap tir related to the trap-RQ.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      ceef1b66
    • Aya Levin's avatar
      net/mlx5e: Add flow steering VLAN trap rule · e2a1a004
      Aya Levin authored
      Add flow group to the VLAN table to hold the catch-all VLAN rule. Add
      API which adds/removes VLAN trap rule. This rule catches packets that
      were destined to be dropped due to no-match with previous VLAN rules.
      The trap rule steer these packets to the trap tir related to the
      trap-RQ.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      e2a1a004
    • Aya Levin's avatar
      net/mlx5e: Optimize promiscuous mode · 1c46d740
      Aya Levin authored
      Change steering flow to optimize traffic in promiscuous mode. On demand,
      add a high priority table containing a catch-all rule. All incoming
      packets are caught by this rule and steered directly to the TTC table.
      Prior to this change, packets in promiscuous mode may suffer from up to
      4 steering hops before reaching TTC table.
      In addition, this patch will allow us adding a catch-all rule at the end
      of MAC table to serve MAC trap, with no impact on promiscuous mode
      performance.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
      Reviewed-by: default avatarMaor Gottlieb <maorg@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      1c46d740
    • Aya Levin's avatar
      net/mlx5: Notify on trap action by blocking event · 241dc159
      Aya Levin authored
      In order to allow mlx5 core driver to trigger synchronous operations to
      its consumers, add a blocking events handler. Add wrappers to
      blocking_notifier_[call_chain/chain_register/chain_unregister]. Add trap
      callback for action set and notify about this change. Following patches
      in the set add a listener for this event.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      241dc159
    • Aya Levin's avatar
      net/mlx5: Rename events notifier header · 3eac5d94
      Aya Levin authored
      Change the naming of events notifier head to clarify that it handles
      only firmware events. Coming patches in the set, add event notifier for
      software events.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      3eac5d94
    • Aya Levin's avatar
      net/mlx5: Register to devlink DMAC filter trap · f679247f
      Aya Levin authored
      Core driver is registered to the devlink traps service, which enables the
      admin to redeem packets that were destined to be dropped due to a
      particular reason. Register to DMAC filter, allow visibility of packets
      that were filtered out by the MAC table.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      f679247f
    • Aya Levin's avatar
      net/mlx5: Register to devlink ingress VLAN filter trap · 82e6c96f
      Aya Levin authored
      Add traps registration to mlx5_core devlink register/unregister flow.
      This patch registers INGRESS_VLAN_FILTER trap.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      82e6c96f
    • Aya Levin's avatar
      net/mlx5: Add support for devlink traps in mlx5 core driver · 3d347b1b
      Aya Levin authored
      Add devlink traps infra-structure to mlx5 core driver. Add traps list to
      mlx5_priv and corresponding API:
       - mlx5_devlink_trap_report() to wrap trap reports to devlink
       - mlx5_devlink_trap_get_num_active() to decide whether to open/close trap
         resources.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      3d347b1b
    • Aya Levin's avatar
      devlink: Add DMAC filter generic packet trap · e78ab164
      Aya Levin authored
      Add packet trap that can report packets that were dropped due to
      destination MAC filtering.
      Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
      Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
      Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
      Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      e78ab164