5.10.80-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainercover 5.10.80-rc1 review
This is the start of the stable review cycle for the 5.10.80 release. There are 575 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 Wed, 17 Nov 2021 16:52:23 +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.10.80-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.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.80-rc1
Trond Myklebust <[email protected]>
SUNRPC: Partial revert of commit 6f9f17287e78
Pali Rohár <[email protected]>
PCI: aardvark: Fix PCIe Max Payload Size setting
Pali Rohár <[email protected]>
PCI: Add PCI_EXP_DEVCTL_PAYLOAD_* macros
Jernej Skrabec <[email protected]>
drm/sun4i: Fix macros in sun8i_csc.h
Xiaoming Ni <[email protected]>
powerpc/85xx: fix timebase sync issue when CONFIG_HOTPLUG_CPU=n
Vasant Hegde <[email protected]>
powerpc/powernv/prd: Unregister OPAL_MSG_PRD2 notifier during module unload
Miquel Raynal <[email protected]>
mtd: rawnand: au1550nd: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: plat_nand: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: orion: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: pasemi: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: gpio: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: mpc5121: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: xway: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: ams-delta: Keep the driver compatible with on-die ECC engines
Halil Pasic <[email protected]>
s390/cio: make ccw_device_dma_* more robust
Harald Freudenberger <[email protected]>
s390/ap: Fix hanging ioctl caused by orphaned replies
Sven Schnelle <[email protected]>
s390/tape: fix timer initialization in tape_std_assign()
Vineeth Vijayan <[email protected]>
s390/cio: check the subchannel validity for dev_busid
Marek Vasut <[email protected]>
video: backlight: Drop maximum brightness override for brightness zero
Jack Andersen <[email protected]>
mfd: dln2: Add cell for initializing DLN2 ADC
Michal Hocko <[email protected]>
mm, oom: do not trigger out_of_memory from the #PF
Vasily Averin <[email protected]>
mm, oom: pagefault_out_of_memory: don't force global OOM for dying tasks
Naveen N. Rao <[email protected]>
powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC
Naveen N. Rao <[email protected]>
powerpc/security: Add a helper to query stf_barrier type
Naveen N. Rao <[email protected]>
powerpc/bpf: Validate branch ranges
Naveen N. Rao <[email protected]>
powerpc/lib: Add helper to check if offset is within conditional branch range
Vasily Averin <[email protected]>
memcg: prohibit unconditional exceeding the limit of dying tasks
Dominique Martinet <[email protected]>
9p/net: fix missing error check in p9_check_errors
Daniel Borkmann <[email protected]>
net, neigh: Enable state migration between NUD_PERMANENT and NTF_USE
Jaegeuk Kim <[email protected]>
f2fs: should use GFP_NOFS for directory inodes
Guo Ren <[email protected]>
irqchip/sifive-plic: Fixup EOI failed when masked
Michael Pratt <[email protected]>
posix-cpu-timers: Clear task::posix_cputimers_work in copy_process()
Dave Jones <[email protected]>
x86/mce: Add errata workaround for Skylake SKX37
Maciej W. Rozycki <[email protected]>
MIPS: Fix assembly error from MIPSr2 code used within MIPS_ISA_ARCH_LEVEL
Helge Deller <[email protected]>
parisc: Fix backtrace to always include init funtion names
Arnd Bergmann <[email protected]>
ARM: 9156/1: drop cc-option fallbacks for architecture selection
Michał Mirosław <[email protected]>
ARM: 9155/1: fix early early_iounmap()
Willem de Bruijn <[email protected]>
selftests/net: udpgso_bench_rx: fix port argument
Rahul Lakkireddy <[email protected]>
cxgb4: fix eeprom len when diagnostics not implemented
Dust Li <[email protected]>
net/smc: fix sk_refcnt underflow on linkdown and fallback
Eiichi Tsukata <[email protected]>
vsock: prevent unnecessary refcnt inc for nonblocking connect
Vladimir Oltean <[email protected]>
net: stmmac: allow a tc-taprio base-time of zero
Guangbin Huang <[email protected]>
net: hns3: allow configure ETS bandwidth of all TCs
Yufeng Mo <[email protected]>
net: hns3: fix kernel crash when unload VF while it is being reset
Eric Dumazet <[email protected]>
net/sched: sch_taprio: fix undefined behavior in ktime_mono_to_any
Muchun Song <[email protected]>
seq_file: fix passing wrong private data
Dan Carpenter <[email protected]>
gve: Fix off by one in gve_tx_timeout()
John Fastabend <[email protected]>
bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding
John Fastabend <[email protected]>
bpf, sockmap: Remove unhash handler for BPF sockmap usage
Arnd Bergmann <[email protected]>
arm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions
Chengfeng Ye <[email protected]>
nfc: pn533: Fix double free when pn533_fill_fragment_skbs() fails
Eric Dumazet <[email protected]>
llc: fix out-of-bound array index in llc_sk_dev_hash()
Ian Rogers <[email protected]>
perf bpf: Add missing free to bpf_event__print_bpf_prog_info()
Dan Carpenter <[email protected]>
zram: off by one in read_block_state()
Miaohe Lin <[email protected]>
mm/zsmalloc.c: close race window between zs_pool_dec_isolated() and zs_unregister_migration()
Marc Kleine-Budde <[email protected]>
can: mcp251xfd: mcp251xfd_chip_start(): fix error handling for mcp251xfd_chip_rx_int_enable()
Krzysztof Kozlowski <[email protected]>
mfd: core: Add missing of_node_put for loop iteration
Huang Guobin <[email protected]>
bonding: Fix a use-after-free problem when bond_sysfs_slave_add() failed
Heiner Kallweit <[email protected]>
net: phy: fix duplex out of sync problem while changing settings
Tetsuo Handa <[email protected]>
ataflop: remove ataflop_probe_lock mutex
Luis Chamberlain <[email protected]>
block/ataflop: provide a helper for cleanup up an atari disk
Luis Chamberlain <[email protected]>
block/ataflop: add registration bool before calling del_gendisk()
Luis Chamberlain <[email protected]>
block/ataflop: use the blk_cleanup_disk() helper
Chenyuan Mi <[email protected]>
drm/nouveau/svm: Fix refcount leak bug and missing check against null bug
Hans de Goede <[email protected]>
ACPI: PMIC: Fix intel_pmic_regs_handler() read accesses
Brett Creeley <[email protected]>
ice: Fix not stopping Tx queues for VFs
Sylwester Dziedziuch <[email protected]>
ice: Fix replacing VF hardware MAC to existing MAC filter
Ziyang Xuan <[email protected]>
net: vlan: fix a UAF in vlan_dev_real_dev()
Stafford Horne <[email protected]>
openrisc: fix SMP tlb flush NULL pointer dereference
Jakub Kicinski <[email protected]>
ethtool: fix ethtool msg len calculation for pause stats
Maxim Kiselev <[email protected]>
net: davinci_emac: Fix interrupt pacing disable
YueHaibing <[email protected]>
xen-pciback: Fix return in pm_ctrl_init()
Christophe JAILLET <[email protected]>
i2c: xlr: Fix a resource leak in the error handling path of 'xlr_i2c_probe()'
Trond Myklebust <[email protected]>
NFSv4: Fix a regression in nfs_set_open_stateid_locked()
Quinn Tran <[email protected]>
scsi: qla2xxx: Turn off target reset during issue_lip
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix gnl list corruption
Quinn Tran <[email protected]>
scsi: qla2xxx: Relogin during fabric disturbance
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Changes to support FCP2 Target
Jackie Liu <[email protected]>
ar7: fix kernel builds for compiler test
Ahmad Fatoum <[email protected]>
watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT
Randy Dunlap <[email protected]>
m68k: set a default value for MEMORY_RESERVE
Eric W. Biederman <[email protected]>
signal/sh: Use force_sig(SIGKILL) instead of do_group_exit(SIGKILL)
Lars-Peter Clausen <[email protected]>
dmaengine: dmaengine_desc_callback_valid(): Check for callback_result
Florian Westphal <[email protected]>
netfilter: nfnetlink_queue: fix OOB when mac header was cleared
Robert-Ionut Alexa <[email protected]>
soc: fsl: dpaa2-console: free buffer before returning from dpaa2_console_read
Geert Uytterhoeven <[email protected]>
auxdisplay: ht16k33: Fix frame buffer device blanking
Geert Uytterhoeven <[email protected]>
auxdisplay: ht16k33: Connect backlight to fbdev
Geert Uytterhoeven <[email protected]>
auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string
Alexey Gladkov <[email protected]>
Fix user namespace leak
Trond Myklebust <[email protected]>
NFS: Fix an Oops in pnfs_mark_request_commit()
Trond Myklebust <[email protected]>
NFS: Fix up commit deadlocks
Claudiu Beznea <[email protected]>
dmaengine: at_xdmac: fix AT_XDMAC_CC_PERID() macro
Dan Carpenter <[email protected]>
rtc: rv3032: fix error handling in rv3032_clkout_set_rate()
Christophe JAILLET <[email protected]>
remoteproc: Fix a memory leak in an error handling path in 'rproc_handle_vdev()'
Zev Weiss <[email protected]>
mtd: core: don't remove debugfs directory if device is in use
Kunihiko Hayashi <[email protected]>
PCI: uniphier: Serialize INTx masking/unmasking and fix the bit operation
Evgeny Novikov <[email protected]>
mtd: spi-nor: hisi-sfc: Remove excessive clk_disable_unprepare()
Jia-Ju Bai <[email protected]>
fs: orangefs: fix error return code of orangefs_revalidate_lookup()
Trond Myklebust <[email protected]>
NFS: Fix deadlocks in nfs_scan_commit_list()
YueHaibing <[email protected]>
opp: Fix return in _opp_add_static_v2()
Pali Rohár <[email protected]>
PCI: aardvark: Fix preserving PCI_EXP_RTCTL_CRSSVE flag on emulated bridge
Marek Behún <[email protected]>
PCI: aardvark: Don't spam about PIO Response Status
Alex Xu (Hello71) <[email protected]>
drm/plane-helper: fix uninitialized variable reference
Baptiste Lepers <[email protected]>
pnfs/flexfiles: Fix misplaced barrier in nfs4_ff_layout_prepare_ds
Trond Myklebust <[email protected]>
NFS: Fix dentry verifier races
Kewei Xu <[email protected]>
i2c: mediatek: fixing the incorrect register offset
J. Bruce Fields <[email protected]>
nfsd: don't alloc under spinlock in rpc_parse_scope_id
Arnaud Pouliquen <[email protected]>
rpmsg: Fix rpmsg_create_ept return when RPMSG config is not defined
Tom Rix <[email protected]>
apparmor: fix error check
Hans de Goede <[email protected]>
power: supply: bq27xxx: Fix kernel crash on IRQ handler register error
Geert Uytterhoeven <[email protected]>
mips: cm: Convert to bitfield API to fix out-of-bounds access
Xuan Zhuo <[email protected]>
virtio_ring: check desc == NULL when using indirect with packed
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Correct configuring of switch inversion from ts-inv
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Use device_property API instead of of_property
Lucas Tanure <[email protected]>
ASoC: cs42l42: Disable regulators if probe fails
Bixuan Cui <[email protected]>
powerpc/44x/fsp2: add missing of_node_put
Andrej Shadura <[email protected]>
HID: u2fzero: properly handle timeouts in usb_submit_urb
Andrej Shadura <[email protected]>
HID: u2fzero: clarify error check and length calculations
Claudiu Beznea <[email protected]>
clk: at91: sam9x60-pll: use DIV_ROUND_CLOSEST_ULL
Anssi Hannula <[email protected]>
serial: xilinx_uartps: Fix race condition causing stuck TX
Sandeep Maheswaram <[email protected]>
phy: qcom-snps: Correct the FSEL_MASK
Dan Carpenter <[email protected]>
phy: ti: gmii-sel: check of_get_address() for failure
Vladimir Zapolskiy <[email protected]>
phy: qcom-qusb2: Fix a memory leak on probe
Rahul Tanwar <[email protected]>
pinctrl: equilibrium: Fix function addition in multiple groups
Wan Jiabing <[email protected]>
soc: qcom: apr: Add of_node_put() before return
Guru Das Srinagesh <[email protected]>
firmware: qcom_scm: Fix error retval in __qcom_scm_is_call_available()
Amelie Delaunay <[email protected]>
usb: dwc2: drd: reset current session before setting the new one
Amelie Delaunay <[email protected]>
usb: dwc2: drd: fix dwc2_drd_role_sw_set when clock could be disabled
Amelie Delaunay <[email protected]>
usb: dwc2: drd: fix dwc2_force_mode call in dwc2_ovr_init
Stefan Agner <[email protected]>
serial: imx: fix detach/attach of serial console
Srinivas Kandagatla <[email protected]>
scsi: ufs: ufshcd-pltfrm: Fix memory leak due to probe defer
Can Guo <[email protected]>
scsi: ufs: Refactor ufshcd_setup_clocks() to remove skip_ref_clk
Nuno Sá <[email protected]>
iio: adis: do not disabe IRQs in 'adis_init()'
Randy Dunlap <[email protected]>
usb: typec: STUSB160X should select REGMAP_I2C
Bjorn Andersson <[email protected]>
soc: qcom: rpmhpd: Make power_on actually enable the domain
Lee Jones <[email protected]>
soc: qcom: rpmhpd: Provide some missing struct member descriptions
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFER
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Correct some register default values
Olivier Moysan <[email protected]>
ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
Olivier Moysan <[email protected]>
ARM: dts: stm32: fix SAI sub nodes register range
Marek Vasut <[email protected]>
ARM: dts: stm32: Reduce DHCOR SPI NOR frequency to 50 MHz
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: checker: Fix off-by-one bug in drive register check
Vegard Nossum <[email protected]>
staging: ks7010: select CRYPTO_HASH/CRYPTO_MICHAEL_MIC
Nikita Yushchenko <[email protected]>
staging: most: dim2: do not double-register the same device
Randy Dunlap <[email protected]>
usb: musb: select GENERIC_PHY instead of depending on it
Leon Romanovsky <[email protected]>
RDMA/mlx4: Return missed an error if device doesn't support steering
Dan Carpenter <[email protected]>
scsi: csiostor: Uninitialized data in csio_ln_vnp_read_cbfn()
Yang Yingliang <[email protected]>
power: supply: max17040: fix null-ptr-deref in max17040_probe()
Jakob Hauser <[email protected]>
power: supply: rt5033_battery: Change voltage values to µV
Dan Carpenter <[email protected]>
usb: gadget: hid: fix error code in do_config()
Andy Shevchenko <[email protected]>
serial: 8250_dw: Drop wrong use of ACPI_PTR()
Nathan Lynch <[email protected]>
powerpc: fix unbalanced node refcount in check_kvm_guest()
Michael Ellerman <[email protected]>
powerpc: Fix is_kvm_guest() / kvm_para_available()
Srikar Dronamraju <[email protected]>
powerpc: Reintroduce is_kvm_guest() as a fast-path check
Srikar Dronamraju <[email protected]>
powerpc: Rename is_kvm_guest() to check_kvm_guest()
Srikar Dronamraju <[email protected]>
powerpc: Refactor is_kvm_guest() declaration to new header
Christophe Leroy <[email protected]>
video: fbdev: chipsfb: use memset_io() instead of memset()
Clément Léger <[email protected]>
clk: at91: check pmc node status before registering syscore ops
Dongliang Mu <[email protected]>
memory: fsl_ifc: fix leak of irq and nand_irq in fsl_ifc_ctrl_probe
Christophe JAILLET <[email protected]>
soc/tegra: Fix an error handling path in tegra_powergate_power_up()
Ranjani Sridharan <[email protected]>
ASoC: SOF: topology: do not power down primary core during topology removal
Andreas Kemnade <[email protected]>
arm: dts: omap3-gta04a4: accelerometer irq fix
Yang Yingliang <[email protected]>
driver core: Fix possible memory leak in device_link_add()
Igor Pylypiv <[email protected]>
scsi: pm80xx: Fix misleading log statement in pm8001_mpi_get_nvmd_resp()
Srinivas Kandagatla <[email protected]>
soundwire: debugfs: use controller id and link_id for debugfs
Takashi Iwai <[email protected]>
ALSA: hda: Use position buffer for SKL+ again
Imre Deak <[email protected]>
ALSA: hda: Fix hang during shutdown due to link reset
Imre Deak <[email protected]>
ALSA: hda: Release controller display power during shutdown/reboot
Takashi Iwai <[email protected]>
ALSA: hda: Reduce udelay() at SKL+ position reporting
Stephan Gerhold <[email protected]>
arm64: dts: qcom: pm8916: Remove wrong reg-names for rtc@6000
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: beacon: Fix Ethernet PHY mode
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Fix Secondary MI2S bit clock
Dongliang Mu <[email protected]>
JFS: fix memleak in jfs_mount
Jackie Liu <[email protected]>
MIPS: loongson64: make CPU_LOONGSON64 depends on MIPS_FP_SUPPORT
Tong Zhang <[email protected]>
scsi: dc395: Fix error case unwinding
Peter Rosin <[email protected]>
ARM: dts: at91: tse850: the emac<->phy interface is rmii
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix timekeeping_suspended warning on resume
Anand Moon <[email protected]>
arm64: dts: meson-g12b: Fix the pwm regulator supply properties
Anand Moon <[email protected]>
arm64: dts: meson-g12a: Fix the pwm regulator supply properties
Kishon Vijay Abraham I <[email protected]>
arm64: dts: ti: k3-j721e-main: Fix "bus-range" upto 256 bus number for PCIe
Kishon Vijay Abraham I <[email protected]>
arm64: dts: ti: k3-j721e-main: Fix "max-virtual-functions" in PCIe EP nodes
Selvin Xavier <[email protected]>
RDMA/bnxt_re: Fix query SRQ failure
Marijn Suijten <[email protected]>
ARM: dts: qcom: msm8974: Add xo_board reference clock to DSI0 PHY
Alex Bee <[email protected]>
arm64: dts: rockchip: Fix GPU register width for RK3328
Jackie Liu <[email protected]>
ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc()
Christophe JAILLET <[email protected]>
clk: mvebu: ap-cpu-clk: Fix a memory leak in error handling paths
Rafał Miłecki <[email protected]>
ARM: dts: BCM5301X: Fix memory nodes names
Junji Wei <[email protected]>
RDMA/rxe: Fix wrong port_cap_flags
Alexandru Ardelean <[email protected]>
iio: st_sensors: disable regulators after device unregistration
Andy Shevchenko <[email protected]>
iio: st_sensors: Call st_sensors_power_enable() from bus drivers
Frank Rowand <[email protected]>
of: unittest: fix EXPECT text for gpio hog errors
Alexei Starovoitov <[email protected]>
bpf: Fix propagation of signed bounds from 64-bit min/max into 32-bit.
Alexei Starovoitov <[email protected]>
bpf: Fix propagation of bounds from 64-bit min/max into 32-bit and var_off.
Dan Schatzberg <[email protected]>
cgroup: Fix rootcg cpu.stat guest double counting
Sukadev Bhattiprolu <[email protected]>
ibmvnic: Process crqs after enabling interrupts
Sukadev Bhattiprolu <[email protected]>
ibmvnic: don't stop queue in xmit
Jakub Kicinski <[email protected]>
udp6: allow SO_MARK ctrl msg to affect routing
Andrea Righi <[email protected]>
selftests/bpf: Fix fclose/pclose mismatch in test_progs
Daniel Jordan <[email protected]>
crypto: pcrypt - Delay write to padata->info
Russell King (Oracle) <[email protected]>
net: phylink: avoid mvneta warning when setting pause parameters
Shyam Sundar S K <[email protected]>
net: amd-xgbe: Toggle PLL settings during rate change
Kumar Kartikeya Dwivedi <[email protected]>
selftests/bpf: Fix fd cleanup in sk_lookup test
Lorenz Bauer <[email protected]>
selftests: bpf: Convert sk_lookup ctx access tests to PROG_TEST_RUN
Alex Deucher <[email protected]>
drm/amdgpu/gmc6: fix DMA mask from 44 to 40 bits
Loic Poulain <[email protected]>
wcn36xx: Fix discarded frames due to wrong sequence number
Benjamin Li <[email protected]>
wcn36xx: add proper DMA memory barriers in rx path
Wang Hai <[email protected]>
libertas: Fix possible memory leak in probe and disconnect
Wang Hai <[email protected]>
libertas_tf: Fix possible memory leak in probe and disconnect
Janis Schoetterl-Glausch <[email protected]>
KVM: s390: Fix handle_sske page fault handling
Tiezhu Yang <[email protected]>
samples/kretprobes: Fix return value if register_kretprobe() failed
Lad Prabhakar <[email protected]>
spi: spi-rpc-if: Check return value of rpcif_sw_init()
Jon Maxwell <[email protected]>
tcp: don't free a FIN sk_buff in tcp_remove_empty_skb()
Ilya Leoshkevich <[email protected]>
libbpf: Fix endianness detection in BPF_CORE_READ_BITFIELD_PROBED()
Mark Brown <[email protected]>
tpm_tis_spi: Add missing SPI ID
Hao Wu <[email protected]>
tpm: fix Atmel TPM crash caused by too frequent queries
Michael Schmitz <[email protected]>
block: ataflop: more blk-mq refactoring fixes
Dan Carpenter <[email protected]>
ataflop: potential out of bounds in do_format()
Christoph Hellwig <[email protected]>
ataflop: use a separate gendisk for each media format
Mark Rutland <[email protected]>
irq: mips: avoid nested irq_enter()
Claudio Imbrenda <[email protected]>
KVM: s390: pv: avoid stalls for kvm_s390_pv_init_vm
Claudio Imbrenda <[email protected]>
KVM: s390: pv: avoid double free of sida page
David Hildenbrand <[email protected]>
s390/gmap: don't unconditionally call pte_unmap_unlock() in __gmap_zap()
Andrii Nakryiko <[email protected]>
libbpf: Fix BTF header parsing checks
Andrii Nakryiko <[email protected]>
libbpf: Fix overflow in BTF sanity checks
Andrii Nakryiko <[email protected]>
libbpf: Allow loading empty BTFs
Andrii Nakryiko <[email protected]>
libbpf: Fix BTF data layout checks and allow empty BTF
Quentin Monnet <[email protected]>
bpftool: Avoid leaking the JSON writer prepared for program metadata
Jim Mattson <[email protected]>
KVM: selftests: Fix nested SVM tests when built with clang
Ricardo Koller <[email protected]>
KVM: selftests: Add operand to vmsave/vmload/vmrun in svm.c
Tetsuo Handa <[email protected]>
smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi
Jessica Zhang <[email protected]>
drm/msm: Fix potential NULL dereference in DPU SSPP
Joerg Roedel <[email protected]>
x86/sev: Fix stack type check in vc_switch_off_ist()
Kees Cook <[email protected]>
clocksource/drivers/timer-ti-dm: Select TIMER_OF
Anders Roxell <[email protected]>
PM: hibernate: fix sparse warnings
Max Gurtovoy <[email protected]>
nvme-rdma: fix error code in nvme_rdma_setup_ctrl
Stefan Agner <[email protected]>
phy: micrel: ksz8041nl: do not use power down mode
Tim Gardner <[email protected]>
net: enetc: unmap DMA in enetc_send_cmd()
Jonas Dreßler <[email protected]>
mwifiex: Send DELBA requests according to spec
Ziyang Xuan <[email protected]>
rsi: stop thread firstly in rsi_91x_init() error handling
Shayne Chen <[email protected]>
mt76: mt7915: fix muar_idx in mt7915_mcu_alloc_sta_req()
Shayne Chen <[email protected]>
mt76: mt7915: fix sta_rec_wtbl tag len
Lorenzo Bianconi <[email protected]>
mt76: mt7915: fix possible infinite loop release semaphore
Lorenzo Bianconi <[email protected]>
mt76: mt76x02: fix endianness warnings in mt76x02_mac.c
Lorenzo Bianconi <[email protected]>
mt76: mt7615: fix endianness warning in mt7615_mac_write_txwi
Nathan Chancellor <[email protected]>
platform/x86: thinkpad_acpi: Fix bitwise vs. logical warning
Michael Schmitz <[email protected]>
block: ataflop: fix breakage introduced at blk-mq refactoring
Christophe JAILLET <[email protected]>
mmc: mxs-mmc: disable regulator on error and in the remove function
Sean Young <[email protected]>
media: ir_toy: assignment to be16 should be of correct type
Jakub Kicinski <[email protected]>
net: stream: don't purge sk_error_queue in sk_stream_kill_queues()
Dan Carpenter <[email protected]>
drm/msm: uninitialized variable in msm_gem_import()
Dan Carpenter <[email protected]>
drm/msm: potential error pointer dereference in init()
Eric Dumazet <[email protected]>
tcp: switch orphan_count to bare per-cpu counters
Zhang Qiao <[email protected]>
kernel/sched: Fix sched_fork() access an invalid sched_task_group
Sven Eckelmann <[email protected]>
ath10k: fix max antenna gain unit
Zev Weiss <[email protected]>
hwmon: (pmbus/lm25066) Let compiler determine outer dimension of lm25066_coeff
Yang Yingliang <[email protected]>
hwmon: Fix possible memleak in __hwmon_device_register()
Daniel Borkmann <[email protected]>
net, neigh: Fix NTF_EXT_LEARNED in combination with NTF_USE
Dan Carpenter <[email protected]>
memstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host()
Arnd Bergmann <[email protected]>
memstick: avoid out-of-range warning
Tony Lindgren <[email protected]>
mmc: sdhci-omap: Fix context restore
Tony Lindgren <[email protected]>
mmc: sdhci-omap: Fix NULL pointer exception if regulator is not configured
John Fraker <[email protected]>
gve: Recover from queue stall due to missed IRQ
Dan Carpenter <[email protected]>
b43: fix a lower bounds test
Dan Carpenter <[email protected]>
b43legacy: fix a lower bounds test
Markus Schneider-Pargmann <[email protected]>
hwrng: mtk - Force runtime pm ops for sleep ops
Giovanni Cabiddu <[email protected]>
crypto: qat - disregard spurious PFVF interrupts
Giovanni Cabiddu <[email protected]>
crypto: qat - detect PFVF collision after ACK
Evgeny Novikov <[email protected]>
media: dvb-frontends: mn88443x: Handle errors of clk_prepare_enable()
Pablo Neira Ayuso <[email protected]>
netfilter: nft_dynset: relax superfluous check on set updates
Peter Zijlstra <[email protected]>
rcu: Always inline rcu_dynticks_task*_{enter,exit}()
Yazen Ghannam <[email protected]>
EDAC/amd64: Handle three rank interleaving mode
Vincent Donnefort <[email protected]>
PM: EM: Fix inefficient states detection
Linus Lüssing <[email protected]>
ath9k: Fix potential interrupt storm on queue reset
Colin Ian King <[email protected]>
media: em28xx: Don't use ops->suspend if it is NULL
Anel Orazgaliyeva <[email protected]>
cpuidle: Fix kobject memory leaks in error paths
Arnd Bergmann <[email protected]>
crypto: ecc - fix CRYPTO_DEFAULT_RNG dependency
Punit Agrawal <[email protected]>
kprobes: Do not use local variable when creating debugfs file
Colin Ian King <[email protected]>
media: cx23885: Fix snd_card_free call on null card pointer
Kees Cook <[email protected]>
media: tm6000: Avoid card name truncation
Kees Cook <[email protected]>
media: si470x: Avoid card name truncation
Kees Cook <[email protected]>
media: radio-wl1273: Avoid card name truncation
Randy Dunlap <[email protected]>
media: i2c: ths8200 needs V4L2_ASYNC
Christophe JAILLET <[email protected]>
media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()'
Tom Rix <[email protected]>
media: TDA1997x: handle short reads of hdmi info frame.
Ricardo Ribalda <[email protected]>
media: v4l2-ioctl: S_CTRL output the right value
Pavel Skripkin <[email protected]>
media: dvb-usb: fix ununit-value in az6027_rc_query
Colin Ian King <[email protected]>
media: cxd2880-spi: Fix a null pointer dereference on error handling path
Pavel Skripkin <[email protected]>
media: em28xx: add missing em28xx_close_extension
Arnd Bergmann <[email protected]>
drm/amdgpu: fix warning for overflow check
Sudarshan Rajagopalan <[email protected]>
arm64: mm: update max_pfn after memory hotplug
Matthew Auld <[email protected]>
drm/ttm: stop calling tt_swapin in vm_access
Fabio Estevam <[email protected]>
ath10k: sdio: Add missing BH locking around napi_schdule()
Loic Poulain <[email protected]>
ath10k: Fix missing frame timestamp for beacon/probe-resp
Baochen Qiang <[email protected]>
ath11k: Fix memory leak in ath11k_qmi_driver_event_work
Pradeep Kumar Chitrapu <[email protected]>
ath11k: fix packet drops due to incorrect 6 GHz freq value in rx status
Sriram R <[email protected]>
ath11k: Avoid race during regd updates
Dan Carpenter <[email protected]>
ath11k: fix some sleeping in atomic bugs
Linus Walleij <[email protected]>
net: dsa: rtl8366rb: Fix off-by-one bug
Jiasheng Jiang <[email protected]>
rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies()
Michael Walle <[email protected]>
crypto: caam - disable pkc for non-E SoCs
Dinghao Liu <[email protected]>
Bluetooth: btmtkuart: fix a memleak in mtk_hci_wmt_sync
Ajay Singh <[email protected]>
wilc1000: fix possible memory leak in cfg_scan_result()
Bryan O'Donoghue <[email protected]>
wcn36xx: Fix Antenna Diversity Switching
Waiman Long <[email protected]>
cgroup: Make rebind_subsystems() disable v2 controllers all at once
Yajun Deng <[email protected]>
net: net_namespace: Fix undefined member in key_remove_domain()
Sebastian Andrzej Siewior <[email protected]>
lockdep: Let lock_is_held_type() detect recursive read as read
liuyuntao <[email protected]>
virtio-gpu: fix possible memory allocation failure
Iago Toral Quiroga <[email protected]>
drm/v3d: fix wait for TMU write combiner flush
Peter Zijlstra <[email protected]>
objtool: Fix static_call list generation
Peter Zijlstra <[email protected]>
x86/xen: Mark cpu_bringup_and_idle() as dead_end_function
Josh Poimboeuf <[email protected]>
objtool: Add xen_start_kernel() to noreturn list
Aleksander Jan Bajkowski <[email protected]>
MIPS: lantiq: dma: fix burst length for DEU
Neeraj Upadhyay <[email protected]>
rcu: Fix existing exp request check in sync_sched_exp_online_cleanup()
Desmond Cheong Zhi Xi <[email protected]>
Bluetooth: fix init and cleanup of sco_conn.timeout_work
Andrii Nakryiko <[email protected]>
selftests/bpf: Fix strobemeta selftest regression
Pablo Neira Ayuso <[email protected]>
netfilter: conntrack: set on IPS_ASSURED if flows enters internal stream state
Sven Schnelle <[email protected]>
parisc/kgdb: add kgdb_roundup() to make kgdb work with idle polling
Sven Schnelle <[email protected]>
parisc/unwind: fix unwinder when CONFIG_64BIT is enabled
Gao Xiang <[email protected]>
erofs: don't trigger WARN() when decompression fails
Helge Deller <[email protected]>
task_stack: Fix end_of_stack() for architectures with upwards-growing stack
Sven Schnelle <[email protected]>
parisc: fix warning in flush_tlb_all
Shuah Khan <[email protected]>
selftests/core: fix conflicting types compile error for close_range()
Anson Jacob <[email protected]>
drm/amd/display: dcn20_resource_construct reduce scope of FPU enabled
Vitaly Kuznetsov <[email protected]>
x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted
Loic Poulain <[email protected]>
wcn36xx: Correct band/freq reporting on RX
Yang Yingliang <[email protected]>
spi: bcm-qspi: Fix missing clk_disable_unprepare() on error in bcm_qspi_probe()
Josef Bacik <[email protected]>
btrfs: do not take the uuid_mutex in btrfs_rm_device
Sidong Yang <[email protected]>
btrfs: reflink: initialize return value to 0 in btrfs_extent_same()
Stefan Schaeckeler <[email protected]>
ACPI: AC: Quirk GK45 to skip reading _PSR
Eric Dumazet <[email protected]>
net: annotate data-race in neigh_output()
Florian Westphal <[email protected]>
vrf: run conntrack only in context of lower/physdev for locally generated packets
Arnd Bergmann <[email protected]>
ARM: 9136/1: ARMv7-M uses BE-8, not BE-32
Andreas Gruenbacher <[email protected]>
gfs2: Fix glock_hash_walk bugs
Andreas Gruenbacher <[email protected]>
gfs2: Cancel remote delete work asynchronously
Vladimir Oltean <[email protected]>
net: dsa: lantiq_gswip: serialize access to the PCE table
Stephen Suryaputra <[email protected]>
gre/sit: Don't generate link-local addr if addr_gen_mode is IN6_ADDR_GEN_MODE_NONE
Masami Hiramatsu <[email protected]>
ARM: clang: Do not rely on lr register for stacktrace
Tetsuo Handa <[email protected]>
smackfs: use __GFP_NOFAIL for smk_cipso_doi()
Johannes Berg <[email protected]>
iwlwifi: mvm: disable RX-diversity in powersave
Jiri Olsa <[email protected]>
selftests/bpf: Fix perf_buffer test on system with offline cpus
Shuah Khan <[email protected]>
selftests: kvm: fix mismatched fclose() after popen()
Ye Bin <[email protected]>
PM: hibernate: Get block device exclusively in swsusp_check()
Hannes Reinecke <[email protected]>
nvme: drop scan_lock and always kick requeue list when removing namespaces
Israel Rukshin <[email protected]>
nvmet-tcp: fix use-after-free when a port is removed
Israel Rukshin <[email protected]>
nvmet-rdma: fix use-after-free when a port is removed
Israel Rukshin <[email protected]>
nvmet: fix use-after-free when a port is removed
Michael Tretter <[email protected]>
media: allegro: ignore interrupt if mailbox is not initialized
Jens Axboe <[email protected]>
block: remove inaccurate requeue check
Zheyu Ma <[email protected]>
mwl8k: Fix use-after-free in mwl8k_fw_state_machine()
Ryder Lee <[email protected]>
mt76: mt7915: fix an off-by-one bound check
Kalesh Singh <[email protected]>
tracing/cfi: Fix cmp_entries_* functions signature mismatch
Menglong Dong <[email protected]>
workqueue: make sysfs of unbound kworker cpumask more clever
Lasse Collin <[email protected]>
lib/xz: Validate the value before assigning it to an enum variable
Lasse Collin <[email protected]>
lib/xz: Avoid overlapping memcpy() with invalid input with in-place decompression
Zheyu Ma <[email protected]>
memstick: r592: Fix a UAF bug when removing the driver
Xiao Ni <[email protected]>
md: update superblock after changing rdev flags in state_store
Jens Axboe <[email protected]>
block: bump max plugged deferred size from 16 to 32
Tim Gardner <[email protected]>
drm/msm: prevent NULL dereference in msm_gpu_crashstate_capture()
Kees Cook <[email protected]>
leaking_addresses: Always print a trailing newline
Matthias Schiffer <[email protected]>
net: phy: micrel: make *-skew-ps check more lenient
Yifan Zhang <[email protected]>
drm/amdkfd: fix resume error when iommu disabled in Picasso
André Almeida <[email protected]>
ACPI: battery: Accept charges over the design capacity as full
Andreas Gruenbacher <[email protected]>
iov_iter: Fix iov_iter_get_pages{,_alloc} page fault return value
Xin Xiong <[email protected]>
mmc: moxart: Fix reference count leaks in moxart_probe
Tuo Li <[email protected]>
ath: dfs_pattern_detector: Fix possible null-pointer dereference in channel_detector_create()
Steven Rostedt (VMware) <[email protected]>
tracefs: Have tracefs directories not set OTH permission bits by default
Antoine Tenart <[email protected]>
net-sysfs: try not to restart the syscall if it will fail eventually
Anant Thazhemadam <[email protected]>
media: usb: dvd-usb: fix uninit-value bug in dibusb_read_eeprom_byte()
Ricardo Ribalda <[email protected]>
media: ipu3-imgu: VIDIOC_QUERYCAP: Fix bus_info
Ricardo Ribalda <[email protected]>
media: ipu3-imgu: imgu_fmt: Handle properly try
Rafael J. Wysocki <[email protected]>
ACPICA: Avoid evaluating methods too early during system resume
Josh Don <[email protected]>
fs/proc/uptime.c: Fix idle time reporting in /proc/uptime
Corey Minyard <[email protected]>
ipmi: Disable some operations during a panic
Nadezda Lutovinova <[email protected]>
media: rcar-csi2: Add checking to rcsi2_start_receiver()
Hans de Goede <[email protected]>
brcmfmac: Add DMI nvram filename quirk for Cyberbook T116 tablet
Zong-Zhe Yang <[email protected]>
rtw88: fix RX clock gate setting while fifo dump
Randy Dunlap <[email protected]>
ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK
Rajat Asthana <[email protected]>
media: mceusb: return without resubmitting URB in case of -EPROTO error.
Martin Kepplinger <[email protected]>
media: imx: set a media_device bus_info string
Nadezda Lutovinova <[email protected]>
media: s5p-mfc: Add checking to s5p_mfc_probe().
Tuo Li <[email protected]>
media: s5p-mfc: fix possible null-pointer dereference in s5p_mfc_probe()
Ricardo Ribalda <[email protected]>
media: uvcvideo: Set unique vdev name based in type
Ricardo Ribalda <[email protected]>
media: uvcvideo: Return -EIO for control errors
Ricardo Ribalda <[email protected]>
media: uvcvideo: Set capability in s_param
Dmitriy Ulitin <[email protected]>
media: stm32: Potential NULL pointer dereference in dcmi_irq_thread()
Evgeny Novikov <[email protected]>
media: atomisp: Fix error handling in probe
Zheyu Ma <[email protected]>
media: netup_unidvb: handle interrupt properly according to the firmware
Dirk Bender <[email protected]>
media: mt9p031: Fix corrupted frame after restarting stream
Alagu Sankar <[email protected]>
ath10k: high latency fixes for beacon buffer
Baochen Qiang <[email protected]>
ath11k: Change DMA_FROM_DEVICE to DMA_TO_DEVICE when map reinjected packets
Wen Gong <[email protected]>
ath11k: add handler for scan event WMI_SCAN_EVENT_DEQUEUED
Sriram R <[email protected]>
ath11k: Avoid reg rules update during firmware recovery
Andrey Grodzovsky <[email protected]>
drm/amdgpu: Fix MMIO access page fault
Eric Biggers <[email protected]>
fscrypt: allow 256-bit master keys with AES-256-XTS
Jonas Dreßler <[email protected]>
mwifiex: Properly initialize private structure on interface type changes
Jonas Dreßler <[email protected]>
mwifiex: Run SET_BSS_MODE when changing from P2P to STATION vif-type
Peter Zijlstra <[email protected]>
x86: Increase exception stack sizes
Seevalamuthu Mariappan <[email protected]>
ath11k: Align bss_chan_info structure with firmware
Pawan Gupta <[email protected]>
smackfs: Fix use-after-free in netlbl_catmap_walk()
Paul E. McKenney <[email protected]>
rcu-tasks: Move RTGS_WAIT_CBS to beginning of rcu_tasks_kthread() loop
Jakub Kicinski <[email protected]>
net: sched: update default qdisc visibility after Tx queue cnt changes
Peter Zijlstra <[email protected]>
locking/lockdep: Avoid RCU-induced noinstr fail
Aleksander Jan Bajkowski <[email protected]>
MIPS: lantiq: dma: reset correct number of channel
Aleksander Jan Bajkowski <[email protected]>
MIPS: lantiq: dma: add small delay after reset
Barnabás Pőcze <[email protected]>
platform/x86: wmi: do not fail if disabling fails
Scott Wood <[email protected]>
rcutorture: Avoid problematic critical section nesting on PREEMPT_RT
Simon Ser <[email protected]>
drm/panel-orientation-quirks: add Valve Steam Deck
Wang ShaoBo <[email protected]>
Bluetooth: fix use-after-free error in lock_sock_nested()
Takashi Iwai <[email protected]>
Bluetooth: sco: Fix lock_sock() blockage by memcpy_from_msg()
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Add quirk for the Samsung Galaxy Book 10.6
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Add quirk for KD Kurio Smart C15200 2-in-1
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Update the Lenovo Ideapad D330 quirk (v2)
Charan Teja Reddy <[email protected]>
dma-buf: WARN on dmabuf release with pending attachments
Sebastian Krzyszkowiak <[email protected]>
power: supply: max17042_battery: Clear status bits in interrupt handler
Johan Hovold <[email protected]>
USB: chipidea: fix interrupt deadlock
Johan Hovold <[email protected]>
USB: iowarrior: fix control-message timeouts
Johan Hovold <[email protected]>
most: fix control-message timeouts
Johan Hovold <[email protected]>
serial: 8250: fix racy uartclk update
Wang Hai <[email protected]>
USB: serial: keyspan: fix memleak on probe errors
Nuno Sá <[email protected]>
iio: ad5770r: make devicetree property reading consistent
Pekka Korpinen <[email protected]>
iio: dac: ad5446: Fix ad5622_write() return value
Tao Zhang <[email protected]>
coresight: cti: Correct the parameter for pm_runtime_put
Yang Yingliang <[email protected]>
pinctrl: core: fix possible memory leak in pinctrl_enable()
Zhang Yi <[email protected]>
quota: correct error number in free_dqentry()
Zhang Yi <[email protected]>
quota: check block number when reading the block in quota file
Pali Rohár <[email protected]>
PCI: aardvark: Fix support for PCI_ROM_ADDRESS1 on emulated bridge
Pali Rohár <[email protected]>
PCI: aardvark: Set PCI Bridge Class Code to PCI Bridge
Pali Rohár <[email protected]>
PCI: aardvark: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge
Pali Rohár <[email protected]>
PCI: aardvark: Fix support for bus mastering and PCI_COMMAND on emulated bridge
Marek Behún <[email protected]>
PCI: aardvark: Read all 16-bits from PCIE_MSI_PAYLOAD_REG
Marek Behún <[email protected]>
PCI: aardvark: Fix return value of MSI domain .alloc() method
Pali Rohár <[email protected]>
PCI: aardvark: Fix configuring Reference clock
Pali Rohár <[email protected]>
PCI: aardvark: Fix reporting Data Link Layer Link Active
Pali Rohár <[email protected]>
PCI: aardvark: Do not unmask unused interrupts
Pali Rohár <[email protected]>
PCI: aardvark: Fix checking for link up via LTSSM state
Pali Rohár <[email protected]>
PCI: aardvark: Do not clear status bits of masked interrupts
Li Chen <[email protected]>
PCI: cadence: Add cdns_plat_pcie_probe() missing return
Marek Behún <[email protected]>
PCI: pci-bridge-emul: Fix emulation of W1C bits
yangerkun <[email protected]>
ovl: fix use after free in struct ovl_aio_req
Juergen Gross <[email protected]>
xen/balloon: add late_initcall_sync() for initial ballooning done
Pavel Skripkin <[email protected]>
ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume
Takashi Iwai <[email protected]>
ALSA: mixer: oss: Fix racy access to slots
Arnd Bergmann <[email protected]>
ifb: fix building without CONFIG_NET_CLS_ACT
Pali Rohár <[email protected]>
serial: core: Fix initializing and restoring termios speed
Steven Rostedt (VMware) <[email protected]>
ring-buffer: Protect ring_buffer_reset() from reentrancy
Xiaoming Ni <[email protected]>
powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found
Zhang Changzhong <[email protected]>
can: j1939: j1939_can_recv(): ignore messages with invalid source address
Zhang Changzhong <[email protected]>
can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport
Sean Christopherson <[email protected]>
KVM: nVMX: Query current VMCS when determining if MSR bitmaps are in use
Mark Rutland <[email protected]>
KVM: arm64: Extract ESR_ELx.EC only
Henrik Grimler <[email protected]>
power: supply: max17042_battery: use VFSOC for capacity when no rsns
Sebastian Krzyszkowiak <[email protected]>
power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
Miquel Raynal <[email protected]>
mtd: rawnand: socrates: Keep the driver compatible with on-die ECC engines
Meng Li <[email protected]>
soc: fsl: dpio: use the combined functions to protect critical zone
Meng Li <[email protected]>
soc: fsl: dpio: replace smp_processor_id with raw_smp_processor_id
Eric W. Biederman <[email protected]>
signal/mips: Update (_save|_restore)_fp_context to fail with -EFAULT
Wolfram Sang <[email protected]>
memory: renesas-rpc-if: Correct QSPI data transfer in Manual mode
Eric W. Biederman <[email protected]>
signal: Remove the bogus sigkill_pending in ptrace_stop
Alok Prasad <[email protected]>
RDMA/qedr: Fix NULL deref for query_qp on the GSI QP
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix Intel ICX IIO event constraints
Kan Liang <[email protected]>
perf/x86/intel/uncore: Support extra IMC channel on Ice Lake server
Marek Vasut <[email protected]>
rsi: Fix module dev_oper_mode parameter description
Martin Fuzzey <[email protected]>
rsi: fix rate mask set leading to P2P failure
Martin Fuzzey <[email protected]>
rsi: fix key enabled check causing unwanted encryption for vap_id > 0
Martin Fuzzey <[email protected]>
rsi: fix occasional initialisation failure with BT coex
Benjamin Li <[email protected]>
wcn36xx: handle connection loss indication
Reimar Döffinger <[email protected]>
libata: fix checking of DMA state
Jonas Dreßler <[email protected]>
mwifiex: Try waking the firmware until we get an interrupt
Jonas Dreßler <[email protected]>
mwifiex: Read a PCI register after writing the TX ring write pointer
Rafael J. Wysocki <[email protected]>
PM: sleep: Do not let "syscore" devices runtime-suspend during system transitions
Loic Poulain <[email protected]>
wcn36xx: Fix (QoS) null data frame bitrate/modulation
Loic Poulain <[email protected]>
wcn36xx: Fix tx_status mechanism
Loic Poulain <[email protected]>
wcn36xx: Fix HT40 capability for 2Ghz band
Lukas Wunner <[email protected]>
ifb: Depend on netfilter alternatively to tc
Austin Kim <[email protected]>
evm: mark evm_fixmode as __ro_after_init
Johan Hovold <[email protected]>
rtl8187: fix control-message timeouts
Ingmar Klein <[email protected]>
PCI: Mark Atheros QCA6174 to avoid bus reset
Johan Hovold <[email protected]>
ath10k: fix division by zero in send path
Johan Hovold <[email protected]>
ath10k: fix control-message timeout
Johan Hovold <[email protected]>
ath6kl: fix control-message timeout
Johan Hovold <[email protected]>
ath6kl: fix division by zero in send path
Johan Hovold <[email protected]>
mwifiex: fix division by zero in fw download path
Eric Badger <[email protected]>
EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell
Krzysztof Kozlowski <[email protected]>
regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx property
Krzysztof Kozlowski <[email protected]>
regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled
Zev Weiss <[email protected]>
hwmon: (pmbus/lm25066) Add offset coefficients
Ondrej Mosnacek <[email protected]>
selinux: fix race condition when computing ocontext SIDs
Masami Hiramatsu <[email protected]>
ia64: kprobes: Fix to pass correct trampoline address to the handler
Andreas Gruenbacher <[email protected]>
powerpc/kvm: Fix kvm_use_magic_page
Sean Christopherson <[email protected]>
KVM: VMX: Unregister posted interrupt wakeup handler on hardware unsetup
Anand Jain <[email protected]>
btrfs: call btrfs_check_rw_degradable only if there is a missing device
Filipe Manana <[email protected]>
btrfs: fix lost error handling when replaying directory deletes
Li Zhang <[email protected]>
btrfs: clear MISSING device status bit in btrfs_close_one_device
Christoph Hellwig <[email protected]>
rds: stop using dmapool
Wen Gu <[email protected]>
net/smc: Correct spelling mistake to TCPF_SYN_RECV
Tony Lu <[email protected]>
net/smc: Fix smc_link->llc_testlink_time overflow
Yu Xiao <[email protected]>
nfp: bpf: relax prog rejection for mtu check through max_pkt_offset
Dongli Zhang <[email protected]>
vmxnet3: do not stop tx queues after netif_device_detach()
Janghyub Seo <[email protected]>
r8169: Add device 10ec:8162 to driver r8169
Amit Engel <[email protected]>
nvmet-tcp: fix header digest verification
Naohiro Aota <[email protected]>
block: schedule queue restart after BLK_STS_ZONE_RESOURCE
Mario <[email protected]>
drm: panel-orientation-quirks: Add quirk for GPD Win3
Walter Stoll <[email protected]>
watchdog: Fix OMAP watchdog early handling
Cyril Strejc <[email protected]>
net: multicast: calculate csum of looped-back and forwarded packets
Thomas Perrot <[email protected]>
spi: spl022: fix Microwire full duplex mode
Maurizio Lombardi <[email protected]>
nvmet-tcp: fix a memory leak when releasing a queue
Dongli Zhang <[email protected]>
xen/netfront: stop tx queues during live migration
Asmaa Mnebhi <[email protected]>
gpio: mlxbf2.c: Add check for bgpio_init failure
Lorenz Bauer <[email protected]>
bpf: Prevent increasing bpf_jit_limit above max
Lorenz Bauer <[email protected]>
bpf: Define bpf_jit_alloc_exec_limit for arm64 JIT
Florian Westphal <[email protected]>
fcnal-test: kill hanging ping/nettest binaries on cleanup
Bryant Mairs <[email protected]>
drm: panel-orientation-quirks: Add quirk for Aya Neo 2021
Randy Dunlap <[email protected]>
mmc: winbond: don't build on M68K
Paweł Anikiel <[email protected]>
reset: socfpga: add empty driver allowing consumers to probe
Mikko Perttunen <[email protected]>
reset: tegra-bpmp: Handle errors in BPMP response
Bastien Roucariès <[email protected]>
ARM: dts: sun7i: A20-olinuxino-lime2: Fix ethernet phy-mode
Arnd Bergmann <[email protected]>
hyperv/vmbus: include linux/bitops.h
Erik Ekman <[email protected]>
sfc: Don't use netif_info before net_device setup
Erik Ekman <[email protected]>
sfc: Export fibre-specific supported link modes
Zheyu Ma <[email protected]>
cavium: Fix return values of the probe function
Zheyu Ma <[email protected]>
mISDN: Fix return values of the probe function
Dmitry Bogdanov <[email protected]>
scsi: qla2xxx: Fix unmap of already freed sgl
Zheyu Ma <[email protected]>
scsi: qla2xxx: Return -ENOMEM if kzalloc() fails
Zheyu Ma <[email protected]>
cavium: Return negative value when pci_alloc_irq_vectors() fails
Davide Baldo <[email protected]>
ALSA: hda/realtek: Fixes HP Spectre x360 15-eb1xxx speakers
Yang Yingliang <[email protected]>
ASoC: soc-core: fix null-ptr-deref in snd_soc_del_component_unlocked()
Sean Christopherson <[email protected]>
x86/irq: Ensure PI wakeup handler is unregistered before module unload
Jane Malalane <[email protected]>
x86/cpu: Fix migration safety with X86_BUG_NULL_SEL
Tom Lendacky <[email protected]>
x86/sme: Use #define USE_EARLY_PGTABLE_L5 in mem_encrypt_identity.c
Miklos Szeredi <[email protected]>
fuse: fix page stealing
yangerkun <[email protected]>
ext4: refresh the ext4_ext_path struct after dropping i_data_sem.
yangerkun <[email protected]>
ext4: ensure enough credits in ext4_ext_shift_path_extents
Shaoying Xu <[email protected]>
ext4: fix lazy initialization next schedule time computation in more granular unit
Takashi Iwai <[email protected]>
ALSA: timer: Unconditionally unlink slave instances, too
Wang Wensheng <[email protected]>
ALSA: timer: Fix use-after-free problem
Austin Kim <[email protected]>
ALSA: synth: missing check for possible NULL after the call to kstrdup
Takashi Iwai <[email protected]>
ALSA: hda: Free card instance properly at probe errors
Alexander Tsoy <[email protected]>
ALSA: usb-audio: Add registration quirk for JBL Quantum 400
Jason Ormes <[email protected]>
ALSA: usb-audio: Line6 HX-Stomp XL USB_ID for 48k-fixed quirk
Johan Hovold <[email protected]>
ALSA: line6: fix control and interrupt message timeouts
Johan Hovold <[email protected]>
ALSA: 6fire: fix control and bulk message timeouts
Johan Hovold <[email protected]>
ALSA: ua101: fix division by zero at probe
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek: Add quirk for HP EliteBook 840 G7 mute LED
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add quirk for ASUS UX550VE
Jaroslav Kysela <[email protected]>
ALSA: hda/realtek: Add a quirk for Acer Spin SP513-54N
Jeremy Soller <[email protected]>
ALSA: hda/realtek: Headset fixup for Clevo NH77HJQ
Tim Crawford <[email protected]>
ALSA: hda/realtek: Add quirk for Clevo PC70HS
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add a quirk for HP OMEN 15 mute LED
Johnathon Clark <[email protected]>
ALSA: hda/realtek: Fix mic mute LED for the HP Spectre x360 14
Ricardo Ribalda <[email protected]>
media: v4l2-ioctl: Fix check_ext_ctrls
Sean Young <[email protected]>
media: ir-kbd-i2c: improve responsiveness of hauppauge zilog receivers
Chen-Yu Tsai <[email protected]>
media: rkvdec: Support dynamic resolution changes
Sean Young <[email protected]>
media: ite-cir: IR receiver stop working after receive overflow
Chen-Yu Tsai <[email protected]>
media: rkvdec: Do not override sizeimage for output format
Tang Bin <[email protected]>
crypto: s5p-sss - Add error handling in s5p_aes_probe()
jing yangyang <[email protected]>
firmware/psci: fix application of sizeof to pointer
Dan Carpenter <[email protected]>
tpm: Check for integer overflow in tpm2_map_response_body()
Helge Deller <[email protected]>
parisc: Fix ptrace check on syscall return
Helge Deller <[email protected]>
parisc: Fix set_fixmap() on PA1.x CPUs
Sungjong Seo <[email protected]>
exfat: fix incorrect loading of i_blocks for large files
Christian Löhle <[email protected]>
mmc: dw_mmc: Dont wait for DRTO on Write RSP error
Derong Liu <[email protected]>
mmc: mtk-sd: Add wait dma stop done flow
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix use after free in eh_abort path
Arun Easi <[email protected]>
scsi: qla2xxx: Fix kernel crash when accessing port_speed sysfs file
Tadeusz Struk <[email protected]>
scsi: core: Remove command size deduction from scsi_setup_scsi_cmnd()
Jan Kara <[email protected]>
ocfs2: fix data corruption on truncate
Damien Le Moal <[email protected]>
libata: fix read log timeout value
Takashi Iwai <[email protected]>
Input: i8042 - Add quirk for Fujitsu Lifebook T725
Phoenix Huang <[email protected]>
Input: elantench - fix misreporting trackpoint coordinates
Johan Hovold <[email protected]>
Input: iforce - fix control-message timeout
Todd Kjos <[email protected]>
binder: use cred instead of task for getsecid
Todd Kjos <[email protected]>
binder: use cred instead of task for selinux checks
Todd Kjos <[email protected]>
binder: use euid from cred instead of using task
Nehal Bakulchandra Shah <[email protected]>
usb: xhci: Enable runtime-pm by default on AMD Yellow Carp platform
Mathias Nyman <[email protected]>
xhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delay
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 7 + .../bindings/regulator/samsung,s5m8767.txt | 23 +- Documentation/filesystems/fscrypt.rst | 10 +- Makefile | 4 +- arch/arm/Makefile | 22 +- arch/arm/boot/dts/at91-tse850-3.dts | 2 +- arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 2 +- arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 2 +- arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 2 +- arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 2 +- arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 2 +- arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 2 +- arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 2 +- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +- arch/arm/boot/dts/bcm94708.dts | 2 +- arch/arm/boot/dts/bcm94709.dts | 2 +- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8974.dtsi | 4 +- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 8 +- arch/arm/boot/dts/stm32mp151.dtsi | 16 +- arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- arch/arm/kernel/stacktrace.c | 3 +- arch/arm/mach-s3c/irq-s3c24xx.c | 22 +- arch/arm/mm/Kconfig | 2 +- arch/arm/mm/mmu.c | 4 +- arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 +- .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 +- arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 4 +- arch/arm64/boot/dts/qcom/msm8916.dtsi | 8 +- arch/arm64/boot/dts/qcom/pm8916.dtsi | 1 - .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 16 +- arch/arm64/include/asm/esr.h | 1 + arch/arm64/include/asm/pgtable.h | 12 +- arch/arm64/kvm/hyp/hyp-entry.S | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 2 +- arch/arm64/mm/mmu.c | 5 + arch/arm64/net/bpf_jit_comp.c | 5 + arch/ia64/Kconfig.debug | 2 +- arch/ia64/kernel/kprobes.c | 9 +- arch/m68k/Kconfig.machine | 1 + arch/mips/Kconfig | 1 + arch/mips/include/asm/cmpxchg.h | 5 +- arch/mips/include/asm/mips-cm.h | 12 +- arch/mips/kernel/mips-cm.c | 21 +- arch/mips/kernel/r2300_fpu.S | 4 +- arch/mips/kernel/syscall.c | 9 - arch/mips/lantiq/xway/dma.c | 23 +- arch/openrisc/kernel/dma.c | 4 +- arch/openrisc/kernel/smp.c | 6 +- arch/parisc/kernel/entry.S | 2 +- arch/parisc/kernel/smp.c | 19 +- arch/parisc/kernel/unwind.c | 21 +- arch/parisc/kernel/vmlinux.lds.S | 3 +- arch/parisc/mm/fixmap.c | 5 +- arch/parisc/mm/init.c | 4 +- arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/include/asm/firmware.h | 6 - arch/powerpc/include/asm/kvm_guest.h | 25 ++ arch/powerpc/include/asm/kvm_para.h | 2 +- arch/powerpc/include/asm/security_features.h | 5 + arch/powerpc/kernel/firmware.c | 12 +- arch/powerpc/kernel/kvm.c | 2 +- arch/powerpc/kernel/security.c | 5 + arch/powerpc/lib/code-patching.c | 7 +- arch/powerpc/net/bpf_jit.h | 33 ++- arch/powerpc/net/bpf_jit64.h | 8 +- arch/powerpc/net/bpf_jit_comp64.c | 64 +++++- arch/powerpc/platforms/44x/fsp2.c | 2 + arch/powerpc/platforms/85xx/Makefile | 4 +- arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 7 +- arch/powerpc/platforms/85xx/smp.c | 12 +- arch/powerpc/platforms/powernv/opal-prd.c | 12 +- arch/powerpc/platforms/pseries/smp.c | 3 + arch/s390/kvm/priv.c | 2 + arch/s390/kvm/pv.c | 21 +- arch/s390/mm/gmap.c | 5 +- arch/sh/kernel/cpu/fpu.c | 10 +- arch/x86/events/intel/uncore_snbep.c | 6 +- arch/x86/hyperv/hv_init.c | 5 +- arch/x86/include/asm/page_64_types.h | 2 +- arch/x86/kernel/cpu/amd.c | 2 + arch/x86/kernel/cpu/common.c | 44 +++- arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/hygon.c | 2 + arch/x86/kernel/cpu/mce/intel.c | 5 +- arch/x86/kernel/irq.c | 4 +- arch/x86/kernel/traps.c | 2 +- arch/x86/kvm/vmx/vmx.c | 15 +- arch/x86/mm/mem_encrypt_identity.c | 9 + block/blk-mq.c | 18 +- block/blk.h | 6 + crypto/Kconfig | 2 +- crypto/pcrypt.c | 12 +- drivers/acpi/ac.c | 19 ++ drivers/acpi/acpica/acglobal.h | 2 + drivers/acpi/acpica/hwesleep.c | 8 +- drivers/acpi/acpica/hwsleep.c | 11 +- drivers/acpi/acpica/hwxfsleep.c | 7 + drivers/acpi/battery.c | 2 +- drivers/acpi/pmic/intel_pmic.c | 51 +++-- drivers/android/binder.c | 22 +- drivers/ata/libata-core.c | 2 +- drivers/ata/libata-eh.c | 8 + drivers/auxdisplay/ht16k33.c | 66 +++--- drivers/auxdisplay/img-ascii-lcd.c | 10 + drivers/base/core.c | 4 +- drivers/base/power/main.c | 9 +- drivers/block/ataflop.c | 237 ++++++++++++------- drivers/block/zram/zram_drv.c | 2 +- drivers/bluetooth/btmtkuart.c | 13 +- drivers/bus/ti-sysc.c | 65 +++++- drivers/char/hw_random/mtk-rng.c | 9 +- drivers/char/ipmi/ipmi_msghandler.c | 10 +- drivers/char/ipmi/ipmi_watchdog.c | 17 +- drivers/char/tpm/tpm2-space.c | 3 + drivers/char/tpm/tpm_tis_core.c | 26 ++- drivers/char/tpm/tpm_tis_core.h | 4 + drivers/char/tpm/tpm_tis_spi_main.c | 1 + drivers/clk/at91/clk-sam9x60-pll.c | 4 +- drivers/clk/at91/pmc.c | 5 + drivers/clk/mvebu/ap-cpu-clk.c | 14 +- drivers/clocksource/Kconfig | 1 + drivers/cpuidle/sysfs.c | 5 +- drivers/crypto/caam/caampkc.c | 19 +- drivers/crypto/caam/regs.h | 3 + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 13 ++ drivers/crypto/qat/qat_common/adf_vf_isr.c | 6 + drivers/crypto/s5p-sss.c | 2 + drivers/dma-buf/dma-buf.c | 1 + drivers/dma/at_xdmac.c | 2 +- drivers/dma/dmaengine.h | 2 +- drivers/edac/amd64_edac.c | 22 +- drivers/edac/sb_edac.c | 2 +- drivers/firmware/psci/psci_checker.c | 2 +- drivers/firmware/qcom_scm.c | 2 +- drivers/gpio/gpio-mlxbf2.c | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 17 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 16 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 47 +++- drivers/gpu/drm/drm_plane_helper.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 + drivers/gpu/drm/msm/msm_gem.c | 4 +- drivers/gpu/drm/msm/msm_gpu.c | 2 +- drivers/gpu/drm/nouveau/nouveau_svm.c | 4 + drivers/gpu/drm/sun4i/sun8i_csc.h | 4 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 5 - drivers/gpu/drm/v3d/v3d_gem.c | 4 +- drivers/gpu/drm/virtio/virtgpu_vq.c | 8 +- drivers/hid/hid-u2fzero.c | 10 +- drivers/hv/hyperv_vmbus.h | 1 + drivers/hwmon/hwmon.c | 6 +- drivers/hwmon/pmbus/lm25066.c | 25 +- drivers/hwtracing/coresight/coresight-cti-core.c | 2 +- drivers/i2c/busses/i2c-mt65xx.c | 2 +- drivers/i2c/busses/i2c-xlr.c | 6 +- drivers/iio/accel/st_accel_core.c | 21 +- drivers/iio/accel/st_accel_i2c.c | 17 +- drivers/iio/accel/st_accel_spi.c | 17 +- drivers/iio/dac/ad5446.c | 9 +- drivers/iio/dac/ad5770r.c | 2 +- drivers/iio/gyro/st_gyro_core.c | 15 +- drivers/iio/gyro/st_gyro_i2c.c | 17 +- drivers/iio/gyro/st_gyro_spi.c | 17 +- drivers/iio/imu/adis.c | 4 +- drivers/iio/magnetometer/st_magn_core.c | 15 +- drivers/iio/magnetometer/st_magn_i2c.c | 14 +- drivers/iio/magnetometer/st_magn_spi.c | 14 +- drivers/iio/pressure/st_pressure_core.c | 15 +- drivers/iio/pressure/st_pressure_i2c.c | 17 +- drivers/iio/pressure/st_pressure_spi.c | 17 +- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 3 +- drivers/infiniband/hw/mlx4/qp.c | 4 +- drivers/infiniband/hw/qedr/verbs.c | 15 +- drivers/infiniband/sw/rxe/rxe_param.h | 2 +- drivers/input/joystick/iforce/iforce-usb.c | 2 +- drivers/input/mouse/elantech.c | 13 ++ drivers/input/serio/i8042-x86ia64io.h | 14 ++ drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-sifive-plic.c | 8 +- drivers/isdn/hardware/mISDN/hfcpci.c | 8 +- drivers/md/md.c | 11 +- drivers/media/dvb-frontends/mn88443x.c | 18 +- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/ir-kbd-i2c.c | 1 + drivers/media/i2c/mt9p031.c | 28 ++- drivers/media/i2c/tda1997x.c | 8 +- drivers/media/pci/cx23885/cx23885-alsa.c | 3 +- drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 27 ++- drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 +- drivers/media/platform/rcar-vin/rcar-csi2.c | 2 + drivers/media/platform/s5p-mfc/s5p_mfc.c | 6 +- drivers/media/platform/stm32/stm32-dcmi.c | 19 +- drivers/media/radio/radio-wl1273.c | 2 +- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- drivers/media/rc/ir_toy.c | 2 +- drivers/media/rc/ite-cir.c | 2 +- drivers/media/rc/mceusb.c | 1 + drivers/media/spi/cxd2880-spi.c | 2 +- drivers/media/usb/dvb-usb/az6027.c | 1 + drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- drivers/media/usb/em28xx/em28xx-cards.c | 5 +- drivers/media/usb/em28xx/em28xx-core.c | 5 +- drivers/media/usb/tm6000/tm6000-video.c | 3 +- drivers/media/usb/uvc/uvc_driver.c | 7 +- drivers/media/usb/uvc/uvc_v4l2.c | 7 +- drivers/media/usb/uvc/uvc_video.c | 5 + drivers/media/v4l2-core/v4l2-ioctl.c | 67 ++++-- drivers/memory/fsl_ifc.c | 13 +- drivers/memory/renesas-rpc-if.c | 113 +++++++--- drivers/memstick/core/ms_block.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/memstick/host/r592.c | 8 +- drivers/mfd/dln2.c | 18 ++ drivers/mfd/mfd-core.c | 2 + drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/dw_mmc.c | 3 +- drivers/mmc/host/moxart-mmc.c | 16 +- drivers/mmc/host/mtk-sd.c | 5 + drivers/mmc/host/mxs-mmc.c | 10 + drivers/mmc/host/sdhci-omap.c | 18 +- drivers/most/most_usb.c | 5 +- drivers/mtd/mtdcore.c | 4 +- drivers/mtd/nand/raw/ams-delta.c | 12 +- drivers/mtd/nand/raw/au1550nd.c | 12 +- drivers/mtd/nand/raw/gpio.c | 12 +- drivers/mtd/nand/raw/mpc5121_nfc.c | 12 +- drivers/mtd/nand/raw/orion_nand.c | 12 +- drivers/mtd/nand/raw/pasemi_nand.c | 12 +- drivers/mtd/nand/raw/plat_nand.c | 12 +- drivers/mtd/nand/raw/socrates_nand.c | 12 +- drivers/mtd/nand/raw/xway_nand.c | 12 +- drivers/mtd/spi-nor/controllers/hisi-sfc.c | 1 - drivers/net/Kconfig | 2 +- drivers/net/bonding/bond_sysfs_slave.c | 36 +-- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- drivers/net/dsa/lantiq_gswip.c | 28 ++- drivers/net/dsa/rtl8366rb.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 20 +- drivers/net/ethernet/cavium/thunder/nic_main.c | 2 +- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 7 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 2 + .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- .../chelsio/inline_crypto/chtls/chtls_cm.h | 2 +- drivers/net/ethernet/freescale/enetc/enetc_qos.c | 18 +- drivers/net/ethernet/google/gve/gve.h | 4 +- drivers/net/ethernet/google/gve/gve_adminq.h | 1 + drivers/net/ethernet/google/gve/gve_main.c | 48 +++- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 2 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 9 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 + drivers/net/ethernet/ibm/ibmvnic.c | 5 +- drivers/net/ethernet/intel/ice/ice_base.c | 2 +- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 20 +- drivers/net/ethernet/netronome/nfp/bpf/main.c | 16 +- drivers/net/ethernet/netronome/nfp/bpf/main.h | 2 + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 17 +- drivers/net/ethernet/realtek/r8169_main.c | 1 + drivers/net/ethernet/sfc/mcdi_port_common.c | 37 ++- drivers/net/ethernet/sfc/ptp.c | 4 +- drivers/net/ethernet/sfc/siena_sriov.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 - drivers/net/ethernet/ti/davinci_emac.c | 16 +- drivers/net/ifb.c | 2 + drivers/net/phy/micrel.c | 9 +- drivers/net/phy/phy.c | 7 +- drivers/net/phy/phylink.c | 2 +- drivers/net/vmxnet3/vmxnet3_drv.c | 1 - drivers/net/vrf.c | 28 ++- drivers/net/wireless/ath/ath10k/mac.c | 37 ++- drivers/net/wireless/ath/ath10k/sdio.c | 5 +- drivers/net/wireless/ath/ath10k/usb.c | 7 +- drivers/net/wireless/ath/ath10k/wmi.c | 4 + drivers/net/wireless/ath/ath10k/wmi.h | 3 + drivers/net/wireless/ath/ath11k/dbring.c | 16 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 13 +- drivers/net/wireless/ath/ath11k/mac.c | 2 +- drivers/net/wireless/ath/ath11k/qmi.c | 4 +- drivers/net/wireless/ath/ath11k/reg.c | 11 +- drivers/net/wireless/ath/ath11k/reg.h | 2 +- drivers/net/wireless/ath/ath11k/wmi.c | 40 ++-- drivers/net/wireless/ath/ath11k/wmi.h | 3 +- drivers/net/wireless/ath/ath6kl/usb.c | 7 +- drivers/net/wireless/ath/ath9k/main.c | 4 +- drivers/net/wireless/ath/dfs_pattern_detector.c | 10 +- drivers/net/wireless/ath/wcn36xx/dxe.c | 49 ++-- drivers/net/wireless/ath/wcn36xx/main.c | 8 +- drivers/net/wireless/ath/wcn36xx/smd.c | 44 +++- drivers/net/wireless/ath/wcn36xx/txrx.c | 64 +++--- drivers/net/wireless/ath/wcn36xx/txrx.h | 3 +- drivers/net/wireless/broadcom/b43/phy_g.c | 2 +- drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +- .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 10 + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 3 + drivers/net/wireless/marvell/libertas/if_usb.c | 2 + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 + drivers/net/wireless/marvell/mwifiex/11n.c | 5 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 32 +-- drivers/net/wireless/marvell/mwifiex/pcie.c | 36 ++- drivers/net/wireless/marvell/mwifiex/usb.c | 16 ++ drivers/net/wireless/marvell/mwl8k.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 15 +- drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 13 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 8 +- drivers/net/wireless/microchip/wilc1000/cfg80211.c | 3 +- .../net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 14 +- drivers/net/wireless/realtek/rtw88/fw.c | 7 +- drivers/net/wireless/realtek/rtw88/reg.h | 1 + drivers/net/wireless/rsi/rsi_91x_core.c | 2 + drivers/net/wireless/rsi/rsi_91x_hal.c | 10 +- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 74 ++---- drivers/net/wireless/rsi/rsi_91x_main.c | 17 +- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 24 +- drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +- drivers/net/wireless/rsi/rsi_91x_usb.c | 5 +- drivers/net/wireless/rsi/rsi_hal.h | 11 + drivers/net/wireless/rsi/rsi_main.h | 15 +- drivers/net/xen-netfront.c | 8 + drivers/nfc/pn533/pn533.c | 6 +- drivers/nvme/host/multipath.c | 9 +- drivers/nvme/host/rdma.c | 2 + drivers/nvme/target/configfs.c | 2 + drivers/nvme/target/rdma.c | 24 ++ drivers/nvme/target/tcp.c | 21 +- drivers/of/unittest.c | 16 +- drivers/opp/of.c | 2 +- drivers/pci/controller/cadence/pcie-cadence-plat.c | 2 + drivers/pci/controller/dwc/pcie-uniphier.c | 26 +-- drivers/pci/controller/pci-aardvark.c | 251 ++++++++++++++++++--- drivers/pci/pci-bridge-emul.c | 13 ++ drivers/pci/quirks.c | 1 + drivers/phy/qualcomm/phy-qcom-qusb2.c | 16 +- drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 2 +- drivers/phy/ti/phy-gmii-sel.c | 2 + drivers/pinctrl/core.c | 2 + drivers/pinctrl/pinctrl-equilibrium.c | 7 +- drivers/pinctrl/renesas/core.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/platform/x86/wmi.c | 9 +- drivers/power/supply/bq27xxx_battery_i2c.c | 3 +- drivers/power/supply/max17040_battery.c | 2 + drivers/power/supply/max17042_battery.c | 12 +- drivers/power/supply/rt5033_battery.c | 2 +- drivers/regulator/s5m8767.c | 21 +- drivers/remoteproc/remoteproc_core.c | 8 +- drivers/reset/reset-socfpga.c | 26 +++ drivers/reset/tegra/reset-bpmp.c | 9 +- drivers/rtc/rtc-rv3032.c | 4 +- drivers/s390/char/tape_std.c | 3 +- drivers/s390/cio/css.c | 4 +- drivers/s390/cio/device_ops.c | 12 +- drivers/s390/crypto/ap_queue.c | 2 + drivers/scsi/csiostor/csio_lnode.c | 2 +- drivers/scsi/dc395x.c | 1 + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 24 +- drivers/scsi/qla2xxx/qla_dbg.c | 3 +- drivers/scsi/qla2xxx/qla_gbl.h | 2 - drivers/scsi/qla2xxx/qla_init.c | 54 ++++- drivers/scsi/qla2xxx/qla_mr.c | 23 -- drivers/scsi/qla2xxx/qla_os.c | 47 ++-- drivers/scsi/qla2xxx/qla_target.c | 14 +- drivers/scsi/scsi_lib.c | 2 - drivers/scsi/ufs/ufshcd-pltfrm.c | 6 +- drivers/scsi/ufs/ufshcd.c | 29 +-- drivers/scsi/ufs/ufshcd.h | 3 + drivers/soc/fsl/dpaa2-console.c | 1 + drivers/soc/fsl/dpio/dpio-service.c | 2 +- drivers/soc/fsl/dpio/qbman-portal.c | 9 +- drivers/soc/qcom/apr.c | 2 + drivers/soc/qcom/rpmhpd.c | 21 +- drivers/soc/tegra/pmc.c | 2 +- drivers/soundwire/debugfs.c | 2 +- drivers/spi/spi-bcm-qspi.c | 5 +- drivers/spi/spi-pl022.c | 5 +- drivers/spi/spi-rpc-if.c | 4 +- drivers/staging/ks7010/Kconfig | 3 + drivers/staging/media/allegro-dvt/allegro-core.c | 9 + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 37 +-- drivers/staging/media/imx/imx-media-dev-common.c | 2 + drivers/staging/media/ipu3/ipu3-v4l2.c | 7 +- drivers/staging/media/rkvdec/rkvdec-h264.c | 5 +- drivers/staging/media/rkvdec/rkvdec.c | 40 ++-- drivers/staging/most/dim2/Makefile | 2 +- drivers/staging/most/dim2/dim2.c | 24 +- drivers/staging/most/dim2/sysfs.c | 49 ---- drivers/staging/most/dim2/sysfs.h | 11 - drivers/tty/serial/8250/8250_dw.c | 2 +- drivers/tty/serial/8250/8250_port.c | 21 +- drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/serial_core.c | 16 +- drivers/tty/serial/xilinx_uartps.c | 3 +- drivers/usb/chipidea/core.c | 23 +- drivers/usb/dwc2/drd.c | 24 +- drivers/usb/gadget/legacy/hid.c | 4 +- drivers/usb/host/xhci-hub.c | 3 +- drivers/usb/host/xhci-pci.c | 16 ++ drivers/usb/misc/iowarrior.c | 8 +- drivers/usb/musb/Kconfig | 2 +- drivers/usb/serial/keyspan.c | 15 +- drivers/usb/typec/Kconfig | 4 +- drivers/video/backlight/backlight.c | 6 - drivers/video/fbdev/chipsfb.c | 2 +- drivers/virtio/virtio_ring.c | 14 +- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/f71808e_wdt.c | 4 +- drivers/watchdog/omap_wdt.c | 6 +- drivers/xen/balloon.c | 86 +++++-- drivers/xen/xen-pciback/conf_space_capability.c | 2 +- fs/btrfs/disk-io.c | 3 +- fs/btrfs/reflink.c | 2 +- fs/btrfs/tree-log.c | 4 +- fs/btrfs/volumes.c | 14 +- fs/crypto/fscrypt_private.h | 5 +- fs/crypto/hkdf.c | 11 +- fs/crypto/keysetup.c | 57 ++++- fs/erofs/decompressor.c | 1 - fs/exfat/inode.c | 2 +- fs/ext4/extents.c | 63 +++--- fs/ext4/super.c | 9 +- fs/f2fs/inode.c | 2 +- fs/f2fs/namei.c | 2 +- fs/fuse/dev.c | 14 +- fs/gfs2/glock.c | 24 +- fs/jfs/jfs_mount.c | 51 ++--- fs/nfs/dir.c | 7 +- fs/nfs/direct.c | 2 +- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 4 +- fs/nfs/nfs4idmap.c | 2 +- fs/nfs/nfs4proc.c | 15 +- fs/nfs/pnfs.h | 2 +- fs/nfs/pnfs_nfs.c | 6 +- fs/nfs/write.c | 26 +-- fs/ocfs2/file.c | 8 +- fs/orangefs/dcache.c | 4 +- fs/overlayfs/file.c | 16 +- fs/proc/stat.c | 4 +- fs/proc/uptime.c | 14 +- fs/quota/quota_tree.c | 15 ++ fs/tracefs/inode.c | 3 +- include/linux/blkdev.h | 2 - include/linux/console.h | 2 + include/linux/ethtool_netlink.h | 3 + include/linux/filter.h | 1 + include/linux/kernel_stat.h | 1 + include/linux/libata.h | 2 +- include/linux/lsm_hook_defs.h | 14 +- include/linux/lsm_hooks.h | 14 +- include/linux/nfs_fs.h | 1 + include/linux/posix-timers.h | 2 + include/linux/rpmsg.h | 2 +- include/linux/sched/task.h | 3 +- include/linux/sched/task_stack.h | 4 + include/linux/security.h | 33 +-- include/linux/seq_file.h | 2 +- include/linux/tpm.h | 1 + include/memory/renesas-rpc-if.h | 1 + include/net/inet_connection_sock.h | 2 +- include/net/llc.h | 4 +- include/net/neighbour.h | 12 +- include/net/sch_generic.h | 4 + include/net/sock.h | 2 +- include/net/strparser.h | 16 +- include/net/tcp.h | 17 +- include/net/udp.h | 5 +- include/uapi/linux/ethtool_netlink.h | 4 +- include/uapi/linux/pci_regs.h | 6 + kernel/bpf/core.c | 4 +- kernel/bpf/verifier.c | 4 +- kernel/cgroup/cgroup.c | 31 ++- kernel/cgroup/rstat.c | 2 - kernel/fork.c | 3 +- kernel/kprobes.c | 3 +- kernel/locking/lockdep.c | 4 +- kernel/power/energy_model.c | 23 +- kernel/power/swap.c | 7 +- kernel/rcu/rcutorture.c | 48 +++- kernel/rcu/tasks.h | 3 +- kernel/rcu/tree_exp.h | 2 +- kernel/rcu/tree_plugin.h | 8 +- kernel/sched/core.c | 43 ++-- kernel/signal.c | 18 +- kernel/time/posix-cpu-timers.c | 19 +- kernel/trace/ring_buffer.c | 5 + kernel/trace/tracing_map.c | 40 ++-- kernel/workqueue.c | 15 +- lib/decompress_unxz.c | 2 +- lib/iov_iter.c | 5 +- lib/xz/xz_dec_lzma2.c | 21 +- lib/xz/xz_dec_stream.c | 6 +- mm/memcontrol.c | 27 +-- mm/oom_kill.c | 23 +- mm/zsmalloc.c | 7 +- net/8021q/vlan.c | 3 - net/8021q/vlan_dev.c | 3 + net/9p/client.c | 2 + net/bluetooth/l2cap_sock.c | 10 +- net/bluetooth/sco.c | 33 +-- net/can/j1939/main.c | 7 + net/can/j1939/transport.c | 6 + net/core/dev.c | 5 +- net/core/filter.c | 21 ++ net/core/neighbour.c | 48 ++-- net/core/net-sysfs.c | 55 +++++ net/core/net_namespace.c | 4 + net/core/stream.c | 3 - net/core/sysctl_net_core.c | 2 +- net/dccp/dccp.h | 2 +- net/dccp/proto.c | 14 +- net/ethtool/pause.c | 3 +- net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/proc.c | 2 +- net/ipv4/tcp.c | 40 +++- net/ipv4/tcp_bpf.c | 1 - net/ipv6/addrconf.c | 3 + net/ipv6/udp.c | 2 +- net/netfilter/nf_conntrack_proto_udp.c | 7 +- net/netfilter/nfnetlink_queue.c | 2 +- net/netfilter/nft_dynset.c | 11 +- net/rds/ib.c | 10 - net/rds/ib.h | 6 - net/rds/ib_cm.c | 128 +++++++---- net/rds/ib_recv.c | 18 +- net/rds/ib_send.c | 8 + net/rxrpc/rtt.c | 2 +- net/sched/sch_generic.c | 9 + net/sched/sch_mq.c | 24 ++ net/sched/sch_mqprio.c | 23 ++ net/sched/sch_taprio.c | 27 ++- net/smc/af_smc.c | 20 +- net/smc/smc_llc.c | 2 +- net/strparser/strparser.c | 10 +- net/sunrpc/addr.c | 40 ++-- net/sunrpc/xprt.c | 28 +-- net/vmw_vsock/af_vsock.c | 2 + samples/kprobes/kretprobe_example.c | 2 +- scripts/leaking_addresses.pl | 3 +- security/apparmor/label.c | 4 +- security/integrity/evm/evm_main.c | 2 +- security/security.c | 14 +- security/selinux/hooks.c | 36 ++- security/selinux/ss/services.c | 162 +++++++------ security/smack/smackfs.c | 11 +- sound/core/oss/mixer_oss.c | 43 +++- sound/core/timer.c | 17 +- sound/pci/hda/hda_intel.c | 74 +++--- sound/pci/hda/patch_realtek.c | 82 +++++++ sound/soc/codecs/cs42l42.c | 88 ++++---- sound/soc/soc-core.c | 1 + sound/soc/sof/topology.c | 9 + sound/synth/emux/emux.c | 2 +- sound/usb/6fire/comm.c | 2 +- sound/usb/6fire/firmware.c | 6 +- sound/usb/format.c | 1 + sound/usb/line6/driver.c | 14 +- sound/usb/line6/driver.h | 2 +- sound/usb/line6/podhd.c | 6 +- sound/usb/line6/toneport.c | 2 +- sound/usb/misc/ua101.c | 4 +- sound/usb/quirks.c | 1 + tools/bpf/bpftool/prog.c | 16 +- tools/lib/bpf/bpf_core_read.h | 2 +- tools/lib/bpf/btf.c | 25 +- tools/objtool/check.c | 19 +- tools/perf/util/bpf-event.c | 4 +- .../testing/selftests/bpf/prog_tests/perf_buffer.c | 4 +- tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 85 +++++-- tools/testing/selftests/bpf/progs/strobemeta.h | 11 + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 62 +++-- tools/testing/selftests/bpf/test_progs.c | 4 +- .../testing/selftests/bpf/verifier/array_access.c | 2 +- tools/testing/selftests/core/close_range_test.c | 2 +- tools/testing/selftests/kvm/lib/x86_64/svm.c | 22 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- tools/testing/selftests/net/fcnal-test.sh | 3 + tools/testing/selftests/net/udpgso_bench_rx.c | 11 +- 593 files changed, 4821 insertions(+), 2452 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/575 xhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delay
From: Mathias Nyman <[email protected]>
commit e1959faf085b004e6c3afaaaa743381f00e7c015 upstream.
Some USB 3.1 enumeration issues were reported after the hub driver removed the minimum 100ms limit for the power-on-good delay.
Since commit 90d28fb53d4a ("usb: core: reduce power-on-good delay time of root hub") the hub driver sets the power-on-delay based on the bPwrOn2PwrGood value in the hub descriptor.
xhci driver has a 20ms bPwrOn2PwrGood value for both roothubs based on xhci spec section 5.4.8, but it's clearly not enough for the USB 3.1 devices, causing enumeration issues.
Tests indicate full 100ms delay is needed.
--- drivers/usb/host/xhci-hub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-hub.c +2 -1
@@ -171,7 +171,6 @@ static void xhci_common_hub_descriptor(s {u16 temp; - desc->bPwrOn2PwrGood =10 ;/* xhci section 5.4.9 says 20ms max */ desc->bHubContrCurrent =0 ; desc->bNbrPorts = ports;
@@ -206,6 +205,7 @@ static void xhci_usb2_hub_descriptor(str desc->bDescriptorType =USB_DT_HUB ; temp =1 + (ports /8 ); desc->bDescLength =USB_DT_HUB_NONVAR_SIZE +2 * temp; + desc->bPwrOn2PwrGood =10 ;/* xhci section 5.4.8 says 20ms */ /* The Device Removable bits are reported on a byte granularity. * If the port doesn't exist within that byte, the bit is set to 0.
@@ -258,6 +258,7 @@ static void xhci_usb3_hub_descriptor(strxhci_common_hub_descriptor (xhci, desc, ports); desc->bDescriptorType =USB_DT_SS_HUB ; desc->bDescLength =USB_DT_SS_HUB_SIZE ; + desc->bPwrOn2PwrGood =50 ;/* usb 3.1 may fail if less than 100ms */ /* header decode latency should be zero for roothubs, * see section 4.23.5.2.
Greg Kroah-Hartman
maintainerPATCH 2/575 usb: xhci: Enable runtime-pm by default on AMD Yellow Carp platform
In reply to Greg Kroah-HartmanFrom: Nehal Bakulchandra Shah <[email protected]>
commit 660a92a59b9e831a0407e41ff62875656d30006e upstream.
AMD's Yellow Carp platform supports runtime power management for XHCI Controllers, so enable the same by default for all XHCI Controllers.
[ regrouped and aligned the PCI_DEVICE_ID definitions -Mathias]
--- drivers/usb/host/xhci-pci.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/usb/host/xhci-pci.c +16 -0
@@ -64,6 +64,13 @@#define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba#define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb#define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 0x161a +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 0x161b +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 0x161d +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 0x161e +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 0x15d6 +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 0x15d7 +#define PCI_DEVICE_ID_ASMEDIA_1042_XHCI 0x1042#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142#define PCI_DEVICE_ID_ASMEDIA_1142_XHCI 0x1242
@@ -312,6 +319,15 @@ static void xhci_pci_quirks(struct devic pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4)) xhci->quirks |= XHCI_NO_SOFT_RETRY; +if (pdev->vendor ==PCI_VENDOR_ID_AMD && + (pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 )) + xhci->quirks |=XHCI_DEFAULT_PM_RUNTIME_ALLOW ; +if (xhci->quirks &XHCI_RESET_ON_RESUME )xhci_dbg_trace (xhci, trace_xhci_dbg_quirks,"QUIRK: Resetting on resume" );
Greg Kroah-Hartman
maintainerPATCH 3/575 binder: use euid from cred instead of using task
In reply to Greg Kroah-HartmanFrom: Todd Kjos <[email protected]>
commit 29bc22ac5e5bc63275e850f0c8fc549e3d0e306b upstream.
Save the 'struct cred' associated with a binder process at initial open to avoid potential race conditions when converting to an euid.
Set a transaction's sender_euid from the 'struct cred' saved at binder_open() instead of looking up the euid from the binder proc's 'struct task'. This ensures the euid is associated with the security context that of the task that opened binder.
--- drivers/android/binder.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/android/binder.c +7 -1
@@ -420,6 +420,9 @@ enum binder_deferred_state {* (invariant after initialized) * @tsk task_struct for group_leader of process * (invariant after initialized) +* @cred struct cred associated with the `struct file` +* in binder_open() +* (invariant after initialized) * @deferred_work_node: element for binder_deferred_list * (protected by binder_deferred_lock) * @deferred_work: bitmap of deferred work to perform
@@ -465,6 +468,7 @@ struct binder_proc {struct list_head waiting_threads;int pid;struct task_struct *tsk; +const struct cred *cred;struct hlist_node deferred_work_node;int deferred_work;bool is_dead;
@@ -3087,7 +3091,7 @@ static void binder_transaction(struct bi t->from = thread; else t->from = NULL; - t->sender_euid =task_euid (proc->tsk); + t->sender_euid = proc->cred->euid; t->to_proc = target_proc; t->to_thread = target_thread; t->code = tr->code;
@@ -4703,6 +4707,7 @@ static void binder_free_proc(struct bind }binder_alloc_deferred_release (&proc->alloc);put_task_struct (proc->tsk); +put_cred (proc->cred);binder_stats_deleted (BINDER_STAT_PROC );kfree (proc); }
@@ -5220,6 +5225,7 @@ static int binder_open(struct inode *nodspin_lock_init (&proc->outer_lock);get_task_struct (current->group_leader); proc->tsk = current->group_leader; + proc->cred =get_cred (filp->f_cred);INIT_LIST_HEAD (&proc->todo); proc->default_priority =task_nice (current);/* binderfs stashes devices in i_private */
Greg Kroah-Hartman
maintainerPATCH 4/575 binder: use cred instead of task for selinux checks
In reply to Greg Kroah-HartmanFrom: Todd Kjos <[email protected]>
commit 52f88693378a58094c538662ba652aff0253c4fe upstream.
Since binder was integrated with selinux, it has passed 'struct task_struct' associated with the binder_proc to represent the source and target of transactions. The conversion of task to SID was then done in the hook implementations. It turns out that there are race conditions which can result in an incorrect security context being used.
Fix by using the 'struct cred' saved during binder_open and pass it to the selinux subsystem.
--- drivers/android/binder.c | 12 ++++++------ include/linux/lsm_hook_defs.h | 14 +++++++------- include/linux/lsm_hooks.h | 14 +++++++------- include/linux/security.h | 28 ++++++++++++++-------------- security/security.c | 14 +++++++------- security/selinux/hooks.c | 36 +++++++++++++++--------------------- 6 files changed, 56 insertions(+), 62 deletions(-)
drivers/android/binder.c +6 -6
@@ -2443,7 +2443,7 @@ static int binder_translate_binder(struc ret = -EINVAL ; goto done; } -if (security_binder_transfer_binder (proc->tsk, target_proc->tsk)) { +if (security_binder_transfer_binder (proc->cred, target_proc->cred)) { ret = -EPERM ; goto done; }
@@ -2489,7 +2489,7 @@ static int binder_translate_handle(struc proc->pid, thread->pid, fp->handle);return -EINVAL ; } -if (security_binder_transfer_binder (proc->tsk, target_proc->tsk)) { +if (security_binder_transfer_binder (proc->cred, target_proc->cred)) { ret = -EPERM ; goto done; }
@@ -2577,7 +2577,7 @@ static int binder_translate_fd(u32 fd, b ret = -EBADF ; goto err_fget; } - ret =security_binder_transfer_file (proc->tsk, target_proc->tsk, file); + ret =security_binder_transfer_file (proc->cred, target_proc->cred, file);if (ret <0 ) { ret = -EPERM ; goto err_security;
@@ -2975,8 +2975,8 @@ static void binder_transaction(struct bi return_error_line = __LINE__; goto err_invalid_target_handle; } -if (security_binder_transaction (proc->tsk, - target_proc->tsk) <0 ) { +if (security_binder_transaction (proc->cred, + target_proc->cred) <0 ) { return_error =BR_FAILED_REPLY ; return_error_param = -EPERM ; return_error_line = __LINE__;
@@ -4918,7 +4918,7 @@ static int binder_ioctl_set_ctx_mgr(stru ret = -EBUSY ; goto out; } - ret =security_binder_set_context_mgr (proc->tsk); + ret =security_binder_set_context_mgr (proc->cred);if (ret <0 ) goto out;if (uid_valid (context->binder_context_mgr_uid)) {
include/linux/lsm_hook_defs.h +7 -7
@@ -26,13 +26,13 @@* #undef LSM_HOOK * }; */ -LSM_HOOK(int, 0, binder_set_context_mgr, struct task_struct *mgr) -LSM_HOOK(int, 0, binder_transaction, struct task_struct *from, - struct task_struct *to) -LSM_HOOK(int, 0, binder_transfer_binder, struct task_struct *from, - struct task_struct *to) -LSM_HOOK(int, 0, binder_transfer_file, struct task_struct *from, - struct task_struct *to, struct file *file) +LSM_HOOK(int, 0, binder_set_context_mgr, const struct cred *mgr) +LSM_HOOK(int, 0, binder_transaction, const struct cred *from, + const struct cred *to) +LSM_HOOK(int, 0, binder_transfer_binder, const struct cred *from, + const struct cred *to) +LSM_HOOK(int, 0, binder_transfer_file, const struct cred *from, + const struct cred *to, struct file *file) LSM_HOOK(int, 0, ptrace_access_check, struct task_struct *child, unsigned int mode) LSM_HOOK(int, 0, ptrace_traceme, struct task_struct *parent)
include/linux/lsm_hooks.h +7 -7
@@ -1288,22 +1288,22 @@* * @binder_set_context_mgr: * Check whether @mgr is allowed to be the binder context manager. -* @mgr contains the task_struct for the task being registered. +* @mgr contains the struct cred for the current binder process. * Return 0 if permission is granted. * @binder_transaction: * Check whether @from is allowed to invoke a binder transaction call * to @to. -* @from contains the task_struct for the sending task. -* @to contains the task_struct for the receiving task. +* @from contains the struct cred for the sending process. +* @to contains the struct cred for the receiving process. * @binder_transfer_binder: * Check whether @from is allowed to transfer a binder reference to @to. -* @from contains the task_struct for the sending task. -* @to contains the task_struct for the receiving task. +* @from contains the struct cred for the sending process. +* @to contains the struct cred for the receiving process. * @binder_transfer_file: * Check whether @from is allowed to transfer @file to @to. -* @from contains the task_struct for the sending task. +* @from contains the struct cred for the sending process. * @file contains the struct file being transferred. -* @to contains the task_struct for the receiving task. +* @to contains the struct cred for the receiving process. * * @ptrace_access_check: * Check permission before allowing the current process to trace the
include/linux/security.h +14 -14
@@ -254,13 +254,13 @@ extern int security_init(void);extern int early_security_init (void );/* Security operations */ -int security_binder_set_context_mgr (struct task_struct *mgr); -int security_binder_transaction (struct task_struct *from, -struct task_struct *to); -int security_binder_transfer_binder (struct task_struct *from, -struct task_struct *to); -int security_binder_transfer_file (struct task_struct *from, -struct task_struct *to,struct file *file); +int security_binder_set_context_mgr (const struct cred *mgr); +int security_binder_transaction (const struct cred *from, +const struct cred *to); +int security_binder_transfer_binder (const struct cred *from, +const struct cred *to); +int security_binder_transfer_file (const struct cred *from, +const struct cred *to,struct file *file);int security_ptrace_access_check (struct task_struct *child,unsigned int mode);int security_ptrace_traceme (struct task_struct *parent); int security_capget(struct task_struct *target,
@@ -493,25 +493,25 @@ static inline int early_security_init(voreturn 0 ; } -static inline int security_binder_set_context_mgr (struct task_struct *mgr) +static inline int security_binder_set_context_mgr (const struct cred *mgr) {return 0 ; } -static inline int security_binder_transaction (struct task_struct *from, -struct task_struct *to) +static inline int security_binder_transaction (const struct cred *from, +const struct cred *to) {return 0 ; } -static inline int security_binder_transfer_binder (struct task_struct *from, -struct task_struct *to) +static inline int security_binder_transfer_binder (const struct cred *from, +const struct cred *to) {return 0 ; } -static inline int security_binder_transfer_file (struct task_struct *from, -struct task_struct *to, +static inline int security_binder_transfer_file (const struct cred *from, +const struct cred *to,struct file *file) {return 0 ;
security/security.c +7 -7
@@ -723,25 +723,25 @@ static void __init lsm_early_task(struct/* Security operations */ -int security_binder_set_context_mgr (struct task_struct *mgr) +int security_binder_set_context_mgr (const struct cred *mgr) {return call_int_hook (binder_set_context_mgr,0 , mgr); } -int security_binder_transaction (struct task_struct *from, -struct task_struct *to) +int security_binder_transaction (const struct cred *from, +const struct cred *to) {return call_int_hook (binder_transaction,0 , from, to); } -int security_binder_transfer_binder (struct task_struct *from, -struct task_struct *to) +int security_binder_transfer_binder (const struct cred *from, +const struct cred *to) {return call_int_hook (binder_transfer_binder,0 , from, to); } -int security_binder_transfer_file (struct task_struct *from, -struct task_struct *to,struct file *file) +int security_binder_transfer_file (const struct cred *from, +const struct cred *to,struct file *file) {return call_int_hook (binder_transfer_file,0 , from, to, file); }
security/selinux/hooks.c +15 -21
@@ -2004,22 +2004,19 @@ static inline u32 open_file_to_av(struct/* Hook functions begin here. */ -static int selinux_binder_set_context_mgr (struct task_struct *mgr) +static int selinux_binder_set_context_mgr (const struct cred *mgr) { -u32 mysid =current_sid (); -u32 mgrsid =task_sid (mgr); -return avc_has_perm (&selinux_state, - mysid, mgrsid,SECCLASS_BINDER , +current_sid (),cred_sid (mgr),SECCLASS_BINDER ,BINDER__SET_CONTEXT_MGR ,NULL ); } -static int selinux_binder_transaction (struct task_struct *from, -struct task_struct *to) +static int selinux_binder_transaction (const struct cred *from, +const struct cred *to) {u32 mysid =current_sid (); -u32 fromsid =task_sid (from); -u32 tosid =task_sid (to); +u32 fromsid =cred_sid (from); +u32 tosid =cred_sid (to);int rc;if (mysid != fromsid) {
@@ -2030,27 +2027,24 @@ static int selinux_binder_transaction(streturn rc; } -return avc_has_perm (&selinux_state, - fromsid, tosid,SECCLASS_BINDER ,BINDER__CALL , -NULL ); +return avc_has_perm (&selinux_state, fromsid, tosid, +SECCLASS_BINDER ,BINDER__CALL ,NULL ); } -static int selinux_binder_transfer_binder (struct task_struct *from, -struct task_struct *to) +static int selinux_binder_transfer_binder (const struct cred *from, +const struct cred *to) { -u32 fromsid =task_sid (from); -u32 tosid =task_sid (to); -return avc_has_perm (&selinux_state, - fromsid, tosid,SECCLASS_BINDER ,BINDER__TRANSFER , +cred_sid (from),cred_sid (to), +SECCLASS_BINDER ,BINDER__TRANSFER ,NULL ); } -static int selinux_binder_transfer_file (struct task_struct *from, -struct task_struct *to, +static int selinux_binder_transfer_file (const struct cred *from, +const struct cred *to,struct file *file) { -u32 sid =task_sid (to); +u32 sid =cred_sid (to);struct file_security_struct *fsec =selinux_file (file);struct dentry *dentry = file->f_path.dentry;struct inode_security_struct *isec;
Greg Kroah-Hartman
maintainerPATCH 5/575 binder: use cred instead of task for getsecid
In reply to Greg Kroah-HartmanFrom: Todd Kjos <[email protected]>
commit 4d5b5539742d2554591751b4248b0204d20dcc9d upstream.
Use the 'struct cred' saved at binder_open() to lookup the security ID via security_cred_getsecid(). This ensures that the security context that opened binder is the one used to generate the secctx.
--- drivers/android/binder.c | 2 +- include/linux/security.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/android/binder.c +1 -1
@@ -3102,7 +3102,7 @@ static void binder_transaction(struct biu32 secid;size_t added_size; -security_task_getsecid (proc->tsk, &secid); +security_cred_getsecid (proc->cred, &secid); ret =security_secid_to_secctx (secid, &secctx, &secctx_sz);if (ret) { return_error =BR_FAILED_REPLY ;
include/linux/security.h +5 -0
@@ -1003,6 +1003,11 @@ static inline void security_transfer_cre { } +static inline void security_cred_getsecid (const struct cred *c,u32 *secid) +{ + *secid =0 ; +} +static inline int security_kernel_act_as (struct cred *cred,u32 secid) {return 0 ;
Greg Kroah-Hartman
maintainerPATCH 6/575 Input: iforce - fix control-message timeout
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 744d0090a5f6dfa4c81b53402ccdf08313100429 upstream.
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- drivers/input/joystick/iforce/iforce-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/joystick/iforce/iforce-usb.c +1 -1
@@ -92,7 +92,7 @@ static int iforce_usb_get_id(struct ifor id,USB_TYPE_VENDOR |USB_DIR_IN |USB_RECIP_INTERFACE , - 0, 0, buf, IFORCE_MAX_LENGTH, HZ); + 0, 0, buf, IFORCE_MAX_LENGTH, 1000);if (status <0 ) {dev_err (&iforce_usb->intf->dev,"usb_submit_urb failed: %d\n" , status);
Greg Kroah-Hartman
maintainerPATCH 7/575 Input: elantench - fix misreporting trackpoint coordinates
In reply to Greg Kroah-HartmanFrom: Phoenix Huang <[email protected]>
commit be896bd3b72b44126c55768f14c22a8729b0992e upstream.
Some firmwares occasionally report bogus data from trackpoint, with X or Y displacement being too large (outside of [-127, 127] range). Let's drop such packets so that we do not generate jumps.
--- drivers/input/mouse/elantech.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/input/mouse/elantech.c +13 -0
@@ -517,6 +517,19 @@ static void elantech_report_trackpoint(scase 0x16008020U :case 0x26800010U :case 0x36808000U : + +/* +* This firmware misreport coordinates for trackpoint +* occasionally. Discard packets outside of [-127, 127] range +* to prevent cursor jumps. +*/ +if (packet[4 ] ==0x80 || packet[5 ] ==0x80 || + packet[1 ] >>7 == packet[4 ] >>7 || + packet[2 ] >>7 == packet[5 ] >>7 ) { +elantech_debug ("discarding packet [%6ph]\n" , packet); +break ; + + } x = packet[4 ] - (int )((packet[1 ]^0x80 ) <<1 ); y = (int )((packet[2 ]^0x80 ) <<1 ) - packet[5 ];
Greg Kroah-Hartman
maintainerPATCH 8/575 Input: i8042 - Add quirk for Fujitsu Lifebook T725
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 16e28abb7290c4ca3b3a0f333ba067f34bb18c86 upstream.
Fujitsu Lifebook T725 laptop requires, like a few other similar models, the nomux and notimeout options to probe the touchpad properly. This patch adds the corresponding quirk entries.
--- drivers/input/serio/i8042-x86ia64io.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +14 -0
@@ -273,6 +273,13 @@ static const struct dmi_system_id __init }, }, { +/* Fujitsu Lifebook T725 laptop */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), + }, + }, + {/* Fujitsu Lifebook U745 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
@@ -841,6 +848,13 @@ static const struct dmi_system_id __init }, }, { +/* Fujitsu Lifebook T725 laptop */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), + }, + }, + {/* Fujitsu U574 laptop */ /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ .matches = {
Greg Kroah-Hartman
maintainerPATCH 9/575 libata: fix read log timeout value
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
commit 68dbbe7d5b4fde736d104cbbc9a2fce875562012 upstream.
Some ATA drives are very slow to respond to READ_LOG_EXT and READ_LOG_DMA_EXT commands issued from ata_dev_configure() when the device is revalidated right after resuming a system or inserting the ATA adapter driver (e.g. ahci). The default 5s timeout (ATA_EH_CMD_DFL_TIMEOUT) used for these commands is too short, causing errors during the device configuration. Ex:
...
ata9: SATA max UDMA/133 abar m524288@0x9d200000 port 0x9d200400 irq 209
ata9: SATA link up 6.0 Gbps (SStatus 133 SControl 300) ata9.00: ATA-9: XXX XXXXXXXXXXXXXXX, XXXXXXXX, max UDMA/133 ata9.00: qc timeout (cmd 0x2f)
ata9.00: Read log page 0x00 failed, Emask 0x4
ata9.00: Read log page 0x00 failed, Emask 0x40
ata9.00: NCQ Send/Recv Log not supported
ata9.00: Read log page 0x08 failed, Emask 0x40
ata9.00: 27344764928 sectors, multi 16: LBA48 NCQ (depth 32), AA ata9.00: Read log page 0x00 failed, Emask 0x40
ata9.00: ATA Identify Device Log not supported
ata9.00: failed to set xfermode (err_mask=0x40)
ata9: SATA link up 6.0 Gbps (SStatus 133 SControl 300) ata9.00: configured for UDMA/133
...
The timeout error causes a soft reset of the drive link, followed in most cases by a successful revalidation as that give enough time to the drive to become fully ready to quickly process the read log commands. However, in some cases, this also fails resulting in the device being dropped.
Fix this by using adding the ata_eh_revalidate_timeouts entries for the READ_LOG_EXT and READ_LOG_DMA_EXT commands. This defines a timeout increased to 15s, retriable one time.
--- drivers/ata/libata-eh.c | 8 ++++++++ include/linux/libata.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/ata/libata-eh.c +8 -0
@@ -93,6 +93,12 @@ static const unsigned long ata_eh_identi ULONG_MAX, }; +static const unsigned long ata_eh_revalidate_timeouts[] = { +15000 ,/* Some drives are slow to read log pages when waking-up */ +15000 ,/* combined time till here is enough even for media access */ +ULONG_MAX , +}; +static const unsigned long ata_eh_flush_timeouts[] = {15000 ,/* be generous with flush */ 15000 ,/* ditto */
@@ -129,6 +135,8 @@ static const struct ata_eh_cmd_timeout_e ata_eh_cmd_timeout_table[ATA_EH_CMD_TIMEOUT_TABLE_SIZE] = { { .commands = CMDS(ATA_CMD_ID_ATA, ATA_CMD_ID_ATAPI), .timeouts = ata_eh_identify_timeouts, }, + { .commands = CMDS(ATA_CMD_READ_LOG_EXT, ATA_CMD_READ_LOG_DMA_EXT), + .timeouts = ata_eh_revalidate_timeouts, }, { .commands = CMDS(ATA_CMD_READ_NATIVE_MAX, ATA_CMD_READ_NATIVE_MAX_EXT), .timeouts = ata_eh_other_timeouts, }, { .commands = CMDS(ATA_CMD_SET_MAX, ATA_CMD_SET_MAX_EXT),
include/linux/libata.h +1 -1
@@ -390,7 +390,7 @@ enum {/* This should match the actual table size of * ata_eh_cmd_timeout_table in libata-eh.c. */ - ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6, + ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 7,/* Horkage types. May be set by libata or controller on drives (some horkage may be drive/controller pair dependent */
Greg Kroah-Hartman
maintainerPATCH 10/575 ocfs2: fix data corruption on truncate
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 839b63860eb3835da165642923120d305925561d upstream.
Patch series "ocfs2: Truncate data corruption fix".
As further testing has shown, commit 5314454ea3f ("ocfs2: fix data corruption after conversion from inline format") didn't fix all the data corruption issues the customer started observing after 6dbf7bb55598 ("fs: Don't invalidate page buffers in block_write_full_page()") This time I have tracked them down to two bugs in ocfs2 truncation code.
One bug (truncating page cache before clearing tail cluster and setting i_size) could cause data corruption even before 6dbf7bb55598, but before that commit it needed a race with page fault, after 6dbf7bb55598 it started to be pretty deterministic.
Another bug (zeroing pages beyond old i_size) used to be harmless inefficiency before commit 6dbf7bb55598. But after commit 6dbf7bb55598 in combination with the first bug it resulted in deterministic data corruption.
Although fixing only the first problem is needed to stop data corruption, I've fixed both issues to make the code more robust.
This patch (of 2):
ocfs2_truncate_file() did unmap invalidate page cache pages before zeroing partial tail cluster and setting i_size. Thus some pages could be left (and likely have left if the cluster zeroing happened) in the page cache beyond i_size after truncate finished letting user possibly see stale data once the file was extended again. Also the tail cluster zeroing was not guaranteed to finish before truncate finished causing possible stale data exposure. The problem started to be particularly easy to hit after commit 6dbf7bb55598 "fs: Don't invalidate page buffers in block_write_full_page()" stopped invalidation of pages beyond i_size from page writeback path.
Fix these problems by unmapping and invalidating pages in the page cache after the i_size is reduced and tail cluster is zeroed out.
--- fs/ocfs2/file.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/ocfs2/file.c +6 -2
@@ -478,10 +478,11 @@ int ocfs2_truncate_file(struct inode *in* greater than page size, so we have to truncate them * anyway. */ -unmap_mapping_range (inode->i_mapping, new_i_size +PAGE_SIZE -1 ,0 ,1 ); -truncate_inode_pages (inode->i_mapping, new_i_size);if (OCFS2_I (inode)->ip_dyn_features &OCFS2_INLINE_DATA_FL ) { +unmap_mapping_range (inode->i_mapping, + new_i_size +PAGE_SIZE -1 ,0 ,1 ); +truncate_inode_pages (inode->i_mapping, new_i_size); status =ocfs2_truncate_inline (inode, di_bh, new_i_size,i_size_read (inode),1 );if (status)
@@ -500,6 +501,9 @@ int ocfs2_truncate_file(struct inode *in goto bail_unlock_sem; } +unmap_mapping_range (inode->i_mapping, new_i_size +PAGE_SIZE -1 ,0 ,1 ); +truncate_inode_pages (inode->i_mapping, new_i_size); + status =ocfs2_commit_truncate (osb, inode, di_bh);if (status <0 ) {mlog_errno (status);
Greg Kroah-Hartman
maintainerPATCH 11/575 scsi: core: Remove command size deduction from scsi_setup_scsi_cmnd()
In reply to Greg Kroah-HartmanFrom: Tadeusz Struk <[email protected]>
commit 703535e6ae1e94c89a9c1396b4c7b6b41160ef0c upstream.
No need to deduce command size in scsi_setup_scsi_cmnd() anymore as appropriate checks have been added to scsi_fill_sghdr_rq() function and the cmd_len should never be zero here. The code to do that wasn't correct anyway, as it used uninitialized cmd->cmnd, which caused a null-ptr-deref if the command size was zero as in the trace below. Fix this by removing the unneeded code.
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 0 PID: 1822 Comm: repro Not tainted 5.15.0 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-4.fc34 04/01/2014 Call Trace: blk_mq_dispatch_rq_list+0x7c7/0x12d0 __blk_mq_sched_dispatch_requests+0x244/0x380 blk_mq_sched_dispatch_requests+0xf0/0x160 __blk_mq_run_hw_queue+0xe8/0x160 __blk_mq_delay_run_hw_queue+0x252/0x5d0 blk_mq_run_hw_queue+0x1dd/0x3b0 blk_mq_sched_insert_request+0x1ff/0x3e0 blk_execute_rq_nowait+0x173/0x1e0 blk_execute_rq+0x15c/0x540 sg_io+0x97c/0x1370 scsi_ioctl+0xe16/0x28e0 sd_ioctl+0x134/0x170 blkdev_ioctl+0x362/0x6e0 block_ioctl+0xb0/0xf0 vfs_ioctl+0xa7/0xf0 do_syscall_64+0x3d/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae ---[ end trace 8b086e334adef6d2 ]--- Kernel panic - not syncing: Fatal exception
--- drivers/scsi/scsi_lib.c | 2 -- 1 file changed, 2 deletions(-)
drivers/scsi/scsi_lib.c +0 -2
@@ -1193,8 +1193,6 @@ static blk_status_t scsi_setup_scsi_cmnd } cmd->cmd_len =scsi_req (req)->cmd_len; -if (cmd->cmd_len ==0 ) - cmd->cmd_len =scsi_command_size (cmd->cmnd); cmd->cmnd =scsi_req (req)->cmd; cmd->transfersize =blk_rq_bytes (req); cmd->allowed =scsi_req (req)->retries;
Re: [PATCH 5.10 011/575] scsi: core: Remove command size deduction from scsi_setup_scsi_cmnd()
Quoted 3 lines · Greg Kroah-Hartman
From: Tadeusz Struk <[email protected]>
commit
703535e6ae1e94c89a9c1396b4c7b6b41160ef0cupstream.
Hi Greg,
Thanks for having queued this patch for the 5.10 stable branch.
Do you plan to also include commit 20aaef52eb08 ("scsi: scsi_ioctl: Validate command size")? That patch prevents that the bug in the commit mentioned above can be triggered.
Thanks,
Bart.
Re: [PATCH 5.10 011/575] scsi: core: Remove command size deduction from scsi_setup_scsi_cmnd()
Quoted 7 lines · Bart Van Assche
Hi Greg,
Thanks for having queued this patch for the 5.10 stable branch.
Do you plan to also include commit
20aaef52eb08("scsi:scsi_ioctl: Validate command size")? That patch prevents that the bug in the commit mentioned above can be triggered.Thanks,
Hi Brad,
The "scsi_ioctl: Validate command size" patch is not needed for either 5.10 nor 5.14 as the it is set directly from COMMAND_SIZE(opcode). See:
https://elixir.bootlin.com/linux/v5.14.18/source/block/scsi_ioctl.c#L445
https://elixir.bootlin.com/linux/v5.10.79/source/block/scsi_ioctl.c#L447
Signature · 2 lines
Thanks, Tadeusz
Greg Kroah-Hartman
maintainerRe: [PATCH 5.10 011/575] scsi: core: Remove command size deduction from scsi_setup_scsi_cmnd()
In reply to Bart Van AsscheQuoted 5 lines · Bart Van Assche
Quoted 3 lines · Greg Kroah-Hartman
From: Tadeusz Struk <[email protected]>
commit
703535e6ae1e94c89a9c1396b4c7b6b41160ef0cupstream.
Quoted 7 lines
Hi Greg,
Thanks for having queued this patch for the 5.10 stable branch.
Do you plan to also include commit
20aaef52eb08("scsi:scsi_ioctl: Validate command size")? That patch prevents that the bug in the commit mentioned above can be triggered.
It did not apply to 5.10.y and 5.14.y and a "FAILED:" email was sent out asking for a backport of it.
If you can provide that, great, I'll be glad to take it.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 12/575 scsi: qla2xxx: Fix kernel crash when accessing port_speed sysfs file
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit 3ef68d4f0c9e7cb589ae8b70f07d77f528105331 upstream.
Kernel crashes when accessing port_speed sysfs file. The issue happens on a CNA when the local array was accessed beyond bounds. Fix this by changing the lookup.
BUG: unable to handle kernel paging request at 0000000000004000 PGD 0 P4D 0 Oops: 0000 [#1] SMP PTI CPU: 15 PID: 455213 Comm: sosreport Kdump: loaded Not tainted 4.18.0-305.7.1.el8_4.x86_64 #1 RIP: 0010:string_nocheck+0x12/0x70 Code: 00 00 4c 89 e2 be 20 00 00 00 48 89 ef e8 86 9a 00 00 4c 01 e3 eb 81 90 49 89 f2 48 89 ce 48 89 f8 48 c1 fe 30 66 85 f6 74 4f <44> 0f b6 0a 45 84 c9 74 46 83 ee 01 41 b8 01 00 00 00 48 8d 7c 37 RSP: 0018:ffffb5141c1afcf0 EFLAGS: 00010286 RAX: ffff8bf4009f8000 RBX: ffff8bf4009f9000 RCX: ffff0a00ffffff04 RDX: 0000000000004000 RSI: ffffffffffffffff RDI: ffff8bf4009f8000 RBP: 0000000000004000 R08: 0000000000000001 R09: ffffb5141c1afb84 R10: ffff8bf4009f9000 R11: ffffb5141c1afce6 R12: ffff0a00ffffff04 R13: ffffffffc08e21aa R14: 0000000000001000 R15: ffffffffc08e21aa FS: 00007fc4ebfff700(0000) GS:ffff8c717f7c0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000004000 CR3: 000000edfdee6006 CR4: 00000000001706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: string+0x40/0x50 vsnprintf+0x33c/0x520 scnprintf+0x4d/0x90 qla2x00_port_speed_show+0xb5/0x100 [qla2xxx] dev_attr_show+0x1c/0x40 sysfs_kf_seq_show+0x9b/0x100 seq_read+0x153/0x410 vfs_read+0x91/0x140 ksys_read+0x4f/0xb0 do_syscall_64+0x5b/0x1a0 entry_SYSCALL_64_after_hwframe+0x65/0xca
--- drivers/scsi/qla2xxx/qla_attr.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +22 -2
@@ -1862,6 +1862,18 @@ qla2x00_port_speed_store(struct device *return strlen (buf); } +static const struct { +u16 rate; +char *str; +} port_speed_str[] = { + {PORT_SPEED_4GB ,"4" }, + {PORT_SPEED_8GB ,"8" }, + {PORT_SPEED_16GB ,"16" }, + {PORT_SPEED_32GB ,"32" }, + {PORT_SPEED_64GB ,"64" }, + {PORT_SPEED_10GB ,"10" }, +}; +static ssize_t qla2x00_port_speed_show (struct device *dev,struct device_attribute *attr,char *buf)
@@ -1869,7 +1881,8 @@ qla2x00_port_speed_show(struct device *dstruct scsi_qla_host *vha =shost_priv (dev_to_shost (dev));struct qla_hw_data *ha = vha->hw;ssize_t rval; -char *spd[7 ] = {"0" ,"0" ,"0" ,"4" ,"8" ,"16" ,"32" }; +u16 i; +char *speed ="Unknown" ; rval =qla2x00_get_data_rate (vha);if (rval !=QLA_SUCCESS ) {
@@ -1878,7 +1891,14 @@ qla2x00_port_speed_show(struct device *dreturn -EINVAL ; } -return scnprintf (buf,PAGE_SIZE ,"%s\n" , spd[ha->link_data_rate]); +for (i =0 ; i <ARRAY_SIZE (port_speed_str); i++) { +if (port_speed_str[i].rate != ha->link_data_rate) +continue ; + speed = port_speed_str[i].str; +break ; + } + +return scnprintf (buf,PAGE_SIZE ,"%s\n" , speed); }/* ----- */
Greg Kroah-Hartman
maintainerPATCH 13/575 scsi: qla2xxx: Fix use after free in eh_abort path
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit 3d33b303d4f3b74a71bede5639ebba3cfd2a2b4d upstream.
In eh_abort path driver prematurely exits the call to upper layer. Check whether command is aborted / completed by firmware before exiting the call.
9 [ffff8b1ebf803c00] page_fault at ffffffffb0389778
[exception RIP: qla2x00_status_entry+0x48d]
RIP: ffffffffc04fa62d RSP: ffff8b1ebf803cb0 RFLAGS: 00010082 RAX: 00000000ffffffff RBX: 00000000000e0000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 00000000000013d8 RDI: fffff3253db78440 RBP: ffff8b1ebf803dd0 R8: ffff8b1ebcd9b0c0 R9: 0000000000000000 R10: ffff8b1e38a30808 R11: 0000000000001000 R12: 00000000000003e9 R13: 0000000000000000 R14: ffff8b1ebcd9d740 R15: 0000000000000028 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
10 [ffff8b1ebf803cb0] enqueue_entity at ffffffffafce708f
11 [ffff8b1ebf803d00] enqueue_task_fair at ffffffffafce7b88 12 [ffff8b1ebf803dd8] qla24xx_process_response_queue at ffffffffc04fc9a6 [qla2xxx]
13 [ffff8b1ebf803e78] qla24xx_msix_rsp_q at ffffffffc04ff01b [qla2xxx] 14 [ffff8b1ebf803eb0] __handle_irq_event_percpu at ffffffffafd50714
--- drivers/scsi/qla2xxx/qla_os.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +5 -3
@@ -1254,6 +1254,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)uint32_t ratov_j;struct qla_qpair *qpair;unsigned long flags; +int fast_fail_status =SUCCESS ;if (qla2x00_isp_reg_stat (ha)) { ql_log(ql_log_info, vha, 0x8042,
@@ -1261,15 +1262,16 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)return FAILED ; } +/* Save any FAST_IO_FAIL value to return later if abort succeeds */ ret =fc_block_scsi_eh (cmd);if (ret !=0 ) -return ret; + fast_fail_status = ret; sp =scsi_cmd_priv (cmd); qpair = sp->qpair;if ((sp->fcport && sp->fcport->deleted) || !qpair) -return SUCCESS ; +return fast_fail_status !=SUCCESS ? fast_fail_status :FAILED ;spin_lock_irqsave (qpair->qp_lock_ptr, flags); sp->comp = ∁
@@ -1304,7 +1306,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) __func__, ha->r_a_tov/10); ret =FAILED ; }else { - ret =SUCCESS ; + ret = fast_fail_status; }break ;default :
Greg Kroah-Hartman
maintainerPATCH 14/575 mmc: mtk-sd: Add wait dma stop done flow
In reply to Greg Kroah-HartmanFrom: Derong Liu <[email protected]>
commit 43e5fee317f4b0a48992b8b07935b1a3ac20ce84 upstream.
We found this issue on a 5G platform, during CMDQ error handling, if DMA status is active when it call msdc_reset_hw(), it means mmc host hw reset and DMA transfer will be parallel, mmc host may access sram region unexpectedly. According to the programming guide of mtk-sd host, it needs to wait for dma stop done after set dma stop.
This change should be applied to all SoCs.
--- drivers/mmc/host/mtk-sd.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mmc/host/mtk-sd.c +5 -0
@@ -8,6 +8,7 @@#include <linux/clk.h> #include <linux/delay.h> #include <linux/dma-mapping.h> +#include <linux/iopoll.h> #include <linux/ioport.h> #include <linux/irq.h> #include <linux/of_address.h>
@@ -2285,6 +2286,7 @@ static void msdc_cqe_enable(struct mmc_hstatic void msdc_cqe_disable (struct mmc_host *mmc,bool recovery) {struct msdc_host *host =mmc_priv (mmc); +unsigned int val =0 ;/* disable cmdq irq */ sdr_clr_bits (host->base +MSDC_INTEN ,MSDC_INT_CMDQ );
@@ -2294,6 +2296,9 @@ static void msdc_cqe_disable(struct mmc_if (recovery) {sdr_set_field (host->base +MSDC_DMA_CTRL ,MSDC_DMA_CTRL_STOP ,1 ); +if (WARN_ON (readl_poll_timeout (host->base +MSDC_DMA_CFG , val, + !(val &MSDC_DMA_CFG_STS ),1 ,3000 ))) +return ;msdc_reset_hw (host); } }
Greg Kroah-Hartman
maintainerPATCH 15/575 mmc: dw_mmc: Dont wait for DRTO on Write RSP error
In reply to Greg Kroah-HartmanFrom: Christian Löhle <[email protected]>
commit 43592c8736e84025d7a45e61a46c3fa40536a364 upstream.
Only wait for DRTO on reads, otherwise the driver hangs.
The driver prevents sending CMD12 on response errors like CRCs. According to the comment this is because some cards have problems with this during the UHS tuning sequence. Unfortunately this workaround currently also applies for any command with data. On reads this will set the drto timer, which then triggers after a while. On writes this will not set any timer and the tasklet will not be scheduled again.
I cannot test for the UHS workarounds need, but even if so, it should at most apply to reads. I have observed many hangs when CMD25 response contained a CRC error. This patch fixes this without touching the actual UHS tuning workaround.
--- drivers/mmc/host/dw_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/dw_mmc.c +2 -1
@@ -2014,7 +2014,8 @@ static void dw_mci_tasklet_func(unsigned* delayed. Allowing the transfer to take place * avoids races and keeps things simple. */ -if (err != -ETIMEDOUT ) { +if (err != -ETIMEDOUT && + host->dir_status ==DW_MCI_RECV_STATUS ) { state =STATE_SENDING_DATA ;continue ; }
Greg Kroah-Hartman
maintainerPATCH 16/575 exfat: fix incorrect loading of i_blocks for large files
In reply to Greg Kroah-HartmanFrom: Sungjong Seo <[email protected]>
commit 0c336d6e33f4bedc443404c89f43c91c8bd9ee11 upstream.
When calculating i_blocks, there was a mistake that was masked with a 32-bit variable. So i_blocks for files larger than 4 GiB had incorrect values. Mask with a 64-bit variable instead of 32-bit one.
--- fs/exfat/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/exfat/inode.c +1 -1
@@ -602,7 +602,7 @@ static int exfat_fill_inode(struct inodeexfat_save_attr (inode, info->attr); inode->i_blocks = ((i_size_read (inode) + (sbi->cluster_size -1 )) & - ~(sbi->cluster_size -1 )) >> inode->i_blkbits; + ~((loff_t )sbi->cluster_size -1 )) >> inode->i_blkbits; inode->i_mtime = info->mtime; inode->i_ctime = info->mtime; ei->i_crtime = info->crtime;
Greg Kroah-Hartman
maintainerPATCH 17/575 parisc: Fix set_fixmap() on PA1.x CPUs
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 6e866a462867b60841202e900f10936a0478608c upstream.
Fix a kernel crash which happens on PA1.x CPUs while initializing the FTRACE/KPROBE breakpoints. The PTE table entries for the fixmap area were not created correctly.
--- arch/parisc/mm/fixmap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/parisc/mm/fixmap.c +1 -4
@@ -20,12 +20,9 @@ void notrace set_fixmap(enum fixed_addrepte_t *pte;if (pmd_none (*pmd)) - pmd =pmd_alloc (NULL , pud, vaddr); - - pte =pte_offset_kernel (pmd, vaddr); -if (pte_none (*pte)) pte =pte_alloc_kernel (pmd, vaddr); + pte =pte_offset_kernel (pmd, vaddr);set_pte_at (&init_mm, vaddr, pte,__mk_pte (phys,PAGE_KERNEL_RWX ));flush_tlb_kernel_range (vaddr, vaddr +PAGE_SIZE ); }
Greg Kroah-Hartman
maintainerPATCH 18/575 parisc: Fix ptrace check on syscall return
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 8779e05ba8aaffec1829872ef9774a71f44f6580 upstream.
The TIF_XXX flags are stored in the flags field in the thread_info struct (TI_FLAGS), not in the flags field of the task_struct structure (TASK_FLAGS).
It seems this bug didn't generate any important side-effects, otherwise it wouldn't have went unnoticed for 12 years (since v2.6.32).
--- arch/parisc/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/parisc/kernel/entry.S +1 -1
@@ -1848,7 +1848,7 @@ syscall_restore: LDREG TI_TASK-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r1 /* Are we being ptraced? */ - ldw TASK_FLAGS(%r1),%r19 + LDREG TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19 ldi _TIF_SYSCALL_TRACE_MASK,%r2 and,COND(=) %r19,%r2,%r0 b,n syscall_restore_rfi
Greg Kroah-Hartman
maintainerPATCH 19/575 tpm: Check for integer overflow in tpm2_map_response_body()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit a0bcce2b2a169e10eb265c8f0ebdd5ae4c875670 upstream.
The "4 * be32_to_cpu(data->count)" multiplication can potentially overflow which would lead to memory corruption. Add a check for that.
--- drivers/char/tpm/tpm2-space.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/char/tpm/tpm2-space.c +3 -0
@@ -455,6 +455,9 @@ static int tpm2_map_response_body(structif (be32_to_cpu (data->capability) !=TPM2_CAP_HANDLES )return 0 ; +if (be32_to_cpu (data->count) > (UINT_MAX -TPM_HEADER_SIZE -9 ) /4 ) +return -EFAULT ; +if (len !=TPM_HEADER_SIZE +9 +4 *be32_to_cpu (data->count))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 20/575 firmware/psci: fix application of sizeof to pointer
In reply to Greg Kroah-HartmanFrom: jing yangyang <[email protected]>
commit 2ac5fb35cd520ab1851c9a4816c523b65276052f upstream.
sizeof when applied to a pointer typed expression gives the size of the pointer.
./drivers/firmware/psci/psci_checker.c:158:41-47: ERROR application of sizeof to pointer
This issue was detected with the help of Coccinelle.
--- drivers/firmware/psci/psci_checker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/psci/psci_checker.c +1 -1
@@ -155,7 +155,7 @@ static int alloc_init_cpu_groups(cpumaskif (!alloc_cpumask_var (&tmp,GFP_KERNEL ))return -ENOMEM ; - cpu_groups =kcalloc (nb_available_cpus,sizeof (cpu_groups), + cpu_groups =kcalloc (nb_available_cpus,sizeof (*cpu_groups),GFP_KERNEL );if (!cpu_groups) {free_cpumask_var (tmp);
Greg Kroah-Hartman
maintainerPATCH 21/575 crypto: s5p-sss - Add error handling in s5p_aes_probe()
In reply to Greg Kroah-HartmanFrom: Tang Bin <[email protected]>
commit a472cc0dde3eb057db71c80f102556eeced03805 upstream.
The function s5p_aes_probe() does not perform sufficient error checking after executing platform_get_resource(), thus fix it.
--- drivers/crypto/s5p-sss.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/s5p-sss.c +2 -0
@@ -2173,6 +2173,8 @@ static int s5p_aes_probe(struct platform variant =find_s5p_sss_version (pdev); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -EINVAL ;/* * Note: HASH and PRNG uses the same registers in secss, avoid
Greg Kroah-Hartman
maintainerPATCH 22/575 media: rkvdec: Do not override sizeimage for output format
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
commit 298d8e8f7bcf023aceb60232d59b983255fec0df upstream.
The rkvdec H.264 decoder currently overrides sizeimage for the output format. This causes issues when userspace requires and requests a larger buffer, but ends up with one of insufficient size.
Instead, only provide a default size if none was requested. This fixes the video_decode_accelerator_tests from Chromium failing on the first frame due to insufficient buffer space. It also aligns the behavior of the rkvdec driver with the Hantro and Cedrus drivers.
--- drivers/staging/media/rkvdec/rkvdec-h264.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/media/rkvdec/rkvdec-h264.c +3 -2
@@ -1015,8 +1015,9 @@ static int rkvdec_h264_adjust_fmt(structstruct v4l2_pix_format_mplane *fmt = &f->fmt.pix_mp; fmt->num_planes =1 ; - fmt->plane_fmt[0 ].sizeimage = fmt->width * fmt->height * -RKVDEC_H264_MAX_DEPTH_IN_BYTES ; +if (!fmt->plane_fmt[0 ].sizeimage) + fmt->plane_fmt[0 ].sizeimage = fmt->width * fmt->height * +RKVDEC_H264_MAX_DEPTH_IN_BYTES ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 23/575 media: ite-cir: IR receiver stop working after receive overflow
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit fdc881783099c6343921ff017450831c8766d12a upstream.
On an Intel NUC6iSYK, no IR is reported after a receive overflow.
When a receiver overflow occurs, this condition is only cleared by reading the fifo. Make sure we read anything in the fifo.
--- drivers/media/rc/ite-cir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/ite-cir.c +1 -1
@@ -283,7 +283,7 @@ static irqreturn_t ite_cir_isr(int irq, }/* check for the receive interrupt */ -if (iflags &ITE_IRQ_RX_FIFO ) { +if (iflags & (ITE_IRQ_RX_FIFO |ITE_IRQ_RX_FIFO_OVERRUN )) {/* read the FIFO bytes */ rx_bytes = dev->params.get_rx_bytes(dev, rx_buf,
Greg Kroah-Hartman
maintainerPATCH 24/575 media: rkvdec: Support dynamic resolution changes
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
commit 0887e9e152efbd3601d6c907e90033d25067277d upstream.
The mem-to-mem stateless decoder API specifies support for dynamic resolution changes. In particular, the decoder should accept format changes on the OUTPUT queue even when buffers have been allocated, as long as it is not streaming.
Relax restrictions for S_FMT as described in the previous paragraph, and as long as the codec format remains the same. This aligns it with the Hantro and Cedrus decoders. This change was mostly based on commit ae02d49493b5 ("media: hantro: Fix s_fmt for dynamic resolution changes").
Since rkvdec_s_fmt() is now just a wrapper around the output/capture variants without any additional shared functionality, drop the wrapper and call the respective functions directly.
--- drivers/staging/media/rkvdec/rkvdec.c | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/staging/media/rkvdec/rkvdec.c +20 -20
@@ -270,31 +270,20 @@ static int rkvdec_try_output_fmt(structreturn 0 ; } -static int rkvdec_s_fmt (struct file *file,void *priv, -struct v4l2_format *f, -int (*try_fmt)(struct file *,void *, -struct v4l2_format *)) +static int rkvdec_s_capture_fmt (struct file *file,void *priv, +struct v4l2_format *f) {struct rkvdec_ctx *ctx =fh_to_rkvdec_ctx (priv);struct vb2_queue *vq; +int ret; -if (!try_fmt) -return -EINVAL ; - - vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx, f->type); +/* Change not allowed if queue is busy */ + vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx, +V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE );if (vb2_is_busy (vq))return -EBUSY ; -return try_fmt (file, priv, f); -} - -static int rkvdec_s_capture_fmt (struct file *file,void *priv, -struct v4l2_format *f) -{ -struct rkvdec_ctx *ctx =fh_to_rkvdec_ctx (priv); -int ret; - - ret =rkvdec_s_fmt (file, priv, f, rkvdec_try_capture_fmt); + ret =rkvdec_try_capture_fmt (file, priv, f);if (ret)return ret;
@@ -309,10 +298,21 @@ static int rkvdec_s_output_fmt(struct fistruct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx;const struct rkvdec_coded_fmt_desc *desc;struct v4l2_format *cap_fmt; -struct vb2_queue *peer_vq; +struct vb2_queue *peer_vq, *vq;int ret;/* +* In order to support dynamic resolution change, the decoder admits +* a resolution change, as long as the pixelformat remains. Can't be +* done if streaming. +*/ + vq =v4l2_m2m_get_vq (m2m_ctx,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ); +if (vb2_is_streaming (vq) || + (vb2_is_busy (vq) && + f->fmt.pix_mp.pixelformat != ctx->coded_fmt.fmt.pix_mp.pixelformat)) +return -EBUSY ; + +/* * Since format change on the OUTPUT queue will reset the CAPTURE * queue, we can't allow doing so when the CAPTURE queue has buffers * allocated.
@@ -321,7 +321,7 @@ static int rkvdec_s_output_fmt(struct fiif (vb2_is_busy (peer_vq))return -EBUSY ; - ret =rkvdec_s_fmt (file, priv, f, rkvdec_try_output_fmt); + ret =rkvdec_try_output_fmt (file, priv, f);if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 25/575 media: ir-kbd-i2c: improve responsiveness of hauppauge zilog receivers
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit c73ba202a851c0b611ef2c25e568fadeff5e667f upstream.
The IR receiver has two issues:
- Sometimes there is no response to a button press
- Sometimes a button press is repeated when it should not have been
Hanging the polling interval fixes this behaviour.
--- drivers/media/i2c/ir-kbd-i2c.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/ir-kbd-i2c.c +1 -0
@@ -791,6 +791,7 @@ static int ir_probe(struct i2c_client *c rc_proto =RC_PROTO_BIT_RC5 |RC_PROTO_BIT_RC6_MCE |RC_PROTO_BIT_RC6_6A_32 ; ir_codes =RC_MAP_HAUPPAUGE ; + ir->polling_interval =125 ; probe_tx = true;break ; }
Greg Kroah-Hartman
maintainerPATCH 26/575 media: v4l2-ioctl: Fix check_ext_ctrls
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
commit 861f92cb9160b14beef0ada047384c2340701ee2 upstream.
Drivers that do not use the ctrl-framework use this function instead.
Fix the following issues:
- Do not check for multiple classes when getting the DEF_VAL.
- Return -EINVAL for request_api calls
- Default value cannot be changed, return EINVAL as soon as possible.
- Return the right error_idx
[If an error is found when validating the list of controls passed with VIDIOC_G_EXT_CTRLS, then error_idx shall be set to ctrls->count to indicate to userspace that no actual hardware was touched. It would have been much nicer of course if error_idx could point to the control index that failed the validation, but sadly that's not how the API was designed.]
Fixes v4l2-compliance:
Control ioctls (Input 0):
warn: v4l2-test-controls.cpp(834): error_idx should be equal to count
warn: v4l2-test-controls.cpp(855): error_idx should be equal to count
fail: v4l2-test-controls.cpp(813): doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls)
test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL
Buffer ioctls (Input 0):
fail: v4l2-test-buffers.cpp(1994): ret != EINVAL && ret != EBADR && ret != ENOTTY test Requests: FAIL
--- drivers/media/v4l2-core/v4l2-ioctl.c | 60 ++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 21 deletions(-)
drivers/media/v4l2-core/v4l2-ioctl.c +39 -21
@@ -907,7 +907,7 @@ static void v4l_print_default(const voidpr_cont ("driver-specific ioctl\n" ); } -static int check_ext_ctrls (struct v4l2_ext_controls *c,int allow_priv) +static bool check_ext_ctrls (struct v4l2_ext_controls *c,unsigned long ioctl) {__u32 i;
@@ -916,23 +916,41 @@ static int check_ext_ctrls(struct v4l2_efor (i =0 ; i < c->count; i++) c->controls[i].reserved2[0 ] =0 ; -/* V4L2_CID_PRIVATE_BASE cannot be used as control class -when using extended controls. -Only when passed in through VIDIOC_G_CTRL and VIDIOC_S_CTRL -is it allowed for backwards compatibility. -*/ -if (!allow_priv && c->which ==V4L2_CID_PRIVATE_BASE ) -return 0 ; -if (!c->which) -return 1 ; +switch (c->which) { +case V4L2_CID_PRIVATE_BASE : +/* +* V4L2_CID_PRIVATE_BASE cannot be used as control class +* when using extended controls. +* Only when passed in through VIDIOC_G_CTRL and VIDIOC_S_CTRL +* is it allowed for backwards compatibility. +*/ +if (ioctl ==VIDIOC_G_CTRL || ioctl ==VIDIOC_S_CTRL ) +return false; +break ; +case V4L2_CTRL_WHICH_DEF_VAL : +/* Default value cannot be changed */ +if (ioctl ==VIDIOC_S_EXT_CTRLS || + ioctl ==VIDIOC_TRY_EXT_CTRLS ) { + c->error_idx = c->count; +return false; + } +return true; +case V4L2_CTRL_WHICH_CUR_VAL : +return true; +case V4L2_CTRL_WHICH_REQUEST_VAL : + c->error_idx = c->count; +return false; + } +/* Check that all controls are from the same control class. */ for (i =0 ; i < c->count; i++) {if (V4L2_CTRL_ID2WHICH (c->controls[i].id) != c->which) { - c->error_idx = i; -return 0 ; + c->error_idx = ioctl ==VIDIOC_TRY_EXT_CTRLS ? i : + c->count; +return false; } } -return 1 ; +return true; }static int check_fmt (struct file *file,enum v4l2_buf_type type)
@@ -2226,7 +2244,7 @@ static int v4l_g_ctrl(const struct v4l2_ ctrls.controls = &ctrl; ctrl.id = p->id; ctrl.value = p->value; -if (check_ext_ctrls (&ctrls,1 )) { +if (check_ext_ctrls (&ctrls,VIDIOC_G_CTRL )) {int ret = ops->vidioc_g_ext_ctrls (file, fh, &ctrls);if (ret ==0 )
@@ -2260,7 +2278,7 @@ static int v4l_s_ctrl(const struct v4l2_ ctrls.controls = &ctrl; ctrl.id = p->id; ctrl.value = p->value; -if (check_ext_ctrls (&ctrls,1 )) +if (check_ext_ctrls (&ctrls,VIDIOC_S_CTRL ))return ops->vidioc_s_ext_ctrls (file, fh, &ctrls);return -EINVAL ; }
@@ -2282,8 +2300,8 @@ static int v4l_g_ext_ctrls(const struct vfd, vfd->v4l2_dev->mdev, p);if (ops->vidioc_g_ext_ctrls ==NULL )return -ENOTTY ; -return check_ext_ctrls (p,0 ) ? ops->vidioc_g_ext_ctrls (file, fh, p) : - -EINVAL ; +return check_ext_ctrls (p,VIDIOC_G_EXT_CTRLS ) ? + ops->vidioc_g_ext_ctrls (file, fh, p) : -EINVAL ; } static int v4l_s_ext_ctrls(const struct v4l2_ioctl_ops *ops,
@@ -2303,8 +2321,8 @@ static int v4l_s_ext_ctrls(const struct vfd, vfd->v4l2_dev->mdev, p);if (ops->vidioc_s_ext_ctrls ==NULL )return -ENOTTY ; -return check_ext_ctrls (p,0 ) ? ops->vidioc_s_ext_ctrls (file, fh, p) : - -EINVAL ; +return check_ext_ctrls (p,VIDIOC_S_EXT_CTRLS ) ? + ops->vidioc_s_ext_ctrls (file, fh, p) : -EINVAL ; } static int v4l_try_ext_ctrls(const struct v4l2_ioctl_ops *ops,
@@ -2324,8 +2342,8 @@ static int v4l_try_ext_ctrls(const struc vfd, vfd->v4l2_dev->mdev, p);if (ops->vidioc_try_ext_ctrls ==NULL )return -ENOTTY ; -return check_ext_ctrls (p,0 ) ? ops->vidioc_try_ext_ctrls (file, fh, p) : - -EINVAL ; +return check_ext_ctrls (p,VIDIOC_TRY_EXT_CTRLS ) ? + ops->vidioc_try_ext_ctrls (file, fh, p) : -EINVAL ; }/*
Greg Kroah-Hartman
maintainerPATCH 27/575 ALSA: hda/realtek: Fix mic mute LED for the HP Spectre x360 14
In reply to Greg Kroah-HartmanFrom: Johnathon Clark <[email protected]>
commit 5fc462c3aaad601d5089fd5588a5799896a6937d upstream.
On the 'HP Spectre x360 Convertible 14-ea0xx' the microphone mute led is controlled by GPIO 0x04. The speaker mute LED does not seem to be exposed by GPIO and is there not set.
[ a slight coding-style fix by tiwai ]
--- sound/pci/hda/patch_realtek.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
sound/pci/hda/patch_realtek.c +17 -0
@@ -4300,6 +4300,16 @@ static void alc287_fixup_hp_gpio_led(stralc_fixup_hp_gpio_led (codec, action,0x10 ,0 ); } +static void alc245_fixup_hp_gpio_led (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct alc_spec *spec = codec->spec; + +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) + spec->micmute_led_polarity =1 ; +alc_fixup_hp_gpio_led (codec, action,0 ,0x04 ); +} +/* turn on/off mic-mute LED per capture hook via VREF change */ static int vref_micmute_led_set (struct led_classdev *led_cdev,enum led_brightness brightness)
@@ -6616,6 +6626,7 @@ enum {ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK ,ALC287_FIXUP_HP_GPIO_LED ,ALC256_FIXUP_HP_HEADSET_MIC , +ALC245_FIXUP_HP_GPIO_LED ,ALC236_FIXUP_DELL_AIO_HEADSET_MIC ,ALC282_FIXUP_ACER_DISABLE_LINEOUT , ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST,
@@ -7239,6 +7250,8 @@ static const struct hda_fixup alc269_fix [ALC245_FIXUP_HP_X360_AMP] = { .type = HDA_FIXUP_FUNC, .v.func = alc245_fixup_hp_x360_amp, + .chained = true, + .chain_id =ALC245_FIXUP_HP_GPIO_LED }, [ALC288_FIXUP_DELL_HEADSET_MODE] = { .type = HDA_FIXUP_FUNC,
@@ -8328,6 +8341,10 @@ static const struct hda_fixup alc269_fix .type = HDA_FIXUP_FUNC, .v.func = alc256_fixup_tongfang_reset_persistent_settings, }, + [ALC245_FIXUP_HP_GPIO_LED] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc245_fixup_hp_gpio_led, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = {
Greg Kroah-Hartman
maintainerPATCH 28/575 ALSA: hda/realtek: Add a quirk for HP OMEN 15 mute LED
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 375f8426ed994addd2be4d76febc946a6fdd8280 upstream.
HP OMEN 15 laptop requires the quirk to fiddle with COEF 0x0b bit 2 for toggling the mute LED. It's already implemented for other HP laptops, and we just need to add a proper fixup entry.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8530,6 +8530,7 @@ static const struct snd_pci_quirk alc269 ALC285_FIXUP_HP_GPIO_AMP_INIT),SND_PCI_QUIRK (0x103c ,0x8783 ,"HP ZBook Fury 15 G7 Mobile Workstation" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ), +SND_PCI_QUIRK (0x103c ,0x8788 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x87c8 ,"HP" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x87e5 ,"HP ProBook 440 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x87e7, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 29/575 ALSA: hda/realtek: Add quirk for Clevo PC70HS
In reply to Greg Kroah-HartmanFrom: Tim Crawford <[email protected]>
commit dbfe83507cf4ea66ce4efee2ac14c5ad420e31d3 upstream.
Apply the PB51ED PCI quirk to the Clevo PC70HS. Fixes audio output from the internal speakers.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -2551,6 +2551,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1558 ,0x67d1 ,"Clevo PB71[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67e1 ,"Clevo PB71[DE][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67e5 ,"Clevo PC70D[PRS](?:-D|-G)?" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x67f1 ,"Clevo PC70H[PRS]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x70d1 ,"Clevo PC70[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x7714 ,"Clevo X170SM" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), SND_PCI_QUIRK(0x1558, 0x7715, "Clevo X170KM-G", ALC1220_FIXUP_CLEVO_PB51ED),
Greg Kroah-Hartman
maintainerPATCH 30/575 ALSA: hda/realtek: Headset fixup for Clevo NH77HJQ
In reply to Greg Kroah-HartmanFrom: Jeremy Soller <[email protected]>
commit 1278cc5ac2f96bab50dd55c8c05e0a6a77ce323e upstream.
On Clevo NH77HJ, NH77HP, and their 15" variants, there is a headset microphone input attached to 0x19 that does not have a jack detect. In order to get it working, the pin configuration needs to be set correctly, and a new ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE fixup is applied. This is similar to the existing System76 quirk for ALC293, but for ALC256.
--- sound/pci/hda/patch_realtek.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
sound/pci/hda/patch_realtek.c +14 -0
@@ -6645,6 +6645,7 @@ enum {ALC287_FIXUP_YOGA7_14ITL_SPEAKERS ,ALC287_FIXUP_13S_GEN2_SPEAKERS ,ALC256_FIXUP_TONGFANG_RESET_PERSISTENT_SETTINGS , + ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE, }; static const struct hda_fixup alc269_fixups[] = {
@@ -8346,6 +8347,15 @@ static const struct hda_fixup alc269_fix .type = HDA_FIXUP_FUNC, .v.func = alc245_fixup_hp_gpio_led, }, + [ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x19 ,0x03a11120 },/* use as headset mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8642,11 +8652,15 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1558 ,0x40a1 ,"Clevo NL40GU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x40c1 ,"Clevo NL40[CZ]U" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x40d1 ,"Clevo NL41DU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x5015 ,"Clevo NH5[58]H[HJK]Q" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x5017 ,"Clevo NH7[79]H[HJK]Q" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50a3 ,"Clevo NJ51GU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50b3 ,"Clevo NK50S[BEZ]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50b6 ,"Clevo NK50S5" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50b8 ,"Clevo NK50SZ" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50d5 ,"Clevo NP50D5" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x50e1 ,"Clevo NH5[58]HPQ" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x50e2 ,"Clevo NH7[79]HPQ" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50f0 ,"Clevo NH50A[CDF]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50f2 ,"Clevo NH50E[PR]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0x50f3, "Clevo NH58DPQ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
Greg Kroah-Hartman
maintainerPATCH 31/575 ALSA: hda/realtek: Add a quirk for Acer Spin SP513-54N
In reply to Greg Kroah-HartmanFrom: Jaroslav Kysela <[email protected]>
commit 2a5bb694488bb6593066d46881bfd9d07edd1628 upstream.
Another model requires ALC255_FIXUP_ACER_MIC_NO_PRESENCE fixup.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8392,6 +8392,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1025 ,0x1308 ,"Acer Aspire Z24-890" ,ALC286_FIXUP_ACER_AIO_HEADSET_MIC ),SND_PCI_QUIRK (0x1025 ,0x132a ,"Acer TravelMate B114-21" ,ALC233_FIXUP_ACER_HEADSET_MIC ),SND_PCI_QUIRK (0x1025 ,0x1330 ,"Acer TravelMate X514-51T" ,ALC255_FIXUP_ACER_HEADSET_MIC ), +SND_PCI_QUIRK (0x1025 ,0x141f ,"Acer Spin SP513-54N" ,ALC255_FIXUP_ACER_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1025 ,0x142b ,"Acer Swift SF314-42" ,ALC255_FIXUP_ACER_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1025 ,0x1430 ,"Acer TravelMate B311R-31" ,ALC256_FIXUP_ACER_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),
Greg Kroah-Hartman
maintainerPATCH 32/575 ALSA: hda/realtek: Add quirk for ASUS UX550VE
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 4fad4fb9871b43389e4f4bead18ec693064697bb upstream.
ASUS UX550VE (SSID 1043:1970) requires a similar workaround for managing the routing of the 4 speakers like some other ASUS models. Add a corresponding quirk entry for fixing it.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8590,6 +8590,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x18b1 ,"Asus MJ401TA" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1043 ,0x18f1 ,"Asus FX505DT" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1043 ,0x194e ,"ASUS UX563FD" ,ALC294_FIXUP_ASUS_HPE ), +SND_PCI_QUIRK (0x1043 ,0x1970 ,"ASUS UX550VE" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1982 ,"ASUS B1400CEPE" ,ALC256_FIXUP_ASUS_HPE ),SND_PCI_QUIRK (0x1043 ,0x19ce ,"ASUS B9450FA" ,ALC294_FIXUP_ASUS_HPE ), SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE),
Greg Kroah-Hartman
maintainerPATCH 33/575 ALSA: hda/realtek: Add quirk for HP EliteBook 840 G7 mute LED
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit c058493df7edcef8f48c1494d9a84218519f966b upstream.
The mute and micmute LEDs don't work on HP EliteBook 840 G7. The same quirk for other HP laptops can let LEDs work, so apply it.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8532,6 +8532,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8716 ,"HP Elite Dragonfly G2 Notebook PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8720 ,"HP EliteBook x360 1040 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8724 ,"HP EliteBook 850 G7" ,ALC285_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8728 ,"HP EliteBook 840 G7" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8729 ,"HP" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8730 ,"HP ProBook 445 G7" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ), SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_AMP_INIT),
Greg Kroah-Hartman
maintainerPATCH 34/575 ALSA: ua101: fix division by zero at probe
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 55f261b73a7e1cb254577c3536cef8f415de220a upstream.
Add the missing endpoint max-packet sanity check to probe() to avoid division by zero in alloc_stream_buffers() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing).
Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")).
--- sound/usb/misc/ua101.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/misc/ua101.c +2 -2
@@ -1001,7 +1001,7 @@ static int detect_usb_format(struct ua10 fmt_playback->bSubframeSize * ua->playback.channels; epd = &ua->intf[INTF_CAPTURE ]->altsetting[1 ].endpoint[0 ].desc; -if (!usb_endpoint_is_isoc_in (epd)) { +if (!usb_endpoint_is_isoc_in (epd) ||usb_endpoint_maxp (epd) ==0 ) {dev_err (&ua->dev->dev,"invalid capture endpoint\n" );return -ENXIO ; }
@@ -1009,7 +1009,7 @@ static int detect_usb_format(struct ua10 ua->capture.max_packet_bytes =usb_endpoint_maxp (epd); epd = &ua->intf[INTF_PLAYBACK ]->altsetting[1 ].endpoint[0 ].desc; -if (!usb_endpoint_is_isoc_out (epd)) { +if (!usb_endpoint_is_isoc_out (epd) ||usb_endpoint_maxp (epd) ==0 ) {dev_err (&ua->dev->dev,"invalid playback endpoint\n" );return -ENXIO ; }
Greg Kroah-Hartman
maintainerPATCH 35/575 ALSA: 6fire: fix control and bulk message timeouts
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 9b371c6cc37f954360989eec41c2ddc5a6b83917 upstream.
USB control and bulk message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- sound/usb/6fire/comm.c | 2 +- sound/usb/6fire/firmware.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
sound/usb/6fire/comm.c +1 -1
@@ -95,7 +95,7 @@ static int usb6fire_comm_send_buffer(u8int actual_len; ret =usb_interrupt_msg (dev,usb_sndintpipe (dev,COMM_EP ), - buffer, buffer[1 ] +2 , &actual_len,HZ ); + buffer, buffer[1 ] +2 , &actual_len,1000 );if (ret <0 )return ret;else if (actual_len != buffer[1 ] +2 )
sound/usb/6fire/firmware.c +3 -3
@@ -160,7 +160,7 @@ static int usb6fire_fw_ezusb_write(struc {return usb_control_msg_send (device,0 , type,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , - value,0 , data, len,HZ ,GFP_KERNEL ); + value,0 , data, len,1000 ,GFP_KERNEL ); } static int usb6fire_fw_ezusb_read(struct usb_device *device,
@@ -168,7 +168,7 @@ static int usb6fire_fw_ezusb_read(struct {return usb_control_msg_recv (device,0 , type,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , - value,0 , data, len,HZ ,GFP_KERNEL ); + value,0 , data, len,1000 ,GFP_KERNEL ); } static int usb6fire_fw_fpga_write(struct usb_device *device,
@@ -178,7 +178,7 @@ static int usb6fire_fw_fpga_write(structint ret; ret =usb_bulk_msg (device,usb_sndbulkpipe (device,FPGA_EP ), data, len, - &actual_len,HZ ); + &actual_len,1000 );if (ret <0 )return ret;else if (actual_len != len)
Greg Kroah-Hartman
maintainerPATCH 36/575 ALSA: line6: fix control and interrupt message timeouts
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit f4000b58b64344871d7b27c05e73932f137cfef6 upstream.
USB control and interrupt message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- sound/usb/line6/driver.c | 14 +++++++------- sound/usb/line6/driver.h | 2 +- sound/usb/line6/podhd.c | 6 +++--- sound/usb/line6/toneport.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-)
sound/usb/line6/driver.c +7 -7
@@ -113,12 +113,12 @@ int line6_send_raw_message(struct usb_li retval =usb_interrupt_msg (line6->usbdev,usb_sndintpipe (line6->usbdev, properties->ep_ctrl_w), (char *)frag_buf, frag_size, - &partial,LINE6_TIMEOUT *HZ ); + &partial,LINE6_TIMEOUT ); }else { retval =usb_bulk_msg (line6->usbdev,usb_sndbulkpipe (line6->usbdev, properties->ep_ctrl_w), (char *)frag_buf, frag_size, - &partial,LINE6_TIMEOUT *HZ ); + &partial,LINE6_TIMEOUT ); }if (retval) {
@@ -347,7 +347,7 @@ int line6_read_data(struct usb_line6 *li ret =usb_control_msg_send (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT , (datalen <<8 ) |0x21 , address,NULL ,0 , -LINE6_TIMEOUT *HZ ,GFP_KERNEL ); +LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {dev_err (line6->ifcdev,"read request failed (error %d)\n" , ret); goto exit;
@@ -360,7 +360,7 @@ int line6_read_data(struct usb_line6 *li ret =usb_control_msg_recv (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0x0012 ,0x0000 , &len,1 , -LINE6_TIMEOUT *HZ ,GFP_KERNEL ); +LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {dev_err (line6->ifcdev,"receive length failed (error %d)\n" , ret);
@@ -387,7 +387,7 @@ int line6_read_data(struct usb_line6 *li/* receive the result: */ ret =usb_control_msg_recv (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN , -0x0013 ,0x0000 , data, datalen,LINE6_TIMEOUT *HZ , +0x0013 ,0x0000 , data, datalen,LINE6_TIMEOUT ,GFP_KERNEL );if (ret)dev_err (line6->ifcdev,"read failed (error %d)\n" , ret);
@@ -417,7 +417,7 @@ int line6_write_data(struct usb_line6 *l ret =usb_control_msg_send (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT , -0x0022 , address, data, datalen,LINE6_TIMEOUT *HZ , +0x0022 , address, data, datalen,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) { dev_err(line6->ifcdev,
@@ -430,7 +430,7 @@ int line6_write_data(struct usb_line6 *l ret =usb_control_msg_recv (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN , -0x0012 ,0x0000 , status,1 ,LINE6_TIMEOUT *HZ , +0x0012 ,0x0000 , status,1 ,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) { dev_err(line6->ifcdev,
sound/usb/line6/driver.h +1 -1
@@ -27,7 +27,7 @@#define LINE6_FALLBACK_INTERVAL 10#define LINE6_FALLBACK_MAXPACKETSIZE 16 -#define LINE6_TIMEOUT 1 +#define LINE6_TIMEOUT 1000#define LINE6_BUFSIZE_LISTEN 64#define LINE6_MIDI_MESSAGE_MAXLEN 256
sound/usb/line6/podhd.c +3 -3
@@ -190,7 +190,7 @@ static int podhd_dev_start(struct usb_li ret =usb_control_msg_send (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT ,0x11 ,0 , -NULL ,0 ,LINE6_TIMEOUT *HZ ,GFP_KERNEL ); +NULL ,0 ,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {dev_err (pod->line6.ifcdev,"read request failed (error %d)\n" , ret); goto exit;
@@ -200,7 +200,7 @@ static int podhd_dev_start(struct usb_li ret =usb_control_msg_recv (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0x11 ,0x0 , - init_bytes,3 ,LINE6_TIMEOUT *HZ ,GFP_KERNEL ); + init_bytes,3 ,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {dev_err (pod->line6.ifcdev,"receive length failed (error %d)\n" , ret);
@@ -220,7 +220,7 @@ static int podhd_dev_start(struct usb_liUSB_REQ_SET_FEATURE ,USB_TYPE_STANDARD |USB_RECIP_DEVICE |USB_DIR_OUT ,1 ,0 , - NULL, 0, LINE6_TIMEOUT * HZ, GFP_KERNEL); + NULL, 0, LINE6_TIMEOUT, GFP_KERNEL); exit:return ret; }
sound/usb/line6/toneport.c +1 -1
@@ -128,7 +128,7 @@ static int toneport_send_cmd(struct usb_ ret =usb_control_msg_send (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT , - cmd1, cmd2,NULL ,0 ,LINE6_TIMEOUT *HZ , + cmd1, cmd2,NULL ,0 ,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {
Greg Kroah-Hartman
maintainerPATCH 37/575 ALSA: usb-audio: Line6 HX-Stomp XL USB_ID for 48k-fixed quirk
In reply to Greg Kroah-HartmanFrom: Jason Ormes <[email protected]>
commit 8f27b689066113a3e579d4df171c980c54368c4e upstream.
Adding the Line6 HX-Stomp XL USB_ID as it needs this fixed frequency quirk as well.
The device is basically just the HX-Stomp with some more buttons on the face. I've done some recording with it after adding it, and it seems to function properly with this fix. The Midi features appear to be working as well.
[ a coding style fix and patch reformat by tiwai ]
--- sound/usb/format.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/format.c +1 -0
@@ -410,6 +410,7 @@ static int line6_parse_audio_format_ratecase USB_ID (0x0e41 ,0x4242 ):/* Line6 Helix Rack */ case USB_ID (0x0e41 ,0x4244 ):/* Line6 Helix LT */ case USB_ID (0x0e41 ,0x4246 ):/* Line6 HX-Stomp */ +case USB_ID (0x0e41 ,0x4253 ):/* Line6 HX-Stomp XL */ case USB_ID (0x0e41 ,0x4247 ):/* Line6 Pod Go */ case USB_ID (0x0e41 ,0x4248 ):/* Line6 Helix >= fw 2.82 */ case USB_ID (0x0e41 ,0x4249 ):/* Line6 Helix Rack >= fw 2.82 */
Greg Kroah-Hartman
maintainerPATCH 38/575 ALSA: usb-audio: Add registration quirk for JBL Quantum 400
In reply to Greg Kroah-HartmanFrom: Alexander Tsoy <[email protected]>
commit 763d92ed5dece7d439fc28a88b2d2728d525ffd9 upstream.
Add another device ID for JBL Quantum 400. It requires the same quirk as other JBL Quantum devices.
--- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/quirks.c +1 -0
@@ -1897,6 +1897,7 @@ static const struct registration_quirk rREG_QUIRK_ENTRY (0x0951 ,0x16ea ,2 ),/* Kingston HyperX Cloud Flight S */ REG_QUIRK_ENTRY (0x0ecb ,0x1f46 ,2 ),/* JBL Quantum 600 */ REG_QUIRK_ENTRY (0x0ecb ,0x1f47 ,2 ),/* JBL Quantum 800 */ +REG_QUIRK_ENTRY (0x0ecb ,0x1f4c ,2 ),/* JBL Quantum 400 */ REG_QUIRK_ENTRY (0x0ecb ,0x2039 ,2 ),/* JBL Quantum 400 */ REG_QUIRK_ENTRY (0x0ecb ,0x203c ,2 ),/* JBL Quantum 600 */ REG_QUIRK_ENTRY(0x0ecb, 0x203e, 2), /* JBL Quantum 800 */
Greg Kroah-Hartman
maintainerPATCH 39/575 ALSA: hda: Free card instance properly at probe errors
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 39173303c83859723dab32c2abfb97296d6af3bf upstream.
The recent change in hda-intel driver to allow repeated probes surfaced a problem that has been hidden until; the probe process in the work calls azx_free() at the error path, and this skips the card free process that eventually releases codec instances. As a result, we get a kernel WARNING like:
snd_hda_intel 0000:00:1f.3: Cannot probe codecs, giving up
------------[ cut here ]------------ WARNING: CPU: 14 PID: 186 at sound/hda/hdac_bus.c:73 ....
For fixing this, we need to call snd_card_free() instead of azx_free(). Additionally, the device drvdata has to be cleared, as the driver binding itself is still active. Then the PM and other driver callbacks will ignore the procedure.
--- sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/pci/hda/hda_intel.c +2 -1
@@ -2392,7 +2392,8 @@ static int azx_probe_continue(struct azx out_free:if (err <0 ) { -azx_free (chip); +pci_set_drvdata (pci,NULL ); +snd_card_free (chip->card);return err; }
Greg Kroah-Hartman
maintainerPATCH 40/575 ALSA: synth: missing check for possible NULL after the call to kstrdup
In reply to Greg Kroah-HartmanFrom: Austin Kim <[email protected]>
commit d159037abbe3412285c271bdfb9cdf19e62678ff upstream.
If kcalloc() return NULL due to memory starvation, it is possible for kstrdup() to return NULL in similar case. So add null check after the call to kstrdup() is made.
[ minor coding-style fix by tiwai ]
--- sound/synth/emux/emux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/synth/emux/emux.c +1 -1
@@ -88,7 +88,7 @@ int snd_emux_register(struct snd_emux *e emu->name =kstrdup (name,GFP_KERNEL ); emu->voices =kcalloc (emu->max_voices,sizeof (struct snd_emux_voice ),GFP_KERNEL ); -if (emu->voices ==NULL ) +if (emu->name ==NULL || emu->voices ==NULL )return -ENOMEM ;/* create soundfont list */
Greg Kroah-Hartman
maintainerPATCH 41/575 ALSA: timer: Fix use-after-free problem
In reply to Greg Kroah-HartmanFrom: Wang Wensheng <[email protected]>
commit c0317c0e87094f5b5782b6fdef5ae0a4b150496c upstream.
When the timer instance was add into ack_list but was not currently in process, the user could stop it via snd_timer_stop1() without delete it from the ack_list. Then the user could free the timer instance and when it was actually processed UAF occurred.
This issue could be reproduced via testcase snd_timer01 in ltp - running several instances of that testcase at the same time.
What I actually met was that the ack_list of the timer broken and the kernel went into deadloop with irqoff. That could be detected by hardlockup detector on board or when we run it on qemu, we could use gdb to dump the ack_list when the console has no response.
To fix this issue, we delete the timer instance from ack_list and active_list unconditionally in snd_timer_stop1().
--- sound/core/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/timer.c +2 -2
@@ -624,13 +624,13 @@ static int snd_timer_stop1(struct snd_tiif (!timer)return -EINVAL ;spin_lock_irqsave (&timer->lock, flags); +list_del_init (&timeri->ack_list); +list_del_init (&timeri->active_list);if (!(timeri->flags & (SNDRV_TIMER_IFLG_RUNNING |SNDRV_TIMER_IFLG_START ))) { result = -EBUSY ; goto unlock; } -list_del_init (&timeri->ack_list); -list_del_init (&timeri->active_list);if (timer->card && timer->card->shutdown) goto unlock;if (stop) {
Greg Kroah-Hartman
maintainerPATCH 42/575 ALSA: timer: Unconditionally unlink slave instances, too
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit ffdd98277f0a1d15a67a74ae09bee713df4c0dbc upstream.
Like the previous fix (commit c0317c0e8709 "ALSA: timer: Fix use-after-free problem"), we have to unlink slave timer instances immediately at snd_timer_stop(), too. Otherwise it may leave a stale entry in the list if the slave instance is freed before actually running.
--- sound/core/timer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
sound/core/timer.c +6 -7
@@ -665,23 +665,22 @@ static int snd_timer_stop1(struct snd_tistatic int snd_timer_stop_slave (struct snd_timer_instance *timeri,bool stop) {unsigned long flags; +bool running;spin_lock_irqsave (&slave_active_lock, flags); -if (!(timeri->flags &SNDRV_TIMER_IFLG_RUNNING )) { -spin_unlock_irqrestore (&slave_active_lock, flags); -return -EBUSY ; - } + running = timeri->flags &SNDRV_TIMER_IFLG_RUNNING ; timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING ;if (timeri->timer) {spin_lock (&timeri->timer->lock);list_del_init (&timeri->ack_list);list_del_init (&timeri->active_list); -snd_timer_notify1 (timeri, stop ?SNDRV_TIMER_EVENT_STOP : -SNDRV_TIMER_EVENT_PAUSE ); +if (running) +snd_timer_notify1 (timeri, stop ?SNDRV_TIMER_EVENT_STOP : +SNDRV_TIMER_EVENT_PAUSE );spin_unlock (&timeri->timer->lock); }spin_unlock_irqrestore (&slave_active_lock, flags); -return 0 ; +return running ?0 : -EBUSY ; }/*
Greg Kroah-Hartman
maintainerPATCH 43/575 ext4: fix lazy initialization next schedule time computation in more granular unit
In reply to Greg Kroah-HartmanFrom: Shaoying Xu <[email protected]>
commit 39fec6889d15a658c3a3ebb06fd69d3584ddffd3 upstream.
Ext4 file system has default lazy inode table initialization setup once it is mounted. However, it has issue on computing the next schedule time that makes the timeout same amount in jiffies but different real time in secs if with various HZ values. Therefore, fix by measuring the current time in a more granular unit nanoseconds and make the next schedule time independent of the HZ value.
--- fs/ext4/super.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/ext4/super.c +4 -5
@@ -3436,9 +3436,9 @@ static int ext4_run_li_request(struct exstruct super_block *sb = elr->lr_super;ext4_group_t ngroups =EXT4_SB (sb)->s_groups_count;ext4_group_t group = elr->lr_next_group; -unsigned long timeout =0 ;unsigned int prefetch_ios =0 ;int ret =0 ; +u64 start_time;if (elr->lr_mode ==EXT4_LI_MODE_PREFETCH_BBITMAP ) { elr->lr_next_group = ext4_mb_prefetch(sb, group,
@@ -3475,14 +3475,13 @@ static int ext4_run_li_request(struct ex ret =1 ;if (!ret) { - timeout = jiffies; + start_time =ktime_get_real_ns (); ret =ext4_init_inode_table (sb, group, elr->lr_timeout ?0 :1 );trace_ext4_lazy_itable_init (sb, group);if (elr->lr_timeout ==0 ) { - timeout = (jiffies - timeout) * -EXT4_SB (elr->lr_super)->s_li_wait_mult; - elr->lr_timeout = timeout; + elr->lr_timeout =nsecs_to_jiffies ((ktime_get_real_ns () - start_time) * +EXT4_SB (elr->lr_super)->s_li_wait_mult); } elr->lr_next_sched = jiffies + elr->lr_timeout; elr->lr_next_group = group +1 ;
Greg Kroah-Hartman
maintainerPATCH 44/575 ext4: ensure enough credits in ext4_ext_shift_path_extents
In reply to Greg Kroah-HartmanFrom: yangerkun <[email protected]>
commit 4268496e48dc681cfa53b92357314b5d7221e625 upstream.
Like ext4_ext_rm_leaf, we can ensure that there are enough credits before every call that will consume credits. As part of this fix we fold the functionality of ext4_access_path() into ext4_ext_shift_path_extents(). This change is needed as a preparation for the next bugfix patch.
--- fs/ext4/extents.c | 49 +++++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-)
fs/ext4/extents.c +15 -34
@@ -4971,36 +4971,6 @@ int ext4_get_es_cache(struct inode *inod }/* -* ext4_access_path: -* Function to access the path buffer for marking it dirty. -* It also checks if there are sufficient credits left in the journal handle -* to update path. -*/ -static int -ext4_access_path (handle_t *handle,struct inode *inode, -struct ext4_ext_path *path) -{ -int credits, err; - -if (!ext4_handle_valid (handle)) -return 0 ; - -/* -* Check if need to extend journal credits -* 3 for leaf, sb, and inode plus 2 (bmap and group -* descriptor) for each block group; assume two block -* groups -*/ - credits =ext4_writepage_trans_blocks (inode); - err =ext4_datasem_ensure_credits (handle, inode,7 , credits,0 ); -if (err <0 ) -return err; - - err =ext4_ext_get_access (handle, inode, path); -return err; -} - -/* * ext4_ext_shift_path_extents: * Shift the extents of a path structure lying between path[depth].p_ext * and EXT_LAST_EXTENT(path[depth].p_hdr), by @shift blocks. @SHIFT tells
@@ -5014,6 +4984,7 @@ ext4_ext_shift_path_extents(struct ext4_int depth, err =0 ;struct ext4_extent *ex_start, *ex_last;bool update = false; +int credits, restart_credits; depth = path->p_depth;while (depth >=0 ) {
@@ -5023,13 +4994,23 @@ ext4_ext_shift_path_extents(struct ext4_return -EFSCORRUPTED ; ex_last =EXT_LAST_EXTENT (path[depth].p_hdr); +/* leaf + sb + inode */ + credits =3 ; +if (ex_start ==EXT_FIRST_EXTENT (path[depth].p_hdr)) { + update = true; +/* extent tree + sb + inode */ + credits = depth +2 ; + } - err =ext4_access_path (handle, inode, path + depth); + restart_credits =ext4_writepage_trans_blocks (inode); + err =ext4_datasem_ensure_credits (handle, inode, credits, + restart_credits,0 );if (err) goto out; -if (ex_start ==EXT_FIRST_EXTENT (path[depth].p_hdr)) - update = true; + err =ext4_ext_get_access (handle, inode, path + depth); +if (err) + goto out;while (ex_start <= ex_last) {if (SHIFT ==SHIFT_LEFT ) {
@@ -5060,7 +5041,7 @@ ext4_ext_shift_path_extents(struct ext4_ }/* Update index too */ - err =ext4_access_path (handle, inode, path + depth); + err =ext4_ext_get_access (handle, inode, path + depth);if (err) goto out;
Greg Kroah-Hartman
maintainerPATCH 45/575 ext4: refresh the ext4_ext_path struct after dropping i_data_sem.
In reply to Greg Kroah-HartmanFrom: yangerkun <[email protected]>
commit 1811bc401aa58c7bdb0df3205aa6613b49d32127 upstream.
After we drop i_data sem, we need to reload the ext4_ext_path structure since the extent tree can change once i_data_sem is released.
This addresses the BUG:
[52117.465187] ------------[ cut here ]------------ [52117.465686] kernel BUG at fs/ext4/extents.c:1756! ... [52117.478306] Call Trace: [52117.478565] ext4_ext_shift_extents+0x3ee/0x710 [52117.479020] ext4_fallocate+0x139c/0x1b40 [52117.479405] ? __do_sys_newfstat+0x6b/0x80 [52117.479805] vfs_fallocate+0x151/0x4b0 [52117.480177] ksys_fallocate+0x4a/0xa0 [52117.480533] __x64_sys_fallocate+0x22/0x30 [52117.480930] do_syscall_64+0x35/0x80 [52117.481277] entry_SYSCALL_64_after_hwframe+0x44/0xae [52117.481769] RIP: 0033:0x7fa062f855ca
--- fs/ext4/extents.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
fs/ext4/extents.c +13 -1
@@ -5005,8 +5005,11 @@ ext4_ext_shift_path_extents(struct ext4_ restart_credits =ext4_writepage_trans_blocks (inode); err =ext4_datasem_ensure_credits (handle, inode, credits, restart_credits,0 ); -if (err) +if (err) { +if (err >0 ) + err = -EAGAIN ; goto out; + } err =ext4_ext_get_access (handle, inode, path + depth);if (err)
@@ -5080,6 +5083,7 @@ ext4_ext_shift_extents(struct inode *inoint ret =0 , depth;struct ext4_extent *extent;ext4_lblk_t stop, *iterator, ex_start, ex_end; +ext4_lblk_t tmp =EXT_MAX_BLOCKS ;/* Let path point to the last extent */ path = ext4_find_extent(inode, EXT_MAX_BLOCKS - 1, NULL,
@@ -5133,11 +5137,15 @@ ext4_ext_shift_extents(struct inode *ino* till we reach stop. In case of right shift, iterator points to stop * and it is decreased till we reach start. */ +again:if (SHIFT ==SHIFT_LEFT ) iterator = &start;else iterator = &stop; +if (tmp !=EXT_MAX_BLOCKS ) + *iterator = tmp; +/* * Its safe to start updating extents. Start and stop are unsigned, so * in case of right shift if extent with 0 block is reached, iterator
@@ -5166,6 +5174,7 @@ ext4_ext_shift_extents(struct inode *ino } } + tmp = *iterator;if (SHIFT ==SHIFT_LEFT ) { extent =EXT_LAST_EXTENT (path[depth].p_hdr); *iterator = le32_to_cpu(extent->ee_block) +
@@ -5184,6 +5193,9 @@ ext4_ext_shift_extents(struct inode *ino } ret =ext4_ext_shift_path_extents (path, shift, inode, handle,SHIFT ); +/* iterator can be NULL which means we should break */ +if (ret == -EAGAIN ) + goto again;if (ret)break ; }
Greg Kroah-Hartman
maintainerPATCH 46/575 fuse: fix page stealing
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit 712a951025c0667ff00b25afc360f74e639dfabe upstream.
It is possible to trigger a crash by splicing anon pipe bufs to the fuse device.
The reason for this is that anon_pipe_buf_release() will reuse buf->page if the refcount is 1, but that page might have already been stolen and its flags modified (e.g. PG_lru added).
This happens in the unlikely case of fuse_dev_splice_write() getting around to calling pipe_buf_release() after a page has been stolen, added to the page cache and removed from the page cache.
Fix by calling pipe_buf_release() right after the page was inserted into the page cache. In this case the page has an elevated refcount so any release function will know that the page isn't reusable.
--- fs/fuse/dev.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
fs/fuse/dev.c +12 -2
@@ -851,6 +851,12 @@ static int fuse_try_move_page(struct fus goto out_put_old; } +/* +* Release while we have extra ref on stolen page. Otherwise +* anon_pipe_buf_release() might think the page can be reused. +*/ +pipe_buf_release (cs->pipe, buf); +get_page (newpage);if (!(buf->flags &PIPE_BUF_FLAG_LRU ))
@@ -2035,8 +2041,12 @@ static ssize_t fuse_dev_splice_write(strpipe_lock (pipe); out_free: -for (idx =0 ; idx < nbuf; idx++) -pipe_buf_release (pipe, &bufs[idx]); +for (idx =0 ; idx < nbuf; idx++) { +struct pipe_buffer *buf = &bufs[idx]; + +if (buf->ops) +pipe_buf_release (pipe, buf); + }pipe_unlock (pipe);kvfree (bufs);
Greg Kroah-Hartman
maintainerPATCH 47/575 x86/sme: Use #define USE_EARLY_PGTABLE_L5 in mem_encrypt_identity.c
In reply to Greg Kroah-HartmanFrom: Tom Lendacky <[email protected]>
commit e7d445ab26db833d6640d4c9a08bee176777cc82 upstream.
When runtime support for converting between 4-level and 5-level pagetables was added to the kernel, the SME code that built pagetables was updated to use the pagetable functions, e.g. p4d_offset(), etc., in order to simplify the code. However, the use of the pagetable functions in early boot code requires the use of the USE_EARLY_PGTABLE_L5 #define in order to ensure that the proper definition of pgtable_l5_enabled() is used.
Without the #define, pgtable_l5_enabled() is #defined as cpu_feature_enabled(X86_FEATURE_LA57). In early boot, the CPU features have not yet been discovered and populated, so pgtable_l5_enabled() will return false even when 5-level paging is enabled. This causes the SME code to always build 4-level pagetables to perform the in-place encryption. If 5-level paging is enabled, switching to the SME pagetables results in a page-fault that kills the boot.
Adding the #define results in pgtable_l5_enabled() using the __pgtable_l5_enabled variable set in early boot and the SME code building pagetables for the proper paging level.
--- arch/x86/mm/mem_encrypt_identity.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/x86/mm/mem_encrypt_identity.c +9 -0
@@ -27,6 +27,15 @@#undef CONFIG_PARAVIRT_XXL#undef CONFIG_PARAVIRT_SPINLOCKS +/* +* This code runs before CPU feature bits are set. By default, the +* pgtable_l5_enabled() function uses bit X86_FEATURE_LA57 to determine if +* 5-level paging is active, so that won't work here. USE_EARLY_PGTABLE_L5 +* is provided to handle this situation and, instead, use a variable that +* has been set by the early boot code. +*/ +#define USE_EARLY_PGTABLE_L5 +#include <linux/kernel.h> #include <linux/mm.h> #include <linux/mem_encrypt.h>
Greg Kroah-Hartman
maintainerPATCH 48/575 x86/cpu: Fix migration safety with X86_BUG_NULL_SEL
In reply to Greg Kroah-HartmanFrom: Jane Malalane <[email protected]>
commit 415de44076640483648d6c0f6d645a9ee61328ad upstream.
Currently, Linux probes for X86_BUG_NULL_SEL unconditionally which makes it unsafe to migrate in a virtualised environment as the properties across the migration pool might differ.
To be specific, the case which goes wrong is:
1. Zen1 (or earlier) and Zen2 (or later) in a migration pool
2. Linux boots on Zen2, probes and finds the absence of X86_BUG_NULL_SEL
3. Linux is then migrated to Zen1
Linux is now running on a X86_BUG_NULL_SEL-impacted CPU while believing that the bug is fixed.
The only way to address the problem is to fully trust the "no longer affected" CPUID bit when virtualised, because in the above case it would be clear deliberately to indicate the fact "you might migrate to somewhere which has this behaviour".
Zen3 adds the NullSelectorClearsBase CPUID bit to indicate that loading a NULL segment selector zeroes the base and limit fields, as well as just attributes. Zen2 also has this behaviour but doesn't have the NSCB bit.
[ bp: Minor touchups. ]
--- arch/x86/kernel/cpu/amd.c | 2 + arch/x86/kernel/cpu/common.c | 44 ++++++++++++++++++++++++++++++++++++------- arch/x86/kernel/cpu/cpu.h | 1 arch/x86/kernel/cpu/hygon.c | 2 + 4 files changed, 42 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/amd.c +2 -0
@@ -1017,6 +1017,8 @@ static void init_amd(struct cpuinfo_x86if (cpu_has (c,X86_FEATURE_IRPERF ) && !cpu_has_amd_erratum (c, amd_erratum_1054))msr_set_bit (MSR_K7_HWCR ,MSR_K7_HWCR_IRPERF_EN_BIT ); + +check_null_seg_clears_base (c); }#ifdef CONFIG_X86_32
arch/x86/kernel/cpu/common.c +37 -7
64 lines not on this page · raw message
arch/x86/kernel/cpu/cpu.h +1 -0
@@ -73,6 +73,7 @@ extern int detect_extended_topology_earlextern int detect_extended_topology (struct cpuinfo_x86 *c);extern int detect_ht_early (struct cpuinfo_x86 *c);extern void detect_ht (struct cpuinfo_x86 *c); +extern void check_null_seg_clears_base (struct cpuinfo_x86 *c);unsigned int aperfmperf_get_khz (int cpu);
arch/x86/kernel/cpu/hygon.c +2 -0
@@ -351,6 +351,8 @@ static void init_hygon(struct cpuinfo_x8/* Hygon CPUs don't reset SS attributes on SYSRET, Xen does. */ if (!cpu_has (c,X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS ); + +check_null_seg_clears_base (c); }static void cpu_detect_tlb_hygon (struct cpuinfo_x86 *c)
Greg Kroah-Hartman
maintainerPATCH 49/575 x86/irq: Ensure PI wakeup handler is unregistered before module unload
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 6ff53f6a438f72998f56e82e76694a1df9d1ea2c upstream.
Add a synchronize_rcu() after clearing the posted interrupt wakeup handler to ensure all readers, i.e. in-flight IRQ handlers, see the new handler before returning to the caller. If the caller is an exiting module and is unregistering its handler, failure to wait could result in the IRQ handler jumping into an unloaded module.
The registration path doesn't require synchronization, as it's the caller's responsibility to not generate interrupts it cares about until after its handler is registered.
Message-Id: <[email protected]>
--- arch/x86/kernel/irq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/irq.c +3 -1
@@ -290,8 +290,10 @@ void kvm_set_posted_intr_wakeup_handler( {if (handler) kvm_posted_intr_wakeup_handler = handler; -else +else { kvm_posted_intr_wakeup_handler = dummy_handler; +synchronize_rcu (); + } }EXPORT_SYMBOL_GPL (kvm_set_posted_intr_wakeup_handler);
Greg Kroah-Hartman
maintainerPATCH 50/575 ASoC: soc-core: fix null-ptr-deref in snd_soc_del_component_unlocked()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit c448b7aa3e66042fc0f849d9a0fb90d1af82e948 ]
'component' is allocated in snd_soc_register_component(), but component->list is not initalized, this may cause snd_soc_del_component_unlocked() deref null ptr in the error handing case.
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:__list_del_entry_valid+0x81/0xf0 Call Trace: snd_soc_del_component_unlocked+0x69/0x1b0 [snd_soc_core] snd_soc_add_component.cold+0x54/0x6c [snd_soc_core] snd_soc_register_component+0x70/0x90 [snd_soc_core] devm_snd_soc_register_component+0x5e/0xd0 [snd_soc_core] tas2552_probe+0x265/0x320 [snd_soc_tas2552] ? tas2552_component_probe+0x1e0/0x1e0 [snd_soc_tas2552] i2c_device_probe+0xa31/0xbe0
Fix by adding INIT_LIST_HEAD() to snd_soc_component_initialize().
--- sound/soc/soc-core.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/soc-core.c +1 -0
@@ -2454,6 +2454,7 @@ int snd_soc_component_initialize(struct snd_soc_component *component,INIT_LIST_HEAD (&component->dai_list);INIT_LIST_HEAD (&component->dobj_list);INIT_LIST_HEAD (&component->card_list); +INIT_LIST_HEAD (&component->list);mutex_init (&component->io_mutex); component->name =fmt_single_name (dev, &component->id);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 51/575 ALSA: hda/realtek: Fixes HP Spectre x360 15-eb1xxx speakers
In reply to Greg Kroah-HartmanFrom: Davide Baldo <[email protected]>
[ Upstream commit d94befbb5ae379f6dfd4fa6d460eacc09fa7b9c3 ]
In laptop 'HP Spectre x360 Convertible 15-eb1xxx/8811' both front and rear speakers are silent, this patch fixes that by overriding the pin layout and by initializing the amplifier which needs a GPIO pin to be set to 1 then 0, similar to the existing HP Spectre x360 14 model.
In order to have volume control, both front and rear speakers were forced to use the DAC1.
This patch also correctly map the mute LED but since there is no microphone on/off switch exposed by the alsa subsystem it never turns on by itself.
There are still known audio issues in this laptop: headset microphone doesn't work, the button to mute/unmute microphone is not yet mapped, the LED of the mute/unmute speakers doesn't seems to be exposed via GPIO and never turns on.
--- sound/pci/hda/patch_realtek.c | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
sound/pci/hda/patch_realtek.c +46 -0
@@ -6363,6 +6363,44 @@ static void alc_fixup_no_int_mic(struct hda_codec *codec, } } +/* GPIO1 = amplifier on/off +* GPIO3 = mic mute LED +*/ +static void alc285_fixup_hp_spectre_x360_eb1 (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +static const hda_nid_t conn[] = {0x02 }; + +struct alc_spec *spec = codec->spec; +static const struct hda_pintbl pincfgs[] = { + {0x14 ,0x90170110 },/* front/high speakers */ + {0x17 ,0x90170130 },/* back/bass speakers */ + { } + }; + +//enable micmute led +alc_fixup_hp_gpio_led (codec, action,0x00 ,0x04 ); + +switch (action) { +case HDA_FIXUP_ACT_PRE_PROBE : + spec->micmute_led_polarity =1 ; +/* needed for amp of back speakers */ + spec->gpio_mask |=0x01 ; + spec->gpio_dir |=0x01 ; +snd_hda_apply_pincfgs (codec, pincfgs); +/* share DAC to have unified volume control */ +snd_hda_override_conn_list (codec,0x14 ,ARRAY_SIZE (conn), conn); +snd_hda_override_conn_list (codec,0x17 ,ARRAY_SIZE (conn), conn); +break ; +case HDA_FIXUP_ACT_INIT : +/* need to toggle GPIO to enable the amp of back speakers */ +alc_update_gpio_data (codec,0x01 , true); +msleep (100 ); +alc_update_gpio_data (codec,0x01 , false); +break ; + } +} +static void alc285_fixup_hp_spectre_x360 (struct hda_codec *codec,const struct hda_fixup *fix,int action) {
@@ -6515,6 +6553,7 @@ enum {ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED ,ALC280_FIXUP_HP_9480M ,ALC245_FIXUP_HP_X360_AMP , +ALC285_FIXUP_HP_SPECTRE_X360_EB1 ,ALC288_FIXUP_DELL_HEADSET_MODE ,ALC288_FIXUP_DELL1_MIC_NO_PRESENCE , ALC288_FIXUP_DELL_XPS_13,
@@ -8205,6 +8244,10 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_hp_spectre_x360, }, + [ALC285_FIXUP_HP_SPECTRE_X360_EB1] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_hp_spectre_x360_eb1 + }, [ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_ideapad_s740_coef,
@@ -8555,6 +8598,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x87f7 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ),SND_PCI_QUIRK (0x103c ,0x8805 ,"HP ProBook 650 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x880d ,"HP EliteBook 830 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8811 ,"HP Spectre x360 15-eb1xxx" ,ALC285_FIXUP_HP_SPECTRE_X360_EB1 ), +SND_PCI_QUIRK (0x103c ,0x8812 ,"HP Spectre x360 15-eb1xxx" ,ALC285_FIXUP_HP_SPECTRE_X360_EB1 ),SND_PCI_QUIRK (0x103c ,0x8846 ,"HP EliteBook 850 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8847 ,"HP EliteBook x360 830 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
@@ -8979,6 +9024,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC245_FIXUP_HP_X360_AMP, .name = "alc245-hp-x360-amp"}, {.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"}, {.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"}, + {.id = ALC285_FIXUP_HP_SPECTRE_X360_EB1, .name = "alc285-hp-spectre-x360-eb1"}, {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"}, {.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"}, {.id = ALC255_FIXUP_ACER_HEADPHONE_AND_MIC, .name = "alc255-acer-headphone-and-mic"},
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 52/575 cavium: Return negative value when pci_alloc_irq_vectors() fails
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit b2cddb44bddc1a9c5949a978bb454bba863264db ]
During the process of driver probing, the probe function should return < 0 for failure, otherwise, the kernel will treat value > 0 as success.
--- drivers/net/ethernet/cavium/thunder/nic_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cavium/thunder/nic_main.c +1 -1
@@ -1193,7 +1193,7 @@ static int nic_register_interrupts(struct nicpf *nic)dev_err (&nic->pdev->dev,"Request for #%d msix vectors failed, returned %d\n" , nic->num_vec, ret); -return 1 ; +return ret; }/* Register mailbox interrupt handler */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 53/575 scsi: qla2xxx: Return -ENOMEM if kzalloc() fails
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 06634d5b6e923ed0d4772aba8def5a618f44c7fe ]
The driver probing function should return < 0 for failure, otherwise kernel will treat value > 0 as success.
--- drivers/scsi/qla2xxx/qla_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_os.c +1 -1
@@ -4079,7 +4079,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,ql_dbg_pci (ql_dbg_init, ha->pdev,0xe0ee ,"%s: failed alloc dsd\n" , __func__); -return 1 ; +return -ENOMEM ; } ha->dif_bundle_kallocs++;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 54/575 scsi: qla2xxx: Fix unmap of already freed sgl
In reply to Greg Kroah-HartmanFrom: Dmitry Bogdanov <[email protected]>
[ Upstream commit 4a8f71014b4d56c4fb287607e844c0a9f68f46d9 ]
The sgl is freed in the target stack in target_release_cmd_kref() before calling qlt_free_cmd() but there is an unmap of sgl in qlt_free_cmd() that causes a panic if sgl is not yet DMA unmapped:
NIP dma_direct_unmap_sg+0xdc/0x180
LR dma_direct_unmap_sg+0xc8/0x180
Call Trace: ql_dbg_prefix+0x68/0xc0 [qla2xxx] (unreliable) dma_unmap_sg_attrs+0x54/0xf0 qlt_unmap_sg.part.19+0x54/0x1c0 [qla2xxx] qlt_free_cmd+0x124/0x1d0 [qla2xxx] tcm_qla2xxx_release_cmd+0x4c/0xa0 [tcm_qla2xxx] target_put_sess_cmd+0x198/0x370 [target_core_mod] transport_generic_free_cmd+0x6c/0x1b0 [target_core_mod] tcm_qla2xxx_complete_free+0x6c/0x90 [tcm_qla2xxx]
The sgl may be left unmapped in error cases of response sending. For instance, qlt_rdy_to_xfer() maps sgl and exits when session is being deleted keeping the sgl mapped.
This patch removes use-after-free of the sgl and ensures that the sgl is unmapped for any command that was not sent to firmware.
--- drivers/scsi/qla2xxx/qla_target.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +5 -9
@@ -3256,8 +3256,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,"RESET-RSP online/active/old-count/new-count = %d/%d/%d/%d.\n" , vha->flags.online,qla2x00_reset_active (vha), cmd->reset_count, qpair->chip_reset); -spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); -return 0 ; + goto out_unmap_unlock; }/* Does F/W have an IOCBs for this request */
@@ -3380,10 +3379,6 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) prm.sg =NULL ; prm.req_cnt =1 ; -/* Calculate number of entries and segments required */ -if (qlt_pci_map_calc_cnt (&prm) !=0 ) -return -EAGAIN ; -if (!qpair->fw_started || (cmd->reset_count != qpair->chip_reset) || (cmd->sess && cmd->sess->deleted)) {/*
@@ -3401,6 +3396,10 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)return 0 ; } +/* Calculate number of entries and segments required */ +if (qlt_pci_map_calc_cnt (&prm) !=0 ) +return -EAGAIN ; +spin_lock_irqsave (qpair->qp_lock_ptr, flags);/* Does F/W have an IOCBs for this request */ res =qlt_check_reserve_free_req (qpair, prm.req_cnt);
@@ -3805,9 +3804,6 @@ void qlt_free_cmd(struct qla_tgt_cmd *cmd)BUG_ON (cmd->cmd_in_wq); -if (cmd->sg_mapped) -qlt_unmap_sg (cmd->vha, cmd); -if (!cmd->q_full)qlt_decr_num_pend_cmds (cmd->vha);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 55/575 mISDN: Fix return values of the probe function
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit e211210098cb7490db2183d725f5c0f10463a704 ]
During the process of driver probing, the probe function should return < 0 for failure, otherwise, the kernel will treat value > 0 as success.
--- drivers/isdn/hardware/mISDN/hfcpci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/isdn/hardware/mISDN/hfcpci.c +4 -4
@@ -1994,14 +1994,14 @@ setup_hw(struct hfc_pci *hc)pci_set_master (hc->pdev);if (!hc->irq) {printk (KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n" ); -return 1 ; +return -EINVAL ; } hc->hw.pci_io = (char __iomem *)(unsigned long )hc->pdev->resource[1 ].start;if (!hc->hw.pci_io) {printk (KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n" ); -return 1 ; +return -ENOMEM ; }/* Allocate memory for FIFOS */ /* the memory needs to be on a 32k boundary within the first 4G */
@@ -2012,7 +2012,7 @@ setup_hw(struct hfc_pci *hc)if (!buffer) {printk (KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n" ); -return 1 ; +return -ENOMEM ; } hc->hw.fifos = buffer;pci_write_config_dword (hc->pdev,0x80 , hc->hw.dmahandle);
@@ -2022,7 +2022,7 @@ setup_hw(struct hfc_pci *hc) "HFC-PCI: Error in ioremap for PCI!\n");dma_free_coherent (&hc->pdev->dev,0x8000 , hc->hw.fifos, hc->hw.dmahandle); -return 1 ; +return -ENOMEM ; } printk(KERN_INFO
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 56/575 cavium: Fix return values of the probe function
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit c69b2f46876825c726bd8a97c7fa852d8932bc32 ]
During the process of driver probing, the probe function should return < 0 for failure, otherwise, the kernel will treat value > 0 as success.
--- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/cavium/thunder/nicvf_main.c +2 -2
@@ -1226,7 +1226,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic)if (ret <0 ) {netdev_err (nic->netdev,"Req for #%d msix vectors failed\n" , nic->num_vec); -return 1 ; +return ret; }sprintf (nic->irq_name[irq],"%s Mbox" ,"NICVF" );
@@ -1245,7 +1245,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic)if (!nicvf_check_pf_ready (nic)) {nicvf_disable_intr (nic,NICVF_INTR_MBOX ,0 );nicvf_unregister_interrupts (nic); -return 1 ; +return -EIO ; }return 0 ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 57/575 sfc: Export fibre-specific supported link modes
In reply to Greg Kroah-HartmanFrom: Erik Ekman <[email protected]>
[ Upstream commit c62041c5baa9ded3bc6fd38d3f724de70683b489 ]
The 1/10GbaseT modes were set up for cards with SFP+ cages in 3497ed8c852a5 ("sfc: report supported link speeds on SFP connections"). 10GbaseT was likely used since no 10G fibre mode existed.
The missing fibre modes for 1/10G were added to ethtool.h in 5711a9822144 ("net: ethtool: add support for 1000BaseX and missing 10G link modes") shortly thereafter.
The user guide available at https://support-nic.xilinx.com/wp/drivers
lists support for the following cable and transceiver types in section 2.9:
- QSFP28 100G Direct Attach Cables
- QSFP28 100G SR Optical Transceivers (with SR4 modules listed)
- SFP28 25G Direct Attach Cables
- SFP28 25G SR Optical Transceivers
- QSFP+ 40G Direct Attach Cables
- QSFP+ 40G Active Optical Cables
- QSFP+ 40G SR4 Optical Transceivers
- QSFP+ to SFP+ Breakout Direct Attach Cables
- QSFP+ to SFP+ Breakout Active Optical Cables
- SFP+ 10G Direct Attach Cables
- SFP+ 10G SR Optical Transceivers
- SFP+ 10G LR Optical Transceivers
- SFP 1000BASE‐T Transceivers
- 1G Optical Transceivers
(From user guide issue 28. Issue 16 which also includes older cards like SFN5xxx/SFN6xxx has matching lists for 1/10/40G transceiver types.)
Regarding SFP+ 10GBASE‐T transceivers the latest guide says:
"Solarflare adapters do not support 10GBASE‐T transceiver modules."
Tested using SFN5122F-R7 (with 2 SFP+ ports). Supported link modes do not change depending on module used (tested with 1000BASE-T, 1000BASE-BX10, 10GBASE-LR). Before:
$ ethtool ext
Settings for ext:
Supported ports: [ FIBRE ]
Supported link modes: 1000baseT/Full
10000baseT/Full
Supported pause frame use: Symmetric Receive-only
Supports auto-negotiation: No
Supported FEC modes: Not reported
Advertised link modes: Not reported
Advertised pause frame use: No
Advertised auto-negotiation: No
Advertised FEC modes: Not reported
Link partner advertised link modes: Not reported
Link partner advertised pause frame use: No
Link partner advertised auto-negotiation: No
Link partner advertised FEC modes: Not reported
Speed: 1000Mb/s
Duplex: Full
Auto-negotiation: off
Port: FIBRE
PHYAD: 255
Transceiver: internal
Current message level: 0x000020f7 (8439)
drv probe link ifdown ifup rx_err tx_err hw
Link detected: yesAfter:
$ ethtool ext
Settings for ext:
Supported ports: [ FIBRE ]
Supported link modes: 1000baseT/Full
1000baseX/Full
10000baseCR/Full
10000baseSR/Full
10000baseLR/Full
Supported pause frame use: Symmetric Receive-only
Supports auto-negotiation: No
Supported FEC modes: Not reported
Advertised link modes: Not reported
Advertised pause frame use: No
Advertised auto-negotiation: No
Advertised FEC modes: Not reported
Link partner advertised link modes: Not reported
Link partner advertised pause frame use: No
Link partner advertised auto-negotiation: No
Link partner advertised FEC modes: Not reported
Speed: 1000Mb/s
Duplex: Full
Auto-negotiation: off
Port: FIBRE
PHYAD: 255
Transceiver: internal
Supports Wake-on: g
Wake-on: d
Current message level: 0x000020f7 (8439)
drv probe link ifdown ifup rx_err tx_err hw
Link detected: yes--- drivers/net/ethernet/sfc/mcdi_port_common.c | 37 +++++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-)
drivers/net/ethernet/sfc/mcdi_port_common.c +26 -11
@@ -132,16 +132,27 @@ void mcdi_to_ethtool_linkset(u32 media, u32 cap, unsigned long *linkset)case MC_CMD_MEDIA_SFP_PLUS :case MC_CMD_MEDIA_QSFP_PLUS :SET_BIT (FIBRE ); -if (cap & (1 <<MC_CMD_PHY_CAP_1000FDX_LBN )) +if (cap & (1 <<MC_CMD_PHY_CAP_1000FDX_LBN )) { SET_BIT(1000baseT_Full); -if (cap & (1 <<MC_CMD_PHY_CAP_10000FDX_LBN )) - SET_BIT(10000baseT_Full); -if (cap & (1 <<MC_CMD_PHY_CAP_40000FDX_LBN )) + SET_BIT(1000baseX_Full); + } +if (cap & (1 <<MC_CMD_PHY_CAP_10000FDX_LBN )) { + SET_BIT(10000baseCR_Full); + SET_BIT(10000baseLR_Full); + SET_BIT(10000baseSR_Full); + } +if (cap & (1 <<MC_CMD_PHY_CAP_40000FDX_LBN )) { SET_BIT(40000baseCR4_Full); -if (cap & (1 <<MC_CMD_PHY_CAP_100000FDX_LBN )) + SET_BIT(40000baseSR4_Full); + } +if (cap & (1 <<MC_CMD_PHY_CAP_100000FDX_LBN )) { SET_BIT(100000baseCR4_Full); -if (cap & (1 <<MC_CMD_PHY_CAP_25000FDX_LBN )) + SET_BIT(100000baseSR4_Full); + } +if (cap & (1 <<MC_CMD_PHY_CAP_25000FDX_LBN )) { SET_BIT(25000baseCR_Full); + SET_BIT(25000baseSR_Full); + }if (cap & (1 <<MC_CMD_PHY_CAP_50000FDX_LBN )) SET_BIT(50000baseCR2_Full);break ;
@@ -192,15 +203,19 @@ u32 ethtool_linkset_to_mcdi_cap(const unsigned long *linkset) result |= (1 <<MC_CMD_PHY_CAP_100FDX_LBN ); if (TEST_BIT(1000baseT_Half)) result |= (1 <<MC_CMD_PHY_CAP_1000HDX_LBN ); - if (TEST_BIT(1000baseT_Full) || TEST_BIT(1000baseKX_Full)) + if (TEST_BIT(1000baseT_Full) || TEST_BIT(1000baseKX_Full) || + TEST_BIT(1000baseX_Full)) result |= (1 <<MC_CMD_PHY_CAP_1000FDX_LBN ); - if (TEST_BIT(10000baseT_Full) || TEST_BIT(10000baseKX4_Full)) + if (TEST_BIT(10000baseT_Full) || TEST_BIT(10000baseKX4_Full) || + TEST_BIT(10000baseCR_Full) || TEST_BIT(10000baseLR_Full) || + TEST_BIT(10000baseSR_Full)) result |= (1 <<MC_CMD_PHY_CAP_10000FDX_LBN ); - if (TEST_BIT(40000baseCR4_Full) || TEST_BIT(40000baseKR4_Full)) + if (TEST_BIT(40000baseCR4_Full) || TEST_BIT(40000baseKR4_Full) || + TEST_BIT(40000baseSR4_Full)) result |= (1 <<MC_CMD_PHY_CAP_40000FDX_LBN ); - if (TEST_BIT(100000baseCR4_Full)) + if (TEST_BIT(100000baseCR4_Full) || TEST_BIT(100000baseSR4_Full)) result |= (1 <<MC_CMD_PHY_CAP_100000FDX_LBN ); - if (TEST_BIT(25000baseCR_Full)) + if (TEST_BIT(25000baseCR_Full) || TEST_BIT(25000baseSR_Full)) result |= (1 <<MC_CMD_PHY_CAP_25000FDX_LBN ); if (TEST_BIT(50000baseCR2_Full)) result |= (1 <<MC_CMD_PHY_CAP_50000FDX_LBN );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 58/575 sfc: Dont use netif_info before net_device setup
In reply to Greg Kroah-HartmanFrom: Erik Ekman <[email protected]>
[ Upstream commit bf6abf345dfa77786aca554bc58c64bd428ecb1d ]
Use pci_info instead to avoid unnamed/uninitialized noise:
[197088.688729] sfc 0000:01:00.0: Solarflare NIC detected [197088.690333] sfc 0000:01:00.0: Part Number : SFN5122F [197088.729061] sfc 0000:01:00.0 (unnamed net_device) (uninitialized): no SR-IOV VFs probed [197088.729071] sfc 0000:01:00.0 (unnamed net_device) (uninitialized): no PTP support
Inspired by fa44821a4ddd ("sfc: don't use netif_info et al before net_device is registered") from Heiner Kallweit.
--- drivers/net/ethernet/sfc/ptp.c | 4 ++-- drivers/net/ethernet/sfc/siena_sriov.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/sfc/ptp.c +2 -2
@@ -648,7 +648,7 @@ static int efx_ptp_get_attributes(struct efx_nic *efx) }else if (rc == -EINVAL ) { fmt =MC_CMD_PTP_OUT_GET_ATTRIBUTES_SECONDS_NANOSECONDS ; }else if (rc == -EPERM ) { -netif_info (efx, probe, efx->net_dev,"no PTP support\n" ); +pci_info (efx->pci_dev,"no PTP support\n" );return rc; }else { efx_mcdi_display_error(efx, MC_CMD_PTP, sizeof(inbuf),
@@ -824,7 +824,7 @@ static int efx_ptp_disable(struct efx_nic *efx)* should only have been called during probe. */ if (rc == -ENOSYS || rc == -EPERM ) -netif_info (efx, probe, efx->net_dev,"no PTP support\n" ); +pci_info (efx->pci_dev,"no PTP support\n" );else if (rc) efx_mcdi_display_error(efx, MC_CMD_PTP, MC_CMD_PTP_IN_DISABLE_LEN,
drivers/net/ethernet/sfc/siena_sriov.c +1 -1
@@ -1057,7 +1057,7 @@ void efx_siena_sriov_probe(struct efx_nic *efx)return ;if (efx_siena_sriov_cmd (efx, false, &efx->vi_scale, &count)) { -netif_info (efx, probe, efx->net_dev,"no SR-IOV VFs probed\n" ); +pci_info (efx->pci_dev,"no SR-IOV VFs probed\n" );return ; }if (count >0 && count > max_vfs)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 59/575 hyperv/vmbus: include linux/bitops.h
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 8017c99680fa65e1e8d999df1583de476a187830 ]
On arm64 randconfig builds, hyperv sometimes fails with this error:
In file included from drivers/hv/hv_trace.c:3:
In file included from drivers/hv/hyperv_vmbus.h:16:
In file included from arch/arm64/include/asm/sync_bitops.h:5:arch/arm64/include/asm/bitops.h:11:2: error: only <linux/bitops.h> can be included directly
In file included from include/asm-generic/bitops/hweight.h:5:include/asm-generic/bitops/arch_hweight.h:9:9: error: implicit declaration of function '__sw_hweight32' [-Werror,-Wimplicit-function-declaration] include/asm-generic/bitops/atomic.h:17:7: error: implicit declaration of function 'BIT_WORD' [-Werror,-Wimplicit-function-declaration]
Include the correct header first.
--- drivers/hv/hyperv_vmbus.h | 1 + 1 file changed, 1 insertion(+)
drivers/hv/hyperv_vmbus.h +1 -0
@@ -13,6 +13,7 @@#define _HYPERV_VMBUS_H#include <linux/list.h> +#include <linux/bitops.h> #include <asm/sync_bitops.h> #include <asm/hyperv-tlfs.h> #include <linux/atomic.h>
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 60/575 ARM: dts: sun7i: A20-olinuxino-lime2: Fix ethernet phy-mode
In reply to Greg Kroah-HartmanFrom: Bastien Roucariès <[email protected]>
[ Upstream commit 55dd7e059098ce4bd0a55c251cb78e74604abb57 ]
Commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay config") sets the RX/TX delay according to the phy-mode property in the device tree. For the A20-olinuxino-lime2 board this is "rgmii", which is the wrong setting.
Following the example of a900cac3750b ("ARM: dts: sun7i: a20: bananapro:
Fix ethernet phy-mode") the phy-mode is changed to "rgmii-id" which gets the Ethernet working again on this board.
--- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +1 -1
@@ -112,7 +112,7 @@ pinctrl-names = "default"; pinctrl-0 = <&gmac_rgmii_pins>; phy-handle = <&phy1>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; status = "okay"; };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 61/575 reset: tegra-bpmp: Handle errors in BPMP response
In reply to Greg Kroah-HartmanFrom: Mikko Perttunen <[email protected]>
[ Upstream commit c045ceb5a145d2a9a4bf33cbc55185ddf99f60ab ]
The return value from tegra_bpmp_transfer indicates the success or failure of the IPC transaction with BPMP. If the transaction succeeded, we also need to check the actual command's result code. Add code to do this.
--- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/reset/tegra/reset-bpmp.c +8 -1
@@ -20,6 +20,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,struct tegra_bpmp *bpmp =to_tegra_bpmp (rstc);struct mrq_reset_request request;struct tegra_bpmp_message msg; +int err;memset (&request,0 ,sizeof (request)); request.cmd = command;
@@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc, msg.tx.data = &request; msg.tx.size =sizeof (request); -return tegra_bpmp_transfer (bpmp, &msg); + err =tegra_bpmp_transfer (bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; } static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 62/575 reset: socfpga: add empty driver allowing consumers to probe
In reply to Greg Kroah-HartmanFrom: Paweł Anikiel <[email protected]>
[ Upstream commit 3ad60b4b3570937f3278509fe6797a5093ce53f8 ]
The early reset driver doesn't ever probe, which causes consuming devices to be unable to probe. Add an empty driver to set this device as available, allowing consumers to probe.
--- drivers/reset/reset-socfpga.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/reset/reset-socfpga.c +26 -0
@@ -85,3 +85,29 @@ void __init socfpga_reset_init(void)for_each_matching_node (np, socfpga_early_reset_dt_ids)a10_reset_init (np); } + +/* +* The early driver is problematic, because it doesn't register +* itself as a driver. This causes certain device links to prevent +* consumer devices from probing. The hacky solution is to register +* an empty driver, whose only job is to attach itself to the reset +* manager and call probe. +*/ +static const struct of_device_id socfpga_reset_dt_ids[] = { + { .compatible ="altr,rst-mgr" , }, + {/* sentinel */ }, +}; + +static int reset_simple_probe (struct platform_device *pdev) +{ +return 0 ; +} + +static struct platform_driver reset_socfpga_driver = { + .probe = reset_simple_probe, + .driver = { + .name ="socfpga-reset" , + .of_match_table = socfpga_reset_dt_ids, + }, +}; +builtin_platform_driver (reset_socfpga_driver);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 63/575 mmc: winbond: dont build on M68K
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 162079f2dccd02cb4b6654defd32ca387dd6d4d4 ]
The Winbond MMC driver fails to build on ARCH=m68k so prevent that build config. Silences these build errors:
../drivers/mmc/host/wbsd.c: In function 'wbsd_request_end':../drivers/mmc/host/wbsd.c:212:28: error: implicit declaration of function 'claim_dma_lock' [-Werror=implicit-function-declaration]
212 | dmaflags = claim_dma_lock();../drivers/mmc/host/wbsd.c:215:17: error: implicit declaration of function 'release_dma_lock'; did you mean 'release_task'? [-Werror=implicit-function-declaration]
215 | release_dma_lock(dmaflags);
--- drivers/mmc/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/Kconfig +1 -1
@@ -503,7 +503,7 @@ config MMC_OMAP_HS config MMC_WBSD tristate "Winbond W83L51xD SD/MMC Card Interface support" - depends on ISA_DMA_API + depends on ISA_DMA_API && !M68K help This selects the Winbond(R) W83L51xD Secure digital and Multimedia card Interface.
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 64/575 drm: panel-orientation-quirks: Add quirk for Aya Neo 2021
In reply to Greg Kroah-HartmanFrom: Bryant Mairs <[email protected]>
[ Upstream commit def0c3697287f6e85d5ac68b21302966c95474f9 ]
Fixes screen orientation for the Aya Neo 2021 handheld gaming console.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +6 -0
@@ -134,6 +134,12 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), }, .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* AYA NEO 2021 */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"AYADEVICE" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AYA NEO 2021"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, }, { /* GPD MicroPC (generic strings, also match on bios date) */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 65/575 fcnal-test: kill hanging ping/nettest binaries on cleanup
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 1f83b835a3eaa5ae4bd825fb07182698bfc243ba ]
On my box I see a bunch of ping/nettest processes hanging around after fcntal-test.sh is done.
Clean those up before netns deletion.
--- tools/testing/selftests/net/fcnal-test.sh | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/selftests/net/fcnal-test.sh +3 -0
@@ -436,10 +436,13 @@ cleanup() ip -netns ${NSA} link set dev ${NSA_DEV} down ip -netns ${NSA} link del dev ${NSA_DEV} + ip netns pids ${NSA} | xargs kill 2>/dev/null ip netns del ${NSA} fi + ip netns pids ${NSB} | xargs kill 2>/dev/null ip netns del ${NSB} + ip netns pids ${NSC} | xargs kill 2>/dev/null ip netns del ${NSC} >/dev/null 2>&1 }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 66/575 bpf: Define bpf_jit_alloc_exec_limit for arm64 JIT
In reply to Greg Kroah-HartmanFrom: Lorenz Bauer <[email protected]>
[ Upstream commit 5d63ae908242f028bd10860cba98450d11c079b8 ]
Expose the maximum amount of useable memory from the arm64 JIT.
--- arch/arm64/net/bpf_jit_comp.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/net/bpf_jit_comp.c +5 -0
@@ -1134,6 +1134,11 @@ out:return prog; } +u64 bpf_jit_alloc_exec_limit (void ) +{ +return BPF_JIT_REGION_SIZE ; +} +void *bpf_jit_alloc_exec (unsigned long size) { return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 67/575 bpf: Prevent increasing bpf_jit_limit above max
In reply to Greg Kroah-HartmanFrom: Lorenz Bauer <[email protected]>
[ Upstream commit fadb7ff1a6c2c565af56b4aacdd086b067eed440 ]
Restrict bpf_jit_limit to the maximum supported by the arch's JIT.
--- include/linux/filter.h | 1 + kernel/bpf/core.c | 4 +++- net/core/sysctl_net_core.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
include/linux/filter.h +1 -0
@@ -998,6 +998,7 @@ extern int bpf_jit_enable;extern int bpf_jit_harden;extern int bpf_jit_kallsyms;extern long bpf_jit_limit; +extern long bpf_jit_limit_max;typedef void (*bpf_jit_fill_hole_t )(void *area,unsigned int size);
kernel/bpf/core.c +3 -1
@@ -528,6 +528,7 @@ int bpf_jit_enable __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_DEFAULT_ON);int bpf_jit_kallsyms__read_mostly =IS_BUILTIN (CONFIG_BPF_JIT_DEFAULT_ON );int bpf_jit_harden__read_mostly ;long bpf_jit_limit__read_mostly ; +long bpf_jit_limit_max__read_mostly ;static void bpf_prog_ksym_set_addr (struct bpf_prog *prog)
@@ -821,7 +822,8 @@ u64 __weak bpf_jit_alloc_exec_limit(void)static int __init bpf_jit_charge_init (void ) {/* Only used as heuristic here to derive limit. */ - bpf_jit_limit =min_t (u64,round_up (bpf_jit_alloc_exec_limit () >>2 , + bpf_jit_limit_max =bpf_jit_alloc_exec_limit (); + bpf_jit_limit =min_t (u64,round_up (bpf_jit_limit_max >>2 ,PAGE_SIZE ),LONG_MAX );return 0 ; }
net/core/sysctl_net_core.c +1 -1
@@ -419,7 +419,7 @@ static struct ctl_table net_core_table[] = { .mode = 0600, .proc_handler = proc_dolongvec_minmax_bpf_restricted, .extra1 = &long_one, - .extra2 = &long_max, + .extra2 = &bpf_jit_limit_max, },#endif {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 68/575 gpio: mlxbf2.c: Add check for bgpio_init failure
In reply to Greg Kroah-HartmanFrom: Asmaa Mnebhi <[email protected]>
[ Upstream commit c0eee6fbfa2b3377f1efed10dad539abeb7312aa ]
Add a check if bgpio_init fails.
--- drivers/gpio/gpio-mlxbf2.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpio/gpio-mlxbf2.c +5 -0
@@ -268,6 +268,11 @@ mlxbf2_gpio_probe(struct platform_device *pdev)NULL , 0); +if (ret) { +dev_err (dev,"bgpio_init failed\n" ); +return ret; + } + gc->direction_input = mlxbf2_gpio_direction_input; gc->direction_output = mlxbf2_gpio_direction_output; gc->ngpio = npins;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 69/575 xen/netfront: stop tx queues during live migration
In reply to Greg Kroah-HartmanFrom: Dongli Zhang <[email protected]>
[ Upstream commit 042b2046d0f05cf8124c26ff65dbb6148a4404fb ]
The tx queues are not stopped during the live migration. As a result, the ndo_start_xmit() may access netfront_info->queues which is freed by talk_to_netback()->xennet_destroy_queues().
This patch is to netif_device_detach() at the beginning of xen-netfront resuming, and netif_device_attach() at the end of resuming.
CPU A CPU B
talk_to_netback()
-> if (info->queues)
xennet_destroy_queues(info);
to free netfront_info->queues
xennet_start_xmit()
to access netfront_info->queues-> err = xennet_create_queues(info, &num_queues);
The idea is borrowed from virtio-net.
--- drivers/net/xen-netfront.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/xen-netfront.c +8 -0
@@ -1671,6 +1671,10 @@ static int netfront_resume(struct xenbus_device *dev)dev_dbg (&dev->dev,"%s\n" , dev->nodename); +netif_tx_lock_bh (info->netdev); +netif_device_detach (info->netdev); +netif_tx_unlock_bh (info->netdev); +xennet_disconnect_backend (info);return 0 ; }
@@ -2285,6 +2289,10 @@ static int xennet_connect(struct net_device *dev)* domain a kick because we've probably just requeued some * packets. */ +netif_tx_lock_bh (np->netdev); +netif_device_attach (np->netdev); +netif_tx_unlock_bh (np->netdev); +netif_carrier_on (np->netdev);for (j =0 ; j < num_queues; ++j) { queue = &np->queues[j];
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 70/575 nvmet-tcp: fix a memory leak when releasing a queue
In reply to Greg Kroah-HartmanFrom: Maurizio Lombardi <[email protected]>
[ Upstream commit 926245c7d22271307606c88b1fbb2539a8550e94 ]
page_frag_free() won't completely release the memory allocated for the commands, the cache page must be explicitly freed by calling __page_frag_cache_drain().
This bug can be easily reproduced by repeatedly executing the following command on the initiator:
$echo 1 > /sys/devices/virtual/nvme-fabrics/ctl/nvme0/reset_controller
--- drivers/nvme/target/tcp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvme/target/tcp.c +3 -0
@@ -1398,6 +1398,7 @@ static void nvmet_tcp_uninit_data_in_cmds(struct nvmet_tcp_queue *queue)static void nvmet_tcp_release_queue_work (struct work_struct *w) { +struct page *page;struct nvmet_tcp_queue *queue = container_of(w, struct nvmet_tcp_queue, release_work);
@@ -1417,6 +1418,8 @@ static void nvmet_tcp_release_queue_work(struct work_struct *w)nvmet_tcp_free_crypto (queue);ida_simple_remove (&nvmet_tcp_queue_ida, queue->idx); + page =virt_to_head_page (queue->pf_cache.va); +__page_frag_cache_drain (page, queue->pf_cache.pagecnt_bias);kfree (queue); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 71/575 spi: spl022: fix Microwire full duplex mode
In reply to Greg Kroah-HartmanFrom: Thomas Perrot <[email protected]>
[ Upstream commit d81d0e41ed5fe7229a2c9a29d13bad288c7cf2d2 ]
There are missing braces in the function that verify controller parameters, then an error is always returned when the parameter to select Microwire frames operation is used on devices allowing it.
--- drivers/spi/spi-pl022.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/spi/spi-pl022.c +3 -2
@@ -1723,12 +1723,13 @@ static int verify_controller_parameters(struct pl022 *pl022,return -EINVAL ; } }else { -if (chip_info->duplex !=SSP_MICROWIRE_CHANNEL_FULL_DUPLEX ) +if (chip_info->duplex !=SSP_MICROWIRE_CHANNEL_FULL_DUPLEX ) {dev_err (&pl022->adev->dev,"Microwire half duplex mode requested," " but this is only available in the" " ST version of PL022\n" ); -return -EINVAL ; +return -EINVAL ; + } } }return 0 ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 72/575 net: multicast: calculate csum of looped-back and forwarded packets
In reply to Greg Kroah-HartmanFrom: Cyril Strejc <[email protected]>
[ Upstream commit 9122a70a6333705c0c35614ddc51c274ed1d3637 ]
During a testing of an user-space application which transmits UDP multicast datagrams and utilizes multicast routing to send the UDP datagrams out of defined network interfaces, I've found a multicast router does not fill-in UDP checksum into locally produced, looped-back and forwarded UDP datagrams, if an original output NIC the datagrams are sent to has UDP TX checksum offload enabled.
The datagrams are sent malformed out of the NIC the datagrams have been forwarded to.
It is because:
1. If TX checksum offload is enabled on the output NIC, UDP checksum is not calculated by kernel and is not filled into skb data.
2. dev_loopback_xmit(), which is called solely by ip_mc_finish_output(), sets skb->ip_summed = CHECKSUM_UNNECESSARY unconditionally.
3. Since 35fc92a9 ("[NET]: Allow forwarding of ip_summed except CHECKSUM_COMPLETE"), the ip_summed value is preserved during forwarding.
4. If ip_summed != CHECKSUM_PARTIAL, checksum is not calculated during a packet egress.
The minimum fix in dev_loopback_xmit():
1. Preserves skb->ip_summed CHECKSUM_PARTIAL. This is the case when the original output NIC has TX checksum offload enabled. The effects are:
a) If the forwarding destination interface supports TX checksum offloading, the NIC driver is responsible to fill-in the checksum.
b) If the forwarding destination interface does NOT support TX checksum offloading, checksums are filled-in by kernel before skb is submitted to the NIC driver.
c) For local delivery, checksum validation is skipped as in the case of CHECKSUM_UNNECESSARY, thanks to skb_csum_unnecessary().
2. Translates ip_summed CHECKSUM_NONE to CHECKSUM_UNNECESSARY. It means, for CHECKSUM_NONE, the behavior is unmodified and is there to skip a looped-back packet local delivery checksum validation.
--- include/net/udp.h | 5 +++-- net/core/dev.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
include/net/udp.h +3 -2
@@ -488,8 +488,9 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk,* CHECKSUM_NONE in __udp_gso_segment. UDP GRO indeed builds partial * packets in udp_gro_complete_segment. As does UDP GSO, verified by * udp_send_skb. But when those packets are looped in dev_loopback_xmit -* their ip_summed is set to CHECKSUM_UNNECESSARY. Reset in this -* specific case, where PARTIAL is both correct and required. +* their ip_summed CHECKSUM_NONE is changed to CHECKSUM_UNNECESSARY. +* Reset in this specific case, where PARTIAL is both correct and +* required. */ if (skb->pkt_type ==PACKET_LOOPBACK ) skb->ip_summed =CHECKSUM_PARTIAL ;
net/core/dev.c +2 -1
@@ -3867,7 +3867,8 @@ int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *skb)skb_reset_mac_header (skb);__skb_pull (skb,skb_network_offset (skb)); skb->pkt_type =PACKET_LOOPBACK ; - skb->ip_summed =CHECKSUM_UNNECESSARY ; +if (skb->ip_summed ==CHECKSUM_NONE ) + skb->ip_summed =CHECKSUM_UNNECESSARY ;WARN_ON (!skb_dst (skb));skb_dst_force (skb);netif_rx_ni (skb);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 73/575 watchdog: Fix OMAP watchdog early handling
In reply to Greg Kroah-HartmanFrom: Walter Stoll <[email protected]>
[ Upstream commit cd004d8299f1dc6cfa6a4eea8f94cb45eaedf070 ]
TI's implementation does not service the watchdog even if the kernel command line parameter omap_wdt.early_enable is set to 1. This patch fixes the issue.
--- drivers/watchdog/omap_wdt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/watchdog/omap_wdt.c +5 -1
@@ -268,8 +268,12 @@ static int omap_wdt_probe(struct platform_device *pdev) wdev->wdog.bootstatus =WDIOF_CARDRESET ; } -if (!early_enable) +if (early_enable) { +omap_wdt_start (&wdev->wdog); +set_bit (WDOG_HW_RUNNING , &wdev->wdog.status); + }else {omap_wdt_disable (wdev); + } ret =watchdog_register_device (&wdev->wdog);if (ret) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 74/575 drm: panel-orientation-quirks: Add quirk for GPD Win3
In reply to Greg Kroah-HartmanFrom: Mario <[email protected]>
[ Upstream commit 61b1d445f3bfe4c3ba4335ceeb7e8ba688fd31e2 ]
Fixes screen orientation for GPD Win 3 handheld gaming console.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +6 -0
@@ -191,6 +191,12 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"), }, .driver_data = (void *)&gpd_win2, + }, { /* GPD Win 3 */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"GPD" ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"G1618-03" ) + }, + .driver_data = (void *)&lcd720x1280_rightside_up, }, { /* I.T.Works TW891 */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 75/575 block: schedule queue restart after BLK_STS_ZONE_RESOURCE
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 9586e67b911c95ba158fcc247b230e9c2d718623 ]
When dispatching a zone append write request to a SCSI zoned block device, if the target zone of the request is already locked, the device driver will return BLK_STS_ZONE_RESOURCE and the request will be pushed back to the hctx dipatch queue. The queue will be marked as RESTART in dd_finish_request() and restarted in __blk_mq_free_request(). However, this restart applies to the hctx of the completed request. If the requeued request is on a different hctx, dispatch will no be retried until another request is submitted or the next periodic queue run triggers, leading to up to 30 seconds latency for the requeued request.
Fix this problem by scheduling a queue restart similarly to the BLK_STS_RESOURCE case or when we cannot get the budget.
Also, consolidate the checks into the "need_resource" variable to simplify the condition.
--- block/blk-mq.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
block/blk-mq.c +9 -4
@@ -1327,6 +1327,7 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list,int errors, queued;blk_status_t ret =BLK_STS_OK ;LIST_HEAD (zone_list); +bool needs_resource = false;if (list_empty (list))return false;
@@ -1372,6 +1373,8 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list, queued++;break ;case BLK_STS_RESOURCE : + needs_resource = true; + fallthrough;case BLK_STS_DEV_RESOURCE :blk_mq_handle_dev_resource (rq, list); goto out;
@@ -1382,6 +1385,7 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list,* accept. */ blk_mq_handle_zone_resource (rq, &zone_list); + needs_resource = true;break ;default : errors++;
@@ -1408,7 +1412,6 @@ out:/* For non-shared tags, the RESTART check will suffice */ bool no_tag = prep ==PREP_DISPATCH_NO_TAG && (hctx->flags &BLK_MQ_F_TAG_QUEUE_SHARED ); -bool no_budget_avail = prep ==PREP_DISPATCH_NO_BUDGET ;blk_mq_release_budgets (q, nr_budgets);
@@ -1448,14 +1451,16 @@ out:* If driver returns BLK_STS_RESOURCE and SCHED_RESTART * bit is set, run queue after a delay to avoid IO stalls * that could otherwise occur if the queue is idle. We'll do -* similar if we couldn't get budget and SCHED_RESTART is set. +* similar if we couldn't get budget or couldn't lock a zone +* and SCHED_RESTART is set. */ needs_restart =blk_mq_sched_needs_restart (hctx); +if (prep ==PREP_DISPATCH_NO_BUDGET ) + needs_resource = true;if (!needs_restart || (no_tag &&list_empty_careful (&hctx->dispatch_wait.entry)))blk_mq_run_hw_queue (hctx, true); -else if (needs_restart && (ret ==BLK_STS_RESOURCE || - no_budget_avail)) +else if (needs_restart && needs_resource)blk_mq_delay_run_hw_queue (hctx,BLK_MQ_RESOURCE_DELAY );blk_mq_update_dispatch_busy (hctx, true);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 76/575 nvmet-tcp: fix header digest verification
In reply to Greg Kroah-HartmanFrom: Amit Engel <[email protected]>
[ Upstream commit 86aeda32b887cdaeb0f4b7bfc9971e36377181c7 ]
Pass the correct length to nvmet_tcp_verify_hdgst, which is the pdu header length. This fixes a wrong behaviour where header digest verification passes although the digest is wrong.
--- drivers/nvme/target/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/tcp.c +1 -1
@@ -1084,7 +1084,7 @@ recv: }if (queue->hdr_digest && -nvmet_tcp_verify_hdgst (queue, &queue->pdu, queue->offset)) { +nvmet_tcp_verify_hdgst (queue, &queue->pdu, hdr->hlen)) {nvmet_tcp_fatal_error (queue);/* fatal */ return -EPROTO ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 77/575 r8169: Add device 10ec:8162 to driver r8169
In reply to Greg Kroah-HartmanFrom: Janghyub Seo <[email protected]>
[ Upstream commit 72f898ca0ab85fde6facf78b14d9f67a4a7b32d1 ]
This patch makes the driver r8169 pick up device Realtek Semiconductor Co. , Ltd. Device [10ec:8162].
--- drivers/net/ethernet/realtek/r8169_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/realtek/r8169_main.c +1 -0
@@ -157,6 +157,7 @@ static const struct pci_device_id rtl8169_pci_tbl[] = { { PCI_VDEVICE(REALTEK, 0x8129) }, { PCI_VDEVICE(REALTEK, 0x8136), RTL_CFG_NO_GBIT }, { PCI_VDEVICE(REALTEK, 0x8161) }, + { PCI_VDEVICE(REALTEK, 0x8162) }, { PCI_VDEVICE(REALTEK, 0x8167) }, { PCI_VDEVICE(REALTEK, 0x8168) }, { PCI_VDEVICE(NCUBE, 0x8168) },
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 78/575 vmxnet3: do not stop tx queues after netif_device_detach()
In reply to Greg Kroah-HartmanFrom: Dongli Zhang <[email protected]>
[ Upstream commit 9159f102402a64ac85e676b75cc1f9c62c5b4b73 ]
The netif_device_detach() conditionally stops all tx queues if the queues are running. There is no need to call netif_tx_stop_all_queues() again.
--- drivers/net/vmxnet3/vmxnet3_drv.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/vmxnet3/vmxnet3_drv.c +0 -1
@@ -3765,7 +3765,6 @@ vmxnet3_suspend(struct device *device)vmxnet3_free_intr_resources (adapter);netif_device_detach (netdev); -netif_tx_stop_all_queues (netdev);/* Create wake-up filters. */ pmConf = adapter->pm_conf;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 79/575 nfp: bpf: relax prog rejection for mtu check through max_pkt_offset
In reply to Greg Kroah-HartmanFrom: Yu Xiao <[email protected]>
[ Upstream commit 90a881fc352a953f1c8beb61977a2db0818157d4 ]
MTU change is refused whenever the value of new MTU is bigger than the max packet bytes that fits in NFP Cluster Target Memory (CTM). However, an eBPF program doesn't always need to access the whole packet data.
The maximum direct packet access (DPA) offset has always been caculated by verifier and stored in the max_pkt_offset field of prog aux data.
--- drivers/net/ethernet/netronome/nfp/bpf/main.c | 16 +++++++++++----- drivers/net/ethernet/netronome/nfp/bpf/main.h | 2 ++ .../net/ethernet/netronome/nfp/bpf/offload.c | 17 +++++++++++++---- 3 files changed, 26 insertions(+), 9 deletions(-)
drivers/net/ethernet/netronome/nfp/bpf/main.c +11 -5
@@ -182,15 +182,21 @@ static int nfp_bpf_check_mtu(struct nfp_app *app, struct net_device *netdev, int new_mtu) { struct nfp_net *nn = netdev_priv(netdev); -unsigned int max_mtu; +struct nfp_bpf_vnic *bv; +struct bpf_prog *prog;if (~nn->dp.ctrl &NFP_NET_CFG_CTRL_BPF )return 0 ; - max_mtu =nn_readb (nn,NFP_NET_CFG_BPF_INL_MTU ) *64 -32 ; -if (new_mtu > max_mtu) { -nn_info (nn,"BPF offload active, MTU over %u not supported\n" , - max_mtu); +if (nn->xdp_hw.prog) { + prog = nn->xdp_hw.prog; + }else { + bv = nn->app_priv; + prog = bv->tc_prog; + } + +if (nfp_bpf_offload_check_mtu (nn, prog, new_mtu)) { +nn_info (nn,"BPF offload active, potential packet access beyond hardware packet boundary" );return -EBUSY ; }return 0 ;
drivers/net/ethernet/netronome/nfp/bpf/main.h +2 -0
@@ -560,6 +560,8 @@ bool nfp_is_subprog_start(struct nfp_insn_meta *meta);void nfp_bpf_jit_prepare (struct nfp_prog *nfp_prog);int nfp_bpf_jit (struct nfp_prog *prog);bool nfp_bpf_supported_opcode (u8 code); +bool nfp_bpf_offload_check_mtu (struct nfp_net *nn,struct bpf_prog *prog, +unsigned int mtu);int nfp_verify_insn (struct bpf_verifier_env *env,int insn_idx,int prev_insn_idx);
drivers/net/ethernet/netronome/nfp/bpf/offload.c +13 -4
@@ -481,19 +481,28 @@ int nfp_bpf_event_output(struct nfp_app_bpf *bpf, const void *data,return 0 ; } +bool nfp_bpf_offload_check_mtu (struct nfp_net *nn,struct bpf_prog *prog, +unsigned int mtu) +{ +unsigned int fw_mtu, pkt_off; + + fw_mtu =nn_readb (nn,NFP_NET_CFG_BPF_INL_MTU ) *64 -32 ; + pkt_off =min (prog->aux->max_pkt_offset, mtu); + +return fw_mtu < pkt_off; +} +static int nfp_net_bpf_load (struct nfp_net *nn,struct bpf_prog *prog,struct netlink_ext_ack *extack) {struct nfp_prog *nfp_prog = prog->aux->offload->dev_priv; -unsigned int fw_mtu, pkt_off, max_stack, max_prog_len; +unsigned int max_stack, max_prog_len;dma_addr_t dma_addr;void *img;int err; - fw_mtu =nn_readb (nn,NFP_NET_CFG_BPF_INL_MTU ) *64 -32 ; - pkt_off =min (prog->aux->max_pkt_offset, nn->dp.netdev->mtu); -if (fw_mtu < pkt_off) { +if (nfp_bpf_offload_check_mtu (nn, prog, nn->dp.netdev->mtu)) {NL_SET_ERR_MSG_MOD (extack,"BPF offload not supported with potential packet access beyond HW packet split boundary" );return -EOPNOTSUPP ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 80/575 net/smc: Fix smc_link->llc_testlink_time overflow
In reply to Greg Kroah-HartmanFrom: Tony Lu <[email protected]>
[ Upstream commit c4a146c7cf5e8ad76231523b174d161bf152c6e7 ]
The value of llc_testlink_time is set to the value stored in net->ipv4.sysctl_tcp_keepalive_time when linkgroup init. The value of sysctl_tcp_keepalive_time is already jiffies, so we don't need to multiply by HZ, which would cause smc_link->llc_testlink_time overflow, and test_link send flood.
--- net/smc/smc_llc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/smc/smc_llc.c +1 -1
@@ -1787,7 +1787,7 @@ void smc_llc_link_active(struct smc_link *link) link->smcibdev->ibdev->name, link->ibport); link->state =SMC_LNK_ACTIVE ;if (link->lgr->llc_testlink_time) { - link->llc_testlink_time = link->lgr->llc_testlink_time *HZ ; + link->llc_testlink_time = link->lgr->llc_testlink_time;schedule_delayed_work (&link->llc_testlink_wrk, link->llc_testlink_time); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 81/575 net/smc: Correct spelling mistake to TCPF_SYN_RECV
In reply to Greg Kroah-HartmanFrom: Wen Gu <[email protected]>
[ Upstream commit f3a3a0fe0b644582fa5d83dd94b398f99fc57914 ]
There should use TCPF_SYN_RECV instead of TCP_SYN_RECV.
--- net/smc/af_smc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/smc/af_smc.c +1 -1
@@ -1018,7 +1018,7 @@ static void smc_connect_work(struct work_struct *work)if (smc->clcsock->sk->sk_err) { smc->sk.sk_err = smc->clcsock->sk->sk_err; }else if ((1 << smc->clcsock->sk->sk_state) & - (TCPF_SYN_SENT |TCP_SYN_RECV )) { + (TCPF_SYN_SENT |TCPF_SYN_RECV )) { rc =sk_stream_wait_connect (smc->clcsock->sk, &timeo); if ((rc == -EPIPE) && ((1 << smc->clcsock->sk->sk_state) &
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 82/575 rds: stop using dmapool
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 42f2611cc1738b201701e717246e11e86bef4e1e ]
RDMA ULPs should only perform DMA through the ib_dma_* API instead of using the hidden dma_device directly. In addition using the dma coherent API family that dmapool is a part of can be very ineffcient on plaforms that are not DMA coherent. Switch to use slab allocations and the ib_dma_* APIs instead.
--- net/rds/ib.c | 10 ---- net/rds/ib.h | 6 --- net/rds/ib_cm.c | 128 ++++++++++++++++++++++++++++------------------ net/rds/ib_recv.c | 18 +++++-- net/rds/ib_send.c | 8 +++ 5 files changed, 101 insertions(+), 69 deletions(-)
net/rds/ib.c +0 -10
@@ -30,7 +30,6 @@* SOFTWARE. * */ -#include <linux/dmapool.h> #include <linux/kernel.h> #include <linux/in.h> #include <linux/if.h>
@@ -108,7 +107,6 @@ static void rds_ib_dev_free(struct work_struct *work)rds_ib_destroy_mr_pool (rds_ibdev->mr_1m_pool);if (rds_ibdev->pd)ib_dealloc_pd (rds_ibdev->pd); -dma_pool_destroy (rds_ibdev->rid_hdrs_pool);list_for_each_entry_safe (i_ipaddr, i_next, &rds_ibdev->ipaddr_list, list) {list_del (&i_ipaddr->list);
@@ -191,14 +189,6 @@ static int rds_ib_add_one(struct ib_device *device) rds_ibdev->pd =NULL ; goto put_dev; } - rds_ibdev->rid_hdrs_pool =dma_pool_create (device->name, - device->dma_device, -sizeof (struct rds_header ), -L1_CACHE_BYTES ,0 ); -if (!rds_ibdev->rid_hdrs_pool) { - ret = -ENOMEM ; - goto put_dev; - } rds_ibdev->mr_1m_pool =rds_ib_create_mr_pool (rds_ibdev,RDS_IB_MR_1M_POOL );
net/rds/ib.h +0 -6
@@ -246,7 +246,6 @@ struct rds_ib_device {struct list_head conn_list;struct ib_device *dev;struct ib_pd *pd; -struct dma_pool *rid_hdrs_pool;/* RDS headers DMA pool */ u8 odp_capable:1;unsigned int max_mrs;
@@ -380,11 +379,6 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,int rds_ib_cm_initiate_connect (struct rdma_cm_id *cm_id,bool isv6);void rds_ib_cm_connect_complete (struct rds_connection *conn,struct rdma_cm_event *event); -struct rds_header **rds_dma_hdrs_alloc (struct ib_device *ibdev, -struct dma_pool *pool, -dma_addr_t **dma_addrs,u32 num_hdrs); -void rds_dma_hdrs_free (struct dma_pool *pool,struct rds_header **hdrs, -dma_addr_t *dma_addrs,u32 num_hdrs); #define rds_ib_conn_error(conn, fmt...) \ __rds_ib_conn_error(conn, KERN_WARNING "RDS/IB: " fmt)
net/rds/ib_cm.c +78 -50
230 lines not on this page · raw message
net/rds/ib_recv.c +15 -3
@@ -662,10 +662,16 @@ static void rds_ib_send_ack(struct rds_ib_connection *ic, unsigned int adv_credi seq =rds_ib_get_ack (ic);rdsdebug ("send_ack: ic %p ack %llu\n" , ic, (unsigned long long ) seq); + +ib_dma_sync_single_for_cpu (ic->rds_ibdev->dev, ic->i_ack_dma, +sizeof (*hdr),DMA_TO_DEVICE );rds_message_populate_header (hdr,0 ,0 ,0 ); hdr->h_ack =cpu_to_be64 (seq); hdr->h_credit = adv_credits;rds_message_make_checksum (hdr); +ib_dma_sync_single_for_device (ic->rds_ibdev->dev, ic->i_ack_dma, +sizeof (*hdr),DMA_TO_DEVICE ); + ic->i_ack_queued = jiffies; ret =ib_post_send (ic->i_cm_id->qp, &ic->i_ack_wr,NULL );
@@ -845,6 +851,7 @@ static void rds_ib_process_recv(struct rds_connection *conn,struct rds_ib_connection *ic = conn->c_transport_data;struct rds_ib_incoming *ibinc = ic->i_ibinc;struct rds_header *ihdr, *hdr; +dma_addr_t dma_addr = ic->i_recv_hdrs_dma[recv - ic->i_recvs];/* XXX shut down the connection if port 0,0 are seen? */
@@ -863,6 +870,8 @@ static void rds_ib_process_recv(struct rds_connection *conn, ihdr = ic->i_recv_hdrs[recv - ic->i_recvs]; +ib_dma_sync_single_for_cpu (ic->rds_ibdev->dev, dma_addr, +sizeof (*ihdr),DMA_FROM_DEVICE );/* Validate the checksum. */ if (!rds_message_verify_checksum (ihdr)) { rds_ib_conn_error(conn, "incoming message "
@@ -870,7 +879,7 @@ static void rds_ib_process_recv(struct rds_connection *conn,"forcing a reconnect\n" , &conn->c_faddr);rds_stats_inc (s_recv_drop_bad_checksum); -return ; + goto done; }/* Process the ACK sequence which comes with every packet */
@@ -899,7 +908,7 @@ static void rds_ib_process_recv(struct rds_connection *conn,*/ rds_ib_frag_free (ic, recv->r_frag); recv->r_frag =NULL ; -return ; + goto done; }/*
@@ -933,7 +942,7 @@ static void rds_ib_process_recv(struct rds_connection *conn, hdr->h_dport != ihdr->h_dport) {rds_ib_conn_error (conn,"fragment header mismatch; forcing reconnect\n" ); -return ; + goto done; } }
@@ -965,6 +974,9 @@ static void rds_ib_process_recv(struct rds_connection *conn,rds_inc_put (&ibinc->ii_inc); } +done: +ib_dma_sync_single_for_device (ic->rds_ibdev->dev, dma_addr, +sizeof (*ihdr),DMA_FROM_DEVICE ); } void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic,
net/rds/ib_send.c +8 -0
@@ -638,6 +638,10 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, send->s_sge[0 ].length =sizeof (struct rds_header ); send->s_sge[0 ].lkey = ic->i_pd->local_dma_lkey; +ib_dma_sync_single_for_cpu (ic->rds_ibdev->dev, + ic->i_send_hdrs_dma[pos], +sizeof (struct rds_header ), +DMA_TO_DEVICE );memcpy (ic->i_send_hdrs[pos], &rm->m_inc.i_hdr,sizeof (struct rds_header ));
@@ -688,6 +692,10 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, adv_credits =0 ;rds_ib_stats_inc (s_ib_tx_credit_updates); } +ib_dma_sync_single_for_device (ic->rds_ibdev->dev, + ic->i_send_hdrs_dma[pos], +sizeof (struct rds_header ), +DMA_TO_DEVICE );if (prev) prev->s_wr.next = &send->s_wr;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 83/575 btrfs: clear MISSING device status bit in btrfs_close_one_device
In reply to Greg Kroah-HartmanFrom: Li Zhang <[email protected]>
commit 5d03dbebba2594d2e6fbf3b5dd9060c5a835de3b upstream.
Reported bug: https://github.com/kdave/btrfs-progs/issues/389
There's a problem with scrub reporting aborted status but returning error code 0, on a filesystem with missing and readded device.
Roughly these steps:
- mkfs -d raid1 dev1 dev2
- fill with data
- unmount
- make dev1 disappear
- mount -o degraded
- copy more data
- make dev1 appear again
Running scrub afterwards reports that the command was aborted, but the system log message says the exit code was 0.
It seems that the cause of the error is decrementing fs_devices->missing_devices but not clearing device->dev_state. Every time we umount filesystem, it would call close_ctree, And it would eventually involve btrfs_close_one_device to close the device, but it only decrements fs_devices->missing_devices but does not clear the device BTRFS_DEV_STATE_MISSING bit. Worse, this bug will cause Integer Overflow, because every time umount, fs_devices->missing_devices will decrease. If fs_devices->missing_devices value hit 0, it would overflow.
With added debugging:
loop1: detected capacity change from 0 to 20971520
BTRFS: device fsid 56ad51f1-5523-463b-8547-c19486c51ebb devid 1 transid 21 /dev/loop1 scanned by systemd-udevd (2311)
loop2: detected capacity change from 0 to 20971520
BTRFS: device fsid 56ad51f1-5523-463b-8547-c19486c51ebb devid 2 transid 17 /dev/loop2 scanned by systemd-udevd (2313) BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): using free space tree
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000f706684d /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 6635ac31-56dd-4852-873b-c60f5e2d53d2 is missing
BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 1
BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): using free space tree
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000f706684d /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 6635ac31-56dd-4852-873b-c60f5e2d53d2 is missing
BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 0
BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): using free space tree
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000f706684d /dev/loop1 18446744073709551615 BTRFS warning (device loop1): devid 2 uuid 6635ac31-56dd-4852-873b-c60f5e2d53d2 is missing
BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 18446744073709551615
If fs_devices->missing_devices is 0, next time it would be 18446744073709551615
After apply this patch, the fs_devices->missing_devices seems to be right:
$ truncate -s 10g test1 $ truncate -s 10g test2 $ losetup /dev/loop1 test1 $ losetup /dev/loop2 test2 $ mkfs.btrfs -draid1 -mraid1 /dev/loop1 /dev/loop2 -f $ losetup -d /dev/loop2 $ mount -o degraded /dev/loop1 /mnt/1 $ umount /mnt/1 $ mount -o degraded /dev/loop1 /mnt/1 $ umount /mnt/1 $ mount -o degraded /dev/loop1 /mnt/1 $ umount /mnt/1 $ dmesg
loop1: detected capacity change from 0 to 20971520
loop2: detected capacity change from 0 to 20971520
BTRFS: device fsid 15aa1203-98d3-4a66-bcae-ca82f629c2cd devid 1 transid 5 /dev/loop1 scanned by mkfs.btrfs (1863)
BTRFS: device fsid 15aa1203-98d3-4a66-bcae-ca82f629c2cd devid 2 transid 5 /dev/loop2 scanned by mkfs.btrfs (1863) BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): disk space caching is enabled
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000975bd577 /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 8b333791-0b3f-4f57-b449-1c1ab6b51f38 is missing BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 1
BTRFS info (device loop1): checking UUID tree
BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): disk space caching is enabled
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000975bd577 /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 8b333791-0b3f-4f57-b449-1c1ab6b51f38 is missing BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 1
BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): disk space caching is enabled
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000975bd577 /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 8b333791-0b3f-4f57-b449-1c1ab6b51f38 is missing BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 1
--- fs/btrfs/volumes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/volumes.c +3 -1
@@ -1133,8 +1133,10 @@ static void btrfs_close_one_device(strucif (device->devid ==BTRFS_DEV_REPLACE_DEVID )clear_bit (BTRFS_DEV_STATE_REPLACE_TGT , &device->dev_state); -if (test_bit (BTRFS_DEV_STATE_MISSING , &device->dev_state)) +if (test_bit (BTRFS_DEV_STATE_MISSING , &device->dev_state)) { +clear_bit (BTRFS_DEV_STATE_MISSING , &device->dev_state); fs_devices->missing_devices--; + }btrfs_close_bdev (device);if (device->bdev) {
Greg Kroah-Hartman
maintainerPATCH 84/575 btrfs: fix lost error handling when replaying directory deletes
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 10adb1152d957a4d570ad630f93a88bb961616c1 upstream.
At replay_dir_deletes(), if find_dir_range() returns an error we break out of the main while loop and then assign a value of 0 (success) to the 'ret' variable, resulting in completely ignoring that an error happened. Fix that by jumping to the 'out' label when find_dir_range() returns an error (negative value).
--- fs/btrfs/tree-log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/tree-log.c +3 -1
@@ -2466,7 +2466,9 @@ again:else { ret =find_dir_range (log, path, dirid, key_type, &range_start, &range_end); -if (ret !=0 ) +if (ret <0 ) + goto out; +else if (ret >0 )break ; }
Greg Kroah-Hartman
maintainerPATCH 85/575 btrfs: call btrfs_check_rw_degradable only if there is a missing device
In reply to Greg Kroah-HartmanFrom: Anand Jain <[email protected]>
commit 5c78a5e7aa835c4f08a7c90fe02d19f95a776f29 upstream.
In open_ctree() in btrfs_check_rw_degradable() [1], we check each block group individually if at least the minimum number of devices is available for that profile. If all the devices are available, then we don't have to check degradable.
[1]open_ctree()
::
3559 if (!sb_rdonly(sb) && !btrfs_check_rw_degradable(fs_info, NULL)) {
Also before calling btrfs_check_rw_degradable() in open_ctee() at the line number shown below [2] we call btrfs_read_chunk_tree() and down to add_missing_dev() to record number of missing devices.
[2]open_ctree()
::
3454 ret = btrfs_read_chunk_tree(fs_info);
btrfs_read_chunk_tree()
read_one_chunk() / read_one_dev()
add_missing_dev()
So, check if there is any missing device before btrfs_check_rw_degradable() in open_ctree().
Also, with this the mount command could save ~16ms.[3] in the most common case, that is no device is missing.
[3]
1) * 16934.96 us | btrfs_check_rw_degradable [btrfs]();
--- fs/btrfs/disk-io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/disk-io.c +2 -1
@@ -3223,7 +3223,8 @@ int __cold open_ctree(struct super_block goto fail_sysfs; } -if (!sb_rdonly (sb) && !btrfs_check_rw_degradable (fs_info,NULL )) { +if (!sb_rdonly (sb) && fs_info->fs_devices->missing_devices && + !btrfs_check_rw_degradable (fs_info,NULL )) {btrfs_warn (fs_info,"writable mount is not allowed due to too many missing devices" ); goto fail_sysfs;
Greg Kroah-Hartman
maintainerPATCH 86/575 KVM: VMX: Unregister posted interrupt wakeup handler on hardware unsetup
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit ec5a4919fa7b7d8c7a2af1c7e799b1fe4be84343 upstream.
Unregister KVM's posted interrupt wakeup handler during unsetup so that a spurious interrupt that arrives after kvm_intel.ko is unloaded doesn't call into freed memory.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/vmx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/vmx.c +5 -2
@@ -7586,6 +7586,8 @@ static void vmx_migrate_timers(struct kvstatic void hardware_unsetup (void ) { +kvm_set_posted_intr_wakeup_handler (NULL ); +if (nested)nested_vmx_hardware_unsetup ();
@@ -7877,8 +7879,6 @@ static __init int hardware_setup(void) vmx_x86_ops.request_immediate_exit = __kvm_request_immediate_exit; } -kvm_set_posted_intr_wakeup_handler (pi_wakeup_handler); - kvm_mce_cap_supported |=MCG_LMCE_P ;if (pt_mode !=PT_MODE_SYSTEM && pt_mode !=PT_MODE_HOST_GUEST )
@@ -7900,6 +7900,9 @@ static __init int hardware_setup(void) r =alloc_kvm_area ();if (r)nested_vmx_hardware_unsetup (); + +kvm_set_posted_intr_wakeup_handler (pi_wakeup_handler); +return r; }
Greg Kroah-Hartman
maintainerPATCH 87/575 powerpc/kvm: Fix kvm_use_magic_page
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
commit 0c8eb2884a42d992c7726539328b7d3568f22143 upstream.
When switching from __get_user to fault_in_pages_readable, commit 9f9eae5ce717 broke kvm_use_magic_page: like __get_user, fault_in_pages_readable returns 0 on success.
--- arch/powerpc/kernel/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/kvm.c +1 -1
@@ -669,7 +669,7 @@ static void __init kvm_use_magic_page(voon_each_cpu (kvm_map_magic_page, &features,1 );/* Quick self-test to see if the mapping works */ -if (!fault_in_pages_readable ((const char *)KVM_MAGIC_PAGE ,sizeof (u32))) { +if (fault_in_pages_readable ((const char *)KVM_MAGIC_PAGE ,sizeof (u32))) { kvm_patching_worked = false;return ; }
Greg Kroah-Hartman
maintainerPATCH 88/575 ia64: kprobes: Fix to pass correct trampoline address to the handler
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
commit a7fe2378454cf46cd5e2776d05e72bbe8f0a468c upstream.
The following commit:
Commit e792ff804f49 ("ia64: kprobes: Use generic kretprobe trampoline handler")
Passed the wrong trampoline address to __kretprobe_trampoline_handler(): it passes the descriptor address instead of function entry address.
Pass the right parameter.
Also use correct symbol dereference function to get the function address from 'kretprobe_trampoline' - an IA64 special.
--- arch/ia64/kernel/kprobes.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/ia64/kernel/kprobes.c +5 -4
@@ -398,7 +398,8 @@ static void kretprobe_trampoline(void)int __kprobes trampoline_probe_handler (struct kprobe *p,struct pt_regs *regs) { - regs->cr_iip =__kretprobe_trampoline_handler (regs, kretprobe_trampoline,NULL ); + regs->cr_iip =__kretprobe_trampoline_handler (regs, +dereference_function_descriptor (kretprobe_trampoline),NULL );/* * By returning a non-zero value, we are telling * kprobe_handler() that we don't want the post_handler
@@ -414,7 +415,7 @@ void __kprobes arch_prepare_kretprobe(st ri->fp =NULL ;/* Replace the return addr with trampoline addr */ - regs->b0 = ((struct fnptr *)kretprobe_trampoline)->ip; + regs->b0 = (unsigned long )dereference_function_descriptor (kretprobe_trampoline); }/* Check the instruction in the slot is break */
@@ -918,14 +919,14 @@ static struct kprobe trampoline_p = {int __init arch_init_kprobes (void ) { trampoline_p.addr = - (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip; +dereference_function_descriptor (kretprobe_trampoline);return register_kprobe (&trampoline_p); }int __kprobes arch_trampoline_kprobe (struct kprobe *p) {if (p->addr == - (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip) +dereference_function_descriptor (kretprobe_trampoline))return 1 ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 89/575 selinux: fix race condition when computing ocontext SIDs
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
commit cbfcd13be5cb2a07868afe67520ed181956579a7 upstream.
Current code contains a lot of racy patterns when converting an ocontext's context structure to an SID. This is being done in a "lazy" fashion, such that the SID is looked up in the SID table only when it's first needed and then cached in the "sid" field of the ocontext structure. However, this is done without any locking or memory barriers and is thus unsafe.
Between commits 24ed7fdae669 ("selinux: use separate table for initial SID lookup") and 66f8e2f03c02 ("selinux: sidtab reverse lookup hash table"), this race condition lead to an actual observable bug, because a pointer to the shared sid field was passed directly to sidtab_context_to_sid(), which was using this location to also store an intermediate value, which could have been read by other threads and interpreted as an SID. In practice this caused e.g. new mounts to get a wrong (seemingly random) filesystem context, leading to strange denials. This bug has been spotted in the wild at least twice, see [1] and [2].
Fix the race condition by making all the racy functions use a common helper that ensures the ocontext::sid accesses are made safely using the appropriate SMP constructs.
Note that security_netif_sid() was populating the sid field of both contexts stored in the ocontext, but only the first one was actually used. The SELinux wiki's documentation on the "netifcon" policy statement [3] suggests that using only the first context is intentional. I kept only the handling of the first context here, as there is really no point in doing the SID lookup for the unused one.
I wasn't able to reproduce the bug mentioned above on any kernel that includes commit 66f8e2f03c02, even though it has been reported that the issue occurs with that commit, too, just less frequently. Thus, I wasn't able to verify that this patch fixes the issue, but it makes sense to avoid the race condition regardless.
[1] https://github.com/containers/container-selinux/issues/89
[2] https://lists.fedoraproject.org/archives/list/[email protected]/thread/6DMTAMHIOAOEMUAVTULJD45JZU7IBAFM/
[3] https://selinuxproject.org/page/NetworkStatements#netifcon
--- security/selinux/ss/services.c | 162 +++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 85 deletions(-)
security/selinux/ss/services.c +77 -85
@@ -2369,6 +2369,43 @@ err_policy: }/** +* ocontext_to_sid - Helper to safely get sid for an ocontext +* @sidtab: SID table +* @c: ocontext structure +* @index: index of the context entry (0 or 1) +* @out_sid: pointer to the resulting SID value +* +* For all ocontexts except OCON_ISID the SID fields are populated +* on-demand when needed. Since updating the SID value is an SMP-sensitive +* operation, this helper must be used to do that safely. +* +* WARNING: This function may return -ESTALE, indicating that the caller +* must retry the operation after re-acquiring the policy pointer! +*/ +static int ocontext_to_sid (struct sidtab *sidtab,struct ocontext *c, +size_t index,u32 *out_sid) +{ +int rc; +u32 sid; + +/* Ensure the associated sidtab entry is visible to this thread. */ + sid =smp_load_acquire (&c->sid[index]); +if (!sid) { + rc =sidtab_context_to_sid (sidtab, &c->context[index], &sid); +if (rc) +return rc; + +/* +* Ensure the new sidtab entry is visible to other threads +* when they see the SID. +*/ +smp_store_release (&c->sid[index], sid); + } + *out_sid = sid; +return 0 ; +} + +/** * security_port_sid - Obtain the SID for a port. * @protocol: protocol number * @port: port number
@@ -2405,17 +2442,13 @@ retry: }if (c) { -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , out_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *out_sid = c->sid[0 ]; +if (rc) + goto out; }else { *out_sid =SECINITSID_PORT ; }
@@ -2463,18 +2496,13 @@ retry: }if (c) { -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, - &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , out_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *out_sid = c->sid[0 ]; +if (rc) + goto out; }else *out_sid =SECINITSID_UNLABELED ;
@@ -2522,17 +2550,13 @@ retry: }if (c) { -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , out_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *out_sid = c->sid[0 ]; +if (rc) + goto out; }else *out_sid =SECINITSID_UNLABELED ;
@@ -2575,25 +2599,13 @@ retry: }if (c) { -if (!c->sid[0 ] || !c->sid[1 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; - rc =sidtab_context_to_sid (sidtab, &c->context[1 ], - &c->sid[1 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , if_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *if_sid = c->sid[0 ]; +if (rc) + goto out; }else *if_sid =SECINITSID_NETIF ;
@@ -2684,18 +2696,13 @@ retry: }if (c) { -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, - &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , out_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *out_sid = c->sid[0 ]; +if (rc) + goto out; }else { *out_sid =SECINITSID_NODE ; }
@@ -2859,7 +2866,7 @@ static inline int __security_genfs_sid(su16 sclass;struct genfs *genfs;struct ocontext *c; -int rc, cmp =0 ; +int cmp =0 ;while (path[0 ] =='/' && path[1 ] =='/' ) path++;
@@ -2873,9 +2880,8 @@ static inline int __security_genfs_sid(sbreak ; } - rc = -ENOENT ;if (!genfs || cmp) - goto out; +return -ENOENT ;for (c = genfs->head; c; c = c->next) { len =strlen (c->u.name);
@@ -2884,20 +2890,10 @@ static inline int __security_genfs_sid(sbreak ; } - rc = -ENOENT ;if (!c) - goto out; +return -ENOENT ; -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], &c->sid[0 ]); -if (rc) - goto out; - } - - *sid = c->sid[0 ]; - rc =0 ; -out: -return rc; +return ocontext_to_sid (sidtab, c,0 , sid); }/**
@@ -2980,17 +2976,13 @@ retry:if (c) { sbsec->behavior = c->v.behavior; -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , &sbsec->sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - sbsec->sid = c->sid[0 ]; +if (rc) + goto out; }else { rc =__security_genfs_sid (policy, fstype,"/" ,SECCLASS_DIR , &sbsec->sid);
Greg Kroah-Hartman
maintainerPATCH 90/575 hwmon: (pmbus/lm25066) Add offset coefficients
In reply to Greg Kroah-HartmanFrom: Zev Weiss <[email protected]>
commit ae59dc455a78fb73034dd1fbb337d7e59c27cbd8 upstream.
With the exception of the lm5066i, all the devices handled by this driver had been missing their offset ('b') coefficients for direct format readings.
--- drivers/hwmon/pmbus/lm25066.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/hwmon/pmbus/lm25066.c +23 -0
@@ -55,22 +55,27 @@ static struct __coeff lm25066_coeff[6][P [lm25056] = { [PSC_VOLTAGE_IN] = { .m = 16296, + .b = 1343, .R = -2, }, [PSC_CURRENT_IN] = { .m = 13797, + .b = -1833, .R = -2, }, [PSC_CURRENT_IN_L] = { .m = 6726, + .b = -537, .R = -2, }, [PSC_POWER] = { .m = 5501, + .b = -2908, .R = -3, }, [PSC_POWER_L] = { .m = 26882, + .b = -5646, .R = -4, }, [PSC_TEMPERATURE] = {
@@ -82,26 +87,32 @@ static struct __coeff lm25066_coeff[6][P [lm25066] = { [PSC_VOLTAGE_IN] = { .m = 22070, + .b = -1800, .R = -2, }, [PSC_VOLTAGE_OUT] = { .m = 22070, + .b = -1800, .R = -2, }, [PSC_CURRENT_IN] = { .m = 13661, + .b = -5200, .R = -2, }, [PSC_CURRENT_IN_L] = { .m = 6852, + .b = -3100, .R = -2, }, [PSC_POWER] = { .m = 736, + .b = -3300, .R = -2, }, [PSC_POWER_L] = { .m = 369, + .b = -1900, .R = -2, }, [PSC_TEMPERATURE] = {
@@ -111,26 +122,32 @@ static struct __coeff lm25066_coeff[6][P [lm5064] = { [PSC_VOLTAGE_IN] = { .m = 4611, + .b = -642, .R = -2, }, [PSC_VOLTAGE_OUT] = { .m = 4621, + .b = 423, .R = -2, }, [PSC_CURRENT_IN] = { .m = 10742, + .b = 1552, .R = -2, }, [PSC_CURRENT_IN_L] = { .m = 5456, + .b = 2118, .R = -2, }, [PSC_POWER] = { .m = 1204, + .b = 8524, .R = -3, }, [PSC_POWER_L] = { .m = 612, + .b = 11202, .R = -3, }, [PSC_TEMPERATURE] = {
@@ -140,26 +157,32 @@ static struct __coeff lm25066_coeff[6][P [lm5066] = { [PSC_VOLTAGE_IN] = { .m = 4587, + .b = -1200, .R = -2, }, [PSC_VOLTAGE_OUT] = { .m = 4587, + .b = -2400, .R = -2, }, [PSC_CURRENT_IN] = { .m = 10753, + .b = -1200, .R = -2, }, [PSC_CURRENT_IN_L] = { .m = 5405, + .b = -600, .R = -2, }, [PSC_POWER] = { .m = 1204, + .b = -6000, .R = -3, }, [PSC_POWER_L] = { .m = 605, + .b = -8000, .R = -3, }, [PSC_TEMPERATURE] = {
Greg Kroah-Hartman
maintainerPATCH 91/575 regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit b16bef60a9112b1e6daf3afd16484eb06e7ce792 upstream.
The driver and its bindings, before commit 04f9f068a619 ("regulator:
s5m8767: Modify parsing method of the voltage table of buck2/3/4") were requiring to provide at least one safe/default voltage for DVS registers if DVS GPIO is not being enabled.
IOW, if s5m8767,pmic-buck2-uses-gpio-dvs is missing, the s5m8767,pmic-buck2-dvs-voltage should still be present and contain one voltage.
This requirement was coming from driver behavior matching this condition (none of DVS GPIO is enabled): it was always initializing the DVS selector pins to 0 and keeping the DVS enable setting at reset value (enabled). Therefore if none of DVS GPIO is enabled in devicetree, driver was configuring the first DVS voltage for buck[234].
Mentioned commit 04f9f068a619 ("regulator: s5m8767: Modify parsing method of the voltage table of buck2/3/4") broke it because DVS voltage won't be parsed from devicetree if DVS GPIO is not enabled. After the change, driver will configure bucks to use the register reset value as voltage which might have unpleasant effects.
Fix this by relaxing the bindings constrain: if DVS GPIO is not enabled in devicetree (therefore DVS voltage is also not parsed), explicitly disable it.
Message-Id: <[email protected]>
--- Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt | 21 +++------- drivers/regulator/s5m8767.c | 21 ++++------ 2 files changed, 17 insertions(+), 25 deletions(-)
Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt +8 -13
@@ -13,6 +13,14 @@ common regulator binding documented in: Required properties of the main device node (the parent!): + - s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used + for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines. + + [1] If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional + property is specified, then all the eight voltage values for the + 's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified. + +Optional properties of the main device node (the parent!): - s5m8767,pmic-buck2-dvs-voltage: A set of 8 voltage values in micro-volt (uV) units for buck2 when changing voltage using gpio dvs. Refer to [1] below for additional information.
@@ -25,19 +33,6 @@ Required properties of the main device n units for buck4 when changing voltage using gpio dvs. Refer to [1] below for additional information. - - s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used - for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines. - - [1] If none of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional - property is specified, the 's5m8767,pmic-buck[2/3/4]-dvs-voltage' - property should specify atleast one voltage level (which would be a - safe operating voltage). - - If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional - property is specified, then all the eight voltage values for the - 's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified. - -Optional properties of the main device node (the parent!): - s5m8767,pmic-buck2-uses-gpio-dvs: 'buck2' can be controlled by gpio dvs. - s5m8767,pmic-buck3-uses-gpio-dvs: 'buck3' can be controlled by gpio dvs. - s5m8767,pmic-buck4-uses-gpio-dvs: 'buck4' can be controlled by gpio dvs.
drivers/regulator/s5m8767.c +9 -12
@@ -850,18 +850,15 @@ static int s5m8767_pmic_probe(struct pla/* DS4 GPIO */ gpio_direction_output (pdata->buck_ds[2 ],0x0 ); -if (pdata->buck2_gpiodvs || pdata->buck3_gpiodvs || - pdata->buck4_gpiodvs) { -regmap_update_bits (s5m8767->iodev->regmap_pmic, -S5M8767_REG_BUCK2CTRL ,1 <<1 , - (pdata->buck2_gpiodvs) ? (1 <<1 ) : (0 <<1 )); -regmap_update_bits (s5m8767->iodev->regmap_pmic, -S5M8767_REG_BUCK3CTRL ,1 <<1 , - (pdata->buck3_gpiodvs) ? (1 <<1 ) : (0 <<1 )); -regmap_update_bits (s5m8767->iodev->regmap_pmic, -S5M8767_REG_BUCK4CTRL ,1 <<1 , - (pdata->buck4_gpiodvs) ? (1 <<1 ) : (0 <<1 )); - } +regmap_update_bits (s5m8767->iodev->regmap_pmic, +S5M8767_REG_BUCK2CTRL ,1 <<1 , + (pdata->buck2_gpiodvs) ? (1 <<1 ) : (0 <<1 )); +regmap_update_bits (s5m8767->iodev->regmap_pmic, +S5M8767_REG_BUCK3CTRL ,1 <<1 , + (pdata->buck3_gpiodvs) ? (1 <<1 ) : (0 <<1 )); +regmap_update_bits (s5m8767->iodev->regmap_pmic, +S5M8767_REG_BUCK4CTRL ,1 <<1 , + (pdata->buck4_gpiodvs) ? (1 <<1 ) : (0 <<1 ));/* Initialize GPIO DVS registers */ for (i =0 ; i <8 ; i++) {
Greg Kroah-Hartman
maintainerPATCH 92/575 regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx property
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit a7fda04bc9b6ad9da8e19c9e6e3b1dab773d068a upstream.
The driver was always parsing "s5m8767,pmic-buck-default-dvs-idx", not "s5m8767,pmic-buck234-default-dvs-idx".
Message-Id: <[email protected]>
--- Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt +1 -1
@@ -39,7 +39,7 @@ Optional properties of the main device n Additional properties required if either of the optional properties are used: - - s5m8767,pmic-buck234-default-dvs-idx: Default voltage setting selected from + - s5m8767,pmic-buck-default-dvs-idx: Default voltage setting selected from the possible 8 options selectable by the dvs gpios. The value of this property should be between 0 and 7. If not specified or if out of range, the default value of this property is set to 0.
Greg Kroah-Hartman
maintainerPATCH 93/575 EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell
In reply to Greg Kroah-HartmanFrom: Eric Badger <[email protected]>
commit 537bddd069c743759addf422d0b8f028ff0f8dbc upstream.
The computation of TOHM is off by one bit. This missed bit results in too low a value for TOHM, which can cause errors in regular memory to incorrectly report:
EDAC MC0: 1 CE Error at MMIOH area, on addr 0x000000207fffa680 on any memory
--- drivers/edac/sb_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/sb_edac.c +1 -1
@@ -1052,7 +1052,7 @@ static u64 haswell_get_tohm(struct sbridpci_read_config_dword (pvt->info.pci_vtd,HASWELL_TOHM_1 , ®); rc = ((reg <<6 ) | rc) <<26 ; -return rc |0x1ffffff ; +return rc |0x3ffffff ; }static u64 knl_get_tolm (struct sbridge_pvt *pvt)
Greg Kroah-Hartman
maintainerPATCH 94/575 mwifiex: fix division by zero in fw download path
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 89f8765a11d8df49296d92c404067f9b5c58ee26 upstream.
Add the missing endpoint sanity checks to probe() to avoid division by zero in mwifiex_write_data_sync() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing).
Only add checks for the firmware-download boot stage, which require both command endpoints, for now. The driver looks like it will handle a missing endpoint during normal operation without oopsing, albeit not very gracefully as it will try to submit URBs to the default pipe and fail.
Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")).
--- drivers/net/wireless/marvell/mwifiex/usb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/net/wireless/marvell/mwifiex/usb.c +16 -0
@@ -505,6 +505,22 @@ static int mwifiex_usb_probe(struct usb_ } } +switch (card->usb_boot_state) { +case USB8XXX_FW_DNLD : +/* Reject broken descriptors. */ +if (!card->rx_cmd_ep || !card->tx_cmd_ep) +return -ENODEV ; +if (card->bulk_out_maxpktsize ==0 ) +return -ENODEV ; +break ; +case USB8XXX_FW_READY : +/* Assume the driver can handle missing endpoints for now. */ +break ; +default : +WARN_ON (1 ); +return -ENODEV ; + } +usb_set_intfdata (intf, card); ret = mwifiex_add_card(card, &card->fw_done, &usb_ops,
Greg Kroah-Hartman
maintainerPATCH 95/575 ath6kl: fix division by zero in send path
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit c1b9ca365deae667192be9fe24db244919971234 upstream.
Add the missing endpoint max-packet sanity check to probe() to avoid division by zero in ath10k_usb_hif_tx_sg() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing).
Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")).
--- drivers/net/wireless/ath/ath6kl/usb.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath6kl/usb.c +5 -0
@@ -340,6 +340,11 @@ static int ath6kl_usb_setup_pipe_resourcle16_to_cpu (endpoint->wMaxPacketSize), endpoint->bInterval); } + +/* Ignore broken descriptors. */ +if (usb_endpoint_maxp (endpoint) ==0 ) +continue ; + urbcount =0 ; pipe_num =
Greg Kroah-Hartman
maintainerPATCH 96/575 ath6kl: fix control-message timeout
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit a066d28a7e729f808a3e6eff22e70c003091544e upstream.
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- drivers/net/wireless/ath/ath6kl/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/usb.c +1 -1
@@ -912,7 +912,7 @@ static int ath6kl_usb_submit_ctrl_in(str req,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , value, index, buf, - size, 2 * HZ); + size, 2000);if (ret <0 ) {ath6kl_warn ("Failed to read usb control message: %d\n" , ret);
Greg Kroah-Hartman
maintainerPATCH 97/575 ath10k: fix control-message timeout
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 5286132324230168d3fab6ffc16bfd7de85bdfb4 upstream.
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- drivers/net/wireless/ath/ath10k/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/usb.c +1 -1
@@ -525,7 +525,7 @@ static int ath10k_usb_submit_ctrl_in(str req,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , value, index, buf, - size, 2 * HZ); + size, 2000);if (ret <0 ) { ath10k_warn(ar, "Failed to read usb control message: %d\n",
Greg Kroah-Hartman
maintainerPATCH 98/575 ath10k: fix division by zero in send path
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit a006acb931317aad3a8dd41333ebb0453caf49b8 upstream.
Add the missing endpoint max-packet sanity check to probe() to avoid division by zero in ath10k_usb_hif_tx_sg() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing).
Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")).
--- drivers/net/wireless/ath/ath10k/usb.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath10k/usb.c +5 -0
@@ -853,6 +853,11 @@ static int ath10k_usb_setup_pipe_resourcle16_to_cpu (endpoint->wMaxPacketSize), endpoint->bInterval); } + +/* Ignore broken descriptors. */ +if (usb_endpoint_maxp (endpoint) ==0 ) +continue ; + urbcount =0 ; pipe_num =
Greg Kroah-Hartman
maintainerPATCH 99/575 PCI: Mark Atheros QCA6174 to avoid bus reset
In reply to Greg Kroah-HartmanFrom: Ingmar Klein <[email protected]>
commit e3f4bd3462f6f796594ecc0dda7144ed2d1e5a26 upstream.
When passing the Atheros QCA6174 through to a virtual machine, the VM hangs at the point where the ath10k driver loads.
Add a quirk to avoid bus resets on this device, which avoids the hang.
--- drivers/pci/quirks.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/quirks.c +1 -0
@@ -3584,6 +3584,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ADECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x003c , quirk_no_bus_reset);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0033 , quirk_no_bus_reset);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0034 , quirk_no_bus_reset); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x003e , quirk_no_bus_reset);/* * Root port on some Cavium CN8xxx chips do not successfully complete a bus
Greg Kroah-Hartman
maintainerPATCH 100/575 rtl8187: fix control-message timeouts
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 2e9be536a213e838daed6ba42024dd68954ac061 upstream.
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c +7 -7
@@ -28,7 +28,7 @@ u8 rtl818x_ioread8_idx(struct rtl8187_prusb_control_msg (priv->udev,usb_rcvctrlpipe (priv->udev,0 ),RTL8187_REQ_GET_REG ,RTL8187_REQT_READ , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits8,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits8,sizeof (val),500 ); val = priv->io_dmabuf->bits8;mutex_unlock (&priv->io_mutex);
@@ -45,7 +45,7 @@ u16 rtl818x_ioread16_idx(struct rtl8187_usb_control_msg (priv->udev,usb_rcvctrlpipe (priv->udev,0 ),RTL8187_REQ_GET_REG ,RTL8187_REQT_READ , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits16,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits16,sizeof (val),500 ); val = priv->io_dmabuf->bits16;mutex_unlock (&priv->io_mutex);
@@ -62,7 +62,7 @@ u32 rtl818x_ioread32_idx(struct rtl8187_usb_control_msg (priv->udev,usb_rcvctrlpipe (priv->udev,0 ),RTL8187_REQ_GET_REG ,RTL8187_REQT_READ , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits32,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits32,sizeof (val),500 ); val = priv->io_dmabuf->bits32;mutex_unlock (&priv->io_mutex);
@@ -79,7 +79,7 @@ void rtl818x_iowrite8_idx(struct rtl8187usb_control_msg (priv->udev,usb_sndctrlpipe (priv->udev,0 ),RTL8187_REQ_SET_REG ,RTL8187_REQT_WRITE , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits8,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits8,sizeof (val),500 );mutex_unlock (&priv->io_mutex); }
@@ -93,7 +93,7 @@ void rtl818x_iowrite16_idx(struct rtl818usb_control_msg (priv->udev,usb_sndctrlpipe (priv->udev,0 ),RTL8187_REQ_SET_REG ,RTL8187_REQT_WRITE , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits16,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits16,sizeof (val),500 );mutex_unlock (&priv->io_mutex); }
@@ -107,7 +107,7 @@ void rtl818x_iowrite32_idx(struct rtl818usb_control_msg (priv->udev,usb_sndctrlpipe (priv->udev,0 ),RTL8187_REQ_SET_REG ,RTL8187_REQT_WRITE , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits32,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits32,sizeof (val),500 );mutex_unlock (&priv->io_mutex); }
@@ -183,7 +183,7 @@ static void rtl8225_write_8051(struct ieusb_control_msg (priv->udev,usb_sndctrlpipe (priv->udev,0 ),RTL8187_REQ_SET_REG ,RTL8187_REQT_WRITE , addr,0x8225 , &priv->io_dmabuf->bits16,sizeof (data), -HZ /2 ); +500 );mutex_unlock (&priv->io_mutex);
Greg Kroah-Hartman
maintainerPATCH 101/575 evm: mark evm_fixmode as __ro_after_init
In reply to Greg Kroah-HartmanFrom: Austin Kim <[email protected]>
commit 32ba540f3c2a7ef61ed5a577ce25069a3d714fc9 upstream.
The evm_fixmode is only configurable by command-line option and it is never modified outside initcalls, so declaring it with __ro_after_init is better.
--- security/integrity/evm/evm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/integrity/evm/evm_main.c +1 -1
@@ -54,7 +54,7 @@ static struct xattr_list evm_config_defaLIST_HEAD (evm_config_xattrnames); -static int evm_fixmode; +static int evm_fixmode__ro_after_init ;static int __init evm_set_fixmode (char *str) {if (strncmp (str,"fix" ,3 ) ==0 )
Greg Kroah-Hartman
maintainerPATCH 102/575 ifb: Depend on netfilter alternatively to tc
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 046178e726c2977d686ba5e07105d5a6685c830e upstream.
IFB originally depended on NET_CLS_ACT for traffic redirection. But since v4.5, that may be achieved with NFT_FWD_NETDEV as well.
--- drivers/net/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/Kconfig +1 -1
@@ -148,7 +148,7 @@ config NET_FC config IFB tristate "Intermediate Functional Block support" - depends on NET_CLS_ACT + depends on NET_ACT_MIRRED || NFT_FWD_NETDEV select NET_REDIRECT help This is an intermediate driver that allows sharing of
Greg Kroah-Hartman
maintainerPATCH 103/575 wcn36xx: Fix HT40 capability for 2Ghz band
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
commit 960ae77f25631bbe4e3aafefe209b52e044baf31 upstream.
All wcn36xx controllers are supposed to support HT40 (and SGI40), This doubles the maximum bitrate/throughput with compatible APs.
Tested with wcn3620 & wcn3680B.
--- drivers/net/wireless/ath/wcn36xx/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/wcn36xx/main.c +3 -1
@@ -134,7 +134,9 @@ static struct ieee80211_supported_band w .cap = IEEE80211_HT_CAP_GRN_FLD |IEEE80211_HT_CAP_SGI_20 |IEEE80211_HT_CAP_DSSSCCK40 | - IEEE80211_HT_CAP_LSIG_TXOP_PROT, +IEEE80211_HT_CAP_LSIG_TXOP_PROT | +IEEE80211_HT_CAP_SGI_40 | + IEEE80211_HT_CAP_SUP_WIDTH_20_40, .ht_supported = true, .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
Greg Kroah-Hartman
maintainerPATCH 104/575 wcn36xx: Fix tx_status mechanism
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
commit a9e79b116cc4d0057e912be8f40b2c2e5bdc7c43 upstream.
This change fix the TX ack mechanism in various ways:
- For NO_ACK tagged packets, we don't need to wait for TX_ACK indication and so are not subject to the single packet ack limitation. So we don't have to stop the tx queue, and can call the tx status callback as soon as DMA transfer has completed.
- Fix skb ownership/reference. Only start status indication timeout once the DMA transfer has been completed. This avoids the skb to be both referenced in the DMA tx ring and by the tx_ack_skb pointer, preventing any use-after-free or double-free.
- This adds a sanity (paranoia?) check on the skb tx ack pointer.
- Resume TX queue if TX status tagged packet TX fails.
--- drivers/net/wireless/ath/wcn36xx/dxe.c | 37 ++++++++++++-------------------- drivers/net/wireless/ath/wcn36xx/txrx.c | 31 +++++--------------------- 2 files changed, 21 insertions(+), 47 deletions(-)
drivers/net/wireless/ath/wcn36xx/dxe.c +15 -22
@@ -403,8 +403,21 @@ static void reap_tx_dxes(struct wcn36xxdma_unmap_single (wcn->dev, ctl->desc->src_addr_l, ctl->skb->len,DMA_TO_DEVICE ); info =IEEE80211_SKB_CB (ctl->skb); -if (!(info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS )) { -/* Keep frame until TX status comes */ +if (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS ) { +if (info->flags &IEEE80211_TX_CTL_NO_ACK ) { + info->flags |=IEEE80211_TX_STAT_NOACK_TRANSMITTED ; +ieee80211_tx_status_irqsafe (wcn->hw, ctl->skb); + }else { +/* Wait for the TX ack indication or timeout... */ +spin_lock (&wcn->dxe_lock); +if (WARN_ON (wcn->tx_ack_skb)) +ieee80211_free_txskb (wcn->hw, wcn->tx_ack_skb); + wcn->tx_ack_skb = ctl->skb;/* Tracking ref */ +mod_timer (&wcn->tx_ack_timer, jiffies +HZ /10 ); +spin_unlock (&wcn->dxe_lock); + } +/* do not free, ownership transferred to mac80211 status cb */ + }else {ieee80211_free_txskb (wcn->hw, ctl->skb); }
@@ -426,7 +439,6 @@ static irqreturn_t wcn36xx_irq_tx_comple {struct wcn36xx *wcn = (struct wcn36xx *)dev;int int_src, int_reason; -bool transmitted = false;wcn36xx_dxe_read_register (wcn,WCN36XX_DXE_INT_SRC_RAW_REG , &int_src);
@@ -466,7 +478,6 @@ static irqreturn_t wcn36xx_irq_tx_compleif (int_reason & (WCN36XX_CH_STAT_INT_DONE_MASK |WCN36XX_CH_STAT_INT_ED_MASK )) {reap_tx_dxes (wcn, &wcn->dxe_tx_h_ch); - transmitted = true; } }
@@ -479,7 +490,6 @@ static irqreturn_t wcn36xx_irq_tx_compleWCN36XX_DXE_0_INT_CLR , WCN36XX_INT_MASK_CHAN_TX_L); -if (int_reason &WCN36XX_CH_STAT_INT_ERR_MASK ) { wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_0_INT_ERR_CLR,
@@ -507,25 +517,8 @@ static irqreturn_t wcn36xx_irq_tx_compleif (int_reason & (WCN36XX_CH_STAT_INT_DONE_MASK |WCN36XX_CH_STAT_INT_ED_MASK )) {reap_tx_dxes (wcn, &wcn->dxe_tx_l_ch); - transmitted = true; - } - } - -spin_lock (&wcn->dxe_lock); -if (wcn->tx_ack_skb && transmitted) { -struct ieee80211_tx_info *info =IEEE80211_SKB_CB (wcn->tx_ack_skb); - -/* TX complete, no need to wait for 802.11 ack indication */ -if (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS && - info->flags &IEEE80211_TX_CTL_NO_ACK ) { - info->flags |=IEEE80211_TX_STAT_NOACK_TRANSMITTED ; -del_timer (&wcn->tx_ack_timer); -ieee80211_tx_status_irqsafe (wcn->hw, wcn->tx_ack_skb); - wcn->tx_ack_skb =NULL ; -ieee80211_wake_queues (wcn->hw); } } -spin_unlock (&wcn->dxe_lock);return IRQ_HANDLED ; }
drivers/net/wireless/ath/wcn36xx/txrx.c +6 -25
@@ -502,10 +502,11 @@ int wcn36xx_start_tx(struct wcn36xx *wcnstruct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct wcn36xx_vif *vif_priv =NULL ;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); -unsigned long flags;bool is_low =ieee80211_is_data (hdr->frame_control);bool bcast =is_broadcast_ether_addr (hdr->addr1) ||is_multicast_ether_addr (hdr->addr1); +bool ack_ind = (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS ) && + !(info->flags &IEEE80211_TX_CTL_NO_ACK );struct wcn36xx_tx_bd bd;int ret;
@@ -521,30 +522,16 @@ int wcn36xx_start_tx(struct wcn36xx *wcn bd.dpu_rf =WCN36XX_BMU_WQ_TX ; -if (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS ) { +if (unlikely (ack_ind)) {wcn36xx_dbg (WCN36XX_DBG_DXE ,"TX_ACK status requested\n" ); -spin_lock_irqsave (&wcn->dxe_lock, flags); -if (wcn->tx_ack_skb) { -spin_unlock_irqrestore (&wcn->dxe_lock, flags); -wcn36xx_warn ("tx_ack_skb already set\n" ); -return -EINVAL ; - } - - wcn->tx_ack_skb = skb; -spin_unlock_irqrestore (&wcn->dxe_lock, flags); -/* Only one at a time is supported by fw. Stop the TX queues * until the ack status gets back. */ ieee80211_stop_queues (wcn->hw); -/* TX watchdog if no TX irq or ack indication received */ -mod_timer (&wcn->tx_ack_timer, jiffies +HZ /10 ); -/* Request ack indication from the firmware */ -if (!(info->flags &IEEE80211_TX_CTL_NO_ACK )) - bd.tx_comp =1 ; + bd.tx_comp =1 ; }/* Data frames served first*/
@@ -558,14 +545,8 @@ int wcn36xx_start_tx(struct wcn36xx *wcn bd.tx_bd_sign =0xbdbdbdbd ; ret =wcn36xx_dxe_tx_frame (wcn, vif_priv, &bd, skb, is_low); -if (ret && (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS )) { -/* If the skb has not been transmitted, -* don't keep a reference to it. -*/ -spin_lock_irqsave (&wcn->dxe_lock, flags); - wcn->tx_ack_skb =NULL ; -spin_unlock_irqrestore (&wcn->dxe_lock, flags); - +if (unlikely (ret && ack_ind)) { +/* If the skb has not been transmitted, resume TX queue */ ieee80211_wake_queues (wcn->hw); }
Greg Kroah-Hartman
maintainerPATCH 105/575 wcn36xx: Fix (QoS) null data frame bitrate/modulation
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
commit d3fd2c95c1c13ec217d43ebef3c61cfa00a6cd37 upstream.
We observe unexpected connection drops with some APs due to non-acked mac80211 generated null data frames (keep-alive). After debugging and capture, we noticed that null frames are submitted at standard data bitrate and that the given APs are in trouble with that.
After setting the null frame bitrate to control bitrate, all null frames are acked as expected and connection is maintained.
Not sure if it's a requirement of the specification, but it seems the right thing to do anyway, null frames are mostly used for control purpose (power-saving, keep-alive...), and submitting them with a slower/simpler bitrate/modulation is more robust.
--- drivers/net/wireless/ath/wcn36xx/txrx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/wcn36xx/txrx.c +1 -0
@@ -429,6 +429,7 @@ static void wcn36xx_set_tx_data(struct wif (ieee80211_is_any_nullfunc (hdr->frame_control)) {/* Don't use a regular queue for null packet (no ampdu) */ bd->queue_id =WCN36XX_TX_U_WQ_ID ; + bd->bd_rate =WCN36XX_BD_RATE_CTRL ; }if (bcast) {
Greg Kroah-Hartman
maintainerPATCH 106/575 PM: sleep: Do not let "syscore" devices runtime-suspend during system transitions
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 928265e3601cde78c7e0a3e518a93b27defed3b1 upstream.
There is no reason to allow "syscore" devices to runtime-suspend during system-wide PM transitions, because they are subject to the same possible failure modes as any other devices in that respect.
Accordingly, change device_prepare() and device_complete() to call pm_runtime_get_noresume() and pm_runtime_put(), respectively, for "syscore" devices too.
--- drivers/base/power/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/base/power/main.c +5 -4
@@ -1053,7 +1053,7 @@ static void device_complete(struct devicconst char *info =NULL ;if (dev->power.syscore) -return ; + goto out;device_lock (dev);
@@ -1083,6 +1083,7 @@ static void device_complete(struct devicdevice_unlock (dev); +out:pm_runtime_put (dev); }
@@ -1796,9 +1797,6 @@ static int device_prepare(struct deviceint (*callback)(struct device *) =NULL ;int ret =0 ; -if (dev->power.syscore) -return 0 ; -/* * If a device's parent goes into runtime suspend at the wrong time, * it won't be possible to resume the device. To prevent this we
@@ -1807,6 +1805,9 @@ static int device_prepare(struct device*/ pm_runtime_get_noresume (dev); +if (dev->power.syscore) +return 0 ; +device_lock (dev); dev->power.wakeup_path = false;
Greg Kroah-Hartman
maintainerPATCH 107/575 mwifiex: Read a PCI register after writing the TX ring write pointer
In reply to Greg Kroah-HartmanFrom: Jonas Dreßler <[email protected]>
commit e5f4eb8223aa740237cd463246a7debcddf4eda1 upstream.
On the 88W8897 PCIe+USB card the firmware randomly crashes after setting the TX ring write pointer. The issue is present in the latest firmware version 15.68.19.p21 of the PCIe+USB card.
Those firmware crashes can be worked around by reading any PCI register of the card after setting that register, so read the PCI_VENDOR_ID register here. The reason this works is probably because we keep the bus from entering an ASPM state for a bit longer, because that's what causes the cards firmware to crash.
This fixes a bug where during RX/TX traffic and with ASPM L1 substates enabled (the specific substates where the issue happens appear to be platform dependent), the firmware crashes and eventually a command timeout appears in the logs.
--- drivers/net/wireless/marvell/mwifiex/pcie.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/marvell/mwifiex/pcie.c +8 -0
@@ -1480,6 +1480,14 @@ mwifiex_pcie_send_data(struct mwifiex_ad ret =-1 ; goto done_unmap; } + +/* The firmware (latest version 15.68.19.p21) of the 88W8897 PCIe+USB card +* seems to crash randomly after setting the TX ring write pointer when +* ASPM powersaving is enabled. A workaround seems to be keeping the bus +* busy by reading a random register afterwards. +*/ +mwifiex_read_reg (adapter,PCI_VENDOR_ID , &rx_val); +if ((mwifiex_pcie_txbd_not_full (card)) && tx_param->next_pkt_len) {/* have more packets and TxBD still can hold more */
Greg Kroah-Hartman
maintainerPATCH 108/575 mwifiex: Try waking the firmware until we get an interrupt
In reply to Greg Kroah-HartmanFrom: Jonas Dreßler <[email protected]>
commit 8e3e59c31fea5de95ffc52c46f0c562c39f20c59 upstream.
It seems that the PCIe+USB firmware (latest version 15.68.19.p21) of the 88W8897 card sometimes ignores or misses when we try to wake it up by writing to the firmware status register. This leads to the firmware wakeup timeout expiring and the driver resetting the card because we assume the firmware has hung up or crashed.
Turns out that the firmware actually didn't hang up, but simply "missed" our wakeup request and didn't send us an interrupt with an AWAKE event.
Trying again to read the firmware status register after a short timeout usually makes the firmware wake up as expected, so add a small retry loop to mwifiex_pm_wakeup_card() that looks at the interrupt status to check whether the card woke up.
The number of tries and timeout lengths for this were determined
experimentally: The firmware usually takes about 500 us to wake up after we attempt to read the status register. In some cases where the firmware is very busy (for example while doing a bluetooth scan) it might even miss our requests for multiple milliseconds, which is why after 15 tries the waiting time gets increased to 10 ms. The maximum number of tries it took to wake the firmware when testing this was around 20, so a maximum number of 50 tries should give us plenty of safety margin.
Here's a reproducer for those firmware wakeup failures I've found:
1) Make sure wifi powersaving is enabled (iw dev wlp1s0 set power_save on)
2) Connect to any wifi network (makes firmware go into wifi powersaving mode, not deep sleep)
3) Make sure bluetooth is turned off (to ensure the firmware actually enters powersave mode and doesn't keep the radio active doing bluetooth stuff)
4) To confirm that wifi powersaving is entered ping a device on the LAN, pings should be a few ms higher than without powersaving
5) Run "while true; do iwconfig; sleep 0.0001; done", this wakes and suspends the firmware extremely often
6) Wait until things explode, for me it consistently takes <5 minutes
--- drivers/net/wireless/marvell/mwifiex/pcie.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)
drivers/net/wireless/marvell/mwifiex/pcie.c +23 -5
@@ -17,6 +17,7 @@* this warranty disclaimer. */ +#include <linux/iopoll.h> #include <linux/firmware.h> #include "decl.h"
@@ -637,11 +638,15 @@ static void mwifiex_delay_for_sleep_cook "max count reached while accessing sleep cookie\n"); } +#define N_WAKEUP_TRIES_SHORT_INTERVAL 15 +#define N_WAKEUP_TRIES_LONG_INTERVAL 35 +/* This function wakes up the card by reading fw_status register. */ static int mwifiex_pm_wakeup_card (struct mwifiex_adapter *adapter) {struct pcie_service_card *card = adapter->card;const struct mwifiex_pcie_card_reg *reg = card->pcie.reg; +int retval;mwifiex_dbg (adapter,EVENT ,"event: Wakeup device...\n" );
@@ -649,11 +654,24 @@ static int mwifiex_pm_wakeup_card(structif (reg->sleep_cookie)mwifiex_pcie_dev_wakeup_delay (adapter); -/* Accessing fw_status register will wakeup device */ -if (mwifiex_write_reg (adapter, reg->fw_status,FIRMWARE_READY_PCIE )) { -mwifiex_dbg (adapter,ERROR , -"Writing fw_status register failed\n" ); -return -1 ; +/* The 88W8897 PCIe+USB firmware (latest version 15.68.19.p21) sometimes +* appears to ignore or miss our wakeup request, so we continue trying +* until we receive an interrupt from the card. +*/ +if (read_poll_timeout (mwifiex_write_reg, retval, +READ_ONCE (adapter->int_status) !=0 , +500 ,500 *N_WAKEUP_TRIES_SHORT_INTERVAL , + false, + adapter, reg->fw_status,FIRMWARE_READY_PCIE )) { +if (read_poll_timeout (mwifiex_write_reg, retval, +READ_ONCE (adapter->int_status) !=0 , +10000 ,10000 *N_WAKEUP_TRIES_LONG_INTERVAL , + false, + adapter, reg->fw_status,FIRMWARE_READY_PCIE )) { +mwifiex_dbg (adapter,ERROR , +"Firmware didn't wake up\n" ); +return -EIO ; + } }if (reg->sleep_cookie) {
Greg Kroah-Hartman
maintainerPATCH 109/575 libata: fix checking of DMA state
In reply to Greg Kroah-HartmanFrom: Reimar Döffinger <[email protected]>
commit f971a85439bd25dc7b4d597cf5e4e8dc7ffc884b upstream.
Checking if DMA is enabled should be done via the ata_dma_enabled helper function, since the init state 0xff indicates disabled.
This meant that ATA_CMD_READ_LOG_DMA_EXT was used and probed for before DMA was enabled, which caused hangs for some combinations of controllers and devices.
It might also have caused it to be incorrectly disabled as broken, but there have been no reports of that.
--- drivers/ata/libata-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-core.c +1 -1
@@ -2004,7 +2004,7 @@ unsigned int ata_read_log_page(struct at retry:ata_tf_init (dev, &tf); -if (dev->dma_mode &&ata_id_has_read_log_dma_ext (dev->id) && +if (ata_dma_enabled (dev) &&ata_id_has_read_log_dma_ext (dev->id) && !(dev->horkage &ATA_HORKAGE_NO_DMA_LOG )) { tf.command =ATA_CMD_READ_LOG_DMA_EXT ; tf.protocol =ATA_PROT_DMA ;
Greg Kroah-Hartman
maintainerPATCH 110/575 wcn36xx: handle connection loss indication
In reply to Greg Kroah-HartmanFrom: Benjamin Li <[email protected]>
commit d6dbce453b19c64b96f3e927b10230f9a704b504 upstream.
Firmware sends delete_sta_context_ind when it detects the AP has gone away in STA mode. Right now the handler for that indication only handles AP mode; fix it to also handle STA mode.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 44 ++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 11 deletions(-)
drivers/net/wireless/ath/wcn36xx/smd.c +33 -11
@@ -2632,30 +2632,52 @@ static int wcn36xx_smd_delete_sta_contex size_t len) {struct wcn36xx_hal_delete_sta_context_ind_msg *rsp = buf; -struct wcn36xx_vif *tmp; +struct wcn36xx_vif *vif_priv; +struct ieee80211_vif *vif; +struct ieee80211_bss_conf *bss_conf;struct ieee80211_sta *sta; +bool found = false;if (len !=sizeof (*rsp)) {wcn36xx_warn ("Corrupted delete sta indication\n" );return -EIO ; } -wcn36xx_dbg (WCN36XX_DBG_HAL ,"delete station indication %pM index %d\n" , - rsp->addr2, rsp->sta_id); +wcn36xx_dbg (WCN36XX_DBG_HAL , +"delete station indication %pM index %d reason %d\n" , + rsp->addr2, rsp->sta_id, rsp->reason_code); -list_for_each_entry (tmp, &wcn->vif_list, list) { +list_for_each_entry (vif_priv, &wcn->vif_list, list) {rcu_read_lock (); - sta =ieee80211_find_sta (wcn36xx_priv_to_vif (tmp), rsp->addr2); -if (sta) -ieee80211_report_low_ack (sta,0 ); + vif =wcn36xx_priv_to_vif (vif_priv); + +if (vif->type ==NL80211_IFTYPE_STATION ) { +/* We could call ieee80211_find_sta too, but checking +* bss_conf is clearer. +*/ + bss_conf = &vif->bss_conf; +if (vif_priv->sta_assoc && + !memcmp (bss_conf->bssid, rsp->addr2,ETH_ALEN )) { + found = true; +wcn36xx_dbg (WCN36XX_DBG_HAL , +"connection loss bss_index %d\n" , + vif_priv->bss_index); +ieee80211_connection_loss (vif); + } + }else { + sta =ieee80211_find_sta (vif, rsp->addr2); +if (sta) { + found = true; +ieee80211_report_low_ack (sta,0 ); + } + } +rcu_read_unlock (); -if (sta) +if (found)return 0 ; } -wcn36xx_warn ("STA with addr %pM and index %d not found\n" , - rsp->addr2, - rsp->sta_id); +wcn36xx_warn ("BSS or STA with addr %pM not found\n" , rsp->addr2);return -ENOENT ; }
Greg Kroah-Hartman
maintainerPATCH 111/575 rsi: fix occasional initialisation failure with BT coex
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit 9b14ed6e11b72dd4806535449ca6c6962cb2369d upstream.
When BT coexistence is enabled (eg oper mode 13, which is the default) the initialisation on startup sometimes silently fails.
In a normal initialisation we see
usb 1-1.3: Product: Wireless USB Network Module usb 1-1.3: Manufacturer: Redpine Signals, Inc. usb 1-1.3: SerialNumber: 000000000001 rsi_91x: rsi_probe: Initialized os intf ops rsi_91x: rsi_load_9116_firmware: Loading chunk 0 rsi_91x: rsi_load_9116_firmware: Loading chunk 1 rsi_91x: rsi_load_9116_firmware: Loading chunk 2 rsi_91x: Max Stations Allowed = 1
But sometimes the last log is missing and the wlan net device is not created.
Running a userspace loop that resets the hardware via a GPIO shows the problem occurring ~5/100 resets.
The problem does not occur in oper mode 1 (wifi only).
Adding logs shows that the initialisation state machine requests a MAC reset via rsi_send_reset_mac() but the firmware does not reply, leading to the initialisation sequence being incomplete.
Fix this by delaying attaching the BT adapter until the wifi initialisation has completed.
With this applied I have done > 300 reset loops with no errors.
--- drivers/net/wireless/rsi/rsi_91x_main.c | 16 +++++++++++++--- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 3 +++ drivers/net/wireless/rsi/rsi_main.h | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-)
drivers/net/wireless/rsi/rsi_91x_main.c +13 -3
@@ -211,9 +211,10 @@ int rsi_read_pkt(struct rsi_common *comm bt_pkt_type = frame_desc[offset +BT_RX_PKT_TYPE_OFST ];if (bt_pkt_type ==BT_CARD_READY_IND ) {rsi_dbg (INFO_ZONE ,"BT Card ready recvd\n" ); -if (rsi_bt_ops.attach (common, &g_proto_ops)) -rsi_dbg (ERR_ZONE , -"Failed to attach BT module\n" ); +if (common->fsm_state ==FSM_MAC_INIT_DONE ) +rsi_attach_bt (common); +else + common->bt_defer_attach = true; }else {if (common->bt_adapter) rsi_bt_ops.recv_pkt(common->bt_adapter,
@@ -278,6 +279,15 @@ void rsi_set_bt_context(void *priv, void }#endif +void rsi_attach_bt (struct rsi_common *common) +{ +#ifdef CONFIG_RSI_COEX +if (rsi_bt_ops.attach (common, &g_proto_ops)) +rsi_dbg (ERR_ZONE , +"Failed to attach BT module\n" ); +#endif +} +/** * rsi_91x_init() - This function initializes os interface operations. * @oper_mode: One of DEV_OPMODE_*.
drivers/net/wireless/rsi/rsi_91x_mgmt.c +3 -0
@@ -2071,6 +2071,9 @@ static int rsi_handle_ta_confirm_type(stif (common->reinit_hw) {complete (&common->wlan_init_completion); }else { +if (common->bt_defer_attach) +rsi_attach_bt (common); +return rsi_mac80211_attach (common); } }
drivers/net/wireless/rsi/rsi_main.h +2 -0
@@ -320,6 +320,7 @@ struct rsi_common {struct ieee80211_vif *roc_vif;bool eapol4_confirm; +bool bt_defer_attach;void *bt_adapter;struct cfg80211_scan_request *hwscan;
@@ -401,5 +402,6 @@ struct rsi_host_intf_ops {enum rsi_host_intf rsi_get_host_intf (void *priv);void rsi_set_bt_context (void *priv,void *bt_context); +void rsi_attach_bt (struct rsi_common *common);#endif
Greg Kroah-Hartman
maintainerPATCH 112/575 rsi: fix key enabled check causing unwanted encryption for vap_id > 0
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit 99ac6018821253ec67f466086afb63fc18ea48e2 upstream.
My previous patch checked if encryption should be enabled by directly checking info->control.hw_key (like the downstream driver). However that missed that the control and driver_info members of struct ieee80211_tx_info are union fields.
Due to this when rsi_core_xmit() updates fields in "tx_params" (driver_info) it can overwrite the control.hw_key, causing the result of the later test to be incorrect.
With the current structure layout the first byte of control.hw_key is overlayed with the vap_id so, since we only test if control.hw_key is NULL / non NULL, a non zero vap_id will incorrectly enable encryption.
In basic STA and AP modes the vap_id is always zero so it works but in P2P client mode a second VIF is created causing vap_id to be non zero and hence encryption to be enabled before keys have been set.
Fix this by extracting the key presence flag to a new field in the driver private tx_params structure and populating it first.
--- drivers/net/wireless/rsi/rsi_91x_core.c | 2 ++ drivers/net/wireless/rsi/rsi_91x_hal.c | 2 +- drivers/net/wireless/rsi/rsi_main.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/rsi/rsi_91x_core.c +2 -0
@@ -400,6 +400,8 @@ void rsi_core_xmit(struct rsi_common *co info =IEEE80211_SKB_CB (skb); tx_params = (struct skb_info *)info->driver_data; +/* info->driver_data and info->control part of union so make copy */ + tx_params->have_key = !!info->control.hw_key; wh = (struct ieee80211_hdr *)&skb->data[0 ]; tx_params->sta_id =0 ;
drivers/net/wireless/rsi/rsi_91x_hal.c +1 -1
@@ -203,7 +203,7 @@ int rsi_prepare_data_desc(struct rsi_com wh->frame_control |=cpu_to_le16 (RSI_SET_PS_ENABLE );if ((!(info->flags &IEEE80211_TX_INTFL_DONT_ENCRYPT )) && - info->control.hw_key) { + tx_params->have_key) {if (rsi_is_cipher_wep (common)) ieee80211_size +=4 ;else
drivers/net/wireless/rsi/rsi_main.h +1 -0
@@ -139,6 +139,7 @@ struct skb_info {u8 internal_hdr_size;struct ieee80211_vif *vif;u8 vap_id; +bool have_key; };enum edca_queue {
Greg Kroah-Hartman
maintainerPATCH 113/575 rsi: fix rate mask set leading to P2P failure
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit b515d097053a71d624e0c5840b42cd4caa653941 upstream.
P2P client mode was only working the first time.
On subsequent connection attempts the group was successfully created but no data was sent (no transmitted data packets were seen with a sniffer).
The reason for this was that the hardware was being configured in fixed rate mode with rate RSI_RATE_1 (1Mbps) which is not valid in the 5GHz band.
In P2P mode wpa_supplicant uses NL80211_CMD_SET_TX_BITRATE_MASK to disallow the 11b rates in the 2.4GHz band which updated common->fixedrate_mask.
rsi_set_min_rate() then used the fixedrate_mask to calculate the minimum allowed rate, or 0xffff = auto if none was found.
However that calculation did not account for the different rate sets allowed in the different bands leading to the error.
Fixing set_min_rate() would result in 6Mb/s being used all the time which is not what we want either.
The reason the problem did not occur on the first connection is that rsi_mac80211_set_rate_mask() only updated the fixedrate_mask for the *current* band. When it was called that was still 2.4GHz as the switch is done later. So the when set_min_rate() was subsequently called after the switch to 5GHz it still had a mask of zero, leading to defaulting to auto mode.
Fix this by differentiating the case of a single rate being requested, in which case the hardware will be used in fixed rate mode with just that rate, and multiple rates being requested, in which case we remain in auto mode but the firmware rate selection algorithm is configured with a restricted set of rates.
--- drivers/net/wireless/rsi/rsi_91x_hal.c | 8 +-- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 74 ++++++++-------------------- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 21 +++++-- drivers/net/wireless/rsi/rsi_main.h | 12 +++- 4 files changed, 50 insertions(+), 65 deletions(-)
drivers/net/wireless/rsi/rsi_91x_hal.c +5 -3
@@ -214,15 +214,17 @@ int rsi_prepare_data_desc(struct rsi_com RSI_WIFI_DATA_Q); data_desc->header_len = ieee80211_size; -if (common->min_rate !=RSI_RATE_AUTO ) { +if (common->rate_config[common->band].fixed_enabled) {/* Send fixed rate */ +u16 fixed_rate = common->rate_config[common->band].fixed_hw_rate; + data_desc->frame_info =cpu_to_le16 (RATE_INFO_ENABLE ); - data_desc->rate_info =cpu_to_le16 (common->min_rate); + data_desc->rate_info =cpu_to_le16 (fixed_rate);if (conf_is_ht40 (&common->priv->hw->conf)) data_desc->bbp_info =cpu_to_le16 (FULL40M_ENABLE ); -if ((common->vif_info[0 ].sgi) && (common->min_rate &0x100 )) { +if (common->vif_info[0 ].sgi && (fixed_rate &0x100 )) {/* Only MCS rates */ data_desc->rate_info |=cpu_to_le16 (ENABLE_SHORTGI_RATE );
drivers/net/wireless/rsi/rsi_91x_mac80211.c +22 -52
111 lines not on this page · raw message
drivers/net/wireless/rsi/rsi_91x_mgmt.c +14 -7
@@ -276,7 +276,7 @@ static void rsi_set_default_parameters(s common->channel_width =BW_20MHZ ; common->rts_threshold =IEEE80211_MAX_RTS_THRESHOLD ; common->channel =1 ; - common->min_rate =0xffff ; +memset (&common->rate_config,0 ,sizeof (common->rate_config)); common->fsm_state =FSM_CARD_NOT_READY ; common->iface_down = true; common->endpoint =EP_2GHZ_20MHZ ;
@@ -1314,7 +1314,7 @@ static int rsi_send_auto_rate_request(stu8 band = hw->conf.chandef.chan->band;u8 num_supported_rates =0 ;u8 rate_table_offset, rate_offset =0 ; -u32 rate_bitmap; +u32 rate_bitmap, configured_rates;u16 *selected_rates, min_rate;bool is_ht = false, is_sgi = false;u16 frame_len =sizeof (struct rsi_auto_rate );
@@ -1364,6 +1364,10 @@ static int rsi_send_auto_rate_request(st is_sgi = true; } +/* Limit to any rates administratively configured by cfg80211 */ + configured_rates = common->rate_config[band].configured_mask ?:0xffffffff ; + rate_bitmap &= configured_rates; +if (band ==NL80211_BAND_2GHZ ) {if ((rate_bitmap ==0 ) && (is_ht)) min_rate =RSI_RATE_MCS0 ;
@@ -1389,10 +1393,13 @@ static int rsi_send_auto_rate_request(st num_supported_rates = jj;if (is_ht) { -for (ii =0 ; ii <ARRAY_SIZE (mcs); ii++) - selected_rates[jj++] = mcs[ii]; - num_supported_rates +=ARRAY_SIZE (mcs); - rate_offset +=ARRAY_SIZE (mcs); +for (ii =0 ; ii <ARRAY_SIZE (mcs); ii++) { +if (configured_rates &BIT (ii +ARRAY_SIZE (rsi_rates))) { + selected_rates[jj++] = mcs[ii]; + num_supported_rates++; + rate_offset++; + } + } }sort (selected_rates, jj,sizeof (u16), &rsi_compare,NULL );
@@ -1482,7 +1489,7 @@ void rsi_inform_bss_status(struct rsi_co qos_enable, aid, sta_id, vif); -if (common->min_rate ==0xffff ) +if (!common->rate_config[common->band].fixed_enabled)rsi_send_auto_rate_request (common, sta, sta_id, vif); if (opmode == RSI_OPMODE_STA && !(assoc_cap & WLAN_CAPABILITY_PRIVACY) &&
drivers/net/wireless/rsi/rsi_main.h +9 -3
@@ -61,6 +61,7 @@ enum RSI_FSM_STATES {extern u32 rsi_zone_enabled; extern __printf(2, 3) void rsi_dbg(u32 zone, const char *fmt, ...); +#define RSI_MAX_BANDS 2#define RSI_MAX_VIFS 3#define NUM_EDCA_QUEUES 4#define IEEE80211_ADDR_LEN 6
@@ -230,6 +231,12 @@ struct rsi_9116_features {u32 ps_options; }; +struct rsi_rate_config { +u32 configured_mask;/* configured by mac80211 bits 0-11=legacy 12+ mcs */ +u16 fixed_hw_rate; +bool fixed_enabled; +}; +struct rsi_common {struct rsi_hw *priv;struct vif_priv vif_info[RSI_MAX_VIFS ];
@@ -255,8 +262,8 @@ struct rsi_common {u8 channel_width;u16 rts_threshold; -u16 bitrate_mask[2 ]; -u32 fixedrate_mask[2 ]; +u32 bitrate_mask[RSI_MAX_BANDS ]; +struct rsi_rate_config rate_config[RSI_MAX_BANDS ];u8 rf_reset;struct transmit_q_stats tx_stats;
@@ -277,7 +284,6 @@ struct rsi_common {u8 mac_id;u8 radio_id;u16 rate_pwr[20 ]; -u16 min_rate;/* WMM algo related */ u8 selected_qnum;
Greg Kroah-Hartman
maintainerPATCH 114/575 rsi: Fix module dev_oper_mode parameter description
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
commit 31f97cf9f0c31143a2a6fcc89c4a1286ce20157e upstream.
The module parameters are missing dev_oper_mode 12, BT classic alone, add it. Moreover, the parameters encode newlines, which ends up being printed malformed e.g. by modinfo, so fix that too.
However, the module parameter string is duplicated in both USB and SDIO modules and the dev_oper_mode mode enumeration in those module parameters is a duplicate of macros used by the driver. Furthermore, the enumeration is confusing.
So, deduplicate the module parameter string and use __stringify() to encode the correct mode enumeration values into the module parameter string. Finally, replace 'Wi-Fi' with 'Wi-Fi alone' and 'BT' with 'BT classic alone' to clarify what those modes really mean.
--- drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +---- drivers/net/wireless/rsi/rsi_91x_usb.c | 5 +---- drivers/net/wireless/rsi/rsi_hal.h | 11 +++++++++++ 3 files changed, 13 insertions(+), 8 deletions(-)
drivers/net/wireless/rsi/rsi_91x_sdio.c +1 -4
@@ -24,10 +24,7 @@/* Default operating mode is wlan STA + BT */ static u16 dev_oper_mode =DEV_OPMODE_STA_BT_DUAL ;module_param (dev_oper_mode, ushort,0444 ); -MODULE_PARM_DESC (dev_oper_mode, -"1[Wi-Fi], 4[BT], 8[BT LE], 5[Wi-Fi STA + BT classic]\n" -"9[Wi-Fi STA + BT LE], 13[Wi-Fi STA + BT classic + BT LE]\n" -"6[AP + BT classic], 14[AP + BT classic + BT LE]" ); +MODULE_PARM_DESC (dev_oper_mode,DEV_OPMODE_PARAM_DESC );/** * rsi_sdio_set_cmd52_arg() - This function prepares cmd 52 read/write arg.
drivers/net/wireless/rsi/rsi_91x_usb.c +1 -4
@@ -25,10 +25,7 @@/* Default operating mode is wlan STA + BT */ static u16 dev_oper_mode =DEV_OPMODE_STA_BT_DUAL ;module_param (dev_oper_mode, ushort,0444 ); -MODULE_PARM_DESC (dev_oper_mode, -"1[Wi-Fi], 4[BT], 8[BT LE], 5[Wi-Fi STA + BT classic]\n" -"9[Wi-Fi STA + BT LE], 13[Wi-Fi STA + BT classic + BT LE]\n" -"6[AP + BT classic], 14[AP + BT classic + BT LE]" ); +MODULE_PARM_DESC (dev_oper_mode,DEV_OPMODE_PARAM_DESC );static int rsi_rx_urb_submit (struct rsi_hw *adapter,u8 ep_num,gfp_t flags);
drivers/net/wireless/rsi/rsi_hal.h +11 -0
@@ -28,6 +28,17 @@#define DEV_OPMODE_AP_BT 6#define DEV_OPMODE_AP_BT_DUAL 14 +#define DEV_OPMODE_PARAM_DESC \ + __stringify(DEV_OPMODE_WIFI_ALONE) "[Wi-Fi alone], " \ + __stringify(DEV_OPMODE_BT_ALONE) "[BT classic alone], " \ + __stringify(DEV_OPMODE_BT_LE_ALONE) "[BT LE alone], " \ + __stringify(DEV_OPMODE_BT_DUAL) "[BT classic + BT LE alone], " \ + __stringify(DEV_OPMODE_STA_BT) "[Wi-Fi STA + BT classic], " \ + __stringify(DEV_OPMODE_STA_BT_LE) "[Wi-Fi STA + BT LE], " \ + __stringify(DEV_OPMODE_STA_BT_DUAL) "[Wi-Fi STA + BT classic + BT LE], " \ + __stringify(DEV_OPMODE_AP_BT) "[Wi-Fi AP + BT classic], " \ + __stringify(DEV_OPMODE_AP_BT_DUAL) "[Wi-Fi AP + BT classic + BT LE]" +#define FLASH_WRITE_CHUNK_SIZE (4 * 1024)#define FLASH_SECTOR_SIZE (4 * 1024)
Greg Kroah-Hartman
maintainerPATCH 115/575 perf/x86/intel/uncore: Support extra IMC channel on Ice Lake server
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
commit 496a18f09374ad89b3ab4366019bc3975db90234 upstream.
There are three channels on a Ice Lake server, but only two channels will ever be active. Current perf only enables two channels.
Support the extra IMC channel, which may be activated on some Ice Lake machines. For a non-activated channel, the SW can still access it. The write will be ignored by the HW. 0 is always returned for the reading.
--- arch/x86/events/intel/uncore_snbep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore_snbep.c +2 -2
@@ -444,7 +444,7 @@#define ICX_M3UPI_PCI_PMON_BOX_CTL 0xa0/* ICX IMC */ -#define ICX_NUMBER_IMC_CHN 2 +#define ICX_NUMBER_IMC_CHN 3#define ICX_IMC_MEM_STRIDE 0x4DEFINE_UNCORE_FORMAT_ATTR (event, event,"config:0-7" );
@@ -5228,7 +5228,7 @@ static struct intel_uncore_ops icx_uncorstatic struct intel_uncore_type icx_uncore_imc = { .name ="imc" , .num_counters =4 , - .num_boxes =8 , + .num_boxes =12 , .perf_ctr_bits =48 , .fixed_ctr_bits =48 , .fixed_ctr =SNR_IMC_MMIO_PMON_FIXED_CTR ,
Greg Kroah-Hartman
maintainerPATCH 116/575 perf/x86/intel/uncore: Fix Intel ICX IIO event constraints
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
commit f42e8a603c88f72bf047a710b9fc1d3579f31e71 upstream.
According to the latest uncore document, both NUM_OUTSTANDING_REQ_OF_CPU (0x88) event and COMP_BUF_OCCUPANCY(0xd5) event also have constraints. Add them into the event constraints table.
--- arch/x86/events/intel/uncore_snbep.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/intel/uncore_snbep.c +2 -0
@@ -4898,8 +4898,10 @@ static struct event_constraint icx_uncorUNCORE_EVENT_CONSTRAINT (0x02 ,0x3 ),UNCORE_EVENT_CONSTRAINT (0x03 ,0x3 ),UNCORE_EVENT_CONSTRAINT (0x83 ,0x3 ), +UNCORE_EVENT_CONSTRAINT (0x88 ,0xc ),UNCORE_EVENT_CONSTRAINT (0xc0 ,0xc ),UNCORE_EVENT_CONSTRAINT (0xc5 ,0xc ), +UNCORE_EVENT_CONSTRAINT (0xd5 ,0xc ), EVENT_CONSTRAINT_END };
Greg Kroah-Hartman
maintainerPATCH 117/575 RDMA/qedr: Fix NULL deref for query_qp on the GSI QP
In reply to Greg Kroah-HartmanFrom: Alok Prasad <[email protected]>
commit 4f960393a0ee9a39469ceb7c8077ae8db665cc12 upstream.
This patch fixes a crash caused by querying the QP via netlink, and corrects the state of GSI qp. GSI qp's have a NULL qed_qp.
The call trace is generated by:
$ rdma res show
BUG: kernel NULL pointer dereference, address: 0000000000000034 Hardware name: Dell Inc. PowerEdge R720/0M1GCR, BIOS 1.2.6 05/10/2012 RIP: 0010:qed_rdma_query_qp+0x33/0x1a0 [qed] RSP: 0018:ffffba560a08f580 EFLAGS: 00010206 RAX: 0000000200000000 RBX: ffffba560a08f5b8 RCX: 0000000000000000 RDX: ffffba560a08f5b8 RSI: 0000000000000000 RDI: ffff9807ee458090 RBP: ffffba560a08f5a0 R08: 0000000000000000 R09: ffff9807890e7048 R10: ffffba560a08f658 R11: 0000000000000000 R12: 0000000000000000 R13: ffff9807ee458090 R14: ffff9807f0afb000 R15: ffffba560a08f7ec FS: 00007fbbf8bfe740(0000) GS:ffff980aafa00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000034 CR3: 00000001720ba001 CR4: 00000000000606f0 Call Trace: qedr_query_qp+0x82/0x360 [qedr] ib_query_qp+0x34/0x40 [ib_core] ? ib_query_qp+0x34/0x40 [ib_core] fill_res_qp_entry_query.isra.26+0x47/0x1d0 [ib_core] ? __nla_put+0x20/0x30 ? nla_put+0x33/0x40 fill_res_qp_entry+0xe3/0x120 [ib_core] res_get_common_dumpit+0x3f8/0x5d0 [ib_core] ? fill_res_cm_id_entry+0x1f0/0x1f0 [ib_core] nldev_res_get_qp_dumpit+0x1a/0x20 [ib_core] netlink_dump+0x156/0x2f0 __netlink_dump_start+0x1ab/0x260 rdma_nl_rcv+0x1de/0x330 [ib_core] ? nldev_res_get_cm_id_dumpit+0x20/0x20 [ib_core] netlink_unicast+0x1b8/0x270 netlink_sendmsg+0x33e/0x470 sock_sendmsg+0x63/0x70 __sys_sendto+0x13f/0x180 ? setup_sgl.isra.12+0x70/0xc0 __x64_sys_sendto+0x28/0x30 do_syscall_64+0x3a/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- drivers/infiniband/hw/qedr/verbs.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +9 -6
@@ -2744,15 +2744,18 @@ int qedr_query_qp(struct ib_qp *ibqp,int rc =0 ;memset (¶ms,0 ,sizeof (params)); - - rc = dev->ops->rdma_query_qp (dev->rdma_ctx, qp->qed_qp, ¶ms); -if (rc) - goto err; -memset (qp_attr,0 ,sizeof (*qp_attr));memset (qp_init_attr,0 ,sizeof (*qp_init_attr)); - qp_attr->qp_state =qedr_get_ibqp_state (params.state); +if (qp->qp_type !=IB_QPT_GSI ) { + rc = dev->ops->rdma_query_qp (dev->rdma_ctx, qp->qed_qp, ¶ms); +if (rc) + goto err; + qp_attr->qp_state =qedr_get_ibqp_state (params.state); + }else { + qp_attr->qp_state =qedr_get_ibqp_state (QED_ROCE_QP_STATE_RTS ); + } + qp_attr->cur_qp_state =qedr_get_ibqp_state (params.state); qp_attr->path_mtu =ib_mtu_int_to_enum (params.mtu); qp_attr->path_mig_state =IB_MIG_MIGRATED ;
Greg Kroah-Hartman
maintainerPATCH 118/575 signal: Remove the bogus sigkill_pending in ptrace_stop
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 7d613f9f72ec8f90ddefcae038fdae5adb8404b3 upstream.
The existence of sigkill_pending is a little silly as it is functionally a duplicate of fatal_signal_pending that is used in exactly one place.
Checking for pending fatal signals and returning early in ptrace_stop is actively harmful. It casues the ptrace_stop called by ptrace_signal to return early before setting current->exit_code. Later when ptrace_signal reads the signal number from current->exit_code is undefined, making it unpredictable what will happen.
Instead rely on the fact that schedule will not sleep if there is a pending signal that can awaken a task.
Removing the explict sigkill_pending test fixes fixes ptrace_signal when ptrace_stop does not stop because current->exit_code is always set to to signr.
--- kernel/signal.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
kernel/signal.c +4 -14
@@ -2097,15 +2097,6 @@ static inline bool may_ptrace_stop(void)return true; } -/* -* Return non-zero if there is a SIGKILL that should be waking us up. -* Called with the siglock held. -*/ -static bool sigkill_pending (struct task_struct *tsk) -{ -return sigismember (&tsk->pending.signal,SIGKILL ) || -sigismember (&tsk->signal->shared_pending.signal,SIGKILL ); -}/* * This must be called with current->sighand->siglock held.
@@ -2132,17 +2123,16 @@ static void ptrace_stop(int exit_code, i* calling arch_ptrace_stop, so we must release it now. * To preserve proper semantics, we must do this before * any signal bookkeeping like checking group_stop_count. -* Meanwhile, a SIGKILL could come in before we retake the -* siglock. That must prevent us from sleeping in TASK_TRACED. -* So after regaining the lock, we must check for SIGKILL. */ spin_unlock_irq (¤t->sighand->siglock);arch_ptrace_stop (exit_code, info);spin_lock_irq (¤t->sighand->siglock); -if (sigkill_pending (current)) -return ; } +/* +* schedule() will not sleep if there is a pending signal that +* can awaken the task. +*/ set_special_state (TASK_TRACED );/*
Greg Kroah-Hartman
maintainerPATCH 119/575 memory: renesas-rpc-if: Correct QSPI data transfer in Manual mode
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
commit fff53a551db50f5edecaa0b29a64056ab8d2bbca upstream.
This patch fixes 2 problems:
[1] The output warning logs and data loss when performing mount/umount then remount the device with jffs2 format.
[2] The access width of SMWDR[0:1]/SMRDR[0:1] register is wrong.
This is the sample warning logs when performing mount/umount then remount the device with jffs2 format:
jffs2: jffs2_scan_inode_node(): CRC failed on node at 0x031c51d4:
Read 0x00034e00, calculated 0xadb272a7
The reason for issue [1] is that the writing data seems to get messed up.
Data is only completed when the number of bytes is divisible by 4. If you only have 3 bytes of data left to write, 1 garbage byte is inserted after the end of the write stream.
If you only have 2 bytes of data left to write, 2 bytes of '00' are added into the write stream.
If you only have 1 byte of data left to write, 2 bytes of '00' are added into the write stream. 1 garbage byte is inserted after the end of the write stream.
To solve problem [1], data must be written continuously in serial and the write stream ends when data is out.
Following HW manual 62.2.15, access to SMWDR0 register should be in the same size as the transfer size specified in the SPIDE[3:0] bits in the manual mode enable setting register (SMENR). Be sure to access from address 0.
So, in 16-bit transfer (SPIDE[3:0]=b'1100), SMWDR0 should be accessed by 16-bit width.
Similar to SMWDR1, SMDDR0/1 registers.
In current code, SMWDR0 register is accessed by regmap_write() that only set up to do 32-bit width.
To solve problem [2], data must be written 16-bit or 8-bit when transferring 1-byte or 2-byte.
--- drivers/memory/renesas-rpc-if.c | 113 +++++++++++++++++++++++++++------------- include/memory/renesas-rpc-if.h | 1 2 files changed, 79 insertions(+), 35 deletions(-)
drivers/memory/renesas-rpc-if.c +78 -35
@@ -161,10 +161,62 @@ static const struct regmap_access_table .n_yes_ranges = ARRAY_SIZE(rpcif_volatile_ranges), }; + +/* +* Custom accessor functions to ensure SMRDR0 and SMWDR0 are always accessed +* with proper width. Requires SMENR_SPIDE to be correctly set before! +*/ +static int rpcif_reg_read (void *context,unsigned int reg,unsigned int *val) +{ +struct rpcif *rpc = context; + +if (reg ==RPCIF_SMRDR0 || reg ==RPCIF_SMWDR0 ) { +u32 spide =readl (rpc->base +RPCIF_SMENR ) &RPCIF_SMENR_SPIDE (0xF ); + +if (spide ==0x8 ) { + *val =readb (rpc->base + reg); +return 0 ; + }else if (spide ==0xC ) { + *val =readw (rpc->base + reg); +return 0 ; + }else if (spide !=0xF ) { +return -EILSEQ ; + } + } + + *val =readl (rpc->base + reg); +return 0 ; + +} + +static int rpcif_reg_write (void *context,unsigned int reg,unsigned int val) +{ +struct rpcif *rpc = context; + +if (reg ==RPCIF_SMRDR0 || reg ==RPCIF_SMWDR0 ) { +u32 spide =readl (rpc->base +RPCIF_SMENR ) &RPCIF_SMENR_SPIDE (0xF ); + +if (spide ==0x8 ) { +writeb (val, rpc->base + reg); +return 0 ; + }else if (spide ==0xC ) { +writew (val, rpc->base + reg); +return 0 ; + }else if (spide !=0xF ) { +return -EILSEQ ; + } + } + +writel (val, rpc->base + reg); +return 0 ; +} +static const struct regmap_config rpcif_regmap_config = { .reg_bits =32 , .val_bits =32 , .reg_stride =4 , + .reg_read = rpcif_reg_read, + .reg_write = rpcif_reg_write, .fast_io = true, .max_register =RPCIF_PHYINT , .volatile_table = &rpcif_volatile_table,
@@ -174,17 +226,15 @@ int rpcif_sw_init(struct rpcif *rpc, str {struct platform_device *pdev =to_platform_device (dev);struct resource *res; -void __iomem *base; rpc->dev = dev; res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"regs" ); - base =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (base)) -return PTR_ERR (base); + rpc->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (rpc->base)) +return PTR_ERR (rpc->base); - rpc->regmap =devm_regmap_init_mmio (&pdev->dev, base, - &rpcif_regmap_config); + rpc->regmap =devm_regmap_init (&pdev->dev,NULL , rpc, &rpcif_regmap_config);if (IS_ERR (rpc->regmap)) { dev_err(&pdev->dev, "failed to init regmap for rpcif, error %ld\n",
@@ -367,20 +417,16 @@ void rpcif_prepare(struct rpcif *rpc, co nbytes = op->data.nbytes; rpc->xferlen = nbytes; - rpc->enable |=RPCIF_SMENR_SPIDE (rpcif_bits_set (rpc, nbytes)) | -RPCIF_SMENR_SPIDB (rpcif_bit_size (op->data.buswidth)); + rpc->enable |=RPCIF_SMENR_SPIDB (rpcif_bit_size (op->data.buswidth)); } }EXPORT_SYMBOL (rpcif_prepare);int rpcif_manual_xfer (struct rpcif *rpc) { -u32 smenr, smcr, pos =0 , max =4 ; +u32 smenr, smcr, pos =0 , max = rpc->bus_size ==2 ?8 :4 ;int ret =0 ; -if (rpc->bus_size ==2 ) - max =8 ; -pm_runtime_get_sync (rpc->dev); regmap_update_bits(rpc->regmap, RPCIF_PHYCNT,
@@ -391,37 +437,36 @@ int rpcif_manual_xfer(struct rpcif *rpc)regmap_write (rpc->regmap,RPCIF_SMOPR , rpc->option);regmap_write (rpc->regmap,RPCIF_SMDMCR , rpc->dummy);regmap_write (rpc->regmap,RPCIF_SMDRENR , rpc->ddr); +regmap_write (rpc->regmap,RPCIF_SMADR , rpc->smadr); smenr = rpc->enable;switch (rpc->dir) {case RPCIF_DATA_OUT :while (pos < rpc->xferlen) { -u32 nbytes = rpc->xferlen - pos; -u32 data[2 ]; +u32 bytes_left = rpc->xferlen - pos; +u32 nbytes, data[2 ]; smcr = rpc->smcr |RPCIF_SMCR_SPIE ; -if (nbytes > max) { - nbytes = max; + +/* nbytes may only be 1, 2, 4, or 8 */ + nbytes = bytes_left >= max ? max : (1 <<ilog2 (bytes_left)); +if (bytes_left > nbytes) smcr |=RPCIF_SMCR_SSLKP ; - } + + smenr |=RPCIF_SMENR_SPIDE (rpcif_bits_set (rpc, nbytes)); +regmap_write (rpc->regmap,RPCIF_SMENR , smenr);memcpy (data, rpc->buffer + pos, nbytes); -if (nbytes >4 ) { +if (nbytes ==8 ) {regmap_write (rpc->regmap,RPCIF_SMWDR1 , data[0 ]);regmap_write (rpc->regmap,RPCIF_SMWDR0 , data[1 ]); - }else if (nbytes >2 ) { + }else {regmap_write (rpc->regmap,RPCIF_SMWDR0 , data[0 ]); - }else { -regmap_write (rpc->regmap,RPCIF_SMWDR0 , - data[0 ] <<16 ); } -regmap_write (rpc->regmap,RPCIF_SMADR , - rpc->smadr + pos); -regmap_write (rpc->regmap,RPCIF_SMENR , smenr);regmap_write (rpc->regmap,RPCIF_SMCR , smcr); ret =wait_msg_xfer_end (rpc);if (ret)
@@ -461,14 +506,16 @@ int rpcif_manual_xfer(struct rpcif *rpc)break ; }while (pos < rpc->xferlen) { -u32 nbytes = rpc->xferlen - pos; -u32 data[2 ]; +u32 bytes_left = rpc->xferlen - pos; +u32 nbytes, data[2 ]; -if (nbytes > max) - nbytes = max; +/* nbytes may only be 1, 2, 4, or 8 */ + nbytes = bytes_left >= max ? max : (1 <<ilog2 (bytes_left));regmap_write (rpc->regmap,RPCIF_SMADR , rpc->smadr + pos); + smenr &= ~RPCIF_SMENR_SPIDE (0xF ); + smenr |=RPCIF_SMENR_SPIDE (rpcif_bits_set (rpc, nbytes));regmap_write (rpc->regmap,RPCIF_SMENR , smenr);regmap_write (rpc->regmap,RPCIF_SMCR , rpc->smcr |RPCIF_SMCR_SPIE );
@@ -476,18 +523,14 @@ int rpcif_manual_xfer(struct rpcif *rpc)if (ret) goto err_out; -if (nbytes >4 ) { +if (nbytes ==8 ) {regmap_read (rpc->regmap,RPCIF_SMRDR1 , &data[0 ]);regmap_read (rpc->regmap,RPCIF_SMRDR0 , &data[1 ]); - }else if (nbytes >2 ) { -regmap_read (rpc->regmap,RPCIF_SMRDR0 , - &data[0 ]); - }else { + }else {regmap_read (rpc->regmap,RPCIF_SMRDR0 , &data[0 ]); - data[0 ] >>=16 ; }memcpy (rpc->buffer + pos, data, nbytes);
include/memory/renesas-rpc-if.h +1 -0
@@ -58,6 +58,7 @@ struct rpcif_op {struct rpcif {struct device *dev; +void __iomem *base;void __iomem *dirmap;struct regmap *regmap;struct reset_control *rstc;
Greg Kroah-Hartman
maintainerPATCH 120/575 signal/mips: Update (_save|_restore)_fp_context to fail with -EFAULT
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 95bf9d646c3c3f95cb0be7e703b371db8da5be68 upstream.
When an instruction to save or restore a register from the stack fails in _save_fp_context or _restore_fp_context return with -EFAULT. This change was made to r2300_fpu.S[1] but it looks like it got lost with the introduction of EX2[2]. This is also what the other implementation of _save_fp_context and _restore_fp_context in r4k_fpu.S does, and what is needed for the callers to be able to handle the error.
Furthermore calling do_exit(SIGSEGV) from bad_stack is wrong because it does not terminate the entire process it just terminates a single thread.
As the changed code was the only caller of arch/mips/kernel/syscall.c:bad_stack remove the problematic and now unused helper function.
Cc: Thomas Bogendoerfer <[email protected]>
Cc: Maciej Rozycki <[email protected]>
Cc: [email protected]
[1] 35938a00ba86 ("MIPS: Fix ISA I FP sigcontext access violation handling")
[2] f92722dc4545 ("MIPS: Correct MIPS I FP sigcontext layout")
--- arch/mips/kernel/r2300_fpu.S | 4 ++-- arch/mips/kernel/syscall.c | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-)
arch/mips/kernel/r2300_fpu.S +2 -2
@@ -29,8 +29,8 @@ #define EX2(a,b) \ 9: a,##b; \ .section __ex_table,"a"; \ - PTR 9b,bad_stack; \ - PTR 9b+4,bad_stack; \ + PTR 9b,fault; \ + PTR 9b+4,fault; \ .previous .set mips1
arch/mips/kernel/syscall.c +0 -9
@@ -240,12 +240,3 @@ SYSCALL_DEFINE3(cachectl, char *, addr, {return -ENOSYS ; } - -/* -* If we ever come here the user sp is bad. Zap the process right away. -* Due to the bad stack signaling wouldn't work. -*/ -asmlinkage void bad_stack(void) -{ -do_exit (SIGSEGV ); -}
Greg Kroah-Hartman
maintainerPATCH 121/575 soc: fsl: dpio: replace smp_processor_id with raw_smp_processor_id
In reply to Greg Kroah-HartmanFrom: Meng Li <[email protected]>
commit e775eb9fc2a4107f03222fa48bc95c2c82427e64 upstream.
When enable debug kernel configs,there will be calltrace as below:
BUG: using smp_processor_id() in preemptible [00000000] code: swapper/0/1 caller is debug_smp_processor_id+0x20/0x30 CPU: 6 PID: 1 Comm: swapper/0 Not tainted 5.10.63-yocto-standard #1 Hardware name: NXP Layerscape LX2160ARDB (DT) Call trace: dump_backtrace+0x0/0x1a0 show_stack+0x24/0x30 dump_stack+0xf0/0x13c check_preemption_disabled+0x100/0x110 debug_smp_processor_id+0x20/0x30 dpaa2_io_query_fq_count+0xdc/0x154 dpaa2_eth_stop+0x144/0x314 __dev_close_many+0xdc/0x160 __dev_change_flags+0xe8/0x220 dev_change_flags+0x30/0x70 ic_close_devs+0x50/0x78 ip_auto_config+0xed0/0xf10 do_one_initcall+0xac/0x460 kernel_init_freeable+0x30c/0x378 kernel_init+0x20/0x128 ret_from_fork+0x10/0x38
Based on comment in the context, it doesn't matter whether preemption is disable or not. So, replace smp_processor_id() with raw_smp_processor_id() to avoid above call trace.
--- drivers/soc/fsl/dpio/dpio-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/fsl/dpio/dpio-service.c +1 -1
@@ -59,7 +59,7 @@ static inline struct dpaa2_io *service_s* potentially being migrated away. */ if (cpu <0 ) - cpu =smp_processor_id (); + cpu =raw_smp_processor_id ();/* If a specific cpu was requested, pick it up immediately */ return dpio_by_cpu[cpu];
Greg Kroah-Hartman
maintainerPATCH 122/575 soc: fsl: dpio: use the combined functions to protect critical zone
In reply to Greg Kroah-HartmanFrom: Meng Li <[email protected]>
commit dc7e5940aad6641bd5ab33ea8b21c4b3904d989f upstream.
In orininal code, use 2 function spin_lock() and local_irq_save() to
protect the critical zone. But when enable the kernel debug config,
there are below inconsistent lock state detected.
================================
WARNING: inconsistent lock state
5.10.63-yocto-standard #1 Not tainted
--------------------------------
inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
lock_torture_wr/226 [HC0[0]:SC1[5]:HE1:SE0] takes:ffff002005b2dd80 (&p->access_spinlock){+.?.}-{3:3}, at: qbman_swp_enqueue_multiple_mem_back+0x44/0x270 {SOFTIRQ-ON-W} state was registered at:
lock_acquire.part.0+0xf8/0x250 lock_acquire+0x68/0x84 _raw_spin_lock+0x68/0x90 qbman_swp_enqueue_multiple_mem_back+0x44/0x270 ...... cryptomgr_test+0x38/0x60 kthread+0x158/0x164 ret_from_fork+0x10/0x38 irq event stamp: 4498 hardirqs last enabled at (4498): [<ffff800010fcf980>] _raw_spin_unlock_irqrestore+0x90/0xb0 hardirqs last disabled at (4497): [<ffff800010fcffc4>] _raw_spin_lock_irqsave+0xd4/0xe0 softirqs last enabled at (4458): [<ffff8000100108c4>] __do_softirq+0x674/0x724 softirqs last disabled at (4465): [<ffff80001005b2a4>] __irq_exit_rcu+0x190/0x19c
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(&p->access_spinlock);
<Interrupt>
lock(&p->access_spinlock);
*** DEADLOCK ***So, in order to avoid deadlock, use the combined functions spin_lock_irqsave/spin_unlock_irqrestore() to protect critical zone.
--- drivers/soc/fsl/dpio/qbman-portal.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/soc/fsl/dpio/qbman-portal.c +3 -6
@@ -732,8 +732,7 @@ int qbman_swp_enqueue_multiple_mem_back(int i, num_enqueued =0 ;unsigned long irq_flags; -spin_lock (&s->access_spinlock); -local_irq_save (irq_flags); +spin_lock_irqsave (&s->access_spinlock, irq_flags); half_mask = (s->eqcr.pi_ci_mask>>1 ); full_mask = s->eqcr.pi_ci_mask;
@@ -744,8 +743,7 @@ int qbman_swp_enqueue_multiple_mem_back( s->eqcr.available =qm_cyc_diff (s->eqcr.pi_ring_size, eqcr_ci, s->eqcr.ci);if (!s->eqcr.available) { -local_irq_restore (irq_flags); -spin_unlock (&s->access_spinlock); +spin_unlock_irqrestore (&s->access_spinlock, irq_flags);return 0 ; } }
@@ -784,8 +782,7 @@ int qbman_swp_enqueue_multiple_mem_back(dma_wmb ();qbman_write_register (s,QBMAN_CINH_SWP_EQCR_PI , (QB_RT_BIT )|(s->eqcr.pi)|s->eqcr.pi_vb); -local_irq_restore (irq_flags); -spin_unlock (&s->access_spinlock); +spin_unlock_irqrestore (&s->access_spinlock, irq_flags);return num_enqueued; }
Greg Kroah-Hartman
maintainerPATCH 123/575 mtd: rawnand: socrates: Keep the driver compatible with on-die ECC engines
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit b4ebddd6540d78a7f977b3fea0261bd575c6ffe2 upstream.
Following the introduction of the generic ECC engine infrastructure, it was necessary to reorganize the code and move the ECC configuration in the ->attach_chip() hook. Failing to do that properly lead to a first series of fixes supposed to stabilize the situation. Unfortunately, this only fixed the use of software ECC engines, preventing any other kind of engine to be used, including on-die ones.
It is now time to (finally) fix the situation by ensuring that we still provide a default (eg. software ECC) but will still support different ECC engines such as on-die ECC engines if properly described in the device tree.
There are no changes needed on the core side in order to do this, but we just need to leverage the logic there which allows:
1- a subsystem default (set to Host engines in the raw NAND world) 2- a driver specific default (here set to software ECC engines) 3- any type of engine requested by the user (ie. described in the DT)
As the raw NAND subsystem has not yet been fully converted to the ECC engine infrastructure, in order to provide a default ECC engine for this driver we need to set chip->ecc.engine_type *before* calling nand_scan(). During the initialization step, the core will consider this entry as the default engine for this driver. This value may of course be overloaded by the user if the usual DT properties are provided.
--- drivers/mtd/nand/raw/socrates_nand.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/socrates_nand.c +9 -3
@@ -119,9 +119,8 @@ static int socrates_nand_device_ready(ststatic int socrates_attach_chip (struct nand_chip *chip) { - chip->ecc.engine_type =NAND_ECC_ENGINE_TYPE_SOFT ; - -if (chip->ecc.algo ==NAND_ECC_ALGO_UNKNOWN ) +if (chip->ecc.engine_type ==NAND_ECC_ENGINE_TYPE_SOFT && + chip->ecc.algo ==NAND_ECC_ALGO_UNKNOWN ) chip->ecc.algo =NAND_ECC_ALGO_HAMMING ;return 0 ;
@@ -175,6 +174,13 @@ static int socrates_nand_probe(struct pl/* TODO: I have no idea what real delay is. */ nand_chip->legacy.chip_delay =20 ;/* 20us command delay time */ +/* +* This driver assumes that the default ECC engine should be TYPE_SOFT. +* Set ->engine_type before registering the NAND devices in order to +* provide a driver specific default value. +*/ + nand_chip->ecc.engine_type =NAND_ECC_ENGINE_TYPE_SOFT ; +dev_set_drvdata (&ofdev->dev, host); res =nand_scan (nand_chip,1 );
Greg Kroah-Hartman
maintainerPATCH 124/575 power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
In reply to Greg Kroah-HartmanFrom: Sebastian Krzyszkowiak <[email protected]>
commit e660dbb68c6b3f7b9eb8b9775846a44f9798b719 upstream.
max17042_set_soc_threshold gets called with offset set to 1, which means that minimum threshold value would underflow once SOC got down to 0, causing invalid alerts from the gauge.
--- drivers/power/supply/max17042_battery.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/power/supply/max17042_battery.c +2 -1
@@ -851,7 +851,8 @@ static void max17042_set_soc_threshold(sregmap_read (map, MAX17042_RepSOC, &soc); soc >>=8 ; soc_tr = (soc + off) <<8 ; - soc_tr |= (soc - off); +if (off < soc) + soc_tr |= soc - off;regmap_write (map, MAX17042_SALRT_Th, soc_tr); }
Greg Kroah-Hartman
maintainerPATCH 125/575 power: supply: max17042_battery: use VFSOC for capacity when no rsns
In reply to Greg Kroah-HartmanFrom: Henrik Grimler <[email protected]>
commit 223a3b82834f036a62aa831f67cbf1f1d644c6e2 upstream.
On Galaxy S3 (i9300/i9305), which has the max17047 fuel gauge and no current sense resistor (rsns), the RepSOC register does not provide an accurate state of charge value. The reported value is wrong, and does not change over time. VFSOC however, which uses the voltage fuel gauge to determine the state of charge, always shows an accurate value.
For devices without current sense, VFSOC is already used for the soc-alert (0x0003 is written to MiscCFG register), so with this change the source of the alert and the PROP_CAPACITY value match.
--- drivers/power/supply/max17042_battery.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/power/supply/max17042_battery.c +4 -1
@@ -316,7 +316,10 @@ static int max17042_get_property(struct val->intval = data *625 /8 ;break ;case POWER_SUPPLY_PROP_CAPACITY : - ret =regmap_read (map, MAX17042_RepSOC, &data); +if (chip->pdata->enable_current_sense) + ret =regmap_read (map, MAX17042_RepSOC, &data); +else + ret =regmap_read (map,MAX17042_VFSOC , &data);if (ret <0 )return ret;
Greg Kroah-Hartman
maintainerPATCH 126/575 KVM: arm64: Extract ESR_ELx.EC only
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
commit 8bb084119f1acc2ec55ea085a97231e3ddb30782 upstream.
Since ARMv8.0 the upper 32 bits of ESR_ELx have been RES0, and recently some of the upper bits gained a meaning and can be non-zero. For example, when FEAT_LS64 is implemented, ESR_ELx[36:32] contain ISS2, which for an ST64BV or ST64BV0 can be non-zero. This can be seen in ARM DDI 0487G.b, page D13-3145, section D13.2.37.
Generally, we must not rely on RES0 bit remaining zero in future, and when extracting ESR_ELx.EC we must mask out all other bits.
All C code uses the ESR_ELx_EC() macro, which masks out the irrelevant bits, and therefore no alterations are required to C code to avoid consuming irrelevant bits.
In a couple of places the KVM assembly extracts ESR_ELx.EC using LSR on an X register, and so could in theory consume previously RES0 bits. In both cases this is for comparison with EC values ESR_ELx_EC_HVC32 and ESR_ELx_EC_HVC64, for which the upper bits of ESR_ELx must currently be zero, but this could change in future.
This patch adjusts the KVM vectors to use UBFX rather than LSR to extract ESR_ELx.EC, ensuring these are robust to future additions to ESR_ELx.
--- arch/arm64/include/asm/esr.h | 1 + arch/arm64/kvm/hyp/hyp-entry.S | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
arch/arm64/include/asm/esr.h +1 -0
@@ -68,6 +68,7 @@#define ESR_ELx_EC_MAX (0x3F)#define ESR_ELx_EC_SHIFT (26) +#define ESR_ELx_EC_WIDTH (6)#define ESR_ELx_EC_MASK (UL(0x3F) << ESR_ELx_EC_SHIFT)#define ESR_ELx_EC (esr) (((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT)
arch/arm64/kvm/hyp/hyp-entry.S +1 -1
@@ -43,7 +43,7 @@ el1_sync: // Guest trapped into EL2 mrs x0, esr_el2 - lsr x0, x0, #ESR_ELx_EC_SHIFT + ubfx x0, x0, #ESR_ELx_EC_SHIFT, #ESR_ELx_EC_WIDTH cmp x0, #ESR_ELx_EC_HVC64 ccmp x0, #ESR_ELx_EC_HVC32, #4, ne b.ne el1_trap
arch/arm64/kvm/hyp/nvhe/host.S +1 -1
@@ -97,7 +97,7 @@ SYM_FUNC_END(__hyp_do_panic) .L__vect_start\@: stp x0, x1, [sp, #-16]! mrs x0, esr_el2 - lsr x0, x0, #ESR_ELx_EC_SHIFT + ubfx x0, x0, #ESR_ELx_EC_SHIFT, #ESR_ELx_EC_WIDTH cmp x0, #ESR_ELx_EC_HVC64 ldp x0, x1, [sp], #16 b.ne __host_exit
Greg Kroah-Hartman
maintainerPATCH 127/575 KVM: nVMX: Query current VMCS when determining if MSR bitmaps are in use
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 7dfbc624eb5726367900c8d86deff50836240361 upstream.
Check the current VMCS controls to determine if an MSR write will be intercepted due to MSR bitmaps being disabled. In the nested VMX case, KVM will disable MSR bitmaps in vmcs02 if they're disabled in vmcs12 or if KVM can't map L1's bitmaps for whatever reason.
Note, the bad behavior is relatively benign in the current code base as KVM sets all bits in vmcs02's MSR bitmap by default, clears bits if and only if L0 KVM also disables interception of an MSR, and only uses the buggy helper for MSR_IA32_SPEC_CTRL. Because KVM explicitly tests WRMSR before disabling interception of MSR_IA32_SPEC_CTRL, the flawed check will only result in KVM reading MSR_IA32_SPEC_CTRL from hardware when it isn't strictly necessary.
Tag the fix for stable in case a future fix wants to use msr_write_intercepted(), in which case a buggy implementation in older kernels could prove subtly problematic.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/vmx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx/vmx.c +4 -4
@@ -859,15 +859,15 @@ void update_exception_bitmap(struct kvm_/* * Check if MSR is intercepted for currently loaded MSR bitmap. */ -static bool msr_write_intercepted (struct kvm_vcpu *vcpu,u32 msr) +static bool msr_write_intercepted (struct vcpu_vmx *vmx,u32 msr) {unsigned long *msr_bitmap;int f =sizeof (unsigned long ); -if (!cpu_has_vmx_msr_bitmap ()) +if (!(exec_controls_get (vmx) &CPU_BASED_USE_MSR_BITMAPS ))return true; - msr_bitmap =to_vmx (vcpu)->loaded_vmcs->msr_bitmap; + msr_bitmap = vmx->loaded_vmcs->msr_bitmap;if (msr <=0x1fff ) {return !!test_bit (msr, msr_bitmap +0x800 / f);
@@ -6744,7 +6744,7 @@ reenter_guest:* If the L02 MSR bitmap does not intercept the MSR, then we need to * save it. */ -if (unlikely (!msr_write_intercepted (vcpu,MSR_IA32_SPEC_CTRL ))) +if (unlikely (!msr_write_intercepted (vmx,MSR_IA32_SPEC_CTRL ))) vmx->spec_ctrl =native_read_msr (MSR_IA32_SPEC_CTRL );x86_spec_ctrl_restore_host (vmx->spec_ctrl,0 );
Greg Kroah-Hartman
maintainerPATCH 128/575 can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
commit c0f49d98006f2db3333b917caac65bce2af9865c upstream.
This patch prevents BAM transport from being closed by receiving abort message, as specified in SAE-J1939-82 2015 (A.3.3 Row 4).
--- net/can/j1939/transport.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/can/j1939/transport.c +6 -0
@@ -2065,6 +2065,12 @@ static void j1939_tp_cmd_recv(struct j19break ;case J1939_ETP_CMD_ABORT :/* && J1939_TP_CMD_ABORT */ +if (j1939_cb_is_broadcast (skcb)) { +netdev_err_once (priv->ndev,"%s: abort to broadcast (%02x), ignoring!\n" , + __func__, skcb->addr.sa); +return ; + } +if (j1939_tp_im_transmitter (skcb))j1939_xtp_rx_abort (priv, skb, true);
Greg Kroah-Hartman
maintainerPATCH 129/575 can: j1939: j1939_can_recv(): ignore messages with invalid source address
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
commit a79305e156db3d24fcd8eb649cdb3c3b2350e5c2 upstream.
According to SAE-J1939-82 2015 (A.3.6 Row 2), a receiver should never send TP.CM_CTS to the global address, so we can add a check in j1939_can_recv() to drop messages with invalid source address.
--- net/can/j1939/main.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/can/j1939/main.c +7 -0
@@ -75,6 +75,13 @@ static void j1939_can_recv(struct sk_buf skcb->addr.pgn = (cf->can_id >>8 ) &J1939_PGN_MAX ;/* set default message type */ skcb->addr.type =J1939_TP ; + +if (!j1939_address_is_valid (skcb->addr.sa)) { +netdev_err_once (priv->ndev,"%s: sa is broadcast address, ignoring!\n" , + __func__); + goto done; + } +if (j1939_pgn_is_pdu1 (skcb->addr.pgn)) {/* Type 1: with destination address */ skcb->addr.da = skcb->addr.pgn;
Greg Kroah-Hartman
maintainerPATCH 130/575 powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found
In reply to Greg Kroah-HartmanFrom: Xiaoming Ni <[email protected]>
commit 3c2172c1c47b4079c29f0e6637d764a99355ebcd upstream.
When the field described in mpc85xx_smp_guts_ids[] is not configured in dtb, the mpc85xx_setup_pmc() does not assign a value to the "guts" variable. As a result, the oops is triggered when mpc85xx_freeze_time_base() is executed.
--- arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c +1 -2
@@ -94,9 +94,8 @@ int __init mpc85xx_setup_pmc(void)pr_err ("Could not map guts node address\n" );return -ENOMEM ; } + qoriq_pm_ops = &mpc85xx_pm_ops; } - qoriq_pm_ops = &mpc85xx_pm_ops; -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 131/575 ring-buffer: Protect ring_buffer_reset() from reentrancy
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 51d157946666382e779f94c39891e8e9a020da78 upstream.
The resetting of the entire ring buffer use to simply go through and reset each individual CPU buffer that had its own protection and synchronization. But this was very slow, due to performing a synchronization for each CPU. The code was reshuffled to do one disabling of all CPU buffers, followed by a single RCU synchronization, and then the resetting of each of the CPU buffers. But unfortunately, the mutex that prevented multiple occurrences of resetting the buffer was not moved to the upper function, and there is nothing to protect from it.
Take the ring buffer mutex around the global reset.
--- kernel/trace/ring_buffer.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/trace/ring_buffer.c +5 -0
@@ -5000,6 +5000,9 @@ void ring_buffer_reset(struct trace_buffstruct ring_buffer_per_cpu *cpu_buffer;int cpu; +/* prevent another thread from changing buffer sizes */ +mutex_lock (&buffer->mutex); +for_each_buffer_cpu (buffer, cpu) { cpu_buffer = buffer->buffers[cpu];
@@ -5018,6 +5021,8 @@ void ring_buffer_reset(struct trace_buffatomic_dec (&cpu_buffer->record_disabled);atomic_dec (&cpu_buffer->resize_disabled); } + +mutex_unlock (&buffer->mutex); }EXPORT_SYMBOL_GPL (ring_buffer_reset);
Greg Kroah-Hartman
maintainerPATCH 132/575 serial: core: Fix initializing and restoring termios speed
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 027b57170bf8bb6999a28e4a5f3d78bf1db0f90c upstream.
Since commit edc6afc54968 ("tty: switch to ktermios and new framework") termios speed is no longer stored only in c_cflag member but also in new additional c_ispeed and c_ospeed members. If BOTHER flag is set in c_cflag then termios speed is stored only in these new members.
Therefore to correctly restore termios speed it is required to store also ispeed and ospeed members, not only cflag member.
In case only cflag member with BOTHER flag is restored then functions tty_termios_baud_rate() and tty_termios_input_baud_rate() returns baudrate stored in c_ospeed / c_ispeed member, which is zero as it was not restored too. If reported baudrate is invalid (e.g. zero) then serial core functions report fallback baudrate value 9600. So it means that in this case original baudrate is lost and kernel changes it to value 9600.
Simple reproducer of this issue is to boot kernel with following command line argument: "console=ttyXXX,86400" (where ttyXXX is the device name). For speed 86400 there is no Bnnn constant and therefore kernel has to represent this speed via BOTHER c_cflag. Which means that speed is stored only in c_ospeed and c_ispeed members, not in c_cflag anymore.
If bootloader correctly configures serial device to speed 86400 then kernel prints boot log to early console at speed speed 86400 without any issue. But after kernel starts initializing real console device ttyXXX then speed is changed to fallback value 9600 because information about speed was lost.
This patch fixes above issue by storing and restoring also ispeed and ospeed members, which are required for BOTHER flag.
--- drivers/tty/serial/serial_core.c | 16 ++++++++++++++-- include/linux/console.h | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-)
drivers/tty/serial/serial_core.c +14 -2
@@ -222,7 +222,11 @@ static int uart_port_startup(struct tty_if (retval ==0 ) {if (uart_console (uport) && uport->cons->cflag) { tty->termios.c_cflag = uport->cons->cflag; + tty->termios.c_ispeed = uport->cons->ispeed; + tty->termios.c_ospeed = uport->cons->ospeed; uport->cons->cflag =0 ; + uport->cons->ispeed =0 ; + uport->cons->ospeed =0 ; }/* * Initialise the hardware port settings.
@@ -290,8 +294,11 @@ static void uart_shutdown(struct tty_str/* * Turn off DTR and RTS early. */ -if (uport &&uart_console (uport) && tty) +if (uport &&uart_console (uport) && tty) { uport->cons->cflag = tty->termios.c_cflag; + uport->cons->ispeed = tty->termios.c_ispeed; + uport->cons->ospeed = tty->termios.c_ospeed; + }if (!tty ||C_HUPCL (tty))uart_port_dtr_rts (uport,0 );
@@ -2123,8 +2130,11 @@ uart_set_options(struct uart_port *port,* Allow the setting of the UART parameters with a NULL console * too: */ -if (co) +if (co) { co->cflag = termios.c_cflag; + co->ispeed = termios.c_ispeed; + co->ospeed = termios.c_ospeed; + }return 0 ; }
@@ -2258,6 +2268,8 @@ int uart_resume_port(struct uart_driver*/ memset (&termios,0 ,sizeof (struct ktermios )); termios.c_cflag = uport->cons->cflag; + termios.c_ispeed = uport->cons->ispeed; + termios.c_ospeed = uport->cons->ospeed;/* * If that's unset, use the tty termios setting.
include/linux/console.h +2 -0
@@ -150,6 +150,8 @@ struct console {short flags;short index;int cflag; +uint ispeed; +uint ospeed;void *data;struct console *next; };
Greg Kroah-Hartman
maintainerPATCH 133/575 ifb: fix building without CONFIG_NET_CLS_ACT
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 7444d706be31753f65052c7f6325fc8470cc1789 upstream.
The driver no longer depends on this option, but it fails to build if it's disabled because the skb->tc_skip_classify is hidden behind an #ifdef:
drivers/net/ifb.c:81:8: error: no member named 'tc_skip_classify' in 'struct sk_buff'
skb->tc_skip_classify = 1;
Use the same #ifdef around the assignment.
--- drivers/net/ifb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ifb.c +2 -0
@@ -76,7 +76,9 @@ static void ifb_ri_tasklet(unsigned longwhile ((skb =__skb_dequeue (&txp->tq)) !=NULL ) { skb->redirected =0 ; +#ifdef CONFIG_NET_CLS_ACT skb->tc_skip_classify =1 ; +#endif u64_stats_update_begin (&txp->tsync); txp->tx_packets++;
Greg Kroah-Hartman
maintainerPATCH 134/575 ALSA: mixer: oss: Fix racy access to slots
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 411cef6adfb38a5bb6bd9af3941b28198e7fb680 upstream.
The OSS mixer can reassign the mapping slots dynamically via proc file. Although the addition and deletion of those slots are protected by mixer->reg_mutex, the access to slots aren't, hence this may cause UAF when the slots in use are deleted concurrently.
This patch applies the mixer->reg_mutex in all appropriate code paths (i.e. the ioctl functions) that may access slots.
--- sound/core/oss/mixer_oss.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-)
sound/core/oss/mixer_oss.c +33 -10
@@ -130,11 +130,13 @@ static int snd_mixer_oss_devmask(structif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);for (chn =0 ; chn <31 ; chn++) { pslot = &mixer->slots[chn];if (pslot->put_volume || pslot->put_recsrc) result |=1 << chn; } +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -146,11 +148,13 @@ static int snd_mixer_oss_stereodevs(struif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);for (chn =0 ; chn <31 ; chn++) { pslot = &mixer->slots[chn];if (pslot->put_volume && pslot->stereo) result |=1 << chn; } +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -161,6 +165,7 @@ static int snd_mixer_oss_recmask(structif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);if (mixer->put_recsrc && mixer->get_recsrc) {/* exclusive */ result = mixer->mask_recsrc; }else {
@@ -172,6 +177,7 @@ static int snd_mixer_oss_recmask(struct result |=1 << chn; } } +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -182,11 +188,12 @@ static int snd_mixer_oss_get_recsrc(struif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);if (mixer->put_recsrc && mixer->get_recsrc) {/* exclusive */ -int err;unsigned int index; -if ((err = mixer->get_recsrc (fmixer, &index)) <0 ) -return err; + result = mixer->get_recsrc (fmixer, &index); +if (result <0 ) + goto unlock; result =1 << index; }else {struct snd_mixer_oss_slot *pslot;
@@ -201,7 +208,10 @@ static int snd_mixer_oss_get_recsrc(stru } } } -return mixer->oss_recsrc = result; + mixer->oss_recsrc = result; + unlock: +mutex_unlock (&mixer->reg_mutex); +return result; }static int snd_mixer_oss_set_recsrc (struct snd_mixer_oss_file *fmixer,int recsrc)
@@ -214,6 +224,7 @@ static int snd_mixer_oss_set_recsrc(struif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);if (mixer->get_recsrc && mixer->put_recsrc) {/* exclusive input */ if (recsrc & ~mixer->oss_recsrc) recsrc &= ~mixer->oss_recsrc;
@@ -239,6 +250,7 @@ static int snd_mixer_oss_set_recsrc(stru } } } +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -250,6 +262,7 @@ static int snd_mixer_oss_get_volume(struif (mixer ==NULL || slot >30 )return -EIO ; +mutex_lock (&mixer->reg_mutex); pslot = &mixer->slots[slot]; left = pslot->volume[0 ]; right = pslot->volume[1 ];
@@ -257,15 +270,21 @@ static int snd_mixer_oss_get_volume(stru result = pslot->get_volume (fmixer, pslot, &left, &right);if (!pslot->stereo) right = left; -if (snd_BUG_ON (left <0 || left >100 )) -return -EIO ; -if (snd_BUG_ON (right <0 || right >100 )) -return -EIO ; +if (snd_BUG_ON (left <0 || left >100 )) { + result = -EIO ; + goto unlock; + } +if (snd_BUG_ON (right <0 || right >100 )) { + result = -EIO ; + goto unlock; + }if (result >=0 ) { pslot->volume[0 ] = left; pslot->volume[1 ] = right; result = (left &0xff ) | ((right &0xff ) <<8 ); } + unlock: +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -278,6 +297,7 @@ static int snd_mixer_oss_set_volume(struif (mixer ==NULL || slot >30 )return -EIO ; +mutex_lock (&mixer->reg_mutex); pslot = &mixer->slots[slot];if (left >100 ) left =100 ;
@@ -288,10 +308,13 @@ static int snd_mixer_oss_set_volume(struif (pslot->put_volume) result = pslot->put_volume (fmixer, pslot, left, right);if (result <0 ) -return result; + goto unlock; pslot->volume[0 ] = left; pslot->volume[1 ] = right; -return (left &0xff ) | ((right &0xff ) <<8 ); + result = (left &0xff ) | ((right &0xff ) <<8 ); + unlock: +mutex_lock (&mixer->reg_mutex); +return result; }static int snd_mixer_oss_ioctl1 (struct snd_mixer_oss_file *fmixer,unsigned int cmd,unsigned long arg)
Greg Kroah-Hartman
maintainerPATCH 135/575 ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit 3ab7992018455ac63c33e9b3eaa7264e293e40f4 upstream.
In commit 411cef6adfb3 ("ALSA: mixer: oss: Fix racy access to slots") added mutex protection in snd_mixer_oss_set_volume(). Second mutex_lock() in same function looks like typo, fix it.
--- sound/core/oss/mixer_oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/oss/mixer_oss.c +1 -1
@@ -313,7 +313,7 @@ static int snd_mixer_oss_set_volume(stru pslot->volume[1 ] = right; result = (left &0xff ) | ((right &0xff ) <<8 ); unlock: -mutex_lock (&mixer->reg_mutex); +mutex_unlock (&mixer->reg_mutex);return result; }
Greg Kroah-Hartman
maintainerPATCH 136/575 xen/balloon: add late_initcall_sync() for initial ballooning done
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
commit 40fdea0284bb20814399da0484a658a96c735d90 upstream.
When running as PVH or HVM guest with actual memory < max memory the hypervisor is using "populate on demand" in order to allow the guest to balloon down from its maximum memory size. For this to work correctly the guest must not touch more memory pages than its target memory size as otherwise the PoD cache will be exhausted and the guest is crashed as a result of that.
In extreme cases ballooning down might not be finished today before the init process is started, which can consume lots of memory.
In order to avoid random boot crashes in such cases, add a late init call to wait for ballooning down having finished for PVH/HVM guests.
Warn on console if initial ballooning fails, panic() after stalling for more than 3 minutes per default. Add a module parameter for changing this timeout.
[boris: replaced pr_info() with pr_notice()]
--- Documentation/admin-guide/kernel-parameters.txt | 7 + drivers/xen/balloon.c | 86 +++++++++++++++++------- 2 files changed, 70 insertions(+), 23 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +7 -0
@@ -5988,6 +5988,13 @@ improve timer resolution at the expense of processing more timer interrupts. + xen.balloon_boot_timeout= [XEN] + The time (in seconds) to wait before giving up to boot + in case initial ballooning fails to free enough memory. + Applies only when running as HVM or PVH guest and + started with less memory configured than allowed at + max. Default is 180. + xen.event_eoi_delay= [XEN] How long to delay EOI handling in case of event storms (jiffies). Default is 10.
drivers/xen/balloon.c +63 -23
173 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 137/575 ovl: fix use after free in struct ovl_aio_req
In reply to Greg Kroah-HartmanFrom: yangerkun <[email protected]>
commit 9a254403760041528bc8f69fe2f5e1ef86950991 upstream.
Example for triggering use after free in a overlay on ext4 setup:
aio_read
ovl_read_iter
vfs_iter_read
ext4_file_read_iter
ext4_dio_read_iter
iomap_dio_rw -> -EIOCBQUEUED
/*
* Here IO is completed in a separate thread,
* ovl_aio_cleanup_handler() frees aio_req which has iocb embedded
*/
file_accessed(iocb->ki_filp); /**BOOM**/Fix by introducing a refcount in ovl_aio_req similarly to aio_kiocb. This guarantees that iocb is only freed after vfs_read/write_iter() returns on underlying fs.
--- fs/overlayfs/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
fs/overlayfs/file.c +14 -2
@@ -17,6 +17,7 @@struct ovl_aio_req {struct kiocb iocb; +refcount_t ref;struct kiocb *orig_iocb;struct fd fd; };
@@ -257,6 +258,14 @@ static rwf_t ovl_iocb_to_rwf(int ifl)return flags; } +static inline void ovl_aio_put (struct ovl_aio_req *aio_req) +{ +if (refcount_dec_and_test (&aio_req->ref)) { +fdput (aio_req->fd); +kmem_cache_free (ovl_aio_request_cachep, aio_req); + } +} +static void ovl_aio_cleanup_handler (struct ovl_aio_req *aio_req) {struct kiocb *iocb = &aio_req->iocb;
@@ -273,8 +282,7 @@ static void ovl_aio_cleanup_handler(stru } orig_iocb->ki_pos = iocb->ki_pos; -fdput (aio_req->fd); -kmem_cache_free (ovl_aio_request_cachep, aio_req); +ovl_aio_put (aio_req); }static void ovl_aio_rw_complete (struct kiocb *iocb,long res,long res2)
@@ -324,7 +332,9 @@ static ssize_t ovl_read_iter(struct kioc aio_req->orig_iocb = iocb;kiocb_clone (&aio_req->iocb, iocb, real.file); aio_req->iocb.ki_complete = ovl_aio_rw_complete; +refcount_set (&aio_req->ref,2 ); ret =vfs_iocb_iter_read (real.file, &aio_req->iocb, iter); +ovl_aio_put (aio_req);if (ret != -EIOCBQUEUED )ovl_aio_cleanup_handler (aio_req); }
@@ -395,7 +405,9 @@ static ssize_t ovl_write_iter(struct kiokiocb_clone (&aio_req->iocb, iocb, real.file); aio_req->iocb.ki_flags = ifl; aio_req->iocb.ki_complete = ovl_aio_rw_complete; +refcount_set (&aio_req->ref,2 ); ret =vfs_iocb_iter_write (real.file, &aio_req->iocb, iter); +ovl_aio_put (aio_req);if (ret != -EIOCBQUEUED )ovl_aio_cleanup_handler (aio_req); }
Greg Kroah-Hartman
maintainerPATCH 138/575 PCI: pci-bridge-emul: Fix emulation of W1C bits
In reply to Greg Kroah-HartmanFrom: Marek Behún <[email protected]>
commit 7a41ae80bdcb17e14dd7d83239b8a0cf368f18be upstream.
The pci_bridge_emul_conf_write() function correctly clears W1C bits in cfgspace cache, but it does not inform the underlying implementation about the clear request: the .write_op() method is given the value with these bits cleared.
This is wrong if the .write_op() needs to know which bits were requested to be cleared.
Fix the value to be passed into the .write_op() method to have requested W1C bits set, so that it can clear them.
Both pci-bridge-emul users (mvebu and aardvark) are compatible with this change.
--- drivers/pci/pci-bridge-emul.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/pci/pci-bridge-emul.c +13 -0
@@ -431,8 +431,21 @@ int pci_bridge_emul_conf_write(struct pc/* Clear the W1C bits */ new &= ~((value << shift) & (behavior[reg /4 ].w1c & mask)); +/* Save the new value with the cleared W1C bits into the cfgspace */ cfgspace[reg /4 ] =cpu_to_le32 (new); +/* +* Clear the W1C bits not specified by the write mask, so that the +* write_op() does not clear them. +*/ + new &= ~(behavior[reg /4 ].w1c & ~mask); + +/* +* Set the W1C bits specified by the write mask, so that write_op() +* knows about that they are to be cleared. +*/ + new |= (value << shift) & (behavior[reg /4 ].w1c & mask); +if (write_op)write_op (bridge, reg, old, new, mask);
Greg Kroah-Hartman
maintainerPATCH 139/575 PCI: cadence: Add cdns_plat_pcie_probe() missing return
In reply to Greg Kroah-HartmanFrom: Li Chen <[email protected]>
commit 27cd7e3c9bb1ae13bc16f08138edd6e4df3cd211 upstream.
When cdns_plat_pcie_probe() succeeds, return success instead of falling into the error handling code.
--- drivers/pci/controller/cadence/pcie-cadence-plat.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/controller/cadence/pcie-cadence-plat.c +2 -0
@@ -127,6 +127,8 @@ static int cdns_plat_pcie_probe(struct p goto err_init; } +return 0 ; + err_init: err_get_sync:pm_runtime_put_sync (dev);