5.5.10-rc1 review
Greg Kroah-Hartman
maintainercover 5.5.10-rc1 review
This is the start of the stable review cycle for the 5.5.10 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 19 Mar 2020 10:31:16 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.10-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.5.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.5.10-rc1
Karsten Graul <[email protected]>
net/smc: check for valid ib_client_data
Eric Dumazet <[email protected]>
ipv6: restrict IPV6_ADDRFORM operation
Suravee Suthikulpanit <[email protected]>
iommu/amd: Fix IOMMU AVIC not properly update the is_run bit in IRTE
Wolfram Sang <[email protected]>
i2c: acpi: put device when verifying client fails
Daniel Drake <[email protected]>
iommu/vt-d: Ignore devices with out-of-spec domain number
Zhenzhong Duan <[email protected]>
iommu/vt-d: Fix the wrong printing in RHSA parsing
Pablo Neira Ayuso <[email protected]>
netfilter: nft_chain_nat: inet family is missing module ownership
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: dump NFTA_CHAIN_FLAGS attribute
Jakub Kicinski <[email protected]>
netfilter: nft_tunnel: add missing attribute validation for tunnels
Jakub Kicinski <[email protected]>
netfilter: nft_payload: add missing attribute validation for payload csum flags
Jakub Kicinski <[email protected]>
netfilter: cthelper: add missing attribute validation for cthelper
Florian Westphal <[email protected]>
netfilter: nf_tables: free flowtable hooks on hook register error
Tommi Rantala <[email protected]>
perf bench futex-wake: Restore thread count default to online CPU count
Jakub Kicinski <[email protected]>
nl80211: add missing attribute validation for channel switch
Jakub Kicinski <[email protected]>
nl80211: add missing attribute validation for beacon report scanning
Jakub Kicinski <[email protected]>
nl80211: add missing attribute validation for critical protocol indication
Hamish Martin <[email protected]>
i2c: gpio: suppress error on probe defer
Qian Cai <[email protected]>
iommu/vt-d: Fix RCU-list bugs in intel_iommu_init()
Christoph Hellwig <[email protected]>
driver code: clarify and fix platform device DMA mask allocation
Zhenyu Wang <[email protected]>
drm/i915/gvt: Fix unnecessary schedule timer when no vGPU exits
Charles Keepax <[email protected]>
pinctrl: core: Remove extra kref_get which blocks hogs being freed
Tina Zhang <[email protected]>
drm/i915/gvt: Fix dma-buf display blur issue on CFL
Thomas Gleixner <[email protected]>
x86/mce/therm_throt: Undo thermal polling properly on CPU offline
Suman Anna <[email protected]>
virtio_ring: Fix mem leak with vring_new_virtqueue()
Leonard Crestez <[email protected]>
pinctrl: imx: scu: Align imx sc msg structs to 4
Nicolas Belin <[email protected]>
pinctrl: meson-gxl: fix GPIOX sdio pins
Anson Huang <[email protected]>
clk: imx8mn: Fix incorrect clock defines
Sven Eckelmann <[email protected]>
batman-adv: Don't schedule OGM for disabled interface
Yonghyun Hwang <[email protected]>
iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page
Amol Grover <[email protected]>
iommu/vt-d: Fix RCU list debugging warnings
Hans de Goede <[email protected]>
iommu/vt-d: dmar_parse_one_rmrr: replace WARN_TAINT with pr_warn + add_taint
Hans de Goede <[email protected]>
iommu/vt-d: dmar: replace WARN_TAINT with pr_warn + add_taint
Marc Zyngier <[email protected]>
iommu/dma: Fix MSI reservation allocation
Tony Luck <[email protected]>
x86/mce: Fix logic and comments around MSR_PPIN_CTL
Kim Phillips <[email protected]>
perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag
Felix Fietkau <[email protected]>
mt76: fix array overflow on receiving too many fragments for a packet
Jarkko Nikula <[email protected]>
i2c: designware-pci: Fix BUG_ON during device removal
Vladis Dronov <[email protected]>
efi: Add a sanity check to efivar_store_raw()
Vladis Dronov <[email protected]>
efi: Fix a race and a buffer overflow while reading efivars via sysfs
Tom Lendacky <[email protected]>
x86/ioremap: Map EFI runtime services data as encrypted for SEV
Wolfram Sang <[email protected]>
macintosh: windfarm: fix MODINFO regression
Corey Minyard <[email protected]>
pid: Fix error return value in some cases
Eric Biggers <[email protected]>
fscrypt: don't evict dirty inodes after removing key
Tejun Heo <[email protected]>
blk-iocost: fix incorrect vtime comparison in iocg_is_idle()
Artem Savkov <[email protected]>
ftrace: Return the first found result in lookup_rec()
Takashi Iwai <[email protected]>
ipmi_si: Avoid spurious errors for optional IRQs
Stefan Haberland <[email protected]>
s390/dasd: fix data corruption for thin provisioned devices
Paul Cercueil <[email protected]>
MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling
H. Nikolaus Schaller <[email protected]>
MIPS: DTS: CI20: fix interrupt for pcf8563 RTC
H. Nikolaus Schaller <[email protected]>
MIPS: DTS: CI20: fix PMU definitions for ACT8600
Miklos Szeredi <[email protected]>
fuse: fix stack use after return
Eugeniy Paltsev <[email protected]>
ARC: define __ALIGN_STR and __ALIGN symbols for ARC
Vitaly Kuznetsov <[email protected]>
KVM: nVMX: avoid NULL pointer dereference with incorrect EVMCS GPAs
Vitaly Kuznetsov <[email protected]>
KVM: x86: clear stale x86_emulate_ctxt->intercept value
Al Viro <[email protected]>
gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache
Al Viro <[email protected]>
cifs_atomic_open(): fix double-put on late allocation failure
Shin'ichiro Kawasaki <[email protected]>
block: Fix partition support for host aware zoned block devices
Steven Rostedt (VMware) <[email protected]>
ktest: Add timeout for ssh sync testing
Linus Walleij <[email protected]>
pinctrl: qcom: Assign irq_eoi conditionally
Mathias Kresin <[email protected]>
pinctrl: falcon: fix syntax error
Ben Chuang <[email protected]>
mmc: sdhci-pci-gli: Enable MSI interrupt for GL975x
Chris Wilson <[email protected]>
drm/i915/execlists: Enable timeslice on partial virtual engine dequeue
Chris Wilson <[email protected]>
drm/i915/gt: Close race between cacheline_retire and free
Chris Wilson <[email protected]>
drm/i915: Defer semaphore priority bumping to a workqueue
Matthew Auld <[email protected]>
drm/i915: be more solid in checking the alignment
Chris Wilson <[email protected]>
drm/i915: Return early for await_start on same timeline
Chris Wilson <[email protected]>
drm/i915: Actually emit the await_start
Colin Ian King <[email protected]>
drm/amd/display: remove duplicated assignment to grph_obj_type
Hillf Danton <[email protected]>
workqueue: don't use wq_select_unbound_cpu() for bound works
Vasily Averin <[email protected]>
netfilter: x_tables: xt_mttg_seq_next should increase position index
Vasily Averin <[email protected]>
netfilter: xt_recent: recent_seq_next should increase position index
Vasily Averin <[email protected]>
netfilter: synproxy: synproxy_cpu_seq_next should increase position index
Vasily Averin <[email protected]>
netfilter: nf_conntrack: ct_cpu_seq_next should increase position index
Hans de Goede <[email protected]>
iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint
Halil Pasic <[email protected]>
virtio-blk: fix hw_queue stopped on arbitrary error
Dan Moulding <[email protected]>
iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices
Florian Westphal <[email protected]>
netfilter: nf_tables: fix infinite loop when expr is not available
Michal Koutný <[email protected]>
cgroup: Iterate tasks that did not finish do_exit()
Vasily Averin <[email protected]>
cgroup: cgroup_procs_next should increase position index
Qian Cai <[email protected]>
cgroup: fix psi_show() crash on 32bit ino archs
Florian Fainelli <[email protected]>
net: phy: Avoid multiple suspends
Andrew Lunn <[email protected]>
net: dsa: mv88e6xxx: Add missing mask of ATU occupancy register
Andrew Lunn <[email protected]>
net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed
Julian Wiedmann <[email protected]>
s390/qeth: handle error when backing RX buffer
Julian Wiedmann <[email protected]>
s390/qeth: don't reset default_out_queue
Hangbin Liu <[email protected]>
selftests/net/fib_tests: update addr_metric_test for peer route testing
Hangbin Liu <[email protected]>
net/ipv6: remove the old peer route if change it to a new one
Hangbin Liu <[email protected]>
net/ipv6: need update peer route when modify metric
Heiner Kallweit <[email protected]>
net: phy: fix MDIO bus PM PHY resuming
Heiner Kallweit <[email protected]>
net: phy: avoid clearing PHY interrupts twice in irq handler
Jakub Kicinski <[email protected]>
nfc: add missing attribute validation for vendor subcommand
Jakub Kicinski <[email protected]>
nfc: add missing attribute validation for deactivate target
Jakub Kicinski <[email protected]>
nfc: add missing attribute validation for SE API
Jakub Kicinski <[email protected]>
tipc: add missing attribute validation for MTU property
Jakub Kicinski <[email protected]>
team: add missing attribute validation for array index
Jakub Kicinski <[email protected]>
team: add missing attribute validation for port ifindex
Jakub Kicinski <[email protected]>
net: taprio: add missing attribute validation for txtime delay
Jakub Kicinski <[email protected]>
net: fq: add missing attribute validation for orphan mask
Jakub Kicinski <[email protected]>
openvswitch: add missing attribute validation for hash
Jakub Kicinski <[email protected]>
macsec: add missing attribute validation for port
Jakub Kicinski <[email protected]>
can: add missing attribute validation for termination
Jakub Kicinski <[email protected]>
nl802154: add missing attribute validation for dev_type
Jakub Kicinski <[email protected]>
nl802154: add missing attribute validation
Jakub Kicinski <[email protected]>
fib: add missing attribute validation for tun_id
Jakub Kicinski <[email protected]>
devlink: validate length of region addr/len
Jakub Kicinski <[email protected]>
devlink: validate length of param values
Jian Shen <[email protected]>
net: hns3: clear port base VLAN when unload PF
Jian Shen <[email protected]>
net: hns3: fix RMW issue for VLAN filter switch
Yonglong Liu <[email protected]>
net: hns3: fix "tc qdisc del" failed issue
Madalin Bucur <[email protected]>
dpaa_eth: FMan erratum A050385 workaround
Madalin Bucur <[email protected]>
fsl/fman: detect FMan erratum A050385
Madalin Bucur <[email protected]>
arm64: dts: ls1043a: FMan erratum A050385
Madalin Bucur <[email protected]>
dt-bindings: net: FMan erratum A050385
Eric Dumazet <[email protected]>
net: memcg: fix lockdep splat in inet_csk_accept()
Shakeel Butt <[email protected]>
net: memcg: late association of sock to memcg
Shakeel Butt <[email protected]>
cgroup: memcg: net: do not associate sock with unrelated cgroup
Edwin Peer <[email protected]>
bnxt_en: fix error handling when flashing from file
Vasundhara Volam <[email protected]>
bnxt_en: reinitialize IRQs when MTU is modified
Eric Dumazet <[email protected]>
bonding/alb: make sure arp header is pulled before accessing it
Vinicius Costa Gomes <[email protected]>
taprio: Fix sending packets without dequeueing them
Eric Dumazet <[email protected]>
slip: make slhc_compress() more robust against malicious packets
Edward Cree <[email protected]>
sfc: detach from cb_page in efx_copy_channel()
You-Sheng Yang <[email protected]>
r8152: check disconnect status after long sleep
Colin Ian King <[email protected]>
net: systemport: fix index check to avoid an array out of bounds access
Remi Pommarel <[email protected]>
net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used
Karsten Graul <[email protected]>
net/smc: cancel event worker during device removal
Jonas Gorski <[email protected]>
net: phy: bcm63xx: fix OOPS due to missing driver name
Willem de Bruijn <[email protected]>
net/packet: tpacket_rcv: do not increment ring index on drop
Dan Carpenter <[email protected]>
net: nfc: fix bounds checking bugs on "pipe"
Vladimir Oltean <[email protected]>
net: mscc: ocelot: properly account for VLAN header length when setting MRU
Dmitry Bogdanov <[email protected]>
net: macsec: update SCI upon MAC address change.
Pablo Neira Ayuso <[email protected]>
netlink: Use netlink header as base to calculate bad attribute offset
Hangbin Liu <[email protected]>
net/ipv6: use configured metric when add peer route
Jian Shen <[email protected]>
net: hns3: fix a not link up issue when fibre port supports autoneg
Jakub Kicinski <[email protected]>
net: fec: validate the new settings in fec_enet_set_coalesce()
Russell King <[email protected]>
net: dsa: mv88e6xxx: fix lockup on warm boot
Russell King <[email protected]>
net: dsa: fix phylink_start()/phylink_stop() calls
Mahesh Bandewar <[email protected]>
macvlan: add cond_resched() during multicast processing
Mahesh Bandewar <[email protected]>
ipvlan: don't deref eth hdr before checking it's set
Eric Dumazet <[email protected]>
ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()
Jiri Wiesner <[email protected]>
ipvlan: do not add hardware address of master to its unicast filter list
Mahesh Bandewar <[email protected]>
ipvlan: add cond_resched_rcu() while processing muticast backlog
Hangbin Liu <[email protected]>
ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
Dmitry Yakunin <[email protected]>
inet_diag: return classid for all socket types
Eric Dumazet <[email protected]>
gre: fix uninit-value in __iptunnel_pull_header
Vishal Kulkarni <[email protected]>
cxgb4: fix checks for max queues to allocate
Dmitry Yakunin <[email protected]>
cgroup, netclassid: periodically release file_lock on classid updating
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fixed one of HP ALC671 platform Headset Mic supported
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add Headset Mic supported for HP cPC
Takashi Iwai <[email protected]>
ALSA: hda/realtek - More constifications
Nathan Chancellor <[email protected]>
virtio_balloon: Adjust label in virtballoon_probe
-------------
Diffstat:
Documentation/devicetree/bindings/net/fsl-fman.txt | 7 + Documentation/filesystems/porting.rst | 8 + Makefile | 4 +- arch/arc/include/asm/linkage.h | 2 + arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 2 + arch/mips/boot/dts/ingenic/ci20.dts | 44 ++++-- arch/mips/kernel/setup.c | 3 +- arch/x86/events/amd/uncore.c | 17 +-- arch/x86/kernel/cpu/mce/intel.c | 9 +- arch/x86/kernel/cpu/mce/therm_throt.c | 9 +- arch/x86/kvm/emulate.c | 1 + arch/x86/kvm/vmx/nested.c | 5 +- arch/x86/mm/ioremap.c | 18 +++ block/blk-iocost.c | 2 +- block/genhd.c | 36 +++++ drivers/base/platform.c | 25 +--- drivers/block/virtio_blk.c | 8 +- drivers/char/ipmi/ipmi_si_platform.c | 4 +- drivers/firmware/efi/efivars.c | 32 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 29 ++-- drivers/gpu/drm/i915/gt/intel_timeline.c | 8 +- drivers/gpu/drm/i915/gvt/display.c | 3 +- drivers/gpu/drm/i915/gvt/vgpu.c | 12 +- drivers/gpu/drm/i915/i915_request.c | 28 +++- drivers/gpu/drm/i915/i915_request.h | 2 + drivers/gpu/drm/i915/i915_utils.h | 5 + drivers/i2c/busses/i2c-designware-pcidrv.c | 1 + drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/i2c-core-acpi.c | 10 +- drivers/iommu/amd_iommu.c | 4 +- drivers/iommu/dma-iommu.c | 16 +- drivers/iommu/dmar.c | 21 ++- drivers/iommu/intel-iommu.c | 24 ++- drivers/macintosh/windfarm_ad7417_sensor.c | 7 + drivers/macintosh/windfarm_fcu_controls.c | 7 + drivers/macintosh/windfarm_lm75_sensor.c | 16 +- drivers/macintosh/windfarm_lm87_sensor.c | 7 + drivers/macintosh/windfarm_max6690_sensor.c | 7 + drivers/macintosh/windfarm_smu_sat.c | 7 + drivers/mmc/host/sdhci-pci-gli.c | 17 +++ drivers/net/bonding/bond_alb.c | 20 +-- drivers/net/can/dev.c | 1 + drivers/net/dsa/mv88e6xxx/chip.c | 2 + drivers/net/dsa/mv88e6xxx/global2.c | 8 +- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 24 ++- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 49 ++++--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 110 +++++++++++++- drivers/net/ethernet/freescale/fec_main.c | 6 +- drivers/net/ethernet/freescale/fman/Kconfig | 28 ++++ drivers/net/ethernet/freescale/fman/fman.c | 18 +++ drivers/net/ethernet/freescale/fman/fman.h | 5 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 46 +++++- drivers/net/ethernet/mscc/ocelot.c | 28 ++-- drivers/net/ethernet/mscc/ocelot_dev.h | 2 +- drivers/net/ethernet/sfc/efx.c | 1 + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 +- drivers/net/ipvlan/ipvlan_core.c | 19 ++- drivers/net/ipvlan/ipvlan_main.c | 5 +- drivers/net/macsec.c | 12 +- drivers/net/macvlan.c | 2 + drivers/net/phy/bcm63xx.c | 1 + drivers/net/phy/phy.c | 3 +- drivers/net/phy/phy_device.c | 11 +- drivers/net/slip/slhc.c | 14 +- drivers/net/team/team.c | 2 + drivers/net/usb/r8152.c | 8 + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 +- drivers/net/wireless/mediatek/mt76/dma.c | 9 +- drivers/pinctrl/core.c | 1 - drivers/pinctrl/freescale/pinctrl-scu.c | 4 +- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 +- drivers/pinctrl/pinctrl-falcon.c | 2 +- drivers/pinctrl/qcom/pinctrl-msm.c | 3 +- drivers/s390/block/dasd.c | 27 +++- drivers/s390/block/dasd_eckd.c | 163 ++++++++++++++++++++- drivers/s390/block/dasd_int.h | 15 +- drivers/s390/net/qeth_core_main.c | 14 +- drivers/virtio/virtio_balloon.c | 2 +- drivers/virtio/virtio_ring.c | 4 +- fs/cifs/dir.c | 1 - fs/crypto/keysetup.c | 9 ++ fs/fuse/dev.c | 6 +- fs/fuse/fuse_i.h | 2 + fs/gfs2/inode.c | 2 +- fs/open.c | 3 - include/dt-bindings/clock/imx8mn-clock.h | 4 +- include/linux/cgroup.h | 1 + include/linux/dmar.h | 8 +- include/linux/genhd.h | 13 +- include/linux/inet_diag.h | 18 ++- include/linux/phy.h | 3 + include/linux/platform_device.h | 2 +- include/net/fib_rules.h | 1 + kernel/cgroup/cgroup.c | 43 ++++-- kernel/pid.c | 2 + kernel/trace/ftrace.c | 2 + kernel/workqueue.c | 14 +- mm/memcontrol.c | 14 +- net/batman-adv/bat_iv_ogm.c | 4 + net/core/devlink.c | 33 +++-- net/core/netclassid_cgroup.c | 47 ++++-- net/core/sock.c | 5 +- net/dsa/dsa_priv.h | 2 + net/dsa/port.c | 44 ++++-- net/dsa/slave.c | 8 +- net/ieee802154/nl_policy.c | 6 + net/ipv4/gre_demux.c | 12 +- net/ipv4/inet_connection_sock.c | 20 +++ net/ipv4/inet_diag.c | 44 +++--- net/ipv4/raw_diag.c | 5 +- net/ipv4/udp_diag.c | 5 +- net/ipv6/addrconf.c | 51 +++++-- net/ipv6/ipv6_sockglue.c | 10 +- net/netfilter/nf_conntrack_standalone.c | 2 +- net/netfilter/nf_synproxy_core.c | 2 +- net/netfilter/nf_tables_api.c | 22 ++- net/netfilter/nfnetlink_cthelper.c | 2 + net/netfilter/nft_chain_nat.c | 1 + net/netfilter/nft_payload.c | 1 + net/netfilter/nft_tunnel.c | 2 + net/netfilter/x_tables.c | 6 +- net/netfilter/xt_recent.c | 2 +- net/netlink/af_netlink.c | 2 +- net/nfc/hci/core.c | 19 ++- net/nfc/netlink.c | 4 + net/openvswitch/datapath.c | 1 + net/packet/af_packet.c | 13 +- net/sched/sch_fq.c | 1 + net/sched/sch_taprio.c | 13 +- net/sctp/diag.c | 8 +- net/smc/smc_ib.c | 3 + net/tipc/netlink.c | 1 + net/wireless/nl80211.c | 5 + sound/pci/hda/patch_realtek.c | 163 +++++++++++++-------- tools/perf/bench/futex-wake.c | 4 +- tools/testing/ktest/ktest.pl | 2 +- tools/testing/selftests/net/fib_tests.sh | 34 ++++- 142 files changed, 1420 insertions(+), 499 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/151 virtio_balloon: Adjust label in virtballoon_probe
From: Nathan Chancellor <[email protected]>
[ Upstream commit 6ae4edab2fbf86ec92fbf0a8f0c60b857d90d50f ]
Clang warns when CONFIG_BALLOON_COMPACTION is unset:
../drivers/virtio/virtio_balloon.c:963:1: warning: unused label 'out_del_vqs' [-Wunused-label]out_del_vqs:
^~~~~~~~~~~~
1 warning generated.
Move the label within the preprocessor block since it is only used when CONFIG_BALLOON_COMPACTION is set.
--- drivers/virtio/virtio_balloon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virtio/virtio_balloon.c +1 -1
@@ -959,8 +959,8 @@ out_iput:iput (vb->vb_dev_info.inode); out_kern_unmount:kern_unmount (balloon_mnt); -#endif out_del_vqs: +#endif vdev->config->del_vqs (vdev); out_free_vb:kfree (vb);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/151 ALSA: hda/realtek - More constifications
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 6b0f95c49d890440c01a759c767dfe40e2acdbf2 ]
Apply const prefix to each coef table array.
Just for minor optimization and no functional changes.
--- sound/pci/hda/patch_realtek.c | 118 +++++++++++++++++----------------- 1 file changed, 59 insertions(+), 59 deletions(-)
sound/pci/hda/patch_realtek.c +59 -59
@@ -949,7 +949,7 @@ struct alc_codec_rename_pci_table {const char *name; }; -static struct alc_codec_rename_table rename_tbl[] = { +static const struct alc_codec_rename_table rename_tbl[] = { {0x10ec0221 ,0xf00f ,0x1003 ,"ALC231" }, {0x10ec0269 ,0xfff0 ,0x3010 ,"ALC277" }, {0x10ec0269 ,0xf0f0 ,0x2010 ,"ALC259" },
@@ -970,7 +970,7 @@ static struct alc_codec_rename_table rename_tbl[] = { { }/* terminator */ }; -static struct alc_codec_rename_pci_table rename_pci_tbl[] = { +static const struct alc_codec_rename_pci_table rename_pci_tbl[] = { {0x10ec0280 ,0x1028 ,0 ,"ALC3220" }, {0x10ec0282 ,0x1028 ,0 ,"ALC3221" }, {0x10ec0283 ,0x1028 ,0 ,"ALC3223" },
@@ -3000,7 +3000,7 @@ static void alc269_shutup(struct hda_codec *codec)alc_shutup_pins (codec); } -static struct coef_fw alc282_coefs[] = { +static const struct coef_fw alc282_coefs[] = {WRITE_COEF (0x03 ,0x0002 ),/* Power Down Control */ UPDATE_COEF (0x05 ,0xff3f ,0x0700 ),/* FIFO and filter clock */ WRITE_COEF (0x07 ,0x0200 ),/* DMIC control */
@@ -3112,7 +3112,7 @@ static void alc282_shutup(struct hda_codec *codec)alc_write_coef_idx (codec,0x78 , coef78); } -static struct coef_fw alc283_coefs[] = { +static const struct coef_fw alc283_coefs[] = {WRITE_COEF (0x03 ,0x0002 ),/* Power Down Control */ UPDATE_COEF (0x05 ,0xff3f ,0x0700 ),/* FIFO and filter clock */ WRITE_COEF (0x07 ,0x0200 ),/* DMIC control */
@@ -4188,7 +4188,7 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec, } } -static struct coef_fw alc225_pre_hsmode[] = { +static const struct coef_fw alc225_pre_hsmode[] = {UPDATE_COEF (0x4a ,1 <<8 ,0 ),UPDATE_COEFEX (0x57 ,0x05 ,1 <<14 ,0 ),UPDATE_COEF (0x63 ,3 <<14 ,3 <<14 ),
@@ -4201,7 +4201,7 @@ static struct coef_fw alc225_pre_hsmode[] = {static void alc_headset_mode_unplugged (struct hda_codec *codec) { -static struct coef_fw coef0255[] = { +static const struct coef_fw coef0255[] = {WRITE_COEF (0x1b ,0x0c0b ),/* LDO and MISC control */ WRITE_COEF (0x45 ,0xd089 ),/* UAJ function set to menual mode */ UPDATE_COEFEX (0x57 ,0x05 ,1 <<14 ,0 ),/* Direct Drive HP Amp control(Set to verb control)*/
@@ -4209,7 +4209,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) WRITE_COEFEX(0x57, 0x03, 0x8aa6), /* Direct Drive HP Amp control */ {} }; -static struct coef_fw coef0256[] = { +static const struct coef_fw coef0256[] = {WRITE_COEF (0x1b ,0x0c4b ),/* LDO and MISC control */ WRITE_COEF (0x45 ,0xd089 ),/* UAJ function set to menual mode */ WRITE_COEF (0x06 ,0x6104 ),/* Set MIC2 Vref gate with HP */
@@ -4217,7 +4217,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), /* Direct Drive HP Amp control(Set to verb control)*/ {} }; -static struct coef_fw coef0233[] = { +static const struct coef_fw coef0233[] = {WRITE_COEF (0x1b ,0x0c0b ),WRITE_COEF (0x45 ,0xc429 ),UPDATE_COEF (0x35 ,0x4000 ,0 ),
@@ -4227,7 +4227,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) WRITE_COEF(0x32, 0x42a3), {} }; -static struct coef_fw coef0288[] = { +static const struct coef_fw coef0288[] = {UPDATE_COEF (0x4f ,0xfcc0 ,0xc400 ),UPDATE_COEF (0x50 ,0x2000 ,0x2000 ),UPDATE_COEF (0x56 ,0x0006 ,0x0006 ),
@@ -4235,18 +4235,18 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) UPDATE_COEF(0x67, 0x2000, 0), {} }; -static struct coef_fw coef0298[] = { +static const struct coef_fw coef0298[] = {UPDATE_COEF (0x19 ,0x1300 ,0x0300 ), {} }; -static struct coef_fw coef0292[] = { +static const struct coef_fw coef0292[] = {WRITE_COEF (0x76 ,0x000e ),WRITE_COEF (0x6c ,0x2400 ),WRITE_COEF (0x18 ,0x7308 ),WRITE_COEF (0x6b ,0xc429 ), {} }; -static struct coef_fw coef0293[] = { +static const struct coef_fw coef0293[] = {UPDATE_COEF (0x10 ,7 <<8 ,6 <<8 ),/* SET Line1 JD to 0 */ UPDATE_COEFEX (0x57 ,0x05 ,1 <<15 |1 <<13 ,0x0 ),/* SET charge pump by verb */ UPDATE_COEFEX (0x57 ,0x03 ,1 <<10 ,1 <<10 ),/* SET EN_OSW to 1 */
@@ -4255,16 +4255,16 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) UPDATE_COEF(0x4a, 0x000f, 0x000e), /* Combo Jack auto detect */ {} }; -static struct coef_fw coef0668[] = { +static const struct coef_fw coef0668[] = {WRITE_COEF (0x15 ,0x0d40 ),WRITE_COEF (0xb7 ,0x802b ), {} }; -static struct coef_fw coef0225[] = { +static const struct coef_fw coef0225[] = {UPDATE_COEF (0x63 ,3 <<14 ,0 ), {} }; -static struct coef_fw coef0274[] = { +static const struct coef_fw coef0274[] = {UPDATE_COEF (0x4a ,0x0100 ,0 ),UPDATE_COEFEX (0x57 ,0x05 ,0x4000 ,0 ),UPDATE_COEF (0x6b ,0xf000 ,0x5000 ),
@@ -4329,25 +4329,25 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)static void alc_headset_mode_mic_in (struct hda_codec *codec,hda_nid_t hp_pin,hda_nid_t mic_pin) { -static struct coef_fw coef0255[] = { +static const struct coef_fw coef0255[] = {WRITE_COEFEX (0x57 ,0x03 ,0x8aa6 ),WRITE_COEF (0x06 ,0x6100 ),/* Set MIC2 Vref gate to normal */ {} }; -static struct coef_fw coef0256[] = { +static const struct coef_fw coef0256[] = {UPDATE_COEFEX (0x57 ,0x05 ,1 <<14 ,1 <<14 ),/* Direct Drive HP Amp control(Set to verb control)*/ WRITE_COEFEX (0x57 ,0x03 ,0x09a3 ),WRITE_COEF (0x06 ,0x6100 ),/* Set MIC2 Vref gate to normal */ {} }; -static struct coef_fw coef0233[] = { +static const struct coef_fw coef0233[] = {UPDATE_COEF (0x35 ,0 ,1 <<14 ),WRITE_COEF (0x06 ,0x2100 ),WRITE_COEF (0x1a ,0x0021 ),WRITE_COEF (0x26 ,0x008c ), {} }; -static struct coef_fw coef0288[] = { +static const struct coef_fw coef0288[] = {UPDATE_COEF (0x4f ,0x00c0 ,0 ),UPDATE_COEF (0x50 ,0x2000 ,0 ),UPDATE_COEF (0x56 ,0x0006 ,0 ),
@@ -4356,30 +4356,30 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, UPDATE_COEF(0x67, 0x2000, 0x2000), {} }; -static struct coef_fw coef0292[] = { +static const struct coef_fw coef0292[] = {WRITE_COEF (0x19 ,0xa208 ),WRITE_COEF (0x2e ,0xacf0 ), {} }; -static struct coef_fw coef0293[] = { +static const struct coef_fw coef0293[] = {UPDATE_COEFEX (0x57 ,0x05 ,0 ,1 <<15 |1 <<13 ),/* SET charge pump by verb */ UPDATE_COEFEX (0x57 ,0x03 ,1 <<10 ,0 ),/* SET EN_OSW to 0 */ UPDATE_COEF (0x1a ,1 <<3 ,0 ),/* Combo JD gating without LINE1-VREFO */ {} }; -static struct coef_fw coef0688[] = { +static const struct coef_fw coef0688[] = {WRITE_COEF (0xb7 ,0x802b ),WRITE_COEF (0xb5 ,0x1040 ),UPDATE_COEF (0xc3 ,0 ,1 <<12 ), {} }; -static struct coef_fw coef0225[] = { +static const struct coef_fw coef0225[] = {UPDATE_COEFEX (0x57 ,0x05 ,1 <<14 ,1 <<14 ),UPDATE_COEF (0x4a ,3 <<4 ,2 <<4 ),UPDATE_COEF (0x63 ,3 <<14 ,0 ), {} }; -static struct coef_fw coef0274[] = { +static const struct coef_fw coef0274[] = {UPDATE_COEFEX (0x57 ,0x05 ,0x4000 ,0x4000 ),UPDATE_COEF (0x4a ,0x0010 ,0 ),UPDATE_COEF (0x6b ,0xf000 ,0 ),
@@ -4465,7 +4465,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,static void alc_headset_mode_default (struct hda_codec *codec) { -static struct coef_fw coef0225[] = { +static const struct coef_fw coef0225[] = {UPDATE_COEF (0x45 ,0x3f <<10 ,0x30 <<10 ),UPDATE_COEF (0x45 ,0x3f <<10 ,0x31 <<10 ),UPDATE_COEF (0x49 ,3 <<8 ,0 <<8 ),
@@ -4474,14 +4474,14 @@ static void alc_headset_mode_default(struct hda_codec *codec) UPDATE_COEF(0x67, 0xf000, 0x3000), {} }; -static struct coef_fw coef0255[] = { +static const struct coef_fw coef0255[] = {WRITE_COEF (0x45 ,0xc089 ),WRITE_COEF (0x45 ,0xc489 ),WRITE_COEFEX (0x57 ,0x03 ,0x8ea6 ),WRITE_COEF (0x49 ,0x0049 ), {} }; -static struct coef_fw coef0256[] = { +static const struct coef_fw coef0256[] = {WRITE_COEF (0x45 ,0xc489 ),WRITE_COEFEX (0x57 ,0x03 ,0x0da3 ),WRITE_COEF (0x49 ,0x0049 ),
@@ -4489,12 +4489,12 @@ static void alc_headset_mode_default(struct hda_codec *codec) WRITE_COEF(0x06, 0x6100), {} }; -static struct coef_fw coef0233[] = { +static const struct coef_fw coef0233[] = {WRITE_COEF (0x06 ,0x2100 ),WRITE_COEF (0x32 ,0x4ea3 ), {} }; -static struct coef_fw coef0288[] = { +static const struct coef_fw coef0288[] = {UPDATE_COEF (0x4f ,0xfcc0 ,0xc400 ),/* Set to TRS type */ UPDATE_COEF (0x50 ,0x2000 ,0x2000 ),UPDATE_COEF (0x56 ,0x0006 ,0x0006 ),
@@ -4502,26 +4502,26 @@ static void alc_headset_mode_default(struct hda_codec *codec) UPDATE_COEF(0x67, 0x2000, 0), {} }; -static struct coef_fw coef0292[] = { +static const struct coef_fw coef0292[] = {WRITE_COEF (0x76 ,0x000e ),WRITE_COEF (0x6c ,0x2400 ),WRITE_COEF (0x6b ,0xc429 ),WRITE_COEF (0x18 ,0x7308 ), {} }; -static struct coef_fw coef0293[] = { +static const struct coef_fw coef0293[] = {UPDATE_COEF (0x4a ,0x000f ,0x000e ),/* Combo Jack auto detect */ WRITE_COEF (0x45 ,0xC429 ),/* Set to TRS type */ UPDATE_COEF (0x1a ,1 <<3 ,0 ),/* Combo JD gating without LINE1-VREFO */ {} }; -static struct coef_fw coef0688[] = { +static const struct coef_fw coef0688[] = {WRITE_COEF (0x11 ,0x0041 ),WRITE_COEF (0x15 ,0x0d40 ),WRITE_COEF (0xb7 ,0x802b ), {} }; -static struct coef_fw coef0274[] = { +static const struct coef_fw coef0274[] = {WRITE_COEF (0x45 ,0x4289 ),UPDATE_COEF (0x4a ,0x0010 ,0x0010 ),UPDATE_COEF (0x6b ,0x0f00 ,0 ),
@@ -4584,53 +4584,53 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) {int val; -static struct coef_fw coef0255[] = { +static const struct coef_fw coef0255[] = {WRITE_COEF (0x45 ,0xd489 ),/* Set to CTIA type */ WRITE_COEF (0x1b ,0x0c2b ),WRITE_COEFEX (0x57 ,0x03 ,0x8ea6 ), {} }; -static struct coef_fw coef0256[] = { +static const struct coef_fw coef0256[] = {WRITE_COEF (0x45 ,0xd489 ),/* Set to CTIA type */ WRITE_COEF (0x1b ,0x0e6b ), {} }; -static struct coef_fw coef0233[] = { +static const struct coef_fw coef0233[] = {WRITE_COEF (0x45 ,0xd429 ),WRITE_COEF (0x1b ,0x0c2b ),WRITE_COEF (0x32 ,0x4ea3 ), {} }; -static struct coef_fw coef0288[] = { +static const struct coef_fw coef0288[] = {UPDATE_COEF (0x50 ,0x2000 ,0x2000 ),UPDATE_COEF (0x56 ,0x0006 ,0x0006 ),UPDATE_COEF (0x66 ,0x0008 ,0 ),UPDATE_COEF (0x67 ,0x2000 ,0 ), {} }; -static struct coef_fw coef0292[] = { +static const struct coef_fw coef0292[] = {WRITE_COEF (0x6b ,0xd429 ),WRITE_COEF (0x76 ,0x0008 ),WRITE_COEF (0x18 ,0x7388 ), {} }; -static struct coef_fw coef0293[] = { +static const struct coef_fw coef0293[] = {WRITE_COEF (0x45 ,0xd429 ),/* Set to ctia type */ UPDATE_COEF (0x10 ,7 <<8 ,7 <<8 ),/* SET Line1 JD to 1 */ {} }; -static struct coef_fw coef0688[] = { +static const struct coef_fw coef0688[] = {WRITE_COEF (0x11 ,0x0001 ),WRITE_COEF (0x15 ,0x0d60 ),WRITE_COEF (0xc3 ,0x0000 ), {} }; -static struct coef_fw coef0225_1[] = { +static const struct coef_fw coef0225_1[] = {UPDATE_COEF (0x45 ,0x3f <<10 ,0x35 <<10 ),UPDATE_COEF (0x63 ,3 <<14 ,2 <<14 ), {} }; -static struct coef_fw coef0225_2[] = { +static const struct coef_fw coef0225_2[] = {UPDATE_COEF (0x45 ,0x3f <<10 ,0x35 <<10 ),UPDATE_COEF (0x63 ,3 <<14 ,1 <<14 ), {}
@@ -4702,48 +4702,48 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)/* Nokia type */ static void alc_headset_mode_omtp (struct hda_codec *codec) { -static struct coef_fw coef0255[] = { +static const struct coef_fw coef0255[] = {WRITE_COEF (0x45 ,0xe489 ),/* Set to OMTP Type */ WRITE_COEF (0x1b ,0x0c2b ),WRITE_COEFEX (0x57 ,0x03 ,0x8ea6 ), {} }; -static struct coef_fw coef0256[] = { +static const struct coef_fw coef0256[] = {WRITE_COEF (0x45 ,0xe489 ),/* Set to OMTP Type */ WRITE_COEF (0x1b ,0x0e6b ), {} }; -static struct coef_fw coef0233[] = { +static const struct coef_fw coef0233[] = {WRITE_COEF (0x45 ,0xe429 ),WRITE_COEF (0x1b ,0x0c2b ),WRITE_COEF (0x32 ,0x4ea3 ), {} }; -static struct coef_fw coef0288[] = { +static const struct coef_fw coef0288[] = {UPDATE_COEF (0x50 ,0x2000 ,0x2000 ),UPDATE_COEF (0x56 ,0x0006 ,0x0006 ),UPDATE_COEF (0x66 ,0x0008 ,0 ),UPDATE_COEF (0x67 ,0x2000 ,0 ), {} }; -static struct coef_fw coef0292[] = { +static const struct coef_fw coef0292[] = {WRITE_COEF (0x6b ,0xe429 ),WRITE_COEF (0x76 ,0x0008 ),WRITE_COEF (0x18 ,0x7388 ), {} }; -static struct coef_fw coef0293[] = { +static const struct coef_fw coef0293[] = {WRITE_COEF (0x45 ,0xe429 ),/* Set to omtp type */ UPDATE_COEF (0x10 ,7 <<8 ,7 <<8 ),/* SET Line1 JD to 1 */ {} }; -static struct coef_fw coef0688[] = { +static const struct coef_fw coef0688[] = {WRITE_COEF (0x11 ,0x0001 ),WRITE_COEF (0x15 ,0x0d50 ),WRITE_COEF (0xc3 ,0x0000 ), {} }; -static struct coef_fw coef0225[] = { +static const struct coef_fw coef0225[] = {UPDATE_COEF (0x45 ,0x3f <<10 ,0x39 <<10 ),UPDATE_COEF (0x63 ,3 <<14 ,2 <<14 ), {}
@@ -4803,17 +4803,17 @@ static void alc_determine_headset_type(struct hda_codec *codec)int val;bool is_ctia = false;struct alc_spec *spec = codec->spec; -static struct coef_fw coef0255[] = { +static const struct coef_fw coef0255[] = {WRITE_COEF (0x45 ,0xd089 ),/* combo jack auto switch control(Check type)*/ WRITE_COEF (0x49 ,0x0149 ),/* combo jack auto switch control(Vref conteol) */ {} }; -static struct coef_fw coef0288[] = { +static const struct coef_fw coef0288[] = {UPDATE_COEF (0x4f ,0xfcc0 ,0xd400 ),/* Check Type */ {} }; -static struct coef_fw coef0298[] = { +static const struct coef_fw coef0298[] = {UPDATE_COEF (0x50 ,0x2000 ,0x2000 ),UPDATE_COEF (0x56 ,0x0006 ,0x0006 ),UPDATE_COEF (0x66 ,0x0008 ,0 ),
@@ -4821,19 +4821,19 @@ static void alc_determine_headset_type(struct hda_codec *codec) UPDATE_COEF(0x19, 0x1300, 0x1300), {} }; -static struct coef_fw coef0293[] = { +static const struct coef_fw coef0293[] = {UPDATE_COEF (0x4a ,0x000f ,0x0008 ),/* Combo Jack auto detect */ WRITE_COEF (0x45 ,0xD429 ),/* Set to ctia type */ {} }; -static struct coef_fw coef0688[] = { +static const struct coef_fw coef0688[] = {WRITE_COEF (0x11 ,0x0001 ),WRITE_COEF (0xb7 ,0x802b ),WRITE_COEF (0x15 ,0x0d60 ),WRITE_COEF (0xc3 ,0x0c00 ), {} }; -static struct coef_fw coef0274[] = { +static const struct coef_fw coef0274[] = {UPDATE_COEF (0x4a ,0x0010 ,0 ),UPDATE_COEF (0x4a ,0x8000 ,0 ),WRITE_COEF (0x45 ,0xd289 ),
@@ -5120,7 +5120,7 @@ static void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec,static void alc255_set_default_jack_type (struct hda_codec *codec) {/* Set to iphone type */ -static struct coef_fw alc255fw[] = { +static const struct coef_fw alc255fw[] = {WRITE_COEF (0x1b ,0x880b ),WRITE_COEF (0x45 ,0xd089 ),WRITE_COEF (0x1b ,0x080b ),
@@ -5128,7 +5128,7 @@ static void alc255_set_default_jack_type(struct hda_codec *codec) WRITE_COEF(0x1b, 0x0c0b), {} }; -static struct coef_fw alc256fw[] = { +static const struct coef_fw alc256fw[] = {WRITE_COEF (0x1b ,0x884b ),WRITE_COEF (0x45 ,0xd089 ),WRITE_COEF (0x1b ,0x084b ),
@@ -8513,7 +8513,7 @@ static void alc662_fixup_aspire_ethos_hp(struct hda_codec *codec, } } -static struct coef_fw alc668_coefs[] = { +static const struct coef_fw alc668_coefs[] = {WRITE_COEF (0x01 ,0xbebe ),WRITE_COEF (0x02 ,0xaaaa ),WRITE_COEF (0x03 ,0x0 ),WRITE_COEF (0x04 ,0x0180 ),WRITE_COEF (0x06 ,0x0 ),WRITE_COEF (0x07 ,0x0f80 ),WRITE_COEF (0x08 ,0x0031 ),WRITE_COEF (0x0a ,0x0060 ),WRITE_COEF (0x0b ,0x0 ),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/151 ALSA: hda/realtek - Add Headset Mic supported for HP cPC
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
[ Upstream commit 5af29028fd6db9438b5584ab7179710a0a22569d ]
HP ALC671 need to support Headset Mic.
--- sound/pci/hda/patch_realtek.c | 44 +++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
sound/pci/hda/patch_realtek.c +44 -0
@@ -8513,6 +8513,29 @@ static void alc662_fixup_aspire_ethos_hp(struct hda_codec *codec, } } +static void alc671_fixup_hp_headset_mic2 (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct alc_spec *spec = codec->spec; + +static const struct hda_pintbl pincfgs[] = { + {0x19 ,0x02a11040 },/* use as headset mic, with its own jack detect */ + {0x1b ,0x0181304f }, + { } + }; + +switch (action) { +case HDA_FIXUP_ACT_PRE_PROBE : + spec->gen.mixer_nid =0 ; + spec->parse_flags |=HDA_PINCFG_HEADSET_MIC ; +snd_hda_apply_pincfgs (codec, pincfgs); +break ; +case HDA_FIXUP_ACT_INIT : +alc_write_coef_idx (codec,0x19 ,0xa054 ); +break ; + } +} +static const struct coef_fw alc668_coefs[] = {WRITE_COEF (0x01 ,0xbebe ),WRITE_COEF (0x02 ,0xaaaa ),WRITE_COEF (0x03 ,0x0 ),WRITE_COEF (0x04 ,0x0180 ),WRITE_COEF (0x06 ,0x0 ),WRITE_COEF (0x07 ,0x0f80 ),
@@ -8586,6 +8609,7 @@ enum {ALC662_FIXUP_LENOVO_MULTI_CODECS ,ALC669_FIXUP_ACER_ASPIRE_ETHOS ,ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET , + ALC671_FIXUP_HP_HEADSET_MIC2, }; static const struct hda_fixup alc662_fixups[] = {
@@ -8927,6 +8951,10 @@ static const struct hda_fixup alc662_fixups[] = { .chained = true, .chain_id =ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET }, + [ALC671_FIXUP_HP_HEADSET_MIC2] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc671_fixup_hp_headset_mic2, + }, };static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -9109,6 +9137,22 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { {0x12, 0x90a60130}, {0x14, 0x90170110}, {0x15, 0x0321101f}), +SND_HDA_PIN_QUIRK (0x10ec0671 ,0x103c ,"HP cPC" ,ALC671_FIXUP_HP_HEADSET_MIC2 , + {0x14, 0x01014010}, + {0x17, 0x90170150}, + {0x1b, 0x01813030}, + {0x21, 0x02211020}), +SND_HDA_PIN_QUIRK (0x10ec0671 ,0x103c ,"HP cPC" ,ALC671_FIXUP_HP_HEADSET_MIC2 , + {0x14, 0x01014010}, + {0x18, 0x01a19040}, + {0x1b, 0x01813030}, + {0x21, 0x02211020}), +SND_HDA_PIN_QUIRK (0x10ec0671 ,0x103c ,"HP cPC" ,ALC671_FIXUP_HP_HEADSET_MIC2 , + {0x14, 0x01014020}, + {0x17, 0x90170110}, + {0x18, 0x01a19050}, + {0x1b, 0x01813040}, + {0x21, 0x02211030}), {} };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/151 ALSA: hda/realtek - Fixed one of HP ALC671 platform Headset Mic supported
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
[ Upstream commit f2adbae0cb20c8eaf06914b2187043ea944b0aff ]
HP want to keep BIOS verb table for release platform. So, it need to add 0x19 pin for quirk.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9140,6 +9140,7 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {SND_HDA_PIN_QUIRK (0x10ec0671 ,0x103c ,"HP cPC" ,ALC671_FIXUP_HP_HEADSET_MIC2 , {0x14, 0x01014010}, {0x17, 0x90170150}, + {0x19, 0x02a11060}, {0x1b, 0x01813030}, {0x21, 0x02211020}), SND_HDA_PIN_QUIRK(0x10ec0671, 0x103c, "HP cPC", ALC671_FIXUP_HP_HEADSET_MIC2,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/151 cgroup, netclassid: periodically release file_lock on classid updating
In reply to Greg Kroah-HartmanFrom: Dmitry Yakunin <[email protected]>
[ Upstream commit 018d26fcd12a75fb9b5fe233762aa3f2f0854b88 ]
In our production environment we have faced with problem that updating classid in cgroup with heavy tasks cause long freeze of the file tables in this tasks. By heavy tasks we understand tasks with many threads and opened sockets (e.g. balancers). This freeze leads to an increase number of client timeouts.
This patch implements following logic to fix this issue:
аfter iterating 1000 file descriptors file table lock will be released thus providing a time gap for socket creation/deletion.
Now update is non atomic and socket may be skipped using calls:
dup2(oldfd, newfd);
close(oldfd);
But this case is not typical. Moreover before this patch skip is possible too by hiding socket fd in unix socket buffer.
New sockets will be allocated with updated classid because cgroup state is updated before start of the file descriptors iteration.
So in common cases this patch has no side effects.
--- net/core/netclassid_cgroup.c | 47 +++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-)
net/core/netclassid_cgroup.c +37 -10
@@ -53,30 +53,60 @@ static void cgrp_css_free(struct cgroup_kfree (css_cls_state (css)); } +/* +* To avoid freezing of sockets creation for tasks with big number of threads +* and opened sockets lets release file_lock every 1000 iterated descriptors. +* New sockets will already have been created with new classid. +*/ + +struct update_classid_context { +u32 classid; +unsigned int batch; +}; + +#define UPDATE_CLASSID_BATCH 1000 +static int update_classid_sock (const void *v,struct file *file,unsigned n) {int err; +struct update_classid_context *ctx = (void *)v;struct socket *sock =sock_from_file (file, &err);if (sock) {spin_lock (&cgroup_sk_update_lock); -sock_cgroup_set_classid (&sock->sk->sk_cgrp_data, - (unsigned long )v); +sock_cgroup_set_classid (&sock->sk->sk_cgrp_data, ctx->classid);spin_unlock (&cgroup_sk_update_lock); } +if (--ctx->batch ==0 ) { + ctx->batch =UPDATE_CLASSID_BATCH ; +return n +1 ; + }return 0 ; } +static void update_classid_task (struct task_struct *p,u32 classid) +{ +struct update_classid_context ctx = { + .classid = classid, + .batch =UPDATE_CLASSID_BATCH + }; +unsigned int fd =0 ; + +do { +task_lock (p); + fd =iterate_fd (p->files, fd, update_classid_sock, &ctx); +task_unlock (p); +cond_resched (); + }while (fd); +} +static void cgrp_attach (struct cgroup_taskset *tset) {struct cgroup_subsys_state *css;struct task_struct *p;cgroup_taskset_for_each (p, css, tset) { -task_lock (p); -iterate_fd (p->files,0 , update_classid_sock, - (void *)(unsigned long )css_cls_state (css)->classid); -task_unlock (p); +update_classid_task (p,css_cls_state (css)->classid); } }
@@ -98,10 +128,7 @@ static int write_classid(struct cgroup_scss_task_iter_start (css,0 , &it);while ((p =css_task_iter_next (&it))) { -task_lock (p); -iterate_fd (p->files,0 , update_classid_sock, - (void *)(unsigned long )cs->classid); -task_unlock (p); +update_classid_task (p, cs->classid);cond_resched (); }css_task_iter_end (&it);
Greg Kroah-Hartman
maintainerPATCH 6/151 cxgb4: fix checks for max queues to allocate
In reply to Greg Kroah-HartmanFrom: Vishal Kulkarni <[email protected]>
[ Upstream commit 116ca924aea664141afa86a1425edc3fcda0d06f ]
Hardware can support more than 8 queues currently limited by netif_get_num_default_rss_queues(). So, rework and fix checks for max number of queues to allocate. The checks should be based on how many are actually supported by hardware, OR the number of online cpus; whichever is lower.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 49 +++++++++++++----------- 1 file changed, 27 insertions(+), 22 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +27 -22
@@ -5351,12 +5351,11 @@ static inline bool is_x_10g_port(const sstatic int cfg_queues (struct adapter *adap) {u32 avail_qsets, avail_eth_qsets, avail_uld_qsets; +u32 i, n10g =0 , qidx =0 , n1g =0 ; +u32 ncpus =num_online_cpus ();u32 niqflint, neq, num_ulds;struct sge *s = &adap->sge; -u32 i, n10g =0 , qidx =0 ; -#ifndef CONFIG_CHELSIO_T4_DCB -int q10g =0 ; -#endif +u32 q10g =0 , q1g;/* Reduce memory usage in kdump environment, disable all offload. */ if (is_kdump_kernel () || (is_uld (adap) &&t4_uld_mem_alloc (adap))) {
@@ -5394,44 +5393,50 @@ static int cfg_queues(struct adapter *ad n10g +=is_x_10g_port (&adap2pinfo (adap, i)->link_cfg); avail_eth_qsets =min_t (u32, avail_qsets,MAX_ETH_QSETS ); + +/* We default to 1 queue per non-10G port and up to # of cores queues +* per 10G port. +*/ +if (n10g) + q10g = (avail_eth_qsets - (adap->params.nports - n10g)) / n10g; + + n1g = adap->params.nports - n10g;#ifdef CONFIG_CHELSIO_T4_DCB /* For Data Center Bridging support we need to be able to support up * to 8 Traffic Priorities; each of which will be assigned to its * own TX Queue in order to prevent Head-Of-Line Blocking. */ + q1g =8 ;if (adap->params.nports *8 > avail_eth_qsets) {dev_err (adap->pdev_dev,"DCB avail_eth_qsets=%d < %d!\n" , avail_eth_qsets, adap->params.nports *8 );return -ENOMEM ; } -for_each_port (adap, i) { -struct port_info *pi =adap2pinfo (adap, i); +if (adap->params.nports * ncpus < avail_eth_qsets) + q10g =max (8U , ncpus); +else + q10g =max (8U , q10g); - pi->first_qset = qidx; - pi->nqsets =is_kdump_kernel () ?1 :8 ; - qidx += pi->nqsets; - } -#else /* !CONFIG_CHELSIO_T4_DCB */ -/* We default to 1 queue per non-10G port and up to # of cores queues -* per 10G port. -*/ -if (n10g) - q10g = (avail_eth_qsets - (adap->params.nports - n10g)) / n10g; -if (q10g >netif_get_num_default_rss_queues ()) - q10g =netif_get_num_default_rss_queues (); +while ((q10g * n10g) > (avail_eth_qsets - n1g * q1g)) + q10g--; -if (is_kdump_kernel ()) +#else /* !CONFIG_CHELSIO_T4_DCB */ + q1g =1 ; + q10g =min (q10g, ncpus); +#endif /* !CONFIG_CHELSIO_T4_DCB */ +if (is_kdump_kernel ()) { q10g =1 ; + q1g =1 ; + }for_each_port (adap, i) {struct port_info *pi =adap2pinfo (adap, i); pi->first_qset = qidx; - pi->nqsets =is_x_10g_port (&pi->link_cfg) ? q10g :1 ; + pi->nqsets =is_x_10g_port (&pi->link_cfg) ? q10g : q1g; qidx += pi->nqsets; } -#endif /* !CONFIG_CHELSIO_T4_DCB */ s->ethqsets = qidx; s->max_ethqsets = qidx;/* MSI-X may lower it later */
@@ -5443,7 +5448,7 @@ static int cfg_queues(struct adapter *ad* capped by the number of available cores. */ num_ulds = adap->num_uld + adap->num_ofld_uld; - i =min_t (u32,MAX_OFLD_QSETS ,num_online_cpus ()); + i =min_t (u32,MAX_OFLD_QSETS , ncpus); avail_uld_qsets =roundup (i, adap->params.nports);if (avail_qsets < num_ulds * adap->params.nports) { adap->params.offload =0 ;
Greg Kroah-Hartman
maintainerPATCH 7/151 gre: fix uninit-value in __iptunnel_pull_header
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 17c25cafd4d3e74c83dce56b158843b19c40b414 ]
syzbot found an interesting case of the kernel reading an uninit-value [1]
Problem is in the handling of ETH_P_WCCP in gre_parse_header()
We look at the byte following GRE options to eventually decide if the options are four bytes longer.
Use skb_header_pointer() to not pull bytes if we found that no more bytes were needed.
All callers of gre_parse_header() are properly using pskb_may_pull() anyway before proceeding to next header.
[1]
BUG: KMSAN: uninit-value in pskb_may_pull include/linux/skbuff.h:2303 [inline] BUG: KMSAN: uninit-value in __iptunnel_pull_header+0x30c/0xbd0 net/ipv4/ip_tunnel_core.c:94 CPU: 1 PID: 11784 Comm: syz-executor940 Not tainted 5.6.0-rc2-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 pskb_may_pull include/linux/skbuff.h:2303 [inline] __iptunnel_pull_header+0x30c/0xbd0 net/ipv4/ip_tunnel_core.c:94 iptunnel_pull_header include/net/ip_tunnels.h:411 [inline] gre_rcv+0x15e/0x19c0 net/ipv6/ip6_gre.c:606 ip6_protocol_deliver_rcu+0x181b/0x22c0 net/ipv6/ip6_input.c:432 ip6_input_finish net/ipv6/ip6_input.c:473 [inline] NF_HOOK include/linux/netfilter.h:307 [inline] ip6_input net/ipv6/ip6_input.c:482 [inline] ip6_mc_input+0xdf2/0x1460 net/ipv6/ip6_input.c:576 dst_input include/net/dst.h:442 [inline] ip6_rcv_finish net/ipv6/ip6_input.c:76 [inline] NF_HOOK include/linux/netfilter.h:307 [inline] ipv6_rcv+0x683/0x710 net/ipv6/ip6_input.c:306 __netif_receive_skb_one_core net/core/dev.c:5198 [inline] __netif_receive_skb net/core/dev.c:5312 [inline] netif_receive_skb_internal net/core/dev.c:5402 [inline] netif_receive_skb+0x66b/0xf20 net/core/dev.c:5461 tun_rx_batched include/linux/skbuff.h:4321 [inline] tun_get_user+0x6aef/0x6f60 drivers/net/tun.c:1997 tun_chr_write_iter+0x1f2/0x360 drivers/net/tun.c:2026 call_write_iter include/linux/fs.h:1901 [inline] new_sync_write fs/read_write.c:483 [inline] __vfs_write+0xa5a/0xca0 fs/read_write.c:496 vfs_write+0x44a/0x8f0 fs/read_write.c:558 ksys_write+0x267/0x450 fs/read_write.c:611 __do_sys_write fs/read_write.c:623 [inline] __se_sys_write fs/read_write.c:620 [inline] __ia32_sys_write+0xdb/0x120 fs/read_write.c:620 do_syscall_32_irqs_on arch/x86/entry/common.c:339 [inline] do_fast_syscall_32+0x3c7/0x6e0 arch/x86/entry/common.c:410 entry_SYSENTER_compat+0x68/0x77 arch/x86/entry/entry_64_compat.S:139 RIP: 0023:0xf7f62d99 Code: 90 e8 0b 00 00 00 f3 90 0f ae e8 eb f9 8d 74 26 00 89 3c 24 c3 90 90 90 90 90 90 90 90 90 90 90 90 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 eb 0d 90 90 90 90 90 90 90 90 90 90 90 90 RSP: 002b:00000000fffedb2c EFLAGS: 00000217 ORIG_RAX: 0000000000000004 RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 0000000020002580 RDX: 0000000000000fca RSI: 0000000000000036 RDI: 0000000000000004 RBP: 0000000000008914 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
Uninit was created at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:144 [inline] kmsan_internal_poison_shadow+0x66/0xd0 mm/kmsan/kmsan.c:127 kmsan_slab_alloc+0x8a/0xe0 mm/kmsan/kmsan_hooks.c:82 slab_alloc_node mm/slub.c:2793 [inline] __kmalloc_node_track_caller+0xb40/0x1200 mm/slub.c:4401 __kmalloc_reserve net/core/skbuff.c:142 [inline] __alloc_skb+0x2fd/0xac0 net/core/skbuff.c:210 alloc_skb include/linux/skbuff.h:1051 [inline] alloc_skb_with_frags+0x18c/0xa70 net/core/skbuff.c:5766 sock_alloc_send_pskb+0xada/0xc60 net/core/sock.c:2242 tun_alloc_skb drivers/net/tun.c:1529 [inline] tun_get_user+0x10ae/0x6f60 drivers/net/tun.c:1843 tun_chr_write_iter+0x1f2/0x360 drivers/net/tun.c:2026 call_write_iter include/linux/fs.h:1901 [inline] new_sync_write fs/read_write.c:483 [inline] __vfs_write+0xa5a/0xca0 fs/read_write.c:496 vfs_write+0x44a/0x8f0 fs/read_write.c:558 ksys_write+0x267/0x450 fs/read_write.c:611 __do_sys_write fs/read_write.c:623 [inline] __se_sys_write fs/read_write.c:620 [inline] __ia32_sys_write+0xdb/0x120 fs/read_write.c:620 do_syscall_32_irqs_on arch/x86/entry/common.c:339 [inline] do_fast_syscall_32+0x3c7/0x6e0 arch/x86/entry/common.c:410 entry_SYSENTER_compat+0x68/0x77 arch/x86/entry/entry_64_compat.S:139
--- net/ipv4/gre_demux.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/ipv4/gre_demux.c +10 -2
@@ -56,7 +56,9 @@ int gre_del_protocol(const struct gre_pr }EXPORT_SYMBOL_GPL (gre_del_protocol); -/* Fills in tpi and returns header length to be pulled. */ +/* Fills in tpi and returns header length to be pulled. +* Note that caller must use pskb_may_pull() before pulling GRE header. +*/ int gre_parse_header (struct sk_buff *skb,struct tnl_ptk_info *tpi,bool *csum_err,__be16 proto,int nhs) {
@@ -110,8 +112,14 @@ int gre_parse_header(struct sk_buff *skb* - When dealing with WCCPv2, Skip extra 4 bytes in GRE header */ if (greh->flags ==0 && tpi->proto ==htons (ETH_P_WCCP )) { +u8 _val, *val; + + val =skb_header_pointer (skb, nhs + hdr_len, +sizeof (_val), &_val); +if (!val) +return -EINVAL ; tpi->proto = proto; -if ((*(u8 *)options &0xF0 ) !=0x40 ) +if ((*val &0xF0 ) !=0x40 ) hdr_len +=4 ; } tpi->hdr_len = hdr_len;
Greg Kroah-Hartman
maintainerPATCH 8/151 inet_diag: return classid for all socket types
In reply to Greg Kroah-HartmanFrom: Dmitry Yakunin <[email protected]>
[ Upstream commit 83f73c5bb7b9a9135173f0ba2b1aa00c06664ff9 ]
In commit 1ec17dbd90f8 ("inet_diag: fix reporting cgroup classid and fallback to priority") croup classid reporting was fixed. But this works only for TCP sockets because for other socket types icsk parameter can be NULL and classid code path is skipped. This change moves classid handling to inet_diag_msg_attrs_fill() function.
Also inet_diag_msg_attrs_size() helper was added and addends in nlmsg_new() were reordered to save order from inet_sk_diag_fill().
--- include/linux/inet_diag.h | 18 ++++++++++++------ net/ipv4/inet_diag.c | 44 ++++++++++++++++++++------------------------ net/ipv4/raw_diag.c | 5 +++-- net/ipv4/udp_diag.c | 5 +++-- net/sctp/diag.c | 8 ++------ 5 files changed, 40 insertions(+), 40 deletions(-)
include/linux/inet_diag.h +12 -6
@@ -2,15 +2,10 @@ #ifndef _INET_DIAG_H_ #define _INET_DIAG_H_ 1 +#include <net/netlink.h> #include <uapi/linux/inet_diag.h> -struct net; -struct sock; struct inet_hashinfo; -struct nlattr; -struct nlmsghdr; -struct sk_buff; -struct netlink_callback; struct inet_diag_handler { void (*dump)(struct sk_buff *skb,
@@ -62,6 +57,17 @@ int inet_diag_bc_sk(const struct nlattrvoid inet_diag_msg_common_fill (struct inet_diag_msg *r,struct sock *sk); +static inline size_t inet_diag_msg_attrs_size (void ) +{ +return nla_total_size (1 )/* INET_DIAG_SHUTDOWN */ + + nla_total_size(1) /* INET_DIAG_TOS */ +#if IS_ENABLED (CONFIG_IPV6 ) + +nla_total_size (1 )/* INET_DIAG_TCLASS */ + + nla_total_size(1) /* INET_DIAG_SKV6ONLY */ +#endif + +nla_total_size (4 )/* INET_DIAG_MARK */ + +nla_total_size (4 );/* INET_DIAG_CLASS_ID */ +}int inet_diag_msg_attrs_fill (struct sock *sk,struct sk_buff *skb,struct inet_diag_msg *r,int ext,struct user_namespace *user_ns,bool net_admin);
net/ipv4/inet_diag.c +20 -24
63 lines not on this page · raw message
net/ipv4/raw_diag.c +3 -2
@@ -100,8 +100,9 @@ static int raw_diag_dump_one(struct sk_bif (IS_ERR (sk))return PTR_ERR (sk); - rep =nlmsg_new (sizeof (struct inet_diag_msg ) + -sizeof (struct inet_diag_meminfo ) +64 , + rep =nlmsg_new (nla_total_size (sizeof (struct inet_diag_msg )) + +inet_diag_msg_attrs_size () + +nla_total_size (sizeof (struct inet_diag_meminfo )) +64 ,GFP_KERNEL );if (!rep) {sock_put (sk);
net/ipv4/udp_diag.c +3 -2
@@ -64,8 +64,9 @@ static int udp_dump_one(struct udp_table goto out; err = -ENOMEM ; - rep =nlmsg_new (sizeof (struct inet_diag_msg ) + -sizeof (struct inet_diag_meminfo ) +64 , + rep =nlmsg_new (nla_total_size (sizeof (struct inet_diag_msg )) + +inet_diag_msg_attrs_size () + +nla_total_size (sizeof (struct inet_diag_meminfo )) +64 ,GFP_KERNEL );if (!rep) goto out;
net/sctp/diag.c +2 -6
@@ -237,15 +237,11 @@ static size_t inet_assoc_attr_size(struc addrcnt++;return nla_total_size (sizeof (struct sctp_info )) - +nla_total_size (1 )/* INET_DIAG_SHUTDOWN */ - +nla_total_size (1 )/* INET_DIAG_TOS */ - +nla_total_size (1 )/* INET_DIAG_TCLASS */ - +nla_total_size (4 )/* INET_DIAG_MARK */ - +nla_total_size (4 )/* INET_DIAG_CLASS_ID */ +nla_total_size (addrlen * asoc->peer.transport_count) +nla_total_size (addrlen * addrcnt) - +nla_total_size (sizeof (struct inet_diag_meminfo )) +nla_total_size (sizeof (struct inet_diag_msg )) + +inet_diag_msg_attrs_size () + +nla_total_size (sizeof (struct inet_diag_meminfo )) +64 ; }
Greg Kroah-Hartman
maintainerPATCH 9/151 ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 60380488e4e0b95e9e82aa68aa9705baa86de84c ]
Rafał found an issue that for non-Ethernet interface, if we down and up frequently, the memory will be consumed slowly.
The reason is we add allnodes/allrouters addressed in multicast list in ipv6_add_dev(). When link down, we call ipv6_mc_down(), store all multicast addresses via mld_add_delrec(). But when link up, we don't call ipv6_mc_up() for non-Ethernet interface to remove the addresses. This makes idev->mc_tomb getting bigger and bigger. The call stack looks like:
addrconf_notify(NETDEV_REGISTER)
ipv6_add_dev ipv6_dev_mc_inc(ff01::1) ipv6_dev_mc_inc(ff02::1) ipv6_dev_mc_inc(ff02::2)
addrconf_notify(NETDEV_UP)
addrconf_dev_config /* Alas, we support only Ethernet autoconfiguration. */ return;
addrconf_notify(NETDEV_DOWN)
addrconf_ifdown ipv6_mc_down igmp6_group_dropped(ff02::2) mld_add_delrec(ff02::2) igmp6_group_dropped(ff02::1) igmp6_group_dropped(ff01::1)
After investigating, I can't found a rule to disable multicast on non-Ethernet interface. In RFC2460, the link could be Ethernet, PPP, ATM, tunnels, etc. In IPv4, it doesn't check the dev type when calls ip_mc_up() in inetdev_event(). Even for IPv6, we don't check the dev type and call ipv6_add_dev(), ipv6_dev_mc_inc() after register device.
So I think it's OK to fix this memory consumer by calling ipv6_mc_up() for non-Ethernet interface.
v2: Also check IFF_MULTICAST flag to make sure the interface supports
multicast
--- net/ipv6/addrconf.c | 4 ++++ 1 file changed, 4 insertions(+)
net/ipv6/addrconf.c +4 -0
@@ -3345,6 +3345,10 @@ static void addrconf_dev_config(struct n (dev->type != ARPHRD_NONE) && (dev->type != ARPHRD_RAWIP)) {/* Alas, we support only Ethernet autoconfiguration. */ + idev =__in6_dev_get (dev); +if (!IS_ERR_OR_NULL (idev) && dev->flags &IFF_UP && + dev->flags &IFF_MULTICAST ) +ipv6_mc_up (idev);return ; }
Greg Kroah-Hartman
maintainerPATCH 10/151 ipvlan: add cond_resched_rcu() while processing muticast backlog
In reply to Greg Kroah-HartmanFrom: Mahesh Bandewar <[email protected]>
[ Upstream commit e18b353f102e371580f3f01dd47567a25acc3c1d ]
If there are substantial number of slaves created as simulated by Syzbot, the backlog processing could take much longer and result into the issue found in the Syzbot report.
INFO: rcu_sched detected stalls on CPUs/tasks:
(detected by 1, t=10502 jiffies, g=5049, c=5048, q=752)
All QSes seen, last rcu_sched kthread activity 10502 (4294965563-4294955061), jiffies_till_next_fqs=1, root ->qsmask 0x0
syz-executor.1 R running task on cpu 1 10984 11210 3866 0x30020008 179034491270
Call Trace:
<IRQ>
[<ffffffff81497163>] _sched_show_task kernel/sched/core.c:8063 [inline]
[<ffffffff81497163>] _sched_show_task.cold+0x2fd/0x392 kernel/sched/core.c:8030
[<ffffffff8146a91b>] sched_show_task+0xb/0x10 kernel/sched/core.c:8073
[<ffffffff815c931b>] print_other_cpu_stall kernel/rcu/tree.c:1577 [inline]
[<ffffffff815c931b>] check_cpu_stall kernel/rcu/tree.c:1695 [inline]
[<ffffffff815c931b>] __rcu_pending kernel/rcu/tree.c:3478 [inline]
[<ffffffff815c931b>] rcu_pending kernel/rcu/tree.c:3540 [inline]
[<ffffffff815c931b>] rcu_check_callbacks.cold+0xbb4/0xc29 kernel/rcu/tree.c:2876
[<ffffffff815e3962>] update_process_times+0x32/0x80 kernel/time/timer.c:1635
[<ffffffff816164f0>] tick_sched_handle+0xa0/0x180 kernel/time/tick-sched.c:161
[<ffffffff81616ae4>] tick_sched_timer+0x44/0x130 kernel/time/tick-sched.c:1193
[<ffffffff815e75f7>] __run_hrtimer kernel/time/hrtimer.c:1393 [inline]
[<ffffffff815e75f7>] __hrtimer_run_queues+0x307/0xd90 kernel/time/hrtimer.c:1455
[<ffffffff815e90ea>] hrtimer_interrupt+0x2ea/0x730 kernel/time/hrtimer.c:1513
[<ffffffff844050f4>] local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1031 [inline]
[<ffffffff844050f4>] smp_apic_timer_interrupt+0x144/0x5e0 arch/x86/kernel/apic/apic.c:1056
[<ffffffff84401cbe>] apic_timer_interrupt+0x8e/0xa0 arch/x86/entry/entry_64.S:778
RIP: 0010:do_raw_read_lock+0x22/0x80 kernel/locking/spinlock_debug.c:153
RSP: 0018:ffff8801dad07ab8 EFLAGS: 00000a02 ORIG_RAX: ffffffffffffff12
RAX: 0000000000000000 RBX: ffff8801c4135680 RCX: 0000000000000000
RDX: 1ffff10038826afe RSI: ffff88019d816bb8 RDI: ffff8801c41357f0
RBP: ffff8801dad07ac0 R08: 0000000000004b15 R09: 0000000000310273
R10: ffff88019d816bb8 R11: 0000000000000001 R12: ffff8801c41357e8
R13: 0000000000000000 R14: ffff8801cfb19850 R15: ffff8801cfb198b0
[<ffffffff8101460e>] __raw_read_lock_bh include/linux/rwlock_api_smp.h:177 [inline]
[<ffffffff8101460e>] _raw_read_lock_bh+0x3e/0x50 kernel/locking/spinlock.c:240
[<ffffffff840d78ca>] ipv6_chk_mcast_addr+0x11a/0x6f0 net/ipv6/mcast.c:1006
[<ffffffff84023439>] ip6_mc_input+0x319/0x8e0 net/ipv6/ip6_input.c:482
[<ffffffff840211c8>] dst_input include/net/dst.h:449 [inline]
[<ffffffff840211c8>] ip6_rcv_finish+0x408/0x610 net/ipv6/ip6_input.c:78
[<ffffffff840214de>] NF_HOOK include/linux/netfilter.h:292 [inline]
[<ffffffff840214de>] NF_HOOK include/linux/netfilter.h:286 [inline]
[<ffffffff840214de>] ipv6_rcv+0x10e/0x420 net/ipv6/ip6_input.c:278
[<ffffffff83a29efa>] __netif_receive_skb_one_core+0x12a/0x1f0 net/core/dev.c:5303
[<ffffffff83a2a15c>] __netif_receive_skb+0x2c/0x1b0 net/core/dev.c:5417
[<ffffffff83a2f536>] process_backlog+0x216/0x6c0 net/core/dev.c:6243
[<ffffffff83a30d1b>] napi_poll net/core/dev.c:6680 [inline]
[<ffffffff83a30d1b>] net_rx_action+0x47b/0xfb0 net/core/dev.c:6748
[<ffffffff846002c8>] __do_softirq+0x2c8/0x99a kernel/softirq.c:317
[<ffffffff813e656a>] invoke_softirq kernel/softirq.c:399 [inline]
[<ffffffff813e656a>] irq_exit+0x16a/0x1a0 kernel/softirq.c:439
[<ffffffff84405115>] exiting_irq arch/x86/include/asm/apic.h:561 [inline]
[<ffffffff84405115>] smp_apic_timer_interrupt+0x165/0x5e0 arch/x86/kernel/apic/apic.c:1058
[<ffffffff84401cbe>] apic_timer_interrupt+0x8e/0xa0 arch/x86/entry/entry_64.S:778
</IRQ>
RIP: 0010:__sanitizer_cov_trace_pc+0x26/0x50 kernel/kcov.c:102
RSP: 0018:ffff880196033bd8 EFLAGS: 00000246 ORIG_RAX: ffffffffffffff12
RAX: ffff88019d8161c0 RBX: 00000000ffffffff RCX: ffffc90003501000
RDX: 0000000000000002 RSI: ffffffff816236d1 RDI: 0000000000000005
RBP: ffff880196033bd8 R08: ffff88019d8161c0 R09: 0000000000000000
R10: 1ffff10032c067f0 R11: 0000000000000000 R12: 0000000000000000
R13: 0000000000000080 R14: 0000000000000000 R15: 0000000000000000
[<ffffffff816236d1>] do_futex+0x151/0x1d50 kernel/futex.c:3548
[<ffffffff816260f0>] C_SYSC_futex kernel/futex_compat.c:201 [inline]
[<ffffffff816260f0>] compat_SyS_futex+0x270/0x3b0 kernel/futex_compat.c:175
[<ffffffff8101da17>] do_syscall_32_irqs_on arch/x86/entry/common.c:353 [inline]
[<ffffffff8101da17>] do_fast_syscall_32+0x357/0xe1c arch/x86/entry/common.c:415
[<ffffffff84401a9b>] entry_SYSENTER_compat+0x8b/0x9d arch/x86/entry/entry_64_compat.S:139
RIP: 0023:0xf7f23c69
RSP: 002b:00000000f5d1f12c EFLAGS: 00000282 ORIG_RAX: 00000000000000f0
RAX: ffffffffffffffda RBX: 000000000816af88 RCX: 0000000000000080
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 000000000816af8c
RBP: 00000000f5d1f228 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
rcu_sched kthread starved for 10502 jiffies! g5049 c5048 f0x2 RCU_GP_WAIT_FQS(3) ->state=0x0 ->cpu=1
rcu_sched R running task on cpu 1 13048 8 2 0x90000000 179099587640
Call Trace:
[<ffffffff8147321f>] context_switch+0x60f/0xa60 kernel/sched/core.c:3209
[<ffffffff8100095a>] __schedule+0x5aa/0x1da0 kernel/sched/core.c:3934
[<ffffffff810021df>] schedule+0x8f/0x1b0 kernel/sched/core.c:4011
[<ffffffff8101116d>] schedule_timeout+0x50d/0xee0 kernel/time/timer.c:1803
[<ffffffff815c13f1>] rcu_gp_kthread+0xda1/0x3b50 kernel/rcu/tree.c:2327
[<ffffffff8144b318>] kthread+0x348/0x420 kernel/kthread.c:246
[<ffffffff84400266>] ret_from_fork+0x56/0x70 arch/x86/entry/entry_64.S:393--- drivers/net/ipvlan/ipvlan_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ipvlan/ipvlan_core.c +1 -0
@@ -277,6 +277,7 @@ void ipvlan_process_multicast(struct wor }ipvlan_count_rx (ipvlan, len, ret ==NET_RX_SUCCESS , true);local_bh_enable (); +cond_resched_rcu (); }rcu_read_unlock ();
Greg Kroah-Hartman
maintainerPATCH 11/151 ipvlan: do not add hardware address of master to its unicast filter list
In reply to Greg Kroah-HartmanFrom: Jiri Wiesner <[email protected]>
[ Upstream commit 63aae7b17344d4b08a7d05cb07044de4c0f9dcc6 ]
There is a problem when ipvlan slaves are created on a master device that is a vmxnet3 device (ipvlan in VMware guests). The vmxnet3 driver does not support unicast address filtering. When an ipvlan device is brought up in ipvlan_open(), the ipvlan driver calls dev_uc_add() to add the hardware address of the vmxnet3 master device to the unicast address list of the master device, phy_dev->uc. This inevitably leads to the vmxnet3 master device being forced into promiscuous mode by __dev_set_rx_mode().
Promiscuous mode is switched on the master despite the fact that there is still only one hardware address that the master device should use for filtering in order for the ipvlan device to be able to receive packets. The comment above struct net_device describes the uc_promisc member as a "counter, that indicates, that promiscuous mode has been enabled due to the need to listen to additional unicast addresses in a device that does not implement ndo_set_rx_mode()". Moreover, the design of ipvlan guarantees that only the hardware address of a master device, phy_dev->dev_addr, will be used to transmit and receive all packets from its ipvlan slaves. Thus, the unicast address list of the master device should not be modified by ipvlan_open() and ipvlan_stop() in order to make ipvlan a workable option on masters that do not support unicast address filtering.
--- drivers/net/ipvlan/ipvlan_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ipvlan/ipvlan_main.c +1 -4
@@ -164,7 +164,6 @@ static void ipvlan_uninit(struct net_devstatic int ipvlan_open (struct net_device *dev) {struct ipvl_dev *ipvlan =netdev_priv (dev); -struct net_device *phy_dev = ipvlan->phy_dev;struct ipvl_addr *addr; if (ipvlan->port->mode == IPVLAN_MODE_L3 ||
@@ -178,7 +177,7 @@ static int ipvlan_open(struct net_deviceipvlan_ht_addr_add (ipvlan, addr);rcu_read_unlock (); -return dev_uc_add (phy_dev, phy_dev->dev_addr); +return 0 ; }static int ipvlan_stop (struct net_device *dev)
@@ -190,8 +189,6 @@ static int ipvlan_stop(struct net_devicedev_uc_unsync (phy_dev, dev);dev_mc_unsync (phy_dev, dev); -dev_uc_del (phy_dev, phy_dev->dev_addr); -rcu_read_lock ();list_for_each_entry_rcu (addr, &ipvlan->addrs, anode)ipvlan_ht_addr_del (addr);
Greg Kroah-Hartman
maintainerPATCH 12/151 ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit afe207d80a61e4d6e7cfa0611a4af46d0ba95628 ]
Commit e18b353f102e ("ipvlan: add cond_resched_rcu() while processing muticast backlog") added a cond_resched_rcu() in a loop using rcu protection to iterate over slaves.
This is breaking rcu rules, so lets instead use cond_resched() at a point we can reschedule
--- drivers/net/ipvlan/ipvlan_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ipvlan/ipvlan_core.c +1 -1
@@ -277,7 +277,6 @@ void ipvlan_process_multicast(struct wor }ipvlan_count_rx (ipvlan, len, ret ==NET_RX_SUCCESS , true);local_bh_enable (); -cond_resched_rcu (); }rcu_read_unlock ();
@@ -294,6 +293,7 @@ void ipvlan_process_multicast(struct wor }if (dev)dev_put (dev); +cond_resched (); } }
Greg Kroah-Hartman
maintainerPATCH 13/151 ipvlan: dont deref eth hdr before checking its set
In reply to Greg Kroah-HartmanFrom: Mahesh Bandewar <[email protected]>
[ Upstream commit ad8192767c9f9cf97da57b9ffcea70fb100febef ]
IPvlan in L3 mode discards outbound multicast packets but performs the check before ensuring the ether-header is set or not. This is an error that Eric found through code browsing.
--- drivers/net/ipvlan/ipvlan_core.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/net/ipvlan/ipvlan_core.c +10 -8
@@ -499,19 +499,21 @@ static int ipvlan_process_outbound(strucstruct ethhdr *ethh =eth_hdr (skb);int ret =NET_XMIT_DROP ; -/* In this mode we dont care about multicast and broadcast traffic */ -if (is_multicast_ether_addr (ethh->h_dest)) { -pr_debug_ratelimited ("Dropped {multi|broad}cast of type=[%x]\n" , -ntohs (skb->protocol)); -kfree_skb (skb); - goto out; - } -/* The ipvlan is a pseudo-L2 device, so the packets that we receive * will have L2; which need to discarded and processed further * in the net-ns of the main-device. */ if (skb_mac_header_was_set (skb)) { +/* In this mode we dont care about +* multicast and broadcast traffic */ +if (is_multicast_ether_addr (ethh->h_dest)) { +pr_debug_ratelimited ( +"Dropped {multi|broad}cast of type=[%x]\n" , +ntohs (skb->protocol)); +kfree_skb (skb); + goto out; + } +skb_pull (skb,sizeof (*ethh)); skb->mac_header = (typeof(skb->mac_header))~0U;skb_reset_network_header (skb);
Greg Kroah-Hartman
maintainerPATCH 14/151 macvlan: add cond_resched() during multicast processing
In reply to Greg Kroah-HartmanFrom: Mahesh Bandewar <[email protected]>
[ Upstream commit ce9a4186f9ac475c415ffd20348176a4ea366670 ]
The Rx bound multicast packets are deferred to a workqueue and macvlan can also suffer from the same attack that was discovered by Syzbot for IPvlan. This solution is not as effective as in IPvlan. IPvlan defers all (Tx and Rx) multicast packet processing to a workqueue while macvlan does this way only for the Rx. This fix should address the Rx codition to certain extent.
Tx is still suseptible. Tx multicast processing happens when .ndo_start_xmit is called, hence we cannot add cond_resched(). However, it's not that severe since the user which is generating
/ flooding will be affected the most.
--- drivers/net/macvlan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/macvlan.c +2 -0
@@ -334,6 +334,8 @@ static void macvlan_process_broadcast(stif (src)dev_put (src->dev);consume_skb (skb); + +cond_resched (); } }
Greg Kroah-Hartman
maintainerPATCH 15/151 net: dsa: fix phylink_start()/phylink_stop() calls
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 8640f8dc6d657ebfb4e67c202ad32c5457858a13 ]
Place phylink_start()/phylink_stop() inside dsa_port_enable() and dsa_port_disable(), which ensures that we call phylink_stop() before tearing down phylink - which is a documented requirement. Failure to do so can cause use-after-free bugs.
--- net/dsa/dsa_priv.h | 2 ++ net/dsa/port.c | 32 ++++++++++++++++++++++++++------ net/dsa/slave.c | 8 ++------ 3 files changed, 30 insertions(+), 12 deletions(-)
net/dsa/dsa_priv.h +2 -0
@@ -117,7 +117,9 @@ static inline struct net_device *dsa_mas/* port.c */ int dsa_port_set_state (struct dsa_port *dp,u8 state,struct switchdev_trans *trans); +int dsa_port_enable_rt (struct dsa_port *dp,struct phy_device *phy);int dsa_port_enable (struct dsa_port *dp,struct phy_device *phy); +void dsa_port_disable_rt (struct dsa_port *dp);void dsa_port_disable (struct dsa_port *dp);int dsa_port_bridge_join (struct dsa_port *dp,struct net_device *br);void dsa_port_bridge_leave (struct dsa_port *dp,struct net_device *br);
net/dsa/port.c +26 -6
@@ -63,7 +63,7 @@ static void dsa_port_set_state_now(strucpr_err ("DSA: failed to set STP state %u (%d)\n" , state, err); } -int dsa_port_enable (struct dsa_port *dp,struct phy_device *phy) +int dsa_port_enable_rt (struct dsa_port *dp,struct phy_device *phy) {struct dsa_switch *ds = dp->ds;int port = dp->index;
@@ -78,14 +78,31 @@ int dsa_port_enable(struct dsa_port *dp,if (!dp->bridge_dev)dsa_port_set_state_now (dp,BR_STATE_FORWARDING ); +if (dp->pl) +phylink_start (dp->pl); +return 0 ; } -void dsa_port_disable (struct dsa_port *dp) +int dsa_port_enable (struct dsa_port *dp,struct phy_device *phy) +{ +int err; + +rtnl_lock (); + err =dsa_port_enable_rt (dp, phy); +rtnl_unlock (); + +return err; +} + +void dsa_port_disable_rt (struct dsa_port *dp) {struct dsa_switch *ds = dp->ds;int port = dp->index; +if (dp->pl) +phylink_stop (dp->pl); +if (!dp->bridge_dev)dsa_port_set_state_now (dp,BR_STATE_DISABLED );
@@ -93,6 +110,13 @@ void dsa_port_disable(struct dsa_port *d ds->ops->port_disable (ds, port); } +void dsa_port_disable (struct dsa_port *dp) +{ +rtnl_lock (); +dsa_port_disable_rt (dp); +rtnl_unlock (); +} +int dsa_port_bridge_join (struct dsa_port *dp,struct net_device *br) {struct dsa_notifier_bridge_info info = {
@@ -619,10 +643,6 @@ static int dsa_port_phylink_register(str goto err_phy_connect; } -rtnl_lock (); -phylink_start (dp->pl); -rtnl_unlock (); -return 0 ; err_phy_connect:
net/dsa/slave.c +2 -6
@@ -90,12 +90,10 @@ static int dsa_slave_open(struct net_dev goto clear_allmulti; } - err =dsa_port_enable (dp, dev->phydev); + err =dsa_port_enable_rt (dp, dev->phydev);if (err) goto clear_promisc; -phylink_start (dp->pl); -return 0 ; clear_promisc:
@@ -119,9 +117,7 @@ static int dsa_slave_close(struct net_decancel_work_sync (&dp->xmit_work);skb_queue_purge (&dp->xmit_queue); -phylink_stop (dp->pl); - -dsa_port_disable (dp); +dsa_port_disable_rt (dp);dev_mc_unsync (master, dev);dev_uc_unsync (master, dev);
Greg Kroah-Hartman
maintainerPATCH 16/151 net: dsa: mv88e6xxx: fix lockup on warm boot
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 0395823b8d9a4d87bd1bf74359123461c2ae801b ]
If the switch is not hardware reset on a warm boot, interrupts can be left enabled, and possibly pending. This will cause us to enter an infinite loop trying to service an interrupt we are unable to handle, thereby preventing the kernel from booting.
Ensure that the global 2 interrupt sources are disabled before we claim the parent interrupt.
Observed on the ZII development revision B and C platforms with reworked serdes support, and using reboot -f to reboot the platform.
--- drivers/net/dsa/mv88e6xxx/global2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/dsa/mv88e6xxx/global2.c +7 -1
@@ -1096,6 +1096,13 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6 {int err, irq, virq; + chip->g2_irq.masked = ~0 ; +mv88e6xxx_reg_lock (chip); + err =mv88e6xxx_g2_int_mask (chip, ~chip->g2_irq.masked); +mv88e6xxx_reg_unlock (chip); +if (err) +return err; + chip->g2_irq.domain =irq_domain_add_simple ( chip->dev->of_node,16 ,0 , &mv88e6xxx_g2_irq_domain_ops, chip);if (!chip->g2_irq.domain)
@@ -1105,7 +1112,6 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6irq_create_mapping (chip->g2_irq.domain, irq); chip->g2_irq.chip = mv88e6xxx_g2_irq_chip; - chip->g2_irq.masked = ~0 ; chip->device_irq =irq_find_mapping (chip->g1_irq.domain,MV88E6XXX_G1_STS_IRQ_DEVICE );
Greg Kroah-Hartman
maintainerPATCH 17/151 net: fec: validate the new settings in fec_enet_set_coalesce()
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit ab14961d10d02d20767612c78ce148f6eb85bd58 ]
fec_enet_set_coalesce() validates the previously set params and if they are within range proceeds to apply the new ones. The new ones, however, are not validated. This seems backwards, probably a copy-paste error?
Compile tested only.
--- drivers/net/ethernet/freescale/fec_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +3 -3
@@ -2529,15 +2529,15 @@ fec_enet_set_coalesce(struct net_devicereturn -EINVAL ; } - cycle =fec_enet_us_to_itr_clock (ndev, fep->rx_time_itr); + cycle =fec_enet_us_to_itr_clock (ndev, ec->rx_coalesce_usecs);if (cycle >0xFFFF ) {dev_err (dev,"Rx coalesced usec exceed hardware limitation\n" );return -EINVAL ; } - cycle =fec_enet_us_to_itr_clock (ndev, fep->tx_time_itr); + cycle =fec_enet_us_to_itr_clock (ndev, ec->tx_coalesce_usecs);if (cycle >0xFFFF ) { -dev_err (dev,"Rx coalesced usec exceed hardware limitation\n" ); +dev_err (dev,"Tx coalesced usec exceed hardware limitation\n" );return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 18/151 net: hns3: fix a not link up issue when fibre port supports autoneg
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 68e1006f618e509fc7869259fe83ceec4a95dac3 ]
When fibre port supports auto-negotiation, the IMP(Intelligent Management Process) processes the speed of auto-negotiation and the user's speed separately.
For below case, the port will get a not link up problem. step 1: disables auto-negotiation and sets speed to A, then the driver's MAC speed will be updated to A.
step 2: enables auto-negotiation and MAC gets negotiated speed B, then the driver's MAC speed will be updated to B through querying in periodical task.
step 3: MAC gets new negotiated speed A.
step 4: disables auto-negotiation and sets speed to B before periodical task query new MAC speed A, the driver will ignore the speed configuration.
This patch fixes it by skipping speed and duplex checking when fibre port supports auto-negotiation.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +3 -1
@@ -2450,10 +2450,12 @@ static int hclge_cfg_mac_speed_dup_hw(stint hclge_cfg_mac_speed_dup (struct hclge_dev *hdev,int speed,u8 duplex) { +struct hclge_mac *mac = &hdev->hw.mac;int ret; duplex =hclge_check_speed_dup (duplex, speed); -if (hdev->hw.mac.speed == speed && hdev->hw.mac.duplex == duplex) +if (!mac->support_autoneg && mac->speed == speed && + mac->duplex == duplex)return 0 ; ret =hclge_cfg_mac_speed_dup_hw (hdev, speed, duplex);
Greg Kroah-Hartman
maintainerPATCH 19/151 net/ipv6: use configured metric when add peer route
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 07758eb9ff52794fba15d03aa88d92dbd1b7d125 ]
When we add peer address with metric configured, IPv4 could set the dest metric correctly, but IPv6 do not. e.g.
]# ip addr add 192.0.2.1 peer 192.0.2.2/32 dev eth1 metric 20 ]# ip route show dev eth1
192.0.2.2 proto kernel scope link src 192.0.2.1 metric 20 ]# ip addr add 2001:db8::1 peer 2001:db8::2/128 dev eth1 metric 20 ]# ip -6 route show dev eth1
2001:db8::1 proto kernel metric 20 pref medium 2001:db8::2 proto kernel metric 256 pref medium
Fix this by using configured metric instead of default one.
--- net/ipv6/addrconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv6/addrconf.c +3 -3
@@ -5987,9 +5987,9 @@ static void __ipv6_ifa_notify(int event,if (ifp->idev->cnf.forwarding)addrconf_join_anycast (ifp);if (!ipv6_addr_any (&ifp->peer_addr)) -addrconf_prefix_route (&ifp->peer_addr,128 ,0 , - ifp->idev->dev,0 ,0 , -GFP_ATOMIC ); +addrconf_prefix_route (&ifp->peer_addr,128 , + ifp->rt_priority, ifp->idev->dev, +0 ,0 ,GFP_ATOMIC );break ;case RTM_DELADDR :if (ifp->idev->cnf.forwarding)
Greg Kroah-Hartman
maintainerPATCH 20/151 netlink: Use netlink header as base to calculate bad attribute offset
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 84b3268027641401bb8ad4427a90a3cce2eb86f5 ]
Userspace might send a batch that is composed of several netlink messages. The netlink_ack() function must use the pointer to the netlink header as base to calculate the bad attribute offset.
--- net/netlink/af_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netlink/af_netlink.c +1 -1
@@ -2434,7 +2434,7 @@ void netlink_ack(struct sk_buff *in_skb, in_skb->len))WARN_ON (nla_put_u32 (skb,NLMSGERR_ATTR_OFFS , (u8 *)extack->bad_attr - - in_skb->data)); + (u8 *)nlh)); }else {if (extack->cookie_len) WARN_ON(nla_put(skb, NLMSGERR_ATTR_COOKIE,
Greg Kroah-Hartman
maintainerPATCH 21/151 net: macsec: update SCI upon MAC address change.
In reply to Greg Kroah-HartmanFrom: Dmitry Bogdanov <[email protected]>
[ Upstream commit 6fc498bc82929ee23aa2f35a828c6178dfd3f823 ]
SCI should be updated, because it contains MAC in its first 6 octets.
--- drivers/net/macsec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/macsec.c +6 -5
@@ -532,6 +532,11 @@ static struct macsec_eth_header *macsec_return (struct macsec_eth_header *)skb_mac_header (skb); } +static sci_t dev_to_sci (struct net_device *dev,__be16 port) +{ +return make_sci (dev->dev_addr, port); +} +static u32 tx_sa_update_pn (struct macsec_tx_sa *tx_sa,struct macsec_secy *secy) {u32 pn;
@@ -2903,6 +2908,7 @@ static int macsec_set_mac_address(struct out:ether_addr_copy (dev->dev_addr, addr->sa_data); + macsec->secy.sci =dev_to_sci (dev,MACSEC_PORT_ES );return 0 ; }
@@ -3176,11 +3182,6 @@ static bool sci_exists(struct net_devicereturn false; } -static sci_t dev_to_sci (struct net_device *dev,__be16 port) -{ -return make_sci (dev->dev_addr, port); -} -static int macsec_add_dev (struct net_device *dev,sci_t sci,u8 icv_len) {struct macsec_dev *macsec =macsec_priv (dev);
Greg Kroah-Hartman
maintainerPATCH 22/151 net: mscc: ocelot: properly account for VLAN header length when setting MRU
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit a8015ded89ad740d21355470d41879c5bd82aab7 ]
What the driver writes into MAC_MAXLEN_CFG does not actually represent VLAN_ETH_FRAME_LEN but instead ETH_FRAME_LEN + ETH_FCS_LEN. Yes they are numerically equal, but the difference is important, as the switch treats VLAN-tagged traffic specially and knows to increase the maximum accepted frame size automatically. So it is always wrong to account for VLAN in the MAC_MAXLEN_CFG register.
Unconditionally increase the maximum allowed frame size for double-tagged traffic. Accounting for the additional length does not mean that the other VLAN membership checks aren't performed, so there's no harm done.
Also, stop abusing the MTU name for configuring the MRU. There is no support for configuring the MRU on an interface at the moment.
--- drivers/net/ethernet/mscc/ocelot.c | 28 +++++++++++++++++----------- drivers/net/ethernet/mscc/ocelot_dev.h | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-)
drivers/net/ethernet/mscc/ocelot.c +17 -11
@@ -2175,24 +2175,29 @@ static int ocelot_init_timestamp(structreturn 0 ; } -static void ocelot_port_set_mtu (struct ocelot *ocelot,int port,size_t mtu) +/* Configure the maximum SDU (L2 payload) on RX to the value specified in @sdu. +* The length of VLAN tags is accounted for automatically via DEV_MAC_TAGS_CFG. +*/ +static void ocelot_port_set_maxlen (struct ocelot *ocelot,int port,size_t sdu) {struct ocelot_port *ocelot_port = ocelot->ports[port]; +int maxlen = sdu +ETH_HLEN +ETH_FCS_LEN ;int atop_wm; -ocelot_port_writel (ocelot_port, mtu,DEV_MAC_MAXLEN_CFG ); +ocelot_port_writel (ocelot_port, maxlen,DEV_MAC_MAXLEN_CFG );/* Set Pause WM hysteresis -* 152 = 6 * mtu / OCELOT_BUFFER_CELL_SZ -* 101 = 4 * mtu / OCELOT_BUFFER_CELL_SZ +* 152 = 6 * maxlen / OCELOT_BUFFER_CELL_SZ +* 101 = 4 * maxlen / OCELOT_BUFFER_CELL_SZ */ ocelot_write_rix (ocelot,SYS_PAUSE_CFG_PAUSE_ENA |SYS_PAUSE_CFG_PAUSE_STOP (101 ) |SYS_PAUSE_CFG_PAUSE_START (152 ),SYS_PAUSE_CFG , port);/* Tail dropping watermark */ - atop_wm = (ocelot->shared_queue_sz -9 * mtu) /OCELOT_BUFFER_CELL_SZ ; -ocelot_write_rix (ocelot,ocelot_wm_enc (9 * mtu), + atop_wm = (ocelot->shared_queue_sz -9 * maxlen) / +OCELOT_BUFFER_CELL_SZ ; +ocelot_write_rix (ocelot,ocelot_wm_enc (9 * maxlen),SYS_ATOP , port);ocelot_write (ocelot,ocelot_wm_enc (atop_wm),SYS_ATOP_TOT_CFG ); }
@@ -2221,9 +2226,10 @@ void ocelot_init_port(struct ocelot *oce DEV_MAC_HDX_CFG);/* Set Max Length and maximum tags allowed */ -ocelot_port_set_mtu (ocelot, port,VLAN_ETH_FRAME_LEN ); +ocelot_port_set_maxlen (ocelot, port,ETH_DATA_LEN );ocelot_port_writel (ocelot_port,DEV_MAC_TAGS_CFG_TAG_ID (ETH_P_8021AD ) |DEV_MAC_TAGS_CFG_VLAN_AWR_ENA | +DEV_MAC_TAGS_CFG_VLAN_DBL_AWR_ENA |DEV_MAC_TAGS_CFG_VLAN_LEN_AWR_ENA ,DEV_MAC_TAGS_CFG );
@@ -2309,18 +2315,18 @@ void ocelot_set_cpu_port(struct ocelot ** Only one port can be an NPI at the same time. */ if (cpu < ocelot->num_phys_ports) { -int mtu =VLAN_ETH_FRAME_LEN +OCELOT_TAG_LEN ; +int sdu =ETH_DATA_LEN +OCELOT_TAG_LEN ;ocelot_write (ocelot,QSYS_EXT_CPU_CFG_EXT_CPUQ_MSK_M |QSYS_EXT_CPU_CFG_EXT_CPU_PORT (cpu),QSYS_EXT_CPU_CFG );if (injection ==OCELOT_TAG_PREFIX_SHORT ) - mtu +=OCELOT_SHORT_PREFIX_LEN ; + sdu +=OCELOT_SHORT_PREFIX_LEN ;else if (injection ==OCELOT_TAG_PREFIX_LONG ) - mtu +=OCELOT_LONG_PREFIX_LEN ; + sdu +=OCELOT_LONG_PREFIX_LEN ; -ocelot_port_set_mtu (ocelot, cpu, mtu); +ocelot_port_set_maxlen (ocelot, cpu, sdu); }/* CPU port Injection/Extraction configuration */
drivers/net/ethernet/mscc/ocelot_dev.h +1 -1
@@ -74,7 +74,7 @@#define DEV_MAC_TAGS_CFG_TAG_ID_M GENMASK(31, 16)#define DEV_MAC_TAGS_CFG_TAG_ID_X (x) (((x) & GENMASK(31, 16)) >> 16)#define DEV_MAC_TAGS_CFG_VLAN_LEN_AWR_ENA BIT(2) -#define DEV_MAC_TAGS_CFG_PB_ENA BIT(1) +#define DEV_MAC_TAGS_CFG_VLAN_DBL_AWR_ENA BIT(1)#define DEV_MAC_TAGS_CFG_VLAN_AWR_ENA BIT(0)#define DEV_MAC_ADV_CHK_CFG 0x2c
Greg Kroah-Hartman
maintainerPATCH 23/151 net: nfc: fix bounds checking bugs on "pipe"
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit a3aefbfe45751bf7b338c181b97608e276b5bb73 ]
This is similar to commit 674d9de02aa7 ("NFC: Fix possible memory corruption when handling SHDLC I-Frame commands") and commit d7ee81ad09f0 ("NFC: nci: Add some bounds checking in nci_hci_cmd_received()") which added range checks on "pipe".
The "pipe" variable comes skb->data[0] in nfc_hci_msg_rx_work(). It's in the 0-255 range. We're using it as the array index into the hdev->pipes[] array which has NFC_HCI_MAX_PIPES (128) members.
--- net/nfc/hci/core.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
net/nfc/hci/core.c +16 -3
@@ -181,13 +181,20 @@ exit:void nfc_hci_cmd_received (struct nfc_hci_dev *hdev,u8 pipe,u8 cmd,struct sk_buff *skb) { -u8 gate = hdev->pipes[pipe].gate;u8 status =NFC_HCI_ANY_OK ;struct hci_create_pipe_resp *create_info;struct hci_delete_pipe_noti *delete_info;struct hci_all_pipe_cleared_noti *cleared_info; +u8 gate; -pr_debug ("from gate %x pipe %x cmd %x\n" , gate, pipe, cmd); +pr_debug ("from pipe %x cmd %x\n" , pipe, cmd); + +if (pipe >=NFC_HCI_MAX_PIPES ) { + status =NFC_HCI_ANY_E_NOK ; + goto exit; + } + + gate = hdev->pipes[pipe].gate;switch (cmd) {case NFC_HCI_ADM_NOTIFY_PIPE_CREATED :
@@ -375,8 +382,14 @@ void nfc_hci_event_received(struct nfc_h struct sk_buff *skb) {int r =0 ; -u8 gate = hdev->pipes[pipe].gate; +u8 gate; + +if (pipe >=NFC_HCI_MAX_PIPES ) { +pr_err ("Discarded event %x to invalid pipe %x\n" , event, pipe); + goto exit; + } + gate = hdev->pipes[pipe].gate;if (gate ==NFC_HCI_INVALID_GATE ) {pr_err ("Discarded event %x to unopened pipe %x\n" , event, pipe); goto exit;
Greg Kroah-Hartman
maintainerPATCH 24/151 net/packet: tpacket_rcv: do not increment ring index on drop
In reply to Greg Kroah-HartmanFrom: Willem de Bruijn <[email protected]>
[ Upstream commit 46e4c421a053c36bf7a33dda2272481bcaf3eed3 ]
In one error case, tpacket_rcv drops packets after incrementing the ring producer index.
If this happens, it does not update tp_status to TP_STATUS_USER and thus the reader is stalled for an iteration of the ring, causing out of order arrival.
The only such error path is when virtio_net_hdr_from_skb fails due to encountering an unknown GSO type.
--- net/packet/af_packet.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
net/packet/af_packet.c +7 -6
@@ -2273,6 +2273,13 @@ static int tpacket_rcv(struct sk_buff *s TP_STATUS_KERNEL, (macoff+snaplen));if (!h.raw) goto drop_n_account; + +if (do_vnet && +virtio_net_hdr_from_skb (skb, h.raw + macoff - +sizeof (struct virtio_net_hdr ), +vio_le (), true,0 )) + goto drop_n_account; +if (po->tp_version <=TPACKET_V2 ) {packet_increment_rx_head (po, &po->rx_ring);/*
@@ -2285,12 +2292,6 @@ static int tpacket_rcv(struct sk_buff *s status |=TP_STATUS_LOSING ; } -if (do_vnet && -virtio_net_hdr_from_skb (skb, h.raw + macoff - -sizeof (struct virtio_net_hdr ), -vio_le (), true,0 )) - goto drop_n_account; - po->stats.stats1.tp_packets++;if (copy_skb) { status |=TP_STATUS_COPY ;
Greg Kroah-Hartman
maintainerPATCH 25/151 net: phy: bcm63xx: fix OOPS due to missing driver name
In reply to Greg Kroah-HartmanFrom: Jonas Gorski <[email protected]>
[ Upstream commit 43de81b0601df7d7988d3f5617ee0987df65c883 ]
719655a14971 ("net: phy: Replace phy driver features u32 with link_mode bitmap") was a bit over-eager and also removed the second phy driver's name, resulting in a nasty OOPS on registration:
[ 1.319854] CPU 0 Unable to handle kernel paging request at virtual address 00000000, epc == 804dd50c, ra == 804dd4f0 [ 1.330859] Oops[#1]: [ 1.333138] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.4.22 #0 [ 1.339217] $ 0 : 00000000 00000001 87ca7f00 805c1874 [ 1.344590] $ 4 : 00000000 00000047 00585000 8701f800 [ 1.349965] $ 8 : 8701f800 804f4a5c 00000003 64726976 [ 1.355341] $12 : 00000001 00000000 00000000 00000114 [ 1.360718] $16 : 87ca7f80 00000000 00000000 80639fe4 [ 1.366093] $20 : 00000002 00000000 806441d0 80b90000 [ 1.371470] $24 : 00000000 00000000 [ 1.376847] $28 : 87c1e000 87c1fda0 80b90000 804dd4f0 [ 1.382224] Hi : d1c8f8da [ 1.385180] Lo : 5518a480 [ 1.388182] epc : 804dd50c kset_find_obj+0x3c/0x114 [ 1.393345] ra : 804dd4f0 kset_find_obj+0x20/0x114 [ 1.398530] Status: 10008703 KERNEL EXL IE [ 1.402833] Cause : 00800008 (ExcCode 02) [ 1.406952] BadVA : 00000000 [ 1.409913] PrId : 0002a075 (Broadcom BMIPS4350) [ 1.414745] Modules linked in: [ 1.417895] Process swapper/0 (pid: 1, threadinfo=(ptrval), task=(ptrval), tls=00000000) [ 1.426214] Stack : 87cec000 80630000 80639370 80640658 80640000 80049af4 80639fe4 8063a0d8 [ 1.434816] 8063a0d8 802ef078 00000002 00000000 806441d0 80b90000 8063a0d8 802ef114 [ 1.443417] 87cea0de 87c1fde0 00000000 804de488 87cea000 8063a0d8 8063a0d8 80334e48 [ 1.452018] 80640000 8063984c 80639bf4 00000000 8065de48 00000001 8063a0d8 80334ed0 [ 1.460620] 806441d0 80b90000 80b90000 802ef164 8065dd70 80620000 80b90000 8065de58 [ 1.469222] ... [ 1.471734] Call Trace: [ 1.474255] [<804dd50c>] kset_find_obj+0x3c/0x114 [ 1.479141] [<802ef078>] driver_find+0x1c/0x44 [ 1.483665] [<802ef114>] driver_register+0x74/0x148 [ 1.488719] [<80334e48>] phy_driver_register+0x9c/0xd0 [ 1.493968] [<80334ed0>] phy_drivers_register+0x54/0xe8 [ 1.499345] [<8001061c>] do_one_initcall+0x7c/0x1f4 [ 1.504374] [<80644ed8>] kernel_init_freeable+0x1d4/0x2b4 [ 1.509940] [<804f4e24>] kernel_init+0x10/0xf8 [ 1.514502] [<80018e68>] ret_from_kernel_thread+0x14/0x1c [ 1.520040] Code: 1060000c 02202025 90650000 <90810000> 24630001 14250004 24840001 14a0fffb 90650000 [ 1.530061] [ 1.531698] ---[ end trace d52f1717cd29bdc8 ]---
Fix it by readding the name.
--- drivers/net/phy/bcm63xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/phy/bcm63xx.c +1 -0
@@ -73,6 +73,7 @@ static struct phy_driver bcm63xx_driver[/* same phy as above, with just a different OUI */ .phy_id = 0x002bdc00, .phy_id_mask = 0xfffffc00, + .name = "Broadcom BCM63XX (2)",/* PHY_BASIC_FEATURES */ .flags = PHY_IS_INTERNAL, .config_init = bcm63xx_config_init,
Greg Kroah-Hartman
maintainerPATCH 26/151 net/smc: cancel event worker during device removal
In reply to Greg Kroah-HartmanFrom: Karsten Graul <[email protected]>
[ Upstream commit ece0d7bd74615773268475b6b64d6f1ebbd4b4c6 ]
During IB device removal, cancel the event worker before the device structure is freed.
--- net/smc/smc_ib.c | 1 + 1 file changed, 1 insertion(+)
net/smc/smc_ib.c +1 -0
@@ -580,6 +580,7 @@ static void smc_ib_remove_dev(struct ib_smc_smcr_terminate_all (smcibdev);smc_ib_cleanup_per_ibdev (smcibdev);ib_unregister_event_handler (&smcibdev->event_handler); +cancel_work_sync (&smcibdev->port_event_work);kfree (smcibdev); }
Greg Kroah-Hartman
maintainerPATCH 27/151 net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used
In reply to Greg Kroah-HartmanFrom: Remi Pommarel <[email protected]>
[ Upstream commit b723bd933980f4956dabc8a8d84b3e83be8d094c ]
ACS (auto PAD/FCS stripping) removes FCS off 802.3 packets (LLC) so that there is no need to manually strip it for such packets. The enhanced DMA descriptors allow to flag LLC packets so that the receiving callback can use that to strip FCS manually or not. On the other hand, normal descriptors do not support that.
Thus in order to not truncate LLC packet ACS should be disabled when using normal DMA descriptors.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +2 -1
@@ -24,6 +24,7 @@static void dwmac1000_core_init (struct mac_device_info *hw,struct net_device *dev) { +struct stmmac_priv *priv =netdev_priv (dev);void __iomem *ioaddr = hw->pcsr;u32 value =readl (ioaddr +GMAC_CONTROL );int mtu = dev->mtu;
@@ -35,7 +36,7 @@ static void dwmac1000_core_init(struct m* Broadcom tags can look like invalid LLC/SNAP packets and cause the * hardware to truncate packets on reception. */ -if (netdev_uses_dsa (dev)) +if (netdev_uses_dsa (dev) || !priv->plat->enh_desc) value &= ~GMAC_CONTROL_ACS ;if (mtu >1500 )
Greg Kroah-Hartman
maintainerPATCH 28/151 net: systemport: fix index check to avoid an array out of bounds access
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit c0368595c1639947839c0db8294ee96aca0b3b86 ]
Currently the bounds check on index is off by one and can lead to an out of bounds access on array priv->filters_loc when index is RXCHK_BRCM_TAG_MAX.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bcmsysport.c +1 -1
@@ -2135,7 +2135,7 @@ static int bcm_sysport_rule_set(struct breturn -ENOSPC ; index =find_first_zero_bit (priv->filters,RXCHK_BRCM_TAG_MAX ); -if (index >RXCHK_BRCM_TAG_MAX ) +if (index >=RXCHK_BRCM_TAG_MAX )return -ENOSPC ;/* Location is the classification ID, and index is the position
Greg Kroah-Hartman
maintainerPATCH 29/151 r8152: check disconnect status after long sleep
In reply to Greg Kroah-HartmanFrom: You-Sheng Yang <[email protected]>
[ Upstream commit d64c7a08034b32c285e576208ae44fc3ba3fa7df ]
Dell USB Type C docking WD19/WD19DC attaches additional peripherals as:
/: Bus 02.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/6p, 5000M
|__ Port 1: Dev 11, If 0, Class=Hub, Driver=hub/4p, 5000M
|__ Port 3: Dev 12, If 0, Class=Hub, Driver=hub/4p, 5000M
|__ Port 4: Dev 13, If 0, Class=Vendor Specific Class,
Driver=r8152, 5000Mwhere usb 2-1-3 is a hub connecting all USB Type-A/C ports on the dock.
When hotplugging such dock with additional usb devices already attached on it, the probing process may reset usb 2.1 port, therefore r8152 ethernet device is also reset. However, during r8152 device init there are several for-loops that, when it's unable to retrieve hardware registers due to being disconnected from USB, may take up to 14 seconds each in practice, and that has to be completed before USB may re-enumerate devices on the bus. As a result, devices attached to the dock will only be available after nearly 1 minute after the dock was plugged in:
[ 216.388290] [250] r8152 2-1.4:1.0: usb_probe_interface [ 216.388292] [250] r8152 2-1.4:1.0: usb_probe_interface - got id [ 258.830410] r8152 2-1.4:1.0 (unnamed net_device) (uninitialized): PHY not ready [ 258.830460] r8152 2-1.4:1.0 (unnamed net_device) (uninitialized): Invalid header when reading pass-thru MAC addr [ 258.830464] r8152 2-1.4:1.0 (unnamed net_device) (uninitialized): Get ether addr fail
This happens in, for example, r8153_init:
static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
void *data, u16 type)
{
if (test_bit(RTL8152_UNPLUG, &tp->flags))
return -ENODEV;
...}
static u16 ocp_read_word(struct r8152 *tp, u16 type, u16 index)
{
u32 data;
...
generic_ocp_read(tp, index, sizeof(tmp), &tmp, type | byen); data = __le32_to_cpu(tmp);
...
return (u16)data;}
static void r8153_init(struct r8152 *tp)
{
...
if (test_bit(RTL8152_UNPLUG, &tp->flags))
return; for (i = 0; i < 500; i++) {
if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) &
AUTOLOAD_DONE)
break;
msleep(20);
}
...}
Since ocp_read_word() doesn't check the return status of generic_ocp_read(), and the only exit condition for the loop is to have a match in the returned value, such loops will only ends after exceeding its maximum runs when the device has been marked as disconnected, which takes 500 * 20ms = 10 seconds in theory, 14 in practice.
To solve this long latency another test to RTL8152_UNPLUG flag should be added after those 20ms sleep to skip unnecessary loops, so that the device probe can complete early and proceed to parent port reset/reprobe process.
This can be reproduced on all kernel versions up to latest v5.6-rc2, but after v5.5-rc7 the reproduce rate is dramatically lowered to 1/30 or less while it was around 1/2.
--- drivers/net/usb/r8152.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/usb/r8152.c +8 -0
@@ -3220,6 +3220,8 @@ static u16 r8153_phy_status(struct r8152 }msleep (20 ); +if (test_bit (RTL8152_UNPLUG , &tp->flags)) +break ; }return data;
@@ -5401,7 +5403,10 @@ static void r8153_init(struct r8152 *tp)if (ocp_read_word (tp,MCU_TYPE_PLA ,PLA_BOOT_CTRL ) &AUTOLOAD_DONE )break ; +msleep (20 ); +if (test_bit (RTL8152_UNPLUG , &tp->flags)) +break ; } data =r8153_phy_status (tp,0 );
@@ -5538,7 +5543,10 @@ static void r8153b_init(struct r8152 *tpif (ocp_read_word (tp,MCU_TYPE_PLA ,PLA_BOOT_CTRL ) &AUTOLOAD_DONE )break ; +msleep (20 ); +if (test_bit (RTL8152_UNPLUG , &tp->flags)) +break ; } data =r8153_phy_status (tp,0 );
Greg Kroah-Hartman
maintainerPATCH 30/151 sfc: detach from cb_page in efx_copy_channel()
In reply to Greg Kroah-HartmanFrom: Edward Cree <[email protected]>
[ Upstream commit 4b1bd9db078f7d5332c8601a2f5bd43cf0458fd4 ]
It's a resource, not a parameter, so we can't copy it into the new
channel's TX queues, otherwise aliasing will lead to resource- management bugs if the channel is subsequently torn down without being initialised.
Before the Fixes:-tagged commit there was a similar bug with
tsoh_page, but I'm not sure it's worth doing another fix for such old kernels.
--- drivers/net/ethernet/sfc/efx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/sfc/efx.c +1 -0
@@ -525,6 +525,7 @@ efx_copy_channel(const struct efx_channeif (tx_queue->channel) tx_queue->channel = channel; tx_queue->buffer =NULL ; + tx_queue->cb_page =NULL ;memset (&tx_queue->txd,0 ,sizeof (tx_queue->txd)); }
Greg Kroah-Hartman
maintainerPATCH 31/151 slip: make slhc_compress() more robust against malicious packets
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 110a40dfb708fe940a3f3704d470e431c368d256 ]
Before accessing various fields in IPV4 network header and TCP header, make sure the packet :
- Has IP version 4 (ip->version == 4)
- Has not a silly network length (ip->ihl >= 5)
- Is big enough to hold network and transport headers
- Has not a silly TCP header size (th->doff >= sizeof(struct tcphdr) / 4)
syzbot reported :
BUG: KMSAN: uninit-value in slhc_compress+0x5b9/0x2e60 drivers/net/slip/slhc.c:270 CPU: 0 PID: 11728 Comm: syz-executor231 Not tainted 5.6.0-rc2-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 slhc_compress+0x5b9/0x2e60 drivers/net/slip/slhc.c:270 ppp_send_frame drivers/net/ppp/ppp_generic.c:1637 [inline] __ppp_xmit_process+0x1902/0x2970 drivers/net/ppp/ppp_generic.c:1495 ppp_xmit_process+0x147/0x2f0 drivers/net/ppp/ppp_generic.c:1516 ppp_write+0x6bb/0x790 drivers/net/ppp/ppp_generic.c:512 do_loop_readv_writev fs/read_write.c:717 [inline] do_iter_write+0x812/0xdc0 fs/read_write.c:1000 compat_writev+0x2df/0x5a0 fs/read_write.c:1351 do_compat_pwritev64 fs/read_write.c:1400 [inline] __do_compat_sys_pwritev fs/read_write.c:1420 [inline] __se_compat_sys_pwritev fs/read_write.c:1414 [inline] __ia32_compat_sys_pwritev+0x349/0x3f0 fs/read_write.c:1414 do_syscall_32_irqs_on arch/x86/entry/common.c:339 [inline] do_fast_syscall_32+0x3c7/0x6e0 arch/x86/entry/common.c:410 entry_SYSENTER_compat+0x68/0x77 arch/x86/entry/entry_64_compat.S:139 RIP: 0023:0xf7f7cd99 Code: 90 e8 0b 00 00 00 f3 90 0f ae e8 eb f9 8d 74 26 00 89 3c 24 c3 90 90 90 90 90 90 90 90 90 90 90 90 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 eb 0d 90 90 90 90 90 90 90 90 90 90 90 90 RSP: 002b:00000000ffdb84ac EFLAGS: 00000217 ORIG_RAX: 000000000000014e RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00000000200001c0 RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000003 RBP: 0000000040047459 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
Uninit was created at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:144 [inline] kmsan_internal_poison_shadow+0x66/0xd0 mm/kmsan/kmsan.c:127 kmsan_slab_alloc+0x8a/0xe0 mm/kmsan/kmsan_hooks.c:82 slab_alloc_node mm/slub.c:2793 [inline] __kmalloc_node_track_caller+0xb40/0x1200 mm/slub.c:4401 __kmalloc_reserve net/core/skbuff.c:142 [inline] __alloc_skb+0x2fd/0xac0 net/core/skbuff.c:210 alloc_skb include/linux/skbuff.h:1051 [inline] ppp_write+0x115/0x790 drivers/net/ppp/ppp_generic.c:500 do_loop_readv_writev fs/read_write.c:717 [inline] do_iter_write+0x812/0xdc0 fs/read_write.c:1000 compat_writev+0x2df/0x5a0 fs/read_write.c:1351 do_compat_pwritev64 fs/read_write.c:1400 [inline] __do_compat_sys_pwritev fs/read_write.c:1420 [inline] __se_compat_sys_pwritev fs/read_write.c:1414 [inline] __ia32_compat_sys_pwritev+0x349/0x3f0 fs/read_write.c:1414 do_syscall_32_irqs_on arch/x86/entry/common.c:339 [inline] do_fast_syscall_32+0x3c7/0x6e0 arch/x86/entry/common.c:410 entry_SYSENTER_compat+0x68/0x77 arch/x86/entry/entry_64_compat.S:139
--- drivers/net/slip/slhc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/slip/slhc.c +10 -4
@@ -232,7 +232,7 @@ slhc_compress(struct slcompress *comp, ustruct cstate *cs = lcs->next;unsigned long deltaS, deltaA;short changes =0 ; -int hlen; +int nlen, hlen;unsigned char new_seq[16 ];unsigned char *cp = new_seq;struct iphdr *ip;
@@ -248,6 +248,8 @@ slhc_compress(struct slcompress *comp, ureturn isize; ip = (struct iphdr *) icp; +if (ip->version !=4 || ip->ihl <5 ) +return isize;/* Bail if this packet isn't TCP, or is an IP fragment */ if (ip->protocol !=IPPROTO_TCP || (ntohs (ip->frag_off) &0x3fff )) {
@@ -258,10 +260,14 @@ slhc_compress(struct slcompress *comp, u comp->sls_o_tcp++;return isize; } -/* Extract TCP header */ + nlen = ip->ihl *4 ; +if (isize < nlen +sizeof (*th)) +return isize; - th = (struct tcphdr *)(((unsigned char *)ip) + ip->ihl*4 ); - hlen = ip->ihl*4 + th->doff*4 ; + th = (struct tcphdr *)(icp + nlen); +if (th->doff <sizeof (struct tcphdr ) /4 ) +return isize; + hlen = nlen + th->doff *4 ;/* Bail if the TCP packet isn't `compressible' (i.e., ACK isn't set or * some other control bit is set). Also uncompressible if
Greg Kroah-Hartman
maintainerPATCH 32/151 taprio: Fix sending packets without dequeueing them
In reply to Greg Kroah-HartmanFrom: Vinicius Costa Gomes <[email protected]>
[ Upstream commit b09fe70ef520e011ba4a64f4b93f948a8f14717b ]
There was a bug that was causing packets to be sent to the driver without first calling dequeue() on the "child" qdisc. And the KASAN report below shows that sending a packet without calling dequeue() leads to bad results.
The problem is that when checking the last qdisc "child" we do not set the returned skb to NULL, which can cause it to be sent to the driver, and so after the skb is sent, it may be freed, and in some situations a reference to it may still be in the child qdisc, because it was never dequeued.
The crash log looks like this:
[ 19.937538] ================================================================== [ 19.938300] BUG: KASAN: use-after-free in taprio_dequeue_soft+0x620/0x780 [ 19.938968] Read of size 4 at addr ffff8881128628cc by task swapper/1/0 [ 19.939612] [ 19.939772] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.6.0-rc3+ #97 [ 19.940397] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qe4 [ 19.941523] Call Trace: [ 19.941774] <IRQ> [ 19.941985] dump_stack+0x97/0xe0 [ 19.942323] print_address_description.constprop.0+0x3b/0x60 [ 19.942884] ? taprio_dequeue_soft+0x620/0x780 [ 19.943325] ? taprio_dequeue_soft+0x620/0x780 [ 19.943767] __kasan_report.cold+0x1a/0x32 [ 19.944173] ? taprio_dequeue_soft+0x620/0x780 [ 19.944612] kasan_report+0xe/0x20 [ 19.944954] taprio_dequeue_soft+0x620/0x780 [ 19.945380] __qdisc_run+0x164/0x18d0 [ 19.945749] net_tx_action+0x2c4/0x730 [ 19.946124] __do_softirq+0x268/0x7bc [ 19.946491] irq_exit+0x17d/0x1b0 [ 19.946824] smp_apic_timer_interrupt+0xeb/0x380 [ 19.947280] apic_timer_interrupt+0xf/0x20 [ 19.947687] </IRQ> [ 19.947912] RIP: 0010:default_idle+0x2d/0x2d0 [ 19.948345] Code: 00 00 41 56 41 55 65 44 8b 2d 3f 8d 7c 7c 41 54 55 53 0f 1f 44 00 00 e8 b1 b2 c5 fd e9 07 00 3 [ 19.950166] RSP: 0018:ffff88811a3efda0 EFLAGS: 00000282 ORIG_RAX: ffffffffffffff13 [ 19.950909] RAX: 0000000080000000 RBX: ffff88811a3a9600 RCX: ffffffff8385327e [ 19.951608] RDX: 1ffff110234752c0 RSI: 0000000000000000 RDI: ffffffff8385262f [ 19.952309] RBP: ffffed10234752c0 R08: 0000000000000001 R09: ffffed10234752c1 [ 19.953009] R10: ffffed10234752c0 R11: ffff88811a3a9607 R12: 0000000000000001 [ 19.953709] R13: 0000000000000001 R14: 0000000000000000 R15: 0000000000000000 [ 19.954408] ? default_idle_call+0x2e/0x70 [ 19.954816] ? default_idle+0x1f/0x2d0 [ 19.955192] default_idle_call+0x5e/0x70 [ 19.955584] do_idle+0x3d4/0x500 [ 19.955909] ? arch_cpu_idle_exit+0x40/0x40 [ 19.956325] ? _raw_spin_unlock_irqrestore+0x23/0x30 [ 19.956829] ? trace_hardirqs_on+0x30/0x160 [ 19.957242] cpu_startup_entry+0x19/0x20 [ 19.957633] start_secondary+0x2a6/0x380 [ 19.958026] ? set_cpu_sibling_map+0x18b0/0x18b0 [ 19.958486] secondary_startup_64+0xa4/0xb0 [ 19.958921] [ 19.959078] Allocated by task 33: [ 19.959412] save_stack+0x1b/0x80 [ 19.959747] __kasan_kmalloc.constprop.0+0xc2/0xd0 [ 19.960222] kmem_cache_alloc+0xe4/0x230 [ 19.960617] __alloc_skb+0x91/0x510 [ 19.960967] ndisc_alloc_skb+0x133/0x330 [ 19.961358] ndisc_send_ns+0x134/0x810 [ 19.961735] addrconf_dad_work+0xad5/0xf80 [ 19.962144] process_one_work+0x78e/0x13a0 [ 19.962551] worker_thread+0x8f/0xfa0 [ 19.962919] kthread+0x2ba/0x3b0 [ 19.963242] ret_from_fork+0x3a/0x50 [ 19.963596] [ 19.963753] Freed by task 33: [ 19.964055] save_stack+0x1b/0x80 [ 19.964386] __kasan_slab_free+0x12f/0x180 [ 19.964830] kmem_cache_free+0x80/0x290 [ 19.965231] ip6_mc_input+0x38a/0x4d0 [ 19.965617] ipv6_rcv+0x1a4/0x1d0 [ 19.965948] __netif_receive_skb_one_core+0xf2/0x180 [ 19.966437] netif_receive_skb+0x8c/0x3c0 [ 19.966846] br_handle_frame_finish+0x779/0x1310 [ 19.967302] br_handle_frame+0x42a/0x830 [ 19.967694] __netif_receive_skb_core+0xf0e/0x2a90 [ 19.968167] __netif_receive_skb_one_core+0x96/0x180 [ 19.968658] process_backlog+0x198/0x650 [ 19.969047] net_rx_action+0x2fa/0xaa0 [ 19.969420] __do_softirq+0x268/0x7bc [ 19.969785] [ 19.969940] The buggy address belongs to the object at ffff888112862840 [ 19.969940] which belongs to the cache skbuff_head_cache of size 224 [ 19.971202] The buggy address is located 140 bytes inside of [ 19.971202] 224-byte region [ffff888112862840, ffff888112862920) [ 19.972344] The buggy address belongs to the page: [ 19.972820] page:ffffea00044a1800 refcount:1 mapcount:0 mapping:ffff88811a2bd1c0 index:0xffff8881128625c0 compo0 [ 19.973930] flags: 0x8000000000010200(slab|head) [ 19.974388] raw: 8000000000010200 ffff88811a2ed650 ffff88811a2ed650 ffff88811a2bd1c0 [ 19.975151] raw: ffff8881128625c0 0000000000190013 00000001ffffffff 0000000000000000 [ 19.975915] page dumped because: kasan: bad access detected [ 19.976461] page_owner tracks the page as allocated [ 19.976946] page last allocated via order 2, migratetype Unmovable, gfp_mask 0xd20c0(__GFP_IO|__GFP_FS|__GFP_NO) [ 19.978332] prep_new_page+0x24b/0x330 [ 19.978707] get_page_from_freelist+0x2057/0x2c90 [ 19.979170] __alloc_pages_nodemask+0x218/0x590 [ 19.979619] new_slab+0x9d/0x300 [ 19.979948] ___slab_alloc.constprop.0+0x2f9/0x6f0 [ 19.980421] __slab_alloc.constprop.0+0x30/0x60 [ 19.980870] kmem_cache_alloc+0x201/0x230 [ 19.981269] __alloc_skb+0x91/0x510 [ 19.981620] alloc_skb_with_frags+0x78/0x4a0 [ 19.982043] sock_alloc_send_pskb+0x5eb/0x750 [ 19.982476] unix_stream_sendmsg+0x399/0x7f0 [ 19.982904] sock_sendmsg+0xe2/0x110 [ 19.983262] ____sys_sendmsg+0x4de/0x6d0 [ 19.983660] ___sys_sendmsg+0xe4/0x160 [ 19.984032] __sys_sendmsg+0xab/0x130 [ 19.984396] do_syscall_64+0xe7/0xae0 [ 19.984761] page last free stack trace: [ 19.985142] __free_pages_ok+0x432/0xbc0 [ 19.985533] qlist_free_all+0x56/0xc0 [ 19.985907] quarantine_reduce+0x149/0x170 [ 19.986315] __kasan_kmalloc.constprop.0+0x9e/0xd0 [ 19.986791] kmem_cache_alloc+0xe4/0x230 [ 19.987182] prepare_creds+0x24/0x440 [ 19.987548] do_faccessat+0x80/0x590 [ 19.987906] do_syscall_64+0xe7/0xae0 [ 19.988276] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 19.988775] [ 19.988930] Memory state around the buggy address: [ 19.989402] ffff888112862780: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 19.990111] ffff888112862800: fc fc fc fc fc fc fc fc fb fb fb fb fb fb fb fb [ 19.990822] >ffff888112862880: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 19.991529] ^ [ 19.992081] ffff888112862900: fb fb fb fb fc fc fc fc fc fc fc fc fc fc fc fc [ 19.992796] ffff888112862980: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
--- net/sched/sch_taprio.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/sched/sch_taprio.c +9 -3
@@ -564,8 +564,10 @@ static struct sk_buff *taprio_dequeue_so prio = skb->priority; tc =netdev_get_prio_tc_map (dev, prio); -if (!(gate_mask &BIT (tc))) +if (!(gate_mask &BIT (tc))) { + skb =NULL ;continue ; + } len =qdisc_pkt_len (skb); guard = ktime_add_ns(taprio_get_time(q),
@@ -575,13 +577,17 @@ static struct sk_buff *taprio_dequeue_so* guard band ... */ if (gate_mask !=TAPRIO_ALL_GATES_OPEN && -ktime_after (guard, entry->close_time)) +ktime_after (guard, entry->close_time)) { + skb =NULL ;continue ; + }/* ... and no budget. */ if (gate_mask !=TAPRIO_ALL_GATES_OPEN && -atomic_sub_return (len, &entry->budget) <0 ) +atomic_sub_return (len, &entry->budget) <0 ) { + skb =NULL ;continue ; + } skb = child->ops->dequeue (child);if (unlikely (!skb))
Greg Kroah-Hartman
maintainerPATCH 33/151 bonding/alb: make sure arp header is pulled before accessing it
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit b7469e83d2add567e4e0b063963db185f3167cea upstream.
Similar to commit 38f88c454042 ("bonding/alb: properly access headers in bond_alb_xmit()"), we need to make sure arp header was pulled in skb->head before blindly accessing it in rlb_arp_xmit().
Remove arp_pkt() private helper, since it is more readable/obvious to have the following construct back to back :
if (!pskb_network_may_pull(skb, sizeof(*arp))) return NULL; arp = (struct arp_pkt *)skb_network_header(skb);
syzbot reported :
BUG: KMSAN: uninit-value in bond_slave_has_mac_rx include/net/bonding.h:704 [inline] BUG: KMSAN: uninit-value in rlb_arp_xmit drivers/net/bonding/bond_alb.c:662 [inline] BUG: KMSAN: uninit-value in bond_alb_xmit+0x575/0x25e0 drivers/net/bonding/bond_alb.c:1477 CPU: 0 PID: 12743 Comm: syz-executor.4 Not tainted 5.6.0-rc2-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 bond_slave_has_mac_rx include/net/bonding.h:704 [inline] rlb_arp_xmit drivers/net/bonding/bond_alb.c:662 [inline] bond_alb_xmit+0x575/0x25e0 drivers/net/bonding/bond_alb.c:1477 __bond_start_xmit drivers/net/bonding/bond_main.c:4257 [inline] bond_start_xmit+0x85d/0x2f70 drivers/net/bonding/bond_main.c:4282 __netdev_start_xmit include/linux/netdevice.h:4524 [inline] netdev_start_xmit include/linux/netdevice.h:4538 [inline] xmit_one net/core/dev.c:3470 [inline] dev_hard_start_xmit+0x531/0xab0 net/core/dev.c:3486 __dev_queue_xmit+0x37de/0x4220 net/core/dev.c:4063 dev_queue_xmit+0x4b/0x60 net/core/dev.c:4096 packet_snd net/packet/af_packet.c:2967 [inline] packet_sendmsg+0x8347/0x93b0 net/packet/af_packet.c:2992 sock_sendmsg_nosec net/socket.c:652 [inline] sock_sendmsg net/socket.c:672 [inline] __sys_sendto+0xc1b/0xc50 net/socket.c:1998 __do_sys_sendto net/socket.c:2010 [inline] __se_sys_sendto+0x107/0x130 net/socket.c:2006 __x64_sys_sendto+0x6e/0x90 net/socket.c:2006 do_syscall_64+0xb8/0x160 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x45c479 Code: ad b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 7b b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fc77ffbbc78 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 00007fc77ffbc6d4 RCX: 000000000045c479 RDX: 000000000000000e RSI: 00000000200004c0 RDI: 0000000000000003 RBP: 000000000076bf20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000ffffffff R13: 0000000000000a04 R14: 00000000004cc7b0 R15: 000000000076bf2c
Uninit was created at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:144 [inline] kmsan_internal_poison_shadow+0x66/0xd0 mm/kmsan/kmsan.c:127 kmsan_slab_alloc+0x8a/0xe0 mm/kmsan/kmsan_hooks.c:82 slab_alloc_node mm/slub.c:2793 [inline] __kmalloc_node_track_caller+0xb40/0x1200 mm/slub.c:4401 __kmalloc_reserve net/core/skbuff.c:142 [inline] __alloc_skb+0x2fd/0xac0 net/core/skbuff.c:210 alloc_skb include/linux/skbuff.h:1051 [inline] alloc_skb_with_frags+0x18c/0xa70 net/core/skbuff.c:5766 sock_alloc_send_pskb+0xada/0xc60 net/core/sock.c:2242 packet_alloc_skb net/packet/af_packet.c:2815 [inline] packet_snd net/packet/af_packet.c:2910 [inline] packet_sendmsg+0x66a0/0x93b0 net/packet/af_packet.c:2992 sock_sendmsg_nosec net/socket.c:652 [inline] sock_sendmsg net/socket.c:672 [inline] __sys_sendto+0xc1b/0xc50 net/socket.c:1998 __do_sys_sendto net/socket.c:2010 [inline] __se_sys_sendto+0x107/0x130 net/socket.c:2006 __x64_sys_sendto+0x6e/0x90 net/socket.c:2006 do_syscall_64+0xb8/0x160 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/net/bonding/bond_alb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/net/bonding/bond_alb.c +10 -10
@@ -50,11 +50,6 @@ struct arp_pkt { };#pragma pack() -static inline struct arp_pkt *arp_pkt (const struct sk_buff *skb) -{ -return (struct arp_pkt *)skb_network_header (skb); -} -/* Forward declaration */ static void alb_send_learning_packets (struct slave *slave,u8 mac_addr[],bool strict_match);
@@ -553,10 +548,11 @@ static void rlb_req_update_subnet_clientspin_unlock (&bond->mode_lock); } -static struct slave *rlb_choose_channel (struct sk_buff *skb,struct bonding *bond) +static struct slave *rlb_choose_channel (struct sk_buff *skb, +struct bonding *bond, +const struct arp_pkt *arp) {struct alb_bond_info *bond_info = &(BOND_ALB_INFO (bond)); -struct arp_pkt *arp =arp_pkt (skb);struct slave *assigned_slave, *curr_active_slave;struct rlb_client_info *client_info;u32 hash_index =0 ;
@@ -653,8 +649,12 @@ static struct slave *rlb_choose_channel(*/ static struct slave *rlb_arp_xmit (struct sk_buff *skb,struct bonding *bond) { -struct arp_pkt *arp =arp_pkt (skb);struct slave *tx_slave =NULL ; +struct arp_pkt *arp; + +if (!pskb_network_may_pull (skb,sizeof (*arp))) +return NULL ; + arp = (struct arp_pkt *)skb_network_header (skb);/* Don't modify or load balance ARPs that do not originate locally * (e.g.,arrive via a bridge).
@@ -664,7 +664,7 @@ static struct slave *rlb_arp_xmit(structif (arp->op_code ==htons (ARPOP_REPLY )) {/* the arp must be sent on the selected rx channel */ - tx_slave =rlb_choose_channel (skb, bond); + tx_slave =rlb_choose_channel (skb, bond, arp);if (tx_slave)bond_hw_addr_copy (arp->mac_src, tx_slave->dev->dev_addr, tx_slave->dev->addr_len);
@@ -676,7 +676,7 @@ static struct slave *rlb_arp_xmit(struct* When the arp reply is received the entry will be updated * with the correct unicast address of the client. */ - tx_slave =rlb_choose_channel (skb, bond); + tx_slave =rlb_choose_channel (skb, bond, arp);/* The ARP reply packets must be delayed so that * they can cancel out the influence of the ARP request.
Greg Kroah-Hartman
maintainerPATCH 34/151 bnxt_en: reinitialize IRQs when MTU is modified
In reply to Greg Kroah-HartmanFrom: Vasundhara Volam <[email protected]>
[ Upstream commit a9b952d267e59a3b405e644930f46d252cea7122 ]
MTU changes may affect the number of IRQs so we must call bnxt_close_nic()/bnxt_open_nic() with the irq_re_init parameter set to true. The reason is that a larger MTU may require aggregation rings not needed with smaller MTU. We may not be able to allocate the required number of aggregation rings and so we reduce the number of channels which will change the number of IRQs. Without this patch, it may crash eventually in pci_disable_msix() when the IRQs are not properly unwound.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -2
@@ -10973,13 +10973,13 @@ static int bnxt_change_mtu(struct net_destruct bnxt *bp =netdev_priv (dev);if (netif_running (dev)) -bnxt_close_nic (bp, false, false); +bnxt_close_nic (bp, true, false); dev->mtu = new_mtu;bnxt_set_ring_params (bp);if (netif_running (dev)) -return bnxt_open_nic (bp, false, false); +return bnxt_open_nic (bp, true, false);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 35/151 bnxt_en: fix error handling when flashing from file
In reply to Greg Kroah-HartmanFrom: Edwin Peer <[email protected]>
[ Upstream commit 22630e28f9c2b55abd217869cc0696def89f2284 ]
After bnxt_hwrm_do_send_message() was updated to return standard error codes in a recent commit, a regression in bnxt_flash_package_from_file() was introduced. The return value does not properly reflect all possible firmware errors when calling firmware to flash the package.
Fix it by consolidating all errors in one local variable rc instead of having 2 variables for different errors.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +11 -13
@@ -2007,8 +2007,8 @@ int bnxt_flash_package_from_file(structstruct hwrm_nvm_install_update_output *resp = bp->hwrm_cmd_resp_addr;struct hwrm_nvm_install_update_input install = {0 };const struct firmware *fw; -int rc, hwrm_err =0 ;u32 item_len; +int rc =0 ;u16 index;bnxt_hwrm_fw_set_time (bp);
@@ -2052,15 +2052,14 @@ int bnxt_flash_package_from_file(structmemcpy (kmem, fw->data, fw->size); modify.host_src_addr =cpu_to_le64 (dma_handle); - hwrm_err =hwrm_send_message (bp, &modify, -sizeof (modify), -FLASH_PACKAGE_TIMEOUT ); + rc =hwrm_send_message (bp, &modify,sizeof (modify), +FLASH_PACKAGE_TIMEOUT );dma_free_coherent (&bp->pdev->dev, fw->size, kmem, dma_handle); } }release_firmware (fw); -if (rc || hwrm_err) +if (rc) goto err_exit;if ((install_type &0xffff ) ==0 )
@@ -2069,20 +2068,19 @@ int bnxt_flash_package_from_file(struct install.install_type =cpu_to_le32 (install_type);mutex_lock (&bp->hwrm_cmd_lock); - hwrm_err =_hwrm_send_message (bp, &install,sizeof (install), -INSTALL_PACKAGE_TIMEOUT ); -if (hwrm_err) { + rc =_hwrm_send_message (bp, &install,sizeof (install), +INSTALL_PACKAGE_TIMEOUT ); +if (rc) {u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err;if (resp->error_code && error_code ==NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR ) { install.flags |=cpu_to_le16 (NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG ); - hwrm_err =_hwrm_send_message (bp, &install, -sizeof (install), -INSTALL_PACKAGE_TIMEOUT ); + rc =_hwrm_send_message (bp, &install,sizeof (install), +INSTALL_PACKAGE_TIMEOUT ); } -if (hwrm_err) +if (rc) goto flash_pkg_exit; }
@@ -2094,7 +2092,7 @@ int bnxt_flash_package_from_file(struct flash_pkg_exit:mutex_unlock (&bp->hwrm_cmd_lock); err_exit: -if (hwrm_err == -EACCES ) +if (rc == -EACCES )bnxt_print_admin_err (bp);return rc; }
Greg Kroah-Hartman
maintainerPATCH 36/151 cgroup: memcg: net: do not associate sock with unrelated cgroup
In reply to Greg Kroah-HartmanFrom: Shakeel Butt <[email protected]>
[ Upstream commit e876ecc67db80dfdb8e237f71e5b43bb88ae549c ]
We are testing network memory accounting in our setup and noticed inconsistent network memory usage and often unrelated cgroups network usage correlates with testing workload. On further inspection, it seems like mem_cgroup_sk_alloc() and cgroup_sk_alloc() are broken in irq context specially for cgroup v1.
mem_cgroup_sk_alloc() and cgroup_sk_alloc() can be called in irq context and kind of assumes that this can only happen from sk_clone_lock() and the source sock object has already associated cgroup. However in cgroup v1, where network memory accounting is opt-in, the source sock can be unassociated with any cgroup and the new cloned sock can get associated with unrelated interrupted cgroup.
Cgroup v2 can also suffer if the source sock object was created by process in the root cgroup or if sk_alloc() is called in irq context. The fix is to just do nothing in interrupt.
WARNING: Please note that about half of the TCP sockets are allocated from the IRQ context, so, memory used by such sockets will not be accouted by the memcg.
The stack trace of mem_cgroup_sk_alloc() from IRQ-context:
CPU: 70 PID: 12720 Comm: ssh Tainted: 5.6.0-smp-DEV #1 Hardware name: ... Call Trace: <IRQ> dump_stack+0x57/0x75 mem_cgroup_sk_alloc+0xe9/0xf0 sk_clone_lock+0x2a7/0x420 inet_csk_clone_lock+0x1b/0x110 tcp_create_openreq_child+0x23/0x3b0 tcp_v6_syn_recv_sock+0x88/0x730 tcp_check_req+0x429/0x560 tcp_v6_rcv+0x72d/0xa40 ip6_protocol_deliver_rcu+0xc9/0x400 ip6_input+0x44/0xd0 ? ip6_protocol_deliver_rcu+0x400/0x400 ip6_rcv_finish+0x71/0x80 ipv6_rcv+0x5b/0xe0 ? ip6_sublist_rcv+0x2e0/0x2e0 process_backlog+0x108/0x1e0 net_rx_action+0x26b/0x460 __do_softirq+0x104/0x2a6 do_softirq_own_stack+0x2a/0x40 </IRQ> do_softirq.part.19+0x40/0x50 __local_bh_enable_ip+0x51/0x60 ip6_finish_output2+0x23d/0x520 ? ip6table_mangle_hook+0x55/0x160 __ip6_finish_output+0xa1/0x100 ip6_finish_output+0x30/0xd0 ip6_output+0x73/0x120 ? __ip6_finish_output+0x100/0x100 ip6_xmit+0x2e3/0x600 ? ipv6_anycast_cleanup+0x50/0x50 ? inet6_csk_route_socket+0x136/0x1e0 ? skb_free_head+0x1e/0x30 inet6_csk_xmit+0x95/0xf0 __tcp_transmit_skb+0x5b4/0xb20 __tcp_send_ack.part.60+0xa3/0x110 tcp_send_ack+0x1d/0x20 tcp_rcv_state_process+0xe64/0xe80 ? tcp_v6_connect+0x5d1/0x5f0 tcp_v6_do_rcv+0x1b1/0x3f0 ? tcp_v6_do_rcv+0x1b1/0x3f0 __release_sock+0x7f/0xd0 release_sock+0x30/0xa0 __inet_stream_connect+0x1c3/0x3b0 ? prepare_to_wait+0xb0/0xb0 inet_stream_connect+0x3b/0x60 __sys_connect+0x101/0x120 ? __sys_getsockopt+0x11b/0x140 __x64_sys_connect+0x1a/0x20 do_syscall_64+0x51/0x200 entry_SYSCALL_64_after_hwframe+0x44/0xa9
The stack trace of mem_cgroup_sk_alloc() from IRQ-context:
--- kernel/cgroup/cgroup.c | 4 ++++ mm/memcontrol.c | 4 ++++ 2 files changed, 8 insertions(+)
kernel/cgroup/cgroup.c +4 -0
@@ -6263,6 +6263,10 @@ void cgroup_sk_alloc(struct sock_cgroup_return ; } +/* Don't associate the sock with unrelated interrupted task's cgroup. */ +if (in_interrupt ()) +return ; +rcu_read_lock ();while (true) {
mm/memcontrol.c +4 -0
@@ -6697,6 +6697,10 @@ void mem_cgroup_sk_alloc(struct sock *skreturn ; } +/* Do not associate the sock with unrelated interrupted task's memcg. */ +if (in_interrupt ()) +return ; +rcu_read_lock (); memcg =mem_cgroup_from_task (current);if (memcg == root_mem_cgroup)
Greg Kroah-Hartman
maintainerPATCH 37/151 net: memcg: late association of sock to memcg
In reply to Greg Kroah-HartmanFrom: Shakeel Butt <[email protected]>
[ Upstream commit d752a4986532cb6305dfd5290a614cde8072769d ]
If a TCP socket is allocated in IRQ context or cloned from unassociated (i.e. not associated to a memcg) in IRQ context then it will remain unassociated for its whole life. Almost half of the TCPs created on the system are created in IRQ context, so, memory used by such sockets will not be accounted by the memcg.
This issue is more widespread in cgroup v1 where network memory accounting is opt-in but it can happen in cgroup v2 if the source socket for the cloning was created in root memcg.
To fix the issue, just do the association of the sockets at the accept() time in the process context and then force charge the memory buffer already used and reserved by the socket.
--- mm/memcontrol.c | 14 -------------- net/core/sock.c | 5 ++++- net/ipv4/inet_connection_sock.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 15 deletions(-)
mm/memcontrol.c +0 -14
@@ -6683,20 +6683,6 @@ void mem_cgroup_sk_alloc(struct sock *skif (!mem_cgroup_sockets_enabled)return ; -/* -* Socket cloning can throw us here with sk_memcg already -* filled. It won't however, necessarily happen from -* process context. So the test for root memcg given -* the current task's memcg won't help us in this case. -* -* Respecting the original socket's memcg is a better -* decision in this case. -*/ -if (sk->sk_memcg) { -css_get (&sk->sk_memcg->css); -return ; - } -/* Do not associate the sock with unrelated interrupted task's memcg. */ if (in_interrupt ())return ;
net/core/sock.c +4 -1
@@ -1830,7 +1830,10 @@ struct sock *sk_clone_lock(const structatomic_set (&newsk->sk_zckey,0 );sock_reset_flag (newsk,SOCK_DONE ); -mem_cgroup_sk_alloc (newsk); + +/* sk->sk_memcg will be populated at accept() time */ + newsk->sk_memcg =NULL ; +cgroup_sk_alloc (&newsk->sk_cgrp_data);rcu_read_lock ();
net/ipv4/inet_connection_sock.c +20 -0
@@ -482,6 +482,26 @@ struct sock *inet_csk_accept(struct sock }spin_unlock_bh (&queue->fastopenq.lock); } + +if (mem_cgroup_sockets_enabled) { +int amt; + +/* atomically get the memory usage, set and charge the +* sk->sk_memcg. +*/ +lock_sock (newsk); + +/* The sk has not been accepted yet, no need to look at +* sk->sk_wmem_queued. +*/ + amt =sk_mem_pages (newsk->sk_forward_alloc + +atomic_read (&sk->sk_rmem_alloc)); +mem_cgroup_sk_alloc (newsk); +if (newsk->sk_memcg && amt) +mem_cgroup_charge_skmem (newsk->sk_memcg, amt); + +release_sock (newsk); + } out:release_sock (sk);if (req)
Greg Kroah-Hartman
maintainerPATCH 38/151 net: memcg: fix lockdep splat in inet_csk_accept()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 06669ea346e476a5339033d77ef175566a40efbb upstream.
Locking newsk while still holding the listener lock triggered a lockdep splat [1]
We can simply move the memcg code after we release the listener lock, as this can also help if multiple threads are sharing a common listener.
Also fix a typo while reading socket sk_rmem_alloc.
[1]
WARNING: possible recursive locking detected
5.6.0-rc3-syzkaller #0 Not tainted
--------------------------------------------
syz-executor598/9524 is trying to acquire lock:ffff88808b5b8b90 (sk_lock-AF_INET6){+.+.}, at: lock_sock include/net/sock.h:1541 [inline] ffff88808b5b8b90 (sk_lock-AF_INET6){+.+.}, at: inet_csk_accept+0x69f/0xd30 net/ipv4/inet_connection_sock.c:492
but task is already holding lock:ffff88808b5b9590 (sk_lock-AF_INET6){+.+.}, at: lock_sock include/net/sock.h:1541 [inline] ffff88808b5b9590 (sk_lock-AF_INET6){+.+.}, at: inet_csk_accept+0x8d/0xd30 net/ipv4/inet_connection_sock.c:445
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(sk_lock-AF_INET6);
lock(sk_lock-AF_INET6);
*** DEADLOCK ***
May be due to missing lock nesting notation
1 lock held by syz-executor598/9524:
#0: ffff88808b5b9590 (sk_lock-AF_INET6){+.+.}, at: lock_sock include/net/sock.h:1541 [inline] #0: ffff88808b5b9590 (sk_lock-AF_INET6){+.+.}, at: inet_csk_accept+0x8d/0xd30 net/ipv4/inet_connection_sock.c:445
stack backtrace: CPU: 0 PID: 9524 Comm: syz-executor598 Not tainted 5.6.0-rc3-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x188/0x20d lib/dump_stack.c:118 print_deadlock_bug kernel/locking/lockdep.c:2370 [inline] check_deadlock kernel/locking/lockdep.c:2411 [inline] validate_chain kernel/locking/lockdep.c:2954 [inline] __lock_acquire.cold+0x114/0x288 kernel/locking/lockdep.c:3954 lock_acquire+0x197/0x420 kernel/locking/lockdep.c:4484 lock_sock_nested+0xc5/0x110 net/core/sock.c:2947 lock_sock include/net/sock.h:1541 [inline] inet_csk_accept+0x69f/0xd30 net/ipv4/inet_connection_sock.c:492 inet_accept+0xe9/0x7c0 net/ipv4/af_inet.c:734 __sys_accept4_file+0x3ac/0x5b0 net/socket.c:1758 __sys_accept4+0x53/0x90 net/socket.c:1809 __do_sys_accept4 net/socket.c:1821 [inline] __se_sys_accept4 net/socket.c:1818 [inline] __x64_sys_accept4+0x93/0xf0 net/socket.c:1818 do_syscall_64+0xf6/0x790 arch/x86/entry/common.c:294 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x4445c9 Code: e8 0c 0d 03 00 48 83 c4 18 c3 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 eb 08 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007ffc35b37608 EFLAGS: 00000246 ORIG_RAX: 0000000000000120 RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00000000004445c9 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000003 RBP: 0000000000000000 R08: 0000000000306777 R09: 0000000000306777 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00000000004053d0 R14: 0000000000000000 R15: 0000000000000000
--- net/ipv4/inet_connection_sock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/ipv4/inet_connection_sock.c +7 -7
@@ -483,27 +483,27 @@ struct sock *inet_csk_accept(struct sockspin_unlock_bh (&queue->fastopenq.lock); } -if (mem_cgroup_sockets_enabled) { +out: +release_sock (sk); +if (newsk && mem_cgroup_sockets_enabled) {int amt;/* atomically get the memory usage, set and charge the -* sk->sk_memcg. +* newsk->sk_memcg. */ lock_sock (newsk); -/* The sk has not been accepted yet, no need to look at -* sk->sk_wmem_queued. +/* The socket has not been accepted yet, no need to look at +* newsk->sk_wmem_queued. */ amt =sk_mem_pages (newsk->sk_forward_alloc + -atomic_read (&sk->sk_rmem_alloc)); +atomic_read (&newsk->sk_rmem_alloc));mem_cgroup_sk_alloc (newsk);if (newsk->sk_memcg && amt)mem_cgroup_charge_skmem (newsk->sk_memcg, amt);release_sock (newsk); } -out: -release_sock (sk);if (req)reqsk_put (req);return newsk;
Greg Kroah-Hartman
maintainerPATCH 39/151 dt-bindings: net: FMan erratum A050385
In reply to Greg Kroah-HartmanFrom: Madalin Bucur <[email protected]>
commit 26d5bb9e4c4b541c475751e015072eb2cbf70d15 upstream.
FMAN DMA read or writes under heavy traffic load may cause FMAN internal resource leak; thus stopping further packet processing.
The FMAN internal queue can overflow when FMAN splits single read or write transactions into multiple smaller transactions such that more than 17 AXI transactions are in flight from FMAN to interconnect. When the FMAN internal queue overflows, it can stall further packet processing. The issue can occur with any one of the following three conditions:
1. FMAN AXI transaction crosses 4K address boundary (Errata
A010022)
2. FMAN DMA address for an AXI transaction is not 16 byte aligned, i.e. the last 4 bits of an address are non-zero
3. Scatter Gather (SG) frames have more than one SG buffer in the SG list and any one of the buffers, except the last buffer in the SG list has data size that is not a multiple of 16 bytes, i.e., other than 16, 32, 48, 64, etc.
With any one of the above three conditions present, there is likelihood of stalled FMAN packet processing, especially under stress with multiple ports injecting line-rate traffic.
To avoid situations that stall FMAN packet processing, all of the above three conditions must be avoided; therefore, configure the system with the following rules:
1. Frame buffers must not span a 4KB address boundary, unless the frame start address is 256 byte aligned
2. All FMAN DMA start addresses (for example, BMAN buffer address, FD[address] + FD[offset]) are 16B aligned
3. SG table and buffer addresses are 16B aligned and the size of SG buffers are multiple of 16 bytes, except for the last SG buffer that can be of any size.
Additional workaround notes:
- Address alignment of 64 bytes is recommended for maximally efficient system bus transactions (although 16 byte alignment is sufficient to avoid the stall condition)
- To support frame sizes that are larger than 4K bytes, there are two options:
1. Large single buffer frames that span a 4KB page boundary can be converted into SG frames to avoid transaction splits at the 4KB boundary,
2. Align the large single buffer to 256B address boundaries, ensure that the frame address plus offset is 256B aligned.
- If software generated SG frames have buffers that are unaligned and with random non-multiple of 16 byte lengths, before transmitting such frames via FMAN, frames will need to be copied into a new single buffer or multiple buffer SG frame that is compliant with the three rules listed above.
--- Documentation/devicetree/bindings/net/fsl-fman.txt | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/net/fsl-fman.txt +7 -0
@@ -110,6 +110,13 @@ PROPERTIES Usage: required Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt +- fsl,erratum-a050385 + Usage: optional + Value type: boolean + Definition: A boolean property. Indicates the presence of the + erratum A050385 which indicates that DMA transactions that are + split can result in a FMan lock. + ============================================================================= FMan MURAM Node
Greg Kroah-Hartman
maintainerPATCH 40/151 arm64: dts: ls1043a: FMan erratum A050385
In reply to Greg Kroah-HartmanFrom: Madalin Bucur <[email protected]>
commit b54d3900862374e1bb2846e6b39d79c896c0b200 upstream.
The LS1043A SoC is affected by the A050385 erratum stating that FMAN DMA read or writes under heavy traffic load may cause FMAN internal resource leak thus stopping further packet processing.
--- arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi +2 -0
@@ -20,6 +20,8 @@ }; &fman0 { + fsl,erratum-a050385; + /* these aliases provide the FMan ports mapping */ enet0: ethernet@e0000 { };
Greg Kroah-Hartman
maintainerPATCH 41/151 fsl/fman: detect FMan erratum A050385
In reply to Greg Kroah-HartmanFrom: Madalin Bucur <[email protected]>
commit b281f7b93b258ce1419043bbd898a29254d5c9c7 upstream.
Detect the presence of the A050385 erratum.
--- drivers/net/ethernet/freescale/fman/Kconfig | 28 ++++++++++++++++++++++++++++ drivers/net/ethernet/freescale/fman/fman.c | 18 ++++++++++++++++++ drivers/net/ethernet/freescale/fman/fman.h | 5 +++++ 3 files changed, 51 insertions(+)
drivers/net/ethernet/freescale/fman/Kconfig +28 -0
@@ -8,3 +8,31 @@ config FSL_FMAN help Freescale Data-Path Acceleration Architecture Frame Manager (FMan) support + +config DPAA_ERRATUM_A050385 + bool + depends on ARM64 && FSL_DPAA + default y + help + DPAA FMan erratum A050385 software workaround implementation: + align buffers, data start, SG fragment length to avoid FMan DMA + splits. + FMAN DMA read or writes under heavy traffic load may cause FMAN + internal resource leak thus stopping further packet processing. + The FMAN internal queue can overflow when FMAN splits single + read or write transactions into multiple smaller transactions + such that more than 17 AXI transactions are in flight from FMAN + to interconnect. When the FMAN internal queue overflows, it can + stall further packet processing. The issue can occur with any + one of the following three conditions: + 1. FMAN AXI transaction crosses 4K address boundary (Errata + A010022) + 2. FMAN DMA address for an AXI transaction is not 16 byte + aligned, i.e. the last 4 bits of an address are non-zero + 3. Scatter Gather (SG) frames have more than one SG buffer in + the SG list and any one of the buffers, except the last + buffer in the SG list has data size that is not a multiple + of 16 bytes, i.e., other than 16, 32, 48, 64, etc. + With any one of the above three conditions present, there is + likelihood of stalled FMAN packet processing, especially under + stress with multiple ports injecting line-rate traffic.
drivers/net/ethernet/freescale/fman/fman.c +18 -0
@@ -1,5 +1,6 @@/* * Copyright 2008-2015 Freescale Semiconductor Inc. +* Copyright 2020 NXP * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met:
@@ -566,6 +567,10 @@ struct fman_cfg {u32 qmi_def_tnums_thresh; }; +#ifdef CONFIG_DPAA_ERRATUM_A050385 +static bool fman_has_err_a050385; +#endif +static irqreturn_t fman_exceptions (struct fman *fman,enum fman_exceptions exception) {
@@ -2518,6 +2523,14 @@ struct fman *fman_bind(struct device *fm }EXPORT_SYMBOL (fman_bind); +#ifdef CONFIG_DPAA_ERRATUM_A050385 +bool fman_has_errata_a050385 (void ) +{ +return fman_has_err_a050385; +} +EXPORT_SYMBOL (fman_has_errata_a050385); +#endif +static irqreturn_t fman_err_irq (int irq,void *handle) {struct fman *fman = (struct fman *)handle;
@@ -2845,6 +2858,11 @@ static struct fman *read_dts_node(struct goto fman_free; } +#ifdef CONFIG_DPAA_ERRATUM_A050385 + fman_has_err_a050385 = +of_property_read_bool (fm_node,"fsl,erratum-a050385" ); +#endif +return fman; fman_node_put:
drivers/net/ethernet/freescale/fman/fman.h +5 -0
@@ -1,5 +1,6 @@/* * Copyright 2008-2015 Freescale Semiconductor Inc. +* Copyright 2020 NXP * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met:
@@ -398,6 +399,10 @@ u16 fman_get_max_frm(void);int fman_get_rx_extra_headroom (void ); +#ifdef CONFIG_DPAA_ERRATUM_A050385 +bool fman_has_errata_a050385 (void ); +#endif +struct fman *fman_bind (struct device *dev);#endif /* __FM_H */
Greg Kroah-Hartman
maintainerPATCH 42/151 dpaa_eth: FMan erratum A050385 workaround
In reply to Greg Kroah-HartmanFrom: Madalin Bucur <[email protected]>
commit 3c68b8fffb48c0018c24e73c48f2bac768c6203e upstream.
Align buffers, data start, SG fragment length to avoid DMA splits. These changes prevent the A050385 erratum to manifest itself:
FMAN DMA read or writes under heavy traffic load may cause FMAN internal resource leak; thus stopping further packet processing.
The FMAN internal queue can overflow when FMAN splits single read or write transactions into multiple smaller transactions such that more than 17 AXI transactions are in flight from FMAN to interconnect. When the FMAN internal queue overflows, it can stall further packet processing. The issue can occur with any one of the following three conditions:
1. FMAN AXI transaction crosses 4K address boundary (Errata
A010022)
2. FMAN DMA address for an AXI transaction is not 16 byte aligned, i.e. the last 4 bits of an address are non-zero
3. Scatter Gather (SG) frames have more than one SG buffer in the SG list and any one of the buffers, except the last buffer in the SG list has data size that is not a multiple of 16 bytes, i.e., other than 16, 32, 48, 64, etc.
With any one of the above three conditions present, there is likelihood of stalled FMAN packet processing, especially under stress with multiple ports injecting line-rate traffic.
To avoid situations that stall FMAN packet processing, all of the above three conditions must be avoided; therefore, configure the system with the following rules:
1. Frame buffers must not span a 4KB address boundary, unless the frame start address is 256 byte aligned
2. All FMAN DMA start addresses (for example, BMAN buffer address, FD[address] + FD[offset]) are 16B aligned
3. SG table and buffer addresses are 16B aligned and the size of SG buffers are multiple of 16 bytes, except for the last SG buffer that can be of any size.
Additional workaround notes:
- Address alignment of 64 bytes is recommended for maximally efficient system bus transactions (although 16 byte alignment is sufficient to avoid the stall condition)
- To support frame sizes that are larger than 4K bytes, there are two options:
1. Large single buffer frames that span a 4KB page boundary can be converted into SG frames to avoid transaction splits at the 4KB boundary,
2. Align the large single buffer to 256B address boundaries, ensure that the frame address plus offset is 256B aligned.
- If software generated SG frames have buffers that are unaligned and with random non-multiple of 16 byte lengths, before transmitting such frames via FMAN, frames will need to be copied into a new single buffer or multiple buffer SG frame that is compliant with the three rules listed above.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 110 ++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +107 -3
@@ -1,4 +1,5 @@/* Copyright 2008 - 2016 Freescale Semiconductor Inc. +* Copyright 2020 NXP * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met:
@@ -123,7 +124,22 @@ MODULE_PARM_DESC(tx_timeout, "The Tx tim#define FSL_QMAN_MAX_OAL 127/* Default alignment for start of data in an Rx FD */ +#ifdef CONFIG_DPAA_ERRATUM_A050385 +/* aligning data start to 64 avoids DMA transaction splits, unless the buffer +* is crossing a 4k page boundary +*/ +#define DPAA_FD_DATA_ALIGNMENT (fman_has_errata_a050385() ? 64 : 16) +/* aligning to 256 avoids DMA transaction splits caused by 4k page boundary +* crossings; also, all SG fragments except the last must have a size multiple +* of 256 to avoid DMA transaction splits +*/ +#define DPAA_A050385_ALIGN 256 +#define DPAA_FD_RX_DATA_ALIGNMENT (fman_has_errata_a050385() ? \ + DPAA_A050385_ALIGN : 16) +#else #define DPAA_FD_DATA_ALIGNMENT 16 +#define DPAA_FD_RX_DATA_ALIGNMENT DPAA_FD_DATA_ALIGNMENT +#endif /* The DPAA requires 256 bytes reserved and mapped for the SGT */ #define DPAA_SGT_SIZE 256
@@ -158,8 +174,13 @@ MODULE_PARM_DESC(tx_timeout, "The Tx tim#define DPAA_PARSE_RESULTS_SIZE sizeof(struct fman_prs_result)#define DPAA_TIME_STAMP_SIZE 8#define DPAA_HASH_RESULTS_SIZE 8 +#ifdef CONFIG_DPAA_ERRATUM_A050385 +#define DPAA_RX_PRIV_DATA_SIZE (DPAA_A050385_ALIGN - (DPAA_PARSE_RESULTS_SIZE\ + + DPAA_TIME_STAMP_SIZE + DPAA_HASH_RESULTS_SIZE)) +#else #define DPAA_RX_PRIV_DATA_SIZE (u16)(DPAA_TX_PRIV_DATA_SIZE + \ dpaa_rx_extra_headroom) +#endif #define DPAA_ETH_PCD_RXQ_NUM 128
@@ -180,7 +201,12 @@ static struct dpaa_bp *dpaa_bp_array[BM_#define DPAA_BP_RAW_SIZE 4096 +#ifdef CONFIG_DPAA_ERRATUM_A050385 +#define dpaa_bp_size (raw_size) (SKB_WITH_OVERHEAD(raw_size) & \ + ~(DPAA_A050385_ALIGN - 1)) +#else #define dpaa_bp_size (raw_size) SKB_WITH_OVERHEAD(raw_size) +#endif static int dpaa_max_frm;
@@ -1192,7 +1218,7 @@ static int dpaa_eth_init_rx_port(struct buf_prefix_content.pass_prs_result = true; buf_prefix_content.pass_hash_result = true; buf_prefix_content.pass_time_stamp = true; - buf_prefix_content.data_align =DPAA_FD_DATA_ALIGNMENT ; + buf_prefix_content.data_align =DPAA_FD_RX_DATA_ALIGNMENT ; rx_p = ¶ms.specific_params.rx_params; rx_p->err_fqid = errq->fqid;
@@ -1662,6 +1688,8 @@ static u8 rx_csum_offload(const struct dreturn CHECKSUM_NONE ; } +#define PTR_IS_ALIGNED (x, a) (IS_ALIGNED((unsigned long)(x), (a))) +/* Build a linear skb around the received buffer. * We are guaranteed there is enough room at the end of the data buffer to * accommodate the shared info area of the skb.
@@ -1733,8 +1761,7 @@ static struct sk_buff *sg_fd_to_skb(cons sg_addr =qm_sg_addr (&sgt[i]); sg_vaddr =phys_to_virt (sg_addr); -WARN_ON (!IS_ALIGNED ((unsigned long )sg_vaddr, -SMP_CACHE_BYTES )); +WARN_ON (!PTR_IS_ALIGNED (sg_vaddr,SMP_CACHE_BYTES ));dma_unmap_page (priv->rx_dma_dev, sg_addr,DPAA_BP_RAW_SIZE ,DMA_FROM_DEVICE );
@@ -2022,6 +2049,75 @@ static inline int dpaa_xmit(struct dpaa_return 0 ; } +#ifdef CONFIG_DPAA_ERRATUM_A050385 +int dpaa_a050385_wa (struct net_device *net_dev,struct sk_buff **s) +{ +struct dpaa_priv *priv =netdev_priv (net_dev); +struct sk_buff *new_skb, *skb = *s; +unsigned char *start, i; + +/* check linear buffer alignment */ +if (!PTR_IS_ALIGNED (skb->data,DPAA_A050385_ALIGN )) + goto workaround; + +/* linear buffers just need to have an aligned start */ +if (!skb_is_nonlinear (skb)) +return 0 ; + +/* linear data size for nonlinear skbs needs to be aligned */ +if (!IS_ALIGNED (skb_headlen (skb),DPAA_A050385_ALIGN )) + goto workaround; + +for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) { +skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; + +/* all fragments need to have aligned start addresses */ +if (!IS_ALIGNED (skb_frag_off (frag),DPAA_A050385_ALIGN )) + goto workaround; + +/* all but last fragment need to have aligned sizes */ +if (!IS_ALIGNED (skb_frag_size (frag),DPAA_A050385_ALIGN ) && + (i <skb_shinfo (skb)->nr_frags -1 )) + goto workaround; + } + +return 0 ; + +workaround: +/* copy all the skb content into a new linear buffer */ + new_skb =netdev_alloc_skb (net_dev, skb->len +DPAA_A050385_ALIGN -1 + + priv->tx_headroom); +if (!new_skb) +return -ENOMEM ; + +/* NET_SKB_PAD bytes already reserved, adding up to tx_headroom */ +skb_reserve (new_skb, priv->tx_headroom -NET_SKB_PAD ); + +/* Workaround for DPAA_A050385 requires data start to be aligned */ + start =PTR_ALIGN (new_skb->data,DPAA_A050385_ALIGN ); +if (start - new_skb->data !=0 ) +skb_reserve (new_skb, start - new_skb->data); + +skb_put (new_skb, skb->len); +skb_copy_bits (skb,0 , new_skb->data, skb->len); +skb_copy_header (new_skb, skb); + new_skb->dev = skb->dev; + +/* We move the headroom when we align it so we have to reset the +* network and transport header offsets relative to the new data +* pointer. The checksum offload relies on these offsets. +*/ +skb_set_network_header (new_skb,skb_network_offset (skb)); +skb_set_transport_header (new_skb,skb_transport_offset (skb)); + +/* TODO: does timestamping need the result in the old skb? */ +dev_kfree_skb (skb); + *s = new_skb; + +return 0 ; +} +#endif +static netdev_tx_t dpaa_start_xmit (struct sk_buff *skb,struct net_device *net_dev) {
@@ -2068,6 +2164,14 @@ dpaa_start_xmit(struct sk_buff *skb, str nonlinear =skb_is_nonlinear (skb); } +#ifdef CONFIG_DPAA_ERRATUM_A050385 +if (unlikely (fman_has_errata_a050385 ())) { +if (dpaa_a050385_wa (net_dev, &skb)) + goto enomem; + nonlinear =skb_is_nonlinear (skb); + } +#endif +if (nonlinear) {/* Just create a S/G fd based on the skb */ err =skb_to_sg_fd (priv, skb, &fd);
Greg Kroah-Hartman
maintainerPATCH 43/151 net: hns3: fix "tc qdisc del" failed issue
In reply to Greg Kroah-HartmanFrom: Yonglong Liu <[email protected]>
[ Upstream commit 5eb01ddfcfb25e6ebc404a41deae946bde776731 ]
The HNS3 driver supports to configure TC numbers and TC to priority map via "tc" tool. But when delete the rule, will fail, because the HNS3 driver needs at least one TC, but the "tc" tool sets TC number to zero when delete.
This patch makes sure that the TC number is at least one.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -1675,7 +1675,7 @@ static int hns3_setup_tc(struct net_devinetif_dbg (h, drv, netdev,"setup tc: num_tc=%u\n" , tc);return (kinfo->dcb_ops && kinfo->dcb_ops->setup_tc) ? - kinfo->dcb_ops->setup_tc (h, tc, prio_tc) : -EOPNOTSUPP ; + kinfo->dcb_ops->setup_tc (h, tc ? tc :1 , prio_tc) : -EOPNOTSUPP ; } static int hns3_nic_setup_tc(struct net_device *dev, enum tc_setup_type type,
Greg Kroah-Hartman
maintainerPATCH 44/151 net: hns3: fix RMW issue for VLAN filter switch
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 903b85d3adce99a5301d5959c4d3c9d14a7974d4 ]
According to the user manual, the ingress and egress VLAN filter are configured at the same time. Currently, hclge_init_vlan_config() and hclge_set_vlan_spoofchk() will both change the VLAN filter switch. So it's necessary to read the old configuration before modifying it.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 19 ++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +15 -4
@@ -7727,16 +7727,27 @@ static int hclge_set_vlan_filter_ctrl(ststruct hclge_desc desc;int ret; -hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_VLAN_FILTER_CTRL , false); - +/* read current vlan filter parameter */ +hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_VLAN_FILTER_CTRL , true); req = (struct hclge_vlan_filter_ctrl_cmd *)desc.data; req->vlan_type = vlan_type; - req->vlan_fe = filter_en ? fe_type :0 ; req->vf_id = vf_id; ret =hclge_cmd_send (&hdev->hw, &desc,1 ); +if (ret) { +dev_err (&hdev->pdev->dev, +"failed to get vlan filter config, ret = %d.\n" , ret); +return ret; + } + +/* modify and write new config parameter */ +hclge_cmd_reuse_desc (&desc, false); + req->vlan_fe = filter_en ? + (req->vlan_fe | fe_type) : (req->vlan_fe & ~fe_type); + + ret =hclge_cmd_send (&hdev->hw, &desc,1 );if (ret) -dev_err (&hdev->pdev->dev,"set vlan filter fail, ret =%d.\n" , +dev_err (&hdev->pdev->dev,"failed to set vlan filter, ret = %d.\n" , ret);return ret;
Greg Kroah-Hartman
maintainerPATCH 45/151 net: hns3: clear port base VLAN when unload PF
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 59359fc8a2f7af062777692e6a7aae73483729ec ]
Currently, PF missed to clear the port base VLAN for VF when unload. In this case, the VLAN id will remain in the VLAN table. This patch fixes it.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 23 ++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +23 -0
@@ -8486,6 +8486,28 @@ static int hclge_set_vf_vlan_filter(stru } } +static void hclge_clear_vf_vlan (struct hclge_dev *hdev) +{ +struct hclge_vlan_info *vlan_info; +struct hclge_vport *vport; +int ret; +int vf; + +/* clear port base vlan for all vf */ +for (vf =HCLGE_VF_VPORT_START_NUM ; vf < hdev->num_alloc_vport; vf++) { + vport = &hdev->vport[vf]; + vlan_info = &vport->port_base_vlan_cfg.vlan_info; + + ret =hclge_set_vlan_filter_hw (hdev,htons (ETH_P_8021Q ), + vport->vport_id, + vlan_info->vlan_tag, true); +if (ret) +dev_err (&hdev->pdev->dev, +"failed to clear vf vlan for vf%d, ret = %d\n" , + vf -HCLGE_VF_VPORT_START_NUM , ret); + } +} +int hclge_set_vlan_filter (struct hnae3_handle *handle,__be16 proto,u16 vlan_id,bool is_kill) {
@@ -9895,6 +9917,7 @@ static void hclge_uninit_ae_dev(struct hstruct hclge_mac *mac = &hdev->hw.mac;hclge_reset_vf_rate (hdev); +hclge_clear_vf_vlan (hdev);hclge_misc_affinity_teardown (hdev);hclge_state_uninit (hdev);
Greg Kroah-Hartman
maintainerPATCH 46/151 devlink: validate length of param values
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 8750939b6ad86abc3f53ec8a9683a1cded4a5654 ]
DEVLINK_ATTR_PARAM_VALUE_DATA may have different types so it's not checked by the normal netlink policy. Make sure the attribute length is what we expect.
--- net/core/devlink.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
net/core/devlink.c +19 -12
@@ -3352,34 +3352,41 @@ devlink_param_value_get_from_info(conststruct genl_info *info, union devlink_param_value *value) { + struct nlattr *param_data;int len; -if (param->type !=DEVLINK_PARAM_TYPE_BOOL && - !info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ]) + param_data = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ]; + +if (param->type !=DEVLINK_PARAM_TYPE_BOOL && !param_data)return -EINVAL ;switch (param->type) {case DEVLINK_PARAM_TYPE_U8 : - value->vu8 =nla_get_u8 (info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ]); +if (nla_len (param_data) !=sizeof (u8)) +return -EINVAL ; + value->vu8 =nla_get_u8 (param_data);break ;case DEVLINK_PARAM_TYPE_U16 : - value->vu16 =nla_get_u16 (info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ]); +if (nla_len (param_data) !=sizeof (u16)) +return -EINVAL ; + value->vu16 =nla_get_u16 (param_data);break ;case DEVLINK_PARAM_TYPE_U32 : - value->vu32 =nla_get_u32 (info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ]); +if (nla_len (param_data) !=sizeof (u32)) +return -EINVAL ; + value->vu32 =nla_get_u32 (param_data);break ;case DEVLINK_PARAM_TYPE_STRING : - len =strnlen (nla_data (info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ]), -nla_len (info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ])); -if (len ==nla_len (info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ]) || + len =strnlen (nla_data (param_data),nla_len (param_data)); +if (len ==nla_len (param_data) || len >= __DEVLINK_PARAM_MAX_STRING_VALUE)return -EINVAL ; -strcpy (value->vstr, -nla_data (info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ])); +strcpy (value->vstr,nla_data (param_data));break ;case DEVLINK_PARAM_TYPE_BOOL : - value->vbool = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA ] ? - true : false; +if (param_data &&nla_len (param_data)) +return -EINVAL ; + value->vbool =nla_get_flag (param_data);break ; }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 47/151 devlink: validate length of region addr/len
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit ff3b63b8c299b73ac599b120653b47e275407656 ]
DEVLINK_ATTR_REGION_CHUNK_ADDR and DEVLINK_ATTR_REGION_CHUNK_LEN lack entries in the netlink policy. Corresponding nla_get_u64()s may read beyond the end of the message.
--- net/core/devlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/devlink.c +2 -0
@@ -5924,6 +5924,8 @@ static const struct nla_policy devlink_n [DEVLINK_ATTR_PARAM_VALUE_CMODE] = { .type = NLA_U8 }, [DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING }, [DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32 }, + [DEVLINK_ATTR_REGION_CHUNK_ADDR] = { .type = NLA_U64 }, + [DEVLINK_ATTR_REGION_CHUNK_LEN] = { .type = NLA_U64 }, [DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING }, [DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] = { .type = NLA_U64 }, [DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER] = { .type = NLA_U8 },
Greg Kroah-Hartman
maintainerPATCH 48/151 fib: add missing attribute validation for tun_id
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 4c16d64ea04056f1b1b324ab6916019f6a064114 ]
Add missing netlink policy entry for FRA_TUN_ID.
--- include/net/fib_rules.h | 1 + 1 file changed, 1 insertion(+)
include/net/fib_rules.h +1 -0
@@ -108,6 +108,7 @@ struct fib_rule_notifier_info { [FRA_OIFNAME] = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \ [FRA_PRIORITY] = { .type = NLA_U32 }, \ [FRA_FWMARK] = { .type = NLA_U32 }, \ + [FRA_TUN_ID] = { .type = NLA_U64 }, \ [FRA_FWMASK] = { .type = NLA_U32 }, \ [FRA_TABLE] = { .type = NLA_U32 }, \ [FRA_SUPPRESS_PREFIXLEN] = { .type = NLA_U32 }, \
Greg Kroah-Hartman
maintainerPATCH 49/151 nl802154: add missing attribute validation
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 9322cd7c4af2ccc7fe7c5f01adb53f4f77949e92 ]
Add missing attribute validation for several u8 types.
--- net/ieee802154/nl_policy.c | 5 +++++ 1 file changed, 5 insertions(+)
net/ieee802154/nl_policy.c +5 -0
@@ -21,6 +21,11 @@ const struct nla_policy ieee802154_polic [IEEE802154_ATTR_HW_ADDR] = { .type = NLA_HW_ADDR, }, [IEEE802154_ATTR_PAN_ID] = { .type = NLA_U16, }, [IEEE802154_ATTR_CHANNEL] = { .type = NLA_U8, }, + [IEEE802154_ATTR_BCN_ORD] = { .type = NLA_U8, }, + [IEEE802154_ATTR_SF_ORD] = { .type = NLA_U8, }, + [IEEE802154_ATTR_PAN_COORD] = { .type = NLA_U8, }, + [IEEE802154_ATTR_BAT_EXT] = { .type = NLA_U8, }, + [IEEE802154_ATTR_COORD_REALIGN] = { .type = NLA_U8, }, [IEEE802154_ATTR_PAGE] = { .type = NLA_U8, }, [IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, }, [IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, },
Greg Kroah-Hartman
maintainerPATCH 50/151 nl802154: add missing attribute validation for dev_type
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit b60673c4c418bef7550d02faf53c34fbfeb366bf ]
Add missing attribute type validation for IEEE802154_ATTR_DEV_TYPE to the netlink policy.
--- net/ieee802154/nl_policy.c | 1 + 1 file changed, 1 insertion(+)
net/ieee802154/nl_policy.c +1 -0
@@ -27,6 +27,7 @@ const struct nla_policy ieee802154_polic [IEEE802154_ATTR_BAT_EXT] = { .type = NLA_U8, }, [IEEE802154_ATTR_COORD_REALIGN] = { .type = NLA_U8, }, [IEEE802154_ATTR_PAGE] = { .type = NLA_U8, }, + [IEEE802154_ATTR_DEV_TYPE] = { .type = NLA_U8, }, [IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, }, [IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, }, [IEEE802154_ATTR_COORD_PAN_ID] = { .type = NLA_U16, },
Greg Kroah-Hartman
maintainerPATCH 51/151 can: add missing attribute validation for termination
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit ab02ad660586b94f5d08912a3952b939cf4c4430 ]
Add missing attribute validation for IFLA_CAN_TERMINATION to the netlink policy.
--- drivers/net/can/dev.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/can/dev.c +1 -0
@@ -883,6 +883,7 @@ static const struct nla_policy can_polic = { .len = sizeof(struct can_bittiming) }, [IFLA_CAN_DATA_BITTIMING_CONST ] = { .len = sizeof(struct can_bittiming_const) }, + [IFLA_CAN_TERMINATION] = { .type = NLA_U16 }, }; static int can_validate(struct nlattr *tb[], struct nlattr *data[],
Greg Kroah-Hartman
maintainerPATCH 52/151 macsec: add missing attribute validation for port
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 31d9a1c524964bac77b7f9d0a1ac140dc6b57461 ]
Add missing attribute validation for IFLA_MACSEC_PORT to the netlink policy.
--- drivers/net/macsec.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/macsec.c +1 -0
@@ -2983,6 +2983,7 @@ static const struct device_type macsec_tstatic const struct nla_policy macsec_rtnl_policy[IFLA_MACSEC_MAX +1 ] = { [IFLA_MACSEC_SCI ] = { .type =NLA_U64 }, + [IFLA_MACSEC_PORT ] = { .type =NLA_U16 }, [IFLA_MACSEC_ICV_LEN ] = { .type =NLA_U8 }, [IFLA_MACSEC_CIPHER_SUITE ] = { .type =NLA_U64 }, [IFLA_MACSEC_WINDOW ] = { .type =NLA_U32 },
Greg Kroah-Hartman
maintainerPATCH 53/151 openvswitch: add missing attribute validation for hash
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit b5ab1f1be6180a2e975eede18731804b5164a05d ]
Add missing attribute validation for OVS_PACKET_ATTR_HASH to the netlink policy.
--- net/openvswitch/datapath.c | 1 + 1 file changed, 1 insertion(+)
net/openvswitch/datapath.c +1 -0
@@ -647,6 +647,7 @@ static const struct nla_policy packet_po [OVS_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED }, [OVS_PACKET_ATTR_PROBE] = { .type = NLA_FLAG }, [OVS_PACKET_ATTR_MRU] = { .type = NLA_U16 }, + [OVS_PACKET_ATTR_HASH] = { .type = NLA_U64 }, };static const struct genl_ops dp_packet_genl_ops[] = {
Greg Kroah-Hartman
maintainerPATCH 54/151 net: fq: add missing attribute validation for orphan mask
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 7e6dc03eeb023e18427a373522f1d247b916a641 ]
Add missing attribute validation for TCA_FQ_ORPHAN_MASK to the netlink policy.
--- net/sched/sch_fq.c | 1 + 1 file changed, 1 insertion(+)
net/sched/sch_fq.c +1 -0
@@ -744,6 +744,7 @@ static const struct nla_policy fq_policy [TCA_FQ_FLOW_MAX_RATE] = { .type = NLA_U32 }, [TCA_FQ_BUCKETS_LOG] = { .type = NLA_U32 }, [TCA_FQ_FLOW_REFILL_DELAY] = { .type = NLA_U32 }, + [TCA_FQ_ORPHAN_MASK] = { .type = NLA_U32 }, [TCA_FQ_LOW_RATE_THRESHOLD] = { .type = NLA_U32 }, [TCA_FQ_CE_THRESHOLD] = { .type = NLA_U32 }, };
Greg Kroah-Hartman
maintainerPATCH 55/151 net: taprio: add missing attribute validation for txtime delay
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit e13aaa0643da10006ec35715954e7f92a62899a5 ]
Add missing attribute validation for TCA_TAPRIO_ATTR_TXTIME_DELAY to the netlink policy.
--- net/sched/sch_taprio.c | 1 + 1 file changed, 1 insertion(+)
net/sched/sch_taprio.c +1 -0
@@ -774,6 +774,7 @@ static const struct nla_policy taprio_po [TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME] = { .type = NLA_S64 }, [TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION] = { .type = NLA_S64 }, [TCA_TAPRIO_ATTR_FLAGS] = { .type = NLA_U32 }, + [TCA_TAPRIO_ATTR_TXTIME_DELAY] = { .type = NLA_U32 }, }; static int fill_sched_entry(struct nlattr **tb, struct sched_entry *entry,
Greg Kroah-Hartman
maintainerPATCH 56/151 team: add missing attribute validation for port ifindex
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit dd25cb272ccce4db67dc8509278229099e4f5e99 ]
Add missing attribute validation for TEAM_ATTR_OPTION_PORT_IFINDEX to the netlink policy.
--- drivers/net/team/team.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/team/team.c +1 -0
@@ -2240,6 +2240,7 @@ team_nl_option_policy[TEAM_ATTR_OPTION_M [TEAM_ATTR_OPTION_CHANGED] = { .type = NLA_FLAG }, [TEAM_ATTR_OPTION_TYPE] = { .type = NLA_U8 }, [TEAM_ATTR_OPTION_DATA] = { .type = NLA_BINARY }, + [TEAM_ATTR_OPTION_PORT_IFINDEX] = { .type = NLA_U32 }, };static int team_nl_cmd_noop (struct sk_buff *skb,struct genl_info *info)
Greg Kroah-Hartman
maintainerPATCH 57/151 team: add missing attribute validation for array index
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 669fcd7795900cd1880237cbbb57a7db66cb9ac8 ]
Add missing attribute validation for TEAM_ATTR_OPTION_ARRAY_INDEX to the netlink policy.
--- drivers/net/team/team.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/team/team.c +1 -0
@@ -2241,6 +2241,7 @@ team_nl_option_policy[TEAM_ATTR_OPTION_M [TEAM_ATTR_OPTION_TYPE] = { .type = NLA_U8 }, [TEAM_ATTR_OPTION_DATA] = { .type = NLA_BINARY }, [TEAM_ATTR_OPTION_PORT_IFINDEX] = { .type = NLA_U32 }, + [TEAM_ATTR_OPTION_ARRAY_INDEX] = { .type = NLA_U32 }, };static int team_nl_cmd_noop (struct sk_buff *skb,struct genl_info *info)
Greg Kroah-Hartman
maintainerPATCH 58/151 tipc: add missing attribute validation for MTU property
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 213320a67962ff6e7b83b704d55cbebc341426db ]
Add missing attribute validation for TIPC_NLA_PROP_MTU to the netlink policy.
--- net/tipc/netlink.c | 1 + 1 file changed, 1 insertion(+)
net/tipc/netlink.c +1 -0
@@ -115,6 +115,7 @@ const struct nla_policy tipc_nl_prop_pol [TIPC_NLA_PROP_PRIO] = { .type = NLA_U32 }, [TIPC_NLA_PROP_TOL] = { .type = NLA_U32 }, [TIPC_NLA_PROP_WIN] = { .type = NLA_U32 }, + [TIPC_NLA_PROP_MTU] = { .type = NLA_U32 }, [TIPC_NLA_PROP_BROADCAST] = { .type = NLA_U32 }, [TIPC_NLA_PROP_BROADCAST_RATIO] = { .type = NLA_U32 } };
Greg Kroah-Hartman
maintainerPATCH 59/151 nfc: add missing attribute validation for SE API
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 361d23e41ca6e504033f7e66a03b95788377caae ]
Add missing attribute validation for NFC_ATTR_SE_INDEX to the netlink policy.
--- net/nfc/netlink.c | 1 + 1 file changed, 1 insertion(+)
net/nfc/netlink.c +1 -0
@@ -43,6 +43,7 @@ static const struct nla_policy nfc_genl_ [NFC_ATTR_LLC_SDP] = { .type = NLA_NESTED }, [NFC_ATTR_FIRMWARE_NAME] = { .type = NLA_STRING, .len = NFC_FIRMWARE_NAME_MAXSIZE }, + [NFC_ATTR_SE_INDEX] = { .type = NLA_U32 }, [NFC_ATTR_SE_APDU] = { .type = NLA_BINARY }, [NFC_ATTR_VENDOR_DATA] = { .type = NLA_BINARY },
Greg Kroah-Hartman
maintainerPATCH 60/151 nfc: add missing attribute validation for deactivate target
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 88e706d5168b07df4792dbc3d1bc37b83e4bd74d ]
Add missing attribute validation for NFC_ATTR_TARGET_INDEX to the netlink policy.
--- net/nfc/netlink.c | 1 + 1 file changed, 1 insertion(+)
net/nfc/netlink.c +1 -0
@@ -32,6 +32,7 @@ static const struct nla_policy nfc_genl_ [NFC_ATTR_DEVICE_NAME] = { .type = NLA_STRING, .len = NFC_DEVICE_NAME_MAXSIZE }, [NFC_ATTR_PROTOCOLS] = { .type = NLA_U32 }, + [NFC_ATTR_TARGET_INDEX] = { .type = NLA_U32 }, [NFC_ATTR_COMM_MODE] = { .type = NLA_U8 }, [NFC_ATTR_RF_MODE] = { .type = NLA_U8 }, [NFC_ATTR_DEVICE_POWERED] = { .type = NLA_U8 },
Greg Kroah-Hartman
maintainerPATCH 61/151 nfc: add missing attribute validation for vendor subcommand
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 6ba3da446551f2150fadbf8c7788edcb977683d3 ]
Add missing attribute validation for vendor subcommand attributes to the netlink policy.
--- net/nfc/netlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/nfc/netlink.c +2 -0
@@ -46,6 +46,8 @@ static const struct nla_policy nfc_genl_ .len = NFC_FIRMWARE_NAME_MAXSIZE }, [NFC_ATTR_SE_INDEX] = { .type = NLA_U32 }, [NFC_ATTR_SE_APDU] = { .type = NLA_BINARY }, + [NFC_ATTR_VENDOR_ID] = { .type = NLA_U32 }, + [NFC_ATTR_VENDOR_SUBCMD] = { .type = NLA_U32 }, [NFC_ATTR_VENDOR_DATA] = { .type = NLA_BINARY }, };
Greg Kroah-Hartman
maintainerPATCH 62/151 net: phy: avoid clearing PHY interrupts twice in irq handler
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit 249bc9744e165abe74ae326f43e9d70bad54c3b7 ]
On all PHY drivers that implement did_interrupt() reading the interrupt status bits clears them. This means we may loose an interrupt that is triggered between calling did_interrupt() and phy_clear_interrupt(). As part of the fix make it a requirement that did_interrupt() clears the interrupt.
The Fixes tag refers to the first commit where the patch applies cleanly.
--- drivers/net/phy/phy.c | 3 ++- include/linux/phy.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/phy/phy.c +2 -1
@@ -702,7 +702,8 @@ static irqreturn_t phy_interrupt(int irqphy_trigger_machine (phydev); } -if (phy_clear_interrupt (phydev)) +/* did_interrupt() may have cleared the interrupt already */ +if (!phydev->drv->did_interrupt &&phy_clear_interrupt (phydev)) goto phy_err;return IRQ_HANDLED ;
include/linux/phy.h +1 -0
@@ -531,6 +531,7 @@ struct phy_driver {/* * Checks if the PHY generated an interrupt. * For multi-PHY devices with shared PHY interrupt pin +* Set interrupt bits have to be cleared. */ int (*did_interrupt)(struct phy_device *phydev);
Greg Kroah-Hartman
maintainerPATCH 63/151 net: phy: fix MDIO bus PM PHY resuming
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit 611d779af7cad2b87487ff58e4931a90c20b113c ]
So far we have the unfortunate situation that mdio_bus_phy_may_suspend() is called in suspend AND resume path, assuming that function result is the same. After the original change this is no longer the case, resulting in broken resume as reported by Geert.
To fix this call mdio_bus_phy_may_suspend() in the suspend path only, and let the phy_device store the info whether it was suspended by MDIO bus PM.
--- drivers/net/phy/phy_device.c | 6 +++++- include/linux/phy.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/net/phy/phy_device.c +5 -1
@@ -285,6 +285,8 @@ static int mdio_bus_phy_suspend(struct dif (!mdio_bus_phy_may_suspend (phydev))return 0 ; + phydev->suspended_by_mdio_bus =1 ; +return phy_suspend (phydev); }
@@ -293,9 +295,11 @@ static int mdio_bus_phy_resume(struct destruct phy_device *phydev =to_phy_device (dev);int ret; -if (!mdio_bus_phy_may_suspend (phydev)) +if (!phydev->suspended_by_mdio_bus) goto no_resume; + phydev->suspended_by_mdio_bus =0 ; + ret =phy_resume (phydev);if (ret <0 )return ret;
include/linux/phy.h +2 -0
@@ -338,6 +338,7 @@ struct phy_c45_device_ids {* is_gigabit_capable: Set to true if PHY supports 1000Mbps * has_fixups: Set to true if this phy has fixups/quirks. * suspended: Set to true if this phy has been suspended successfully. +* suspended_by_mdio_bus: Set to true if this phy was suspended by MDIO bus. * sysfs_links: Internal boolean tracking sysfs symbolic links setup/removal. * loopback_enabled: Set true if this phy has been loopbacked successfully. * state: state of the PHY for management purposes
@@ -376,6 +377,7 @@ struct phy_device { unsigned is_gigabit_capable:1; unsigned has_fixups:1; unsigned suspended:1; + unsigned suspended_by_mdio_bus:1; unsigned sysfs_links:1; unsigned loopback_enabled:1;
Greg Kroah-Hartman
maintainerPATCH 64/151 net/ipv6: need update peer route when modify metric
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 617940123e0140521f3080d2befc2bf55bcda094 ]
When we modify the route metric, the peer address's route need also be updated. Before the fix:
+ ip addr add dev dummy1 2001:db8::1 peer 2001:db8::2 metric 60
+ ip -6 route show dev dummy1
2001:db8::1 proto kernel metric 60 pref medium 2001:db8::2 proto kernel metric 60 pref medium
+ ip addr change dev dummy1 2001:db8::1 peer 2001:db8::2 metric 61
+ ip -6 route show dev dummy1
2001:db8::1 proto kernel metric 61 pref medium 2001:db8::2 proto kernel metric 60 pref medium
After the fix:
+ ip addr change dev dummy1 2001:db8::1 peer 2001:db8::2 metric 61
+ ip -6 route show dev dummy1
2001:db8::1 proto kernel metric 61 pref medium 2001:db8::2 proto kernel metric 61 pref medium
--- net/ipv6/addrconf.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
net/ipv6/addrconf.c +16 -4
@@ -4590,12 +4590,14 @@ inet6_rtm_deladdr(struct sk_buff *skb, s }static int modify_prefix_route (struct inet6_ifaddr *ifp, -unsigned long expires,u32 flags) +unsigned long expires,u32 flags, +bool modify_peer) {struct fib6_info *f6i;u32 prio; - f6i =addrconf_get_prefix_route (&ifp->addr, ifp->prefix_len, + f6i =addrconf_get_prefix_route (modify_peer ? &ifp->peer_addr : &ifp->addr, + ifp->prefix_len, ifp->idev->dev,0 ,RTF_DEFAULT , true);if (!f6i)return -ENOENT ;
@@ -4606,7 +4608,8 @@ static int modify_prefix_route(struct inip6_del_rt (dev_net (ifp->idev->dev), f6i);/* add new one */ -addrconf_prefix_route (&ifp->addr, ifp->prefix_len, +addrconf_prefix_route (modify_peer ? &ifp->peer_addr : &ifp->addr, + ifp->prefix_len, ifp->rt_priority, ifp->idev->dev, expires, flags,GFP_KERNEL ); }else {
@@ -4682,7 +4685,7 @@ static int inet6_addr_modify(struct inetint rc = -ENOENT ;if (had_prefixroute) - rc =modify_prefix_route (ifp, expires, flags); + rc =modify_prefix_route (ifp, expires, flags, false);/* prefix route could have been deleted; if so restore it */ if (rc == -ENOENT ) {
@@ -4690,6 +4693,15 @@ static int inet6_addr_modify(struct inet ifp->rt_priority, ifp->idev->dev, expires, flags, GFP_KERNEL); } + +if (had_prefixroute && !ipv6_addr_any (&ifp->peer_addr)) + rc =modify_prefix_route (ifp, expires, flags, true); + +if (rc == -ENOENT && !ipv6_addr_any (&ifp->peer_addr)) { +addrconf_prefix_route (&ifp->peer_addr, ifp->prefix_len, + ifp->rt_priority, ifp->idev->dev, + expires, flags,GFP_KERNEL ); + } }else if (had_prefixroute) {enum cleanup_prefix_rt_t action;unsigned long rt_expires;
Greg Kroah-Hartman
maintainerPATCH 65/151 net/ipv6: remove the old peer route if change it to a new one
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit d0098e4c6b83e502cc1cd96d67ca86bc79a6c559 ]
When we modify the peer route and changed it to a new one, we should remove the old route first. Before the fix:
+ ip addr add dev dummy1 2001:db8::1 peer 2001:db8::2
+ ip -6 route show dev dummy1
2001:db8::1 proto kernel metric 256 pref medium 2001:db8::2 proto kernel metric 256 pref medium
+ ip addr change dev dummy1 2001:db8::1 peer 2001:db8::3
+ ip -6 route show dev dummy1
2001:db8::1 proto kernel metric 256 pref medium 2001:db8::2 proto kernel metric 256 pref medium
After the fix:
+ ip addr change dev dummy1 2001:db8::1 peer 2001:db8::3
+ ip -6 route show dev dummy1
2001:db8::1 proto kernel metric 256 pref medium 2001:db8::3 proto kernel metric 256 pref medium
This patch depend on the previous patch "net/ipv6: need update peer route when modify metric" to update new peer route after delete old one.
--- net/ipv6/addrconf.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
net/ipv6/addrconf.c +17 -4
@@ -1226,11 +1226,13 @@ check_cleanup_prefix_route(struct inet6_ }static void -cleanup_prefix_route (struct inet6_ifaddr *ifp,unsigned long expires,bool del_rt) +cleanup_prefix_route (struct inet6_ifaddr *ifp,unsigned long expires, +bool del_rt,bool del_peer) {struct fib6_info *f6i; - f6i =addrconf_get_prefix_route (&ifp->addr, ifp->prefix_len, + f6i =addrconf_get_prefix_route (del_peer ? &ifp->peer_addr : &ifp->addr, + ifp->prefix_len, ifp->idev->dev,0 ,RTF_DEFAULT , true);if (f6i) {if (del_rt)
@@ -1293,7 +1295,7 @@ static void ipv6_del_addr(struct inet6_iif (action !=CLEANUP_PREFIX_RT_NOP ) {cleanup_prefix_route (ifp, expires, - action ==CLEANUP_PREFIX_RT_DEL ); + action ==CLEANUP_PREFIX_RT_DEL , false); }/* clean up prefsrc entries */
@@ -4631,6 +4633,7 @@ static int inet6_addr_modify(struct inetunsigned long timeout;bool was_managetempaddr;bool had_prefixroute; +bool new_peer = false;ASSERT_RTNL ();
@@ -4662,6 +4665,13 @@ static int inet6_addr_modify(struct inet cfg->preferred_lft = timeout; } +if (cfg->peer_pfx && +memcmp (&ifp->peer_addr, cfg->peer_pfx,sizeof (struct in6_addr ))) { +if (!ipv6_addr_any (&ifp->peer_addr)) +cleanup_prefix_route (ifp, expires, true, true); + new_peer = true; + } +spin_lock_bh (&ifp->lock); was_managetempaddr = ifp->flags &IFA_F_MANAGETEMPADDR ; had_prefixroute = ifp->flags & IFA_F_PERMANENT &&
@@ -4677,6 +4687,9 @@ static int inet6_addr_modify(struct inetif (cfg->rt_priority && cfg->rt_priority != ifp->rt_priority) ifp->rt_priority = cfg->rt_priority; +if (new_peer) + ifp->peer_addr = *cfg->peer_pfx; +spin_unlock_bh (&ifp->lock);if (!(ifp->flags&IFA_F_TENTATIVE ))ipv6_ifa_notify (0 , ifp);
@@ -4712,7 +4725,7 @@ static int inet6_addr_modify(struct inetif (action !=CLEANUP_PREFIX_RT_NOP ) {cleanup_prefix_route (ifp, rt_expires, - action ==CLEANUP_PREFIX_RT_DEL ); + action ==CLEANUP_PREFIX_RT_DEL , false); } }
Greg Kroah-Hartman
maintainerPATCH 66/151 selftests/net/fib_tests: update addr_metric_test for peer route testing
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 0d29169a708bf730ede287248e429d579f432d1d ]
This patch update {ipv4, ipv6}_addr_metric_test with
1. Set metric of address with peer route and see if the route added correctly.
2. Modify metric and peer address for peer route and see if the route changed correctly.
--- tools/testing/selftests/net/fib_tests.sh | 34 ++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-)
tools/testing/selftests/net/fib_tests.sh +31 -3
@@ -1041,6 +1041,27 @@ ipv6_addr_metric_test() fi log_test $rc 0 "Prefix route with metric on link up" + # verify peer metric added correctly + set -e + run_cmd "$IP -6 addr flush dev dummy2" + run_cmd "$IP -6 addr add dev dummy2 2001:db8:104::1 peer 2001:db8:104::2 metric 260" + set +e + + check_route6 "2001:db8:104::1 dev dummy2 proto kernel metric 260" + log_test $? 0 "Set metric with peer route on local side" + log_test $? 0 "User specified metric on local address" + check_route6 "2001:db8:104::2 dev dummy2 proto kernel metric 260" + log_test $? 0 "Set metric with peer route on peer side" + + set -e + run_cmd "$IP -6 addr change dev dummy2 2001:db8:104::1 peer 2001:db8:104::3 metric 261" + set +e + + check_route6 "2001:db8:104::1 dev dummy2 proto kernel metric 261" + log_test $? 0 "Modify metric and peer address on local side" + check_route6 "2001:db8:104::3 dev dummy2 proto kernel metric 261" + log_test $? 0 "Modify metric and peer address on peer side" + $IP li del dummy1 $IP li del dummy2 cleanup
@@ -1457,13 +1478,20 @@ ipv4_addr_metric_test() run_cmd "$IP addr flush dev dummy2" run_cmd "$IP addr add dev dummy2 172.16.104.1/32 peer 172.16.104.2 metric 260" - run_cmd "$IP addr change dev dummy2 172.16.104.1/32 peer 172.16.104.2 metric 261" rc=$? if [ $rc -eq 0 ]; then - check_route "172.16.104.2 dev dummy2 proto kernel scope link src 172.16.104.1 metric 261" + check_route "172.16.104.2 dev dummy2 proto kernel scope link src 172.16.104.1 metric 260" + rc=$? + fi + log_test $rc 0 "Set metric of address with peer route" + + run_cmd "$IP addr change dev dummy2 172.16.104.1/32 peer 172.16.104.3 metric 261" + rc=$? + if [ $rc -eq 0 ]; then + check_route "172.16.104.3 dev dummy2 proto kernel scope link src 172.16.104.1 metric 261" rc=$? fi - log_test $rc 0 "Modify metric of address with peer route" + log_test $rc 0 "Modify metric and peer address for peer route" $IP li del dummy1 $IP li del dummy2
Greg Kroah-Hartman
maintainerPATCH 67/151 s390/qeth: dont reset default_out_queue
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 240c1948491b81cfe40f84ea040a8f2a4966f101 ]
When an OSA device in prio-queue setup is reduced to 1 TX queue due to HW restrictions, we reset its the default_out_queue to 0.
In the old code this was needed so that qeth_get_priority_queue() gets the queue selection right. But with proper multiqueue support we already reduced dev->real_num_tx_queues to 1, and so the stack puts all traffic on txq 0 without even calling .ndo_select_queue.
Thus we can preserve the user's configuration, and apply it if the OSA device later re-gains support for multiple TX queues.
--- drivers/s390/net/qeth_core_main.c | 1 - 1 file changed, 1 deletion(-)
drivers/s390/net/qeth_core_main.c +0 -1
@@ -1244,7 +1244,6 @@ static int qeth_osa_set_output_queues(stif (count ==1 )dev_info (&card->gdev->dev,"Priority Queueing not supported\n" ); - card->qdio.default_out_queue = single ?0 :QETH_DEFAULT_QUEUE ; card->qdio.no_out_queues = count;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 68/151 s390/qeth: handle error when backing RX buffer
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 17413852804d7e86e6f0576cca32c1541817800e ]
qeth_init_qdio_queues() fills the RX ring with an initial set of RX buffers. If qeth_init_input_buffer() fails to back one of the RX buffers with memory, we need to bail out and report the error.
--- drivers/s390/net/qeth_core_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_core_main.c +9 -4
@@ -2633,12 +2633,12 @@ static int qeth_init_input_buffer(struct buf->rx_skb =netdev_alloc_skb (card->dev,QETH_RX_PULL_LEN +ETH_HLEN );if (!buf->rx_skb) -return 1 ; +return -ENOMEM ; } pool_entry =qeth_find_free_buffer_pool_entry (card);if (!pool_entry) -return 1 ; +return -ENOBUFS ;/* * since the buffer is accessed only from the input_tasklet
@@ -2682,10 +2682,15 @@ int qeth_init_qdio_queues(struct qeth_ca/* inbound queue */ qdio_reset_buffers (card->qdio.in_q->qdio_bufs,QDIO_MAX_BUFFERS_PER_Q );memset (&card->rx,0 ,sizeof (struct qeth_rx )); +qeth_initialize_working_pool_list (card);/*give only as many buffers to hardware as we have buffer pool entries*/ -for (i =0 ; i < card->qdio.in_buf_pool.buf_count -1 ; ++i) -qeth_init_input_buffer (card, &card->qdio.in_q->bufs[i]); +for (i =0 ; i < card->qdio.in_buf_pool.buf_count -1 ; i++) { + rc =qeth_init_input_buffer (card, &card->qdio.in_q->bufs[i]); +if (rc) +return rc; + } + card->qdio.in_q->next_buf_to_init = card->qdio.in_buf_pool.buf_count -1 ; rc = do_QDIO(CARD_DDEV(card), QDIO_FLAG_SYNC_INPUT, 0, 0,
Greg Kroah-Hartman
maintainerPATCH 69/151 net: dsa: Dont instantiate phylink for CPU/DSA ports unless needed
In reply to Greg Kroah-HartmanFrom: Andrew Lunn <[email protected]>
[ Upstream commit a20f997010c4ec76eaa55b8cc047d76dcac69f70 ]
By default, DSA drivers should configure CPU and DSA ports to their maximum speed. In many configurations this is sufficient to make the link work.
In some cases it is necessary to configure the link to run slower, e.g. because of limitations of the SoC it is connected to. Or back to back PHYs are used and the PHY needs to be driven in order to establish link. In this case, phylink is used.
Only instantiate phylink if it is required. If there is no PHY, or no fixed link properties, phylink can upset a link which works in the default configuration.
--- net/dsa/port.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/dsa/port.c +9 -3
@@ -653,9 +653,14 @@ err_phy_connect:int dsa_port_link_register_of (struct dsa_port *dp) {struct dsa_switch *ds = dp->ds; +struct device_node *phy_np; -if (!ds->ops->adjust_link) -return dsa_port_phylink_register (dp); +if (!ds->ops->adjust_link) { + phy_np =of_parse_phandle (dp->dn,"phy-handle" ,0 ); +if (of_phy_is_fixed_link (dp->dn) || phy_np) +return dsa_port_phylink_register (dp); +return 0 ; + }dev_warn (ds->dev,"Using legacy PHYLIB callbacks. Please migrate to PHYLINK!\n" );
@@ -670,11 +675,12 @@ void dsa_port_link_unregister_of(struct {struct dsa_switch *ds = dp->ds; -if (!ds->ops->adjust_link) { +if (!ds->ops->adjust_link && dp->pl) {rtnl_lock ();phylink_disconnect_phy (dp->pl);rtnl_unlock ();phylink_destroy (dp->pl); + dp->pl =NULL ;return ; }
Greg Kroah-Hartman
maintainerPATCH 70/151 net: dsa: mv88e6xxx: Add missing mask of ATU occupancy register
In reply to Greg Kroah-HartmanFrom: Andrew Lunn <[email protected]>
[ Upstream commit 012fc74517b25177dfede2ed45cd108258564e4a ]
Only the bottom 12 bits contain the ATU bin occupancy statistics. The upper bits need masking off.
--- drivers/net/dsa/mv88e6xxx/chip.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/dsa/mv88e6xxx/chip.c +2 -0
@@ -2762,6 +2762,8 @@ static u64 mv88e6xxx_devlink_atu_bin_get goto unlock; } + occupancy &=MV88E6XXX_G2_ATU_STATS_MASK ; + unlock:mv88e6xxx_reg_unlock (chip);
Greg Kroah-Hartman
maintainerPATCH 71/151 net: phy: Avoid multiple suspends
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
commit 503ba7c6961034ff0047707685644cad9287c226 upstream.
It is currently possible for a PHY device to be suspended as part of a network device driver's suspend call while it is still being attached to that net_device, either via phy_suspend() or implicitly via phy_stop().
Later on, when the MDIO bus controller get suspended, we would attempt to suspend again the PHY because it is still attached to a network device.
This is both a waste of time and creates an opportunity for improper clock/power management bugs to creep in.
--- drivers/net/phy/phy_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/phy/phy_device.c +3 -2
@@ -247,7 +247,7 @@ static bool mdio_bus_phy_may_suspend(str* MDIO bus driver and clock gated at this point. */ if (!netdev) -return !phydev->suspended; + goto out;if (netdev->wol_enabled)return false;
@@ -267,7 +267,8 @@ static bool mdio_bus_phy_may_suspend(strif (device_may_wakeup (&netdev->dev))return false; -return true; +out: +return !phydev->suspended; }static int mdio_bus_phy_suspend (struct device *dev)
Greg Kroah-Hartman
maintainerPATCH 72/151 cgroup: fix psi_show() crash on 32bit ino archs
In reply to Greg Kroah-HartmanFrom: Qian Cai <[email protected]>
commit 190ecb190a9cd8c0599d8499b901e3c32e87966a upstream.
Similar to the commit d7495343228f ("cgroup: fix incorrect WARN_ON_ONCE() in cgroup_setup_root()"), cgroup_id(root_cgrp) does not equal to 1 on 32bit ino archs which triggers all sorts of issues with psi_show() on s390x. For example,
BUG: KASAN: slab-out-of-bounds in collect_percpu_times+0x2d0/ Read of size 4 at addr 000000001e0ce000 by task read_all/3667 collect_percpu_times+0x2d0/0x798 psi_show+0x7c/0x2a8 seq_read+0x2ac/0x830 vfs_read+0x92/0x150 ksys_read+0xe2/0x188 system_call+0xd8/0x2b4
Fix it by using cgroup_ino().
--- kernel/cgroup/cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/cgroup/cgroup.c +3 -3
@@ -3547,21 +3547,21 @@ static int cpu_stat_show(struct seq_filestatic int cgroup_io_pressure_show (struct seq_file *seq,void *v) {struct cgroup *cgrp =seq_css (seq)->cgroup; -struct psi_group *psi =cgroup_id (cgrp) ==1 ? &psi_system : &cgrp->psi; +struct psi_group *psi =cgroup_ino (cgrp) ==1 ? &psi_system : &cgrp->psi;return psi_show (seq, psi,PSI_IO ); }static int cgroup_memory_pressure_show (struct seq_file *seq,void *v) {struct cgroup *cgrp =seq_css (seq)->cgroup; -struct psi_group *psi =cgroup_id (cgrp) ==1 ? &psi_system : &cgrp->psi; +struct psi_group *psi =cgroup_ino (cgrp) ==1 ? &psi_system : &cgrp->psi;return psi_show (seq, psi,PSI_MEM ); }static int cgroup_cpu_pressure_show (struct seq_file *seq,void *v) {struct cgroup *cgrp =seq_css (seq)->cgroup; -struct psi_group *psi =cgroup_id (cgrp) ==1 ? &psi_system : &cgrp->psi; +struct psi_group *psi =cgroup_ino (cgrp) ==1 ? &psi_system : &cgrp->psi;return psi_show (seq, psi,PSI_CPU ); }
Greg Kroah-Hartman
maintainerPATCH 73/151 cgroup: cgroup_procs_next should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
commit 2d4ecb030dcc90fb725ecbfc82ce5d6c37906e0e upstream.
If seq_file .next fuction does not change position index, read after some lseek can generate unexpected output:
1) dd bs=1 skip output of each 2nd elements
$ dd if=/sys/fs/cgroup/cgroup.procs bs=8 count=1 2 3 4 5 1+0 records in 1+0 records out 8 bytes copied, 0,000267297 s, 29,9 kB/s [test@localhost ~]$ dd if=/sys/fs/cgroup/cgroup.procs bs=1 count=8 2 4 <<< NB! 3 was skipped 6 <<< ... and 5 too 8 <<< ... and 7 8+0 records in 8+0 records out 8 bytes copied, 5,2123e-05 s, 153 kB/s
This happen because __cgroup_procs_start() makes an extra extra cgroup_procs_next() call
2) read after lseek beyond end of file generates whole last line.
3) read after lseek into middle of last line generates expected rest of last line and unexpected whole line once again.
Additionally patch removes an extra position index changes in __cgroup_procs_start()
Cc: [email protected]
https://bugzilla.kernel.org/show_bug.cgi?id=206283
--- kernel/cgroup/cgroup.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
kernel/cgroup/cgroup.c +7 -3
@@ -4600,6 +4600,9 @@ static void *cgroup_procs_next(struct sestruct kernfs_open_file *of = s->private;struct css_task_iter *it = of->priv; +if (pos) + (*pos)++; +return css_task_iter_next (it); }
@@ -4615,7 +4618,7 @@ static void *__cgroup_procs_start(struct* from position 0, so we can simply keep iterating on !0 *pos. */ if (!it) { -if (WARN_ON_ONCE ((*pos)++)) +if (WARN_ON_ONCE ((*pos)))return ERR_PTR (-EINVAL ); it =kzalloc (sizeof (*it),GFP_KERNEL );
@@ -4623,10 +4626,11 @@ static void *__cgroup_procs_start(structreturn ERR_PTR (-ENOMEM ); of->priv = it;css_task_iter_start (&cgrp->self, iter_flags, it); - }else if (!(*pos)++) { + }else if (!(*pos)) {css_task_iter_end (it);css_task_iter_start (&cgrp->self, iter_flags, it); - } + }else +return it->cur_task;return cgroup_procs_next (s,NULL ,NULL ); }
Greg Kroah-Hartman
maintainerPATCH 74/151 cgroup: Iterate tasks that did not finish do_exit()
In reply to Greg Kroah-HartmanFrom: Michal Koutný <[email protected]>
commit 9c974c77246460fa6a92c18554c3311c8c83c160 upstream.
PF_EXITING is set earlier than actual removal from css_set when a task is exitting. This can confuse cgroup.procs readers who see no PF_EXITING tasks, however, rmdir is checking against css_set membership so it can transitionally fail with EBUSY.
Fix this by listing tasks that weren't unlinked from css_set active lists.
It may happen that other users of the task iterator (without CSS_TASK_ITER_PROCS) spot a PF_EXITING task before cgroup_exit(). This is equal to the state before commit c03cd7738a83 ("cgroup: Include dying leaders with live threads in PROCS iterations") but it may be reviewed later.
--- include/linux/cgroup.h | 1 + kernel/cgroup/cgroup.c | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-)
include/linux/cgroup.h +1 -0
@@ -62,6 +62,7 @@ struct css_task_iter {struct list_head *mg_tasks_head;struct list_head *dying_tasks_head; +struct list_head *cur_tasks_head;struct css_set *cur_cset;struct css_set *cur_dcset;struct task_struct *cur_task;
kernel/cgroup/cgroup.c +16 -7
@@ -4405,12 +4405,16 @@ static void css_task_iter_advance_css_se } }while (!css_set_populated (cset) &&list_empty (&cset->dying_tasks)); -if (!list_empty (&cset->tasks)) +if (!list_empty (&cset->tasks)) { it->task_pos = cset->tasks.next; -else if (!list_empty (&cset->mg_tasks)) + it->cur_tasks_head = &cset->tasks; + }else if (!list_empty (&cset->mg_tasks)) { it->task_pos = cset->mg_tasks.next; -else + it->cur_tasks_head = &cset->mg_tasks; + }else { it->task_pos = cset->dying_tasks.next; + it->cur_tasks_head = &cset->dying_tasks; + } it->tasks_head = &cset->tasks; it->mg_tasks_head = &cset->mg_tasks;
@@ -4468,10 +4472,14 @@ repeat:else it->task_pos = it->task_pos->next; -if (it->task_pos == it->tasks_head) +if (it->task_pos == it->tasks_head) { it->task_pos = it->mg_tasks_head->next; -if (it->task_pos == it->mg_tasks_head) + it->cur_tasks_head = it->mg_tasks_head; + } +if (it->task_pos == it->mg_tasks_head) { it->task_pos = it->dying_tasks_head->next; + it->cur_tasks_head = it->dying_tasks_head; + }if (it->task_pos == it->dying_tasks_head)css_task_iter_advance_css_set (it); }else {
@@ -4490,11 +4498,12 @@ repeat: goto repeat;/* and dying leaders w/o live member threads */ -if (!atomic_read (&task->signal->live)) +if (it->cur_tasks_head == it->dying_tasks_head && + !atomic_read (&task->signal->live)) goto repeat; }else {/* skip all dying ones */ -if (task->flags &PF_EXITING ) +if (it->cur_tasks_head == it->dying_tasks_head) goto repeat; } }
Greg Kroah-Hartman
maintainerPATCH 75/151 netfilter: nf_tables: fix infinite loop when expr is not available
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit 1d305ba40eb8081ff21eeb8ca6ba5c70fd920934 upstream.
nft will loop forever if the kernel doesn't support an expression:
1. nft_expr_type_get() appends the family specific name to the module list.
2. -EAGAIN is returned to nfnetlink, nfnetlink calls abort path.
3. abort path sets ->done to true and calls request_module for the expression.
4. nfnetlink replays the batch, we end up in nft_expr_type_get() again.
5. nft_expr_type_get attempts to append family-specific name. This one already exists on the list, so we continue
6. nft_expr_type_get adds the generic expression name to the module list. -EAGAIN is returned, nfnetlink calls abort path.
7. abort path encounters the family-specific expression which has 'done' set, so it gets removed.
8. abort path requests the generic expression name, sets done to true.
9. batch is replayed.
If the expression could not be loaded, then we will end up back at 1), because the family-specific name got removed and the cycle starts again.
Note that userspace can SIGKILL the nft process to stop the cycle, but the desired behaviour is to return an error after the generic expr name fails to load the expression.
--- net/netfilter/nf_tables_api.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_api.c +3 -7
@@ -7250,13 +7250,8 @@ static void nf_tables_module_autoload(stlist_splice_init (&net->nft.module_list, &module_list);mutex_unlock (&net->nft.commit_mutex);list_for_each_entry_safe (req, next, &module_list, list) { -if (req->done) { -list_del (&req->list); -kfree (req); - }else { -request_module ("%s" , req->module); - req->done = true; - } +request_module ("%s" , req->module); + req->done = true; }mutex_lock (&net->nft.commit_mutex);list_splice (&module_list, &net->nft.module_list);
@@ -8039,6 +8034,7 @@ static void __net_exit nf_tables_exit_ne__nft_release_tables (net);mutex_unlock (&net->nft.commit_mutex);WARN_ON_ONCE (!list_empty (&net->nft.tables)); +WARN_ON_ONCE (!list_empty (&net->nft.module_list)); }static struct pernet_operations nf_tables_net_ops = {
Greg Kroah-Hartman
maintainerPATCH 76/151 iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices
In reply to Greg Kroah-HartmanFrom: Dan Moulding <[email protected]>
commit a9149d243f259ad8f02b1e23dfe8ba06128f15e1 upstream.
The logic for checking required NVM sections was recently fixed in commit b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168 devices"). However, with that fixed the else is now taken for 3168 devices and within the else clause there is a mandatory check for the PHY_SKU section. This causes the parsing to fail for 3168 devices.
The PHY_SKU section is really only mandatory for the IWL_NVM_EXT layout (the phy_sku parameter of iwl_parse_nvm_data is only used when the NVM type is IWL_NVM_EXT). So this changes the PHY_SKU section check so that it's only mandatory for IWL_NVM_EXT.
--- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +2 -1
@@ -308,7 +308,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *m }/* PHY_SKU section is mandatory in B0 */ -if (!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU ].data) { +if (mvm->trans->cfg->nvm_type ==IWL_NVM_EXT && + !mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU ].data) {IWL_ERR (mvm,"Can't parse phy_sku in B0, empty sections\n" );return NULL ;
Greg Kroah-Hartman
maintainerPATCH 77/151 virtio-blk: fix hw_queue stopped on arbitrary error
In reply to Greg Kroah-HartmanFrom: Halil Pasic <[email protected]>
commit f5f6b95c72f7f8bb46eace8c5306c752d0133daa upstream.
Since nobody else is going to restart our hw_queue for us, the blk_mq_start_stopped_hw_queues() is in virtblk_done() is not sufficient necessarily sufficient to ensure that the queue will get started again. In case of global resource outage (-ENOMEM because mapping failure, because of swiotlb full) our virtqueue may be empty and we can get stuck with a stopped hw_queue.
Let us not stop the queue on arbitrary errors, but only on -EONSPC which indicates a full virtqueue, where the hw_queue is guaranteed to get started by virtblk_done() before when it makes sense to carry on submitting requests. Let us also remove a stale comment.
--- drivers/block/virtio_blk.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/block/virtio_blk.c +5 -3
@@ -339,10 +339,12 @@ static blk_status_t virtio_queue_rq(stru err =virtblk_add_req (vblk->vqs[qid].vq, vbr, vbr->sg, num);if (err) {virtqueue_kick (vblk->vqs[qid].vq); -blk_mq_stop_hw_queue (hctx); +/* Don't stop the queue if -ENOMEM: we may have failed to +* bounce the buffer due to global resource outage. +*/ +if (err == -ENOSPC ) +blk_mq_stop_hw_queue (hctx);spin_unlock_irqrestore (&vblk->vqs[qid].lock, flags); -/* Out of mem doesn't actually happen, since we fall back -* to direct descriptors */ if (err == -ENOMEM || err == -ENOSPC )return BLK_STS_DEV_RESOURCE ;return BLK_STS_IOERR ;
Greg Kroah-Hartman
maintainerPATCH 78/151 iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 81ee85d0462410de8eeeec1b9761941fd6ed8c7b upstream.
Quoting from the comment describing the WARN functions in include/asm-generic/bug.h:
* WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report
* significant kernel issues that need prompt attention if they should ever
* appear at runtime.
*
* Do not use these macros when checking for invalid external inputs
The (buggy) firmware tables which the dmar code was calling WARN_TAINT for really are invalid external inputs. They are not under the kernel's control and the issues in them cannot be fixed by a kernel update. So logging a backtrace, which invites bug reports to be filed about this, is not helpful.
--- drivers/iommu/intel-iommu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iommu/intel-iommu.c +4 -3
@@ -4141,10 +4141,11 @@ static void quirk_ioat_snb_local_iommu(s/* we know that the this iommu should be at offset 0xa000 from vtbar */ drhd =dmar_find_matched_drhd_unit (pdev); -if (WARN_TAINT_ONCE (!drhd || drhd->reg_base_addr - vtbar !=0xa000 , -TAINT_FIRMWARE_WORKAROUND , -"BIOS assigned incorrect VT-d unit for Intel(R) QuickData Technology device\n" )) +if (!drhd || drhd->reg_base_addr - vtbar !=0xa000 ) { +pr_warn_once (FW_BUG "BIOS assigned incorrect VT-d unit for Intel(R) QuickData Technology device\n" ); +add_taint (TAINT_FIRMWARE_WORKAROUND ,LOCKDEP_STILL_OK ); pdev->dev.archdata.iommu =DUMMY_DEVICE_DOMAIN_INFO ; + } }DECLARE_PCI_FIXUP_ENABLE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_IOAT_SNB , quirk_ioat_snb_local_iommu);
Greg Kroah-Hartman
maintainerPATCH 79/151 netfilter: nf_conntrack: ct_cpu_seq_next should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
commit dc15af8e9dbd039ebb06336597d2c491ef46ab74 upstream.
If .next function does not change position index, following .show function will repeat output related to current position index.
--- net/netfilter/nf_conntrack_standalone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_standalone.c +1 -1
@@ -411,7 +411,7 @@ static void *ct_cpu_seq_next(struct seq_ *pos = cpu +1 ;return per_cpu_ptr (net->ct.stat, cpu); } - + (*pos)++;return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 80/151 netfilter: synproxy: synproxy_cpu_seq_next should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
commit bb71f846a0002239f7058c84f1496648ff4a5c20 upstream.
If .next function does not change position index, following .show function will repeat output related to current position index.
--- net/netfilter/nf_synproxy_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_synproxy_core.c +1 -1
@@ -267,7 +267,7 @@ static void *synproxy_cpu_seq_next(struc *pos = cpu +1 ;return per_cpu_ptr (snet->stats, cpu); } - + (*pos)++;return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 81/151 netfilter: xt_recent: recent_seq_next should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
commit db25517a550926f609c63054b12ea9ad515e1a10 upstream.
If .next function does not change position index, following .show function will repeat output related to current position index.
Without the patch:
# dd if=/proc/net/xt_recent/SSH # original file outpt src=127.0.0.4 ttl: 0 last_seen: 6275444819 oldest_pkt: 1 6275444819 src=127.0.0.2 ttl: 0 last_seen: 6275438906 oldest_pkt: 1 6275438906 src=127.0.0.3 ttl: 0 last_seen: 6275441953 oldest_pkt: 1 6275441953 0+1 records in 0+1 records out 204 bytes copied, 6.1332e-05 s, 3.3 MB/s
Read after lseek into middle of last line (offset 140 in example below) generates expected end of last line and then unexpected whole last line once again
# dd if=/proc/net/xt_recent/SSH bs=140 skip=1 dd: /proc/net/xt_recent/SSH: cannot skip to specified offset 127.0.0.3 ttl: 0 last_seen: 6275441953 oldest_pkt: 1 6275441953 src=127.0.0.3 ttl: 0 last_seen: 6275441953 oldest_pkt: 1 6275441953 0+1 records in 0+1 records out 132 bytes copied, 6.2487e-05 s, 2.1 MB/s
--- net/netfilter/xt_recent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/xt_recent.c +1 -1
@@ -492,12 +492,12 @@ static void *recent_seq_next(struct seq_const struct recent_entry *e = v;const struct list_head *head = e->list.next; + (*pos)++;while (head == &t->iphash[st->bucket]) {if (++st->bucket >= ip_list_hash_size)return NULL ; head = t->iphash[st->bucket].next; } - (*pos)++; return list_entry(head, struct recent_entry, list); }
Greg Kroah-Hartman
maintainerPATCH 82/151 netfilter: x_tables: xt_mttg_seq_next should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
commit ee84f19cbbe9cf7cba2958acb03163fed3ecbb0f upstream.
If .next function does not change position index, following .show function will repeat output related to current position index.
Without patch:
# dd if=/proc/net/ip_tables_matches # original file output conntrack conntrack conntrack recent recent icmp udplite udp tcp 0+1 records in 0+1 records out 65 bytes copied, 5.4074e-05 s, 1.2 MB/s
# dd if=/proc/net/ip_tables_matches bs=62 skip=1 dd: /proc/net/ip_tables_matches: cannot skip to specified offset cp <<< end of last line tcp <<< and then unexpected whole last line once again 0+1 records in 0+1 records out 7 bytes copied, 0.000102447 s, 68.3 kB/s
--- net/netfilter/x_tables.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/x_tables.c +3 -3
@@ -1551,6 +1551,9 @@ static void *xt_mttg_seq_next(struct sequint8_t nfproto = (unsigned long )PDE_DATA (file_inode (seq->file));struct nf_mttg_trav *trav = seq->private; +if (ppos !=NULL ) + ++(*ppos); +switch (trav->class) {case MTTG_TRAV_INIT : trav->class =MTTG_TRAV_NFP_UNSPEC ;
@@ -1576,9 +1579,6 @@ static void *xt_mttg_seq_next(struct seqdefault :return NULL ; } - -if (ppos !=NULL ) - ++*ppos;return trav; }
Greg Kroah-Hartman
maintainerPATCH 83/151 workqueue: dont use wq_select_unbound_cpu() for bound works
In reply to Greg Kroah-HartmanFrom: Hillf Danton <[email protected]>
commit aa202f1f56960c60e7befaa0f49c72b8fa11b0a8 upstream.
wq_select_unbound_cpu() is designed for unbound workqueues only, but it's wrongly called when using a bound workqueue too.
Fixing this ensures work queued to a bound workqueue with cpu=WORK_CPU_UNBOUND always runs on the local CPU.
Before, that would happen only if wq_unbound_cpumask happened to include it (likely almost always the case), or was empty, or we got lucky with forced round-robin placement. So restricting /sys/devices/virtual/workqueue/cpumask to a small subset of a machine's CPUs would cause some bound work items to run unexpectedly there.
--- kernel/workqueue.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
kernel/workqueue.c +8 -6
@@ -1411,14 +1411,16 @@ static void __queue_work(int cpu, structreturn ;rcu_read_lock (); retry: -if (req_cpu ==WORK_CPU_UNBOUND ) - cpu =wq_select_unbound_cpu (raw_smp_processor_id ()); -/* pwq which will be used unless @work is executing elsewhere */ -if (!(wq->flags &WQ_UNBOUND )) - pwq =per_cpu_ptr (wq->cpu_pwqs, cpu); -else +if (wq->flags &WQ_UNBOUND ) { +if (req_cpu ==WORK_CPU_UNBOUND ) + cpu =wq_select_unbound_cpu (raw_smp_processor_id ()); pwq =unbound_pwq_by_node (wq,cpu_to_node (cpu)); + }else { +if (req_cpu ==WORK_CPU_UNBOUND ) + cpu =raw_smp_processor_id (); + pwq =per_cpu_ptr (wq->cpu_pwqs, cpu); + }/* * If @work was previously on a different pool, it might still be
Greg Kroah-Hartman
maintainerPATCH 84/151 drm/amd/display: remove duplicated assignment to grph_obj_type
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit d785476c608c621b345dd9396e8b21e90375cb0e upstream.
Variable grph_obj_type is being assigned twice, one of these is redundant so remove it.
Addresses-Coverity: ("Evaluation order violation")
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +1 -2
@@ -365,8 +365,7 @@ bool amdgpu_atombios_get_connector_info_ router.ddc_valid = false; router.cd_valid = false;for (j =0 ; j < ((le16_to_cpu (path->usSize) -8 ) /2 ); j++) { -uint8_t grph_obj_type= - grph_obj_type = +uint8_t grph_obj_type = (le16_to_cpu (path->usGraphicObjIds[j]) &OBJECT_TYPE_MASK ) >>OBJECT_TYPE_SHIFT ;
Greg Kroah-Hartman
maintainerPATCH 85/151 drm/i915: Actually emit the await_start
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit c67b35d970ed3391069c21f3071a26f687399ab2 upstream.
Fix the inverted test to emit the wait on the end of the previous request if we /haven't/ already.
--- drivers/gpu/drm/i915/i915_request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_request.c +1 -1
@@ -785,7 +785,7 @@ i915_request_await_start(struct i915_reqreturn PTR_ERR_OR_ZERO (fence); err =0 ; -if (intel_timeline_sync_is_later (i915_request_timeline (rq), fence)) +if (!intel_timeline_sync_is_later (i915_request_timeline (rq), fence)) err =i915_sw_fence_await_dma_fence (&rq->submit, fence,0 ,I915_FENCE_GFP );
Greg Kroah-Hartman
maintainerPATCH 86/151 drm/i915: Return early for await_start on same timeline
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit c951b0af2dddbb1f34be103029eb9030392d5554 upstream.
Requests within a timeline are ordered by that timeline, so awaiting for the start of a request within the timeline is a no-op. This used to work by falling out of the mutex_trylock() as the signaler and waiter had the same timeline and not returning an error.
--- drivers/gpu/drm/i915/i915_request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_request.c +2 -2
@@ -759,8 +759,8 @@ i915_request_await_start(struct i915_reqstruct dma_fence *fence;int err; -GEM_BUG_ON (i915_request_timeline (rq) == -rcu_access_pointer (signal->timeline)); +if (i915_request_timeline (rq) ==rcu_access_pointer (signal->timeline)) +return 0 ;rcu_read_lock (); tl =rcu_dereference (signal->timeline);
Greg Kroah-Hartman
maintainerPATCH 87/151 drm/i915: be more solid in checking the alignment
In reply to Greg Kroah-HartmanFrom: Matthew Auld <[email protected]>
commit 1d61c5d711a2dc0b978ae905535edee9601f9449 upstream.
The alignment is u64, and yet is_power_of_2() assumes unsigned long, which might give different results between 32b and 64b kernel.
--- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 ++- drivers/gpu/drm/i915/i915_utils.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +2 -1
@@ -441,7 +441,8 @@ eb_validate_vma(struct i915_execbuffer *if (unlikely (entry->flags & eb->invalid_flags))return -EINVAL ; -if (unlikely (entry->alignment && !is_power_of_2 (entry->alignment))) +if (unlikely (entry->alignment && + !is_power_of_2_u64 (entry->alignment)))return -EINVAL ;/*
drivers/gpu/drm/i915/i915_utils.h +5 -0
@@ -234,6 +234,11 @@ static inline u64 ptr_to_u64(const void __idx; \ }) +static inline bool is_power_of_2_u64 (u64 n) +{ +return (n !=0 && ((n & (n -1 )) ==0 )); +} +static inline void __list_del_many (struct list_head *head,struct list_head *first) {
Greg Kroah-Hartman
maintainerPATCH 88/151 drm/i915: Defer semaphore priority bumping to a workqueue
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit 14a0d527a479eb2cb6067f9e5e163e1bf35db2a9 upstream.
Since the semaphore fence may be signaled from inside an interrupt handler from inside a request holding its request->lock, we cannot then enter into the engine->active.lock for processing the semaphore priority bump as we may traverse our call tree and end up on another held request.
CPU 0:
[ 2243.218864] _raw_spin_lock_irqsave+0x9a/0xb0 [ 2243.218867] i915_schedule_bump_priority+0x49/0x80 [i915] [ 2243.218869] semaphore_notify+0x6d/0x98 [i915] [ 2243.218871] __i915_sw_fence_complete+0x61/0x420 [i915] [ 2243.218874] ? kmem_cache_free+0x211/0x290 [ 2243.218876] i915_sw_fence_complete+0x58/0x80 [i915] [ 2243.218879] dma_i915_sw_fence_wake+0x3e/0x80 [i915] [ 2243.218881] signal_irq_work+0x571/0x690 [i915] [ 2243.218883] irq_work_run_list+0xd7/0x120 [ 2243.218885] irq_work_run+0x1d/0x50 [ 2243.218887] smp_irq_work_interrupt+0x21/0x30 [ 2243.218889] irq_work_interrupt+0xf/0x20
CPU 1:
[ 2242.173107] _raw_spin_lock+0x8f/0xa0 [ 2242.173110] __i915_request_submit+0x64/0x4a0 [i915] [ 2242.173112] __execlists_submission_tasklet+0x8ee/0x2120 [i915] [ 2242.173114] ? i915_sched_lookup_priolist+0x1e3/0x2b0 [i915] [ 2242.173117] execlists_submit_request+0x2e8/0x2f0 [i915] [ 2242.173119] submit_notify+0x8f/0xc0 [i915] [ 2242.173121] __i915_sw_fence_complete+0x61/0x420 [i915] [ 2242.173124] ? _raw_spin_unlock_irqrestore+0x39/0x40 [ 2242.173137] i915_sw_fence_complete+0x58/0x80 [i915] [ 2242.173140] i915_sw_fence_commit+0x16/0x20 [i915]
--- drivers/gpu/drm/i915/i915_request.c | 22 +++++++++++++++++----- drivers/gpu/drm/i915/i915_request.h | 2 ++ 2 files changed, 19 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_request.c +17 -5
@@ -529,19 +529,31 @@ submit_notify(struct i915_sw_fence *fencreturn NOTIFY_DONE ; } +static void irq_semaphore_cb (struct irq_work *wrk) +{ +struct i915_request *rq = +container_of (wrk,typeof (*rq), semaphore_work); + +i915_schedule_bump_priority (rq,I915_PRIORITY_NOSEMAPHORE ); +i915_request_put (rq); +} + static int __i915_sw_fence_callsemaphore_notify (struct i915_sw_fence *fence,enum i915_sw_fence_notify state) { -struct i915_request *request = -container_of (fence,typeof (*request), semaphore); +struct i915_request *rq =container_of (fence,typeof (*rq), semaphore);switch (state) {case FENCE_COMPLETE : -i915_schedule_bump_priority (request,I915_PRIORITY_NOSEMAPHORE ); +if (!(READ_ONCE (rq->sched.attr.priority) &I915_PRIORITY_NOSEMAPHORE )) { +i915_request_get (rq); +init_irq_work (&rq->semaphore_work, irq_semaphore_cb); +irq_work_queue (&rq->semaphore_work); + }break ;case FENCE_FREE : -i915_request_put (request); +i915_request_put (rq);break ; }
@@ -1283,9 +1295,9 @@ void __i915_request_queue(struct i915_re* decide whether to preempt the entire chain so that it is ready to * run at the earliest possible convenience. */ -i915_sw_fence_commit (&rq->semaphore);if (attr && rq->engine->schedule) rq->engine->schedule (rq, attr); +i915_sw_fence_commit (&rq->semaphore);i915_sw_fence_commit (&rq->submit); }
drivers/gpu/drm/i915/i915_request.h +2 -0
@@ -26,6 +26,7 @@#define I915_REQUEST_H #include <linux/dma-fence.h> +#include <linux/irq_work.h> #include <linux/lockdep.h> #include "gt/intel_context_types.h"
@@ -147,6 +148,7 @@ struct i915_request { };struct list_head execute_cb;struct i915_sw_fence semaphore; +struct irq_work semaphore_work;/* * A list of everyone we wait upon, and everyone who waits upon us.
Greg Kroah-Hartman
maintainerPATCH 89/151 drm/i915/gt: Close race between cacheline_retire and free
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit 8ea6bb8e4d47e07518e5dba4f5cb77e210f0df82 upstream.
If the cacheline may still be busy, atomically mark it for future release, and only if we can determine that it will never be used again, immediately free it.
--- drivers/gpu/drm/i915/gt/intel_timeline.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_timeline.c +6 -2
@@ -197,11 +197,15 @@ static void cacheline_release(struct intstatic void cacheline_free (struct intel_timeline_cacheline *cl) { +if (!i915_active_acquire_if_busy (&cl->active)) { +__idle_cacheline_free (cl); +return ; + } +GEM_BUG_ON (ptr_test_bit (cl->vaddr,CACHELINE_FREE )); cl->vaddr =ptr_set_bit (cl->vaddr,CACHELINE_FREE ); -if (i915_active_is_idle (&cl->active)) -__idle_cacheline_free (cl); +i915_active_release (&cl->active); } int intel_timeline_init(struct intel_timeline *timeline,
Greg Kroah-Hartman
maintainerPATCH 90/151 drm/i915/execlists: Enable timeslice on partial virtual engine dequeue
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit eafc2aa20fba319b6e791a1b0c45a91511eccb6b upstream.
If we stop filling the ELSP due to an incompatible virtual engine request, check if we should enable the timeslice on behalf of the queue.
This fixes the case where we are inspecting the last->next element when we know that the last element is the last request in the execution queue, and so decided we did not need to enable timeslicing despite the intent to do so!
--- drivers/gpu/drm/i915/gt/intel_lrc.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/gt/intel_lrc.c +18 -11
@@ -1501,11 +1501,9 @@ need_timeslice(struct intel_engine_cs *eif (!intel_engine_has_timeslices (engine))return false; -if (list_is_last (&rq->sched.link, &engine->active.requests)) -return false; - - hint =max (rq_prio (list_next_entry (rq, sched.link)), - engine->execlists.queue_priority_hint); + hint = engine->execlists.queue_priority_hint; +if (!list_is_last (&rq->sched.link, &engine->active.requests)) + hint =max (hint,rq_prio (list_next_entry (rq, sched.link)));return hint >=effective_prio (rq); }
@@ -1547,6 +1545,18 @@ static void set_timeslice(struct intel_eset_timer_ms (&engine->execlists.timer,active_timeslice (engine)); } +static void start_timeslice (struct intel_engine_cs *engine) +{ +struct intel_engine_execlists *execlists = &engine->execlists; + + execlists->switch_priority_hint = execlists->queue_priority_hint; + +if (timer_pending (&execlists->timer)) +return ; + +set_timer_ms (&execlists->timer,timeslice (engine)); +} +static void record_preemption (struct intel_engine_execlists *execlists) { (void )I915_SELFTEST_ONLY (execlists->preempt_hang.count++);
@@ -1705,11 +1715,7 @@ static void execlists_dequeue(struct int* Even if ELSP[1] is occupied and not worthy * of timeslices, our queue might be. */ -if (!execlists->timer.expires && -need_timeslice (engine, last)) -set_timer_ms (&execlists->timer, -timeslice (engine)); - +start_timeslice (engine);return ; } }
@@ -1744,7 +1750,8 @@ static void execlists_dequeue(struct intif (last && !can_merge_rq (last, rq)) {spin_unlock (&ve->base.active.lock); -return ;/* leave this for another */ +start_timeslice (engine); +return ;/* leave this for another sibling */ } GEM_TRACE("%s: virtual rq=%llx:%lld%s, new engine? %s\n",
Greg Kroah-Hartman
maintainerPATCH 91/151 mmc: sdhci-pci-gli: Enable MSI interrupt for GL975x
In reply to Greg Kroah-HartmanFrom: Ben Chuang <[email protected]>
commit 31e43f31890ca6e909b27dcb539252b46aa465da upstream.
Enable MSI interrupt for GL9750/GL9755. Some platforms do not support PCI INTx and devices can not work without interrupt. Like messages below:
[ 4.487132] sdhci-pci 0000:01:00.0: SDHCI controller found [17a0:9755] (rev 0) [ 4.487198] ACPI BIOS Error (bug): Could not resolve symbol [\_SB.PCI0.PBR2._PRT.APS2], AE_NOT_FOUND (20190816/psargs-330) [ 4.487397] ACPI Error: Aborting method \_SB.PCI0.PBR2._PRT due to previous error (AE_NOT_FOUND) (20190816/psparse-529) [ 4.487707] pcieport 0000:00:01.3: can't derive routing for PCI INT A [ 4.487709] sdhci-pci 0000:01:00.0: PCI INT A: no GSI
--- drivers/mmc/host/sdhci-pci-gli.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/mmc/host/sdhci-pci-gli.c +17 -0
@@ -262,10 +262,26 @@ static int gl9750_execute_tuning(structreturn 0 ; } +static void gli_pcie_enable_msi (struct sdhci_pci_slot *slot) +{ +int ret; + + ret =pci_alloc_irq_vectors (slot->chip->pdev,1 ,1 , +PCI_IRQ_MSI |PCI_IRQ_MSIX ); +if (ret <0 ) { +pr_warn ("%s: enable PCI MSI failed, error=%d\n" , +mmc_hostname (slot->host->mmc), ret); +return ; + } + + slot->host->irq =pci_irq_vector (slot->chip->pdev,0 ); +} +static int gli_probe_slot_gl9750 (struct sdhci_pci_slot *slot) {struct sdhci_host *host = slot->host; +gli_pcie_enable_msi (slot); slot->host->mmc->caps2 |=MMC_CAP2_NO_SDIO ;sdhci_enable_v4_mode (host);
@@ -276,6 +292,7 @@ static int gli_probe_slot_gl9755(struct {struct sdhci_host *host = slot->host; +gli_pcie_enable_msi (slot); slot->host->mmc->caps2 |=MMC_CAP2_NO_SDIO ;sdhci_enable_v4_mode (host);
Greg Kroah-Hartman
maintainerPATCH 92/151 pinctrl: falcon: fix syntax error
In reply to Greg Kroah-HartmanFrom: Mathias Kresin <[email protected]>
commit d62e7fbea4951c124a24176da0c7bf3003ec53d4 upstream.
Add the missing semicolon after of_node_put to get the file compiled.
--- drivers/pinctrl/pinctrl-falcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-falcon.c +1 -1
@@ -451,7 +451,7 @@ static int pinctrl_falcon_probe(struct p falcon_info.clk[*bank] =clk_get (&ppdev->dev,NULL );if (IS_ERR (falcon_info.clk[*bank])) {dev_err (&ppdev->dev,"failed to get clock\n" ); -of_node_put (np) +of_node_put (np);return PTR_ERR (falcon_info.clk[*bank]); } falcon_info.membase[*bank] = devm_ioremap_resource(&pdev->dev,
Greg Kroah-Hartman
maintainerPATCH 93/151 pinctrl: qcom: Assign irq_eoi conditionally
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
commit 1cada2f307665e208a486d7ac2294ed9a6f74a6f upstream.
The hierarchical parts of MSM pinctrl/GPIO is only used when the device tree has a "wakeup-parent" as a phandle, but the .irq_eoi is anyway assigned leading to semantic problems on elder Qualcomm chipsets.
When the drivers/mfd/qcom-pm8xxx.c driver calls chained_irq_exit() that call will in turn call chip->irq_eoi() which is set to irq_chip_eoi_parent() by default on a hierachical IRQ chip, and the parent is pinctrl-msm.c so that will in turn unconditionally call irq_chip_eoi_parent() again, but its parent is invalid so we get the following crash:
Unnable to handle kernel NULL pointer dereference at virtual address 00000010
pgd = (ptrval)
[00000010] *pgd=00000000
Internal error: Oops: 5 [#1] PREEMPT SMP ARM (...) PC is at irq_chip_eoi_parent+0x4/0x10 LR is at pm8xxx_irq_handler+0x1b4/0x2d8
If we solve this crash by avoiding to call up to irq_chip_eoi_parent(), the machine will hang and get reset by the watchdog, because of semantic issues, probably inside irq_chip.
As a solution, just assign the .irq_eoi conditionally if we are actually using a wakeup parent.
--- drivers/pinctrl/qcom/pinctrl-msm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pinctrl/qcom/pinctrl-msm.c +1 -2
@@ -1104,7 +1104,6 @@ static int msm_gpio_init(struct msm_pinc pctrl->irq_chip.irq_mask = msm_gpio_irq_mask; pctrl->irq_chip.irq_unmask = msm_gpio_irq_unmask; pctrl->irq_chip.irq_ack = msm_gpio_irq_ack; - pctrl->irq_chip.irq_eoi = irq_chip_eoi_parent; pctrl->irq_chip.irq_set_type = msm_gpio_irq_set_type; pctrl->irq_chip.irq_set_wake = msm_gpio_irq_set_wake; pctrl->irq_chip.irq_request_resources = msm_gpio_irq_reqres;
@@ -1118,7 +1117,7 @@ static int msm_gpio_init(struct msm_pincif (!chip->irq.parent_domain)return -EPROBE_DEFER ; chip->irq.child_to_parent_hwirq = msm_gpio_wakeirq; - + pctrl->irq_chip.irq_eoi = irq_chip_eoi_parent;/* * Let's skip handling the GPIOs, if the parent irqchip * is handling the direct connect IRQ of the GPIO.
Greg Kroah-Hartman
maintainerPATCH 94/151 ktest: Add timeout for ssh sync testing
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 4d00fc477a2ce8b6d2b09fb34ef9fe9918e7d434 upstream.
Before rebooting the box, a "ssh sync" is called to the test machine to see if it is alive or not. But if the test machine is in a partial state, that ssh may never actually finish, and the ktest test hangs.
Add a 10 second timeout to the sync test, which will fail after 10 seconds and then cause the test to reboot the test machine.
--- tools/testing/ktest/ktest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/ktest/ktest.pl +1 -1
@@ -1383,7 +1383,7 @@ sub reboot { } else { # Make sure everything has been written to disk - run_ssh("sync"); + run_ssh("sync", 10); if (defined($time)) { start_monitor;
Greg Kroah-Hartman
maintainerPATCH 95/151 block: Fix partition support for host aware zoned block devices
In reply to Greg Kroah-HartmanFrom: Shin'ichiro Kawasaki <[email protected]>
commit b53df2e7442c73a932fb74228147fb946e531585 upstream.
Commit b72053072c0b ("block: allow partitions on host aware zone devices") introduced the helper function disk_has_partitions() to check if a given disk has valid partitions. However, since this function result directly depends on the disk partition table length rather than the actual existence of valid partitions in the table, it returns true even after all partitions are removed from the disk. For host aware zoned block devices, this results in zone management support to be kept disabled even after removing all partitions.
Fix this by changing disk_has_partitions() to walk through the partition table entries and return true if and only if a valid non-zero size partition is found.
block/genhd.c +36 -0
@@ -301,6 +301,42 @@ struct hd_struct *disk_map_sector_rcu(struct gendisk *disk, sector_t sector) }EXPORT_SYMBOL_GPL (disk_map_sector_rcu); +/** +* disk_has_partitions +* @disk: gendisk of interest +* +* Walk through the partition table and check if valid partition exists. +* +* CONTEXT: +* Don't care. +* +* RETURNS: +* True if the gendisk has at least one valid non-zero size partition. +* Otherwise false. +*/ +bool disk_has_partitions (struct gendisk *disk) +{ +struct disk_part_tbl *ptbl; +int i; +bool ret = false; + +rcu_read_lock (); + ptbl =rcu_dereference (disk->part_tbl); + +/* Iterate partitions skipping the whole device at index 0 */ +for (i =1 ; i < ptbl->len; i++) { +if (rcu_dereference (ptbl->part[i])) { + ret = true; +break ; + } + } + +rcu_read_unlock (); + +return ret; +} +EXPORT_SYMBOL_GPL (disk_has_partitions); +/* * Can be deleted altogether. Later. *
include/linux/genhd.h +1 -12
@@ -245,18 +245,6 @@ static inline bool disk_part_scan_enabled(struct gendisk *disk) !(disk->flags &GENHD_FL_NO_PART_SCAN ); } -static inline bool disk_has_partitions (struct gendisk *disk) -{ -bool ret = false; - -rcu_read_lock (); -if (rcu_dereference (disk->part_tbl)->len >1 ) - ret = true; -rcu_read_unlock (); - -return ret; -} -static inline dev_t disk_devt (struct gendisk *disk) {return MKDEV (disk->major, disk->first_minor);
@@ -298,6 +286,7 @@ extern void disk_part_iter_exit(struct disk_part_iter *piter);extern struct hd_struct *disk_map_sector_rcu (struct gendisk *disk,sector_t sector); +bool disk_has_partitions (struct gendisk *disk);/* * Macros to operate on percpu disk statistics:
Greg Kroah-Hartman
maintainerPATCH 96/151 cifs_atomic_open(): fix double-put on late allocation failure
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit d9a9f4849fe0c9d560851ab22a85a666cddfdd24 upstream.
several iterations of ->atomic_open() calling conventions ago, we used to need fput() if ->atomic_open() failed at some point after successful finish_open(). Now (since 2016) it's not needed - struct file carries enough state to make fput() work regardless of the point in struct file lifecycle and discarding it on failure exits in open() got unified. Unfortunately, I'd missed the fact that we had an instance of ->atomic_open() (cifs one) that used to need that fput(), as well as the stale comment in finish_open() demanding such late failure handling. Trivially fixed...
--- Documentation/filesystems/porting.rst | 8 ++++++++ fs/cifs/dir.c | 1 - fs/open.c | 3 --- 3 files changed, 8 insertions(+), 4 deletions(-)
Documentation/filesystems/porting.rst +8 -0
@@ -850,3 +850,11 @@ business doing so. d_alloc_pseudo() is internal-only; uses outside of alloc_file_pseudo() are very suspect (and won't work in modules). Such uses are very likely to be misspelled d_alloc_anon(). + +--- + +**mandatory** + +[should've been added in 2016] stale comment in finish_open() nonwithstanding, +failure exits in ->atomic_open() instances should *NOT* fput() the file, +no matter what. Everything is handled by the caller.
fs/cifs/dir.c +0 -1
@@ -558,7 +558,6 @@ cifs_atomic_open(struct inode *inode, stif (server->ops->close) server->ops->close (xid, tcon, &fid);cifs_del_pending_open (&open); -fput (file); rc = -ENOMEM ; }
fs/open.c +0 -3
@@ -860,9 +860,6 @@ cleanup_file:* the return value of d_splice_alias(), then the caller needs to perform dput() * on it after finish_open(). * -* On successful return @file is a fully instantiated open file. After this, if -* an error occurs in ->atomic_open(), it needs to clean up with fput(). -* * Returns zero on success or -errno if the open failed. */ int finish_open(struct file *file, struct dentry *dentry,
Greg Kroah-Hartman
maintainerPATCH 97/151 gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 21039132650281de06a169cbe8a0f7e5c578fd8b upstream.
with the way fs/namei.c:do_last() had been done, ->atomic_open() instances needed to recognize the case when existing file got found with O_EXCL|O_CREAT, either by falling back to finish_no_open() or failing themselves. gfs2 one didn't.
--- fs/gfs2/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/inode.c +1 -1
@@ -1248,7 +1248,7 @@ static int gfs2_atomic_open(struct inodeif (!(file->f_mode &FMODE_OPENED ))return finish_no_open (file, d);dput (d); -return 0 ; +return excl && (flags &O_CREAT ) ? -EEXIST :0 ; }BUG_ON (d !=NULL );
Greg Kroah-Hartman
maintainerPATCH 98/151 KVM: x86: clear stale x86_emulate_ctxt->intercept value
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
commit 342993f96ab24d5864ab1216f46c0b199c2baf8e upstream.
After commit 07721feee46b ("KVM: nVMX: Don't emulate instructions in guest mode") Hyper-V guests on KVM stopped booting with:
kvm_nested_vmexit: rip fffff802987d6169 reason EPT_VIOLATION info1 181
info2 0 int_info 0 int_info_err 0
kvm_page_fault: address febd0000 error_code 181 kvm_emulate_insn: 0:fffff802987d6169: f3 a5 kvm_emulate_insn: 0:fffff802987d6169: f3 a5 FAIL kvm_inj_exception: #UD (0x0)
"f3 a5" is a "rep movsw" instruction, which should not be intercepted at all. Commit c44b4c6ab80e ("KVM: emulate: clean up initializations in init_decode_cache") reduced the number of fields cleared by init_decode_cache() claiming that they are being cleared elsewhere, 'intercept', however, is left uncleared if the instruction does not have any of the "slow path" flags (NotImpl, Stack, Op3264, Sse, Mmx, CheckPerm, NearBranch, No16 and of course Intercept itself).
--- arch/x86/kvm/emulate.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kvm/emulate.c +1 -0
@@ -5195,6 +5195,7 @@ int x86_decode_insn(struct x86_emulate_c ctxt->fetch.ptr = ctxt->fetch.data; ctxt->fetch.end = ctxt->fetch.data + insn_len; ctxt->opcode_len =1 ; + ctxt->intercept = x86_intercept_none;if (insn_len >0 )memcpy (ctxt->fetch.data, insn, insn_len);else {
Greg Kroah-Hartman
maintainerPATCH 99/151 KVM: nVMX: avoid NULL pointer dereference with incorrect EVMCS GPAs
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
commit 95fa10103dabc38be5de8efdfced5e67576ed896 upstream.
When an EVMCS enabled L1 guest on KVM will tries doing enlightened VMEnter with EVMCS GPA = 0 the host crashes because the
evmcs_gpa != vmx->nested.hv_evmcs_vmptr
condition in nested_vmx_handle_enlightened_vmptrld() will evaluate to false (as nested.hv_evmcs_vmptr is zeroed after init). The crash will happen on vmx->nested.hv_evmcs pointer dereference.
Another problematic EVMCS ptr value is '-1' but it only causes host crash after nested_release_evmcs() invocation. The problem is exactly the same as with '0', we mistakenly think that the EVMCS pointer hasn't changed and thus nested.hv_evmcs_vmptr is valid.
Resolve the issue by adding an additional !vmx->nested.hv_evmcs check to nested_vmx_handle_enlightened_vmptrld(), this way we will always be trying kvm_vcpu_map() when nested.hv_evmcs is NULL and this is supposed to catch all invalid EVMCS GPAs.
Also, initialize hv_evmcs_vmptr to '0' in nested_release_evmcs() to be consistent with initialization where we don't currently set hv_evmcs_vmptr to '-1'.
--- arch/x86/kvm/vmx/nested.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/nested.c +3 -2
@@ -234,7 +234,7 @@ static inline void nested_release_evmcs(return ;kvm_vcpu_unmap (vcpu, &vmx->nested.hv_evmcs_map, true); - vmx->nested.hv_evmcs_vmptr =-1ull ; + vmx->nested.hv_evmcs_vmptr =0 ; vmx->nested.hv_evmcs =NULL ; }
@@ -1932,7 +1932,8 @@ static int nested_vmx_handle_enlightenedif (!nested_enlightened_vmentry (vcpu, &evmcs_gpa))return 1 ; -if (unlikely (evmcs_gpa != vmx->nested.hv_evmcs_vmptr)) { +if (unlikely (!vmx->nested.hv_evmcs || + evmcs_gpa != vmx->nested.hv_evmcs_vmptr)) {if (!vmx->nested.hv_evmcs) vmx->nested.current_vmptr =-1ull ;
Greg Kroah-Hartman
maintainerPATCH 100/151 ARC: define __ALIGN_STR and __ALIGN symbols for ARC
In reply to Greg Kroah-HartmanFrom: Eugeniy Paltsev <[email protected]>
commit 8d92e992a785f35d23f845206cf8c6cafbc264e0 upstream.
The default defintions use fill pattern 0x90 for padding which for ARC generates unintended "ldh_s r12,[r0,0x20]" corresponding to opcode 0x9090
So use ".align 4" which insert a "nop_s" instruction instead.
--- arch/arc/include/asm/linkage.h | 2 ++ 1 file changed, 2 insertions(+)
arch/arc/include/asm/linkage.h +2 -0
@@ -29,6 +29,8 @@ .endm#define ASM_NL `/* use '`' to mark new line in macro */ +#define __ALIGN .align 4 +#define __ALIGN_STR __stringify(__ALIGN)/* annotation for data we want in DCCM - if enabled in .config */ .macro ARCFP_DATA nm
Greg Kroah-Hartman
maintainerPATCH 101/151 fuse: fix stack use after return
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit 3e8cb8b2eaeb22f540f1cbc00cbb594047b7ba89 upstream.
Normal, synchronous requests will have their args allocated on the stack. After the FR_FINISHED bit is set by receiving the reply from the userspace fuse server, the originating task may return and reuse the stack frame, resulting in an Oops if the args structure is dereferenced.
Fix by setting a flag in the request itself upon initializing, indicating whether it has an asynchronous ->end() callback.
--- fs/fuse/dev.c | 6 +++--- fs/fuse/fuse_i.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-)
fs/fuse/dev.c +3 -3
@@ -276,12 +276,10 @@ static void flush_bg_queue(struct fuse_cvoid fuse_request_end (struct fuse_conn *fc,struct fuse_req *req) {struct fuse_iqueue *fiq = &fc->iq; -bool async;if (test_and_set_bit (FR_FINISHED , &req->flags)) goto put_request; - async = req->args->end;/* * test_and_set_bit() implies smp_mb() between bit * changing and below intr_entry check. Pairs with
@@ -324,7 +322,7 @@ void fuse_request_end(struct fuse_conn *wake_up (&req->waitq); } -if (async) +if (test_bit (FR_ASYNC , &req->flags)) req->args->end (fc, req->args, req->out.h.error); put_request:fuse_put_request (fc, req);
@@ -471,6 +469,8 @@ static void fuse_args_to_req(struct fuse req->in.h.opcode = args->opcode; req->in.h.nodeid = args->nodeid; req->args = args; +if (args->end) +__set_bit (FR_ASYNC , &req->flags); }ssize_t fuse_simple_request (struct fuse_conn *fc,struct fuse_args *args)
fs/fuse/fuse_i.h +2 -0
@@ -301,6 +301,7 @@ struct fuse_io_priv {* FR_SENT: request is in userspace, waiting for an answer * FR_FINISHED: request is finished * FR_PRIVATE: request is on private list +* FR_ASYNC: request is asynchronous */ enum fuse_req_flag {FR_ISREPLY ,
@@ -314,6 +315,7 @@ enum fuse_req_flag {FR_SENT ,FR_FINISHED ,FR_PRIVATE , + FR_ASYNC, };/**
Greg Kroah-Hartman
maintainerPATCH 102/151 MIPS: DTS: CI20: fix PMU definitions for ACT8600
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
commit e8d87a0b822d4b3d9a94a5da915f93aa1b674c93 upstream.
There is a ACT8600 on the CI20 board and the bindings of the ACT8865 driver have changed without updating the CI20 device tree. Therefore the PMU can not be probed successfully and is running in power-on reset state.
Fix DT to match the latest act8865-regulator bindings.
--- arch/mips/boot/dts/ingenic/ci20.dts | 39 ++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 15 deletions(-)
arch/mips/boot/dts/ingenic/ci20.dts +24 -15
@@ -4,6 +4,7 @@ #include "jz4780.dtsi" #include <dt-bindings/clock/ingenic,tcu.h> #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/regulator/active-semi,8865-regulator.h> / { compatible = "img,ci20", "ingenic,jz4780";
@@ -163,63 +164,71 @@ regulators { vddcore: SUDCDC1 { - regulator-name = "VDDCORE"; + regulator-name = "DCDC_REG1"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; vddmem: SUDCDC2 { - regulator-name = "VDDMEM"; + regulator-name = "DCDC_REG2"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; vcc_33: SUDCDC3 { - regulator-name = "VCC33"; + regulator-name = "DCDC_REG3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; vcc_50: SUDCDC4 { - regulator-name = "VCC50"; + regulator-name = "SUDCDC_REG4"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; vcc_25: LDO_REG5 { - regulator-name = "VCC25"; + regulator-name = "LDO_REG5"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; wifi_io: LDO_REG6 { - regulator-name = "WIFIIO"; + regulator-name = "LDO_REG6"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; vcc_28: LDO_REG7 { - regulator-name = "VCC28"; + regulator-name = "LDO_REG7"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-always-on; }; vcc_15: LDO_REG8 { - regulator-name = "VCC15"; + regulator-name = "LDO_REG8"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; - vcc_18: LDO_REG9 { - regulator-name = "VCC18"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + vrtc_18: LDO_REG9 { + regulator-name = "LDO_REG9"; + /* Despite the datasheet stating 3.3V + * for REG9 and the driver expecting that, + * REG9 outputs 1.8V. + * Likely the CI20 uses a proprietary + * factory programmed chip variant. + * Since this is a simple on/off LDO the + * exact values do not matter. + */ + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; vcc_11: LDO_REG10 { - regulator-name = "VCC11"; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; + regulator-name = "LDO_REG10"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; regulator-always-on; }; };
Greg Kroah-Hartman
maintainerPATCH 103/151 MIPS: DTS: CI20: fix interrupt for pcf8563 RTC
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
commit 130ab8819d81bd96f1a71e8461a8f73edf1fbe82 upstream.
Interrupts should not be specified by interrupt line but by gpio parent and reference.
--- arch/mips/boot/dts/ingenic/ci20.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/mips/boot/dts/ingenic/ci20.dts +4 -1
@@ -4,6 +4,7 @@ #include "jz4780.dtsi" #include <dt-bindings/clock/ingenic,tcu.h> #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/regulator/active-semi,8865-regulator.h> / {
@@ -270,7 +271,9 @@ rtc@51 { compatible = "nxp,pcf8563"; reg = <0x51>; - interrupts = <110>; + + interrupt-parent = <&gpf>; + interrupts = <30 IRQ_TYPE_LEVEL_LOW>; }; };
Greg Kroah-Hartman
maintainerPATCH 104/151 MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
commit 8e029eb0bcd6a7fab6dc9191152c085784c31ee6 upstream.
The CONFIG_MIPS_CMDLINE_DTB_EXTEND option is used so that the kernel arguments provided in the 'bootargs' property in devicetree are extended with the kernel arguments provided by the bootloader.
The code was broken, as it didn't actually take any of the kernel arguments provided in devicetree when that option was set.
--- arch/mips/kernel/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/kernel/setup.c +2 -1
@@ -606,7 +606,8 @@ static void __init bootcmdline_init(char* If we're configured to take boot arguments from DT, look for those * now. */ -if (IS_ENABLED (CONFIG_MIPS_CMDLINE_FROM_DTB )) +if (IS_ENABLED (CONFIG_MIPS_CMDLINE_FROM_DTB ) || +IS_ENABLED (CONFIG_MIPS_CMDLINE_DTB_EXTEND ))of_scan_flat_dt (bootcmdline_scan_chosen, &dt_bootargs);#endif
Greg Kroah-Hartman
maintainerPATCH 105/151 s390/dasd: fix data corruption for thin provisioned devices
In reply to Greg Kroah-HartmanFrom: Stefan Haberland <[email protected]>
commit 5e6bdd37c5526ef01326df5dabb93011ee89237e upstream.
Devices are formatted in multiple of tracks.
For an Extent Space Efficient (ESE) volume we get errors when accessing unformatted tracks. In this case the driver either formats the track on the flight for write requests or returns zero data for read requests.
In case a request spans multiple tracks, the indication of an unformatted track presented for the first track is incorrectly applied to all tracks covered by the request. As a result, tracks containing data will be handled as empty, resulting in zero data being returned on read, or overwriting existing data with zero on write.
Fix by determining the track that gets the NRF error.
For write requests only format the track that is surely not formatted. For Read requests all tracks before have returned valid data and should not be touched.
All tracks after the unformatted track might be formatted or not. Those are returned to the blocklayer to build a new request.
When using alias devices there is a chance that multiple write requests trigger a format of the same track which might lead to data loss. Ensure that a track is formatted only once by maintaining a list of currently processed tracks.
--- drivers/s390/block/dasd.c | 27 ++++++ drivers/s390/block/dasd_eckd.c | 163 +++++++++++++++++++++++++++++++++++++++-- drivers/s390/block/dasd_int.h | 15 +++ 3 files changed, 193 insertions(+), 12 deletions(-)
drivers/s390/block/dasd.c +24 -3
@@ -178,6 +178,8 @@ struct dasd_block *dasd_alloc_block(void (unsigned long) block);INIT_LIST_HEAD (&block->ccw_queue);spin_lock_init (&block->queue_lock); +INIT_LIST_HEAD (&block->format_list); +spin_lock_init (&block->format_lock);timer_setup (&block->timer, dasd_block_timeout,0 );spin_lock_init (&block->profile.lock);
@@ -1779,20 +1781,26 @@ void dasd_int_handler(struct ccw_deviceif (dasd_ese_needs_format (cqr->block, irb)) {if (rq_data_dir ((struct request *)cqr->callback_data) ==READ ) { - device->discipline->ese_read (cqr); + device->discipline->ese_read (cqr, irb); cqr->status =DASD_CQR_SUCCESS ; cqr->stopclk = now;dasd_device_clear_timer (device);dasd_schedule_device_bh (device);return ; } - fcqr = device->discipline->ese_format (device, cqr); + fcqr = device->discipline->ese_format (device, cqr, irb);if (IS_ERR (fcqr)) { +if (PTR_ERR (fcqr) == -EINVAL ) { + cqr->status =DASD_CQR_ERROR ; +return ; + }/* * If we can't format now, let the request go * one extra round. Maybe we can format later. */ cqr->status =DASD_CQR_QUEUED ; +dasd_schedule_device_bh (device); +return ; }else { fcqr->status =DASD_CQR_QUEUED ; cqr->status =DASD_CQR_QUEUED ;
@@ -2748,11 +2756,13 @@ static void __dasd_cleanup_cqr(struct da {struct request *req;blk_status_t error =BLK_STS_OK ; +unsigned int proc_bytes;int status; req = (struct request *) cqr->callback_data;dasd_profile_end (cqr->block, cqr, req); + proc_bytes = cqr->proc_bytes; status = cqr->block->base->discipline->free_cp (cqr, req);if (status <0 ) error =errno_to_blk_status (status);
@@ -2783,7 +2793,18 @@ static void __dasd_cleanup_cqr(struct dablk_mq_end_request (req, error);blk_mq_run_hw_queues (req->q, true); }else { -blk_mq_complete_request (req); +/* +* Partial completed requests can happen with ESE devices. +* During read we might have gotten a NRF error and have to +* complete a request partially. +*/ +if (proc_bytes) { +blk_update_request (req,BLK_STS_OK , +blk_rq_bytes (req) - proc_bytes); +blk_mq_requeue_request (req, true); + }else { +blk_mq_complete_request (req); + } } }
drivers/s390/block/dasd_eckd.c +156 -7
241 lines not on this page · raw message
drivers/s390/block/dasd_int.h +13 -2
@@ -187,6 +187,7 @@ struct dasd_ccw_req {void (*callback)(struct dasd_ccw_req *,void *data);void *callback_data; +unsigned int proc_bytes;/* bytes for partial completion */ };/*
@@ -387,8 +388,9 @@ struct dasd_discipline {int (*ext_pool_warn_thrshld)(struct dasd_device *);int (*ext_pool_oos)(struct dasd_device *);int (*ext_pool_exhaust)(struct dasd_device *,struct dasd_ccw_req *); -struct dasd_ccw_req *(*ese_format)(struct dasd_device *,struct dasd_ccw_req *); -void (*ese_read)(struct dasd_ccw_req *); +struct dasd_ccw_req *(*ese_format)(struct dasd_device *, +struct dasd_ccw_req *,struct irb *); +int (*ese_read)(struct dasd_ccw_req *,struct irb *); };extern struct dasd_discipline *dasd_diag_discipline_pointer;
@@ -474,6 +476,11 @@ struct dasd_profile {spinlock_t lock; }; +struct dasd_format_entry { +struct list_head list; +sector_t track; +}; +struct dasd_device {/* Block device stuff. */ struct dasd_block *block;
@@ -539,6 +546,7 @@ struct dasd_device {struct dentry *debugfs_dentry;struct dentry *hosts_dentry;struct dasd_profile profile; +struct dasd_format_entry format_entry; };struct dasd_block {
@@ -564,6 +572,9 @@ struct dasd_block {struct dentry *debugfs_dentry;struct dasd_profile profile; + +struct list_head format_list; +spinlock_t format_lock; };struct dasd_attention_data {
Greg Kroah-Hartman
maintainerPATCH 106/151 ipmi_si: Avoid spurious errors for optional IRQs
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 443d372d6a96cd94ad119e5c14bb4d63a536a7f6 upstream.
Although the IRQ assignment in ipmi_si driver is optional, platform_get_irq() spews error messages unnecessarily:
ipmi_si dmi-ipmi-si.0: IRQ index 0 not found
Fix this by switching to platform_get_irq_optional().
Message-Id: <[email protected]>
--- drivers/char/ipmi/ipmi_si_platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/ipmi/ipmi_si_platform.c +2 -2
@@ -194,7 +194,7 @@ static int platform_ipmi_probe(struct plelse io.slave_addr = slave_addr; - io.irq =platform_get_irq (pdev,0 ); + io.irq =platform_get_irq_optional (pdev,0 );if (io.irq >0 ) io.irq_setup = ipmi_std_irq_setup;else
@@ -378,7 +378,7 @@ static int acpi_ipmi_probe(struct platfo io.irq = tmp; io.irq_setup = acpi_gpe_irq_setup; }else { -int irq =platform_get_irq (pdev,0 ); +int irq =platform_get_irq_optional (pdev,0 );if (irq >0 ) { io.irq = irq;
Greg Kroah-Hartman
maintainerPATCH 107/151 ftrace: Return the first found result in lookup_rec()
In reply to Greg Kroah-HartmanFrom: Artem Savkov <[email protected]>
commit d9815bff6b379ff46981bea9dfeb146081eab314 upstream.
It appears that ip ranges can overlap so. In that case lookup_rec() returns whatever results it got last even if it found nothing in last searched page.
This breaks an obscure livepatch late module patching usecase:
- load livepatch
- load the patched module
- unload livepatch
- try to load livepatch again
To fix this return from lookup_rec() as soon as it found the record containing searched-for ip. This used to be this way prior lookup_rec() introduction.
--- kernel/trace/ftrace.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/ftrace.c +2 -0
@@ -1552,6 +1552,8 @@ static struct dyn_ftrace *lookup_rec(uns rec =bsearch (&key, pg->records, pg->index,sizeof (struct dyn_ftrace ), ftrace_cmp_recs); +if (rec) +break ; }return rec; }
Greg Kroah-Hartman
maintainerPATCH 108/151 blk-iocost: fix incorrect vtime comparison in iocg_is_idle()
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit dcd6589b11d3b1e71f516a87a7b9646ed356b4c0 upstream.
vtimes may wrap and time_before/after64() should be used to determine whether a given vtime is before or after another. iocg_is_idle() was incorrectly using plain "<" comparison do determine whether done_vtime is before vtime. Here, the only thing we're interested in is whether done_vtime matches vtime which indicates that there's nothing in flight. Let's test for inequality instead.
--- block/blk-iocost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-iocost.c +1 -1
@@ -1318,7 +1318,7 @@ static bool iocg_is_idle(struct ioc_gq *return false;/* is something in flight? */ -if (atomic64_read (&iocg->done_vtime) <atomic64_read (&iocg->vtime)) +if (atomic64_read (&iocg->done_vtime) !=atomic64_read (&iocg->vtime))return false;return true;
Greg Kroah-Hartman
maintainerPATCH 109/151 fscrypt: dont evict dirty inodes after removing key
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 2b4eae95c7361e0a147b838715c8baa1380a428f upstream.
After FS_IOC_REMOVE_ENCRYPTION_KEY removes a key, it syncs the filesystem and tries to get and put all inodes that were unlocked by the key so that unused inodes get evicted via fscrypt_drop_inode(). Normally, the inodes are all clean due to the sync.
However, after the filesystem is sync'ed, userspace can modify and close one of the files. (Userspace is *supposed* to close the files before removing the key. But it doesn't always happen, and the kernel can't assume it.) This causes the inode to be dirtied and have i_count == 0. Then, fscrypt_drop_inode() failed to consider this case and indicated that the inode can be dropped, causing the write to be lost.
On f2fs, other problems such as a filesystem freeze could occur due to the inode being freed while still on f2fs's dirty inode list.
Fix this bug by making fscrypt_drop_inode() only drop clean inodes.
I've written an xfstest which detects this bug on ext4, f2fs, and ubifs.
--- fs/crypto/keysetup.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/crypto/keysetup.c +9 -0
@@ -515,6 +515,15 @@ int fscrypt_drop_inode(struct inode *ino mk = ci->ci_master_key->payload.data[0 ];/* +* With proper, non-racy use of FS_IOC_REMOVE_ENCRYPTION_KEY, all inodes +* protected by the key were cleaned by sync_filesystem(). But if +* userspace is still using the files, inodes can be dirtied between +* then and now. We mustn't lose any writes, so skip dirty inodes here. +*/ +if (inode->i_state &I_DIRTY_ALL ) +return 0 ; + +/* * Note: since we aren't holding ->mk_secret_sem, the result here can * immediately become outdated. But there's no correctness problem with * unnecessarily evicting. Nor is there a correctness problem with not
Greg Kroah-Hartman
maintainerPATCH 110/151 pid: Fix error return value in some cases
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
commit b26ebfe12f34f372cf041c6f801fa49c3fb382c5 upstream.
Recent changes to alloc_pid() allow the pid number to be specified on the command line. If set_tid_size is set, then the code scanning the levels will hard-set retval to -EPERM, overriding it's previous -ENOMEM value.
After the code scanning the levels, there are error returns that do not set retval, assuming it is still set to -ENOMEM.
So set retval back to -ENOMEM after scanning the levels.
--- kernel/pid.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/pid.c +2 -0
@@ -247,6 +247,8 @@ struct pid *alloc_pid(struct pid_namespa tmp = tmp->parent; } + retval = -ENOMEM ; +if (unlikely (is_child_reaper (pid))) {if (pid_ns_prepare_proc (ns)) goto out_free;
Greg Kroah-Hartman
maintainerPATCH 111/151 macintosh: windfarm: fix MODINFO regression
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
commit bcf3588d8ed3517e6ffaf083f034812aee9dc8e2 upstream.
Commit af503716ac14 made sure OF devices get an OF style modalias with I2C events. It assumed all in-tree users were converted, yet it missed some Macintosh drivers.
Add an OF module device table for all windfarm drivers to make them automatically load again.
--- drivers/macintosh/windfarm_ad7417_sensor.c | 7 +++++++ drivers/macintosh/windfarm_fcu_controls.c | 7 +++++++ drivers/macintosh/windfarm_lm75_sensor.c | 16 +++++++++++++++- drivers/macintosh/windfarm_lm87_sensor.c | 7 +++++++ drivers/macintosh/windfarm_max6690_sensor.c | 7 +++++++ drivers/macintosh/windfarm_smu_sat.c | 7 +++++++ 6 files changed, 50 insertions(+), 1 deletion(-)
drivers/macintosh/windfarm_ad7417_sensor.c +7 -0
@@ -312,9 +312,16 @@ static const struct i2c_device_id wf_ad7 };MODULE_DEVICE_TABLE (i2c, wf_ad7417_id); +static const struct of_device_id wf_ad7417_of_id[] = { + { .compatible ="ad7417" , }, + { } +}; +MODULE_DEVICE_TABLE (of, wf_ad7417_of_id); +static struct i2c_driver wf_ad7417_driver = { .driver = { .name ="wf_ad7417" , + .of_match_table = wf_ad7417_of_id, }, .probe = wf_ad7417_probe, .remove = wf_ad7417_remove,
drivers/macintosh/windfarm_fcu_controls.c +7 -0
@@ -580,9 +580,16 @@ static const struct i2c_device_id wf_fcu };MODULE_DEVICE_TABLE (i2c, wf_fcu_id); +static const struct of_device_id wf_fcu_of_id[] = { + { .compatible ="fcu" , }, + { } +}; +MODULE_DEVICE_TABLE (of, wf_fcu_of_id); +static struct i2c_driver wf_fcu_driver = { .driver = { .name ="wf_fcu" , + .of_match_table = wf_fcu_of_id, }, .probe = wf_fcu_probe, .remove = wf_fcu_remove,
drivers/macintosh/windfarm_lm75_sensor.c +15 -1
@@ -14,6 +14,7 @@#include <linux/init.h> #include <linux/wait.h> #include <linux/i2c.h> +#include <linux/of_device.h> #include <asm/prom.h> #include <asm/machdep.h> #include <asm/io.h>
@@ -91,9 +92,14 @@ static int wf_lm75_probe(struct i2c_clie const struct i2c_device_id *id) {struct wf_lm75_sensor *lm; -int rc, ds1775 = id->driver_data; +int rc, ds1775;const char *name, *loc; +if (id) + ds1775 = id->driver_data; +else + ds1775 = !!of_device_get_match_data (&client->dev); +DBG ("wf_lm75: creating %s device at address 0x%02x\n" , ds1775 ?"ds1775" :"lm75" , client->addr);
@@ -164,9 +170,17 @@ static const struct i2c_device_id wf_lm7 };MODULE_DEVICE_TABLE (i2c, wf_lm75_id); +static const struct of_device_id wf_lm75_of_id[] = { + { .compatible ="lm75" , .data = (void *)0 }, + { .compatible ="ds1775" , .data = (void *)1 }, + { } +}; +MODULE_DEVICE_TABLE (of, wf_lm75_of_id); +static struct i2c_driver wf_lm75_driver = { .driver = { .name ="wf_lm75" , + .of_match_table = wf_lm75_of_id, }, .probe = wf_lm75_probe, .remove = wf_lm75_remove,
drivers/macintosh/windfarm_lm87_sensor.c +7 -0
@@ -166,9 +166,16 @@ static const struct i2c_device_id wf_lm8 };MODULE_DEVICE_TABLE (i2c, wf_lm87_id); +static const struct of_device_id wf_lm87_of_id[] = { + { .compatible ="lm87cimt" , }, + { } +}; +MODULE_DEVICE_TABLE (of, wf_lm87_of_id); +static struct i2c_driver wf_lm87_driver = { .driver = { .name ="wf_lm87" , + .of_match_table = wf_lm87_of_id, }, .probe = wf_lm87_probe, .remove = wf_lm87_remove,
drivers/macintosh/windfarm_max6690_sensor.c +7 -0
@@ -120,9 +120,16 @@ static const struct i2c_device_id wf_max };MODULE_DEVICE_TABLE (i2c, wf_max6690_id); +static const struct of_device_id wf_max6690_of_id[] = { + { .compatible ="max6690" , }, + { } +}; +MODULE_DEVICE_TABLE (of, wf_max6690_of_id); +static struct i2c_driver wf_max6690_driver = { .driver = { .name ="wf_max6690" , + .of_match_table = wf_max6690_of_id, }, .probe = wf_max6690_probe, .remove = wf_max6690_remove,
drivers/macintosh/windfarm_smu_sat.c +7 -0
@@ -341,9 +341,16 @@ static const struct i2c_device_id wf_sat };MODULE_DEVICE_TABLE (i2c, wf_sat_id); +static const struct of_device_id wf_sat_of_id[] = { + { .compatible ="smu-sat" , }, + { } +}; +MODULE_DEVICE_TABLE (of, wf_sat_of_id); +static struct i2c_driver wf_sat_driver = { .driver = { .name ="wf_smu_sat" , + .of_match_table = wf_sat_of_id, }, .probe = wf_sat_probe, .remove = wf_sat_remove,
Greg Kroah-Hartman
maintainerPATCH 112/151 x86/ioremap: Map EFI runtime services data as encrypted for SEV
In reply to Greg Kroah-HartmanFrom: Tom Lendacky <[email protected]>
commit 985e537a4082b4635754a57f4f95430790afee6a upstream.
The dmidecode program fails to properly decode the SMBIOS data supplied by OVMF/UEFI when running in an SEV guest. The SMBIOS area, under SEV, is encrypted and resides in reserved memory that is marked as EFI runtime services data.
As a result, when memremap() is attempted for the SMBIOS data, it can't be mapped as regular RAM (through try_ram_remap()) and, since the address isn't part of the iomem resources list, it isn't mapped encrypted through the fallback ioremap().
Add a new __ioremap_check_other() to deal with memory types like EFI_RUNTIME_SERVICES_DATA which are not covered by the resource ranges.
This allows any runtime services data which has been created encrypted, to be mapped encrypted too.
[ bp: Move functionality to a separate function. ]
--- arch/x86/mm/ioremap.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/x86/mm/ioremap.c +18 -0
@@ -106,6 +106,19 @@ static unsigned int __ioremap_check_encrreturn 0 ; } +/* +* The EFI runtime services data area is not covered by walk_mem_res(), but must +* be mapped encrypted when SEV is active. +*/ +static void __ioremap_check_other (resource_size_t addr,struct ioremap_desc *desc) +{ +if (!sev_active ()) +return ; + +if (efi_mem_type (addr) ==EFI_RUNTIME_SERVICES_DATA ) + desc->flags |=IORES_MAP_ENCRYPTED ; +} +static int __ioremap_collect_map_flags (struct resource *res,void *arg) {struct ioremap_desc *desc = arg;
@@ -124,6 +137,9 @@ static int __ioremap_collect_map_flags(s* To avoid multiple resource walks, this function walks resources marked as * IORESOURCE_MEM and IORESOURCE_BUSY and looking for system RAM and/or a * resource described not as IORES_DESC_NONE (e.g. IORES_DESC_ACPI_TABLES). +* +* After that, deal with misc other ranges in __ioremap_check_other() which do +* not fall into the above category. */ static void __ioremap_check_mem (resource_size_t addr,unsigned long size,struct ioremap_desc *desc)
@@ -135,6 +151,8 @@ static void __ioremap_check_mem(resourcememset (desc,0 ,sizeof (struct ioremap_desc ));walk_mem_res (start, end, desc, __ioremap_collect_map_flags); + +__ioremap_check_other (addr, desc); }/*
Greg Kroah-Hartman
maintainerPATCH 113/151 efi: Fix a race and a buffer overflow while reading efivars via sysfs
In reply to Greg Kroah-HartmanFrom: Vladis Dronov <[email protected]>
commit 286d3250c9d6437340203fb64938bea344729a0e upstream.
There is a race and a buffer overflow corrupting a kernel memory while reading an EFI variable with a size more than 1024 bytes via the older sysfs method. This happens because accessing struct efi_variable in efivar_{attr,size,data}_read() and friends is not protected from a concurrent access leading to a kernel memory corruption and, at best, to a crash. The race scenario is the following:
CPU0: CPU1:efivar_attr_read()
var->DataSize = 1024;
efivar_entry_get(... &var->DataSize)
down_interruptible(&efivars_lock)
efivar_attr_read() // same EFI var
var->DataSize = 1024;
efivar_entry_get(... &var->DataSize)
down_interruptible(&efivars_lock)
virt_efi_get_variable()
// returns EFI_BUFFER_TOO_SMALL but
// var->DataSize is set to a real
// var size more than 1024 bytes
up(&efivars_lock)
virt_efi_get_variable()
// called with var->DataSize set
// to a real var size, returns
// successfully and overwrites
// a 1024-bytes kernel buffer
up(&efivars_lock)This can be reproduced by concurrent reading of an EFI variable which size is more than 1024 bytes:
ts# for cpu in $(seq 0 $(nproc --ignore=1)); do ( taskset -c $cpu \ cat /sys/firmware/efi/vars/KEKDefault*/size & ) ; done
Fix this by using a local variable for a var's data buffer size so it does not get overwritten.
--- drivers/firmware/efi/efivars.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
drivers/firmware/efi/efivars.c +20 -9
@@ -83,13 +83,16 @@ static ssize_t efivar_attr_read(struct efivar_entry *entry, char *buf) { struct efi_variable *var = &entry->var; +unsigned long size =sizeof (var->Data);char *str = buf; +int ret;if (!entry || !buf)return -EINVAL ; - var->DataSize =1024 ; -if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data)) + ret =efivar_entry_get (entry, &var->Attributes, &size, var->Data); + var->DataSize = size; +if (ret)return -EIO ;if (var->Attributes &EFI_VARIABLE_NON_VOLATILE )
@@ -116,13 +119,16 @@ static ssize_t efivar_size_read(struct efivar_entry *entry, char *buf) { struct efi_variable *var = &entry->var; +unsigned long size =sizeof (var->Data);char *str = buf; +int ret;if (!entry || !buf)return -EINVAL ; - var->DataSize =1024 ; -if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data)) + ret =efivar_entry_get (entry, &var->Attributes, &size, var->Data); + var->DataSize = size; +if (ret)return -EIO ; str +=sprintf (str,"0x%lx\n" , var->DataSize);
@@ -133,12 +139,15 @@ static ssize_t efivar_data_read(struct efivar_entry *entry, char *buf) { struct efi_variable *var = &entry->var; +unsigned long size =sizeof (var->Data); +int ret;if (!entry || !buf)return -EINVAL ; - var->DataSize =1024 ; -if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data)) + ret =efivar_entry_get (entry, &var->Attributes, &size, var->Data); + var->DataSize = size; +if (ret)return -EIO ;memcpy (buf, var->Data, var->DataSize);
@@ -250,14 +259,16 @@ efivar_show_raw(struct efivar_entry *ent {struct efi_variable *var = &entry->var;struct compat_efi_variable *compat; +unsigned long datasize =sizeof (var->Data);size_t size; +int ret;if (!entry || !buf)return 0 ; - var->DataSize =1024 ; -if (efivar_entry_get (entry, &entry->var.Attributes, - &entry->var.DataSize, entry->var.Data)) + ret =efivar_entry_get (entry, &var->Attributes, &datasize, var->Data); + var->DataSize = datasize; +if (ret)return -EIO ;if (in_compat_syscall ()) {
Greg Kroah-Hartman
maintainerPATCH 114/151 efi: Add a sanity check to efivar_store_raw()
In reply to Greg Kroah-HartmanFrom: Vladis Dronov <[email protected]>
commit d6c066fda90d578aacdf19771a027ed484a79825 upstream.
Add a sanity check to efivar_store_raw() the same way efivar_{attr,size,data}_read() and efivar_show_raw() have it.
--- drivers/firmware/efi/efivars.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/firmware/efi/efivars.c +3 -0
@@ -208,6 +208,9 @@ efivar_store_raw(struct efivar_entry *enu8 *data;int err; +if (!entry || !buf) +return -EINVAL ; +if (in_compat_syscall ()) {struct compat_efi_variable *compat;
Greg Kroah-Hartman
maintainerPATCH 115/151 i2c: designware-pci: Fix BUG_ON during device removal
In reply to Greg Kroah-HartmanFrom: Jarkko Nikula <[email protected]>
commit 9be8bc4dd6177cf992b93b0bd014c4f611283896 upstream.
Function i2c_dw_pci_remove() -> pci_free_irq_vectors() -> pci_disable_msi() -> free_msi_irqs() will throw a BUG_ON() for MSI enabled device since the driver has not released the requested IRQ before calling the pci_free_irq_vectors().
Here driver requests an IRQ using devm_request_irq() but automatic release happens only after remove callback. Fix this by explicitly freeing the IRQ before calling pci_free_irq_vectors().
--- drivers/i2c/busses/i2c-designware-pcidrv.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-designware-pcidrv.c +1 -0
@@ -313,6 +313,7 @@ static void i2c_dw_pci_remove(struct pcipm_runtime_get_noresume (&pdev->dev);i2c_del_adapter (&dev->adapter); +devm_free_irq (&pdev->dev, dev->irq, dev);pci_free_irq_vectors (pdev); }
Greg Kroah-Hartman
maintainerPATCH 116/151 mt76: fix array overflow on receiving too many fragments for a packet
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
commit b102f0c522cf668c8382c56a4f771b37d011cda2 upstream.
If the hardware receives an oversized packet with too many rx fragments, skb_shinfo(skb)->frags can overflow and corrupt memory of adjacent pages. This becomes especially visible if it corrupts the freelist pointer of a slab page.
--- drivers/net/wireless/mediatek/mt76/dma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +6 -3
@@ -447,10 +447,13 @@ mt76_add_fragment(struct mt76_dev *dev,struct page *page =virt_to_head_page (data);int offset = data -page_address (page);struct sk_buff *skb = q->rx_head; +struct skb_shared_info *shinfo =skb_shinfo (skb); - offset += q->buf_offset; -skb_add_rx_frag (skb,skb_shinfo (skb)->nr_frags, page, offset, len, - q->buf_size); +if (shinfo->nr_frags <ARRAY_SIZE (shinfo->frags)) { + offset += q->buf_offset; +skb_add_rx_frag (skb, shinfo->nr_frags, page, offset, len, + q->buf_size); + }if (more)return ;
Greg Kroah-Hartman
maintainerPATCH 117/151 perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag
In reply to Greg Kroah-HartmanFrom: Kim Phillips <[email protected]>
commit f967140dfb7442e2db0868b03b961f9c59418a1b upstream.
Enable the sampling check in kernel/events/core.c::perf_event_open(), which returns the more appropriate -EOPNOTSUPP.
BEFORE:
$ sudo perf record -a -e instructions,l3_request_g1.caching_l3_cache_accesses true Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (l3_request_g1.caching_l3_cache_accesses). /bin/dmesg | grep -i perf may provide additional information.
With nothing relevant in dmesg.
AFTER:
$ sudo perf record -a -e instructions,l3_request_g1.caching_l3_cache_accesses true Error: l3_request_g1.caching_l3_cache_accesses: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat'
--- arch/x86/events/amd/uncore.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
arch/x86/events/amd/uncore.c +7 -10
@@ -190,15 +190,12 @@ static int amd_uncore_event_init(struct/* * NB and Last level cache counters (MSRs) are shared across all cores -* that share the same NB / Last level cache. Interrupts can be directed -* to a single target core, however, event counts generated by processes -* running on other cores cannot be masked out. So we do not support -* sampling and per-thread events. +* that share the same NB / Last level cache. On family 16h and below, +* Interrupts can be directed to a single target core, however, event +* counts generated by processes running on other cores cannot be masked +* out. So we do not support sampling and per-thread events via +* CAP_NO_INTERRUPT, and we do not enable counter overflow interrupts: */ -if (is_sampling_event (event) || event->attach_state &PERF_ATTACH_TASK ) -return -EINVAL ; - -/* and we do not enable counter overflow interrupts */ hwc->config = event->attr.config &AMD64_RAW_EVENT_MASK_NB ; hwc->idx =-1 ;
@@ -306,7 +303,7 @@ static struct pmu amd_nb_pmu = { .start = amd_uncore_start, .stop = amd_uncore_stop, .read = amd_uncore_read, - .capabilities = PERF_PMU_CAP_NO_EXCLUDE, + .capabilities = PERF_PMU_CAP_NO_EXCLUDE | PERF_PMU_CAP_NO_INTERRUPT, };static struct pmu amd_llc_pmu = {
@@ -317,7 +314,7 @@ static struct pmu amd_llc_pmu = { .start = amd_uncore_start, .stop = amd_uncore_stop, .read = amd_uncore_read, - .capabilities = PERF_PMU_CAP_NO_EXCLUDE, + .capabilities = PERF_PMU_CAP_NO_EXCLUDE | PERF_PMU_CAP_NO_INTERRUPT, };static struct amd_uncore *amd_uncore_alloc (unsigned int cpu)
Greg Kroah-Hartman
maintainerPATCH 118/151 x86/mce: Fix logic and comments around MSR_PPIN_CTL
In reply to Greg Kroah-HartmanFrom: Tony Luck <[email protected]>
commit 59b5809655bdafb0767d3fd00a3e41711aab07e6 upstream.
There are two implemented bits in the PPIN_CTL MSR:
Bit 0: LockOut (R/WO)
Set 1 to prevent further writes to MSR_PPIN_CTL.
Bit 1: Enable_PPIN (R/W)
If 1, enables MSR_PPIN to be accessible using RDMSR. If 0, an attempt to read MSR_PPIN will cause #GP.
So there are four defined values:
0: PPIN is disabled, PPIN_CTL may be updated 1: PPIN is disabled. PPIN_CTL is locked against updates 2: PPIN is enabled. PPIN_CTL may be updated 3: PPIN is enabled. PPIN_CTL is locked against updates
Code would only enable the X86_FEATURE_INTEL_PPIN feature for case "2". When it should have done so for both case "2" and case "3".
Fix the final test to just check for the enable bit. Also fix some of the other comments in this function.
--- arch/x86/kernel/cpu/mce/intel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/mce/intel.c +5 -4
@@ -492,17 +492,18 @@ static void intel_ppin_init(struct cpuinreturn ;if ((val &3UL ) ==1UL ) { -/* PPIN available but disabled: */ +/* PPIN locked in disabled mode */ return ; } -/* If PPIN is disabled, but not locked, try to enable: */ -if (!(val &3UL )) { +/* If PPIN is disabled, try to enable */ +if (!(val &2UL )) {wrmsrl_safe (MSR_PPIN_CTL , val |2UL );rdmsrl_safe (MSR_PPIN_CTL , &val); } -if ((val &3UL ) ==2UL ) +/* Is the enable bit set? */ +if (val &2UL )set_cpu_cap (c,X86_FEATURE_INTEL_PPIN ); } }
Greg Kroah-Hartman
maintainerPATCH 119/151 iommu/dma: Fix MSI reservation allocation
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
commit 65ac74f1de3334852fb7d9b1b430fa5a06524276 upstream.
The way cookie_init_hw_msi_region() allocates the iommu_dma_msi_page structures doesn't match the way iommu_put_dma_cookie() frees them.
The former performs a single allocation of all the required structures, while the latter tries to free them one at a time. It doesn't quite work for the main use case (the GICv3 ITS where the range is 64kB) when the base granule size is 4kB.
This leads to a nice slab corruption on teardown, which is easily observable by simply creating a VF on a SRIOV-capable device, and tearing it down immediately (no need to even make use of it). Fortunately, this only affects systems where the ITS isn't translated by the SMMU, which are both rare and non-standard.
Fix it by allocating iommu_dma_msi_page structures one at a time.
--- drivers/iommu/dma-iommu.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/iommu/dma-iommu.c +8 -8
@@ -177,15 +177,15 @@ static int cookie_init_hw_msi_region(str start -=iova_offset (iovad, start); num_pages =iova_align (iovad, end - start) >>iova_shift (iovad); - msi_page =kcalloc (num_pages,sizeof (*msi_page),GFP_KERNEL ); -if (!msi_page) -return -ENOMEM ; -for (i =0 ; i < num_pages; i++) { - msi_page[i].phys = start; - msi_page[i].iova = start; -INIT_LIST_HEAD (&msi_page[i].list); -list_add (&msi_page[i].list, &cookie->msi_page_list); + msi_page =kmalloc (sizeof (*msi_page),GFP_KERNEL ); +if (!msi_page) +return -ENOMEM ; + + msi_page->phys = start; + msi_page->iova = start; +INIT_LIST_HEAD (&msi_page->list); +list_add (&msi_page->list, &cookie->msi_page_list); start += iovad->granule; }
Greg Kroah-Hartman
maintainerPATCH 120/151 iommu/vt-d: dmar: replace WARN_TAINT with pr_warn + add_taint
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 59833696442c674acbbd297772ba89e7ad8c753d upstream.
Quoting from the comment describing the WARN functions in include/asm-generic/bug.h:
* WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report
* significant kernel issues that need prompt attention if they should ever
* appear at runtime.
*
* Do not use these macros when checking for invalid external inputs
The (buggy) firmware tables which the dmar code was calling WARN_TAINT for really are invalid external inputs. They are not under the kernel's control and the issues in them cannot be fixed by a kernel update. So logging a backtrace, which invites bug reports to be filed about this, is not helpful.
Some distros, e.g. Fedora, have tools watching for the kernel backtraces logged by the WARN macros and offer the user an option to file a bug for this when these are encountered. The WARN_TAINT in warn_invalid_dmar()
+ another iommu WARN_TAINT, addressed in another patch, have lead to over a 100 bugs being filed this way.
This commit replaces the WARN_TAINT("...") calls, with pr_warn(FW_BUG "...") + add_taint(TAINT_FIRMWARE_WORKAROUND, ...) calls avoiding the backtrace and thus also avoiding bug-reports being filed about this against the kernel.
--- drivers/iommu/dmar.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/iommu/dmar.c +6 -5
@@ -440,12 +440,13 @@ static int __init dmar_parse_one_andd(st/* Check for NUL termination within the designated length */ if (strnlen (andd->device_name, header->length -8 ) == header->length -8 ) { -WARN_TAINT (1 ,TAINT_FIRMWARE_WORKAROUND , +pr_warn (FW_BUG "Your BIOS is broken; ANDD object name is not NUL-terminated\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n" ,dmi_get_system_info (DMI_BIOS_VENDOR ),dmi_get_system_info (DMI_BIOS_VERSION ),dmi_get_system_info (DMI_PRODUCT_VERSION )); +add_taint (TAINT_FIRMWARE_WORKAROUND ,LOCKDEP_STILL_OK );return -EINVAL ; } pr_info("ANDD device: %x name: %s\n", andd->device_number,
@@ -471,14 +472,14 @@ static int dmar_parse_one_rhsa(struct acreturn 0 ; } } -WARN_TAINT ( -1 ,TAINT_FIRMWARE_WORKAROUND , +pr_warn (FW_BUG "Your BIOS is broken; RHSA refers to non-existent DMAR unit at %llx\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n" , drhd->reg_base_addr,dmi_get_system_info (DMI_BIOS_VENDOR ),dmi_get_system_info (DMI_BIOS_VERSION ),dmi_get_system_info (DMI_PRODUCT_VERSION )); +add_taint (TAINT_FIRMWARE_WORKAROUND ,LOCKDEP_STILL_OK );return 0 ; }
@@ -827,14 +828,14 @@ int __init dmar_table_init(void)static void warn_invalid_dmar (u64 addr,const char *message) { -WARN_TAINT_ONCE ( -1 ,TAINT_FIRMWARE_WORKAROUND , +pr_warn_once (FW_BUG "Your BIOS is broken; DMAR reported at address %llx%s!\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n" , addr, message,dmi_get_system_info (DMI_BIOS_VENDOR ),dmi_get_system_info (DMI_BIOS_VERSION ),dmi_get_system_info (DMI_PRODUCT_VERSION )); +add_taint (TAINT_FIRMWARE_WORKAROUND ,LOCKDEP_STILL_OK ); } static int __ref
Greg Kroah-Hartman
maintainerPATCH 121/151 iommu/vt-d: dmar_parse_one_rmrr: replace WARN_TAINT with pr_warn + add_taint
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 96788c7a7f1e7206519d4d736f89a2072dcfe0fc upstream.
Quoting from the comment describing the WARN functions in include/asm-generic/bug.h:
* WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report
* significant kernel issues that need prompt attention if they should ever
* appear at runtime.
*
* Do not use these macros when checking for invalid external inputs
The (buggy) firmware tables which the dmar code was calling WARN_TAINT for really are invalid external inputs. They are not under the kernel's control and the issues in them cannot be fixed by a kernel update. So logging a backtrace, which invites bug reports to be filed about this, is not helpful.
Some distros, e.g. Fedora, have tools watching for the kernel backtraces logged by the WARN macros and offer the user an option to file a bug for this when these are encountered. The WARN_TAINT in dmar_parse_one_rmrr
+ another iommu WARN_TAINT, addressed in another patch, have lead to over a 100 bugs being filed this way.
This commit replaces the WARN_TAINT("...") call, with a pr_warn(FW_BUG "...") + add_taint(TAINT_FIRMWARE_WORKAROUND, ...) call avoiding the backtrace and thus also avoiding bug-reports being filed about this against the kernel.
--- drivers/iommu/intel-iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/iommu/intel-iommu.c +4 -2
@@ -4330,14 +4330,16 @@ int __init dmar_parse_one_rmrr(struct acstruct dmar_rmrr_unit *rmrru; rmrr = (struct acpi_dmar_reserved_memory *)header; -if (arch_rmrr_sanity_check (rmrr)) -WARN_TAINT (1 ,TAINT_FIRMWARE_WORKAROUND , +if (arch_rmrr_sanity_check (rmrr)) { +pr_warn (FW_BUG "Your BIOS is broken; bad RMRR [%#018Lx-%#018Lx]\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n" , rmrr->base_address, rmrr->end_address,dmi_get_system_info (DMI_BIOS_VENDOR ),dmi_get_system_info (DMI_BIOS_VERSION ),dmi_get_system_info (DMI_PRODUCT_VERSION )); +add_taint (TAINT_FIRMWARE_WORKAROUND ,LOCKDEP_STILL_OK ); + } rmrru =kzalloc (sizeof (*rmrru),GFP_KERNEL );if (!rmrru)
Greg Kroah-Hartman
maintainerPATCH 122/151 iommu/vt-d: Fix RCU list debugging warnings
In reply to Greg Kroah-HartmanFrom: Amol Grover <[email protected]>
commit 02d715b4a8182f4887d82df82a7b83aced647760 upstream.
dmar_drhd_units is traversed using list_for_each_entry_rcu() outside of an RCU read side critical section but under the protection of dmar_global_lock. Hence add corresponding lockdep expression to silence the following false-positive warnings:
[ 1.603975] ============================= [ 1.603976] WARNING: suspicious RCU usage [ 1.603977] 5.5.4-stable #17 Not tainted [ 1.603978] ----------------------------- [ 1.603980] drivers/iommu/intel-iommu.c:4769 RCU-list traversed in non-reader section!!
[ 1.603869] ============================= [ 1.603870] WARNING: suspicious RCU usage [ 1.603872] 5.5.4-stable #17 Not tainted [ 1.603874] ----------------------------- [ 1.603875] drivers/iommu/dmar.c:293 RCU-list traversed in non-reader section!!
--- include/linux/dmar.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
include/linux/dmar.h +5 -3
@@ -69,8 +69,9 @@ struct dmar_pci_notify_info {extern struct rw_semaphore dmar_global_lock;extern struct list_head dmar_drhd_units; -#define for_each_drhd_unit (drhd) \ - list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) +#define for_each_drhd_unit (drhd) \ + list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \ + dmar_rcu_check())#define for_each_active_drhd_unit (drhd) \ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) \
@@ -81,7 +82,8 @@ extern struct list_head dmar_drhd_units; if (i=drhd->iommu, drhd->ignored) {} else#define for_each_iommu (i, drhd) \ - list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) \ + list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \ + dmar_rcu_check()) \ if (i=drhd->iommu, 0) {} elsestatic inline bool dmar_rcu_check (void )
Greg Kroah-Hartman
maintainerPATCH 123/151 iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page
In reply to Greg Kroah-HartmanFrom: Yonghyun Hwang <[email protected]>
commit 77a1bce84bba01f3f143d77127b72e872b573795 upstream.
intel_iommu_iova_to_phys() has a bug when it translates an IOVA for a huge page onto its corresponding physical address. This commit fixes the bug by accomodating the level of page entry for the IOVA and adds IOVA's lower address to the physical address.
--- drivers/iommu/intel-iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/iommu/intel-iommu.c +4 -2
@@ -5568,8 +5568,10 @@ static phys_addr_t intel_iommu_iova_to_pu64 phys =0 ; pte =pfn_to_dma_pte (dmar_domain, iova >>VTD_PAGE_SHIFT , &level); -if (pte) - phys =dma_pte_addr (pte); +if (pte &&dma_pte_present (pte)) + phys =dma_pte_addr (pte) + + (iova & (BIT_MASK (level_to_offset_bits (level) + +VTD_PAGE_SHIFT ) -1 ));return phys; }
Greg Kroah-Hartman
maintainerPATCH 124/151 batman-adv: Dont schedule OGM for disabled interface
In reply to Greg Kroah-HartmanFrom: Sven Eckelmann <[email protected]>
commit 8e8ce08198de193e3d21d42e96945216e3d9ac7f upstream.
A transmission scheduling for an interface which is currently dropped by batadv_iv_ogm_iface_disable could still be in progress. The B.A.T.M.A.N. V is simply cancelling the workqueue item in an synchronous way but this is not possible with B.A.T.M.A.N. IV because the OGM submissions are intertwined.
Instead it has to stop submitting the OGM when it detect that the buffer pointer is set to NULL.
--- net/batman-adv/bat_iv_ogm.c | 4 ++++ 1 file changed, 4 insertions(+)
net/batman-adv/bat_iv_ogm.c +4 -0
@@ -789,6 +789,10 @@ static void batadv_iv_ogm_schedule_buff(lockdep_assert_held (&hard_iface->bat_iv.ogm_buff_mutex); +/* interface already disabled by batadv_iv_ogm_iface_disable */ +if (!*ogm_buff) +return ; +/* the interface gets activated here to avoid race conditions between * the moment of activating the interface in * hardif_activate_interface() where the originator mac is set and
Greg Kroah-Hartman
maintainerPATCH 125/151 clk: imx8mn: Fix incorrect clock defines
In reply to Greg Kroah-HartmanFrom: Anson Huang <[email protected]>
commit 5eb40257047fb11085d582b7b9ccd0bffe900726 upstream.
IMX8MN_CLK_I2C4 and IMX8MN_CLK_UART1's index definitions are incorrect, fix them.
--- include/dt-bindings/clock/imx8mn-clock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/dt-bindings/clock/imx8mn-clock.h +2 -2
@@ -122,8 +122,8 @@#define IMX8MN_CLK_I2C1 105#define IMX8MN_CLK_I2C2 106#define IMX8MN_CLK_I2C3 107 -#define IMX8MN_CLK_I2C4 118 -#define IMX8MN_CLK_UART1 119 +#define IMX8MN_CLK_I2C4 108 +#define IMX8MN_CLK_UART1 109#define IMX8MN_CLK_UART2 110#define IMX8MN_CLK_UART3 111#define IMX8MN_CLK_UART4 112
Greg Kroah-Hartman
maintainerPATCH 126/151 pinctrl: meson-gxl: fix GPIOX sdio pins
In reply to Greg Kroah-HartmanFrom: Nicolas Belin <[email protected]>
commit dc7a06b0dbbafac8623c2b7657e61362f2f479a7 upstream.
In the gxl driver, the sdio cmd and clk pins are inverted. It has not caused any issue so far because devices using these pins always take both pins so the resulting configuration is OK.
--- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/meson/pinctrl-meson-gxl.c +2 -2
@@ -147,8 +147,8 @@ static const unsigned int sdio_d0_pins[]static const unsigned int sdio_d1_pins[] = {GPIOX_1 };static const unsigned int sdio_d2_pins[] = {GPIOX_2 };static const unsigned int sdio_d3_pins[] = {GPIOX_3 }; -static const unsigned int sdio_cmd_pins[] = {GPIOX_4 }; -static const unsigned int sdio_clk_pins[] = {GPIOX_5 }; +static const unsigned int sdio_clk_pins[] = {GPIOX_4 }; +static const unsigned int sdio_cmd_pins[] = {GPIOX_5 };static const unsigned int sdio_irq_pins[] = {GPIOX_7 };static const unsigned int nand_ce0_pins[] = {BOOT_8 };
Greg Kroah-Hartman
maintainerPATCH 127/151 pinctrl: imx: scu: Align imx sc msg structs to 4
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
commit 4c48e549f39f8ed10cf8a0b6cb96f5eddf0391ce upstream.
The imx SC api strongly assumes that messages are composed out of 4-bytes words but some of our message structs have odd sizeofs.
This produces many oopses with CONFIG_KASAN=y.
Fix by marking with __aligned(4).
--- drivers/pinctrl/freescale/pinctrl-scu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/freescale/pinctrl-scu.c +2 -2
@@ -23,12 +23,12 @@ struct imx_sc_msg_req_pad_set {struct imx_sc_rpc_msg hdr;u32 val;u16 pad; -} __packed; +} __packed__aligned(4) ;struct imx_sc_msg_req_pad_get {struct imx_sc_rpc_msg hdr;u16 pad; -} __packed; +} __packed__aligned(4) ;struct imx_sc_msg_resp_pad_get {struct imx_sc_rpc_msg hdr;
Greg Kroah-Hartman
maintainerPATCH 128/151 virtio_ring: Fix mem leak with vring_new_virtqueue()
In reply to Greg Kroah-HartmanFrom: Suman Anna <[email protected]>
commit f13f09a12cbd0c7b776e083c5d008b6c6a9c4e0b upstream.
The functions vring_new_virtqueue() and __vring_new_virtqueue() are used with split rings, and any allocations within these functions are managed outside of the .we_own_ring flag. The commit cbeedb72b97a ("virtio_ring:
allocate desc state for split ring separately") allocates the desc state within the __vring_new_virtqueue() but frees it only when the .we_own_ring flag is set. This leads to a memory leak when freeing such allocated virtqueues with the vring_del_virtqueue() function.
Fix this by moving the desc_state free code outside the flag and only for split rings. Issue was discovered during testing with remoteproc and virtio_rpmsg.
--- drivers/virtio/virtio_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/virtio/virtio_ring.c +2 -2
@@ -2203,10 +2203,10 @@ void vring_del_virtqueue(struct virtqueu vq->split.queue_size_in_bytes, vq->split.vring.desc, vq->split.queue_dma_addr); - -kfree (vq->split.desc_state); } } +if (!vq->packed_ring) +kfree (vq->split.desc_state);list_del (&_vq->list);kfree (vq); }
Greg Kroah-Hartman
maintainerPATCH 129/151 x86/mce/therm_throt: Undo thermal polling properly on CPU offline
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit d364847eed890211444ad74496bb549f838c6018 upstream.
Chris Wilson reported splats from running the thermal throttling workqueue callback on offlined CPUs. The problem is that that callback should not even run on offlined CPUs but it happens nevertheless because the offlining callback thermal_throttle_offline() does not symmetrically undo the setup work done in its onlining counterpart. IOW,
1. The thermal interrupt vector should be masked out before ...
2. ... cancelling any pending work synchronously so that no new work is enqueued anymore.
Do those things and fix the issue properly.
[ bp: Write commit message. ]
--- arch/x86/kernel/cpu/mce/therm_throt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mce/therm_throt.c +7 -2
@@ -486,9 +486,14 @@ static int thermal_throttle_offline(unsi {struct thermal_state *state = &per_cpu (thermal_state, cpu);struct device *dev =get_cpu_device (cpu); +u32 l; -cancel_delayed_work (&state->package_throttle.therm_work); -cancel_delayed_work (&state->core_throttle.therm_work); +/* Mask the thermal vector before draining evtl. pending work */ + l =apic_read (APIC_LVTTHMR ); +apic_write (APIC_LVTTHMR , l |APIC_LVT_MASKED ); + +cancel_delayed_work_sync (&state->package_throttle.therm_work); +cancel_delayed_work_sync (&state->core_throttle.therm_work); state->package_throttle.rate_control_active = false; state->core_throttle.rate_control_active = false;
Greg Kroah-Hartman
maintainerPATCH 130/151 drm/i915/gvt: Fix dma-buf display blur issue on CFL
In reply to Greg Kroah-HartmanFrom: Tina Zhang <[email protected]>
commit 259170cb4c84f4165a36c0b05811eb74c495412c upstream.
Commit c3b5a8430daad ("drm/i915/gvt: Enable gfx virtualiztion for CFL") added the support on CFL. The vgpu emulation hotplug support on CFL was supposed to be included in that patch. Without the vgpu emulation hotplug support, the dma-buf based display gives us a blur face.
So fix this issue by adding the vgpu emulation hotplug support on CFL.
--- drivers/gpu/drm/i915/gvt/display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/display.c +2 -1
@@ -457,7 +457,8 @@ void intel_vgpu_emulate_hotplug(struct istruct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;/* TODO: add more platforms support */ -if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) || +IS_COFFEELAKE (dev_priv)) {if (connected) {vgpu_vreg_t (vgpu,SFUSE_STRAP ) |=SFUSE_STRAP_DDID_DETECTED ;
Greg Kroah-Hartman
maintainerPATCH 131/151 pinctrl: core: Remove extra kref_get which blocks hogs being freed
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
commit aafd56fc79041bf36f97712d4b35208cbe07db90 upstream.
kref_init starts with the reference count at 1, which will be balanced by the pinctrl_put in pinctrl_unregister. The additional kref_get in pinctrl_claim_hogs will increase this count to 2 and cause the hogs to not get freed when pinctrl_unregister is called.
--- drivers/pinctrl/core.c | 1 - 1 file changed, 1 deletion(-)
drivers/pinctrl/core.c +0 -1
@@ -2025,7 +2025,6 @@ static int pinctrl_claim_hogs(struct pinreturn PTR_ERR (pctldev->p); } -kref_get (&pctldev->p->users); pctldev->hog_default =pinctrl_lookup_state (pctldev->p,PINCTRL_STATE_DEFAULT );if (IS_ERR (pctldev->hog_default)) {
Greg Kroah-Hartman
maintainerPATCH 132/151 drm/i915/gvt: Fix unnecessary schedule timer when no vGPU exits
In reply to Greg Kroah-HartmanFrom: Zhenyu Wang <[email protected]>
commit 04d6067f1f19e70a418f92fa3170cf7fe53b7fdf upstream.
Quoted 1 line
From commit
f25a49ab8ab9("drm/i915/gvt: Usevgpu_lockto protect per
vgpu access") the vgpu idr destroy is moved later than vgpu resource destroy, then it would fail to stop timer for schedule policy clean which to check vgpu idr for any left vGPU. So this trys to destroy vgpu idr earlier.
--- drivers/gpu/drm/i915/gvt/vgpu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gvt/vgpu.c +9 -3
@@ -272,10 +272,17 @@ void intel_gvt_destroy_vgpu(struct intel {struct intel_gvt *gvt = vgpu->gvt; -mutex_lock (&vgpu->vgpu_lock); -WARN (vgpu->active,"vGPU is still active!\n" ); +/* +* remove idr first so later clean can judge if need to stop +* service if no active vgpu. +*/ +mutex_lock (&gvt->lock); +idr_remove (&gvt->vgpu_idr, vgpu->id); +mutex_unlock (&gvt->lock); + +mutex_lock (&vgpu->vgpu_lock);intel_gvt_debugfs_remove_vgpu (vgpu);intel_vgpu_clean_sched_policy (vgpu);intel_vgpu_clean_submission (vgpu);
@@ -290,7 +297,6 @@ void intel_gvt_destroy_vgpu(struct intelmutex_unlock (&vgpu->vgpu_lock);mutex_lock (&gvt->lock); -idr_remove (&gvt->vgpu_idr, vgpu->id);if (idr_is_empty (&gvt->vgpu_idr))intel_gvt_clean_irq (gvt);intel_gvt_update_vgpu_types (gvt);
Greg Kroah-Hartman
maintainerPATCH 133/151 driver code: clarify and fix platform device DMA mask allocation
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
commit e3a36eb6dfaeea8175c05d5915dcf0b939be6dab upstream.
This does three inter-related things to clarify the usage of the platform device dma_mask field. In the process, fix the bug introduced by cdfee5623290 ("driver core: initialize a default DMA mask for platform device") that caused Artem Tashkinov's laptop to not boot with newer Fedora kernels.
This does:
- First off, rename the field to "platform_dma_mask" to make it greppable.
We have way too many different random fields called "dma_mask" in various data structures, where some of them are actual masks, and some of them are just pointers to the mask. And the structures all have pointers to each other, or embed each other inside themselves, and "pdev" sometimes means "platform device" and sometimes it means "PCI device".
So to make it clear in the code when you actually use this new field, give it a unique name (it really should be something even more unique like "platform_device_dma_mask", since it's per platform device, not per platform, but that gets old really fast, and this is unique enough in context).
To further clarify when the field gets used, initialize it when we actually start using it with the default value.
- Then, use this field instead of the random one-off allocation in platform_device_register_full() that is now unnecessary since we now already have a perfectly fine allocation for it in the platform device structure.
- The above then allows us to fix the actual bug, where the error path of platform_device_register_full() would unconditionally free the platform device DMA allocation with 'kfree()'.
That kfree() was dont regardless of whether the allocation had been done earlier with the (now removed) kmalloc, or whether setup_pdev_dma_masks() had already been used and the dma_mask pointer pointed to the mask that was part of the platform device.
It seems most people never triggered the error path, or only triggered it from a call chain that set an explicit pdevinfo->dma_mask value (and thus caused the unnecessary allocation that was "cleaned up" in the error path) before calling platform_device_register_full().
Robin Murphy points out that in Artem's case the wdat_wdt driver failed in platform_device_add(), and that was the one that had called platform_device_register_full() with pdevinfo.dma_mask = 0, and would have caused that kfree() of pdev.dma_mask corrupting the heap.
A later unrelated kmalloc() then oopsed due to the heap corruption.
--- drivers/base/platform.c | 25 ++++++------------------- include/linux/platform_device.h | 2 +- 2 files changed, 7 insertions(+), 20 deletions(-)
drivers/base/platform.c +6 -19
@@ -363,10 +363,10 @@ static void setup_pdev_dma_masks(struct {if (!pdev->dev.coherent_dma_mask) pdev->dev.coherent_dma_mask =DMA_BIT_MASK (32 ); -if (!pdev->dma_mask) - pdev->dma_mask =DMA_BIT_MASK (32 ); -if (!pdev->dev.dma_mask) - pdev->dev.dma_mask = &pdev->dma_mask; +if (!pdev->dev.dma_mask) { + pdev->platform_dma_mask =DMA_BIT_MASK (32 ); + pdev->dev.dma_mask = &pdev->platform_dma_mask; + } };/**
@@ -662,20 +662,8 @@ struct platform_device *platform_device_ pdev->dev.of_node_reused = pdevinfo->of_node_reused;if (pdevinfo->dma_mask) { -/* -* This memory isn't freed when the device is put, -* I don't have a nice idea for that though. Conceptually -* dma_mask in struct device should not be a pointer. -* See http://thread.gmane.org/gmane.linux.kernel.pci/9081 -*/ - pdev->dev.dma_mask = -kmalloc (sizeof (*pdev->dev.dma_mask),GFP_KERNEL ); -if (!pdev->dev.dma_mask) - goto err; - -kmemleak_ignore (pdev->dev.dma_mask); - - *pdev->dev.dma_mask = pdevinfo->dma_mask; + pdev->platform_dma_mask = pdevinfo->dma_mask; + pdev->dev.dma_mask = &pdev->platform_dma_mask; pdev->dev.coherent_dma_mask = pdevinfo->dma_mask; }
@@ -700,7 +688,6 @@ struct platform_device *platform_device_if (ret) { err:ACPI_COMPANION_SET (&pdev->dev,NULL ); -kfree (pdev->dev.dma_mask);platform_device_put (pdev);return ERR_PTR (ret); }
include/linux/platform_device.h +1 -1
@@ -24,7 +24,7 @@ struct platform_device {int id;bool id_auto;struct device dev; -u64 dma_mask; +u64 platform_dma_mask;u32 num_resources;struct resource *resource;
Greg Kroah-Hartman
maintainerPATCH 134/151 iommu/vt-d: Fix RCU-list bugs in intel_iommu_init()
In reply to Greg Kroah-HartmanFrom: Qian Cai <[email protected]>
commit 2d48ea0efb8887ebba3e3720bb5b738aced4e574 upstream.
There are several places traverse RCU-list without holding any lock in intel_iommu_init(). Fix them by acquiring dmar_global_lock.
WARNING: suspicious RCU usage
-----------------------------
drivers/iommu/intel-iommu.c:5216 RCU-list traversed in non-reader section!!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
no locks held by swapper/0/1.
Call Trace: dump_stack+0xa0/0xea lockdep_rcu_suspicious+0x102/0x10b intel_iommu_init+0x947/0xb13 pci_iommu_init+0x26/0x62 do_one_initcall+0xfe/0x500 kernel_init_freeable+0x45a/0x4f8 kernel_init+0x11/0x139 ret_from_fork+0x3a/0x50 DMAR: Intel(R) Virtualization Technology for Directed I/O
--- drivers/iommu/intel-iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +4 -1
@@ -5068,6 +5068,7 @@ int __init intel_iommu_init(void)init_iommu_pm_ops (); +down_read (&dmar_global_lock);for_each_active_iommu (iommu, drhd) { iommu_device_sysfs_add(&iommu->iommu, NULL, intel_iommu_groups,
@@ -5075,6 +5076,7 @@ int __init intel_iommu_init(void)iommu_device_set_ops (&iommu->iommu, &intel_iommu_ops);iommu_device_register (&iommu->iommu); } +up_read (&dmar_global_lock);bus_set_iommu (&pci_bus_type, &intel_iommu_ops);if (si_domain && !hw_pass_through)
@@ -5085,7 +5087,6 @@ int __init intel_iommu_init(void)down_read (&dmar_global_lock);if (probe_acpi_namespace_devices ())pr_warn ("ACPI name space devices didn't probe correctly\n" ); -up_read (&dmar_global_lock);/* Finally, we enable the DMA remapping hardware. */ for_each_iommu (iommu, drhd) {
@@ -5094,6 +5095,8 @@ int __init intel_iommu_init(void)iommu_disable_protect_mem_regions (iommu); } +up_read (&dmar_global_lock); +pr_info ("Intel(R) Virtualization Technology for Directed I/O\n" ); intel_iommu_enabled =1 ;
Greg Kroah-Hartman
maintainerPATCH 135/151 i2c: gpio: suppress error on probe defer
In reply to Greg Kroah-HartmanFrom: Hamish Martin <[email protected]>
commit 3747cd2efe7ecb9604972285ab3f60c96cb753a8 upstream.
If a GPIO we are trying to use is not available and we are deferring the probe, don't output an error message.
This seems to have been the intent of commit 05c74778858d ("i2c: gpio: Add support for named gpios in DT") but the error was still output due to not checking the updated 'retdesc'.
--- drivers/i2c/busses/i2c-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-gpio.c +1 -1
@@ -348,7 +348,7 @@ static struct gpio_desc *i2c_gpio_get_deif (ret == -ENOENT ) retdesc =ERR_PTR (-EPROBE_DEFER ); -if (ret != -EPROBE_DEFER ) +if (PTR_ERR (retdesc) != -EPROBE_DEFER )dev_err (dev,"error trying to get descriptor: %d\n" , ret);return retdesc;
Greg Kroah-Hartman
maintainerPATCH 136/151 nl80211: add missing attribute validation for critical protocol indication
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
commit 0e1a1d853ecedc99da9d27f9f5c376935547a0e2 upstream.
Add missing attribute validation for critical protocol fields to the netlink policy.
--- net/wireless/nl80211.c | 2 ++ 1 file changed, 2 insertions(+)
net/wireless/nl80211.c +2 -0
@@ -530,6 +530,8 @@ const struct nla_policy nl80211_policy[N [NL80211_ATTR_MDID] = { .type = NLA_U16 }, [NL80211_ATTR_IE_RIC] = { .type = NLA_BINARY, .len = IEEE80211_MAX_DATA_LEN }, + [NL80211_ATTR_CRIT_PROT_ID] = { .type = NLA_U16 }, + [NL80211_ATTR_MAX_CRIT_PROT_DURATION] = { .type = NLA_U16 }, [NL80211_ATTR_PEER_AID ] = NLA_POLICY_RANGE(NLA_U16, 1, IEEE80211_MAX_AID), [NL80211_ATTR_CH_SWITCH_COUNT] = { .type = NLA_U32 },
Greg Kroah-Hartman
maintainerPATCH 137/151 nl80211: add missing attribute validation for beacon report scanning
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
commit 056e9375e1f3c4bf2fd49b70258c7daf788ecd9d upstream.
Add missing attribute validation for beacon report scanning to the netlink policy.
--- net/wireless/nl80211.c | 2 ++ 1 file changed, 2 insertions(+)
net/wireless/nl80211.c +2 -0
@@ -469,6 +469,8 @@ const struct nla_policy nl80211_policy[N [NL80211_ATTR_WOWLAN_TRIGGERS] = { .type = NLA_NESTED }, [NL80211_ATTR_STA_PLINK_STATE ] = NLA_POLICY_MAX(NLA_U8, NUM_NL80211_PLINK_STATES - 1), + [NL80211_ATTR_MEASUREMENT_DURATION] = { .type = NLA_U16 }, + [NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY] = { .type = NLA_FLAG }, [NL80211_ATTR_MESH_PEER_AID ] = NLA_POLICY_RANGE(NLA_U16, 1, IEEE80211_MAX_AID), [NL80211_ATTR_SCHED_SCAN_INTERVAL] = { .type = NLA_U32 },
Greg Kroah-Hartman
maintainerPATCH 138/151 nl80211: add missing attribute validation for channel switch
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
commit 5cde05c61cbe13cbb3fa66d52b9ae84f7975e5e6 upstream.
Add missing attribute validation for NL80211_ATTR_OPER_CLASS to the netlink policy.
--- net/wireless/nl80211.c | 1 + 1 file changed, 1 insertion(+)
net/wireless/nl80211.c +1 -0
@@ -564,6 +564,7 @@ const struct nla_policy nl80211_policy[N NLA_POLICY_MAX(NLA_U8, IEEE80211_NUM_UPS - 1), [NL80211_ATTR_ADMITTED_TIME] = { .type = NLA_U16 }, [NL80211_ATTR_SMPS_MODE] = { .type = NLA_U8 }, + [NL80211_ATTR_OPER_CLASS] = { .type = NLA_U8 }, [NL80211_ATTR_MAC_MASK] = { .type =NLA_EXACT_LEN_WARN , .len = ETH_ALEN
Greg Kroah-Hartman
maintainerPATCH 139/151 perf bench futex-wake: Restore thread count default to online CPU count
In reply to Greg Kroah-HartmanFrom: Tommi Rantala <[email protected]>
commit f649bd9dd5d5004543bbc3c50b829577b49f5d75 upstream.
Since commit 3b2323c2c1c4 ("perf bench futex: Use cpumaps") the default number of threads the benchmark uses got changed from number of online CPUs to zero:
$ perf bench futex wake # Running 'futex/wake' benchmark: Run summary [PID 15930]: blocking on 0 threads (at [private] futex 0x558b8ee4bfac), waking up 1 at a time. [Run 1]: Wokeup 0 of 0 threads in 0.0000 ms [...] [Run 10]: Wokeup 0 of 0 threads in 0.0000 ms Wokeup 0 of 0 threads in 0.0004 ms (+-40.82%)
Restore the old behavior by grabbing the number of online CPUs via cpu->nr:
$ perf bench futex wake # Running 'futex/wake' benchmark: Run summary [PID 18356]: blocking on 8 threads (at [private] futex 0xb3e62c), waking up 1 at a time. [Run 1]: Wokeup 8 of 8 threads in 0.0260 ms [...] [Run 10]: Wokeup 8 of 8 threads in 0.0270 ms Wokeup 8 of 8 threads in 0.0419 ms (+-24.35%)
--- tools/perf/bench/futex-wake.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/bench/futex-wake.c +2 -2
@@ -43,7 +43,7 @@ static bool done = false, silent = falsestatic pthread_mutex_t thread_lock;static pthread_cond_t thread_parent, thread_worker;static struct stats waketime_stats, wakeup_stats; -static unsigned int ncpus, threads_starting, nthreads =0 ; +static unsigned int threads_starting, nthreads =0 ;static int futex_flag =0 ;static const struct option options[] = {
@@ -141,7 +141,7 @@ int bench_futex_wake(int argc, const chasigaction (SIGINT , &act,NULL );if (!nthreads) - nthreads = ncpus; + nthreads = cpu->nr; worker =calloc (nthreads,sizeof (*worker));if (!worker)
Greg Kroah-Hartman
maintainerPATCH 140/151 netfilter: nf_tables: free flowtable hooks on hook register error
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit 2d285f26ecd072800a29c5b71e63437f21ef830a upstream.
If hook registration fails, the hooks allocated via nft_netdev_hook_alloc need to be freed.
We can't change the goto label to 'goto 5' -- while it does fix the memleak it does cause a warning splat from the netfilter core (the hooks were not registered).
--- net/netfilter/nf_tables_api.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +6 -1
@@ -6172,8 +6172,13 @@ static int nf_tables_newflowtable(struct goto err4; err =nft_register_flowtable_net_hooks (ctx.net, table, flowtable); -if (err <0 ) +if (err <0 ) { +list_for_each_entry_safe (hook, next, &flowtable->hook_list, list) { +list_del_rcu (&hook->list); +kfree_rcu (hook, rcu); + } goto err4; + } err =nft_trans_flowtable_add (&ctx,NFT_MSG_NEWFLOWTABLE , flowtable);if (err <0 )
Greg Kroah-Hartman
maintainerPATCH 141/151 netfilter: cthelper: add missing attribute validation for cthelper
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
commit c049b3450072b8e3998053490e025839fecfef31 upstream.
Add missing attribute validation for cthelper
to the netlink policy.
--- net/netfilter/nfnetlink_cthelper.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nfnetlink_cthelper.c +2 -0
@@ -742,6 +742,8 @@ static const struct nla_policy nfnl_cthe [NFCTH_NAME ] = { .type =NLA_NUL_STRING , .len = NF_CT_HELPER_NAME_LEN-1 }, [NFCTH_QUEUE_NUM] = { .type = NLA_U32, }, + [NFCTH_PRIV_DATA_LEN] = { .type = NLA_U32, }, + [NFCTH_STATUS] = { .type = NLA_U32, }, };static const struct nfnl_callback nfnl_cthelper_cb[NFNL_MSG_CTHELPER_MAX ] = {
Greg Kroah-Hartman
maintainerPATCH 142/151 netfilter: nft_payload: add missing attribute validation for payload csum flags
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
commit 9d6effb2f1523eb84516e44213c00f2fd9e6afff upstream.
Add missing attribute validation for NFTA_PAYLOAD_CSUM_FLAGS to the netlink policy.
--- net/netfilter/nft_payload.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nft_payload.c +1 -0
@@ -129,6 +129,7 @@ static const struct nla_policy nft_paylo [NFTA_PAYLOAD_LEN] = { .type = NLA_U32 }, [NFTA_PAYLOAD_CSUM_TYPE] = { .type = NLA_U32 }, [NFTA_PAYLOAD_CSUM_OFFSET] = { .type = NLA_U32 }, + [NFTA_PAYLOAD_CSUM_FLAGS] = { .type = NLA_U32 }, }; static int nft_payload_init(const struct nft_ctx *ctx,
Greg Kroah-Hartman
maintainerPATCH 143/151 netfilter: nft_tunnel: add missing attribute validation for tunnels
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
commit 88a637719a1570705c02cacb3297af164b1714e7 upstream.
Add missing attribute validation for tunnel source and destination ports to the netlink policy.
--- net/netfilter/nft_tunnel.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nft_tunnel.c +2 -0
@@ -339,6 +339,8 @@ static const struct nla_policy nft_tunne [NFTA_TUNNEL_KEY_FLAGS] = { .type = NLA_U32, }, [NFTA_TUNNEL_KEY_TOS] = { .type = NLA_U8, }, [NFTA_TUNNEL_KEY_TTL] = { .type = NLA_U8, }, + [NFTA_TUNNEL_KEY_SPORT] = { .type = NLA_U16, }, + [NFTA_TUNNEL_KEY_DPORT] = { .type = NLA_U16, }, [NFTA_TUNNEL_KEY_OPTS] = { .type = NLA_NESTED, }, };
Greg Kroah-Hartman
maintainerPATCH 144/151 netfilter: nf_tables: dump NFTA_CHAIN_FLAGS attribute
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit d78008de6103c708171baff9650a7862645d23b0 upstream.
Missing NFTA_CHAIN_FLAGS netlink attribute when dumping basechain definitions.
--- net/netfilter/nf_tables_api.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netfilter/nf_tables_api.c +5 -0
@@ -1405,6 +1405,11 @@ static int nf_tables_fill_chain_info(str lockdep_commit_lock_is_held(net));if (nft_dump_stats (skb, stats)) goto nla_put_failure; + +if ((chain->flags &NFT_CHAIN_HW_OFFLOAD ) && +nla_put_be32 (skb,NFTA_CHAIN_FLAGS , +htonl (NFT_CHAIN_HW_OFFLOAD ))) + goto nla_put_failure; }if (nla_put_be32 (skb,NFTA_CHAIN_USE ,htonl (chain->use)))
Greg Kroah-Hartman
maintainerPATCH 145/151 netfilter: nft_chain_nat: inet family is missing module ownership
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 6a42cefb25d8bdc1b391f4a53c78c32164eea2dd upstream.
Set owner to THIS_MODULE, otherwise the nft_chain_nat module might be removed while there are still inet/nat chains in place.
[ 117.942096] BUG: unable to handle page fault for address: ffffffffa0d5e040 [ 117.942101] #PF: supervisor read access in kernel mode [ 117.942103] #PF: error_code(0x0000) - not-present page [ 117.942106] PGD 200c067 P4D 200c067 PUD 200d063 PMD 3dc909067 PTE 0 [ 117.942113] Oops: 0000 [#1] PREEMPT SMP PTI [ 117.942118] CPU: 3 PID: 27 Comm: kworker/3:0 Not tainted 5.6.0-rc3+ #348 [ 117.942133] Workqueue: events nf_tables_trans_destroy_work [nf_tables] [ 117.942145] RIP: 0010:nf_tables_chain_destroy.isra.0+0x94/0x15a [nf_tables] [ 117.942149] Code: f6 45 54 01 0f 84 d1 00 00 00 80 3b 05 74 44 48 8b 75 e8 48 c7 c7 72 be de a0 e8 56 e6 2d e0 48 8b 45 e8 48 c7 c7 7f be de a0 <48> 8b 30 e8 43 e6 2d e0 48 8b 45 e8 48 8b 40 10 48 85 c0 74 5b 8b [ 117.942152] RSP: 0018:ffffc9000015be10 EFLAGS: 00010292 [ 117.942155] RAX: ffffffffa0d5e040 RBX: ffff88840be87fc2 RCX: 0000000000000007 [ 117.942158] RDX: 0000000000000007 RSI: 0000000000000086 RDI: ffffffffa0debe7f [ 117.942160] RBP: ffff888403b54b50 R08: 0000000000001482 R09: 0000000000000004 [ 117.942162] R10: 0000000000000000 R11: 0000000000000001 R12: ffff8883eda7e540 [ 117.942164] R13: dead000000000122 R14: dead000000000100 R15: ffff888403b3db80 [ 117.942167] FS: 0000000000000000(0000) GS:ffff88840e4c0000(0000) knlGS:0000000000000000 [ 117.942169] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 117.942172] CR2: ffffffffa0d5e040 CR3: 00000003e4c52002 CR4: 00000000001606e0 [ 117.942174] Call Trace: [ 117.942188] nf_tables_trans_destroy_work.cold+0xd/0x12 [nf_tables] [ 117.942196] process_one_work+0x1d6/0x3b0 [ 117.942200] worker_thread+0x45/0x3c0 [ 117.942203] ? process_one_work+0x3b0/0x3b0 [ 117.942210] kthread+0x112/0x130 [ 117.942214] ? kthread_create_worker_on_cpu+0x40/0x40 [ 117.942221] ret_from_fork+0x35/0x40
nf_tables_chain_destroy() crashes on module_put() because the module is gone.
--- net/netfilter/nft_chain_nat.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nft_chain_nat.c +1 -0
@@ -89,6 +89,7 @@ static const struct nft_chain_type nft_c .name = "nat", .type = NFT_CHAIN_T_NAT, .family = NFPROTO_INET, + .owner = THIS_MODULE, .hook_mask = (1 <<NF_INET_PRE_ROUTING ) | (1 <<NF_INET_LOCAL_IN ) | (1 << NF_INET_LOCAL_OUT) |
Greg Kroah-Hartman
maintainerPATCH 146/151 iommu/vt-d: Fix the wrong printing in RHSA parsing
In reply to Greg Kroah-HartmanFrom: Zhenzhong Duan <[email protected]>
commit b0bb0c22c4db623f2e7b1a471596fbf1c22c6dc5 upstream.
When base address in RHSA structure doesn't match base address in each DRHD structure, the base address in last DRHD is printed out.
This doesn't make sense when there are multiple DRHD units, fix it by printing the buggy RHSA's base address.
--- drivers/iommu/dmar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/dmar.c +1 -1
@@ -475,7 +475,7 @@ static int dmar_parse_one_rhsa(struct acpr_warn (FW_BUG "Your BIOS is broken; RHSA refers to non-existent DMAR unit at %llx\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n" , - drhd->reg_base_addr, + rhsa->base_address,dmi_get_system_info (DMI_BIOS_VENDOR ),dmi_get_system_info (DMI_BIOS_VERSION ),dmi_get_system_info (DMI_PRODUCT_VERSION ));
Greg Kroah-Hartman
maintainerPATCH 147/151 iommu/vt-d: Ignore devices with out-of-spec domain number
In reply to Greg Kroah-HartmanFrom: Daniel Drake <[email protected]>
commit da72a379b2ec0bad3eb265787f7008bead0b040c upstream.
VMD subdevices are created with a PCI domain ID of 0x10000 or higher.
These subdevices are also handled like all other PCI devices by dmar_pci_bus_notifier().
However, when dmar_alloc_pci_notify_info() take records of such devices, it will truncate the domain ID to a u16 value (in info->seg). The device at (e.g.) 10000:00:02.0 is then treated by the DMAR code as if it is 0000:00:02.0.
In the unlucky event that a real device also exists at 0000:00:02.0 and also has a device-specific entry in the DMAR table, dmar_insert_dev_scope() will crash on:
BUG_ON(i >= devices_cnt);
That's basically a sanity check that only one PCI device matches a single DMAR entry; in this case we seem to have two matching devices.
Fix this by ignoring devices that have a domain number higher than what can be looked up in the DMAR table.
This problem was carefully diagnosed by Jian-Hong Pan.
--- drivers/iommu/dmar.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/iommu/dmar.c +8 -0
@@ -28,6 +28,7 @@#include <linux/slab.h> #include <linux/iommu.h> #include <linux/numa.h> +#include <linux/limits.h> #include <asm/irq_remapping.h> #include <asm/iommu_table.h>
@@ -128,6 +129,13 @@ dmar_alloc_pci_notify_info(struct pci_deBUG_ON (dev->is_virtfn); +/* +* Ignore devices that have a domain number higher than what can +* be looked up in DMAR, e.g. VMD subdevices with domain 0x10000 +*/ +if (pci_domain_nr (dev->bus) >U16_MAX ) +return NULL ; +/* Only generate path[] for device addition event */ if (event ==BUS_NOTIFY_ADD_DEVICE )for (tmp = dev; tmp; tmp = tmp->bus->self)
Greg Kroah-Hartman
maintainerPATCH 148/151 i2c: acpi: put device when verifying client fails
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
commit 8daee952b4389729358665fb91949460641659d4 upstream.
i2c_verify_client() can fail, so we need to put the device when that happens.
--- drivers/i2c/i2c-core-acpi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/i2c/i2c-core-acpi.c +9 -1
@@ -394,9 +394,17 @@ EXPORT_SYMBOL_GPL(i2c_acpi_find_adapter_static struct i2c_client *i2c_acpi_find_client_by_adev (struct acpi_device *adev) {struct device *dev; +struct i2c_client *client; dev =bus_find_device_by_acpi_dev (&i2c_bus_type, adev); -return dev ?i2c_verify_client (dev) :NULL ; +if (!dev) +return NULL ; + + client =i2c_verify_client (dev); +if (!client) +put_device (dev); + +return client; } static int i2c_acpi_notify(struct notifier_block *nb, unsigned long value,
Greg Kroah-Hartman
maintainerPATCH 149/151 iommu/amd: Fix IOMMU AVIC not properly update the is_run bit in IRTE
In reply to Greg Kroah-HartmanFrom: Suravee Suthikulpanit <[email protected]>
commit 730ad0ede130015a773229573559e97ba0943065 upstream.
Commit b9c6ff94e43a ("iommu/amd: Re-factor guest virtual APIC (de-)activation code") accidentally left out the ir_data pointer when calling modity_irte_ga(), which causes the function amd_iommu_update_ga() to return prematurely due to struct amd_ir_data.ref is NULL and the "is_run" bit of IRTE does not get updated properly.
This results in bad I/O performance since IOMMU AVIC always generate GA Log entry and notify IOMMU driver and KVM when it receives interrupt from the PCI pass-through device instead of directly inject interrupt to the vCPU.
Fixes by passing ir_data when calling modify_irte_ga() as done previously.
--- drivers/iommu/amd_iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/amd_iommu.c +2 -2
@@ -3836,7 +3836,7 @@ int amd_iommu_activate_guest_mode(void * entry->lo.fields_vapic.ga_tag = ir_data->ga_tag;return modify_irte_ga (ir_data->irq_2_irte.devid, - ir_data->irq_2_irte.index, entry,NULL ); + ir_data->irq_2_irte.index, entry, ir_data); }EXPORT_SYMBOL (amd_iommu_activate_guest_mode);
@@ -3862,7 +3862,7 @@ int amd_iommu_deactivate_guest_mode(voidAPICID_TO_IRTE_DEST_HI (cfg->dest_apicid);return modify_irte_ga (ir_data->irq_2_irte.devid, - ir_data->irq_2_irte.index, entry,NULL ); + ir_data->irq_2_irte.index, entry, ir_data); }EXPORT_SYMBOL (amd_iommu_deactivate_guest_mode);
Greg Kroah-Hartman
maintainerPATCH 150/151 ipv6: restrict IPV6_ADDRFORM operation
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit b6f6118901d1e867ac9177bbff3b00b185bd4fdc upstream.
IPV6_ADDRFORM is able to transform IPv6 socket to IPv4 one. While this operation sounds illogical, we have to support it.
One of the things it does for TCP socket is to switch sk->sk_prot to tcp_prot.
We now have other layers playing with sk->sk_prot, so we should make sure to not interfere with them.
This patch makes sure sk_prot is the default pointer for TCP IPv6 socket.
syzbot reported :
BUG: kernel NULL pointer dereference, address: 0000000000000000 PGD a0113067 P4D a0113067 PUD a8771067 PMD 0 Oops: 0010 [#1] PREEMPT SMP KASAN CPU: 0 PID: 10686 Comm: syz-executor.0 Not tainted 5.6.0-rc2-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:0x0 Code: Bad RIP value. RSP: 0018:ffffc9000281fce0 EFLAGS: 00010246 RAX: 1ffffffff15f48ac RBX: ffffffff8afa4560 RCX: dffffc0000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff8880a69a8f40 RBP: ffffc9000281fd10 R08: ffffffff86ed9b0c R09: ffffed1014d351f5 R10: ffffed1014d351f5 R11: 0000000000000000 R12: ffff8880920d3098 R13: 1ffff1101241a613 R14: ffff8880a69a8f40 R15: 0000000000000000 FS: 00007f2ae75db700(0000) GS:ffff8880aea00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 00000000a3b85000 CR4: 00000000001406f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: inet_release+0x165/0x1c0 net/ipv4/af_inet.c:427 __sock_release net/socket.c:605 [inline] sock_close+0xe1/0x260 net/socket.c:1283 __fput+0x2e4/0x740 fs/file_table.c:280 ____fput+0x15/0x20 fs/file_table.c:313 task_work_run+0x176/0x1b0 kernel/task_work.c:113 tracehook_notify_resume include/linux/tracehook.h:188 [inline] exit_to_usermode_loop arch/x86/entry/common.c:164 [inline] prepare_exit_to_usermode+0x480/0x5b0 arch/x86/entry/common.c:195 syscall_return_slowpath+0x113/0x4a0 arch/x86/entry/common.c:278 do_syscall_64+0x11f/0x1c0 arch/x86/entry/common.c:304 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x45c429 Code: ad b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 7b b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007f2ae75dac78 EFLAGS: 00000246 ORIG_RAX: 0000000000000036 RAX: 0000000000000000 RBX: 00007f2ae75db6d4 RCX: 000000000045c429 RDX: 0000000000000001 RSI: 000000000000011a RDI: 0000000000000004 RBP: 000000000076bf20 R08: 0000000000000038 R09: 0000000000000000 R10: 0000000020000180 R11: 0000000000000246 R12: 00000000ffffffff R13: 0000000000000a9d R14: 00000000004ccfb4 R15: 000000000076bf2c Modules linked in: CR2: 0000000000000000 ---[ end trace 82567b5207e87bae ]--- RIP: 0010:0x0 Code: Bad RIP value. RSP: 0018:ffffc9000281fce0 EFLAGS: 00010246 RAX: 1ffffffff15f48ac RBX: ffffffff8afa4560 RCX: dffffc0000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff8880a69a8f40 RBP: ffffc9000281fd10 R08: ffffffff86ed9b0c R09: ffffed1014d351f5 R10: ffffed1014d351f5 R11: 0000000000000000 R12: ffff8880920d3098 R13: 1ffff1101241a613 R14: ffff8880a69a8f40 R15: 0000000000000000 FS: 00007f2ae75db700(0000) GS:ffff8880aea00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 00000000a3b85000 CR4: 00000000001406f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
--- net/ipv6/ipv6_sockglue.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/ipv6/ipv6_sockglue.c +8 -2
@@ -183,9 +183,15 @@ static int do_ipv6_setsockopt(struct soc retv = -EBUSY ;break ; } - }else if (sk->sk_protocol !=IPPROTO_TCP ) + }else if (sk->sk_protocol ==IPPROTO_TCP ) { +if (sk->sk_prot != &tcpv6_prot) { + retv = -EBUSY ; +break ; + } +break ; + }else {break ; - + }if (sk->sk_state !=TCP_ESTABLISHED ) { retv = -ENOTCONN ;break ;
Greg Kroah-Hartman
maintainerPATCH 151/151 net/smc: check for valid ib_client_data
In reply to Greg Kroah-HartmanFrom: Karsten Graul <[email protected]>
commit a2f2ef4a54c0d97aa6a8386f4ff23f36ebb488cf upstream.
In smc_ib_remove_dev() check if the provided ib device was actually initialized for SMC before.
--- net/smc/smc_ib.c | 2 ++ 1 file changed, 2 insertions(+)
net/smc/smc_ib.c +2 -0
@@ -573,6 +573,8 @@ static void smc_ib_remove_dev(struct ib_struct smc_ib_device *smcibdev; smcibdev =ib_get_client_data (ibdev, &smc_ib_client); +if (!smcibdev || smcibdev->ibdev != ibdev) +return ;ib_set_client_data (ibdev, &smc_ib_client,NULL );spin_lock (&smc_ib_devices.lock);list_del_init (&smcibdev->list);/* remove from smc_ib_devices */
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.5.10 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 19 Mar 2020 10:31:16 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 428 pass: 428 fail: 0
Guenter
Greg Kroah-Hartman
maintainerQuoted 6 lines · Guenter Roeck
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.5.10 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Quoted 3 lines
Responses should be made by Thu, 19 Mar 2020 10:31:16 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 428 pass: 428 fail: 0
Great, thanks for testing all of these and letting me know.
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.5.10 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 19 Mar 2020 10:31:16 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.5.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.5.10-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.5.y
git commit: 97969bd1700945fbc9ef82238f6a2d5a390e5b4d
git describe: v5.5.9-152-g97969bd17009
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.5-oe/build/v5.5.9-152-g97969bd17009
No regressions (compared to build v5.5.9)
No fixes (compared to build v5.5.9)
Ran 25803 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- nxp-ls2088
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* install-android-platform-tools-r2800
* kselftest
* libgpiod
* libhugetlbfs
* linux-log-parser
* ltp-dio-tests
* ltp-io-tests
* ltp-ipc-tests
* perf
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* spectre-meltdown-checker-test
* v4l2-compliance
* ltp-commands-kasan-tests
* ltp-containers-kasan-tests
* ltp-cve-kasan-tests
* ltp-fs-kasan-tests
* ltp-ipc-kasan-tests
* ltp-math-kasan-tests
* ltp-sched-kasan-tests
* ltp-syscalls-kasan-tests
* kvm-unit-tests
* ltp-crypto-tests
* ltp-open-posix-tests
* network-basic-tests
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 17 lines · Naresh Kamboju
Quoted 15 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.5.10 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 19 Mar 2020 10:31:16 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.5.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 3 lines
thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
Thanks for testing all of these and letting me know.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.5.10 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 19 Mar 2020 10:31:16 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.5.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 15 lines · shuah
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.5.10 release. There are 151 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 19 Mar 2020 10:31:16 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.5.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 4 lines
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Thanks for testing all of these and letting me know.
greg k-h