5.9.14-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.9.14-rc1 review
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.14-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.9.14-rc1
Masami Hiramatsu <[email protected]>
x86/insn-eval: Use new for_each_insn_prefix() macro to loop over prefixes bytes
Pablo Neira Ayuso <[email protected]>
netfilter: nftables_offload: build mask based from the matching bytes
Pablo Neira Ayuso <[email protected]>
netfilter: nftables_offload: set address type in control dissector
Florian Westphal <[email protected]>
netfilter: nf_tables: avoid false-postive lockdep splat
Luo Meng <[email protected]>
Input: i8042 - fix error return code in i8042_setup_aux()
Mike Snitzer <[email protected]>
dm writecache: remove BUG() and fail gracefully instead
Zhihao Cheng <[email protected]>
i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc()
Robert Foss <[email protected]>
i2c: qcom: Fix IRQ error misassignement
Dan Carpenter <[email protected]>
rtw88: debug: Fix uninitialized memory in debugfs code
Bob Peterson <[email protected]>
gfs2: Don't freeze the file system during unmount
Alexander Aring <[email protected]>
gfs2: Fix deadlock dumping resource group glocks
Luo Meng <[email protected]>
ASoC: wm_adsp: fix error return code in wm_adsp_load()
Hoang Huu Le <[email protected]>
tipc: fix a deadlock when flushing scheduled work
Eric Dumazet <[email protected]>
netfilter: ipset: prevent uninit-value in hash_ip6_add
Bob Peterson <[email protected]>
gfs2: check for empty rgrp tree in gfs2_ri_update
Oliver Hartkopp <[email protected]>
can: af_can: can_rx_unregister(): remove WARN() statement from list operation sanity check
Willy Tarreau <[email protected]>
lib/syscall: fix syscall registers retrieval on 32-bit platforms
Roman Gushchin <[email protected]>
mm: memcg/slab: fix obj_cgroup_charge() return value handling
Suravee Suthikulpanit <[email protected]>
iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs
Alex Deucher <[email protected]>
Revert "amd/amdgpu: Disable VCN DPG mode for Picasso"
Mike Kravetz <[email protected]>
hugetlb_cgroup: fix offline of hugetlb cgroup with reservations
Qian Cai <[email protected]>
mm/swapfile: do not sleep with a spin lock held
Yang Shi <[email protected]>
mm: list_lru: set shrinker map bit when child nr_items is not zero
Menglong Dong <[email protected]>
coredump: fix core_pattern parse error
Masami Hiramatsu <[email protected]>
x86/uprobes: Do not use prefixes.nbytes when looping over prefixes.bytes
Mike Snitzer <[email protected]>
dm: remove invalid sparse __acquires and __releases annotations
Mike Snitzer <[email protected]>
dm: fix double RCU unlock in dm_dax_zero_page_range() error path
Sergei Shtepa <[email protected]>
dm: fix bug with RCU locking in dm_blk_report_zones
Laurent Vivier <[email protected]>
powerpc/pseries: Pass MSI affinity to irq_create_mapping()
Laurent Vivier <[email protected]>
genirq/irqdomain: Add an irq_create_mapping_affinity() function
Nicholas Piggin <[email protected]>
powerpc/64s/powernv: Fix memory corruption when saving SLB entries on MCE
Mikulas Patocka <[email protected]>
dm writecache: fix the maximum number of arguments
Mikulas Patocka <[email protected]>
dm writecache: advance the number of arguments when reporting max_age
Pavel Begunkov <[email protected]>
io_uring: fix recvmsg setup with compat buf-select
Suganath Prabu S <[email protected]>
scsi: mpt3sas: Fix ioctl timeout
Greg Kurz <[email protected]>
KVM: PPC: Book3S HV: XIVE: Fix vCPU id sanity check
Chris Wilson <[email protected]>
drm/i915/gt: Program mocs:63 for cache eviction on gen9
Chris Wilson <[email protected]>
drm/i915/gt: Limit frequency drop to RPe on parking
Venkata Ramana Nayana <[email protected]>
drm/i915/gt: Retain default context state across shrinking
Boyuan Zhang <[email protected]>
drm/amdgpu/vcn3.0: remove old DPG workaround
Boyuan Zhang <[email protected]>
drm/amdgpu/vcn3.0: stall DPG when WPTR/RPTR reset
Tomi Valkeinen <[email protected]>
drm/omap: sdi: fix bridge enable/disable
Mika Westerberg <[email protected]>
thunderbolt: Fix use-after-free in remove_unplugged_switch()
Steven Rostedt (VMware) <[email protected]>
tracing: Fix userstacktrace option for instances
Christian Eggers <[email protected]>
i2c: imx: Don't generate STOP condition if arbitration has been lost
Christian Eggers <[email protected]>
i2c: imx: Check for I2SR_IAL after every byte
Christian Eggers <[email protected]>
i2c: imx: Fix reset of I2SR_IAL flag
Alexander Gordeev <[email protected]>
s390/pci: fix CPU address in MSI for directed IRQ
Andreas Gruenbacher <[email protected]>
gfs2: Fix deadlock between gfs2_{create_inode,inode_lookup} and delete_work_func
Andreas Gruenbacher <[email protected]>
gfs2: Upgrade shared glocks for atime updates
Aurelien Aptel <[email protected]>
cifs: add NULL check for ses->tcon_ipc
Ronnie Sahlberg <[email protected]>
cifs: refactor create_sd_buf() and and avoid corrupting the buffer
Paulo Alcantara <[email protected]>
cifs: fix potential use-after-free in cifs_echo_request()
Paulo Alcantara <[email protected]>
cifs: allow syscalls to be restarted in __smb_send_rqst()
Naveen N. Rao <[email protected]>
ftrace: Fix DYNAMIC_FTRACE_WITH_DIRECT_CALLS dependency
Naveen N. Rao <[email protected]>
ftrace: Fix updating FTRACE_FL_TRAMP
Steven Rostedt (VMware) <[email protected]>
ring-buffer: Always check to put back before stamp when crossing pages
Andrea Righi <[email protected]>
ring-buffer: Set the right timestamp in the slow path of __rb_reserve_next()
Steven Rostedt (VMware) <[email protected]>
ring-buffer: Update write stamp with the correct ts
Takashi Iwai <[email protected]>
ALSA: hda/generic: Add option to enforce preferred_dacs pairs
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fixed Dell AIO wrong sound tone
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add new codec supported for ALC897
Jian-Hong Pan <[email protected]>
ALSA: hda/realtek: Enable headset of ASUS UX482EG & B9400CEA with ALC294
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Fix bass speaker DAC assignment on Asus Zephyrus G14
Samuel Thibault <[email protected]>
speakup: Reject setting the speakup line discipline outside of speakup
Jann Horn <[email protected]>
tty: Fix ->session locking
Jann Horn <[email protected]>
tty: Fix ->pgrp locking in tiocspgrp()
Bjørn Mork <[email protected]>
USB: serial: option: fix Quectel BG96 matching
Giacinto Cifelli <[email protected]>
USB: serial: option: add support for Thales Cinterion EXS82
Vincent Palatin <[email protected]>
USB: serial: option: add Fibocom NL668 variants
Johan Hovold <[email protected]>
USB: serial: ch341: sort device-id entries
Jan-Niklas Burfeind <[email protected]>
USB: serial: ch341: add new Product ID for CH341A
Johan Hovold <[email protected]>
USB: serial: kl5kusb105: fix memleak on open
Vamsi Krishna Samavedam <[email protected]>
usb: gadget: f_fs: Use local copy of descriptors for userspace copy
-------------
Diffstat:
Makefile | 4 +- arch/powerpc/kvm/book3s_xive.c | 7 +-- arch/powerpc/platforms/powernv/setup.c | 9 +++- arch/powerpc/platforms/pseries/msi.c | 3 +- arch/s390/pci/pci_irq.c | 14 ++++-- arch/x86/include/asm/insn.h | 15 +++++++ arch/x86/kernel/uprobes.c | 10 +++-- arch/x86/lib/insn-eval.c | 5 ++- drivers/accessibility/speakup/spk_ttyio.c | 37 +++++++++------ drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 25 ++++++++--- drivers/gpu/drm/i915/gt/intel_mocs.c | 14 +++++- drivers/gpu/drm/i915/gt/intel_rps.c | 4 ++ drivers/gpu/drm/i915/gt/shmem_utils.c | 7 ++- drivers/gpu/drm/omapdrm/dss/sdi.c | 10 ++--- drivers/i2c/busses/i2c-imx.c | 44 ++++++++++++++---- drivers/i2c/busses/i2c-qcom-cci.c | 4 +- drivers/i2c/busses/i2c-qup.c | 3 +- drivers/input/serio/i8042.c | 3 +- drivers/iommu/amd/amd_iommu_types.h | 2 +- drivers/md/dm-writecache.c | 6 ++- drivers/md/dm.c | 10 ++--- drivers/net/wireless/realtek/rtw88/debug.c | 2 + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- drivers/thunderbolt/icm.c | 10 +++-- drivers/tty/tty_io.c | 7 ++- drivers/tty/tty_jobctrl.c | 44 ++++++++++++------ drivers/usb/gadget/function/f_fs.c | 6 ++- drivers/usb/serial/ch341.c | 5 ++- drivers/usb/serial/kl5kusb105.c | 10 ++--- drivers/usb/serial/option.c | 10 +++-- fs/cifs/connect.c | 5 ++- fs/cifs/smb2pdu.c | 71 +++++++++++++++-------------- fs/cifs/smb2pdu.h | 2 - fs/cifs/transport.c | 4 +- fs/coredump.c | 3 +- fs/gfs2/glops.c | 5 ++- fs/gfs2/inode.c | 42 ++++++++++++----- fs/gfs2/rgrp.c | 4 ++ fs/io_uring.c | 3 +- include/linux/irqdomain.h | 12 ++++- include/linux/tty.h | 4 ++ include/net/netfilter/nf_tables_offload.h | 7 +++ kernel/irq/irqdomain.c | 13 +++--- kernel/trace/Kconfig | 2 +- kernel/trace/ftrace.c | 22 ++++++++- kernel/trace/ring_buffer.c | 20 ++++----- kernel/trace/trace.c | 13 +++--- lib/syscall.c | 11 ++++- mm/hugetlb_cgroup.c | 8 ++-- mm/list_lru.c | 10 ++--- mm/slab.h | 42 ++++++++++------- mm/swapfile.c | 4 +- net/can/af_can.c | 7 ++- net/netfilter/ipset/ip_set_core.c | 3 +- net/netfilter/nf_tables_api.c | 3 +- net/netfilter/nf_tables_offload.c | 17 +++++++ net/netfilter/nft_cmp.c | 8 ++-- net/netfilter/nft_meta.c | 16 +++---- net/netfilter/nft_payload.c | 70 ++++++++++++++++++++++------- net/tipc/core.c | 9 ++-- net/tipc/core.h | 8 ++++ net/tipc/net.c | 20 +++------ net/tipc/net.h | 1 + sound/pci/hda/hda_generic.c | 12 +++-- sound/pci/hda/hda_generic.h | 1 + sound/pci/hda/patch_realtek.c | 72 +++++++++++++++++++++++++++--- sound/soc/codecs/wm_adsp.c | 1 + tools/arch/x86/include/asm/insn.h | 15 +++++++ 69 files changed, 633 insertions(+), 272 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/75 usb: gadget: f_fs: Use local copy of descriptors for userspace copy
From: Vamsi Krishna Samavedam <[email protected]>
commit a4b98a7512f18534ce33a7e98e49115af59ffa00 upstream.
The function may be unbound causing the ffs_ep and its descriptors to be freed while userspace is in the middle of an ioctl requesting the same descriptors. Avoid dangling pointer reference by first making a local copy of desctiptors before releasing the spinlock.
--- drivers/usb/gadget/function/f_fs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_fs.c +4 -2
@@ -1324,7 +1324,7 @@ static long ffs_epfile_ioctl(struct filecase FUNCTIONFS_ENDPOINT_DESC : {int desc_idx; -struct usb_endpoint_descriptor *desc; +struct usb_endpoint_descriptor desc1, *desc;switch (epfile->ffs->gadget->speed) {case USB_SPEED_SUPER :
@@ -1336,10 +1336,12 @@ static long ffs_epfile_ioctl(struct filedefault : desc_idx =0 ; } + desc = epfile->ep->descs[desc_idx]; +memcpy (&desc1, desc, desc->bLength);spin_unlock_irq (&epfile->ffs->eps_lock); - ret =copy_to_user ((void __user *)value, desc, desc->bLength); + ret =copy_to_user ((void __user *)value, &desc1, desc1.bLength);if (ret) ret = -EFAULT ;return ret;
Greg Kroah-Hartman
maintainerPATCH 2/75 USB: serial: kl5kusb105: fix memleak on open
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 3f203f057edfcf6bd02c6b942799262bfcf31f73 upstream.
Fix memory leak of control-message transfer buffer on successful open().
--- drivers/usb/serial/kl5kusb105.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/usb/serial/kl5kusb105.c +4 -6
@@ -276,12 +276,12 @@ static int klsi_105_open(struct tty_str priv->cfg.unknown2 = cfg->unknown2;spin_unlock_irqrestore (&priv->lock, flags); +kfree (cfg); +/* READ_ON and urb submission */ rc =usb_serial_generic_open (tty, port); -if (rc) { - retval = rc; - goto err_free_cfg; - } +if (rc) +return rc; rc = usb_control_msg(port->serial->dev, usb_sndctrlpipe(port->serial->dev, 0),
@@ -324,8 +324,6 @@ err_disable_read: KLSI_TIMEOUT); err_generic_close:usb_serial_generic_close (port); -err_free_cfg: -kfree (cfg);return retval; }
Greg Kroah-Hartman
maintainerPATCH 3/75 USB: serial: ch341: add new Product ID for CH341A
In reply to Greg Kroah-HartmanFrom: Jan-Niklas Burfeind <[email protected]>
commit 46ee4abb10a07bd8f8ce910ee6b4ae6a947d7f63 upstream.
Add PID for CH340 that's found on a ch341 based Programmer made by keeyees. The specific device that contains the serial converter is described
here: http://www.keeyees.com/a/Products/ej/36.html
The driver works flawlessly as soon as the new PID (0x5512) is added to it.
--- drivers/usb/serial/ch341.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/ch341.c +1 -0
@@ -84,6 +84,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x4348, 0x5523) }, { USB_DEVICE(0x1a86, 0x7522) }, { USB_DEVICE(0x1a86, 0x7523) }, + { USB_DEVICE(0x1a86, 0x5512) }, { USB_DEVICE(0x1a86, 0x5523) }, { }, };
Greg Kroah-Hartman
maintainerPATCH 4/75 USB: serial: ch341: sort device-id entries
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit bf193bfc12dbc3754fc8a6e0e1e3702f1af2f772 upstream.
Keep the device-id entries sorted to make it easier to add new ones in the right spot.
--- drivers/usb/serial/ch341.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/serial/ch341.c +3 -3
@@ -81,11 +81,11 @@#define CH341_QUIRK_SIMULATE_BREAK BIT(1)static const struct usb_device_id id_table[] = { - {USB_DEVICE (0x4348 ,0x5523 ) }, - {USB_DEVICE (0x1a86 ,0x7522 ) }, - {USB_DEVICE (0x1a86 ,0x7523 ) }, {USB_DEVICE (0x1a86 ,0x5512 ) }, {USB_DEVICE (0x1a86 ,0x5523 ) }, + {USB_DEVICE (0x1a86 ,0x7522 ) }, + {USB_DEVICE (0x1a86 ,0x7523 ) }, + {USB_DEVICE (0x4348 ,0x5523 ) }, { }, };MODULE_DEVICE_TABLE (usb, id_table);
Greg Kroah-Hartman
maintainerPATCH 5/75 USB: serial: option: add Fibocom NL668 variants
In reply to Greg Kroah-HartmanFrom: Vincent Palatin <[email protected]>
commit 5e4d659b10fde14403adb2e215df4a3168fe8465 upstream.
Update the USB serial option driver support for the Fibocom NL668 Cat.4 LTE modules as there are actually several different variants. Got clarifications from Fibocom, there are distinct products:
- VID:PID 1508:1001, NL668 for IOT (no MBIM interface)
- VID:PID 2cb7:01a0, NL668-AM and NL652-EU are laptop M.2 cards (with MBIM interfaces for Windows/Linux/Chrome OS), respectively for Americas and Europe.
usb-devices output for the laptop M.2 cards:
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 4 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=ef(misc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=2cb7 ProdID=01a0 Rev=03.18 S: Manufacturer=Fibocom Wireless Inc. S: Product=Fibocom NL652-EU Modem S: SerialNumber=0123456789ABCDEF C: #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
--- drivers/usb/serial/option.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/serial/option.c +2 -1
@@ -2046,12 +2046,13 @@ static const struct usb_device_id option .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, { USB_DEVICE(0x0489, 0xe0b5), /* Foxconn T77W968 ESIM */ .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, - { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 */ + { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 (IOT version) */ .driver_info = RSVD(4) | RSVD(5) | RSVD(6) }, { USB_DEVICE(0x2cb7, 0x0104), /* Fibocom NL678 series */ .driver_info = RSVD(4) | RSVD(5) }, { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff), /* Fibocom NL678 series */ .driver_info = RSVD(6) }, + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) }, /* GosunCn GM500 RNDIS */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) }, /* GosunCn GM500 MBIM */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) }, /* GosunCn GM500 ECM/NCM */
Greg Kroah-Hartman
maintainerPATCH 6/75 USB: serial: option: add support for Thales Cinterion EXS82
In reply to Greg Kroah-HartmanFrom: Giacinto Cifelli <[email protected]>
commit 6d6556c04ebaeaf4e7fa8b791c97e2a7c41b38a3 upstream.
There is a single option port in this modem, and it is used as debug port.
lsusb -v for this device:
Bus 001 Device 002: ID 1e2d:006c
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 239 Miscellaneous Device
bDeviceSubClass 2 ?
bDeviceProtocol 1 Interface Association
bMaxPacketSize0 64
idVendor 0x1e2d
idProduct 0x006c
bcdDevice 0.00
iManufacturer 4 iProduct 3 iSerial 5 bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 243
bNumInterfaces 7
bConfigurationValue 1
iConfiguration 2
bmAttributes 0xe0
Self Powered
Remote Wakeup
MaxPower 500mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Interface Association:
bLength 8
bDescriptorType 11
bFirstInterface 1
bInterfaceCount 2
bFunctionClass 2 Communications
bFunctionSubClass 2 Abstract (modem)
bFunctionProtocol 1 AT-commands (v.25ter)
iFunction 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 0
bNumEndpoints 1
bInterfaceClass 2 Communications
bInterfaceSubClass 2 Abstract (modem)
bInterfaceProtocol 1 AT-commands (v.25ter)
iInterface 0
CDC Header:
bcdCDC 1.10
CDC ACM:
bmCapabilities 0x02
line coding and serial state
CDC Call Management:
bmCapabilities 0x03
call management
use DataInterface
bDataInterface 2
CDC Union:
bMasterInterface 1
bSlaveInterface 2
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82 EP 2 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 5
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 2
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 10 CDC Data
bInterfaceSubClass 0 Unused
bInterfaceProtocol 0
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x83 EP 3 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x02 EP 2 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Interface Association:
bLength 8
bDescriptorType 11
bFirstInterface 3
bInterfaceCount 2
bFunctionClass 2 Communications
bFunctionSubClass 2 Abstract (modem)
bFunctionProtocol 1 AT-commands (v.25ter)
iFunction 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 3
bAlternateSetting 0
bNumEndpoints 1
bInterfaceClass 2 Communications
bInterfaceSubClass 2 Abstract (modem)
bInterfaceProtocol 1 AT-commands (v.25ter)
iInterface 0
CDC Header:
bcdCDC 1.10
CDC ACM:
bmCapabilities 0x02
line coding and serial state
CDC Call Management:
bmCapabilities 0x03
call management
use DataInterface
bDataInterface 4
CDC Union:
bMasterInterface 3
bSlaveInterface 4
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x84 EP 4 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 5
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 4
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 10 CDC Data
bInterfaceSubClass 0 Unused
bInterfaceProtocol 0
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x85 EP 5 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x03 EP 3 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Interface Association:
bLength 8
bDescriptorType 11
bFirstInterface 5
bInterfaceCount 2
bFunctionClass 2 Communications
bFunctionSubClass 2 Abstract (modem)
bFunctionProtocol 1 AT-commands (v.25ter)
iFunction 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 5
bAlternateSetting 0
bNumEndpoints 1
bInterfaceClass 2 Communications
bInterfaceSubClass 6 Ethernet Networking
bInterfaceProtocol 0
iInterface 0
CDC Header:
bcdCDC 1.10
CDC Ethernet:
iMacAddress 1 (??)
bmEthernetStatistics 0x00000000
wMaxSegmentSize 16384
wNumberMCFilters 0x0001
bNumberPowerFilters 0
CDC Union:
bMasterInterface 5
bSlaveInterface 6
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x86 EP 6 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 5
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 6
bAlternateSetting 0
bNumEndpoints 0
bInterfaceClass 10 CDC Data
bInterfaceSubClass 0 Unused
bInterfaceProtocol 0
iInterface 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 6
bAlternateSetting 1
bNumEndpoints 2
bInterfaceClass 10 CDC Data
bInterfaceSubClass 0 Unused
bInterfaceProtocol 0
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x87 EP 7 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x04 EP 4 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -419,6 +419,7 @@ static void option_instat_callback(struc#define CINTERION_PRODUCT_PH8 0x0053#define CINTERION_PRODUCT_AHXX 0x0055#define CINTERION_PRODUCT_PLXX 0x0060 +#define CINTERION_PRODUCT_EXS82 0x006c#define CINTERION_PRODUCT_PH8_2RMNET 0x0082#define CINTERION_PRODUCT_PH8_AUDIO 0x0083#define CINTERION_PRODUCT_AHXX_2RMNET 0x0084
@@ -1902,6 +1903,7 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_CLS8, 0xff), .driver_info = RSVD(0) | RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EXS82, 0xff) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) }, { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },
Greg Kroah-Hartman
maintainerPATCH 7/75 USB: serial: option: fix Quectel BG96 matching
In reply to Greg Kroah-HartmanFrom: Bjørn Mork <[email protected]>
commit c98fff7332dbd6e028969f8c2bda3d7bc7a024d8 upstream.
This is a partial revert of commit 2bb70f0a4b23 ("USB: serial:
option: support dynamic Quectel USB compositions")
The Quectel BG96 is different from most other modern Quectel modems, having serial functions with 3 endpoints using ff/ff/ff and ff/fe/ff class/subclass/protocol. Including it in the change to accommodate dynamic function mapping was incorrect.
Revert to interface number matching for the BG96, assuming static layout of the RMNET function on interface 4. This restores support for the serial functions on interfaces 2 and 3.
Full lsusb output for the BG96:
Bus 002 Device 003: ID 2c7c:0296
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 0 (Defined at Interface level)
bDeviceSubClass 0
bDeviceProtocol 0
bMaxPacketSize0 64
idVendor 0x2c7c
idProduct 0x0296
bcdDevice 0.00
iManufacturer 3 Qualcomm, Incorporated
iProduct 2 Qualcomm CDMA Technologies MSM
iSerial 4 d1098243
bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 145
bNumInterfaces 5
bConfigurationValue 1
iConfiguration 1 Qualcomm Configuration
bmAttributes 0xe0
Self Powered
Remote Wakeup
MaxPower 500mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82 EP 2 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x02 EP 2 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 2
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x83 EP 3 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 5
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x84 EP 4 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x03 EP 3 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 3
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 254
bInterfaceProtocol 255
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x85 EP 5 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 5
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x86 EP 6 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x04 EP 4 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 4
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x87 EP 7 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 5
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x88 EP 8 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x05 EP 5 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0200 1x 512 bytes
bInterval 0
Device Qualifier (for other device speed):
bLength 10
bDescriptorType 6
bcdUSB 2.00
bDeviceClass 0 (Defined at Interface level) bDeviceSubClass 0 bDeviceProtocol 0
bMaxPacketSize0 64
bNumConfigurations 1
Device Status: 0x0000
(Bus Powered)
--- drivers/usb/serial/option.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/serial/option.c +2 -3
@@ -1106,9 +1106,8 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff), .driver_info = NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0xff, 0xff), - .driver_info = NUMEP2 }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0, 0) }, + { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), + .driver_info = RSVD(4) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff), .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) },
Greg Kroah-Hartman
maintainerPATCH 8/75 tty: Fix ->pgrp locking in tiocspgrp()
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 54ffccbf053b5b6ca4f6e45094b942fab92a25fc upstream.
tiocspgrp() takes two tty_struct pointers: One to the tty that userspace passed to ioctl() (tty) and one to the TTY being changed (real_tty). These pointers are different when ioctl() is called with a master fd.
To properly lock real_tty->pgrp, we must take real_tty->ctrl_lock.
This bug makes it possible for racing ioctl(TIOCSPGRP, ...) calls on both sides of a PTY pair to corrupt the refcount of struct pid, leading to use-after-free errors.
--- drivers/tty/tty_jobctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/tty_jobctrl.c +2 -2
@@ -494,10 +494,10 @@ static int tiocspgrp(struct tty_struct *if (session_of_pgrp (pgrp) !=task_session (current)) goto out_unlock; retval =0 ; -spin_lock_irq (&tty->ctrl_lock); +spin_lock_irq (&real_tty->ctrl_lock);put_pid (real_tty->pgrp); real_tty->pgrp =get_pid (pgrp); -spin_unlock_irq (&tty->ctrl_lock); +spin_unlock_irq (&real_tty->ctrl_lock); out_unlock:rcu_read_unlock ();return retval;
Greg Kroah-Hartman
maintainerPATCH 9/75 tty: Fix ->session locking
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit c8bcd9c5be24fb9e6132e97da5a35e55a83e36b9 upstream.
Currently, locking of ->session is very inconsistent; most places protect it using the legacy tty mutex, but disassociate_ctty(), __do_SAK(), tiocspgrp() and tiocgsid() don't.
Two of the writers hold the ctrl_lock (because they already need it for ->pgrp), but __proc_set_tty() doesn't do that yet.
On a PREEMPT=y system, an unprivileged user can theoretically abuse this broken locking to read 4 bytes of freed memory via TIOCGSID if tiocgsid() is preempted long enough at the right point. (Other things might also go wrong, especially if root-only ioctls are involved; I'm not sure about that.)
Change the locking on ->session such that:
- tty_lock() is held by all writers: By making disassociate_ctty() hold it. This should be fine because the same lock can already be taken through the call to tty_vhangup_session().
The tricky part is that we need to shorten the area covered by siglock to be able to take tty_lock() without ugly retry logic; as far as I can tell, this should be fine, since nothing in the signal_struct is touched in the if (tty) branch.
- ctrl_lock is held by all writers: By changing __proc_set_tty() to hold the lock a little longer.
- All readers that aren't holding tty_lock() hold ctrl_lock: By adding locking to tiocgsid() and __do_SAK(), and expanding the area covered by ctrl_lock in tiocspgrp().
--- drivers/tty/tty_io.c | 7 ++++++- drivers/tty/tty_jobctrl.c | 44 +++++++++++++++++++++++++++++++------------- include/linux/tty.h | 4 ++++ 3 files changed, 41 insertions(+), 14 deletions(-)
drivers/tty/tty_io.c +6 -1
@@ -2899,10 +2899,14 @@ void __do_SAK(struct tty_struct *tty)struct task_struct *g, *p;struct pid *session;int i; +unsigned long flags;if (!tty)return ; - session = tty->session; + +spin_lock_irqsave (&tty->ctrl_lock, flags); + session =get_pid (tty->session); +spin_unlock_irqrestore (&tty->ctrl_lock, flags);tty_ldisc_flush (tty);
@@ -2934,6 +2938,7 @@ void __do_SAK(struct tty_struct *tty) task_unlock(p); }while_each_thread (g, p);read_unlock (&tasklist_lock); +put_pid (session);#endif }
drivers/tty/tty_jobctrl.c +31 -13
105 lines not on this page · raw message
include/linux/tty.h +4 -0
@@ -306,6 +306,10 @@ struct tty_struct {struct termiox *termiox;/* May be NULL for unsupported */ char name[64 ];struct pid *pgrp;/* Protected by ctrl lock */ +/* +* Writes protected by both ctrl lock and legacy mutex, readers must use +* at least one of them. +*/ struct pid *session;unsigned long flags;int count;
Greg Kroah-Hartman
maintainerPATCH 10/75 speakup: Reject setting the speakup line discipline outside of speakup
In reply to Greg Kroah-HartmanFrom: Samuel Thibault <[email protected]>
commit f0992098cadb4c9c6a00703b66cafe604e178fea upstream.
Speakup exposing a line discipline allows userland to try to use it, while it is deemed to be useless, and thus uselessly exposes potential bugs. One of them is simply that in such a case if the line sends data, spk_ttyio_receive_buf2 is called and crashes since spk_ttyio_synth is NULL.
This change restricts the use of the speakup line discipline to speakup drivers, thus avoiding such kind of issues altogether.
--- drivers/accessibility/speakup/spk_ttyio.c | 37 ++++++++++++++++++------------ 1 file changed, 23 insertions(+), 14 deletions(-)
drivers/accessibility/speakup/spk_ttyio.c +23 -14
@@ -47,27 +47,20 @@ static int spk_ttyio_ldisc_open(struct t {struct spk_ldisc_data *ldisc_data; +if (tty != speakup_tty) +/* Somebody tried to use this line discipline outside speakup */ +return -ENODEV ; +if (!tty->ops->write)return -EOPNOTSUPP ; -mutex_lock (&speakup_tty_mutex); -if (speakup_tty) { -mutex_unlock (&speakup_tty_mutex); -return -EBUSY ; - } - speakup_tty = tty; - ldisc_data =kmalloc (sizeof (*ldisc_data),GFP_KERNEL ); -if (!ldisc_data) { - speakup_tty =NULL ; -mutex_unlock (&speakup_tty_mutex); +if (!ldisc_data)return -ENOMEM ; - }init_completion (&ldisc_data->completion); ldisc_data->buf_free = true; - speakup_tty->disc_data = ldisc_data; -mutex_unlock (&speakup_tty_mutex); + tty->disc_data = ldisc_data;return 0 ; }
@@ -191,9 +184,25 @@ static int spk_ttyio_initialise_ldisc(sttty_unlock (tty); +mutex_lock (&speakup_tty_mutex); + speakup_tty = tty; ret =tty_set_ldisc (tty,N_SPEAKUP );if (ret) -pr_err ("speakup: Failed to set N_SPEAKUP on tty\n" ); + speakup_tty =NULL ; +mutex_unlock (&speakup_tty_mutex); + +if (!ret) +/* Success */ +return 0 ; + +pr_err ("speakup: Failed to set N_SPEAKUP on tty\n" ); + +tty_lock (tty); +if (tty->ops->close) + tty->ops->close (tty,NULL ); +tty_unlock (tty); + +tty_kclose (tty);return ret; }
Greg Kroah-Hartman
maintainerPATCH 11/75 ALSA: hda/realtek: Fix bass speaker DAC assignment on Asus Zephyrus G14
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit c84bfedce60192c08455ee2d25dd13d19274a266 upstream.
ASUS Zephyrus G14 has two speaker pins, and the auto-parser tries to assign an individual DAC to each pin as much as possible. Unfortunately the third DAC has no volume control unlike the two DACs, and this resulted in the inconsistent speaker volumes.
As a workaround, wire both speaker pins to the same DAC by modifying the existing quirk (ALC289_FIXUP_ASUS_GA401) applied to this device. Since this quirk entry is chained by another, we need to avoid applying the DAC assignment change for it. Luckily, there is another quirk entry (ALC289_FIXUP_ASUS_GA502) doing the very same thing, so we can chain to the GA502 quirk instead.
Note that this patch uses a new flag of the generic parser, obey_preferred_dacs, for enforcing the DACs.
--- sound/pci/hda/patch_realtek.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
sound/pci/hda/patch_realtek.c +20 -6
@@ -6014,6 +6014,21 @@ static void alc274_fixup_bind_dacs(struc codec->power_save_node =0 ; } +/* avoid DAC 0x06 for bass speaker 0x17; it has no volume control */ +static void alc289_fixup_asus_ga401 (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +static const hda_nid_t preferred_pairs[] = { +0x14 ,0x02 ,0x17 ,0x02 ,0x21 ,0x03 ,0 + }; +struct alc_spec *spec = codec->spec; + +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { + spec->gen.preferred_dacs = preferred_pairs; + spec->gen.obey_preferred_dacs =1 ; + } +} +/* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */ static void alc285_fixup_invalidate_dacs (struct hda_codec *codec,const struct hda_fixup *fix,int action)
@@ -7569,11 +7584,10 @@ static const struct hda_fixup alc269_fix .chain_id = ALC269_FIXUP_HEADSET_MIC }, [ALC289_FIXUP_ASUS_GA401] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl []) { - {0x19 ,0x03a11020 },/* headset mic with jack detect */ - { } - }, + .type = HDA_FIXUP_FUNC, + .v.func = alc289_fixup_asus_ga401, + .chained = true, + .chain_id = ALC289_FIXUP_ASUS_GA502, }, [ALC289_FIXUP_ASUS_GA502] = { .type = HDA_FIXUP_PINS,
@@ -7697,7 +7711,7 @@ static const struct hda_fixup alc269_fix { } }, .chained = true, - .chain_id =ALC289_FIXUP_ASUS_GA401 + .chain_id =ALC289_FIXUP_ASUS_GA502 }, [ALC274_FIXUP_HP_MIC] = { .type = HDA_FIXUP_VERBS,
Greg Kroah-Hartman
maintainerPATCH 12/75 ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit aeedad2504997be262c98f6e3228173225a8d868 upstream.
HP Spectre x360 Convertible 15" version (SSID 103c:827f) needs the same quirk to make the mute LED working like other models.
System Information
Manufacturer: HP
Product Name: HP Spectre x360 Convertible 15-bl1XX
Sound Codec:
Codec: Realtek ALC295
Vendor Id: 0x10ec0295
Subsystem Id: 0x103c827f
Revision Id: 0x100002--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -7895,6 +7895,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x820d ,"HP Pavilion 15" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x8256 ,"HP" ,ALC221_FIXUP_HP_FRONT_MIC ),SND_PCI_QUIRK (0x103c ,0x827e ,"HP x360" ,ALC295_FIXUP_HP_X360 ), +SND_PCI_QUIRK (0x103c ,0x827f ,"HP x360" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x82bf ,"HP G3 mini" ,ALC221_FIXUP_HP_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x103c ,0x82c0 ,"HP G3 mini premium" ,ALC221_FIXUP_HP_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
Greg Kroah-Hartman
maintainerPATCH 13/75 ALSA: hda/realtek: Enable headset of ASUS UX482EG & B9400CEA with ALC294
In reply to Greg Kroah-HartmanFrom: Jian-Hong Pan <[email protected]>
commit eeacd80fcb29b769ea915cd06b7dd35e0bf0bc25 upstream.
Some laptops like ASUS UX482EG & B9400CEA's headset audio does not work until the quirk ALC294_FIXUP_ASUS_HPE is applied.
--- sound/pci/hda/patch_realtek.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/patch_realtek.c +3 -0
@@ -8600,6 +8600,9 @@ static const struct snd_hda_pin_quirk al SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, ALC292_STANDARD_PINS, {0x13, 0x90a60140}), + SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_HPE, + {0x17, 0x90170110}, + {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_MIC, {0x14, 0x90170110}, {0x1b, 0x90a70130},
Greg Kroah-Hartman
maintainerPATCH 14/75 ALSA: hda/realtek - Add new codec supported for ALC897
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit e5782a5d5054bf1e03cb7fbd87035037c2a22698 upstream.
Enable new codec supported for ALC897.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -445,6 +445,7 @@ static void alc_fill_eapd_coef(struct hdalc_update_coef_idx (codec,0x7 ,1 <<5 ,0 );break ;case 0x10ec0892 : +case 0x10ec0897 :alc_update_coef_idx (codec,0x7 ,1 <<5 ,0 );break ;case 0x10ec0899 :
@@ -10189,6 +10190,7 @@ static const struct hda_device_id snd_hdHDA_CODEC_ENTRY (0x10ec0888 ,"ALC888" , patch_alc882),HDA_CODEC_ENTRY (0x10ec0889 ,"ALC889" , patch_alc882),HDA_CODEC_ENTRY (0x10ec0892 ,"ALC892" , patch_alc662), +HDA_CODEC_ENTRY (0x10ec0897 ,"ALC897" , patch_alc662),HDA_CODEC_ENTRY (0x10ec0899 ,"ALC898" , patch_alc882),HDA_CODEC_ENTRY (0x10ec0900 ,"ALC1150" , patch_alc882), HDA_CODEC_ENTRY(0x10ec0b00, "ALCS1200A", patch_alc882),
Greg Kroah-Hartman
maintainerPATCH 15/75 ALSA: hda/realtek - Fixed Dell AIO wrong sound tone
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit 92666d45adcfd4a4a70580ff9f732309e16131f9 upstream.
This platform only had one audio jack.
If it plugged speaker then replug with speaker or headset, the sound tone will change to abnormal.
Headset Mic also can't record when this issue was happen.
[ Added a short comment about the COEF by tiwai ]
--- sound/pci/hda/patch_realtek.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
sound/pci/hda/patch_realtek.c +40 -0
@@ -119,6 +119,7 @@ struct alc_spec { unsigned int no_shutup_pins:1; unsigned int ultra_low_power:1; unsigned int has_hs_key:1; + unsigned int no_internal_mic_pin:1;/* for PLL fix */ hda_nid_t pll_nid;
@@ -4524,6 +4525,7 @@ static const struct coef_fw alc225_pre_hstatic void alc_headset_mode_unplugged (struct hda_codec *codec) { +struct alc_spec *spec = codec->spec;static const struct coef_fw coef0255[] = {WRITE_COEF (0x1b ,0x0c0b ),/* LDO and MISC control */ WRITE_COEF (0x45 ,0xd089 ),/* UAJ function set to menual mode */
@@ -4598,6 +4600,11 @@ static void alc_headset_mode_unplugged(s {} }; +if (spec->no_internal_mic_pin) { +alc_update_coef_idx (codec,0x45 ,0xf <<12 |1 <<10 ,5 <<12 ); +return ; + } +switch (codec->core.vendor_id) {case 0x10ec0255 :alc_process_coef_fw (codec, coef0255);
@@ -5164,6 +5171,11 @@ static void alc_determine_headset_type(s {} }; +if (spec->no_internal_mic_pin) { +alc_update_coef_idx (codec,0x45 ,0xf <<12 |1 <<10 ,5 <<12 ); +return ; + } +switch (codec->core.vendor_id) {case 0x10ec0255 :alc_process_coef_fw (codec, coef0255);
@@ -6137,6 +6149,23 @@ static void alc274_fixup_hp_headset_mic( } } +static void alc_fixup_no_int_mic (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct alc_spec *spec = codec->spec; + +switch (action) { +case HDA_FIXUP_ACT_PRE_PROBE : +/* Mic RING SLEEVE swap for combo jack */ +alc_update_coef_idx (codec,0x45 ,0xf <<12 |1 <<10 ,5 <<12 ); + spec->no_internal_mic_pin = true; +break ; +case HDA_FIXUP_ACT_INIT : +alc_combo_jack_hp_jd_restart (codec); +break ; + } +} +/* for hda_fixup_thinkpad_acpi() */ #include "thinkpad_helper.c"
@@ -6336,6 +6365,7 @@ enum {ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK ,ALC287_FIXUP_HP_GPIO_LED ,ALC256_FIXUP_HP_HEADSET_MIC , + ALC236_FIXUP_DELL_AIO_HEADSET_MIC, }; static const struct hda_fixup alc269_fixups[] = {
@@ -7753,6 +7783,12 @@ static const struct hda_fixup alc269_fix .type = HDA_FIXUP_FUNC, .v.func = alc274_fixup_hp_headset_mic, }, + [ALC236_FIXUP_DELL_AIO_HEADSET_MIC] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_no_int_mic, + .chained = true, + .chain_id =ALC255_FIXUP_DELL1_MIC_NO_PRESENCE + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7830,6 +7866,8 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1028 ,0x097d ,"Dell Precision" ,ALC289_FIXUP_DUAL_SPK ),SND_PCI_QUIRK (0x1028 ,0x098d ,"Dell Precision" ,ALC233_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x09bf ,"Dell Precision" ,ALC233_FIXUP_ASUS_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1028 ,0x0a2e ,"Dell" ,ALC236_FIXUP_DELL_AIO_HEADSET_MIC ), +SND_PCI_QUIRK (0x1028 ,0x0a30 ,"Dell" ,ALC236_FIXUP_DELL_AIO_HEADSET_MIC ),SND_PCI_QUIRK (0x1028 ,0x164a ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x164b ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
@@ -8369,6 +8407,8 @@ static const struct snd_hda_pin_quirk al {0x19, 0x02a11020}, {0x1a, 0x02a11030}, {0x21, 0x0221101f}), + SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC, + {0x21, 0x02211010}), SND_HDA_PIN_QUIRK(0x10ec0236, 0x103c, "HP", ALC256_FIXUP_HP_HEADSET_MIC, {0x14, 0x90170110}, {0x19, 0x02a11020},
Greg Kroah-Hartman
maintainerPATCH 16/75 ALSA: hda/generic: Add option to enforce preferred_dacs pairs
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 242d990c158d5b1dabd166516e21992baef5f26a upstream.
The generic parser accepts the preferred_dacs[] pairs as a hint for assigning a DAC to each pin, but this hint doesn't work always effectively. Currently it's merely a secondary choice after the trial with the path index failed. This made sometimes it difficult to assign DACs without mimicking the connection list and/or the badness table.
This patch adds a new flag, obey_preferred_dacs, that changes the behavior of the parser. As its name stands, the parser obeys the given preferred_dacs[] pairs by skipping the path index matching and giving a high penalty if no DAC is assigned by the pairs. This mode will help for assigning the fixed DACs forcibly from the codec driver.
--- sound/pci/hda/hda_generic.c | 12 ++++++++---- sound/pci/hda/hda_generic.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)
sound/pci/hda/hda_generic.c +8 -4
@@ -1364,16 +1364,20 @@ static int try_assign_dacs(struct hda_costruct nid_path *path;hda_nid_t pin = pins[i]; - path =snd_hda_get_path_from_idx (codec, path_idx[i]); -if (path) { - badness +=assign_out_path_ctls (codec, path); -continue ; +if (!spec->obey_preferred_dacs) { + path =snd_hda_get_path_from_idx (codec, path_idx[i]); +if (path) { + badness +=assign_out_path_ctls (codec, path); +continue ; + } } dacs[i] =get_preferred_dac (codec, pin);if (dacs[i]) {if (is_dac_already_used (codec, dacs[i])) badness += bad->shared_primary; + }else if (spec->obey_preferred_dacs) { + badness +=BAD_NO_PRIMARY_DAC ; }if (!dacs[i])
sound/pci/hda/hda_generic.h +1 -0
@@ -237,6 +237,7 @@ struct hda_gen_spec { unsigned int power_down_unused:1; /* power down unused widgets */ unsigned int dac_min_mute:1; /* minimal = mute for DACs */ unsigned int suppress_vmaster:1; /* don't create vmaster kctls */ + unsigned int obey_preferred_dacs:1; /* obey preferred_dacs assignment *//* other internal flags */ unsigned int no_analog:1; /* digital I/O only */
Greg Kroah-Hartman
maintainerPATCH 17/75 ring-buffer: Update write stamp with the correct ts
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 55ea4cf403800af2ce6b125bc3d853117e0c0456 upstream.
The write stamp, used to calculate deltas between events, was updated with the stale "ts" value in the "info" structure, and not with the updated "ts" variable. This caused the deltas between events to be inaccurate, and when crossing into a new sub buffer, had time go backwards.
--- kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ring_buffer.c +1 -1
@@ -3291,7 +3291,7 @@ __rb_reserve_next(struct ring_buffer_per/* Nothing came after this event between C and E */ info->delta = ts - info->after; (void )rb_time_cmpxchg (&cpu_buffer->write_stamp, - info->after, info->ts); + info->after, ts); info->ts = ts; }else {/*
Greg Kroah-Hartman
maintainerPATCH 18/75 ring-buffer: Set the right timestamp in the slow path of __rb_reserve_next()
In reply to Greg Kroah-HartmanFrom: Andrea Righi <[email protected]>
commit 8785f51a17083eee7c37606079c6447afc6ba102 upstream.
In the slow path of __rb_reserve_next() a nested event(s) can happen between evaluating the timestamp delta of the current event and updating write_stamp via local_cmpxchg(); in this case the delta is not valid anymore and it should be set to 0 (same timestamp as the interrupting event), since the event that we are currently processing is not the last event in the buffer.
--- kernel/trace/ring_buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/trace/ring_buffer.c +3 -3
@@ -3287,11 +3287,11 @@ __rb_reserve_next(struct ring_buffer_per ts =rb_time_stamp (cpu_buffer->buffer);barrier ();/*E*/ if (write == (local_read (&tail_page->write) &RB_WRITE_MASK ) && - info->after < ts) { + info->after < ts && +rb_time_cmpxchg (&cpu_buffer->write_stamp, + info->after, ts)) {/* Nothing came after this event between C and E */ info->delta = ts - info->after; - (void )rb_time_cmpxchg (&cpu_buffer->write_stamp, - info->after, ts); info->ts = ts; }else {/*
Greg Kroah-Hartman
maintainerPATCH 19/75 ring-buffer: Always check to put back before stamp when crossing pages
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 68e10d5ff512b503dcba1246ad5620f32035e135 upstream.
The current ring buffer logic checks to see if the updating of the event buffer was interrupted, and if it is, it will try to fix up the before stamp with the write stamp to make them equal again. This logic is flawed, because if it is not interrupted, the two are guaranteed to be different, as the current event just updated the before stamp before allocation. This guarantees that the next event (this one or another interrupting one) will think it interrupted the time updates of a previous event and inject an absolute time stamp to compensate.
The correct logic is to always update the timestamps when traversing to a new sub buffer.
--- kernel/trace/ring_buffer.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
kernel/trace/ring_buffer.c +6 -8
@@ -3234,14 +3234,12 @@ __rb_reserve_next(struct ring_buffer_per/* See if we shot pass the end of this buffer page */ if (unlikely (write >BUF_PAGE_SIZE )) { -if (tail != w) { -/* before and after may now different, fix it up*/ - b_ok =rb_time_read (&cpu_buffer->before_stamp, &info->before); - a_ok =rb_time_read (&cpu_buffer->write_stamp, &info->after); -if (a_ok && b_ok && info->before != info->after) - (void )rb_time_cmpxchg (&cpu_buffer->before_stamp, - info->before, info->after); - } +/* before and after may now different, fix it up*/ + b_ok =rb_time_read (&cpu_buffer->before_stamp, &info->before); + a_ok =rb_time_read (&cpu_buffer->write_stamp, &info->after); +if (a_ok && b_ok && info->before != info->after) + (void )rb_time_cmpxchg (&cpu_buffer->before_stamp, + info->before, info->after);return rb_move_tail (cpu_buffer, tail, info); }
Greg Kroah-Hartman
maintainerPATCH 20/75 ftrace: Fix updating FTRACE_FL_TRAMP
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
commit 4c75b0ff4e4bf7a45b5aef9639799719c28d0073 upstream.
On powerpc, kprobe-direct.tc triggered FTRACE_WARN_ON() in ftrace_get_addr_new() followed by the below message:
Bad trampoline accounting at: 000000004222522f (wake_up_process+0xc/0x20) (f0000001)
The set of steps leading to this involved:
- modprobe ftrace-direct-too
- enable_probe
- modprobe ftrace-direct
- rmmod ftrace-direct <-- trigger
The problem turned out to be that we were not updating flags in the ftrace record properly. From the above message about the trampoline accounting being bad, it can be seen that the ftrace record still has FTRACE_FL_TRAMP set though ftrace-direct module is going away. This happens because we are checking if any ftrace_ops has the FTRACE_FL_TRAMP flag set _before_ updating the filter hash.
The fix for this is to look for any _other_ ftrace_ops that also needs FTRACE_FL_TRAMP.
--- kernel/trace/ftrace.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
kernel/trace/ftrace.c +21 -1
@@ -1629,6 +1629,8 @@ static bool test_rec_ops_needs_regs(strustatic struct ftrace_ops *ftrace_find_tramp_ops_any (struct dyn_ftrace *rec);static struct ftrace_ops * +ftrace_find_tramp_ops_any_other (struct dyn_ftrace *rec,struct ftrace_ops *op_exclude); +static struct ftrace_ops *ftrace_find_tramp_ops_next (struct dyn_ftrace *rec,struct ftrace_ops *ops); static bool __ftrace_hash_rec_update(struct ftrace_ops *ops,
@@ -1778,7 +1780,7 @@ static bool __ftrace_hash_rec_update(str* to it. */ if (ftrace_rec_count (rec) ==1 && -ftrace_find_tramp_ops_any (rec)) +ftrace_find_tramp_ops_any_other (rec, ops)) rec->flags |=FTRACE_FL_TRAMP ;else rec->flags &= ~FTRACE_FL_TRAMP ;
@@ -2238,6 +2240,24 @@ ftrace_find_tramp_ops_any(struct dyn_ftrcontinue ;if (hash_contains_ip (ip, op->func_hash)) +return op; + }while_for_each_ftrace_op (op); + +return NULL ; +} + +static struct ftrace_ops * +ftrace_find_tramp_ops_any_other (struct dyn_ftrace *rec,struct ftrace_ops *op_exclude) +{ +struct ftrace_ops *op; +unsigned long ip = rec->ip; + +do_for_each_ftrace_op (op, ftrace_ops_list) { + +if (op == op_exclude || !op->trampoline) +continue ; + +if (hash_contains_ip (ip, op->func_hash))return op; }while_for_each_ftrace_op (op);
Greg Kroah-Hartman
maintainerPATCH 21/75 ftrace: Fix DYNAMIC_FTRACE_WITH_DIRECT_CALLS dependency
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
commit 49a962c075dfa41c78e34784772329bc8784d217 upstream.
DYNAMIC_FTRACE_WITH_DIRECT_CALLS should depend on DYNAMIC_FTRACE_WITH_REGS since we need ftrace_regs_caller().
--- kernel/trace/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/Kconfig +1 -1
@@ -202,7 +202,7 @@ config DYNAMIC_FTRACE_WITH_REGS config DYNAMIC_FTRACE_WITH_DIRECT_CALLS def_bool y - depends on DYNAMIC_FTRACE + depends on DYNAMIC_FTRACE_WITH_REGS depends on HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS config FUNCTION_PROFILER
Greg Kroah-Hartman
maintainerPATCH 22/75 cifs: allow syscalls to be restarted in __smb_send_rqst()
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 6988a619f5b79e4efadea6e19dcfe75fbcd350b5 upstream.
A customer has reported that several files in their multi-threaded app were left with size of 0 because most of the read(2) calls returned -EINTR and they assumed no bytes were read. Obviously, they could have fixed it by simply retrying on -EINTR.
We noticed that most of the -EINTR on read(2) were due to real-time signals sent by glibc to process wide credential changes (SIGRT_1), and its signal handler had been established with SA_RESTART, in which case those calls could have been automatically restarted by the kernel.
Let the kernel decide to whether or not restart the syscalls when there is a signal pending in __smb_send_rqst() by returning -ERESTARTSYS. If it can't, it will return -EINTR anyway.
--- fs/cifs/transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/cifs/transport.c +2 -2
@@ -339,8 +339,8 @@ __smb_send_rqst(struct TCP_Server_Info *return -EAGAIN ;if (signal_pending (current)) { -cifs_dbg (FYI ,"signal is pending before sending any data\n" ); -return -EINTR ; +cifs_dbg (FYI ,"signal pending before send request\n" ); +return -ERESTARTSYS ; }/* cork the socket */
Greg Kroah-Hartman
maintainerPATCH 23/75 cifs: fix potential use-after-free in cifs_echo_request()
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 212253367dc7b49ed3fc194ce71b0992eacaecf2 upstream.
This patch fixes a potential use-after-free bug in cifs_echo_request().
For instance,
thread 1
--------
cifs_demultiplex_thread()
clean_demultiplex_info()
kfree(server)
thread 2 (workqueue)
--------
apic_timer_interrupt()
smp_apic_timer_interrupt()
irq_exit()
__do_softirq()
run_timer_softirq()
call_timer_fn()
cifs_echo_request() <- use-after-free in server ptr--- fs/cifs/connect.c | 2 ++ 1 file changed, 2 insertions(+)
fs/cifs/connect.c +2 -0
@@ -935,6 +935,8 @@ static void clean_demultiplex_info(struclist_del_init (&server->tcp_ses_list);spin_unlock (&cifs_tcp_ses_lock); +cancel_delayed_work_sync (&server->echo); +spin_lock (&GlobalMid_Lock); server->tcpStatus = CifsExiting;spin_unlock (&GlobalMid_Lock);
Greg Kroah-Hartman
maintainerPATCH 24/75 cifs: refactor create_sd_buf() and and avoid corrupting the buffer
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
commit ea64370bcae126a88cd26a16f1abcc23ab2b9a55 upstream.
When mounting with "idsfromsid" mount option, Azure corrupted the owner SIDs due to excessive padding caused by placing the owner fields at the end of the security descriptor on create. Placing owners at the front of the security descriptor (rather than the end) is also safer, as the number of ACEs (that follow it) are variable.
--- fs/cifs/smb2pdu.c | 69 ++++++++++++++++++++++++++++-------------------------- fs/cifs/smb2pdu.h | 2 - 2 files changed, 37 insertions(+), 34 deletions(-)
fs/cifs/smb2pdu.c +37 -32
@@ -2237,17 +2237,15 @@ static struct crt_sd_ctxt * create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) { struct crt_sd_ctxt *buf; -struct cifs_ace *pace; -unsigned int sdlen, acelen; +__u8 *ptr, *aclptr; +unsigned int acelen, acl_size, ace_count;unsigned int owner_offset =0 ;unsigned int group_offset =0 ; +struct smb3_acl acl; - *len =roundup (sizeof (struct crt_sd_ctxt ) + (sizeof (struct cifs_ace ) *2 ),8 ); + *len =roundup (sizeof (struct crt_sd_ctxt ) + (sizeof (struct cifs_ace ) *4 ),8 );if (set_owner) { -/* offset fields are from beginning of security descriptor not of create context */ - owner_offset =sizeof (struct smb3_acl ) + (sizeof (struct cifs_ace ) *2 ); -/* sizeof(struct owner_group_sids) is already multiple of 8 so no need to round */ *len +=sizeof (struct owner_group_sids ); }
@@ -2256,26 +2254,22 @@ create_sd_buf(umode_t mode, bool set_ownif (buf ==NULL )return buf; + ptr = (__u8 *)&buf[1 ];if (set_owner) { +/* offset fields are from beginning of security descriptor not of create context */ + owner_offset = ptr - (__u8 *)&buf->sd; buf->sd.OffsetOwner =cpu_to_le32 (owner_offset); - group_offset = owner_offset +sizeof (struct owner_sid ); + group_offset = owner_offset + offsetof(struct owner_group_sids , group); buf->sd.OffsetGroup =cpu_to_le32 (group_offset); + +setup_owner_group_sids (ptr); + ptr +=sizeof (struct owner_group_sids ); }else { buf->sd.OffsetOwner =0 ; buf->sd.OffsetGroup =0 ; } - sdlen =sizeof (struct smb3_sd ) +sizeof (struct smb3_acl ) + -2 *sizeof (struct cifs_ace ); -if (set_owner) { - sdlen +=sizeof (struct owner_group_sids ); -setup_owner_group_sids (owner_offset +sizeof (struct create_context ) +8 /* name */ - + (char *)buf); - } - - buf->ccontext.DataOffset =cpu_to_le16 (offsetof - (struct crt_sd_ctxt , sd)); - buf->ccontext.DataLength =cpu_to_le32 (sdlen); + buf->ccontext.DataOffset =cpu_to_le16 (offsetof(struct crt_sd_ctxt , sd)); buf->ccontext.NameOffset =cpu_to_le16 (offsetof(struct crt_sd_ctxt , Name)); buf->ccontext.NameLength =cpu_to_le16 (4 );/* SMB2_CREATE_SD_BUFFER_TOKEN is "SecD" */
@@ -2284,6 +2278,7 @@ create_sd_buf(umode_t mode, bool set_own buf->Name[2 ] ='c' ; buf->Name[3 ] ='D' ; buf->sd.Revision =1 ;/* Must be one see MS-DTYP 2.4.6 */ +/* * ACL is "self relative" ie ACL is stored in contiguous block of memory * and "DP" ie the DACL is present
@@ -2291,28 +2286,38 @@ create_sd_buf(umode_t mode, bool set_own buf->sd.Control =cpu_to_le16 (ACL_CONTROL_SR |ACL_CONTROL_DP );/* offset owner, group and Sbz1 and SACL are all zero */ - buf->sd.OffsetDacl =cpu_to_le32 (sizeof (struct smb3_sd )); - buf->acl.AclRevision =ACL_REVISION ;/* See 2.4.4.1 of MS-DTYP */ + buf->sd.OffsetDacl =cpu_to_le32 (ptr - (__u8 *)&buf->sd); +/* Ship the ACL for now. we will copy it into buf later. */ + aclptr = ptr; + ptr +=sizeof (struct cifs_acl );/* create one ACE to hold the mode embedded in reserved special SID */ - pace = (struct cifs_ace *)(sizeof (struct crt_sd_ctxt ) + (char *)buf); - acelen =setup_special_mode_ACE (pace, (__u64 )mode); + acelen =setup_special_mode_ACE ((struct cifs_ace *)ptr, (__u64 )mode); + ptr += acelen; + acl_size = acelen +sizeof (struct smb3_acl ); + ace_count =1 ;if (set_owner) {/* we do not need to reallocate buffer to add the two more ACEs. plenty of space */ - pace = (struct cifs_ace *)(acelen + (sizeof (struct crt_sd_ctxt ) + (char *)buf)); - acelen +=setup_special_user_owner_ACE (pace); -/* it does not appear necessary to add an ACE for the NFS group SID */ - buf->acl.AceCount =cpu_to_le16 (3 ); - }else - buf->acl.AceCount =cpu_to_le16 (2 ); + acelen =setup_special_user_owner_ACE ((struct cifs_ace *)ptr); + ptr += acelen; + acl_size += acelen; + ace_count +=1 ; + }/* and one more ACE to allow access for authenticated users */ - pace = (struct cifs_ace *)(acelen + (sizeof (struct crt_sd_ctxt ) + - (char *)buf)); - acelen +=setup_authusers_ACE (pace); + acelen =setup_authusers_ACE ((struct cifs_ace *)ptr); + ptr += acelen; + acl_size += acelen; + ace_count +=1 ; + + acl.AclRevision =ACL_REVISION ;/* See 2.4.4.1 of MS-DTYP */ + acl.AclSize =cpu_to_le16 (acl_size); + acl.AceCount =cpu_to_le16 (ace_count); +memcpy (aclptr, &acl,sizeof (struct cifs_acl )); - buf->acl.AclSize =cpu_to_le16 (sizeof (struct cifs_acl ) + acelen); + buf->ccontext.DataLength =cpu_to_le32 (ptr - (__u8 *)&buf->sd); + *len = ptr - (__u8 *)buf;return buf; }
fs/cifs/smb2pdu.h +0 -2
@@ -900,8 +900,6 @@ struct crt_sd_ctxt {struct create_context ccontext;__u8 Name[8 ];struct smb3_sd sd; -struct smb3_acl acl; -/* Followed by at least 4 ACEs */ } __packed;
Greg Kroah-Hartman
maintainerPATCH 25/75 cifs: add NULL check for ses->tcon_ipc
In reply to Greg Kroah-HartmanFrom: Aurelien Aptel <[email protected]>
commit 59463eb88829f646aed13283fd84d02a475334fe upstream.
In some scenarios (DFS and BAD_NETWORK_NAME) set_root_set() can be called with a NULL ses->tcon_ipc.
--- fs/cifs/connect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/cifs/connect.c +2 -1
@@ -4768,7 +4768,8 @@ static void set_root_ses(struct cifs_sb_if (ses) {spin_lock (&cifs_tcp_ses_lock); ses->ses_count++; - ses->tcon_ipc->remap =cifs_remap (cifs_sb); +if (ses->tcon_ipc) + ses->tcon_ipc->remap =cifs_remap (cifs_sb);spin_unlock (&cifs_tcp_ses_lock); } *root_ses = ses;
Greg Kroah-Hartman
maintainerPATCH 26/75 gfs2: Upgrade shared glocks for atime updates
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
commit 82e938bd5382b322ce81e6cb8fd030987f2da022 upstream.
Commit 20f829999c38 ("gfs2: Rework read and page fault locking") lifted the glock lock taking from the low-level ->readpage and ->readahead address space operations to the higher-level ->read_iter file and ->fault vm operations. The glocks are still taken in LM_ST_SHARED mode only. On filesystems mounted without the noatime option, ->read_iter sometimes needs to update the atime as well, though. Right now, this leads to a failed locking mode assertion in gfs2_dirty_inode.
Fix that by introducing a new update_time inode operation. There, if the glock is held non-exclusively, upgrade it to an exclusive lock.
--- fs/gfs2/inode.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
fs/gfs2/inode.c +21 -0
@@ -2116,6 +2116,25 @@ loff_t gfs2_seek_hole(struct file *file,return vfs_setpos (file, ret, inode->i_sb->s_maxbytes); } +static int gfs2_update_time (struct inode *inode,struct timespec64 *time, +int flags) +{ +struct gfs2_inode *ip =GFS2_I (inode); +struct gfs2_glock *gl = ip->i_gl; +struct gfs2_holder *gh; +int error; + + gh =gfs2_glock_is_locked_by_me (gl); +if (gh && !gfs2_glock_is_held_excl (gl)) { +gfs2_glock_dq (gh); +gfs2_holder_reinit (LM_ST_EXCLUSIVE ,0 , gh); + error =gfs2_glock_nq (gh); +if (error) +return error; + } +return generic_update_time (inode, time, flags); +} +const struct inode_operations gfs2_file_iops = { .permission = gfs2_permission, .setattr = gfs2_setattr,
@@ -2124,6 +2143,7 @@ const struct inode_operations gfs2_file_ .fiemap = gfs2_fiemap, .get_acl = gfs2_get_acl, .set_acl = gfs2_set_acl, + .update_time = gfs2_update_time, };const struct inode_operations gfs2_dir_iops = {
@@ -2143,6 +2163,7 @@ const struct inode_operations gfs2_dir_i .fiemap = gfs2_fiemap, .get_acl = gfs2_get_acl, .set_acl = gfs2_set_acl, + .update_time = gfs2_update_time, .atomic_open = gfs2_atomic_open, };
Greg Kroah-Hartman
maintainerPATCH 27/75 gfs2: Fix deadlock between gfs2_{create_inode,inode_lookup} and delete_work_func
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
commit dd0ecf544125639e54056d851e4887dbb94b6d2f upstream.
In gfs2_create_inode and gfs2_inode_lookup, make sure to cancel any pending delete work before taking the inode glock. Otherwise, gfs2_cancel_delete_work may block waiting for delete_work_func to complete, and delete_work_func may block trying to acquire the inode glock in gfs2_inode_lookup.
--- fs/gfs2/inode.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
fs/gfs2/inode.c +11 -10
@@ -150,6 +150,8 @@ struct inode *gfs2_inode_lookup(struct s error =gfs2_glock_get (sdp, no_addr, &gfs2_iopen_glops,CREATE , &io_gl);if (unlikely (error)) goto fail; +if (blktype !=GFS2_BLKST_UNLINKED ) +gfs2_cancel_delete_work (io_gl);if (type ==DT_UNKNOWN || blktype !=GFS2_BLKST_FREE ) {/*
@@ -180,8 +182,6 @@ struct inode *gfs2_inode_lookup(struct s error =gfs2_glock_nq_init (io_gl,LM_ST_SHARED ,GL_EXACT , &ip->i_iopen_gh);if (unlikely (error)) goto fail; -if (blktype !=GFS2_BLKST_UNLINKED ) -gfs2_cancel_delete_work (ip->i_iopen_gh.gh_gl);glock_set_object (ip->i_iopen_gh.gh_gl, ip);gfs2_glock_put (io_gl); io_gl =NULL ;
@@ -725,13 +725,19 @@ static int gfs2_create_inode(struct inodflush_delayed_work (&ip->i_gl->gl_work);glock_set_object (ip->i_gl, ip); - error =gfs2_glock_nq_init (ip->i_gl,LM_ST_EXCLUSIVE ,GL_SKIP , ghs +1 ); + error =gfs2_glock_get (sdp, ip->i_no_addr, &gfs2_iopen_glops,CREATE , &io_gl);if (error) goto fail_free_inode; +gfs2_cancel_delete_work (io_gl); +glock_set_object (io_gl, ip); + + error =gfs2_glock_nq_init (ip->i_gl,LM_ST_EXCLUSIVE ,GL_SKIP , ghs +1 ); +if (error) + goto fail_gunlock2; error =gfs2_trans_begin (sdp, blocks,0 );if (error) - goto fail_free_inode; + goto fail_gunlock2;if (blocks >1 ) { ip->i_eattr = ip->i_no_addr +1 ;
@@ -740,18 +746,12 @@ static int gfs2_create_inode(struct inodinit_dinode (dip, ip, symname);gfs2_trans_end (sdp); - error =gfs2_glock_get (sdp, ip->i_no_addr, &gfs2_iopen_glops,CREATE , &io_gl); -if (error) - goto fail_free_inode; -BUG_ON (test_and_set_bit (GLF_INODE_CREATING , &io_gl->gl_flags)); error =gfs2_glock_nq_init (io_gl,LM_ST_SHARED ,GL_EXACT , &ip->i_iopen_gh);if (error) goto fail_gunlock2; -gfs2_cancel_delete_work (ip->i_iopen_gh.gh_gl); -glock_set_object (ip->i_iopen_gh.gh_gl, ip);gfs2_set_iop (inode);insert_inode_hash (inode);
@@ -803,6 +803,7 @@ fail_gunlock3:gfs2_glock_dq_uninit (&ip->i_iopen_gh); fail_gunlock2:clear_bit (GLF_INODE_CREATING , &io_gl->gl_flags); +glock_clear_object (io_gl, ip);gfs2_glock_put (io_gl); fail_free_inode:if (ip->i_gl) {
Greg Kroah-Hartman
maintainerPATCH 28/75 s390/pci: fix CPU address in MSI for directed IRQ
In reply to Greg Kroah-HartmanFrom: Alexander Gordeev <[email protected]>
commit a2bd4097b3ec242f4de4924db463a9c94530e03a upstream.
The directed MSIs are delivered to CPUs whose address is written to the MSI message address. The current code assumes that a CPU logical number (as it is seen by the kernel) is also the CPU address.
The above assumption is not correct, as the CPU address is rather the value returned by STAP instruction. That value does not necessarily match the kernel logical CPU number.
--- arch/s390/pci/pci_irq.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
arch/s390/pci/pci_irq.c +11 -3
@@ -103,9 +103,10 @@ static int zpci_set_irq_affinity(struct {struct msi_desc *entry =irq_get_msi_desc (data->irq);struct msi_msg msg = entry->msg; +int cpu_addr =smp_cpu_get_cpu_address (cpumask_first (dest)); msg.address_lo &=0xff0000ff ; - msg.address_lo |= (cpumask_first (dest) <<8 ); + msg.address_lo |= (cpu_addr <<8 );pci_write_msi_msg (data->irq, &msg);return IRQ_SET_MASK_OK ;
@@ -238,6 +239,7 @@ int arch_setup_msi_irqs(struct pci_dev *unsigned long bit;struct msi_desc *msi;struct msi_msg msg; +int cpu_addr;int rc, irq; zdev->aisb =-1UL ;
@@ -287,9 +289,15 @@ int arch_setup_msi_irqs(struct pci_dev * handle_percpu_irq); msg.data = hwirq - bit;if (irq_delivery ==DIRECTED ) { +if (msi->affinity) + cpu =cpumask_first (&msi->affinity->mask); +else + cpu =0 ; + cpu_addr =smp_cpu_get_cpu_address (cpu); + msg.address_lo = zdev->msi_addr &0xff0000ff ; - msg.address_lo |= msi->affinity ? - (cpumask_first (&msi->affinity->mask) <<8 ) :0 ; + msg.address_lo |= (cpu_addr <<8 ); +for_each_possible_cpu (cpu) {airq_iv_set_data (zpci_ibv[cpu], hwirq, irq); }
Greg Kroah-Hartman
maintainerPATCH 29/75 i2c: imx: Fix reset of I2SR_IAL flag
In reply to Greg Kroah-HartmanFrom: Christian Eggers <[email protected]>
commit 384a9565f70a876c2e78e58c5ca0bbf0547e4f6d upstream.
According to the "VFxxx Controller Reference Manual" (and the comment block starting at line 97), Vybrid requires writing a one for clearing an interrupt flag. Syncing the method for clearing I2SR_IIF in i2c_imx_isr().
--- drivers/i2c/busses/i2c-imx.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-imx.c +16 -6
@@ -412,6 +412,19 @@ static void i2c_imx_dma_free(struct imx_ dma->chan_using =NULL ; } +static void i2c_imx_clear_irq (struct imx_i2c_struct *i2c_imx,unsigned int bits) +{ +unsigned int temp; + +/* +* i2sr_clr_opcode is the value to clear all interrupts. Here we want to +* clear only <bits>, so we write ~i2sr_clr_opcode with just <bits> +* toggled. This is required because i.MX needs W0C and Vybrid uses W1C. +*/ + temp = ~i2c_imx->hwdata->i2sr_clr_opcode ^ bits; +imx_i2c_write_reg (temp, i2c_imx,IMX_I2C_I2SR ); +} +static int i2c_imx_bus_busy (struct imx_i2c_struct *i2c_imx,int for_busy,bool atomic) {unsigned long orig_jiffies = jiffies;
@@ -424,8 +437,7 @@ static int i2c_imx_bus_busy(struct imx_i/* check for arbitration lost */ if (temp &I2SR_IAL ) { - temp &= ~I2SR_IAL ; -imx_i2c_write_reg (temp, i2c_imx,IMX_I2C_I2SR ); +i2c_imx_clear_irq (i2c_imx,I2SR_IAL );return -EAGAIN ; }
@@ -469,7 +481,7 @@ static int i2c_imx_trx_complete(struct i*/ readb_poll_timeout_atomic (addr, regval, regval &I2SR_IIF ,5 ,1000 +100 ); i2c_imx->i2csr = regval; -imx_i2c_write_reg (0 , i2c_imx,IMX_I2C_I2SR ); +i2c_imx_clear_irq (i2c_imx,I2SR_IIF |I2SR_IAL ); }else {wait_event_timeout (i2c_imx->queue, i2c_imx->i2csr &I2SR_IIF ,HZ /10 ); }
@@ -623,9 +635,7 @@ static irqreturn_t i2c_imx_isr(int irq,if (temp &I2SR_IIF ) {/* save status register */ i2c_imx->i2csr = temp; - temp &= ~I2SR_IIF ; - temp |= (i2c_imx->hwdata->i2sr_clr_opcode &I2SR_IIF ); -imx_i2c_write_reg (temp, i2c_imx,IMX_I2C_I2SR ); +i2c_imx_clear_irq (i2c_imx,I2SR_IIF );wake_up (&i2c_imx->queue);return IRQ_HANDLED ; }
Greg Kroah-Hartman
maintainerPATCH 30/75 i2c: imx: Check for I2SR_IAL after every byte
In reply to Greg Kroah-HartmanFrom: Christian Eggers <[email protected]>
commit 1de67a3dee7a279ebe4d892b359fe3696938ec15 upstream.
Arbitration Lost (IAL) can happen after every single byte transfer. If arbitration is lost, the I2C hardware will autonomously switch from master mode to slave. If a transfer is not aborted in this state, consecutive transfers will not be executed by the hardware and will timeout.
Tested (not extensively) on Vybrid VF500 (Toradex VF50):
--- drivers/i2c/busses/i2c-imx.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/i2c/busses/i2c-imx.c +10 -0
@@ -490,6 +490,16 @@ static int i2c_imx_trx_complete(struct idev_dbg (&i2c_imx->adapter.dev,"<%s> Timeout\n" , __func__);return -ETIMEDOUT ; } + +/* check for arbitration lost */ +if (i2c_imx->i2csr &I2SR_IAL ) { +dev_dbg (&i2c_imx->adapter.dev,"<%s> Arbitration lost\n" , __func__); +i2c_imx_clear_irq (i2c_imx,I2SR_IAL ); + + i2c_imx->i2csr =0 ; +return -EAGAIN ; + } +dev_dbg (&i2c_imx->adapter.dev,"<%s> TRX complete\n" , __func__); i2c_imx->i2csr =0 ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 31/75 i2c: imx: Dont generate STOP condition if arbitration has been lost
In reply to Greg Kroah-HartmanFrom: Christian Eggers <[email protected]>
commit 61e6fe59ede155881a622f5901551b1cc8748f6a upstream.
If arbitration is lost, the master automatically changes to slave mode. I2SR_IBB may or may not be reset by hardware. Raising a STOP condition by resetting I2CR_MSTA has no effect and will not clear I2SR_IBB.
So calling i2c_imx_bus_busy() is not required and would busy-wait until timeout.
Tested (not extensively) on Vybrid VF500 (Toradex VF50):
# the 3rd argument from the calls to
# i2c_imx_bus_busy().
Signed-off-by: Wolfram Sang <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>--- drivers/i2c/busses/i2c-imx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-imx.c +10 -2
@@ -615,6 +615,8 @@ static void i2c_imx_stop(struct imx_i2c_/* Stop I2C transaction */ dev_dbg (&i2c_imx->adapter.dev,"<%s>\n" , __func__); temp =imx_i2c_read_reg (i2c_imx,IMX_I2C_I2CR ); +if (!(temp &I2CR_MSTA )) + i2c_imx->stopped =1 ; temp &= ~(I2CR_MSTA |I2CR_MTX );if (i2c_imx->dma) temp &= ~I2CR_DMAEN ;
@@ -778,9 +780,12 @@ static int i2c_imx_dma_read(struct imx_i*/ dev_dbg (dev,"<%s> clear MSTA\n" , __func__); temp =imx_i2c_read_reg (i2c_imx,IMX_I2C_I2CR ); +if (!(temp &I2CR_MSTA )) + i2c_imx->stopped =1 ; temp &= ~(I2CR_MSTA |I2CR_MTX );imx_i2c_write_reg (temp, i2c_imx,IMX_I2C_I2CR ); -i2c_imx_bus_busy (i2c_imx,0 , false); +if (!i2c_imx->stopped) +i2c_imx_bus_busy (i2c_imx,0 , false); }else {/* * For i2c master receiver repeat restart operation like:
@@ -905,9 +910,12 @@ static int i2c_imx_read(struct imx_i2c_sdev_dbg (&i2c_imx->adapter.dev,"<%s> clear MSTA\n" , __func__); temp =imx_i2c_read_reg (i2c_imx,IMX_I2C_I2CR ); +if (!(temp &I2CR_MSTA )) + i2c_imx->stopped =1 ; temp &= ~(I2CR_MSTA |I2CR_MTX );imx_i2c_write_reg (temp, i2c_imx,IMX_I2C_I2CR ); -i2c_imx_bus_busy (i2c_imx,0 , atomic); +if (!i2c_imx->stopped) +i2c_imx_bus_busy (i2c_imx,0 , atomic); }else {/* * For i2c master receiver repeat restart operation like:
Greg Kroah-Hartman
maintainerPATCH 32/75 tracing: Fix userstacktrace option for instances
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit bcee5278958802b40ee8b26679155a6d9231783e upstream.
When the instances were able to use their own options, the userstacktrace option was left hardcoded for the top level. This made the instance userstacktrace option bascially into a nop, and will confuse users that set it, but nothing happens (I was confused when it happened to me!)
--- kernel/trace/trace.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
kernel/trace/trace.c +8 -5
@@ -163,7 +163,8 @@ static union trace_eval_map_item *trace_#endif /* CONFIG_TRACE_EVAL_MAP_FILE */ int tracing_set_tracer (struct trace_array *tr,const char *buf); -static void ftrace_trace_userstack (struct trace_buffer *buffer, +static void ftrace_trace_userstack (struct trace_array *tr, +struct trace_buffer *buffer,unsigned long flags,int pc);#define MAX_TRACER_SIZE 100
@@ -2729,7 +2730,7 @@ void trace_buffer_unlock_commit_regs(str* two. They are not that meaningful. */ ftrace_trace_stack (tr, buffer, flags, regs ?0 :STACK_SKIP , pc, regs); -ftrace_trace_userstack (buffer, flags, pc); +ftrace_trace_userstack (tr, buffer, flags, pc); }/*
@@ -3038,13 +3039,14 @@ EXPORT_SYMBOL_GPL(trace_dump_stack); static DEFINE_PER_CPU(int, user_stack_count);static void -ftrace_trace_userstack (struct trace_buffer *buffer,unsigned long flags,int pc) +ftrace_trace_userstack (struct trace_array *tr, +struct trace_buffer *buffer,unsigned long flags,int pc) {struct trace_event_call *call = &event_user_stack;struct ring_buffer_event *event;struct userstack_entry *entry; -if (!(global_trace.trace_flags &TRACE_ITER_USERSTACKTRACE )) +if (!(tr->trace_flags &TRACE_ITER_USERSTACKTRACE ))return ;/*
@@ -3083,7 +3085,8 @@ ftrace_trace_userstack(struct trace_buff preempt_enable(); }#else /* CONFIG_USER_STACKTRACE_SUPPORT */ -static void ftrace_trace_userstack (struct trace_buffer *buffer, +static void ftrace_trace_userstack (struct trace_array *tr, +struct trace_buffer *buffer,unsigned long flags,int pc) { }
Greg Kroah-Hartman
maintainerPATCH 33/75 thunderbolt: Fix use-after-free in remove_unplugged_switch()
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit 600c0849cf86b75d86352f59745226273290986a upstream.
Paulian reported a crash that happens when a dock is unplugged during hibernation:
[78436.228217] thunderbolt 0-1: device disconnected [78436.228365] BUG: kernel NULL pointer dereference, address: 00000000000001e0 ... [78436.228397] RIP: 0010:icm_free_unplugged_children+0x109/0x1a0 ... [78436.228432] Call Trace: [78436.228439] icm_rescan_work+0x24/0x30 [78436.228444] process_one_work+0x1a3/0x3a0 [78436.228449] worker_thread+0x30/0x370 [78436.228454] ? process_one_work+0x3a0/0x3a0 [78436.228457] kthread+0x13d/0x160 [78436.228461] ? kthread_park+0x90/0x90 [78436.228465] ret_from_fork+0x1f/0x30
This happens because remove_unplugged_switch() calls tb_switch_remove() that releases the memory pointed by sw so the following lines reference to a memory that might be released already.
Fix this by saving pointer to the parent device before calling tb_switch_remove().
--- drivers/thunderbolt/icm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/thunderbolt/icm.c +7 -3
@@ -1973,7 +1973,9 @@ static int complete_rpm(struct device *dstatic void remove_unplugged_switch (struct tb_switch *sw) { -pm_runtime_get_sync (sw->dev.parent); +struct device *parent =get_device (sw->dev.parent); + +pm_runtime_get_sync (parent);/* * Signal this and switches below for rpm_complete because
@@ -1984,8 +1986,10 @@ static void remove_unplugged_switch(strubus_for_each_dev (&tb_bus_type, &sw->dev,NULL , complete_rpm);tb_switch_remove (sw); -pm_runtime_mark_last_busy (sw->dev.parent); -pm_runtime_put_autosuspend (sw->dev.parent); +pm_runtime_mark_last_busy (parent); +pm_runtime_put_autosuspend (parent); + +put_device (parent); }static void icm_free_unplugged_children (struct tb_switch *sw)
Greg Kroah-Hartman
maintainerPATCH 34/75 drm/omap: sdi: fix bridge enable/disable
In reply to Greg Kroah-HartmanFrom: Tomi Valkeinen <[email protected]>
commit fd4e788e971ce763e50762d7b1a0048992949dd0 upstream.
When the SDI output was converted to DRM bridge, the atomic versions of enable and disable funcs were used. This was not intended, as that would require implementing other atomic funcs too. This leads to:
WARNING: CPU: 0 PID: 18 at drivers/gpu/drm/drm_bridge.c:708 drm_atomic_helper_commit_modeset_enables+0x134/0x268
and display not working.
Fix this by using the legacy enable/disable funcs.
--- drivers/gpu/drm/omapdrm/dss/sdi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/omapdrm/dss/sdi.c +4 -6
@@ -195,8 +195,7 @@ static void sdi_bridge_mode_set(struct d sdi->pixelclock = adjusted_mode->clock *1000 ; } -static void sdi_bridge_enable (struct drm_bridge *bridge, -struct drm_bridge_state *bridge_state) +static void sdi_bridge_enable (struct drm_bridge *bridge) {struct sdi_device *sdi =drm_bridge_to_sdi (bridge);struct dispc_clock_info dispc_cinfo;
@@ -259,8 +258,7 @@ err_get_dispc:regulator_disable (sdi->vdds_sdi_reg); } -static void sdi_bridge_disable (struct drm_bridge *bridge, -struct drm_bridge_state *bridge_state) +static void sdi_bridge_disable (struct drm_bridge *bridge) {struct sdi_device *sdi =drm_bridge_to_sdi (bridge);
@@ -278,8 +276,8 @@ static const struct drm_bridge_funcs sdi .mode_valid = sdi_bridge_mode_valid, .mode_fixup = sdi_bridge_mode_fixup, .mode_set = sdi_bridge_mode_set, - .atomic_enable = sdi_bridge_enable, - .atomic_disable = sdi_bridge_disable, + .enable = sdi_bridge_enable, + .disable = sdi_bridge_disable, };static void sdi_bridge_init (struct sdi_device *sdi)
Greg Kroah-Hartman
maintainerPATCH 35/75 drm/amdgpu/vcn3.0: stall DPG when WPTR/RPTR reset
In reply to Greg Kroah-HartmanFrom: Boyuan Zhang <[email protected]>
commit ac2db9488cf21de0be7899c1e5963e5ac0ff351f upstream.
Port from VCN2.5
Add vcn dpg harware synchronization to fix race condition issue between vcn driver and hardware.
--- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +20 -0
@@ -1011,6 +1011,11 @@ static int vcn_v3_0_start_dpg_mode(struc tmp =REG_SET_FIELD (tmp,UVD_RBC_RB_CNTL ,RB_RPTR_WR_EN ,1 );WREG32_SOC15 (VCN , inst_idx, mmUVD_RBC_RB_CNTL, tmp); +/* Stall DPG before WPTR/RPTR reset */ +WREG32_P (SOC15_REG_OFFSET (VCN , inst_idx, mmUVD_POWER_STATUS), +UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK , + ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK ); +/* set the write pointer delay */ WREG32_SOC15 (VCN , inst_idx, mmUVD_RBC_RB_WPTR_CNTL,0 );
@@ -1033,6 +1038,10 @@ static int vcn_v3_0_start_dpg_mode(strucWREG32_SOC15 (VCN , inst_idx, mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr)); +/* Unstall DPG */ +WREG32_P (SOC15_REG_OFFSET (VCN , inst_idx, mmUVD_POWER_STATUS), +0 , ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK ); +return 0 ; }
@@ -1556,8 +1565,14 @@ static int vcn_v3_0_pause_dpg_mode(strucUVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK , UVD_DPG_PAUSE__NJ_PAUSE_DPG_ACK_MASK); +/* Stall DPG before WPTR/RPTR reset */ +WREG32_P (SOC15_REG_OFFSET (VCN , inst_idx, mmUVD_POWER_STATUS), +UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK , + ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK ); +/* Restore */ ring = &adev->vcn.inst[inst_idx].ring_enc[0 ]; + ring->wptr =0 ;WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_BASE_LO, ring->gpu_addr);WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_BASE_HI,upper_32_bits (ring->gpu_addr));WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_SIZE, ring->ring_size /4 );
@@ -1565,6 +1580,7 @@ static int vcn_v3_0_pause_dpg_mode(strucWREG32_SOC15 (VCN , inst_idx, mmUVD_RB_WPTR,lower_32_bits (ring->wptr)); ring = &adev->vcn.inst[inst_idx].ring_enc[1 ]; + ring->wptr =0 ;WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_BASE_LO2, ring->gpu_addr);WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_SIZE2, ring->ring_size /4 );
@@ -1574,6 +1590,10 @@ static int vcn_v3_0_pause_dpg_mode(strucWREG32_SOC15 (VCN , inst_idx, mmUVD_RBC_RB_WPTR,RREG32_SOC15 (VCN , inst_idx, mmUVD_SCRATCH2) &0x7FFFFFFF ); +/* Unstall DPG */ +WREG32_P (SOC15_REG_OFFSET (VCN , inst_idx, mmUVD_POWER_STATUS), +0 , ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK ); +SOC15_WAIT_ON_RREG (VCN , inst_idx, mmUVD_POWER_STATUS,UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON ,UVD_POWER_STATUS__UVD_POWER_STATUS_MASK ); }
Greg Kroah-Hartman
maintainerPATCH 36/75 drm/amdgpu/vcn3.0: remove old DPG workaround
In reply to Greg Kroah-HartmanFrom: Boyuan Zhang <[email protected]>
commit efd6d85a18102241538dd1cc257948a0dbe6fae6 upstream.
Port from VCN2.5
SCRATCH2 is used to keep decode wptr as a workaround which fix a hardware DPG decode wptr update bug for vcn2.5 beforehand.
--- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +0 -7
@@ -1587,9 +1587,6 @@ static int vcn_v3_0_pause_dpg_mode(strucWREG32_SOC15 (VCN , inst_idx, mmUVD_RB_RPTR2,lower_32_bits (ring->wptr));WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_WPTR2,lower_32_bits (ring->wptr)); -WREG32_SOC15 (VCN , inst_idx, mmUVD_RBC_RB_WPTR, -RREG32_SOC15 (VCN , inst_idx, mmUVD_SCRATCH2) &0x7FFFFFFF ); -/* Unstall DPG */ WREG32_P (SOC15_REG_OFFSET (VCN , inst_idx, mmUVD_POWER_STATUS),0 , ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK );
@@ -1650,10 +1647,6 @@ static void vcn_v3_0_dec_ring_set_wptr(s {struct amdgpu_device *adev = ring->adev; -if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) -WREG32_SOC15 (VCN , ring->me, mmUVD_SCRATCH2, -lower_32_bits (ring->wptr) |0x80000000 ); -if (ring->use_doorbell) { adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr);WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr));
Greg Kroah-Hartman
maintainerPATCH 37/75 drm/i915/gt: Retain default context state across shrinking
In reply to Greg Kroah-HartmanFrom: Venkata Ramana Nayana <[email protected]>
commit 78b2eb8a1f10f366681acad8d21c974c1f66791a upstream.
As we use a shmemfs file to hold the context state, when not in use it may be swapped out, such as across suspend. Since we wrote into the shmemfs without marking the pages as dirty, the contents may be dropped instead of being written back to swap. On re-using the shmemfs file, such as creating a new context after resume, the contents of that file were likely garbage and so the new context could then hang the GPU.
Simply mark the page as being written when copying into the shmemfs file, and it the new contents will be retained across swapout.
--- drivers/gpu/drm/i915/gt/shmem_utils.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/shmem_utils.c +5 -2
@@ -143,10 +143,13 @@ static int __shmem_rw(struct file *file,return PTR_ERR (page); vaddr =kmap (page); -if (write) +if (write) {memcpy (vaddr +offset_in_page (off), ptr, this); -else +set_page_dirty (page); + }else {memcpy (ptr, vaddr +offset_in_page (off), this); + } +mark_page_accessed (page);kunmap (page);put_page (page);
Greg Kroah-Hartman
maintainerPATCH 38/75 drm/i915/gt: Limit frequency drop to RPe on parking
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit aff76ab795364569b1cac58c1d0bc7df956e3899 upstream.
We treat idling the GT (intel_rps_park) as a downclock event, and reduce the frequency we intend to restart the GT with. Since the two workloads are likely related (e.g. a compositor rendering every 16ms), we want to carry the frequency and load information from across the idling. However, we do also need to update the frequencies so that workloads that run for less than 1ms are autotuned by RPS (otherwise we leave compositors running at max clocks, draining excess power). Conversely, if we try to run too slowly, the next workload has to run longer. Since there is a hysteresis in the power graph, below a certain frequency running a short workload for longer consumes more energy than running it slightly higher for less time. The exact balance point is unknown beforehand, but measurements with 30fps media playback indicate that RPe is a better choice.
--- drivers/gpu/drm/i915/gt/intel_rps.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/gt/intel_rps.c +4 -0
@@ -882,6 +882,10 @@ void intel_rps_park(struct intel_rps *rp adj =-2 ; rps->last_adj = adj; rps->cur_freq =max_t (int, rps->cur_freq + adj, rps->min_freq); +if (rps->cur_freq < rps->efficient_freq) { + rps->cur_freq = rps->efficient_freq; + rps->last_adj =0 ; + }GT_TRACE (rps_to_gt (rps),"park:%x\n" , rps->cur_freq); }
Greg Kroah-Hartman
maintainerPATCH 39/75 drm/i915/gt: Program mocs:63 for cache eviction on gen9
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit 777a7717d60ccdc9b84f35074f848d3f746fc3bf upstream.
Ville noticed that the last mocs entry is used unconditionally by the HW when it performs cache evictions, and noted that while the value is not meant to be writable by the driver, we should program it to a reasonable value nevertheless.
As it turns out, we can change the value of mocs:63 and the value we were programming into it would cause hard hangs in conjunction with atomic operations.
v2: Add details from bspec about how it is used by HW
--- drivers/gpu/drm/i915/gt/intel_mocs.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_mocs.c +13 -1
@@ -131,7 +131,19 @@ static const struct drm_i915_mocs_entryGEN9_MOCS_ENTRIES ,MOCS_ENTRY (I915_MOCS_CACHED ,LE_3_WB |LE_TC_2_LLC_ELLC |LE_LRUM (3 ), - L3_3_WB) +L3_3_WB ), + +/* +* mocs:63 +* - used by the L3 for all of its evictions. +* Thus it is expected to allow LLC cacheability to enable coherent +* flows to be maintained. +* - used to force L3 uncachable cycles. +* Thus it is expected to make the surface L3 uncacheable. +*/ +MOCS_ENTRY (63 , +LE_3_WB |LE_TC_1_LLC |LE_LRUM (3 ), + L3_1_UC) };/* NOTE: the LE_TGT_CACHE is not used on Broxton */
Greg Kroah-Hartman
maintainerPATCH 40/75 KVM: PPC: Book3S HV: XIVE: Fix vCPU id sanity check
In reply to Greg Kroah-HartmanFrom: Greg Kurz <[email protected]>
commit f54db39fbe40731c40aefdd3bc26e7d56d668c64 upstream.
Commit 062cfab7069f ("KVM: PPC: Book3S HV: XIVE: Make VP block size configurable") updated kvmppc_xive_vcpu_id_valid() in a way that allows userspace to trigger an assertion in skiboot and crash the host:
[ 696.186248988,3] XIVE[ IC 08 ] eq_blk != vp_blk (0 vs. 1) for target 0x4300008c/0 [ 696.186314757,0] Assert fail: hw/xive.c:2370:0 [ 696.186342458,0] Aborting! xive-kvCPU 0043 Backtrace: S: 0000000031e2b8f0 R: 0000000030013840 .backtrace+0x48 S: 0000000031e2b990 R: 000000003001b2d0 ._abort+0x4c S: 0000000031e2ba10 R: 000000003001b34c .assert_fail+0x34 S: 0000000031e2ba90 R: 0000000030058984 .xive_eq_for_target.part.20+0xb0 S: 0000000031e2bb40 R: 0000000030059fdc .xive_setup_silent_gather+0x2c S: 0000000031e2bc20 R: 000000003005a334 .opal_xive_set_vp_info+0x124 S: 0000000031e2bd20 R: 00000000300051a4 opal_entry+0x134
--- OPAL call token: 0x8a caller R1: 0xc000001f28563850 ---
XIVE maintains the interrupt context state of non-dispatched vCPUs in an internal VP structure. We allocate a bunch of those on startup to accommodate all possible vCPUs. Each VP has an id, that we derive from the vCPU id for efficiency:
static inline u32 kvmppc_xive_vp(struct kvmppc_xive *xive, u32 server)
{
return xive->vp_base + kvmppc_pack_vcpu_id(xive->kvm, server);
}The KVM XIVE device used to allocate KVM_MAX_VCPUS VPs. This was limitting the number of concurrent VMs because the VP space is limited on the HW. Since most of the time, VMs run with a lot less vCPUs, commit 062cfab7069f ("KVM: PPC: Book3S HV: XIVE: Make VP block size configurable") gave the possibility for userspace to tune the size of the VP block through the KVM_DEV_XIVE_NR_SERVERS attribute.
The check in kvmppc_pack_vcpu_id() was changed from
cpu < KVM_MAX_VCPUS * xive->kvm->arch.emul_smt_mode
to
cpu < xive->nr_servers * xive->kvm->arch.emul_smt_mode
The previous check was based on the fact that the VP block had KVM_MAX_VCPUS entries and that kvmppc_pack_vcpu_id() guarantees that packed vCPU ids are below KVM_MAX_VCPUS. We've changed the size of the VP block, but kvmppc_pack_vcpu_id() has nothing to do with it and it certainly doesn't ensure that the packed vCPU ids are below xive->nr_servers. kvmppc_xive_vcpu_id_valid() might thus return true when the VM was configured with a non-standard VSMT mode, even if the packed vCPU id is higher than what we expect. We end up using an unallocated VP id, which confuses OPAL. The assert in OPAL is probably abusive and should be converted to a regular error that the kernel can handle, but we shouldn't really use broken VP ids in the first place.
Fix kvmppc_xive_vcpu_id_valid() so that it checks the packed vCPU id is below xive->nr_servers, which is explicitly what we want.
--- arch/powerpc/kvm/book3s_xive.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/powerpc/kvm/book3s_xive.c +2 -5
@@ -1214,12 +1214,9 @@ void kvmppc_xive_cleanup_vcpu(struct kvmstatic bool kvmppc_xive_vcpu_id_valid (struct kvmppc_xive *xive,u32 cpu) {/* We have a block of xive->nr_servers VPs. We just need to check -* raw vCPU ids are below the expected limit for this guest's -* core stride ; kvmppc_pack_vcpu_id() will pack them down to an -* index that can be safely used to compute a VP id that belongs -* to the VP block. +* packed vCPU ids are below that. */ -return cpu < xive->nr_servers * xive->kvm->arch.emul_smt_mode; +return kvmppc_pack_vcpu_id (xive->kvm, cpu) < xive->nr_servers; }int kvmppc_xive_compute_vp_id (struct kvmppc_xive *xive,u32 cpu,u32 *vp)
Greg Kroah-Hartman
maintainerPATCH 41/75 scsi: mpt3sas: Fix ioctl timeout
In reply to Greg Kroah-HartmanFrom: Suganath Prabu S <[email protected]>
commit 42f687038bcc34aa919e0e4c29b04e4cda3f6a79 upstream.
Commit c1a6c5ac4278 ("scsi: mpt3sas: For NVME device, issue a protocol level reset") modified the ioctl path 'timeout' variable type to u8 from unsigned long, limiting the maximum timeout value that the driver can support to 255 seconds.
If the management application is requesting a higher value the resulting timeout will be zero. The operation times out immediately and the ioctl request fails.
Change datatype back to unsigned long.
--- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_ctl.c +1 -1
@@ -664,7 +664,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTMpi26NVMeEncapsulatedRequest_t *nvme_encap_request =NULL ;struct _pcie_device *pcie_device =NULL ;u16 smid; -u8 timeout; +unsigned long timeout;u8 issue_reset;u32 sz, sz_arg;void *psge;
Greg Kroah-Hartman
maintainerPATCH 42/75 io_uring: fix recvmsg setup with compat buf-select
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 2d280bc8930ba9ed1705cfd548c6c8924949eaf1 upstream.
__io_compat_recvmsg_copy_hdr() with REQ_F_BUFFER_SELECT reads out iov len but never assigns it to iov/fast_iov, leaving sr->len with garbage. Hopefully, following io_buffer_select() truncates it to the selected buffer size, but the value is still may be under what was specified.
--- fs/io_uring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/io_uring.c +2 -1
@@ -4300,7 +4300,8 @@ static int __io_compat_recvmsg_copy_hdr(return -EFAULT ;if (clen <0 )return -EINVAL ; - sr->len = iomsg->iov[0 ].iov_len; + sr->len = clen; + iomsg->iov[0 ].iov_len = clen; iomsg->iov =NULL ; }else { ret = compat_import_iovec(READ, uiov, len, UIO_FASTIOV,
Greg Kroah-Hartman
maintainerPATCH 43/75 dm writecache: advance the number of arguments when reporting max_age
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit e5d41cbca1b2036362c9e29d705d3a175a01eff8 upstream.
When reporting the "max_age" value the number of arguments must advance by two.
--- drivers/md/dm-writecache.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/dm-writecache.c +2 -0
@@ -2479,6 +2479,8 @@ static void writecache_status(struct dm_ extra_args +=2 ;if (wc->autocommit_time_set) extra_args +=2 ; +if (wc->max_age !=MAX_AGE_UNSPECIFIED ) + extra_args +=2 ;if (wc->cleaner) extra_args++;if (wc->writeback_fua_set)
Greg Kroah-Hartman
maintainerPATCH 44/75 dm writecache: fix the maximum number of arguments
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 67aa3ec3dbc43d6e34401d9b2a40040ff7bb57af upstream.
Advance the maximum number of arguments to 16.
This fixes issue where certain operations, combined with table configured args, exceed 10 arguments.
--- drivers/md/dm-writecache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-writecache.c +1 -1
@@ -2041,7 +2041,7 @@ static int writecache_ctr(struct dm_targstruct wc_memory_superblock s;static struct dm_arg _args[] = { - {0 ,10 ,"Invalid number of feature args" }, + {0 ,16 ,"Invalid number of feature args" }, }; as.argc = argc;
Greg Kroah-Hartman
maintainerPATCH 45/75 powerpc/64s/powernv: Fix memory corruption when saving SLB entries on MCE
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
commit a1ee28117077c3bf24e5ab6324c835eaab629c45 upstream.
This can be hit by an HPT guest running on an HPT host and bring down the host, so it's quite important to fix.
--- arch/powerpc/platforms/powernv/setup.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/setup.c +7 -2
@@ -186,11 +186,16 @@ static void __init pnv_init(void)add_preferred_console ("hvc" ,0 ,NULL );if (!radix_enabled ()) { +size_t size =sizeof (struct slb_entry ) * mmu_slb_size;int i;/* Allocate per cpu area to save old slb contents during MCE */ -for_each_possible_cpu (i) - paca_ptrs[i]->mce_faulty_slbs = memblock_alloc_node(mmu_slb_size, __alignof__(*paca_ptrs[i]->mce_faulty_slbs), cpu_to_node(i)); +for_each_possible_cpu (i) { + paca_ptrs[i]->mce_faulty_slbs = +memblock_alloc_node (size, + __alignof__(struct slb_entry ), +cpu_to_node (i)); + } } }
Greg Kroah-Hartman
maintainerPATCH 46/75 genirq/irqdomain: Add an irq_create_mapping_affinity() function
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
commit bb4c6910c8b41623104c2e64a30615682689a54d upstream.
There is currently no way to convey the affinity of an interrupt via irq_create_mapping(), which creates issues for devices that expect that affinity to be managed by the kernel.
In order to sort this out, rename irq_create_mapping() to irq_create_mapping_affinity() with an additional affinity parameter that can be passed down to irq_domain_alloc_descs().
irq_create_mapping() is re-implemented as a wrapper around irq_create_mapping_affinity().
No functional change.
--- include/linux/irqdomain.h | 12 ++++++++++-- kernel/irq/irqdomain.c | 13 ++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-)
include/linux/irqdomain.h +10 -2
@@ -383,11 +383,19 @@ extern void irq_domain_associate_many(stextern void irq_domain_disassociate (struct irq_domain *domain,unsigned int irq); -extern unsigned int irq_create_mapping (struct irq_domain *host, -irq_hw_number_t hwirq); +extern unsigned int irq_create_mapping_affinity (struct irq_domain *host, +irq_hw_number_t hwirq, +const struct irq_affinity_desc *affinity);extern unsigned int irq_create_fwspec_mapping (struct irq_fwspec *fwspec);extern void irq_dispose_mapping (unsigned int virq); +static inline unsigned int irq_create_mapping (struct irq_domain *host, +irq_hw_number_t hwirq) +{ +return irq_create_mapping_affinity (host, hwirq,NULL ); +} + +/** * irq_linear_revmap() - Find a linux irq from a hw irq number. * @domain: domain owning this hardware interrupt
kernel/irq/irqdomain.c +8 -5
@@ -624,17 +624,19 @@ unsigned int irq_create_direct_mapping(sEXPORT_SYMBOL_GPL (irq_create_direct_mapping);/** -* irq_create_mapping() - Map a hardware interrupt into linux irq space +* irq_create_mapping_affinity() - Map a hardware interrupt into linux irq space * @domain: domain owning this hardware interrupt or NULL for default domain * @hwirq: hardware irq number in that domain space +* @affinity: irq affinity * * Only one mapping per hardware interrupt is permitted. Returns a linux * irq number. * If the sense/trigger is to be specified, set_irq_type() should be called * on the number returned from that call. */ -unsigned int irq_create_mapping (struct irq_domain *domain, -irq_hw_number_t hwirq) +unsigned int irq_create_mapping_affinity (struct irq_domain *domain, +irq_hw_number_t hwirq, +const struct irq_affinity_desc *affinity) {struct device_node *of_node;int virq;
@@ -660,7 +662,8 @@ unsigned int irq_create_mapping(struct i }/* Allocate a virtual interrupt number */ - virq =irq_domain_alloc_descs (-1 ,1 , hwirq,of_node_to_nid (of_node),NULL ); + virq =irq_domain_alloc_descs (-1 ,1 , hwirq,of_node_to_nid (of_node), + affinity);if (virq <=0 ) {pr_debug ("-> virq allocation failed\n" );return 0 ;
@@ -676,7 +679,7 @@ unsigned int irq_create_mapping(struct ireturn virq; } -EXPORT_SYMBOL_GPL (irq_create_mapping); +EXPORT_SYMBOL_GPL (irq_create_mapping_affinity);/** * irq_create_strict_mappings() - Map a range of hw irqs to fixed linux irqs
Greg Kroah-Hartman
maintainerPATCH 47/75 powerpc/pseries: Pass MSI affinity to irq_create_mapping()
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
commit 9ea69a55b3b9a71cded9726af591949c1138f235 upstream.
With virtio multiqueue, normally each queue IRQ is mapped to a CPU.
Commit 0d9f0a52c8b9f ("virtio_scsi: use virtio IRQ affinity") exposed an existing shortcoming of the arch code by moving virtio_scsi to the automatic IRQ affinity assignment.
The affinity is correctly computed in msi_desc but this is not applied to the system IRQs.
It appears the affinity is correctly passed to rtas_setup_msi_irqs() but lost at this point and never passed to irq_domain_alloc_descs() (see commit 06ee6d571f0e ("genirq: Add affinity hint to irq allocation")) because irq_create_mapping() doesn't take an affinity parameter.
Use the new irq_create_mapping_affinity() function, which allows to forward the affinity setting from rtas_setup_msi_irqs() to irq_domain_alloc_descs().
With this change, the virtqueues are correctly dispatched between the CPUs on pseries.
--- arch/powerpc/platforms/pseries/msi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/platforms/pseries/msi.c +2 -1
@@ -458,7 +458,8 @@ again:return hwirq; } - virq =irq_create_mapping (NULL , hwirq); + virq =irq_create_mapping_affinity (NULL , hwirq, + entry->affinity);if (!virq) {pr_debug ("rtas_msi: Failed mapping hwirq %d\n" , hwirq);
Greg Kroah-Hartman
maintainerPATCH 48/75 dm: fix bug with RCU locking in dm_blk_report_zones
In reply to Greg Kroah-HartmanFrom: Sergei Shtepa <[email protected]>
commit 89478335718c98557f10470a9bc5c555b9261c4e upstream.
The dm_get_live_table() function makes RCU read lock so dm_put_live_table() must be called even if dm_table map is not found.
--- drivers/md/dm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/md/dm.c +4 -2
@@ -491,8 +491,10 @@ static int dm_blk_report_zones(struct gereturn -EAGAIN ; map =dm_get_live_table (md, &srcu_idx); -if (!map) -return -EIO ; +if (!map) { + ret = -EIO ; + goto out; + } do { struct dm_target *tgt;
Greg Kroah-Hartman
maintainerPATCH 49/75 dm: fix double RCU unlock in dm_dax_zero_page_range() error path
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit f05c4403db5bba881d4964e731f6da35be46aabd upstream.
Remove redundant dm_put_live_table() in dm_dax_zero_page_range() error
path to fix sparse warning:drivers/md/dm.c:1208:9: warning: context imbalance in 'dm_dax_zero_page_range' - unexpected unlock
--- drivers/md/dm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/md/dm.c +0 -2
@@ -1219,11 +1219,9 @@ static int dm_dax_zero_page_range(struct* ->zero_page_range() is mandatory dax operation. If we are * here, something is wrong. */ -dm_put_live_table (md, srcu_idx); goto out; } ret = ti->type->dax_zero_page_range (ti, pgoff, nr_pages); - out:dm_put_live_table (md, srcu_idx);
Greg Kroah-Hartman
maintainerPATCH 50/75 dm: remove invalid sparse __acquires and __releases annotations
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit bde3808bc8c2741ad3d804f84720409aee0c2972 upstream.
Fixes sparse warnings:drivers/md/dm.c:508:12: warning: context imbalance in 'dm_prepare_ioctl' - wrong count at exit drivers/md/dm.c:543:13: warning: context imbalance in 'dm_unprepare_ioctl' - wrong count at exit
--- drivers/md/dm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/md/dm.c +0 -2
@@ -524,7 +524,6 @@ out:static int dm_prepare_ioctl (struct mapped_device *md,int *srcu_idx,struct block_device **bdev) - __acquires(md->io_barrier) {struct dm_target *tgt;struct dm_table *map;
@@ -558,7 +557,6 @@ retry: }static void dm_unprepare_ioctl (struct mapped_device *md,int srcu_idx) - __releases(md->io_barrier) {dm_put_live_table (md, srcu_idx); }
Greg Kroah-Hartman
maintainerPATCH 51/75 x86/uprobes: Do not use prefixes.nbytes when looping over prefixes.bytes
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
commit 4e9a5ae8df5b3365183150f6df49e49dece80d8c upstream.
Since insn.prefixes.nbytes can be bigger than the size of insn.prefixes.bytes[] when a prefix is repeated, the proper check must be
insn.prefixes.bytes[i] != 0 and i < 4
instead of using insn.prefixes.nbytes.
Introduce a for_each_insn_prefix() macro for this purpose. Debugged by Kees Cook <[email protected]>.
[ bp: Massage commit message, sync with the respective header in tools/
and drop "we". ]
--- arch/x86/include/asm/insn.h | 15 +++++++++++++++ arch/x86/kernel/uprobes.c | 10 ++++++---- tools/arch/x86/include/asm/insn.h | 15 +++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-)
arch/x86/include/asm/insn.h +15 -0
@@ -201,6 +201,21 @@ static inline int insn_offset_immediate(return insn_offset_displacement (insn) + insn->displacement.nbytes; } +/** +* for_each_insn_prefix() -- Iterate prefixes in the instruction +* @insn: Pointer to struct insn. +* @idx: Index storage. +* @prefix: Prefix byte. +* +* Iterate prefix bytes of given @insn. Each prefix byte is stored in @prefix +* and the index is stored in @idx (note that this @idx is just for a cursor, +* do not change it.) +* Since prefixes.nbytes can be bigger than 4 if some prefixes +* are repeated, it cannot be used for looping over the prefixes. +*/ +#define for_each_insn_prefix (insn, idx, prefix) \ + for (idx = 0; idx < ARRAY_SIZE(insn->prefixes.bytes) && (prefix = insn->prefixes.bytes[idx]) != 0; idx++) +#define POP_SS_OPCODE 0x1f#define MOV_SREG_OPCODE 0x8e
arch/x86/kernel/uprobes.c +6 -4
@@ -255,12 +255,13 @@ static volatile u32 good_2byte_insns[256static bool is_prefix_bad (struct insn *insn) { +insn_byte_t p;int i; -for (i =0 ; i < insn->prefixes.nbytes; i++) { +for_each_insn_prefix (insn, i, p) {insn_attr_t attr; - attr =inat_get_opcode_attribute (insn->prefixes.bytes[i]); + attr =inat_get_opcode_attribute (p);switch (attr) {case INAT_MAKE_PREFIX (INAT_PFX_ES ):case INAT_MAKE_PREFIX (INAT_PFX_CS ):
@@ -715,6 +716,7 @@ static const struct uprobe_xol_ops push_static int branch_setup_xol_ops (struct arch_uprobe *auprobe,struct insn *insn) {u8 opc1 =OPCODE1 (insn); +insn_byte_t p;int i;switch (opc1) {
@@ -746,8 +748,8 @@ static int branch_setup_xol_ops(struct a* Intel and AMD behavior differ in 64-bit mode: Intel ignores 66 prefix. * No one uses these insns, reject any branch insns with such prefix. */ -for (i =0 ; i < insn->prefixes.nbytes; i++) { -if (insn->prefixes.bytes[i] ==0x66 ) +for_each_insn_prefix (insn, i, p) { +if (p ==0x66 )return -ENOTSUPP ; }
tools/arch/x86/include/asm/insn.h +15 -0
@@ -201,6 +201,21 @@ static inline int insn_offset_immediate(return insn_offset_displacement (insn) + insn->displacement.nbytes; } +/** +* for_each_insn_prefix() -- Iterate prefixes in the instruction +* @insn: Pointer to struct insn. +* @idx: Index storage. +* @prefix: Prefix byte. +* +* Iterate prefix bytes of given @insn. Each prefix byte is stored in @prefix +* and the index is stored in @idx (note that this @idx is just for a cursor, +* do not change it.) +* Since prefixes.nbytes can be bigger than 4 if some prefixes +* are repeated, it cannot be used for looping over the prefixes. +*/ +#define for_each_insn_prefix (insn, idx, prefix) \ + for (idx = 0; idx < ARRAY_SIZE(insn->prefixes.bytes) && (prefix = insn->prefixes.bytes[idx]) != 0; idx++) +#define POP_SS_OPCODE 0x1f#define MOV_SREG_OPCODE 0x8e
Greg Kroah-Hartman
maintainerPATCH 52/75 coredump: fix core_pattern parse error
In reply to Greg Kroah-HartmanFrom: Menglong Dong <[email protected]>
commit 2bf509d96d84c3336d08375e8af34d1b85ee71c8 upstream.
'format_corename()' will splite 'core_pattern' on spaces when it is in pipe mode, and take helper_argv[0] as the path to usermode executable. It works fine in most cases.
However, if there is a space between '|' and '/file/path', such as '| /usr/lib/systemd/systemd-coredump %P %u %g', then helper_argv[0] will be parsed as '', and users will get a 'Core dump to | disabled'.
It is not friendly to users, as the pattern above was valid previously. Fix this by ignoring the spaces between '|' and '/file/path'.
--- fs/coredump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/coredump.c +2 -1
@@ -229,7 +229,8 @@ static int format_corename(struct core_n*/ if (ispipe) {if (isspace (*pat_ptr)) { - was_space = true; +if (cn->used !=0 ) + was_space = true; pat_ptr++;continue ; }else if (was_space) {
Greg Kroah-Hartman
maintainerPATCH 53/75 mm: list_lru: set shrinker map bit when child nr_items is not zero
In reply to Greg Kroah-HartmanFrom: Yang Shi <[email protected]>
commit 8199be001a470209f5c938570cc199abb012fe53 upstream.
When investigating a slab cache bloat problem, significant amount of negative dentry cache was seen, but confusingly they neither got shrunk by reclaimer (the host has very tight memory) nor be shrunk by dropping cache. The vmcore shows there are over 14M negative dentry objects on lru, but tracing result shows they were even not scanned at all.
Further investigation shows the memcg's vfs shrinker_map bit is not set. So the reclaimer or dropping cache just skip calling vfs shrinker. So we have to reboot the hosts to get the memory back.
I didn't manage to come up with a reproducer in test environment, and the problem can't be reproduced after rebooting. But it seems there is race between shrinker map bit clear and reparenting by code inspection. The hypothesis is elaborated as below.
The memcg hierarchy on our production environment looks like:
root
/ \
system userThe main workloads are running under user slice's children, and it creates and removes memcg frequently. So reparenting happens very often under user slice, but no task is under user slice directly.
So with the frequent reparenting and tight memory pressure, the below hypothetical race condition may happen:
CPU A CPU B
reparent
dst->nr_items == 0
shrinker:
total_objects == 0
add src->nr_items to dst
set_bit
return SHRINK_EMPTY
clear_bitchild memcg offline
replace child's kmemcg_id with
parent's (in memcg_offline_kmem())
list_lru_del() between shrinker runs
see parent's kmemcg_id dec dst->nr_items
reparent again
dst->nr_items may go negative
due to concurrent list_lru_del()
The second run of shrinker:
read nr_items without any synchronization, so it may see intermediate negative nr_items then total_objects may return 0 coincidently
keep the bit cleared
dst->nr_items != 0
skip set_bit
add scr->nr_item to dst
After this point dst->nr_item may never go zero, so reparenting will not set shrinker_map bit anymore. And since there is no task under user slice directly, so no new object will be added to its lru to set the shrinker map bit either. That bit is kept cleared forever.
How does list_lru_del() race with reparenting? It is because reparenting replaces children's kmemcg_id to parent's without protecting from nlru->lock, so list_lru_del() may see parent's kmemcg_id but actually deleting items from child's lru, but dec'ing parent's nr_items, so the parent's nr_items may go negative as commit 2788cf0c401c ("memcg:
reparent list_lrus and free kmemcg_id on css offline") says.
Since it is impossible that dst->nr_items goes negative and src->nr_items goes zero at the same time, so it seems we could set the shrinker map bit iff src->nr_items != 0. We could synchronize list_lru_count_one() and reparenting with nlru->lock, but it seems checking src->nr_items in reparenting is the simplest and avoids lock contention.
--- mm/list_lru.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
mm/list_lru.c +5 -5
@@ -534,7 +534,6 @@ static void memcg_drain_list_lru_node(ststruct list_lru_node *nlru = &lru->node[nid];int dst_idx = dst_memcg->kmemcg_id;struct list_lru_one *src, *dst; -bool set;/* * Since list_lru_{add,del} may be called under an IRQ-safe lock,
@@ -546,11 +545,12 @@ static void memcg_drain_list_lru_node(st dst =list_lru_from_memcg_idx (nlru, dst_idx);list_splice_init (&src->list, &dst->list); - set = (!dst->nr_items && src->nr_items); - dst->nr_items += src->nr_items; -if (set) + +if (src->nr_items) { + dst->nr_items += src->nr_items;memcg_set_shrinker_bit (dst_memcg, nid,lru_shrinker_id (lru)); - src->nr_items =0 ; + src->nr_items =0 ; + }spin_unlock_irq (&nlru->lock); }
Greg Kroah-Hartman
maintainerPATCH 54/75 mm/swapfile: do not sleep with a spin lock held
In reply to Greg Kroah-HartmanFrom: Qian Cai <[email protected]>
commit b11a76b37a5aa7b07c3e3eeeaae20b25475bddd3 upstream.
We can't call kvfree() with a spin lock held, so defer it. Fixes a might_sleep() runtime warning.
--- mm/swapfile.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/swapfile.c +3 -1
@@ -2868,6 +2868,7 @@ late_initcall(max_swapfiles_check);static struct swap_info_struct *alloc_swap_info (void ) {struct swap_info_struct *p; +struct swap_info_struct *defer =NULL ;unsigned int type;int i;
@@ -2896,7 +2897,7 @@ static struct swap_info_struct *alloc_swsmp_wmb ();WRITE_ONCE (nr_swapfiles, nr_swapfiles +1 ); }else { -kvfree (p); + defer = p; p = swap_info[type];/* * Do not memset this entry: a racing procfs swap_next()
@@ -2909,6 +2910,7 @@ static struct swap_info_struct *alloc_swplist_node_init (&p->avail_lists[i],0 ); p->flags =SWP_USED ;spin_unlock (&swap_lock); +kvfree (defer);spin_lock_init (&p->lock);spin_lock_init (&p->cont_lock);
Greg Kroah-Hartman
maintainerPATCH 55/75 hugetlb_cgroup: fix offline of hugetlb cgroup with reservations
In reply to Greg Kroah-HartmanFrom: Mike Kravetz <[email protected]>
commit 7a5bde37983d37783161681ff7c6122dfd081791 upstream.
Adrian Moreno was ruuning a kubernetes 1.19 + containerd/docker workload using hugetlbfs. In this environment the issue is reproduced by:
- Start a simple pod that uses the recently added HugePages medium feature (pod yaml attached)
- Start a DPDK app. It doesn't need to run successfully (as in transfer packets) nor interact with real hardware. It seems just initializing the EAL layer (which handles hugepage reservation and locking) is enough to trigger the issue
- Delete the Pod (or let it "Complete").
This would result in a kworker thread going into a tight loop (top output):
1425 root 20 0 0 0 0 R 99.7 0.0 5:22.45 kworker/28:7+cgroup_destroy
'perf top -g' reports:
- 63.28% 0.01% [kernel] [k] worker_thread
- 49.97% worker_thread
- 52.64% process_one_work
- 62.08% css_killed_work_fn
- hugetlb_cgroup_css_offline
41.52% _raw_spin_lock
- 2.82% _cond_resched
rcu_all_qs
2.66% PageHuge
- 0.57% schedule
- 0.57% __schedule
We are spinning in the do-while loop in hugetlb_cgroup_css_offline. Worse yet, we are holding the master cgroup lock (cgroup_mutex) while infinitely spinning. Little else can be done on the system as the cgroup_mutex can not be acquired.
Do note that the issue can be reproduced by simply offlining a hugetlb cgroup containing pages with reservation counts.
The loop in hugetlb_cgroup_css_offline is moving page counts from the cgroup being offlined to the parent cgroup. This is done for each hstate, and is repeated until hugetlb_cgroup_have_usage returns false. The routine moving counts (hugetlb_cgroup_move_parent) is only moving 'usage' counts. The routine hugetlb_cgroup_have_usage is checking for both 'usage' and 'reservation' counts. Discussion about what to do with reservation counts when reparenting was discussed here:
The decision was made to leave a zombie cgroup for with reservation counts. Unfortunately, the code checking reservation counts was incorrectly added to hugetlb_cgroup_have_usage.
To fix the issue, simply remove the check for reservation counts. While fixing this issue, a related bug in hugetlb_cgroup_css_offline was noticed. The hstate index is not reinitialized each time through the do-while loop. Fix this as well.
--- mm/hugetlb_cgroup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
mm/hugetlb_cgroup.c +3 -5
@@ -82,11 +82,8 @@ static inline bool hugetlb_cgroup_have_ufor (idx =0 ; idx < hugetlb_max_hstate; idx++) {if (page_counter_read ( -hugetlb_cgroup_counter_from_cgroup (h_cg, idx)) || -page_counter_read (hugetlb_cgroup_counter_from_cgroup_rsvd ( - h_cg, idx))) { +hugetlb_cgroup_counter_from_cgroup (h_cg, idx)))return true; - } }return false; }
@@ -202,9 +199,10 @@ static void hugetlb_cgroup_css_offline(sstruct hugetlb_cgroup *h_cg =hugetlb_cgroup_from_css (css);struct hstate *h;struct page *page; -int idx =0 ; +int idx; do { + idx = 0; for_each_hstate(h) { spin_lock(&hugetlb_lock); list_for_each_entry(page, &h->hugepage_activelist, lru)
Greg Kroah-Hartman
maintainerPATCH 56/75 Revert "amd/amdgpu: Disable VCN DPG mode for Picasso"
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
This patch should not have been applied to stable. It depends on changes in newer drivers.
This reverts commit 756fec062e4b823bbbe10b95cbcfa84f948131c6.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -1
@@ -1220,7 +1220,8 @@ static int soc15_common_early_init(void adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_MMHUB | -AMD_PG_SUPPORT_VCN ; +AMD_PG_SUPPORT_VCN | +AMD_PG_SUPPORT_VCN_DPG ; }else { adev->cg_flags =AMD_CG_SUPPORT_GFX_MGCG | AMD_CG_SUPPORT_GFX_MGLS |
Greg Kroah-Hartman
maintainerPATCH 57/75 iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs
In reply to Greg Kroah-HartmanFrom: Suravee Suthikulpanit <[email protected]>
commit 4165bf015ba9454f45beaad621d16c516d5c5afe upstream.
According to the AMD IOMMU spec, the commit 73db2fc595f3 ("iommu/amd: Increase interrupt remapping table limit to 512 entries") also requires the interrupt table length (IntTabLen) to be set to 9 (power of 2) in the device table mapping entry (DTE).
--- drivers/iommu/amd/amd_iommu_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd/amd_iommu_types.h +1 -1
@@ -254,7 +254,7 @@#define DTE_IRQ_REMAP_INTCTL_MASK (0x3ULL << 60)#define DTE_IRQ_TABLE_LEN_MASK (0xfULL << 1)#define DTE_IRQ_REMAP_INTCTL (2ULL << 60) -#define DTE_IRQ_TABLE_LEN (8ULL << 1) +#define DTE_IRQ_TABLE_LEN (9ULL << 1)#define DTE_IRQ_REMAP_ENABLE 1ULL#define PAGE_MODE_NONE 0x00
Greg Kroah-Hartman
maintainerPATCH 58/75 mm: memcg/slab: fix obj_cgroup_charge() return value handling
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit becaba65f62f88e553ec92ed98370e9d2b18e629 upstream.
Commit 10befea91b61 ("mm: memcg/slab: use a single set of kmem_caches for all allocations") introduced a regression into the handling of the obj_cgroup_charge() return value. If a non-zero value is returned (indicating of exceeding one of memory.max limits), the allocation should fail, instead of falling back to non-accounted mode.
To make the code more readable, move memcg_slab_pre_alloc_hook() and memcg_slab_post_alloc_hook() calling conditions into bodies of these hooks.
--- mm/slab.h | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-)
mm/slab.h +25 -17
@@ -275,25 +275,35 @@ static inline size_t obj_full_size(strucreturn s->size +sizeof (struct obj_cgroup *); } -static inline struct obj_cgroup *memcg_slab_pre_alloc_hook (struct kmem_cache *s, -size_t objects, -gfp_t flags) +/* +* Returns false if the allocation should fail. +*/ +static inline bool memcg_slab_pre_alloc_hook (struct kmem_cache *s, +struct obj_cgroup **objcgp, +size_t objects,gfp_t flags) {struct obj_cgroup *objcg; +if (!memcg_kmem_enabled ()) +return true; + +if (!(flags & __GFP_ACCOUNT) && !(s->flags &SLAB_ACCOUNT )) +return true; +if (memcg_kmem_bypass ()) -return NULL ; +return true; objcg =get_obj_cgroup_from_current ();if (!objcg) -return NULL ; +return true;if (obj_cgroup_charge (objcg, flags, objects *obj_full_size (s))) {obj_cgroup_put (objcg); -return NULL ; +return false; } -return objcg; + *objcgp = objcg; +return true; } static inline void mod_objcg_state(struct obj_cgroup *objcg,
@@ -319,7 +329,7 @@ static inline void memcg_slab_post_allocunsigned long off;size_t i; -if (!objcg) +if (!memcg_kmem_enabled () || !objcg)return ; flags &= ~__GFP_ACCOUNT;
@@ -404,11 +414,11 @@ static inline void memcg_free_page_obj_c { } -static inline struct obj_cgroup *memcg_slab_pre_alloc_hook (struct kmem_cache *s, -size_t objects, -gfp_t flags) +static inline bool memcg_slab_pre_alloc_hook (struct kmem_cache *s, +struct obj_cgroup **objcgp, +size_t objects,gfp_t flags) { -return NULL ; +return true; } static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s,
@@ -512,9 +522,8 @@ static inline struct kmem_cache *slab_prif (should_failslab (s, flags))return NULL ; -if (memcg_kmem_enabled () && - ((flags & __GFP_ACCOUNT) || (s->flags &SLAB_ACCOUNT ))) - *objcgp =memcg_slab_pre_alloc_hook (s, size, flags); +if (!memcg_slab_pre_alloc_hook (s, objcgp, size, flags)) +return NULL ;return s; }
@@ -533,8 +542,7 @@ static inline void slab_post_alloc_hook( s->flags, flags); } -if (memcg_kmem_enabled ()) -memcg_slab_post_alloc_hook (s, objcg, flags, size, p); +memcg_slab_post_alloc_hook (s, objcg, flags, size, p); }#ifndef CONFIG_SLOB
Greg Kroah-Hartman
maintainerPATCH 59/75 lib/syscall: fix syscall registers retrieval on 32-bit platforms
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit 4f134b89a24b965991e7c345b9a4591821f7c2a6 upstream.
Lilith >_> and Claudio Bozzato of Cisco Talos security team reported that collect_syscall() improperly casts the syscall registers to 64-bit values leaking the uninitialized last 24 bytes on 32-bit platforms, that are visible in /proc/self/syscall.
The cause is that info->data.args are u64 while syscall_get_arguments() uses longs, as hinted by the bogus pointer cast in the function.
Let's just proceed like the other call places, by retrieving the registers into an array of longs before assigning them to the caller's array. This was successfully tested on x86_64, i386 and ppc32.
Reference: CVE-2020-28588, TALOS-2020-1211
--- lib/syscall.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
lib/syscall.c +9 -2
@@ -7,6 +7,7 @@static int collect_syscall (struct task_struct *target,struct syscall_info *info) { +unsigned long args[6 ] = { };struct pt_regs *regs;if (!try_get_task_stack (target)) {
@@ -27,8 +28,14 @@ static int collect_syscall(struct task_s info->data.nr =syscall_get_nr (target, regs);if (info->data.nr !=-1L ) -syscall_get_arguments (target, regs, - (unsigned long *)&info->data.args[0 ]); +syscall_get_arguments (target, regs, args); + + info->data.args[0 ] = args[0 ]; + info->data.args[1 ] = args[1 ]; + info->data.args[2 ] = args[2 ]; + info->data.args[3 ] = args[3 ]; + info->data.args[4 ] = args[4 ]; + info->data.args[5 ] = args[5 ];put_task_stack (target);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 60/75 can: af_can: can_rx_unregister(): remove WARN() statement from list operation sanity check
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
commit d73ff9b7c4eacaba0fd956d14882bcae970f8307 upstream.
To detect potential bugs in CAN protocol implementations (double removal of receiver entries) a WARN() statement has been used if no matching list item was found for removal.
The fault injection issued by syzkaller was able to create a situation where the closing of a socket runs simultaneously to the notifier call chain for removing the CAN network device in use.
This case is very unlikely in real life but it doesn't break anything. Therefore we just replace the WARN() statement with pr_warn() to preserve the notification for the CAN protocol development.
--- net/can/af_can.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/can/af_can.c +5 -2
@@ -541,10 +541,13 @@ void can_rx_unregister(struct net *net,/* Check for bugs in CAN protocol implementations using af_can.c: * 'rcv' will be NULL if no matching list item was found for removal. +* As this case may potentially happen when closing a socket while +* the notifier for removing the CAN netdev is running we just print +* a warning here. */ if (!rcv) { -WARN (1 ,"BUG: receive list entry not found for dev %s, id %03X, mask %03X\n" , -DNAME (dev), can_id, mask); +pr_warn ("can: receive list entry not found for dev %s, id %03X, mask %03X\n" , +DNAME (dev), can_id, mask); goto out; }
Greg Kroah-Hartman
maintainerPATCH 61/75 gfs2: check for empty rgrp tree in gfs2_ri_update
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
commit 778721510e84209f78e31e2ccb296ae36d623f5e upstream.
If gfs2 tries to mount a (corrupt) file system that has no resource groups it still tries to set preferences on the first one, which causes a kernel null pointer dereference. This patch adds a check to function gfs2_ri_update so this condition is detected and reported back as an error.
--- fs/gfs2/rgrp.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/gfs2/rgrp.c +4 -0
@@ -989,6 +989,10 @@ static int gfs2_ri_update(struct gfs2_inif (error <0 )return error; +if (RB_EMPTY_ROOT (&sdp->sd_rindex_tree)) { +fs_err (sdp,"no resource groups found in the file system.\n" ); +return -ENOENT ; + }set_rgrp_preferences (sdp); sdp->sd_rindex_uptodate =1 ;
Greg Kroah-Hartman
maintainerPATCH 62/75 netfilter: ipset: prevent uninit-value in hash_ip6_add
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 68ad89de918e1c5a79c9c56127e5e31741fd517e upstream.
syzbot found that we are not validating user input properly before copying 16 bytes [1].
Using NLA_BINARY in ipaddr_policy[] for IPv6 address is not correct, since it ensures at most 16 bytes were provided.
We should instead make sure user provided exactly 16 bytes.
In old kernels (before v4.20), fix would be to remove the NLA_BINARY, since NLA_POLICY_EXACT_LEN() was not yet available.
[1]
BUG: KMSAN: uninit-value in hash_ip6_add+0x1cba/0x3a50 net/netfilter/ipset/ip_set_hash_gen.h:892 CPU: 1 PID: 11611 Comm: syz-executor.0 Not tainted 5.10.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x21c/0x280 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x5f/0xa0 mm/kmsan/kmsan_instr.c:197 hash_ip6_add+0x1cba/0x3a50 net/netfilter/ipset/ip_set_hash_gen.h:892 hash_ip6_uadt+0x976/0xbd0 net/netfilter/ipset/ip_set_hash_ip.c:267 call_ad+0x329/0xd00 net/netfilter/ipset/ip_set_core.c:1720 ip_set_ad+0x111f/0x1440 net/netfilter/ipset/ip_set_core.c:1808 ip_set_uadd+0xf6/0x110 net/netfilter/ipset/ip_set_core.c:1833 nfnetlink_rcv_msg+0xc7d/0xdf0 net/netfilter/nfnetlink.c:252 netlink_rcv_skb+0x70a/0x820 net/netlink/af_netlink.c:2494 nfnetlink_rcv+0x4f0/0x4380 net/netfilter/nfnetlink.c:600 netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline] netlink_unicast+0x11da/0x14b0 net/netlink/af_netlink.c:1330 netlink_sendmsg+0x173c/0x1840 net/netlink/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] ____sys_sendmsg+0xc7a/0x1240 net/socket.c:2353 ___sys_sendmsg net/socket.c:2407 [inline] __sys_sendmsg+0x6d5/0x830 net/socket.c:2440 __do_sys_sendmsg net/socket.c:2449 [inline] __se_sys_sendmsg+0x97/0xb0 net/socket.c:2447 __x64_sys_sendmsg+0x4a/0x70 net/socket.c:2447 do_syscall_64+0x9f/0x140 arch/x86/entry/common.c:48 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x45deb9 Code: 0d b4 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 db b3 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fe2e503fc78 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000029ec0 RCX: 000000000045deb9 RDX: 0000000000000000 RSI: 0000000020000140 RDI: 0000000000000003 RBP: 000000000118bf60 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 000000000118bf2c R13: 000000000169fb7f R14: 00007fe2e50409c0 R15: 000000000118bf2c
Uninit was stored to memory at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:121 [inline] kmsan_internal_chain_origin+0xad/0x130 mm/kmsan/kmsan.c:289 __msan_chain_origin+0x57/0xa0 mm/kmsan/kmsan_instr.c:147 ip6_netmask include/linux/netfilter/ipset/pfxlen.h:49 [inline] hash_ip6_netmask net/netfilter/ipset/ip_set_hash_ip.c:185 [inline] hash_ip6_uadt+0xb1c/0xbd0 net/netfilter/ipset/ip_set_hash_ip.c:263 call_ad+0x329/0xd00 net/netfilter/ipset/ip_set_core.c:1720 ip_set_ad+0x111f/0x1440 net/netfilter/ipset/ip_set_core.c:1808 ip_set_uadd+0xf6/0x110 net/netfilter/ipset/ip_set_core.c:1833 nfnetlink_rcv_msg+0xc7d/0xdf0 net/netfilter/nfnetlink.c:252 netlink_rcv_skb+0x70a/0x820 net/netlink/af_netlink.c:2494 nfnetlink_rcv+0x4f0/0x4380 net/netfilter/nfnetlink.c:600 netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline] netlink_unicast+0x11da/0x14b0 net/netlink/af_netlink.c:1330 netlink_sendmsg+0x173c/0x1840 net/netlink/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] ____sys_sendmsg+0xc7a/0x1240 net/socket.c:2353 ___sys_sendmsg net/socket.c:2407 [inline] __sys_sendmsg+0x6d5/0x830 net/socket.c:2440 __do_sys_sendmsg net/socket.c:2449 [inline] __se_sys_sendmsg+0x97/0xb0 net/socket.c:2447 __x64_sys_sendmsg+0x4a/0x70 net/socket.c:2447 do_syscall_64+0x9f/0x140 arch/x86/entry/common.c:48 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Uninit was stored to memory at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:121 [inline] kmsan_internal_chain_origin+0xad/0x130 mm/kmsan/kmsan.c:289 kmsan_memcpy_memmove_metadata+0x25e/0x2d0 mm/kmsan/kmsan.c:226 kmsan_memcpy_metadata+0xb/0x10 mm/kmsan/kmsan.c:246 __msan_memcpy+0x46/0x60 mm/kmsan/kmsan_instr.c:110 ip_set_get_ipaddr6+0x2cb/0x370 net/netfilter/ipset/ip_set_core.c:310 hash_ip6_uadt+0x439/0xbd0 net/netfilter/ipset/ip_set_hash_ip.c:255 call_ad+0x329/0xd00 net/netfilter/ipset/ip_set_core.c:1720 ip_set_ad+0x111f/0x1440 net/netfilter/ipset/ip_set_core.c:1808 ip_set_uadd+0xf6/0x110 net/netfilter/ipset/ip_set_core.c:1833 nfnetlink_rcv_msg+0xc7d/0xdf0 net/netfilter/nfnetlink.c:252 netlink_rcv_skb+0x70a/0x820 net/netlink/af_netlink.c:2494 nfnetlink_rcv+0x4f0/0x4380 net/netfilter/nfnetlink.c:600 netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline] netlink_unicast+0x11da/0x14b0 net/netlink/af_netlink.c:1330 netlink_sendmsg+0x173c/0x1840 net/netlink/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] ____sys_sendmsg+0xc7a/0x1240 net/socket.c:2353 ___sys_sendmsg net/socket.c:2407 [inline] __sys_sendmsg+0x6d5/0x830 net/socket.c:2440 __do_sys_sendmsg net/socket.c:2449 [inline] __se_sys_sendmsg+0x97/0xb0 net/socket.c:2447 __x64_sys_sendmsg+0x4a/0x70 net/socket.c:2447 do_syscall_64+0x9f/0x140 arch/x86/entry/common.c:48 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Uninit was created at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:121 [inline] kmsan_internal_poison_shadow+0x5c/0xf0 mm/kmsan/kmsan.c:104 kmsan_slab_alloc+0x8d/0xe0 mm/kmsan/kmsan_hooks.c:76 slab_alloc_node mm/slub.c:2906 [inline] __kmalloc_node_track_caller+0xc61/0x15f0 mm/slub.c:4512 __kmalloc_reserve net/core/skbuff.c:142 [inline] __alloc_skb+0x309/0xae0 net/core/skbuff.c:210 alloc_skb include/linux/skbuff.h:1094 [inline] netlink_alloc_large_skb net/netlink/af_netlink.c:1176 [inline] netlink_sendmsg+0xdb8/0x1840 net/netlink/af_netlink.c:1894 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] ____sys_sendmsg+0xc7a/0x1240 net/socket.c:2353 ___sys_sendmsg net/socket.c:2407 [inline] __sys_sendmsg+0x6d5/0x830 net/socket.c:2440 __do_sys_sendmsg net/socket.c:2449 [inline] __se_sys_sendmsg+0x97/0xb0 net/socket.c:2447 __x64_sys_sendmsg+0x4a/0x70 net/socket.c:2447 do_syscall_64+0x9f/0x140 arch/x86/entry/common.c:48 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- net/netfilter/ipset/ip_set_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/netfilter/ipset/ip_set_core.c +1 -2
@@ -286,8 +286,7 @@ flag_nested(const struct nlattr *nla)static const struct nla_policy ipaddr_policy[IPSET_ATTR_IPADDR_MAX +1 ] = { [IPSET_ATTR_IPADDR_IPV4 ] = { .type =NLA_U32 }, - [IPSET_ATTR_IPADDR_IPV6 ] = { .type =NLA_BINARY , - .len =sizeof (struct in6_addr ) }, + [IPSET_ATTR_IPADDR_IPV6 ] =NLA_POLICY_EXACT_LEN (sizeof (struct in6_addr )), };int
Greg Kroah-Hartman
maintainerPATCH 63/75 tipc: fix a deadlock when flushing scheduled work
In reply to Greg Kroah-HartmanFrom: Hoang Huu Le <[email protected]>
commit d966ddcc38217a6110a6a0ff37ad2dee7d42e23e upstream.
In the commit fdeba99b1e58
("tipc: fix use-after-free in tipc_bcast_get_mode"), we're trying to make sure the tipc_net_finalize_work work item finished if it enqueued. But calling flush_scheduled_work() is not just affecting above work item but either any scheduled work. This has turned out to be overkill and caused to deadlock as syzbot reported:
======================================================
WARNING: possible circular locking dependency detected
5.9.0-rc2-next-20200828-syzkaller #0 Not tainted
------------------------------------------------------
kworker/u4:6/349 is trying to acquire lock:ffff8880aa063d38 ((wq_completion)events){+.+.}-{0:0}, at: flush_workqueue+0xe1/0x13e0 kernel/workqueue.c:2777
but task is already holding lock:ffffffff8a879430 (pernet_ops_rwsem){++++}-{3:3}, at: cleanup_net+0x9b/0xb10 net/core/net_namespace.c:565
[...]
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(pernet_ops_rwsem);
lock(&sb->s_type->i_mutex_key#13);
lock(pernet_ops_rwsem);lock((wq_completion)events);
*** DEADLOCK ***
[...]
v1:
To fix the original issue, we replace above calling by introducing a bit flag. When a namespace cleaned-up, bit flag is set to zero and:
- tipc_net_finalize functionial just does return immediately.
- tipc_net_finalize_work does not enqueue into the scheduled work queue.
v2:
Use cancel_work_sync() helper to make sure ONLY the tipc_net_finalize_work() stopped before releasing bcbase object.
--- net/tipc/core.c | 9 +++++---- net/tipc/core.h | 8 ++++++++ net/tipc/net.c | 20 +++++--------------- net/tipc/net.h | 1 + 4 files changed, 19 insertions(+), 19 deletions(-)
net/tipc/core.c +5 -4
@@ -60,6 +60,7 @@ static int __net_init tipc_init_net(stru tn->trial_addr =0 ; tn->addr_trial_end =0 ; tn->capabilities =TIPC_NODE_CAPABILITIES ; +INIT_WORK (&tn->final_work.work, tipc_net_finalize_work);memset (tn->node_id,0 ,sizeof (tn->node_id));memset (tn->node_id_string,0 ,sizeof (tn->node_id_string)); tn->mon_threshold =TIPC_DEF_MON_THRESHOLD ;
@@ -107,13 +108,13 @@ out_crypto: static void __net_exit tipc_exit_net(struct net *net) { +struct tipc_net *tn =tipc_net (net); +tipc_detach_loopback (net); +/* Make sure the tipc_net_finalize_work() finished */ +cancel_work_sync (&tn->final_work.work);tipc_net_stop (net); -/* Make sure the tipc_net_finalize_work stopped -* before releasing the resources. -*/ -flush_scheduled_work ();tipc_bcast_stop (net);tipc_nametbl_stop (net);tipc_sk_rht_destroy (net);
net/tipc/core.h +8 -0
@@ -90,6 +90,12 @@ extern unsigned int tipc_net_id __read_mextern int sysctl_tipc_rmem[3 ]__read_mostly ;extern int sysctl_tipc_named_timeout__read_mostly ; +struct tipc_net_work { +struct work_struct work; +struct net *net; +u32 addr; +}; +struct tipc_net {u8 node_id[NODE_ID_LEN ];u32 node_addr;
@@ -143,6 +149,8 @@ struct tipc_net {/* TX crypto handler */ struct tipc_crypto *crypto_tx;#endif +/* Work item for net finalize */ +struct tipc_net_work final_work; };static inline struct tipc_net *tipc_net (struct net *net)
net/tipc/net.c +5 -15
@@ -105,12 +105,6 @@* - A local spin_lock protecting the queue of subscriber events. */ -struct tipc_net_work { -struct work_struct work; -struct net *net; -u32 addr; -}; -static void tipc_net_finalize (struct net *net,u32 addr);int tipc_net_init (struct net *net,u8 *node_id,u32 addr)
@@ -142,25 +136,21 @@ static void tipc_net_finalize(struct net TIPC_CLUSTER_SCOPE, 0, addr); } -static void tipc_net_finalize_work (struct work_struct *work) +void tipc_net_finalize_work (struct work_struct *work) {struct tipc_net_work *fwork; fwork = container_of(work, struct tipc_net_work, work);tipc_net_finalize (fwork->net, fwork->addr); -kfree (fwork); }void tipc_sched_net_finalize (struct net *net,u32 addr) { -struct tipc_net_work *fwork =kzalloc (sizeof (*fwork),GFP_ATOMIC ); +struct tipc_net *tn =tipc_net (net); -if (!fwork) -return ; -INIT_WORK (&fwork->work, tipc_net_finalize_work); - fwork->net = net; - fwork->addr = addr; -schedule_work (&fwork->work); + tn->final_work.net = net; + tn->final_work.addr = addr; +schedule_work (&tn->final_work.work); }void tipc_net_stop (struct net *net)
net/tipc/net.h +1 -0
@@ -42,6 +42,7 @@extern const struct nla_policy tipc_nl_net_policy[];int tipc_net_init (struct net *net,u8 *node_id,u32 addr); +void tipc_net_finalize_work (struct work_struct *work);void tipc_sched_net_finalize (struct net *net,u32 addr);void tipc_net_stop (struct net *net);int tipc_nl_net_dump (struct sk_buff *skb,struct netlink_callback *cb);
Greg Kroah-Hartman
maintainerPATCH 64/75 ASoC: wm_adsp: fix error return code in wm_adsp_load()
In reply to Greg Kroah-HartmanFrom: Luo Meng <[email protected]>
commit 3fba05a2832f93b4d0cd4204f771fdae0d823114 upstream.
Fix to return a negative error code from the error handling case instead of 0 in function wm_adsp_load(), as done elsewhere in this function.
--- sound/soc/codecs/wm_adsp.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wm_adsp.c +1 -0
@@ -1937,6 +1937,7 @@ static int wm_adsp_load(struct wm_adsp * mem =wm_adsp_find_region (dsp, type);if (!mem) {adsp_err (dsp,"No region of type: %x\n" , type); + ret = -EINVAL ; goto out_fw; }
Greg Kroah-Hartman
maintainerPATCH 65/75 gfs2: Fix deadlock dumping resource group glocks
In reply to Greg Kroah-HartmanFrom: Alexander Aring <[email protected]>
commit 16e6281b6b22b0178eab95c6a82502d7b10f67b8 upstream.
Commit 0e539ca1bbbe ("gfs2: Fix NULL pointer dereference in gfs2_rgrp_dump") introduced additional locking in gfs2_rgrp_go_dump, which is also used for dumping resource group glocks via debugfs. However, on that code path, the glock spin lock is already taken in dump_glock, and taking it again in gfs2_glock2rgrp leads to deadlock. This can be reproduced with:
$ mkfs.gfs2 -O -p lock_nolock /dev/FOO $ mount /dev/FOO /mnt/foo $ touch /mnt/foo/bar $ cat /sys/kernel/debug/gfs2/FOO/glocks
Fix that by not taking the glock spin lock inside the go_dump callback.
--- fs/gfs2/glops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/glops.c +1 -1
@@ -230,7 +230,7 @@ static void rgrp_go_inval(struct gfs2_glstatic void gfs2_rgrp_go_dump (struct seq_file *seq,struct gfs2_glock *gl,const char *fs_id_buf) { -struct gfs2_rgrpd *rgd =gfs2_glock2rgrp (gl); +struct gfs2_rgrpd *rgd = gl->gl_object;if (rgd)gfs2_rgrp_dump (seq, rgd, fs_id_buf);
Greg Kroah-Hartman
maintainerPATCH 66/75 gfs2: Dont freeze the file system during unmount
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
commit f39e7d3aae2934b1cfdd209b54c508e2552e9531 upstream.
GFS2's freeze/thaw mechanism uses a special freeze glock to control its operation. It does this with a sync glock operation (glops.c) called freeze_go_sync. When the freeze glock is demoted (glock's do_xmote) the glops function causes the file system to be frozen. This is intended. However, GFS2's mount and unmount processes also hold the freeze glock to prevent other processes, perhaps on different cluster nodes, from mounting the frozen file system in read-write mode.
Before this patch, there was no check in freeze_go_sync for whether a freeze in intended or whether the glock demote was caused by a normal unmount. So it was trying to freeze the file system it's trying to unmount, which ends up in a deadlock.
This patch adds an additional check to freeze_go_sync so that demotes of the freeze glock are ignored if they come from the unmount process.
--- fs/gfs2/glops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/gfs2/glops.c +2 -1
@@ -551,7 +551,8 @@ static int freeze_go_sync(struct gfs2_gl* Once thawed, the work func acquires the freeze glock in * SH and everybody goes back to thawed. */ -if (gl->gl_state ==LM_ST_SHARED && !gfs2_withdrawn (sdp)) { +if (gl->gl_state ==LM_ST_SHARED && !gfs2_withdrawn (sdp) && + !test_bit (SDF_NORECOVERY , &sdp->sd_flags)) {atomic_set (&sdp->sd_freeze_state,SFS_STARTING_FREEZE ); error =freeze_super (sdp->sd_vfs);if (error) {
Greg Kroah-Hartman
maintainerPATCH 67/75 rtw88: debug: Fix uninitialized memory in debugfs code
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 74a8c816fa8fa7862df870660e9821abb56649fe upstream.
This code does not ensure that the whole buffer is initialized and none of the callers check for errors so potentially none of the buffer is initialized. Add a memset to eliminate this bug.
--- drivers/net/wireless/realtek/rtw88/debug.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/realtek/rtw88/debug.c +2 -0
@@ -147,6 +147,8 @@ static int rtw_debugfs_copy_from_user(ch {int tmp_len; +memset (tmp,0 , size); +if (count < num)return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 68/75 i2c: qcom: Fix IRQ error misassignement
In reply to Greg Kroah-HartmanFrom: Robert Foss <[email protected]>
commit 14718b3e129b058cb716a60c6faf40ef68661c54 upstream.
During cci_isr() errors read from register fields belonging to i2c master1 are currently assigned to the status field belonging to i2c master0. This patch corrects this error, and always assigns master1 errors to the status field of master1.
--- drivers/i2c/busses/i2c-qcom-cci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-qcom-cci.c +2 -2
@@ -194,9 +194,9 @@ static irqreturn_t cci_isr(int irq, voidif (unlikely (val &CCI_IRQ_STATUS_0_I2C_M1_ERROR )) {if (val &CCI_IRQ_STATUS_0_I2C_M1_Q0_NACK_ERR || val &CCI_IRQ_STATUS_0_I2C_M1_Q1_NACK_ERR ) - cci->master[0 ].status = -ENXIO ; + cci->master[1 ].status = -ENXIO ;else - cci->master[0 ].status = -EIO ; + cci->master[1 ].status = -EIO ;writel (CCI_HALT_REQ_I2C_M1_Q0Q1 , cci->base +CCI_HALT_REQ ); ret =IRQ_HANDLED ;
Greg Kroah-Hartman
maintainerPATCH 69/75 i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc()
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit e9acf0298c664f825e6f1158f2a97341bf9e03ca upstream.
Fix to return the error code from qup_i2c_change_state() instaed of 0 in qup_i2c_bam_schedule_desc().
--- drivers/i2c/busses/i2c-qup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-qup.c +2 -1
@@ -801,7 +801,8 @@ static int qup_i2c_bam_schedule_desc(strif (ret || qup->bus_err || qup->qup_err) {reinit_completion (&qup->xfer); -if (qup_i2c_change_state (qup,QUP_RUN_STATE )) { + ret =qup_i2c_change_state (qup,QUP_RUN_STATE ); +if (ret) {dev_err (qup->dev,"change to run state timed out" ); goto desc_err; }
Greg Kroah-Hartman
maintainerPATCH 70/75 dm writecache: remove BUG() and fail gracefully instead
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit 857c4c0a8b2888d806f4308c58f59a6a81a1dee9 upstream.
Building on arch/s390/ results in this build error:
cc1: some warnings being treated as errors../drivers/md/dm-writecache.c: In function 'persistent_memory_claim':../drivers/md/dm-writecache.c:323:1: error: no return statement in function returning non-void [-Werror=return-type]
Fix this by replacing the BUG() with an -EOPNOTSUPP return.
--- drivers/md/dm-writecache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-writecache.c +1 -1
@@ -319,7 +319,7 @@ err1:#else static int persistent_memory_claim (struct dm_writecache *wc) { -BUG (); +return -EOPNOTSUPP ; }#endif
Greg Kroah-Hartman
maintainerPATCH 71/75 Input: i8042 - fix error return code in i8042_setup_aux()
In reply to Greg Kroah-HartmanFrom: Luo Meng <[email protected]>
commit 855b69857830f8d918d715014f05e59a3f7491a0 upstream.
Fix to return a negative error code from the error handling case instead of 0 in function i8042_setup_aux(), as done elsewhere in this function.
--- drivers/input/serio/i8042.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/serio/i8042.c +2 -1
@@ -1471,7 +1471,8 @@ static int __init i8042_setup_aux(void)if (error) goto err_free_ports; -if (aux_enable ()) + error =aux_enable (); +if (error) goto err_free_irq; i8042_aux_irq_registered = true;
Greg Kroah-Hartman
maintainerPATCH 72/75 netfilter: nf_tables: avoid false-postive lockdep splat
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit c0700dfa2cae44c033ed97dade8a2679c7d22a9d upstream.
There are reports wrt lockdep splat in nftables, e.g.:
------------[ cut here ]------------ WARNING: CPU: 2 PID: 31416 at net/netfilter/nf_tables_api.c:622 lockdep_nfnl_nft_mutex_not_held+0x28/0x38 [nf_tables]
...
These are caused by an earlier, unrelated bug such as a n ABBA deadlock in a different subsystem.
In such an event, lockdep is disabled and lockdep_is_held returns true unconditionally. This then causes the WARN() in nf_tables.
Make the WARN conditional on lockdep still active to avoid this.
--- net/netfilter/nf_tables_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +2 -1
@@ -619,7 +619,8 @@ static int nft_request_module(struct netstatic void lockdep_nfnl_nft_mutex_not_held (void ) {#ifdef CONFIG_PROVE_LOCKING -WARN_ON_ONCE (lockdep_nfnl_is_held (NFNL_SUBSYS_NFTABLES )); +if (debug_locks) +WARN_ON_ONCE (lockdep_nfnl_is_held (NFNL_SUBSYS_NFTABLES ));#endif }
Greg Kroah-Hartman
maintainerPATCH 73/75 netfilter: nftables_offload: set address type in control dissector
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 3c78e9e0d33a27ab8050e4492c03c6a1f8d0ed6b upstream.
This patch adds nft_flow_rule_set_addr_type() to set the address type from the nft_payload expression accordingly.
If the address type is not set in the control dissector then a rule that matches either on source or destination IP address does not work.
After this patch, nft hardware offload generates the flow dissector configuration as tc-flower does to match on an IP address.
This patch has been also tested functionally to make sure packets are filtered out by the NIC.
This is also getting the code aligned with the existing netfilter flow offload infrastructure which is also setting the control dissector.
--- include/net/netfilter/nf_tables_offload.h | 4 ++++ net/netfilter/nf_tables_offload.c | 17 +++++++++++++++++ net/netfilter/nft_payload.c | 4 ++++ 3 files changed, 25 insertions(+)
include/net/netfilter/nf_tables_offload.h +4 -0
@@ -37,6 +37,7 @@ void nft_offload_update_dependency(strucstruct nft_flow_key {struct flow_dissector_key_basic basic; +struct flow_dissector_key_control control;union {struct flow_dissector_key_ipv4_addrs ipv4;struct flow_dissector_key_ipv6_addrs ipv6;
@@ -62,6 +63,9 @@ struct nft_flow_rule {#define NFT_OFFLOAD_F_ACTION (1 << 0) +void nft_flow_rule_set_addr_type (struct nft_flow_rule *flow, +enum flow_dissector_key_id addr_type); +struct nft_rule ;struct nft_flow_rule *nft_flow_rule_create (struct net *net,const struct nft_rule *rule);void nft_flow_rule_destroy (struct nft_flow_rule *flow);
net/netfilter/nf_tables_offload.c +17 -0
@@ -28,6 +28,23 @@ static struct nft_flow_rule *nft_flow_rureturn flow; } +void nft_flow_rule_set_addr_type (struct nft_flow_rule *flow, +enum flow_dissector_key_id addr_type) +{ +struct nft_flow_match *match = &flow->match; +struct nft_flow_key *mask = &match->mask; +struct nft_flow_key *key = &match->key; + +if (match->dissector.used_keys &BIT (FLOW_DISSECTOR_KEY_CONTROL )) +return ; + + key->control.addr_type = addr_type; + mask->control.addr_type =0xffff ; + match->dissector.used_keys |=BIT (FLOW_DISSECTOR_KEY_CONTROL ); + match->dissector.offset[FLOW_DISSECTOR_KEY_CONTROL ] = + offsetof(struct nft_flow_key , control); +} +struct nft_flow_rule *nft_flow_rule_create (struct net *net,const struct nft_rule *rule) {
net/netfilter/nft_payload.c +4 -0
@@ -243,6 +243,7 @@ static int nft_payload_offload_ip(structNFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_IPV4_ADDRS , ipv4, src,sizeof (struct in_addr ), reg); +nft_flow_rule_set_addr_type (flow,FLOW_DISSECTOR_KEY_IPV4_ADDRS );break ;case offsetof(struct iphdr , daddr):if (priv->len !=sizeof (struct in_addr ))
@@ -250,6 +251,7 @@ static int nft_payload_offload_ip(structNFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_IPV4_ADDRS , ipv4, dst,sizeof (struct in_addr ), reg); +nft_flow_rule_set_addr_type (flow,FLOW_DISSECTOR_KEY_IPV4_ADDRS );break ;case offsetof(struct iphdr , protocol):if (priv->len !=sizeof (__u8))
@@ -279,6 +281,7 @@ static int nft_payload_offload_ip6(strucNFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_IPV6_ADDRS , ipv6, src,sizeof (struct in6_addr ), reg); +nft_flow_rule_set_addr_type (flow,FLOW_DISSECTOR_KEY_IPV6_ADDRS );break ;case offsetof(struct ipv6hdr , daddr):if (priv->len !=sizeof (struct in6_addr ))
@@ -286,6 +289,7 @@ static int nft_payload_offload_ip6(strucNFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_IPV6_ADDRS , ipv6, dst,sizeof (struct in6_addr ), reg); +nft_flow_rule_set_addr_type (flow,FLOW_DISSECTOR_KEY_IPV6_ADDRS );break ;case offsetof(struct ipv6hdr , nexthdr):if (priv->len !=sizeof (__u8))
Greg Kroah-Hartman
maintainerPATCH 74/75 netfilter: nftables_offload: build mask based from the matching bytes
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit a5d45bc0dc50f9dd83703510e9804d813a9cac32 upstream.
Userspace might match on prefix bytes of header fields if they are on the byte boundary, this requires that the mask is adjusted accordingly. Use NFT_OFFLOAD_MATCH_EXACT() for meta since prefix byte matching is not allowed for this type of selector.
The bitwise expression might be optimized out by userspace, hence the kernel needs to infer the prefix from the number of payload bytes to match on. This patch adds nft_payload_offload_mask() to calculate the bitmask to match on the prefix.
--- include/net/netfilter/nf_tables_offload.h | 3 + net/netfilter/nft_cmp.c | 8 +-- net/netfilter/nft_meta.c | 16 +++---- net/netfilter/nft_payload.c | 66 ++++++++++++++++++++++-------- 4 files changed, 64 insertions(+), 29 deletions(-)
include/net/netfilter/nf_tables_offload.h +3 -0
@@ -78,6 +78,9 @@ int nft_flow_rule_offload_commit(struct offsetof(struct nft_flow_key, __base.__field); \ (__reg)->len = __len; \ (__reg)->key = __key; \ + +#define NFT_OFFLOAD_MATCH_EXACT (__key, __base, __field, __len, __reg) \ + NFT_OFFLOAD_MATCH(__key, __base, __field, __len, __reg) \ memset(&(__reg)->mask, 0xff, (__reg)->len);int nft_chain_offload_priority (struct nft_base_chain *basechain);
net/netfilter/nft_cmp.c +4 -4
@@ -123,11 +123,11 @@ static int __nft_cmp_offload(struct nft_u8 *mask = (u8 *)&flow->match.mask;u8 *key = (u8 *)&flow->match.key; -if (priv->op !=NFT_CMP_EQ || reg->len != priv->len) +if (priv->op !=NFT_CMP_EQ || priv->len > reg->len)return -EOPNOTSUPP ; -memcpy (key + reg->offset, &priv->data, priv->len); -memcpy (mask + reg->offset, ®->mask, priv->len); +memcpy (key + reg->offset, &priv->data, reg->len); +memcpy (mask + reg->offset, ®->mask, reg->len); flow->match.dissector.used_keys |=BIT (reg->key); flow->match.dissector.offset[reg->key] = reg->base_offset;
@@ -137,7 +137,7 @@ static int __nft_cmp_offload(struct nft_ nft_reg_load16(priv->data.data) != ARPHRD_ETHER) return -EOPNOTSUPP; -nft_offload_update_dependency (ctx, &priv->data, priv->len); +nft_offload_update_dependency (ctx, &priv->data, reg->len);return 0 ; }
net/netfilter/nft_meta.c +8 -8
@@ -724,22 +724,22 @@ static int nft_meta_get_offload(struct nswitch (priv->key) {case NFT_META_PROTOCOL : -NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_BASIC , basic, n_proto, -sizeof (__u16), reg); +NFT_OFFLOAD_MATCH_EXACT (FLOW_DISSECTOR_KEY_BASIC , basic, n_proto, +sizeof (__u16), reg);nft_offload_set_dependency (ctx,NFT_OFFLOAD_DEP_NETWORK );break ;case NFT_META_L4PROTO : -NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_BASIC , basic, ip_proto, -sizeof (__u8), reg); +NFT_OFFLOAD_MATCH_EXACT (FLOW_DISSECTOR_KEY_BASIC , basic, ip_proto, +sizeof (__u8), reg);nft_offload_set_dependency (ctx,NFT_OFFLOAD_DEP_TRANSPORT );break ;case NFT_META_IIF : -NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_META , meta, - ingress_ifindex,sizeof (__u32), reg); +NFT_OFFLOAD_MATCH_EXACT (FLOW_DISSECTOR_KEY_META , meta, + ingress_ifindex,sizeof (__u32), reg);break ;case NFT_META_IIFTYPE : -NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_META , meta, - ingress_iftype,sizeof (__u16), reg); +NFT_OFFLOAD_MATCH_EXACT (FLOW_DISSECTOR_KEY_META , meta, + ingress_iftype,sizeof (__u16), reg);break ;default :return -EOPNOTSUPP ;
net/netfilter/nft_payload.c +49 -17
174 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 75/75 x86/insn-eval: Use new for_each_insn_prefix() macro to loop over prefixes bytes
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
commit 12cb908a11b2544b5f53e9af856e6b6a90ed5533 upstream
Since insn.prefixes.nbytes can be bigger than the size of insn.prefixes.bytes[] when a prefix is repeated, the proper check must be
insn.prefixes.bytes[i] != 0 and i < 4
instead of using insn.prefixes.nbytes. Use the new for_each_insn_prefix() macro which does it correctly.
Debugged by Kees Cook <[email protected]>.
[ bp: Massage commit message. ]
--- arch/x86/lib/insn-eval.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/lib/insn-eval.c +3 -2
@@ -70,14 +70,15 @@ static int get_seg_reg_override_idx(stru {int idx =INAT_SEG_REG_DEFAULT ;int num_overrides =0 , i; +insn_byte_t p;insn_get_prefixes (insn);/* Look for any segment override prefixes. */ -for (i =0 ; i < insn->prefixes.nbytes; i++) { +for_each_insn_prefix (insn, i, p) {insn_attr_t attr; - attr =inat_get_opcode_attribute (insn->prefixes.bytes[i]); + attr =inat_get_opcode_attribute (p);switch (attr) {case INAT_MAKE_PREFIX (INAT_PFX_CS ): idx =INAT_SEG_REG_CS ;
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.9.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.9:
15 builds: 15 pass, 0 fail
26 boots: 26 pass, 0 fail
64 tests: 64 pass, 0 failLinux version: 5.9.14-rc1-g81beabff31a7
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Greg Kroah-Hartman
maintainerQuoted 26 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.9.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.9:
15 builds: 15 pass, 0 fail 26 boots: 26 pass, 0 fail 64 tests: 64 pass, 0 fail
Quoted 7 lines
Linux version: 5.9.14-rc1-g81beabff31a7
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Tested-by Jon Hunter <[email protected]>
Thanks for testing them all!
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.9.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 15 lines · Shuah Khan
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.9.y
and the diffstat can be found below.
Quoted 9 lines
Quoted 4 lines
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Tested-by Shuah Khan <[email protected]>
thanks for testing them all and letting me know.
greg k-h
Quoted 16 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.14-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-
stable-rc.git linux-5.9.y
and the diffstat can be found below.
Quoted 4 lines
thanks,
greg k-h
hello,
Compiled and booted 5.9.14-rc1+. No typical dmesg regression or regressions.
Signature · 2 lines
software engineer rajagiri school of engineering and technology - autonomous
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
Build results:
total: 154 pass: 154 fail: 0 Qemu test results: total: 426 pass: 426 fail: 0
Guenter
Greg Kroah-Hartman
maintainerQuoted 10 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
Quoted 6 lines
Build results:
total: 154 pass: 154 fail: 0 Qemu test results: total: 426 pass: 426 fail: 0Tested-by Guenter Roeck <[email protected]>
Thanks for testing all of these and letting me know.
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.9.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.9.14-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.9.y
git commit: 81beabff31a7c60d2065f5711ffda6d97776a728
git describe: v5.9.13-77-g81beabff31a7
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.9.y/build/v5.9.13-77-g81beabff31a7
No regressions (compared to build v5.9.13)
No fixes (compared to build v5.9.13)
Ran 57691 total tests in the following environments and test suites.
Environments
--------------
- arc
- arm
- arm64
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- mips
- nxp-ls2088
- parisc
- powerpc
- qemu-arm-clang
- qemu-arm64-clang
- qemu-arm64-kasan
- qemu-i386-clang
- qemu-x86_64-clang
- qemu-x86_64-kasan
- qemu-x86_64-kcsan
- qemu_arm
- qemu_arm64
- qemu_arm64-compat
- qemu_i386
- qemu_x86_64
- qemu_x86_64-compat
- riscv
- s390
- sh
- sparc
- x15
- x86
- x86-kasan
Test Suites
-----------
* build
* linux-log-parser
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-mm-tests
* ltp-sched-tests
* ltp-syscalls-tests
* perf
* v4l2-compliance
* kvm-unit-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-dio-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-tracing-tests
* network-basic-tests
* ltp-controllers-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-securebits-tests
* ltp-fcntl-locktests-tests
* kunit
* rcutorture
* fwts
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 17 lines · Naresh Kamboju
Quoted 15 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.9.14 release. There are 75 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 Sat, 12 Dec 2020 14:25:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.9.y
and the diffstat can be found below.
Quoted 8 lines
Quoted 3 lines
thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
Thanks for testing them all and letting me know.
greg k-h