5.1.17-stable review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 5.1.17-stable review
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.1.17-rc1
Roman Bolshakov <[email protected]>
scsi: target/iblock: Fix overrun in WRITE SAME emulation
Geert Uytterhoeven <[email protected]>
fs: VALIDATE_FS_PARSER should default to n
Dan Carpenter <[email protected]>
dmaengine: jz4780: Fix an endian bug in IRQ handler
Robin Gong <[email protected]>
dmaengine: imx-sdma: remove BD_INTR for channel0
Sricharan R <[email protected]>
dmaengine: qcom: bam_dma: Fix completed descriptors count
Cedric Hombourger <[email protected]>
MIPS: have "plain" make calls build dtbs for selected platforms
Dmitry Korotin <[email protected]>
MIPS: Add missing EHB in mtc0 -> mfc0 sequence.
Hauke Mehrtens <[email protected]>
MIPS: Fix bounds check virt_addr_valid
Chuck Lever <[email protected]>
svcrdma: Ignore source port when computing DRC hash
Paul Menzel <[email protected]>
nfsd: Fix overflow causing non-working mounts on 1 TB machines
Wanpeng Li <[email protected]>
KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC
Paolo Bonzini <[email protected]>
KVM: x86: degrade WARN to pr_warn_ratelimited
Martin Schwidefsky <[email protected]>
s390/mm: fix pxd_bad with folded page tables
Linus Torvalds <[email protected]>
tty: rocket: fix incorrect forward declaration of 'rp_init()'
Nikolay Borisov <[email protected]>
btrfs: Ensure replaced device doesn't have pending chunk allocation
Shakeel Butt <[email protected]>
mm/vmscan.c: prevent useless kswapd loops
Petr Mladek <[email protected]>
ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code()
Robert Beckett <[email protected]>
drm/imx: only send event on crtc disable if kept disabled
Robert Beckett <[email protected]>
drm/imx: notify drm core before sending event during crtc disable
Lucas Stach <[email protected]>
drm/etnaviv: add missing failure path to destroy suballoc
Gerd Hoffmann <[email protected]>
drm/virtio: move drm_connector_update_edid_property() call
Alex Deucher <[email protected]>
drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE
Lyude Paul <[email protected]>
drm/amdgpu: Don't skip display settings in hwmgr_resume()
Evan Quan <[email protected]>
drm/amd/powerplay: use hardware fan control if no powerplay fan table
Chris Wilson <[email protected]>
drm/i915/ringbuffer: EMIT_INVALIDATE *before* switch context
Ard Biesheuvel <[email protected]>
arm64: kaslr: keep modules inside module region when KASAN is enabled
Joshua Scott <[email protected]>
ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node
Eiichi Tsukata <[email protected]>
tracing/snapshot: Resize spare buffer if size changed
Oleg Nesterov <[email protected]>
swap_readpage(): avoid blk_wake_io_task() if !synchronous
Eric Biggers <[email protected]>
fs/userfaultfd.c: disable irqs for fault_pending and event locks
Herbert Xu <[email protected]>
lib/mpi: Fix karactx leak in mpi_powm
Jan Kara <[email protected]>
dax: Fix xarray entry association for mixed mappings
Dennis Wassenberg <[email protected]>
ALSA: hda/realtek - Change front mic location for Lenovo M710q
Richard Sailer <[email protected]>
ALSA: hda/realtek: Add quirks for several Clevo notebook barebones
Colin Ian King <[email protected]>
ALSA: usb-audio: fix sign unintended sign extension on left shifts
Takashi Iwai <[email protected]>
ALSA: line6: Fix write on zero-sized buffer
Takashi Sakamoto <[email protected]>
ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
Colin Ian King <[email protected]>
ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
Vincent Whitchurch <[email protected]>
crypto: cryptd - Fix skcipher instance memory leak
Eric Biggers <[email protected]>
crypto: user - prevent operating on larval algorithms
Jann Horn <[email protected]>
ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
Wei Li <[email protected]>
ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper()
Josh Poimboeuf <[email protected]>
module: Fix livepatch/ftrace module text permissions race
Vasily Gorbik <[email protected]>
tracing: avoid build warning with HAVE_NOP_MCOUNT
swkhack <[email protected]>
mm/mlock.c: change count_mm_mlocked_page_nr return type
Manuel Traut <[email protected]>
scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE
Joel Savitz <[email protected]>
cpuset: restore sanity to cpuset_cpus_allowed_fallback()
Will Deacon <[email protected]>
arm64: tlbflush: Ensure start/end of address range are aligned to stride
Linus Walleij <[email protected]>
i2c: pca-platform: Fix GPIO lookup code
Vadim Pasternak <[email protected]>
platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow
Vadim Pasternak <[email protected]>
platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration
Mathew King <[email protected]>
platform/x86: intel-vbtn: Report switch events when event wakes device
Hans de Goede <[email protected]>
platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi
Alex Levin <[email protected]>
ASoC: Intel: sst: fix kmalloc call with wrong flags
Ranjani Sridharan <[email protected]>
ASoC: core: Fix deadlock in snd_soc_instantiate_card()
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Add quirk for GPD MicroPC
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Add quirk for GPD pocket2
H. Nikolaus Schaller <[email protected]>
gpio: pca953x: hack to fix 24 bit gpio expanders
Don Brace <[email protected]>
scsi: hpsa: correct ioaccel2 chaining
Amadeusz Sławiński <[email protected]>
SoC: rt274: Fix internal jack assignment in set_jack callback
Amadeusz Sławiński <[email protected]>
ALSA: hdac: fix memory release for SST and SOF drivers
Tzung-Bi Shih <[email protected]>
ASoC: core: move DAI pre-links initiation to snd_soc_instantiate_card
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: cht_bsw_rt5672: fix kernel oops with platform_name override
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: cht_bsw_nau8824: fix kernel oops with platform_name override
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: bytcht_es8316: fix kernel oops with platform_name override
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: cht_bsw_max98090: fix kernel oops with platform_name override
Andrzej Pietrasiewicz <[email protected]>
usb: gadget: dwc2: fix zlp handling
Alexandre Belloni <[email protected]>
usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
Young Xiao <[email protected]>
usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
Kan Liang <[email protected]>
x86/CPU: Add more Icelake model numbers
Marcus Cooper <[email protected]>
ASoC: sun4i-i2s: Add offset to RX channel select
Marcus Cooper <[email protected]>
ASoC: sun4i-i2s: Fix sun8i tx channel offset mask
Yu-Hsuan Hsu <[email protected]>
ASoC: max98090: remove 24-bit format support if RJ is 0
Hsin-Yi Wang <[email protected]>
drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable()
Hsin-Yi Wang <[email protected]>
drm/mediatek: clear num_pipes when unbind driver
Hsin-Yi Wang <[email protected]>
drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver
Hsin-Yi Wang <[email protected]>
drm/mediatek: unbind components in mtk_drm_unbind()
Hsin-Yi Wang <[email protected]>
drm/mediatek: fix unbind functions
Ranjani Sridharan <[email protected]>
ASoC: hda: fix unbalanced codec dev refcount for HDA_DEV_ASOC
Kovács Tamás <[email protected]>
ASoC: Intel: Baytrail: add quirk for Aegex 10 (RU2) tablet
Błażej Szczygieł <[email protected]>
HID: a4tech: fix horizontal scrolling
Lu Baolu <[email protected]>
iommu/vt-d: Set the right field for Page Walk Snoop
Ranjani Sridharan <[email protected]>
ASoC: core: lock client_mutex while removing link components
YueHaibing <[email protected]>
spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
Viorel Suman <[email protected]>
ASoC: ak4458: rstn_control - return a non-zero on error only
Libin Yang <[email protected]>
ASoC: soc-pcm: BE dai needs prepare when pause release after resume
Viorel Suman <[email protected]>
ASoC: ak4458: add return value for ak4458_probe
Matt Flax <[email protected]>
ASoC : cs4265 : readable register too low
Kai-Heng Feng <[email protected]>
HID: i2c-hid: add iBall Aer3 to descriptor override
Matthew Wilcox (Oracle) <[email protected]>
idr: Fix idr_get_next race with idr_remove
Florian Westphal <[email protected]>
netfilter: nft_flow_offload: IPCB is only valid for ipv4 family
Florian Westphal <[email protected]>
netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment
Florian Westphal <[email protected]>
netfilter: nft_flow_offload: set liberal tracking mode for tcp
Florian Westphal <[email protected]>
netfilter: nf_flow_table: ignore DF bit setting
Oleg Nesterov <[email protected]>
signal: remove the wrong signal_pending() check in restore_user_sigmask()
Matias Karhumaa <[email protected]>
Bluetooth: Fix faulty expression for minimum encryption key size check
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 8 ++++ arch/arm64/include/asm/tlbflush.h | 3 ++ arch/arm64/kernel/module.c | 8 +++- arch/mips/Makefile | 3 +- arch/mips/mm/mmap.c | 2 +- arch/mips/mm/tlbex.c | 29 +++++++++----- arch/s390/include/asm/pgtable.h | 33 +++++++++------- arch/x86/include/asm/intel-family.h | 3 ++ arch/x86/kernel/ftrace.c | 3 ++ arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/x86.c | 6 +-- crypto/cryptd.c | 1 + crypto/crypto_user_base.c | 3 ++ drivers/dma/dma-jz4780.c | 5 ++- drivers/dma/imx-sdma.c | 4 +- drivers/dma/qcom/bam_dma.c | 3 ++ drivers/gpio/gpio-pca953x.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 19 --------- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +- .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 4 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 4 ++ drivers/gpu/drm/drm_panel_orientation_quirks.c | 32 +++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 7 +++- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +-- drivers/gpu/drm/imx/ipuv3-crtc.c | 6 +-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 8 ++-- drivers/gpu/drm/mediatek/mtk_dsi.c | 12 +++++- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- drivers/hid/hid-a4tech.c | 11 ++++-- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++ drivers/i2c/busses/i2c-pca-platform.c | 3 +- drivers/iommu/intel-pasid.c | 2 +- drivers/platform/mellanox/mlxreg-hotplug.c | 1 + drivers/platform/x86/asus-nb-wmi.c | 8 ++++ drivers/platform/x86/asus-wmi.c | 2 +- drivers/platform/x86/asus-wmi.h | 1 + drivers/platform/x86/intel-vbtn.c | 16 +++++++- drivers/platform/x86/mlx-platform.c | 2 +- drivers/scsi/hpsa.c | 7 +++- drivers/scsi/hpsa_cmd.h | 1 + drivers/spi/spi-bitbang.c | 2 +- drivers/target/target_core_iblock.c | 2 +- drivers/tty/rocket.c | 2 +- drivers/usb/dwc2/gadget.c | 20 ++++++---- drivers/usb/gadget/udc/fusb300_udc.c | 5 +++ drivers/usb/gadget/udc/lpc32xx_udc.c | 3 +- fs/Kconfig | 1 - fs/aio.c | 28 +++++++++---- fs/btrfs/dev-replace.c | 26 +++++++----- fs/btrfs/volumes.c | 5 ++- fs/btrfs/volumes.h | 5 +++ fs/dax.c | 9 ++--- fs/eventpoll.c | 4 +- fs/io_uring.c | 2 +- fs/nfsd/nfs4state.c | 2 +- fs/select.c | 18 +++------ fs/userfaultfd.c | 42 ++++++++++++-------- include/linux/signal.h | 2 +- kernel/cgroup/cpuset.c | 15 ++++++- kernel/livepatch/core.c | 6 +++ kernel/ptrace.c | 4 +- kernel/signal.c | 5 ++- kernel/trace/ftrace.c | 12 +++--- kernel/trace/trace.c | 10 +++-- lib/idr.c | 14 ++++++- lib/mpi/mpi-pow.c | 6 +-- mm/mlock.c | 4 +- mm/page_io.c | 13 +++--- mm/vmscan.c | 27 +++++++------ net/bluetooth/l2cap_core.c | 2 +- net/netfilter/nf_flow_table_ip.c | 3 +- net/netfilter/nft_flow_offload.c | 31 ++++++++++----- net/sunrpc/xprtrdma/svc_rdma_transport.c | 7 +++- scripts/decode_stacktrace.sh | 2 +- sound/core/seq/oss/seq_oss_ioctl.c | 2 +- sound/core/seq/oss/seq_oss_rw.c | 2 +- sound/firewire/amdtp-am824.c | 2 +- sound/hda/ext/hdac_ext_bus.c | 1 - sound/pci/hda/hda_codec.c | 9 ++++- sound/pci/hda/patch_realtek.c | 8 ++-- sound/soc/codecs/ak4458.c | 18 +++++---- sound/soc/codecs/cs4265.c | 2 +- sound/soc/codecs/max98090.c | 16 ++++++++ sound/soc/codecs/rt274.c | 3 +- sound/soc/codecs/rt5670.c | 12 ++++++ sound/soc/intel/atom/sst/sst_pvt.c | 4 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/intel/common/soc-acpi-intel-byt-match.c | 17 ++++++++ sound/soc/soc-core.c | 29 ++++++-------- sound/soc/soc-pcm.c | 3 +- sound/soc/sunxi/sun4i-i2s.c | 6 ++- sound/usb/line6/pcm.c | 5 +++ sound/usb/mixer_quirks.c | 4 +- tools/testing/radix-tree/idr-test.c | 46 ++++++++++++++++++++++ 99 files changed, 570 insertions(+), 254 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/96 Bluetooth: Fix faulty expression for minimum encryption key size check
From: Matias Karhumaa <[email protected]>
commit eca94432934fe5f141d084f2e36ee2c0e614cc04 upstream.
Fix minimum encryption key size check so that HCI_MIN_ENC_KEY_SIZE is also allowed as stated in the comment.
This bug caused connection problems with devices having maximum encryption key size of 7 octets (56-bit).
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203997
--- net/bluetooth/l2cap_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +1 -1
@@ -1353,7 +1353,7 @@ static bool l2cap_check_enc_key_size(str* actually encrypted before enforcing a key size. */ return (!test_bit (HCI_CONN_ENCRYPT , &hcon->flags) || - hcon->enc_key_size >HCI_MIN_ENC_KEY_SIZE ); + hcon->enc_key_size >=HCI_MIN_ENC_KEY_SIZE ); }static void l2cap_do_start (struct l2cap_chan *chan)
Greg Kroah-Hartman
maintainerPATCH 2/96 signal: remove the wrong signal_pending() check in restore_user_sigmask()
In reply to Greg Kroah-HartmanFrom: Oleg Nesterov <[email protected]>
commit 97abc889ee296faf95ca0e978340fb7b942a3e32 upstream.
This is the minimal fix for stable, I'll send cleanups later.
Commit 854a6ed56839 ("signal: Add restore_user_sigmask()") introduced the visible change which breaks user-space: a signal temporary unblocked by set_user_sigmask() can be delivered even if the caller returns success or timeout.
Change restore_user_sigmask() to accept the additional "interrupted" argument which should be used instead of signal_pending() check, and update the callers.
Eric said:
: For clarity. I don't think this is required by posix, or fundamentally to : remove the races in select. It is what linux has always done and we have : applications who care so I agree this fix is needed.
:
: Further in any case where the semantic change that this patch rolls back : (aka where allowing a signal to be delivered and the select like call to : complete) would be advantage we can do as well if not better by using : signalfd.
:
: Michael is there any chance we can get this guarantee of the linux : implementation of pselect and friends clearly documented. The guarantee : that if the system call completes successfully we are guaranteed that no : signal that is unblocked by using sigmask will be delivered?
--- fs/aio.c | 28 ++++++++++++++++++++-------- fs/eventpoll.c | 4 ++-- fs/io_uring.c | 2 +- fs/select.c | 18 ++++++------------ include/linux/signal.h | 2 +- kernel/signal.c | 5 +++-- 6 files changed, 33 insertions(+), 26 deletions(-)
fs/aio.c +20 -8
@@ -2095,6 +2095,7 @@ SYSCALL_DEFINE6(io_pgetevents,struct __aio_sigset ksig = {NULL , };sigset_t ksigmask, sigsaved;struct timespec64 ts; +bool interrupted;int ret;if (timeout &&unlikely (get_timespec64 (&ts, timeout)))
@@ -2108,8 +2109,10 @@ SYSCALL_DEFINE6(io_pgetevents,return ret; ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &ts :NULL ); -restore_user_sigmask (ksig.sigmask, &sigsaved); -if (signal_pending (current) && !ret) + + interrupted =signal_pending (current); +restore_user_sigmask (ksig.sigmask, &sigsaved, interrupted); +if (interrupted && !ret) ret = -ERESTARTNOHAND ;return ret;
@@ -2128,6 +2131,7 @@ SYSCALL_DEFINE6(io_pgetevents_time32,struct __aio_sigset ksig = {NULL , };sigset_t ksigmask, sigsaved;struct timespec64 ts; +bool interrupted;int ret;if (timeout &&unlikely (get_old_timespec32 (&ts, timeout)))
@@ -2142,8 +2146,10 @@ SYSCALL_DEFINE6(io_pgetevents_time32,return ret; ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &ts :NULL ); -restore_user_sigmask (ksig.sigmask, &sigsaved); -if (signal_pending (current) && !ret) + + interrupted =signal_pending (current); +restore_user_sigmask (ksig.sigmask, &sigsaved, interrupted); +if (interrupted && !ret) ret = -ERESTARTNOHAND ;return ret;
@@ -2193,6 +2199,7 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,struct __compat_aio_sigset ksig = {NULL , };sigset_t ksigmask, sigsaved;struct timespec64 t; +bool interrupted;int ret;if (timeout &&get_old_timespec32 (&t, timeout))
@@ -2206,8 +2213,10 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,return ret; ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &t :NULL ); -restore_user_sigmask (ksig.sigmask, &sigsaved); -if (signal_pending (current) && !ret) + + interrupted =signal_pending (current); +restore_user_sigmask (ksig.sigmask, &sigsaved, interrupted); +if (interrupted && !ret) ret = -ERESTARTNOHAND ;return ret;
@@ -2226,6 +2235,7 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents_timstruct __compat_aio_sigset ksig = {NULL , };sigset_t ksigmask, sigsaved;struct timespec64 t; +bool interrupted;int ret;if (timeout &&get_timespec64 (&t, timeout))
@@ -2239,8 +2249,10 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents_timreturn ret; ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &t :NULL ); -restore_user_sigmask (ksig.sigmask, &sigsaved); -if (signal_pending (current) && !ret) + + interrupted =signal_pending (current); +restore_user_sigmask (ksig.sigmask, &sigsaved, interrupted); +if (interrupted && !ret) ret = -ERESTARTNOHAND ;return ret;
fs/eventpoll.c +2 -2
@@ -2330,7 +2330,7 @@ SYSCALL_DEFINE6(epoll_pwait, int, epfd, error =do_epoll_wait (epfd, events, maxevents, timeout); -restore_user_sigmask (sigmask, &sigsaved); +restore_user_sigmask (sigmask, &sigsaved, error == -EINTR );return error; }
@@ -2355,7 +2355,7 @@ COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, err =do_epoll_wait (epfd, events, maxevents, timeout); -restore_user_sigmask (sigmask, &sigsaved); +restore_user_sigmask (sigmask, &sigsaved, err == -EINTR );return err; }
fs/io_uring.c +1 -1
@@ -2096,7 +2096,7 @@ static int io_cqring_wait(struct io_ringfinish_wait (&ctx->wait, &wait);if (sig) -restore_user_sigmask (sig, &sigsaved); +restore_user_sigmask (sig, &sigsaved, ret == -EINTR );return READ_ONCE (ring->r.head) ==READ_ONCE (ring->r.tail) ? ret :0 ; }
fs/select.c +6 -12
@@ -758,10 +758,9 @@ static long do_pselect(int n, fd_set __ureturn ret; ret =core_sys_select (n, inp, outp, exp, to); +restore_user_sigmask (sigmask, &sigsaved, ret == -ERESTARTNOHAND ); ret =poll_select_copy_remaining (&end_time, tsp, type, ret); -restore_user_sigmask (sigmask, &sigsaved); -return ret; }
@@ -1106,8 +1105,7 @@ SYSCALL_DEFINE5(ppoll, struct pollfd __u ret =do_sys_poll (ufds, nfds, to); -restore_user_sigmask (sigmask, &sigsaved); - +restore_user_sigmask (sigmask, &sigsaved, ret == -EINTR );/* We can restart this syscall, usually */ if (ret == -EINTR ) ret = -ERESTARTNOHAND ;
@@ -1142,8 +1140,7 @@ SYSCALL_DEFINE5(ppoll_time32, struct pol ret =do_sys_poll (ufds, nfds, to); -restore_user_sigmask (sigmask, &sigsaved); - +restore_user_sigmask (sigmask, &sigsaved, ret == -EINTR );/* We can restart this syscall, usually */ if (ret == -EINTR ) ret = -ERESTARTNOHAND ;
@@ -1350,10 +1347,9 @@ static long do_compat_pselect(int n, comreturn ret; ret =compat_core_sys_select (n, inp, outp, exp, to); +restore_user_sigmask (sigmask, &sigsaved, ret == -ERESTARTNOHAND ); ret =poll_select_copy_remaining (&end_time, tsp, type, ret); -restore_user_sigmask (sigmask, &sigsaved); -return ret; }
@@ -1425,8 +1421,7 @@ COMPAT_SYSCALL_DEFINE5(ppoll_time32, str ret =do_sys_poll (ufds, nfds, to); -restore_user_sigmask (sigmask, &sigsaved); - +restore_user_sigmask (sigmask, &sigsaved, ret == -EINTR );/* We can restart this syscall, usually */ if (ret == -EINTR ) ret = -ERESTARTNOHAND ;
@@ -1461,8 +1456,7 @@ COMPAT_SYSCALL_DEFINE5(ppoll_time64, str ret =do_sys_poll (ufds, nfds, to); -restore_user_sigmask (sigmask, &sigsaved); - +restore_user_sigmask (sigmask, &sigsaved, ret == -EINTR );/* We can restart this syscall, usually */ if (ret == -EINTR ) ret = -ERESTARTNOHAND ;
include/linux/signal.h +1 -1
@@ -276,7 +276,7 @@ extern int sigprocmask(int, sigset_t *,extern int set_user_sigmask (const sigset_t __user *usigmask,sigset_t *set,sigset_t *oldset,size_t sigsetsize);extern void restore_user_sigmask (const void __user *usigmask, -sigset_t *sigsaved); +sigset_t *sigsaved,bool interrupted);extern void set_current_blocked (sigset_t *);extern void __set_current_blocked (const sigset_t *);extern int show_unhandled_signals;
kernel/signal.c +3 -2
@@ -2851,7 +2851,8 @@ EXPORT_SYMBOL(set_compat_user_sigmask);* This is useful for syscalls such as ppoll, pselect, io_pgetevents and * epoll_pwait where a new sigmask is passed in from userland for the syscalls. */ -void restore_user_sigmask (const void __user *usigmask,sigset_t *sigsaved) +void restore_user_sigmask (const void __user *usigmask,sigset_t *sigsaved, +bool interrupted) {if (!usigmask)
@@ -2861,7 +2862,7 @@ void restore_user_sigmask(const void __u* Restoring sigmask here can lead to delivering signals that the above * syscalls are intended to block because of the sigmask passed in. */ -if (signal_pending (current)) { +if (interrupted) { current->saved_sigmask = *sigsaved;set_restore_sigmask ();return ;
Greg Kroah-Hartman
maintainerPATCH 3/96 netfilter: nf_flow_table: ignore DF bit setting
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit e75b3e1c9bc5b997d09bdf8eb72ab3dd3c1a7072 upstream.
Its irrelevant if the DF bit is set or not, we must pass packet to stack in either case.
If the DF bit is set, we must pass it to stack so the appropriate ICMP error can be generated.
If the DF is not set, we must pass it to stack for fragmentation.
--- net/netfilter/nf_flow_table_ip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/netfilter/nf_flow_table_ip.c +1 -2
@@ -246,8 +246,7 @@ nf_flow_offload_ip_hook(void *priv, stru flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); rt = (struct rtable *)flow->tuplehash[dir].tuple.dst_cache; -if (unlikely (nf_flow_exceeds_mtu (skb, flow->tuplehash[dir].tuple.mtu)) && - (ip_hdr (skb)->frag_off &htons (IP_DF )) !=0 ) +if (unlikely (nf_flow_exceeds_mtu (skb, flow->tuplehash[dir].tuple.mtu)))return NF_ACCEPT ;if (skb_try_make_writable (skb,sizeof (*iph)))
Greg Kroah-Hartman
maintainerPATCH 4/96 netfilter: nft_flow_offload: set liberal tracking mode for tcp
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit 8437a6209f76f85a2db1abb12a9bde2170801617 upstream.
Without it, whenever a packet has to be pushed up the stack (e.g. because of mtu mismatch), then conntrack will flag packets as invalid, which in turn breaks NAT.
--- net/netfilter/nft_flow_offload.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/netfilter/nft_flow_offload.c +8 -0
@@ -72,6 +72,7 @@ static void nft_flow_offload_eval(conststruct nf_flow_route route;struct flow_offload *flow;enum ip_conntrack_dir dir; +bool is_tcp = false;struct nf_conn *ct;int ret;
@@ -84,6 +85,8 @@ static void nft_flow_offload_eval(constswitch (ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.protonum) {case IPPROTO_TCP : + is_tcp = true; +break ;case IPPROTO_UDP :break ;default :
@@ -109,6 +112,11 @@ static void nft_flow_offload_eval(constif (!flow) goto err_flow_alloc; +if (is_tcp) { + ct->proto.tcp.seen[0 ].flags |=IP_CT_TCP_FLAG_BE_LIBERAL ; + ct->proto.tcp.seen[1 ].flags |=IP_CT_TCP_FLAG_BE_LIBERAL ; + } + ret =flow_offload_add (flowtable, flow);if (ret <0 ) goto err_flow_add;
Greg Kroah-Hartman
maintainerPATCH 5/96 netfilter: nft_flow_offload: dont offload when sequence numbers need adjustment
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit 91a9048f238063dde7feea752b9dd386f7e3808b upstream.
We can't deal with tcp sequence number rewrite in flow_offload. While at it, simplify helper check, we only need to know if the extension is present, we don't need the helper data.
--- net/netfilter/nft_flow_offload.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/netfilter/nft_flow_offload.c +2 -4
@@ -12,7 +12,6 @@#include <net/netfilter/nf_conntrack_core.h> #include <linux/netfilter/nf_conntrack_common.h> #include <net/netfilter/nf_flow_table.h> -#include <net/netfilter/nf_conntrack_helper.h> struct nft_flow_offload {struct nft_flowtable *flowtable;
@@ -67,7 +66,6 @@ static void nft_flow_offload_eval(const {struct nft_flow_offload *priv =nft_expr_priv (expr);struct nf_flowtable *flowtable = &priv->flowtable->data; -const struct nf_conn_help *help;enum ip_conntrack_info ctinfo;struct nf_flow_route route;struct flow_offload *flow;
@@ -93,8 +91,8 @@ static void nft_flow_offload_eval(const goto out; } - help =nfct_help (ct); -if (help) +if (nf_ct_ext_exist (ct,NF_CT_EXT_HELPER ) || + ct->status &IPS_SEQ_ADJUST ) goto out; if (ctinfo == IP_CT_NEW ||
Greg Kroah-Hartman
maintainerPATCH 6/96 netfilter: nft_flow_offload: IPCB is only valid for ipv4 family
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit 69aeb538587e087bfc81dd1f465eab3558ff3158 upstream.
Guard this with a check vs. ipv4, IPCB isn't valid in ipv6 case.
--- net/netfilter/nft_flow_offload.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
net/netfilter/nft_flow_offload.c +11 -6
@@ -48,15 +48,20 @@ static int nft_flow_route(const struct nreturn 0 ; } -static bool nft_flow_offload_skip (struct sk_buff *skb) +static bool nft_flow_offload_skip (struct sk_buff *skb,int family) { -struct ip_options *opt = &(IPCB (skb)->opt); - -if (unlikely (opt->optlen)) -return true;if (skb_sec_path (skb))return true; +if (family ==NFPROTO_IPV4 ) { +const struct ip_options *opt; + + opt = &(IPCB (skb)->opt); + +if (unlikely (opt->optlen)) +return true; + } +return false; }
@@ -74,7 +79,7 @@ static void nft_flow_offload_eval(conststruct nf_conn *ct;int ret; -if (nft_flow_offload_skip (pkt->skb)) +if (nft_flow_offload_skip (pkt->skb,nft_pf (pkt))) goto out; ct =nf_ct_get (pkt->skb, &ctinfo);
Greg Kroah-Hartman
maintainerPATCH 7/96 idr: Fix idr_get_next race with idr_remove
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
commit 5c089fd0c73411f2170ab795c9ffc16718c7d007 upstream.
If the entry is deleted from the IDR between the call to radix_tree_iter_find() and rcu_dereference_raw(), idr_get_next() will return NULL, which will end the iteration prematurely. We should instead continue to the next entry in the IDR. This only happens if the iteration is protected by the RCU lock. Most IDR users use a spinlock or semaphore to exclude simultaneous modifications. It was noticed once the PID allocator was converted to use the IDR, as it uses the RCU lock, but there may be other users elsewhere in the kernel.
We can't use the normal pattern of calling radix_tree_deref_retry() (which catches both a retry entry in a leaf node and a node entry in the root) as the IDR supports storing entries which are unaligned, which will trigger an infinite loop if they are encountered. Instead, we have to explicitly check whether the entry is a retry entry.
--- lib/idr.c | 14 +++++++++- tools/testing/radix-tree/idr-test.c | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-)
lib/idr.c +12 -2
@@ -227,11 +227,21 @@ void *idr_get_next(struct idr *idr, int {struct radix_tree_iter iter;void __rcu **slot; +void *entry =NULL ;unsigned long base = idr->idr_base;unsigned long id = *nextid; id = (id < base) ?0 : id - base; - slot =radix_tree_iter_find (&idr->idr_rt, &iter, id); +radix_tree_for_each_slot (slot, &idr->idr_rt, &iter, id) { + entry =rcu_dereference_raw (*slot); +if (!entry) +continue ; +if (!xa_is_internal (entry)) +break ; +if (slot != &idr->idr_rt.xa_head && !xa_is_retry (entry)) +break ; + slot =radix_tree_iter_retry (&iter); + }if (!slot)return NULL ; id = iter.index + base;
@@ -240,7 +250,7 @@ void *idr_get_next(struct idr *idr, intreturn NULL ; *nextid = id; -return rcu_dereference_raw (*slot); +return entry; }EXPORT_SYMBOL (idr_get_next);
tools/testing/radix-tree/idr-test.c +46 -0
58 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 8/96 HID: i2c-hid: add iBall Aer3 to descriptor override
In reply to Greg Kroah-Hartman[ Upstream commit eb6964fa6509b4f1152313f1e0bb67f0c54a6046 ]
This device uses the SIPODEV SP1064 touchpad, which does not supply descriptors, so it has to be added to the override list.
--- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +8 -0
@@ -354,6 +354,14 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = { }, .driver_data = (void *)&sipodev_desc }, + { + .ident = "iBall Aer3", + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "iBall"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Aer3"), + }, + .driver_data = (void *)&sipodev_desc + }, { } /* Terminate list */ };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/96 ASoC : cs4265 : readable register too low
In reply to Greg Kroah-Hartman[ Upstream commit f3df05c805983427319eddc2411a2105ee1757cf ]
The cs4265_readable_register function stopped short of the maximum register.
An example bug is taken from :
https://github.com/Audio-Injector/Ultra/issues/25
Where alsactl store fails with :
Cannot read control '2,0,0,C Data Buffer,0': Input/output error
This patch fixes the bug by setting the cs4265 to have readable registers up to the maximum hardware register CS4265_MAX_REGISTER.
--- sound/soc/codecs/cs4265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs4265.c +1 -1
@@ -60,7 +60,7 @@ static const struct reg_default cs4265_reg_defaults[] = {static bool cs4265_readable_register (struct device *dev,unsigned int reg) {switch (reg) { - case CS4265_CHIP_ID ... CS4265_SPDIF_CTL2: + case CS4265_CHIP_ID ... CS4265_MAX_REGISTER:return true;default :return false;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/96 ASoC: ak4458: add return value for ak4458_probe
In reply to Greg Kroah-Hartman[ Upstream commit a8dee20d792432740509237943700fbcfc230bad ]
AK4458 is probed successfully even if AK4458 is not present - this is caused by probe function returning no error on i2c access failure. Return an error on probe if i2c access has failed.
--- sound/soc/codecs/ak4458.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
sound/soc/codecs/ak4458.c +7 -6
@@ -536,9 +536,10 @@ static void ak4458_power_on(struct ak4458_priv *ak4458) } } -static void ak4458_init (struct snd_soc_component *component) +static int ak4458_init (struct snd_soc_component *component) {struct ak4458_priv *ak4458 =snd_soc_component_get_drvdata (component); +int ret;/* External Mute ON */ if (ak4458->mute_gpiod)
@@ -546,21 +547,21 @@ static void ak4458_init(struct snd_soc_component *component)ak4458_power_on (ak4458); -snd_soc_component_update_bits (component,AK4458_00_CONTROL1 , + ret =snd_soc_component_update_bits (component,AK4458_00_CONTROL1 ,0x80 ,0x80 );/* ACKS bit = 1; 10000000 */ +if (ret <0 ) +return ret; -ak4458_rstn_control (component,1 ); +return ak4458_rstn_control (component,1 ); }static int ak4458_probe (struct snd_soc_component *component) {struct ak4458_priv *ak4458 =snd_soc_component_get_drvdata (component); -ak4458_init (component); - ak4458->fs =48000 ; -return 0 ; +return ak4458_init (component); }static void ak4458_remove (struct snd_soc_component *component)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/96 ASoC: soc-pcm: BE dai needs prepare when pause release after resume
In reply to Greg Kroah-Hartman[ Upstream commit 5087a8f17df868601cd7568299e91c28086d2b45 ]
If playback/capture is paused and system enters S3, after system returns from suspend, BE dai needs to call prepare() callback when playback/capture is released from pause if RESUME_INFO flag is not set.
Currently, the dpcm_be_dai_prepare() function will block calling prepare() if the pcm is in SND_SOC_DPCM_STATE_PAUSED state. This will cause the following test case fail if the pcm uses BE:
playback -> pause -> S3 suspend -> S3 resume -> pause release
The playback may exit abnormally when pause is released because the BE dai prepare() is not called.
This patch allows dpcm_be_dai_prepare() to call dai prepare() callback in SND_SOC_DPCM_STATE_PAUSED state.
--- sound/soc/soc-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/soc-pcm.c +2 -1
@@ -2469,7 +2469,8 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream)if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_HW_PARAMS ) && (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_STOP ) && - (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_SUSPEND )) + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_SUSPEND ) && + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED ))continue ; dev_dbg(be->dev, "ASoC: prepare BE %s\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/96 ASoC: ak4458: rstn_control - return a non-zero on error only
In reply to Greg Kroah-Hartman[ Upstream commit 176a11834b65ec35e3b7a953f87fb9cc41309497 ]
snd_soc_component_update_bits() may return 1 if operation was successful and the value of the register changed. Return a non-zero in ak4458_rstn_control for an error only.
--- sound/soc/codecs/ak4458.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/ak4458.c +4 -1
@@ -304,7 +304,10 @@ static int ak4458_rstn_control(struct snd_soc_component *component, int bit)AK4458_00_CONTROL1 ,AK4458_RSTN_MASK , 0x0); -return ret; +if (ret <0 ) +return ret; + +return 0 ; } static int ak4458_hw_params(struct snd_pcm_substream *substream,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/96 spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
In reply to Greg Kroah-Hartman[ Upstream commit 5caaf29af5ca82d5da8bc1d0ad07d9e664ccf1d8 ]
If spi_register_master fails in spi_bitbang_start because device_add failure, We should return the error code other than 0, otherwise calling spi_bitbang_stop may trigger NULL pointer dereference like this:
BUG: KASAN: null-ptr-deref in __list_del_entry_valid+0x45/0xd0 Read of size 8 at addr 0000000000000000 by task syz-executor.0/3661 CPU: 0 PID: 3661 Comm: syz-executor.0 Not tainted 5.1.0+ #28 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: dump_stack+0xa9/0x10e ? __list_del_entry_valid+0x45/0xd0 ? __list_del_entry_valid+0x45/0xd0 __kasan_report+0x171/0x18d ? __list_del_entry_valid+0x45/0xd0 kasan_report+0xe/0x20 __list_del_entry_valid+0x45/0xd0 spi_unregister_controller+0x99/0x1b0 spi_lm70llp_attach+0x3ae/0x4b0 [spi_lm70llp] ? 0xffffffffc1128000 ? klist_next+0x131/0x1e0 ? driver_detach+0x40/0x40 [parport] port_check+0x3b/0x50 [parport] bus_for_each_dev+0x115/0x180 ? subsys_dev_iter_exit+0x20/0x20 __parport_register_driver+0x1f0/0x210 [parport] ? 0xffffffffc1150000 do_one_initcall+0xb9/0x3b5 ? perf_trace_initcall_level+0x270/0x270 ? kasan_unpoison_shadow+0x30/0x40 ? kasan_unpoison_shadow+0x30/0x40 do_init_module+0xe0/0x330 load_module+0x38eb/0x4270 ? module_frob_arch_sections+0x20/0x20 ? kernel_read_file+0x188/0x3f0 ? find_held_lock+0x6d/0xd0 ? fput_many+0x1a/0xe0 ? __do_sys_finit_module+0x162/0x190 __do_sys_finit_module+0x162/0x190 ? __ia32_sys_init_module+0x40/0x40 ? __mutex_unlock_slowpath+0xb4/0x3f0 ? wait_for_completion+0x240/0x240 ? vfs_write+0x160/0x2a0 ? lockdep_hardirqs_off+0xb5/0x100 ? mark_held_locks+0x1a/0x90 ? do_syscall_64+0x14/0x2a0 do_syscall_64+0x72/0x2a0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/spi/spi-bitbang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-bitbang.c +1 -1
@@ -403,7 +403,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)if (ret)spi_master_put (master); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (spi_bitbang_start);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/96 ASoC: core: lock client_mutex while removing link components
In reply to Greg Kroah-Hartman[ Upstream commit 34ac3c3eb8f0c07252ceddf0a22dd240e5c91ccb ]
Removing link components results in topology unloading. So, acquire the client_mutex before removing components in soc_remove_link_components. This will prevent the lockdep warning seen when dai links are removed during topology removal.
--- sound/soc/soc-core.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/soc-core.c +2 -0
@@ -1008,12 +1008,14 @@ static void soc_remove_link_components(struct snd_soc_card *card,struct snd_soc_component *component;struct snd_soc_rtdcom_list *rtdcom; +mutex_lock (&client_mutex);for_each_rtdcom (rtd, rtdcom) { component = rtdcom->component;if (component->driver->remove_order == order)soc_remove_component (component); } +mutex_unlock (&client_mutex); }static void soc_remove_dai_links (struct snd_soc_card *card)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/96 iommu/vt-d: Set the right field for Page Walk Snoop
In reply to Greg Kroah-Hartman[ Upstream commit 66d78ad316b0e1ca5ae19663468554e2c0e31c26 ]
Set the page walk snoop to the right bit, otherwise the domain id field will be overlapped.
--- drivers/iommu/intel-pasid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel-pasid.c +1 -1
@@ -387,7 +387,7 @@ static inline void pasid_set_present(struct pasid_entry *pe)*/ static inline void pasid_set_page_snoop (struct pasid_entry *pe,bool value) { -pasid_set_bits (&pe->val[1 ],1 <<23 , value); +pasid_set_bits (&pe->val[1 ],1 <<23 , value <<23 ); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/96 HID: a4tech: fix horizontal scrolling
In reply to Greg Kroah-Hartman[ Upstream commit abf82e8f7e9af40a49e3d905187c662a43c96c8f ]
Since recent high resolution scrolling changes the A4Tech driver must check for the "REL_WHEEL_HI_RES" usage code.
--- drivers/hid/hid-a4tech.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/hid/hid-a4tech.c +8 -3
@@ -38,8 +38,10 @@ static int a4_input_mapped(struct hid_device *hdev, struct hid_input *hi, {struct a4tech_sc *a4 =hid_get_drvdata (hdev); -if (usage->type ==EV_REL && usage->code ==REL_WHEEL ) +if (usage->type ==EV_REL && usage->code ==REL_WHEEL_HI_RES ) {set_bit (REL_HWHEEL , *bit); +set_bit (REL_HWHEEL_HI_RES , *bit); + }if ((a4->quirks &A4_2WHEEL_MOUSE_HACK_7 ) && usage->hid ==0x00090007 )return -1 ;
@@ -60,7 +62,7 @@ static int a4_event(struct hid_device *hdev, struct hid_field *field, input = field->hidinput->input;if (a4->quirks &A4_2WHEEL_MOUSE_HACK_B8 ) { -if (usage->type ==EV_REL && usage->code ==REL_WHEEL ) { +if (usage->type ==EV_REL && usage->code ==REL_WHEEL_HI_RES ) { a4->delayed_value = value;return 1 ; }
@@ -68,6 +70,8 @@ static int a4_event(struct hid_device *hdev, struct hid_field *field,if (usage->hid ==0x000100b8 ) {input_event (input,EV_REL , value ?REL_HWHEEL :REL_WHEEL , a4->delayed_value); +input_event (input,EV_REL , value ?REL_HWHEEL_HI_RES : +REL_WHEEL_HI_RES , a4->delayed_value *120 );return 1 ; } }
@@ -77,8 +81,9 @@ static int a4_event(struct hid_device *hdev, struct hid_field *field,return 1 ; } -if (usage->code ==REL_WHEEL && a4->hw_wheel) { +if (usage->code ==REL_WHEEL_HI_RES && a4->hw_wheel) {input_event (input, usage->type,REL_HWHEEL , value); +input_event (input, usage->type,REL_HWHEEL_HI_RES , value *120 );return 1 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/96 ASoC: Intel: Baytrail: add quirk for Aegex 10 (RU2) tablet
In reply to Greg Kroah-Hartman[ Upstream commit 3e951e7914408aee196db77a5cb377801c85692a ]
This tablet has an incorrect acpi identifier just like Thinkpad10 tablet, which is why it is trying to load the RT5640 driver instead of the RT5762 driver. The RT5640 driver, on the other hand, checks the hardware ID, so no driver are loaded during boot. This fix resolves to load the RT5672 driver on this tablet during boot. It also provides the correct IO configuration, like the jack detect mode 3, for 1.8V pullup. I would like to thank Pierre-Louis Bossart for helping with this patch.
--- sound/soc/codecs/rt5670.c | 12 ++++++++++++ .../soc/intel/common/soc-acpi-intel-byt-match.c | 17 +++++++++++++++++ 2 files changed, 29 insertions(+)
sound/soc/codecs/rt5670.c +12 -0
@@ -2882,6 +2882,18 @@ static const struct dmi_system_id dmi_platform_intel_quirks[] = { RT5670_DEV_GPIO | RT5670_JD_MODE3), }, + { + .callback = rt5670_quirk_cb, + .ident = "Aegex 10 tablet (RU2)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AEGEX"), + DMI_MATCH(DMI_PRODUCT_VERSION, "RU2"), + }, + .driver_data = (unsigned long *)(RT5670_DMIC_EN | + RT5670_DMIC2_INR | + RT5670_DEV_GPIO | + RT5670_JD_MODE3), + }, {} };
sound/soc/intel/common/soc-acpi-intel-byt-match.c +17 -0
@@ -22,6 +22,7 @@ static unsigned long byt_machine_id;#define BYT_THINKPAD_10 1#define BYT_POV_P1006W 2 +#define BYT_AEGEX_10 3static int byt_thinkpad10_quirk_cb (const struct dmi_system_id *id) {
@@ -35,6 +36,12 @@ static int byt_pov_p1006w_quirk_cb(const struct dmi_system_id *id)return 1 ; } +static int byt_aegex10_quirk_cb (const struct dmi_system_id *id) +{ + byt_machine_id =BYT_AEGEX_10 ; +return 1 ; +} +static const struct dmi_system_id byt_table[] = { { .callback = byt_thinkpad10_quirk_cb,
@@ -75,9 +82,18 @@ static const struct dmi_system_id byt_table[] = { DMI_EXACT_MATCH(DMI_BOARD_NAME, "0E57"), }, }, + { + /* Aegex 10 tablet (RU2) */ + .callback = byt_aegex10_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AEGEX"), + DMI_MATCH(DMI_PRODUCT_VERSION, "RU2"), + }, + }, { } }; +/* The Thinkapd 10 and Aegex 10 tablets have the same ID problem */ static struct snd_soc_acpi_mach byt_thinkpad_10 = { .id ="10EC5640" , .drv_name ="cht-bsw-rt5672" ,
@@ -104,6 +120,7 @@ static struct snd_soc_acpi_mach *byt_quirk(void *arg)switch (byt_machine_id) {case BYT_THINKPAD_10 : +case BYT_AEGEX_10 :return &byt_thinkpad_10;case BYT_POV_P1006W :return &byt_pov_p1006w;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/96 ASoC: hda: fix unbalanced codec dev refcount for HDA_DEV_ASOC
In reply to Greg Kroah-Hartman[ Upstream commit d6947bb234dcc86e878d502516d0fb9d635aa2ae ]
HDA_DEV_ASOC type codec device refcounts are managed differently from HDA_DEV_LEGACY devices. The refcount is released explicitly in snd_hdac_ext_bus_device_remove() for ASOC type devices. So, remove the put_device() call in snd_hda_codec_dev_free() for such devices to make the refcount balanced. This will prevent the NULL pointer exception when the codec driver is released after the card is freed.
--- sound/pci/hda/hda_codec.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
sound/pci/hda/hda_codec.c +8 -1
@@ -840,7 +840,14 @@ static int snd_hda_codec_dev_free(struct snd_device *device)if (codec->core.type ==HDA_DEV_LEGACY )snd_hdac_device_unregister (&codec->core);codec_display_power (codec, false); -put_device (hda_codec_dev (codec)); + +/* +* In the case of ASoC HD-audio bus, the device refcount is released in +* snd_hdac_ext_bus_device_remove() explicitly. +*/ +if (codec->core.type ==HDA_DEV_LEGACY ) +put_device (hda_codec_dev (codec)); +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/96 drm/mediatek: fix unbind functions
In reply to Greg Kroah-Hartman[ Upstream commit 8fd7a37b191f93737f6280a9b5de65f98acc12c9 ]
detatch panel in mtk_dsi_destroy_conn_enc(), since .bind will try to attach it again.
--- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/mediatek/mtk_dsi.c +2 -0
@@ -844,6 +844,8 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi)/* Skip connector cleanup if creation was delegated to the bridge */ if (dsi->conn.dev)drm_connector_cleanup (&dsi->conn); +if (dsi->panel) +drm_panel_detach (dsi->panel); }static void mtk_dsi_ddp_start (struct mtk_ddp_comp *comp)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/96 drm/mediatek: unbind components in mtk_drm_unbind()
In reply to Greg Kroah-Hartman[ Upstream commit f0fd848342802bc0f74620d387eead53e8905804 ]
Unbinding components (i.e. mtk_dsi and mtk_disp_ovl/rdma/color) will trigger master(mtk_drm)'s .unbind(), and currently mtk_drm's unbind won't actually unbind components. During the next bind, mtk_drm_kms_init() is called, and the components are added back.
.unbind() should call mtk_drm_kms_deinit() to unbind components.
And since component_master_del() in .remove() will trigger .unbind(), which will also unregister device, it's fine to remove original functions called here.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -5
@@ -397,6 +397,7 @@ static void mtk_drm_unbind(struct device *dev)struct mtk_drm_private *private =dev_get_drvdata (dev);drm_dev_unregister (private->drm); +mtk_drm_kms_deinit (private->drm);drm_dev_put (private->drm); private->drm =NULL ; }
@@ -568,13 +569,8 @@ err_node:static int mtk_drm_remove (struct platform_device *pdev) {struct mtk_drm_private *private =platform_get_drvdata (pdev); -struct drm_device *drm = private->drm;int i; -drm_dev_unregister (drm); -mtk_drm_kms_deinit (drm); -drm_dev_put (drm); -component_master_del (&pdev->dev, &mtk_drm_ops);pm_runtime_disable (&pdev->dev);of_node_put (private->mutex_node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/96 drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver
In reply to Greg Kroah-Hartman[ Upstream commit cf49b24ffa62766f8f04cd1c4cf17b75d29b240a ]
shutdown all CRTC when unbinding drm driver.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -0
@@ -311,6 +311,7 @@ err_config_cleanup:static void mtk_drm_kms_deinit (struct drm_device *drm) {drm_kms_helper_poll_fini (drm); +drm_atomic_helper_shutdown (drm);component_unbind_all (drm->dev, drm);drm_mode_config_cleanup (drm);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/96 drm/mediatek: clear num_pipes when unbind driver
In reply to Greg Kroah-Hartman[ Upstream commit a4cd1d2b016d5d043ab2c4b9c4ec50a5805f5396 ]
num_pipes is used for mutex created in mtk_drm_crtc_create(). If we don't clear num_pipes count, when rebinding driver, the count will be accumulated. From mtk_disp_mutex_get(), there can only be at most 10 mutex id. Clear this number so it starts from 0 in every rebind.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -0
@@ -400,6 +400,7 @@ static void mtk_drm_unbind(struct device *dev)drm_dev_unregister (private->drm);mtk_drm_kms_deinit (private->drm);drm_dev_put (private->drm); + private->num_pipes =0 ; private->drm =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/96 drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable()
In reply to Greg Kroah-Hartman[ Upstream commit 2458d9d6d94be982b917e93c61a89b4426f32e31 ]
mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(), which needs ovl irq for drm_crtc_wait_one_vblank(), since after mtk_dsi_stop() is called, ovl irq will be disabled. If drm_crtc_wait_one_vblank() is called after last irq, it will timeout with this message: "vblank wait timed out on crtc 0". This happens sometimes when turning off the screen.
In drm_atomic_helper.c#disable_outputs(), the calling sequence when turning off the screen is:
1. mtk_dsi_encoder_disable()
--> mtk_output_dsi_disable()
--> mtk_dsi_stop(); /* sometimes make vblank timeout in
atomic_disable */
--> mtk_dsi_poweroff();
2. mtk_drm_crtc_atomic_disable()
--> drm_crtc_wait_one_vblank();
...
--> mtk_dsi_ddp_stop()
--> mtk_dsi_poweroff();mtk_dsi_poweroff() has reference count design, change to make mtk_dsi_stop() called in mtk_dsi_poweroff() when refcount is 0.
--- drivers/gpu/drm/mediatek/mtk_dsi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_dsi.c +9 -1
@@ -630,6 +630,15 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi)if (--dsi->refcount !=0 )return ; +/* +* mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since +* mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(), +* which needs irq for vblank, and mtk_dsi_stop() will disable irq. +* mtk_dsi_start() needs to be called in mtk_output_dsi_enable(), +* after dsi is fully set. +*/ +mtk_dsi_stop (dsi); +if (!mtk_dsi_switch_to_cmd_mode (dsi,VM_DONE_INT_FLAG ,500 )) {if (dsi->panel) {if (drm_panel_unprepare (dsi->panel)) {
@@ -696,7 +705,6 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi) } } -mtk_dsi_stop (dsi);mtk_dsi_poweroff (dsi); dsi->enabled = false;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/96 ASoC: max98090: remove 24-bit format support if RJ is 0
In reply to Greg Kroah-Hartman[ Upstream commit 5628c8979642a076f91ee86c3bae5ad251639af0 ]
The supported formats are S16_LE and S24_LE now. However, by datasheet of max98090, S24_LE is only supported when it is in the right justified mode. We should remove 24-bit format if it is not in that mode to avoid triggering error.
--- sound/soc/codecs/max98090.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
sound/soc/codecs/max98090.c +16 -0
@@ -1909,6 +1909,21 @@ static int max98090_configure_dmic(struct max98090_priv *max98090,return 0 ; } +static int max98090_dai_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct snd_soc_component *component = dai->component; +struct max98090_priv *max98090 =snd_soc_component_get_drvdata (component); +unsigned int fmt = max98090->dai_fmt; + +/* Remove 24-bit format support if it is not in right justified mode. */ +if ((fmt &SND_SOC_DAIFMT_FORMAT_MASK ) !=SND_SOC_DAIFMT_RIGHT_J ) { + substream->runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (substream->runtime,0 ,16 ,16 ); + } +return 0 ; +} +static int max98090_dai_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai)
@@ -2316,6 +2331,7 @@ EXPORT_SYMBOL_GPL(max98090_mic_detect);#define MAX98090_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)static const struct snd_soc_dai_ops max98090_dai_ops = { + .startup = max98090_dai_startup, .set_sysclk = max98090_dai_set_sysclk, .set_fmt = max98090_dai_set_fmt, .set_tdm_slot = max98090_set_tdm_slot,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/96 ASoC: sun4i-i2s: Fix sun8i tx channel offset mask
In reply to Greg Kroah-Hartman[ Upstream commit 7e46169a5f35762f335898a75d1b8a242f2ae0f5 ]
Although not causing any noticeable issues, the mask for the channel offset is covering too many bits.
--- sound/soc/sunxi/sun4i-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sunxi/sun4i-i2s.c +1 -1
@@ -110,7 +110,7 @@#define SUN8I_I2S_TX_CHAN_MAP_REG 0x44#define SUN8I_I2S_TX_CHAN_SEL_REG 0x34 -#define SUN8I_I2S_TX_CHAN_OFFSET_MASK GENMASK(13, 11) +#define SUN8I_I2S_TX_CHAN_OFFSET_MASK GENMASK(13, 12)#define SUN8I_I2S_TX_CHAN_OFFSET (offset) (offset << 12)#define SUN8I_I2S_TX_CHAN_EN_MASK GENMASK(11, 4)#define SUN8I_I2S_TX_CHAN_EN (num_chan) (((1 << num_chan) - 1) << 4)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/96 ASoC: sun4i-i2s: Add offset to RX channel select
In reply to Greg Kroah-Hartman[ Upstream commit f9927000cb35f250051f0f1878db12ee2626eea1 ]
Whilst testing the capture functionality of the i2s on the newer SoCs it was noticed that the recording was somewhat distorted. This was due to the offset not being set correctly on the receiver side.
--- sound/soc/sunxi/sun4i-i2s.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/sunxi/sun4i-i2s.c +4 -0
@@ -460,6 +460,10 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)regmap_update_bits (i2s->regmap,SUN8I_I2S_TX_CHAN_SEL_REG ,SUN8I_I2S_TX_CHAN_OFFSET_MASK ,SUN8I_I2S_TX_CHAN_OFFSET (offset)); + +regmap_update_bits (i2s->regmap,SUN8I_I2S_RX_CHAN_SEL_REG , +SUN8I_I2S_TX_CHAN_OFFSET_MASK , +SUN8I_I2S_TX_CHAN_OFFSET (offset)); }regmap_field_write (i2s->field_fmt_mode, val);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/96 x86/CPU: Add more Icelake model numbers
In reply to Greg Kroah-Hartman[ Upstream commit e35faeb64146f2015f2aec14b358ae508e4066db ]
Add the CPUID model numbers of Icelake (ICL) desktop and server processors to the Intel family list.
[ Qiuxu: Sort the macros by model number. ]
--- arch/x86/include/asm/intel-family.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/asm/intel-family.h +3 -0
@@ -52,6 +52,9 @@#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66 +#define INTEL_FAM6_ICELAKE_X 0x6A +#define INTEL_FAM6_ICELAKE_XEON_D 0x6C +#define INTEL_FAM6_ICELAKE_DESKTOP 0x7D#define INTEL_FAM6_ICELAKE_MOBILE 0x7E/* "Small Core" Processors (Atom) */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/96 usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
In reply to Greg Kroah-Hartman[ Upstream commit 62fd0e0a24abeebe2c19fce49dd5716d9b62042d ]
There is no deallocation of fusb300->ep[i] elements, allocated at fusb300_probe.
The patch adds deallocation of fusb300->ep array elements.
--- drivers/usb/gadget/udc/fusb300_udc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/gadget/udc/fusb300_udc.c +5 -0
@@ -1342,12 +1342,15 @@ static const struct usb_gadget_ops fusb300_gadget_ops = {static int fusb300_remove (struct platform_device *pdev) {struct fusb300 *fusb300 =platform_get_drvdata (pdev); +int i;usb_del_gadget_udc (&fusb300->gadget);iounmap (fusb300->reg);free_irq (platform_get_irq (pdev,0 ), fusb300);fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300);return 0 ;
@@ -1491,6 +1494,8 @@ clean_up:if (fusb300->ep0_req)fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300); }if (reg)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/96 usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
In reply to Greg Kroah-Hartman[ Upstream commit fbc318afadd6e7ae2252d6158cf7d0c5a2132f7d ]
Gadget drivers may queue request in interrupt context. This would lead to a descriptor allocation in that context. In that case we would hit BUG_ON(in_interrupt()) in __get_vm_area_node.
Also remove the unnecessary cast.
--- drivers/usb/gadget/udc/lpc32xx_udc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -922,8 +922,7 @@ static struct lpc32xx_usbd_dd_gad *udc_dd_alloc(struct lpc32xx_udc *udc)dma_addr_t dma;struct lpc32xx_usbd_dd_gad *dd; - dd = (struct lpc32xx_usbd_dd_gad *)dma_pool_alloc ( - udc->dd_cache, (GFP_KERNEL |GFP_DMA ), &dma); + dd =dma_pool_alloc (udc->dd_cache,GFP_ATOMIC |GFP_DMA , &dma);if (dd) dd->this_dma = dma;
Signature · 1 line
2.20.1
Re: [PATCH 5.1 29/96] usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
Quoted 7 lines · Greg Kroah-Hartman
[ Upstream commit
fbc318afadd6e7ae2252d6158cf7d0c5a2132f7d]Gadget drivers may queue request in interrupt context. This would lead to a descriptor allocation in that context. In that case we would hit BUG_ON(in_interrupt()) in
__get_vm_area_node.Also remove the unnecessary cast.
GFP_ATOMIC allocations can and do fail, but I don't see any explicit error handling.
Can someone check everything is ok?
Thanks,
Pavel
Quoted 18 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1
-2@@ -922,8 +922,7 @@ static struct lpc32xx_usbd_dd_gad *udc_dd_alloc(struct lpc32xx_udc *udc)dma_addr_t dma;struct lpc32xx_usbd_dd_gad *dd; - dd = (struct lpc32xx_usbd_dd_gad *)dma_pool_alloc ( - udc->dd_cache, (GFP_KERNEL |GFP_DMA ), &dma); + dd =dma_pool_alloc (udc->dd_cache,GFP_ATOMIC |GFP_DMA , &dma);if (dd) dd->this_dma = dma;Signature · 1 line
2.20.1
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 5.1 29/96] usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
Quoted 7 lines · Pavel Machek
Quoted 6 lines · Greg Kroah-Hartman
[ Upstream commit
fbc318afadd6e7ae2252d6158cf7d0c5a2132f7d]Gadget drivers may queue request in interrupt context. This would lead to a descriptor allocation in that context. In that case we would hit BUG_ON(in_interrupt()) in
__get_vm_area_node.
Quoted 6 lines
Quoted 1 line
Also remove the unnecessary cast.
GFP_ATOMICallocations can and do fail, but I don't see any explicit error handling.Can someone check everything is ok?
It is checked later on:
dd = udc_dd_alloc(udc);
if (!dd) {
/* Error allocating DD */
return -ENOMEM;
}Quoted 26 lines
Thanks,
PavelQuoted 18 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1
-2@@ -922,8 +922,7 @@ static struct lpc32xx_usbd_dd_gad *udc_dd_alloc(struct lpc32xx_udc *udc)dma_addr_t dma;struct lpc32xx_usbd_dd_gad *dd; - dd = (struct lpc32xx_usbd_dd_gad *)dma_pool_alloc ( - udc->dd_cache, (GFP_KERNEL |GFP_DMA ), &dma); + dd =dma_pool_alloc (udc->dd_cache,GFP_ATOMIC |GFP_DMA , &dma);if (dd) dd->this_dma = dma;Signature · 1 line
2.20.1Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Greg Kroah-Hartman
maintainerPATCH 30/96 usb: gadget: dwc2: fix zlp handling
In reply to Greg Kroah-Hartman[ Upstream commit 066cfd0770aba8a9ac79b59d99530653885d919d ]
The patch 10209abe87f5ebfd482a00323f5236d6094d0865
usb: dwc2: gadget: Add scatter-gather mode
avoided a NULL pointer dereference (hs_ep->req == NULL) by calling dwc2_gadget_fill_nonisoc_xfer_dma_one() directly instead of through the dwc2_gadget_config_nonisoc_xfer_ddma() wrapper, which unconditionally dereferenced the said pointer.
However, this was based on an incorrect assumption that in the context of dwc2_hsotg_program_zlp() the pointer is always NULL, which is not the case. The result were SB CV MSC tests failing starting from Test Case 6.
Instead, this patch reverts to calling the wrapper and adds a check for the pointer being NULL inside the wrapper.
--- drivers/usb/dwc2/gadget.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/usb/dwc2/gadget.c +12 -8
@@ -833,19 +833,22 @@ static void dwc2_gadget_fill_nonisoc_xfer_ddma_one(struct dwc2_hsotg_ep *hs_ep,* with corresponding information based on transfer data. */ static void dwc2_gadget_config_nonisoc_xfer_ddma (struct dwc2_hsotg_ep *hs_ep, -struct usb_request *ureq, -unsigned int offset, +dma_addr_t dma_buff,unsigned int len) { +struct usb_request *ureq =NULL ;struct dwc2_dma_desc *desc = hs_ep->desc_list;struct scatterlist *sg;int i;u8 desc_count =0 ; +if (hs_ep->req) + ureq = &hs_ep->req->req; +/* non-DMA sg buffer */ -if (!ureq->num_sgs) { +if (!ureq || !ureq->num_sgs) {dwc2_gadget_fill_nonisoc_xfer_ddma_one (hs_ep, &desc, - ureq->dma + offset, len, true); + dma_buff, len, true);return ; }
@@ -1133,7 +1136,7 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, offset = ureq->actual;/* Fill DDMA chain entries */ -dwc2_gadget_config_nonisoc_xfer_ddma (hs_ep, ureq, offset, +dwc2_gadget_config_nonisoc_xfer_ddma (hs_ep, ureq->dma + offset, length);/* write descriptor chain address to control register */
@@ -2026,12 +2029,13 @@ static void dwc2_hsotg_program_zlp(struct dwc2_hsotg *hsotg,dev_dbg (hsotg->dev,"Receiving zero-length packet on ep%d\n" , index);if (using_desc_dma (hsotg)) { +/* Not specific buffer needed for ep0 ZLP */ +dma_addr_t dma = hs_ep->desc_list_dma; +if (!index)dwc2_gadget_set_ep0_desc_chain (hsotg, hs_ep); -/* Not specific buffer needed for ep0 ZLP */ -dwc2_gadget_fill_nonisoc_xfer_ddma_one (hs_ep, &hs_ep->desc_list, - hs_ep->desc_list_dma,0 , true); +dwc2_gadget_config_nonisoc_xfer_ddma (hs_ep, dma,0 ); }else { dwc2_writel(hsotg, DXEPTSIZ_MC(1) | DXEPTSIZ_PKTCNT(1) | DXEPTSIZ_XFERSIZE(0),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/96 ASoC: Intel: cht_bsw_max98090: fix kernel oops with platform_name override
In reply to Greg Kroah-Hartman[ Upstream commit fb54555134b9b17835545e4d096b5550c27eed64 ]
The platform override code uses devm_ functions to allocate memory for the new name but the card device is not initialized. Fix by moving the init earlier.
--- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/cht_bsw_max98090_ti.c +1 -1
@@ -454,6 +454,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) }/* override plaform name, if required */ + snd_soc_card_cht.dev = &pdev->dev; mach = (&pdev->dev)->platform_data; platform_name = mach->mach_params.platform;
@@ -463,7 +464,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)return ret_val;/* register the soc card */ - snd_soc_card_cht.dev = &pdev->dev;snd_soc_card_set_drvdata (&snd_soc_card_cht, drv);if (drv->quirks &QUIRK_PMC_PLT_CLK_0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/96 ASoC: Intel: bytcht_es8316: fix kernel oops with platform_name override
In reply to Greg Kroah-Hartman[ Upstream commit 79136a016add1acb690fe8d96be50dd22a143d26 ]
The platform override code uses devm_ functions to allocate memory for the new name but the card device is not initialized. Fix by moving the init earlier.
--- sound/soc/intel/boards/bytcht_es8316.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/bytcht_es8316.c +1 -1
@@ -471,6 +471,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) }/* override plaform name, if required */ + byt_cht_es8316_card.dev = dev; platform_name = mach->mach_params.platform; ret = snd_soc_fixup_dai_links_platform_name(&byt_cht_es8316_card,
@@ -538,7 +539,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) (quirk &BYT_CHT_ES8316_MONO_SPEAKER ) ?"mono" :"stereo" , mic_name[BYT_CHT_ES8316_MAP(quirk)]); byt_cht_es8316_card.long_name = long_name; - byt_cht_es8316_card.dev = dev;snd_soc_card_set_drvdata (&byt_cht_es8316_card, priv); ret =devm_snd_soc_register_card (dev, &byt_cht_es8316_card);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/96 ASoC: Intel: cht_bsw_nau8824: fix kernel oops with platform_name override
In reply to Greg Kroah-Hartman[ Upstream commit 096701e8131425044d2054a0c210d6ea24ee7386 ]
The platform override code uses devm_ functions to allocate memory for the new name but the card device is not initialized. Fix by moving the init earlier.
--- sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/cht_bsw_nau8824.c +1 -1
@@ -257,6 +257,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)snd_soc_card_set_drvdata (&snd_soc_card_cht, drv);/* override plaform name, if required */ + snd_soc_card_cht.dev = &pdev->dev; mach = (&pdev->dev)->platform_data; platform_name = mach->mach_params.platform;
@@ -266,7 +267,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)return ret_val;/* register the soc card */ - snd_soc_card_cht.dev = &pdev->dev; ret_val =devm_snd_soc_register_card (&pdev->dev, &snd_soc_card_cht);if (ret_val) { dev_err(&pdev->dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/96 ASoC: Intel: cht_bsw_rt5672: fix kernel oops with platform_name override
In reply to Greg Kroah-Hartman[ Upstream commit 9bbc799318a34061703f2a980e2b6df7fc6760f0 ]
The platform override code uses devm_ functions to allocate memory for the new name but the card device is not initialized. Fix by moving the init earlier.
--- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/cht_bsw_rt5672.c +1 -1
@@ -425,6 +425,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) }/* override plaform name, if required */ + snd_soc_card_cht.dev = &pdev->dev; platform_name = mach->mach_params.platform; ret_val = snd_soc_fixup_dai_links_platform_name(&snd_soc_card_cht,
@@ -442,7 +443,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)snd_soc_card_set_drvdata (&snd_soc_card_cht, drv);/* register the soc card */ - snd_soc_card_cht.dev = &pdev->dev; ret_val =devm_snd_soc_register_card (&pdev->dev, &snd_soc_card_cht);if (ret_val) { dev_err(&pdev->dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/96 ASoC: core: move DAI pre-links initiation to snd_soc_instantiate_card
In reply to Greg Kroah-Hartman[ Upstream commit 70fc53734e71ce51f46dfcfd1a1c319e1cfe080c ]
Kernel crashes when an ASoC component rebinding.
The dai_link->platforms has been reset to NULL by soc_cleanup_platform() in soc_cleanup_card_resources() when un-registering component. However, it has no chance to re-allocate the dai_link->platforms when registering the component again.
Move the DAI pre-links initiation from snd_soc_register_card() to snd_soc_instantiate_card() to make sure all DAI pre-links get initiated when component rebinding.
As an example, by using the following commands:
- echo -n max98357a > /sys/bus/platform/drivers/max98357a/unbind
- echo -n max98357a > /sys/bus/platform/drivers/max98357a/bind
Got the error message:
"Unable to handle kernel NULL pointer dereference at virtual address".
The call trace:
snd_soc_is_matching_component+0x30/0x6c soc_bind_dai_link+0x16c/0x240 snd_soc_bind_card+0x1e4/0xb10 snd_soc_add_component+0x270/0x300 snd_soc_register_component+0x54/0x6c
--- sound/soc/soc-core.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-)
sound/soc/soc-core.c +10 -17
@@ -2069,6 +2069,16 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)int ret, i, order;mutex_lock (&client_mutex); +for_each_card_prelinks (card, i, dai_link) { + ret =soc_init_dai_link (card, dai_link); +if (ret) { +soc_cleanup_platform (card); +dev_err (card->dev,"ASoC: failed to init link %s: %d\n" , + dai_link->name, ret); +mutex_unlock (&client_mutex); +return ret; + } + }mutex_lock_nested (&card->mutex,SND_SOC_CARD_CLASS_INIT ); card->dapm.bias_level =SND_SOC_BIAS_OFF ;
@@ -2793,26 +2803,9 @@ static int snd_soc_bind_card(struct snd_soc_card *card)*/ int snd_soc_register_card (struct snd_soc_card *card) { -int i, ret; -struct snd_soc_dai_link *link; -if (!card->name || !card->dev)return -EINVAL ; -mutex_lock (&client_mutex); -for_each_card_prelinks (card, i, link) { - - ret =soc_init_dai_link (card, link); -if (ret) { -soc_cleanup_platform (card); -dev_err (card->dev,"ASoC: failed to init link %s\n" , - link->name); -mutex_unlock (&client_mutex); -return ret; - } - } -mutex_unlock (&client_mutex); -dev_set_drvdata (card->dev, card);snd_soc_initialize_card_lists (card);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/96 ALSA: hdac: fix memory release for SST and SOF drivers
In reply to Greg Kroah-Hartman[ Upstream commit 6d647b736a6b1cbf2f8deab0e6a94c34a6ea9d60 ]
During the integration of HDaudio support, we changed the way in which we get hdev in snd_hdac_ext_bus_device_init() to use one preallocated with devm_kzalloc(), however it still left kfree(hdev) in snd_hdac_ext_bus_device_exit(). It leads to oopses when trying to rmmod and modprobe. Fix it, by just removing kfree call.
SOF also uses some of the snd_hdac_ functions for HDAudio support but allocated the memory with kzalloc. A matching fix is provided separately to align all users of the snd_hdac_ library.
--- sound/hda/ext/hdac_ext_bus.c | 1 - 1 file changed, 1 deletion(-)
sound/hda/ext/hdac_ext_bus.c +0 -1
@@ -172,7 +172,6 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_init);void snd_hdac_ext_bus_device_exit (struct hdac_device *hdev) {snd_hdac_device_exit (hdev); -kfree (hdev); }EXPORT_SYMBOL_GPL (snd_hdac_ext_bus_device_exit);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/96 SoC: rt274: Fix internal jack assignment in set_jack callback
In reply to Greg Kroah-Hartman[ Upstream commit 04268bf2757a125616b6c2140e6250f43b7b737a ]
When we call snd_soc_component_set_jack(component, NULL, NULL) we should set rt274->jack to passed jack, so when interrupt is triggered it calls snd_soc_jack_report(rt274->jack, ...) with proper value.
This fixes problem in machine where in register, we call snd_soc_register(component, &headset, NULL), which just calls rt274_mic_detect via callback.
Now when machine driver is removed "headset" will be gone, so we need to tell codec driver that it's gone with:snd_soc_register(component, NULL, NULL), but we also need to be able to handle NULL jack argument here gracefully.
If we don't set it to NULL, next time the rt274_irq runs it will call snd_soc_jack_report with first argument being invalid pointer and there will be Oops.
--- sound/soc/codecs/rt274.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/rt274.c +2 -1
@@ -405,6 +405,8 @@ static int rt274_mic_detect(struct snd_soc_component *component, {struct rt274_priv *rt274 =snd_soc_component_get_drvdata (component); + rt274->jack = jack; +if (jack ==NULL ) {/* Disable jack detection */ regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
@@ -412,7 +414,6 @@ static int rt274_mic_detect(struct snd_soc_component *component,return 0 ; } - rt274->jack = jack;regmap_update_bits (rt274->regmap,RT274_EAPD_GPIO_IRQ_CTRL ,RT274_IRQ_EN ,RT274_IRQ_EN );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/96 scsi: hpsa: correct ioaccel2 chaining
In reply to Greg Kroah-Hartman[ Upstream commit 625d7d3518875c4d303c652a198feaa13d9f52d9 ]
- set ioaccel2_sg_element member 'chain_indicator' to IOACCEL2_LAST_SG for the last s/g element.
- set ioaccel2_sg_element member 'chain_indicator' to IOACCEL2_CHAIN when chaining.
--- drivers/scsi/hpsa.c | 7 ++++++- drivers/scsi/hpsa_cmd.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/scsi/hpsa.c +6 -1
@@ -4925,7 +4925,7 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg->reserved[0 ] =0 ; curr_sg->reserved[1 ] =0 ; curr_sg->reserved[2 ] =0 ; - curr_sg->chain_indicator =0x80 ; + curr_sg->chain_indicator =IOACCEL2_CHAIN ; curr_sg = h->ioaccel2_cmd_sg_list[c->cmdindex]; }
@@ -4942,6 +4942,11 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg++; } +/* +* Set the last s/g element bit +*/ + (curr_sg -1 )->chain_indicator =IOACCEL2_LAST_SG ; +switch (cmd->sc_data_direction) {case DMA_TO_DEVICE : cp->direction &= ~IOACCEL2_DIRECTION_MASK ;
drivers/scsi/hpsa_cmd.h +1 -0
@@ -517,6 +517,7 @@ struct ioaccel2_sg_element {u8 reserved[3 ];u8 chain_indicator;#define IOACCEL2_CHAIN 0x80 +#define IOACCEL2_LAST_SG 0x40 };/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/96 gpio: pca953x: hack to fix 24 bit gpio expanders
In reply to Greg Kroah-Hartman[ Upstream commit 3b00691cc46a4089368a008b30655a8343411715 ]
24 bit expanders use REG_ADDR_AI in combination with register addressing. This conflicts with regmap which takes this bit as part of the register number, i.e. a second cache entry is defined for accessed with REG_ADDR_AI being set although on the chip it is the same register as with REG_ADDR_AI being cleared.
The problem was introduced by
commit b32cecb46bdc ("gpio: pca953x: Extract the register address mangling to single function")
but only became visible by
commit 8b9f9d4dc511 ("regmap: verify if register is writeable before writing operations")
because before, the regmap size was effectively ignored and pca953x_writeable_register() did know to ignore REG_ADDR_AI. Still, there were two separate cache entries created.
Since the use of REG_ADDR_AI seems to be static we can work around this issue by simply increasing the size of the regmap to cover the "virtual" registers with REG_ADDR_AI being set. This only means that half of the regmap buffer will be unused.
--- drivers/gpio/gpio-pca953x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpio/gpio-pca953x.c +2 -1
@@ -306,7 +306,8 @@ static const struct regmap_config pca953x_i2c_regmap = { .volatile_reg = pca953x_volatile_register, .cache_type = REGCACHE_RBTREE, - .max_register = 0x7f, +/* REVISIT: should be 0x7f but some 24 bit chips use REG_ADDR_AI */ + .max_register = 0xff, }; static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/96 drm: panel-orientation-quirks: Add quirk for GPD pocket2
In reply to Greg Kroah-Hartman[ Upstream commit 15abc7110a77555d3bf72aaef46d1557db0a4ac5 ]
GPD has done it again, make a nice device (good), use way too generic DMI strings (bad) and use a portrait screen rotated 90 degrees (ugly).
Because of the too generic DMI strings this entry is also doing bios-date matching, so the gpd_pocket2 data struct may very well need to be updated with some extra bios-dates in the future.
Changes in v2:
-Add one more known BIOS date to the list of BIOS dates
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +16 -0
@@ -50,6 +50,14 @@ static const struct drm_dmi_panel_orientation_data gpd_pocket = { .orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, }; +static const struct drm_dmi_panel_orientation_data gpd_pocket2 = { + .width =1200 , + .height =1920 , + .bios_dates = (const char *const []){"06/28/2018" ,"08/28/2018" , +"12/07/2018" ,NULL }, + .orientation =DRM_MODE_PANEL_ORIENTATION_RIGHT_UP , +}; +static const struct drm_dmi_panel_orientation_data gpd_win = { .width =720 , .height =1280 ,
@@ -106,6 +114,14 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"), }, .driver_data = (void *)&gpd_pocket, + }, { /* GPD Pocket 2 (generic strings, also match on bios date) */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Default string" ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"Default string" ), +DMI_EXACT_MATCH (DMI_BOARD_VENDOR ,"Default string" ), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"), + }, + .driver_data = (void *)&gpd_pocket2, }, { /* GPD Win (same note on DMI match as GPD Pocket) */ .matches = { DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/96 drm: panel-orientation-quirks: Add quirk for GPD MicroPC
In reply to Greg Kroah-Hartman[ Upstream commit 652b8b086538c8a10de5aa5cbdaef79333b46358 ]
GPD has done it again, make a nice device (good), use way too generic DMI strings (bad) and use a portrait screen rotated 90 degrees (ugly).
Because of the too generic DMI strings this entry is also doing bios-date matching, so the gpd_micropc data struct may very well need to be updated with some extra bios-dates in the future.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +16 -0
@@ -42,6 +42,14 @@ static const struct drm_dmi_panel_orientation_data asus_t100ha = { .orientation = DRM_MODE_PANEL_ORIENTATION_LEFT_UP, }; +static const struct drm_dmi_panel_orientation_data gpd_micropc = { + .width =720 , + .height =1280 , + .bios_dates = (const char *const []){"04/26/2019" , +NULL }, + .orientation =DRM_MODE_PANEL_ORIENTATION_RIGHT_UP , +}; +static const struct drm_dmi_panel_orientation_data gpd_pocket = { .width =1200 , .height =1920 ,
@@ -101,6 +109,14 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100HAN"), }, .driver_data = (void *)&asus_t100ha, + }, { /* GPD MicroPC (generic strings, also match on bios date) */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Default string" ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"Default string" ), +DMI_EXACT_MATCH (DMI_BOARD_VENDOR ,"Default string" ), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"), + }, + .driver_data = (void *)&gpd_micropc, }, { /** GPD Pocket, note that the the DMI data is less generic then * it seems, devices with a board-vendor of "AMI Corporation"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/96 ASoC: core: Fix deadlock in snd_soc_instantiate_card()
In reply to Greg Kroah-Hartman[ Upstream commit 495f926c68ddb905a7a0192963096138c6a934e1 ]
Move the client_mutex lock to snd_soc_unbind_card() before removing link components. This prevents the deadlock in the error path in snd_soc_instantiate_card().
link components)
--- sound/soc/soc-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-core.c +2 -2
@@ -1008,14 +1008,12 @@ static void soc_remove_link_components(struct snd_soc_card *card,struct snd_soc_component *component;struct snd_soc_rtdcom_list *rtdcom; -mutex_lock (&client_mutex);for_each_rtdcom (rtd, rtdcom) { component = rtdcom->component;if (component->driver->remove_order == order)soc_remove_component (component); } -mutex_unlock (&client_mutex); }static void soc_remove_dai_links (struct snd_soc_card *card)
@@ -2836,12 +2834,14 @@ static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister)snd_soc_dapm_shutdown (card);snd_soc_flush_all_delayed_work (card); +mutex_lock (&client_mutex);/* remove all components used by DAI links on this card */ for_each_comp_order (order) {for_each_card_rtds (card, rtd) {soc_remove_link_components (card, rtd, order); } } +mutex_unlock (&client_mutex);soc_cleanup_card_resources (card);if (!unregister)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/96 ASoC: Intel: sst: fix kmalloc call with wrong flags
In reply to Greg Kroah-Hartman[ Upstream commit 3da428ff2aa5a5191ba2f1630eea75f03242f3f2 ]
When calling kmalloc with GFP_KERNEL in case CONFIG_SLOB is unset, kmem_cache_alloc_trace is called.
In case CONFIG_TRACING is set, kmem_cache_alloc_trace will ball slab_alloc, which will call slab_pre_alloc_hook which might_sleep_if.
The context in which it is called in this case, the intel_sst_interrupt_mrfld, calling a sleeping kmalloc generates a BUG():
[ 20.250671] BUG: sleeping function called from invalid context at mm/slab.h:422 [ 20.250683] in_atomic(): 1, irqs_disabled(): 1, pid: 1791, name: Chrome_IOThread [ 20.250690] CPU: 0 PID: 1791 Comm: Chrome_IOThread Tainted: G W 4.19.43 #61 [ 20.250693] Hardware name: GOOGLE Kefka, BIOS Google_Kefka.7287.337.0 03/02/2017 [ 20.250697] Call Trace: [ 20.250704] <IRQ> [ 20.250716] dump_stack+0x7e/0xc3 [ 20.250725] ___might_sleep+0x12a/0x140 [ 20.250731] kmem_cache_alloc_trace+0x53/0x1c5 [ 20.250736] ? update_cfs_rq_load_avg+0x17e/0x1aa [ 20.250740] ? cpu_load_update+0x6c/0xc2 [ 20.250746] sst_create_ipc_msg+0x2d/0x88 [ 20.250752] intel_sst_interrupt_mrfld+0x12a/0x22c [ 20.250758] __handle_irq_event_percpu+0x133/0x228 [ 20.250764] handle_irq_event_percpu+0x35/0x7a [ 20.250768] handle_irq_event+0x36/0x55 [ 20.250773] handle_fasteoi_irq+0xab/0x16c [ 20.250779] handle_irq+0xd9/0x11e [ 20.250785] do_IRQ+0x54/0xe0 [ 20.250791] common_interrupt+0xf/0xf [ 20.250795] </IRQ> [ 20.250800] RIP: 0010:__lru_cache_add+0x4e/0xad [ 20.250806] Code: 00 01 48 c7 c7 b8 df 01 00 65 48 03 3c 25 28 f1 00 00 48 8b 48 08 48 89 ca 48 ff ca f6 c1 01 48 0f 44 d0 f0 ff 42 34 0f b6 0f <89> ca fe c2 88 17 48 89 44 cf 08 80 fa 0f 74 0e 48 8b 08 66 85 c9 [ 20.250809] RSP: 0000:ffffa568810bfd98 EFLAGS: 00000202 ORIG_RAX: ffffffffffffffd6 [ 20.250814] RAX: ffffd3b904eb1940 RBX: ffffd3b904eb1940 RCX: 0000000000000004 [ 20.250817] RDX: ffffd3b904eb1940 RSI: ffffa10ee5c47450 RDI: ffffa10efba1dfb8 [ 20.250821] RBP: ffffa568810bfda8 R08: ffffa10ef9c741c1 R09: dead000000000100 [ 20.250824] R10: 0000000000000000 R11: 0000000000000000 R12: ffffa10ee8d52a40 [ 20.250827] R13: ffffa10ee8d52000 R14: ffffa10ee5c47450 R15: 800000013ac65067 [ 20.250835] lru_cache_add_active_or_unevictable+0x4e/0xb8 [ 20.250841] handle_mm_fault+0xd98/0x10c4 [ 20.250848] __do_page_fault+0x235/0x42d [ 20.250853] ? page_fault+0x8/0x30 [ 20.250858] do_page_fault+0x3d/0x17a [ 20.250862] ? page_fault+0x8/0x30 [ 20.250866] page_fault+0x1e/0x30 [ 20.250872] RIP: 0033:0x7962fdea9304 [ 20.250875] Code: 0f 11 4c 17 f0 c3 48 3b 15 f1 26 31 00 0f 83 e2 00 00 00 48 39 f7 72 0f 74 12 4c 8d 0c 16 4c 39 cf 0f 82 63 01 00 00 48 89 d1 <f3> a4 c3 80 fa 08 73 12 80 fa 04 73 1e 80 fa 01 77 26 72 05 0f b6 [ 20.250879] RSP: 002b:00007962f4db5468 EFLAGS: 00010206 [ 20.250883] RAX: 00003c8cc9d47008 RBX: 0000000000000000 RCX: 0000000000001b48 [ 20.250886] RDX: 0000000000002b40 RSI: 00003c8cc9551000 RDI: 00003c8cc9d48000 [ 20.250890] RBP: 00007962f4db5820 R08: 0000000000000000 R09: 00003c8cc9552b48 [ 20.250893] R10: 0000562dd1064d30 R11: 00003c8cc825b908 R12: 00003c8cc966d3c0 [ 20.250896] R13: 00003c8cc9e280c0 R14: 0000000000000000 R15: 0000000000000000
--- sound/soc/intel/atom/sst/sst_pvt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/atom/sst/sst_pvt.c +2 -2
@@ -166,11 +166,11 @@ int sst_create_ipc_msg(struct ipc_post **arg, bool large) {struct ipc_post *msg; - msg =kzalloc (sizeof (*msg),GFP_KERNEL ); + msg =kzalloc (sizeof (*msg),GFP_ATOMIC );if (!msg)return -ENOMEM ;if (large) { - msg->mailbox_data =kzalloc (SST_MAILBOX_SIZE ,GFP_KERNEL ); + msg->mailbox_data =kzalloc (SST_MAILBOX_SIZE ,GFP_ATOMIC );if (!msg->mailbox_data) {kfree (msg);return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/96 platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi
In reply to Greg Kroah-Hartman[ Upstream commit 401fee8195d401b2b94dee57383f627050724d5b ]
Commit 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey") causes the backlight to be permanently off on various EeePC laptop models using the eeepc-wmi driver (Asus EeePC 1015BX, Asus EeePC 1025C).
The asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL) call added by that commit is made conditional in this commit and only enabled in the quirk_entry structs in the asus-nb-wmi driver fixing the broken display / backlight on various EeePC laptop models.
--- drivers/platform/x86/asus-nb-wmi.c | 8 ++++++++ drivers/platform/x86/asus-wmi.c | 2 +- drivers/platform/x86/asus-wmi.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-)
drivers/platform/x86/asus-nb-wmi.c +8 -0
@@ -78,10 +78,12 @@ static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str,static struct quirk_entry quirk_asus_unknown = { .wapf =0 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_q500a = { .i8042_filter = asus_q500a_i8042_filter, + .wmi_backlight_set_devstate = true, };/*
@@ -92,26 +94,32 @@ static struct quirk_entry quirk_asus_q500a = {static struct quirk_entry quirk_asus_x55u = { .wapf =4 , .wmi_backlight_power = true, + .wmi_backlight_set_devstate = true, .no_display_toggle = true, };static struct quirk_entry quirk_asus_wapf4 = { .wapf =4 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_x200ca = { .wapf =2 , + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_ux303ub = { .wmi_backlight_native = true, + .wmi_backlight_set_devstate = true, };static struct quirk_entry quirk_asus_x550lb = { + .wmi_backlight_set_devstate = true, .xusb2pr =0x01D9 , };static struct quirk_entry quirk_asus_forceals = { + .wmi_backlight_set_devstate = true, .wmi_force_als_set = true, };
drivers/platform/x86/asus-wmi.c +1 -1
@@ -2131,7 +2131,7 @@ static int asus_wmi_add(struct platform_device *pdev) err =asus_wmi_backlight_init (asus);if (err && err != -ENODEV ) goto fail_backlight; - }else + }else if (asus->driver->quirks->wmi_backlight_set_devstate) err =asus_wmi_set_devstate (ASUS_WMI_DEVID_BACKLIGHT ,2 ,NULL ); status = wmi_install_notify_handler(asus->driver->event_guid,
drivers/platform/x86/asus-wmi.h +1 -0
@@ -44,6 +44,7 @@ struct quirk_entry {bool store_backlight_power;bool wmi_backlight_power;bool wmi_backlight_native; +bool wmi_backlight_set_devstate;bool wmi_force_als_set;int wapf;/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/96 platform/x86: intel-vbtn: Report switch events when event wakes device
In reply to Greg Kroah-Hartman[ Upstream commit cb1921b17adbe6509538098ac431033378cd7165 ]
When a switch event, such as tablet mode/laptop mode or docked/undocked, wakes a device make sure that the value of the swich is reported. Without when a device is put in tablet mode from laptop mode when it is suspended or vice versa the device will wake up but mode will be incorrect.
Tested by suspending a device in laptop mode and putting it in tablet mode, the device resumes and is in tablet mode. When suspending the device in tablet mode and putting it in laptop mode the device resumes and is in laptop mode.
--- drivers/platform/x86/intel-vbtn.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/platform/x86/intel-vbtn.c +14 -2
@@ -76,12 +76,24 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)struct platform_device *device = context;struct intel_vbtn_priv *priv =dev_get_drvdata (&device->dev);unsigned int val = !(event &1 );/* Even=press, Odd=release */ -const struct key_entry *ke_rel; +const struct key_entry *ke, *ke_rel;bool autorelease;if (priv->wakeup_mode) { -if (sparse_keymap_entry_from_scancode (priv->input_dev, event)) { + ke =sparse_keymap_entry_from_scancode (priv->input_dev, event); +if (ke) {pm_wakeup_hard_event (&device->dev); + +/* +* Switch events like tablet mode will wake the device +* and report the new switch position to the input +* subsystem. +*/ +if (ke->type ==KE_SW ) +sparse_keymap_report_event (priv->input_dev, + event, + val, +0 );return ; } goto out_unknown;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/96 platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration
In reply to Greg Kroah-Hartman[ Upstream commit 160da20b254dd4bfc5828f12c208fa831ad4be6c ]
Fix the issue found while running kernel with the option CONFIG_DEBUG_TEST_DRIVER_REMOVE.
Driver 'mlx-platform' registers 'i2c_mlxcpld' device and then registers few underlying 'i2c-mux-reg' devices:
priv->pdev_i2c = platform_device_register_simple("i2c_mlxcpld", nr,
NULL, 0);
...
for (i = 0; i < ARRAY_SIZE(mlxplat_mux_data); i++) {
priv->pdev_mux[i] = platform_device_register_resndata(
&mlxplat_dev->dev,
"i2c-mux-reg", i, NULL,
0, &mlxplat_mux_data[i],
sizeof(mlxplat_mux_data[i]));But actual parent of "i2c-mux-reg" device is priv->pdev_i2c->dev and not mlxplat_dev->dev.
Patch fixes parent device parameter in a call to platform_device_register_resndata() for "i2c-mux-reg".
It solves the race during initialization flow while 'i2c_mlxcpld.1' is removing after probe, while 'i2c-mux-reg.0' is still in probing flow:
'i2c_mlxcpld.1' flow: probe -> remove -> probe.
'i2c-mux-reg.0' flow: probe -> ...
[ 12:621096] Registering platform device 'i2c_mlxcpld.1'. Parent at platform [ 12:621117] device: 'i2c_mlxcpld.1': device_add [ 12:621155] bus: 'platform': add device i2c_mlxcpld.1 [ 12:621384] Registering platform device 'i2c-mux-reg.0'. Parent at mlxplat [ 12:621395] device: 'i2c-mux-reg.0': device_add [ 12:621425] bus: 'platform': add device i2c-mux-reg.0 [ 12:621806] Registering platform device 'i2c-mux-reg.1'. Parent at mlxplat [ 12:621828] device: 'i2c-mux-reg.1': device_add [ 12:621892] bus: 'platform': add device i2c-mux-reg.1 [ 12:621906] bus: 'platform': add driver i2c_mlxcpld [ 12:621996] bus: 'platform': driver_probe_device: matched device i2c_mlxcpld.1 with driver i2c_mlxcpld [ 12:622003] bus: 'platform': really_probe: probing driver i2c_mlxcpld with device i2c_mlxcpld.1 [ 12:622100] i2c_mlxcpld i2c_mlxcpld.1: no default pinctrl state [ 12:622293] device: 'i2c-1': device_add [ 12:627280] bus: 'i2c': add device i2c-1 [ 12:627692] device: 'i2c-1': device_add [ 12.629639] bus: 'platform': add driver i2c-mux-reg [ 12.629718] bus: 'platform': driver_probe_device: matched device i2c-mux-reg.0 with driver i2c-mux-reg [ 12.629723] bus: 'platform': really_probe: probing driver i2c-mux-reg with device i2c-mux-reg.0 [ 12.629818] i2c-mux-reg i2c-mux-reg.0: no default pinctrl state [ 12.629981] platform i2c-mux-reg.0: Driver i2c-mux-reg requests probe deferral [ 12.629986] platform i2c-mux-reg.0: Added to deferred list [ 12.629992] bus: 'platform': driver_probe_device: matched device i2c-mux-reg.1 with driver i2c-mux-reg [ 12.629997] bus: 'platform': really_probe: probing driver i2c-mux-reg with device i2c-mux-reg.1 [ 12.630091] i2c-mux-reg i2c-mux-reg.1: no default pinctrl state [ 12.630247] platform i2c-mux-reg.1: Driver i2c-mux-reg requests probe deferral [ 12.630252] platform i2c-mux-reg.1: Added to deferred list [ 12.640892] devices_kset: Moving i2c-mux-reg.0 to end of list [ 12.640900] platform i2c-mux-reg.0: Retrying from deferred list [ 12.640911] bus: 'platform': driver_probe_device: matched device i2c-mux-reg.0 with driver i2c-mux-reg [ 12.640919] bus: 'platform': really_probe: probing driver i2c-mux-reg with device i2c-mux-reg.0 [ 12.640999] i2c-mux-reg i2c-mux-reg.0: no default pinctrl state [ 12.641177] platform i2c-mux-reg.0: Driver i2c-mux-reg requests probe deferral [ 12.641187] platform i2c-mux-reg.0: Added to deferred list [ 12.641198] devices_kset: Moving i2c-mux-reg.1 to end of list [ 12.641219] platform i2c-mux-reg.1: Retrying from deferred list [ 12.641237] bus: 'platform': driver_probe_device: matched device i2c-mux-reg.1 with driver i2c-mux-reg [ 12.641247] bus: 'platform': really_probe: probing driver i2c-mux-reg with device i2c-mux-reg.1 [ 12.641331] i2c-mux-reg i2c-mux-reg.1: no default pinctrl state [ 12.641465] platform i2c-mux-reg.1: Driver i2c-mux-reg requests probe deferral [ 12.641469] platform i2c-mux-reg.1: Added to deferred list [ 12.646427] device: 'i2c-1': device_add [ 12.646647] bus: 'i2c': add device i2c-1 [ 12.647104] device: 'i2c-1': device_add [ 12.669231] devices_kset: Moving i2c-mux-reg.0 to end of list [ 12.669240] platform i2c-mux-reg.0: Retrying from deferred list [ 12.669258] bus: 'platform': driver_probe_device: matched device i2c-mux-reg.0 with driver i2c-mux-reg [ 12.669263] bus: 'platform': really_probe: probing driver i2c-mux-reg with device i2c-mux-reg.0 [ 12.669343] i2c-mux-reg i2c-mux-reg.0: no default pinctrl state [ 12.669585] device: 'i2c-2': device_add [ 12.669795] bus: 'i2c': add device i2c-2 [ 12.670201] device: 'i2c-2': device_add [ 12.671427] i2c i2c-1: Added multiplexed i2c bus 2 [ 12.671514] device: 'i2c-3': device_add [ 12.671724] bus: 'i2c': add device i2c-3 [ 12.672136] device: 'i2c-3': device_add [ 12.673378] i2c i2c-1: Added multiplexed i2c bus 3 [ 12.673472] device: 'i2c-4': device_add [ 12.673676] bus: 'i2c': add device i2c-4 [ 12.674060] device: 'i2c-4': device_add [ 12.675861] i2c i2c-1: Added multiplexed i2c bus 4 [ 12.675941] device: 'i2c-5': device_add [ 12.676150] bus: 'i2c': add device i2c-5 [ 12.676550] device: 'i2c-5': device_add [ 12.678103] i2c i2c-1: Added multiplexed i2c bus 5 [ 12.678193] device: 'i2c-6': device_add [ 12.678395] bus: 'i2c': add device i2c-6 [ 12.678774] device: 'i2c-6': device_add [ 12.679969] i2c i2c-1: Added multiplexed i2c bus 6 [ 12.680065] device: 'i2c-7': device_add [ 12.680275] bus: 'i2c': add device i2c-7 [ 12.680913] device: 'i2c-7': device_add [ 12.682506] i2c i2c-1: Added multiplexed i2c bus 7 [ 12.682600] device: 'i2c-8': device_add [ 12.682808] bus: 'i2c': add device i2c-8 [ 12.683189] device: 'i2c-8': device_add [ 12.683907] device: 'i2c-1': device_unregister [ 12.683945] device: 'i2c-1': device_unregister [ 12.684387] device: 'i2c-1': device_create_release [ 12.684536] bus: 'i2c': remove device i2c-1 [ 12.686019] i2c i2c-8: Failed to create compatibility class link [ 12.686086] ------------[ cut here ]------------ [ 12.686087] can't create symlink to mux device [ 12.686224] Workqueue: events deferred_probe_work_func [ 12.686135] WARNING: CPU: 7 PID: 436 at drivers/i2c/i2c-mux.c:416 i2c_mux_add_adapter+0x729/0x7d0 [i2c_mux] [ 12.686232] RIP: 0010:i2c_mux_add_adapter+0x729/0x7d0 [i2c_mux] [ 0x190/0x190 [i2c_mux] [ 12.686300] ? i2c_mux_alloc+0xac/0x110 [i2c_mux] [ 12.686306] ? i2c_mux_reg_set+0x200/0x200 [i2c_mux_reg] [ 12.686313] i2c_mux_reg_probe+0x22c/0x731 [i2c_mux_reg] [ 12.686322] ? i2c_mux_reg_deselect+0x60/0x60 [i2c_mux_reg] [ 12.686346] platform_drv_probe+0xa8/0x110 [ 12.686351] really_probe+0x185/0x720 [ 12.686358] driver_probe_device+0xdf/0x1f0 ... [ 12.686522] i2c i2c-1: Added multiplexed i2c bus 8 [ 12.686621] device: 'i2c-9': device_add [ 12.686626] kobject_add_internal failed for i2c-9 (error: -2 parent: i2c-1) [ 12.694729] i2c-core: adapter 'i2c-1-mux (chan_id 8)': can't register device (-2) [ 12.705726] i2c i2c-1: failed to add mux-adapter 8 as bus 9 (error=-2) [ 12.714494] device: 'i2c-8': device_unregister [ 12.714537] device: 'i2c-8': device_unregister
--- drivers/platform/x86/mlx-platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/mlx-platform.c +1 -1
@@ -1828,7 +1828,7 @@ static int __init mlxplat_init(void)for (i =0 ; i <ARRAY_SIZE (mlxplat_mux_data); i++) { priv->pdev_mux[i] =platform_device_register_resndata ( - &mlxplat_dev->dev, + &priv->pdev_i2c->dev,"i2c-mux-reg" , i,NULL ,0 , &mlxplat_mux_data[i],sizeof (mlxplat_mux_data[i]));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/96 platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow
In reply to Greg Kroah-Hartman[ Upstream commit 8c2eb7b6468ad4aa5600aed01aa0715f921a3f8b ]
Add devm_free_irq() call to mlxreg-hotplug remove() for clean release of devices irq resource. Fix debugobjects warning triggered by rmmod It prevents of use-after-free memory, related to mlxreg_hotplug_work_handler.
Issue has been reported as debugobjects warning triggered by 'rmmod mlxtreg-hotplug' flow, while running kernel with CONFIG_DEBUG_OBJECTS* options.
[ 2489.623551] ODEBUG: free active (active state 0) object type: work_struct hint: mlxreg_hotplug_work_handler+0x0/0x7f0 [mlxreg_hotplug] [ 2489.637097] WARNING: CPU: 5 PID: 3924 at lib/debugobjects.c:328 debug_print_object+0xfe/0x180 [ 2489.637165] RIP: 0010:debug_print_object+0xfe/0x180 ? [ 2489.637214] Call Trace: [ 2489.637225] __debug_check_no_obj_freed+0x25e/0x320 [ 2489.637231] kfree+0x82/0x110 [ 2489.637238] release_nodes+0x33c/0x4e0 [ 2489.637242] ? devres_remove_group+0x1b0/0x1b0 [ 2489.637247] device_release_driver_internal+0x146/0x270 [ 2489.637251] driver_detach+0x73/0xe0 [ 2489.637254] bus_remove_driver+0xa1/0x170 [ 2489.637261] __x64_sys_delete_module+0x29e/0x320 [ 2489.637265] ? __ia32_sys_delete_module+0x320/0x320 [ 2489.637268] ? blkcg_exit_queue+0x20/0x20 [ 2489.637273] ? task_work_run+0x7d/0x100 [ 2489.637278] ? exit_to_usermode_loop+0x5b/0xf0 [ 2489.637281] do_syscall_64+0x73/0x160 [ 2489.637287] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 2489.637290] RIP: 0033:0x7f95c3596fd7
The difference in release flow with and with no devm_free_irq is listed below:
bus: 'platform': remove driver mlxreg-hotplug
mlxreg_hotplug_remove(start)
-> devm_free_irq (with new code) mlxreg_hotplug_remove (end) release_nodes (start) mlxreg-hotplug: DEVRES REL devm_hwmon_release (8 bytes) device: 'hwmon3': device_unregister PM: Removing info for No Bus:hwmon3 mlxreg-hotplug: DEVRES REL devm_kzalloc_release (88 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (6 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (5 bytes) mlxreg-hotplug: DEVRES REL devm_irq_release (16 bytes) (no new code) mlxreg-hotplug: DEVRES REL devm_kzalloc_release (1376 bytes) ------------[ cut here ]------------ (no new code): ODEBUG: free active (active state 0) object type: work_struct hint: mlxreg_hotplug_work_handler
release_nodes(end)
driver: 'mlxreg-hotplug': driver_release
--- drivers/platform/mellanox/mlxreg-hotplug.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/mellanox/mlxreg-hotplug.c +1 -0
@@ -694,6 +694,7 @@ static int mlxreg_hotplug_remove(struct platform_device *pdev)/* Clean interrupts setup. */ mlxreg_hotplug_unset_irq (priv); +devm_free_irq (&pdev->dev, priv->irq, priv);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/96 i2c: pca-platform: Fix GPIO lookup code
In reply to Greg Kroah-Hartman[ Upstream commit a0cac264a86fbf4d6cb201fbbb73c1d335e3248a ]
The devm_gpiod_request_gpiod() call will add "-gpios" to any passed connection ID before looking it up.
I do not think the reset GPIO on this platform is named "reset-gpios-gpios" but rather "reset-gpios" in the device tree, so fix this up so that we get a proper reset GPIO handle.
Also drop the inclusion of the legacy GPIO header.
--- drivers/i2c/busses/i2c-pca-platform.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/i2c/busses/i2c-pca-platform.c +1 -2
@@ -21,7 +21,6 @@#include <linux/platform_device.h> #include <linux/i2c-algo-pca.h> #include <linux/platform_data/i2c-pca-platform.h> -#include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/io.h> #include <linux/of.h>
@@ -173,7 +172,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) i2c->adap.dev.parent = &pdev->dev; i2c->adap.dev.of_node = np; - i2c->gpio =devm_gpiod_get_optional (&pdev->dev,"reset-gpios" ,GPIOD_OUT_LOW ); + i2c->gpio =devm_gpiod_get_optional (&pdev->dev,"reset" ,GPIOD_OUT_LOW );if (IS_ERR (i2c->gpio))return PTR_ERR (i2c->gpio);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/96 arm64: tlbflush: Ensure start/end of address range are aligned to stride
In reply to Greg Kroah-Hartman[ Upstream commit 01d57485fcdb9f9101a10a18e32d5f8b023cab86 ]
Since commit 3d65b6bbc01e ("arm64: tlbi: Set MAX_TLBI_OPS to PTRS_PER_PTE"), we resort to per-ASID invalidation when attempting to perform more than PTRS_PER_PTE invalidation instructions in a single call to __flush_tlb_range(). Whilst this is beneficial, the mmu_gather code does not ensure that the end address of the range is rounded-up to the stride when freeing intermediate page tables in pXX_free_tlb(), which defeats our range checking.
Align the bounds passed into __flush_tlb_range().
--- arch/arm64/include/asm/tlbflush.h | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/include/asm/tlbflush.h +3 -0
@@ -195,6 +195,9 @@ static inline void __flush_tlb_range(struct vm_area_struct *vma,unsigned long asid =ASID (vma->vm_mm);unsigned long addr; + start =round_down (start, stride); + end =round_up (end, stride); +if ((end - start) >= (MAX_TLBI_OPS * stride)) {flush_tlb_mm (vma->vm_mm);return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/96 cpuset: restore sanity to cpuset_cpus_allowed_fallback()
In reply to Greg Kroah-Hartman[ Upstream commit d477f8c202d1f0d4791ab1263ca7657bbe5cf79e ]
In the case that a process is constrained by taskset(1) (i.e. sched_setaffinity(2)) to a subset of available cpus, and all of those are subsequently offlined, the scheduler will set tsk->cpus_allowed to the current value of task_cs(tsk)->effective_cpus.
This is done via a call to do_set_cpus_allowed() in the context of cpuset_cpus_allowed_fallback() made by the scheduler when this case is detected. This is the only call made to cpuset_cpus_allowed_fallback() in the latest mainline kernel.
However, this is not sane behavior.
I will demonstrate this on a system running the latest upstream kernel with the following initial configuration:
# grep -i cpu /proc/$$/status Cpus_allowed: ffffffff,fffffff Cpus_allowed_list: 0-63
(Where cpus 32-63 are provided via smt.)
If we limit our current shell process to cpu2 only and then offline it and reonline it:
# taskset -p 4 $$ pid 2272's current affinity mask: ffffffffffffffff pid 2272's new affinity mask: 4
# echo off > /sys/devices/system/cpu/cpu2/online # dmesg | tail -3 [ 2195.866089] process 2272 (bash) no longer affine to cpu2 [ 2195.872700] IRQ 114: no longer affine to CPU2 [ 2195.879128] smpboot: CPU 2 is now offline
# echo on > /sys/devices/system/cpu/cpu2/online # dmesg | tail -1 [ 2617.043572] smpboot: Booting Node 0 Processor 2 APIC 0x4
We see that our current process now has an affinity mask containing every cpu available on the system _except_ the one we originally constrained it to:
# grep -i cpu /proc/$$/status Cpus_allowed: ffffffff,fffffffb Cpus_allowed_list: 0-1,3-63
This is not sane behavior, as the scheduler can now not only place the process on previously forbidden cpus, it can't even schedule it on the cpu it was originally constrained to!
Other cases result in even more exotic affinity masks. Take for instance a process with an affinity mask containing only cpus provided by smt at the moment that smt is toggled, in a configuration such as the following:
# taskset -p f000000000 $$ # grep -i cpu /proc/$$/status Cpus_allowed: 000000f0,00000000 Cpus_allowed_list: 36-39
A double toggle of smt results in the following behavior:
# echo off > /sys/devices/system/cpu/smt/control # echo on > /sys/devices/system/cpu/smt/control # grep -i cpus /proc/$$/status Cpus_allowed: ffffff00,ffffffff Cpus_allowed_list: 0-31,40-63
This is even less sane than the previous case, as the new affinity mask excludes all smt-provided cpus with ids less than those that were previously in the affinity mask, as well as those that were actually in the mask.
With this patch applied, both of these cases end in the following state:
# grep -i cpu /proc/$$/status Cpus_allowed: ffffffff,ffffffff Cpus_allowed_list: 0-63
The original policy is discarded. Though not ideal, it is the simplest way to restore sanity to this fallback case without reinventing the cpuset wheel that rolls down the kernel just fine in cgroup v2. A user who wishes for the previous affinity mask to be restored in this fallback case can use that mechanism instead.
This patch modifies scheduler behavior by instead resetting the mask to task_cs(tsk)->cpus_allowed by default, and cpu_possible mask in legacy mode. I tested the cases above on both modes.
Note that the scheduler uses this fallback mechanism if and only if _every_ other valid avenue has been traveled, and it is the last resort before calling BUG().
--- kernel/cgroup/cpuset.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
kernel/cgroup/cpuset.c +14 -1
@@ -3255,10 +3255,23 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)spin_unlock_irqrestore (&callback_lock, flags); } +/** +* cpuset_cpus_allowed_fallback - final fallback before complete catastrophe. +* @tsk: pointer to task_struct with which the scheduler is struggling +* +* Description: In the case that the scheduler cannot find an allowed cpu in +* tsk->cpus_allowed, we fall back to task_cs(tsk)->cpus_allowed. In legacy +* mode however, this value is the same as task_cs(tsk)->effective_cpus, +* which will not contain a sane cpumask during cases such as cpu hotplugging. +* This is the absolute last resort for the scheduler and it is only used if +* _every_ other avenue has been traveled. +**/ +void cpuset_cpus_allowed_fallback (struct task_struct *tsk) {rcu_read_lock (); -do_set_cpus_allowed (tsk,task_cs (tsk)->effective_cpus); +do_set_cpus_allowed (tsk,is_in_v2_mode () ? +task_cs (tsk)->cpus_allowed : cpu_possible_mask);rcu_read_unlock ();/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/96 scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE
In reply to Greg Kroah-Hartman[ Upstream commit c04e32e911653442fc834be6e92e072aeebe01a1 ]
At least for ARM64 kernels compiled with the crosstoolchain from Debian/stretch or with the toolchain from kernel.org the line number is not decoded correctly by 'decode_stacktrace.sh':
$ echo "[ 136.513051] f1+0x0/0xc [kcrash]" | \
CROSS_COMPILE=/opt/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- \
./scripts/decode_stacktrace.sh /scratch/linux-arm64/vmlinux \
/scratch/linux-arm64 \
/nfs/debian/lib/modules/4.20.0-devel
[ 136.513051] f1 (/linux/drivers/staging/kcrash/kcrash.c:68) kcrashIf addr2line from the toolchain is used the decoded line number is correct:
[ 136.513051] f1 (/linux/drivers/staging/kcrash/kcrash.c:57) kcrash
--- scripts/decode_stacktrace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/decode_stacktrace.sh +1 -1
@@ -73,7 +73,7 @@ parse_symbol() { if [[ "${cache[$module,$address]+isset}" == "isset" ]]; then local code=${cache[$module,$address]} else - local code=$(addr2line -i -e "$objfile" "$address") + local code=$(${CROSS_COMPILE}addr2line -i -e "$objfile" "$address") cache[$module,$address]=$code fi
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/96 mm/mlock.c: change count_mm_mlocked_page_nr return type
In reply to Greg Kroah-Hartman[ Upstream commit 0874bb49bb21bf24deda853e8bf61b8325e24bcb ]
On a 64-bit machine the value of "vma->vm_end - vma->vm_start" may be negative when using 32 bit ints and the "count >> PAGE_SHIFT"'s result will be wrong. So change the local variable and return value to unsigned long to fix the problem.
--- mm/mlock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/mlock.c +2 -2
@@ -636,11 +636,11 @@ static int apply_vma_lock_flags(unsigned long start, size_t len,* is also counted. * Return value: previously mlocked page counts */ -static int count_mm_mlocked_page_nr (struct mm_struct *mm, +static unsigned long count_mm_mlocked_page_nr (struct mm_struct *mm,unsigned long start,size_t len) {struct vm_area_struct *vma; -int count =0 ; +unsigned long count =0 ;if (mm ==NULL ) mm = current->mm;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/96 tracing: avoid build warning with HAVE_NOP_MCOUNT
In reply to Greg Kroah-Hartman[ Upstream commit cbdaeaf050b730ea02e9ab4ff844ce54d85dbe1d ]
Selecting HAVE_NOP_MCOUNT enables -mnop-mcount (if gcc supports it) and sets CC_USING_NOP_MCOUNT. Reuse __is_defined (which is suitable for testing CC_USING_* defines) to avoid conditional compilation and fix the following gcc 9 warning on s390:
kernel/trace/ftrace.c:2514:1: warning: ‘ftrace_code_disable’ defined but not used [-Wunused-function]
--- kernel/trace/ftrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/trace/ftrace.c +2 -3
@@ -2939,14 +2939,13 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs) p = &pg->records[i]; p->flags = rec_flags; -#ifndef CC_USING_NOP_MCOUNT /* * Do the initial record conversion from mcount jump * to the NOP instructions. */ -if (!ftrace_code_disable (mod, p)) +if (!__is_defined (CC_USING_NOP_MCOUNT ) && + !ftrace_code_disable (mod, p))break ; -#endif update_cnt++; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/96 module: Fix livepatch/ftrace module text permissions race
In reply to Greg Kroah-Hartman[ Upstream commit 9f255b632bf12c4dd7fc31caee89aa991ef75176 ]
It's possible for livepatch and ftrace to be toggling a module's text permissions at the same time, resulting in the following panic:
BUG: unable to handle page fault for address: ffffffffc005b1d9 #PF: supervisor write access in kernel mode #PF: error_code(0x0003) - permissions violation PGD 3ea0c067 P4D 3ea0c067 PUD 3ea0e067 PMD 3cc13067 PTE 3b8a1061 Oops: 0003 [#1] PREEMPT SMP PTI CPU: 1 PID: 453 Comm: insmod Tainted: G O K 5.2.0-rc1-a188339ca5 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-20181126_142135-anatol 04/01/2014 RIP: 0010:apply_relocate_add+0xbe/0x14c Code: fa 0b 74 21 48 83 fa 18 74 38 48 83 fa 0a 75 40 eb 08 48 83 38 00 74 33 eb 53 83 38 00 75 4e 89 08 89 c8 eb 0a 83 38 00 75 43 <89> 08 48 63 c1 48 39 c8 74 2e eb 48 83 38 00 75 32 48 29 c1 89 08 RSP: 0018:ffffb223c00dbb10 EFLAGS: 00010246 RAX: ffffffffc005b1d9 RBX: 0000000000000000 RCX: ffffffff8b200060 RDX: 000000000000000b RSI: 0000004b0000000b RDI: ffff96bdfcd33000 RBP: ffffb223c00dbb38 R08: ffffffffc005d040 R09: ffffffffc005c1f0 R10: ffff96bdfcd33c40 R11: ffff96bdfcd33b80 R12: 0000000000000018 R13: ffffffffc005c1f0 R14: ffffffffc005e708 R15: ffffffff8b2fbc74 FS: 00007f5f447beba8(0000) GS:ffff96bdff900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffc005b1d9 CR3: 000000003cedc002 CR4: 0000000000360ea0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: klp_init_object_loaded+0x10f/0x219 ? preempt_latency_start+0x21/0x57 klp_enable_patch+0x662/0x809 ? virt_to_head_page+0x3a/0x3c ? kfree+0x8c/0x126 patch_init+0x2ed/0x1000 [livepatch_test02] ? 0xffffffffc0060000 do_one_initcall+0x9f/0x1c5 ? kmem_cache_alloc_trace+0xc4/0xd4 ? do_init_module+0x27/0x210 do_init_module+0x5f/0x210 load_module+0x1c41/0x2290 ? fsnotify_path+0x3b/0x42 ? strstarts+0x2b/0x2b ? kernel_read+0x58/0x65 __do_sys_finit_module+0x9f/0xc3 ? __do_sys_finit_module+0x9f/0xc3 __x64_sys_finit_module+0x1a/0x1c do_syscall_64+0x52/0x61 entry_SYSCALL_64_after_hwframe+0x44/0xa9
The above panic occurs when loading two modules at the same time with ftrace enabled, where at least one of the modules is a livepatch module:
CPU0 CPU1klp_enable_patch()
klp_init_object_loaded()
module_disable_ro()
ftrace_module_enable()
ftrace_arch_code_modify_post_process()
set_all_modules_text_ro()
klp_write_object_relocations()
apply_relocate_add()
*patches read-only code* - BOOM
A similar race exists when toggling ftrace while loading a livepatch module.
Fix it by ensuring that the livepatch and ftrace code patching operations -- and their respective permissions changes -- are protected by the text_mutex.
--- kernel/livepatch/core.c | 6 ++++++ kernel/trace/ftrace.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
kernel/livepatch/core.c +6 -0
@@ -30,6 +30,7 @@#include <linux/elf.h> #include <linux/moduleloader.h> #include <linux/completion.h> +#include <linux/memory.h> #include <asm/cacheflush.h> #include "core.h" #include "patch.h"
@@ -746,16 +747,21 @@ static int klp_init_object_loaded(struct klp_patch *patch,struct klp_func *func;int ret; +mutex_lock (&text_mutex); +module_disable_ro (patch->mod); ret =klp_write_object_relocations (patch->mod, obj);if (ret) {module_enable_ro (patch->mod, true); +mutex_unlock (&text_mutex);return ret; }arch_klp_init_object_loaded (patch, obj);module_enable_ro (patch->mod, true); +mutex_unlock (&text_mutex); +klp_for_each_func (obj, func) { ret = klp_find_object_symbol(obj->name, func->old_name, func->old_sympos,
kernel/trace/ftrace.c +9 -1
@@ -34,6 +34,7 @@#include <linux/hash.h> #include <linux/rcupdate.h> #include <linux/kprobes.h> +#include <linux/memory.h> #include <trace/events/sched.h>
@@ -2614,10 +2615,12 @@ static void ftrace_run_update_code(int command) {int ret; +mutex_lock (&text_mutex); + ret =ftrace_arch_code_modify_prepare ();FTRACE_WARN_ON (ret);if (ret) -return ; + goto out_unlock;/* * By default we use stop_machine() to modify the code.
@@ -2629,6 +2632,9 @@ static void ftrace_run_update_code(int command) ret =ftrace_arch_code_modify_post_process ();FTRACE_WARN_ON (ret); + +out_unlock: +mutex_unlock (&text_mutex); } static void ftrace_run_modify_code(struct ftrace_ops *ops, int command,
@@ -5779,6 +5785,7 @@ void ftrace_module_enable(struct module *mod)struct ftrace_page *pg;mutex_lock (&ftrace_lock); +mutex_lock (&text_mutex);if (ftrace_disabled) goto out_unlock;
@@ -5840,6 +5847,7 @@ void ftrace_module_enable(struct module *mod)ftrace_arch_code_modify_post_process (); out_unlock: +mutex_unlock (&text_mutex);mutex_unlock (&ftrace_lock);process_cached_mods (mod->name);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/96 ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper()
In reply to Greg Kroah-Hartman[ Upstream commit 04e03d9a616c19a47178eaca835358610e63a1dd ]
The mapper may be NULL when called from register_ftrace_function_probe() with probe->data == NULL.
This issue can be reproduced as follow (it may be covered by compiler optimization sometime):
/ # cat /sys/kernel/debug/tracing/set_ftrace_filter
#### all functions enabled ####
/ # echo foo_bar:dump > /sys/kernel/debug/tracing/set_ftrace_filter
[ 206.949100] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 206.952402] Mem abort info: [ 206.952819] ESR = 0x96000006 [ 206.955326] Exception class = DABT (current EL), IL = 32 bits [ 206.955844] SET = 0, FnV = 0 [ 206.956272] EA = 0, S1PTW = 0 [ 206.956652] Data abort info: [ 206.957320] ISV = 0, ISS = 0x00000006 [ 206.959271] CM = 0, WnR = 0 [ 206.959938] user pgtable: 4k pages, 48-bit VAs, pgdp=0000000419f3a000 [ 206.960483] [0000000000000000] pgd=0000000411a87003, pud=0000000411a83003, pmd=0000000000000000 [ 206.964953] Internal error: Oops: 96000006 [#1] SMP [ 206.971122] Dumping ftrace buffer: [ 206.973677] (ftrace buffer empty) [ 206.975258] Modules linked in: [ 206.976631] Process sh (pid: 281, stack limit = 0x(____ptrval____)) [ 206.978449] CPU: 10 PID: 281 Comm: sh Not tainted 5.2.0-rc1+ #17 [ 206.978955] Hardware name: linux,dummy-virt (DT) [ 206.979883] pstate: 60000005 (nZCv daif -PAN -UAO) [ 206.980499] pc : free_ftrace_func_mapper+0x2c/0x118 [ 206.980874] lr : ftrace_count_free+0x68/0x80 [ 206.982539] sp : ffff0000182f3ab0 [ 206.983102] x29: ffff0000182f3ab0 x28: ffff8003d0ec1700 [ 206.983632] x27: ffff000013054b40 x26: 0000000000000001 [ 206.984000] x25: ffff00001385f000 x24: 0000000000000000 [ 206.984394] x23: ffff000013453000 x22: ffff000013054000 [ 206.984775] x21: 0000000000000000 x20: ffff00001385fe28 [ 206.986575] x19: ffff000013872c30 x18: 0000000000000000 [ 206.987111] x17: 0000000000000000 x16: 0000000000000000 [ 206.987491] x15: ffffffffffffffb0 x14: 0000000000000000 [ 206.987850] x13: 000000000017430e x12: 0000000000000580 [ 206.988251] x11: 0000000000000000 x10: cccccccccccccccc [ 206.988740] x9 : 0000000000000000 x8 : ffff000013917550 [ 206.990198] x7 : ffff000012fac2e8 x6 : ffff000012fac000 [ 206.991008] x5 : ffff0000103da588 x4 : 0000000000000001 [ 206.991395] x3 : 0000000000000001 x2 : ffff000013872a28 [ 206.991771] x1 : 0000000000000000 x0 : 0000000000000000 [ 206.992557] Call trace: [ 206.993101] free_ftrace_func_mapper+0x2c/0x118 [ 206.994827] ftrace_count_free+0x68/0x80 [ 206.995238] release_probe+0xfc/0x1d0 [ 206.995555] register_ftrace_function_probe+0x4a8/0x868 [ 206.995923] ftrace_trace_probe_callback.isra.4+0xb8/0x180 [ 206.996330] ftrace_dump_callback+0x50/0x70 [ 206.996663] ftrace_regex_write.isra.29+0x290/0x3a8 [ 206.997157] ftrace_filter_write+0x44/0x60 [ 206.998971] __vfs_write+0x64/0xf0 [ 206.999285] vfs_write+0x14c/0x2f0 [ 206.999591] ksys_write+0xbc/0x1b0 [ 206.999888] __arm64_sys_write+0x3c/0x58 [ 207.000246] el0_svc_common.constprop.0+0x408/0x5f0 [ 207.000607] el0_svc_handler+0x144/0x1c8 [ 207.000916] el0_svc+0x8/0xc [ 207.003699] Code: aa0003f8 a9025bf5 aa0103f5 f946ea80 (f9400303) [ 207.008388] ---[ end trace 7b6d11b5f542bdf1 ]--- [ 207.010126] Kernel panic - not syncing: Fatal exception [ 207.011322] SMP: stopping secondary CPUs [ 207.013956] Dumping ftrace buffer: [ 207.014595] (ftrace buffer empty) [ 207.015632] Kernel Offset: disabled [ 207.017187] CPU features: 0x002,20006008 [ 207.017985] Memory Limit: none [ 207.019825] ---[ end Kernel panic - not syncing: Fatal exception ]---
--- kernel/trace/ftrace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/trace/ftrace.c +5 -2
@@ -4230,10 +4230,13 @@ void free_ftrace_func_mapper(struct ftrace_func_mapper *mapper,struct ftrace_func_entry *entry;struct ftrace_func_map *map;struct hlist_head *hhd; -int size =1 << mapper->hash.size_bits; -int i; +int size, i; + +if (!mapper) +return ;if (free_func && mapper->hash.count) { + size =1 << mapper->hash.size_bits;for (i =0 ; i < size; i++) { hhd = &mapper->hash.buckets[i];hlist_for_each_entry (entry, hhd, hlist) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/96 ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 6994eefb0053799d2e07cd140df6c2ea106c41ee upstream.
Fix two issues:
When called for PTRACE_TRACEME, ptrace_link() would obtain an RCU reference to the parent's objective credentials, then give that pointer to get_cred(). However, the object lifetime rules for things like struct cred do not permit unconditionally turning an RCU reference into a stable reference.
PTRACE_TRACEME records the parent's credentials as if the parent was acting as the subject, but that's not the case. If a malicious unprivileged child uses PTRACE_TRACEME and the parent is privileged, and at a later point, the parent process becomes attacker-controlled (because it drops privileges and calls execve()), the attacker ends up with control over two processes with a privileged ptrace relationship, which can be abused to ptrace a suid binary and obtain root privileges.
Fix both of these by always recording the credentials of the process that is requesting the creation of the ptrace relationship:current_cred() can't change under us, and current is the proper subject for access control.
This change is theoretically userspace-visible, but I am not aware of any code that it will actually break.
--- kernel/ptrace.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/ptrace.c +1 -3
@@ -78,9 +78,7 @@ void __ptrace_link(struct task_struct *c*/ static void ptrace_link (struct task_struct *child,struct task_struct *new_parent) { -rcu_read_lock (); -__ptrace_link (child, new_parent,__task_cred (new_parent)); -rcu_read_unlock (); +__ptrace_link (child, new_parent,current_cred ()); }/**
Greg Kroah-Hartman
maintainerPATCH 57/96 crypto: user - prevent operating on larval algorithms
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 21d4120ec6f5b5992b01b96ac484701163917b63 upstream.
Michal Suchanek reported [1] that running the pcrypt_aead01 test from LTP [2] in a loop and holding Ctrl-C causes a NULL dereference of alg->cra_users.next in crypto_remove_spawns(), via crypto_del_alg(). The test repeatedly uses CRYPTO_MSG_NEWALG and CRYPTO_MSG_DELALG.
The crash occurs when the instance that CRYPTO_MSG_DELALG is trying to unregister isn't a real registered algorithm, but rather is a "test larval", which is a special "algorithm" added to the algorithms list while the real algorithm is still being tested. Larvals don't have initialized cra_users, so that causes the crash. Normally pcrypt_aead01 doesn't trigger this because CRYPTO_MSG_NEWALG waits for the algorithm to be tested; however, CRYPTO_MSG_NEWALG returns early when interrupted.
Everything else in the "crypto user configuration" API has this same bug too, i.e. it inappropriately allows operating on larval algorithms (though it doesn't look like the other cases can cause a crash).
Fix this by making crypto_alg_match() exclude larval algorithms.
[1] https://lkml.kernel.org/r/[email protected]
[2] https://github.com/linux-test-project/ltp/blob/20190517/testcases/kernel/crypto/pcrypt_aead01.c
--- crypto/crypto_user_base.c | 3 +++ 1 file changed, 3 insertions(+)
crypto/crypto_user_base.c +3 -0
@@ -56,6 +56,9 @@ struct crypto_alg *crypto_alg_match(strulist_for_each_entry (q, &crypto_alg_list, cra_list) {int match =0 ; +if (crypto_is_larval (q)) +continue ; +if ((q->cra_flags ^ p->cru_type) & p->cru_mask)continue ;
Greg Kroah-Hartman
maintainerPATCH 58/96 crypto: cryptd - Fix skcipher instance memory leak
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
commit 1a0fad630e0b7cff38e7691b28b0517cfbb0633f upstream.
cryptd_skcipher_free() fails to free the struct skcipher_instance allocated in cryptd_create_skcipher(), leading to a memory leak. This is detected by kmemleak on bootup on ARM64 platforms:
unreferenced object 0xffff80003377b180 (size 1024):
comm "cryptomgr_probe", pid 822, jiffies 4294894830 (age 52.760s) backtrace:
kmem_cache_alloc_trace+0x270/0x2d0
cryptd_create+0x990/0x124c
cryptomgr_probe+0x5c/0x1e8
kthread+0x258/0x318
ret_from_fork+0x10/0x1c--- crypto/cryptd.c | 1 + 1 file changed, 1 insertion(+)
crypto/cryptd.c +1 -0
@@ -586,6 +586,7 @@ static void cryptd_skcipher_free(structstruct skcipherd_instance_ctx *ctx =skcipher_instance_ctx (inst);crypto_drop_skcipher (&ctx->spawn); +kfree (inst); } static int cryptd_create_skcipher(struct crypto_template *tmpl,
Greg Kroah-Hartman
maintainerPATCH 59/96 ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit c3ea60c231446663afd6ea1054da6b7f830855ca upstream.
There are two occurrances of a call to snd_seq_oss_fill_addr where the dest_client and dest_port arguments are in the wrong order. Fix this by swapping them around.
Addresses-Coverity: ("Arguments in wrong order")
--- sound/core/seq/oss/seq_oss_ioctl.c | 2 +- sound/core/seq/oss/seq_oss_rw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/core/seq/oss/seq_oss_ioctl.c +1 -1
@@ -62,7 +62,7 @@ static int snd_seq_oss_oob_user(struct sif (copy_from_user (ev, arg,8 ))return -EFAULT ;memset (&tmpev,0 ,sizeof (tmpev)); -snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.port, dp->addr.client); +snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.client, dp->addr.port); tmpev.time.tick =0 ;if (!snd_seq_oss_process_event (dp, (union evrec *)ev, &tmpev)) {snd_seq_oss_dispatch (dp, &tmpev,0 ,0 );
sound/core/seq/oss/seq_oss_rw.c +1 -1
@@ -174,7 +174,7 @@ insert_queue(struct seq_oss_devinfo *dp,memset (&event,0 ,sizeof (event));/* set dummy -- to be sure */ event.type =SNDRV_SEQ_EVENT_NOTEOFF ; -snd_seq_oss_fill_addr (dp, &event, dp->addr.port, dp->addr.client); +snd_seq_oss_fill_addr (dp, &event, dp->addr.client, dp->addr.port);if (snd_seq_oss_process_event (dp, rec, &event))return 0 ;/* invalid event - no need to insert queue */
Greg Kroah-Hartman
maintainerPATCH 60/96 ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
commit 7fbd1753b64eafe21cf842348a40a691d0dee440 upstream.
In IEC 61883-6, 8 MIDI data streams are multiplexed into single MIDI conformant data channel. The index of stream is calculated by modulo 8 of the value of data block counter.
In fireworks, the value of data block counter in CIP header has a quirk with firmware version v5.0.0, v5.7.3 and v5.8.0. This brings ALSA IEC 61883-1/6 packet streaming engine to miss detection of MIDI messages.
This commit fixes the miss detection to modify the value of data block counter for the modulo calculation.
For maintainers, this bug exists since a commit 18f5ed365d3f ("ALSA:
fireworks/firewire-lib: add support for recent firmware quirk") in Linux kernel v4.2. There're many changes since the commit. This fix can be backported to Linux kernel v4.4 or later. I tagged a base commit to the backport for your convenience.
Besides, my work for Linux kernel v5.3 brings heavy code refactoring and some structure members are renamed in 'sound/firewire/amdtp-stream.h'. The content of this patch brings conflict when merging -rc tree with this patch and the latest tree. I request maintainers to solve the conflict to replace 'tx_first_dbc' with 'ctx_data.tx.first_dbc'.
--- sound/firewire/amdtp-am824.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/firewire/amdtp-am824.c +1 -1
@@ -321,7 +321,7 @@ static void read_midi_messages(struct amu8 *b;for (f =0 ; f < frames; f++) { - port = (s->data_block_counter + f) %8 ; + port = (8 - s->tx_first_dbc + s->data_block_counter + f) %8 ; b = (u8 *)&buffer[p->midi_position]; len = b[0 ] -0x80 ;
Greg Kroah-Hartman
maintainerPATCH 61/96 ALSA: line6: Fix write on zero-sized buffer
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 3450121997ce872eb7f1248417225827ea249710 upstream.
LINE6 drivers allocate the buffers based on the value returned from usb_maxpacket() calls. The manipulated device may return zero for this, and this results in the kmalloc() with zero size (and it may succeed) while the other part of the driver code writes the packet data with the fixed size -- which eventually overwrites.
This patch adds a simple sanity check for the invalid buffer size for avoiding that problem.
--- sound/usb/line6/pcm.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/usb/line6/pcm.c +5 -0
@@ -560,6 +560,11 @@ int line6_init_pcm(struct usb_line6 *lin line6pcm->max_packet_size_out =usb_maxpacket (line6->usbdev,usb_sndisocpipe (line6->usbdev, ep_write),1 ); +if (!line6pcm->max_packet_size_in || !line6pcm->max_packet_size_out) { +dev_err (line6pcm->line6->ifcdev, +"cannot get proper max packet size\n" ); +return -EINVAL ; + }spin_lock_init (&line6pcm->out.lock);spin_lock_init (&line6pcm->in.lock);
Greg Kroah-Hartman
maintainerPATCH 62/96 ALSA: usb-audio: fix sign unintended sign extension on left shifts
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 2acf5a3e6e9371e63c9e4ff54d84d08f630467a0 upstream.
There are a couple of left shifts of unsigned 8 bit values that first get promoted to signed ints and hence get sign extended on the shift if the top bit of the 8 bit values are set. Fix this by casting the 8 bit values to unsigned ints to stop the unintentional sign extension.
Addresses-Coverity: ("Unintended sign extension")
--- sound/usb/mixer_quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/mixer_quirks.c +2 -2
@@ -754,7 +754,7 @@ static int snd_ni_control_init_val(strucreturn err; } - kctl->private_value |= (value <<24 ); + kctl->private_value |= ((unsigned int )value <<24 );return 0 ; }
@@ -915,7 +915,7 @@ static int snd_ftu_eff_switch_init(strucif (err <0 )return err; - kctl->private_value |= value[0 ] <<24 ; + kctl->private_value |= (unsigned int )value[0 ] <<24 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 63/96 ALSA: hda/realtek: Add quirks for several Clevo notebook barebones
In reply to Greg Kroah-HartmanFrom: Richard Sailer <[email protected]>
commit 503d90b30602a3295978e46d844ccc8167400fe6 upstream.
This adds 4 SND_PCI_QUIRK(...) lines for several barebone models of the ODM Clevo. The model names are written in regex syntax to describe/match all clevo models that are similar enough and use the same PCI SSID that this fixup works for them.
Additionally the lines regarding SSID 0x96e1 and 0x97e1 didn't fix audio for the all our Clevo notebooks using these SSIDs (models Clevo P960* and P970*) since ALC1220_FIXP_CLEVO_PB51ED_PINS swapped pins that are not necesarry to be swapped. This patch initiates ALC1220_FIXUP_CLEVO_P950 instead for these model and fixes the audio.
--- sound/pci/hda/patch_realtek.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/pci/hda/patch_realtek.c +4 -3
@@ -2443,9 +2443,10 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1558 ,0x9501 ,"Clevo P950HR" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1558 ,0x95e1 ,"Clevo P95xER" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1558 ,0x95e2 ,"Clevo P950ER" ,ALC1220_FIXUP_CLEVO_P950 ), -SND_PCI_QUIRK (0x1558 ,0x96e1 ,"System76 Oryx Pro (oryp5)" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), -SND_PCI_QUIRK (0x1558 ,0x97e1 ,"System76 Oryx Pro (oryp5)" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), -SND_PCI_QUIRK (0x1558 ,0x65d1 ,"Tuxedo Book XC1509" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x96e1 ,"Clevo P960[ER][CDFN]-K" ,ALC1220_FIXUP_CLEVO_P950 ), +SND_PCI_QUIRK (0x1558 ,0x97e1 ,"Clevo P970[ER][CDFN]" ,ALC1220_FIXUP_CLEVO_P950 ), +SND_PCI_QUIRK (0x1558 ,0x65d1 ,"Clevo PB51[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x67d1 ,"Clevo PB71[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK_VENDOR (0x1558 ,"Clevo laptop" ,ALC882_FIXUP_EAPD ),SND_PCI_QUIRK (0x161f ,0x2054 ,"Medion laptop" ,ALC883_FIXUP_EAPD ), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),
Greg Kroah-Hartman
maintainerPATCH 64/96 ALSA: hda/realtek - Change front mic location for Lenovo M710q
In reply to Greg Kroah-HartmanFrom: Dennis Wassenberg <[email protected]>
commit bef33e19203dde434bcdf21c449e3fb4f06c2618 upstream.
On M710q Lenovo ThinkCentre machine, there are two front mics, we change the location for one of them to avoid conflicts.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -7031,6 +7031,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x30bb ,"ThinkCentre AIO" ,ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY ),SND_PCI_QUIRK (0x17aa ,0x30e2 ,"ThinkCentre AIO" ,ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY ),SND_PCI_QUIRK (0x17aa ,0x310c ,"ThinkCentre Station" ,ALC294_FIXUP_LENOVO_MIC_LOCATION ), +SND_PCI_QUIRK (0x17aa ,0x3111 ,"ThinkCentre Station" ,ALC294_FIXUP_LENOVO_MIC_LOCATION ),SND_PCI_QUIRK (0x17aa ,0x312a ,"ThinkCentre Station" ,ALC294_FIXUP_LENOVO_MIC_LOCATION ),SND_PCI_QUIRK (0x17aa ,0x312f ,"ThinkCentre Station" ,ALC294_FIXUP_LENOVO_MIC_LOCATION ), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
Greg Kroah-Hartman
maintainerPATCH 65/96 dax: Fix xarray entry association for mixed mappings
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 1571c029a2ff289683ddb0a32253850363bcb8a7 upstream.
When inserting entry into xarray, we store mapping and index in corresponding struct pages for memory error handling. When it happened that one process was mapping file at PMD granularity while another process at PTE granularity, we could wrongly deassociate PMD range and then reassociate PTE range leaving the rest of struct pages in PMD range without mapping information which could later cause missed notifications about memory errors. Fix the problem by calling the association / deassociation code if and only if we are really going to update the xarray (deassociating and associating zero or empty entries is just no-op so there's no reason to complicate the code with trying to avoid the calls for these cases).
--- fs/dax.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/dax.c +4 -5
@@ -728,12 +728,11 @@ static void *dax_insert_entry(struct xa_xas_reset (xas);xas_lock_irq (xas); -if (dax_entry_size (entry) !=dax_entry_size (new_entry)) { +if (dax_is_zero_entry (entry) ||dax_is_empty_entry (entry)) { +void *old; +dax_disassociate_entry (entry, mapping, false);dax_associate_entry (new_entry, mapping, vmf->vma, vmf->address); - } - -if (dax_is_zero_entry (entry) ||dax_is_empty_entry (entry)) {/* * Only swap our new entry into the page cache if the current * entry is a zero page or an empty entry. If a normal PTE or
@@ -742,7 +741,7 @@ static void *dax_insert_entry(struct xa_* existing entry is a PMD, we will just leave the PMD in the * tree and dirty it if necessary. */ -void *old =dax_lock_entry (xas, new_entry); + old =dax_lock_entry (xas, new_entry);WARN_ON_ONCE (old !=xa_mk_value (xa_to_value (entry) |DAX_LOCKED )); entry = new_entry;
Greg Kroah-Hartman
maintainerPATCH 66/96 lib/mpi: Fix karactx leak in mpi_powm
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
commit c8ea9fce2baf7b643384f36f29e4194fa40d33a6 upstream.
Sometimes mpi_powm will leak karactx because a memory allocation failure causes a bail-out that skips the freeing of karactx. This patch moves the freeing of karactx to the end of the function like everything else so that it can't be skipped.
--- lib/mpi/mpi-pow.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
lib/mpi/mpi-pow.c +2 -4
@@ -37,6 +37,7 @@int mpi_powm (MPI res,MPI base,MPI exp,MPI mod) {mpi_ptr_t mp_marker =NULL , bp_marker =NULL , ep_marker =NULL ; +struct karatsuba_ctx karactx = {};mpi_ptr_t xp_marker =NULL ;mpi_ptr_t tspace =NULL ;mpi_ptr_t rp, ep, mp, bp;
@@ -163,13 +164,11 @@ int mpi_powm(MPI res, MPI base, MPI exp,int c;mpi_limb_t e;mpi_limb_t carry_limb; -struct karatsuba_ctx karactx; xp = xp_marker =mpi_alloc_limb_space (2 * (msize +1 ));if (!xp) goto enomem; -memset (&karactx,0 ,sizeof karactx); negative_result = (ep[0 ] &1 ) && base->sign; i = esize -1 ;
@@ -294,8 +293,6 @@ int mpi_powm(MPI res, MPI base, MPI exp,if (mod_shift_cnt)mpihelp_rshift (rp, rp, rsize, mod_shift_cnt);MPN_NORMALIZE (rp, rsize); - -mpihelp_release_karatsuba_ctx (&karactx); }if (negative_result && rsize) {
@@ -312,6 +309,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, leave: rc =0 ; enomem: +mpihelp_release_karatsuba_ctx (&karactx);if (assign_rp)mpi_assign_limb_space (res, rp, size);if (mp_marker)
Greg Kroah-Hartman
maintainerPATCH 67/96 fs/userfaultfd.c: disable irqs for fault_pending and event locks
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit cbcfa130a911c613a1d9d921af2eea171c414172 upstream.
When IOCB_CMD_POLL is used on a userfaultfd, aio_poll() disables IRQs and takes kioctx::ctx_lock, then userfaultfd_ctx::fd_wqh.lock.
This may have to wait for userfaultfd_ctx::fd_wqh.lock to be released by userfaultfd_ctx_read(), which in turn can be waiting for userfaultfd_ctx::fault_pending_wqh.lock or userfaultfd_ctx::event_wqh.lock.
But elsewhere the fault_pending_wqh and event_wqh locks are taken with IRQs enabled. Since the IRQ handler may take kioctx::ctx_lock, lockdep reports that a deadlock is possible.
Fix it by always disabling IRQs when taking the fault_pending_wqh and event_wqh locks.
Commit ae62c16e105a ("userfaultfd: disable irqs when taking the waitqueue lock") didn't fix this because it only accounted for the fd_wqh lock, not the other locks nested inside it.
--- fs/userfaultfd.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-)
fs/userfaultfd.c +26 -16
@@ -40,6 +40,16 @@ enum userfaultfd_state {/* * Start with fault_pending_wqh and fault_wqh so they're more likely * to be in the same cacheline. +* +* Locking order: +* fd_wqh.lock +* fault_pending_wqh.lock +* fault_wqh.lock +* event_wqh.lock +* +* To avoid deadlocks, IRQs must be disabled when taking any of the above locks, +* since fd_wqh.lock is taken by aio_poll() while it's holding a lock that's +* also taken in IRQ context. */ struct userfaultfd_ctx {/* waitqueue head for the pending (i.e. not read) userfaults */
@@ -458,7 +468,7 @@ vm_fault_t handle_userfault(struct vm_fa blocking_state = return_to_userland ?TASK_INTERRUPTIBLE :TASK_KILLABLE ; -spin_lock (&ctx->fault_pending_wqh.lock); +spin_lock_irq (&ctx->fault_pending_wqh.lock);/* * After the __add_wait_queue the uwq is visible to userland * through poll/read().
@@ -470,7 +480,7 @@ vm_fault_t handle_userfault(struct vm_fa* __add_wait_queue. */ set_current_state (blocking_state); -spin_unlock (&ctx->fault_pending_wqh.lock); +spin_unlock_irq (&ctx->fault_pending_wqh.lock);if (!is_vm_hugetlb_page (vmf->vma)) must_wait = userfaultfd_must_wait(ctx, vmf->address, vmf->flags,
@@ -552,13 +562,13 @@ vm_fault_t handle_userfault(struct vm_fa* kernel stack can be released after the list_del_init. */ if (!list_empty_careful (&uwq.wq.entry)) { -spin_lock (&ctx->fault_pending_wqh.lock); +spin_lock_irq (&ctx->fault_pending_wqh.lock);/* * No need of list_del_init(), the uwq on the stack * will be freed shortly anyway. */ list_del (&uwq.wq.entry); -spin_unlock (&ctx->fault_pending_wqh.lock); +spin_unlock_irq (&ctx->fault_pending_wqh.lock); }/*
@@ -583,7 +593,7 @@ static void userfaultfd_event_wait_complinit_waitqueue_entry (&ewq->wq, current); release_new_ctx =NULL ; -spin_lock (&ctx->event_wqh.lock); +spin_lock_irq (&ctx->event_wqh.lock);/* * After the __add_wait_queue the uwq is visible to userland * through poll/read().
@@ -613,15 +623,15 @@ static void userfaultfd_event_wait_complbreak ; } -spin_unlock (&ctx->event_wqh.lock); +spin_unlock_irq (&ctx->event_wqh.lock);wake_up_poll (&ctx->fd_wqh,EPOLLIN );schedule (); -spin_lock (&ctx->event_wqh.lock); +spin_lock_irq (&ctx->event_wqh.lock); }__set_current_state (TASK_RUNNING ); -spin_unlock (&ctx->event_wqh.lock); +spin_unlock_irq (&ctx->event_wqh.lock);if (release_new_ctx) {struct vm_area_struct *vma;
@@ -918,10 +928,10 @@ wakeup:* the last page faults that may have been already waiting on * the fault_*wqh. */ -spin_lock (&ctx->fault_pending_wqh.lock); +spin_lock_irq (&ctx->fault_pending_wqh.lock);__wake_up_locked_key (&ctx->fault_pending_wqh,TASK_NORMAL , &range);__wake_up (&ctx->fault_wqh,TASK_NORMAL ,1 , &range); -spin_unlock (&ctx->fault_pending_wqh.lock); +spin_unlock_irq (&ctx->fault_pending_wqh.lock);/* Flush pending events that may still wait on event_wqh */ wake_up_all (&ctx->event_wqh);
@@ -1134,7 +1144,7 @@ static ssize_t userfaultfd_ctx_read(struif (!ret && msg->event ==UFFD_EVENT_FORK ) { ret =resolve_userfault_fork (ctx, fork_nctx, msg); -spin_lock (&ctx->event_wqh.lock); +spin_lock_irq (&ctx->event_wqh.lock);if (!list_empty (&fork_event)) {/* * The fork thread didn't abort, so we can
@@ -1180,7 +1190,7 @@ static ssize_t userfaultfd_ctx_read(struif (ret)userfaultfd_ctx_put (fork_nctx); } -spin_unlock (&ctx->event_wqh.lock); +spin_unlock_irq (&ctx->event_wqh.lock); }return ret;
@@ -1219,14 +1229,14 @@ static ssize_t userfaultfd_read(struct fstatic void __wake_userfault (struct userfaultfd_ctx *ctx,struct userfaultfd_wake_range *range) { -spin_lock (&ctx->fault_pending_wqh.lock); +spin_lock_irq (&ctx->fault_pending_wqh.lock);/* wake all in the range and autoremove */ if (waitqueue_active (&ctx->fault_pending_wqh))__wake_up_locked_key (&ctx->fault_pending_wqh,TASK_NORMAL , range);if (waitqueue_active (&ctx->fault_wqh))__wake_up (&ctx->fault_wqh,TASK_NORMAL ,1 , range); -spin_unlock (&ctx->fault_pending_wqh.lock); +spin_unlock_irq (&ctx->fault_pending_wqh.lock); } static __always_inline void wake_userfault(struct userfaultfd_ctx *ctx,
@@ -1881,7 +1891,7 @@ static void userfaultfd_show_fdinfo(struwait_queue_entry_t *wq;unsigned long pending =0 , total =0 ; -spin_lock (&ctx->fault_pending_wqh.lock); +spin_lock_irq (&ctx->fault_pending_wqh.lock);list_for_each_entry (wq, &ctx->fault_pending_wqh.head, entry) { pending++; total++;
@@ -1889,7 +1899,7 @@ static void userfaultfd_show_fdinfo(strulist_for_each_entry (wq, &ctx->fault_wqh.head, entry) { total++; } -spin_unlock (&ctx->fault_pending_wqh.lock); +spin_unlock_irq (&ctx->fault_pending_wqh.lock);/* * If more protocols will be added, there will be all shown
Greg Kroah-Hartman
maintainerPATCH 68/96 swap_readpage(): avoid blk_wake_io_task() if !synchronous
In reply to Greg Kroah-HartmanFrom: Oleg Nesterov <[email protected]>
commit 8751853091998cd31e9e5f1e8206280155af8921 upstream.
swap_readpage() sets waiter = bio->bi_private even if synchronous = F, this means that the caller can get the spurious wakeup after return.
This can be fatal if blk_wake_io_task() does set_current_state(TASK_RUNNING) after the caller does set_special_state(), in the worst case the kernel can crash in do_task_dead().
--- mm/page_io.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
mm/page_io.c +8 -5
@@ -137,8 +137,10 @@ out:unlock_page (page);WRITE_ONCE (bio->bi_private,NULL );bio_put (bio); -blk_wake_io_task (waiter); -put_task_struct (waiter); +if (waiter) { +blk_wake_io_task (waiter); +put_task_struct (waiter); + } } int generic_swapfile_activate(struct swap_info_struct *sis,
@@ -395,11 +397,12 @@ int swap_readpage(struct page *page, boo* Keep this task valid during swap readpage because the oom killer may * attempt to access it in the page fault retry time check. */ -get_task_struct (current); - bio->bi_private = current;bio_set_op_attrs (bio,REQ_OP_READ ,0 ); -if (synchronous) +if (synchronous) { bio->bi_opf |=REQ_HIPRI ; +get_task_struct (current); + bio->bi_private = current; + }count_vm_event (PSWPIN );bio_get (bio); qc =submit_bio (bio);
Greg Kroah-Hartman
maintainerPATCH 69/96 tracing/snapshot: Resize spare buffer if size changed
In reply to Greg Kroah-HartmanFrom: Eiichi Tsukata <[email protected]>
commit 46cc0b44428d0f0e81f11ea98217fc0edfbeab07 upstream.
Current snapshot implementation swaps two ring_buffers even though their sizes are different from each other, that can cause an inconsistency between the contents of buffer_size_kb file and the current buffer size.
For example:
# cat buffer_size_kb 7 (expanded: 1408) # echo 1 > events/enable # grep bytes per_cpu/cpu0/stats bytes: 1441020 # echo 1 > snapshot // current:1408, spare:1408 # echo 123 > buffer_size_kb // current:123, spare:1408 # echo 1 > snapshot // current:1408, spare:123 # grep bytes per_cpu/cpu0/stats bytes: 1443700 # cat buffer_size_kb 123 // != current:1408
And also, a similar per-cpu case hits the following WARNING:
Reproducer:
# echo 1 > per_cpu/cpu0/snapshot # echo 123 > buffer_size_kb # echo 1 > per_cpu/cpu0/snapshot
WARNING:
WARNING: CPU: 0 PID: 1946 at kernel/trace/trace.c:1607 update_max_tr_single.part.0+0x2b8/0x380 Modules linked in: CPU: 0 PID: 1946 Comm: bash Not tainted 5.2.0-rc6 #20 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-2.fc30 04/01/2014 RIP: 0010:update_max_tr_single.part.0+0x2b8/0x380 Code: ff e8 dc da f9 ff 0f 0b e9 88 fe ff ff e8 d0 da f9 ff 44 89 ee bf f5 ff ff ff e8 33 dc f9 ff 41 83 fd f5 74 96 e8 b8 da f9 ff <0f> 0b eb 8d e8 af da f9 ff 0f 0b e9 bf fd ff ff e8 a3 da f9 ff 48 RSP: 0018:ffff888063e4fca0 EFLAGS: 00010093 RAX: ffff888066214380 RBX: ffffffff99850fe0 RCX: ffffffff964298a8 RDX: 0000000000000000 RSI: 00000000fffffff5 RDI: 0000000000000005 RBP: 1ffff1100c7c9f96 R08: ffff888066214380 R09: ffffed100c7c9f9b R10: ffffed100c7c9f9a R11: 0000000000000003 R12: 0000000000000000 R13: 00000000ffffffea R14: ffff888066214380 R15: ffffffff99851060 FS: 00007f9f8173c700(0000) GS:ffff88806d000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000714dc0 CR3: 0000000066fa6000 CR4: 00000000000006f0 Call Trace: ? trace_array_printk_buf+0x140/0x140 ? __mutex_lock_slowpath+0x10/0x10 tracing_snapshot_write+0x4c8/0x7f0 ? trace_printk_init_buffers+0x60/0x60 ? selinux_file_permission+0x3b/0x540 ? tracer_preempt_off+0x38/0x506 ? trace_printk_init_buffers+0x60/0x60 __vfs_write+0x81/0x100 vfs_write+0x1e1/0x560 ksys_write+0x126/0x250 ? __ia32_sys_read+0xb0/0xb0 ? do_syscall_64+0x1f/0x390 do_syscall_64+0xc1/0x390 entry_SYSCALL_64_after_hwframe+0x49/0xbe
This patch adds resize_buffer_duplicate_size() to check if there is a difference between current/spare buffer sizes and resize a spare buffer if necessary.
--- kernel/trace/trace.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/trace/trace.c +6 -4
@@ -6696,11 +6696,13 @@ tracing_snapshot_write(struct file *filp break; }#endif -if (!tr->allocated_snapshot) { +if (tr->allocated_snapshot) + ret =resize_buffer_duplicate_size (&tr->max_buffer, + &tr->trace_buffer, iter->cpu_file); +else ret =tracing_alloc_snapshot_instance (tr); -if (ret <0 ) -break ; - } +if (ret <0 ) +break ;local_irq_disable ();/* Now, we're going to swap */ if (iter->cpu_file ==RING_BUFFER_ALL_CPUS )
Greg Kroah-Hartman
maintainerPATCH 70/96 ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node
In reply to Greg Kroah-HartmanFrom: Joshua Scott <[email protected]>
commit 80031361747aec92163464f2ee08870fec33bcb0 upstream.
Switch to the "marvell,armada-38x-uart" driver variant to empty the UART buffer before writing to the UART_LCR register.
--- arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/armada-xp-98dx3236.dtsi +8 -0
@@ -336,3 +336,11 @@ status = "disabled"; }; +&uart0 { + compatible = "marvell,armada-38x-uart"; +}; + +&uart1 { + compatible = "marvell,armada-38x-uart"; +}; +
Greg Kroah-Hartman
maintainerPATCH 71/96 arm64: kaslr: keep modules inside module region when KASAN is enabled
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 6f496a555d93db7a11d4860b9220d904822f586a upstream.
When KASLR and KASAN are both enabled, we keep the modules where they are, and randomize the placement of the kernel so it is within 2 GB of the module region. The reason for this is that putting modules in the vmalloc region (like we normally do when KASLR is enabled) is not possible in this case, given that the entire vmalloc region is already backed by KASAN zero shadow pages, and so allocating dedicated KASAN shadow space as required by loaded modules is not possible.
The default module allocation window is set to [_etext - 128MB, _etext] in kaslr.c, which is appropriate for KASLR kernels booted without a seed or with 'nokaslr' on the command line. However, as it turns out, it is not quite correct for the KASAN case, since it still intersects the vmalloc region at the top, where attempts to allocate shadow pages will collide with the KASAN zero shadow pages, causing a WARN() and all kinds of other trouble. So cap the top end to MODULES_END explicitly when running with KASAN.
--- arch/arm64/kernel/module.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm64/kernel/module.c +6 -2
@@ -32,6 +32,7 @@void *module_alloc (unsigned long size) { +u64 module_alloc_end = module_alloc_base +MODULES_VSIZE ;gfp_t gfp_mask =GFP_KERNEL ;void *p;
@@ -39,9 +40,12 @@ void *module_alloc(unsigned long size)if (IS_ENABLED (CONFIG_ARM64_MODULE_PLTS )) gfp_mask |= __GFP_NOWARN; +if (IS_ENABLED (CONFIG_KASAN )) +/* don't exceed the static module region - see below */ + module_alloc_end =MODULES_END ; + p =__vmalloc_node_range (size,MODULE_ALIGN , module_alloc_base, - module_alloc_base +MODULES_VSIZE , - gfp_mask,PAGE_KERNEL_EXEC ,0 , + module_alloc_end, gfp_mask,PAGE_KERNEL_EXEC ,0 ,NUMA_NO_NODE ,__builtin_return_address (0 )); if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&
Greg Kroah-Hartman
maintainerPATCH 72/96 drm/i915/ringbuffer: EMIT_INVALIDATE *before* switch context
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit c84c9029d782a3a0d2a7f0522ecb907314d43e2c upstream.
Despite what I think the prm recommends, commit f2253bd9859b ("drm/i915/ringbuffer: EMIT_INVALIDATE after switch context") turned out to be a huge mistake when enabling Ironlake contexts as the GPU would hang on either a MI_FLUSH or PIPE_CONTROL immediately following the MI_SET_CONTEXT of an active mesa context (more vanilla contexts, e.g. simple rendercopies with igt, do not suffer).
Ville found the following clue,
"[DevCTG+]: For the invalidate operation of the pipe control, the
following pointers are affected. The
invalidate operation affects the restore of these packets. If the pipe control invalidate operation is completed
before the context save, the indirect pointers will not be restored from memory.
1. Pipeline State Pointer
2. Media State Pointer
3. Constant Buffer Packet"
which suggests by us emitting the INVALIDATE prior to the MI_SET_CONTEXT, we prevent the context-restore from chasing the dangling pointers within the image, and explains why this likely prevents the GPU hang.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111014
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -3
@@ -1957,12 +1957,12 @@ static int ring_request_alloc(struct i91*/ request->reserved_space +=LEGACY_REQUEST_SIZE ; - ret =switch_context (request); +/* Unconditionally invalidate GPU caches and TLBs. */ + ret = request->engine->emit_flush (request,EMIT_INVALIDATE );if (ret)return ret; -/* Unconditionally invalidate GPU caches and TLBs. */ - ret = request->engine->emit_flush (request,EMIT_INVALIDATE ); + ret =switch_context (request);if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 73/96 drm/amd/powerplay: use hardware fan control if no powerplay fan table
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit f78c581e22d4b33359ac3462e8d0504735df01f4 upstream.
Otherwise, you may get divided-by-zero error or corrput the SMU fan control feature.
--- drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c | 4 +++- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c +3 -1
@@ -916,8 +916,10 @@ static int init_thermal_controller(PHM_PlatformCaps_ThermalController ); -if (0 == powerplay_table->usFanTableOffset) +if (0 == powerplay_table->usFanTableOffset) { + hwmgr->thermal_controller.use_hw_fan_control =1 ;return 0 ; + } fan_table = (const PPTable_Generic_SubTable_Header *) (((unsigned long)powerplay_table) +
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -0
@@ -694,6 +694,7 @@ struct pp_thermal_controller_info {uint8_t ucType;uint8_t ucI2cLine;uint8_t ucI2cAddress; +uint8_t use_hw_fan_control;struct pp_fan_info fanInfo;struct pp_advance_fan_control_parameters advanceFanControlParameters; };
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +4 -0
@@ -2092,6 +2092,10 @@ static int polaris10_thermal_setup_fan_treturn 0 ; } +/* use hardware fan control */ +if (hwmgr->thermal_controller.use_hw_fan_control) +return 0 ; + tmp64 = hwmgr->thermal_controller.advanceFanControlParameters. usPWMMin * duty100;do_div (tmp64,10000 );
Greg Kroah-Hartman
maintainerPATCH 74/96 drm/amdgpu: Dont skip display settings in hwmgr_resume()
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
commit 688f3d1ebedffa310b6591bd1b63fa0770d945fe upstream.
I'm not entirely sure why this is, but for some reason:
921935dc6404 ("drm/amd/powerplay: enforce display related settings only on needed")
Breaks runtime PM resume on the Radeon PRO WX 3100 (Lexa) in one the pre-production laptops I have. The issue manifests as the following messages in dmesg:
[drm] UVD and UVD ENC initialized successfully.
amdgpu 0000:3b:00.0: [drm:amdgpu_ring_test_helper [amdgpu]] *ERROR* ring vce1 test failed (-110) [drm:amdgpu_device_ip_resume_phase2 [amdgpu]] *ERROR* resume of IP block <vce_v3_0> failed -110 [drm:amdgpu_device_resume [amdgpu]] *ERROR* amdgpu_device_ip_resume failed (-110).
And happens after about 6-10 runtime PM suspend/resume cycles (sometimes sooner, if you're lucky!). Unfortunately I can't seem to pin down precisely which part in psm_adjust_power_state_dynamic that is causing the issue, but not skipping the display setting setup seems to fix it. Hopefully if there is a better fix for this, this patch will spark discussion around it.
--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +1 -1
@@ -325,7 +325,7 @@ int hwmgr_resume(struct pp_hwmgr *hwmgr)if (ret)return ret; - ret =psm_adjust_power_state_dynamic (hwmgr, true,NULL ); + ret =psm_adjust_power_state_dynamic (hwmgr, false,NULL );return ret; }
Greg Kroah-Hartman
maintainerPATCH 75/96 drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit 25f09f858835b0e9a06213811031190a17d8ab78 upstream.
Recommended by the hw team.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 19 ------------------- 1 file changed, 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0 -19
@@ -1899,25 +1899,6 @@ static void gfx_v9_0_constants_init(strumutex_unlock (&adev->srbm_mutex);gfx_v9_0_init_compute_vmid (adev); - -mutex_lock (&adev->grbm_idx_mutex); -/* -* making sure that the following register writes will be broadcasted -* to all the shaders -*/ -gfx_v9_0_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); - -WREG32_SOC15 (GC ,0 , mmPA_SC_FIFO_SIZE, - (adev->gfx.config.sc_prim_fifo_size_frontend << -PA_SC_FIFO_SIZE__SC_FRONTEND_PRIM_FIFO_SIZE__SHIFT ) | - (adev->gfx.config.sc_prim_fifo_size_backend << -PA_SC_FIFO_SIZE__SC_BACKEND_PRIM_FIFO_SIZE__SHIFT ) | - (adev->gfx.config.sc_hiz_tile_fifo_size << -PA_SC_FIFO_SIZE__SC_HIZ_TILE_FIFO_SIZE__SHIFT ) | - (adev->gfx.config.sc_earlyz_tile_fifo_size << -PA_SC_FIFO_SIZE__SC_EARLYZ_TILE_FIFO_SIZE__SHIFT )); -mutex_unlock (&adev->grbm_idx_mutex); - }static void gfx_v9_0_wait_for_rlc_serdes (struct amdgpu_device *adev)
Greg Kroah-Hartman
maintainerPATCH 76/96 drm/virtio: move drm_connector_update_edid_property() call
In reply to Greg Kroah-HartmanFrom: Gerd Hoffmann <[email protected]>
commit 41de4be6f6efa4132b29af51158cd672d93f2543 upstream.
drm_connector_update_edid_property can sleep, we must not call it while holding a spinlock. Move the callsite.
--- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_vq.c +1 -1
@@ -620,11 +620,11 @@ static void virtio_gpu_cmd_get_edid_cb(s output = vgdev->outputs + scanout; new_edid =drm_do_get_edid (&output->conn, virtio_get_edid_block, resp); +drm_connector_update_edid_property (&output->conn, new_edid);spin_lock (&vgdev->display_info_lock); old_edid = output->edid; output->edid = new_edid; -drm_connector_update_edid_property (&output->conn, output->edid);spin_unlock (&vgdev->display_info_lock);kfree (old_edid);
Greg Kroah-Hartman
maintainerPATCH 77/96 drm/etnaviv: add missing failure path to destroy suballoc
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit be132e1375c1fffe48801296279079f8a59a9ed3 upstream.
When something goes wrong in the GPU init after the cmdbuf suballocator has been constructed, we fail to destroy it properly. This causes havok later when the GPU is unbound due to a module unload or similar.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +5 -2
@@ -762,7 +762,7 @@ int etnaviv_gpu_init(struct etnaviv_gpuif (IS_ERR (gpu->cmdbuf_suballoc)) {dev_err (gpu->dev,"Failed to create cmdbuf suballocator\n" ); ret =PTR_ERR (gpu->cmdbuf_suballoc); - goto fail; + goto destroy_iommu; }/* Create buffer: */
@@ -770,7 +770,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu PAGE_SIZE);if (ret) {dev_err (gpu->dev,"could not create command buffer\n" ); - goto destroy_iommu; + goto destroy_suballoc; } if (gpu->mmu->version == ETNAVIV_IOMMU_V1 &&
@@ -802,6 +802,9 @@ int etnaviv_gpu_init(struct etnaviv_gpu free_buffer:etnaviv_cmdbuf_free (&gpu->buffer); gpu->buffer.suballoc =NULL ; +destroy_suballoc: +etnaviv_cmdbuf_suballoc_destroy (gpu->cmdbuf_suballoc); + gpu->cmdbuf_suballoc =NULL ; destroy_iommu:etnaviv_iommu_destroy (gpu->mmu); gpu->mmu =NULL ;
Greg Kroah-Hartman
maintainerPATCH 78/96 drm/imx: notify drm core before sending event during crtc disable
In reply to Greg Kroah-HartmanFrom: Robert Beckett <[email protected]>
commit 78c68e8f5cd24bd32ba4ca1cdfb0c30cf0642685 upstream.
Notify drm core before sending pending events during crtc disable. This fixes the first event after disable having an old stale timestamp by having drm_crtc_vblank_off update the timestamp to now.
This was seen while debugging weston log message:
Warning: computed repaint delay is insane: -8212 msec
This occurred due to:
1. driver starts up
2. fbcon comes along and restores fbdev, enabling vblank
3. vblank_disable_fn fires via timer disabling vblank, keeping vblank seq number and time set at current value
(some time later)
4. weston starts and does a modeset
5. atomic commit disables crtc while it does the modeset
6. ipu_crtc_atomic_disable sends vblank with old seq number and time
--- drivers/gpu/drm/imx/ipuv3-crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/ipuv3-crtc.c +2 -2
@@ -91,14 +91,14 @@ static void ipu_crtc_atomic_disable(struipu_dc_disable (ipu);ipu_prg_disable (ipu); +drm_crtc_vblank_off (crtc); +spin_lock_irq (&crtc->dev->event_lock);if (crtc->state->event) {drm_crtc_send_vblank_event (crtc, crtc->state->event); crtc->state->event =NULL ; }spin_unlock_irq (&crtc->dev->event_lock); - -drm_crtc_vblank_off (crtc); }static void imx_drm_crtc_reset (struct drm_crtc *crtc)
Greg Kroah-Hartman
maintainerPATCH 79/96 drm/imx: only send event on crtc disable if kept disabled
In reply to Greg Kroah-HartmanFrom: Robert Beckett <[email protected]>
commit 5aeab2bfc9ffa72d3ca73416635cb3785dfc076f upstream.
The event will be sent as part of the vblank enable during the modeset if the crtc is not being kept disabled.
--- drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/imx/ipuv3-crtc.c +1 -1
@@ -94,7 +94,7 @@ static void ipu_crtc_atomic_disable(strudrm_crtc_vblank_off (crtc);spin_lock_irq (&crtc->dev->event_lock); -if (crtc->state->event) { +if (crtc->state->event && !crtc->state->active) {drm_crtc_send_vblank_event (crtc, crtc->state->event); crtc->state->event =NULL ; }
Greg Kroah-Hartman
maintainerPATCH 80/96 ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code()
In reply to Greg Kroah-HartmanFrom: Petr Mladek <[email protected]>
commit d5b844a2cf507fc7642c9ae80a9d585db3065c28 upstream.
The commit 9f255b632bf12c4dd7 ("module: Fix livepatch/ftrace module text permissions race") causes a possible deadlock between register_kprobe() and ftrace_run_update_code() when ftrace is using stop_machine().
The existing dependency chain (in reverse order) is:
-> #1 (text_mutex){+.+.}:
validate_chain.isra.21+0xb32/0xd70
__lock_acquire+0x4b8/0x928
lock_acquire+0x102/0x230
__mutex_lock+0x88/0x908
mutex_lock_nested+0x32/0x40
register_kprobe+0x254/0x658
init_kprobes+0x11a/0x168
do_one_initcall+0x70/0x318
kernel_init_freeable+0x456/0x508
kernel_init+0x22/0x150
ret_from_fork+0x30/0x34
kernel_thread_starter+0x0/0xc-> #0 (cpu_hotplug_lock.rw_sem){++++}:
check_prev_add+0x90c/0xde0
validate_chain.isra.21+0xb32/0xd70
__lock_acquire+0x4b8/0x928
lock_acquire+0x102/0x230
cpus_read_lock+0x62/0xd0
stop_machine+0x2e/0x60
arch_ftrace_update_code+0x2e/0x40
ftrace_run_update_code+0x40/0xa0
ftrace_startup+0xb2/0x168
register_ftrace_function+0x64/0x88
klp_patch_object+0x1a2/0x290
klp_enable_patch+0x554/0x980
do_one_initcall+0x70/0x318
do_init_module+0x6e/0x250
load_module+0x1782/0x1990
__s390x_sys_finit_module+0xaa/0xf0
system_call+0xd8/0x2d0
Possible unsafe locking scenario: CPU0 CPU1
---- ----
lock(text_mutex);
lock(cpu_hotplug_lock.rw_sem);
lock(text_mutex); lock(cpu_hotplug_lock.rw_sem);
It is similar problem that has been solved by the commit 2d1e38f56622b9b ("kprobes: Cure hotplug lock ordering issues"). Many locks are involved. To be on the safe side, text_mutex must become a low level lock taken after cpu_hotplug_lock.rw_sem.
This can't be achieved easily with the current ftrace design. For example, arm calls set_all_modules_text_rw() already in ftrace_arch_code_modify_prepare(), see arch/arm/kernel/ftrace.c. This functions is called:
+ outside stop_machine() from ftrace_run_update_code()
+ without stop_machine() from ftrace_module_enable()
Fortunately, the problematic fix is needed only on x86_64. It is the only architecture that calls set_all_modules_text_rw() in ftrace path and supports livepatching at the same time.
Therefore it is enough to move text_mutex handling from the generic kernel/trace/ftrace.c into arch/x86/kernel/ftrace.c:
ftrace_arch_code_modify_prepare()
ftrace_arch_code_modify_post_process()
This patch basically reverts the ftrace part of the problematic commit 9f255b632bf12c4dd7 ("module: Fix livepatch/ftrace module text permissions race"). And provides x86_64 specific-fix.
Some refactoring of the ftrace code will be needed when livepatching is implemented for arm or nds32. These architectures call set_all_modules_text_rw() and use stop_machine() at the same time.
[
As reviewed by Miroslav Benes <[email protected]>, removed return value of ftrace_run_update_code() as it is a void function.
]
--- arch/x86/kernel/ftrace.c | 3 +++ kernel/trace/ftrace.c | 10 +--------- 2 files changed, 4 insertions(+), 9 deletions(-)
arch/x86/kernel/ftrace.c +3 -0
@@ -22,6 +22,7 @@#include <linux/init.h> #include <linux/list.h> #include <linux/module.h> +#include <linux/memory.h> #include <trace/syscall.h>
@@ -35,6 +36,7 @@int ftrace_arch_code_modify_prepare (void ) { +mutex_lock (&text_mutex);set_kernel_text_rw ();set_all_modules_text_rw ();return 0 ;
@@ -44,6 +46,7 @@ int ftrace_arch_code_modify_post_process {set_all_modules_text_ro ();set_kernel_text_ro (); +mutex_unlock (&text_mutex);return 0 ; }
kernel/trace/ftrace.c +1 -9
@@ -34,7 +34,6 @@#include <linux/hash.h> #include <linux/rcupdate.h> #include <linux/kprobes.h> -#include <linux/memory.h> #include <trace/events/sched.h>
@@ -2615,12 +2614,10 @@ static void ftrace_run_update_code(int c {int ret; -mutex_lock (&text_mutex); - ret =ftrace_arch_code_modify_prepare ();FTRACE_WARN_ON (ret);if (ret) - goto out_unlock; +return ;/* * By default we use stop_machine() to modify the code.
@@ -2632,9 +2629,6 @@ static void ftrace_run_update_code(int c ret =ftrace_arch_code_modify_post_process ();FTRACE_WARN_ON (ret); - -out_unlock: -mutex_unlock (&text_mutex); } static void ftrace_run_modify_code(struct ftrace_ops *ops, int command,
@@ -5788,7 +5782,6 @@ void ftrace_module_enable(struct modulestruct ftrace_page *pg;mutex_lock (&ftrace_lock); -mutex_lock (&text_mutex);if (ftrace_disabled) goto out_unlock;
@@ -5850,7 +5843,6 @@ void ftrace_module_enable(struct moduleftrace_arch_code_modify_post_process (); out_unlock: -mutex_unlock (&text_mutex);mutex_unlock (&ftrace_lock);process_cached_mods (mod->name);
Greg Kroah-Hartman
maintainerPATCH 81/96 mm/vmscan.c: prevent useless kswapd loops
In reply to Greg Kroah-HartmanFrom: Shakeel Butt <[email protected]>
commit dffcac2cb88e4ec5906235d64a83d802580b119e upstream.
In production we have noticed hard lockups on large machines running large jobs due to kswaps hoarding lru lock within isolate_lru_pages when sc->reclaim_idx is 0 which is a small zone. The lru was couple hundred GiBs and the condition (page_zonenum(page) > sc->reclaim_idx) in isolate_lru_pages() was basically skipping GiBs of pages while holding the LRU spinlock with interrupt disabled.
On further inspection, it seems like there are two issues:
(1) If kswapd on the return from balance_pgdat() could not sleep (i.e. node is still unbalanced), the classzone_idx is unintentionally set to 0 and the whole reclaim cycle of kswapd will try to reclaim only the lowest and smallest zone while traversing the whole memory.
(2) Fundamentally isolate_lru_pages() is really bad when the allocation has woken kswapd for a smaller zone on a very large machine running very large jobs. It can hoard the LRU spinlock while skipping over 100s of GiBs of pages.
This patch only fixes (1). (2) needs a more fundamental solution. To fix (1), in the kswapd context, if pgdat->kswapd_classzone_idx is invalid use the classzone_idx of the previous kswapd loop otherwise use the one the waker has requested.
--- mm/vmscan.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
mm/vmscan.c +15 -12
@@ -3703,19 +3703,18 @@ out: }/* -* pgdat->kswapd_classzone_idx is the highest zone index that a recent -* allocation request woke kswapd for. When kswapd has not woken recently, -* the value is MAX_NR_ZONES which is not a valid index. This compares a -* given classzone and returns it or the highest classzone index kswapd -* was recently woke for. +* The pgdat->kswapd_classzone_idx is used to pass the highest zone index to be +* reclaimed by kswapd from the waker. If the value is MAX_NR_ZONES which is not +* a valid index then either kswapd runs for first time or kswapd couldn't sleep +* after previous reclaim attempt (node is still unbalanced). In that case +* return the zone index of the previous kswapd reclaim cycle. */ static enum zone_type kswapd_classzone_idx (pg_data_t *pgdat, -enum zone_type classzone_idx) +enum zone_type prev_classzone_idx) {if (pgdat->kswapd_classzone_idx ==MAX_NR_ZONES ) -return classzone_idx; - -return max (pgdat->kswapd_classzone_idx, classzone_idx); +return prev_classzone_idx; +return pgdat->kswapd_classzone_idx; } static void kswapd_try_to_sleep(pg_data_t *pgdat, int alloc_order, int reclaim_order,
@@ -3856,7 +3855,7 @@ kswapd_try_sleep:/* Read the new order and classzone_idx */ alloc_order = reclaim_order = pgdat->kswapd_order; - classzone_idx =kswapd_classzone_idx (pgdat,0 ); + classzone_idx =kswapd_classzone_idx (pgdat, classzone_idx); pgdat->kswapd_order =0 ; pgdat->kswapd_classzone_idx =MAX_NR_ZONES ;
@@ -3910,8 +3909,12 @@ void wakeup_kswapd(struct zone *zone, gfif (!cpuset_zone_allowed (zone, gfp_flags))return ; pgdat = zone->zone_pgdat; - pgdat->kswapd_classzone_idx =kswapd_classzone_idx (pgdat, - classzone_idx); + +if (pgdat->kswapd_classzone_idx ==MAX_NR_ZONES ) + pgdat->kswapd_classzone_idx = classzone_idx; +else + pgdat->kswapd_classzone_idx =max (pgdat->kswapd_classzone_idx, + classzone_idx); pgdat->kswapd_order =max (pgdat->kswapd_order, order);if (!waitqueue_active (&pgdat->kswapd_wait))return ;
Greg Kroah-Hartman
maintainerPATCH 82/96 btrfs: Ensure replaced device doesnt have pending chunk allocation
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
commit debd1c065d2037919a7da67baf55cc683fee09f0 upstream.
Recent FITRIM work, namely bbbf7243d62d ("btrfs: combine device update operations during transaction commit") combined the way certain operations are recoded in a transaction. As a result an ASSERT was added in dev_replace_finish to ensure the new code works correctly. Unfortunately I got reports that it's possible to trigger the assert, meaning that during a device replace it's possible to have an unfinished chunk allocation on the source device.
This is supposed to be prevented by the fact that a transaction is committed before finishing the replace oepration and alter acquiring the chunk mutex. This is not sufficient since by the time the transaction is committed and the chunk mutex acquired it's possible to allocate a chunk depending on the workload being executed on the replaced device. This bug has been present ever since device replace was introduced but there was never code which checks for it.
The correct way to fix is to ensure that there is no pending device modification operation when the chunk mutex is acquire and if there is repeat transaction commit. Unfortunately it's not possible to just exclude the source device from btrfs_fs_devices::dev_alloc_list since this causes ENOSPC to be hit in transaction commit.
Fixing that in another way would need to add special cases to handle the last writes and forbid new ones. The looped transaction fix is more obvious, and can be easily backported. The runtime of dev-replace is long so there's no noticeable delay caused by that.
--- fs/btrfs/dev-replace.c | 26 +++++++++++++++++--------- fs/btrfs/volumes.c | 5 ++++- fs/btrfs/volumes.h | 5 +++++ 3 files changed, 26 insertions(+), 10 deletions(-)
fs/btrfs/dev-replace.c +17 -9
@@ -603,17 +603,25 @@ static int btrfs_dev_replace_finishing(s }btrfs_wait_ordered_roots (fs_info,U64_MAX ,0 , (u64)-1 ); - trans =btrfs_start_transaction (root,0 ); -if (IS_ERR (trans)) { -mutex_unlock (&dev_replace->lock_finishing_cancel_unmount); -return PTR_ERR (trans); +while (1 ) { + trans =btrfs_start_transaction (root,0 ); +if (IS_ERR (trans)) { +mutex_unlock (&dev_replace->lock_finishing_cancel_unmount); +return PTR_ERR (trans); + } + ret =btrfs_commit_transaction (trans); +WARN_ON (ret); +/* keep away write_all_supers() during the finishing procedure */ +mutex_lock (&fs_info->fs_devices->device_list_mutex); +mutex_lock (&fs_info->chunk_mutex); +if (src_device->has_pending_chunks) { +mutex_unlock (&root->fs_info->chunk_mutex); +mutex_unlock (&root->fs_info->fs_devices->device_list_mutex); + }else { +break ; + } } - ret =btrfs_commit_transaction (trans); -WARN_ON (ret); -/* keep away write_all_supers() during the finishing procedure */ -mutex_lock (&fs_info->fs_devices->device_list_mutex); -mutex_lock (&fs_info->chunk_mutex);down_write (&dev_replace->rwsem); dev_replace->replace_state = scrub_ret ? BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED
fs/btrfs/volumes.c +4 -1
@@ -5222,9 +5222,11 @@ static int __btrfs_alloc_chunk(struct btif (ret) goto error_del_extent; -for (i =0 ; i < map->num_stripes; i++) +for (i =0 ; i < map->num_stripes; i++) {btrfs_device_set_bytes_used (map->stripes[i].dev, map->stripes[i].dev->bytes_used + stripe_size); + map->stripes[i].dev->has_pending_chunks = true; + }atomic64_sub (stripe_size * map->num_stripes, &info->free_chunk_space);
@@ -7716,6 +7718,7 @@ void btrfs_update_commit_device_bytes_usfor (i =0 ; i < map->num_stripes; i++) { dev = map->stripes[i].dev; dev->commit_bytes_used = dev->bytes_used; + dev->has_pending_chunks = false; } }mutex_unlock (&fs_info->chunk_mutex);
fs/btrfs/volumes.h +5 -0
@@ -54,6 +54,11 @@ struct btrfs_device {spinlock_t io_lock____cacheline_aligned ;int running_pending; +/* When true means this device has pending chunk alloc in +* current transaction. Protected by chunk_mutex. +*/ +bool has_pending_chunks; +/* regular prio bios */ struct btrfs_pending_bios pending_bios;/* sync bios */
Greg Kroah-Hartman
maintainerPATCH 83/96 tty: rocket: fix incorrect forward declaration of rp_init()
In reply to Greg Kroah-Hartman[ Upstream commit 423ea3255424b954947d167681b71ded1b8fca53 ]
Make the forward declaration actually match the real function definition, something that previous versions of gcc had just ignored.
This is another patch to fix new warnings from gcc-9 before I start the merge window pulls. I don't want to miss legitimate new warnings just because my system update brought a new compiler with new warnings.
--- drivers/tty/rocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/rocket.c +1 -1
@@ -266,7 +266,7 @@ MODULE_PARM_DESC(pc104_3, "set interface types for ISA(PC104) board #3 (e.g. pc1module_param_array (pc104_4, ulong,NULL ,0 );MODULE_PARM_DESC (pc104_4,"set interface types for ISA(PC104) board #4 (e.g. pc104_4=232,232,485,485,..." ); -static int rp_init (void ); +static int __init rp_init (void );static void rp_cleanup_module (void );module_init (rp_init);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/96 s390/mm: fix pxd_bad with folded page tables
In reply to Greg Kroah-Hartman[ Upstream commit c9f621524e70774688db3cec60d85fa4c7de52e3 ]
With git commit d1874a0c2805fcfa9162c972d6b7541e57adb542 "s390/mm: make the pxd_offset functions more robust" and a 2-level page table it can now happen that pgd_bad() gets asked to verify a large segment table entry. If the entry is marked as dirty pgd_bad() will incorrectly return true.
Change the pgd_bad(), p4d_bad(), pud_bad() and pmd_bad() functions to first verify the table type, return false if the table level is lower than what the function is suppossed to check, return true if the table level is too high, and otherwise check the relevant region and segment table bits. pmd_bad() has to check against ~SEGMENT_ENTRY_BITS for normal page table pointers or ~SEGMENT_ENTRY_BITS_LARGE for large segment table entries. Same for pud_bad() which has to check against ~_REGION_ENTRY_BITS or ~_REGION_ENTRY_BITS_LARGE.
--- arch/s390/include/asm/pgtable.h | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
arch/s390/include/asm/pgtable.h +19 -14
@@ -238,7 +238,7 @@ static inline int is_module_addr(void *addr)#define _REGION_ENTRY_NOEXEC 0x100/* region no-execute bit */ #define _REGION_ENTRY_OFFSET 0xc0/* region table offset */ #define _REGION_ENTRY_INVALID 0x20/* invalid region table entry */ -#define _REGION_ENTRY_TYPE_MASK 0x0c/* region/segment table type mask */ +#define _REGION_ENTRY_TYPE_MASK 0x0c/* region table type mask */ #define _REGION_ENTRY_TYPE_R1 0x0c/* region first table type */ #define _REGION_ENTRY_TYPE_R2 0x08/* region second table type */ #define _REGION_ENTRY_TYPE_R3 0x04/* region third table type */
@@ -277,6 +277,7 @@ static inline int is_module_addr(void *addr)#define _SEGMENT_ENTRY_PROTECT 0x200/* segment protection bit */ #define _SEGMENT_ENTRY_NOEXEC 0x100/* segment no-execute bit */ #define _SEGMENT_ENTRY_INVALID 0x20/* invalid segment table entry */ +#define _SEGMENT_ENTRY_TYPE_MASK 0x0c/* segment table type mask */ #define _SEGMENT_ENTRY (0)#define _SEGMENT_ENTRY_EMPTY (_SEGMENT_ENTRY_INVALID)
@@ -614,15 +615,9 @@ static inline int pgd_none(pgd_t pgd)static inline int pgd_bad (pgd_t pgd) { -/* -* With dynamic page table levels the pgd can be a region table -* entry or a segment table entry. Check for the bit that are -* invalid for either table entry. -*/ -unsigned long mask = - ~_SEGMENT_ENTRY_ORIGIN & ~_REGION_ENTRY_INVALID & - ~_REGION_ENTRY_TYPE_MASK & ~_REGION_ENTRY_LENGTH; -return (pgd_val (pgd) & mask) !=0 ; +if ((pgd_val (pgd) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R1) +return 0 ; +return (pgd_val (pgd) & ~_REGION_ENTRY_BITS) !=0 ; }static inline unsigned long pgd_pfn (pgd_t pgd)
@@ -703,6 +698,8 @@ static inline int pmd_large(pmd_t pmd)static inline int pmd_bad (pmd_t pmd) { +if ((pmd_val (pmd) & _SEGMENT_ENTRY_TYPE_MASK) >0 ) +return 1 ;if (pmd_large (pmd))return (pmd_val (pmd) & ~_SEGMENT_ENTRY_BITS_LARGE) !=0 ;return (pmd_val (pmd) & ~_SEGMENT_ENTRY_BITS) !=0 ;
@@ -710,8 +707,12 @@ static inline int pmd_bad(pmd_t pmd)static inline int pud_bad (pud_t pud) { -if ((pud_val (pud) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R3) -return pmd_bad (__pmd (pud_val (pud))); +unsigned long type =pud_val (pud) & _REGION_ENTRY_TYPE_MASK; + +if (type > _REGION_ENTRY_TYPE_R3) +return 1 ; +if (type < _REGION_ENTRY_TYPE_R3) +return 0 ;if (pud_large (pud))return (pud_val (pud) & ~_REGION_ENTRY_BITS_LARGE) !=0 ;return (pud_val (pud) & ~_REGION_ENTRY_BITS) !=0 ;
@@ -719,8 +720,12 @@ static inline int pud_bad(pud_t pud)static inline int p4d_bad (p4d_t p4d) { -if ((p4d_val (p4d) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R2) -return pud_bad (__pud (p4d_val (p4d))); +unsigned long type =p4d_val (p4d) & _REGION_ENTRY_TYPE_MASK; + +if (type > _REGION_ENTRY_TYPE_R2) +return 1 ; +if (type < _REGION_ENTRY_TYPE_R2) +return 0 ;return (p4d_val (p4d) & ~_REGION_ENTRY_BITS) !=0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/96 KVM: x86: degrade WARN to pr_warn_ratelimited
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 3f16a5c318392cbb5a0c7a3d19dff8c8ef3c38ee upstream.
This warning can be triggered easily by userspace, so it should certainly not cause a panic if panic_on_warn is set.
--- arch/x86/kvm/x86.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +3 -3
@@ -1547,7 +1547,7 @@ static int set_tsc_khz(struct kvm_vcpu * vcpu->arch.tsc_always_catchup =1 ;return 0 ; }else { -WARN (1 ,"user requested TSC rate below hardware speed\n" ); +pr_warn_ratelimited ("user requested TSC rate below hardware speed\n" );return -1 ; } }
@@ -1557,8 +1557,8 @@ static int set_tsc_khz(struct kvm_vcpu * user_tsc_khz, tsc_khz);if (ratio ==0 || ratio >= kvm_max_tsc_scaling_ratio) { -WARN_ONCE (1 ,"Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , - user_tsc_khz); +pr_warn_ratelimited ("Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , + user_tsc_khz);return -1 ; }
Greg Kroah-Hartman
maintainerPATCH 86/96 KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC
In reply to Greg Kroah-HartmanFrom: Wanpeng Li <[email protected]>
commit bb34e690e9340bc155ebed5a3d75fc63ff69e082 upstream.
Thomas reported that:
| Background: | | In preparation of supporting IPI shorthands I changed the CPU offline | code to software disable the local APIC instead of just masking it. | That's done by clearing the APIC_SPIV_APIC_ENABLED bit in the APIC_SPIV | register. | | Failure: | | When the CPU comes back online the startup code triggers occasionally | the warning in apic_pending_intr_clear(). That complains that the IRRs | are not empty. | | The offending vector is the local APIC timer vector who's IRR bit is set | and stays set. | | It took me quite some time to reproduce the issue locally, but now I can | see what happens. | | It requires apicv_enabled=0, i.e. full apic emulation. With apicv_enabled=1 | (and hardware support) it behaves correctly. | | Here is the series of events: | | Guest CPU | | goes down | | native_cpu_disable() | | apic_soft_disable(); | | play_dead() | | .... | | startup() | | if (apic_enabled()) | apic_pending_intr_clear() <- Not taken | | enable APIC | | apic_pending_intr_clear() <- Triggers warning because IRR is stale | | When this happens then the deadline timer or the regular APIC timer - | happens with both, has fired shortly before the APIC is disabled, but the | interrupt was not serviced because the guest CPU was in an interrupt | disabled region at that point. | | The state of the timer vector ISR/IRR bits: | | ISR IRR | before apic_soft_disable() 0 1 | after apic_soft_disable() 0 1 | | On startup 0 1 | | Now one would assume that the IRR is cleared after the INIT reset, but this | happens only on CPU0. | | Why? | | Because our CPU0 hotplug is just for testing to make sure nothing breaks | and goes through an NMI wakeup vehicle because INIT would send it through | the boots-trap code which is not really working if that CPU was not | physically unplugged. | | Now looking at a real world APIC the situation in that case is: | | ISR IRR | before apic_soft_disable() 0 1 | after apic_soft_disable() 0 1 | | On startup 0 0 | | Why? | | Once the dying CPU reenables interrupts the pending interrupt gets | delivered as a spurious interupt and then the state is clear. | | While that CPU0 hotplug test case is surely an esoteric issue, the APIC | emulation is still wrong, Even if the play_dead() code would not enable | interrupts then the pending IRR bit would turn into an ISR .. interrupt | when the APIC is reenabled on startup.
Quoted 1 line
From SDM 10.4.7.2 Local APIC State After It Has Been Software Disabled
* Pending interrupts in the IRR and ISR registers are held and require masking or handling by the CPU.
In Thomas's testing, hardware cpu will not respect soft disable LAPIC when IRR has already been set or APICv posted-interrupt is in flight, so we can skip soft disable APIC checking when clearing IRR and set ISR, continue to respect soft disable APIC when attempting to set IRR.
--- arch/x86/kvm/lapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/lapic.c +1 -1
@@ -2331,7 +2331,7 @@ int kvm_apic_has_interrupt(struct kvm_vcstruct kvm_lapic *apic = vcpu->arch.apic;u32 ppr; -if (!apic_enabled (apic)) +if (!kvm_apic_hw_enabled (apic))return -1 ;__apic_update_ppr (apic, &ppr);
Greg Kroah-Hartman
maintainerPATCH 87/96 nfsd: Fix overflow causing non-working mounts on 1 TB machines
In reply to Greg Kroah-HartmanFrom: Paul Menzel <[email protected]>
commit 3b2d4dcf71c4a91b420f835e52ddea8192300a3b upstream.
Since commit 10a68cdf10 (nfsd: fix performance-limiting session calculation) (Linux 5.1-rc1 and 4.19.31), shares from NFS servers with 1 TB of memory cannot be mounted anymore. The mount just hangs on the client.
The gist of commit 10a68cdf10 is the change below.
-avail = clamp_t(int, avail, slotsize, avail/3);
+avail = clamp_t(int, avail, slotsize, total_avail/3);Here are the macros.
#define min_t(type, x, y) __careful_cmp((type)(x), (type)(y), <)
#define clamp_t(type, val, lo, hi) min_t(type, max_t(type, val, lo), hi)total_avail is 8,434,659,328 on the 1 TB machine. clamp_t() casts the values to int, which for 32-bit integers can only hold values −2,147,483,648 (−2^31) through 2,147,483,647 (2^31 − 1).
avail (in the function signature) is just 65536, so that no overflow was happening. Before the commit the assignment would result in 21845, and num = 4.
When using total_avail, it is causing the assignment to be 18446744072226137429 (printed as %lu), and num is then 4164608182.
My next guess is, that nfsd_drc_mem_used is then exceeded, and the server thinks there is no memory available any more for this client.
Updating the arguments of clamp_t() and min_t() to unsigned long fixes the issue.
Now, avail = 65536 (before commit 10a68cdf10 avail = 21845), but num = 4 remains the same.
--- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4state.c +1 -1
@@ -1562,7 +1562,7 @@ static u32 nfsd4_get_drc_mem(struct nfsd* Never use more than a third of the remaining memory, * unless it's the only way to give this client a slot: */ - avail =clamp_t (int, avail, slotsize, total_avail/3 ); + avail = clamp_t(unsigned long, avail, slotsize, total_avail/3); num =min_t (int, num, avail / slotsize); nfsd_drc_mem_used += num * slotsize;spin_unlock (&nfsd_drc_lock);
Greg Kroah-Hartman
maintainerPATCH 88/96 svcrdma: Ignore source port when computing DRC hash
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
commit 1e091c3bbf51d34d5d96337a59ce5ab2ac3ba2cc upstream.
The DRC appears to be effectively empty after an RPC/RDMA transport reconnect. The problem is that each connection uses a different source port, which defeats the DRC hash.
Clients always have to disconnect before they send retransmissions to reset the connection's credit accounting, thus every retransmit on NFS/RDMA will miss the DRC.
An NFS/RDMA client's IP source port is meaningless for RDMA transports. The transport layer typically sets the source port value on the connection to a random ephemeral port. The server already ignores it for the "secure port" check. See commit 16e4d93f6de7 ("NFSD: Ignore client's source port on RDMA transports").
The Linux NFS server's DRC resolves XID collisions from the same source IP address by using the checksum of the first 200 bytes of the RPC call header.
--- net/sunrpc/xprtrdma/svc_rdma_transport.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/sunrpc/xprtrdma/svc_rdma_transport.c +6 -1
@@ -211,9 +211,14 @@ static void handle_connect_req(struct rd/* Save client advertised inbound read limit for use later in accept. */ newxprt->sc_ord = param->initiator_depth; -/* Set the local and remote addresses in the transport */ sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr;svc_xprt_set_remote (&newxprt->sc_xprt, sa,svc_addr_len (sa)); +/* The remote port is arbitrary and not under the control of the +* client ULP. Set it to a fixed value so that the DRC continues +* to be effective after a reconnect. +*/ +rpc_set_port ((struct sockaddr *)&newxprt->sc_xprt.xpt_remote,0 ); + sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr;svc_xprt_set_local (&newxprt->sc_xprt, sa,svc_addr_len (sa));
Greg Kroah-Hartman
maintainerPATCH 89/96 MIPS: Fix bounds check virt_addr_valid
In reply to Greg Kroah-HartmanFrom: Hauke Mehrtens <[email protected]>
commit d6ed083f5cc621e15c15b56c3b585fd524dbcb0f upstream.
The bounds check used the uninitialized variable vaddr, it should use the given parameter kaddr instead. When using the uninitialized value the compiler assumed it to be 0 and optimized this function to just return 0 in all cases.
This should make the function check the range of the given address and only do the page map check in case it is in the expected range of virtual addresses.
--- arch/mips/mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/mm/mmap.c +1 -1
@@ -203,7 +203,7 @@ unsigned long arch_randomize_brk(structint __virt_addr_valid (const volatile void *kaddr) { -unsigned long vaddr = (unsigned long )vaddr; +unsigned long vaddr = (unsigned long )kaddr;if ((vaddr <PAGE_OFFSET ) || (vaddr >=MAP_BASE ))return 0 ;
Greg Kroah-Hartman
maintainerPATCH 90/96 MIPS: Add missing EHB in mtc0 -> mfc0 sequence.
In reply to Greg Kroah-HartmanFrom: Dmitry Korotin <[email protected]>
commit 0b24cae4d535045f4c9e177aa228d4e97bad212c upstream.
Add a missing EHB (Execution Hazard Barrier) in mtc0 -> mfc0 sequence. Without this execution hazard barrier it's possible for the value read back from the KScratch register to be the value from before the mtc0.
Reproducible on P5600 & P6600.
The hazard is documented in the MIPS Architecture Reference Manual Vol.
III: MIPS32/microMIPS32 Privileged Resource Architecture (MD00088), rev 6.03 table 8.1 which includes:
Producer | Consumer | Hazard ----------|----------|---------------------------- mtc0 | mfc0 | any coprocessor 0 register
[[email protected]:
- Commit message tweaks.
- Add Fixes tags.
- Mark for stable back to v3.15 where P5600 support was introduced.]
--- arch/mips/mm/tlbex.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
arch/mips/mm/tlbex.c +20 -9
@@ -391,6 +391,7 @@ static struct work_registers build_get_wstatic void build_restore_work_registers (u32 **p) {if (scratch_reg >=0 ) { +uasm_i_ehb (p);UASM_i_MFC0 (p,1 ,c0_kscratch (), scratch_reg);return ; }
@@ -668,10 +669,12 @@ static void build_restore_pagemask(u32 *uasm_i_mtc0 (p,0 ,C0_PAGEMASK );uasm_il_b (p, r, lid); } -if (scratch_reg >=0 ) +if (scratch_reg >=0 ) { +uasm_i_ehb (p);UASM_i_MFC0 (p,1 ,c0_kscratch (), scratch_reg); -else + }else {UASM_i_LW (p,1 ,scratchpad_offset (0 ),0 ); + } }else {/* Reset default page size */ if (PM_DEFAULT_MASK >>16 ) {
@@ -938,10 +941,12 @@ build_get_pgd_vmalloc64(u32 **p, structuasm_i_jr (p, ptr);if (mode == refill_scratch) { -if (scratch_reg >=0 ) +if (scratch_reg >=0 ) { +uasm_i_ehb (p);UASM_i_MFC0 (p,1 ,c0_kscratch (), scratch_reg); -else + }else {UASM_i_LW (p,1 ,scratchpad_offset (0 ),0 ); + } }else {uasm_i_nop (p); }
@@ -1258,6 +1263,7 @@ build_fast_tlb_refill_handler (u32 **p,UASM_i_MTC0 (p, odd,C0_ENTRYLO1 );/* load it */ if (c0_scratch_reg >=0 ) { +uasm_i_ehb (p);UASM_i_MFC0 (p, scratch,c0_kscratch (), c0_scratch_reg);build_tlb_write_entry (p, l, r, tlb_random);uasm_l_leave (l, *p);
@@ -1603,15 +1609,17 @@ static void build_setup_pgd(void)uasm_i_dinsm (&p, a0,0 ,29 ,64 -29 );uasm_l_tlbl_goaround1 (&l, p);UASM_i_SLL (&p, a0, a0,11 ); -uasm_i_jr (&p,31 );UASM_i_MTC0 (&p, a0,C0_CONTEXT ); +uasm_i_jr (&p,31 ); + uasm_i_ehb(&p); }else {/* PGD in c0_KScratch */ -uasm_i_jr (&p,31 );if (cpu_has_ldpte)UASM_i_MTC0 (&p, a0,C0_PWBASE );else UASM_i_MTC0 (&p, a0,c0_kscratch (), pgd_reg); +uasm_i_jr (&p,31 ); +uasm_i_ehb (&p); }#else #ifdef CONFIG_SMP
@@ -1625,13 +1633,16 @@ static void build_setup_pgd(void)UASM_i_LA_mostly (&p, a2, pgdc);UASM_i_SW (&p, a0,uasm_rel_lo (pgdc), a2);#endif /* SMP */ -uasm_i_jr (&p,31 );/* if pgd_reg is allocated, save PGD also to scratch register */ -if (pgd_reg !=-1 ) +if (pgd_reg !=-1 ) {UASM_i_MTC0 (&p, a0,c0_kscratch (), pgd_reg); -else +uasm_i_jr (&p,31 ); +uasm_i_ehb (&p); + }else { +uasm_i_jr (&p,31 );uasm_i_nop (&p); + }#endif if (p >= (u32 *)tlbmiss_handler_setup_pgd_end)panic ("tlbmiss_handler_setup_pgd space exceeded" );
Greg Kroah-Hartman
maintainerPATCH 91/96 MIPS: have "plain" make calls build dtbs for selected platforms
In reply to Greg Kroah-HartmanFrom: Cedric Hombourger <[email protected]>
commit 637dfa0fad6d91a9a709dc70549a6d20fa77f615 upstream.
scripts/package/builddeb calls "make dtbs_install" after executing a plain make (i.e. no build targets specified). It will fail if dtbs were not built beforehand. Match the arm64 architecture where DTBs get built by the "all" target.
--- arch/mips/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/Makefile +2 -1
@@ -17,6 +17,7 @@ archscripts: scripts_basic $(Q)$(MAKE) $(build)=arch/mips/boot/tools relocs KBUILD_DEFCONFIG := 32r2el_defconfig +KBUILD_DTBS := dtbs # # Select the object file format to substitute into the linker script.
@@ -384,7 +385,7 @@ quiet_cmd_64 = OBJCOPY $@ vmlinux.64: vmlinux $(call cmd,64) -all: $(all-y) +all: $(all-y) $(KBUILD_DTBS) # boot $(boot-y): $(vmlinux-32) FORCE
Greg Kroah-Hartman
maintainerPATCH 92/96 dmaengine: qcom: bam_dma: Fix completed descriptors count
In reply to Greg Kroah-HartmanFrom: Sricharan R <[email protected]>
commit f6034225442c4a87906d36e975fd9e99a8f95487 upstream.
One space is left unused in circular FIFO to differentiate 'full' and 'empty' cases. So take that in to account while counting for the descriptors completed.
Fixes the issue reported here,
https://lkml.org/lkml/2019/6/18/669
--- drivers/dma/qcom/bam_dma.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/dma/qcom/bam_dma.c +3 -0
@@ -808,6 +808,9 @@ static u32 process_channel_irqs(struct b/* Number of bytes available to read */ avail =CIRC_CNT (offset, bchan->head,MAX_DESCRIPTORS +1 ); +if (offset < bchan->head) + avail--; +list_for_each_entry_safe (async_desc, tmp, &bchan->desc_list, desc_node) {/* Not enough data to read */
Greg Kroah-Hartman
maintainerPATCH 93/96 dmaengine: imx-sdma: remove BD_INTR for channel0
In reply to Greg Kroah-HartmanFrom: Robin Gong <[email protected]>
commit 3f93a4f297961c12bb17aa16cb3a4d1291823cae upstream.
It is possible for an irq triggered by channel0 to be received later after clks are disabled once firmware loaded during sdma probe. If that happens then clearing them by writing to SDMA_H_INTR won't work and the kernel will hang processing infinite interrupts. Actually, don't need interrupt triggered on channel0 since it's pollling SDMA_H_STATSTOP to know channel0 done rather than interrupt in current code, just clear BD_INTR to disable channel0 interrupt to avoid the above case.
This issue was brought by commit 1d069bfa3c78 ("dmaengine: imx-sdma:
ack channel 0 IRQ in the interrupt handler") which didn't take care the above case.
--- drivers/dma/imx-sdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/imx-sdma.c +2 -2
@@ -703,7 +703,7 @@ static int sdma_load_script(struct sdma_spin_lock_irqsave (&sdma->channel_0_lock, flags); bd0->mode.command =C0_SETPM ; - bd0->mode.status =BD_DONE |BD_INTR |BD_WRAP |BD_EXTD ; + bd0->mode.status =BD_DONE |BD_WRAP |BD_EXTD ; bd0->mode.count = size /2 ; bd0->buffer_addr = buf_phys; bd0->ext_buffer_addr = address;
@@ -1025,7 +1025,7 @@ static int sdma_load_context(struct sdma context->gReg[7 ] = sdmac->watermark_level; bd0->mode.command =C0_SETDM ; - bd0->mode.status =BD_DONE |BD_INTR |BD_WRAP |BD_EXTD ; + bd0->mode.status =BD_DONE |BD_WRAP |BD_EXTD ; bd0->mode.count =sizeof (*context) /4 ; bd0->buffer_addr = sdma->context_phys; bd0->ext_buffer_addr =2048 + (sizeof (*context) /4 ) * channel;
Greg Kroah-Hartman
maintainerPATCH 94/96 dmaengine: jz4780: Fix an endian bug in IRQ handler
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 4c89cc73d1da42ae48b5c5dfbfd12304d0b86786 upstream.
The "pending" variable was a u32 but we cast it to an unsigned long pointer when we do the for_each_set_bit() loop. The problem is that on big endian 64bit systems that results in an out of bounds read.
--- drivers/dma/dma-jz4780.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/dma/dma-jz4780.c +3 -2
@@ -722,12 +722,13 @@ static irqreturn_t jz4780_dma_irq_handle {struct jz4780_dma_dev *jzdma = data;unsigned int nb_channels = jzdma->soc_data->nb_channels; -uint32_t pending, dmac; +unsigned long pending; +uint32_t dmac;int i; pending =jz4780_dma_ctrl_readl (jzdma,JZ_DMA_REG_DIRQP ); -for_each_set_bit (i, (unsigned long *)&pending, nb_channels) { +for_each_set_bit (i, &pending, nb_channels) {if (jz4780_dma_chan_irq (jzdma, &jzdma->chan[i])) pending &= ~BIT (i); }
Greg Kroah-Hartman
maintainerPATCH 95/96 fs: VALIDATE_FS_PARSER should default to n
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 75f2d86b20bf6aec0392d6dd2ae3ffff26d2ae0e upstream.
CONFIG_VALIDATE_FS_PARSER is a debugging tool to check that the parser tables are vaguely sane. It was set to default to 'Y' for the moment to catch errors in upcoming fs conversion development.
Make sure it is not enabled by default in the final release of v5.1.
--- fs/Kconfig | 1 - 1 file changed, 1 deletion(-)
fs/Kconfig +0 -1
@@ -10,7 +10,6 @@ config DCACHE_WORD_ACCESS config VALIDATE_FS_PARSER bool "Validate filesystem parameter description" - default y help Enable this to perform validation of the parameter description for a filesystem when it is registered.
Greg Kroah-Hartman
maintainerPATCH 96/96 scsi: target/iblock: Fix overrun in WRITE SAME emulation
In reply to Greg Kroah-HartmanFrom: Roman Bolshakov <[email protected]>
commit 5676234f20fef02f6ca9bd66c63a8860fce62645 upstream.
WRITE SAME corrupts data on the block device behind iblock if the command is emulated. The emulation code issues (M - 1) * N times more bios than requested, where M is the number of 512 blocks per real block size and N is the NUMBER OF LOGICAL BLOCKS specified in WRITE SAME command. So, for a device with 4k blocks, 7 * N more LBAs gets written after the requested range.
The issue happens because the number of 512 byte sectors to be written is decreased one by one while the real bios are typically from 1 to 8 512 byte sectors per bio.
--- drivers/target/target_core_iblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_iblock.c +1 -1
@@ -515,7 +515,7 @@ iblock_execute_write_same(struct se_cmd/* Always in 512 byte units for Linux/Block */ block_lba += sg->length >>SECTOR_SHIFT ; - sectors -=1 ; + sectors -= sg->length >>SECTOR_SHIFT ; }iblock_submit_bios (&list);
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
Quoted 5 lines
thanks,
greg k-h
-------------
Hello,
Compiled and booted. No regressions on x86_64,
THX,
Jiunn
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 9 lines
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
build and boot fine with qemu-system-riscv64
root@(none):~# uname -a Linux (none) 5.1.17-rc1-00097-gb64119f8dffe #4 SMP Tue Jul 9 00:44:23 +07 2019 riscv64 GNU/Linux root@(none):~# cat /proc/cpuinfo processor : 0 hart : 0 isa : rv64imafdcu mmu : sv48
Greg Kroah-Hartman
maintainerQuoted 18 lines · Phong Tran
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 9 lines
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.build and boot fine with qemu-system-riscv64
Quoted 9 lines
root@(none):~# uname -a Linux (none) 5.1.17-rc1-00097-gb64119f8dffe #4 SMP Tue Jul 9 00:44:23 +07 2019 riscv64 GNU/Linux root@(none):~# cat /proc/cpuinfo processor : 0 hart : 0 isa : rv64imafdcu mmu : sv48
riscv on quemu, interesting choice!
Note, Guenter's tests do check this type of thing already, but thanks for doing this.
greg k-h
stable-rc/linux-5.1.y boot: 108 boots: 3 failed, 105 passed (v5.1.16-96-gadc3bfb5810c)
stable-rc/linux-5.1.y boot: 108 boots: 3 failed, 105 passed (v5.1.16-96-gadc3bfb5810c)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-5.1.y/kernel/v5.1.16-96-gadc3bfb5810c/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-5.1.y/kernel/v5.1.16-96-gadc3bfb5810c/
Tree: stable-rc
Branch: linux-5.1.y
Git Describe: v5.1.16-96-gadc3bfb5810c
Git Commit: adc3bfb5810c7d89758b29f1736fc927757ea64f
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 66 unique boards, 24 SoC families, 15 builds out of 209
Boot Failures Detected:
arm:
sunxi_defconfig:
gcc-8:
sun7i-a20-bananapi: 1 failed lab
multi_v7_defconfig:
gcc-8:
bcm4708-smartrg-sr400ac: 1 failed lab
sun7i-a20-bananapi: 1 failed lab---
For more info write to <[email protected]>
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
Quoted 5 lines
thanks,
greg k-h
-------------
Hi Greg,
Compiled and Booted on my x86_64 system.
Thanks,
- Luke
Greg Kroah-Hartman
maintainerQuoted 15 lines · Luke Nowakowski-Krijger
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
Quoted 8 lines
Quoted 5 lines
thanks,
greg k-h
-------------
Hi Greg,
Compiled and Booted on my
x86_64system.
Thanks for testing 2 of these.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 15 lines · shuah
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 4 lines
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Thanks for testing all of these and letting me know.
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.1.17-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.1.y
git commit: b64119f8dffe14ab62bbe65e01e72c102be085a9
git describe: v5.1.16-97-gb64119f8dffe
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.1-oe/build/v5.1.16-97-gb64119f8dffe
No regressions (compared to build v5.1.16)
No fixes (compared to build v5.1.16)
Ran 18086 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libgpiod
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* network-basic-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 17 lines · Naresh Kamboju
Quoted 15 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 3 lines
thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
Great, thanks for testing all of these!
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.thanks,
greg k-h
Compiled, booted; no regressions between 5.1.16 and 5.1.17-rc1 for dmesg, and kselftests (at least those that did run in my environment).
Greg Kroah-Hartman
maintainerQuoted 15 lines · Amol Surati
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 3 lines
thanks,
greg k-h
Compiled, booted; no regressions between 5.1.16 and 5.1.17-rc1 for dmesg, and kselftests (at least those that did run in my environment).
Thanks for testing 2 of these!
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 364 pass: 364 fail: 0
Guenter
Greg Kroah-Hartman
maintainerQuoted 6 lines · Guenter Roeck
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Quoted 3 lines
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 364 pass: 364 fail: 0
Thanks for testing all of these and letting me know.
greg k-h
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.1:
12 builds: 12 pass, 0 fail
22 boots: 22 pass, 0 fail
32 tests: 32 pass, 0 failLinux version: 5.1.17-rc1-gb64119f8dffe
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Greg Kroah-Hartman
maintainerQuoted 23 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.1.17 release. There are 96 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.1.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.1.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.1:
Quoted 9 lines
12 builds: 12 pass, 0 fail 22 boots: 22 pass, 0 fail 32 tests: 32 pass, 0 failLinux version: 5.1.17-rc1-gb64119f8dffe
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra30-cardhu-a04
Thanks for testing all of these and letting me know.
greg k-h