Linux 4.20.5
Greg KH
maintainerI'm announcing the release of the 4.20.5 kernel.
All users of the 4.20 kernel series must upgrade.
The updated 4.20.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.20.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/filesystems/proc.txt | 4 Makefile | 15 - arch/arm64/Makefile | 2 arch/arm64/include/asm/assembler.h | 30 +- arch/arm64/include/asm/memory.h | 7 arch/arm64/kernel/cpu_errata.c | 6 arch/arm64/kernel/perf_event.c | 1 arch/arm64/kernel/vmlinux.lds.S | 9 arch/arm64/mm/cache.S | 3 arch/arm64/mm/kasan_init.c | 2 arch/mips/Kconfig | 3 arch/mips/include/asm/cpu.h | 3 arch/mips/include/asm/mach-loongson64/kernel-entry-init.h | 4 arch/mips/kernel/cpu-probe.c | 3 arch/mips/kernel/idle.c | 2 arch/mips/loongson64/common/env.c | 3 arch/mips/loongson64/loongson-3/smp.c | 3 arch/mips/mm/c-r4k.c | 2 arch/mips/sibyte/common/Makefile | 1 arch/mips/sibyte/common/dma.c | 14 + arch/powerpc/kvm/book3s_hv_nested.c | 5 arch/powerpc/xmon/xmon.c | 18 + arch/x86/include/asm/traps.h | 6 arch/x86/kernel/cpu/intel_rdt.c | 2 arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 2 arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 2 arch/x86/kernel/cpu/mcheck/mce_amd.c | 5 arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 arch/x86/kernel/cpu/mcheck/threshold.c | 3 arch/x86/kernel/smpboot.c | 2 crypto/ecc.c | 16 - drivers/base/bus.c | 7 drivers/bluetooth/btusb.c | 72 ++--- drivers/char/ipmi/ipmi_msghandler.c | 173 ++++++++------ drivers/char/ipmi/ipmi_ssif.c | 25 +- drivers/clk/imx/clk-busy.c | 2 drivers/clk/imx/clk-fixup-mux.c | 2 drivers/clk/imx/clk-imx6q.c | 6 drivers/clk/imx/clk.h | 18 - drivers/clk/meson/meson8b.c | 20 + drivers/clocksource/timer-integrator-ap.c | 25 +- drivers/cpuidle/cpuidle-pseries.c | 8 drivers/firmware/efi/libstub/Makefile | 5 drivers/fpga/altera-cvp.c | 34 +- drivers/gpio/gpio-pl061.c | 21 - drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 8 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 8 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 8 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 8 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 5 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 5 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 2 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 drivers/gpu/drm/drm_atomic_helper.c | 3 drivers/gpu/drm/scheduler/sched_main.c | 17 + drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 11 drivers/infiniband/sw/rxe/rxe_req.c | 1 drivers/md/dm-crypt.c | 8 drivers/md/dm-delay.c | 2 drivers/md/dm-flakey.c | 2 drivers/md/dm-kcopyd.c | 19 + drivers/md/dm-linear.c | 2 drivers/md/dm-raid1.c | 3 drivers/md/dm-snap.c | 22 + drivers/md/dm-unstripe.c | 2 drivers/media/firewire/firedtv-avc.c | 6 drivers/media/firewire/firedtv.h | 6 drivers/media/platform/qcom/venus/core.c | 8 drivers/media/usb/uvc/uvc_driver.c | 13 - drivers/media/usb/uvc/uvc_status.c | 12 drivers/media/usb/uvc/uvcvideo.h | 1 drivers/mmc/host/atmel-mci.c | 3 drivers/net/dsa/mv88e6xxx/chip.c | 113 +++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 5 drivers/net/dsa/mv88e6xxx/port.h | 10 drivers/net/ethernet/intel/e1000e/ptp.c | 13 - drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 4 drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 4 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 7 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 drivers/net/ethernet/realtek/r8169.c | 2 drivers/net/ethernet/socionext/sni_ave.c | 6 drivers/net/usb/qmi_wwan.c | 1 drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 drivers/net/wireless/ath/ath10k/htt_rx.c | 4 drivers/net/wireless/quantenna/qtnfmac/commands.c | 21 + drivers/of/overlay.c | 4 drivers/platform/mips/cpu_hwmon.c | 3 drivers/platform/x86/asus-wmi.c | 3 drivers/scsi/megaraid/megaraid_sas_fp.c | 2 drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 drivers/scsi/mpt3sas/mpt3sas_base.c | 3 drivers/scsi/qedi/qedi_main.c | 3 drivers/scsi/smartpqi/smartpqi_init.c | 4 drivers/staging/erofs/unzip_vle.c | 13 - drivers/target/target_core_spc.c | 17 - drivers/target/target_core_transport.c | 35 ++ drivers/target/target_core_xcopy.c | 6 drivers/tty/serial/amba-pl011.c | 2 drivers/tty/serial/pic32_uart.c | 1 drivers/tty/serial/serial_core.c | 22 + drivers/tty/serial/xilinx_uartps.c | 1 drivers/usb/dwc2/gadget.c | 41 +-- drivers/usb/gadget/udc/renesas_usb3.c | 15 - drivers/usb/typec/tcpm/tcpm.c | 12 fs/btrfs/dev-replace.c | 63 +++-- fs/btrfs/inode.c | 7 fs/btrfs/volumes.c | 30 +- fs/iomap.c | 17 + fs/jffs2/super.c | 3 fs/ocfs2/localalloc.c | 9 fs/pstore/ram_core.c | 5 fs/quota/quota.c | 3 fs/userfaultfd.c | 10 include/linux/backing-dev-defs.h | 8 include/linux/filter.h | 16 - include/linux/memblock.h | 1 include/linux/swap.h | 11 include/linux/usb/tcpm.h | 1 include/sound/soc.h | 2 include/target/target_core_base.h | 1 include/target/target_core_fabric.h | 2 kernel/bpf/verifier.c | 37 ++ mm/memblock.c | 19 - mm/page-writeback.c | 35 +- mm/swapfile.c | 3 net/bluetooth/hci_event.c | 6 net/bridge/br_forward.c | 1 net/core/skbuff.c | 7 net/core/sock.c | 1 net/ipv4/devinet.c | 2 net/ipv4/netfilter/ipt_CLUSTERIP.c | 159 +++++++----- net/ipv6/addrconf.c | 2 net/ipv6/af_inet6.c | 14 + net/ipv6/ip6_fib.c | 6 net/netfilter/ipset/ip_set_bitmap_ipmac.c | 10 net/netfilter/ipset/ip_set_hash_ipmac.c | 16 - net/netfilter/ipset/ip_set_hash_mac.c | 10 net/openvswitch/flow.c | 8 samples/bpf/bpf_load.c | 33 +- scripts/Kbuild.include | 10 scripts/Makefile.build | 12 scripts/kconfig/zconf.l | 4 security/selinux/hooks.c | 2 sound/firewire/Kconfig | 1 sound/firewire/bebob/bebob.c | 2 sound/firewire/oxfw/oxfw.c | 8 sound/soc/amd/acp-pcm-dma.c | 7 sound/soc/codecs/pcm3168a.c | 18 - sound/soc/codecs/wm9705.c | 10 sound/soc/codecs/wm9712.c | 10 sound/soc/codecs/wm9713.c | 10 tools/lib/subcmd/Makefile | 2 tools/lib/traceevent/event-parse.c | 10 tools/perf/Makefile.config | 2 tools/perf/arch/x86/util/intel-pt.c | 11 tools/perf/builtin-stat.c | 8 tools/perf/builtin-timechart.c | 4 tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json | 2 tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json | 2 tools/perf/tests/bp_signal.c | 20 + tools/perf/util/cs-etm.c | 2 tools/perf/util/evlist.c | 4 tools/perf/util/parse-events.c | 2 tools/perf/util/svghelper.c | 2 tools/testing/selftests/bpf/Makefile | 10 tools/testing/selftests/bpf/test_libbpf.sh | 14 - tools/testing/selftests/bpf/test_verifier.c | 13 + tools/testing/selftests/kselftest_harness.h | 42 +-- 170 files changed, 1329 insertions(+), 644 deletions(-)
A.s. Dong (1):
clk: imx: make mux parent strings const
Aaron Lu (1):
mm/swap: use nr_node_ids for avail_lists in swap_info_struct
Adrian Hunter (2):
tools lib traceevent: Fix compile warnings in tools/lib/traceevent/event-parse.c perf intel-pt: Fix error with config term "pt=0"
AliOS system security (1):
dm crypt: use u64 instead of sector_t to store iv_offset
Anand Jain (1):
btrfs: fix use-after-free due to race between replace start and cancel
Anatolij Gustschin (1):
fpga: altera-cvp: fix probing for multiple FPGAs on the bus
Anders Roxell (3):
writeback: don't decrement wb->refcnt if !wb->bdi
serial: set suppress_bind_attrs flag only if builtin
arm64: perf: set suppress_bind_attrs flag to true
Andi Kleen (1):
perf vendor events intel: Fix Load_Miss_Real_Latency on SKL/SKX
Andrew Lunn (1):
net: dsa: mv88x6xxx: mv88e6390 errata
Andrey Ignatov (1):
bpf: Allow narrow loads with offset > 0
Ard Biesheuvel (1):
arm64: relocatable: fix inconsistencies in linker script and options
Arnaldo Carvalho de Melo (5):
perf svghelper: Fix unchecked usage of strncpy()
perf parse-events: Fix unchecked usage of strncpy()
tools lib subcmd: Don't add the kernel sources to the include path perf tools: Add missing sigqueue() prototype for systems lacking it perf tools: Add missing open_memstream() prototype for systems lacking it
Arnd Bergmann (1):
ASoC: wm97xx: fix uninitialized regmap pointer problem
Arthur Gautier (1):
netlink: fixup regression in RTM_GETADDR
Badhri Jagan Sridharan (1):
usb: typec: tcpm: Do not disconnect link for self powered devices
Bart Van Assche (1):
scsi: target/core: Make sure that target_wait_for_sess_cmds() waits long enough
Borislav Petkov (1):
x86/mce: Fix -Wmissing-prototypes warnings
Breno Leitao (2):
powerpc/xmon: Fix invocation inside lock region powerpc/pseries/cpuidle: Fix preempt warning
Brian Foster (1):
mm/page-writeback.c: don't break integrity writeback on ->writepage() error
Chris Wilson (1):
drm/amdgpu: Reorder uvd ring init before uvd resume
Christian König (1):
drm/amdkfd: fix interrupt spin lock
Christophe JAILLET (1):
octeontx2-af: Fix a resource leak in an error handling path in 'cgx_probe()'
Chuck Lever (1):
rxe: IB_WR_REG_MR does not capture MR's iova field
Corey Minyard (2):
ipmi: Don't initialize anything in the core until something uses it ipmi:ssif: Fix handling of multi-part return messages
Daniel Axtens (1):
media: uvcvideo: Refactor teardown of uvc on USB disconnect
Daniel Santos (1):
jffs2: Fix use of uninitialized delayed_work, lockdep breakage
Daniel T. Lee (1):
samples: bpf: fix: error handling regarding kprobe_events
Daniel Vetter (1):
sysfs: Disable lockdep for driver bind/unbind files
Daniele Palmas (1):
qmi_wwan: add MTU default to qmap network interface
David Ahern (3):
ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address
ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses
ipv6: Fix dump of specific table with strict checking
David Disseldorp (1):
scsi: target: use consistent left-aligned ASCII INQUIRY data
David Rientjes (1):
net, skbuff: do not prefer skb allocation fails early
Dmitry V. Levin (1):
selftests: do not macro-expand failed assertion expressions
Eric Sandeen (1):
iomap: don't search past page end in iomap_is_partially_uptodate
Florian Fainelli (1):
perf tests ARM: Disable breakpoint tests 32-bit
Frank Rowand (1):
of: overlay: add missing of_node_put() after add new node to changeset
Fred Klassen (1):
ipmi: Prevent use-after-free in deliver_response
Gao Xiang (1):
staging: erofs: fix use-after-free of on-stack `z_erofs_vle_unzip_io'
Greg Kroah-Hartman (1):
Linux 4.20.5
Gustavo A. R. Silva (1):
ipmi: msghandler: Fix potential Spectre v1 vulnerabilities
Hans van Kranenburg (1):
btrfs: alloc_chunk: fix more DUP stripe size handling
Huacai Chen (1):
MIPS: Loongson: Add Loongson-3A R2.1 basic support
Hui Wang (1):
x86/topology: Use total_cpus for max logical packages calculation
Ido Schimmel (1):
mlxsw: spectrum_switchdev: Set PVID correctly during VLAN deletion
James Morse (1):
arm64: Use a raw spinlock in __install_bp_hardening_cb()
Javier Barrio (1):
quota: Lock s_umount in exclusive mode for Q_XQUOTA{ON,OFF} quotactls.
Jiada Wang (1):
ASoC: pcm3168a: Don't disable pcm3168a when CONFIG_PM defined
Jiong Wang (1):
bpf: relax verifier restriction on BPF_MOV | BPF_ALU
Jiri Pirko (1):
mlxsw: spectrum: Disable lag port TX before removing it
Joel Fernandes (Google) (1):
pstore/ram: Do not treat empty buffers as valid
Johan Hedberg (1):
Bluetooth: Fix unnecessary error message for HCI request completion
Johannes Thumshirn (1):
btrfs: improve error handling of btrfs_add_link
Jonas Danielsson (1):
mmc: atmel-mci: do not assume idle after atmci_request_end
João Paulo Rechi Vita (1):
platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey
Junxiao Bi (1):
ocfs2: fix panic due to unrecovered local alloc
Kai-Heng Feng (1):
r8169: Add support for new Realtek Ethernet
Kevin Barnett (1):
scsi: smartpqi: correct lun reset issues
Kunihiko Hayashi (1):
net: ethernet: ave: Set initial wol state to disabled
Leo Yan (2):
coresight: tmc: Fix bad register address for CLAIM perf cs-etm: Correct packets swapping in cs_etm__flush()
Lucas Stach (1):
clk: imx6q: reset exclusive gates on init
Maciej W. Rozycki (1):
MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur
Manish Rangankar (1):
scsi: qedi: Check for session online before getting iSCSI TLV data.
Manivannan Sadhasivam (1):
gpio: pl061: Move irq_chip definition inside struct pl061
Martin Blumenstingl (2):
clk: meson: meson8b: add support for more M/N values in sys_pll
clk: meson: meson8b: fix incorrect divider mapping in cpu_scale_table
Masahiro Yamada (3):
kbuild: let fixdep directly write to .*.cmd files
kconfig: fix file name and line number of warn_ignored_character()
kconfig: fix memory leak when EOF is encountered in quotation
Michael Petlan (1):
perf stat: Avoid segfaults caused by negated options
Michal Hocko (1):
mm, proc: be more verbose about unstable VMA flags in /proc/<pid>/smaps
Milan Broz (1):
dm: Check for device sector overflow if CONFIG_LBDAF is not set
Minas Harutyunyan (1):
usb: dwc2: Fix disable all EP's on disconnect
Miroslav Lichvar (1):
e1000e: allow non-monotonic SYSTIM readings
Nathan Chancellor (2):
efi/libstub: Disable some warnings for x86{,_64}
media: firewire: Fix app_info parameter type in avc_ca{,_app}_info
Nicholas Kazlauskas (2):
drm/amd/display: Guard against null stream_state in set_crc_source drm/amd/display: Fix disabled cursor on top screen edge
Nikos Tsironis (2):
dm kcopyd: Fix bug causing workqueue stalls
dm snapshot: Fix excessive memory usage and workqueue stalls
Ondrej Mosnacek (1):
selinux: always allow mounting submounts
Paolo Abeni (1):
net: clear skb->tstamp in bridge forwarding path
Parvi Kaustubhi (1):
IB/usnic: Fix potential deadlock
Peter Xu (1):
userfaultfd: clear flag if remap event not enabled
Qian Cai (3):
arm64: kasan: Increase stack size for KASAN_EXTRA
scsi: megaraid: fix out-of-bound array accesses mm/memblock.c: skip kmemleak for kasan_init()
Qu Wenruo (1):
btrfs: volumes: Make sure there is no overlap of dev extents at mount time
Quentin Monnet (1):
selftests/bpf: enable (uncomment) all tests in test_libbpf.sh
Raghuram Hegde (1):
Bluetooth: btusb: Add support for Intel bluetooth device 8087:0029
Reinette Chatre (1):
x86/resctrl: Fix rdt_find_domain() return value and checks
Sergey Matyukevich (1):
qtnfmac: fix error handling in control path
Sergey Senozhatsky (1):
tty/serial: do not free trasnmit buffer page under port lock
Shannon Nelson (1):
ixgbe: allow IPsec Tx offload in VEPA mode
Stefano Brivio (1):
netfilter: ipset: Allow matching on destination MAC address for mac and ipmac sets
Stephan Günther (1):
scsi: mpt3sas: fix memory ordering on 64bit writes
Suraj Jitindar Singh (2):
KVM: PPC: Book3S HV: Align gfn to L1 page size when inserting nest-rmap entry
KVM: PPC: Book3S HV: Apply combination of host and l1 pte rc for nested guest
Taehee Yoo (3):
netfilter: ipt_CLUSTERIP: check MAC address when duplicate config is set
netfilter: ipt_CLUSTERIP: remove wrong WARN_ON_ONCE in netns exit routine
netfilter: ipt_CLUSTERIP: fix deadlock in netns exit routine
Takashi Sakamoto (2):
ALSA: oxfw: add support for APOGEE duet FireWire
ALSA: bebob: fix model-id of unit for Apogee Ensemble
Trigger Huang (1):
drm/scheduler: Fix bad job be re-processed in TDR
Ville Syrjälä (1):
drm/atomic-helper: Complete fake_commit->flip_done potentially earlier
Vitaly Chikunov (1):
crypto: ecc - regularize scalar for scalar multiplication
Vivek Gautam (1):
media: venus: core: Set dma maximum segment size
Will Deacon (1):
arm64: Fix minor issues with the dcache_by_line_op macro
Yang Yingliang (1):
ipmi: fix use-after-free of user->release_barrier.rda
Yangtao Li (1):
clocksource/drivers/integrator-ap: Add missing of_node_put()
Yanjiang Jin (1):
scsi: smartpqi: call pqi_free_interrupts() in pqi_shutdown()
Yi-Hung Wei (1):
openvswitch: Fix IPv6 later frags parsing
Yoshihiro Shimoda (1):
usb: gadget: udc: renesas_usb3: add a safety connection way for forced_b_device
Yu Zhao (1):
ASoC: use dma_ops of parent device for acp_audio_dma
Zhi Chen (1):
ath10k: fix peer stats null pointer dereference
yupeng (1):
net: call sk_dst_reset when set SO_DONTROUTE
Greg KH
maintainerDocumentation/filesystems/proc.txt +3 -1
@@ -496,7 +496,9 @@ manner. The codes are the following: Note that there is no guarantee that every flag and associated mnemonic will be present in all further kernel releases. Things get changed, the flags may -be vanished or the reverse -- new added. +be vanished or the reverse -- new added. Interpretation of their meaning +might change in future as well. So each consumer of these flags has to +follow each specific kernel version for the exact semantic. This file is only present if the CONFIG_MMU kernel configuration option is enabled.
Makefile +8 -7
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 20 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = Shy Crocodile
@@ -1035,6 +1035,8 @@ ifdef CONFIG_GDB_SCRIPTS endif +$(call if_changed,link-vmlinux) +targets := vmlinux + # Build samples along the rest of the kernel. This needs headers_install. ifdef CONFIG_SAMPLES vmlinux-dirs += samples
@@ -1753,13 +1755,12 @@ quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \ $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*) -# read all saved command lines -cmd_files := $(wildcard .*.cmd) +# read saved command lines for existing targets +existing-targets := $(wildcard $(sort $(targets))) -ifneq ($(cmd_files),) - $(cmd_files): ; # Do not try to update included dependency files - include $(cmd_files) -endif +cmd_files := $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd) +$(cmd_files): ; # Do not try to update included dependency files +-include $(cmd_files) endif # ifeq ($(config-targets),1) endif # ifeq ($(mixed-targets),1)
arch/arm64/Makefile +1 -1
@@ -18,7 +18,7 @@ ifeq ($(CONFIG_RELOCATABLE), y) # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour # for relative relocs, since this leads to better Image compression # with the relocation offsets always being zero. -LDFLAGS_vmlinux += -pie -shared -Bsymbolic \ +LDFLAGS_vmlinux += -shared -Bsymbolic -z notext -z norelro \ $(call ld-option, --no-apply-dynamic-relocs) endif
arch/arm64/include/asm/assembler.h +18 -12
@@ -377,27 +377,33 @@ alternative_endif* size: size of the region * Corrupts: kaddr, size, tmp1, tmp2 */ + .macro __dcache_op_workaround_clean_cache, op, kaddr +alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE + dc \op, \kaddr +alternative_else + dc civac, \kaddr +alternative_endif + .endm + .macro dcache_by_line_op op, domain, kaddr, size, tmp1, tmp2 dcache_line_size \tmp1, \tmp2 add \size, \kaddr, \size sub \tmp2, \tmp1, #1 bic \kaddr, \kaddr, \tmp2 9998: - .if (\op == cvau || \op == cvac) -alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE - dc \op, \kaddr -alternative_else - dc civac, \kaddr -alternative_endif - .elseif (\op == cvap) -alternative_if ARM64_HAS_DCPOP - sys 3, c7, c12, 1, \kaddr // dc cvap -alternative_else - dc cvac, \kaddr -alternative_endif + .ifc \op, cvau + __dcache_op_workaround_clean_cache \op, \kaddr + .else + .ifc \op, cvac + __dcache_op_workaround_clean_cache \op, \kaddr + .else + .ifc \op, cvap + sys 3, c7, c12, 1, \kaddr // dc cvap .else dc \op, \kaddr .endif + .endif + .endif add \kaddr, \kaddr, \tmp1 cmp \kaddr, \size b.lo 9998b
arch/arm64/include/asm/memory.h +6 -1
@@ -67,12 +67,17 @@/* * KASAN requires 1/8th of the kernel virtual address space for the shadow * region. KASAN can bloat the stack significantly, so double the (minimum) -* stack size when KASAN is in use. +* stack size when KASAN is in use, and then double it again if KASAN_EXTRA is +* on. */ #ifdef CONFIG_KASAN #define KASAN_SHADOW_SCALE_SHIFT 3#define KASAN_SHADOW_SIZE (UL(1) << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) +#ifdef CONFIG_KASAN_EXTRA +#define KASAN_THREAD_SHIFT 2 +#else #define KASAN_THREAD_SHIFT 1 +#endif /* CONFIG_KASAN_EXTRA */ #else #define KASAN_SHADOW_SIZE (0)#define KASAN_THREAD_SHIFT 0
arch/arm64/kernel/cpu_errata.c +3 -3
@@ -135,7 +135,7 @@ static void __install_bp_hardening_cb(bp_hardening_cb_t fn,const char *hyp_vecs_start, const char *hyp_vecs_end) { - static DEFINE_SPINLOCK(bp_lock); + static DEFINE_RAW_SPINLOCK(bp_lock);int cpu, slot =-1 ;/*
@@ -147,7 +147,7 @@ static void __install_bp_hardening_cb(bp_hardening_cb_t fn,return ; } -spin_lock (&bp_lock); +raw_spin_lock (&bp_lock);for_each_possible_cpu (cpu) {if (per_cpu (bp_hardening_data.fn, cpu) == fn) { slot =per_cpu (bp_hardening_data.hyp_vectors_slot, cpu);
@@ -163,7 +163,7 @@ static void __install_bp_hardening_cb(bp_hardening_cb_t fn,__this_cpu_write (bp_hardening_data.hyp_vectors_slot, slot);__this_cpu_write (bp_hardening_data.fn, fn); - spin_unlock(&bp_lock); + raw_spin_unlock(&bp_lock); }#else #define __smccc_workaround_1_smc_start NULL
arch/arm64/kernel/perf_event.c +1 -0
@@ -1274,6 +1274,7 @@ static struct platform_driver armv8_pmu_driver = { .driver = { .name = ARMV8_PMU_PDEV_NAME, .of_match_table = armv8_pmu_of_device_ids, + .suppress_bind_attrs = true, }, .probe = armv8_pmu_device_probe, };
arch/arm64/kernel/vmlinux.lds.S +5 -4
@@ -99,7 +99,8 @@ SECTIONS *(.discard) *(.discard.*) *(.interp .dynamic) - *(.dynsym .dynstr .hash) + *(.dynsym .dynstr .hash .gnu.hash) + *(.eh_frame) } . = KIMAGE_VADDR + TEXT_OFFSET;
@@ -192,12 +193,12 @@ SECTIONS PERCPU_SECTION(L1_CACHE_BYTES) - .rela : ALIGN(8) { + .rela.dyn : ALIGN(8) { *(.rela .rela*) } - __rela_offset = ABSOLUTE(ADDR(.rela) - KIMAGE_VADDR); - __rela_size = SIZEOF(.rela); + __rela_offset = ABSOLUTE(ADDR(.rela.dyn) - KIMAGE_VADDR); + __rela_size = SIZEOF(.rela.dyn); . = ALIGN(SEGMENT_ALIGN); __initdata_end = .;
arch/arm64/mm/cache.S +3 -0
@@ -212,6 +212,9 @@ ENDPROC(__dma_clean_area) * - size - size in question */ ENTRY(__clean_dcache_area_pop) + alternative_if_not ARM64_HAS_DCPOP + b __clean_dcache_area_poc + alternative_else_nop_endif dcache_by_line_op cvap, sy, x0, x1, x2, x3 ret ENDPIPROC(__clean_dcache_area_pop)
arch/arm64/mm/kasan_init.c +1 -1
@@ -39,7 +39,7 @@ static phys_addr_t __init kasan_alloc_zeroed_page(int node) {void *p =memblock_alloc_try_nid (PAGE_SIZE ,PAGE_SIZE ,__pa (MAX_DMA_ADDRESS ), -MEMBLOCK_ALLOC_ACCESSIBLE , node); +MEMBLOCK_ALLOC_KASAN , node);return __pa (p); }
arch/mips/Kconfig +3 -0
@@ -794,6 +794,7 @@ config SIBYTE_SWARM select SYS_SUPPORTS_HIGHMEM select SYS_SUPPORTS_LITTLE_ENDIAN select ZONE_DMA32 if 64BIT + select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI config SIBYTE_LITTLESUR bool "Sibyte BCM91250C2-LittleSur"
@@ -814,6 +815,7 @@ config SIBYTE_SENTOSA select SYS_HAS_CPU_SB1 select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN + select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI config SIBYTE_BIGSUR bool "Sibyte BCM91480B-BigSur"
@@ -826,6 +828,7 @@ config SIBYTE_BIGSUR select SYS_SUPPORTS_HIGHMEM select SYS_SUPPORTS_LITTLE_ENDIAN select ZONE_DMA32 if 64BIT + select SWIOTLB if ARCH_DMA_ADDR_T_64BIT && PCI config SNI_RM bool "SNI RM200/300/400"
arch/mips/include/asm/cpu.h +2 -1
@@ -248,8 +248,9 @@#define PRID_REV_LOONGSON3A_R1 0x0005#define PRID_REV_LOONGSON3B_R1 0x0006#define PRID_REV_LOONGSON3B_R2 0x0007 -#define PRID_REV_LOONGSON3A_R2 0x0008 +#define PRID_REV_LOONGSON3A_R2_0 0x0008#define PRID_REV_LOONGSON3A_R3_0 0x0009 +#define PRID_REV_LOONGSON3A_R2_1 0x000c#define PRID_REV_LOONGSON3A_R3_1 0x000d/*
arch/mips/include/asm/mach-loongson64/kernel-entry-init.h +2 -2
@@ -31,7 +31,7 @@/* Enable STFill Buffer */ mfc0 t0,CP0_PRID andi t0, (PRID_IMP_MASK | PRID_REV_MASK) - slti t0, (PRID_IMP_LOONGSON_64 | PRID_REV_LOONGSON3A_R2) + slti t0, (PRID_IMP_LOONGSON_64 | PRID_REV_LOONGSON3A_R2_0) bnez t0, 1f mfc0 t0, CP0_CONFIG6 or t0, 0x100
@@ -60,7 +60,7 @@/* Enable STFill Buffer */ mfc0 t0,CP0_PRID andi t0, (PRID_IMP_MASK | PRID_REV_MASK) - slti t0, (PRID_IMP_LOONGSON_64 | PRID_REV_LOONGSON3A_R2) + slti t0, (PRID_IMP_LOONGSON_64 | PRID_REV_LOONGSON3A_R2_0) bnez t0, 1f mfc0 t0, CP0_CONFIG6 or t0, 0x100
arch/mips/kernel/cpu-probe.c +2 -1
@@ -1843,7 +1843,8 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)switch (c->processor_id &PRID_IMP_MASK ) {case PRID_IMP_LOONGSON_64 :/* Loongson-2/3 */ switch (c->processor_id &PRID_REV_MASK ) { -case PRID_REV_LOONGSON3A_R2 : +case PRID_REV_LOONGSON3A_R2_0 : +case PRID_REV_LOONGSON3A_R2_1 : c->cputype =CPU_LOONGSON3 ; __cpu_name[cpu] ="ICT Loongson-3" ;set_elf_platform (cpu,"loongson3a" );
arch/mips/kernel/idle.c +1 -1
@@ -183,7 +183,7 @@ void __init check_wait(void) cpu_wait = r4k_wait;break ;case CPU_LOONGSON3 : -if ((c->processor_id &PRID_REV_MASK ) >=PRID_REV_LOONGSON3A_R2 ) +if ((c->processor_id &PRID_REV_MASK ) >=PRID_REV_LOONGSON3A_R2_0 ) cpu_wait = r4k_wait;break ;
arch/mips/loongson64/common/env.c +2 -1
@@ -197,7 +197,8 @@ void __init prom_init_env(void) cpu_clock_freq =797000000 ;break ;case PRID_REV_LOONGSON3A_R1 : -case PRID_REV_LOONGSON3A_R2 : +case PRID_REV_LOONGSON3A_R2_0 : +case PRID_REV_LOONGSON3A_R2_1 :case PRID_REV_LOONGSON3A_R3_0 :case PRID_REV_LOONGSON3A_R3_1 : cpu_clock_freq =900000000 ;
arch/mips/loongson64/loongson-3/smp.c +2 -1
@@ -682,7 +682,8 @@ void play_dead(void) play_dead_at_ckseg1 = (void *)CKSEG1ADDR ((unsigned long )loongson3a_r1_play_dead);break ; -case PRID_REV_LOONGSON3A_R2 : +case PRID_REV_LOONGSON3A_R2_0 : +case PRID_REV_LOONGSON3A_R2_1 :case PRID_REV_LOONGSON3A_R3_0 :case PRID_REV_LOONGSON3A_R3_1 : play_dead_at_ckseg1 =
arch/mips/mm/c-r4k.c +1 -1
@@ -1381,7 +1381,7 @@ static void probe_pcache(void) c->dcache.ways * c->dcache.linesz; c->dcache.waybit =0 ; -if ((prid &PRID_REV_MASK ) >=PRID_REV_LOONGSON3A_R2 ) +if ((prid &PRID_REV_MASK ) >=PRID_REV_LOONGSON3A_R2_0 ) c->options |=MIPS_CPU_PREFETCH ;break ;
arch/mips/sibyte/common/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-y := cfe.o +obj-$(CONFIG_SWIOTLB) += dma.o obj-$(CONFIG_SIBYTE_BUS_WATCHER) += bus_watcher.o obj-$(CONFIG_SIBYTE_CFE_CONSOLE) += cfe_console.o obj-$(CONFIG_SIBYTE_TBPROF) += sb_tbprof.o
arch/mips/sibyte/common/dma.c new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* DMA support for Broadcom SiByte platforms. +* +* Copyright (c) 2018 Maciej W. Rozycki +*/ + +#include <linux/swiotlb.h> +#include <asm/bootinfo.h> + +void __init plat_swiotlb_setup (void ) +{ +swiotlb_init (1 ); +}
arch/powerpc/kvm/book3s_hv_nested.c +5 -0
@@ -1220,6 +1220,8 @@ static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu,return ret; shift =kvmppc_radix_level_to_shift (level); } +/* Align gfn to the start of the page */ + gfn = (gpa & ~((1UL << shift) -1 )) >>PAGE_SHIFT ;/* 3. Compute the pte we need to insert for nest_gpa -> host r_addr */
@@ -1227,6 +1229,9 @@ static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu, perm |= gpte.may_read ?0UL : _PAGE_READ; perm |= gpte.may_write ?0UL : _PAGE_WRITE; perm |= gpte.may_execute ?0UL : _PAGE_EXEC; +/* Only set accessed/dirty (rc) bits if set in host and l1 guest ptes */ + perm |= (gpte.rc & _PAGE_ACCESSED) ?0UL : _PAGE_ACCESSED; + perm |= ((gpte.rc & _PAGE_DIRTY) && writing) ?0UL : _PAGE_DIRTY; pte =__pte (pte_val (pte) & ~perm);/* What size pte can we insert? */
arch/powerpc/xmon/xmon.c +14 -4
@@ -75,6 +75,9 @@ static int xmon_gate;#define xmon_owner 0#endif /* CONFIG_SMP */ +#ifdef CONFIG_PPC_PSERIES +static int set_indicator_token =RTAS_UNKNOWN_SERVICE ; +#endif static unsigned long in_xmon__read_mostly =0 ;static int xmon_on =IS_ENABLED (CONFIG_XMON_DEFAULT );
@@ -358,7 +361,6 @@ static inline void disable_surveillance(void)#ifdef CONFIG_PPC_PSERIES /* Since this can't be a module, args should end up below 4GB. */ static struct rtas_args args; -int token;/* * At this point we have got all the cpus we can into
@@ -367,11 +369,11 @@ static inline void disable_surveillance(void)* If we did try to take rtas.lock there would be a * real possibility of deadlock. */ - token =rtas_token ("set-indicator" ); -if (token ==RTAS_UNKNOWN_SERVICE ) +if (set_indicator_token ==RTAS_UNKNOWN_SERVICE )return ; -rtas_call_unlocked (&args, token,3 ,1 ,NULL ,SURVEILLANCE_TOKEN ,0 ,0 ); +rtas_call_unlocked (&args, set_indicator_token,3 ,1 ,NULL , +SURVEILLANCE_TOKEN ,0 ,0 );#endif /* CONFIG_PPC_PSERIES */ }
@@ -3688,6 +3690,14 @@ static void xmon_init(int enable) __debugger_iabr_match = xmon_iabr_match; __debugger_break_match = xmon_break_match; __debugger_fault_handler = xmon_fault_handler; + +#ifdef CONFIG_PPC_PSERIES +/* +* Get the token here to avoid trying to get a lock +* during the crash, causing a deadlock. +*/ + set_indicator_token =rtas_token ("set-indicator" ); +#endif }else { __debugger =NULL ; __debugger_ipi =NULL ;
arch/x86/include/asm/traps.h +3 -3
@@ -104,9 +104,9 @@ extern int panic_on_unrecovered_nmi;void math_emulate (struct math_emu_info *);#ifndef CONFIG_X86_32 -asmlinkage void smp_thermal_interrupt(void); -asmlinkage void smp_threshold_interrupt(void); -asmlinkage void smp_deferred_error_interrupt(void); +asmlinkage void smp_thermal_interrupt(struct pt_regs *regs); +asmlinkage void smp_threshold_interrupt(struct pt_regs *regs); +asmlinkage void smp_deferred_error_interrupt(struct pt_regs *regs);#endif extern void ist_enter (struct pt_regs *regs);
arch/x86/kernel/cpu/intel_rdt.c +1 -1
@@ -421,7 +421,7 @@ struct rdt_domain *rdt_find_domain(struct rdt_resource *r, int id,struct list_head *l;if (id <0 ) -return ERR_PTR (id); +return ERR_PTR (-ENODEV );list_for_each (l, &r->domains) { d = list_entry(l, struct rdt_domain, list);
arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +1 -1
@@ -467,7 +467,7 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) r = &rdt_resources_all[resid]; d =rdt_find_domain (r, domid,NULL ); -if (!d) { +if (IS_ERR_OR_NULL (d)) { ret = -ENOENT ; goto out; }
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +1 -1
@@ -1029,7 +1029,7 @@ static int rdt_cdp_peer_get(struct rdt_resource *r, struct rdt_domain *d,* peer RDT CDP resource. Hence the WARN. */ _d_cdp =rdt_find_domain (_r_cdp, d->id,NULL ); -if (WARN_ON (!_d_cdp)) { +if (WARN_ON (IS_ERR_OR_NULL (_d_cdp))) { _r_cdp =NULL ; ret = -EINVAL ; }
arch/x86/kernel/cpu/mcheck/mce_amd.c +3 -2
@@ -23,6 +23,7 @@#include <linux/string.h> #include <asm/amd_nb.h> +#include <asm/traps.h> #include <asm/apic.h> #include <asm/mce.h> #include <asm/msr.h>
@@ -99,7 +100,7 @@ static u32 smca_bank_addrs[MAX_NR_BANKS][NR_BLOCKS] __ro_after_init = [0 ... MAX_NR_BANKS - 1] = { [0 ... NR_BLOCKS - 1] = -1 } }; -const char *smca_get_name (enum smca_bank_types t) +static const char *smca_get_name (enum smca_bank_types t) {if (t >=N_SMCA_BANK_TYPES )return NULL ;
@@ -824,7 +825,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc)mce_log (&m); } -asmlinkage __visible void __irq_entry smp_deferred_error_interrupt(void) +asmlinkage __visible void __irq_entry smp_deferred_error_interrupt(struct pt_regs *regs) {entering_irq ();trace_deferred_error_apic_entry (DEFERRED_ERROR_VECTOR );
arch/x86/kernel/cpu/mcheck/therm_throt.c +2 -1
@@ -25,6 +25,7 @@#include <linux/cpu.h> #include <asm/processor.h> +#include <asm/traps.h> #include <asm/apic.h> #include <asm/mce.h> #include <asm/msr.h>
@@ -390,7 +391,7 @@ static void unexpected_thermal_interrupt(void)static void (*smp_thermal_vector)(void ) = unexpected_thermal_interrupt; -asmlinkage __visible void __irq_entry smp_thermal_interrupt(struct pt_regs *r) +asmlinkage __visible void __irq_entry smp_thermal_interrupt(struct pt_regs *regs) {entering_irq ();trace_thermal_apic_entry (THERMAL_APIC_VECTOR );
arch/x86/kernel/cpu/mcheck/threshold.c +2 -1
@@ -6,6 +6,7 @@#include <linux/kernel.h> #include <asm/irq_vectors.h> +#include <asm/traps.h> #include <asm/apic.h> #include <asm/mce.h> #include <asm/trace/irq_vectors.h>
@@ -18,7 +19,7 @@ static void default_threshold_interrupt(void)void (*mce_threshold_vector)(void ) = default_threshold_interrupt; -asmlinkage __visible void __irq_entry smp_threshold_interrupt(void) +asmlinkage __visible void __irq_entry smp_threshold_interrupt(struct pt_regs *regs) {entering_irq ();trace_threshold_apic_entry (THRESHOLD_APIC_VECTOR );
arch/x86/kernel/smpboot.c +1 -1
@@ -1347,7 +1347,7 @@ void __init calculate_max_logical_packages(void)* extrapolate the boot cpu's data to all packages. */ ncpus =cpu_data (0 ).booted_cores *topology_max_smt_threads (); - __max_logical_packages =DIV_ROUND_UP (nr_cpu_ids, ncpus); + __max_logical_packages =DIV_ROUND_UP (total_cpus, ncpus);pr_info ("Max logical packages: %u\n" , __max_logical_packages); }
crypto/ecc.c +12 -4
@@ -842,15 +842,23 @@ static void xycz_add_c(u64 *x1, u64 *y1, u64 *x2, u64 *y2, u64 *curve_prime,static void ecc_point_mult (struct ecc_point *result,const struct ecc_point *point,const u64 *scalar, -u64 *initial_z,u64 *curve_prime, +u64 *initial_z,const struct ecc_curve *curve,unsigned int ndigits) {/* R0 and R1 */ u64 rx[2 ][ECC_MAX_DIGITS ];u64 ry[2 ][ECC_MAX_DIGITS ];u64 z[ECC_MAX_DIGITS ]; +u64 sk[2 ][ECC_MAX_DIGITS ]; +u64 *curve_prime = curve->p;int i, nb; -int num_bits =vli_num_bits (scalar, ndigits); +int num_bits; +int carry; + + carry =vli_add (sk[0 ], scalar, curve->n, ndigits); +vli_add (sk[1 ], sk[0 ], curve->n, ndigits); + scalar = sk[!carry]; + num_bits =sizeof (u64) * ndigits *8 +1 ;vli_set (rx[1 ], point->x, ndigits);vli_set (ry[1 ], point->y, ndigits);
@@ -1004,7 +1012,7 @@ int ecc_make_pub_key(unsigned int curve_id, unsigned int ndigits, goto out; } -ecc_point_mult (pk, &curve->g, priv,NULL , curve->p, ndigits); +ecc_point_mult (pk, &curve->g, priv,NULL , curve, ndigits);if (ecc_point_is_zero (pk)) { ret = -EAGAIN ; goto err_free_point;
@@ -1090,7 +1098,7 @@ int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits, goto err_alloc_product; } -ecc_point_mult (product, pk, priv, rand_z, curve->p, ndigits); +ecc_point_mult (product, pk, priv, rand_z, curve, ndigits);ecc_swap_digits (product->x, secret, ndigits);
drivers/base/bus.c +5 -2
@@ -31,6 +31,9 @@ static struct kset *system_kset;#define to_drv_attr (_attr) container_of(_attr, struct driver_attribute, attr) +#define DRIVER_ATTR_IGNORE_LOCKDEP (_name, _mode, _show, _store) \ + struct driver_attribute driver_attr_##_name = \ + __ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store)static int __must_check bus_rescan_devices_helper (struct device *dev,void *data);
@@ -195,7 +198,7 @@ static ssize_t unbind_store(struct device_driver *drv, const char *buf,bus_put (bus);return err; } -static DRIVER_ATTR_WO (unbind); +static DRIVER_ATTR_IGNORE_LOCKDEP(unbind, S_IWUSR, NULL, unbind_store);/* * Manually attach a device to a driver.
@@ -231,7 +234,7 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf,bus_put (bus);return err; } -static DRIVER_ATTR_WO (bind); +static DRIVER_ATTR_IGNORE_LOCKDEP(bind, S_IWUSR, NULL, bind_store);static ssize_t show_drivers_autoprobe (struct bus_type *bus,char *buf) {
drivers/bluetooth/btusb.c +37 -35
102 lines not on this page · raw message
drivers/char/ipmi/ipmi_msghandler.c +100 -73
307 lines not on this page · raw message
drivers/char/ipmi/ipmi_ssif.c +17 -8
@@ -632,8 +632,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,/* Remove the multi-part read marker. */ len -=2 ; + data +=2 ;for (i =0 ; i < len; i++) - ssif_info->data[i] = data[i+2 ]; + ssif_info->data[i] = data[i]; ssif_info->multi_len = len; ssif_info->multi_pos =1 ;
@@ -661,8 +662,19 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, } blocknum = data[0 ]; + len--; + data++; + +if (blocknum !=0xff && len !=31 ) { +/* All blocks but the last must have 31 data bytes. */ + result = -EIO ; +if (ssif_info->ssif_debug &SSIF_DEBUG_MSG ) +pr_info ("Received middle message <31\n" ); -if (ssif_info->multi_len + len -1 >IPMI_MAX_MSG_LENGTH ) { + goto continue_op; + } + +if (ssif_info->multi_len + len >IPMI_MAX_MSG_LENGTH ) {/* Received message too big, abort the operation. */ result = -E2BIG ;if (ssif_info->ssif_debug &SSIF_DEBUG_MSG )
@@ -671,16 +683,14 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, goto continue_op; } -/* Remove the blocknum from the data. */ - len--;for (i =0 ; i < len; i++) - ssif_info->data[i + ssif_info->multi_len] = data[i +1 ]; + ssif_info->data[i + ssif_info->multi_len] = data[i]; ssif_info->multi_len += len;if (blocknum ==0xff ) {/* End of read */ len = ssif_info->multi_len; data = ssif_info->data; - }else if (blocknum +1 != ssif_info->multi_pos) { + }else if (blocknum != ssif_info->multi_pos) {/* * Out of sequence block, just abort. Block * numbers start at zero for the second block,
@@ -707,6 +717,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, } } + continue_op:if (result <0 ) {ssif_inc_stat (ssif_info, receive_errors); }else {
@@ -714,8 +725,6 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,ssif_inc_stat (ssif_info, received_message_parts); } - - continue_op:if (ssif_info->ssif_debug &SSIF_DEBUG_STATE )pr_info ("DONE 1: state = %d, result=%d\n" , ssif_info->ssif_state, result);
drivers/clk/imx/clk-busy.c +1 -1
@@ -154,7 +154,7 @@ static const struct clk_ops clk_busy_mux_ops = {struct clk *imx_clk_busy_mux (const char *name,void __iomem *reg,u8 shift,u8 width,void __iomem *busy_reg,u8 busy_shift, -const char **parent_names,int num_parents) +const char *const *parent_names,int num_parents) {struct clk_busy_mux *busy;struct clk *clk;
drivers/clk/imx/clk-fixup-mux.c +1 -1
@@ -70,7 +70,7 @@ static const struct clk_ops clk_fixup_mux_ops = { };struct clk *imx_clk_fixup_mux (const char *name,void __iomem *reg, -u8 shift,u8 width,const char **parents, +u8 shift,u8 width,const char *const *parents,int num_parents,void (*fixup)(u32 *val)) {struct clk_fixup_mux *fixup_mux;
drivers/clk/imx/clk-imx6q.c +5 -1
@@ -508,8 +508,12 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)* lvds1_gate and lvds2_gate are pseudo-gates. Both can be * independently configured as clock inputs or outputs. We treat * the "output_enable" bit as a gate, even though it's really just -* enabling clock output. +* enabling clock output. Initially the gate bits are cleared, as +* otherwise the exclusive configuration gets locked in the setup done +* by software running before the clock driver, with no way to change +* it. */ +writel (readl (base +0x160 ) & ~0x3c00 , base +0x160 ); clk[IMX6QDL_CLK_LVDS1_GATE ] =imx_clk_gate_exclusive ("lvds1_gate" ,"lvds1_sel" , base +0x160 ,10 ,BIT (12 )); clk[IMX6QDL_CLK_LVDS2_GATE ] =imx_clk_gate_exclusive ("lvds2_gate" ,"lvds2_sel" , base +0x160 ,11 ,BIT (13 ));
drivers/clk/imx/clk.h +11 -7
@@ -63,14 +63,14 @@ struct clk *imx_clk_busy_divider(const char *name, const char *parent_name,struct clk *imx_clk_busy_mux (const char *name,void __iomem *reg,u8 shift,u8 width,void __iomem *busy_reg,u8 busy_shift, -const char **parent_names,int num_parents); +const char *const *parent_names,int num_parents);struct clk *imx_clk_fixup_divider (const char *name,const char *parent,void __iomem *reg,u8 shift,u8 width,void (*fixup)(u32 *val));struct clk *imx_clk_fixup_mux (const char *name,void __iomem *reg, -u8 shift,u8 width,const char **parents, +u8 shift,u8 width,const char *const *parents,int num_parents,void (*fixup)(u32 *val));static inline struct clk *imx_clk_fixed (const char *name,int rate)
@@ -79,7 +79,8 @@ static inline struct clk *imx_clk_fixed(const char *name, int rate) }static inline struct clk *imx_clk_mux_ldb (const char *name,void __iomem *reg, -u8 shift,u8 width,const char **parents,int num_parents) +u8 shift,u8 width,const char *const *parents, +int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, reg,
@@ -199,7 +200,8 @@ static inline struct clk *imx_clk_gate4(const char *name, const char *parent, }static inline struct clk *imx_clk_mux (const char *name,void __iomem *reg, -u8 shift,u8 width,const char **parents,int num_parents) +u8 shift,u8 width,const char *const *parents, +int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT, reg, shift,
@@ -207,7 +209,8 @@ static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, }static inline struct clk *imx_clk_mux2 (const char *name,void __iomem *reg, -u8 shift,u8 width,const char **parents,int num_parents) +u8 shift,u8 width,const char *const *parents, +int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE,
@@ -215,8 +218,9 @@ static inline struct clk *imx_clk_mux2(const char *name, void __iomem *reg, }static inline struct clk *imx_clk_mux_flags (const char *name, -void __iomem *reg,u8 shift,u8 width,const char **parents, -int num_parents,unsigned long flags) +void __iomem *reg,u8 shift,u8 width, +const char *const *parents,int num_parents, +unsigned long flags) { return clk_register_mux(NULL, name, parents, num_parents, flags | CLK_SET_RATE_NO_REPARENT, reg, shift, width, 0,
drivers/clk/meson/meson8b.c +13 -7
@@ -42,6 +42,11 @@ static const struct pll_params_table sys_pll_params_table[] = {PLL_PARAMS (62 ,1 ),PLL_PARAMS (63 ,1 ),PLL_PARAMS (64 ,1 ), +PLL_PARAMS (65 ,1 ), +PLL_PARAMS (66 ,1 ), +PLL_PARAMS (67 ,1 ), +PLL_PARAMS (68 ,1 ), + PLL_PARAMS(84, 1), { /* sentinel */ }, };
@@ -579,13 +584,14 @@ static struct clk_fixed_factor meson8b_cpu_div3 = { };static const struct clk_div_table cpu_scale_table[] = { - { .val =2 , .div =4 }, - { .val =3 , .div =6 }, - { .val =4 , .div =8 }, - { .val =5 , .div =10 }, - { .val =6 , .div =12 }, - { .val =7 , .div =14 }, - { .val =8 , .div =16 }, + { .val =1 , .div =4 }, + { .val =2 , .div =6 }, + { .val =3 , .div =8 }, + { .val =4 , .div =10 }, + { .val =5 , .div =12 }, + { .val =6 , .div =14 }, + { .val =7 , .div =16 }, + { .val =8 , .div =18 }, {/* sentinel */ }, };
drivers/clocksource/timer-integrator-ap.c +16 -9
@@ -181,8 +181,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)int irq;struct clk *clk;unsigned long rate; -struct device_node *pri_node; -struct device_node *sec_node; +struct device_node *alias_node; base =of_io_request_and_map (node,0 ,"integrator-timer" );if (IS_ERR (base))
@@ -204,7 +203,18 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)return err; } - pri_node =of_find_node_by_path (path); + alias_node =of_find_node_by_path (path); + +/* +* The pointer is used as an identifier not as a pointer, we +* can drop the refcount on the of__node immediately after +* getting it. +*/ +of_node_put (alias_node); + +if (node == alias_node) +/* The primary timer lacks IRQ, use as clocksource */ +return integrator_clocksource_init (rate, base); err =of_property_read_string (of_aliases,"arm,timer-secondary" , &path);
@@ -213,14 +223,11 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)return err; } + alias_node =of_find_node_by_path (path); - sec_node =of_find_node_by_path (path); - -if (node == pri_node) -/* The primary timer lacks IRQ, use as clocksource */ -return integrator_clocksource_init (rate, base); +of_node_put (alias_node); -if (node == sec_node) { +if (node == alias_node) {/* The secondary timer will drive the clock event */ irq =irq_of_parse_and_map (node,0 );return integrator_clockevent_init (rate, base, irq);
drivers/cpuidle/cpuidle-pseries.c +7 -1
@@ -247,7 +247,13 @@ static int pseries_idle_probe(void)return -ENODEV ;if (firmware_has_feature (FW_FEATURE_SPLPAR )) { -if (lppaca_shared_proc (get_lppaca ())) { +/* +* Use local_paca instead of get_lppaca() since +* preemption is not disabled, and it is not required in +* fact, since lppaca_ptr does not need to be the value +* associated to the current CPU, it can be from any CPU. +*/ +if (lppaca_shared_proc (local_paca->lppaca_ptr)) { cpuidle_state_table = shared_states; max_idle_state =ARRAY_SIZE (shared_states); }else {
drivers/firmware/efi/libstub/Makefile +4 -1
@@ -9,7 +9,10 @@ cflags-$(CONFIG_X86_32) := -march=i386 cflags-$(CONFIG_X86_64) := -mcmodel=small cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ -O2 \ -fPIC -fno-strict-aliasing -mno-red-zone \ - -mno-mmx -mno-sse -fshort-wchar + -mno-mmx -mno-sse -fshort-wchar \ + -Wno-pointer-sign \ + $(call cc-disable-warning, address-of-packed-member) \ + $(call cc-disable-warning, gnu) # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly # disable the stackleak plugin
drivers/fpga/altera-cvp.c +24 -10
@@ -466,14 +466,6 @@ static int altera_cvp_probe(struct pci_dev *pdev,if (ret) goto err_unmap; - ret =driver_create_file (&altera_cvp_driver.driver, - &driver_attr_chkcfg); -if (ret) { -dev_err (&pdev->dev,"Can't create sysfs chkcfg file\n" ); -fpga_mgr_unregister (mgr); - goto err_unmap; - } -return 0 ; err_unmap:
@@ -491,7 +483,6 @@ static void altera_cvp_remove(struct pci_dev *pdev)struct altera_cvp_conf *conf = mgr->priv;u16 cmd; -driver_remove_file (&altera_cvp_driver.driver, &driver_attr_chkcfg);fpga_mgr_unregister (mgr);pci_iounmap (pdev, conf->map);pci_release_region (pdev,CVP_BAR );
@@ -500,7 +491,30 @@ static void altera_cvp_remove(struct pci_dev *pdev)pci_write_config_word (pdev,PCI_COMMAND , cmd); } -module_pci_driver (altera_cvp_driver); +static int __init altera_cvp_init (void ) +{ +int ret; + + ret =pci_register_driver (&altera_cvp_driver); +if (ret) +return ret; + + ret =driver_create_file (&altera_cvp_driver.driver, + &driver_attr_chkcfg); +if (ret) +pr_warn ("Can't create sysfs chkcfg file\n" ); + +return 0 ; +} + +static void __exit altera_cvp_exit(void) +{ +driver_remove_file (&altera_cvp_driver.driver, &driver_attr_chkcfg); +pci_unregister_driver (&altera_cvp_driver); +} + +module_init (altera_cvp_init); +module_exit (altera_cvp_exit);MODULE_LICENSE ("GPL v2" );MODULE_AUTHOR ("Anatolij Gustschin <[email protected]>" );
drivers/gpio/gpio-pl061.c +10 -11
@@ -54,6 +54,7 @@ struct pl061 {void __iomem *base;struct gpio_chip gc; +struct irq_chip irq_chip;int parent_irq;#ifdef CONFIG_PM
@@ -281,15 +282,6 @@ static int pl061_irq_set_wake(struct irq_data *d, unsigned int state)return irq_set_irq_wake (pl061->parent_irq, state); } -static struct irq_chip pl061_irqchip = { - .name ="pl061" , - .irq_ack = pl061_irq_ack, - .irq_mask = pl061_irq_mask, - .irq_unmask = pl061_irq_unmask, - .irq_set_type = pl061_irq_type, - .irq_set_wake = pl061_irq_set_wake, -}; -static int pl061_probe (struct amba_device *adev,const struct amba_id *id) {struct device *dev = &adev->dev;
@@ -328,6 +320,13 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)/* * irq_chip support */ + pl061->irq_chip.name =dev_name (dev); + pl061->irq_chip.irq_ack = pl061_irq_ack; + pl061->irq_chip.irq_mask = pl061_irq_mask; + pl061->irq_chip.irq_unmask = pl061_irq_unmask; + pl061->irq_chip.irq_set_type = pl061_irq_type; + pl061->irq_chip.irq_set_wake = pl061_irq_set_wake; +writeb (0 , pl061->base +GPIOIE );/* disable irqs */ irq = adev->irq[0 ];if (irq <0 ) {
@@ -336,14 +335,14 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) } pl061->parent_irq = irq; - ret =gpiochip_irqchip_add (&pl061->gc, &pl061_irqchip, + ret =gpiochip_irqchip_add (&pl061->gc, &pl061->irq_chip,0 , handle_bad_irq,IRQ_TYPE_NONE );if (ret) {dev_info (&adev->dev,"could not add irqchip\n" );return ret; } -gpiochip_set_chained_irqchip (&pl061->gc, &pl061_irqchip, +gpiochip_set_chained_irqchip (&pl061->gc, &pl061->irq_chip, irq, pl061_irq_handler);amba_set_drvdata (adev, pl061);
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +4 -4
@@ -116,16 +116,16 @@ static int uvd_v4_2_sw_init(void *handle)if (r)return r; - r =amdgpu_uvd_resume (adev); -if (r) -return r; - ring = &adev->uvd.inst->ring;sprintf (ring->name,"uvd" ); r =amdgpu_ring_init (adev, ring,512 , &adev->uvd.inst->irq,0 );if (r)return r; + r =amdgpu_uvd_resume (adev); +if (r) +return r; + r =amdgpu_uvd_entity_init (adev);return r;
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +4 -4
@@ -113,16 +113,16 @@ static int uvd_v5_0_sw_init(void *handle)if (r)return r; - r =amdgpu_uvd_resume (adev); -if (r) -return r; - ring = &adev->uvd.inst->ring;sprintf (ring->name,"uvd" ); r =amdgpu_ring_init (adev, ring,512 , &adev->uvd.inst->irq,0 );if (r)return r; + r =amdgpu_uvd_resume (adev); +if (r) +return r; + r =amdgpu_uvd_entity_init (adev);return r;
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +4 -4
@@ -416,16 +416,16 @@ static int uvd_v6_0_sw_init(void *handle)DRM_INFO ("UVD ENC is disabled\n" ); } - r =amdgpu_uvd_resume (adev); -if (r) -return r; - ring = &adev->uvd.inst->ring;sprintf (ring->name,"uvd" ); r =amdgpu_ring_init (adev, ring,512 , &adev->uvd.inst->irq,0 );if (r)return r; + r =amdgpu_uvd_resume (adev); +if (r) +return r; +if (uvd_v6_0_enc_support (adev)) {for (i =0 ; i < adev->uvd.num_enc_rings; ++i) { ring = &adev->uvd.inst->ring_enc[i];
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +4 -4
@@ -447,10 +447,6 @@ static int uvd_v7_0_sw_init(void *handle)DRM_INFO ("PSP loading UVD firmware\n" ); } - r =amdgpu_uvd_resume (adev); -if (r) -return r; -for (j =0 ; j < adev->uvd.num_uvd_inst; j++) {if (adev->uvd.harvest_config & (1 << j))continue ;
@@ -482,6 +478,10 @@ static int uvd_v7_0_sw_init(void *handle) } } + r =amdgpu_uvd_resume (adev); +if (r) +return r; + r =amdgpu_uvd_entity_init (adev);if (r)return r;
drivers/gpu/drm/amd/amdkfd/kfd_device.c +3 -2
@@ -688,6 +688,7 @@ void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry) {uint32_t patched_ihre[KFD_MAX_RING_ENTRY_SIZE ];bool is_patched = false; +unsigned long flags;if (!kfd->init_complete)return ;
@@ -697,7 +698,7 @@ void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry)return ; } -spin_lock (&kfd->interrupt_lock); +spin_lock_irqsave (&kfd->interrupt_lock, flags);if (kfd->interrupts_active && interrupt_is_wanted(kfd, ih_ring_entry,
@@ -706,7 +707,7 @@ void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry) is_patched ? patched_ihre : ih_ring_entry))queue_work (kfd->ih_wq, &kfd->interrupt_work); -spin_unlock (&kfd->interrupt_lock); +spin_unlock_irqrestore (&kfd->interrupt_lock, flags); }int kgd2kfd_quiesce_mm (struct mm_struct *mm)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c +5 -0
@@ -75,6 +75,11 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name)return -EINVAL ; } +if (!stream_state) { +DRM_ERROR ("No stream state for CRTC%d\n" , crtc->index); +return -EINVAL ; + } +/* When enabling CRC, we should also disable dithering. */ if (source ==AMDGPU_DM_PIPE_CRC_SOURCE_AUTO ) { if (dc_stream_configure_crc(stream_state->ctx->dc,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c +1 -1
@@ -463,7 +463,7 @@ void dpp1_set_cursor_position(if (src_y_offset >= (int )param->viewport.height) cur_en =0 ;/* not visible beyond bottom edge*/ -if (src_y_offset <0 ) +if (src_y_offset + (int )height <=0 ) cur_en =0 ;/* not visible beyond top edge*/ REG_UPDATE(CURSOR0_CONTROL,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c +1 -1
@@ -1134,7 +1134,7 @@ void hubp1_cursor_set_position(if (src_y_offset >= (int )param->viewport.height) cur_en =0 ;/* not visible beyond bottom edge*/ -if (src_y_offset <0 )//+ (int)hubp->curs_attr.height +if (src_y_offset + (int )hubp->curs_attr.height <=0 ) cur_en =0 ;/* not visible beyond top edge*/ if (cur_en &®_READ (CURSOR_SURFACE_ADDRESS ) ==0 )
drivers/gpu/drm/drm_atomic_helper.c +3 -0
@@ -1445,6 +1445,9 @@ void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev,DRM_ERROR ("[CRTC:%d:%s] flip_done timed out\n" , crtc->base.id, crtc->name); } + +if (old_state->fake_commit) +complete_all (&old_state->fake_commit->flip_done); }EXPORT_SYMBOL (drm_atomic_helper_wait_for_flip_done);
drivers/gpu/drm/scheduler/sched_main.c +16 -1
@@ -60,6 +60,8 @@static void drm_sched_process_job (struct dma_fence *f,struct dma_fence_cb *cb); +static void drm_sched_expel_job_unlocked (struct drm_sched_job *s_job); +/** * drm_sched_rq_init - initialize a given run queue struct *
@@ -215,7 +217,7 @@ static void drm_sched_job_finish(struct work_struct *work)spin_lock (&sched->job_list_lock);/* remove job from ring_mirror_list */ -list_del (&s_job->node); +list_del_init (&s_job->node);/* queue TDR for next job */ drm_sched_start_timeout (sched);spin_unlock (&sched->job_list_lock);
@@ -378,6 +380,8 @@ void drm_sched_job_recovery(struct drm_gpu_scheduler *sched) r);dma_fence_put (fence); }else { +if (s_fence->finished.error <0 ) +drm_sched_expel_job_unlocked (s_job);drm_sched_process_job (NULL , &s_fence->cb); }spin_lock (&sched->job_list_lock);
@@ -567,6 +571,8 @@ static int drm_sched_main(void *param) r);dma_fence_put (fence); }else { +if (s_fence->finished.error <0 ) +drm_sched_expel_job_unlocked (sched_job);drm_sched_process_job (NULL , &s_fence->cb); }
@@ -575,6 +581,15 @@ static int drm_sched_main(void *param)return 0 ; } +static void drm_sched_expel_job_unlocked (struct drm_sched_job *s_job) +{ +struct drm_gpu_scheduler *sched = s_job->sched; + +spin_lock (&sched->job_list_lock); +list_del_init (&s_job->node); +spin_unlock (&sched->job_list_lock); +} +/** * drm_sched_init - Init a gpu scheduler instance *
drivers/hwtracing/coresight/coresight-tmc-etf.c +1 -1
@@ -86,7 +86,7 @@ static void __tmc_etb_disable_hw(struct tmc_drvdata *drvdata)static void tmc_etb_disable_hw (struct tmc_drvdata *drvdata) { -coresight_disclaim_device (drvdata); +coresight_disclaim_device (drvdata->base);__tmc_etb_disable_hw (drvdata); }
drivers/infiniband/hw/usnic/usnic_ib_verbs.c +7 -4
@@ -336,13 +336,16 @@ int usnic_ib_query_port(struct ib_device *ibdev, u8 port,usnic_dbg ("\n" ); -mutex_lock (&us_ibdev->usdev_lock);if (ib_get_eth_speed (ibdev, port, &props->active_speed, - &props->active_width)) { -mutex_unlock (&us_ibdev->usdev_lock); + &props->active_width))return -EINVAL ; - } +/* +* usdev_lock is acquired after (and not before) ib_get_eth_speed call +* because acquiring rtnl_lock in ib_get_eth_speed, while holding +* usdev_lock could lead to a deadlock. +*/ +mutex_lock (&us_ibdev->usdev_lock);/* props being zeroed by the caller, avoid zeroing it here */ props->lid =0 ;
drivers/infiniband/sw/rxe/rxe_req.c +1 -0
@@ -643,6 +643,7 @@ int rxe_requester(void *arg) rmr->access = wqe->wr.wr.reg.access; rmr->lkey = wqe->wr.wr.reg.key; rmr->rkey = wqe->wr.wr.reg.key; + rmr->iova = wqe->wr.wr.reg.mr->iova; wqe->state = wqe_state_done; wqe->status =IB_WC_SUCCESS ; }else {
drivers/md/dm-crypt.c +4 -4
@@ -49,7 +49,7 @@ struct convert_context {struct bio *bio_out;struct bvec_iter iter_in;struct bvec_iter iter_out; -sector_t cc_sector; +u64 cc_sector;atomic_t cc_pending;union {struct skcipher_request *req;
@@ -81,7 +81,7 @@ struct dm_crypt_request {struct convert_context *ctx;struct scatterlist sg_in[4 ];struct scatterlist sg_out[4 ]; -sector_t iv_sector; +u64 iv_sector; };struct crypt_config ;
@@ -160,7 +160,7 @@ struct crypt_config {struct iv_lmk_private lmk;struct iv_tcw_private tcw; } iv_gen_private; -sector_t iv_offset; +u64 iv_offset;unsigned int iv_size;unsigned short int sector_size;unsigned char sector_shift;
@@ -2781,7 +2781,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) } ret = -EINVAL ; -if (sscanf (argv[4 ],"%llu%c" , &tmpll, &dummy) !=1 ) { +if (sscanf (argv[4 ],"%llu%c" , &tmpll, &dummy) !=1 || tmpll != (sector_t )tmpll) { ti->error ="Invalid device sector" ; goto bad; }
drivers/md/dm-delay.c +1 -1
@@ -141,7 +141,7 @@ static int delay_class_ctr(struct dm_target *ti, struct delay_class *c, char **aunsigned long long tmpll;char dummy; -if (sscanf (argv[1 ],"%llu%c" , &tmpll, &dummy) !=1 ) { +if (sscanf (argv[1 ],"%llu%c" , &tmpll, &dummy) !=1 || tmpll != (sector_t )tmpll) { ti->error ="Invalid device sector" ;return -EINVAL ; }
drivers/md/dm-flakey.c +1 -1
@@ -213,7 +213,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv) devname =dm_shift_arg (&as); r = -EINVAL ; -if (sscanf (dm_shift_arg (&as),"%llu%c" , &tmpll, &dummy) !=1 ) { +if (sscanf (dm_shift_arg (&as),"%llu%c" , &tmpll, &dummy) !=1 || tmpll != (sector_t )tmpll) { ti->error ="Invalid device sector" ; goto bad; }
drivers/md/dm-kcopyd.c +14 -5
@@ -56,15 +56,17 @@ struct dm_kcopyd_client {atomic_t nr_jobs;/* -* We maintain three lists of jobs: +* We maintain four lists of jobs: * * i) jobs waiting for pages * ii) jobs that have pages, and are waiting for the io to be issued. -* iii) jobs that have completed. +* iii) jobs that don't need to do any IO and just run a callback +* iv) jobs that have completed. * -* All three of these are protected by job_lock. +* All four of these are protected by job_lock. */ spinlock_t job_lock; +struct list_head callback_jobs;struct list_head complete_jobs;struct list_head io_jobs;struct list_head pages_jobs;
@@ -625,6 +627,7 @@ static void do_work(struct work_struct *work)struct dm_kcopyd_client *kc =container_of (work, struct dm_kcopyd_client, kcopyd_work);struct blk_plug plug; +unsigned long flags;/* * The order that these are called is *very* important.
@@ -633,6 +636,10 @@ static void do_work(struct work_struct *work)* list. io jobs call wake when they complete and it all * starts again. */ +spin_lock_irqsave (&kc->job_lock, flags); +list_splice_tail_init (&kc->callback_jobs, &kc->complete_jobs); +spin_unlock_irqrestore (&kc->job_lock, flags); +blk_start_plug (&plug);process_jobs (&kc->complete_jobs, kc, run_complete_job);process_jobs (&kc->pages_jobs, kc, run_pages_job);
@@ -650,7 +657,7 @@ static void dispatch_job(struct kcopyd_job *job)struct dm_kcopyd_client *kc = job->kc;atomic_inc (&kc->nr_jobs);if (unlikely (!job->source.count)) -push (&kc->complete_jobs, job); +push (&kc->callback_jobs, job);else if (job->pages == &zero_page_list)push (&kc->io_jobs, job);else
@@ -858,7 +865,7 @@ void dm_kcopyd_do_callback(void *j, int read_err, unsigned long write_err) job->read_err = read_err; job->write_err = write_err; -push (&kc->complete_jobs, job); +push (&kc->callback_jobs, job);wake (kc); }EXPORT_SYMBOL (dm_kcopyd_do_callback);
@@ -888,6 +895,7 @@ struct dm_kcopyd_client *dm_kcopyd_client_create(struct dm_kcopyd_throttle *throreturn ERR_PTR (-ENOMEM );spin_lock_init (&kc->job_lock); +INIT_LIST_HEAD (&kc->callback_jobs);INIT_LIST_HEAD (&kc->complete_jobs);INIT_LIST_HEAD (&kc->io_jobs);INIT_LIST_HEAD (&kc->pages_jobs);
@@ -939,6 +947,7 @@ void dm_kcopyd_client_destroy(struct dm_kcopyd_client *kc)/* Wait for completion of all jobs submitted by this client. */ wait_event (kc->destroyq, !atomic_read (&kc->nr_jobs)); +BUG_ON (!list_empty (&kc->callback_jobs));BUG_ON (!list_empty (&kc->complete_jobs));BUG_ON (!list_empty (&kc->io_jobs));BUG_ON (!list_empty (&kc->pages_jobs));
drivers/md/dm-linear.c +1 -1
@@ -45,7 +45,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv) } ret = -EINVAL ; -if (sscanf (argv[1 ],"%llu%c" , &tmp, &dummy) !=1 ) { +if (sscanf (argv[1 ],"%llu%c" , &tmp, &dummy) !=1 || tmp != (sector_t )tmp) { ti->error ="Invalid device sector" ; goto bad; }
drivers/md/dm-raid1.c +2 -1
@@ -943,7 +943,8 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,char dummy;int ret; -if (sscanf (argv[1 ],"%llu%c" , &offset, &dummy) !=1 ) { +if (sscanf (argv[1 ],"%llu%c" , &offset, &dummy) !=1 || + offset != (sector_t )offset) { ti->error ="Invalid offset" ;return -EINVAL ; }
drivers/md/dm-snap.c +22 -0
@@ -19,6 +19,7 @@#include <linux/vmalloc.h> #include <linux/log2.h> #include <linux/dm-kcopyd.h> +#include <linux/semaphore.h> #include "dm.h"
@@ -105,6 +106,9 @@ struct dm_snapshot {/* The on disk metadata handler */ struct dm_exception_store *store; +/* Maximum number of in-flight COW jobs. */ +struct semaphore cow_count; +struct dm_kcopyd_client *kcopyd_client;/* Wait for events based on state_bits */
@@ -145,6 +149,19 @@ struct dm_snapshot {#define RUNNING_MERGE 0#define SHUTDOWN_MERGE 1 +/* +* Maximum number of chunks being copied on write. +* +* The value was decided experimentally as a trade-off between memory +* consumption, stalling the kernel's workqueues and maintaining a high enough +* throughput. +*/ +#define DEFAULT_COW_THRESHOLD 2048 + +static int cow_threshold =DEFAULT_COW_THRESHOLD ; +module_param_named (snapshot_cow_threshold, cow_threshold, int,0644 ); +MODULE_PARM_DESC (snapshot_cow_threshold,"Maximum number of chunks being copied on write" ); +DECLARE_DM_KCOPYD_THROTTLE_WITH_MODULE_PARM (snapshot_copy_throttle,"A percentage of time allocated for copy on write" );
@@ -1190,6 +1207,8 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv) goto bad_hash_tables; } +sema_init (&s->cow_count, (cow_threshold >0 ) ? cow_threshold :INT_MAX ); + s->kcopyd_client =dm_kcopyd_client_create (&dm_kcopyd_throttle);if (IS_ERR (s->kcopyd_client)) { r =PTR_ERR (s->kcopyd_client);
@@ -1575,6 +1594,7 @@ static void copy_callback(int read_err, unsigned long write_err, void *context)rb_link_node (&pe->out_of_order_node, parent, p);rb_insert_color (&pe->out_of_order_node, &s->out_of_order_tree); } +up (&s->cow_count); }/*
@@ -1598,6 +1618,7 @@ static void start_copy(struct dm_snap_pending_exception *pe) dest.count = src.count;/* Hand over to kcopyd */ +down (&s->cow_count);dm_kcopyd_copy (s->kcopyd_client, &src,1 , &dest,0 , copy_callback, pe); }
@@ -1617,6 +1638,7 @@ static void start_full_bio(struct dm_snap_pending_exception *pe, pe->full_bio = bio; pe->full_bio_end_io = bio->bi_end_io; +down (&s->cow_count); callback_data =dm_kcopyd_prepare_callback (s->kcopyd_client, copy_callback, pe);
drivers/md/dm-unstripe.c +1 -1
@@ -78,7 +78,7 @@ static int unstripe_ctr(struct dm_target *ti, unsigned int argc, char **argv) goto err; } -if (sscanf (argv[4 ],"%llu%c" , &start, &dummy) !=1 ) { +if (sscanf (argv[4 ],"%llu%c" , &start, &dummy) !=1 || start != (sector_t )start) { ti->error ="Invalid striped device offset" ; goto err; }
drivers/media/firewire/firedtv-avc.c +4 -2
@@ -968,7 +968,8 @@ static int get_ca_object_length(struct avc_response_frame *r)return r->operand[7 ]; } -int avc_ca_app_info (struct firedtv *fdtv,char *app_info,unsigned int *len) +int avc_ca_app_info (struct firedtv *fdtv,unsigned char *app_info, +unsigned int *len) {struct avc_command_frame *c = (void *)fdtv->avc_data;struct avc_response_frame *r = (void *)fdtv->avc_data;
@@ -1009,7 +1010,8 @@ int avc_ca_app_info(struct firedtv *fdtv, char *app_info, unsigned int *len)return ret; } -int avc_ca_info (struct firedtv *fdtv,char *app_info,unsigned int *len) +int avc_ca_info (struct firedtv *fdtv,unsigned char *app_info, +unsigned int *len) {struct avc_command_frame *c = (void *)fdtv->avc_data;struct avc_response_frame *r = (void *)fdtv->avc_data;
drivers/media/firewire/firedtv.h +4 -2
@@ -124,8 +124,10 @@ int avc_lnb_control(struct firedtv *fdtv, char voltage, char burst, struct dvb_diseqc_master_cmd *diseqcmd);void avc_remote_ctrl_work (struct work_struct *work);int avc_register_remote_control (struct firedtv *fdtv); -int avc_ca_app_info (struct firedtv *fdtv,char *app_info,unsigned int *len); -int avc_ca_info (struct firedtv *fdtv,char *app_info,unsigned int *len); +int avc_ca_app_info (struct firedtv *fdtv,unsigned char *app_info, +unsigned int *len); +int avc_ca_info (struct firedtv *fdtv,unsigned char *app_info, +unsigned int *len);int avc_ca_reset (struct firedtv *fdtv);int avc_ca_pmt (struct firedtv *fdtv,char *app_info,int length);int avc_ca_get_time_date (struct firedtv *fdtv,int *interval);
drivers/media/platform/qcom/venus/core.c +8 -0
@@ -264,6 +264,14 @@ static int venus_probe(struct platform_device *pdev)if (ret)return ret; +if (!dev->dma_parms) { + dev->dma_parms =devm_kzalloc (dev,sizeof (*dev->dma_parms), +GFP_KERNEL ); +if (!dev->dma_parms) +return -ENOMEM ; + } +dma_set_max_seg_size (dev,DMA_BIT_MASK (32 )); +INIT_LIST_HEAD (&core->instances);mutex_init (&core->lock);INIT_DELAYED_WORK (&core->work, venus_sys_error_handler);
drivers/media/usb/uvc/uvc_driver.c +9 -4
@@ -1824,11 +1824,7 @@ static void uvc_delete(struct kref *kref)usb_put_intf (dev->intf);usb_put_dev (dev->udev); -if (dev->vdev.dev) -v4l2_device_unregister (&dev->vdev);#ifdef CONFIG_MEDIA_CONTROLLER -if (media_devnode_is_registered (dev->mdev.devnode)) -media_device_unregister (&dev->mdev);media_device_cleanup (&dev->mdev);#endif
@@ -1885,6 +1881,15 @@ static void uvc_unregister_video(struct uvc_device *dev)uvc_debugfs_cleanup_stream (stream); } + +uvc_status_unregister (dev); + +if (dev->vdev.dev) +v4l2_device_unregister (&dev->vdev); +#ifdef CONFIG_MEDIA_CONTROLLER +if (media_devnode_is_registered (dev->mdev.devnode)) +media_device_unregister (&dev->mdev); +#endif } int uvc_register_video_device(struct uvc_device *dev,
drivers/media/usb/uvc/uvc_status.c +8 -4
@@ -54,7 +54,7 @@ static int uvc_input_init(struct uvc_device *dev)return ret; } -static void uvc_input_cleanup (struct uvc_device *dev) +static void uvc_input_unregister (struct uvc_device *dev) {if (dev->input)input_unregister_device (dev->input);
@@ -71,7 +71,7 @@ static void uvc_input_report_key(struct uvc_device *dev, unsigned int code,#else #define uvc_input_init (dev) -#define uvc_input_cleanup (dev) +#define uvc_input_unregister (dev)#define uvc_input_report_key (dev, code, value)#endif /* CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV */
@@ -292,12 +292,16 @@ int uvc_status_init(struct uvc_device *dev)return 0 ; } -void uvc_status_cleanup (struct uvc_device *dev) +void uvc_status_unregister (struct uvc_device *dev) {usb_kill_urb (dev->int_urb); +uvc_input_unregister (dev); +} + +void uvc_status_cleanup (struct uvc_device *dev) +{usb_free_urb (dev->int_urb);kfree (dev->status); -uvc_input_cleanup (dev); }int uvc_status_start (struct uvc_device *dev,gfp_t flags)
drivers/media/usb/uvc/uvcvideo.h +1 -0
@@ -757,6 +757,7 @@ int uvc_register_video_device(struct uvc_device *dev,/* Status */ int uvc_status_init (struct uvc_device *dev); +void uvc_status_unregister (struct uvc_device *dev);void uvc_status_cleanup (struct uvc_device *dev);int uvc_status_start (struct uvc_device *dev,gfp_t flags);void uvc_status_stop (struct uvc_device *dev);
drivers/mmc/host/atmel-mci.c +2 -1
@@ -1954,13 +1954,14 @@ static void atmci_tasklet_func(unsigned long priv) }atmci_request_end (host, host->mrq); - state =STATE_IDLE ; + goto unlock;/* atmci_request_end() sets host->state */ break ; } }while (state != prev_state); host->state = state; +unlock:spin_unlock (&host->lock); }
drivers/net/dsa/mv88e6xxx/chip.c +113 -0
161 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/chip.h +5 -0
@@ -300,6 +300,11 @@ struct mv88e6xxx_mdio_bus { };struct mv88e6xxx_ops { +/* Switch Setup Errata, called early in the switch setup to +* allow any errata actions to be performed +*/ +int (*setup_errata)(struct mv88e6xxx_chip *chip); +int (*ieee_pri_map)(struct mv88e6xxx_chip *chip);int (*ip_pri_map)(struct mv88e6xxx_chip *chip);
drivers/net/dsa/mv88e6xxx/port.h +10 -0
@@ -251,6 +251,16 @@/* Offset 0x19: Port IEEE Priority Remapping Registers (4-7) */ #define MV88E6095_PORT_IEEE_PRIO_REMAP_4567 0x19 +/* Offset 0x1a: Magic undocumented errata register */ +#define PORT_RESERVED_1A 0x1a +#define PORT_RESERVED_1A_BUSY BIT(15) +#define PORT_RESERVED_1A_WRITE BIT(14) +#define PORT_RESERVED_1A_READ 0 +#define PORT_RESERVED_1A_PORT_SHIFT 5 +#define PORT_RESERVED_1A_BLOCK (0xf << 10) +#define PORT_RESERVED_1A_CTRL_PORT 4 +#define PORT_RESERVED_1A_DATA_PORT 5 +int mv88e6xxx_port_read (struct mv88e6xxx_chip *chip,int port,int reg,u16 *val); int mv88e6xxx_port_write(struct mv88e6xxx_chip *chip, int port, int reg,
drivers/net/ethernet/intel/e1000e/ptp.c +10 -3
@@ -173,10 +173,14 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter, ptp_clock_info);unsigned long flags; -u64 ns; +u64 cycles, ns;spin_lock_irqsave (&adapter->systim_lock, flags); - ns =timecounter_read (&adapter->tc); + +/* Use timecounter_cyc2time() to allow non-monotonic SYSTIM readings */ + cycles = adapter->cc.read (&adapter->cc); + ns =timecounter_cyc2time (&adapter->tc, cycles); +spin_unlock_irqrestore (&adapter->systim_lock, flags); *ts =ns_to_timespec64 (ns);
@@ -232,9 +236,12 @@ static void e1000e_systim_overflow_work(struct work_struct *work) systim_overflow_work.work);struct e1000_hw *hw = &adapter->hw;struct timespec64 ts; +u64 ns; - adapter->ptp_clock_info.gettime64 (&adapter->ptp_clock_info, &ts); +/* Update the timecounter */ + ns =timecounter_read (&adapter->tc); + ts =ns_to_timespec64 (ns);e_dbg ("SYSTIM overflow check at %lld.%09lu\n" , (long long ) ts.tv_sec, ts.tv_nsec);
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +3 -1
@@ -4,6 +4,7 @@#include "ixgbe.h" #include <net/xfrm.h> #include <crypto/aead.h> +#include <linux/if_bridge.h> #define IXGBE_IPSEC_KEY_BITS 160static const char aes_gcm_name[] ="rfc4106(gcm(aes))" ;
@@ -693,7 +694,8 @@ static int ixgbe_ipsec_add_sa(struct xfrm_state *xs) }else {struct tx_sa tsa; -if (adapter->num_vfs) +if (adapter->num_vfs && + adapter->bridge_mode !=BRIDGE_MODE_VEPA )return -EOPNOTSUPP ;/* find the first unused index */
drivers/net/ethernet/marvell/octeontx2/af/cgx.c +3 -1
@@ -668,7 +668,7 @@ static int cgx_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (!cgx->reg_base) {dev_err (dev,"CGX: Cannot map CSR memory space, aborting\n" ); err = -ENOMEM ; - goto err_release_regions; + goto err_free_irq_vectors; } nvec =CGX_NVEC ;
@@ -693,6 +693,8 @@ static int cgx_probe(struct pci_dev *pdev, const struct pci_device_id *id) err_release_lmac:cgx_lmac_exit (cgx);list_del (&cgx->cgx_list); +err_free_irq_vectors: +pci_free_irq_vectors (pdev); err_release_regions:pci_release_regions (pdev); err_disable_device:
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +5 -2
@@ -4738,12 +4738,15 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev, lower_dev, upper_dev); }else if (netif_is_lag_master (upper_dev)) { -if (info->linking) +if (info->linking) { err =mlxsw_sp_port_lag_join (mlxsw_sp_port, upper_dev); -else + }else { +mlxsw_sp_port_lag_tx_en_set (mlxsw_sp_port, + false);mlxsw_sp_port_lag_leave (mlxsw_sp_port, upper_dev); + } }else if (netif_is_ovs_master (upper_dev)) {if (info->linking) err =mlxsw_sp_port_ovs_join (mlxsw_sp_port);
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +1 -1
@@ -1816,7 +1816,7 @@ static void mlxsw_sp_bridge_port_vlan_del(struct mlxsw_sp_port *mlxsw_sp_port, struct mlxsw_sp_bridge_port *bridge_port, u16 vid) { - u16 pvid = mlxsw_sp_port->pvid == vid ? 0 : vid; + u16 pvid = mlxsw_sp_port->pvid == vid ? 0 : mlxsw_sp_port->pvid;struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan; mlxsw_sp_port_vlan =mlxsw_sp_port_vlan_find_by_vid (mlxsw_sp_port, vid);
drivers/net/ethernet/realtek/r8169.c +2 -0
@@ -212,6 +212,8 @@ enum cfg_version { };static const struct pci_device_id rtl8169_pci_tbl[] = { + {PCI_VDEVICE (REALTEK ,0x2502 ),RTL_CFG_1 }, + {PCI_VDEVICE (REALTEK ,0x2600 ),RTL_CFG_1 }, {PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8129 ),0 ,0 ,RTL_CFG_0 }, {PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8136 ),0 ,0 ,RTL_CFG_2 }, {PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8161 ),0 ,0 ,RTL_CFG_1 },
drivers/net/ethernet/socionext/sni_ave.c +5 -1
@@ -1210,9 +1210,13 @@ static int ave_init(struct net_device *ndev) priv->phydev = phydev; -phy_ethtool_get_wol (phydev, &wol); +ave_ethtool_get_wol (ndev, &wol);device_set_wakeup_capable (&ndev->dev, !!wol.supported); +/* set wol initial state disabled */ + wol.wolopts =0 ; +ave_ethtool_set_wol (ndev, &wol); +if (!phy_interface_is_rgmii (phydev))phy_set_max_speed (phydev,SPEED_100 );
drivers/net/usb/qmi_wwan.c +1 -0
@@ -123,6 +123,7 @@ static void qmimux_setup(struct net_device *dev) dev->addr_len =0 ; dev->flags =IFF_POINTOPOINT |IFF_NOARP |IFF_MULTICAST ; dev->netdev_ops = &qmimux_netdev_ops; + dev->mtu =1500 ; dev->needs_free_netdev = true; }
drivers/net/wireless/ath/ath10k/debugfs_sta.c +1 -1
@@ -71,7 +71,7 @@ void ath10k_sta_update_rx_tid_stats_ampdu(struct ath10k *ar, u16 peer_id, u8 tidspin_lock_bh (&ar->data_lock); peer =ath10k_peer_find_by_id (ar, peer_id); -if (!peer) +if (!peer || !peer->sta) goto out; arsta = (struct ath10k_sta *)peer->sta->drv_priv;
drivers/net/wireless/ath/ath10k/htt_rx.c +2 -2
@@ -2832,7 +2832,7 @@ static void ath10k_htt_fetch_peer_stats(struct ath10k *ar,rcu_read_lock ();spin_lock_bh (&ar->data_lock); peer =ath10k_peer_find_by_id (ar, peer_id); -if (!peer) { +if (!peer || !peer->sta) {ath10k_warn (ar,"Invalid peer id %d peer stats buffer\n" , peer_id); goto out;
@@ -2885,7 +2885,7 @@ static void ath10k_fetch_10_2_tx_stats(struct ath10k *ar, u8 *data)rcu_read_lock ();spin_lock_bh (&ar->data_lock); peer =ath10k_peer_find_by_id (ar, peer_id); -if (!peer) { +if (!peer || !peer->sta) {ath10k_warn (ar,"Invalid peer id %d in peer stats buffer\n" , peer_id); goto out;
drivers/net/wireless/quantenna/qtnfmac/commands.c +13 -8
@@ -84,7 +84,7 @@ static int qtnf_cmd_send_with_reply(struct qtnf_bus *bus, size_t *var_resp_size) {struct qlink_cmd *cmd; -const struct qlink_resp *resp; +struct qlink_resp *resp =NULL ;struct sk_buff *resp_skb =NULL ;u16 cmd_id;u8 mac_id;
@@ -113,7 +113,12 @@ static int qtnf_cmd_send_with_reply(struct qtnf_bus *bus,if (ret) goto out; - resp = (const struct qlink_resp *)resp_skb->data; +if (WARN_ON (!resp_skb || !resp_skb->data)) { + ret = -EFAULT ; + goto out; + } + + resp = (struct qlink_resp *)resp_skb->data; ret =qtnf_cmd_check_reply_header (resp, cmd_id, mac_id, vif_id, const_resp_size);if (ret)
@@ -686,7 +691,7 @@ int qtnf_cmd_get_sta_info(struct qtnf_vif *vif, const u8 *sta_mac,struct sk_buff *cmd_skb, *resp_skb =NULL ;struct qlink_cmd_get_sta_info *cmd;const struct qlink_resp_get_sta_info *resp; -size_t var_resp_len; +size_t var_resp_len =0 ;int ret =0 ; cmd_skb = qtnf_cmd_alloc_new_cmdskb(vif->mac->macid, vif->vifid,
@@ -1650,7 +1655,7 @@ int qtnf_cmd_get_mac_info(struct qtnf_wmac *mac) {struct sk_buff *cmd_skb, *resp_skb =NULL ;const struct qlink_resp_get_mac_info *resp; -size_t var_data_len; +size_t var_data_len =0 ;int ret =0 ; cmd_skb = qtnf_cmd_alloc_new_cmdskb(mac->macid, QLINK_VIFID_RSVD,
@@ -1680,8 +1685,8 @@ int qtnf_cmd_get_hw_info(struct qtnf_bus *bus) {struct sk_buff *cmd_skb, *resp_skb =NULL ;const struct qlink_resp_get_hw_info *resp; +size_t info_len =0 ;int ret =0 ; -size_t info_len; cmd_skb = qtnf_cmd_alloc_new_cmdskb(QLINK_MACID_RSVD, QLINK_VIFID_RSVD, QLINK_CMD_GET_HW_INFO,
@@ -1709,9 +1714,9 @@ int qtnf_cmd_band_info_get(struct qtnf_wmac *mac, struct ieee80211_supported_band *band) {struct sk_buff *cmd_skb, *resp_skb =NULL ; -size_t info_len;struct qlink_cmd_band_info_get *cmd;struct qlink_resp_band_info_get *resp; +size_t info_len =0 ;int ret =0 ;u8 qband;
@@ -1764,8 +1769,8 @@ int qtnf_cmd_band_info_get(struct qtnf_wmac *mac,int qtnf_cmd_send_get_phy_params (struct qtnf_wmac *mac) {struct sk_buff *cmd_skb, *resp_skb =NULL ; -size_t response_size;struct qlink_resp_phy_params *resp; +size_t response_size =0 ;int ret =0 ; cmd_skb = qtnf_cmd_alloc_new_cmdskb(mac->macid, 0,
@@ -2431,7 +2436,7 @@ int qtnf_cmd_get_chan_stats(struct qtnf_wmac *mac, u16 channel,struct sk_buff *cmd_skb, *resp_skb =NULL ;struct qlink_cmd_get_chan_stats *cmd;struct qlink_resp_get_chan_stats *resp; -size_t var_data_len; +size_t var_data_len =0 ;int ret =0 ; cmd_skb = qtnf_cmd_alloc_new_cmdskb(mac->macid, QLINK_VIFID_RSVD,
drivers/of/overlay.c +3 -1
@@ -378,7 +378,9 @@ static int add_changeset_node(struct overlay_changeset *ovcs,if (ret)return ret; -return build_changeset_next_level (ovcs, tchild, node); + ret =build_changeset_next_level (ovcs, tchild, node); +of_node_put (tchild); +return ret; }if (node->phandle && tchild->phandle)
drivers/platform/mips/cpu_hwmon.c +2 -1
@@ -25,9 +25,10 @@ int loongson3_cpu_temp(int cpu)case PRID_REV_LOONGSON3A_R1 : reg = (reg >>8 ) &0xff ;break ; -case PRID_REV_LOONGSON3A_R2 :case PRID_REV_LOONGSON3B_R1 :case PRID_REV_LOONGSON3B_R2 : +case PRID_REV_LOONGSON3A_R2_0 : +case PRID_REV_LOONGSON3A_R2_1 : reg = ((reg >>8 ) &0xff ) -100 ;break ;case PRID_REV_LOONGSON3A_R3_0 :
drivers/platform/x86/asus-wmi.c +2 -1
@@ -2131,7 +2131,8 @@ static int asus_wmi_add(struct platform_device *pdev) err =asus_wmi_backlight_init (asus);if (err && err != -ENODEV ) goto fail_backlight; - } + }else + err =asus_wmi_set_devstate (ASUS_WMI_DEVID_BACKLIGHT ,2 ,NULL ); status =wmi_install_notify_handler (asus->driver->event_guid, asus_wmi_notify, asus);
drivers/scsi/megaraid/megaraid_sas_fp.c +1 -1
@@ -1266,7 +1266,7 @@ void mr_update_load_balance_params(struct MR_DRV_RAID_MAP_ALL *drv_map,for (ldCount =0 ; ldCount <MAX_LOGICAL_DRIVES_EXT ; ldCount++) { ld =MR_TargetIdToLdGet (ldCount, drv_map); -if (ld >=MAX_LOGICAL_DRIVES_EXT ) { +if (ld >=MAX_LOGICAL_DRIVES_EXT -1 ) { lbInfo[ldCount].loadBalanceFlag =0 ;continue ; }
drivers/scsi/megaraid/megaraid_sas_fusion.c +1 -1
@@ -2832,7 +2832,7 @@ static void megasas_build_ld_nonrw_fusion(struct megasas_instance *instance, device_id < instance->fw_supported_vd_count)) { ld =MR_TargetIdToLdGet (device_id, local_map_ptr); -if (ld >= instance->fw_supported_vd_count) +if (ld >= instance->fw_supported_vd_count -1 ) fp_possible =0 ;else { raid =MR_LdRaidGet (ld, local_map_ptr);
drivers/scsi/mpt3sas/mpt3sas_base.c +2 -1
@@ -3319,8 +3319,9 @@ _base_mpi_ep_writeq(__u64 b, volatile void __iomem *addr,static inline void _base_writeq (__u64 b,volatile void __iomem *addr,spinlock_t *writeq_lock) { +wmb ();__raw_writeq (b, addr); -mmiowb (); +barrier (); }#else static inline void
drivers/scsi/qedi/qedi_main.c +3 -0
@@ -952,6 +952,9 @@ static int qedi_find_boot_info(struct qedi_ctx *qedi, cls_sess =iscsi_conn_to_session (cls_conn); sess = cls_sess->dd_data; +if (!iscsi_is_session_online (cls_sess)) +continue ; +if (pri_ctrl_flags) {if (!strcmp (pri_tgt->iscsi_name, sess->targetname) && !strcmp (pri_tgt->ip_addr, ep_ip_addr)) {
drivers/scsi/smartpqi/smartpqi_init.c +4 -0
@@ -2704,6 +2704,9 @@ static unsigned int pqi_process_io_intr(struct pqi_ctrl_info *ctrl_info,switch (response->header.iu_type) {case PQI_RESPONSE_IU_RAID_PATH_IO_SUCCESS :case PQI_RESPONSE_IU_AIO_PATH_IO_SUCCESS : +if (io_request->scmd) + io_request->scmd->result =0 ; +/* fall through */ case PQI_RESPONSE_IU_GENERAL_MANAGEMENT :break ;case PQI_RESPONSE_IU_TASK_MANAGEMENT :
@@ -6670,6 +6673,7 @@ static void pqi_shutdown(struct pci_dev *pci_dev)* storage. */ rc =pqi_flush_cache (ctrl_info,SHUTDOWN ); +pqi_free_interrupts (ctrl_info);pqi_reset (ctrl_info);if (rc ==0 )return ;
drivers/staging/erofs/unzip_vle.c +9 -4
@@ -717,13 +717,18 @@ static void z_erofs_vle_unzip_kickoff(void *ptr, int bios)struct z_erofs_vle_unzip_io *io =tagptr_unfold_ptr (t);bool background =tagptr_unfold_tags (t); -if (atomic_add_return (bios, &io->pending_bios)) +if (!background) { +unsigned long flags; + +spin_lock_irqsave (&io->u.wait.lock, flags); +if (!atomic_add_return (bios, &io->pending_bios)) +wake_up_locked (&io->u.wait); +spin_unlock_irqrestore (&io->u.wait.lock, flags);return ; + } -if (background) +if (!atomic_add_return (bios, &io->pending_bios))queue_work (z_erofs_workqueue, &io->u.work); -else -wake_up (&io->u.wait); }static inline void z_erofs_vle_read_endio (struct bio *bio)
drivers/target/target_core_spc.c +12 -5
@@ -108,12 +108,17 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf) buf[7 ] =0x2 ;/* CmdQue=1 */ -memcpy (&buf[8 ],"LIO-ORG " ,8 ); -memset (&buf[16 ],0x20 ,16 ); +/* +* ASCII data fields described as being left-aligned shall have any +* unused bytes at the end of the field (i.e., highest offset) and the +* unused bytes shall be filled with ASCII space characters (20h). +*/ +memset (&buf[8 ],0x20 ,8 +16 +4 ); +memcpy (&buf[8 ],"LIO-ORG" ,sizeof ("LIO-ORG" ) -1 );memcpy (&buf[16 ], dev->t10_wwn.model, -min_t (size_t,strlen (dev->t10_wwn.model),16 )); +strnlen (dev->t10_wwn.model,16 ));memcpy (&buf[32 ], dev->t10_wwn.revision, -min_t (size_t,strlen (dev->t10_wwn.revision),4 )); +strnlen (dev->t10_wwn.revision,4 )); buf[4 ] =31 ;/* Set additional length to 31 */ return 0 ;
@@ -251,7 +256,9 @@ spc_emulate_evpd_83(struct se_cmd *cmd, unsigned char *buf) buf[off] =0x2 ;/* ASCII */ buf[off+1 ] =0x1 ;/* T10 Vendor ID */ buf[off+2 ] =0x0 ; -memcpy (&buf[off+4 ],"LIO-ORG" ,8 ); +/* left align Vendor ID and pad with spaces */ +memset (&buf[off+4 ],0x20 ,8 ); +memcpy (&buf[off+4 ],"LIO-ORG" ,sizeof ("LIO-ORG" ) -1 );/* Extra Byte for NULL Terminator */ id_len++;/* Identifier Length */
drivers/target/target_core_transport.c +25 -10
@@ -224,19 +224,28 @@ void transport_subsystem_check_init(void) sub_api_initialized =1 ; } +static void target_release_sess_cmd_refcnt (struct percpu_ref *ref) +{ +struct se_session *sess =container_of (ref,typeof (*sess), cmd_count); + +wake_up (&sess->cmd_list_wq); +} +/** * transport_init_session - initialize a session object * @se_sess: Session object pointer. * * The caller must have zero-initialized @se_sess before calling this function. */ -void transport_init_session (struct se_session *se_sess) +int transport_init_session (struct se_session *se_sess) {INIT_LIST_HEAD (&se_sess->sess_list);INIT_LIST_HEAD (&se_sess->sess_acl_list);INIT_LIST_HEAD (&se_sess->sess_cmd_list);spin_lock_init (&se_sess->sess_cmd_lock);init_waitqueue_head (&se_sess->cmd_list_wq); +return percpu_ref_init (&se_sess->cmd_count, + target_release_sess_cmd_refcnt,0 ,GFP_KERNEL ); }EXPORT_SYMBOL (transport_init_session);
@@ -247,6 +256,7 @@ EXPORT_SYMBOL(transport_init_session);struct se_session *transport_alloc_session (enum target_prot_op sup_prot_ops) {struct se_session *se_sess; +int ret; se_sess =kmem_cache_zalloc (se_sess_cache,GFP_KERNEL );if (!se_sess) {
@@ -254,7 +264,11 @@ struct se_session *transport_alloc_session(enum target_prot_op sup_prot_ops) " se_sess_cache\n");return ERR_PTR (-ENOMEM ); } -transport_init_session (se_sess); + ret =transport_init_session (se_sess); +if (ret <0 ) { +kfree (se_sess); +return ERR_PTR (ret); + } se_sess->sup_prot_ops = sup_prot_ops;return se_sess;
@@ -581,6 +595,7 @@ void transport_free_session(struct se_session *se_sess)sbitmap_queue_free (&se_sess->sess_tag_pool);kvfree (se_sess->sess_cmd_map); } +percpu_ref_exit (&se_sess->cmd_count);kmem_cache_free (se_sess_cache, se_sess); }EXPORT_SYMBOL (transport_free_session);
@@ -2719,6 +2734,7 @@ int target_get_sess_cmd(struct se_cmd *se_cmd, bool ack_kref) } se_cmd->transport_state |=CMD_T_PRE_EXECUTE ;list_add_tail (&se_cmd->se_cmd_list, &se_sess->sess_cmd_list); +percpu_ref_get (&se_sess->cmd_count); out:spin_unlock_irqrestore (&se_sess->sess_cmd_lock, flags);
@@ -2749,8 +2765,6 @@ static void target_release_cmd_kref(struct kref *kref)if (se_sess) {spin_lock_irqsave (&se_sess->sess_cmd_lock, flags);list_del_init (&se_cmd->se_cmd_list); -if (se_sess->sess_tearing_down &&list_empty (&se_sess->sess_cmd_list)) -wake_up (&se_sess->cmd_list_wq);spin_unlock_irqrestore (&se_sess->sess_cmd_lock, flags); }
@@ -2758,6 +2772,8 @@ static void target_release_cmd_kref(struct kref *kref) se_cmd->se_tfo->release_cmd (se_cmd);if (compl)complete (compl); + +percpu_ref_put (&se_sess->cmd_count); }/**
@@ -2886,6 +2902,8 @@ void target_sess_cmd_list_set_waiting(struct se_session *se_sess)spin_lock_irqsave (&se_sess->sess_cmd_lock, flags); se_sess->sess_tearing_down =1 ;spin_unlock_irqrestore (&se_sess->sess_cmd_lock, flags); + +percpu_ref_kill (&se_sess->cmd_count); }EXPORT_SYMBOL (target_sess_cmd_list_set_waiting);
@@ -2900,17 +2918,14 @@ void target_wait_for_sess_cmds(struct se_session *se_sess)WARN_ON_ONCE (!se_sess->sess_tearing_down); -spin_lock_irq (&se_sess->sess_cmd_lock);do { - ret =wait_event_lock_irq_timeout ( - se_sess->cmd_list_wq, -list_empty (&se_sess->sess_cmd_list), - se_sess->sess_cmd_lock,180 *HZ ); + ret =wait_event_timeout (se_sess->cmd_list_wq, +percpu_ref_is_zero (&se_sess->cmd_count), +180 *HZ );list_for_each_entry (cmd, &se_sess->sess_cmd_list, se_cmd_list)target_show_cmd ("session shutdown: still waiting for " , cmd); }while (ret <=0 ); -spin_unlock_irq (&se_sess->sess_cmd_lock); }EXPORT_SYMBOL (target_wait_for_sess_cmds);
drivers/target/target_core_xcopy.c +5 -1
@@ -479,6 +479,8 @@ static const struct target_core_fabric_ops xcopy_pt_tfo = {int target_xcopy_setup_pt (void ) { +int ret; + xcopy_wq =alloc_workqueue ("xcopy_wq" ,WQ_MEM_RECLAIM ,0 );if (!xcopy_wq) {pr_err ("Unable to allocate xcopy_wq\n" );
@@ -496,7 +498,9 @@ int target_xcopy_setup_pt(void)INIT_LIST_HEAD (&xcopy_pt_nacl.acl_list);INIT_LIST_HEAD (&xcopy_pt_nacl.acl_sess_list);memset (&xcopy_pt_sess,0 ,sizeof (struct se_session )); -transport_init_session (&xcopy_pt_sess); + ret =transport_init_session (&xcopy_pt_sess); +if (ret <0 ) +return ret; xcopy_pt_nacl.se_tpg = &xcopy_pt_tpg; xcopy_pt_nacl.nacl_sess = &xcopy_pt_sess;
drivers/tty/serial/amba-pl011.c +2 -0
@@ -2780,6 +2780,7 @@ static struct platform_driver arm_sbsa_uart_platform_driver = { .name = "sbsa-uart", .of_match_table = of_match_ptr(sbsa_uart_of_match), .acpi_match_table = ACPI_PTR(sbsa_uart_acpi_match), + .suppress_bind_attrs = IS_BUILTIN(CONFIG_SERIAL_AMBA_PL011), }, };
@@ -2808,6 +2809,7 @@ static struct amba_driver pl011_driver = { .drv = { .name = "uart-pl011", .pm = &pl011_dev_pm_ops, + .suppress_bind_attrs = IS_BUILTIN(CONFIG_SERIAL_AMBA_PL011), }, .id_table = pl011_ids, .probe = pl011_probe,
drivers/tty/serial/pic32_uart.c +1 -0
@@ -919,6 +919,7 @@ static struct platform_driver pic32_uart_platform_driver = { .driver = { .name = PIC32_DEV_NAME, .of_match_table = of_match_ptr(pic32_serial_dt_ids), + .suppress_bind_attrs = IS_BUILTIN(CONFIG_SERIAL_PIC32), }, };
drivers/tty/serial/serial_core.c +16 -6
@@ -205,10 +205,15 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,if (!state->xmit.buf) { state->xmit.buf = (unsigned char *) page;uart_circ_clear (&state->xmit); +uart_port_unlock (uport, flags); }else { +uart_port_unlock (uport, flags); +/* +* Do not free() the page under the port lock, see +* uart_shutdown(). +*/ free_page (page); } -uart_port_unlock (uport, flags); retval = uport->ops->startup (uport);if (retval ==0 ) {
@@ -268,6 +273,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)struct uart_port *uport =uart_port_check (state);struct tty_port *port = &state->port;unsigned long flags =0 ; +char *xmit_buf =NULL ;/* * Set the TTY IO error marker
@@ -298,14 +304,18 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)tty_port_set_suspended (port,0 );/* -* Free the transmit buffer page. +* Do not free() the transmit buffer page under the port lock since +* this can create various circular locking scenarios. For instance, +* console driver may need to allocate/free a debug object, which +* can endup in printk() recursion. */ uart_port_lock (state, flags); -if (state->xmit.buf) { -free_page ((unsigned long )state->xmit.buf); - state->xmit.buf =NULL ; - } + xmit_buf = state->xmit.buf; + state->xmit.buf =NULL ;uart_port_unlock (uport, flags); + +if (xmit_buf) +free_page ((unsigned long )xmit_buf); }/**
drivers/tty/serial/xilinx_uartps.c +1 -0
@@ -1719,6 +1719,7 @@ static struct platform_driver cdns_uart_platform_driver = { .name = CDNS_UART_NAME, .of_match_table = cdns_uart_of_match, .pm = &cdns_uart_dev_pm_ops, + .suppress_bind_attrs = IS_BUILTIN(CONFIG_SERIAL_XILINX_PS_UART), }, };
drivers/usb/dwc2/gadget.c +23 -18
103 lines not on this page · raw message
drivers/usb/gadget/udc/renesas_usb3.c +10 -5
@@ -358,6 +358,7 @@ struct renesas_usb3 {bool extcon_host;/* check id and set EXTCON_USB_HOST */ bool extcon_usb;/* check vbus and set EXTCON_USB */ bool forced_b_device; +bool start_to_connect; };#define gadget_to_renesas_usb3 (_gadget) \
@@ -476,7 +477,8 @@ static void usb3_init_axi_bridge(struct renesas_usb3 *usb3)static void usb3_init_epc_registers (struct renesas_usb3 *usb3) {usb3_write (usb3, ~0 ,USB3_USB_INT_STA_1 ); -usb3_enable_irq_1 (usb3,USB_INT_1_VBUS_CNG ); +if (!usb3->workaround_for_vbus) +usb3_enable_irq_1 (usb3,USB_INT_1_VBUS_CNG ); }static bool usb3_wakeup_usb2_phy (struct renesas_usb3 *usb3)
@@ -700,8 +702,7 @@ static void usb3_mode_config(struct renesas_usb3 *usb3, bool host, bool a_dev)usb3_set_mode_by_role_sw (usb3, host);usb3_vbus_out (usb3, a_dev);/* for A-Peripheral or forced B-device mode */ -if ((!host && a_dev) || - (usb3->workaround_for_vbus && usb3->forced_b_device)) +if ((!host && a_dev) || usb3->start_to_connect)usb3_connect (usb3);spin_unlock_irqrestore (&usb3->lock, flags); }
@@ -2432,7 +2433,11 @@ static ssize_t renesas_usb3_b_device_write(struct file *file,if (copy_from_user (&buf, ubuf,min_t (size_t,sizeof (buf) -1 , count)))return -EFAULT ; -if (!strncmp (buf,"1" ,1 )) + usb3->start_to_connect = false; +if (usb3->workaround_for_vbus && usb3->forced_b_device && + !strncmp (buf,"2" ,1 )) + usb3->start_to_connect = true; +else if (!strncmp (buf,"1" ,1 )) usb3->forced_b_device = true;else usb3->forced_b_device = false;
@@ -2440,7 +2445,7 @@ static ssize_t renesas_usb3_b_device_write(struct file *file,if (usb3->workaround_for_vbus)usb3_disconnect (usb3); -/* Let this driver call usb3_connect() anyway */ +/* Let this driver call usb3_connect() if needed */ usb3_check_id (usb3);return count;
drivers/usb/typec/tcpm/tcpm.c +10 -2
@@ -317,6 +317,9 @@ struct tcpm_port {/* Deadline in jiffies to exit src_try_wait state */ unsigned long max_wait; +/* port belongs to a self powered device */ +bool self_powered; +#ifdef CONFIG_DEBUG_FS struct dentry *dentry;struct mutex logbuffer_lock;/* log buffer access lock */
@@ -3254,7 +3257,8 @@ static void run_state_machine(struct tcpm_port *port)case SRC_HARD_RESET_VBUS_OFF :tcpm_set_vconn (port, true);tcpm_set_vbus (port, false); -tcpm_set_roles (port, false,TYPEC_SOURCE ,TYPEC_HOST ); +tcpm_set_roles (port, port->self_powered,TYPEC_SOURCE , +TYPEC_HOST );tcpm_set_state (port,SRC_HARD_RESET_VBUS_ON ,PD_T_SRC_RECOVER );break ;case SRC_HARD_RESET_VBUS_ON :
@@ -3267,7 +3271,8 @@ static void run_state_machine(struct tcpm_port *port)memset (&port->pps_data,0 ,sizeof (port->pps_data));tcpm_set_vconn (port, false);tcpm_set_charge (port, false); -tcpm_set_roles (port, false,TYPEC_SINK ,TYPEC_DEVICE ); +tcpm_set_roles (port, port->self_powered,TYPEC_SINK , +TYPEC_DEVICE );/* * VBUS may or may not toggle, depending on the adapter. * If it doesn't toggle, transition to SNK_HARD_RESET_SINK_ON
@@ -4412,6 +4417,8 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,return -EINVAL ; port->operating_snk_mw = mw /1000 ; + port->self_powered =fwnode_property_read_bool (fwnode,"self-powered" ); +return 0 ; }
@@ -4720,6 +4727,7 @@ static int tcpm_copy_caps(struct tcpm_port *port, port->typec_caps.prefer_role = tcfg->default_role; port->typec_caps.type = tcfg->type; port->typec_caps.data = tcfg->data; + port->self_powered = port->tcpc->config->self_powered;return 0 ; }
fs/btrfs/dev-replace.c +41 -22
80 lines not on this page · raw message
fs/btrfs/inode.c +6 -1
@@ -6419,14 +6419,19 @@ int btrfs_add_link(struct btrfs_trans_handle *trans, err =btrfs_del_root_ref (trans, key.objectid, root->root_key.objectid, parent_ino, &local_index, name, name_len); - +if (err) +btrfs_abort_transaction (trans, err); }else if (add_backref) {u64 local_index;int err; err =btrfs_del_inode_ref (trans, root, name, name_len, ino, parent_ino, &local_index); +if (err) +btrfs_abort_transaction (trans, err); } + +/* Return the original error code */ return ret; }
fs/btrfs/volumes.c +21 -9
@@ -4775,19 +4775,17 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,/* * Use the number of data stripes to figure out how big this chunk * is really going to be in terms of logical address space, -* and compare that answer with the max chunk size +* and compare that answer with the max chunk size. If it's higher, +* we try to reduce stripe_size. */ if (stripe_size * data_stripes > max_chunk_size) { - stripe_size =div_u64 (max_chunk_size, data_stripes); - -/* bump the answer up to a 16MB boundary */ - stripe_size =round_up (stripe_size,SZ_16M ); -/* -* But don't go higher than the limits we found while searching -* for free extents +* Reduce stripe_size, round it up to a 16MB boundary again and +* then use it, unless it ends up being even bigger than the +* previous value we had already. */ - stripe_size =min (devices_info[ndevs -1 ].max_avail, + stripe_size =min (round_up (div_u64 (max_chunk_size, + data_stripes),SZ_16M ), stripe_size); }
@@ -7485,6 +7483,8 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)struct btrfs_path *path;struct btrfs_root *root = fs_info->dev_root;struct btrfs_key key; +u64 prev_devid =0 ; +u64 prev_dev_ext_end =0 ;int ret =0 ; key.objectid =1 ;
@@ -7529,10 +7529,22 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info) chunk_offset =btrfs_dev_extent_chunk_offset (leaf, dext); physical_len =btrfs_dev_extent_length (leaf, dext); +/* Check if this dev extent overlaps with the previous one */ +if (devid == prev_devid && physical_offset < prev_dev_ext_end) { +btrfs_err (fs_info, +"dev extent devid %llu physical offset %llu overlap with previous dev extent end %llu" , + devid, physical_offset, prev_dev_ext_end); + ret = -EUCLEAN ; + goto out; + } + ret =verify_one_dev_extent (fs_info, chunk_offset, devid, physical_offset, physical_len);if (ret <0 ) goto out; + prev_devid = devid; + prev_dev_ext_end = physical_offset + physical_len; + ret =btrfs_next_item (root, path);if (ret <0 ) goto out;
fs/iomap.c +15 -2
@@ -492,16 +492,29 @@ iomap_readpages(struct address_space *mapping, struct list_head *pages, }EXPORT_SYMBOL_GPL (iomap_readpages); +/* +* iomap_is_partially_uptodate checks whether blocks within a page are +* uptodate or not. +* +* Returns true if all blocks which correspond to a file portion +* we want to read within the page are uptodate. +*/ int iomap_is_partially_uptodate (struct page *page,unsigned long from,unsigned long count) {struct iomap_page *iop =to_iomap_page (page);struct inode *inode = page->mapping->host; -unsigned first = from >> inode->i_blkbits; -unsigned last = (from + count -1 ) >> inode->i_blkbits; +unsigned len, first, last;unsigned i; +/* Limit range to one page */ + len =min_t (unsigned,PAGE_SIZE - from, count); + +/* First and last blocks in range within page */ + first = from >> inode->i_blkbits; + last = (from + len -1 ) >> inode->i_blkbits; +if (iop) {for (i = first; i <= last; i++)if (!test_bit (i, iop->uptodate))
fs/jffs2/super.c +2 -1
@@ -101,7 +101,8 @@ static int jffs2_sync_fs(struct super_block *sb, int wait)struct jffs2_sb_info *c =JFFS2_SB_INFO (sb);#ifdef CONFIG_JFFS2_FS_WRITEBUFFER -cancel_delayed_work_sync (&c->wbuf_dwork); +if (jffs2_is_writebuffered (c)) +cancel_delayed_work_sync (&c->wbuf_dwork);#endif mutex_lock (&c->alloc_sem);
fs/ocfs2/localalloc.c +7 -2
@@ -345,13 +345,18 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb)if (num_used || alloc->id1.bitmap1.i_used || alloc->id1.bitmap1.i_total - || la->la_bm_off) -mlog (ML_ERROR ,"Local alloc hasn't been recovered!\n" + || la->la_bm_off) { +mlog (ML_ERROR ,"inconsistent detected, clean journal with" +" unrecovered local alloc, please run fsck.ocfs2!\n" "found = %u, set = %u, taken = %u, off = %u\n" , num_used,le32_to_cpu (alloc->id1.bitmap1.i_used),le32_to_cpu (alloc->id1.bitmap1.i_total),OCFS2_LOCAL_ALLOC (alloc)->la_bm_off); + status = -EINVAL ; + goto bail; + } + osb->local_alloc_bh = alloc_bh; osb->local_alloc_state =OCFS2_LA_ENABLED ;
fs/pstore/ram_core.c +5 -0
@@ -497,6 +497,11 @@ static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig, sig ^=PERSISTENT_RAM_SIG ;if (prz->buffer->sig == sig) { +if (buffer_size (prz) ==0 ) { +pr_debug ("found existing empty buffer\n" ); +return 0 ; + } +if (buffer_size (prz) > prz->buffer_size ||buffer_start (prz) >buffer_size (prz)) pr_info("found existing invalid buffer, size %zu, start %zu\n",
fs/quota/quota.c +2 -1
@@ -791,7 +791,8 @@ static int quotactl_cmd_write(int cmd)/* Return true if quotactl command is manipulating quota on/off state */ static bool quotactl_cmd_onoff (int cmd) { -return (cmd ==Q_QUOTAON ) || (cmd ==Q_QUOTAOFF ); +return (cmd ==Q_QUOTAON ) || (cmd ==Q_QUOTAOFF ) || + (cmd ==Q_XQUOTAON ) || (cmd ==Q_XQUOTAOFF ); }/*
fs/userfaultfd.c +9 -1
@@ -736,10 +736,18 @@ void mremap_userfaultfd_prep(struct vm_area_struct *vma,struct userfaultfd_ctx *ctx; ctx = vma->vm_userfaultfd_ctx.ctx; -if (ctx && (ctx->features &UFFD_FEATURE_EVENT_REMAP )) { + +if (!ctx) +return ; + +if (ctx->features &UFFD_FEATURE_EVENT_REMAP ) { vm_ctx->ctx = ctx;userfaultfd_ctx_get (ctx);
Lines of this file are not shown. View the raw message.
net/ipv4/netfilter/ipt_CLUSTERIP.c +89 -70
159 lines not on this page · raw message
net/netfilter/ipset/ip_set_bitmap_ipmac.c +5 -5
Lines of this file are not shown. View the raw message.
net/netfilter/ipset/ip_set_hash_ipmac.c +10 -6
Lines of this file are not shown. View the raw message.
tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json +1 -1
Lines of this file are not shown. View the raw message.
tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json +1 -1
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/test_libbpf.sh +4 -10
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/test_verifier.c +13 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kselftest_harness.h +21 -21
42 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.