4.19.125-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 4.19.125-rc1 review
This is the start of the stable review cycle for the 4.19.125 release. There are 81 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 28 May 2020 18:36:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.125-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-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.125-rc1
Linus Torvalds <[email protected]>
make 'user_access_begin()' do 'access_ok()'
David Howells <[email protected]>
rxrpc: Fix ack discard
David Howells <[email protected]>
rxrpc: Trace discarded ACKs
Fabrice Gasnier <[email protected]>
iio: adc: stm32-dfsdm: fix device used to request dma
Peter Ujfalusi <[email protected]>
iio: adc: stm32-dfsdm: Use dma_request_chan() instead dma_request_slave_channel()
Fabrice Gasnier <[email protected]>
iio: adc: stm32-adc: fix device used to request dma
Peter Ujfalusi <[email protected]>
iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel()
Josh Poimboeuf <[email protected]>
x86/unwind/orc: Fix unwind_get_return_address_ptr() for inactive tasks
Qiushi Wu <[email protected]>
rxrpc: Fix a memory leak in rxkad_verify_response()
John Hubbard <[email protected]>
rapidio: fix an error in get_user_pages_fast() error handling
Wei Yongjun <[email protected]>
ipack: tpci200: fix error return code in tpci200_register()
Alexander Usyskin <[email protected]>
mei: release me_cl object reference
Klaus Doth <[email protected]>
misc: rtsx: Add short delay after exit from ASPM
Christophe JAILLET <[email protected]>
iio: dac: vf610: Fix an error handling path in 'vf610_dac_probe()'
Christophe JAILLET <[email protected]>
iio: sca3000: Remove an erroneous 'get_device()'
Oscar Carter <[email protected]>
staging: greybus: Fix uninitialized scalar variable
Dragos Bogdan <[email protected]>
staging: iio: ad2s1210: Fix SPI reading
Bob Peterson <[email protected]>
Revert "gfs2: Don't demote a glock until its revokes are written"
Guenter Roeck <[email protected]>
brcmfmac: abort and release host after error
Matthias Kaehlcke <[email protected]>
tty: serial: qcom_geni_serial: Fix wrap around of TX buffer
Arjun Vynipadath <[email protected]>
cxgb4/cxgb4vf: Fix mac_hlist initialization and free
Arjun Vynipadath <[email protected]>
cxgb4: free mac_hlist properly
Doug Berger <[email protected]>
net: bcmgenet: abort suspend on error
Doug Berger <[email protected]>
net: bcmgenet: code movement
Juliet Kim <[email protected]>
Revert "net/ibmvnic: Fix EOI when running in XIVE mode"
Geert Uytterhoeven <[email protected]>
media: fdp1: Fix R-Car M3-N naming in debug message
Mika Westerberg <[email protected]>
thunderbolt: Drop duplicated get_switch_at_route()
Gustavo A. R. Silva <[email protected]>
staging: most: core: replace strcpy() by strscpy()
Vishal Verma <[email protected]>
libnvdimm/btt: Fix LBA masking during 'free list' population
Vishal Verma <[email protected]>
libnvdimm/btt: Remove unnecessary code in btt_freelist_init
Dexuan Cui <[email protected]>
nfit: Add Hyper-V NVDIMM DSM command set to white list
Michael Ellerman <[email protected]>
powerpc/64s: Disable STRICT_KERNEL_RWX
Russell Currey <[email protected]>
powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE
Colin Xu <[email protected]>
drm/i915/gvt: Init DPLL/DDI vreg for virtual display instead of inheritance.
Cristian Ciocaltea <[email protected]>
dmaengine: owl: Use correct lock in owl_dma_get_pchan()
Christophe JAILLET <[email protected]>
dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()'
Xiyu Yang <[email protected]>
apparmor: Fix aa_label refcnt leak in policy_update
Xiyu Yang <[email protected]>
apparmor: fix potential label refcnt leak in aa_change_profile
Navid Emamdoost <[email protected]>
apparmor: Fix use-after-free in aa_audit_rule_init
Christian Gmeiner <[email protected]>
drm/etnaviv: fix perfmon domain interation
PeiSen Hou <[email protected]>
ALSA: hda/realtek - Add more fixup entries for Clevo machines
Christian Lachner <[email protected]>
ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Xtreme
Brent Lu <[email protected]>
ALSA: pcm: fix incorrect hw_base increase
Scott Bahling <[email protected]>
ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option
Daniel Jordan <[email protected]>
padata: purge get_cpu and reorder_via_wq from padata_do_serial
Daniel Jordan <[email protected]>
padata: initialize pd->cpu with effective cpumask
Herbert Xu <[email protected]>
padata: Replace delayed timer with immediate workqueue in padata_reorder
Thomas Gleixner <[email protected]>
ARM: futex: Address build warning
Hans de Goede <[email protected]>
platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA
Alan Stern <[email protected]>
USB: core: Fix misleading driver bug report
Maxim Petrov <[email protected]>
stmmac: fix pointer check after utilization in stmmac_interrupt
Wu Bo <[email protected]>
ceph: fix double unlock in handle_cap_export()
Hans de Goede <[email protected]>
HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K12A keyboard-dock
Yoshiyuki Kurauchi <[email protected]>
gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp()
Thomas Gleixner <[email protected]>
x86/apic: Move TSC deadline timer debug printk
Daniel Playfair Cal <[email protected]>
HID: i2c-hid: reset Synaptics SYNA2393 on resume
Tyrel Datwyler <[email protected]>
scsi: ibmvscsi: Fix WARN_ON during event pool release
James Hilliard <[email protected]>
component: Silence bind error on -EPROBE_DEFER
Richard Clark <[email protected]>
aquantia: Fix the media type of AQC100 ethernet controller in the driver
Stefano Garzarella <[email protected]>
vhost/vsock: fix packet delivery order to monitoring devices
Xiyu Yang <[email protected]>
configfs: fix config_item refcnt leak in configfs_rmdir()
Quinn Tran <[email protected]>
scsi: qla2xxx: Delete all sessions before unregister local nvme port
Arun Easi <[email protected]>
scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIV
Jiri Kosina <[email protected]>
HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead
Artem Borisov <[email protected]>
HID: alps: Add AUI1657 device ID
Sebastian Reichel <[email protected]>
HID: multitouch: add eGalaxTouch P80H84 support
Frédéric Pierret (fepitre) <[email protected]>
gcc-common.h: Update for GCC 10
Richard Weinberger <[email protected]>
ubi: Fix seq_file usage in detailed_erase_block_info debugfs file
Christophe JAILLET <[email protected]>
i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
Alexander Monakov <[email protected]>
iommu/amd: Fix over-read of ACPI UID from IVRS table
Christoph Hellwig <[email protected]>
ubifs: remove broken lazytime support
Al Viro <[email protected]>
fix multiplication overflow in copy_fdtable()
Miquel Raynal <[email protected]>
mtd: spinand: Propagate ECC information to the MTD structure
Roberto Sassu <[email protected]>
ima: Fix return value of ima_write_policy()
Roberto Sassu <[email protected]>
evm: Check also if *tfm is an error pointer in init_desc()
Roberto Sassu <[email protected]>
ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash()
Vincent Chen <[email protected]>
riscv: set max_pfn to the PFN of the last page
Miaohe Lin <[email protected]>
KVM: SVM: Fix potential memory leak in svm_cpu_init()
Kevin Hao <[email protected]>
i2c: dev: Fix the race between the release of i2c_dev and cdev
Arnd Bergmann <[email protected]>
ubsan: build ubsan.c more conservatively
Peter Zijlstra <[email protected]>
x86/uaccess, ubsan: Fix UBSAN vs. SMAP
-------------
Diffstat:
Makefile | 4 +- arch/arm/include/asm/futex.h | 9 +- arch/powerpc/Kconfig | 2 +- arch/riscv/kernel/setup.c | 2 + arch/x86/include/asm/uaccess.h | 11 +- arch/x86/kernel/apic/apic.c | 27 ++--- arch/x86/kernel/unwind_orc.c | 7 ++ arch/x86/kvm/svm.c | 13 ++- drivers/acpi/nfit/core.c | 17 ++- drivers/acpi/nfit/nfit.h | 6 +- drivers/base/component.c | 8 +- drivers/dma/owl-dma.c | 8 +- drivers/dma/tegra210-adma.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 2 +- drivers/gpu/drm/i915/gvt/display.c | 49 ++++++++- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 15 ++- drivers/hid/hid-alps.c | 1 + drivers/hid/hid-ids.h | 7 +- drivers/hid/hid-multitouch.c | 3 + drivers/hid/hid-quirks.c | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 2 + drivers/i2c/i2c-dev.c | 48 +++++---- drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 + drivers/iio/accel/sca3000.c | 2 +- drivers/iio/adc/stm32-adc.c | 20 +++- drivers/iio/adc/stm32-dfsdm-adc.c | 23 +++-- drivers/iio/dac/vf610_dac.c | 1 + drivers/iommu/amd_iommu_init.c | 9 +- drivers/ipack/carriers/tpci200.c | 1 + drivers/media/platform/rcar_fdp1.c | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 3 + drivers/misc/mei/client.c | 2 + drivers/mtd/nand/spi/core.c | 4 + drivers/mtd/ubi/debug.c | 12 +-- .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 63 ++++++------ drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 ++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 13 ++- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 +- drivers/net/ethernet/ibm/ibmvnic.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +- drivers/net/gtp.c | 9 +- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 + drivers/nvdimm/btt.c | 33 +++--- drivers/nvdimm/btt.h | 2 + drivers/nvdimm/btt_devs.c | 8 ++ drivers/platform/x86/asus-nb-wmi.c | 24 +++++ drivers/rapidio/devices/rio_mport_cdev.c | 5 + drivers/scsi/ibmvscsi/ibmvscsi.c | 4 - drivers/scsi/qla2xxx/qla_attr.c | 2 +- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/staging/greybus/uart.c | 4 +- drivers/staging/iio/resolver/ad2s1210.c | 17 ++- drivers/staging/most/core.c | 2 +- drivers/thunderbolt/icm.c | 12 ++- drivers/thunderbolt/switch.c | 18 ---- drivers/thunderbolt/tb.c | 9 +- drivers/thunderbolt/tb.h | 1 - drivers/tty/serial/qcom_geni_serial.c | 12 ++- drivers/usb/core/message.c | 4 +- drivers/vhost/vsock.c | 10 +- fs/ceph/caps.c | 1 + fs/configfs/dir.c | 1 + fs/file.c | 2 +- fs/gfs2/glock.c | 3 - fs/ubifs/file.c | 6 +- include/linux/padata.h | 13 +-- include/linux/uaccess.h | 2 +- include/trace/events/rxrpc.h | 35 +++++++ include/uapi/linux/ndctl.h | 1 + kernel/compat.c | 6 +- kernel/exit.c | 6 +- kernel/padata.c | 114 ++++----------------- lib/Makefile | 2 + lib/strncpy_from_user.c | 9 +- lib/strnlen_user.c | 9 +- net/rxrpc/input.c | 38 ++++++- net/rxrpc/rxkad.c | 3 +- scripts/gcc-plugins/Makefile | 1 + scripts/gcc-plugins/gcc-common.h | 4 + security/apparmor/apparmorfs.c | 3 +- security/apparmor/audit.c | 3 +- security/apparmor/domain.c | 3 +- security/integrity/evm/evm_crypto.c | 2 +- security/integrity/ima/ima_crypto.c | 12 +-- security/integrity/ima/ima_fs.c | 3 +- sound/core/pcm_lib.c | 1 + sound/pci/hda/patch_realtek.c | 4 + sound/pci/ice1712/ice1712.c | 3 +- 89 files changed, 537 insertions(+), 362 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/81 x86/uaccess, ubsan: Fix UBSAN vs. SMAP
From: Peter Zijlstra <[email protected]>
commit d08965a27e84ca090b504844d50c24fc98587b11 upstream.
UBSAN can insert extra code in random locations; including AC=1 sections. Typically this code is not safe and needs wrapping.
So far, only __ubsan_handle_type_mismatch* have been observed in AC=1 sections and therefore only those are annotated.
[stable backport: only take the lib/Makefile change to resolve gcc-10
build issues]
--- lib/Makefile | 1 + 1 file changed, 1 insertion(+)
lib/Makefile +1 -0
@@ -269,6 +269,7 @@ obj-$(CONFIG_UCS2_STRING) += ucs2_string obj-$(CONFIG_UBSAN) += ubsan.o UBSAN_SANITIZE_ubsan.o := n +CFLAGS_ubsan.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) obj-$(CONFIG_SBITMAP) += sbitmap.o
Greg Kroah-Hartman
maintainerPATCH 2/81 ubsan: build ubsan.c more conservatively
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit af700eaed0564d5d3963a7a51cb0843629d7fe3d upstream.
objtool points out several conditions that it does not like, depending on the combination with other configuration options and compiler variants:
stack protector:
lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch()+0xbf: call to __stack_chk_fail() with UACCESS enabled lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch_v1()+0xbe: call to __stack_chk_fail() with UACCESS enabled
stackleak plugin:
lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch()+0x4a: call to stackleak_track_stack() with UACCESS enabled lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch_v1()+0x4a: call to stackleak_track_stack() with UACCESS enabled
kasan:
lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch()+0x25: call to memcpy() with UACCESS enabled lib/ubsan.o: warning: objtool: __ubsan_handle_type_mismatch_v1()+0x25: call to memcpy() with UACCESS enabled
The stackleak and kasan options just need to be disabled for this file as we do for other files already. For the stack protector, we already attempt to disable it, but this fails on clang because the check is mixed with the gcc specific -fno-conserve-stack option. According to Andrey Ryabinin, that option is not even needed, dropping it here fixes the stackprotector issue.
--- lib/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/Makefile +2 -1
@@ -269,7 +269,8 @@ obj-$(CONFIG_UCS2_STRING) += ucs2_string obj-$(CONFIG_UBSAN) += ubsan.o UBSAN_SANITIZE_ubsan.o := n -CFLAGS_ubsan.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) +KASAN_SANITIZE_ubsan.o := n +CFLAGS_ubsan.o := $(call cc-option, -fno-stack-protector) $(DISABLE_STACKLEAK_PLUGIN) obj-$(CONFIG_SBITMAP) += sbitmap.o
Greg Kroah-Hartman
maintainerPATCH 3/81 i2c: dev: Fix the race between the release of i2c_dev and cdev
In reply to Greg Kroah-HartmanFrom: Kevin Hao <[email protected]>
commit 1413ef638abae4ab5621901cf4d8ef08a4a48ba6 upstream.
The struct cdev is embedded in the struct i2c_dev. In the current code,
we would free the i2c_dev struct directly in put_i2c_dev(), but the
cdev is manged by a kobject, and the release of it is not predictable.
So it is very possible that the i2c_dev is freed before the cdev is
entirely released. We can easily get the following call trace with CONFIG_DEBUG_KOBJECT_RELEASE and CONFIG_DEBUG_OBJECTS_TIMERS enabled.
ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x38
WARNING: CPU: 19 PID: 1 at lib/debugobjects.c:325 debug_print_object+0xb0/0xf0 Modules linked in: CPU: 19 PID: 1 Comm: swapper/0 Tainted: G W 5.2.20-yocto-standard+ #120 Hardware name: Marvell OcteonTX CN96XX board (DT) pstate: 80c00089 (Nzcv daIf +PAN +UAO) pc : debug_print_object+0xb0/0xf0 lr : debug_print_object+0xb0/0xf0 sp : ffff00001292f7d0 x29: ffff00001292f7d0 x28: ffff800b82151788 x27: 0000000000000001 x26: ffff800b892c0000 x25: ffff0000124a2558 x24: 0000000000000000 x23: ffff00001107a1d8 x22: ffff0000116b5088 x21: ffff800bdc6afca8 x20: ffff000012471ae8 x19: ffff00001168f2c8 x18: 0000000000000010 x17: 00000000fd6f304b x16: 00000000ee79de43 x15: ffff800bc0e80568 x14: 79616c6564203a74 x13: 6e6968207473696c x12: 5f72656d6974203a x11: ffff0000113f0018 x10: 0000000000000000 x9 : 000000000000001f x8 : 0000000000000000 x7 : ffff0000101294cc x6 : 0000000000000000 x5 : 0000000000000000 x4 : 0000000000000001 x3 : 00000000ffffffff x2 : 0000000000000000 x1 : 387fc15c8ec0f200 x0 : 0000000000000000 Call trace: debug_print_object+0xb0/0xf0 __debug_check_no_obj_freed+0x19c/0x228 debug_check_no_obj_freed+0x1c/0x28 kfree+0x250/0x440 put_i2c_dev+0x68/0x78 i2cdev_detach_adapter+0x60/0xc8 i2cdev_notifier_call+0x3c/0x70 notifier_call_chain+0x8c/0xe8 blocking_notifier_call_chain+0x64/0x88 device_del+0x74/0x380 device_unregister+0x54/0x78 i2c_del_adapter+0x278/0x2d0 unittest_i2c_bus_remove+0x3c/0x80 platform_drv_remove+0x30/0x50 device_release_driver_internal+0xf4/0x1c0 driver_detach+0x58/0xa0 bus_remove_driver+0x84/0xd8 driver_unregister+0x34/0x60 platform_driver_unregister+0x20/0x30 of_unittest_overlay+0x8d4/0xbe0 of_unittest+0xae8/0xb3c do_one_initcall+0xac/0x450 do_initcall_level+0x208/0x224 kernel_init_freeable+0x2d8/0x36c kernel_init+0x18/0x108 ret_from_fork+0x10/0x1c irq event stamp: 3934661 hardirqs last enabled at (3934661): [<ffff00001009fa04>] debug_exception_exit+0x4c/0x58 hardirqs last disabled at (3934660): [<ffff00001009fb14>] debug_exception_enter+0xa4/0xe0 softirqs last enabled at (3934654): [<ffff000010081d94>] __do_softirq+0x46c/0x628 softirqs last disabled at (3934649): [<ffff0000100b4a1c>] irq_exit+0x104/0x118
This is a common issue when using cdev embedded in a struct. Fortunately, we already have a mechanism to solve this kind of issue. Please see commit 233ed09d7fda ("chardev: add helper function to register char devs with a struct device") for more detail.
In this patch, we choose to embed the struct device into the i2c_dev, and use the API provided by the commit 233ed09d7fda to make sure that the release of i2c_dev and cdev are in sequence.
--- drivers/i2c/i2c-dev.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-)
drivers/i2c/i2c-dev.c +26 -22
@@ -48,7 +48,7 @@struct i2c_dev {struct list_head list;struct i2c_adapter *adap; -struct device *dev; +struct device dev;struct cdev cdev; };
@@ -92,12 +92,14 @@ static struct i2c_dev *get_free_i2c_dev(return i2c_dev; } -static void put_i2c_dev (struct i2c_dev *i2c_dev) +static void put_i2c_dev (struct i2c_dev *i2c_dev,bool del_cdev) {spin_lock (&i2c_dev_list_lock);list_del (&i2c_dev->list);spin_unlock (&i2c_dev_list_lock); -kfree (i2c_dev); +if (del_cdev) +cdev_device_del (&i2c_dev->cdev, &i2c_dev->dev); +put_device (&i2c_dev->dev); } static ssize_t name_show(struct device *dev,
@@ -636,6 +638,14 @@ static const struct file_operations i2cdstatic struct class *i2c_dev_class; +static void i2cdev_dev_release (struct device *dev) +{ +struct i2c_dev *i2c_dev; + + i2c_dev = container_of(dev, struct i2c_dev, dev); +kfree (i2c_dev); +} +static int i2cdev_attach_adapter (struct device *dev,void *dummy) {struct i2c_adapter *adap;
@@ -652,27 +662,23 @@ static int i2cdev_attach_adapter(structcdev_init (&i2c_dev->cdev, &i2cdev_fops); i2c_dev->cdev.owner =THIS_MODULE ; - res =cdev_add (&i2c_dev->cdev,MKDEV (I2C_MAJOR , adap->nr),1 ); -if (res) - goto error_cdev; - -/* register this i2c device with the driver core */ - i2c_dev->dev =device_create (i2c_dev_class, &adap->dev, -MKDEV (I2C_MAJOR , adap->nr),NULL , -"i2c-%d" , adap->nr); -if (IS_ERR (i2c_dev->dev)) { - res =PTR_ERR (i2c_dev->dev); - goto error; + +device_initialize (&i2c_dev->dev); + i2c_dev->dev.devt =MKDEV (I2C_MAJOR , adap->nr); + i2c_dev->dev.class = i2c_dev_class; + i2c_dev->dev.parent = &adap->dev; + i2c_dev->dev.release = i2cdev_dev_release; +dev_set_name (&i2c_dev->dev,"i2c-%d" , adap->nr); + + res =cdev_device_add (&i2c_dev->cdev, &i2c_dev->dev); +if (res) { +put_i2c_dev (i2c_dev, false); +return res; }pr_debug ("i2c-dev: adapter [%s] registered as minor %d\n" , adap->name, adap->nr);return 0 ; -error: -cdev_del (&i2c_dev->cdev); -error_cdev: -put_i2c_dev (i2c_dev); -return res; }static int i2cdev_detach_adapter (struct device *dev,void *dummy)
@@ -688,9 +694,7 @@ static int i2cdev_detach_adapter(structif (!i2c_dev)/* attach_adapter must have failed */ return 0 ; -cdev_del (&i2c_dev->cdev); -put_i2c_dev (i2c_dev); -device_destroy (i2c_dev_class,MKDEV (I2C_MAJOR , adap->nr)); +put_i2c_dev (i2c_dev, true);pr_debug ("i2c-dev: adapter [%s] unregistered\n" , adap->name);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 4/81 KVM: SVM: Fix potential memory leak in svm_cpu_init()
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit d80b64ff297e40c2b6f7d7abc1b3eba70d22a068 upstream.
When kmalloc memory for sd->sev_vmcbs failed, we forget to free the page held by sd->save_area. Also get rid of the var r as '-ENOMEM' is actually the only possible outcome here.
--- arch/x86/kvm/svm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
arch/x86/kvm/svm.c +6 -7
@@ -998,33 +998,32 @@ static void svm_cpu_uninit(int cpu)static int svm_cpu_init (int cpu) {struct svm_cpu_data *sd; -int r; sd =kzalloc (sizeof (struct svm_cpu_data ),GFP_KERNEL );if (!sd)return -ENOMEM ; sd->cpu = cpu; - r = -ENOMEM ; sd->save_area =alloc_page (GFP_KERNEL );if (!sd->save_area) - goto err_1; + goto free_cpu_data;if (svm_sev_enabled ()) { - r = -ENOMEM ; sd->sev_vmcbs =kmalloc_array (max_sev_asid +1 ,sizeof (void *),GFP_KERNEL );if (!sd->sev_vmcbs) - goto err_1; + goto free_save_area; }per_cpu (svm_data, cpu) = sd;return 0 ; -err_1: +free_save_area: +__free_page (sd->save_area); +free_cpu_data:kfree (sd); -return r; +return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 5/81 riscv: set max_pfn to the PFN of the last page
In reply to Greg Kroah-HartmanFrom: Vincent Chen <[email protected]>
commit c749bb2d554825e007cbc43b791f54e124dadfce upstream.
The current max_pfn equals to zero. In this case, I found it caused users cannot get some page information through /proc such as kpagecount in v5.6 kernel because of new sanity checks. The following message is displayed by stress-ng test suite with the command "stress-ng --verbose --physpage 1 -t 1" on HiFive unleashed board.
# stress-ng --verbose --physpage 1 -t 1 stress-ng: debug: [109] 4 processors online, 4 processors configured stress-ng: info: [109] dispatching hogs: 1 physpage stress-ng: debug: [109] cache allocate: reducing cache level from L3 (too high) to L0 stress-ng: debug: [109] get_cpu_cache: invalid cache_level: 0 stress-ng: info: [109] cache allocate: using built-in defaults as no suitable cache found stress-ng: debug: [109] cache allocate: default cache size: 2048K stress-ng: debug: [109] starting stressors stress-ng: debug: [109] 1 stressor spawned stress-ng: debug: [110] stress-ng-physpage: started [110] (instance 0) stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd34de000 in /proc/kpagecount, errno=0 (Success) stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd32db078 in /proc/kpagecount, errno=0 (Success) ... stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd32db078 in /proc/kpagecount, errno=0 (Success) stress-ng: debug: [110] stress-ng-physpage: exited [110] (instance 0) stress-ng: debug: [109] process [110] terminated stress-ng: info: [109] successful run completed in 1.00s #
After applying this patch, the kernel can pass the test.
# stress-ng --verbose --physpage 1 -t 1 stress-ng: debug: [104] 4 processors online, 4 processors configured stress-ng: info: [104] dispatching hogs: 1 physpage stress-ng: info: [104] cache allocate: using defaults, can't determine cache details from sysfs stress-ng: debug: [104] cache allocate: default cache size: 2048K stress-ng: debug: [104] starting stressors stress-ng: debug: [104] 1 stressor spawned stress-ng: debug: [105] stress-ng-physpage: started [105] (instance 0) stress-ng: debug: [105] stress-ng-physpage: exited [105] (instance 0) stress-ng: debug: [104] process [105] terminated stress-ng: info: [104] successful run completed in 1.01s #
--- arch/riscv/kernel/setup.c | 2 ++ 1 file changed, 2 insertions(+)
arch/riscv/kernel/setup.c +2 -0
@@ -19,6 +19,7 @@* to the Free Software Foundation, Inc., */ +#include <linux/bootmem.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/memblock.h>
@@ -187,6 +188,7 @@ static void __init setup_bootmem(void)set_max_mapnr (PFN_DOWN (mem_size)); max_low_pfn =PFN_DOWN (memblock_end_of_DRAM ()); + max_pfn = max_low_pfn;#ifdef CONFIG_BLK_DEV_INITRD setup_initrd ();
Greg Kroah-Hartman
maintainerPATCH 6/81 ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash()
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
[ Upstream commit 0014cc04e8ec077dc482f00c87dfd949cfe2b98f ]
Commit a408e4a86b36 ("ima: open a new file instance if no read permissions") tries to create a new file descriptor to calculate a file digest if the file has not been opened with O_RDONLY flag. However, if a new file descriptor cannot be obtained, it sets the FMODE_READ flag to file->f_flags instead of file->f_mode.
This patch fixes this issue by replacing f_flags with f_mode as it was before that commit.
--- security/integrity/ima/ima_crypto.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
security/integrity/ima/ima_crypto.c +6 -6
@@ -415,7 +415,7 @@ int ima_calc_file_hash(struct file *file, struct ima_digest_data *hash)loff_t i_size;int rc;struct file *f = file; -bool new_file_instance = false, modified_flags = false; +bool new_file_instance = false, modified_mode = false;/* * For consistency, fail file's opened with the O_DIRECT flag on
@@ -435,13 +435,13 @@ int ima_calc_file_hash(struct file *file, struct ima_digest_data *hash) f =dentry_open (&file->f_path, flags, file->f_cred);if (IS_ERR (f)) {/* -* Cannot open the file again, lets modify f_flags +* Cannot open the file again, lets modify f_mode * of original and continue */ pr_info_ratelimited ("Unable to reopen file for reading.\n" ); f = file; - f->f_flags |=FMODE_READ ; - modified_flags = true; + f->f_mode |=FMODE_READ ; + modified_mode = true; }else { new_file_instance = true; }
@@ -459,8 +459,8 @@ int ima_calc_file_hash(struct file *file, struct ima_digest_data *hash) out:if (new_file_instance)fput (f); -else if (modified_flags) - f->f_flags &= ~FMODE_READ ; +else if (modified_mode) + f->f_mode &= ~FMODE_READ ;return rc; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 7/81 evm: Check also if *tfm is an error pointer in init_desc()
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
[ Upstream commit 53de3b080d5eae31d0de219617155dcc34e7d698 ]
This patch avoids a kernel panic due to accessing an error pointer set by crypto_alloc_shash(). It occurs especially when there are many files that require an unsupported algorithm, as it would increase the likelihood of the following race condition:
Task A: *tfm = crypto_alloc_shash() <= error pointer Task B: if (*tfm == NULL) <= *tfm is not NULL, use it Task B: rc = crypto_shash_init(desc) <= panic Task A: *tfm = NULL
This patch uses the IS_ERR_OR_NULL macro to determine whether or not a new crypto context must be created.
--- security/integrity/evm/evm_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/integrity/evm/evm_crypto.c +1 -1
@@ -96,7 +96,7 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo) algo = hash_algo_name[hash_algo]; } -if (*tfm ==NULL ) { +if (IS_ERR_OR_NULL (*tfm)) {mutex_lock (&mutex);if (*tfm) goto out;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 8/81 ima: Fix return value of ima_write_policy()
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
[ Upstream commit 2e3a34e9f409ebe83d1af7cd2f49fca7af97dfac ]
This patch fixes the return value of ima_write_policy() when a new policy is directly passed to IMA and the current policy requires appraisal of the file containing the policy. Currently, if appraisal is not in ENFORCE mode, ima_write_policy() returns 0 and leads user space applications to an endless loop. Fix this issue by denying the operation regardless of the appraisal mode.
--- security/integrity/ima/ima_fs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
security/integrity/ima/ima_fs.c +1 -2
@@ -343,8 +343,7 @@ static ssize_t ima_write_policy(struct file *file, const char __user *buf,integrity_audit_msg (AUDIT_INTEGRITY_STATUS ,NULL ,NULL ,"policy_update" ,"signed policy required" ,1 ,0 ); -if (ima_appraise &IMA_APPRAISE_ENFORCE ) - result = -EACCES ; + result = -EACCES ; }else { result =ima_parse_add_rule (data); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 9/81 mtd: spinand: Propagate ECC information to the MTD structure
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 3507273d5a4d3c2e46f9d3f9ed9449805f5dff07 ]
This is done by default in the raw NAND core (nand_base.c) but was missing in the SPI-NAND core. Without these two lines the ecc_strength and ecc_step_size values are not exported to the user through sysfs.
--- drivers/mtd/nand/spi/core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/mtd/nand/spi/core.c +4 -0
@@ -1045,6 +1045,10 @@ static int spinand_init(struct spinand_device *spinand) mtd->oobavail = ret; +/* Propagate ECC information to mtd_info */ + mtd->ecc_strength = nand->eccreq.strength; + mtd->ecc_step_size = nand->eccreq.step_size; +return 0 ; err_cleanup_nanddev:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 10/81 fix multiplication overflow in copy_fdtable()
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit 4e89b7210403fa4a8acafe7c602b6212b7af6c3b ]
cpy and set really should be size_t; we won't get an overflow on that, since sysctl_nr_open can't be set above ~(size_t)0 / sizeof(void *), so nr that would've managed to overflow size_t on that multiplication won't get anywhere near copy_fdtable() - we'll fail with EMFILE before that.
--- fs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/file.c +1 -1
@@ -70,7 +70,7 @@ static void copy_fd_bitmaps(struct fdtable *nfdt, struct fdtable *ofdt,*/ static void copy_fdtable (struct fdtable *nfdt,struct fdtable *ofdt) { -unsigned int cpy, set; +size_t cpy, set;BUG_ON (nfdt->max_fds < ofdt->max_fds);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 11/81 ubifs: remove broken lazytime support
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit ecf84096a526f2632ee85c32a3d05de3fa60ce80 ]
When "ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs" introduced atime support to ubifs, it also added lazytime support. As far as I can tell the lazytime support is terminally broken, as it causes mark_inode_dirty_sync to be called from __writeback_single_inode, which will then trigger the locking assert in ubifs_dirty_inode. Just remove the broken lazytime support for now, it can be added back later, especially as some infrastructure changes should make that easier soon.
--- fs/ubifs/file.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
fs/ubifs/file.c +1 -5
@@ -1391,7 +1391,6 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time,struct ubifs_info *c = inode->i_sb->s_fs_info;struct ubifs_budget_req req = { .dirtied_ino =1 , .dirtied_ino_d =ALIGN (ui->data_len,8 ) }; -int iflags =I_DIRTY_TIME ;int err, release; err =ubifs_budget_space (c, &req);
@@ -1406,11 +1405,8 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time,if (flags &S_MTIME ) inode->i_mtime = *time; -if (!(inode->i_sb->s_flags &SB_LAZYTIME )) - iflags |=I_DIRTY_SYNC ; - release = ui->dirty; -__mark_inode_dirty (inode, iflags); +__mark_inode_dirty (inode,I_DIRTY_SYNC );mutex_unlock (&ui->ui_mutex);if (release)ubifs_release_budget (c, &req);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 12/81 iommu/amd: Fix over-read of ACPI UID from IVRS table
In reply to Greg Kroah-HartmanFrom: Alexander Monakov <[email protected]>
[ Upstream commit e461b8c991b9202b007ea2059d953e264240b0c9 ]
IVRS parsing code always tries to read 255 bytes from memory when retrieving ACPI device path, and makes an assumption that firmware provides a zero-terminated string. Both of those are bugs: the entry is likely to be shorter than 255 bytes, and zero-termination is not guaranteed.
With Acer SF314-42 firmware these issues manifest visibly in dmesg:
AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR0\xf0\xa5, rdevid:160
AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR1\xf0\xa5, rdevid:160
AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR2\xf0\xa5, rdevid:160
AMD-Vi: ivrs, add hid:AMDI0020, uid:\_SB.FUR3>\x83e\x8d\x9a\xd1...
The first three lines show how the code over-reads adjacent table entries into the UID, and in the last line it even reads garbage data beyond the end of the IVRS table itself.
Since each entry has the length of the UID (uidl member of ivhd_entry struct), use that for memcpy, and manually add a zero terminator.
Avoid zero-filling hid and uid arrays up front, and instead ensure the uid array is always zero-terminated. No change needed for the hid array, as it was already properly zero-terminated.
--- drivers/iommu/amd_iommu_init.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/iommu/amd_iommu_init.c +5 -4
@@ -1334,8 +1334,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, }case IVHD_DEV_ACPI_HID : {u16 devid; -u8 hid[ACPIHID_HID_LEN ] = {0 }; -u8 uid[ACPIHID_UID_LEN ] = {0 }; +u8 hid[ACPIHID_HID_LEN ]; +u8 uid[ACPIHID_UID_LEN ];int ret;if (h->type !=0x40 ) {
@@ -1352,6 +1352,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,break ; } + uid[0 ] ='\0' ;switch (e->uidf) {case UID_NOT_PRESENT :
@@ -1366,8 +1367,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,break ;case UID_IS_CHARACTER : -memcpy (uid, (u8 *)(&e->uid),ACPIHID_UID_LEN -1 ); - uid[ACPIHID_UID_LEN -1 ] ='\0' ; +memcpy (uid, &e->uid, e->uidl); + uid[e->uidl] ='\0' ;break ;default :
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 13/81 i2c: mux: demux-pinctrl: Fix an error handling path in i2c_demux_pinctrl_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit e9d1a0a41d4486955e96552293c1fcf1fce61602 ]
A call to 'i2c_demux_deactivate_master()' is missing in the error handling path, as already done in the remove function.
--- drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/muxes/i2c-demux-pinctrl.c +1 -0
@@ -273,6 +273,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) err_rollback_available:device_remove_file (&pdev->dev, &dev_attr_available_masters); err_rollback: +i2c_demux_deactivate_master (priv);for (j =0 ; j < i; j++) {of_node_put (priv->chan[j].parent_np);of_changeset_destroy (&priv->chan[j].chgset);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 14/81 ubi: Fix seq_file usage in detailed_erase_block_info debugfs file
In reply to Greg Kroah-HartmanFrom: Richard Weinberger <[email protected]>
[ Upstream commit 0e7572cffe442290c347e779bf8bd4306bb0aa7c ]
3bfa7e141b0b ("fs/seq_file.c: seq_read(): add info message about buggy .next functions") showed that we don't use seq_file correctly.
So make sure that our ->next function always updates the position.
--- drivers/mtd/ubi/debug.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/mtd/ubi/debug.c +2 -10
@@ -405,9 +405,6 @@ static void *eraseblk_count_seq_start(struct seq_file *s, loff_t *pos) {struct ubi_device *ubi = s->private; -if (*pos ==0 ) -return SEQ_START_TOKEN ; -if (*pos < ubi->peb_count)return pos;
@@ -421,8 +418,6 @@ static void *eraseblk_count_seq_next(struct seq_file *s, void *v, loff_t *pos) {struct ubi_device *ubi = s->private; -if (v ==SEQ_START_TOKEN ) -return pos; (*pos)++;if (*pos < ubi->peb_count)
@@ -444,11 +439,8 @@ static int eraseblk_count_seq_show(struct seq_file *s, void *iter)int err;/* If this is the start, print a header */ -if (iter ==SEQ_START_TOKEN ) { -seq_puts (s, -"physical_block_number\terase_count\tblock_status\tread_status\n" ); -return 0 ; - } +if (*block_number ==0 ) +seq_puts (s,"physical_block_number\terase_count\n" ); err =ubi_io_is_bad (ubi, *block_number);if (err)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 15/81 gcc-common.h: Update for GCC 10
In reply to Greg Kroah-HartmanFrom: Frédéric Pierret (fepitre) <[email protected]>
[ Upstream commit c7527373fe28f97d8a196ab562db5589be0d34b9 ]
Remove "params.h" include, which has been dropped in GCC 10.
Remove is_a_helper() macro, which is now defined in gimple.h, as seen when running './scripts/gcc-plugin.sh g++ g++ gcc':
In file included from <stdin>:1:./gcc-plugins/gcc-common.h:852:13: error: redefinition of ‘static bool is_a_helper<T>::test(U*) [with U = const gimple; T = const ggoto*]’
852 | inline bool is_a_helper<const ggoto *>::test(const_gimple gs)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ./gcc-plugins/gcc-common.h:125,
from <stdin>:1:
/usr/lib/gcc/x86_64-redhat-linux/10/plugin/include/gimple.h:1037:1: note: ‘static bool is_a_helper<T>::test(U*) [with U = const gimple; T = const ggoto*]’ previously declared here
1037 | is_a_helper <const ggoto *>::test (const gimple *gs)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~Add -Wno-format-diag to scripts/gcc-plugins/Makefile to avoid meaningless warnings from error() formats used by plugins:
scripts/gcc-plugins/structleak_plugin.c: In function ‘int plugin_init(plugin_name_args*, plugin_gcc_version*)’:scripts/gcc-plugins/structleak_plugin.c:253:12: warning: unquoted sequence of 2 consecutive punctuation characters ‘'-’ in format [-Wformat-diag]
253 | error(G_("unknown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- scripts/gcc-plugins/Makefile | 1 + scripts/gcc-plugins/gcc-common.h | 4 ++++ 2 files changed, 5 insertions(+)
scripts/gcc-plugins/Makefile +1 -0
@@ -11,6 +11,7 @@ else HOST_EXTRACXXFLAGS += -I$(GCC_PLUGINS_DIR)/include -I$(src) -std=gnu++98 -fno-rtti HOST_EXTRACXXFLAGS += -fno-exceptions -fasynchronous-unwind-tables -ggdb HOST_EXTRACXXFLAGS += -Wno-narrowing -Wno-unused-variable + HOST_EXTRACXXFLAGS += -Wno-format-diag export HOST_EXTRACXXFLAGS endif
scripts/gcc-plugins/gcc-common.h +4 -0
@@ -35,7 +35,9 @@#include "ggc.h" #include "timevar.h" +#if BUILDING_GCC_VERSION <10000 #include "params.h" +#endif #if BUILDING_GCC_VERSION <=4009 #include "pointer-set.h"
@@ -847,6 +849,7 @@ static inline gimple gimple_build_assign_with_ops(enum tree_code subcode, tree l return gimple_build_assign(lhs, subcode, op1, op2 PASS_MEM_STAT); } +#if BUILDING_GCC_VERSION <10000 template <> template <> inline bool is_a_helper<const ggoto *>::test(const_gimple gs)
@@ -860,6 +863,7 @@ inline bool is_a_helper<const greturn *>::test(const_gimple gs) {return gs->code ==GIMPLE_RETURN ; } +#endif static inline gasm *as_a_gasm (gimple stmt) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 16/81 HID: multitouch: add eGalaxTouch P80H84 support
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit f9e82295eec141a0569649d400d249333d74aa91 ]
Add support for P80H84 touchscreen from eGalaxy:
idVendor 0x0eef D-WAV Scientific Co., Ltd
idProduct 0xc002
iManufacturer 1 eGalax Inc.
iProduct 2 eGalaxTouch P80H84 2019 vDIVA_1204_T01 k4.02.146
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-multitouch.c | 3 +++ 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -378,6 +378,7 @@#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349 0x7349#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7 0x73f7#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_C002 0xc002#define USB_VENDOR_ID_ELAN 0x04f3#define USB_DEVICE_ID_TOSHIBA_CLICK_L9W 0x0401
drivers/hid/hid-multitouch.c +3 -0
@@ -1909,6 +1909,9 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_EGALAX_SERIAL,MT_USB_DEVICE (USB_VENDOR_ID_DWAV , USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) }, + { .driver_data = MT_CLS_EGALAX, +MT_USB_DEVICE (USB_VENDOR_ID_DWAV , + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_C002) }, /* Elitegroup panel */ { .driver_data = MT_CLS_SERIAL,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 17/81 HID: alps: Add AUI1657 device ID
In reply to Greg Kroah-HartmanFrom: Artem Borisov <[email protected]>
[ Upstream commit 640e403b1fd24e7f31ac6f29f0b6a21d285ed729 ]
This device is used on Lenovo V130-15IKB variants and uses the same registers as U1.
--- drivers/hid/hid-alps.c | 1 + drivers/hid/hid-ids.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/hid/hid-alps.c +1 -0
@@ -806,6 +806,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)break ;case HID_DEVICE_ID_ALPS_U1_DUAL :case HID_DEVICE_ID_ALPS_U1 : +case HID_DEVICE_ID_ALPS_1657 : data->dev_type =U1 ;break ;default :
drivers/hid/hid-ids.h +1 -1
@@ -83,7 +83,7 @@#define HID_DEVICE_ID_ALPS_U1 0x1215#define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C#define HID_DEVICE_ID_ALPS_1222 0x1222 - +#define HID_DEVICE_ID_ALPS_1657 0x121E#define USB_VENDOR_ID_AMI 0x046b#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE 0xff10
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 18/81 HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead
In reply to Greg Kroah-HartmanFrom: Jiri Kosina <[email protected]>
[ Upstream commit 185af3e775b693f773d9a4b5a8c3cda69fc8ca0f ]
HID_DEVICE_ID_ALPS_1657 PID is too specific, as there are many other ALPS hardware IDs using this particular touchpad.
Rename the identifier to HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY in order to describe reality better.
--- drivers/hid/hid-alps.c | 2 +- drivers/hid/hid-ids.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/hid/hid-alps.c +1 -1
@@ -806,7 +806,7 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)break ;case HID_DEVICE_ID_ALPS_U1_DUAL :case HID_DEVICE_ID_ALPS_U1 : -case HID_DEVICE_ID_ALPS_1657 : +case HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY : data->dev_type =U1 ;break ;default :
drivers/hid/hid-ids.h +1 -1
@@ -81,9 +81,9 @@#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220#define HID_DEVICE_ID_ALPS_U1 0x1215 +#define HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY 0x121E#define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C#define HID_DEVICE_ID_ALPS_1222 0x1222 -#define HID_DEVICE_ID_ALPS_1657 0x121E#define USB_VENDOR_ID_AMI 0x046b#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE 0xff10
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 19/81 scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIV
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
[ Upstream commit 45a76264c26fd8cfd0c9746196892d9b7e2657ee ]
In NPIV environment, a NPIV host may use a queue pair created by base host or other NPIVs, so the check for a queue pair created by this NPIV is not correct, and can cause an abort to fail, which in turn means the NVME command not returned. This leads to hang in nvme_fc layer in nvme_fc_delete_association() which waits for all I/Os to be returned, which is seen as hang in the application.
--- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_mbx.c +1 -1
@@ -3077,7 +3077,7 @@ qla24xx_abort_command(srb_t *sp)ql_dbg (ql_dbg_mbx + ql_dbg_verbose, vha,0x108c ,"Entered %s.\n" , __func__); -if (vha->flags.qpairs_available && sp->qpair) +if (sp->qpair) req = sp->qpair->req;if (ql2xasynctmfenable)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 20/81 scsi: qla2xxx: Delete all sessions before unregister local nvme port
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit c48f849d3f7a4ec1025105f446e29d395c4dcc2f ]
Delete all sessions before unregistering local nvme port. This allows nvme layer to decrement all active rport count down to zero. Once the count is down to zero, nvme would call qla to continue with the npiv port deletion.
PID: 27448 TASK: ffff9e34b777c1c0 CPU: 0 COMMAND: "qaucli"
0 [ffff9e25e84abbd8] __schedule at ffffffff977858ca
1 [ffff9e25e84abc68] schedule at ffffffff97785d79
2 [ffff9e25e84abc78] schedule_timeout at ffffffff97783881
3 [ffff9e25e84abd28] wait_for_completion at ffffffff9778612d
4 [ffff9e25e84abd88] qla_nvme_delete at ffffffffc0e3024e [qla2xxx]
5 [ffff9e25e84abda8] qla24xx_vport_delete at ffffffffc0e024b9 [qla2xxx]
6 [ffff9e25e84abdf0] fc_vport_terminate at ffffffffc011c247 [scsi_transport_fc] 7 [ffff9e25e84abe28] store_fc_host_vport_delete at ffffffffc011cd94 [scsi_transport_fc] 8 [ffff9e25e84abe70] dev_attr_store at ffffffff974b376b
9 [ffff9e25e84abe80] sysfs_kf_write at ffffffff972d9a92
10 [ffff9e25e84abe90] kernfs_fop_write at ffffffff972d907b
11 [ffff9e25e84abec8] vfs_write at ffffffff9724c790
12 [ffff9e25e84abf08] sys_write at ffffffff9724d55f
13 [ffff9e25e84abf50] system_call_fastpath at ffffffff97792ed2
RIP: 00007fc0bd81a6fd RSP: 00007ffff78d9648 RFLAGS: 00010202
RAX: 0000000000000001 RBX: 0000000000000022 RCX: 00007ffff78d96e0
RDX: 0000000000000022 RSI: 00007ffff78d94e0 RDI: 0000000000000008
RBP: 00007ffff78d9440 R8: 0000000000000000 R9: 00007fc0bd48b2cd
R10: 0000000000000017 R11: 0000000000000293 R12: 0000000000000000
R13: 00005624e4dac840 R14: 00005624e4da9a10 R15: 0000000000000000
ORIG_RAX: 0000000000000001 CS: 0033 SS: 002b--- drivers/scsi/qla2xxx/qla_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_attr.c +1 -1
@@ -2162,11 +2162,11 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))msleep (1000 ); -qla_nvme_delete (vha);qla24xx_disable_vp (vha);qla2x00_wait_for_sess_deletion (vha); +qla_nvme_delete (vha); vha->flags.delete_progress =1 ;qlt_remove_target (ha, vha);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 21/81 configfs: fix config_item refcnt leak in configfs_rmdir()
In reply to Greg Kroah-HartmanFrom: Xiyu Yang <[email protected]>
[ Upstream commit 8aebfffacfa379ba400da573a5bf9e49634e38cb ]
configfs_rmdir() invokes configfs_get_config_item(), which returns a reference of the specified config_item object to "parent_item" with increased refcnt.
When configfs_rmdir() returns, local variable "parent_item" becomes invalid, so the refcount should be decreased to keep refcount balanced.
The reference counting issue happens in one exception handling path of configfs_rmdir(). When down_write_killable() fails, the function forgets to decrease the refcnt increased by configfs_get_config_item(), causing a refcnt leak.
Fix this issue by calling config_item_put() when down_write_killable() fails.
--- fs/configfs/dir.c | 1 + 1 file changed, 1 insertion(+)
fs/configfs/dir.c +1 -0
@@ -1537,6 +1537,7 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry)spin_lock (&configfs_dirent_lock);configfs_detach_rollback (dentry);spin_unlock (&configfs_dirent_lock); +config_item_put (parent_item);return -EINTR ; } frag->frag_dead = true;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 22/81 vhost/vsock: fix packet delivery order to monitoring devices
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
[ Upstream commit 107bc0766b9feb5113074c753735a3f115c2141f ]
We want to deliver packets to monitoring devices before it is put in the virtqueue, to avoid that replies can appear in the packet capture before the transmitted packet.
--- drivers/vhost/vsock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/vhost/vsock.c +5 -5
@@ -182,14 +182,14 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,break ; } -vhost_add_used (vq, head,sizeof (pkt->hdr) + payload_len); - added = true; - -/* Deliver to monitoring devices all correctly transmitted -* packets. +/* Deliver to monitoring devices all packets that we +* will transmit. */ virtio_transport_deliver_tap_pkt (pkt); +vhost_add_used (vq, head,sizeof (pkt->hdr) + payload_len); + added = true; + pkt->off += payload_len; total_len += payload_len;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 23/81 aquantia: Fix the media type of AQC100 ethernet controller in the driver
In reply to Greg Kroah-HartmanFrom: Richard Clark <[email protected]>
[ Upstream commit 6de556c31061e3b9c36546ffaaac5fdb679a2f14 ]
The Aquantia AQC100 controller enables a SFP+ port, so the driver should configure the media type as '_TYPE_FIBRE' instead of '_TYPE_TP'.
--- drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +1 -1
@@ -60,7 +60,7 @@ static const struct aq_board_revision_s hw_atl_boards[] = { { AQ_DEVICE_ID_D108, AQ_HWREV_2, &hw_atl_ops_b0, &hw_atl_b0_caps_aqc108, }, { AQ_DEVICE_ID_D109, AQ_HWREV_2, &hw_atl_ops_b0, &hw_atl_b0_caps_aqc109, }, - { AQ_DEVICE_ID_AQC100, AQ_HWREV_ANY, &hw_atl_ops_b1, &hw_atl_b0_caps_aqc107, }, + { AQ_DEVICE_ID_AQC100, AQ_HWREV_ANY, &hw_atl_ops_b1, &hw_atl_b0_caps_aqc100, }, { AQ_DEVICE_ID_AQC107, AQ_HWREV_ANY, &hw_atl_ops_b1, &hw_atl_b0_caps_aqc107, }, { AQ_DEVICE_ID_AQC108, AQ_HWREV_ANY, &hw_atl_ops_b1, &hw_atl_b0_caps_aqc108, }, { AQ_DEVICE_ID_AQC109, AQ_HWREV_ANY, &hw_atl_ops_b1, &hw_atl_b0_caps_aqc109, },
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 24/81 component: Silence bind error on -EPROBE_DEFER
In reply to Greg Kroah-HartmanFrom: James Hilliard <[email protected]>
[ Upstream commit 7706b0a76a9697021e2bf395f3f065c18f51043d ]
If a component fails to bind due to -EPROBE_DEFER we should not log an error as this is not a real failure.
Fixes messages like:
vc4-drm soc:gpu: failed to bind 3f902000.hdmi (ops vc4_hdmi_ops): -517 vc4-drm soc:gpu: master bind failed: -517
--- drivers/base/component.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/base/component.c +5 -3
@@ -235,7 +235,8 @@ static int try_to_bring_up_master(struct master *master, ret = master->ops->bind (master->dev);if (ret <0 ) {devres_release_group (master->dev,NULL ); -dev_info (master->dev,"master bind failed: %d\n" , ret); +if (ret != -EPROBE_DEFER ) +dev_info (master->dev,"master bind failed: %d\n" , ret);return ret; }
@@ -506,8 +507,9 @@ static int component_bind(struct component *component, struct master *master,devres_release_group (component->dev,NULL );devres_release_group (master->dev,NULL ); -dev_err (master->dev,"failed to bind %s (ops %ps): %d\n" , -dev_name (component->dev), component->ops, ret); +if (ret != -EPROBE_DEFER ) +dev_err (master->dev,"failed to bind %s (ops %ps): %d\n" , +dev_name (component->dev), component->ops, ret); }return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 25/81 scsi: ibmvscsi: Fix WARN_ON during event pool release
In reply to Greg Kroah-HartmanFrom: Tyrel Datwyler <[email protected]>
[ Upstream commit b36522150e5b85045f868768d46fbaaa034174b2 ]
While removing an ibmvscsi client adapter a WARN_ON like the following is seen in the kernel log:
drmgr: drmgr: -r -c slot -s U9080.M9S.783AEC8-V11-C11 -w 5 -d 1
WARNING: CPU: 9 PID: 24062 at ../kernel/dma/mapping.c:311 dma_free_attrs+0x78/0x110 Supported: No, Unreleased kernel CPU: 9 PID: 24062 Comm: drmgr Kdump: loaded Tainted: G X 5.3.18-12-default NIP: c0000000001fa758 LR: c0000000001fa744 CTR: c0000000001fa6e0 REGS: c0000002173375d0 TRAP: 0700 Tainted: G X (5.3.18-12-default) MSR: 8000000000029033 <SF,EE,ME,IR,DR,RI,LE> CR: 28088282 XER: 20000000
CFAR: c0000000001fbf0c IRQMASK: 1
GPR00: c0000000001fa744 c000000217337860 c00000000161ab00 0000000000000000
GPR04: 0000000000000000 c000011e12250000 0000000018010000 0000000000000000
GPR08: 0000000000000000 0000000000000001 0000000000000001 c0080000190f4fa8
GPR12: c0000000001fa6e0 c000000007fc2a00 0000000000000000 0000000000000000
GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR24: 000000011420e310 0000000000000000 0000000000000000 0000000018010000
GPR28: c00000000159de50 c000011e12250000 0000000000006600 c000011e5c994848 NIP [c0000000001fa758] dma_free_attrs+0x78/0x110
LR [c0000000001fa744] dma_free_attrs+0x64/0x110
Call Trace:
[c000000217337860] [000000011420e310] 0x11420e310 (unreliable) [c0000002173378b0] [c0080000190f0280] release_event_pool+0xd8/0x120 [ibmvscsi] [c000000217337930] [c0080000190f3f74] ibmvscsi_remove+0x6c/0x160 [ibmvscsi] [c000000217337960] [c0000000000f3cac] vio_bus_remove+0x5c/0x100 [c0000002173379a0] [c00000000087a0a4] device_release_driver_internal+0x154/0x280 [c0000002173379e0] [c0000000008777cc] bus_remove_device+0x11c/0x220 [c000000217337a60] [c000000000870fc4] device_del+0x1c4/0x470 [c000000217337b10] [c0000000008712a0] device_unregister+0x30/0xa0 [c000000217337b80] [c0000000000f39ec] vio_unregister_device+0x2c/0x60 [c000000217337bb0] [c00800001a1d0964] dlpar_remove_slot+0x14c/0x250 [rpadlpar_io] [c000000217337c50] [c00800001a1d0bcc] remove_slot_store+0xa4/0x110 [rpadlpar_io] [c000000217337cd0] [c000000000c091a0] kobj_attr_store+0x30/0x50 [c000000217337cf0] [c00000000057c934] sysfs_kf_write+0x64/0x90 [c000000217337d10] [c00000000057be10] kernfs_fop_write+0x1b0/0x290 [c000000217337d60] [c000000000488c4c] __vfs_write+0x3c/0x70 [c000000217337d80] [c00000000048c648] vfs_write+0xd8/0x260 [c000000217337dd0] [c00000000048ca8c] ksys_write+0xdc/0x130 [c000000217337e20] [c00000000000b488] system_call+0x5c/0x70 Instruction dump:7c840074 f8010010 f821ffb1 20840040 eb830218 7c8407b4 48002019 60000000 2fa30000 409e003c 892d0988 792907e0 <0b090000> 2fbd0000 419e0028 2fbc0000
---[ end trace 5955b3c0cc079942 ]---
rpadlpar_io: slot U9080.M9S.783AEC8-V11-C11 removed
This is tripped as a result of irqs being disabled during the call to dma_free_coherent() by release_event_pool(). At this point in the code path we have quiesced the adapter and it is overly paranoid to be holding the host lock.
[mkp: fixed build warning reported by sfr]
--- drivers/scsi/ibmvscsi/ibmvscsi.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/scsi/ibmvscsi/ibmvscsi.c +0 -4
@@ -2296,16 +2296,12 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)static int ibmvscsi_remove (struct vio_dev *vdev) {struct ibmvscsi_host_data *hostdata =dev_get_drvdata (&vdev->dev); -unsigned long flags;srp_remove_host (hostdata->host);scsi_remove_host (hostdata->host);purge_requests (hostdata,DID_ERROR ); - -spin_lock_irqsave (hostdata->host->host_lock, flags);release_event_pool (&hostdata->pool, hostdata); -spin_unlock_irqrestore (hostdata->host->host_lock, flags);ibmvscsi_release_crq_queue (&hostdata->queue, hostdata, max_events);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 26/81 HID: i2c-hid: reset Synaptics SYNA2393 on resume
In reply to Greg Kroah-HartmanFrom: Daniel Playfair Cal <[email protected]>
[ Upstream commit 538f67407e2c0e5ed2a46e7d7ffa52f2e30c7ef8 ]
On the Dell XPS 9570, the Synaptics SYNA2393 touchpad generates spurious interrupts after resuming from suspend until it receives some input or is reset. Add it to the quirk I2C_HID_QUIRK_RESET_ON_RESUME so that it is reset when resuming from suspend.
More information about the bug can be found in this mailing list
discussion: https://www.spinics.net/lists/linux-input/msg59530.html
--- drivers/hid/hid-ids.h | 3 +++ drivers/hid/i2c-hid/i2c-hid-core.c | 2 ++ 2 files changed, 5 insertions(+)
drivers/hid/hid-ids.h +3 -0
@@ -1064,6 +1064,9 @@#define USB_DEVICE_ID_SYMBOL_SCANNER_2 0x1300#define USB_DEVICE_ID_SYMBOL_SCANNER_3 0x1200 +#define I2C_VENDOR_ID_SYNAPTICS 0x06cb +#define I2C_PRODUCT_ID_SYNAPTICS_SYNA2393 0x7a13 +#define USB_VENDOR_ID_SYNAPTICS 0x06cb#define USB_DEVICE_ID_SYNAPTICS_TP 0x0001#define USB_DEVICE_ID_SYNAPTICS_INT_TP 0x0002
drivers/hid/i2c-hid/i2c-hid-core.c +2 -0
@@ -187,6 +187,8 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_BOGUS_IRQ }, {USB_VENDOR_ID_ALPS_JP ,HID_ANY_ID , I2C_HID_QUIRK_RESET_ON_RESUME }, + { I2C_VENDOR_ID_SYNAPTICS, I2C_PRODUCT_ID_SYNAPTICS_SYNA2393, + I2C_HID_QUIRK_RESET_ON_RESUME }, { USB_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720, I2C_HID_QUIRK_BAD_INPUT_SIZE }, { 0, 0 }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 27/81 x86/apic: Move TSC deadline timer debug printk
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit c84cb3735fd53c91101ccdb191f2e3331a9262cb ]
Leon reported that the printk_once() in __setup_APIC_LVTT() triggers a lockdep splat due to a lock order violation between hrtimer_base::lock and console_sem, when the 'once' condition is reset via /sys/kernel/debug/clear_warn_once after boot.
The initial printk cannot trigger this because that happens during boot when the local APIC timer is set up on the boot CPU.
Prevent it by moving the printk to a place which is guaranteed to be only called once during boot.
Mark the deadline timer check related functions and data __init while at it.
--- arch/x86/kernel/apic/apic.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
arch/x86/kernel/apic/apic.c +14 -13
@@ -345,8 +345,6 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)* According to Intel, MFENCE can do the serialization here. */ asmvolatile ("mfence" : : :"memory" ); - -printk_once (KERN_DEBUG "TSC deadline timer enabled\n" );return ; }
@@ -545,7 +543,7 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events);#define DEADLINE_MODEL_MATCH_REV (model, rev) \ { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)rev } -static u32 hsx_deadline_rev (void ) +static __init u32 hsx_deadline_rev (void ) {switch (boot_cpu_data.x86_stepping) {case 0x02 :return 0x3a ;/* EP */
@@ -555,7 +553,7 @@ static u32 hsx_deadline_rev(void)return ~0U ; } -static u32 bdx_deadline_rev (void ) +static __init u32 bdx_deadline_rev (void ) {switch (boot_cpu_data.x86_stepping) {case 0x02 :return 0x00000011 ;
@@ -567,7 +565,7 @@ static u32 bdx_deadline_rev(void)return ~0U ; } -static u32 skx_deadline_rev (void ) +static __init u32 skx_deadline_rev (void ) {switch (boot_cpu_data.x86_stepping) {case 0x03 :return 0x01000136 ;
@@ -580,7 +578,7 @@ static u32 skx_deadline_rev(void)return ~0U ; } -static const struct x86_cpu_id deadline_match[] = { +static const struct x86_cpu_id deadline_match[]__initconst = {DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_HASWELL_X , hsx_deadline_rev),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_X ,0x0b000020 ),DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_BROADWELL_XEON_D , bdx_deadline_rev),
@@ -602,18 +600,19 @@ static const struct x86_cpu_id deadline_match[] = { {}, }; -static void apic_check_deadline_errata (void ) +static __init bool apic_validate_deadline_timer (void ) {const struct x86_cpu_id *m;u32 rev; -if (!boot_cpu_has (X86_FEATURE_TSC_DEADLINE_TIMER ) || -boot_cpu_has (X86_FEATURE_HYPERVISOR )) -return ; +if (!boot_cpu_has (X86_FEATURE_TSC_DEADLINE_TIMER )) +return false; +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) +return true; m =x86_match_cpu (deadline_match);if (!m) -return ; +return true;/* * Function pointers will have the MSB set due to address layout,
@@ -625,11 +624,12 @@ static void apic_check_deadline_errata(void) rev = (u32 )m->driver_data;if (boot_cpu_data.microcode >= rev) -return ; +return true;setup_clear_cpu_cap (X86_FEATURE_TSC_DEADLINE_TIMER );pr_err (FW_BUG "TSC_DEADLINE disabled due to Errata; " "please update microcode to version: 0x%x (or later)\n" , rev); +return false; }/*
@@ -2023,7 +2023,8 @@ void __init init_apic_mappings(void) {unsigned int new_apicid; -apic_check_deadline_errata (); +if (apic_validate_deadline_timer ()) +pr_debug ("TSC deadline timer available\n" );if (x2apic_mode) { boot_cpu_physical_apicid =read_apic_id ();
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 28/81 gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp()
In reply to Greg Kroah-HartmanFrom: Yoshiyuki Kurauchi <[email protected]>
[ Upstream commit 846c68f7f1ac82c797a2f1db3344a2966c0fe2e1 ]
In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI flag since it returns multipart message.
This patch adds a new arg "flags" in gtp_genl_fill_info() so that flags can be set by the callers.
--- drivers/net/gtp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/gtp.c +5 -4
@@ -1177,11 +1177,11 @@ out_unlock:static struct genl_family gtp_genl_family;static int gtp_genl_fill_info (struct sk_buff *skb,u32 snd_portid,u32 snd_seq, -u32 type,struct pdp_ctx *pctx) +int flags,u32 type,struct pdp_ctx *pctx) {void *genlh; - genlh =genlmsg_put (skb, snd_portid, snd_seq, >p_genl_family,0 , + genlh =genlmsg_put (skb, snd_portid, snd_seq, >p_genl_family, flags, type);if (genlh ==NULL ) goto nlmsg_failure;
@@ -1235,8 +1235,8 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) goto err_unlock; } - err =gtp_genl_fill_info (skb2,NETLINK_CB (skb).portid, - info->snd_seq, info->nlhdr->nlmsg_type, pctx); + err =gtp_genl_fill_info (skb2,NETLINK_CB (skb).portid, info->snd_seq, +0 , info->nlhdr->nlmsg_type, pctx);if (err <0 ) goto err_unlock_free;
@@ -1279,6 +1279,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb,gtp_genl_fill_info (skb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, +NLM_F_MULTI , cb->nlh->nlmsg_type, pctx)) { cb->args[0] = i; cb->args[1 ] = j;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 29/81 HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K12A keyboard-dock
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 1e189f267015a098bdcb82cc652d13fbf2203fa0 ]
Add a HID_QUIRK_NO_INIT_REPORTS quirk for the Dell K12A keyboard-dock, which can be used with various Dell Venue 11 models.
Without this quirk the keyboard/touchpad combo works fine when connected at boot, but when hotplugged 9 out of 10 times it will not work properly. Adding the quirk fixes this.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -1081,6 +1081,7 @@#define USB_DEVICE_ID_SYNAPTICS_LTS2 0x1d10#define USB_DEVICE_ID_SYNAPTICS_HD 0x0ac3#define USB_DEVICE_ID_SYNAPTICS_QUAD_HD 0x1ac3 +#define USB_DEVICE_ID_SYNAPTICS_DELL_K12A 0x2819#define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012 0x2968#define USB_DEVICE_ID_SYNAPTICS_TP_V103 0x5710
drivers/hid/hid-quirks.c +1 -0
@@ -163,6 +163,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS2), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_QUAD_HD), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_TP_V103), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DELL_K12A), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD), HID_QUIRK_BADPAD }, { HID_USB_DEVICE(USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882), HID_QUIRK_NOGET },
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 30/81 ceph: fix double unlock in handle_cap_export()
In reply to Greg Kroah-HartmanFrom: Wu Bo <[email protected]>
[ Upstream commit 4d8e28ff3106b093d98bfd2eceb9b430c70a8758 ]
If the ceph_mdsc_open_export_target_session() return fails, it will do a "goto retry", but the session mutex has already been unlocked. Re-lock the mutex in that case to ensure that we don't unlock it twice.
--- fs/ceph/caps.c | 1 + 1 file changed, 1 insertion(+)
fs/ceph/caps.c +1 -0
@@ -3632,6 +3632,7 @@ retry:WARN_ON (1 ); tsession =NULL ; target =-1 ; +mutex_lock (&session->s_mutex); } goto retry;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 31/81 stmmac: fix pointer check after utilization in stmmac_interrupt
In reply to Greg Kroah-HartmanFrom: Maxim Petrov <[email protected]>
[ Upstream commit f42234ffd531ca6b13d9da02faa60b72eccf8334 ]
The paranoidal pointer check in IRQ handler looks very strange - it really protects us only against bogus drivers which request IRQ line with null pointer dev_id. However, the code fragment is incorrect because the dev pointer is used before the actual check which leads to undefined behavior. Remove the check to avoid confusing people with incorrect code.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -6
@@ -3684,7 +3684,7 @@ static int stmmac_set_features(struct net_device *netdev,/** * stmmac_interrupt - main ISR * @irq: interrupt number. -* @dev_id: to pass the net device pointer. +* @dev_id: to pass the net device pointer (must be valid). * Description: this is the main driver interrupt service routine. * It can call: * o DMA service routine (to manage incoming frame reception and transmission
@@ -3708,11 +3708,6 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)if (priv->irq_wake)pm_wakeup_event (priv->device,0 ); -if (unlikely (!dev)) { -netdev_err (priv->dev,"%s: invalid dev pointer\n" , __func__); -return IRQ_NONE ; - } -/* Check if adapter is up */ if (test_bit (STMMAC_DOWN , &priv->state))return IRQ_HANDLED ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 32/81 USB: core: Fix misleading driver bug report
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
[ Upstream commit ac854131d9844f79e2fdcef67a7707227538d78a ]
The syzbot fuzzer found a race between URB submission to endpoint 0 and device reset. Namely, during the reset we call usb_ep0_reinit() because the characteristics of ep0 may have changed (if the reset follows a firmware update, for example). While usb_ep0_reinit() is running there is a brief period during which the pointers stored in udev->ep_in[0] and udev->ep_out[0] are set to NULL, and if an URB is submitted to ep0 during that period, usb_urb_ep_type_check() will report it as a driver bug. In the absence of those pointers, the routine thinks that the endpoint doesn't exist. The log message looks like this:
------------[ cut here ]------------ usb 2-1: BOGUS urb xfer, pipe 2 != type 2 WARNING: CPU: 0 PID: 9241 at drivers/usb/core/urb.c:478 usb_submit_urb+0x1188/0x1460 drivers/usb/core/urb.c:478
Now, although submitting an URB while the device is being reset is a questionable thing to do, it shouldn't count as a driver bug as severe as submitting an URB for an endpoint that doesn't exist. Indeed, endpoint 0 always exists, even while the device is in its unconfigured state.
To prevent these misleading driver bug reports, this patch updates usb_disable_endpoint() to avoid clearing the ep_in[] and ep_out[] pointers when the endpoint being disabled is ep0. There's no danger of leaving a stale pointer in place, because the usb_host_endpoint structure being pointed to is stored permanently in udev->ep0; it doesn't get deallocated until the entire usb_device structure does.
--- drivers/usb/core/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/core/message.c +2 -2
@@ -1143,11 +1143,11 @@ void usb_disable_endpoint(struct usb_device *dev, unsigned int epaddr,if (usb_endpoint_out (epaddr)) { ep = dev->ep_out[epnum]; -if (reset_hardware) +if (reset_hardware && epnum !=0 ) dev->ep_out[epnum] =NULL ; }else { ep = dev->ep_in[epnum]; -if (reset_hardware) +if (reset_hardware && epnum !=0 ) dev->ep_in[epnum] =NULL ; }if (ep) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 33/81 platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 3bd12da7f50b8bc191fcb3bab1f55c582234df59 ]
asus-nb-wmi does not add any extra functionality on these Asus Transformer books. They have detachable keyboards, so the hotkeys are send through a HID device (and handled by the hid-asus driver) and also the rfkill functionality is not used on these devices.
Besides not adding any extra functionality, initializing the WMI interface on these devices actually has a negative side-effect. For some reason the \_SB.ATKD.INIT() function which asus_wmi_platform_init() calls drives GPO2 (INT33FC:02) pin 8, which is connected to the front facing webcam LED, high and there is no (WMI or other) interface to drive this low again causing the LED to be permanently on, even during suspend.
This commit adds a blacklist of DMI system_ids on which not to load the asus-nb-wmi and adds these Transformer books to this list. This fixes the webcam LED being permanently on under Linux.
--- drivers/platform/x86/asus-nb-wmi.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/platform/x86/asus-nb-wmi.c +24 -0
@@ -517,9 +517,33 @@ static struct asus_wmi_driver asus_nb_wmi_driver = { .detect_quirks = asus_nb_wmi_quirks, }; +static const struct dmi_system_id asus_nb_wmi_blacklist[]__initconst = { + { +/* +* asus-nb-wm adds no functionality. The T100TA has a detachable +* USB kbd, so no hotkeys and it has no WMI rfkill; and loading +* asus-nb-wm causes the camera LED to turn and _stay_ on. +*/ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"T100TA" ), + }, + }, + { +/* The Asus T200TA has the same issue as the T100TA */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"T200TA" ), + }, + }, + {}/* Terminating entry */ +};static int __init asus_nb_wmi_init (void ) { +if (dmi_check_system (asus_nb_wmi_blacklist)) +return -ENODEV ; +return asus_wmi_register_driver (&asus_nb_wmi_driver); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 34/81 ARM: futex: Address build warning
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 8101b5a1531f3390b3a69fa7934c70a8fd6566ad ]
Stephen reported the following build warning on a ARM multi_v7_defconfig build with GCC 9.2.1:
kernel/futex.c: In function 'do_futex':kernel/futex.c:1676:17: warning: 'oldval' may be used uninitialized in this function [-Wmaybe-uninitialized]
1676 | return oldval == cmparg;
| ~~~~~~~^~~~~~~~~
kernel/futex.c:1652:6: note: 'oldval' was declared here
1652 | int oldval, ret;
| ^~~~~~introduced by commit a08971e9488d ("futex: arch_futex_atomic_op_inuser() calling conventions change").
While that change should not make any difference it confuses GCC which fails to work out that oldval is not referenced when the return value is not zero.
GCC fails to properly analyze arch_futex_atomic_op_inuser(). It's not the early return, the issue is with the assembly macros. GCC fails to detect that those either set 'ret' to 0 and set oldval or set 'ret' to -EFAULT which makes oldval uninteresting. The store to the callsite supplied oldval pointer is conditional on ret == 0.
The straight forward way to solve this is to make the store unconditional.
Aside of addressing the build warning this makes sense anyway because it removes the conditional from the fastpath. In the error case the stored value is uninteresting and the extra store does not matter at all.
--- arch/arm/include/asm/futex.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/arm/include/asm/futex.h +7 -2
@@ -163,8 +163,13 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)preempt_enable ();#endif -if (!ret) - *oval = oldval; +/* +* Store unconditionally. If ret != 0 the extra store is the least +* of the worries but GCC cannot figure out that __futex_atomic_op() +* is either setting ret to -EFAULT or storing the old value in +* oldval which results in a uninitialized warning at the call site. +*/ + *oval = oldval;return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 35/81 padata: Replace delayed timer with immediate workqueue in padata_reorder
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 6fc4dbcf0276279d488c5fbbfabe94734134f4fa ]
The function padata_reorder will use a timer when it cannot progress while completed jobs are outstanding (pd->reorder_objects > 0). This is suboptimal as if we do end up using the timer then it would have introduced a gratuitous delay of one second.
In fact we can easily distinguish between whether completed jobs are outstanding and whether we can make progress. All we have to do is look at the next pqueue list.
This patch does that by replacing pd->processed with pd->cpu so that the next pqueue is more accessible.
A work queue is used instead of the original try_again to avoid hogging the CPU.
Note that we don't bother removing the work queue in padata_flush_queues because the whole premise is broken. You cannot flush async crypto requests so it makes no sense to even try. A subsequent patch will fix it by replacing it with a ref counting scheme.
[dj: - adjust context
- corrected setup_timer -> timer_setup to delete hunk
- skip padata_flush_queues() hunk, function already removed in 4.19]
--- include/linux/padata.h | 13 ++---- kernel/padata.c | 95 ++++++++---------------------------------- 2 files changed, 22 insertions(+), 86 deletions(-)
include/linux/padata.h +4 -9
@@ -24,7 +24,6 @@#include <linux/workqueue.h> #include <linux/spinlock.h> #include <linux/list.h> -#include <linux/timer.h> #include <linux/notifier.h> #include <linux/kobject.h>
@@ -85,18 +84,14 @@ struct padata_serial_queue {* @serial: List to wait for serialization after reordering. * @pwork: work struct for parallelization. * @swork: work struct for serialization. -* @pd: Backpointer to the internal control structure. * @work: work struct for parallelization. -* @reorder_work: work struct for reordering. * @num_obj: Number of objects that are processed by this cpu. * @cpu_index: Index of the cpu. */ struct padata_parallel_queue {struct padata_list parallel;struct padata_list reorder; -struct parallel_data *pd;struct work_struct work; -struct work_struct reorder_work;atomic_t num_obj;int cpu_index; };
@@ -122,10 +117,10 @@ struct padata_cpumask {* @reorder_objects: Number of objects waiting in the reorder queues. * @refcnt: Number of objects holding a reference on this parallel_data. * @max_seq_nr: Maximal used sequence number. +* @cpu: Next CPU to be processed. * @cpumask: The cpumasks in use for parallel and serial workers. +* @reorder_work: work struct for reordering. * @lock: Reorder lock. -* @processed: Number of already processed objects. -* @timer: Reorder timer. */ struct parallel_data {struct padata_instance *pinst;
@@ -134,10 +129,10 @@ struct parallel_data {atomic_t reorder_objects;atomic_t refcnt;atomic_t seq_nr; +int cpu;struct padata_cpumask cpumask; +struct work_struct reorder_work;spinlock_t lock____cacheline_aligned ; -unsigned int processed; -struct timer_list timer; };/**
kernel/padata.c +18 -77
191 lines not on this page · raw message
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 36/81 padata: initialize pd->cpu with effective cpumask
In reply to Greg Kroah-HartmanFrom: Daniel Jordan <[email protected]>
[ Upstream commit ec9c7d19336ee98ecba8de80128aa405c45feebb ]
Exercising CPU hotplug on a 5.2 kernel with recent padata fixes from cryptodev-2.6.git in an 8-CPU kvm guest...
# modprobe tcrypt alg="pcrypt(rfc4106(gcm(aes)))" type=3
# echo 0 > /sys/devices/system/cpu/cpu1/online
# echo c > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
# modprobe tcrypt mode=215...caused the following crash:
BUG: kernel NULL pointer dereference, address: 0000000000000000
#PF: supervisor read access in kernel mode
#PF: error_code(0x0000) - not-present page
PGD 0 P4D 0
Oops: 0000 [#1] SMP PTI
CPU: 2 PID: 134 Comm: kworker/2:2 Not tainted 5.2.0-padata-base+ #7
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-<snip>
Workqueue: pencrypt padata_parallel_worker
RIP: 0010:padata_reorder+0xcb/0x180
...
Call Trace:
padata_do_serial+0x57/0x60
pcrypt_aead_enc+0x3a/0x50 [pcrypt]
padata_parallel_worker+0x9b/0xe0
process_one_work+0x1b5/0x3f0
worker_thread+0x4a/0x3c0
...In padata_alloc_pd, pd->cpu is set using the user-supplied cpumask instead of the effective cpumask, and in this case cpumask_first picked an offline CPU.
The offline CPU's reorder->list.next is NULL in padata_reorder because the list wasn't initialized in padata_init_pqueues, which only operates on CPUs in the effective mask.
Fix by using the effective mask in padata_alloc_pd.
--- kernel/padata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/padata.c +1 -1
@@ -451,7 +451,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,atomic_set (&pd->refcnt,1 ); pd->pinst = pinst;spin_lock_init (&pd->lock); - pd->cpu =cpumask_first (pcpumask); + pd->cpu =cpumask_first (pd->cpumask.pcpu);INIT_WORK (&pd->reorder_work, invoke_padata_reorder);return pd;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 37/81 padata: purge get_cpu and reorder_via_wq from padata_do_serial
In reply to Greg Kroah-HartmanFrom: Daniel Jordan <[email protected]>
[ Upstream commit 065cf577135a4977931c7a1e1edf442bfd9773dd ]
With the removal of the padata timer, padata_do_serial no longer needs special CPU handling, so remove it.
--- kernel/padata.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-)
kernel/padata.c +3 -20
@@ -324,24 +324,9 @@ static void padata_serial_worker(struct work_struct *serial_work)*/ void padata_do_serial (struct padata_priv *padata) { -int cpu; -struct padata_parallel_queue *pqueue; -struct parallel_data *pd; -int reorder_via_wq =0 ; - - pd = padata->pd; - - cpu =get_cpu (); - -/* We need to enqueue the padata object into the correct -* per-cpu queue. -*/ -if (cpu != padata->cpu) { - reorder_via_wq =1 ; - cpu = padata->cpu; - } - - pqueue =per_cpu_ptr (pd->pqueue, cpu); +struct parallel_data *pd = padata->pd; +struct padata_parallel_queue *pqueue =per_cpu_ptr (pd->pqueue, + padata->cpu);spin_lock (&pqueue->reorder.lock);list_add_tail (&padata->list, &pqueue->reorder.list);
@@ -355,8 +340,6 @@ void padata_do_serial(struct padata_priv *padata)*/ smp_mb__after_atomic (); -put_cpu (); -padata_reorder (pd); }EXPORT_SYMBOL (padata_do_serial);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 38/81 ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option
In reply to Greg Kroah-HartmanFrom: Scott Bahling <[email protected]>
commit b0cb099062b0c18246c3a20caaab4c0afc303255 upstream.
The ST Audio ADCIII is an STDSP24 card plus extension box. With commit e8a91ae18bdc ("ALSA: ice1712: Add support for STAudio ADCIII") we enabled the ADCIII ports using the model=staudio option but forgot this part to ensure the STDSP24 card is initialized properly.
--- sound/pci/ice1712/ice1712.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/pci/ice1712/ice1712.c +2 -1
@@ -2377,7 +2377,8 @@ static int snd_ice1712_chip_init(structpci_write_config_byte (ice->pci,0x61 , ice->eeprom.data[ICE_EEP1_ACLINK ]);pci_write_config_byte (ice->pci,0x62 , ice->eeprom.data[ICE_EEP1_I2SID ]);pci_write_config_byte (ice->pci,0x63 , ice->eeprom.data[ICE_EEP1_SPDIF ]); -if (ice->eeprom.subvendor !=ICE1712_SUBDEVICE_STDSP24 ) { +if (ice->eeprom.subvendor !=ICE1712_SUBDEVICE_STDSP24 && + ice->eeprom.subvendor !=ICE1712_SUBDEVICE_STAUDIO_ADCIII ) { ice->gpio.write_mask = ice->eeprom.gpiomask; ice->gpio.direction = ice->eeprom.gpiodir; snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,
Greg Kroah-Hartman
maintainerPATCH 39/81 ALSA: pcm: fix incorrect hw_base increase
In reply to Greg Kroah-HartmanFrom: Brent Lu <[email protected]>
commit e7513c5786f8b33f0c107b3759e433bc6cbb2efa upstream.
There is a corner case that ALSA keeps increasing the hw_ptr but DMA already stop working/updating the position for a long time.
In following log we can see the position returned from DMA driver does not move at all but the hw_ptr got increased at some point of time so snd_pcm_avail() will return a large number which seems to be a buffer underrun event from user space program point of view. The program thinks there is space in the buffer and fill more data.
[ 418.510086] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 4096 avail 12368 [ 418.510149] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 6910 avail 9554 ... [ 418.681052] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 15102 avail 1362 [ 418.681130] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 16464 avail 0 [ 418.726515] sound pcmC0D5p: pos 96 hw_ptr 16464 appl_ptr 16464 avail 16368
This is because the hw_base will be increased by runtime->buffer_size frames unconditionally if the hw_ptr is not updated for over half of buffer time. As the hw_base increases, so does the hw_ptr increased by the same number.
The avail value returned from snd_pcm_avail() could exceed the limit (buffer_size) easily becase the hw_ptr itself got increased by same buffer_size samples when the corner case happens. In following log, the buffer_size is 16368 samples but the avail is 21810 samples so CRAS server complains about it.
[ 418.851755] sound pcmC0D5p: pos 96 hw_ptr 16464 appl_ptr 27390 avail 5442 [ 418.926491] sound pcmC0D5p: pos 96 hw_ptr 32832 appl_ptr 27390 avail 21810
cras_server[1907]: pcm_avail returned frames larger than buf_size:
sof-glkda7219max: :0,5: 21810 > 16368
By updating runtime->hw_ptr_jiffies each time the HWSYNC is called, the hw_base will keep the same when buffer stall happens at long as the interval between each HWSYNC call is shorter than half of buffer time.
Following is a log captured by a patched kernel. The hw_base/hw_ptr value is fixed in this corner case and user space program should be aware of the buffer stall and handle it.
[ 293.525543] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 4096 avail 12368 [ 293.525606] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 6880 avail 9584 [ 293.525975] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 10976 avail 5488 [ 293.611178] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 15072 avail 1392 [ 293.696429] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 16464 avail 0 ... [ 381.139517] sound pcmC0D5p: pos 96 hw_ptr 96 appl_ptr 16464 avail 0
--- sound/core/pcm_lib.c | 1 + 1 file changed, 1 insertion(+)
sound/core/pcm_lib.c +1 -0
@@ -438,6 +438,7 @@ static int snd_pcm_update_hw_ptr0(struct no_delta_check:if (runtime->status->hw_ptr == new_hw_ptr) { + runtime->hw_ptr_jiffies = curr_jiffies;update_audio_tstamp (substream, &curr_tstamp, &audio_tstamp);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 40/81 ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Xtreme
In reply to Greg Kroah-HartmanFrom: Christian Lachner <[email protected]>
commit d9e8fe0cffbfdd18de96fa68ee2a8b667a0b046e upstream.
The Gigabyte X570 Aorus Xtreme motherboard with ALC1220 codec requires a similar workaround for Clevo laptops to enforce the DAC/mixer connection path. Set up a quirk entry for that.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -2443,6 +2443,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1458 ,0xa002 ,"Gigabyte EP45-DS3/Z87X-UD3H" ,ALC889_FIXUP_FRONT_HP_NO_PRESENCE ),SND_PCI_QUIRK (0x1458 ,0xa0b8 ,"Gigabyte AZ370-Gaming" ,ALC1220_FIXUP_GB_DUAL_CODECS ),SND_PCI_QUIRK (0x1458 ,0xa0cd ,"Gigabyte X570 Aorus Master" ,ALC1220_FIXUP_CLEVO_P950 ), +SND_PCI_QUIRK (0x1458 ,0xa0ce ,"Gigabyte X570 Aorus Xtreme" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1462 ,0x1228 ,"MSI-GP63" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1462 ,0x1275 ,"MSI-GL63" ,ALC1220_FIXUP_CLEVO_P950 ), SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),
Greg Kroah-Hartman
maintainerPATCH 41/81 ALSA: hda/realtek - Add more fixup entries for Clevo machines
In reply to Greg Kroah-HartmanFrom: PeiSen Hou <[email protected]>
commit 259eb82475316672a5d682a94dc8bdd53cf8d8c3 upstream.
A few known Clevo machines (PC50, PC70, X170) with ALC1220 codec need the existing quirk for pins for PB51 and co.
--- sound/pci/hda/patch_realtek.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/patch_realtek.c +3 -0
@@ -2459,6 +2459,9 @@ static const struct snd_pci_quirk alc882SND_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 (0x1558 ,0x50d3 ,"Clevo PC50[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x70d1 ,"Clevo PC70[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x7714 ,"Clevo X170" ,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 42/81 drm/etnaviv: fix perfmon domain interation
In reply to Greg Kroah-HartmanFrom: Christian Gmeiner <[email protected]>
commit 40b697e256ccdb88aaff424b44b4d300eb8460e8 upstream.
The GC860 has one GPU device which has a 2d and 3d core. In this case we want to expose perfmon information for both cores.
The driver has one array which contains all possible perfmon domains with some meta data - doms_meta. Here we can see that for the GC860 two elements of that array are relevant:
doms_3d: is at index 0 in the doms_meta array with 8 perfmon domains
doms_2d: is at index 1 in the doms_meta array with 1 perfmon domain
The userspace driver wants to get a list of all perfmon domains and their perfmon signals. This is done by iterating over all domains and their signals. If the userspace driver wants to access the domain with id 8 the kernel driver fails and returns invalid data from doms_3d with and invalid offset.
This results in:
Unable to handle kernel paging request at virtual address 00000000
On such a device it is not possible to use the userspace driver at all.
The fix for this off-by-one error is quite simple.
--- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_perfmon.c +1 -1
@@ -453,7 +453,7 @@ static const struct etnaviv_pm_domain *pif (!(gpu->identity.features & meta->feature))continue ; -if (meta->nr_domains < (index - offset)) { +if (index - offset >= meta->nr_domains) { offset += meta->nr_domains;continue ; }
Greg Kroah-Hartman
maintainerPATCH 43/81 apparmor: Fix use-after-free in aa_audit_rule_init
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
commit c54d481d71c6849e044690d3960aaebc730224cc upstream.
In the implementation of aa_audit_rule_init(), when aa_label_parse() fails the allocated memory for rule is released using aa_audit_rule_free(). But after this release, the return statement tries to access the label field of the rule which results in use-after-free. Before releasing the rule, copy errNo and return it after release.
--- security/apparmor/audit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
security/apparmor/audit.c +2 -1
@@ -201,8 +201,9 @@ int aa_audit_rule_init(u32 field, u32 op rule->label =aa_label_parse (&root_ns->unconfined->label, rulestr,GFP_KERNEL , true, false);if (IS_ERR (rule->label)) { +int err =PTR_ERR (rule->label);aa_audit_rule_free (rule); -return PTR_ERR (rule->label); +return err; } *vrule = rule;
Greg Kroah-Hartman
maintainerPATCH 44/81 apparmor: fix potential label refcnt leak in aa_change_profile
In reply to Greg Kroah-HartmanFrom: Xiyu Yang <[email protected]>
commit a0b845ffa0d91855532b50fc040aeb2d8338dca4 upstream.
aa_change_profile() invokes aa_get_current_label(), which returns a reference of the current task's label.
According to the comment of aa_get_current_label(), the returned reference must be put with aa_put_label().
However, when the original object pointed by "label" becomes unreachable because aa_change_profile() returns or a new object is assigned to "label", reference count increased by aa_get_current_label() is not decreased, causing a refcnt leak.
Fix this by calling aa_put_label() before aa_change_profile() return and dropping unnecessary aa_get_current_label().
--- security/apparmor/domain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
security/apparmor/domain.c +1 -2
@@ -1338,6 +1338,7 @@ int aa_change_profile(const char *fqname ctx->nnp =aa_get_label (label);if (!fqname || !*fqname) { +aa_put_label (label);AA_DEBUG ("no profile name" );return -EINVAL ; }
@@ -1356,8 +1357,6 @@ int aa_change_profile(const char *fqname op =OP_CHANGE_PROFILE ; } - label =aa_get_current_label (); -if (*fqname =='&' ) { stack = true;/* don't have label_parse() do stacking */
Greg Kroah-Hartman
maintainerPATCH 45/81 apparmor: Fix aa_label refcnt leak in policy_update
In reply to Greg Kroah-HartmanFrom: Xiyu Yang <[email protected]>
commit c6b39f070722ea9963ffe756bfe94e89218c5e63 upstream.
policy_update() invokes begin_current_label_crit_section(), which returns a reference of the updated aa_label object to "label" with increased refcount.
When policy_update() returns, "label" becomes invalid, so the refcount should be decreased to keep refcount balanced.
The reference counting issue happens in one exception handling path of policy_update(). When aa_may_manage_policy() returns not NULL, the refcnt increased by begin_current_label_crit_section() is not decreased, causing a refcnt leak.
Fix this issue by jumping to "end_section" label when aa_may_manage_policy() returns not NULL.
--- security/apparmor/apparmorfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
security/apparmor/apparmorfs.c +2 -1
@@ -424,7 +424,7 @@ static ssize_t policy_update(u32 mask, c*/ error =aa_may_manage_policy (label, ns, mask);if (error) -return error; + goto end_section; data =aa_simple_write_to_buffer (buf, size, size, pos); error =PTR_ERR (data);
@@ -432,6 +432,7 @@ static ssize_t policy_update(u32 mask, c error =aa_replace_profiles (ns, label, mask, data);aa_put_loaddata (data); } +end_section:end_current_label_crit_section (label);return error;
Greg Kroah-Hartman
maintainerPATCH 46/81 dmaengine: tegra210-adma: Fix an error handling path in tegra_adma_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit 3a5fd0dbd87853f8bd2ea275a5b3b41d6686e761 upstream.
Commit b53611fb1ce9 ("dmaengine: tegra210-adma: Fix crash during probe") has moved some code in the probe function and reordered the error handling path accordingly.
However, a goto has been missed.
Fix it and goto the right label if 'dma_async_device_register()' fails, so that all resources are released.
--- drivers/dma/tegra210-adma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/tegra210-adma.c +1 -1
@@ -793,7 +793,7 @@ static int tegra_adma_probe(struct platf ret =dma_async_device_register (&tdma->dma_dev);if (ret <0 ) {dev_err (&pdev->dev,"ADMA registration failed: %d\n" , ret); - goto irq_dispose; + goto rpm_put; } ret = of_dma_controller_register(pdev->dev.of_node,
Greg Kroah-Hartman
maintainerPATCH 47/81 dmaengine: owl: Use correct lock in owl_dma_get_pchan()
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
commit f8f482deb078389b42768b2193e050a81aae137d upstream.
When the kernel is built with lockdep support and the owl-dma driver is used, the following message is shown:
[ 2.496939] INFO: trying to register non-static key. [ 2.501889] the code is fine but needs lockdep annotation. [ 2.507357] turning off the locking correctness validator. [ 2.512834] CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.6.3+ #15 [ 2.519084] Hardware name: Generic DT based system [ 2.523878] Workqueue: events_freezable mmc_rescan [ 2.528681] [<801127f0>] (unwind_backtrace) from [<8010da58>] (show_stack+0x10/0x14) [ 2.536420] [<8010da58>] (show_stack) from [<8080fbe8>] (dump_stack+0xb4/0xe0) [ 2.543645] [<8080fbe8>] (dump_stack) from [<8017efa4>] (register_lock_class+0x6f0/0x718) [ 2.551816] [<8017efa4>] (register_lock_class) from [<8017b7d0>] (__lock_acquire+0x78/0x25f0) [ 2.560330] [<8017b7d0>] (__lock_acquire) from [<8017e5e4>] (lock_acquire+0xd8/0x1f4) [ 2.568159] [<8017e5e4>] (lock_acquire) from [<80831fb0>] (_raw_spin_lock_irqsave+0x3c/0x50) [ 2.576589] [<80831fb0>] (_raw_spin_lock_irqsave) from [<8051b5fc>] (owl_dma_issue_pending+0xbc/0x120) [ 2.585884] [<8051b5fc>] (owl_dma_issue_pending) from [<80668cbc>] (owl_mmc_request+0x1b0/0x390) [ 2.594655] [<80668cbc>] (owl_mmc_request) from [<80650ce0>] (mmc_start_request+0x94/0xbc) [ 2.602906] [<80650ce0>] (mmc_start_request) from [<80650ec0>] (mmc_wait_for_req+0x64/0xd0) [ 2.611245] [<80650ec0>] (mmc_wait_for_req) from [<8065aa10>] (mmc_app_send_scr+0x10c/0x144) [ 2.619669] [<8065aa10>] (mmc_app_send_scr) from [<80659b3c>] (mmc_sd_setup_card+0x4c/0x318) [ 2.628092] [<80659b3c>] (mmc_sd_setup_card) from [<80659f0c>] (mmc_sd_init_card+0x104/0x430) [ 2.636601] [<80659f0c>] (mmc_sd_init_card) from [<8065a3e0>] (mmc_attach_sd+0xcc/0x16c) [ 2.644678] [<8065a3e0>] (mmc_attach_sd) from [<8065301c>] (mmc_rescan+0x3ac/0x40c) [ 2.652332] [<8065301c>] (mmc_rescan) from [<80143244>] (process_one_work+0x2d8/0x780) [ 2.660239] [<80143244>] (process_one_work) from [<80143730>] (worker_thread+0x44/0x598) [ 2.668323] [<80143730>] (worker_thread) from [<8014b5f8>] (kthread+0x148/0x150) [ 2.675708] [<8014b5f8>] (kthread) from [<801010b4>] (ret_from_fork+0x14/0x20) [ 2.682912] Exception stack(0xee8fdfb0 to 0xee8fdff8) [ 2.687954] dfa0: 00000000 00000000 00000000 00000000 [ 2.696118] dfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 2.704277] dfe0: 00000000 00000000 00000000 00000000 00000013 00000000
The obvious fix would be to use 'spin_lock_init()' on 'pchan->lock' before attempting to call 'spin_lock_irqsave()' in 'owl_dma_get_pchan()'.
However, according to Manivannan Sadhasivam, 'pchan->lock' was supposed to only protect 'pchan->vchan' while 'od->lock' does a similar job in 'owl_dma_terminate_pchan()'.
Therefore, this patch substitutes 'pchan->lock' with 'od->lock' and removes the 'lock' attribute in 'owl_dma_pchan' struct.
--- drivers/dma/owl-dma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/dma/owl-dma.c +3 -5
@@ -172,13 +172,11 @@ struct owl_dma_txd {* @id: physical index to this channel * @base: virtual memory base for the dma channel * @vchan: the virtual channel currently being served by this physical channel -* @lock: a lock to use when altering an instance of this struct */ struct owl_dma_pchan {u32 id;void __iomem *base;struct owl_dma_vchan *vchan; -spinlock_t lock; };/**
@@ -396,14 +394,14 @@ static struct owl_dma_pchan *owl_dma_getfor (i =0 ; i < od->nr_pchans; i++) { pchan = &od->pchans[i]; -spin_lock_irqsave (&pchan->lock, flags); +spin_lock_irqsave (&od->lock, flags);if (!pchan->vchan) { pchan->vchan = vchan; -spin_unlock_irqrestore (&pchan->lock, flags); +spin_unlock_irqrestore (&od->lock, flags);break ; } -spin_unlock_irqrestore (&pchan->lock, flags); +spin_unlock_irqrestore (&od->lock, flags); }return pchan;
Greg Kroah-Hartman
maintainerPATCH 48/81 drm/i915/gvt: Init DPLL/DDI vreg for virtual display instead of inheritance.
In reply to Greg Kroah-HartmanFrom: Colin Xu <[email protected]>
commit f965b68188ab59a40a421ced1b05a2fea638465c upstream.
Init value of some display vregs rea inherited from host pregs. When host display in different status, i.e. all monitors unpluged, different display configurations, etc., GVT virtual display setup don't consistent thus may lead to guest driver consider display goes malfunctional.
The added init vreg values are based on PRMs and fixed by calcuation from current configuration (only PIPE_A) and the virtual EDID.
--- drivers/gpu/drm/i915/gvt/display.c | 49 +++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gvt/display.c +44 -5
@@ -206,14 +206,41 @@ static void emulate_monitor_status_changSKL_FUSE_PG_DIST_STATUS (SKL_PG0 ) |SKL_FUSE_PG_DIST_STATUS (SKL_PG1 ) |SKL_FUSE_PG_DIST_STATUS (SKL_PG2 ); -vgpu_vreg_t (vgpu,LCPLL1_CTL ) |= -LCPLL_PLL_ENABLE | -LCPLL_PLL_LOCK ; -vgpu_vreg_t (vgpu,LCPLL2_CTL ) |=LCPLL_PLL_ENABLE ; - +/* +* Only 1 PIPE enabled in current vGPU display and PIPE_A is +* tied to TRANSCODER_A in HW, so it's safe to assume PIPE_A, +* TRANSCODER_A can be enabled. PORT_x depends on the input of +* setup_virtual_dp_monitor, we can bind DPLL0 to any PORT_x +* so we fixed to DPLL0 here. +* Setup DPLL0: DP link clk 1620 MHz, non SSC, DP Mode +*/ +vgpu_vreg_t (vgpu,DPLL_CTRL1 ) = +DPLL_CTRL1_OVERRIDE (DPLL_ID_SKL_DPLL0 ); +vgpu_vreg_t (vgpu,DPLL_CTRL1 ) |= +DPLL_CTRL1_LINK_RATE (DPLL_CTRL1_LINK_RATE_1620 ,DPLL_ID_SKL_DPLL0 ); +vgpu_vreg_t (vgpu,LCPLL1_CTL ) = +LCPLL_PLL_ENABLE |LCPLL_PLL_LOCK ; +vgpu_vreg_t (vgpu,DPLL_STATUS ) =DPLL_LOCK (DPLL_ID_SKL_DPLL0 ); +/* +* Golden M/N are calculated based on: +* 24 bpp, 4 lanes, 154000 pixel clk (from virtual EDID), +* DP link clk 1620 MHz and non-constant_n. +* TODO: calculate DP link symbol clk and stream clk m/n. +*/ +vgpu_vreg_t (vgpu,PIPE_DATA_M1 (TRANSCODER_A )) =63 <<TU_SIZE_SHIFT ; +vgpu_vreg_t (vgpu,PIPE_DATA_M1 (TRANSCODER_A )) |=0x5b425e ; +vgpu_vreg_t (vgpu,PIPE_DATA_N1 (TRANSCODER_A )) =0x800000 ; +vgpu_vreg_t (vgpu,PIPE_LINK_M1 (TRANSCODER_A )) =0x3cd6e ; +vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ; }if (intel_vgpu_has_monitor_on_port (vgpu,PORT_B )) { +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) &= + ~DPLL_CTRL2_DDI_CLK_OFF (PORT_B ); +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |= +DPLL_CTRL2_DDI_CLK_SEL (DPLL_ID_SKL_DPLL0 ,PORT_B ); +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |= +DPLL_CTRL2_DDI_SEL_OVERRIDE (PORT_B );vgpu_vreg_t (vgpu,SFUSE_STRAP ) |=SFUSE_STRAP_DDIB_DETECTED ; vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &= ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
@@ -234,6 +261,12 @@ static void emulate_monitor_status_chang }if (intel_vgpu_has_monitor_on_port (vgpu,PORT_C )) { +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) &= + ~DPLL_CTRL2_DDI_CLK_OFF (PORT_C ); +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |= +DPLL_CTRL2_DDI_CLK_SEL (DPLL_ID_SKL_DPLL0 ,PORT_C ); +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |= +DPLL_CTRL2_DDI_SEL_OVERRIDE (PORT_C );vgpu_vreg_t (vgpu,SDEISR ) |=SDE_PORTC_HOTPLUG_CPT ; vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &= ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
@@ -254,6 +287,12 @@ static void emulate_monitor_status_chang }if (intel_vgpu_has_monitor_on_port (vgpu,PORT_D )) { +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) &= + ~DPLL_CTRL2_DDI_CLK_OFF (PORT_D ); +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |= +DPLL_CTRL2_DDI_CLK_SEL (DPLL_ID_SKL_DPLL0 ,PORT_D ); +vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |= +DPLL_CTRL2_DDI_SEL_OVERRIDE (PORT_D );vgpu_vreg_t (vgpu,SDEISR ) |=SDE_PORTD_HOTPLUG_CPT ; vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &= ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
Greg Kroah-Hartman
maintainerPATCH 49/81 powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE
In reply to Greg Kroah-HartmanFrom: Russell Currey <[email protected]>
[ Upstream commit c55d7b5e64265fdca45c85b639013e770bde2d0e ]
I have tested this with the Radix MMU and everything seems to work, and the previous patch for Hash seems to fix everything too. STRICT_KERNEL_RWX should still be disabled by default for now.
Please test STRICT_KERNEL_RWX + RELOCATABLE!
--- arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/Kconfig +1 -1
@@ -139,7 +139,7 @@ config PPC select ARCH_HAS_MEMBARRIER_CALLBACKS select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE select ARCH_HAS_SG_CHAIN - select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION) + select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION) select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UACCESS_FLUSHCACHE if PPC64 select ARCH_HAS_UBSAN_SANITIZE_ALL
Signature · 1 line
2.25.1
Re: [PATCH 4.19 49/81] powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE
Quoted 9 lines · Greg Kroah-Hartman
From: Russell Currey <[email protected]>
[ Upstream commit
c55d7b5e64265fdca45c85b639013e770bde2d0e]I have tested this with the Radix MMU and everything seems to work, and the previous patch for Hash seems to fix everything too.
STRICT_KERNEL_RWXshould still be disabled by default for now.Please test
STRICT_KERNEL_RWX+ RELOCATABLE!
I don't believe this is suitable for -stable. Yes, it is needed for the next patch, but doing the merge is right solution this time.
Best regards,
Pavel
Quoted 10 lines
+++ b/arch/powerpc/Kconfig
arch/powerpc/Kconfig +1
-1@@ -139,7 +139,7 @@ config PPC select ARCH_HAS_MEMBARRIER_CALLBACKS select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE select ARCH_HAS_SG_CHAIN - select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION) + select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION) select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UACCESS_FLUSHCACHE if PPC64 select ARCH_HAS_UBSAN_SANITIZE_ALL
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 49/81] powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE
Quoted 5 lines · Pavel Machek
Quoted 4 lines · Greg Kroah-Hartman
From: Russell Currey <[email protected]>
[ Upstream commit
c55d7b5e64265fdca45c85b639013e770bde2d0e]
Quoted 8 lines
Quoted 5 lines
I have tested this with the Radix MMU and everything seems to work, and the previous patch for Hash seems to fix everything too.
STRICT_KERNEL_RWXshould still be disabled by default for now.Please test
STRICT_KERNEL_RWX+ RELOCATABLE!I don't believe this is suitable for -stable. Yes, it is needed for the next patch, but doing the merge is right solution this time.
Why? It's always best to keep things as they are in Linus's tree if at all possible.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 50/81 powerpc/64s: Disable STRICT_KERNEL_RWX
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 8659a0e0efdd975c73355dbc033f79ba3b31e82c ]
Several strange crashes have been eventually traced back to STRICT_KERNEL_RWX and its interaction with code patching.
Various paths in our ftrace, kprobes and other patching code need to be hardened against patching failures, otherwise we can end up running with partially/incorrectly patched ftrace paths, kprobes or jump labels, which can then cause strange crashes.
Although fixes for those are in development, they're not -rc material.
There also seem to be problems with the underlying strict RWX logic, which needs further debugging.
So for now disable STRICT_KERNEL_RWX on 64-bit to prevent people from enabling the option and tripping over the bugs.
--- arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/Kconfig +1 -1
@@ -139,7 +139,7 @@ config PPC select ARCH_HAS_MEMBARRIER_CALLBACKS select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE select ARCH_HAS_SG_CHAIN - select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION) + select ARCH_HAS_STRICT_KERNEL_RWX if (PPC32 && !HIBERNATION) select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UACCESS_FLUSHCACHE if PPC64 select ARCH_HAS_UBSAN_SANITIZE_ALL
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 51/81 nfit: Add Hyper-V NVDIMM DSM command set to white list
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
[ Upstream commit 1194c4133195dfcb6c5fc0935d54bbed872a5285 ]
Add the Hyper-V _DSM command set to the white list of NVDIMM command sets.
This command set is documented at http://www.uefi.org/RFIC_LIST
(see "Virtual NVDIMM 0x1901").
--- drivers/acpi/nfit/core.c | 17 ++++++++++++++--- drivers/acpi/nfit/nfit.h | 6 +++++- include/uapi/linux/ndctl.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-)
drivers/acpi/nfit/core.c +14 -3
@@ -1773,9 +1773,17 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc,dev_set_drvdata (&adev_dimm->dev, nfit_mem);/* -* Until standardization materializes we need to consider 4 -* different command sets. Note, that checking for function0 (bit0) -* tells us if any commands are reachable through this GUID. +* There are 4 "legacy" NVDIMM command sets +* (NVDIMM_FAMILY_{INTEL,MSFT,HPE1,HPE2}) that were created before +* an EFI working group was established to constrain this +* proliferation. The nfit driver probes for the supported command +* set by GUID. Note, if you're a platform developer looking to add +* a new command set to this probe, consider using an existing set, +* or otherwise seek approval to publish the command set at +* http://www.uefi.org/RFIC_LIST. +* +* Note, that checking for function0 (bit0) tells us if any commands +* are reachable through this GUID. */ for (i =0 ; i <=NVDIMM_FAMILY_MAX ; i++)if (acpi_check_dsm (adev_dimm->handle,to_nfit_uuid (i),1 ,1 ))
@@ -1798,6 +1806,8 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, dsm_mask &= ~(1 <<8 ); }else if (nfit_mem->family ==NVDIMM_FAMILY_MSFT ) { dsm_mask =0xffffffff ; + }else if (nfit_mem->family ==NVDIMM_FAMILY_HYPERV ) { + dsm_mask =0x1f ; }else {dev_dbg (dev,"unknown dimm command family\n" ); nfit_mem->family =-1 ;
@@ -3622,6 +3632,7 @@ static __init int nfit_init(void)guid_parse (UUID_NFIT_DIMM_N_HPE1 , &nfit_uuid[NFIT_DEV_DIMM_N_HPE1 ]);guid_parse (UUID_NFIT_DIMM_N_HPE2 , &nfit_uuid[NFIT_DEV_DIMM_N_HPE2 ]);guid_parse (UUID_NFIT_DIMM_N_MSFT , &nfit_uuid[NFIT_DEV_DIMM_N_MSFT ]); +guid_parse (UUID_NFIT_DIMM_N_HYPERV , &nfit_uuid[NFIT_DEV_DIMM_N_HYPERV ]); nfit_wq =create_singlethread_workqueue ("nfit" );if (!nfit_wq)
drivers/acpi/nfit/nfit.h +5 -1
@@ -34,11 +34,14 @@/* https://msdn.microsoft.com/library/windows/hardware/mt604741 */ #define UUID_NFIT_DIMM_N_MSFT "1ee68b36-d4bd-4a1a-9a16-4f8e53d46e05" +/* http://www.uefi.org/RFIC_LIST (see "Virtual NVDIMM 0x1901") */ +#define UUID_NFIT_DIMM_N_HYPERV "5746c5f2-a9a2-4264-ad0e-e4ddc9e09e80" +#define ACPI_NFIT_MEM_FAILED_MASK (ACPI_NFIT_MEM_SAVE_FAILED \ | ACPI_NFIT_MEM_RESTORE_FAILED | ACPI_NFIT_MEM_FLUSH_FAILED \ | ACPI_NFIT_MEM_NOT_ARMED | ACPI_NFIT_MEM_MAP_FAILED) -#define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_MSFT +#define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_HYPERV#define NVDIMM_STANDARD_CMDMASK \ (1 << ND_CMD_SMART | 1 << ND_CMD_SMART_THRESHOLD | 1 << ND_CMD_DIMM_FLAGS \
@@ -75,6 +78,7 @@ enum nfit_uuids {NFIT_DEV_DIMM_N_HPE1 =NVDIMM_FAMILY_HPE1 ,NFIT_DEV_DIMM_N_HPE2 =NVDIMM_FAMILY_HPE2 ,NFIT_DEV_DIMM_N_MSFT =NVDIMM_FAMILY_MSFT , +NFIT_DEV_DIMM_N_HYPERV =NVDIMM_FAMILY_HYPERV ,NFIT_SPA_VOLATILE ,NFIT_SPA_PM , NFIT_SPA_DCR,
include/uapi/linux/ndctl.h +1 -0
@@ -247,6 +247,7 @@ struct nd_cmd_pkg {#define NVDIMM_FAMILY_HPE1 1#define NVDIMM_FAMILY_HPE2 2#define NVDIMM_FAMILY_MSFT 3 +#define NVDIMM_FAMILY_HYPERV 4#define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\ struct nd_cmd_pkg)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 52/81 libnvdimm/btt: Remove unnecessary code in btt_freelist_init
In reply to Greg Kroah-HartmanFrom: Vishal Verma <[email protected]>
[ Upstream commit 2f8c9011151337d0bc106693f272f9bddbccfab2 ]
We call btt_log_read() twice, once to get the 'old' log entry, and again to get the 'new' entry. However, we have no use for the 'old' entry, so remove it.
--- drivers/nvdimm/btt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/nvdimm/btt.c +2 -6
@@ -541,9 +541,9 @@ static int arena_clear_freelist_error(struct arena_info *arena, u32 lane)static int btt_freelist_init (struct arena_info *arena) { -int old, new, ret; +int new, ret;u32 i, map_entry; -struct log_entry log_new, log_old; +struct log_entry log_new; arena->freelist =kcalloc (arena->nfree,sizeof (struct free_entry ),GFP_KERNEL );
@@ -551,10 +551,6 @@ static int btt_freelist_init(struct arena_info *arena)return -ENOMEM ;for (i =0 ; i < arena->nfree; i++) { - old =btt_log_read (arena, i, &log_old,LOG_OLD_ENT ); -if (old <0 ) -return old; - new =btt_log_read (arena, i, &log_new,LOG_NEW_ENT );if (new <0 )return new;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 53/81 libnvdimm/btt: Fix LBA masking during free list population
In reply to Greg Kroah-HartmanFrom: Vishal Verma <[email protected]>
[ Upstream commit 9dedc73a4658ebcc0c9b58c3cb84e9ac80122213 ]
The Linux BTT implementation assumes that log entries will never have the 'zero' flag set, and indeed it never sets that flag for log entries itself.
However, the UEFI spec is ambiguous on the exact format of the LBA field of a log entry, specifically as to whether it should include the additional flag bits or not. While a zero bit doesn't make sense in the context of a log entry, other BTT implementations might still have it set.
If an implementation does happen to have it set, we would happily read it in as the next block to write to for writes. Since a high bit is set, it pushes the block number out of the range of an 'arena', and we fail such a write with an EIO.
Follow the robustness principle, and tolerate such implementations by stripping out the zero flag when populating the free list during initialization. Additionally, use the same stripped out entries for detection of incomplete writes and map restoration that happens at this stage.
Add a sysfs file 'log_zero_flags' that indicates the ability to accept such a layout to userspace applications. This enables 'ndctl check-namespace' to recognize whether the kernel is able to handle zero flags, or whether it should attempt a fix-up under the --repair option.
--- drivers/nvdimm/btt.c | 25 +++++++++++++++++++------ drivers/nvdimm/btt.h | 2 ++ drivers/nvdimm/btt_devs.c | 8 ++++++++ 3 files changed, 29 insertions(+), 6 deletions(-)
drivers/nvdimm/btt.c +19 -6
@@ -542,8 +542,8 @@ static int arena_clear_freelist_error(struct arena_info *arena, u32 lane)static int btt_freelist_init (struct arena_info *arena) {int new, ret; -u32 i, map_entry;struct log_entry log_new; +u32 i, map_entry, log_oldmap, log_newmap; arena->freelist =kcalloc (arena->nfree,sizeof (struct free_entry ),GFP_KERNEL );
@@ -555,16 +555,22 @@ static int btt_freelist_init(struct arena_info *arena)if (new <0 )return new; +/* old and new map entries with any flags stripped out */ + log_oldmap =ent_lba (le32_to_cpu (log_new.old_map)); + log_newmap =ent_lba (le32_to_cpu (log_new.new_map)); +/* sub points to the next one to be overwritten */ arena->freelist[i].sub =1 - new; arena->freelist[i].seq =nd_inc_seq (le32_to_cpu (log_new.seq)); - arena->freelist[i].block =le32_to_cpu (log_new.old_map); + arena->freelist[i].block = log_oldmap;/* * FIXME: if error clearing fails during init, we want to make * the BTT read-only */ -if (ent_e_flag (log_new.old_map)) { +if (ent_e_flag (log_new.old_map) && + !ent_normal (log_new.old_map)) { + arena->freelist[i].has_err =1 ; ret =arena_clear_freelist_error (arena, i);if (ret) dev_err_ratelimited(to_dev(arena),
@@ -572,7 +578,7 @@ static int btt_freelist_init(struct arena_info *arena) }/* This implies a newly created or untouched flog entry */ -if (log_new.old_map == log_new.new_map) +if (log_oldmap == log_newmap)continue ;/* Check if map recovery is needed */
@@ -580,8 +586,15 @@ static int btt_freelist_init(struct arena_info *arena) NULL, NULL, 0);if (ret)return ret; -if ((le32_to_cpu (log_new.new_map) != map_entry) && - (le32_to_cpu (log_new.old_map) == map_entry)) { + +/* +* The map_entry from btt_read_map is stripped of any flag bits, +* so use the stripped out versions from the log as well for +* testing whether recovery is needed. For restoration, use the +* 'raw' version of the log entries as that captured what we +* were going to write originally. +*/ +if ((log_newmap != map_entry) && (log_oldmap == map_entry)) {/* * Last transaction wrote the flog, but wasn't able * to complete the map write. So fix up the map.
drivers/nvdimm/btt.h +2 -0
@@ -44,6 +44,8 @@#define ent_e_flag (ent) (!!(ent & MAP_ERR_MASK))#define ent_z_flag (ent) (!!(ent & MAP_TRIM_MASK))#define set_e_flag (ent) (ent |= MAP_ERR_MASK) +/* 'normal' is both e and z flags set */ +#define ent_normal (ent) (ent_e_flag(ent) && ent_z_flag(ent))enum btt_init_state {INIT_UNCHECKED =0 ,
drivers/nvdimm/btt_devs.c +8 -0
@@ -159,11 +159,19 @@ static ssize_t size_show(struct device *dev, }static DEVICE_ATTR_RO (size); +static ssize_t log_zero_flags_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +return sprintf (buf,"Y\n" ); +} +static DEVICE_ATTR_RO (log_zero_flags); +static struct attribute *nd_btt_attributes[] = { &dev_attr_sector_size.attr, &dev_attr_namespace.attr, &dev_attr_uuid.attr, &dev_attr_size.attr, + &dev_attr_log_zero_flags.attr,NULL , };
Signature · 1 line
2.25.1
Re: [PATCH 4.19 53/81] libnvdimm/btt: Fix LBA masking during free list population
Hi!
Quoted 11 lines
If an implementation does happen to have it set, we would happily read it in as the next block to write to for writes. Since a high bit is set, it pushes the block number out of the range of an 'arena', and we fail such a write with an EIO.
Follow the robustness principle, and tolerate such implementations by stripping out the zero flag when populating the free list during initialization. Additionally, use the same stripped out entries for detection of incomplete writes and map restoration that happens at this stage.
Quoted 5 lines
Add a sysfs file '
log_zero_flags' that indicates the ability to accept such a layout to userspace applications. This enables 'ndctl check-namespace' to recognize whether the kernel is able to handle zero flags, or whether it should attempt a fix-up under the --repair option.
Ok, so new /sys file is added; but that should have entry in Documentation/ and that one is not there AFAICT. (Not in -linus, so I assume not in -stable, either).
Best regards,
Pavel
Quoted 116 lines
Cc Dan Williams <[email protected]>Reported-by Dexuan Cui <[email protected]>Tested-by Dexuan Cui <[email protected]>Signed-off-by Vishal Verma <[email protected]>Signed-off-by Dan Williams <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/nvdimm/btt.c | 25 +++++++++++++++++++------ drivers/nvdimm/btt.h | 2 ++ drivers/nvdimm/btt_devs.c | 8 ++++++++ 3 files changed, 29 insertions(+), 6 deletions(-)drivers/nvdimm/btt.c +19
-6@@ -542,8 +542,8 @@ static int arena_clear_freelist_error(struct arena_info *arena, u32 lane)static int btt_freelist_init (struct arena_info *arena) {int new, ret; -u32 i, map_entry;struct log_entry log_new; +u32 i, map_entry, log_oldmap, log_newmap; arena->freelist =kcalloc (arena->nfree,sizeof (struct free_entry ),GFP_KERNEL );@@ -555,16 +555,22 @@ static int btt_freelist_init(struct arena_info *arena)if (new <0 )return new; +/* old and new map entries with any flags stripped out */ + log_oldmap =ent_lba (le32_to_cpu (log_new.old_map)); + log_newmap =ent_lba (le32_to_cpu (log_new.new_map)); +/* sub points to the next one to be overwritten */ arena->freelist[i].sub =1 - new; arena->freelist[i].seq =nd_inc_seq (le32_to_cpu (log_new.seq)); - arena->freelist[i].block =le32_to_cpu (log_new.old_map); + arena->freelist[i].block = log_oldmap;/* * FIXME: if error clearing fails during init, we want to make * the BTT read-only */ -if (ent_e_flag (log_new.old_map)) { +if (ent_e_flag (log_new.old_map) && + !ent_normal (log_new.old_map)) { + arena->freelist[i].has_err =1 ; ret =arena_clear_freelist_error (arena, i);if (ret) dev_err_ratelimited(to_dev(arena),@@ -572,7 +578,7 @@ static int btt_freelist_init(struct arena_info *arena) }/* This implies a newly created or untouched flog entry */ -if (log_new.old_map == log_new.new_map) +if (log_oldmap == log_newmap)continue ;/* Check if map recovery is needed */ @@ -580,8 +586,15 @@ static int btt_freelist_init(struct arena_info *arena) NULL, NULL, 0);if (ret)return ret; -if ((le32_to_cpu (log_new.new_map) != map_entry) && - (le32_to_cpu (log_new.old_map) == map_entry)) { + +/* +* The map_entry from btt_read_map is stripped of any flag bits, +* so use the stripped out versions from the log as well for +* testing whether recovery is needed. For restoration, use the +* 'raw' version of the log entries as that captured what we +* were going to write originally. +*/ +if ((log_newmap != map_entry) && (log_oldmap == map_entry)) {/* * Last transaction wrote the flog, but wasn't able * to complete the map write. So fix up the map. drivers/nvdimm/btt.h +2
-0@@ -44,6 +44,8 @@#define ent_e_flag (ent) (!!(ent & MAP_ERR_MASK))#define ent_z_flag (ent) (!!(ent & MAP_TRIM_MASK))#define set_e_flag (ent) (ent |= MAP_ERR_MASK) +/* 'normal' is both e and z flags set */ +#define ent_normal (ent) (ent_e_flag(ent) && ent_z_flag(ent))enum btt_init_state {INIT_UNCHECKED =0 ,drivers/nvdimm/btt_devs.c +8
-0@@ -159,11 +159,19 @@ static ssize_t size_show(struct device *dev, }static DEVICE_ATTR_RO (size); +static ssize_t log_zero_flags_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +return sprintf (buf,"Y\n" ); +} +static DEVICE_ATTR_RO (log_zero_flags); +static struct attribute *nd_btt_attributes[] = { &dev_attr_sector_size.attr, &dev_attr_namespace.attr, &dev_attr_uuid.attr, &dev_attr_size.attr, + &dev_attr_log_zero_flags.attr,NULL , };
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 54/81 staging: most: core: replace strcpy() by strscpy()
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 3970d0d81816310175b6272e709ee09dd3e05171 ]
The strcpy() function is being deprecated. Replace it by the safer strscpy() and fix the following Coverity warning:
"You might overrun the 80-character fixed-size string iface->p->name by copying iface->description without checking the length."
Addresses-Coverity-ID: 1444760 ("Copy into fixed size buffer")
--- drivers/staging/most/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/most/core.c +1 -1
@@ -1412,7 +1412,7 @@ int most_register_interface(struct most_interface *iface)INIT_LIST_HEAD (&iface->p->channel_list); iface->p->dev_id = id; -strcpy (iface->p->name, iface->description); +strscpy (iface->p->name, iface->description,sizeof (iface->p->name)); iface->dev.init_name = iface->p->name; iface->dev.bus = &mc.bus; iface->dev.parent = &mc.dev;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 55/81 thunderbolt: Drop duplicated get_switch_at_route()
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
[ Upstream commit 8f965efd215a09c20b0b5e5bb4e20009a954472e ]
tb_switch_find_by_route() does the same already so use it instead and remove duplicated get_switch_at_route().
--- drivers/thunderbolt/icm.c | 12 ++++++++---- drivers/thunderbolt/switch.c | 18 ------------------ drivers/thunderbolt/tb.c | 9 ++++++--- drivers/thunderbolt/tb.h | 1 - 4 files changed, 14 insertions(+), 26 deletions(-)
drivers/thunderbolt/icm.c +8 -4
@@ -801,9 +801,11 @@ icm_fr_xdomain_connected(struct tb *tb, const struct icm_pkg_header *hdr)* connected another host to the same port, remove the switch * first. */ - sw =get_switch_at_route (tb->root_switch, route); -if (sw) + sw =tb_switch_find_by_route (tb, route); +if (sw) {remove_switch (sw); +tb_switch_put (sw); + } sw =tb_switch_find_by_link_depth (tb, link, depth);if (!sw) {
@@ -1146,9 +1148,11 @@ icm_tr_xdomain_connected(struct tb *tb, const struct icm_pkg_header *hdr)* connected another host to the same port, remove the switch * first. */ - sw =get_switch_at_route (tb->root_switch, route); -if (sw) + sw =tb_switch_find_by_route (tb, route); +if (sw) {remove_switch (sw); +tb_switch_put (sw); + } sw =tb_switch_find_by_route (tb,get_parent_route (route));if (!sw) {
drivers/thunderbolt/switch.c +0 -18
@@ -664,24 +664,6 @@ int tb_switch_reset(struct tb *tb, u64 route)return res.err; } -struct tb_switch *get_switch_at_route (struct tb_switch *sw,u64 route) -{ -u8 next_port = route;/* -* Routes use a stride of 8 bits, -* eventhough a port index has 6 bits at most. -* */ -if (route ==0 ) -return sw; -if (next_port > sw->config.max_port_number) -return NULL ; -if (tb_is_upstream_port (&sw->ports[next_port])) -return NULL ; -if (!sw->ports[next_port].remote) -return NULL ; -return get_switch_at_route (sw->ports[next_port].remote->sw, - route >>TB_ROUTE_SHIFT ); -} -/** * tb_plug_events_active() - enable/disable plug events on a switch *
drivers/thunderbolt/tb.c +6 -3
@@ -258,7 +258,7 @@ static void tb_handle_hotplug(struct work_struct *work)if (!tcm->hotplug_active) goto out;/* during init, suspend or shutdown */ - sw =get_switch_at_route (tb->root_switch, ev->route); + sw =tb_switch_find_by_route (tb, ev->route);if (!sw) { tb_warn(tb, "hotplug event from non existent switch %llx:%x (unplug: %d)\n",
@@ -269,14 +269,14 @@ static void tb_handle_hotplug(struct work_struct *work)tb_warn (tb,"hotplug event from non existent port %llx:%x (unplug: %d)\n" , ev->route, ev->port, ev->unplug); - goto out; + goto put_sw; } port = &sw->ports[ev->port];if (tb_is_upstream_port (port)) {tb_warn (tb,"hotplug event for upstream port %llx:%x (unplug: %d)\n" , ev->route, ev->port, ev->unplug); - goto out; + goto put_sw; }if (ev->unplug) {if (port->remote) {
@@ -306,6 +306,9 @@ static void tb_handle_hotplug(struct work_struct *work)tb_activate_pcie_devices (tb); } } + +put_sw: +tb_switch_put (sw); out:mutex_unlock (&tb->lock);kfree (ev);
drivers/thunderbolt/tb.h +0 -1
@@ -397,7 +397,6 @@ void tb_switch_suspend(struct tb_switch *sw);int tb_switch_resume (struct tb_switch *sw);int tb_switch_reset (struct tb *tb,u64 route);void tb_sw_set_unplugged (struct tb_switch *sw); -struct tb_switch *get_switch_at_route (struct tb_switch *sw,u64 route);struct tb_switch *tb_switch_find_by_link_depth (struct tb *tb,u8 link,u8 depth);struct tb_switch *tb_switch_find_by_uuid (struct tb *tb,const uuid_t *uuid);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 56/81 media: fdp1: Fix R-Car M3-N naming in debug message
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit c05b9d7b9f3ece2831e4e4829f10e904df296df8 ]
The official name is "R-Car M3-N", not "R-Car M3N".
--- drivers/media/platform/rcar_fdp1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/rcar_fdp1.c +1 -1
@@ -2368,7 +2368,7 @@ static int fdp1_probe(struct platform_dedprintk (fdp1,"FDP1 Version R-Car H3\n" );break ;case FD1_IP_M3N : -dprintk (fdp1,"FDP1 Version R-Car M3N\n" ); +dprintk (fdp1,"FDP1 Version R-Car M3-N\n" );break ;case FD1_IP_E3 :dprintk (fdp1,"FDP1 Version R-Car E3\n" );
Greg Kroah-Hartman
maintainerPATCH 57/81 Revert "net/ibmvnic: Fix EOI when running in XIVE mode"
In reply to Greg Kroah-HartmanFrom: Juliet Kim <[email protected]>
[ Upstream commit 284f87d2f3871247d08a2b6a24466ae905079913 ]
This reverts commit 11d49ce9f7946dfed4dcf5dbde865c78058b50ab (“net/ibmvnic: Fix EOI when running in XIVE mode.”) since that has the unintended effect of changing the interrupt priority and emits warning when running in legacy XICS mode.
--- drivers/net/ethernet/ibm/ibmvnic.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +5 -3
@@ -2731,10 +2731,12 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter,if (adapter->resetting && adapter->reset_reason ==VNIC_RESET_MOBILITY ) { -struct irq_desc *desc =irq_to_desc (scrq->irq); -struct irq_chip *chip =irq_desc_get_chip (desc); +u64 val = (0xff000000 ) | scrq->hw_irq; - chip->irq_eoi (&desc->irq_data); + rc =plpar_hcall_norets (H_EOI , val); +if (rc) +dev_err (dev,"H_EOI FAILED irq 0x%llx. rc=%ld\n" , + val, rc); } rc = plpar_hcall_norets(H_VIOCTL, adapter->vdev->unit_address,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 58/81 net: bcmgenet: code movement
In reply to Greg Kroah-HartmanFrom: Doug Berger <[email protected]>
[ Upstream commit a94cbf03eb514d4d64d8c4f4caa0616b7ce5040a ]
This commit switches the order of bcmgenet_suspend and bcmgenet_resume in the file to prevent the need for a forward declaration in the next commit and to make the review of that commit easier.
--- .../net/ethernet/broadcom/genet/bcmgenet.c | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +30 -30
@@ -3616,36 +3616,6 @@ static int bcmgenet_remove(struct platform_device *pdev) }#ifdef CONFIG_PM_SLEEP -static int bcmgenet_suspend (struct device *d) -{ -struct net_device *dev =dev_get_drvdata (d); -struct bcmgenet_priv *priv =netdev_priv (dev); -int ret =0 ; - -if (!netif_running (dev)) -return 0 ; - -netif_device_detach (dev); - -bcmgenet_netif_stop (dev); - -if (!device_may_wakeup (d)) -phy_suspend (dev->phydev); - -/* Prepare the device for Wake-on-LAN and switch to the slow clock */ -if (device_may_wakeup (d) && priv->wolopts) { - ret =bcmgenet_power_down (priv,GENET_POWER_WOL_MAGIC ); -clk_prepare_enable (priv->clk_wol); - }else if (priv->internal_phy) { - ret =bcmgenet_power_down (priv,GENET_POWER_PASSIVE ); - } - -/* Turn off the clocks */ -clk_disable_unprepare (priv->clk); - -return ret; -} -static int bcmgenet_resume (struct device *d) {struct net_device *dev =dev_get_drvdata (d);
@@ -3724,6 +3694,36 @@ static int bcmgenet_resume(struct device *d)clk_disable_unprepare (priv->clk);return ret; } + +static int bcmgenet_suspend (struct device *d) +{ +struct net_device *dev =dev_get_drvdata (d); +struct bcmgenet_priv *priv =netdev_priv (dev); +int ret =0 ; + +if (!netif_running (dev)) +return 0 ; + +netif_device_detach (dev); + +bcmgenet_netif_stop (dev); + +if (!device_may_wakeup (d)) +phy_suspend (dev->phydev); + +/* Prepare the device for Wake-on-LAN and switch to the slow clock */ +if (device_may_wakeup (d) && priv->wolopts) { + ret =bcmgenet_power_down (priv,GENET_POWER_WOL_MAGIC ); +clk_prepare_enable (priv->clk_wol); + }else if (priv->internal_phy) { + ret =bcmgenet_power_down (priv,GENET_POWER_PASSIVE ); + } + +/* Turn off the clocks */ +clk_disable_unprepare (priv->clk); + +return ret; +}#endif /* CONFIG_PM_SLEEP */ static SIMPLE_DEV_PM_OPS(bcmgenet_pm_ops, bcmgenet_suspend, bcmgenet_resume);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 59/81 net: bcmgenet: abort suspend on error
In reply to Greg Kroah-HartmanFrom: Doug Berger <[email protected]>
[ Upstream commit c5a54bbcececa36852807c36157a86d808b62310 ]
If an error occurs during suspension of the driver the driver should restore the hardware configuration and return an error to force the system to resume.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +++ drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 ++++++ 2 files changed, 9 insertions(+)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +3 -0
@@ -3722,6 +3722,9 @@ static int bcmgenet_suspend(struct device *d)/* Turn off the clocks */ clk_disable_unprepare (priv->clk); +if (ret) +bcmgenet_resume (d); + return ret; }#endif /* CONFIG_PM_SLEEP */
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c +6 -0
@@ -186,9 +186,15 @@ void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv, } reg =bcmgenet_umac_readl (priv,UMAC_MPD_CTRL ); +if (!(reg &MPD_EN )) +return ;/* already powered up so skip the rest */ reg &= ~MPD_EN ;bcmgenet_umac_writel (priv, reg,UMAC_MPD_CTRL ); + reg =bcmgenet_hfb_reg_readl (priv,HFB_CTRL ); + reg &= ~(RBUF_HFB_EN |RBUF_ACPI_EN ); +bcmgenet_hfb_reg_writel (priv, reg,HFB_CTRL ); +/* Disable CRC Forward */ reg =bcmgenet_umac_readl (priv,UMAC_CMD ); reg &= ~CMD_CRC_FWD ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 60/81 cxgb4: free mac_hlist properly
In reply to Greg Kroah-HartmanFrom: Arjun Vynipadath <[email protected]>
[ Upstream commit 2a8d84bf513823ba398f4b2dec41b8decf4041af ]
The locally maintained list for tracking hash mac table was not freed during driver remove.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +8 -0
@@ -2296,6 +2296,8 @@ static int cxgb_up(struct adapter *adap)static void cxgb_down (struct adapter *adapter) { +struct hash_mac_addr *entry, *tmp; +cancel_work_sync (&adapter->tid_release_task);cancel_work_sync (&adapter->db_full_task);cancel_work_sync (&adapter->db_drop_task);
@@ -2304,6 +2306,12 @@ static void cxgb_down(struct adapter *adapter)t4_sge_stop (adapter);t4_free_sge_resources (adapter); + +list_for_each_entry_safe (entry, tmp, &adapter->mac_hlist, list) { +list_del (&entry->list); +kfree (entry); + } + adapter->flags &= ~FULL_INIT_DONE ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 61/81 cxgb4/cxgb4vf: Fix mac_hlist initialization and free
In reply to Greg Kroah-HartmanFrom: Arjun Vynipadath <[email protected]>
[ Upstream commit b539ea60f5043b9acd7562f04fa2117f18776cbb ]
Null pointer dereference seen when cxgb4vf driver is unloaded without bringing up any interfaces, moving mac_hlist initialization to driver probe and free the mac_hlist in remove to fix the issue.
--- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 19 ++++++++++--------- .../ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +10 -9
@@ -2281,8 +2281,6 @@ static int cxgb_up(struct adapter *adap)#if IS_ENABLED (CONFIG_IPV6 )update_clip (adap);#endif -/* Initialize hash mac addr list*/ -INIT_LIST_HEAD (&adap->mac_hlist);return err; irq_err:
@@ -2296,8 +2294,6 @@ static int cxgb_up(struct adapter *adap)static void cxgb_down (struct adapter *adapter) { -struct hash_mac_addr *entry, *tmp; -cancel_work_sync (&adapter->tid_release_task);cancel_work_sync (&adapter->db_full_task);cancel_work_sync (&adapter->db_drop_task);
@@ -2307,11 +2303,6 @@ static void cxgb_down(struct adapter *adapter)t4_sge_stop (adapter);t4_free_sge_resources (adapter); -list_for_each_entry_safe (entry, tmp, &adapter->mac_hlist, list) { -list_del (&entry->list); -kfree (entry); - } - adapter->flags &= ~FULL_INIT_DONE ; }
@@ -5610,6 +5601,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) (is_t5 (adapter->params.chip) ?STATMODE_V (0 ) : T6_STATMODE_V(0))); +/* Initialize hash mac addr list */ +INIT_LIST_HEAD (&adapter->mac_hlist); +for_each_port (adapter, i) { netdev =alloc_etherdev_mq (sizeof (struct port_info ),MAX_ETH_QSETS );
@@ -5884,6 +5878,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)static void remove_one (struct pci_dev *pdev) {struct adapter *adapter =pci_get_drvdata (pdev); +struct hash_mac_addr *entry, *tmp;if (!adapter) {pci_release_regions (pdev);
@@ -5931,6 +5926,12 @@ static void remove_one(struct pci_dev *pdev)if (adapter->num_uld || adapter->num_ofld_uld)t4_uld_mem_free (adapter);free_some_resources (adapter); +list_for_each_entry_safe (entry, tmp, &adapter->mac_hlist, + list) { +list_del (&entry->list); +kfree (entry); + } +#if IS_ENABLED (CONFIG_IPV6 )t4_cleanup_clip_tbl (adapter);#endif
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +3 -3
@@ -723,9 +723,6 @@ static int adapter_up(struct adapter *adapter)if (adapter->flags &USING_MSIX )name_msix_vecs (adapter); -/* Initialize hash mac addr list*/ -INIT_LIST_HEAD (&adapter->mac_hlist); - adapter->flags |=FULL_INIT_DONE ; }
@@ -3038,6 +3035,9 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,if (err) goto err_unmap_bar; +/* Initialize hash mac addr list */ +INIT_LIST_HEAD (&adapter->mac_hlist); +/* * Allocate our "adapter ports" and stitch everything together. */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 62/81 tty: serial: qcom_geni_serial: Fix wrap around of TX buffer
In reply to Greg Kroah-HartmanFrom: Matthias Kaehlcke <[email protected]>
[ Upstream commit 3c66eb4ba18dd1cab0d1bde651cde6d8bdb47696 ]
Before commit a1fee899e5bed ("tty: serial: qcom_geni_serial: Fix softlock") the size of TX transfers was limited to the TX FIFO size, and wrap arounds of the UART circular buffer were split into two transfers. With the commit wrap around are allowed within a transfer. The TX FIFO of the geni serial port uses a word size of 4 bytes. In case of a circular buffer wrap within a transfer the driver currently may write an incomplete word to the FIFO, with some bytes containing data from the circular buffer and others being zero. Since the transfer isn't completed yet the zero bytes are sent as if they were actual data.
Handle wrap arounds of the TX buffer properly and ensure that words written to the TX FIFO always contain valid data (unless the transfer is completed).
--- drivers/tty/serial/qcom_geni_serial.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +7 -5
@@ -705,7 +705,7 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, avail *= port->tx_bytes_pw; tail = xmit->tail; - chunk =min3 (avail, pending, (size_t )(UART_XMIT_SIZE - tail)); + chunk =min (avail, pending);if (!chunk) goto out_write_wakeup;
@@ -727,19 +727,21 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done,memset (buf,0 ,ARRAY_SIZE (buf)); tx_bytes =min_t (size_t, remaining, port->tx_bytes_pw); -for (c =0 ; c < tx_bytes ; c++) - buf[c] = xmit->buf[tail + c]; + +for (c =0 ; c < tx_bytes ; c++) { + buf[c] = xmit->buf[tail++]; + tail &=UART_XMIT_SIZE -1 ; + }iowrite32_rep (uport->membase + SE_GENI_TX_FIFOn, buf,1 ); i += tx_bytes; - tail += tx_bytes; uport->icount.tx += tx_bytes; remaining -= tx_bytes; port->tx_remaining -= tx_bytes; } - xmit->tail = tail & (UART_XMIT_SIZE -1 ); + xmit->tail = tail;/* * The tx fifo watermark is level triggered and latched. Though we had
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 63/81 brcmfmac: abort and release host after error
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 863844ee3bd38219c88e82966d1df36a77716f3e ]
With commit 216b44000ada ("brcmfmac: Fix use after free in brcmf_sdio_readframes()") applied, we see locking timeouts in brcmf_sdio_watchdog_thread().
brcmfmac: brcmf_escan_timeout: timer expired
INFO: task brcmf_wdog/mmc1:621 blocked for more than 120 seconds.
Not tainted 4.19.94-07984-g24ff99a0f713 #1
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
brcmf_wdog/mmc1 D 0 621 2 0x00000000 last_sleep: 2440793077. last_runnable: 2440766827
[<c0aa1e60>] (__schedule) from [<c0aa2100>] (schedule+0x98/0xc4)
[<c0aa2100>] (schedule) from [<c0853830>] (__mmc_claim_host+0x154/0x274)
[<c0853830>] (__mmc_claim_host) from [<bf10c5b8>] (brcmf_sdio_watchdog_thread+0x1b0/0x1f8 [brcmfmac]) [<bf10c5b8>] (brcmf_sdio_watchdog_thread [brcmfmac]) from [<c02570b8>] (kthread+0x178/0x180)
In addition to restarting or exiting the loop, it is also necessary to abort the command and to release the host.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +2 -0
@@ -1933,6 +1933,8 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)if (brcmf_sdio_hdparse (bus, bus->rxhdr, &rd_new,BRCMF_SDIO_FT_NORMAL )) { rd->len =0 ; +brcmf_sdio_rxfail (bus, true, true); +sdio_release_host (bus->sdiodev->func1);brcmu_pkt_buf_free_skb (pkt);continue ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 64/81 Revert "gfs2: Dont demote a glock until its revokes are written"
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
[ Upstream commit b14c94908b1b884276a6608dea3d0b1b510338b7 ]
This reverts commit df5db5f9ee112e76b5202fbc331f990a0fc316d6.
This patch fixes a regression: patch df5db5f9ee112 allowed function run_queue() to bypass its call to do_xmote() if revokes were queued for the glock. That's wrong because its call to do_xmote() is what is responsible for calling the go_sync() glops functions to sync both the ail list and any revokes queued for it. By bypassing the call, gfs2 could get into a stand-off where the glock could not be demoted until its revokes are written back, but the revokes would not be written back because do_xmote() was never called.
It "sort of" works, however, because there are other mechanisms like the log flush daemon (logd) that can sync the ail items and revokes, if it deems it necessary. The problem is: without file system pressure, it might never deem it necessary.
--- fs/gfs2/glock.c | 3 --- 1 file changed, 3 deletions(-)
fs/gfs2/glock.c +0 -3
@@ -636,9 +636,6 @@ __acquires(&gl->gl_lockref.lock) goto out_unlock;if (nonblock) goto out_sched; -smp_mb (); -if (atomic_read (&gl->gl_revokes) !=0 ) - goto out_sched;set_bit (GLF_DEMOTE_IN_PROGRESS , &gl->gl_flags);GLOCK_BUG_ON (gl, gl->gl_demote_state ==LM_ST_EXCLUSIVE ); gl->gl_target = gl->gl_demote_state;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 65/81 staging: iio: ad2s1210: Fix SPI reading
In reply to Greg Kroah-HartmanFrom: Dragos Bogdan <[email protected]>
commit 5e4f99a6b788047b0b8a7496c2e0c8f372f6edf2 upstream.
If the serial interface is used, the 8-bit address should be latched using the rising edge of the WR/FSYNC signal.
This basically means that a CS change is required between the first byte sent, and the second one.
This change splits the single-transfer transfer of 2 bytes into 2 transfers with a single byte, and CS change in-between.
Note fixes tag is not accurate, but reflects a point beyond which there are too many refactors to make backporting straight forward.
--- drivers/staging/iio/resolver/ad2s1210.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/staging/iio/resolver/ad2s1210.c +12 -5
@@ -114,17 +114,24 @@ static int ad2s1210_config_write(structstatic int ad2s1210_config_read (struct ad2s1210_state *st,unsigned char address) { -struct spi_transfer xfer = { - .len =2 , - .rx_buf = st->rx, - .tx_buf = st->tx, +struct spi_transfer xfers[] = { + { + .len =1 , + .rx_buf = &st->rx[0 ], + .tx_buf = &st->tx[0 ], + .cs_change =1 , + }, { + .len =1 , + .rx_buf = &st->rx[1 ], + .tx_buf = &st->tx[1 ], + }, };int ret =0 ;ad2s1210_set_mode (MOD_CONFIG , st); st->tx[0 ] = address |AD2S1210_MSB_IS_HIGH ; st->tx[1 ] =AD2S1210_REG_FAULT ; - ret =spi_sync_transfer (st->sdev, &xfer,1 ); + ret =spi_sync_transfer (st->sdev, xfers,2 );if (ret <0 )return ret;
Greg Kroah-Hartman
maintainerPATCH 66/81 staging: greybus: Fix uninitialized scalar variable
In reply to Greg Kroah-HartmanFrom: Oscar Carter <[email protected]>
commit 34625c1931f8204c234c532b446b9f53c69f4b68 upstream.
In the "gb_tty_set_termios" function the "newline" variable is declared but not initialized. So the "flow_control" member is not initialized and the OR / AND operations with itself results in an undefined value in this member.
The purpose of the code is to set the flow control type, so remove the OR / AND self operator and set the value directly.
Addresses-Coverity-ID: 1374016 ("Uninitialized scalar variable")
--- drivers/staging/greybus/uart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/greybus/uart.c +2 -2
@@ -537,9 +537,9 @@ static void gb_tty_set_termios(struct tt }if (C_CRTSCTS (tty) &&C_BAUD (tty) !=B0 ) - newline.flow_control |=GB_SERIAL_AUTO_RTSCTS_EN ; + newline.flow_control =GB_SERIAL_AUTO_RTSCTS_EN ;else - newline.flow_control &= ~GB_SERIAL_AUTO_RTSCTS_EN ; + newline.flow_control =0 ;if (memcmp (&gb_tty->line_coding, &newline,sizeof (newline))) {memcpy (&gb_tty->line_coding, &newline,sizeof (newline));
Greg Kroah-Hartman
maintainerPATCH 67/81 iio: sca3000: Remove an erroneous get_device()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit 928edefbc18cd8433f7df235c6e09a9306e7d580 upstream.
This looks really unusual to have a 'get_device()' hidden in a 'dev_err()' call.
Remove it.
While at it add a missing \n at the end of the message.
--- drivers/iio/accel/sca3000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/accel/sca3000.c +1 -1
@@ -982,7 +982,7 @@ static int sca3000_read_data(struct sca3 st->tx[0 ] =SCA3000_READ_REG (reg_address_high); ret =spi_sync_transfer (st->us, xfer,ARRAY_SIZE (xfer));if (ret) { -dev_err (get_device (&st->us->dev),"problem reading register" ); +dev_err (&st->us->dev,"problem reading register\n" );return ret; }
Greg Kroah-Hartman
maintainerPATCH 68/81 iio: dac: vf610: Fix an error handling path in vf610_dac_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit aad4742fbf0a560c25827adb58695a4497ffc204 upstream.
A call to 'vf610_dac_exit()' is missing in an error handling path.
--- drivers/iio/dac/vf610_dac.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/dac/vf610_dac.c +1 -0
@@ -234,6 +234,7 @@ static int vf610_dac_probe(struct platforeturn 0 ; error_iio_device_register: +vf610_dac_exit (info);clk_disable_unprepare (info->clk);return ret;
Greg Kroah-Hartman
maintainerPATCH 69/81 misc: rtsx: Add short delay after exit from ASPM
In reply to Greg Kroah-HartmanFrom: Klaus Doth <[email protected]>
commit 7a839dbab1be59f5ed3b3b046de29e166784c9b4 upstream.
DMA transfers to and from the SD card stall for 10 seconds and run into timeout on RTS5260 card readers after ASPM was enabled.
Adding a short msleep after disabling ASPM fixes the issue on several Dell Precision 7530/7540 systems I tested.
This function is only called when waking up after the chip went into power-save after not transferring data for a few seconds. The added msleep does therefore not change anything in data transfer speed or induce any excessive waiting while data transfers are running, or the chip is sleeping. Only the transition from sleep to active is affected.
--- drivers/misc/cardreader/rtsx_pcr.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/misc/cardreader/rtsx_pcr.c +3 -0
@@ -155,6 +155,9 @@ static void rtsx_comm_pm_full_on(structrtsx_disable_aspm (pcr); +/* Fixes DMA transfer timout issue after disabling ASPM on RTS5260 */ +msleep (1 ); +if (option->ltr_enabled)rtsx_set_ltr_latency (pcr, option->ltr_active_latency);
Re: [PATCH 4.19 69/81] misc: rtsx: Add short delay after exit from ASPM
Hi!
drivers/misc/cardreader/rtsx_pcr.c static void rtsx_comm_pm_full_on(struct · line 160
Quoted 13 lines
Signed-off-by Klaus Doth <[email protected]>Cc stable <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>+++
b/drivers/misc/cardreader/rtsx_pcr.cdrivers/misc/cardreader/rtsx_pcr.c +3
-0@@ -155,6 +155,9 @@ static void rtsx_comm_pm_full_on(structrtsx_disable_aspm (pcr); +/* Fixes DMA transfer timout issue after disabling ASPM on RTS5260 */ +msleep (1 ); +
There's typo in comment, should be "timeout".
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 70/81 mei: release me_cl object reference
In reply to Greg Kroah-HartmanFrom: Alexander Usyskin <[email protected]>
commit fc9c03ce30f79b71807961bfcb42be191af79873 upstream.
Allow me_cl object to be freed by releasing the reference that was acquired by one of the search functions:__mei_me_cl_by_uuid_id() or __mei_me_cl_by_uuid()
--- drivers/misc/mei/client.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/mei/client.c +2 -0
@@ -276,6 +276,7 @@ void mei_me_cl_rm_by_uuid(struct mei_devdown_write (&dev->me_clients_rwsem); me_cl =__mei_me_cl_by_uuid (dev, uuid);__mei_me_cl_del (dev, me_cl); +mei_me_cl_put (me_cl);up_write (&dev->me_clients_rwsem); }
@@ -297,6 +298,7 @@ void mei_me_cl_rm_by_uuid_id(struct mei_down_write (&dev->me_clients_rwsem); me_cl =__mei_me_cl_by_uuid_id (dev, uuid, id);__mei_me_cl_del (dev, me_cl); +mei_me_cl_put (me_cl);up_write (&dev->me_clients_rwsem); }
Greg Kroah-Hartman
maintainerPATCH 71/81 ipack: tpci200: fix error return code in tpci200_register()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
commit 133317479f0324f6faaf797c4f5f3e9b1b36ce35 upstream.
Fix to return negative error code -ENOMEM from the ioremap() error handling case instead of 0, as done elsewhere in this function.
--- drivers/ipack/carriers/tpci200.c | 1 + 1 file changed, 1 insertion(+)
drivers/ipack/carriers/tpci200.c +1 -0
@@ -309,6 +309,7 @@ static int tpci200_register(struct tpci2"(bn 0x%X, sn 0x%X) failed to map driver user space!" , tpci200->info->pdev->bus->number, tpci200->info->pdev->devfn); + res = -ENOMEM ; goto out_release_mem8_space; }
Greg Kroah-Hartman
maintainerPATCH 72/81 rapidio: fix an error in get_user_pages_fast() error handling
In reply to Greg Kroah-HartmanFrom: John Hubbard <[email protected]>
commit ffca476a0a8d26de767cc41d62b8ca7f540ecfdd upstream.
In the case of get_user_pages_fast() returning fewer pages than requested, rio_dma_transfer() does not quite do the right thing. It attempts to release all the pages that were requested, rather than just the pages that were pinned.
Fix the error handling so that only the pages that were successfully pinned are released.
--- drivers/rapidio/devices/rio_mport_cdev.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/rapidio/devices/rio_mport_cdev.c +5 -0
@@ -879,6 +879,11 @@ rio_dma_transfer(struct file *filp, u32rmcd_error ("pinned %ld out of %ld pages" , pinned, nr_pages); ret = -EFAULT ; +/* +* Set nr_pages up to mean "how many pages to unpin, in +* the error handler: +*/ + nr_pages = pinned; goto err_pg; }
Greg Kroah-Hartman
maintainerPATCH 73/81 rxrpc: Fix a memory leak in rxkad_verify_response()
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
commit f45d01f4f30b53c3a0a1c6c1c154acb7ff74ab9f upstream.
A ticket was not released after a call of the function "rxkad_decrypt_ticket" failed. Thus replace the jump target "temporary_error_free_resp" by "temporary_error_free_ticket".
--- net/rxrpc/rxkad.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/rxrpc/rxkad.c +1 -2
@@ -1118,7 +1118,7 @@ static int rxkad_verify_response(struct ret =rxkad_decrypt_ticket (conn, skb, ticket, ticket_len, &session_key, &expiry, _abort_code);if (ret <0 ) - goto temporary_error_free_resp; + goto temporary_error_free_ticket;/* use the session key from inside the ticket to decrypt the * response */
@@ -1200,7 +1200,6 @@ protocol_error: temporary_error_free_ticket:kfree (ticket); -temporary_error_free_resp:kfree (response); temporary_error:/* Ignore the response packet if we got a temporary error such as
Greg Kroah-Hartman
maintainerPATCH 74/81 x86/unwind/orc: Fix unwind_get_return_address_ptr() for inactive tasks
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
commit 187b96db5ca79423618dfa29a05c438c34f9e1f0 upstream.
Normally, show_trace_log_lvl() scans the stack, looking for text addresses to print. In parallel, it unwinds the stack with unwind_next_frame(). If the stack address matches the pointer returned by unwind_get_return_address_ptr() for the current frame, the text address is printed normally without a question mark. Otherwise it's considered a breadcrumb (potentially from a previous call path) and it's printed with a question mark to indicate that the address is unreliable and typically can be ignored.
Since the following commit:
f1d9a2abff66 ("x86/unwind/orc: Don't skip the first frame for inactive tasks")
... for inactive tasks, show_trace_log_lvl() prints *only* unreliable addresses (prepended with '?').
That happens because, for the first frame of an inactive task, unwind_get_return_address_ptr() returns the wrong return address
pointer: one word *below* the task stack pointer. show_trace_log_lvl() starts scanning at the stack pointer itself, so it never finds the first 'reliable' address, causing only guesses to being printed.
The first frame of an inactive task isn't a normal stack frame. It's actually just an instance of 'struct inactive_task_frame' which is left behind by __switch_to_asm(). Now that this inactive frame is actually exposed to callers, fix unwind_get_return_address_ptr() to interpret it properly.
--- arch/x86/kernel/unwind_orc.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kernel/unwind_orc.c +7 -0
@@ -300,12 +300,19 @@ EXPORT_SYMBOL_GPL(unwind_get_return_addrunsigned long *unwind_get_return_address_ptr (struct unwind_state *state) { +struct task_struct *task = state->task; +if (unwind_done (state))return NULL ;if (state->regs)return &state->regs->ip; +if (task != current && state->sp == task->thread.sp) { +struct inactive_task_frame *frame = (void *)task->thread.sp; +return &frame->ret_addr; + } +if (state->sp)return (unsigned long *)state->sp -1 ;
Greg Kroah-Hartman
maintainerPATCH 75/81 iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel()
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit 735404b846dffcb320264f62b76e6f70012214dd ]
dma_request_slave_channel() is a wrapper on top of dma_request_chan() eating up the error code.
By using dma_request_chan() directly the driver can support deferred probing against DMA.
--- drivers/iio/adc/stm32-adc.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/iio/adc/stm32-adc.c +14 -2
@@ -1688,9 +1688,21 @@ static int stm32_adc_dma_request(struct iio_dev *indio_dev)struct dma_slave_config config;int ret; - adc->dma_chan =dma_request_slave_channel (&indio_dev->dev,"rx" ); -if (!adc->dma_chan) + adc->dma_chan =dma_request_chan (&indio_dev->dev,"rx" ); +if (IS_ERR (adc->dma_chan)) { + ret =PTR_ERR (adc->dma_chan); +if (ret != -ENODEV ) { +if (ret != -EPROBE_DEFER ) +dev_err (&indio_dev->dev, +"DMA channel request failed with %d\n" , + ret); +return ret; + } + +/* DMA is optional: fall back to IRQ mode */ + adc->dma_chan =NULL ;return 0 ; + } adc->rx_buf = dma_alloc_coherent(adc->dma_chan->device->dev, STM32_DMA_BUFFER_SIZE,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 76/81 iio: adc: stm32-adc: fix device used to request dma
In reply to Greg Kroah-HartmanFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit 52cd91c27f3908b88e8b25aed4a4d20660abcc45 ]
DMA channel request should use device struct from platform device struct. Currently it's using iio device struct. But at this stage when probing, device struct isn't yet registered (e.g. device_register is done in iio_device_register). Since commit 71723a96b8b1 ("dmaengine: Create symlinks between DMA channels and slaves"), a warning message is printed as the links in sysfs can't be created, due to device isn't yet registered:
- Cannot create DMA slave symlink
- Cannot create DMA dma:rx symlink
Fix this by using device struct from platform device to request dma chan.
--- drivers/iio/adc/stm32-adc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/adc/stm32-adc.c +4 -4
@@ -1682,18 +1682,18 @@ static int stm32_adc_chan_of_init(struct iio_dev *indio_dev)return 0 ; } -static int stm32_adc_dma_request (struct iio_dev *indio_dev) +static int stm32_adc_dma_request (struct device *dev,struct iio_dev *indio_dev) {struct stm32_adc *adc =iio_priv (indio_dev);struct dma_slave_config config;int ret; - adc->dma_chan =dma_request_chan (&indio_dev->dev,"rx" ); + adc->dma_chan =dma_request_chan (dev,"rx" );if (IS_ERR (adc->dma_chan)) { ret =PTR_ERR (adc->dma_chan);if (ret != -ENODEV ) {if (ret != -EPROBE_DEFER ) -dev_err (&indio_dev->dev, +dev_err (dev,"DMA channel request failed with %d\n" , ret);return ret;
@@ -1816,7 +1816,7 @@ static int stm32_adc_probe(struct platform_device *pdev)if (ret <0 ) goto err_clk_disable; - ret =stm32_adc_dma_request (indio_dev); + ret =stm32_adc_dma_request (dev, indio_dev);if (ret <0 ) goto err_clk_disable;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 77/81 iio: adc: stm32-dfsdm: Use dma_request_chan() instead dma_request_slave_channel()
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit a9ab624edd9186fbad734cfe5d606a6da3ca34db ]
dma_request_slave_channel() is a wrapper on top of dma_request_chan() eating up the error code.
By using dma_request_chan() directly the driver can support deferred probing against DMA.
--- drivers/iio/adc/stm32-dfsdm-adc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/adc/stm32-dfsdm-adc.c +7 -3
@@ -933,9 +933,13 @@ static int stm32_dfsdm_dma_request(struct iio_dev *indio_dev) };int ret; - adc->dma_chan =dma_request_slave_channel (&indio_dev->dev,"rx" ); -if (!adc->dma_chan) -return -EINVAL ; + adc->dma_chan =dma_request_chan (&indio_dev->dev,"rx" ); +if (IS_ERR (adc->dma_chan)) { +int ret =PTR_ERR (adc->dma_chan); + + adc->dma_chan =NULL ; +return ret; + } adc->rx_buf = dma_alloc_coherent(adc->dma_chan->device->dev, DFSDM_DMA_BUFFER_SIZE,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 78/81 iio: adc: stm32-dfsdm: fix device used to request dma
In reply to Greg Kroah-HartmanFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit b455d06e6fb3c035711e8aab1ca18082ccb15d87 ]
DMA channel request should use device struct from platform device struct. Currently it's using iio device struct. But at this stage when probing, device struct isn't yet registered (e.g. device_register is done in iio_device_register). Since commit 71723a96b8b1 ("dmaengine: Create symlinks between DMA channels and slaves"), a warning message is printed as the links in sysfs can't be created, due to device isn't yet registered:
- Cannot create DMA slave symlink
- Cannot create DMA dma:rx symlink
Fix this by using device struct from platform device to request dma chan.
--- drivers/iio/adc/stm32-dfsdm-adc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/iio/adc/stm32-dfsdm-adc.c +8 -7
@@ -45,7 +45,7 @@ enum sd_converter_type {struct stm32_dfsdm_dev_data {int type; -int (*init)(struct iio_dev *indio_dev); +int (*init)(struct device *dev,struct iio_dev *indio_dev);unsigned int num_channels;const struct regmap_config *regmap_cfg; };
@@ -923,7 +923,8 @@ static void stm32_dfsdm_dma_release(struct iio_dev *indio_dev) } } -static int stm32_dfsdm_dma_request (struct iio_dev *indio_dev) +static int stm32_dfsdm_dma_request (struct device *dev, +struct iio_dev *indio_dev) {struct stm32_dfsdm_adc *adc =iio_priv (indio_dev);struct dma_slave_config config = {
@@ -933,7 +934,7 @@ static int stm32_dfsdm_dma_request(struct iio_dev *indio_dev) };int ret; - adc->dma_chan =dma_request_chan (&indio_dev->dev,"rx" ); + adc->dma_chan =dma_request_chan (dev,"rx" );if (IS_ERR (adc->dma_chan)) {int ret =PTR_ERR (adc->dma_chan);
@@ -997,7 +998,7 @@ static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev, &adc->dfsdm->ch_list[ch->channel]); } -static int stm32_dfsdm_audio_init (struct iio_dev *indio_dev) +static int stm32_dfsdm_audio_init (struct device *dev,struct iio_dev *indio_dev) {struct iio_chan_spec *ch;struct stm32_dfsdm_adc *adc =iio_priv (indio_dev);
@@ -1027,10 +1028,10 @@ static int stm32_dfsdm_audio_init(struct iio_dev *indio_dev) indio_dev->num_channels =1 ; indio_dev->channels = ch; -return stm32_dfsdm_dma_request (indio_dev); +return stm32_dfsdm_dma_request (dev, indio_dev); } -static int stm32_dfsdm_adc_init (struct iio_dev *indio_dev) +static int stm32_dfsdm_adc_init (struct device *dev,struct iio_dev *indio_dev) {struct iio_chan_spec *ch;struct stm32_dfsdm_adc *adc =iio_priv (indio_dev);
@@ -1174,7 +1175,7 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev) adc->dfsdm->fl_list[adc->fl_id].sync_mode = val; adc->dev_data = dev_data; - ret = dev_data->init (iio); + ret = dev_data->init (dev, iio);if (ret <0 )return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 79/81 rxrpc: Trace discarded ACKs
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit d1f129470e6cb79b8b97fecd12689f6eb49e27fe ]
Add a tracepoint to track received ACKs that are discarded due to being outside of the Tx window.
--- include/trace/events/rxrpc.h | 35 +++++++++++++++++++++++++++++++++++ net/rxrpc/input.c | 12 ++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-)
include/trace/events/rxrpc.h +35 -0
@@ -1549,6 +1549,41 @@ TRACE_EVENT(rxrpc_notify_socket, __entry->serial) ); +TRACE_EVENT (rxrpc_rx_discard_ack, + TP_PROTO(unsigned int debug_id, rxrpc_serial_t serial, + rxrpc_seq_t first_soft_ack, rxrpc_seq_t call_ackr_first, + rxrpc_seq_t prev_pkt, rxrpc_seq_t call_ackr_prev), + +TP_ARGS (debug_id, serial, first_soft_ack, call_ackr_first, + prev_pkt, call_ackr_prev), + +TP_STRUCT__entry ( + __field(unsigned int, debug_id ) + __field(rxrpc_serial_t, serial ) + __field(rxrpc_seq_t, first_soft_ack) + __field(rxrpc_seq_t, call_ackr_first) + __field(rxrpc_seq_t, prev_pkt) +__field (rxrpc_seq_t, call_ackr_prev) + ), + +TP_fast_assign ( + __entry->debug_id = debug_id; + __entry->serial = serial; + __entry->first_soft_ack = first_soft_ack; + __entry->call_ackr_first = call_ackr_first; + __entry->prev_pkt = prev_pkt; + __entry->call_ackr_prev = call_ackr_prev; + ), + +TP_printk ("c=%08x r=%08x %08x<%08x %08x<%08x" , + __entry->debug_id, + __entry->serial, + __entry->first_soft_ack, + __entry->call_ackr_first, + __entry->prev_pkt, + __entry->call_ackr_prev) + ); +#endif /* _TRACE_RXRPC_H */ /* This part must be outside protection */
net/rxrpc/input.c +10 -2
@@ -879,8 +879,12 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb,/* Discard any out-of-order or duplicate ACKs (outside lock). */ if (before (first_soft_ack, call->ackr_first_seq) || -before (prev_pkt, call->ackr_prev_seq)) +before (prev_pkt, call->ackr_prev_seq)) { +trace_rxrpc_rx_discard_ack (call->debug_id, sp->hdr.serial, + first_soft_ack, call->ackr_first_seq, + prev_pkt, call->ackr_prev_seq);return ; + } buf.info.rxMTU =0 ; ioffset = offset + nr_acks +3 ;
@@ -892,8 +896,12 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb,/* Discard any out-of-order or duplicate ACKs (inside lock). */ if (before (first_soft_ack, call->ackr_first_seq) || -before (prev_pkt, call->ackr_prev_seq)) +before (prev_pkt, call->ackr_prev_seq)) { +trace_rxrpc_rx_discard_ack (call->debug_id, sp->hdr.serial, + first_soft_ack, call->ackr_first_seq, + prev_pkt, call->ackr_prev_seq); goto out; + } call->acks_latest_ts = skb->tstamp; call->acks_latest = sp->hdr.serial;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 80/81 rxrpc: Fix ack discard
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 441fdee1eaf050ef0040bde0d7af075c1c6a6d8b ]
The Rx protocol has a "previousPacket" field in it that is not handled in the same way by all protocol implementations. Sometimes it contains the serial number of the last DATA packet received, sometimes the sequence number of the last DATA packet received and sometimes the highest sequence number so far received.
AF_RXRPC is using this to weed out ACKs that are out of date (it's possible for ACK packets to get reordered on the wire), but this does not work with OpenAFS which will just stick the sequence number of the last packet seen into previousPacket.
The issue being seen is that big AFS FS.StoreData RPC (eg. of ~256MiB) are timing out when partly sent. A trace was captured, with an additional tracepoint to show ACKs being discarded in rxrpc_input_ack(). Here's an excerpt showing the problem.
52873.203230: rxrpc_tx_data: c=000004ae DATA ed1a3584:00000002 0002449c q=00024499 fl=09
A DATA packet with sequence number 00024499 has been transmitted (the "q=" field).
...
52873.243296: rxrpc_rx_ack: c=000004ae 00012a2b DLY r=00024499 f=00024497 p=00024496 n=0 52873.243376: rxrpc_rx_ack: c=000004ae 00012a2c IDL r=0002449b f=00024499 p=00024498 n=0 52873.243383: rxrpc_rx_ack: c=000004ae 00012a2d OOS r=0002449d f=00024499 p=0002449a n=2
The Out-Of-Sequence ACK indicates that the server didn't see DATA sequence number 00024499, but did see seq 0002449a (previousPacket, shown as "p=", skipped the number, but firstPacket, "f=", which shows the bottom of the window is set at that point).
52873.252663: rxrpc_retransmit: c=000004ae q=24499 a=02 xp=14581537
52873.252664: rxrpc_tx_data: c=000004ae DATA ed1a3584:00000002 000244bc q=00024499 fl=0b *RETRANS*
The packet has been retransmitted. Retransmission recurs until the peer says it got the packet.
52873.271013: rxrpc_rx_ack: c=000004ae 00012a31 OOS r=000244a1 f=00024499 p=0002449e n=6
More OOS ACKs indicate that the other packets that are already in the transmission pipeline are being received. The specific-ACK list is up to 6 ACKs and NAKs.
...
52873.284792: rxrpc_rx_ack: c=000004ae 00012a49 OOS r=000244b9 f=00024499 p=000244b6 n=30 52873.284802: rxrpc_retransmit: c=000004ae q=24499 a=0a xp=63505500
52873.284804: rxrpc_tx_data: c=000004ae DATA ed1a3584:00000002 000244c2 q=00024499 fl=0b *RETRANS* 52873.287468: rxrpc_rx_ack: c=000004ae 00012a4a OOS r=000244ba f=00024499 p=000244b7 n=31 52873.287478: rxrpc_rx_ack: c=000004ae 00012a4b OOS r=000244bb f=00024499 p=000244b8 n=32
At this point, the server's receive window is full (n=32) with presumably 1 NAK'd packet and 31 ACK'd packets. We can't transmit any more packets.
52873.287488: rxrpc_retransmit: c=000004ae q=24499 a=0a xp=61327980
52873.287489: rxrpc_tx_data: c=000004ae DATA ed1a3584:00000002 000244c3 q=00024499 fl=0b *RETRANS* 52873.293850: rxrpc_rx_ack: c=000004ae 00012a4c DLY r=000244bc f=000244a0 p=00024499 n=25
And now we've received an ACK indicating that a DATA retransmission was received. 7 packets have been processed (the occupied part of the window moved, as indicated by f= and n=).
52873.293853: rxrpc_rx_discard_ack: c=000004ae r=00012a4c 000244a0<00024499 00024499<000244b8
However, the DLY ACK gets discarded because its previousPacket has gone backwards (from p=000244b8, in the ACK at 52873.287478 to p=00024499 in the ACK at 52873.293850).
We then end up in a continuous cycle of retransmit/discard. kafs fails to update its window because it's discarding the ACKs and can't transmit an extra packet that would clear the issue because the window is full. OpenAFS doesn't change the previousPacket value in the ACKs because no new DATA packets are received with a different previousPacket number.
Fix this by altering the discard check to only discard an ACK based on previousPacket if there was no advance in the firstPacket. This allows us to transmit a new packet which will cause previousPacket to advance in the next ACK.
The check, however, needs to allow for the possibility that previousPacket may actually have had the serial number placed in it instead - in which case it will go outside the window and we should ignore it.
--- net/rxrpc/input.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
net/rxrpc/input.c +26 -4
@@ -815,6 +815,30 @@ static void rxrpc_input_soft_acks(struct }/* +* Return true if the ACK is valid - ie. it doesn't appear to have regressed +* with respect to the ack state conveyed by preceding ACKs. +*/ +static bool rxrpc_is_ack_valid (struct rxrpc_call *call, +rxrpc_seq_t first_pkt,rxrpc_seq_t prev_pkt) +{ +rxrpc_seq_t base =READ_ONCE (call->ackr_first_seq); + +if (after (first_pkt, base)) +return true;/* The window advanced */ + +if (before (first_pkt, base)) +return false;/* firstPacket regressed */ + +if (after_eq (prev_pkt, call->ackr_prev_seq)) +return true;/* previousPacket hasn't regressed. */ + +/* Some rx implementations put a serial number in previousPacket. */ +if (after_eq (prev_pkt, base + call->tx_winsize)) +return false; +return true; +} + +/* * Process an ACK packet. * * ack.firstPacket is the sequence number of the first soft-ACK'd/NAK'd packet
@@ -878,8 +902,7 @@ static void rxrpc_input_ack(struct rxrpc }/* Discard any out-of-order or duplicate ACKs (outside lock). */ -if (before (first_soft_ack, call->ackr_first_seq) || -before (prev_pkt, call->ackr_prev_seq)) { +if (!rxrpc_is_ack_valid (call, first_soft_ack, prev_pkt)) {trace_rxrpc_rx_discard_ack (call->debug_id, sp->hdr.serial, first_soft_ack, call->ackr_first_seq, prev_pkt, call->ackr_prev_seq);
@@ -895,8 +918,7 @@ static void rxrpc_input_ack(struct rxrpcspin_lock (&call->input_lock);/* Discard any out-of-order or duplicate ACKs (inside lock). */ -if (before (first_soft_ack, call->ackr_first_seq) || -before (prev_pkt, call->ackr_prev_seq)) { +if (!rxrpc_is_ack_valid (call, first_soft_ack, prev_pkt)) {trace_rxrpc_rx_discard_ack (call->debug_id, sp->hdr.serial, first_soft_ack, call->ackr_first_seq, prev_pkt, call->ackr_prev_seq);
Greg Kroah-Hartman
maintainerPATCH 81/81 make user_access_begin() do access_ok()
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit 594cc251fdd0d231d342d88b2fdff4bc42fb0690 upstream.
Originally, the rule used to be that you'd have to do access_ok() separately, and then user_access_begin() before actually doing the direct (optimized) user access.
But experience has shown that people then decide not to do access_ok() at all, and instead rely on it being implied by other operations or similar. Which makes it very hard to verify that the access has actually been range-checked.
If you use the unsafe direct user accesses, hardware features (either SMAP - Supervisor Mode Access Protection - on x86, or PAN - Privileged Access Never - on ARM) do force you to use user_access_begin(). But nothing really forces the range check.
By putting the range check into user_access_begin(), we actually force people to do the right thing (tm), and the range check vill be visible near the actual accesses. We have way too long a history of people trying to avoid them.
--- arch/x86/include/asm/uaccess.h | 11 ++++++++++- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 15 +++++++++++++-- include/linux/uaccess.h | 2 +- kernel/compat.c | 6 ++---- kernel/exit.c | 6 ++---- lib/strncpy_from_user.c | 9 +++++---- lib/strnlen_user.c | 9 +++++---- 7 files changed, 38 insertions(+), 20 deletions(-)
arch/x86/include/asm/uaccess.h +10 -1
@@ -711,7 +711,16 @@ extern struct movsl_mask {* checking before using them, but you have to surround them with the * user_access_begin/end() pair. */ -#define user_access_begin () __uaccess_begin() +static __must_check inline bool user_access_begin (const bool type, +const void __user *ptr, +size_t len) +{ +if (unlikely (!access_ok (type, ptr, len))) +return 0 ; +__uaccess_begin (); +return 1 ; +} +#define user_access_begin (t, a, b) user_access_begin(t, a, b)#define user_access_end () __uaccess_end()#define unsafe_put_user (x, ptr, err_label) \
drivers/gpu/drm/i915/i915_gem_execbuffer.c +13 -2
@@ -1604,7 +1604,9 @@ static int eb_copy_relocations(const str* happened we would make the mistake of assuming that the * relocations were valid. */ -user_access_begin (); +if (!user_access_begin (VERIFY_WRITE , urelocs, size)) + goto end_user; +for (copied =0 ; copied < nreloc; copied++) unsafe_put_user(-1, &urelocs[copied].presumed_offset,
@@ -2649,7 +2651,16 @@ i915_gem_execbuffer2_ioctl(struct drm_deunsigned int i;/* Copy the new buffer offsets back to the user's exec list. */ -user_access_begin (); +/* +* Note: count * sizeof(*user_exec_list) does not overflow, +* because we checked 'count' in check_buffer_count(). +* +* And this range already got effectively checked earlier +* when we did the "copy_from_user()" above. +*/ +if (!user_access_begin (VERIFY_WRITE , user_exec_list, count *sizeof (*user_exec_list))) + goto end_user; +for (i =0 ; i < args->buffer_count; i++) {if (!(exec2_list[i].offset &UPDATE ))continue ;
include/linux/uaccess.h +1 -1
@@ -267,7 +267,7 @@ extern long strncpy_from_unsafe(char *ds probe_kernel_read(&retval, addr, sizeof(retval))#ifndef user_access_begin -#define user_access_begin () do { } while (0) +#define user_access_begin (type, ptr, len) access_ok(type, ptr, len)#define user_access_end () do { } while (0)#define unsafe_get_user (x, ptr, err) do { if (unlikely(__get_user(x, ptr))) goto err; } while (0)#define unsafe_put_user (x, ptr, err) do { if (unlikely(__put_user(x, ptr))) goto err; } while (0)
kernel/compat.c +2 -4
@@ -354,10 +354,9 @@ long compat_get_bitmap(unsigned long *ma bitmap_size =ALIGN (bitmap_size,BITS_PER_COMPAT_LONG ); nr_compat_longs =BITS_TO_COMPAT_LONGS (bitmap_size); -if (!access_ok (VERIFY_READ , umask, bitmap_size /8 )) +if (!user_access_begin (VERIFY_READ , umask, bitmap_size /8 ))return -EFAULT ; -user_access_begin ();while (nr_compat_longs >1 ) {compat_ulong_t l1, l2;unsafe_get_user (l1, umask++, Efault);
@@ -384,10 +383,9 @@ long compat_put_bitmap(compat_ulong_t __ bitmap_size =ALIGN (bitmap_size,BITS_PER_COMPAT_LONG ); nr_compat_longs =BITS_TO_COMPAT_LONGS (bitmap_size); -if (!access_ok (VERIFY_WRITE , umask, bitmap_size /8 )) +if (!user_access_begin (VERIFY_WRITE , umask, bitmap_size /8 ))return -EFAULT ; -user_access_begin ();while (nr_compat_longs >1 ) {unsigned long m = *mask++;unsafe_put_user ((compat_ulong_t )m, umask++, Efault);
kernel/exit.c +2 -4
@@ -1617,10 +1617,9 @@ SYSCALL_DEFINE5(waitid, int, which, pid_if (!infop)return err; -if (!access_ok (VERIFY_WRITE , infop,sizeof (*infop))) +if (!user_access_begin (VERIFY_WRITE , infop,sizeof (*infop)))return -EFAULT ; -user_access_begin ();unsafe_put_user (signo, &infop->si_signo, Efault);unsafe_put_user (0 , &infop->si_errno, Efault);unsafe_put_user (info.cause, &infop->si_code, Efault);
@@ -1745,10 +1744,9 @@ COMPAT_SYSCALL_DEFINE5(waitid,if (!infop)return err; -if (!access_ok (VERIFY_WRITE , infop,sizeof (*infop))) +if (!user_access_begin (VERIFY_WRITE , infop,sizeof (*infop)))return -EFAULT ; -user_access_begin ();unsafe_put_user (signo, &infop->si_signo, Efault);unsafe_put_user (0 , &infop->si_errno, Efault);unsafe_put_user (info.cause, &infop->si_code, Efault);
lib/strncpy_from_user.c +5 -4
@@ -115,10 +115,11 @@ long strncpy_from_user(char *dst, constkasan_check_write (dst, count);check_object_size (dst, count, false); -user_access_begin (); - retval =do_strncpy_from_user (dst, src, count, max); -user_access_end (); -return retval; +if (user_access_begin (VERIFY_READ , src, max)) { + retval =do_strncpy_from_user (dst, src, count, max); +user_access_end (); +return retval; + } }return -EFAULT ; }
lib/strnlen_user.c +5 -4
@@ -114,10 +114,11 @@ long strnlen_user(const char __user *strunsigned long max = max_addr - src_addr;long retval; -user_access_begin (); - retval =do_strnlen_user (str, count, max); -user_access_end (); -return retval; +if (user_access_begin (VERIFY_READ , str, max)) { + retval =do_strnlen_user (str, count, max); +user_access_end (); +return retval; + } }return 0 ; }
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.125 release. There are 81 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 28 May 2020 18:36:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.125-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.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: 4.19.125-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.19.y
git commit: 59438eb2aa125985caa11179358001f38df0bc7e
git describe: v4.19.124-82-g59438eb2aa12
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.19-oe/build/v4.19.124-82-g59438eb2aa12
No regressions (compared to build v4.19.124)
No fixes (compared to build v4.19.124)
Ran 25492 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- juno-r2-compat
- juno-r2-kasan
- nxp-ls2088
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
- x86-kasan
Test Suites
-----------
* build
* install-android-platform-tools-r2800
* linux-log-parser
* ltp-nptl-tests
* ltp-pty-tests
* ltp-securebits-tests
* install-android-platform-tools-r2600
* kselftest
* kselftest/drivers
* kselftest/filesystems
* kselftest/net
* kselftest/networking
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-io-tests
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-open-posix-tests
* ltp-sched-tests
* ltp-syscalls-tests
* network-basic-tests
* perf
* v4l2-compliance
* kvm-unit-tests
* libhugetlbfs
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-native/drivers
* kselftest-vsyscall-mode-native/filesystems
* kselftest-vsyscall-mode-native/net
* kselftest-vsyscall-mode-native/networking
* kselftest-vsyscall-mode-none
* kselftest-vsyscall-mode-none/drivers
* kselftest-vsyscall-mode-none/filesystems
* kselftest-vsyscall-mode-none/net
* kselftest-vsyscall-mode-none/networking
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.125 release. There are 81 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 28 May 2020 18:36:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.125-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.19:
11 builds: 11 pass, 0 fail
22 boots: 22 pass, 0 fail
32 tests: 32 pass, 0 failLinux version: 4.19.125-rc1-g59438eb2aa12
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Good morning Greg,
Quoted 7 lines
From: [email protected] <[email protected]> On Behalf Of Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.125 release. There are 81 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.
No build/boot issues seen for CIP configs for Linux 4.19.125-rc1 (59438eb2aa12).
Build/test pipeline/logs: https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/pipelines/149870026
GitLab CI pipeline: https://gitlab.com/cip-project/cip-testing/linux-cip-pipelines/-/blob/master/trees/linux-4.19.y.yml
Relevant LAVA jobs: https://lava.ciplatform.org/scheduler/alljobs?length=25&search=59438e#table
Kind regards, Chris
Quoted 368 lines
Responses should be made by Thu, 28 May 2020 18:36:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-
review/patch-4.19.125-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-4.19.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 4.19.125-rc1Linus Torvalds <[email protected]>
make 'user_access_begin()' do 'access_ok()'David Howells <[email protected]>
rxrpc: Fix ack discardDavid Howells <[email protected]>
rxrpc: Trace discarded ACKsFabrice Gasnier <[email protected]>
iio: adc: stm32-dfsdm: fix device used to request dmaPeter Ujfalusi <[email protected]>
iio: adc: stm32-dfsdm: Usedma_request_chan()insteaddma_request_slave_channel()Fabrice Gasnier <[email protected]>
iio: adc: stm32-adc: fix device used to request dmaPeter Ujfalusi <[email protected]>
iio: adc: stm32-adc: Usedma_request_chan()insteaddma_request_slave_channel()Josh Poimboeuf <[email protected]>
x86/unwind/orc: Fixunwind_get_return_address_ptr()for inactive tasksQiushi Wu <[email protected]>
rxrpc: Fix a memory leak inrxkad_verify_response()John Hubbard <[email protected]>
rapidio: fix an error inget_user_pages_fast()error handlingWei Yongjun <[email protected]>
ipack: tpci200: fix error return code intpci200_register()Alexander Usyskin <[email protected]>
mei: releaseme_clobject referenceKlaus Doth <[email protected]>
misc: rtsx: Add short delay after exit from ASPMChristophe JAILLET <[email protected]>
iio: dac: vf610: Fix an error handling path in 'vf610_dac_probe()'Christophe JAILLET <[email protected]>
iio: sca3000: Remove an erroneous 'get_device()'Oscar Carter <[email protected]>
staging: greybus: Fix uninitialized scalar variableDragos Bogdan <[email protected]>
staging: iio: ad2s1210: Fix SPI readingBob Peterson <[email protected]>
Revert "gfs2: Don't demote a glock until its revokes are written"Guenter Roeck <[email protected]>
brcmfmac: abort and release host after errorMatthias Kaehlcke <[email protected]>
tty: serial:qcom_geni_serial: Fix wrap around of TX bufferArjun Vynipadath <[email protected]>
cxgb4/cxgb4vf: Fixmac_hlistinitialization and freeArjun Vynipadath <[email protected]>
cxgb4: freemac_hlistproperlyDoug Berger <[email protected]>
net: bcmgenet: abort suspend on errorDoug Berger <[email protected]>
net: bcmgenet: code movementJuliet Kim <[email protected]>
Revert "net/ibmvnic: Fix EOI when running in XIVE mode"Geert Uytterhoeven <[email protected]>
media: fdp1: Fix R-Car M3-N naming in debug messageMika Westerberg <[email protected]>
thunderbolt: Drop duplicatedget_switch_at_route()Gustavo A. R. Silva <[email protected]>
staging: most: core: replacestrcpy()bystrscpy()Vishal Verma <[email protected]>
libnvdimm/btt: Fix LBA masking during 'free list' populationVishal Verma <[email protected]>
libnvdimm/btt: Remove unnecessary code inbtt_freelist_initDexuan Cui <[email protected]>
nfit: Add Hyper-V NVDIMM DSM command set to white listMichael Ellerman <[email protected]>
powerpc/64s: DisableSTRICT_KERNEL_RWXRussell Currey <[email protected]>
powerpc: RemoveSTRICT_KERNEL_RWXincompatibility with RELOCATABLEColin Xu <[email protected]>
drm/i915/gvt: Init DPLL/DDI vreg for virtual display instead of inheritance.Cristian Ciocaltea <[email protected]>
dmaengine: owl: Use correct lock inowl_dma_get_pchan()Christophe JAILLET <[email protected]>
dmaengine: tegra210-adma: Fix an error handling path in
'tegra_adma_probe()'Xiyu Yang <[email protected]>
apparmor: Fixaa_labelrefcnt leak inpolicy_updateXiyu Yang <[email protected]>
apparmor: fix potential label refcnt leak inaa_change_profileNavid Emamdoost <[email protected]>
apparmor: Fix use-after-free inaa_audit_rule_initChristian Gmeiner <[email protected]>
drm/etnaviv: fix perfmon domain interationPeiSen Hou <[email protected]>
ALSA: hda/realtek - Add more fixup entries for Clevo machinesChristian Lachner <[email protected]>
ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus XtremeBrent Lu <[email protected]>
ALSA: pcm: fix incorrecthw_baseincreaseScott Bahling <[email protected]>
ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio
optionDaniel Jordan <[email protected]>
padata: purgeget_cpuandreorder_via_wqfrompadata_do_serialDaniel Jordan <[email protected]>
padata: initialize pd->cpu with effective cpumaskHerbert Xu <[email protected]>
padata: Replace delayed timer with immediate workqueue inpadata_reorderThomas Gleixner <[email protected]>
ARM: futex: Address build warningHans de Goede <[email protected]>
platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TAAlan Stern <[email protected]>
USB: core: Fix misleading driver bug reportMaxim Petrov <[email protected]>
stmmac: fix pointer check after utilization instmmac_interruptWu Bo <[email protected]>
ceph: fix double unlock inhandle_cap_export()Hans de Goede <[email protected]>
HID: quirks: AddHID_QUIRK_NO_INIT_REPORTSquirk for Dell K12A
keyboard-dockYoshiyuki Kurauchi <[email protected]>
gtp: setNLM_F_MULTIflag ingtp_genl_dump_pdp()Thomas Gleixner <[email protected]>
x86/apic: Move TSC deadline timer debug printkDaniel Playfair Cal <[email protected]>
HID: i2c-hid: reset Synaptics SYNA2393 on resumeTyrel Datwyler <[email protected]>
scsi: ibmvscsi: FixWARN_ONduring event pool releaseJames Hilliard <[email protected]>
component: Silence bind error on -EPROBE_DEFERRichard Clark <[email protected]>
aquantia: Fix the media type of AQC100 ethernet controller in the driverStefano Garzarella <[email protected]>
vhost/vsock: fix packet delivery order to monitoring devicesXiyu Yang <[email protected]>
configfs: fixconfig_itemrefcnt leak inconfigfs_rmdir()Quinn Tran <[email protected]>
scsi: qla2xxx: Delete all sessions before unregister local nvme portArun Easi <[email protected]>
scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIVJiri Kosina <[email protected]>
HID: alps:ALPS_1657is too specific; useU1_UNICORN_LEGACYinsteadArtem Borisov <[email protected]>
HID: alps: Add AUI1657 device IDSebastian Reichel <[email protected]>
HID: multitouch: add eGalaxTouch P80H84 supportFrédéric Pierret (fepitre) <[email protected]>
gcc-common.h: Update for GCC 10Richard Weinberger <[email protected]>
ubi: Fixseq_fileusage indetailed_erase_block_infodebugfs fileChristophe JAILLET <[email protected]>
i2c: mux: demux-pinctrl: Fix an error handling path in
'i2c_demux_pinctrl_probe()'Alexander Monakov <[email protected]>
iommu/amd: Fix over-read of ACPI UID from IVRS tableChristoph Hellwig <[email protected]>
ubifs: remove broken lazytime supportAl Viro <[email protected]>
fix multiplication overflow incopy_fdtable()Miquel Raynal <[email protected]>
mtd: spinand: Propagate ECC information to the MTD structureRoberto Sassu <[email protected]>
ima: Fix return value ofima_write_policy()Roberto Sassu <[email protected]>
evm: Check also if *tfm is an error pointer ininit_desc()Roberto Sassu <[email protected]>
ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash()Vincent Chen <[email protected]>
riscv: setmax_pfnto the PFN of the last pageMiaohe Lin <[email protected]>
KVM: SVM: Fix potential memory leak insvm_cpu_init()Kevin Hao <[email protected]>
i2c: dev: Fix the race between the release ofi2c_devand cdevArnd Bergmann <[email protected]>
ubsan: buildubsan.cmore conservativelyPeter Zijlstra <[email protected]>
x86/uaccess, ubsan: Fix UBSAN vs. SMAP-------------
Diffstat:
Makefile | 4 +- arch/arm/include/asm/futex.h | 9 +- arch/powerpc/Kconfig | 2 +- arch/riscv/kernel/setup.c | 2 + arch/x86/include/asm/uaccess.h | 11 +- arch/x86/kernel/apic/apic.c | 27 ++--- arch/x86/kernel/unwind_orc.c | 7 ++ arch/x86/kvm/svm.c | 13 ++- drivers/acpi/nfit/core.c | 17 ++- drivers/acpi/nfit/nfit.h | 6 +- drivers/base/component.c | 8 +- drivers/dma/owl-dma.c | 8 +- drivers/dma/tegra210-adma.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 2 +- drivers/gpu/drm/i915/gvt/display.c | 49 ++++++++- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 15 ++- drivers/hid/hid-alps.c | 1 + drivers/hid/hid-ids.h | 7 +- drivers/hid/hid-multitouch.c | 3 + drivers/hid/hid-quirks.c | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 2 + drivers/i2c/i2c-dev.c | 48 +++++---- drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 + drivers/iio/accel/sca3000.c | 2 +- drivers/iio/adc/stm32-adc.c | 20 +++- drivers/iio/adc/stm32-dfsdm-adc.c | 23 +++-- drivers/iio/dac/vf610_dac.c | 1 + drivers/iommu/amd_iommu_init.c | 9 +- drivers/ipack/carriers/tpci200.c | 1 + drivers/media/platform/rcar_fdp1.c | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 3 + drivers/misc/mei/client.c | 2 + drivers/mtd/nand/spi/core.c | 4 + drivers/mtd/ubi/debug.c | 12 +-- .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 63 ++++++------ drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 ++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 13 ++- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 +- drivers/net/ethernet/ibm/ibmvnic.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +- drivers/net/gtp.c | 9 +- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 + drivers/nvdimm/btt.c | 33 +++--- drivers/nvdimm/btt.h | 2 + drivers/nvdimm/btt_devs.c | 8 ++ drivers/platform/x86/asus-nb-wmi.c | 24 +++++ drivers/rapidio/devices/rio_mport_cdev.c | 5 + drivers/scsi/ibmvscsi/ibmvscsi.c | 4 - drivers/scsi/qla2xxx/qla_attr.c | 2 +- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/staging/greybus/uart.c | 4 +- drivers/staging/iio/resolver/ad2s1210.c | 17 ++- drivers/staging/most/core.c | 2 +- drivers/thunderbolt/icm.c | 12 ++- drivers/thunderbolt/switch.c | 18 ---- drivers/thunderbolt/tb.c | 9 +- drivers/thunderbolt/tb.h | 1 - drivers/tty/serial/qcom_geni_serial.c | 12 ++- drivers/usb/core/message.c | 4 +- drivers/vhost/vsock.c | 10 +- fs/ceph/caps.c | 1 + fs/configfs/dir.c | 1 + fs/file.c | 2 +- fs/gfs2/glock.c | 3 - fs/ubifs/file.c | 6 +- include/linux/padata.h | 13 +-- include/linux/uaccess.h | 2 +- include/trace/events/rxrpc.h | 35 +++++++ include/uapi/linux/ndctl.h | 1 + kernel/compat.c | 6 +- kernel/exit.c | 6 +- kernel/padata.c | 114 ++++----------------- lib/Makefile | 2 + lib/strncpy_from_user.c | 9 +- lib/strnlen_user.c | 9 +- net/rxrpc/input.c | 38 ++++++- net/rxrpc/rxkad.c | 3 +- scripts/gcc-plugins/Makefile | 1 + scripts/gcc-plugins/gcc-common.h | 4 + security/apparmor/apparmorfs.c | 3 +- security/apparmor/audit.c | 3 +- security/apparmor/domain.c | 3 +- security/integrity/evm/evm_crypto.c | 2 +- security/integrity/ima/ima_crypto.c | 12 +-- security/integrity/ima/ima_fs.c | 3 +- sound/core/pcm_lib.c | 1 + sound/pci/hda/patch_realtek.c | 4 + sound/pci/ice1712/ice1712.c | 3 +- 89 files changed, 537 insertions(+), 362 deletions(-)
Greg Kroah-Hartman
maintainerQuoted 10 lines · Chris Paterson
Good morning Greg,
Quoted 7 lines
From: [email protected] <[email protected]> On Behalf Of Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.125 release. There are 81 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 5 lines
No build/boot issues seen for CIP configs for Linux 4.19.125-rc1 (
59438eb2aa12).Build/test pipeline/logs: https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/pipelines/149870026
GitLab CI pipeline: https://gitlab.com/cip-project/cip-testing/linux-cip-pipelines/-/blob/master/trees/linux-4.19.y.yml
Relevant LAVA jobs: https://lava.ciplatform.org/scheduler/alljobs?length=25&search=59438e#table
Great, thanks for testing two of these and letting me know.
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.125 release. There are 81 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 28 May 2020 18:36:22 +0000. Anything received after that time might be too late.
Build results:
total: 155 pass: 155 fail: 0 Qemu test results: total: 421 pass: 390 fail: 31
Failed tests:
<all alpha>
<all sh>
<all sheb>
Bisect log (for alpha) below. Reverting the offending patch fixes the problem. Note that the problematic patch is associated with several other patches in the upstream kernel. Not all of them have a Fixes: tag, and I am not sure if all of them reference the problematic patch.
Guenter
---
# bad: [59438eb2aa125985caa11179358001f38df0bc7e] Linux 4.19.125-rc1
# good: [1bab61d3e8cd96f2badf515dcb06e4e1029bc017] Linux 4.19.124
git bisect start 'HEAD' 'v4.19.124'
# good: [cf97abff88a2d1b1f6ce1cbde6e17133812b40ea] ALSA: hda/realtek - Add more fixup entries for Clevo machines git bisect good cf97abff88a2d1b1f6ce1cbde6e17133812b40ea
# good: [14179ae15e2fd47223a6c05d4580def2c60869ab] cxgb4/cxgb4vf: Fix mac_hlist initialization and free git bisect good 14179ae15e2fd47223a6c05d4580def2c60869ab
# good: [d314b90fcd2704c1c9babb4c35c0dc835c711e2f] ipack: tpci200: fix error return code in tpci200_register() git bisect good d314b90fcd2704c1c9babb4c35c0dc835c711e2f
# good: [76955a85caf40f3edf72a5f346083c14ae3bf843] iio: adc: stm32-adc: fix device used to request dma git bisect good 76955a85caf40f3edf72a5f346083c14ae3bf843
# good: [ff4ab7bb44c4b4007898be3d3a8e1ad51b1981eb] rxrpc: Trace discarded ACKs
git bisect good ff4ab7bb44c4b4007898be3d3a8e1ad51b1981eb
# bad: [dd2e65505bbed0631d642b0f2539ee7894494a9b] make 'user_access_begin()' do 'access_ok()' git bisect bad dd2e65505bbed0631d642b0f2539ee7894494a9b
# good: [d25981b4d48f68871daf41bc0ca7f89c160a4b7c] rxrpc: Fix ack discard
git bisect good d25981b4d48f68871daf41bc0ca7f89c160a4b7c
# first bad commit: [dd2e65505bbed0631d642b0f2539ee7894494a9b] make 'user_access_begin()' do 'access_ok()'
Greg Kroah-Hartman
maintainerQuoted 18 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.125 release. There are 81 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 28 May 2020 18:36:22 +0000. Anything received after that time might be too late.
Build results:
total: 155 pass: 155 fail: 0 Qemu test results: total: 421 pass: 390 fail: 31Failed tests:
<all alpha>
<all sh>
<all sheb>
Quoted 4 lines
Bisect log (for alpha) below. Reverting the offending patch fixes the problem. Note that the problematic patch is associated with several other patches in the upstream kernel. Not all of them have a Fixes: tag, and I am not sure if all of them reference the problematic patch.
ah, I was worried about that patch. ugh. Ok, I'll drop it and make the submitter send all of the fixups as well.
thanks,
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.125 release. There are 81 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 28 May 2020 18:36:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.125-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah