- Linux-stable-mirror - lists.linaro.org

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.110 release. There are 39 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 Tue Jun 26 15:23:25 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.110-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.110-rc1 Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> fs/binfmt_misc.c: do not allow offset overflow Michael S. Tsirkin <mst(a)redhat.com> vhost: fix info leak due to uninitialized memory Even Xu <even.xu(a)intel.com> HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation Martin Brandenburg <martin(a)omnibond.com> orangefs: set i_size on new symlink Stefan Potyra <Stefan.Potyra(a)elektrobit.com> w1: mxc_w1: Enable clock before calling clk_get_rate() on it Hans de Goede <hdegoede(a)redhat.com> libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Dan Carpenter <dan.carpenter(a)oracle.com> libata: zpodd: small read overflow in eject_tray() Colin Ian King <colin.king(a)canonical.com> libata: zpodd: make arrays cdb static, reduces object code size Tao Wang <kevin.wangtao(a)hisilicon.com> cpufreq: Fix new policy initialization during limits updates via sysfs Steve French <stfrench(a)microsoft.com> smb3: on reconnect set PreviousSessionId field Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP ProBook 640 G4 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP EliteBook 830 G5 Bo Chen <chenbo(a)pdx.edu> ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode pages for device replace Omar Sandoval <osandov(a)fb.com> Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2() Omar Sandoval <osandov(a)fb.com> Btrfs: fix clone vs chattr NODATASUM race Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> driver core: Don't ignore class_dir_create_and_add() failure. Jan Kara <jack(a)suse.cz> ext4: fix fencepost error in check for inode count overflow during resize Lukas Czerner <lczerner(a)redhat.com> ext4: update mtime in ext4_punch_hole even if no blocks are released Jan Kara <jack(a)suse.cz> ext4: fix hole length detection in ext4_ind_map_blocks() Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - New codec support for ALC257 Frank van der Linden <fllinden(a)amazon.com> tcp: verify the checksum of the first data segment in a new connection Davide Caratti <dcaratti(a)redhat.com> net/sched: act_simple: fix parsing of TCA_DEF_DATA Julian Anastasov <ja(a)ssi.bg> ipv6: allow PMTU exceptions to local routes Xiangning Yu <yuxiangning(a)gmail.com> bonding: re-evaluate force_primary when the primary slave name changes Daniel Glöckner <dg(a)emlix.com> usb: musb: fix remote wakeup racing with suspend Liu Bo <bo.li.liu(a)oracle.com> Btrfs: make raid6 rebuild retry more Eric Dumazet <edumazet(a)google.com> tcp: do not overshoot window_clamp in tcp_rcv_space_adjust() Sasha Levin <Alexander.Levin(a)microsoft.com> Revert "Btrfs: fix scrub to repair raid6 corruption" Damien Thébault <damien.thebault(a)vitec.com> net: dsa: b53: Add BCM5389 support Finn Thain <fthain(a)telegraphics.com.au> net/sonic: Use dma_mapping_error() João Paulo Rechi Vita <jprvita(a)gmail.com> platform/x86: asus-wmi: Fix NULL pointer dereference Josh Hill <josh(a)joshuajhill.com> net: qmi_wwan: Add Netgear Aircard 779S Ivan Bornyakov <brnkv.i1(a)gmail.com> atm: zatm: fix memcmp casting Hao Wei Tee <angelsl(a)in04.sg> iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs Julian Anastasov <ja(a)ssi.bg> ipvs: fix buffer overflow with sync daemon and service Paolo Abeni <pabeni(a)redhat.com> netfilter: ebtables: handle string from userspace with care Eric Dumazet <edumazet(a)google.com> xfrm6: avoid potential infinite loop in _decode_session6() Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> objtool: update .gitignore file ------------- Diffstat: Documentation/devicetree/bindings/net/dsa/b53.txt | 1 + Makefile | 4 +-- drivers/ata/libata-core.c | 3 -- drivers/ata/libata-zpodd.c | 4 +-- drivers/atm/zatm.c | 4 +-- drivers/base/core.c | 14 +++++++-- drivers/cpufreq/cpufreq.c | 2 ++ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 +++++--------- drivers/net/bonding/bond_options.c | 1 + drivers/net/dsa/b53/b53_common.c | 13 ++++++++ drivers/net/dsa/b53/b53_mdio.c | 5 +++- drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/ethernet/natsemi/sonic.c | 2 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 +++---- drivers/platform/x86/asus-wmi.c | 23 ++++++++------- drivers/usb/musb/musb_host.c | 5 +++- drivers/usb/musb/musb_host.h | 7 +++-- drivers/usb/musb/musb_virthub.c | 25 +++++++++------- drivers/vhost/vhost.c | 3 ++ drivers/w1/masters/mxc_w1.c | 20 ++++++++----- fs/binfmt_misc.c | 12 ++++++-- fs/btrfs/ioctl.c | 18 +++++++----- fs/btrfs/scrub.c | 2 +- fs/cifs/smb2pdu.c | 1 + fs/ext4/indirect.c | 14 ++++++--- fs/ext4/inode.c | 36 +++++++++++------------ fs/ext4/resize.c | 2 +- fs/orangefs/namei.c | 7 +++++ net/bridge/netfilter/ebtables.c | 3 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 4 +++ net/ipv6/route.c | 3 -- net/ipv6/tcp_ipv6.c | 4 +++ net/ipv6/xfrm6_policy.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 21 +++++++++---- net/sched/act_simple.c | 15 ++++------ sound/pci/hda/hda_controller.c | 4 ++- sound/pci/hda/patch_conexant.c | 2 ++ sound/pci/hda/patch_realtek.c | 8 +++++ tools/objtool/.gitignore | 2 +- 41 files changed, 212 insertions(+), 120 deletions(-)

7 years, 3 months

4
38
0 0

[PATCH v3 03/17] arm64: dts: marvell: fix CP110 ICU node size

by Miquel Raynal

ICU size in CP110 is not 0x10 but at least 0x440 bytes long (from the specification). Fixes: 6ef84a827c37 ("arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K") Cc: stable(a)vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi index 7dabe25f6774..1c6ff8197a88 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi @@ -149,7 +149,7 @@ CP110_LABEL(icu): interrupt-controller@1e0000 { compatible = "marvell,cp110-icu"; - reg = <0x1e0000 0x10>; + reg = <0x1e0000 0x440>; #interrupt-cells = <3>; interrupt-controller; msi-parent = <&gicp>; -- 2.14.1

7 years, 3 months

2
2
0 0

[PATCH] Revert "mm: page_alloc: skip over regions of invalid pfns where possible"

by Daniel Vacek

This reverts commit b92df1de5d289c0b5d653e72414bf0850b8511e0. The commit is meant to be a boot init speed up skipping the loop in memmap_init_zone() for invalid pfns. But given some specific memory mapping on x86_64 (or more generally theoretically anywhere but on arm with CONFIG_HAVE_ARCH_PFN_VALID) the implementation also skips valid pfns which is plain wrong and causes 'kernel BUG at mm/page_alloc.c:1389!' crash> log | grep -e BUG -e RIP -e Call.Trace -e move_freepages_block -e rmqueue -e freelist -A1 kernel BUG at mm/page_alloc.c:1389! invalid opcode: 0000 [#1] SMP -- RIP: 0010:[<ffffffff8118833e>] [<ffffffff8118833e>] move_freepages+0x15e/0x160 RSP: 0018:ffff88054d727688 EFLAGS: 00010087 -- Call Trace: [<ffffffff811883b3>] move_freepages_block+0x73/0x80 [<ffffffff81189e63>] __rmqueue+0x263/0x460 [<ffffffff8118c781>] get_page_from_freelist+0x7e1/0x9e0 [<ffffffff8118caf6>] __alloc_pages_nodemask+0x176/0x420 -- RIP [<ffffffff8118833e>] move_freepages+0x15e/0x160 RSP <ffff88054d727688> crash> page_init_bug -v | grep RAM <struct resource 0xffff88067fffd2f8> 1000 - 9bfff System RAM (620.00 KiB) <struct resource 0xffff88067fffd3a0> 100000 - 430bffff System RAM ( 1.05 GiB = 1071.75 MiB = 1097472.00 KiB) <struct resource 0xffff88067fffd410> 4b0c8000 - 4bf9cfff System RAM ( 14.83 MiB = 15188.00 KiB) <struct resource 0xffff88067fffd480> 4bfac000 - 646b1fff System RAM (391.02 MiB = 400408.00 KiB) <struct resource 0xffff88067fffd560> 7b788000 - 7b7fffff System RAM (480.00 KiB) <struct resource 0xffff88067fffd640> 100000000 - 67fffffff System RAM ( 22.00 GiB) crash> page_init_bug | head -6 <struct resource 0xffff88067fffd560> 7b788000 - 7b7fffff System RAM (480.00 KiB) <struct page 0xffffea0001ede200> 1fffff00000000 0 <struct pglist_data 0xffff88047ffd9000> 1 <struct zone 0xffff88047ffd9800> DMA32 4096 1048575 <struct page 0xffffea0001ede200> 505736 505344 <struct page 0xffffea0001ed8000> 505855 <struct page 0xffffea0001edffc0> <struct page 0xffffea0001ed8000> 0 0 <struct pglist_data 0xffff88047ffd9000> 0 <struct zone 0xffff88047ffd9000> DMA 1 4095 <struct page 0xffffea0001edffc0> 1fffff00000400 0 <struct pglist_data 0xffff88047ffd9000> 1 <struct zone 0xffff88047ffd9800> DMA32 4096 1048575 BUG, zones differ! crash> kmem -p 77fff000 78000000 7b5ff000 7b600000 7b787000 7b788000 PAGE PHYSICAL MAPPING INDEX CNT FLAGS ffffea0001e00000 78000000 0 0 0 0 ffffea0001ed7fc0 7b5ff000 0 0 0 0 ffffea0001ed8000 7b600000 0 0 0 0 <<<< ffffea0001ede1c0 7b787000 0 0 0 0 ffffea0001ede200 7b788000 0 0 1 1fffff00000000 Fixes: b92df1de5d28 ("mm: page_alloc: skip over regions of invalid pfns where possible") Signed-off-by: Daniel Vacek <neelx(a)redhat.com> Acked-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Mel Gorman <mgorman(a)techsingularity.net> Cc: Pavel Tatashin <pasha.tatashin(a)oracle.com> Cc: Paul Burton <paul.burton(a)imgtec.com> Cc: stable(a)vger.kernel.org --- include/linux/memblock.h | 1 - mm/memblock.c | 28 ---------------------------- mm/page_alloc.c | 11 +---------- 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 8be5077efb5f..f92ea7783652 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -187,7 +187,6 @@ int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn, unsigned long *end_pfn); void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, unsigned long *out_end_pfn, int *out_nid); -unsigned long memblock_next_valid_pfn(unsigned long pfn, unsigned long max_pfn); /** * for_each_mem_pfn_range - early memory pfn range iterator diff --git a/mm/memblock.c b/mm/memblock.c index b6ba6b7adadc..48376bd33274 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1101,34 +1101,6 @@ void __init_memblock __next_mem_pfn_range(int *idx, int nid, *out_nid = r->nid; } -unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn, - unsigned long max_pfn) -{ - struct memblock_type *type = &memblock.memory; - unsigned int right = type->cnt; - unsigned int mid, left = 0; - phys_addr_t addr = PFN_PHYS(++pfn); - - do { - mid = (right + left) / 2; - - if (addr < type->regions[mid].base) - right = mid; - else if (addr >= (type->regions[mid].base + - type->regions[mid].size)) - left = mid + 1; - else { - /* addr is within the region, so pfn is valid */ - return pfn; - } - } while (left < right); - - if (right == type->cnt) - return -1UL; - else - return PHYS_PFN(type->regions[right].base); -} - /** * memblock_set_node - set node ID on memblock regions * @base: base of area to set node ID for diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 635d7dd29d7f..e4566a3f8083 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5356,17 +5356,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, if (context != MEMMAP_EARLY) goto not_early; - if (!early_pfn_valid(pfn)) { -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP - /* - * Skip to the pfn preceding the next valid one (or - * end_pfn), such that we hit a valid pfn (or end_pfn) - * on our next iteration of the loop. - */ - pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1; -#endif + if (!early_pfn_valid(pfn)) continue; - } if (!early_pfn_in_nid(pfn, nid)) continue; if (!update_defer_init(pgdat, pfn, end_pfn, &nr_initialised)) -- 2.16.2

7 years, 3 months

3
4
0 0

patch "staging: android: ion: Return an ERR_PTR in ion_map_kernel" added to staging-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled staging: android: ion: Return an ERR_PTR in ion_map_kernel to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 0a2bc00341dcfcc793c0dbf4f8d43adf60458b05 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott(a)redhat.com> Date: Mon, 11 Jun 2018 11:06:53 -0700 Subject: staging: android: ion: Return an ERR_PTR in ion_map_kernel The expected return value from ion_map_kernel is an ERR_PTR. The error path for a vmalloc failure currently just returns NULL, triggering a warning in ion_buffer_kmap_get. Encode the vmalloc failure as an ERR_PTR. Reported-by: syzbot+55b1d9f811650de944c6(a)syzkaller.appspotmail.com Signed-off-by: Laura Abbott <labbott(a)redhat.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/android/ion/ion_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index e8c440329708..31db510018a9 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -30,7 +30,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap, struct page **tmp = pages; if (!pages) - return NULL; + return ERR_PTR(-ENOMEM); if (buffer->flags & ION_FLAG_CACHED) pgprot = PAGE_KERNEL; -- 2.18.0

7 years, 3 months

1
0
0 0

patch "usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From d5a4f93511b7000183c0d528739b824752139f79 Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen(a)nxp.com> Date: Tue, 12 Jun 2018 09:53:01 +0800 Subject: usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is re-entered The port->logbuffer_head may be wrong if the two processes enters _tcpm_log at the mostly same time. The 2nd process enters _tcpm_log before the 1st process update the index, then the 2nd process will not allocate logbuffer, when the 2nd process tries to use log buffer, the index has already updated by the 1st process, so it will get NULL pointer for updated logbuffer, the error message like below: tcpci 0-0050: Log buffer index 6 is NULL Cc: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: Guenter Roeck <linux(a)roeck-us.net> Cc: Jun Li <jun.li(a)nxp.com> Signed-off-by: Peter Chen <peter.chen(a)nxp.com> Reviewed-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Guenter Roeck <linux(a)roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/tcpm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c index 0dfd755020f4..d961f1ec0e08 100644 --- a/drivers/usb/typec/tcpm.c +++ b/drivers/usb/typec/tcpm.c @@ -418,17 +418,18 @@ static void _tcpm_log(struct tcpm_port *port, const char *fmt, va_list args) u64 ts_nsec = local_clock(); unsigned long rem_nsec; + mutex_lock(&port->logbuffer_lock); if (!port->logbuffer[port->logbuffer_head]) { port->logbuffer[port->logbuffer_head] = kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL); - if (!port->logbuffer[port->logbuffer_head]) + if (!port->logbuffer[port->logbuffer_head]) { + mutex_unlock(&port->logbuffer_lock); return; + } } vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args); - mutex_lock(&port->logbuffer_lock); - if (tcpm_log_full(port)) { port->logbuffer_head = max(port->logbuffer_head - 1, 0); strcpy(tmpbuffer, "overflow"); -- 2.18.0

7 years, 3 months

1
0
0 0

patch "usb: cdc_acm: Add quirk for Uniden UBC125 scanner" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: cdc_acm: Add quirk for Uniden UBC125 scanner to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 4a762569a2722b8a48066c7bacf0e1dc67d17fa1 Mon Sep 17 00:00:00 2001 From: Houston Yaroschoff <hstn(a)4ever3.net> Date: Mon, 11 Jun 2018 12:39:09 +0200 Subject: usb: cdc_acm: Add quirk for Uniden UBC125 scanner Uniden UBC125 radio scanner has USB interface which fails to work with cdc_acm driver: usb 1-1.5: new full-speed USB device number 4 using xhci_hcd cdc_acm 1-1.5:1.0: Zero length descriptor references cdc_acm: probe of 1-1.5:1.0 failed with error -22 Adding the NO_UNION_NORMAL quirk for the device fixes the issue: usb 1-4: new full-speed USB device number 15 using xhci_hcd usb 1-4: New USB device found, idVendor=1965, idProduct=0018 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: UBC125XLT usb 1-4: Manufacturer: Uniden Corp. usb 1-4: SerialNumber: 0001 cdc_acm 1-4:1.0: ttyACM0: USB ACM device `lsusb -v` of the device: Bus 001 Device 015: ID 1965:0018 Uniden Corporation Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 2 Communications bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 64 idVendor 0x1965 Uniden Corporation idProduct 0x0018 bcdDevice 0.01 iManufacturer 1 Uniden Corp. iProduct 2 UBC125XLT iSerial 3 0001 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 48 bNumInterfaces 2 bConfigurationValue 1 iConfiguration 0 bmAttributes 0x80 (Bus Powered) MaxPower 500mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 1 bInterfaceClass 2 Communications bInterfaceSubClass 2 Abstract (modem) bInterfaceProtocol 0 None 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 0x0008 1x 8 bytes bInterval 10 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 0 bNumEndpoints 2 bInterfaceClass 10 CDC Data bInterfaceSubClass 0 Unused bInterfaceProtocol 0 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 0x0040 1x 64 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 0x0040 1x 64 bytes bInterval 0 Device Status: 0x0000 (Bus Powered) Signed-off-by: Houston Yaroschoff <hstn(a)4ever3.net> Cc: stable <stable(a)vger.kernel.org> Acked-by: Oliver Neukum <oneukum(a)suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/class/cdc-acm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 7b366a6c0b49..998b32d0167e 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1758,6 +1758,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x11ca, 0x0201), /* VeriFone Mx870 Gadget Serial */ .driver_info = SINGLE_RX_URB, }, + { USB_DEVICE(0x1965, 0x0018), /* Uniden UBC125XLT */ + .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ + }, { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ }, -- 2.18.0

7 years, 3 months

1
0
0 0

patch "usb: typec: ucsi: Fix for incorrect status data issue" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: ucsi: Fix for incorrect status data issue to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 68816e16b4789f2d05e77b6dcb77564cf5d6a8d8 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Date: Thu, 21 Jun 2018 16:43:19 +0300 Subject: usb: typec: ucsi: Fix for incorrect status data issue According to UCSI Specification, Connector Change Event only means a change in the Connector Status and Operation Mode fields of the STATUS data structure. So any other change should create another event. Unfortunately on some platforms the firmware acting as PPM (platform policy manager - usually embedded controller firmware) still does not report any other status changes if there is a connector change event. So if the connector power or data role was changed when a device was plugged to the connector, the driver does not get any indication about that. The port will show wrong roles if that happens. To fix the issue, always checking the data and power role together with a connector change event. Fixes: c1b0bc2dabfa ("usb: typec: Add support for UCSI interface") Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/ucsi/ucsi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index bd5cca5632b3..8d0a6fe748bd 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -350,6 +350,19 @@ static void ucsi_connector_change(struct work_struct *work) } if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) { + typec_set_pwr_role(con->port, con->status.pwr_dir); + + switch (con->status.partner_type) { + case UCSI_CONSTAT_PARTNER_TYPE_UFP: + typec_set_data_role(con->port, TYPEC_HOST); + break; + case UCSI_CONSTAT_PARTNER_TYPE_DFP: + typec_set_data_role(con->port, TYPEC_DEVICE); + break; + default: + break; + } + if (con->status.connected) ucsi_register_partner(con); else -- 2.18.0

7 years, 3 months

1
0
0 0

patch "xhci: Fix kernel oops in trace_xhci_free_virt_device" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled xhci: Fix kernel oops in trace_xhci_free_virt_device to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From d850c1658328e757635a46763783c6fd56390dcb Mon Sep 17 00:00:00 2001 From: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> Date: Thu, 21 Jun 2018 16:19:42 +0300 Subject: xhci: Fix kernel oops in trace_xhci_free_virt_device commit 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") set dev->udev pointer to NULL in xhci_free_dev(), it will cause kernel panic in trace_xhci_free_virt_device. This patch reimplement the trace function trace_xhci_free_virt_device, remove dev->udev dereference and added more useful parameters to show in the trace function,it also makes sure dev->udev is not NULL before calling trace_xhci_free_virt_device. This issue happened when xhci-hcd trace is enabled and USB devices hot plug test. Original use-after-free patch went to stable so this needs so be applied there as well. [ 1092.022457] usb 2-4: USB disconnect, device number 6 [ 1092.092772] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [ 1092.101694] PGD 0 P4D 0 [ 1092.104601] Oops: 0000 [#1] SMP [ 1092.207734] Workqueue: usb_hub_wq hub_event [ 1092.212507] RIP: 0010:trace_event_raw_event_xhci_log_virt_dev+0x6c/0xf0 [ 1092.220050] RSP: 0018:ffff8c252e883d28 EFLAGS: 00010086 [ 1092.226024] RAX: ffff8c24af86fa84 RBX: 0000000000000003 RCX: ffff8c25255c2a01 [ 1092.234130] RDX: 0000000000000000 RSI: 00000000aef55009 RDI: ffff8c252e883d28 [ 1092.242242] RBP: ffff8c252550e2c0 R08: ffff8c24af86fa84 R09: 0000000000000a70 [ 1092.250364] R10: 0000000000000a70 R11: 0000000000000000 R12: ffff8c251f21a000 [ 1092.258468] R13: 000000000000000c R14: ffff8c251f21a000 R15: ffff8c251f432f60 [ 1092.266572] FS: 0000000000000000(0000) GS:ffff8c252e880000(0000) knlGS:0000000000000000 [ 1092.275757] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1092.282281] CR2: 0000000000000000 CR3: 0000000154209001 CR4: 00000000003606e0 [ 1092.290384] Call Trace: [ 1092.293156] <IRQ> [ 1092.295439] xhci_free_virt_device.part.34+0x182/0x1a0 [ 1092.301288] handle_cmd_completion+0x7ac/0xfa0 [ 1092.306336] ? trace_event_raw_event_xhci_log_trb+0x6e/0xa0 [ 1092.312661] xhci_irq+0x3e8/0x1f60 [ 1092.316524] __handle_irq_event_percpu+0x75/0x180 [ 1092.321876] handle_irq_event_percpu+0x20/0x50 [ 1092.326922] handle_irq_event+0x36/0x60 [ 1092.331273] handle_edge_irq+0x6d/0x180 [ 1092.335644] handle_irq+0x16/0x20 [ 1092.339417] do_IRQ+0x41/0xc0 [ 1092.342782] common_interrupt+0xf/0xf [ 1092.346955] </IRQ> Fixes: 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/host/xhci-mem.c | 4 ++-- drivers/usb/host/xhci-trace.h | 36 ++++++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index acbd3d7b8828..8a62eee9eee1 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -886,12 +886,12 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id) dev = xhci->devs[slot_id]; - trace_xhci_free_virt_device(dev); - xhci->dcbaa->dev_context_ptrs[slot_id] = 0; if (!dev) return; + trace_xhci_free_virt_device(dev); + if (dev->tt_info) old_active_eps = dev->tt_info->active_eps; diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h index 410544ffe78f..88b427434bd8 100644 --- a/drivers/usb/host/xhci-trace.h +++ b/drivers/usb/host/xhci-trace.h @@ -171,6 +171,37 @@ DEFINE_EVENT(xhci_log_trb, xhci_dbc_gadget_ep_queue, TP_ARGS(ring, trb) ); +DECLARE_EVENT_CLASS(xhci_log_free_virt_dev, + TP_PROTO(struct xhci_virt_device *vdev), + TP_ARGS(vdev), + TP_STRUCT__entry( + __field(void *, vdev) + __field(unsigned long long, out_ctx) + __field(unsigned long long, in_ctx) + __field(u8, fake_port) + __field(u8, real_port) + __field(u16, current_mel) + + ), + TP_fast_assign( + __entry->vdev = vdev; + __entry->in_ctx = (unsigned long long) vdev->in_ctx->dma; + __entry->out_ctx = (unsigned long long) vdev->out_ctx->dma; + __entry->fake_port = (u8) vdev->fake_port; + __entry->real_port = (u8) vdev->real_port; + __entry->current_mel = (u16) vdev->current_mel; + ), + TP_printk("vdev %p ctx %llx | %llx fake_port %d real_port %d current_mel %d", + __entry->vdev, __entry->in_ctx, __entry->out_ctx, + __entry->fake_port, __entry->real_port, __entry->current_mel + ) +); + +DEFINE_EVENT(xhci_log_free_virt_dev, xhci_free_virt_device, + TP_PROTO(struct xhci_virt_device *vdev), + TP_ARGS(vdev) +); + DECLARE_EVENT_CLASS(xhci_log_virt_dev, TP_PROTO(struct xhci_virt_device *vdev), TP_ARGS(vdev), @@ -208,11 +239,6 @@ DEFINE_EVENT(xhci_log_virt_dev, xhci_alloc_virt_device, TP_ARGS(vdev) ); -DEFINE_EVENT(xhci_log_virt_dev, xhci_free_virt_device, - TP_PROTO(struct xhci_virt_device *vdev), - TP_ARGS(vdev) -); - DEFINE_EVENT(xhci_log_virt_dev, xhci_setup_device, TP_PROTO(struct xhci_virt_device *vdev), TP_ARGS(vdev) -- 2.18.0

7 years, 3 months

1
0
0 0

patch "xhci: Fix perceived dead host due to runtime suspend race with event" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled xhci: Fix perceived dead host due to runtime suspend race with event to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 229bc19fd7aca4f37964af06e3583c1c8f36b5d6 Mon Sep 17 00:00:00 2001 From: Mathias Nyman <mathias.nyman(a)linux.intel.com> Date: Thu, 21 Jun 2018 16:19:41 +0300 Subject: xhci: Fix perceived dead host due to runtime suspend race with event handler Don't rely on event interrupt (EINT) bit alone to detect pending port change in resume. If no change event is detected the host may be suspended again, oterwise roothubs are resumed. There is a lag in xHC setting EINT. If we don't notice the pending change in resume, and the controller is runtime suspeded again, it causes the event handler to assume host is dead as it will fail to read xHC registers once PCI puts the controller to D3 state. [ 268.520969] xhci_hcd: xhci_resume: starting port polling. [ 268.520985] xhci_hcd: xhci_hub_status_data: stopping port polling. [ 268.521030] xhci_hcd: xhci_suspend: stopping port polling. [ 268.521040] xhci_hcd: // Setting command ring address to 0x349bd001 [ 268.521139] xhci_hcd: Port Status Change Event for port 3 [ 268.521149] xhci_hcd: resume root hub [ 268.521163] xhci_hcd: port resume event for port 3 [ 268.521168] xhci_hcd: xHC is not running. [ 268.521174] xhci_hcd: handle_port_status: starting port polling. [ 268.596322] xhci_hcd: xhci_hc_died: xHCI host controller not responding, assume dead The EINT lag is described in a additional note in xhci specs 4.19.2: "Due to internal xHC scheduling and system delays, there will be a lag between a change bit being set and the Port Status Change Event that it generated being written to the Event Ring. If SW reads the PORTSC and sees a change bit set, there is no guarantee that the corresponding Port Status Change Event has already been written into the Event Ring." Cc: <stable(a)vger.kernel.org> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/host/xhci.c | 40 +++++++++++++++++++++++++++++++++++++--- drivers/usb/host/xhci.h | 4 ++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 8c8da2d657fa..f11ec61bcc7d 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -908,6 +908,41 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci) spin_unlock_irqrestore(&xhci->lock, flags); } +static bool xhci_pending_portevent(struct xhci_hcd *xhci) +{ + struct xhci_port **ports; + int port_index; + u32 status; + u32 portsc; + + status = readl(&xhci->op_regs->status); + if (status & STS_EINT) + return true; + /* + * Checking STS_EINT is not enough as there is a lag between a change + * bit being set and the Port Status Change Event that it generated + * being written to the Event Ring. See note in xhci 1.1 section 4.19.2. + */ + + port_index = xhci->usb2_rhub.num_ports; + ports = xhci->usb2_rhub.ports; + while (port_index--) { + portsc = readl(ports[port_index]->addr); + if (portsc & PORT_CHANGE_MASK || + (portsc & PORT_PLS_MASK) == XDEV_RESUME) + return true; + } + port_index = xhci->usb3_rhub.num_ports; + ports = xhci->usb3_rhub.ports; + while (port_index--) { + portsc = readl(ports[port_index]->addr); + if (portsc & PORT_CHANGE_MASK || + (portsc & PORT_PLS_MASK) == XDEV_RESUME) + return true; + } + return false; +} + /* * Stop HC (not bus-specific) * @@ -1009,7 +1044,7 @@ EXPORT_SYMBOL_GPL(xhci_suspend); */ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) { - u32 command, temp = 0, status; + u32 command, temp = 0; struct usb_hcd *hcd = xhci_to_hcd(xhci); struct usb_hcd *secondary_hcd; int retval = 0; @@ -1134,8 +1169,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) done: if (retval == 0) { /* Resume root hubs only when have pending events. */ - status = readl(&xhci->op_regs->status); - if (status & STS_EINT) { + if (xhci_pending_portevent(xhci)) { usb_hcd_resume_root_hub(xhci->shared_hcd); usb_hcd_resume_root_hub(hcd); } diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 939e2f86b595..841e89ffe2e9 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -382,6 +382,10 @@ struct xhci_op_regs { #define PORT_PLC (1 << 22) /* port configure error change - port failed to configure its link partner */ #define PORT_CEC (1 << 23) +#define PORT_CHANGE_MASK (PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \ + PORT_RC | PORT_PLC | PORT_CEC) + + /* Cold Attach Status - xHC can set this bit to report device attached during * Sx state. Warm port reset should be perfomed to clear this bit and move port * to connected state. -- 2.18.0

7 years, 3 months

1
0
0 0

patch "usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 8760675932ddb614e83702117d36ea644050c609 Mon Sep 17 00:00:00 2001 From: William Wu <william.wu(a)rock-chips.com> Date: Mon, 21 May 2018 18:12:00 +0800 Subject: usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub The dwc2_get_ls_map() use ttport to reference into the bitmap if we're on a multi_tt hub. But the bitmaps index from 0 to (hub->maxchild - 1), while the ttport index from 1 to hub->maxchild. This will cause invalid memory access when the number of ttport is hub->maxchild. Without this patch, I can easily meet a Kernel panic issue if connect a low-speed USB mouse with the max port of FE2.1 multi-tt hub (1a40:0201) on rk3288 platform. Fixes: 9f9f09b048f5 ("usb: dwc2: host: Totally redo the microframe scheduler") Cc: <stable(a)vger.kernel.org> Reviewed-by: Douglas Anderson <dianders(a)chromium.org> Acked-by: Minas Harutyunyan hminas(a)synopsys.com> Signed-off-by: William Wu <william.wu(a)rock-chips.com> Signed-off-by: Felipe Balbi <felipe.balbi(a)linux.intel.com> --- drivers/usb/dwc2/hcd_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c index d7c3d6c776d8..9c55d1addba9 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -383,7 +383,7 @@ static unsigned long *dwc2_get_ls_map(struct dwc2_hsotg *hsotg, /* Get the map and adjust if this is a multi_tt hub */ map = qh->dwc_tt->periodic_bitmaps; if (qh->dwc_tt->usb_tt->multi) - map += DWC2_ELEMENTS_PER_LS_BITMAP * qh->ttport; + map += DWC2_ELEMENTS_PER_LS_BITMAP * (qh->ttport - 1); return map; } -- 2.18.0

7 years, 3 months

1
0
0 0

[PATCH V2] clk: ti: omap3: Fix am3517 mdio clock alias

by Adam Ford

A previous patch removed OMAP clock aliases that were perceived to be unnecessary. Unfortunately, it broke the ethernet on the am3517-evm. This patch enables the MDIO clock and EMAC clock. Fixes: 0ed266d7ae5e ("clk: ti: omap3: cleanup unnecessary clock aliases") Cc: stable(a)vger.kernel.org #4.16+ Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Instead of modifying clk-3xxx.c, this patch modifie the device tree to work like the original patch intended. diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi index ca294914bbb1..4b6062b631b1 100644 --- a/arch/arm/boot/dts/am3517.dtsi +++ b/arch/arm/boot/dts/am3517.dtsi @@ -39,6 +39,8 @@ ti,davinci-ctrl-ram-size = <0x2000>; ti,davinci-rmii-en = /bits/ 8 <1>; local-mac-address = [ 00 00 00 00 00 00 ]; + clocks = <&emac_ick>; + clock-names = "ick"; }; davinci_mdio: ethernet@5c030000 { @@ -49,6 +51,8 @@ bus_freq = <1000000>; #address-cells = <1>; #size-cells = <0>; + clocks = <&emac_fck>; + clock-names = "fck"; }; uart4: serial@4809e000 { -- 2.17.1

7 years, 3 months

2
1
0 0

[PATCH] x86/efi: Fix efi_call_phys_epilog() with CONFIG_X86_5LEVEL=y

by Kirill A. Shutemov

Open-coded page table entry checks don't work correctly when we fold the page table level at runtime. pgd_present() on 4-level paging machine always returns true, but open-coded version of the check may return false-negative result and we silently skip the rest of the loop body in efi_call_phys_epilog(). Replace open-coded checks with proper helpers. Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Fixes: 94133e46a0f5 ("x86/efi: Correct EFI identity mapping under 'efi=old_map' when KASLR is enabled") Cc: stable(a)vger.kernel.org # 4.12+ Cc: Baoquan He <bhe(a)redhat.com> Cc: Matt Fleming <matt(a)codeblueprint.co.uk> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> --- arch/x86/platform/efi/efi_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index e01f7ceb9e7a..77873ce700ae 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -166,14 +166,14 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd) pgd = pgd_offset_k(pgd_idx * PGDIR_SIZE); set_pgd(pgd_offset_k(pgd_idx * PGDIR_SIZE), save_pgd[pgd_idx]); - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) + if (!pgd_present(*pgd)) continue; for (i = 0; i < PTRS_PER_P4D; i++) { p4d = p4d_offset(pgd, pgd_idx * PGDIR_SIZE + i * P4D_SIZE); - if (!(p4d_val(*p4d) & _PAGE_PRESENT)) + if (!p4d_present(*p4d)) continue; pud = (pud_t *)p4d_page_vaddr(*p4d); -- 2.18.0

7 years, 3 months

1
0
0 0

[PATCH 6/8] mpt3sas: Fix _transport_smp_handler() error path

by Bart Van Assche

This patch avoids that smatch complains about a double unlock on ioc->transport_cmds.mutex. Fixes: 651a01364994 ("scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough") Signed-off-by: Bart Van Assche <bart.vanassche(a)wdc.com> Cc: Christoph Hellwig <hch(a)lst.de> Cc: Sathya Prakash <sathya.prakash(a)broadcom.com> Cc: Chaitra P B <chaitra.basappa(a)broadcom.com> Cc: Suganath Prabu Subramani <suganath-prabu.subramani(a)broadcom.com> Cc: stable(a)vger.kernel.org --- drivers/scsi/mpt3sas/mpt3sas_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c index 77a8ec401461..53224d97f6c1 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_transport.c +++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c @@ -1938,12 +1938,12 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, pr_info(MPT3SAS_FMT "%s: host reset in progress!\n", __func__, ioc->name); rc = -EFAULT; - goto out; + goto job_done; } rc = mutex_lock_interruptible(&ioc->transport_cmds.mutex); if (rc) - goto out; + goto job_done; if (ioc->transport_cmds.status != MPT3_CMD_NOT_USED) { pr_err(MPT3SAS_FMT "%s: transport_cmds in use\n", ioc->name, @@ -2068,6 +2068,7 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, out: ioc->transport_cmds.status = MPT3_CMD_NOT_USED; mutex_unlock(&ioc->transport_cmds.mutex); +job_done: bsg_job_done(job, rc, reslen); } -- 2.17.0

7 years, 3 months

2
1
0 0

[PATCH] clk: ti: omap3: Fix am3517 mdio clock alias

by Adam Ford

A previous patch removed OMAP clock aliases that were perceived to be unnecessary. Unfortunately, it broke the ethernet on the am3517-evm. This patch renables the MDIO clock. Fixes: 0ed266d7ae5e ("clk: ti: omap3: cleanup unnecessary clock aliases") Cc: stable(a)vger.kernel.org #4.16+ Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c index 8aa5f5793835..f84734bd0aa7 100644 --- a/drivers/clk/ti/clk-3xxx.c +++ b/drivers/clk/ti/clk-3xxx.c @@ -254,6 +254,8 @@ static struct ti_dt_clk omap36xx_am35xx_omap3430es2plus_clks[] = { }; static struct ti_dt_clk am35xx_clks[] = { + DT_CLK("davinci_emac.0", NULL, "emac_ick"), + DT_CLK("davinci_mdio.0", NULL, "emac_fck"), DT_CLK(NULL, "hsotgusb_ick", "hsotgusb_ick_am35xx"), DT_CLK(NULL, "hsotgusb_fck", "hsotgusb_fck_am35xx"), DT_CLK(NULL, "uart4_ick", "uart4_ick_am35xx"), -- 2.17.1

7 years, 3 months

3
3
0 0

[PATCH 4.4 00/37] 4.4.136-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.136 release. There are 37 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu Jun 7 17:00:49 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.136-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.4.136-rc1 David S. Miller <davem(a)davemloft.net> sparc64: Fix build warnings with gcc 7. David S. Miller <davem(a)davemloft.net> sparc64: Don't clibber fixed registers in __multi4. David S. Miller <davem(a)davemloft.net> sparc64: Add __multi3 for gcc 7.x and later. Hugh Dickins <hughd(a)google.com> mm: fix the NULL mapping case in __isolate_lru_page() Al Viro <viro(a)zeniv.linux.org.uk> fix io_destroy()/aio_complete() race Arnd Bergmann <arnd(a)arndb.de> Kbuild: change CC_OPTIMIZE_FOR_SIZE definition Ondrej Zary <linux(a)rainbow-software.org> drm/i915: Disable LVDS on Radiant P845 Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> hwtracing: stm: fix build error on some arches Alexander Shishkin <alexander.shishkin(a)linux.intel.com> stm class: Use vmalloc for the master map Bart Van Assche <bart.vanassche(a)wdc.com> scsi: scsi_transport_srp: Fix shost to rport translation Maciej W. Rozycki <macro(a)mips.com> MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests Maciej W. Rozycki <macro(a)mips.com> MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs Martin Kelly <mkelly(a)xevo.com> iio:kfifo_buf: check for uint overflow Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> dmaengine: usb-dmac: fix endless loop in usb_dmac_chan_terminate_all() Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: revoke START request early Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: check master irqs before slave irqs Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: don't issue stop when HW does it automatically Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: init new messages in irq Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: refactor setup of a msg Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: remove spinlock Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: remove unused IOERROR state Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: rework hw init Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: make sure clocks are on when doing clock calculation Eric Dumazet <edumazet(a)google.com> tcp: avoid integer overflows in tcp_rcv_space_adjust() Arnd Bergmann <arnd(a)arndb.de> irda: fix overly long udelay() Colin Ian King <colin.king(a)canonical.com> ASoC: Intel: sst: remove redundant variable dma_dev_name Matthias Kaehlcke <mka(a)chromium.org> rtlwifi: rtl8192cu: Remove variable self-assignment in rf.c Eric Biggers <ebiggers(a)google.com> cfg80211: further limit wiphy names to 64 bytes Sachin Grover <sgrover(a)codeaurora.org> selinux: KASAN: slab-out-of-bounds in xattr_getsecurity Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Fix crash when freeing instances with event triggers Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Input: elan_i2c_smbus - fix corrupted stack Mimi Zohar <zohar(a)linux.vnet.ibm.com> Revert "ima: limit file hash setting by user to fix and log modes" Brian Foster <bfoster(a)redhat.com> xfs: detect agfl count corruption and reset agfl Yoshinori Sato <ysato(a)users.sourceforge.jp> sh: New gcc support Geert Uytterhoeven <geert(a)linux-m68k.org> USB: serial: cp210x: use tcflag_t to fix incompatible pointer type Michael Neuling <mikey(a)neuling.org> powerpc/64s: Clear PCR on boot Will Deacon <will.deacon(a)arm.com> arm64: lse: Add early clobbers to some input/output asm operands ------------- Diffstat: Makefile | 4 +- arch/arm64/include/asm/atomic_lse.h | 14 +- arch/mips/kernel/process.c | 4 + arch/mips/kernel/ptrace.c | 2 +- arch/mips/kernel/ptrace32.c | 2 +- arch/powerpc/kernel/cpu_setup_power.S | 4 + arch/sh/kernel/sh_ksyms_32.c | 3 + arch/sh/lib/ashlsi3.S | 35 +++- arch/sh/lib/ashrsi3.S | 33 +++- arch/sh/lib/lshrsi3.S | 34 +++- arch/sparc/kernel/ds.c | 2 +- arch/sparc/lib/Makefile | 1 + arch/sparc/lib/multi3.S | 35 ++++ drivers/dma/sh/usb-dmac.c | 4 +- drivers/gpu/drm/i915/intel_lvds.c | 8 + drivers/hwtracing/stm/core.c | 7 +- drivers/i2c/busses/i2c-rcar.c | 202 +++++++++------------ drivers/iio/buffer/kfifo_buf.c | 7 + drivers/input/mouse/elan_i2c_smbus.c | 22 +-- drivers/net/irda/w83977af_ir.c | 4 +- .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 3 - drivers/scsi/scsi_transport_srp.c | 22 ++- drivers/usb/serial/cp210x.c | 9 +- fs/aio.c | 3 +- fs/xfs/libxfs/xfs_alloc.c | 94 ++++++++++ fs/xfs/xfs_mount.h | 1 + fs/xfs/xfs_trace.h | 9 +- include/linux/tcp.h | 2 +- include/uapi/linux/nl80211.h | 2 +- init/Kconfig | 13 ++ kernel/trace/trace_events_trigger.c | 5 +- mm/vmscan.c | 2 +- net/ipv4/tcp_input.c | 10 +- security/integrity/ima/ima_appraise.c | 8 +- security/selinux/ss/services.c | 2 +- sound/soc/intel/common/sst-firmware.c | 2 - 36 files changed, 410 insertions(+), 204 deletions(-)

7 years, 3 months

7
46
0 0

[PATCH] ALSA: hda/realtek - Fix the problem of two front mics on more machines

by Hui Wang

We have 3 more Lenovo machines, they all have 2 front mics on them, so they need the fixup to change the location for one of two mics. Among these 3 Lenovo machines, one of them has the same pin cfg as the machine with subid 0x17aa3138, so use the pin cfg table to apply fixup for them. The rest machines don't share the same pin cfg, so far use the subid to apply fixup for them. Fixes: a3dafb2200bf ("ALSA: hda/realtek - adjust the location of one mic") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4834847..418f27b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6594,8 +6594,9 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), + SND_PCI_QUIRK(0x17aa, 0x312a, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), - SND_PCI_QUIRK(0x17aa, 0x3138, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), + SND_PCI_QUIRK(0x17aa, 0x3136, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), @@ -6773,6 +6774,12 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x14, 0x90170110}, {0x19, 0x02a11030}, {0x21, 0x02211020}), + SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC294_FIXUP_LENOVO_MIC_LOCATION, + {0x14, 0x90170110}, + {0x19, 0x02a11030}, + {0x1a, 0x02a11040}, + {0x1b, 0x01014020}, + {0x21, 0x0221101f}), SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60140}, {0x14, 0x90170110}, -- 2.7.4

7 years, 3 months

2
1
0 0

FAILED: patch "[PATCH] media: rc: ensure input/lirc device can be opened after" failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d7832cd2a3c87eb6ae1e802c88b6fc56c5823f6d Mon Sep 17 00:00:00 2001 From: Sean Young <sean(a)mess.org> Date: Thu, 24 May 2018 05:47:17 -0400 Subject: [PATCH] media: rc: ensure input/lirc device can be opened after register Since commit cb84343fced1 ("media: lirc: do not call close() or open() on unregistered devices") rc_open() will return -ENODEV if rcdev->registered is false. Ensure this is set before we register the input device and the lirc device, else we have a short window where the neither the lirc or input device can be opened. Fixes: cb84343fced1 ("media: lirc: do not call close() or open() on unregistered devices") Cc: stable(a)vger.kernel.org # v4.16+ Signed-off-by: Sean Young <sean(a)mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index b7071bde670a..2e222d9ee01f 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -1862,6 +1862,8 @@ int rc_register_device(struct rc_dev *dev) dev->device_name ?: "Unspecified device", path ?: "N/A"); kfree(path); + dev->registered = true; + if (dev->driver_type != RC_DRIVER_IR_RAW_TX) { rc = rc_setup_rx_device(dev); if (rc) @@ -1881,8 +1883,6 @@ int rc_register_device(struct rc_dev *dev) goto out_lirc; } - dev->registered = true; - dev_dbg(&dev->dev, "Registered rc%u (driver: %s)\n", dev->minor, dev->driver_name ? dev->driver_name : "unknown");

7 years, 3 months

2
1
0 0

[PATCHES] Networking

by David Miller

Please queue up the following networking bug fixes for 4.16 and 4.17 -stable, respectively.

7 years, 3 months

2
2
0 0

FAILED: patch "[PATCH] blk-mq: avoid starving tag allocation after allocating" failed to apply to 4.17-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.17-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e6fc46498784e799d3eb95d83079180e413c4e7d Mon Sep 17 00:00:00 2001 From: Ming Lei <ming.lei(a)redhat.com> Date: Thu, 24 May 2018 11:00:39 -0600 Subject: [PATCH] blk-mq: avoid starving tag allocation after allocating process migrates When the allocation process is scheduled back and the mapped hw queue is changed, fake one extra wake up on previous queue for compensating wake up miss, so other allocations on the previous queue won't be starved. This patch fixes one request allocation hang issue, which can be triggered easily in case of very low nr_request. The race is as follows: 1) 2 hw queues, nr_requests are 2, and wake_batch is one 2) there are 3 waiters on hw queue 0 3) two in-flight requests in hw queue 0 are completed, and only two waiters of 3 are waken up because of wake_batch, but both the two waiters can be scheduled to another CPU and cause to switch to hw queue 1 4) then the 3rd waiter will wait for ever, since no in-flight request is in hw queue 0 any more. 5) this patch fixes it by the fake wakeup when waiter is scheduled to another hw queue Cc: <stable(a)vger.kernel.org> Reviewed-by: Omar Sandoval <osandov(a)fb.com> Signed-off-by: Ming Lei <ming.lei(a)redhat.com> Modified commit message to make it clearer, and make it apply on top of the 4.18 branch. Signed-off-by: Jens Axboe <axboe(a)kernel.dk> diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 336dde07b230..a4e58fc28a06 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -134,6 +134,8 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) ws = bt_wait_ptr(bt, data->hctx); drop_ctx = data->ctx == NULL; do { + struct sbitmap_queue *bt_prev; + /* * We're out of tags on this hardware queue, kick any * pending IO submits before going to sleep waiting for @@ -159,6 +161,7 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) if (data->ctx) blk_mq_put_ctx(data->ctx); + bt_prev = bt; io_schedule(); data->ctx = blk_mq_get_ctx(data->q); @@ -170,6 +173,15 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) bt = &tags->bitmap_tags; finish_wait(&ws->wait, &wait); + + /* + * If destination hw queue is changed, fake wake up on + * previous queue for compensating the wake up miss, so + * other allocations on previous queue won't be starved. + */ + if (bt != bt_prev) + sbitmap_queue_wake_up(bt_prev); + ws = bt_wait_ptr(bt, data->hctx); } while (1); diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h index 0c4a9c242dd7..e6539536dea9 100644 --- a/include/linux/sbitmap.h +++ b/include/linux/sbitmap.h @@ -512,6 +512,13 @@ static inline struct sbq_wait_state *sbq_wait_ptr(struct sbitmap_queue *sbq, */ void sbitmap_queue_wake_all(struct sbitmap_queue *sbq); +/** + * sbitmap_queue_wake_up() - Wake up some of waiters in one waitqueue + * on a &struct sbitmap_queue. + * @sbq: Bitmap queue to wake up. + */ +void sbitmap_queue_wake_up(struct sbitmap_queue *sbq); + /** * sbitmap_queue_show() - Dump &struct sbitmap_queue information to a &struct * seq_file. diff --git a/lib/sbitmap.c b/lib/sbitmap.c index e6d7d610778d..6fdc6267f4a8 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -352,8 +352,9 @@ static void sbitmap_queue_update_wake_batch(struct sbitmap_queue *sbq, if (sbq->wake_batch != wake_batch) { WRITE_ONCE(sbq->wake_batch, wake_batch); /* - * Pairs with the memory barrier in sbq_wake_up() to ensure that - * the batch size is updated before the wait counts. + * Pairs with the memory barrier in sbitmap_queue_wake_up() + * to ensure that the batch size is updated before the wait + * counts. */ smp_mb__before_atomic(); for (i = 0; i < SBQ_WAIT_QUEUES; i++) @@ -463,15 +464,6 @@ static bool __sbq_wake_up(struct sbitmap_queue *sbq) unsigned int wake_batch; int wait_cnt; - /* - * Pairs with the memory barrier in set_current_state() to ensure the - * proper ordering of clear_bit()/waitqueue_active() in the waker and - * test_and_set_bit_lock()/prepare_to_wait()/finish_wait() in the - * waiter. See the comment on waitqueue_active(). This is __after_atomic - * because we just did clear_bit_unlock() in the caller. - */ - smp_mb__after_atomic(); - ws = sbq_wake_ptr(sbq); if (!ws) return false; @@ -507,17 +499,26 @@ static bool __sbq_wake_up(struct sbitmap_queue *sbq) return false; } -static void sbq_wake_up(struct sbitmap_queue *sbq) +void sbitmap_queue_wake_up(struct sbitmap_queue *sbq) { while (__sbq_wake_up(sbq)) ; } +EXPORT_SYMBOL_GPL(sbitmap_queue_wake_up); void sbitmap_queue_clear(struct sbitmap_queue *sbq, unsigned int nr, unsigned int cpu) { sbitmap_clear_bit_unlock(&sbq->sb, nr); - sbq_wake_up(sbq); + /* + * Pairs with the memory barrier in set_current_state() to ensure the + * proper ordering of clear_bit_unlock()/waitqueue_active() in the waker + * and test_and_set_bit_lock()/prepare_to_wait()/finish_wait() in the + * waiter. See the comment on waitqueue_active(). + */ + smp_mb__after_atomic(); + sbitmap_queue_wake_up(sbq); + if (likely(!sbq->round_robin && nr < sbq->sb.depth)) *per_cpu_ptr(sbq->alloc_hint, cpu) = nr; } @@ -529,7 +530,7 @@ void sbitmap_queue_wake_all(struct sbitmap_queue *sbq) /* * Pairs with the memory barrier in set_current_state() like in - * sbq_wake_up(). + * sbitmap_queue_wake_up(). */ smp_mb(); wake_index = atomic_read(&sbq->wake_index);

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] smb3: fix various xid leaks" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From cfe89091644c441a1ade6dae6d2e47b715648615 Mon Sep 17 00:00:00 2001 From: Steve French <stfrench(a)microsoft.com> Date: Sat, 19 May 2018 02:04:55 -0500 Subject: [PATCH] smb3: fix various xid leaks Fix a few cases where we were not freeing the xid which led to active requests being non-zero at unmount time. Signed-off-by: Steve French <smfrench(a)gmail.com> CC: Stable <stable(a)vger.kernel.org> Reviewed-by: Ronnie Sahlberg <lsahlber(a)redhat.com> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index ceaa358723f0..f0ae47e69cb3 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1637,8 +1637,11 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb, oparms.create_options = 0; utf16_path = cifs_convert_path_to_utf16(path, cifs_sb); - if (!utf16_path) - return ERR_PTR(-ENOMEM); + if (!utf16_path) { + rc = -ENOMEM; + free_xid(xid); + return ERR_PTR(rc); + } oparms.tcon = tcon; oparms.desired_access = READ_CONTROL; @@ -1696,8 +1699,11 @@ set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen, access_flags = WRITE_DAC; utf16_path = cifs_convert_path_to_utf16(path, cifs_sb); - if (!utf16_path) - return -ENOMEM; + if (!utf16_path) { + rc = -ENOMEM; + free_xid(xid); + return rc; + } oparms.tcon = tcon; oparms.desired_access = access_flags; @@ -1757,15 +1763,21 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, /* if file not oplocked can't be sure whether asking to extend size */ if (!CIFS_CACHE_READ(cifsi)) - if (keep_size == false) - return -EOPNOTSUPP; + if (keep_size == false) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } /* * Must check if file sparse since fallocate -z (zero range) assumes * non-sparse allocation */ - if (!(cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE)) - return -EOPNOTSUPP; + if (!(cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE)) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } /* * need to make sure we are not asked to extend the file since the SMB3 @@ -1774,8 +1786,11 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, * which for a non sparse file would zero the newly extended range */ if (keep_size == false) - if (i_size_read(inode) < offset + len) - return -EOPNOTSUPP; + if (i_size_read(inode) < offset + len) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } cifs_dbg(FYI, "offset %lld len %lld", offset, len); @@ -1808,8 +1823,11 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon, /* Need to make file sparse, if not already, before freeing range. */ /* Consider adding equivalent for compressed since it could also work */ - if (!smb2_set_sparse(xid, tcon, cfile, inode, set_sparse)) - return -EOPNOTSUPP; + if (!smb2_set_sparse(xid, tcon, cfile, inode, set_sparse)) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } cifs_dbg(FYI, "offset %lld len %lld", offset, len); @@ -1840,8 +1858,10 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon, /* if file not oplocked can't be sure whether asking to extend size */ if (!CIFS_CACHE_READ(cifsi)) - if (keep_size == false) - return -EOPNOTSUPP; + if (keep_size == false) { + free_xid(xid); + return rc; + } /* * Files are non-sparse by default so falloc may be a no-op @@ -1850,14 +1870,16 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon, */ if ((cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE) == 0) { if (keep_size == true) - return 0; + rc = 0; /* check if extending file */ else if (i_size_read(inode) >= off + len) /* not extending file and already not sparse */ - return 0; + rc = 0; /* BB: in future add else clause to extend file */ else - return -EOPNOTSUPP; + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; } if ((keep_size == true) || (i_size_read(inode) >= off + len)) { @@ -1869,8 +1891,11 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon, * ie potentially making a few extra pages at the beginning * or end of the file non-sparse via set_sparse is harmless. */ - if ((off > 8192) || (off + len + 8192 < i_size_read(inode))) - return -EOPNOTSUPP; + if ((off > 8192) || (off + len + 8192 < i_size_read(inode))) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } rc = smb2_set_sparse(xid, tcon, cfile, inode, false); }

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] smb3: fix various xid leaks" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From cfe89091644c441a1ade6dae6d2e47b715648615 Mon Sep 17 00:00:00 2001 From: Steve French <stfrench(a)microsoft.com> Date: Sat, 19 May 2018 02:04:55 -0500 Subject: [PATCH] smb3: fix various xid leaks Fix a few cases where we were not freeing the xid which led to active requests being non-zero at unmount time. Signed-off-by: Steve French <smfrench(a)gmail.com> CC: Stable <stable(a)vger.kernel.org> Reviewed-by: Ronnie Sahlberg <lsahlber(a)redhat.com> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index ceaa358723f0..f0ae47e69cb3 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1637,8 +1637,11 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb, oparms.create_options = 0; utf16_path = cifs_convert_path_to_utf16(path, cifs_sb); - if (!utf16_path) - return ERR_PTR(-ENOMEM); + if (!utf16_path) { + rc = -ENOMEM; + free_xid(xid); + return ERR_PTR(rc); + } oparms.tcon = tcon; oparms.desired_access = READ_CONTROL; @@ -1696,8 +1699,11 @@ set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen, access_flags = WRITE_DAC; utf16_path = cifs_convert_path_to_utf16(path, cifs_sb); - if (!utf16_path) - return -ENOMEM; + if (!utf16_path) { + rc = -ENOMEM; + free_xid(xid); + return rc; + } oparms.tcon = tcon; oparms.desired_access = access_flags; @@ -1757,15 +1763,21 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, /* if file not oplocked can't be sure whether asking to extend size */ if (!CIFS_CACHE_READ(cifsi)) - if (keep_size == false) - return -EOPNOTSUPP; + if (keep_size == false) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } /* * Must check if file sparse since fallocate -z (zero range) assumes * non-sparse allocation */ - if (!(cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE)) - return -EOPNOTSUPP; + if (!(cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE)) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } /* * need to make sure we are not asked to extend the file since the SMB3 @@ -1774,8 +1786,11 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, * which for a non sparse file would zero the newly extended range */ if (keep_size == false) - if (i_size_read(inode) < offset + len) - return -EOPNOTSUPP; + if (i_size_read(inode) < offset + len) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } cifs_dbg(FYI, "offset %lld len %lld", offset, len); @@ -1808,8 +1823,11 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon, /* Need to make file sparse, if not already, before freeing range. */ /* Consider adding equivalent for compressed since it could also work */ - if (!smb2_set_sparse(xid, tcon, cfile, inode, set_sparse)) - return -EOPNOTSUPP; + if (!smb2_set_sparse(xid, tcon, cfile, inode, set_sparse)) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } cifs_dbg(FYI, "offset %lld len %lld", offset, len); @@ -1840,8 +1858,10 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon, /* if file not oplocked can't be sure whether asking to extend size */ if (!CIFS_CACHE_READ(cifsi)) - if (keep_size == false) - return -EOPNOTSUPP; + if (keep_size == false) { + free_xid(xid); + return rc; + } /* * Files are non-sparse by default so falloc may be a no-op @@ -1850,14 +1870,16 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon, */ if ((cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE) == 0) { if (keep_size == true) - return 0; + rc = 0; /* check if extending file */ else if (i_size_read(inode) >= off + len) /* not extending file and already not sparse */ - return 0; + rc = 0; /* BB: in future add else clause to extend file */ else - return -EOPNOTSUPP; + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; } if ((keep_size == true) || (i_size_read(inode) >= off + len)) { @@ -1869,8 +1891,11 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon, * ie potentially making a few extra pages at the beginning * or end of the file non-sparse via set_sparse is harmless. */ - if ((off > 8192) || (off + len + 8192 < i_size_read(inode))) - return -EOPNOTSUPP; + if ((off > 8192) || (off + len + 8192 < i_size_read(inode))) { + rc = -EOPNOTSUPP; + free_xid(xid); + return rc; + } rc = smb2_set_sparse(xid, tcon, cfile, inode, false); }

7 years, 3 months

1
0
0 0

[PATCH] drm/etnaviv: Fix driver unregistering

by Fabio Estevam

From: Fabio Estevam <fabio.estevam(a)nxp.com> Russell King reported: "When removing and reloading the etnaviv module, the following splat occurs: sysfs: cannot create duplicate filename '/devices/platform/etnaviv' CPU: 0 PID: 1471 Comm: modprobe Not tainted 4.17.0+ #1608 Hardware name: Marvell Dove (Cubox) Backtrace: [<c00157d4>] (dump_backtrace) from [<c0015b8c>] (show_stack+0x18/0x1c) r6:ef033e38 r5:ee07b340 r4:edb9d000 r3:00000000 [<c0015b74>] (show_stack) from [<c0620784>] (dump_stack+0x20/0x28) [<c0620764>] (dump_stack) from [<c01bcd24>] (sysfs_warn_dup+0x5c/0x70) [<c01bccc8>] (sysfs_warn_dup) from [<c01bce14>] (sysfs_create_dir_ns+0x90/0x98) ..." Commit 246774d17fc0 ("drm/etnaviv: remove the need for a gpu-subsystem DT node") introduced DRM registration via platform_device_register_simple(), but missed to call platform_device_unregister() inside etnaviv_exit(). Fix the problem by calling platform_device_unregister() inside etnaviv_exit(). While at it, also rearrange the function calls in the exit path to make them happen in the opposite order of registration. Tested on a imx6-sabresd board. Cc: <stable(a)vger.kernel.org> Fixes: 246774d17fc0 ("drm/etnaviv: remove the need for a gpu-subsystem DT node") Reported-by: Russell King <linux(a)armlinux.org.uk> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index e5013a9..88ab61b 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -631,6 +631,8 @@ static struct platform_driver etnaviv_platform_driver = { }, }; +static struct platform_device *etnaviv_drm; + static int __init etnaviv_init(void) { int ret; @@ -654,7 +656,8 @@ static int __init etnaviv_init(void) if (!of_device_is_available(np)) continue; - platform_device_register_simple("etnaviv", -1, NULL, 0); + etnaviv_drm = platform_device_register_simple("etnaviv", -1, + NULL, 0); of_node_put(np); break; } @@ -665,8 +668,9 @@ module_init(etnaviv_init); static void __exit etnaviv_exit(void) { - platform_driver_unregister(&etnaviv_gpu_driver); + platform_device_unregister(etnaviv_drm); platform_driver_unregister(&etnaviv_platform_driver); + platform_driver_unregister(&etnaviv_gpu_driver); } module_exit(etnaviv_exit); -- 2.7.4

7 years, 3 months

1
0
0 0

[PATCH 2/5] softirq: Reorder trace_softirqs_on to prevent lockdep splat

by Steven Rostedt

From: "Joel Fernandes (Google)" <joel(a)joelfernandes.org> I'm able to reproduce a lockdep splat with config options: CONFIG_PROVE_LOCKING=y, CONFIG_DEBUG_LOCK_ALLOC=y and CONFIG_PREEMPTIRQ_EVENTS=y $ echo 1 > /d/tracing/events/preemptirq/preempt_enable/enable [ 26.112609] DEBUG_LOCKS_WARN_ON(current->softirqs_enabled) [ 26.112636] WARNING: CPU: 0 PID: 118 at kernel/locking/lockdep.c:3854 [...] [ 26.144229] Call Trace: [ 26.144926] <IRQ> [ 26.145506] lock_acquire+0x55/0x1b0 [ 26.146499] ? __do_softirq+0x46f/0x4d9 [ 26.147571] ? __do_softirq+0x46f/0x4d9 [ 26.148646] trace_preempt_on+0x8f/0x240 [ 26.149744] ? trace_preempt_on+0x4d/0x240 [ 26.150862] ? __do_softirq+0x46f/0x4d9 [ 26.151930] preempt_count_sub+0x18a/0x1a0 [ 26.152985] __do_softirq+0x46f/0x4d9 [ 26.153937] irq_exit+0x68/0xe0 [ 26.154755] smp_apic_timer_interrupt+0x271/0x280 [ 26.156056] apic_timer_interrupt+0xf/0x20 [ 26.157105] </IRQ> The issue was this: preempt_count = 1 << SOFTIRQ_SHIFT __local_bh_enable(cnt = 1 << SOFTIRQ_SHIFT) { if (softirq_count() == (cnt && SOFTIRQ_MASK)) { trace_softirqs_on() { current->softirqs_enabled = 1; } } preempt_count_sub(cnt) { trace_preempt_on() { tracepoint() { rcu_read_lock_sched() { // jumps into lockdep Where preempt_count still has softirqs disabled, but current->softirqs_enabled is true, and we get a splat. Link: http://lkml.kernel.org/r/20180607201143.247775-1-joel@joelfernandes.org Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Cc: Tom Zanussi <tom.zanussi(a)linux.intel.com> Cc: Namhyung Kim <namhyung(a)kernel.org> Cc: Thomas Glexiner <tglx(a)linutronix.de> Cc: Boqun Feng <boqun.feng(a)gmail.com> Cc: Paul McKenney <paulmck(a)linux.vnet.ibm.com> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Todd Kjos <tkjos(a)google.com> Cc: Erick Reyes <erickreyes(a)google.com> Cc: Julia Cartwright <julia(a)ni.com> Cc: Byungchul Park <byungchul.park(a)lge.com> Cc: stable(a)vger.kernel.org Reviewed-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> Fixes: d59158162e032 ("tracing: Add support for preempt and irq enable/disable events") Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> --- kernel/softirq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index de2f57fddc04..900dcfee542c 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -139,9 +139,13 @@ static void __local_bh_enable(unsigned int cnt) { lockdep_assert_irqs_disabled(); + if (preempt_count() == cnt) + trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip()); + if (softirq_count() == (cnt & SOFTIRQ_MASK)) trace_softirqs_on(_RET_IP_); - preempt_count_sub(cnt); + + __preempt_count_sub(cnt); } /* -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH 1/5] tracing: Check for no filter when processing event filters

by Steven Rostedt

From: "Steven Rostedt (VMware)" <rostedt(a)goodmis.org> The syzkaller detected a out-of-bounds issue with the events filter code, specifically here: prog[N].pred = NULL; /* #13 */ prog[N].target = 1; /* TRUE */ prog[N+1].pred = NULL; prog[N+1].target = 0; /* FALSE */ -> prog[N-1].target = N; prog[N-1].when_to_branch = false; As that's the first reference to a "N-1" index, it appears that the code got here with N = 0, which means the filter parser found no filter to parse (which shouldn't ever happen, but apparently it did). Add a new error to the parsing code that will check to make sure that N is not zero before going into this part of the code. If N = 0, then -EINVAL is returned, and a error message is added to the filter. Cc: stable(a)vger.kernel.org Fixes: 80765597bc587 ("tracing: Rewrite filter logic to be simpler and faster") Reported-by: air icy <icytxw(a)gmail.com> bugzilla url: https://bugzilla.kernel.org/show_bug.cgi?id=200019 Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> --- kernel/trace/trace_events_filter.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index e1c818dbc0d7..0dceb77d1d42 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -78,7 +78,8 @@ static const char * ops[] = { OPS }; C(TOO_MANY_PREDS, "Too many terms in predicate expression"), \ C(INVALID_FILTER, "Meaningless filter expression"), \ C(IP_FIELD_ONLY, "Only 'ip' field is supported for function trace"), \ - C(INVALID_VALUE, "Invalid value (did you forget quotes)?"), + C(INVALID_VALUE, "Invalid value (did you forget quotes)?"), \ + C(NO_FILTER, "No filter found"), #undef C #define C(a, b) FILT_ERR_##a @@ -550,6 +551,13 @@ predicate_parse(const char *str, int nr_parens, int nr_preds, goto out_free; } + if (!N) { + /* No program? */ + ret = -EINVAL; + parse_error(pe, FILT_ERR_NO_FILTER, ptr - str); + goto out_free; + } + prog[N].pred = NULL; /* #13 */ prog[N].target = 1; /* TRUE */ prog[N+1].pred = NULL; -- 2.17.1

7 years, 3 months

1
0
0 0

+ kasan-depend-on-config_slub_debug.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: kasan: depend on CONFIG_SLUB_DEBUG has been added to the -mm tree. Its filename is kasan-depend-on-config_slub_debug.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/kasan-depend-on-config_slub_debug.… and later at http://ozlabs.org/~akpm/mmotm/broken-out/kasan-depend-on-config_slub_debug.… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: "Jason A. Donenfeld" <Jason(a)zx2c4.com> Subject: kasan: depend on CONFIG_SLUB_DEBUG KASAN depends on having access to some of the accounting that SLUB_DEBUG does; without it, there are immediate crashes [1]. So, the natural thing to do is to make KASAN select SLUB_DEBUG. [1] http://lkml.kernel.org/r/CAHmME9rtoPwxUSnktxzKso14iuVCWT7BE_-_8PAC=pGw1iJnQ… Link: http://lkml.kernel.org/r/20180622154623.25388-1-Jason@zx2c4.com Fixes: f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com> Acked-by: Michal Hocko <mhocko(a)suse.com> Reviewed-by: Shakeel Butt <shakeelb(a)google.com> Cc: Shakeel Butt <shakeelb(a)google.com> Cc: David Rientjes <rientjes(a)google.com> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- lib/Kconfig.kasan | 1 + 1 file changed, 1 insertion(+) diff -puN lib/Kconfig.kasan~kasan-depend-on-config_slub_debug lib/Kconfig.kasan --- a/lib/Kconfig.kasan~kasan-depend-on-config_slub_debug +++ a/lib/Kconfig.kasan @@ -6,6 +6,7 @@ if HAVE_ARCH_KASAN config KASAN bool "KASan: runtime memory debugger" depends on SLUB || (SLAB && !DEBUG_SLAB) + select SLUB_DEBUG if SLUB select CONSTRUCTORS select STACKDEPOT help _ Patches currently in -mm which might be from Jason(a)zx2c4.com are kasan-depend-on-config_slub_debug.patch

7 years, 3 months

2
1
0 0

[PATCH 1/2] arm64: dts: stratix10: Fix SPI nodes for Stratix10

by thor.thayer＠linux.intel.com

From: Thor Thayer <thor.thayer(a)linux.intel.com> Remove the unused bus-num node and change num-chipselect to num-cs to match SPI bindings. Signed-off-by: Thor Thayer <thor.thayer(a)linux.intel.com> Fixes: 78cd6a9d8e154 ("arm64: dts: Add base stratix 10 dtsi") Cc: stable(a)vger.kernel.org --- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi index d8c94d5ff4b4..47fa4b450324 100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi @@ -315,8 +315,7 @@ interrupts = <0 99 4>; resets = <&rst SPIM0_RESET>; reg-io-width = <4>; - num-chipselect = <4>; - bus-num = <0>; + num-cs = <4>; status = "disabled"; }; @@ -328,8 +327,7 @@ interrupts = <0 100 4>; resets = <&rst SPIM1_RESET>; reg-io-width = <4>; - num-chipselect = <4>; - bus-num = <0>; + num-cs = <4>; status = "disabled"; }; -- 2.7.4

7 years, 3 months

3
2
0 0

[PATCH 1/2] ARM: dts: Fix SPI node for Arria10

by thor.thayer＠linux.intel.com

From: Thor Thayer <thor.thayer(a)linux.intel.com> Remove the unused bus-num node and change num-chipselect to num-cs to match SPI bindings. Fixes: f2d6f8f817814 ("ARM: dts: socfpga: Add SPI Master1 for Arria10 SR chip") Signed-off-by: Thor Thayer <thor.thayer(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- arch/arm/boot/dts/socfpga_arria10.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi index bead79e4b2aa..9138f834bad4 100644 --- a/arch/arm/boot/dts/socfpga_arria10.dtsi +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi @@ -593,8 +593,7 @@ #size-cells = <0>; reg = <0xffda5000 0x100>; interrupts = <0 102 4>; - num-chipselect = <4>; - bus-num = <0>; + num-cs = <4>; /*32bit_access;*/ tx-dma-channel = <&pdma 16>; rx-dma-channel = <&pdma 17>; -- 2.7.4

7 years, 3 months

3
2
0 0

[PATCH v4 1/5] mtd: rawnand: denali_dt: set clk_x_rate to 200 MHz unconditionally

by Masahiro Yamada

Since commit 1bb88666775e ("mtd: nand: denali: handle timing parameters by setup_data_interface()"), denali_dt.c gets the clock rate from the clock driver. The driver expects the frequency of the bus interface clock, whereas the clock driver of SOCFPGA provides the core clock. Thus, the setup_data_interface() hook calculates timing parameters based on a wrong frequency. To make it work without relying on the clock driver, hard-code the clock frequency, 200MHz. This is fine for existing DT of UniPhier, and also fixes the issue of SOCFPGA because both platforms use 200 MHz for the bus interface clock. Fixes: 1bb88666775e ("mtd: nand: denali: handle timing parameters by setup_data_interface()") Cc: linux-stable <stable(a)vger.kernel.org> #4.14+ Reported-by: Philipp Rosenberger <p.rosenberger(a)linutronix.de> Suggested-by: Boris Brezillon <boris.brezillon(a)bootlin.com> Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Tested-by: Richard Weinberger <richard(a)nod.at> --- Changes in v4: - split into a very simple patch for backport candiate drivers/mtd/nand/raw/denali_dt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c index cfd33e6..5869e90 100644 --- a/drivers/mtd/nand/raw/denali_dt.c +++ b/drivers/mtd/nand/raw/denali_dt.c @@ -123,7 +123,11 @@ static int denali_dt_probe(struct platform_device *pdev) if (ret) return ret; - denali->clk_x_rate = clk_get_rate(dt->clk); + /* + * Hardcode the clock rate for the backward compatibility. + * This works for both SOCFPGA and UniPhier. + */ + denali->clk_x_rate = 200000000; ret = denali_init(denali); if (ret) -- 2.7.4

7 years, 3 months

2
1
0 0

[PATCH] arm64: mm: Ensure writes to swapper are ordered wrt subsequent cache maintenance

by Will Deacon

When rewriting swapper using nG mappings, we must performance cache maintenance around each page table access in order to avoid coherency problems with the host's cacheable alias under KVM. To ensure correct ordering of the maintenance with respect to Device memory accesses made with the Stage-1 MMU disabled, DMBs need to be added between the maintenance and the corresponding memory access. This patch adds a missing DMB between writing a new page table entry and performing a clean+invalidate on the same line. Cc: <stable(a)vger.kernel.org> Signed-off-by: Will Deacon <will.deacon(a)arm.com> --- arch/arm64/mm/proc.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 5f9a73a4452c..03646e6a2ef4 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -217,8 +217,9 @@ ENDPROC(idmap_cpu_replace_ttbr1) .macro __idmap_kpti_put_pgtable_ent_ng, type orr \type, \type, #PTE_NG // Same bit for blocks and pages - str \type, [cur_\()\type\()p] // Update the entry and ensure it - dc civac, cur_\()\type\()p // is visible to all CPUs. + str \type, [cur_\()\type\()p] // Update the entry and ensure + dmb sy // that it is visible to all + dc civac, cur_\()\type\()p // CPUs. .endm /* -- 2.1.4

7 years, 3 months

3
2
0 0

[PATCH] slub: track number of slabs irrespective of CONFIG_SLUB_DEBUG

by Shakeel Butt

For !CONFIG_SLUB_DEBUG, SLUB does not maintain the number of slabs allocated per node for a kmem_cache. Thus, slabs_node() in __kmem_cache_empty(), __kmem_cache_shrink() and __kmem_cache_destroy() will always return 0 for such config. This is wrong and can cause issues for all users of these functions. Infact in [1] Jason has reported a system crash while using SLUB without CONFIG_SLUB_DEBUG. The reason was the usage of slabs_node() by __kmem_cache_empty(). The right solution is to make slabs_node() work even for !CONFIG_SLUB_DEBUG. The commit 0f389ec63077 ("slub: No need for per node slab counters if !SLUB_DEBUG") had put the per node slab counter under CONFIG_SLUB_DEBUG because it was only read through sysfs API and the sysfs API was disabled on !CONFIG_SLUB_DEBUG. However the users of the per node slab counter assumed that it will work in the absence of CONFIG_SLUB_DEBUG. So, make the counter work for !CONFIG_SLUB_DEBUG. Please note that commit f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") exposed this issue but it is present even before. [1] http://lkml.kernel.org/r/CAHmME9rtoPwxUSnktxzKso14iuVCWT7BE_-_8PAC=pGw1iJnQ… Fixes: f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") Signed-off-by: Shakeel Butt <shakeelb(a)google.com> Suggested-by: David Rientjes <rientjes(a)google.com> Reported-by: Jason A . Donenfeld <Jason(a)zx2c4.com> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: <stable(a)vger.kernel.org> Cc: <linux-mm(a)kvack.org> Cc: <linux-kernel(a)vger.kernel.org> --- mm/slab.h | 2 +- mm/slub.c | 80 +++++++++++++++++++++++++------------------------------ 2 files changed, 38 insertions(+), 44 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index 68bdf498da3b..a6545332cc86 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -473,8 +473,8 @@ struct kmem_cache_node { #ifdef CONFIG_SLUB unsigned long nr_partial; struct list_head partial; -#ifdef CONFIG_SLUB_DEBUG atomic_long_t nr_slabs; +#ifdef CONFIG_SLUB_DEBUG atomic_long_t total_objects; struct list_head full; #endif diff --git a/mm/slub.c b/mm/slub.c index a3b8467c14af..c9c190d54687 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1030,42 +1030,6 @@ static void remove_full(struct kmem_cache *s, struct kmem_cache_node *n, struct list_del(&page->lru); } -/* Tracking of the number of slabs for debugging purposes */ -static inline unsigned long slabs_node(struct kmem_cache *s, int node) -{ - struct kmem_cache_node *n = get_node(s, node); - - return atomic_long_read(&n->nr_slabs); -} - -static inline unsigned long node_nr_slabs(struct kmem_cache_node *n) -{ - return atomic_long_read(&n->nr_slabs); -} - -static inline void inc_slabs_node(struct kmem_cache *s, int node, int objects) -{ - struct kmem_cache_node *n = get_node(s, node); - - /* - * May be called early in order to allocate a slab for the - * kmem_cache_node structure. Solve the chicken-egg - * dilemma by deferring the increment of the count during - * bootstrap (see early_kmem_cache_node_alloc). - */ - if (likely(n)) { - atomic_long_inc(&n->nr_slabs); - atomic_long_add(objects, &n->total_objects); - } -} -static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) -{ - struct kmem_cache_node *n = get_node(s, node); - - atomic_long_dec(&n->nr_slabs); - atomic_long_sub(objects, &n->total_objects); -} - /* Object debug checks for alloc/free paths */ static void setup_object_debug(struct kmem_cache *s, struct page *page, void *object) @@ -1321,16 +1285,46 @@ slab_flags_t kmem_cache_flags(unsigned int object_size, #define disable_higher_order_debug 0 +#endif /* CONFIG_SLUB_DEBUG */ + static inline unsigned long slabs_node(struct kmem_cache *s, int node) - { return 0; } +{ + struct kmem_cache_node *n = get_node(s, node); + + return atomic_long_read(&n->nr_slabs); +} + static inline unsigned long node_nr_slabs(struct kmem_cache_node *n) - { return 0; } -static inline void inc_slabs_node(struct kmem_cache *s, int node, - int objects) {} -static inline void dec_slabs_node(struct kmem_cache *s, int node, - int objects) {} +{ + return atomic_long_read(&n->nr_slabs); +} -#endif /* CONFIG_SLUB_DEBUG */ +static inline void inc_slabs_node(struct kmem_cache *s, int node, int objects) +{ + struct kmem_cache_node *n = get_node(s, node); + + /* + * May be called early in order to allocate a slab for the + * kmem_cache_node structure. Solve the chicken-egg + * dilemma by deferring the increment of the count during + * bootstrap (see early_kmem_cache_node_alloc). + */ + if (likely(n)) { + atomic_long_inc(&n->nr_slabs); +#ifdef CONFIG_SLUB_DEBUG + atomic_long_add(objects, &n->total_objects); +#endif + } +} +static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) +{ + struct kmem_cache_node *n = get_node(s, node); + + atomic_long_dec(&n->nr_slabs); +#ifdef CONFIG_SLUB_DEBUG + atomic_long_sub(objects, &n->total_objects); +#endif +} /* * Hooks for other subsystems that check memory allocations. In a typical -- 2.18.0.rc1.244.gcf134e6275-goog

7 years, 3 months

4
7
0 0

[PATCH v3] time: Make sure jiffies_to_msecs() preserves non-zero time periods

by Geert Uytterhoeven

For the common cases where 1000 is a multiple of HZ, or HZ is a multiple of 1000, jiffies_to_msecs() never returns zero when passed a non-zero time period. However, if HZ > 1000 and not an integer multiple of 1000 (e.g. 1024 or 1200, as used on alpha and DECstation), jiffies_to_msecs() may return zero for small non-zero time periods. This may break code that relies on receiving back a non-zero value. jiffies_to_usecs() does not need such a fix: one jiffy can only be less than one µs if HZ > 1000000, and such large values of HZ are already rejected at build time, twice: - include/linux/jiffies.h does #error if HZ >= 12288, - kernel/time/time.c has BUILD_BUG_ON(HZ > USEC_PER_SEC). Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Reviewed-by: Arnd Bergmann <arnd(a)arndb.de> Cc: stable(a)vger.kernel.org --- Broken since forever. v3: - Add Reviewed-by, - Cc stable, - Explain better why jiffies_to_usecs() does not need a fix, v2: - Add examples of affected systems, - Use DIV_ROUND_UP(). --- kernel/time/time.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/time/time.c b/kernel/time/time.c index 6fa99213fc720e4b..2b41e8e2d31db26f 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -28,6 +28,7 @@ */ #include <linux/export.h> +#include <linux/kernel.h> #include <linux/timex.h> #include <linux/capability.h> #include <linux/timekeeper_internal.h> @@ -314,9 +315,10 @@ unsigned int jiffies_to_msecs(const unsigned long j) return (j + (HZ / MSEC_PER_SEC) - 1)/(HZ / MSEC_PER_SEC); #else # if BITS_PER_LONG == 32 - return (HZ_TO_MSEC_MUL32 * j) >> HZ_TO_MSEC_SHR32; + return (HZ_TO_MSEC_MUL32 * j + (1ULL << HZ_TO_MSEC_SHR32) - 1) >> + HZ_TO_MSEC_SHR32; # else - return (j * HZ_TO_MSEC_NUM) / HZ_TO_MSEC_DEN; + return DIV_ROUND_UP(j * HZ_TO_MSEC_NUM, HZ_TO_MSEC_DEN); # endif #endif } -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH v3 1/3] mtd: rawnand: denali_dt: add more clocks based on IP datasheet

by Masahiro Yamada

According to the Denali User's Guide, this IP needs three clocks: - clk: controller core clock - clk_x: bus interface clock - ecc_clk: clock at which ECC circuitry is run Currently, denali_dt.c requires a single anonymous clock and its frequency. However, the driver needs to get the frequency of "clk_x" not "clk". This is confusing because people tend to assume the anonymous clock means the core clock. In fact, I got a report of SOCFPGA breakage because the timing parameters are calculated based on a wrong frequency. Instead of the cheesy implementation, the clocks in the real hardware should be represented in the driver and the DT-binding. However, adding new clocks would break the existing platforms. For the backward compatibility, the driver still accepts a single clock just as before. If clk_x is missing, clk_x_rate is set to a hardcoded value. This is fine for existing DT of Socionext UniPhier, and also fixes the issue of Altera (Intel) SOCFPGA because both platforms use 200 MHz for the bus interface clock. Fixes: 1bb88666775e ("mtd: nand: denali: handle timing parameters by setup_data_interface()") Cc: linux-stable <stable(a)vger.kernel.org> #4.14+ Reported-by: Richard Weinberger <richard(a)nod.at> Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v3: - Change the patch order so that the bug-fix one comes the first Changes in v2: - Split patches into sensible chunks .../devicetree/bindings/mtd/denali-nand.txt | 5 +++ drivers/mtd/nand/raw/denali_dt.c | 49 ++++++++++++++++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/denali-nand.txt b/Documentation/devicetree/bindings/mtd/denali-nand.txt index 0ee8edb..f33da87 100644 --- a/Documentation/devicetree/bindings/mtd/denali-nand.txt +++ b/Documentation/devicetree/bindings/mtd/denali-nand.txt @@ -8,6 +8,9 @@ Required properties: - reg : should contain registers location and length for data and reg. - reg-names: Should contain the reg names "nand_data" and "denali_reg" - interrupts : The interrupt number. + - clocks: should contain phandle of the controller core clock, the bus + interface clock, and the ECC circuit clock. + - clock-names: should contain "nand", "nand_x", "ecc" Optional properties: - nand-ecc-step-size: see nand.txt for details. If present, the value must be @@ -31,5 +34,7 @@ nand: nand@ff900000 { compatible = "altr,socfpga-denali-nand"; reg = <0xff900000 0x20>, <0xffb80000 0x1000>; reg-names = "nand_data", "denali_reg"; + clocks = <&nand_clk>, <&nand_x_clk>, <&nand_ecc_clk>; + clock-names = "nand", "nand_x", "ecc"; interrupts = <0 144 4>; }; diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c index cfd33e6..ce6239d 100644 --- a/drivers/mtd/nand/raw/denali_dt.c +++ b/drivers/mtd/nand/raw/denali_dt.c @@ -27,7 +27,9 @@ struct denali_dt { struct denali_nand_info denali; - struct clk *clk; + struct clk *clk; /* core clock */ + struct clk *clk_x; /* bus interface clock */ + struct clk *clk_ecc; /* ECC circuit clock */ }; struct denali_dt_data { @@ -114,24 +116,61 @@ static int denali_dt_probe(struct platform_device *pdev) if (IS_ERR(denali->host)) return PTR_ERR(denali->host); - dt->clk = devm_clk_get(&pdev->dev, NULL); + /* + * A single anonymous clock is supported for the backward compatibility. + * New platforms should support all the named clocks. + */ + dt->clk = devm_clk_get(&pdev->dev, "nand"); + if (IS_ERR(dt->clk)) + dt->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(dt->clk)) { dev_err(&pdev->dev, "no clk available\n"); return PTR_ERR(dt->clk); } + + dt->clk_x = devm_clk_get(&pdev->dev, "nand_x"); + if (IS_ERR(dt->clk_x)) + dt->clk_x = NULL; + + dt->clk_ecc = devm_clk_get(&pdev->dev, "ecc"); + if (IS_ERR(dt->clk_ecc)) + dt->clk_ecc = NULL; + ret = clk_prepare_enable(dt->clk); if (ret) return ret; - denali->clk_x_rate = clk_get_rate(dt->clk); + ret = clk_prepare_enable(dt->clk_x); + if (ret) + goto out_disable_clk; + + ret = clk_prepare_enable(dt->clk_ecc); + if (ret) + goto out_disable_clk_x; + + if (dt->clk_x) { + denali->clk_x_rate = clk_get_rate(dt->clk_x); + } else { + /* + * Hardcode the clock rates for the backward compatibility. + * This works for both SOCFPGA and UniPhier. + */ + dev_notice(&pdev->dev, + "necessary clock is missing. default clock rates are used.\n"); + denali->clk_x_rate = 200000000; + } ret = denali_init(denali); if (ret) - goto out_disable_clk; + goto out_disable_clk_ecc; platform_set_drvdata(pdev, dt); return 0; +out_disable_clk_ecc: + clk_disable_unprepare(dt->clk_ecc); +out_disable_clk_x: + clk_disable_unprepare(dt->clk_x); out_disable_clk: clk_disable_unprepare(dt->clk); @@ -143,6 +182,8 @@ static int denali_dt_remove(struct platform_device *pdev) struct denali_dt *dt = platform_get_drvdata(pdev); denali_remove(&dt->denali); + clk_disable_unprepare(dt->clk_ecc); + clk_disable_unprepare(dt->clk_x); clk_disable_unprepare(dt->clk); return 0; -- 2.7.4

7 years, 3 months

5
10
0 0

[tip:ras/core] x86/mce: Do not overwrite MCi_STATUS in mce_no_way_out()

by tip-bot for Borislav Petkov

Commit-ID: 1f74c8a64798e2c488f86efc97e308b85fb7d7aa Gitweb: https://git.kernel.org/tip/1f74c8a64798e2c488f86efc97e308b85fb7d7aa Author: Borislav Petkov <bp(a)suse.de> AuthorDate: Fri, 22 Jun 2018 11:54:28 +0200 Committer: Thomas Gleixner <tglx(a)linutronix.de> CommitDate: Fri, 22 Jun 2018 14:35:50 +0200 x86/mce: Do not overwrite MCi_STATUS in mce_no_way_out() mce_no_way_out() does a quick check during #MC to see whether some of the MCEs logged would require the kernel to panic immediately. And it passes a struct mce where MCi_STATUS gets written. However, after having saved a valid status value, the next iteration of the loop which goes over the MCA banks on the CPU, overwrites the valid status value because we're using struct mce as storage instead of a temporary variable. Which leads to MCE records with an empty status value: mce: [Hardware Error]: CPU 0: Machine Check Exception: 6 Bank 0: 0000000000000000 mce: [Hardware Error]: RIP 10:<ffffffffbd42fbd7> {trigger_mce+0x7/0x10} In order to prevent the loss of the status register value, return immediately when severity is a panic one so that we can panic immediately with the first fatal MCE logged. This is also the intention of this function and not to noodle over the banks while a fatal MCE is already logged. Tony: read the rest of the MCA bank to populate the struct mce fully. Suggested-by: Tony Luck <tony.luck(a)intel.com> Signed-off-by: Borislav Petkov <bp(a)suse.de> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Cc: <stable(a)vger.kernel.org> Link: https://lkml.kernel.org/r/20180622095428.626-8-bp@alien8.de --- arch/x86/kernel/cpu/mcheck/mce.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index cd76380af79f..7e6f51a9d917 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -772,23 +772,25 @@ EXPORT_SYMBOL_GPL(machine_check_poll); static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp, struct pt_regs *regs) { - int i, ret = 0; char *tmp; + int i; for (i = 0; i < mca_cfg.banks; i++) { m->status = mce_rdmsrl(msr_ops.status(i)); - if (m->status & MCI_STATUS_VAL) { - __set_bit(i, validp); - if (quirk_no_way_out) - quirk_no_way_out(i, m, regs); - } + if (!(m->status & MCI_STATUS_VAL)) + continue; + + __set_bit(i, validp); + if (quirk_no_way_out) + quirk_no_way_out(i, m, regs); if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) { + mce_read_aux(m, i); *msg = tmp; - ret = 1; + return 1; } } - return ret; + return 0; } /*

7 years, 3 months

1
0
0 0

[PATCH v2 1/4] mtd: cfi_cmdset_0002: Use right chip in do_ppb_xxlock()

by Joakim Tjernlund

do_ppb_xxlock() fails to add chip->start when quering for lock status(and chip_ready test), which caused false status reports. Fix by adding adr += chip->start and adjust call sites accordingly. Fixes: 1648eaaa1575 ("mtd: cfi_cmdset_0002: Support Persistent Protection Bits (PPB) locking") Cc: stable(a)vger.kernel.org Signed-off-by: Joakim Tjernlund <joakim.tjernlund(a)infinera.com> --- v2 - Spilt into several patches drivers/mtd/chips/cfi_cmdset_0002.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 53a976a8e614..8648b1adccd5 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -2554,8 +2554,9 @@ static int __maybe_unused do_ppb_xxlock(struct map_info *map, unsigned long timeo; int ret; + adr += chip->start; mutex_lock(&chip->mutex); - ret = get_chip(map, chip, adr + chip->start, FL_LOCKING); + ret = get_chip(map, chip, adr, FL_LOCKING); if (ret) { mutex_unlock(&chip->mutex); return ret; @@ -2573,8 +2574,8 @@ static int __maybe_unused do_ppb_xxlock(struct map_info *map, if (thunk == DO_XXLOCK_ONEBLOCK_LOCK) { chip->state = FL_LOCKING; - map_write(map, CMD(0xA0), chip->start + adr); - map_write(map, CMD(0x00), chip->start + adr); + map_write(map, CMD(0xA0), adr); + map_write(map, CMD(0x00), adr); } else if (thunk == DO_XXLOCK_ONEBLOCK_UNLOCK) { /* * Unlocking of one specific sector is not supported, so we @@ -2612,7 +2613,7 @@ static int __maybe_unused do_ppb_xxlock(struct map_info *map, map_write(map, CMD(0x00), chip->start); chip->state = FL_READY; - put_chip(map, chip, adr + chip->start); + put_chip(map, chip, adr); mutex_unlock(&chip->mutex); return ret; -- 2.13.6

7 years, 3 months

3
14
0 0

[PATCH v2] mtd: rawnand: All AC chips have a broken GET_FEATURES(TIMINGS).

by Boris Brezillon

From: Mason Yang <masonccyang(a)mxic.com.tw> Make sure we flag all broken chips as not supporting this feature. Also move this logic to a new function to keep things readable. Fixes: 34c5c01e0c8c ("mtd: rawnand: macronix: nack the support of changing timings for one chip") Cc: <stable(a)vger.kernel.org> Signed-off-by: Mason Yang <masonccyang(a)mxic.com.tw> Signed-off-by: Boris Brezillon <boris.brezillon(a)bootlin.com> --- Changes in v2: - Add Fixes and Cc-stable tags --- drivers/mtd/nand/raw/nand_macronix.c | 48 +++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c index 7ed1f87e742a..49c546c97c6f 100644 --- a/drivers/mtd/nand/raw/nand_macronix.c +++ b/drivers/mtd/nand/raw/nand_macronix.c @@ -17,23 +17,47 @@ #include <linux/mtd/rawnand.h> +/* + * Macronix AC series does not support using SET/GET_FEATURES to change + * the timings unlike what is declared in the parameter page. Unflag + * this feature to avoid unnecessary downturns. + */ +static void macronix_nand_fix_broken_get_timings(struct nand_chip *chip) +{ + unsigned int i; + static const char * const broken_get_timings[] = { + "MX30LF1G18AC", + "MX30LF1G28AC", + "MX30LF2G18AC", + "MX30LF2G28AC", + "MX30LF4G18AC", + "MX30LF4G28AC", + "MX60LF8G18AC", + }; + + if (!chip->parameters.supports_set_get_features) + return; + + for (i = 0; i < ARRAY_SIZE(broken_get_timings); i++) { + if (!strcmp(broken_get_timings[i], chip->parameters.model)) + break; + } + + if (i == ARRAY_SIZE(broken_get_timings)) + return; + + bitmap_clear(chip->parameters.get_feature_list, + ONFI_FEATURE_ADDR_TIMING_MODE, 1); + bitmap_clear(chip->parameters.set_feature_list, + ONFI_FEATURE_ADDR_TIMING_MODE, 1); +} + static int macronix_nand_init(struct nand_chip *chip) { if (nand_is_slc(chip)) chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; - /* - * MX30LF2G18AC chip does not support using SET/GET_FEATURES to change - * the timings unlike what is declared in the parameter page. Unflag - * this feature to avoid unnecessary downturns. - */ - if (chip->parameters.supports_set_get_features && - !strcmp("MX30LF2G18AC", chip->parameters.model)) { - bitmap_clear(chip->parameters.get_feature_list, - ONFI_FEATURE_ADDR_TIMING_MODE, 1); - bitmap_clear(chip->parameters.set_feature_list, - ONFI_FEATURE_ADDR_TIMING_MODE, 1); - } + macronix_nand_fix_broken_get_timings(chip); return 0; } -- 2.14.1

7 years, 3 months

2
2
0 0

[PATCH] mtd: rawnand: fix return value check for bad block status

by Abhishek Sahu

Positive return value from read_oob() is making false BAD blocks. For some of the NAND controllers, OOB bytes will be protected with ECC and read_oob() will return number of bitflips. If there is any bitflip in ECC protected OOB bytes for BAD block status page, then that block is getting treated as BAD. Fixes: c120e75e0e7d ("mtd: nand: use read_oob() instead of cmdfunc() for bad block check") Cc: <stable(a)vger.kernel.org> Signed-off-by: Abhishek Sahu <absahu(a)codeaurora.org> --- drivers/mtd/nand/raw/nand_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index f28c3a5..4a73f73 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -440,7 +440,7 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs) for (; page < page_end; page++) { res = chip->ecc.read_oob(mtd, chip, page); - if (res) + if (res < 0) return res; bad = chip->oob_poi[chip->badblockpos]; -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

7 years, 3 months

3
2
0 0

[PATCH] cpuidle: powernv: Fix promotion from snooze if next state disabled

by Gautham R. Shenoy

From: "Gautham R. Shenoy" <ego(a)linux.vnet.ibm.com> [ Upstream commit 0a4ec6aa035a52c422eceb2ed51ed88392a3d6c2 ] The commit 78eaa10f027c ("cpuidle: powernv/pseries: Auto-promotion of snooze to deeper idle state") introduced a timeout for the snooze idle state so that it could be eventually be promoted to a deeper idle state. The snooze timeout value is static and set to the target residency of the next idle state, which would train the cpuidle governor to pick the next idle state eventually. The unfortunate side-effect of this is that if the next idle state(s) is disabled, the CPU will forever remain in snooze, despite the fact that the system is completely idle, and other deeper idle states are available. This patch fixes the issue by dynamically setting the snooze timeout to the target residency of the next enabled state on the device. Before Patch: POWER8 : Only nap disabled. $ cpupower monitor sleep 30 sleep took 30.01297 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | Nap | Fast 0| 8| 0| 96.41| 0.00| 0.00 0| 8| 1| 96.43| 0.00| 0.00 0| 8| 2| 96.47| 0.00| 0.00 0| 8| 3| 96.35| 0.00| 0.00 0| 8| 4| 96.37| 0.00| 0.00 0| 8| 5| 96.37| 0.00| 0.00 0| 8| 6| 96.47| 0.00| 0.00 0| 8| 7| 96.47| 0.00| 0.00 POWER9: Shallow states (stop0lite, stop1lite, stop2lite, stop0, stop1, stop2) disabled: $ cpupower monitor sleep 30 sleep took 30.05033 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | stop | stop | stop | stop | stop | stop | stop | stop 0| 16| 0| 89.79| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 1| 90.12| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 2| 90.21| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 3| 90.29| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 After Patch: POWER8 : Only nap disabled. $ cpupower monitor sleep 30 sleep took 30.01200 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | Nap | Fast 0| 8| 0| 16.58| 0.00| 77.21 0| 8| 1| 18.42| 0.00| 75.38 0| 8| 2| 4.70| 0.00| 94.09 0| 8| 3| 17.06| 0.00| 81.73 0| 8| 4| 3.06| 0.00| 95.73 0| 8| 5| 7.00| 0.00| 96.80 0| 8| 6| 1.00| 0.00| 98.79 0| 8| 7| 5.62| 0.00| 94.17 POWER9: Shallow states (stop0lite, stop1lite, stop2lite, stop0, stop1, stop2) disabled: $ cpupower monitor sleep 30 sleep took 30.02110 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | stop | stop | stop | stop | stop | stop | stop | stop 0| 0| 0| 0.69| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 9.39| 89.70 0| 0| 1| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.05| 93.21 0| 0| 2| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 89.93 0| 0| 3| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 93.26 Fixes: 78eaa10f027c ("cpuidle: powernv/pseries: Auto-promotion of snooze to deeper idle state") Cc: stable(a)vger.kernel.org # v4.14+ Signed-off-by: Gautham R. Shenoy <ego(a)linux.vnet.ibm.com> Reviewed-by: Balbir Singh <bsingharora(a)gmail.com> Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> --- drivers/cpuidle/cpuidle-powernv.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c index 1a8234e..d29e4f0 100644 --- a/drivers/cpuidle/cpuidle-powernv.c +++ b/drivers/cpuidle/cpuidle-powernv.c @@ -43,9 +43,31 @@ struct stop_psscr_table { static struct stop_psscr_table stop_psscr_table[CPUIDLE_STATE_MAX] __read_mostly; -static u64 snooze_timeout __read_mostly; +static u64 default_snooze_timeout __read_mostly; static bool snooze_timeout_en __read_mostly; +static u64 get_snooze_timeout(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index) +{ + int i; + + if (unlikely(!snooze_timeout_en)) + return default_snooze_timeout; + + for (i = index + 1; i < drv->state_count; i++) { + struct cpuidle_state *s = &drv->states[i]; + struct cpuidle_state_usage *su = &dev->states_usage[i]; + + if (s->disabled || su->disable) + continue; + + return s->target_residency * tb_ticks_per_usec; + } + + return default_snooze_timeout; +} + static int snooze_loop(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) @@ -56,7 +78,7 @@ static int snooze_loop(struct cpuidle_device *dev, local_irq_enable(); - snooze_exit_time = get_tb() + snooze_timeout; + snooze_exit_time = get_tb() + get_snooze_timeout(dev, drv, index); ppc64_runlatch_off(); HMT_very_low(); while (!need_resched()) { @@ -465,11 +487,9 @@ static int powernv_idle_probe(void) cpuidle_state_table = powernv_states; /* Device tree can indicate more idle states */ max_idle_state = powernv_add_idle_states(); - if (max_idle_state > 1) { + default_snooze_timeout = TICK_USEC * tb_ticks_per_usec; + if (max_idle_state > 1) snooze_timeout_en = true; - snooze_timeout = powernv_states[1].target_residency * - tb_ticks_per_usec; - } } else return -ENODEV; -- 1.9.4

7 years, 3 months

1
0
0 0

[PATCH] cpuidle: powernv: Fix promotion from snooze if next state disabled

by Gautham R. Shenoy

From: "Gautham R. Shenoy" <ego(a)linux.vnet.ibm.com> [ Upstream commit 0a4ec6aa035a52c422eceb2ed51ed88392a3d6c2 ] The commit 78eaa10f027c ("cpuidle: powernv/pseries: Auto-promotion of snooze to deeper idle state") introduced a timeout for the snooze idle state so that it could be eventually be promoted to a deeper idle state. The snooze timeout value is static and set to the target residency of the next idle state, which would train the cpuidle governor to pick the next idle state eventually. The unfortunate side-effect of this is that if the next idle state(s) is disabled, the CPU will forever remain in snooze, despite the fact that the system is completely idle, and other deeper idle states are available. This patch fixes the issue by dynamically setting the snooze timeout to the target residency of the next enabled state on the device. Before Patch: POWER8 : Only nap disabled. $ cpupower monitor sleep 30 sleep took 30.01297 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | Nap | Fast 0| 8| 0| 96.41| 0.00| 0.00 0| 8| 1| 96.43| 0.00| 0.00 0| 8| 2| 96.47| 0.00| 0.00 0| 8| 3| 96.35| 0.00| 0.00 0| 8| 4| 96.37| 0.00| 0.00 0| 8| 5| 96.37| 0.00| 0.00 0| 8| 6| 96.47| 0.00| 0.00 0| 8| 7| 96.47| 0.00| 0.00 POWER9: Shallow states (stop0lite, stop1lite, stop2lite, stop0, stop1, stop2) disabled: $ cpupower monitor sleep 30 sleep took 30.05033 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | stop | stop | stop | stop | stop | stop | stop | stop 0| 16| 0| 89.79| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 1| 90.12| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 2| 90.21| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 3| 90.29| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 After Patch: POWER8 : Only nap disabled. $ cpupower monitor sleep 30 sleep took 30.01200 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | Nap | Fast 0| 8| 0| 16.58| 0.00| 77.21 0| 8| 1| 18.42| 0.00| 75.38 0| 8| 2| 4.70| 0.00| 94.09 0| 8| 3| 17.06| 0.00| 81.73 0| 8| 4| 3.06| 0.00| 95.73 0| 8| 5| 7.00| 0.00| 96.80 0| 8| 6| 1.00| 0.00| 98.79 0| 8| 7| 5.62| 0.00| 94.17 POWER9: Shallow states (stop0lite, stop1lite, stop2lite, stop0, stop1, stop2) disabled: $ cpupower monitor sleep 30 sleep took 30.02110 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | stop | stop | stop | stop | stop | stop | stop | stop 0| 0| 0| 0.69| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 9.39| 89.70 0| 0| 1| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.05| 93.21 0| 0| 2| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 89.93 0| 0| 3| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 93.26 Fixes: 78eaa10f027c ("cpuidle: powernv/pseries: Auto-promotion of snooze to deeper idle state") Cc: stable(a)vger.kernel.org # v4.9 Signed-off-by: Gautham R. Shenoy <ego(a)linux.vnet.ibm.com> Reviewed-by: Balbir Singh <bsingharora(a)gmail.com> Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> --- drivers/cpuidle/cpuidle-powernv.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c index cda8f62..069a689 100644 --- a/drivers/cpuidle/cpuidle-powernv.c +++ b/drivers/cpuidle/cpuidle-powernv.c @@ -42,9 +42,31 @@ struct stop_psscr_table { static struct stop_psscr_table stop_psscr_table[CPUIDLE_STATE_MAX]; -static u64 snooze_timeout; +static u64 default_snooze_timeout; static bool snooze_timeout_en; +static u64 get_snooze_timeout(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index) +{ + int i; + + if (unlikely(!snooze_timeout_en)) + return default_snooze_timeout; + + for (i = index + 1; i < drv->state_count; i++) { + struct cpuidle_state *s = &drv->states[i]; + struct cpuidle_state_usage *su = &dev->states_usage[i]; + + if (s->disabled || su->disable) + continue; + + return s->target_residency * tb_ticks_per_usec; + } + + return default_snooze_timeout; +} + static int snooze_loop(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) @@ -54,7 +76,7 @@ static int snooze_loop(struct cpuidle_device *dev, local_irq_enable(); set_thread_flag(TIF_POLLING_NRFLAG); - snooze_exit_time = get_tb() + snooze_timeout; + snooze_exit_time = get_tb() + get_snooze_timeout(dev, drv, index); ppc64_runlatch_off(); while (!need_resched()) { HMT_low(); @@ -384,11 +406,9 @@ static int powernv_idle_probe(void) cpuidle_state_table = powernv_states; /* Device tree can indicate more idle states */ max_idle_state = powernv_add_idle_states(); - if (max_idle_state > 1) { + default_snooze_timeout = TICK_USEC * tb_ticks_per_usec; + if (max_idle_state > 1) snooze_timeout_en = true; - snooze_timeout = powernv_states[1].target_residency * - tb_ticks_per_usec; - } } else return -ENODEV; -- 1.9.4

7 years, 3 months

1
0
0 0

[PATCH] cpuidle: powernv: Fix promotion from snooze if next state disabled

by Gautham R. Shenoy

From: "Gautham R. Shenoy" <ego(a)linux.vnet.ibm.com> [ Upstream commit 0a4ec6aa035a52c422eceb2ed51ed88392a3d6c2 ] The commit 78eaa10f027c ("cpuidle: powernv/pseries: Auto-promotion of snooze to deeper idle state") introduced a timeout for the snooze idle state so that it could be eventually be promoted to a deeper idle state. The snooze timeout value is static and set to the target residency of the next idle state, which would train the cpuidle governor to pick the next idle state eventually. The unfortunate side-effect of this is that if the next idle state(s) is disabled, the CPU will forever remain in snooze, despite the fact that the system is completely idle, and other deeper idle states are available. This patch fixes the issue by dynamically setting the snooze timeout to the target residency of the next enabled state on the device. Before Patch: POWER8 : Only nap disabled. $ cpupower monitor sleep 30 sleep took 30.01297 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | Nap | Fast 0| 8| 0| 96.41| 0.00| 0.00 0| 8| 1| 96.43| 0.00| 0.00 0| 8| 2| 96.47| 0.00| 0.00 0| 8| 3| 96.35| 0.00| 0.00 0| 8| 4| 96.37| 0.00| 0.00 0| 8| 5| 96.37| 0.00| 0.00 0| 8| 6| 96.47| 0.00| 0.00 0| 8| 7| 96.47| 0.00| 0.00 POWER9: Shallow states (stop0lite, stop1lite, stop2lite, stop0, stop1, stop2) disabled: $ cpupower monitor sleep 30 sleep took 30.05033 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | stop | stop | stop | stop | stop | stop | stop | stop 0| 16| 0| 89.79| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 1| 90.12| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 2| 90.21| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 0| 16| 3| 90.29| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00 After Patch: POWER8 : Only nap disabled. $ cpupower monitor sleep 30 sleep took 30.01200 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | Nap | Fast 0| 8| 0| 16.58| 0.00| 77.21 0| 8| 1| 18.42| 0.00| 75.38 0| 8| 2| 4.70| 0.00| 94.09 0| 8| 3| 17.06| 0.00| 81.73 0| 8| 4| 3.06| 0.00| 95.73 0| 8| 5| 7.00| 0.00| 96.80 0| 8| 6| 1.00| 0.00| 98.79 0| 8| 7| 5.62| 0.00| 94.17 POWER9: Shallow states (stop0lite, stop1lite, stop2lite, stop0, stop1, stop2) disabled: $ cpupower monitor sleep 30 sleep took 30.02110 seconds and exited with status 0 |Idle_Stats PKG |CORE|CPU | snoo | stop | stop | stop | stop | stop | stop | stop | stop 0| 0| 0| 0.69| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 9.39| 89.70 0| 0| 1| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.05| 93.21 0| 0| 2| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 89.93 0| 0| 3| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 93.26 Fixes: 78eaa10f027c ("cpuidle: powernv/pseries: Auto-promotion of snooze to deeper idle state") Cc: stable(a)vger.kernel.org # v4.4 Signed-off-by: Gautham R. Shenoy <ego(a)linux.vnet.ibm.com> Reviewed-by: Balbir Singh <bsingharora(a)gmail.com> Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> --- drivers/cpuidle/cpuidle-powernv.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c index e12dc30..d075071 100644 --- a/drivers/cpuidle/cpuidle-powernv.c +++ b/drivers/cpuidle/cpuidle-powernv.c @@ -29,9 +29,31 @@ struct cpuidle_driver powernv_idle_driver = { static int max_idle_state; static struct cpuidle_state *cpuidle_state_table; -static u64 snooze_timeout; +static u64 default_snooze_timeout; static bool snooze_timeout_en; +static u64 get_snooze_timeout(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index) +{ + int i; + + if (unlikely(!snooze_timeout_en)) + return default_snooze_timeout; + + for (i = index + 1; i < drv->state_count; i++) { + struct cpuidle_state *s = &drv->states[i]; + struct cpuidle_state_usage *su = &dev->states_usage[i]; + + if (s->disabled || su->disable) + continue; + + return s->target_residency * tb_ticks_per_usec; + } + + return default_snooze_timeout; +} + static int snooze_loop(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) @@ -41,7 +63,7 @@ static int snooze_loop(struct cpuidle_device *dev, local_irq_enable(); set_thread_flag(TIF_POLLING_NRFLAG); - snooze_exit_time = get_tb() + snooze_timeout; + snooze_exit_time = get_tb() + get_snooze_timeout(dev, drv, index); ppc64_runlatch_off(); while (!need_resched()) { HMT_low(); @@ -268,11 +290,9 @@ static int powernv_idle_probe(void) cpuidle_state_table = powernv_states; /* Device tree can indicate more idle states */ max_idle_state = powernv_add_idle_states(); - if (max_idle_state > 1) { + default_snooze_timeout = TICK_USEC * tb_ticks_per_usec; + if (max_idle_state > 1) snooze_timeout_en = true; - snooze_timeout = powernv_states[1].target_residency * - tb_ticks_per_usec; - } } else return -ENODEV; -- 1.9.4

7 years, 3 months

1
0
0 0

[PATCH] xen: Remove unnecessary BUG_ON from __unbind_from_irq()

by Boris Ostrovsky

Commit 910f8befdf5b ("xen/pirq: fix error path cleanup when binding MSIs") fixed a couple of errors in error cleanup path of xen_bind_pirq_msi_to_irq(). This cleanup allowed a call to __unbind_from_irq() with an unbound irq, which would result in triggering the BUG_ON there. Since there is really no reason for the BUG_ON (xen_free_irq() can operate on unbound irqs) we can remove it. Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Signed-off-by: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> Cc: stable(a)vger.kernel.org --- drivers/xen/events/events_base.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 762378f..08e4af0 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -628,8 +628,6 @@ static void __unbind_from_irq(unsigned int irq) xen_irq_info_cleanup(info); } - BUG_ON(info_for_irq(irq)->type == IRQT_UNBOUND); - xen_free_irq(irq); } -- 1.8.3.1

7 years, 3 months

3
3
0 0

Re: [PATCH] crypto: ccree: fix iv copying for small buffers

by Herbert Xu

On Sun, Jun 17, 2018 at 01:06:42PM +0300, Gilad Ben-Yossef wrote: > > It was ctr(aes). I wrongly assumed that we are supposed to unconditionally > copy > the cipher-text block post operation and let the caller do with it what it > wants and so the > code now does that for all cipher operations unconditionally. For CTR it doesn't matter whether the last block is less than a block, you should still increment the counter. > So what is a good description of what we are supposed to provide in that > field post operation? > The next IV? but as you stated, that is not necessarily useful for all > ciphers. When in doubt, please refer to the generic implementation. If that is still unclear or if it seems wrong, please post to the list. Cheers, -- Email: Herbert Xu <herbert(a)gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

7 years, 3 months

2
2
0 0

[PATCH] kprobes/x86: Do not modify singlestep buffer while resuming

by Alexey Makhalov

From: Masami Hiramatsu <mhiramat(a)kernel.org> commit 804dec5bda9b4fcdab5f67fe61db4a0498af5221 upstream. Do not modify singlestep execution buffer (kprobe.ainsn.insn) while resuming from single-stepping, instead, modifies the buffer to add a jump back instruction at preparing buffer. Commit 176bee4cfcec ("kprobes/x86: Set kprobes pages read-only") introduced a bug in stable 4.4.y by making singlestep buffer page read-only. Attempts to modify singlestep buffer, to insert a jump instruction, at resume_execution() lead to kernel panic. BUG: unable to handle kernel paging request at ffffffffa0011001 IP: [<ffffffff8105711c>] resume_execution+0x14c/0x1a0 PGD 1c0f067 PUD 1c10063 PMD 42ac74067 PTE 41cc35061 Oops: 0003 [#1] SMP Modules linked in: stap_6eaf26e7bd7018624e4c19b7486f4bb8_1857(OE) ipt_MASQUERADE(E) nf_nat_masquerade_ipv4(E) <...> CPU: 5 PID: 1857 Comm: stapio Tainted: G OE 4.4.136+ #1 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 01/24/2017 task: ffff880425044940 ti: ffff88042d160000 task.ti: ffff88042d160000 RIP: 0010:[<ffffffff8105711c>] [<ffffffff8105711c>] resume_execution+0x14c/0x1a0 RSP: 0018:ffff88043fd4aeb0 EFLAGS: 00010086 RAX: ffffffffa0011001 RBX: ffff88043fd4af58 RCX: 0000000000000006 RDX: ffffffff811b9f71 RSI: ffff88043fd4af58 RDI: 0000000000000055 RBP: ffff88043fd4aee8 R08: 0000000000000001 R09: ffff88041cce8100 R10: 0000000000000004 R11: ffff8804252d9238 R12: ffff88042c6051c0 R13: ffffffff811b9f70 R14: ffff88042d163f08 R15: ffffffffa0011000 FS: 00007f05f6439740(0000) GS:ffff88043fd40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffa0011001 CR3: 000000042944a000 CR4: 0000000000160670 Stack: ffff88043fd4fee0 0000000000000000 ffff88043fd4fee0 ffff88043fd4af58 ffff88042c6051c0 0000000000000000 00007ffd23764640 ffff88043fd4af10 ffffffff810571a8 ffff88043fd4af58 ffff880425044940 0000000000000000 Call Trace: <#DB> [<ffffffff810571a8>] kprobe_debug_handler+0x38/0xd0 [<ffffffff81016de2>] do_debug+0x82/0x1b0 [<ffffffff817e6aa5>] debug+0x35/0x70 <<EOE>> [<ffffffff811bac51>] ? SyS_read+0x41/0xa0 [<ffffffff817e48a1>] entry_SYSCALL_64_fastpath+0x1e/0x95 Issue was found and fix was verified by running systemtap: stap -v -e 'probe vfs.read {printf("read performed\n"); exit()}' Fixes: 176bee4cfcec ("kprobes/x86: Set kprobes pages read-only") Cc: <stable(a)vger.kernel.org> # 4.4.x Signed-off-by: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Ananth N Mavinakayanahalli <ananth(a)linux.vnet.ibm.com> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy(a)intel.com> Cc: Borislav Petkov <bp(a)alien8.de> Cc: Brian Gerst <brgerst(a)gmail.com> Cc: David S . Miller <davem(a)davemloft.net> Cc: Denys Vlasenko <dvlasenk(a)redhat.com> Cc: H. Peter Anvin <hpa(a)zytor.com> Cc: Josh Poimboeuf <jpoimboe(a)redhat.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Ye Xiaolong <xiaolong.ye(a)intel.com> Link: http://lkml.kernel.org/r/149076361560.22469.1610155860343077495.stgit@devbox Signed-off-by: Ingo Molnar <mingo(a)kernel.org> Reviewed-by: "Steven Rostedt (VMware)" <rostedt(a)goodmis.org> Signed-off-by: Alexey Makhalov <amakhalov(a)vmware.com> --- arch/x86/kernel/kprobes/core.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index df9be5b91270..1f5c47a49e35 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -411,25 +411,38 @@ void free_insn_page(void *page) module_memfree(page); } +/* Prepare reljump right after instruction to boost */ +static void prepare_boost(struct kprobe *p, int length) +{ + if (can_boost(p->ainsn.insn, p->addr) && + MAX_INSN_SIZE - length >= RELATIVEJUMP_SIZE) { + /* + * These instructions can be executed directly if it + * jumps back to correct address. + */ + synthesize_reljump(p->ainsn.insn + length, p->addr + length); + p->ainsn.boostable = 1; + } else { + p->ainsn.boostable = -1; + } +} + static int arch_copy_kprobe(struct kprobe *p) { - int ret; + int len; set_memory_rw((unsigned long)p->ainsn.insn & PAGE_MASK, 1); /* Copy an instruction with recovering if other optprobe modifies it.*/ - ret = __copy_instruction(p->ainsn.insn, p->addr); - if (!ret) + len = __copy_instruction(p->ainsn.insn, p->addr); + if (!len) return -EINVAL; /* * __copy_instruction can modify the displacement of the instruction, * but it doesn't affect boostable check. */ - if (can_boost(p->ainsn.insn, p->addr)) - p->ainsn.boostable = 0; - else - p->ainsn.boostable = -1; + prepare_boost(p, len); set_memory_ro((unsigned long)p->ainsn.insn & PAGE_MASK, 1); @@ -894,21 +907,6 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs, break; } - if (p->ainsn.boostable == 0) { - if ((regs->ip > copy_ip) && - (regs->ip - copy_ip) + 5 < MAX_INSN_SIZE) { - /* - * These instructions can be executed directly if it - * jumps back to correct address. - */ - synthesize_reljump((void *)regs->ip, - (void *)orig_ip + (regs->ip - copy_ip)); - p->ainsn.boostable = 1; - } else { - p->ainsn.boostable = -1; - } - } - regs->ip += orig_ip - copy_ip; no_change: -- 2.14.2

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 06b8b00b33a145ef5d708ff971cfdb83c8e480c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita(a)gmail.com> Date: Thu, 19 Apr 2018 07:04:34 -0700 Subject: [PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the module is removed the led workqueue is destroyed in the remove callback, before the led device is unregistered from the led subsystem. This leads to a NULL pointer derefence when the led device is unregistered automatically later as part of the module removal cleanup. Bellow is the backtrace showing the problem. BUG: unable to handle kernel NULL pointer dereference at (null) IP: __queue_work+0x8c/0x410 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI Modules linked in: ccm edac_mce_amd kvm_amd kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel aes_x86_64 joydev crypto_simd asus_nb_wmi glue_helper uvcvideo snd_hda_codec_conexant snd_hda_codec_generic snd_hda_codec_hdmi snd_hda_intel asus_wmi snd_hda_codec cryptd snd_hda_core sparse_keymap videobuf2_vmalloc arc4 videobuf2_memops snd_hwdep input_leds videobuf2_v4l2 ath9k psmouse videobuf2_core videodev ath9k_common snd_pcm ath9k_hw media fam15h_power ath k10temp snd_timer mac80211 i2c_piix4 r8169 mii mac_hid cfg80211 asus_wireless(-) snd soundcore wmi shpchp 8250_dw ip_tables x_tables amdkfd amd_iommu_v2 amdgpu radeon chash i2c_algo_bit drm_kms_helper syscopyarea serio_raw sysfillrect sysimgblt fb_sys_fops ahci ttm libahci drm video CPU: 3 PID: 2177 Comm: rmmod Not tainted 4.15.0-5-generic #6+dev94.b4287e5bem1-Endless Hardware name: ASUSTeK COMPUTER INC. X555DG/X555DG, BIOS 5.011 05/05/2015 RIP: 0010:__queue_work+0x8c/0x410 RSP: 0018:ffffbe8cc249fcd8 EFLAGS: 00010086 RAX: ffff992ac6810800 RBX: 0000000000000000 RCX: 0000000000000008 RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff992ac6400e18 RBP: ffffbe8cc249fd18 R08: ffff992ac6400db0 R09: 0000000000000000 R10: 0000000000000040 R11: ffff992ac6400dd8 R12: 0000000000002000 R13: ffff992abd762e00 R14: ffff992abd763e38 R15: 000000000001ebe0 FS: 00007f318203e700(0000) GS:ffff992aced80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000001c720e000 CR4: 00000000001406e0 Call Trace: queue_work_on+0x38/0x40 led_state_set+0x2c/0x40 [asus_wireless] led_set_brightness_nopm+0x14/0x40 led_set_brightness+0x37/0x60 led_trigger_set+0xfc/0x1d0 led_classdev_unregister+0x32/0xd0 devm_led_classdev_release+0x11/0x20 release_nodes+0x109/0x1f0 devres_release_all+0x3c/0x50 device_release_driver_internal+0x16d/0x220 driver_detach+0x3f/0x80 bus_remove_driver+0x55/0xd0 driver_unregister+0x2c/0x40 acpi_bus_unregister_driver+0x15/0x20 asus_wireless_driver_exit+0x10/0xb7c [asus_wireless] SyS_delete_module+0x1da/0x2b0 entry_SYSCALL_64_fastpath+0x24/0x87 RIP: 0033:0x7f3181b65fd7 RSP: 002b:00007ffe74bcbe18 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f3181b65fd7 RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555ea2559258 RBP: 0000555ea25591f0 R08: 00007ffe74bcad91 R09: 000000000000000a R10: 0000000000000000 R11: 0000000000000206 R12: 0000000000000003 R13: 00007ffe74bcae00 R14: 0000000000000000 R15: 0000555ea25591f0 Code: 01 00 00 02 0f 85 7d 01 00 00 48 63 45 d4 48 c7 c6 00 f4 fa 87 49 8b 9d 08 01 00 00 48 03 1c c6 4c 89 f7 e8 87 fb ff ff 48 85 c0 <48> 8b 3b 0f 84 c5 01 00 00 48 39 f8 0f 84 bc 01 00 00 48 89 c7 RIP: __queue_work+0x8c/0x410 RSP: ffffbe8cc249fcd8 CR2: 0000000000000000 ---[ end trace 7aa4f4a232e9c39c ]--- Unregistering the led device on the remove callback before destroying the workqueue avoids this problem. https://bugzilla.kernel.org/show_bug.cgi?id=196097 Reported-by: Dun Hum <bitter.taste(a)gmx.com> Cc: stable(a)vger.kernel.org Signed-off-by: João Paulo Rechi Vita <jprvita(a)endlessm.com> Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index d4aeac3477f5..f086469ea740 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -178,8 +178,10 @@ static int asus_wireless_remove(struct acpi_device *adev) { struct asus_wireless_data *data = acpi_driver_data(adev); - if (data->wq) + if (data->wq) { + devm_led_classdev_unregister(&adev->dev, &data->led); destroy_workqueue(data->wq); + } return 0; }

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference" failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 06b8b00b33a145ef5d708ff971cfdb83c8e480c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita(a)gmail.com> Date: Thu, 19 Apr 2018 07:04:34 -0700 Subject: [PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the module is removed the led workqueue is destroyed in the remove callback, before the led device is unregistered from the led subsystem. This leads to a NULL pointer derefence when the led device is unregistered automatically later as part of the module removal cleanup. Bellow is the backtrace showing the problem. BUG: unable to handle kernel NULL pointer dereference at (null) IP: __queue_work+0x8c/0x410 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI Modules linked in: ccm edac_mce_amd kvm_amd kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel aes_x86_64 joydev crypto_simd asus_nb_wmi glue_helper uvcvideo snd_hda_codec_conexant snd_hda_codec_generic snd_hda_codec_hdmi snd_hda_intel asus_wmi snd_hda_codec cryptd snd_hda_core sparse_keymap videobuf2_vmalloc arc4 videobuf2_memops snd_hwdep input_leds videobuf2_v4l2 ath9k psmouse videobuf2_core videodev ath9k_common snd_pcm ath9k_hw media fam15h_power ath k10temp snd_timer mac80211 i2c_piix4 r8169 mii mac_hid cfg80211 asus_wireless(-) snd soundcore wmi shpchp 8250_dw ip_tables x_tables amdkfd amd_iommu_v2 amdgpu radeon chash i2c_algo_bit drm_kms_helper syscopyarea serio_raw sysfillrect sysimgblt fb_sys_fops ahci ttm libahci drm video CPU: 3 PID: 2177 Comm: rmmod Not tainted 4.15.0-5-generic #6+dev94.b4287e5bem1-Endless Hardware name: ASUSTeK COMPUTER INC. X555DG/X555DG, BIOS 5.011 05/05/2015 RIP: 0010:__queue_work+0x8c/0x410 RSP: 0018:ffffbe8cc249fcd8 EFLAGS: 00010086 RAX: ffff992ac6810800 RBX: 0000000000000000 RCX: 0000000000000008 RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff992ac6400e18 RBP: ffffbe8cc249fd18 R08: ffff992ac6400db0 R09: 0000000000000000 R10: 0000000000000040 R11: ffff992ac6400dd8 R12: 0000000000002000 R13: ffff992abd762e00 R14: ffff992abd763e38 R15: 000000000001ebe0 FS: 00007f318203e700(0000) GS:ffff992aced80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000001c720e000 CR4: 00000000001406e0 Call Trace: queue_work_on+0x38/0x40 led_state_set+0x2c/0x40 [asus_wireless] led_set_brightness_nopm+0x14/0x40 led_set_brightness+0x37/0x60 led_trigger_set+0xfc/0x1d0 led_classdev_unregister+0x32/0xd0 devm_led_classdev_release+0x11/0x20 release_nodes+0x109/0x1f0 devres_release_all+0x3c/0x50 device_release_driver_internal+0x16d/0x220 driver_detach+0x3f/0x80 bus_remove_driver+0x55/0xd0 driver_unregister+0x2c/0x40 acpi_bus_unregister_driver+0x15/0x20 asus_wireless_driver_exit+0x10/0xb7c [asus_wireless] SyS_delete_module+0x1da/0x2b0 entry_SYSCALL_64_fastpath+0x24/0x87 RIP: 0033:0x7f3181b65fd7 RSP: 002b:00007ffe74bcbe18 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f3181b65fd7 RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555ea2559258 RBP: 0000555ea25591f0 R08: 00007ffe74bcad91 R09: 000000000000000a R10: 0000000000000000 R11: 0000000000000206 R12: 0000000000000003 R13: 00007ffe74bcae00 R14: 0000000000000000 R15: 0000555ea25591f0 Code: 01 00 00 02 0f 85 7d 01 00 00 48 63 45 d4 48 c7 c6 00 f4 fa 87 49 8b 9d 08 01 00 00 48 03 1c c6 4c 89 f7 e8 87 fb ff ff 48 85 c0 <48> 8b 3b 0f 84 c5 01 00 00 48 39 f8 0f 84 bc 01 00 00 48 89 c7 RIP: __queue_work+0x8c/0x410 RSP: ffffbe8cc249fcd8 CR2: 0000000000000000 ---[ end trace 7aa4f4a232e9c39c ]--- Unregistering the led device on the remove callback before destroying the workqueue avoids this problem. https://bugzilla.kernel.org/show_bug.cgi?id=196097 Reported-by: Dun Hum <bitter.taste(a)gmx.com> Cc: stable(a)vger.kernel.org Signed-off-by: João Paulo Rechi Vita <jprvita(a)endlessm.com> Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index d4aeac3477f5..f086469ea740 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -178,8 +178,10 @@ static int asus_wireless_remove(struct acpi_device *adev) { struct asus_wireless_data *data = acpi_driver_data(adev); - if (data->wq) + if (data->wq) { + devm_led_classdev_unregister(&adev->dev, &data->led); destroy_workqueue(data->wq); + } return 0; }

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference" failed to apply to 4.17-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.17-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 06b8b00b33a145ef5d708ff971cfdb83c8e480c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita(a)gmail.com> Date: Thu, 19 Apr 2018 07:04:34 -0700 Subject: [PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the module is removed the led workqueue is destroyed in the remove callback, before the led device is unregistered from the led subsystem. This leads to a NULL pointer derefence when the led device is unregistered automatically later as part of the module removal cleanup. Bellow is the backtrace showing the problem. BUG: unable to handle kernel NULL pointer dereference at (null) IP: __queue_work+0x8c/0x410 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI Modules linked in: ccm edac_mce_amd kvm_amd kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel aes_x86_64 joydev crypto_simd asus_nb_wmi glue_helper uvcvideo snd_hda_codec_conexant snd_hda_codec_generic snd_hda_codec_hdmi snd_hda_intel asus_wmi snd_hda_codec cryptd snd_hda_core sparse_keymap videobuf2_vmalloc arc4 videobuf2_memops snd_hwdep input_leds videobuf2_v4l2 ath9k psmouse videobuf2_core videodev ath9k_common snd_pcm ath9k_hw media fam15h_power ath k10temp snd_timer mac80211 i2c_piix4 r8169 mii mac_hid cfg80211 asus_wireless(-) snd soundcore wmi shpchp 8250_dw ip_tables x_tables amdkfd amd_iommu_v2 amdgpu radeon chash i2c_algo_bit drm_kms_helper syscopyarea serio_raw sysfillrect sysimgblt fb_sys_fops ahci ttm libahci drm video CPU: 3 PID: 2177 Comm: rmmod Not tainted 4.15.0-5-generic #6+dev94.b4287e5bem1-Endless Hardware name: ASUSTeK COMPUTER INC. X555DG/X555DG, BIOS 5.011 05/05/2015 RIP: 0010:__queue_work+0x8c/0x410 RSP: 0018:ffffbe8cc249fcd8 EFLAGS: 00010086 RAX: ffff992ac6810800 RBX: 0000000000000000 RCX: 0000000000000008 RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff992ac6400e18 RBP: ffffbe8cc249fd18 R08: ffff992ac6400db0 R09: 0000000000000000 R10: 0000000000000040 R11: ffff992ac6400dd8 R12: 0000000000002000 R13: ffff992abd762e00 R14: ffff992abd763e38 R15: 000000000001ebe0 FS: 00007f318203e700(0000) GS:ffff992aced80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000001c720e000 CR4: 00000000001406e0 Call Trace: queue_work_on+0x38/0x40 led_state_set+0x2c/0x40 [asus_wireless] led_set_brightness_nopm+0x14/0x40 led_set_brightness+0x37/0x60 led_trigger_set+0xfc/0x1d0 led_classdev_unregister+0x32/0xd0 devm_led_classdev_release+0x11/0x20 release_nodes+0x109/0x1f0 devres_release_all+0x3c/0x50 device_release_driver_internal+0x16d/0x220 driver_detach+0x3f/0x80 bus_remove_driver+0x55/0xd0 driver_unregister+0x2c/0x40 acpi_bus_unregister_driver+0x15/0x20 asus_wireless_driver_exit+0x10/0xb7c [asus_wireless] SyS_delete_module+0x1da/0x2b0 entry_SYSCALL_64_fastpath+0x24/0x87 RIP: 0033:0x7f3181b65fd7 RSP: 002b:00007ffe74bcbe18 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f3181b65fd7 RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555ea2559258 RBP: 0000555ea25591f0 R08: 00007ffe74bcad91 R09: 000000000000000a R10: 0000000000000000 R11: 0000000000000206 R12: 0000000000000003 R13: 00007ffe74bcae00 R14: 0000000000000000 R15: 0000555ea25591f0 Code: 01 00 00 02 0f 85 7d 01 00 00 48 63 45 d4 48 c7 c6 00 f4 fa 87 49 8b 9d 08 01 00 00 48 03 1c c6 4c 89 f7 e8 87 fb ff ff 48 85 c0 <48> 8b 3b 0f 84 c5 01 00 00 48 39 f8 0f 84 bc 01 00 00 48 89 c7 RIP: __queue_work+0x8c/0x410 RSP: ffffbe8cc249fcd8 CR2: 0000000000000000 ---[ end trace 7aa4f4a232e9c39c ]--- Unregistering the led device on the remove callback before destroying the workqueue avoids this problem. https://bugzilla.kernel.org/show_bug.cgi?id=196097 Reported-by: Dun Hum <bitter.taste(a)gmx.com> Cc: stable(a)vger.kernel.org Signed-off-by: João Paulo Rechi Vita <jprvita(a)endlessm.com> Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index d4aeac3477f5..f086469ea740 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -178,8 +178,10 @@ static int asus_wireless_remove(struct acpi_device *adev) { struct asus_wireless_data *data = acpi_driver_data(adev); - if (data->wq) + if (data->wq) { + devm_led_classdev_unregister(&adev->dev, &data->led); destroy_workqueue(data->wq); + } return 0; }

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain." failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6ed66c3ce095ae65bbc976b5817c318653745736 Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello(a)dell.com> Date: Fri, 20 Apr 2018 12:42:11 -0500 Subject: [PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain. As reported by Randy Dunlap: >> WARNING: unmet direct dependencies detected for DELL_SMBIOS >> Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y] >> && (DCDBAS [=m] || >> DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n) >> Selected by [y]: >> - DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] >> && DMI [=y] >> && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || >> ACPI_VIDEO [=n]=n) >> && (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y] >> Right now it's possible to set dell laptop to compile in but this causes dell-smbios to compile in which breaks if dcdbas is a module. Dell laptop shouldn't select dell-smbios anymore, but depend on it. Fixes: 32d7b19bad96 (platform/x86: dell-smbios: Resolve dependency error on DCDBAS) Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Mario Limonciello <mario.limonciello(a)dell.com> Cc: stable(a)vger.kernel.org Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 39d06dd1f63a..bc309c5327ff 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -154,7 +154,7 @@ config DELL_LAPTOP depends on ACPI_VIDEO || ACPI_VIDEO = n depends on RFKILL || RFKILL = n depends on SERIO_I8042 - select DELL_SMBIOS + depends on DELL_SMBIOS select POWER_SUPPLY select LEDS_CLASS select NEW_LEDS

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain." failed to apply to 4.17-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.17-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6ed66c3ce095ae65bbc976b5817c318653745736 Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello(a)dell.com> Date: Fri, 20 Apr 2018 12:42:11 -0500 Subject: [PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain. As reported by Randy Dunlap: >> WARNING: unmet direct dependencies detected for DELL_SMBIOS >> Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y] >> && (DCDBAS [=m] || >> DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n) >> Selected by [y]: >> - DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] >> && DMI [=y] >> && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || >> ACPI_VIDEO [=n]=n) >> && (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y] >> Right now it's possible to set dell laptop to compile in but this causes dell-smbios to compile in which breaks if dcdbas is a module. Dell laptop shouldn't select dell-smbios anymore, but depend on it. Fixes: 32d7b19bad96 (platform/x86: dell-smbios: Resolve dependency error on DCDBAS) Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Mario Limonciello <mario.limonciello(a)dell.com> Cc: stable(a)vger.kernel.org Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 39d06dd1f63a..bc309c5327ff 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -154,7 +154,7 @@ config DELL_LAPTOP depends on ACPI_VIDEO || ACPI_VIDEO = n depends on RFKILL || RFKILL = n depends on SERIO_I8042 - select DELL_SMBIOS + depends on DELL_SMBIOS select POWER_SUPPLY select LEDS_CLASS select NEW_LEDS

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 986376b68dcc95bb7df60ad30c2353c1f7578fa5 Mon Sep 17 00:00:00 2001 From: Hui Wang <hui.wang(a)canonical.com> Date: Wed, 30 May 2018 12:33:07 +0800 Subject: [PATCH] ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs We have several Lenovo AIOs like M810z, M820z and M920z, they have the same design for mic-mute hotkey and led and they use the same codec with the same pin configuration, so use the pin conf table to apply fix to all of them. Fixes: 29693efcea0f ("ALSA: hda - Fix micmute hotkey problem for a lenovo AIO machine") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 240a1a43e048..d64dcb9a4c99 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6603,7 +6603,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x3138, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), - SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP), @@ -6775,6 +6774,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1b, 0x01111010}, {0x1e, 0x01451130}, {0x21, 0x02211020}), + SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, + {0x12, 0x90a60140}, + {0x14, 0x90170110}, + {0x19, 0x02a11030}, + {0x21, 0x02211020}), SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60140}, {0x14, 0x90170110},

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 986376b68dcc95bb7df60ad30c2353c1f7578fa5 Mon Sep 17 00:00:00 2001 From: Hui Wang <hui.wang(a)canonical.com> Date: Wed, 30 May 2018 12:33:07 +0800 Subject: [PATCH] ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs We have several Lenovo AIOs like M810z, M820z and M920z, they have the same design for mic-mute hotkey and led and they use the same codec with the same pin configuration, so use the pin conf table to apply fix to all of them. Fixes: 29693efcea0f ("ALSA: hda - Fix micmute hotkey problem for a lenovo AIO machine") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 240a1a43e048..d64dcb9a4c99 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6603,7 +6603,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x3138, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), - SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP), @@ -6775,6 +6774,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1b, 0x01111010}, {0x1e, 0x01451130}, {0x21, 0x02211020}), + SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, + {0x12, 0x90a60140}, + {0x14, 0x90170110}, + {0x19, 0x02a11030}, + {0x21, 0x02211020}), SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60140}, {0x14, 0x90170110},

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] ext4: do not update s_last_mounted of a frozen fs" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From db6516a5e7ddb6dc72d167b920f2f272596ea22d Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il(a)gmail.com> Date: Sun, 13 May 2018 22:54:44 -0400 Subject: [PATCH] ext4: do not update s_last_mounted of a frozen fs If fs is frozen after mount and before the first file open, the update of s_last_mounted bypasses freeze protection and prints out a WARNING splat: $ mount /vdf $ fsfreeze -f /vdf $ cat /vdf/foo [ 31.578555] WARNING: CPU: 1 PID: 1415 at fs/ext4/ext4_jbd2.c:53 ext4_journal_check_start+0x48/0x82 [ 31.614016] Call Trace: [ 31.614997] __ext4_journal_start_sb+0xe4/0x1a4 [ 31.616771] ? ext4_file_open+0xb6/0x189 [ 31.618094] ext4_file_open+0xb6/0x189 If fs is frozen, skip s_last_mounted update. [backport hint: to apply to stable tree, need to apply also patches vfs: add the sb_start_intwrite_trylock() helper ext4: factor out helper ext4_sample_last_mounted()] Cc: stable(a)vger.kernel.org Fixes: bc0b0d6d69ee ("ext4: update the s_last_mounted field in the superblock") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Reviewed-by: Jan Kara <jack(a)suse.cz> diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c48ea76b63e4..7f8023340eb8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -393,7 +393,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED)) return 0; - if (sb_rdonly(sb)) + if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) return 0; sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED; @@ -407,21 +407,25 @@ static int ext4_sample_last_mounted(struct super_block *sb, path.mnt = mnt; path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); + err = 0; if (IS_ERR(cp)) - return 0; + goto out; handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1); + err = PTR_ERR(handle); if (IS_ERR(handle)) - return PTR_ERR(handle); + goto out; BUFFER_TRACE(sbi->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) - goto out; + goto out_journal; strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); ext4_handle_dirty_super(handle, sb); -out: +out_journal: ext4_journal_stop(handle); +out: + sb_end_intwrite(sb); return err; }

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] ext4: do not update s_last_mounted of a frozen fs" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From db6516a5e7ddb6dc72d167b920f2f272596ea22d Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il(a)gmail.com> Date: Sun, 13 May 2018 22:54:44 -0400 Subject: [PATCH] ext4: do not update s_last_mounted of a frozen fs If fs is frozen after mount and before the first file open, the update of s_last_mounted bypasses freeze protection and prints out a WARNING splat: $ mount /vdf $ fsfreeze -f /vdf $ cat /vdf/foo [ 31.578555] WARNING: CPU: 1 PID: 1415 at fs/ext4/ext4_jbd2.c:53 ext4_journal_check_start+0x48/0x82 [ 31.614016] Call Trace: [ 31.614997] __ext4_journal_start_sb+0xe4/0x1a4 [ 31.616771] ? ext4_file_open+0xb6/0x189 [ 31.618094] ext4_file_open+0xb6/0x189 If fs is frozen, skip s_last_mounted update. [backport hint: to apply to stable tree, need to apply also patches vfs: add the sb_start_intwrite_trylock() helper ext4: factor out helper ext4_sample_last_mounted()] Cc: stable(a)vger.kernel.org Fixes: bc0b0d6d69ee ("ext4: update the s_last_mounted field in the superblock") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Reviewed-by: Jan Kara <jack(a)suse.cz> diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c48ea76b63e4..7f8023340eb8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -393,7 +393,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED)) return 0; - if (sb_rdonly(sb)) + if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) return 0; sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED; @@ -407,21 +407,25 @@ static int ext4_sample_last_mounted(struct super_block *sb, path.mnt = mnt; path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); + err = 0; if (IS_ERR(cp)) - return 0; + goto out; handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1); + err = PTR_ERR(handle); if (IS_ERR(handle)) - return PTR_ERR(handle); + goto out; BUFFER_TRACE(sbi->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) - goto out; + goto out_journal; strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); ext4_handle_dirty_super(handle, sb); -out: +out_journal: ext4_journal_stop(handle); +out: + sb_end_intwrite(sb); return err; }

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] ext4: do not update s_last_mounted of a frozen fs" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From db6516a5e7ddb6dc72d167b920f2f272596ea22d Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il(a)gmail.com> Date: Sun, 13 May 2018 22:54:44 -0400 Subject: [PATCH] ext4: do not update s_last_mounted of a frozen fs If fs is frozen after mount and before the first file open, the update of s_last_mounted bypasses freeze protection and prints out a WARNING splat: $ mount /vdf $ fsfreeze -f /vdf $ cat /vdf/foo [ 31.578555] WARNING: CPU: 1 PID: 1415 at fs/ext4/ext4_jbd2.c:53 ext4_journal_check_start+0x48/0x82 [ 31.614016] Call Trace: [ 31.614997] __ext4_journal_start_sb+0xe4/0x1a4 [ 31.616771] ? ext4_file_open+0xb6/0x189 [ 31.618094] ext4_file_open+0xb6/0x189 If fs is frozen, skip s_last_mounted update. [backport hint: to apply to stable tree, need to apply also patches vfs: add the sb_start_intwrite_trylock() helper ext4: factor out helper ext4_sample_last_mounted()] Cc: stable(a)vger.kernel.org Fixes: bc0b0d6d69ee ("ext4: update the s_last_mounted field in the superblock") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Reviewed-by: Jan Kara <jack(a)suse.cz> diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c48ea76b63e4..7f8023340eb8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -393,7 +393,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED)) return 0; - if (sb_rdonly(sb)) + if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) return 0; sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED; @@ -407,21 +407,25 @@ static int ext4_sample_last_mounted(struct super_block *sb, path.mnt = mnt; path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); + err = 0; if (IS_ERR(cp)) - return 0; + goto out; handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1); + err = PTR_ERR(handle); if (IS_ERR(handle)) - return PTR_ERR(handle); + goto out; BUFFER_TRACE(sbi->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) - goto out; + goto out_journal; strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); ext4_handle_dirty_super(handle, sb); -out: +out_journal: ext4_journal_stop(handle); +out: + sb_end_intwrite(sb); return err; }

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] ext4: do not update s_last_mounted of a frozen fs" failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From db6516a5e7ddb6dc72d167b920f2f272596ea22d Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il(a)gmail.com> Date: Sun, 13 May 2018 22:54:44 -0400 Subject: [PATCH] ext4: do not update s_last_mounted of a frozen fs If fs is frozen after mount and before the first file open, the update of s_last_mounted bypasses freeze protection and prints out a WARNING splat: $ mount /vdf $ fsfreeze -f /vdf $ cat /vdf/foo [ 31.578555] WARNING: CPU: 1 PID: 1415 at fs/ext4/ext4_jbd2.c:53 ext4_journal_check_start+0x48/0x82 [ 31.614016] Call Trace: [ 31.614997] __ext4_journal_start_sb+0xe4/0x1a4 [ 31.616771] ? ext4_file_open+0xb6/0x189 [ 31.618094] ext4_file_open+0xb6/0x189 If fs is frozen, skip s_last_mounted update. [backport hint: to apply to stable tree, need to apply also patches vfs: add the sb_start_intwrite_trylock() helper ext4: factor out helper ext4_sample_last_mounted()] Cc: stable(a)vger.kernel.org Fixes: bc0b0d6d69ee ("ext4: update the s_last_mounted field in the superblock") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Reviewed-by: Jan Kara <jack(a)suse.cz> diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c48ea76b63e4..7f8023340eb8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -393,7 +393,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED)) return 0; - if (sb_rdonly(sb)) + if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) return 0; sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED; @@ -407,21 +407,25 @@ static int ext4_sample_last_mounted(struct super_block *sb, path.mnt = mnt; path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); + err = 0; if (IS_ERR(cp)) - return 0; + goto out; handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1); + err = PTR_ERR(handle); if (IS_ERR(handle)) - return PTR_ERR(handle); + goto out; BUFFER_TRACE(sbi->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) - goto out; + goto out_journal; strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); ext4_handle_dirty_super(handle, sb); -out: +out_journal: ext4_journal_stop(handle); +out: + sb_end_intwrite(sb); return err; }

7 years, 3 months

1
0
0 0

Please consider 3be0f80b5f for stable (v4.11+)

by Anna Schumaker

Hi Stable folks, Please consider adding: commit 3be0f80b5fe9c16eca2d538f799b94ca8aa59433 Author: Trond Myklebust <trond.myklebust(a)primarydata.com> Date: Thu Oct 19 15:46:45 2017 -0400 NFSv4.1: Fix up replays of interrupted requests This patch fixes a data corruption issue that happens if the interrupted slot is reused by the same type of NFS operation (such as two different WRITE requests). I should apply cleanly to v4.11+ Thanks, Anna

7 years, 3 months

2
1
0 0

[PATCH] ALSA: hda/realtek - New codec support for ALC257

by Pali Rohár

From: Kailang Yang <kailang(a)realtek.com> commit f429e7e494afaded76e62c6f98211a635aa03098 Add new support for ALC257 codec. [ It's supposed to be almost equivalent with other ALC25x variants, just adding another type and id -- tiwai ] Signed-off-by: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Cc: <stable(a)vger.kernel.org> # 4.9.y Tested-by: Pali Rohár <pali.rohar(a)gmail.com> --- This patch is for 4.9 stable tree and needed small modification to be cleanly applied for linux-4.9.y git tree. I tested it on Debian's 4.9 Stretch kernel. After applying this patch mute and micmute leds on ThinkPad T480s started working. Leds are managed by snd-hda-codec-realtek. --- sound/pci/hda/patch_realtek.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 39cd35f6a6df..183436e4a8c1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -333,6 +333,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) case 0x10ec0236: case 0x10ec0255: case 0x10ec0256: + case 0x10ec0257: case 0x10ec0282: case 0x10ec0283: case 0x10ec0286: @@ -2663,6 +2664,7 @@ enum { ALC269_TYPE_ALC298, ALC269_TYPE_ALC255, ALC269_TYPE_ALC256, + ALC269_TYPE_ALC257, ALC269_TYPE_ALC225, ALC269_TYPE_ALC294, ALC269_TYPE_ALC700, @@ -2695,6 +2697,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec) case ALC269_TYPE_ALC298: case ALC269_TYPE_ALC255: case ALC269_TYPE_ALC256: + case ALC269_TYPE_ALC257: case ALC269_TYPE_ALC225: case ALC269_TYPE_ALC294: case ALC269_TYPE_ALC700: @@ -6375,6 +6378,10 @@ static int patch_alc269(struct hda_codec *codec) spec->gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */ alc_update_coef_idx(codec, 0x36, 1 << 13, 1 << 5); /* Switch pcbeep path to Line in path*/ break; + case 0x10ec0257: + spec->codec_variant = ALC269_TYPE_ALC257; + spec->gen.mixer_nid = 0; + break; case 0x10ec0225: case 0x10ec0295: case 0x10ec0299: @@ -7361,6 +7368,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = { HDA_CODEC_ENTRY(0x10ec0236, "ALC236", patch_alc269), HDA_CODEC_ENTRY(0x10ec0255, "ALC255", patch_alc269), HDA_CODEC_ENTRY(0x10ec0256, "ALC256", patch_alc269), + HDA_CODEC_ENTRY(0x10ec0257, "ALC257", patch_alc269), HDA_CODEC_ENTRY(0x10ec0260, "ALC260", patch_alc260), HDA_CODEC_ENTRY(0x10ec0262, "ALC262", patch_alc262), HDA_CODEC_ENTRY(0x10ec0267, "ALC267", patch_alc268), -- 2.11.0

7 years, 3 months

2
1
0 0

Please include mainline commit 5088814a6e93 into 4.17.y

by Rafael J. Wysocki

Hi Greg, As per the subject, please add the following mainline commit: 5088814a6e93 ACPICA: AML parser: attempt to continue loading table after error to the 4.17.y series as it is reported to fix a regression introduced in 4.17. Thanks, Rafael

7 years, 3 months

2
1
0 0

perf/x86/intel: Fix large period handling on Broadwell CPUs

by Jim Mattson

I'd like to nominate commit f605cfca8c39 ("perf/x86/intel: Fix large period handling on Broadwell CPUs") for backport to the affected stable Linux releases. (The bug was introduced in 4.1.) Because of this bug, the NMI watchdog timer may fire spuriously on Broadwell systems, resulting in a hard lockup panic when there is, in fact, no lockup.

7 years, 3 months

2
1
0 0

[PATCH 4.16 000/279] 4.16.17-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.16.17 release. There are 279 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Jun 20 08:05:28 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.16.17-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.16.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.16.17-rc1 Russell King <rmk+kernel(a)armlinux.org.uk> ARM: fix kill( ,SIGFPE) breakage Russell King <rmk+kernel(a)armlinux.org.uk> ARM: replace unnecessary perl with sed and the shell $(( )) operator Russell King <rmk+kernel(a)armlinux.org.uk> ARM: kexec: fix kdump register saving on panic() Łukasz Stelmach <l.stelmach(a)samsung.com> ARM: 8758/1: decompressor: restore r1 and r2 just before jumping to the kernel Łukasz Stelmach <l.stelmach(a)samsung.com> ARM: 8753/1: decompressor: add a missing parameter to the addruart macro Mark Rutland <mark.rutland(a)arm.com> efi/libstub/arm64: Handle randomized TEXT_OFFSET Darren Hart <dvhart(a)infradead.org> platform/x86: DELL_WMI use depends on instead of select for DELL_SMBIOS Helge Deller <deller(a)gmx.de> parisc: Move setup_profiling_timer() out of init section Mathieu Malaterre <malat(a)debian.org> sched/deadline: Make the grub_reclaim() function static Mathieu Malaterre <malat(a)debian.org> sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h Dan Carpenter <dan.carpenter(a)oracle.com> drm/dumb-buffers: Integer overflow in drm_mode_create_ioctl() Waiman Long <longman(a)redhat.com> locking/percpu-rwsem: Annotate rwsem ownership transfer by setting RWSEM_OWNER_UNKNOWN Waiman Long <longman(a)redhat.com> locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag Stefan Agner <stefan(a)agner.ch> clk: imx6ull: use OSC clock during AXI rate change Geert Uytterhoeven <geert(a)linux-m68k.org> mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit Wanpeng Li <wanpengli(a)tencent.com> KVM: X86: Lower the default timer frequency limit to 200us Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm646x-evm: set VPIF capture card name Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: dm646x: fix timer interrupt generation Peter Rosin <peda(a)axentia.se> i2c: viperboard: return message count on master_xfer success Peter Rosin <peda(a)axentia.se> i2c: pmcmsp: fix error return from master_xfer Peter Rosin <peda(a)axentia.se> i2c: pmcmsp: return message count on master_xfer success Russell King <rmk+kernel(a)armlinux.org.uk> ARM: keystone: fix platform_domain_notifier array overrun Daniel Glöckner <dg(a)emlix.com> usb: musb: fix remote wakeup racing with suspend David Howells <dhowells(a)redhat.com> afs: Fix the non-encryption of calls Marc Dionne <marc.dionne(a)auristor.com> afs: Fix afs_find_server search loop David Howells <dhowells(a)redhat.com> afs: Fix the handling of CB.InitCallBackState3 to find the server by UUID David Howells <dhowells(a)redhat.com> afs: Fix VNOVOL handling in address rotation Ben Hutchings <ben(a)decadent.org.uk> mtd: Fix comparison in map_word_andequal() David Howells <dhowells(a)redhat.com> afs: Fix server rotation's handling of fileserver probe failure David Howells <dhowells(a)redhat.com> afs: Fix refcounting in callback registration David Howells <dhowells(a)redhat.com> afs: Fix address list parsing Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Add a test for pkey 0 Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Save off 'prot' for allocations Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Fix pointer math Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Fix pkey exhaustion test off-by-one Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Add PROT_EXEC test Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Factor out "instruction page" Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Allow faults on unknown keys Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Avoid printf-in-signal deadlocks Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Remove dead debugging code, fix dprint_in_signal Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Stop using assert() Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Give better unexpected fault error messages Andy Lutomirski <luto(a)kernel.org> x86/selftests: Add mov_to_ss test Ingo Molnar <mingo(a)kernel.org> x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI Ingo Molnar <mingo(a)kernel.org> x86/pkeys/selftests: Adjust the self-test to fresh distros that export the pkeys ABI Ingo Molnar <mingo(a)kernel.org> objtool, kprobes/x86: Sync the latest <asm/insn.h> header with tools/objtool/arch/x86/include/asm/insn.h Masami Hiramatsu <mhiramat(a)kernel.org> uprobes/x86: Prohibit probing on MOV SS instruction Masami Hiramatsu <mhiramat(a)kernel.org> kprobes/x86: Prohibit probing on exception masking instructions Ashish Samant <ashish.samant(a)oracle.com> ocfs2: take inode cluster lock before moving reflinked inode from orphan dir Laura Abbott <labbott(a)redhat.com> proc/kcore: don't bounds check against address 0 Jeffrey Hugo <jhugo(a)codeaurora.org> init: fix false positives in W+X checking Yury Norov <ynorov(a)caviumnetworks.com> lib/find_bit_benchmark.c: avoid soft lockup in test_find_first_bit() Roman Mashak <mrv(a)mojatatu.com> net sched actions: fix invalid pointer dereferencing if skbedit flags missing Colin Ian King <colin.king(a)canonical.com> ixgbe: fix memory leak on ipsec allocation Emil Tantilov <emil.s.tantilov(a)intel.com> ixgbe: return error on unsupported SFP module when resetting Rob Herring <robh(a)kernel.org> sh: switch to NO_BOOTMEM Leo Yan <leo.yan(a)linaro.org> perf cs-etm: Support unknown_thread in cs_etm_auxtrace Marian Rotariu <mrotariu(a)bitdefender.com> x86: Delay skip of emulated hypercall instruction Wanpeng Li <wanpengli(a)tencent.com> KVM: Extend MAX_IRQ_ROUTES to 4096 for all archs Nikita Yushchenko <nikita.yoush(a)cogentembedded.com> ARM: dts: imx51-zii-rdu1: fix touchscreen bindings David Howells <dhowells(a)redhat.com> rxrpc: Fix the min security level for kernel calls David Howells <dhowells(a)redhat.com> rxrpc: Fix error reception on AF_INET6 sockets David Howells <dhowells(a)redhat.com> rxrpc: Fix missing start of call timeout Ganesh Goudar <ganeshgr(a)chelsio.com> cxgb4: copy mbox log size to PF0-3 adap instances Michal Kalderon <Michal.Kalderon(a)cavium.com> qede: Fix gfp flags sent to rdma event node allocation Michal Kalderon <Michal.Kalderon(a)cavium.com> qed: Fix l2 initializations over iWARP personality Ying Xue <ying.xue(a)windriver.com> tipc: eliminate KMSAN uninit-value in strcmp complaint Mathieu Malaterre <malat(a)debian.org> agp: uninorth: make two functions static Andrey Grodzovsky <andrey.grodzovsky(a)amd.com> drm/amdgpu: Switch to interruptable wait to recover from ring hang. Paulo Alcantara <palcantara(a)suse.de> cifs: smb2ops: Fix listxattr() when there are no EAs Long Li <longli(a)microsoft.com> cifs: Allocate validate negotiation request through kmalloc David Gilhooley <dgilhooley(a)nvidia.com> arm64: Add MIDR encoding for NVIDIA CPUs Hans de Goede <hdegoede(a)redhat.com> HID: i2c-hid: Add RESEND_REPORT_DESCR quirk for Toshiba Click Mini L9W-B Jakob Unterwurzacher <jakob.unterwurzacher(a)theobroma-systems.com> can: dev: increase bus-off message severity Michael Ellerman <mpe(a)ellerman.id.au> powerpc/pseries: Fix CONFIG_NUMA=n build Igor Russkikh <igor.russkikh(a)aquantia.com> net: aquantia: Limit number of vectors to actually allocated irqs Igor Russkikh <igor.russkikh(a)aquantia.com> net: aquantia: driver should correctly declare vlan_features bits van der Linden, Frank <fllinden(a)amazon.com> x86/xen: Reset VCPU0 info pointer after shared_info remap Sara Sharon <sara.sharon(a)intel.com> mac80211: use timeout from the AddBA response instead of the request Clément Péron <peron.clem(a)gmail.com> ARM: dts: cygnus: fix irq type for arm global timer Mathieu Malaterre <malat(a)debian.org> driver core: add __printf verification to __ata_ehi_pushv_desc Jianchao Wang <jianchao.w.wang(a)oracle.com> nvme: fix use-after-free in nvme_free_ns_head Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: handle alloc failures in omap_connector Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: check return value from soc_device_match Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: fix possible NULL ref issue in tiler_reserve_2d Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: fix uninitialized ret variable Dan Carpenter <dan.carpenter(a)oracle.com> drm/omap: silence unititialized variable warning Eric Anholt <eric(a)anholt.net> drm/vc4: Fix oops dereferencing DPI's connector since panel_bridge. Ilan Peer <ilan.peer(a)intel.com> mac80211: Adjust SAE authentication timeout Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/trace/syscalls: Update syscall name matching logic to account for ppc_ prefix Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/trace/syscalls: Update syscall name matching logic Etienne Carriere <etienne.carriere(a)linaro.org> tee: check shm references are consistent in offset/size Rich Felker <dalias(a)libc.org> sh: fix build failure for J2 cpu with SMP disabled Masahiro Yamada <yamada.masahiro(a)socionext.com> gcc-plugins: fix build condition of SANCOV plugin Bhadram Varka <vbhadram(a)nvidia.com> net: phy: broadcom: add support for BCM89610 PHY Peter Zijlstra <peterz(a)infradead.org> sched/core: Introduce set_special_state() Daniel Borkmann <daniel(a)iogearbox.net> bpf: use array_index_nospec in find_prog_type Tobias Jakobi <tjakobi(a)math.uni-bielefeld.de> drm/exynos: mixer: avoid Oops in vp_video_buffer() Andrzej Hajda <a.hajda(a)samsung.com> drm/exynos/mixer: fix synchronization check in interlaced mode Mark Rutland <mark.rutland(a)arm.com> bpf: fix possible spectre-v1 in find_and_alloc_map() Rob Herring <robh(a)kernel.org> spi: bcm2835aux: ensure interrupts are enabled for shared handler Parav Pandit <parav(a)mellanox.com> RDMA/cma: Do not query GID during QP state transition to RTR Jack Morgenstein <jackm(a)dev.mellanox.co.il> IB/mlx4: Fix integer overflow when calculating optimal MTT size Sebastian Sanchez <sebastian.sanchez(a)intel.com> IB/hfi1: Fix memory leak in exception path in get_irq_affinity() Sebastian Sanchez <sebastian.sanchez(a)intel.com> IB/{hfi1, rdmavt}: Fix memory leak in hfi1_alloc_devdata() upon failure Michael J. Ruhl <michael.j.ruhl(a)intel.com> IB/hfi1 Use correct type for num_user_context Stefan Raspl <stefan.raspl(a)linux.ibm.com> smc: fix sendpage() call Heikki Krogerus <heikki.krogerus(a)linux.intel.com> usb: typec: tps6598x: handle block reads separately with plain-I2C adapters Graeme Smecher <gsmecher(a)threespeedlogic.com> ARM: dts: correct missing "compatible" entry for ti81xx SoCs Janusz Krzysztofik <jmkrzyszt(a)gmail.com> ARM: OMAP1: ams-delta: fix deferred_fiq handler Keith Busch <keith.busch(a)intel.com> nvme/multipath: Fix multipath disabled naming collisions Keith Busch <keith.busch(a)intel.com> nvme/multipath: Disable runtime writable enabling parameter Keith Busch <keith.busch(a)intel.com> nvme: Set integrity flag for user passthrough commands Chengguang Xu <cgxu519(a)gmx.com> nvme: fix potential memory leak in option parsing Changbin Du <changbin.du(a)intel.com> iommu/vt-d: fix shift-out-of-bounds in bug checking Jagannathan Raman <jag.raman(a)oracle.com> iommu/vt-d: Fix usage of force parameter in intel_ir_reconfigure_irte() Bhadram Varka <vbhadram(a)nvidia.com> arm64: tegra: Make BCM89610 PHY interrupt as active low Peter Zijlstra <peterz(a)infradead.org> kthread, sched/wait: Fix kthread_parkme() completion issue Peter Zijlstra <peterz(a)infradead.org> kthread, sched/wait: Fix kthread_parkme() wait-loop Peter Zijlstra <peterz(a)infradead.org> stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock Helge Deller <deller(a)gmx.de> parisc: drivers.c: Fix section mismatches Daniel Borkmann <daniel(a)iogearbox.net> bpf, x64: fix memleak when not converging on calls Daniel Borkmann <daniel(a)iogearbox.net> bpf, x64: fix memleak when not converging after image Ladislav Michl <ladis(a)linux-mips.org> mtd: onenand: omap2: Disable DMA for HIGHMEM buffers Mika Westerberg <mika.westerberg(a)linux.intel.com> pinctrl: cherryview: Associate IRQ descriptors to irqdomain Yixun Lan <yixun.lan(a)amlogic.com> pinctrl: meson-axg: fix the range of aobus bank Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: fix GPIO lookup for I2C Jim Gill <jgill(a)vmware.com> scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts Arnd Bergmann <arnd(a)arndb.de> hexagon: export csum_partial_copy_nocheck Arnd Bergmann <arnd(a)arndb.de> hexagon: add memset_io() helper Nick Dyer <nick(a)shmanahar.org> Input: atmel_mxt_ts - fix the firmware update Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Fix list corruption / DMAR errors during MR recovery Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-som-lv: Fix Audio Mute Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-som-lv: Fix WL127x Startup Issues Tero Kristo <t-kristo(a)ti.com> ARM: OMAP2+: powerdomain: use raw_smp_processor_id() for trace Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: panel: lvds: Fix path to display timing bindings Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm355-evm: fix broken networking Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD Håkon Bugge <haakon.bugge(a)oracle.com> IB/core: Make ib_mad_client_id atomic Amir Goldstein <amir73il(a)gmail.com> <linux/stringhash.h>: fix end_name_hash() for 64bit long oulijun <oulijun(a)huawei.com> RDMA/hns: Submit bad wr oulijun <oulijun(a)huawei.com> RDMA/hns: Fix the qp context state diagram oulijun <oulijun(a)huawei.com> RDMA/hns: Intercept illegal RDMA operation when use inline data oulijun <oulijun(a)huawei.com> RDMA/hns: Bugfix for init hem table Zhu Yanjun <yanjun.zhu(a)oracle.com> IB/rxe: avoid double kfree_skb Jianchao Wang <jianchao.w.wang(a)oracle.com> IB/rxe: add RXE_START_MASK for rxe_opcode IB_OPCODE_RC_SEND_ONLY_INV Colin Ian King <colin.king(a)canonical.com> RDMA/iwpm: fix memory leak on map_info Parav Pandit <parav(a)mellanox.com> RDMA/cma: Fix use after destroy access to net namespace for IPoIB Matan Barak <matanb(a)mellanox.com> IB/uverbs: Fix validating mandatory attributes Junaid Shahid <junaids(a)google.com> kvm: apic: Flush TLB after APIC mode/address change if VPIDs are in use Maxime Chevallier <maxime.chevallier(a)bootlin.com> net: mvpp2: Fix clk error path in mvpp2_probe Greg Thelen <gthelen(a)google.com> IB: make INFINIBAND_ADDR_TRANS configurable Greg Thelen <gthelen(a)google.com> ib_srp: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> cifs: smbd: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> ib_srpt: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> nvmet-rdma: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> nvme: depend on INFINIBAND_ADDR_TRANS Jakub Kicinski <jakub.kicinski(a)netronome.com> nfp: don't depend on eth_tbl being available Jon Maloy <jon.maloy(a)ericsson.com> tipc: fix bug in function tipc_nl_node_dump_monitor Leon Romanovsky <leonro(a)mellanox.com> RDMA/mlx5: Properly check return value of mlx5_get_uars_page Baolin Wang <baolin.wang(a)linaro.org> i2c: sprd: Fix the i2c count issue Baolin Wang <baolin.wang(a)linaro.org> i2c: sprd: Prevent i2c accesses after suspend is called Masahiro Yamada <yamada.masahiro(a)socionext.com> reset: uniphier: fix USB clock line for LD20 Laurentiu Tudor <laurentiu.tudor(a)nxp.com> powerpc/kvm/booke: Fix altivec related build break Stefano Brivio <sbrivio(a)redhat.com> vti6: Change minimum MTU to IPV4_MIN_MTU, vti6 can carry IPv4 too John Fastabend <john.fastabend(a)gmail.com> bpf: fix uninitialized variable in bpf tools jacek.tomaka(a)poczta.fm <jacek.tomaka(a)poczta.fm> x86/cpu/intel: Add missing TLB cpuid values Evan Wang <xswang(a)marvell.com> ata: ahci: mvebu: override ahci_stop_engine for mvebu AHCI Evan Wang <xswang(a)marvell.com> libahci: Allow drivers to override stop_engine Mark Rutland <mark.rutland(a)arm.com> KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_mmio_read_apr() Mark Rutland <mark.rutland(a)arm.com> arm64: fix possible spectre-v1 in ptrace_hbp_get_event() Omar Sandoval <osandov(a)fb.com> blk-mq: fix sysfs inflight counter Arvind Yadav <arvind.yadav.cs(a)gmail.com> HID: intel-ish-hid: use put_device() instead of kfree() Ramon Fried <rfried(a)codeaurora.org> rpmsg: added MODULE_ALIAS for rpmsg_char Tobias Jordan <Tobias.Jordan(a)elektrobit.com> remoteproc: qcom: Fix potential device node leaks Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1 Dag Moxnes <dag.moxnes(a)oracle.com> rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp Gianluca Borello <g.borello(a)gmail.com> bpf, x64: fix JIT emission for dead code Masami Hiramatsu <mhiramat(a)kernel.org> selftests: ftrace: Add a testcase for multiple actions on trigger Arvind Yadav <arvind.yadav.cs(a)gmail.com> HID: wacom: Release device resource data obtained by devres_alloc() pgzh <peter.ganzhorn(a)gmail.com> HID: lenovo: Add support for IBM/Lenovo Scrollpoint mice Kan Liang <kan.liang(a)linux.intel.com> perf pmu: Fix core PMU alias list for X86 platform Mark Rutland <mark.rutland(a)arm.com> arm64: only advance singlestep for user instruction traps Mark Rutland <mark.rutland(a)arm.com> arm64: ptrace: remove addr_limit manipulation Aurelien Jarno <aurelien(a)aurel32.net> RISC-V: build vdso-dummy.o with -no-pie Christoph Hellwig <hch(a)lst.de> riscv: select DMA_DIRECT_OPS instead of redefining it Florian Fainelli <f.fainelli(a)gmail.com> net: ethtool: Add missing kernel doc for FEC parameters Vinicius Costa Gomes <vinicius.gomes(a)intel.com> igb: Fix the transmission mode of queue 0 for Qav mode Masahiro Yamada <yamada.masahiro(a)socionext.com> arm64: dts: uniphier: fix input delay value for legacy mode of eMMC Steve French <smfrench(a)gmail.com> CIFS: set *resp_buf_type to NO_BUFFER on error Hans de Goede <hdegoede(a)redhat.com> thermal: int3403_thermal: Fix NULL pointer deref on module load / probe Markus Mayer <mmayer(a)broadcom.com> cpufreq: brcmstb-avs-cpufreq: remove development debug support Andres Rodriguez <andres.rodriguez(a)amd.com> drm/amdkfd: fix clock counter retrieval for node without GPU Mika Westerberg <mika.westerberg(a)linux.intel.com> ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 Sekhar Nori <nsekhar(a)ti.com> ARM: dts: da850: fix W=1 warnings with pinmux node Jingju Hou <Jingju.Hou(a)synaptics.com> net: phy: marvell: clear wol event before setting it Balbir Singh <bsingharora(a)gmail.com> powerpc/powernv/memtrace: Let the arch hotunplug code flush cache Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: mvebu-uart: DT fix s/interrupts-names/interrupt-names/ Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: meson-uart: DT fix s/clocks-names/clock-names/ Mika Westerberg <mika.westerberg(a)linux.intel.com> ACPI / scan: Initialize watchdog before PNP Chen Yu <yu.c.chen(a)intel.com> ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016) Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qeth: use Read device to query hypervisor for MAC Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qeth: fix request-side race during cmd IO timeout Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qeth: fix MAC address update sequence Tobias Regnery <tobias.regnery(a)gmail.com> usb: typec: ucsi: fix tracepoint related build error Minchan Kim <minchan(a)kernel.org> mm: memcg: add __GFP_NOWARN in __memcg_schedule_kmem_cache_create() Dave Young <dyoung(a)redhat.com> kexec_file: do not add extra alignment to efi memmap Alexey Dobriyan <adobriyan(a)gmail.com> proc: fix /proc/loadavg regression Alexey Dobriyan <adobriyan(a)gmail.com> proc: revalidate kernel thread inodes to root:root Huang Ying <ying.huang(a)intel.com> mm, pagemap: fix swap offset value for PMD migration entry Colin Ian King <colin.king(a)canonical.com> scsi: isci: Fix infinite loop in while loop Long Li <longli(a)microsoft.com> scsi: storvsc: Set up correct queue depth values for IDE devices Baolin Wang <baolin.wang(a)linaro.org> parisc: time: Convert read_persistent_clock() to read_persistent_clock64() David Howells <dhowells(a)redhat.com> vfs: Undo an overly zealous MS_RDONLY -> SB_RDONLY conversion David Howells <dhowells(a)redhat.com> afs: Fix server record deletion dann frazier <dann.frazier(a)canonical.com> net: hns: Avoid action name truncation Jiang Biao <jiang.biao2(a)zte.com.cn> blkcg: init root blkcg_gq under lock Emil Velikov <emil.velikov(a)collabora.com> drm/msm: don't deref error pointer in the msm_fbdev_create error path Stefan Agner <stefan(a)agner.ch> drm/msm/dsi: use correct enum in dsi_get_cmd_fmt Ben Hutchings <ben.hutchings(a)codethink.co.uk> drm/msm: Fix possible null dereference on failure of get_pages() Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> ASoC: msm8916-wcd-analog: use threaded context for mbhc events Taehee Yoo <ap420073(a)gmail.com> netfilter: nf_tables: fix out-of-bounds in nft_chain_commit_update Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: NAT chain and extensions require NF_TABLES Ming Lei <ming.lei(a)redhat.com> scsi: target: fix crash with iscsi target and dvd Vinson Lee <vlee(a)freedesktop.org> scsi: megaraid_sas: Do not log an error if FW successfully initializes. Chris Leech <cleech(a)redhat.com> scsi: iscsi: respond to netlink with unicast when appropriate Srinath Mannam <srinath.mannam(a)broadcom.com> arm64: dts: correct SATA addresses for Stingray Tung Nguyen <tung.q.nguyen(a)dektech.com.au> tipc: fix infinite loop when dumping link monitor summary Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxm-khadas-vim2: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxl-nexbox-a95x: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxl-s905x-libretech-cc: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gx-p23x-q20x: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxl-s905x-p212: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxm: add GXM specific USB host configuration Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxl: add USB host support Jiang Biao <jiang.biao2(a)zte.com.cn> blkcg: don't hold blkcg lock when deactivating policy sxauwsk <sxauwsk(a)163.com> spi: cadence: Add usleep_range() for cdns_spi_fill_tx_fifo() Liam Girdwood <liam.r.girdwood(a)linux.intel.com> ASoC: topology: Check widget kcontrols before deref. Mark Rutland <mark.rutland(a)arm.com> arm64: kasan: avoid pfn_to_nid() before page array is initialized Simon Gaiser <simon(a)invisiblethingslab.com> xen: xenbus_dev_frontend: Really return response string Andre Przywara <andre.przywara(a)arm.com> KVM: arm/arm64: vgic: Kick new VCPU on interrupt migration Petr Mladek <pmladek(a)suse.com> livepatch: Allow to call a custom callback when freeing shadow variables Petr Mladek <pmladek(a)suse.com> livepatch: Initialize shadow variables safely by a custom callback Yan Wang <yan.wang(a)linux.intel.com> ASoC: topology: Fix bugs of freeing soc topology Loic Poulain <loic.poulain(a)linaro.org> PCI: kirin: Fix reset gpio name Madhavan Srinivasan <maddy(a)linux.vnet.ibm.com> powerpc/64s: Default l1d_size to 64K in RFI fallback flush Geert Uytterhoeven <geert(a)linux-m68k.org> soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure Florian Fainelli <f.fainelli(a)gmail.com> soc: bcm: raspberrypi-power: Fix use of __packed Tyler Hicks <tyhicks(a)canonical.com> eCryptfs: don't pass up plaintext names when using filename encryption Tony Lindgren <tony(a)atomide.com> ARM: dts: Fix cm2 and prm sizes for omap4 oder_chiou(a)realtek.com <oder_chiou(a)realtek.com> ASoC: rt5514: Add the missing register in the readable table Jerome Brunet <jbrunet(a)baylibre.com> clk: honor CLK_MUX_ROUND_CLOSEST in generic clk mux Paolo Bonzini <pbonzini(a)redhat.com> kvm: x86: move MSR_IA32_TSC handling to x86.c KarimAllah Ahmed <karahmed(a)amazon.de> X86/KVM: Properly update 'tsc_offset' to represent the running guest Jacopo Mondi <jacopo+renesas(a)jmondi.org> dt-bindings: dmaengine: rcar-dmac: document R8A77965 support Jacopo Mondi <jacopo+renesas(a)jmondi.org> dt-bindings: serial: sh-sci: Add support for r8a77965 (H)SCIF Jacopo Mondi <jacopo+renesas(a)jmondi.org> dt-bindings: net: ravb: Add support for r8a77965 SoC Matheus Castello <matheus(a)castello.eng.br> dt-bindings: pinctrl: sunxi: Fix reference to driver Lukasz Majewski <lukma(a)denx.de> doc: Add vendor prefix for Kieback & Peter GmbH Vladimir Zapolskiy <vladimir_zapolskiy(a)mentor.com> spi: sh-msiof: Fix bit field overflow writes to TSCR/RSCR Matt Redfearn <matt.redfearn(a)mips.com> MIPS: dts: Boston: Fix PCI bus dtc warnings: Chengguang Xu <cgxu519(a)gmx.com> isofs: fix potential memory leak in mount option parsing Martin Schwidefsky <schwidefsky(a)de.ibm.com> s390/smsgiucv: disable SMSG on module unload Sinan Kaya <okaya(a)codeaurora.org> MIPS: io: Add barrier after register read in readX() Amir Goldstein <amir73il(a)gmail.com> fsnotify: fix ignore mask logic in send_to_group() Arnaldo Carvalho de Melo <acme(a)redhat.com> perf report: Fix switching to another perf.data file Pieter Jansen van Vuuren <pieter.jansenvanvuuren(a)netronome.com> nfp: flower: split and limit cmsg skb lists Jakub Kicinski <jakub.kicinski(a)netronome.com> nfp: ignore signals when communicating with management FW Nathan Fontenot <nfont(a)linux.vnet.ibm.com> ibmvnic: Do not notify peers on parameter change resets Raghuram Chary J <raghuramchary.jallipalli(a)microchip.com> lan78xx: PHY DSP registers initialization to address EEE link drop issues with long cables Sinan Kaya <okaya(a)codeaurora.org> MIPS: io: Prevent compiler reordering writeX() Krish Sadhukhan <krish.sadhukhan(a)oracle.com> x86: Add check for APIC access address for vmentry of L2 guests Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: Intel: atom: fix ACPI/PCI Kconfig hu huajun <huhuajun(a)linux.alibaba.com> KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Input: synaptics-rmi4 - fix an unchecked out of memory error path Anson Huang <Anson.Huang(a)nxp.com> clocksource/drivers/imx-tpm: Correct some registers operation flow ------------- Diffstat: .../bindings/display/panel/panel-common.txt | 2 +- .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + .../devicetree/bindings/net/renesas,ravb.txt | 1 + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 6 +- .../bindings/serial/amlogic,meson-uart.txt | 2 +- .../devicetree/bindings/serial/mvebu-uart.txt | 2 +- .../bindings/serial/renesas,sci-serial.txt | 2 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/livepatch/shadow-vars.txt | 41 ++- Makefile | 4 +- arch/arm/boot/compressed/Makefile | 8 +- arch/arm/boot/compressed/head.S | 20 +- arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- arch/arm/boot/dts/da850.dtsi | 2 - arch/arm/boot/dts/dm8148-evm.dts | 2 +- arch/arm/boot/dts/dm8148-t410.dts | 2 +- arch/arm/boot/dts/dm8168-evm.dts | 2 +- arch/arm/boot/dts/dra62x-j5eco-evm.dts | 2 +- arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 +- arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 +- arch/arm/boot/dts/omap4.dtsi | 8 +- arch/arm/include/uapi/asm/siginfo.h | 13 - arch/arm/kernel/machine_kexec.c | 34 ++- arch/arm/mach-davinci/board-da830-evm.c | 9 +- arch/arm/mach-davinci/board-da850-evm.c | 9 +- arch/arm/mach-davinci/board-dm355-evm.c | 15 +- arch/arm/mach-davinci/board-dm644x-evm.c | 10 +- arch/arm/mach-davinci/board-dm646x-evm.c | 5 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 10 +- arch/arm/mach-davinci/dm646x.c | 3 +- arch/arm/mach-keystone/pm_domain.c | 1 + arch/arm/mach-omap1/ams-delta-fiq.c | 28 +- arch/arm/mach-omap2/powerdomain.c | 4 +- arch/arm/vfp/vfpmodule.c | 2 +- .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 12 + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 4 + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 61 ++++ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 17 ++ .../boot/dts/broadcom/stingray/stingray-sata.dtsi | 80 ++--- arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 2 +- arch/arm64/include/asm/cputype.h | 6 + arch/arm64/kernel/ptrace.c | 20 +- arch/arm64/kernel/traps.c | 3 +- arch/arm64/mm/kasan_init.c | 4 +- arch/hexagon/include/asm/io.h | 6 + arch/hexagon/lib/checksum.c | 1 + arch/mips/boot/dts/img/boston.dts | 6 + arch/mips/include/asm/io.h | 4 +- arch/parisc/kernel/drivers.c | 7 +- arch/parisc/kernel/smp.c | 3 +- arch/parisc/kernel/time.c | 2 +- arch/powerpc/include/asm/ftrace.h | 29 +- arch/powerpc/include/asm/topology.h | 13 +- arch/powerpc/kernel/setup_64.c | 11 + arch/powerpc/kvm/booke.c | 7 + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- arch/powerpc/platforms/powernv/memtrace.c | 17 -- arch/riscv/Kconfig | 4 +- arch/riscv/kernel/vdso/Makefile | 2 +- arch/sh/Kconfig | 1 + arch/sh/kernel/cpu/sh2/probe.c | 4 + arch/sh/kernel/setup.c | 1 - arch/sh/mm/init.c | 68 +---- arch/sh/mm/numa.c | 19 -- arch/x86/events/intel/core.c | 9 +- arch/x86/include/asm/insn.h | 18 ++ arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kernel/cpu/intel.c | 3 + arch/x86/kernel/kexec-bzimage64.c | 5 +- arch/x86/kernel/kprobes/core.c | 4 + arch/x86/kernel/uprobes.c | 4 + arch/x86/kvm/hyperv.c | 2 +- arch/x86/kvm/svm.c | 31 +- arch/x86/kvm/vmx.c | 95 +++--- arch/x86/kvm/x86.c | 33 ++- arch/x86/net/bpf_jit_comp.c | 18 +- arch/x86/xen/enlighten_hvm.c | 13 + block/blk-cgroup.c | 22 +- block/blk-mq.c | 19 ++ block/blk-mq.h | 4 +- block/genhd.c | 12 + block/partition-generic.c | 10 +- drivers/acpi/acpi_watchdog.c | 59 +++- drivers/acpi/scan.c | 2 +- drivers/acpi/sleep.c | 13 + drivers/ata/ahci.c | 6 +- drivers/ata/ahci.h | 7 + drivers/ata/ahci_mvebu.c | 56 ++++ drivers/ata/ahci_qoriq.c | 2 +- drivers/ata/ahci_xgene.c | 4 +- drivers/ata/libahci.c | 20 +- drivers/ata/libata-eh.c | 4 +- drivers/ata/sata_highbank.c | 2 +- drivers/char/agp/uninorth-agp.c | 4 +- drivers/clk/clk-mux.c | 10 +- drivers/clk/clk.c | 7 +- drivers/clk/imx/clk-imx6ul.c | 2 +- drivers/clocksource/timer-imx-tpm.c | 8 +- drivers/cpufreq/Kconfig.arm | 10 - drivers/cpufreq/brcmstb-avs-cpufreq.c | 323 +-------------------- drivers/firmware/efi/libstub/arm64-stub.c | 10 + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 +- drivers/gpu/drm/drm_dumb_buffers.c | 7 +- drivers/gpu/drm/exynos/exynos_mixer.c | 22 +- drivers/gpu/drm/exynos/regs-mixer.h | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- drivers/gpu/drm/msm/msm_fbdev.c | 11 +- drivers/gpu/drm/msm/msm_gem.c | 20 +- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 +- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- drivers/gpu/drm/omapdrm/omap_connector.c | 10 + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +- drivers/gpu/drm/omapdrm/tcm-sita.c | 2 +- drivers/gpu/drm/vc4/vc4_dpi.c | 25 +- drivers/hid/Kconfig | 7 +- drivers/hid/hid-ids.h | 9 + drivers/hid/hid-lenovo.c | 36 +++ drivers/hid/i2c-hid/i2c-hid.c | 2 + drivers/hid/intel-ish-hid/ishtp/bus.c | 2 +- drivers/hid/wacom_sys.c | 4 +- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-sprd.c | 22 +- drivers/i2c/busses/i2c-viperboard.c | 2 +- drivers/infiniband/Kconfig | 5 +- drivers/infiniband/core/cma.c | 60 ++-- drivers/infiniband/core/iwpm_util.c | 5 +- drivers/infiniband/core/mad.c | 4 +- drivers/infiniband/core/uverbs_ioctl.c | 9 + drivers/infiniband/hw/hfi1/affinity.c | 11 +- drivers/infiniband/hw/hfi1/init.c | 41 ++- drivers/infiniband/hw/hfi1/platform.c | 1 + drivers/infiniband/hw/hfi1/qsfp.c | 2 + drivers/infiniband/hw/hns/hns_roce_hem.c | 8 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 11 +- drivers/infiniband/hw/mlx4/mr.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 4 +- drivers/infiniband/sw/rxe/rxe_opcode.c | 2 +- drivers/infiniband/sw/rxe/rxe_req.c | 1 - drivers/infiniband/sw/rxe/rxe_resp.c | 6 +- drivers/infiniband/ulp/srp/Kconfig | 2 +- drivers/infiniband/ulp/srpt/Kconfig | 2 +- drivers/input/rmi4/rmi_spi.c | 7 +- drivers/input/touchscreen/atmel_mxt_ts.c | 186 +++++++----- drivers/iommu/dmar.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/mtd/onenand/omap2.c | 105 +++---- drivers/net/can/dev.c | 2 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 20 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +- drivers/net/ethernet/hisilicon/hns/hnae.h | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 3 +- drivers/net/ethernet/intel/igb/igb_main.c | 17 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 + drivers/net/ethernet/marvell/mvpp2.c | 15 +- drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 38 ++- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 + drivers/net/ethernet/netronome/nfp/flower/main.c | 8 +- drivers/net/ethernet/netronome/nfp/flower/main.h | 8 +- drivers/net/ethernet/netronome/nfp/nfp_app_nic.c | 2 +- drivers/net/ethernet/netronome/nfp/nfp_main.h | 4 +- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 31 +- .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 +- drivers/net/ethernet/qlogic/qede/qede_rdma.c | 2 +- drivers/net/phy/broadcom.c | 10 + drivers/net/phy/marvell.c | 9 + drivers/net/phy/microchip.c | 178 +++++++++++- drivers/nvme/host/Kconfig | 2 +- drivers/nvme/host/core.c | 32 +- drivers/nvme/host/fabrics.c | 6 + drivers/nvme/host/multipath.c | 24 +- drivers/nvme/host/nvme.h | 12 + drivers/nvme/target/Kconfig | 2 +- drivers/pci/dwc/pcie-kirin.c | 2 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 16 +- drivers/pinctrl/meson/pinctrl-meson-axg.c | 2 +- drivers/platform/x86/Kconfig | 2 +- drivers/remoteproc/qcom_q6v5_pil.c | 2 + drivers/reset/reset-uniphier.c | 6 +- drivers/rpmsg/rpmsg_char.c | 2 + drivers/s390/net/qeth_core_main.c | 53 ++-- drivers/s390/net/qeth_core_mpc.h | 12 + drivers/s390/net/qeth_l2_main.c | 59 ++-- drivers/s390/net/smsgiucv.c | 2 +- drivers/scsi/isci/port_config.c | 3 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 +- drivers/scsi/scsi_transport_iscsi.c | 29 +- drivers/scsi/storvsc_drv.c | 7 +- drivers/scsi/vmw_pvscsi.c | 2 +- drivers/soc/bcm/raspberrypi-power.c | 2 +- drivers/spi/spi-bcm2835aux.c | 5 + drivers/spi/spi-cadence.c | 8 + drivers/spi/spi-sh-msiof.c | 1 + drivers/target/target_core_pscsi.c | 2 + drivers/tee/tee_core.c | 11 + drivers/thermal/int340x_thermal/int3403_thermal.c | 3 +- drivers/usb/musb/musb_host.c | 5 +- drivers/usb/musb/musb_host.h | 7 +- drivers/usb/musb/musb_virthub.c | 25 +- drivers/usb/typec/tps6598x.c | 47 ++- drivers/usb/typec/ucsi/Makefile | 2 +- drivers/xen/xenbus/xenbus_dev_frontend.c | 3 +- fs/afs/addr_list.c | 25 +- fs/afs/callback.c | 56 +++- fs/afs/cmservice.c | 6 +- fs/afs/internal.h | 7 +- fs/afs/rotate.c | 20 +- fs/afs/rxrpc.c | 7 + fs/afs/server.c | 22 +- fs/afs/server_list.c | 7 +- fs/cifs/Kconfig | 2 +- fs/cifs/smb2ops.c | 6 + fs/cifs/smb2pdu.c | 68 +++-- fs/cifs/transport.c | 5 +- fs/ecryptfs/crypto.c | 41 ++- fs/ecryptfs/file.c | 21 +- fs/isofs/inode.c | 3 + fs/namespace.c | 2 +- fs/notify/fsnotify.c | 25 +- fs/ocfs2/refcounttree.c | 14 +- fs/proc/base.c | 6 + fs/proc/kcore.c | 23 +- fs/proc/loadavg.c | 2 +- fs/proc/task_mmu.c | 6 +- include/linux/brcmphy.h | 1 + include/linux/clk-provider.h | 3 + include/linux/ethtool.h | 2 + include/linux/genhd.h | 4 +- include/linux/kthread.h | 1 + include/linux/kvm_host.h | 8 +- include/linux/livepatch.h | 19 +- include/linux/microchipphy.h | 8 + include/linux/mtd/map.h | 2 +- include/linux/mtd/rawnand.h | 16 +- include/linux/percpu-rwsem.h | 6 +- include/linux/rwsem.h | 6 + include/linux/sched.h | 50 +++- include/linux/sched/signal.h | 2 +- include/linux/stringhash.h | 4 +- include/soc/bcm2835/raspberrypi-firmware.h | 4 +- init/main.c | 7 + kernel/bpf/syscall.c | 19 +- kernel/kthread.c | 50 ++-- kernel/livepatch/shadow.c | 108 ++++--- kernel/locking/rwsem-xadd.c | 19 +- kernel/locking/rwsem.c | 2 - kernel/locking/rwsem.h | 30 +- kernel/module.c | 5 + kernel/sched/core.c | 49 ++-- kernel/sched/deadline.c | 4 +- kernel/sched/rt.c | 2 - kernel/sched/sched.h | 5 +- kernel/signal.c | 17 +- kernel/stop_machine.c | 19 +- lib/find_bit_benchmark.c | 7 +- mm/memcontrol.c | 2 +- net/ipv6/ip6_vti.c | 4 +- net/ipv6/netfilter/Kconfig | 55 ++-- net/mac80211/agg-tx.c | 4 + net/mac80211/mlme.c | 25 +- net/mac80211/tx.c | 3 +- net/netfilter/nf_tables_api.c | 2 +- net/rds/ib_cm.c | 3 +- net/rxrpc/af_rxrpc.c | 2 +- net/rxrpc/ar-internal.h | 1 + net/rxrpc/input.c | 2 +- net/rxrpc/local_object.c | 57 +++- net/rxrpc/output.c | 11 + net/rxrpc/sendmsg.c | 10 + net/sched/act_skbedit.c | 3 +- net/smc/af_smc.c | 6 +- net/sunrpc/xprtrdma/fmr_ops.c | 5 +- net/sunrpc/xprtrdma/frwr_ops.c | 9 +- net/sunrpc/xprtrdma/verbs.c | 5 + net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- net/tipc/monitor.c | 2 +- net/tipc/node.c | 28 +- samples/livepatch/livepatch-shadow-fix1.c | 43 ++- samples/livepatch/livepatch-shadow-fix2.c | 33 ++- scripts/Makefile.gcc-plugins | 2 +- sound/soc/codecs/msm8916-wcd-analog.c | 9 +- sound/soc/codecs/rt5514.c | 3 + sound/soc/intel/Kconfig | 22 +- sound/soc/soc-topology.c | 6 +- tools/bpf/bpf_dbg.c | 7 +- tools/objtool/arch/x86/include/asm/insn.h | 18 ++ tools/perf/util/cs-etm.c | 24 +- tools/perf/util/pmu.c | 20 +- tools/perf/util/symbol.c | 8 +- .../inter-event/trigger-multi-actions-accept.tc | 44 +++ tools/testing/selftests/x86/Makefile | 2 +- tools/testing/selftests/x86/mov_ss_trap.c | 285 ++++++++++++++++++ tools/testing/selftests/x86/mpx-mini-test.c | 7 +- tools/testing/selftests/x86/pkey-helpers.h | 20 +- tools/testing/selftests/x86/protection_keys.c | 254 +++++++++++----- virt/kvm/arm/vgic/vgic-mmio-v2.c | 5 + virt/kvm/arm/vgic/vgic.c | 8 + 308 files changed, 3213 insertions(+), 1735 deletions(-)

7 years, 3 months

8
273
0 0

[PATCH 1/6] ext4: sysfs: print ext4_super_block fields as little-endian

by Arnd Bergmann

While working on extended rand for last_error/first_error timestamps, I noticed that the endianess is wrong, we access the little-endian fields in struct ext4_super_block as native-endian when we print them. This adds a special case in ext4_attr_show() and ext4_attr_store() to byteswap the superblock fields if needed. In older kernels, this code was part of super.c, it got moved to sysfs.c in linux-4.4. Cc: stable(a)vger.kernel.org Fixes: 52c198c6820f ("ext4: add sysfs entry showing whether the fs contains errors") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- fs/ext4/sysfs.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c index f34da0bb8f17..b970a200f20c 100644 --- a/fs/ext4/sysfs.c +++ b/fs/ext4/sysfs.c @@ -274,8 +274,12 @@ static ssize_t ext4_attr_show(struct kobject *kobj, case attr_pointer_ui: if (!ptr) return 0; - return snprintf(buf, PAGE_SIZE, "%u\n", - *((unsigned int *) ptr)); + if (a->attr_ptr == ptr_ext4_super_block_offset) + return snprintf(buf, PAGE_SIZE, "%u\n", + le32_to_cpup(ptr)); + else + return snprintf(buf, PAGE_SIZE, "%u\n", + *((unsigned int *) ptr)); case attr_pointer_atomic: if (!ptr) return 0; @@ -308,7 +312,10 @@ static ssize_t ext4_attr_store(struct kobject *kobj, ret = kstrtoul(skip_spaces(buf), 0, &t); if (ret) return ret; - *((unsigned int *) ptr) = t; + if (a->attr_ptr == ptr_ext4_super_block_offset) + *((__le32 *) ptr) = cpu_to_le32(t); + else + *((unsigned int *) ptr) = t; return len; case attr_inode_readahead: return inode_readahead_blks_store(sbi, buf, len); -- 2.9.0

7 years, 3 months

2
2
0 0

[tip:x86/pti] x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec()

by tip-bot for Dan Williams

Commit-ID: eab6870fee877258122a042bfd99ee7908c40280 Gitweb: https://git.kernel.org/tip/eab6870fee877258122a042bfd99ee7908c40280 Author: Dan Williams <dan.j.williams(a)intel.com> AuthorDate: Thu, 7 Jun 2018 09:13:48 -0700 Committer: Ingo Molnar <mingo(a)kernel.org> CommitDate: Thu, 21 Jun 2018 16:00:21 +0200 x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec() Mark Rutland noticed that GCC optimization passes have the potential to elide necessary invocations of the array_index_mask_nospec() instruction sequence, so mark the asm() volatile. Mark explains: "The volatile will inhibit *some* cases where the compiler could lift the array_index_nospec() call out of a branch, e.g. where there are multiple invocations of array_index_nospec() with the same arguments: if (idx < foo) { idx1 = array_idx_nospec(idx, foo) do_something(idx1); } < some other code > if (idx < foo) { idx2 = array_idx_nospec(idx, foo); do_something_else(idx2); } ... since the compiler can determine that the two invocations yield the same result, and reuse the first result (likely the same register as idx was in originally) for the second branch, effectively re-writing the above as: if (idx < foo) { idx = array_idx_nospec(idx, foo); do_something(idx); } < some other code > if (idx < foo) { do_something_else(idx); } ... if we don't take the first branch, then speculatively take the second, we lose the nospec protection. There's more info on volatile asm in the GCC docs: https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html#Volatile " Reported-by: Mark Rutland <mark.rutland(a)arm.com> Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> Acked-by: Mark Rutland <mark.rutland(a)arm.com> Acked-by: Thomas Gleixner <tglx(a)linutronix.de> Acked-by: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: <stable(a)vger.kernel.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Fixes: babdde2698d4 ("x86: Implement array_index_mask_nospec") Link: https://lkml.kernel.org/lkml/152838798950.14521.4893346294059739135.stgit@d… Signed-off-by: Ingo Molnar <mingo(a)kernel.org> --- arch/x86/include/asm/barrier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index 042b5e892ed1..14de0432d288 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -38,7 +38,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index, { unsigned long mask; - asm ("cmp %1,%2; sbb %0,%0;" + asm volatile ("cmp %1,%2; sbb %0,%0;" :"=r" (mask) :"g"(size),"r" (index) :"cc");

7 years, 3 months

1
0
0 0

[PATCH 2/3] usb: typec: ucsi: acpi: Workaround for cache mode issue

by Heikki Krogerus

This fixes an issue where the driver fails with an error: ioremap error for 0x3f799000-0x3f79a000, requested 0x2, got 0x0 On some platforms the UCSI ACPI mailbox SystemMemory Operation Region may be setup before the driver has been loaded. That will lead into the driver failing to map the mailbox region, as it has been already marked as write-back memory. acpi_os_ioremap() for x86 uses ioremap_cache() unconditionally. When the issue happens, the embedded controller has a pending query event for the UCSI notification right after boot-up which causes the operation region to be setup before UCSI driver has been loaded. The fix is to notify acpi core that the driver is about to access memory region which potentially overlaps with an operation region right before mapping it. acpi_release_memory() will check if the memory has already been setup (mapped) by acpi core, and deactivate it (unmap) if it has. The driver is then able to map the memory with ioremap_nocache() and set the memtype to uncached for the region. Reported-by: Paul Menzel <pmenzel(a)molgen.mpg.de> Fixes: 8243edf44152 ("usb: typec: ucsi: Add ACPI driver") Cc: stable(a)vger.kernel.org Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> --- drivers/usb/typec/ucsi/ucsi_acpi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c index 44eb4e1ea817..a18112a83fae 100644 --- a/drivers/usb/typec/ucsi/ucsi_acpi.c +++ b/drivers/usb/typec/ucsi/ucsi_acpi.c @@ -79,6 +79,11 @@ static int ucsi_acpi_probe(struct platform_device *pdev) return -ENODEV; } + /* This will make sure we can use ioremap_nocache() */ + status = acpi_release_memory(ACPI_HANDLE(&pdev->dev), res, 1); + if (ACPI_FAILURE(status)) + return -ENOMEM; + /* * NOTE: The memory region for the data structures is used also in an * operation region, which means ACPI has already reserved it. Therefore -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH 1/3] acpi: Add helper for deactivating memory region

by Heikki Krogerus

Sometimes memory resource may be overlapping with SystemMemory Operation Region by design, for example if the memory region is used as a mailbox for communication with a firmware in the system. One occasion of such mailboxes is USB Type-C Connector System Software Interface (UCSI). With regions like that, it is important that the driver is able to map the memory with the requirements it has. For example, the driver should be allowed to map the memory as non-cached memory. However, if the operation region has been accessed before the driver has mapped the memory, the memory has been marked as write-back by the time the driver is loaded. That means the driver will fail to map the memory if it expects non-cached memory. To work around the problem, introducing helper that the drivers can use to temporarily deactivate (unmap) SystemMemory Operation Regions that overlap with their IO memory. Fixes: 8243edf44152 ("usb: typec: ucsi: Add ACPI driver") Cc: stable(a)vger.kernel.org Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> --- drivers/acpi/osl.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 3 ++ 2 files changed, 75 insertions(+) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 7ca41bf023c9..8df9abfa947b 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -45,6 +45,8 @@ #include <linux/uaccess.h> #include <linux/io-64-nonatomic-lo-hi.h> +#include "acpica/accommon.h" +#include "acpica/acnamesp.h" #include "internal.h" #define _COMPONENT ACPI_OS_SERVICES @@ -1490,6 +1492,76 @@ int acpi_check_region(resource_size_t start, resource_size_t n, } EXPORT_SYMBOL(acpi_check_region); +static acpi_status acpi_deactivate_mem_region(acpi_handle handle, u32 level, + void *_res, void **return_value) +{ + struct acpi_mem_space_context **mem_ctx; + union acpi_operand_object *handler_obj; + union acpi_operand_object *region_obj2; + union acpi_operand_object *region_obj; + struct resource *res = _res; + acpi_status status; + + region_obj = acpi_ns_get_attached_object(handle); + if (!region_obj) + return AE_OK; + + handler_obj = region_obj->region.handler; + if (!handler_obj) + return AE_OK; + + if (region_obj->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) + return AE_OK; + + if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) + return AE_OK; + + region_obj2 = acpi_ns_get_secondary_object(region_obj); + if (!region_obj2) + return AE_OK; + + mem_ctx = (void *)&region_obj2->extra.region_context; + + if (!(mem_ctx[0]->address >= res->start && + mem_ctx[0]->address < res->end)) + return AE_OK; + + status = handler_obj->address_space.setup(region_obj, + ACPI_REGION_DEACTIVATE, + NULL, (void **)mem_ctx); + if (ACPI_SUCCESS(status)) + region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE); + + return status; +} + +/** + * acpi_release_memory - Release any mappings done to a memory region + * @handle: Handle to namespace node + * @res: Memory resource + * @level: A level that terminates the search + * + * Walks through @handle and unmaps all SystemMemory Operation Regions that + * overlap with @res and that have already been activated (mapped). + * + * This is a helper that allows drivers to place special requirements on memory + * region that may overlap with operation regions, primarily allowing them to + * safely map the region as non-cached memory. + * + * The unmapped Operation Regions will be automatically remapped next time they + * are called, so the drivers do not need to do anything else. + */ +acpi_status acpi_release_memory(acpi_handle handle, struct resource *res, + u32 level) +{ + if (!(res->flags & IORESOURCE_MEM)) + return AE_TYPE; + + return acpi_walk_namespace(ACPI_TYPE_REGION, handle, level, + acpi_deactivate_mem_region, NULL, res, NULL); +} +EXPORT_SYMBOL_GPL(acpi_release_memory); + /* * Let drivers know whether the resource checks are effective */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4b35a66383f9..e54f40974eb0 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -443,6 +443,9 @@ int acpi_check_resource_conflict(const struct resource *res); int acpi_check_region(resource_size_t start, resource_size_t n, const char *name); +acpi_status acpi_release_memory(acpi_handle handle, struct resource *res, + u32 level); + int acpi_resources_are_enforced(void); #ifdef CONFIG_HIBERNATION -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH RESEND] softirq: reorder trace_softirqs_on to prevent lockdep splat

by Joel Fernandes

From: "Joel Fernandes (Google)" <joel(a)joelfernandes.org> I'm able to reproduce a lockdep splat with config options: CONFIG_PROVE_LOCKING=y, CONFIG_DEBUG_LOCK_ALLOC=y and CONFIG_PREEMPTIRQ_EVENTS=y $ echo 1 > /d/tracing/events/preemptirq/preempt_enable/enable [ 26.112609] DEBUG_LOCKS_WARN_ON(current->softirqs_enabled) [ 26.112636] WARNING: CPU: 0 PID: 118 at kernel/locking/lockdep.c:3854 [...] [ 26.144229] Call Trace: [ 26.144926] <IRQ> [ 26.145506] lock_acquire+0x55/0x1b0 [ 26.146499] ? __do_softirq+0x46f/0x4d9 [ 26.147571] ? __do_softirq+0x46f/0x4d9 [ 26.148646] trace_preempt_on+0x8f/0x240 [ 26.149744] ? trace_preempt_on+0x4d/0x240 [ 26.150862] ? __do_softirq+0x46f/0x4d9 [ 26.151930] preempt_count_sub+0x18a/0x1a0 [ 26.152985] __do_softirq+0x46f/0x4d9 [ 26.153937] irq_exit+0x68/0xe0 [ 26.154755] smp_apic_timer_interrupt+0x271/0x280 [ 26.156056] apic_timer_interrupt+0xf/0x20 [ 26.157105] </IRQ> The issue was this: preempt_count = 1 << SOFTIRQ_SHIFT __local_bh_enable(cnt = 1 << SOFTIRQ_SHIFT) { if (softirq_count() == (cnt && SOFTIRQ_MASK)) { trace_softirqs_on() { current->softirqs_enabled = 1; } } preempt_count_sub(cnt) { trace_preempt_on() { tracepoint() { rcu_read_lock_sched() { // jumps into lockdep Where preempt_count still has softirqs disabled, but current->softirqs_enabled is true, and we get a splat. Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Cc: Tom Zanussi <tom.zanussi(a)linux.intel.com> Cc: Namhyung Kim <namhyung(a)kernel.org> Cc: Thomas Glexiner <tglx(a)linutronix.de> Cc: Boqun Feng <boqun.feng(a)gmail.com> Cc: Paul McKenney <paulmck(a)linux.vnet.ibm.com> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Todd Kjos <tkjos(a)google.com> Cc: Erick Reyes <erickreyes(a)google.com> Cc: Julia Cartwright <julia(a)ni.com> Cc: Byungchul Park <byungchul.park(a)lge.com> Cc: stable(a)vger.kernel.org Reviewed-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> Fixes: d59158162e032 ("tracing: Add support for preempt and irq enable/disable events") Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> --- kernel/softirq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index 177de3640c78..8a040bcaa033 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -139,9 +139,13 @@ static void __local_bh_enable(unsigned int cnt) { lockdep_assert_irqs_disabled(); + if (preempt_count() == cnt) + trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip()); + if (softirq_count() == (cnt & SOFTIRQ_MASK)) trace_softirqs_on(_RET_IP_); - preempt_count_sub(cnt); + + __preempt_count_sub(cnt); } /* -- 2.17.1.1185.g55be947832-goog

7 years, 3 months

3
2
0 0

[PATCH 2/5] xhci: Fix kernel oops in trace_xhci_free_virt_device

by Mathias Nyman

From: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> commit 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") set dev->udev pointer to NULL in xhci_free_dev(), it will cause kernel panic in trace_xhci_free_virt_device. This patch reimplement the trace function trace_xhci_free_virt_device, remove dev->udev dereference and added more useful parameters to show in the trace function,it also makes sure dev->udev is not NULL before calling trace_xhci_free_virt_device. This issue happened when xhci-hcd trace is enabled and USB devices hot plug test. Original use-after-free patch went to stable so this needs so be applied there as well. [ 1092.022457] usb 2-4: USB disconnect, device number 6 [ 1092.092772] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [ 1092.101694] PGD 0 P4D 0 [ 1092.104601] Oops: 0000 [#1] SMP [ 1092.207734] Workqueue: usb_hub_wq hub_event [ 1092.212507] RIP: 0010:trace_event_raw_event_xhci_log_virt_dev+0x6c/0xf0 [ 1092.220050] RSP: 0018:ffff8c252e883d28 EFLAGS: 00010086 [ 1092.226024] RAX: ffff8c24af86fa84 RBX: 0000000000000003 RCX: ffff8c25255c2a01 [ 1092.234130] RDX: 0000000000000000 RSI: 00000000aef55009 RDI: ffff8c252e883d28 [ 1092.242242] RBP: ffff8c252550e2c0 R08: ffff8c24af86fa84 R09: 0000000000000a70 [ 1092.250364] R10: 0000000000000a70 R11: 0000000000000000 R12: ffff8c251f21a000 [ 1092.258468] R13: 000000000000000c R14: ffff8c251f21a000 R15: ffff8c251f432f60 [ 1092.266572] FS: 0000000000000000(0000) GS:ffff8c252e880000(0000) knlGS:0000000000000000 [ 1092.275757] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1092.282281] CR2: 0000000000000000 CR3: 0000000154209001 CR4: 00000000003606e0 [ 1092.290384] Call Trace: [ 1092.293156] <IRQ> [ 1092.295439] xhci_free_virt_device.part.34+0x182/0x1a0 [ 1092.301288] handle_cmd_completion+0x7ac/0xfa0 [ 1092.306336] ? trace_event_raw_event_xhci_log_trb+0x6e/0xa0 [ 1092.312661] xhci_irq+0x3e8/0x1f60 [ 1092.316524] __handle_irq_event_percpu+0x75/0x180 [ 1092.321876] handle_irq_event_percpu+0x20/0x50 [ 1092.326922] handle_irq_event+0x36/0x60 [ 1092.331273] handle_edge_irq+0x6d/0x180 [ 1092.335644] handle_irq+0x16/0x20 [ 1092.339417] do_IRQ+0x41/0xc0 [ 1092.342782] common_interrupt+0xf/0xf [ 1092.346955] </IRQ> Fixes: 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> --- drivers/usb/host/xhci-mem.c | 4 ++-- drivers/usb/host/xhci-trace.h | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index acbd3d7..8a62eee 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -886,12 +886,12 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id) dev = xhci->devs[slot_id]; - trace_xhci_free_virt_device(dev); - xhci->dcbaa->dev_context_ptrs[slot_id] = 0; if (!dev) return; + trace_xhci_free_virt_device(dev); + if (dev->tt_info) old_active_eps = dev->tt_info->active_eps; diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h index 410544f..88b4274 100644 --- a/drivers/usb/host/xhci-trace.h +++ b/drivers/usb/host/xhci-trace.h @@ -171,6 +171,37 @@ DEFINE_EVENT(xhci_log_trb, xhci_dbc_gadget_ep_queue, TP_ARGS(ring, trb) ); +DECLARE_EVENT_CLASS(xhci_log_free_virt_dev, + TP_PROTO(struct xhci_virt_device *vdev), + TP_ARGS(vdev), + TP_STRUCT__entry( + __field(void *, vdev) + __field(unsigned long long, out_ctx) + __field(unsigned long long, in_ctx) + __field(u8, fake_port) + __field(u8, real_port) + __field(u16, current_mel) + + ), + TP_fast_assign( + __entry->vdev = vdev; + __entry->in_ctx = (unsigned long long) vdev->in_ctx->dma; + __entry->out_ctx = (unsigned long long) vdev->out_ctx->dma; + __entry->fake_port = (u8) vdev->fake_port; + __entry->real_port = (u8) vdev->real_port; + __entry->current_mel = (u16) vdev->current_mel; + ), + TP_printk("vdev %p ctx %llx | %llx fake_port %d real_port %d current_mel %d", + __entry->vdev, __entry->in_ctx, __entry->out_ctx, + __entry->fake_port, __entry->real_port, __entry->current_mel + ) +); + +DEFINE_EVENT(xhci_log_free_virt_dev, xhci_free_virt_device, + TP_PROTO(struct xhci_virt_device *vdev), + TP_ARGS(vdev) +); + DECLARE_EVENT_CLASS(xhci_log_virt_dev, TP_PROTO(struct xhci_virt_device *vdev), TP_ARGS(vdev), @@ -208,11 +239,6 @@ DEFINE_EVENT(xhci_log_virt_dev, xhci_alloc_virt_device, TP_ARGS(vdev) ); -DEFINE_EVENT(xhci_log_virt_dev, xhci_free_virt_device, - TP_PROTO(struct xhci_virt_device *vdev), - TP_ARGS(vdev) -); - DEFINE_EVENT(xhci_log_virt_dev, xhci_setup_device, TP_PROTO(struct xhci_virt_device *vdev), TP_ARGS(vdev) -- 2.7.4

7 years, 3 months

1
0
0 0

Re: BUG: jumbo frames broken after commit xen-netfront: Fix race between device setup and open

by Javier Martinez Canillas

Hi Andrew, On Wed, Jun 6, 2018 at 6:29 PM, Andrew Jeddeloh <andrew.jeddeloh(a)redhat.com> wrote: > Hi all, > > The patch "xen-netfront: Fix race between device setup and open" seems > to have introduced a regression preventing setting MTU's larger than > 1500. We experienced this downstream with Container Linux and > confirmed with Fedora 28 as well. > > It's commit f599c64fdf7d9c108e8717fb04bc41c680120da4 in the linux-stable tree. > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/com… > > Downstream bugs: > https://github.com/coreos/bugs/issues/2443 > https://bugzilla.redhat.com/show_bug.cgi?id=1584216 > > We've confirmed that reverting that commit fixes the bug. It be > reliably can be reproduced on AWS with t2.micro instances (and > presumably other systems using the same driver). Both using > systemd-networkd to set the mtu and manual ip link commands cause the > link to repsond with "Invalid argument" when trying to set the MTU > > 1500. > > I'm not sure why that commit introduced the regression. > > Please let me know if there's any more information that would be helpful. > > - Andrew I'm adding some relevant people to the CC list to bring more attention on this regression. The get_maintainer.pl script is very useful to get some hints on who should be copied, i.e: $ ./scripts/get_maintainer.pl -f drivers/net/xen-netfront.c Best regards, Javier

7 years, 3 months

3
2
0 0

[PATCH] x86/xen: add call of speculative_store_bypass_ht_init() to pv paths

by Juergen Gross

Commit 1f50ddb4f4189243c05926b842dc1a0332195f31 ("x86/speculation: Handle HT correctly on AMD") added speculative_store_bypass_ht_init() to the per-cpu initialization sequence. speculative_store_bypass_ht_init() needs to be called on each cpu for pv guests, too. Reported-by: Brian Woods <brian.woods(a)amd.com> Fixes: 1f50ddb4f4189243c05926b842dc1a0332195f31 ("x86/speculation: Handle HT correctly on AMD") Cc: <stable(a)vger.kernel.org> Signed-off-by: Juergen Gross <jgross(a)suse.com> Tested-by: Brian Woods <brian.woods(a)amd.com> --- arch/x86/xen/smp_pv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index 2e20ae2fa2d6..e3b18ad49889 100644 --- a/arch/x86/xen/smp_pv.c +++ b/arch/x86/xen/smp_pv.c @@ -32,6 +32,7 @@ #include <xen/interface/vcpu.h> #include <xen/interface/xenpmu.h> +#include <asm/spec-ctrl.h> #include <asm/xen/interface.h> #include <asm/xen/hypercall.h> @@ -70,6 +71,8 @@ static void cpu_bringup(void) cpu_data(cpu).x86_max_cores = 1; set_cpu_sibling_map(cpu); + speculative_store_bypass_ht_init(); + xen_setup_cpu_clockevents(); notify_cpu_starting(cpu); @@ -250,6 +253,8 @@ static void __init xen_pv_smp_prepare_cpus(unsigned int max_cpus) } set_cpu_sibling_map(0); + speculative_store_bypass_ht_init(); + xen_pmu_init(0); if (xen_smp_intr_init(0) || xen_smp_intr_init_pv(0)) -- 2.13.7

7 years, 3 months

2
1
0 0

Re: [PATCH v2 1/2] sched/fair: Fix bandwidth timer clock drift condition

by Xunlei Pang

On 6/21/18 1:01 AM, bsegall(a)google.com wrote: > Xunlei Pang <xlpang(a)linux.alibaba.com> writes: > >> I noticed the group constantly got throttled even it consumed >> low cpu usage, this caused some jitters on the response time >> to some of our business containers enabling cpu quota. >> >> It's very simple to reproduce: >> mkdir /sys/fs/cgroup/cpu/test >> cd /sys/fs/cgroup/cpu/test >> echo 100000 > cpu.cfs_quota_us >> echo $$ > tasks >> then repeat: >> cat cpu.stat |grep nr_throttled // nr_throttled will increase >> >> After some analysis, we found that cfs_rq::runtime_remaining will >> be cleared by expire_cfs_rq_runtime() due to two equal but stale >> "cfs_{b|q}->runtime_expires" after period timer is re-armed. >> >> The current condition to judge clock drift in expire_cfs_rq_runtime() >> is wrong, the two runtime_expires are actually the same when clock >> drift happens, so this condtion can never hit. The orginal design was >> correctly done by commit a9cf55b28610 ("sched: Expire invalid runtime"), >> but was changed to be the current one due to its locking issue. >> >> This patch introduces another way, it adds a new field in both structures >> cfs_rq and cfs_bandwidth to record the expiration update sequence, and >> use them to figure out if clock drift happens(true if they equal). >> >> Fixes: 51f2176d74ac ("sched/fair: Fix unlocked reads of some cfs_b->quota/period") >> Cc: Ben Segall <bsegall(a)google.com> > > Reviewed-By: Ben Segall <bsegall(a)google.com> Thanks Ben :-) Hi Peter, could you please have a look at them? Cc stable(a)vger.kernel.org > >> Signed-off-by: Xunlei Pang <xlpang(a)linux.alibaba.com> >> --- >> kernel/sched/fair.c | 14 ++++++++------ >> kernel/sched/sched.h | 6 ++++-- >> 2 files changed, 12 insertions(+), 8 deletions(-) >> >> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c >> index e497c05aab7f..e6bb68d52962 100644 >> --- a/kernel/sched/fair.c >> +++ b/kernel/sched/fair.c >> @@ -4590,6 +4590,7 @@ void __refill_cfs_bandwidth_runtime(struct cfs_bandwidth *cfs_b) >> now = sched_clock_cpu(smp_processor_id()); >> cfs_b->runtime = cfs_b->quota; >> cfs_b->runtime_expires = now + ktime_to_ns(cfs_b->period); >> + cfs_b->expires_seq++; >> } >> >> static inline struct cfs_bandwidth *tg_cfs_bandwidth(struct task_group *tg) >> @@ -4612,6 +4613,7 @@ static int assign_cfs_rq_runtime(struct cfs_rq *cfs_rq) >> struct task_group *tg = cfs_rq->tg; >> struct cfs_bandwidth *cfs_b = tg_cfs_bandwidth(tg); >> u64 amount = 0, min_amount, expires; >> + int expires_seq; >> >> /* note: this is a positive sum as runtime_remaining <= 0 */ >> min_amount = sched_cfs_bandwidth_slice() - cfs_rq->runtime_remaining; >> @@ -4628,6 +4630,7 @@ static int assign_cfs_rq_runtime(struct cfs_rq *cfs_rq) >> cfs_b->idle = 0; >> } >> } >> + expires_seq = cfs_b->expires_seq; >> expires = cfs_b->runtime_expires; >> raw_spin_unlock(&cfs_b->lock); >> >> @@ -4637,8 +4640,10 @@ static int assign_cfs_rq_runtime(struct cfs_rq *cfs_rq) >> * spread between our sched_clock and the one on which runtime was >> * issued. >> */ >> - if ((s64)(expires - cfs_rq->runtime_expires) > 0) >> + if (cfs_rq->expires_seq != expires_seq) { >> + cfs_rq->expires_seq = expires_seq; >> cfs_rq->runtime_expires = expires; >> + } >> >> return cfs_rq->runtime_remaining > 0; >> } >> @@ -4664,12 +4669,9 @@ static void expire_cfs_rq_runtime(struct cfs_rq *cfs_rq) >> * has not truly expired. >> * >> * Fortunately we can check determine whether this the case by checking >> - * whether the global deadline has advanced. It is valid to compare >> - * cfs_b->runtime_expires without any locks since we only care about >> - * exact equality, so a partial write will still work. >> + * whether the global deadline(cfs_b->expires_seq) has advanced. >> */ >> - >> - if (cfs_rq->runtime_expires != cfs_b->runtime_expires) { >> + if (cfs_rq->expires_seq == cfs_b->expires_seq) { >> /* extend local deadline, drift is bounded above by 2 ticks */ >> cfs_rq->runtime_expires += TICK_NSEC; >> } else { >> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h >> index 6601baf2361c..e977e04f8daf 100644 >> --- a/kernel/sched/sched.h >> +++ b/kernel/sched/sched.h >> @@ -334,9 +334,10 @@ struct cfs_bandwidth { >> u64 runtime; >> s64 hierarchical_quota; >> u64 runtime_expires; >> + int expires_seq; >> >> - int idle; >> - int period_active; >> + short idle; >> + short period_active; >> struct hrtimer period_timer; >> struct hrtimer slack_timer; >> struct list_head throttled_cfs_rq; >> @@ -551,6 +552,7 @@ struct cfs_rq { >> >> #ifdef CONFIG_CFS_BANDWIDTH >> int runtime_enabled; >> + int expires_seq; >> u64 runtime_expires; >> s64 runtime_remaining;

7 years, 3 months

2
2
0 0

[tip:x86/urgent] x86/xen: Add call of speculative_store_bypass_ht_init() to PV paths

by tip-bot for Juergen Gross

Commit-ID: 74899d92e66663dc7671a8017b3146dcd4735f3b Gitweb: https://git.kernel.org/tip/74899d92e66663dc7671a8017b3146dcd4735f3b Author: Juergen Gross <jgross(a)suse.com> AuthorDate: Thu, 21 Jun 2018 10:43:31 +0200 Committer: Ingo Molnar <mingo(a)kernel.org> CommitDate: Thu, 21 Jun 2018 10:55:52 +0200 x86/xen: Add call of speculative_store_bypass_ht_init() to PV paths Commit: 1f50ddb4f418 ("x86/speculation: Handle HT correctly on AMD") ... added speculative_store_bypass_ht_init() to the per-CPU initialization sequence. speculative_store_bypass_ht_init() needs to be called on each CPU for PV guests, too. Reported-by: Brian Woods <brian.woods(a)amd.com> Tested-by: Brian Woods <brian.woods(a)amd.com> Signed-off-by: Juergen Gross <jgross(a)suse.com> Cc: <stable(a)vger.kernel.org> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: boris.ostrovsky(a)oracle.com Cc: xen-devel(a)lists.xenproject.org Fixes: 1f50ddb4f4189243c05926b842dc1a0332195f31 ("x86/speculation: Handle HT correctly on AMD") Link: https://lore.kernel.org/lkml/20180621084331.21228-1-jgross@suse.com Signed-off-by: Ingo Molnar <mingo(a)kernel.org> --- arch/x86/xen/smp_pv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index 2e20ae2fa2d6..e3b18ad49889 100644 --- a/arch/x86/xen/smp_pv.c +++ b/arch/x86/xen/smp_pv.c @@ -32,6 +32,7 @@ #include <xen/interface/vcpu.h> #include <xen/interface/xenpmu.h> +#include <asm/spec-ctrl.h> #include <asm/xen/interface.h> #include <asm/xen/hypercall.h> @@ -70,6 +71,8 @@ static void cpu_bringup(void) cpu_data(cpu).x86_max_cores = 1; set_cpu_sibling_map(cpu); + speculative_store_bypass_ht_init(); + xen_setup_cpu_clockevents(); notify_cpu_starting(cpu); @@ -250,6 +253,8 @@ static void __init xen_pv_smp_prepare_cpus(unsigned int max_cpus) } set_cpu_sibling_map(0); + speculative_store_bypass_ht_init(); + xen_pmu_init(0); if (xen_smp_intr_init(0) || xen_smp_intr_init_pv(0))

7 years, 3 months

1
0
0 0

+ slub-track-number-of-slabs-irrespective-of-config_slub_debug.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: slub: track number of slabs irrespective of CONFIG_SLUB_DEBUG has been added to the -mm tree. Its filename is slub-track-number-of-slabs-irrespective-of-config_slub_debug.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/slub-track-number-of-slabs-irrespe… and later at http://ozlabs.org/~akpm/mmotm/broken-out/slub-track-number-of-slabs-irrespe… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Shakeel Butt <shakeelb(a)google.com> Subject: slub: track number of slabs irrespective of CONFIG_SLUB_DEBUG For !CONFIG_SLUB_DEBUG, SLUB does not maintain the number of slabs allocated per node for a kmem_cache. Thus, slabs_node() in __kmem_cache_empty(), __kmem_cache_shrink() and __kmem_cache_destroy() will always return 0 for such config. This is wrong and can cause issues for all users of these functions. In fact in [1] Jason has reported a system crash while using SLUB without CONFIG_SLUB_DEBUG. The reason was the usage of slabs_node() by __kmem_cache_empty(). The right solution is to make slabs_node() work even for !CONFIG_SLUB_DEBUG. The commit 0f389ec63077 ("slub: No need for per node slab counters if !SLUB_DEBUG") had put the per node slab counter under CONFIG_SLUB_DEBUG because it was only read through sysfs API and the sysfs API was disabled on !CONFIG_SLUB_DEBUG. However the users of the per node slab counter assumed that it will work in the absence of CONFIG_SLUB_DEBUG. So, make the counter work for !CONFIG_SLUB_DEBUG. Please note that f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") exposed this issue but it is present even before. [1] http://lkml.kernel.org/r/CAHmME9rtoPwxUSnktxzKso14iuVCWT7BE_-_8PAC=pGw1iJnQ… Link: http://lkml.kernel.org/r/20180620224147.23777-1-shakeelb@google.com Fixes: f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") Signed-off-by: Shakeel Butt <shakeelb(a)google.com> Suggested-by: David Rientjes <rientjes(a)google.com> Reported-by: Jason A . Donenfeld <Jason(a)zx2c4.com> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/slab.h | 2 - mm/slub.c | 80 ++++++++++++++++++++++++---------------------------- 2 files changed, 38 insertions(+), 44 deletions(-) diff -puN mm/slab.h~slub-track-number-of-slabs-irrespective-of-config_slub_debug mm/slab.h --- a/mm/slab.h~slub-track-number-of-slabs-irrespective-of-config_slub_debug +++ a/mm/slab.h @@ -473,8 +473,8 @@ struct kmem_cache_node { #ifdef CONFIG_SLUB unsigned long nr_partial; struct list_head partial; -#ifdef CONFIG_SLUB_DEBUG atomic_long_t nr_slabs; +#ifdef CONFIG_SLUB_DEBUG atomic_long_t total_objects; struct list_head full; #endif diff -puN mm/slub.c~slub-track-number-of-slabs-irrespective-of-config_slub_debug mm/slub.c --- a/mm/slub.c~slub-track-number-of-slabs-irrespective-of-config_slub_debug +++ a/mm/slub.c @@ -1030,42 +1030,6 @@ static void remove_full(struct kmem_cach list_del(&page->lru); } -/* Tracking of the number of slabs for debugging purposes */ -static inline unsigned long slabs_node(struct kmem_cache *s, int node) -{ - struct kmem_cache_node *n = get_node(s, node); - - return atomic_long_read(&n->nr_slabs); -} - -static inline unsigned long node_nr_slabs(struct kmem_cache_node *n) -{ - return atomic_long_read(&n->nr_slabs); -} - -static inline void inc_slabs_node(struct kmem_cache *s, int node, int objects) -{ - struct kmem_cache_node *n = get_node(s, node); - - /* - * May be called early in order to allocate a slab for the - * kmem_cache_node structure. Solve the chicken-egg - * dilemma by deferring the increment of the count during - * bootstrap (see early_kmem_cache_node_alloc). - */ - if (likely(n)) { - atomic_long_inc(&n->nr_slabs); - atomic_long_add(objects, &n->total_objects); - } -} -static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) -{ - struct kmem_cache_node *n = get_node(s, node); - - atomic_long_dec(&n->nr_slabs); - atomic_long_sub(objects, &n->total_objects); -} - /* Object debug checks for alloc/free paths */ static void setup_object_debug(struct kmem_cache *s, struct page *page, void *object) @@ -1321,16 +1285,46 @@ slab_flags_t kmem_cache_flags(unsigned i #define disable_higher_order_debug 0 +#endif /* CONFIG_SLUB_DEBUG */ + static inline unsigned long slabs_node(struct kmem_cache *s, int node) - { return 0; } +{ + struct kmem_cache_node *n = get_node(s, node); + + return atomic_long_read(&n->nr_slabs); +} + static inline unsigned long node_nr_slabs(struct kmem_cache_node *n) - { return 0; } -static inline void inc_slabs_node(struct kmem_cache *s, int node, - int objects) {} -static inline void dec_slabs_node(struct kmem_cache *s, int node, - int objects) {} +{ + return atomic_long_read(&n->nr_slabs); +} -#endif /* CONFIG_SLUB_DEBUG */ +static inline void inc_slabs_node(struct kmem_cache *s, int node, int objects) +{ + struct kmem_cache_node *n = get_node(s, node); + + /* + * May be called early in order to allocate a slab for the + * kmem_cache_node structure. Solve the chicken-egg + * dilemma by deferring the increment of the count during + * bootstrap (see early_kmem_cache_node_alloc). + */ + if (likely(n)) { + atomic_long_inc(&n->nr_slabs); +#ifdef CONFIG_SLUB_DEBUG + atomic_long_add(objects, &n->total_objects); +#endif + } +} +static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) +{ + struct kmem_cache_node *n = get_node(s, node); + + atomic_long_dec(&n->nr_slabs); +#ifdef CONFIG_SLUB_DEBUG + atomic_long_sub(objects, &n->total_objects); +#endif +} /* * Hooks for other subsystems that check memory allocations. In a typical _ Patches currently in -mm which might be from shakeelb(a)google.com are slub-track-number-of-slabs-irrespective-of-config_slub_debug.patch slub-fix-__kmem_cache_empty-for-config_slub_debug.patch

7 years, 3 months

3
2
0 0

v4.14.51 build: 0 failures 0 warnings (v4.14.51)

by Build bot for Mark Brown

Tree/Branch: v4.14.51 Git describe: v4.14.51 Commit: 33445c07cd Linux 4.14.51 Build Time: 98 min 40 sec Passed: 11 / 11 (100.00 %) Failed: 0 / 11 ( 0.00 %) Errors: 0 Warnings: 0 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): ------------------------------------------------------------------------------- =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig x86_64-allmodconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

7 years, 3 months

1
0
0 0

[to-be-updated] slub-fix-__kmem_cache_empty-for-config_slub_debug.patch removed from -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: slub: fix __kmem_cache_empty for !CONFIG_SLUB_DEBUG has been removed from the -mm tree. Its filename was slub-fix-__kmem_cache_empty-for-config_slub_debug.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Shakeel Butt <shakeelb(a)google.com> Subject: slub: fix __kmem_cache_empty for !CONFIG_SLUB_DEBUG f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") causes crashes when using slub, as described at http://lkml.kernel.org/r/CAHmME9rtoPwxUSnktxzKso14iuVCWT7BE_-_8PAC=pGw1iJnQ… For !CONFIG_SLUB_DEBUG, SLUB does not maintain the number of slabs allocated per node for a kmem_cache. Thus, slabs_node() in __kmem_cache_empty() will always return 0. So, in such situation, it is required to check per-cpu slabs to make sure if a kmem_cache is empty or not. Please note that __kmem_cache_shutdown() and __kmem_cache_shrink() are not affected by !CONFIG_SLUB_DEBUG as they call flush_all() to clear per-cpu slabs. Link: http://lkml.kernel.org/r/20180619213352.71740-1-shakeelb@google.com Link: http://lkml.kernel.org/r/CAHmME9rtoPwxUSnktxzKso14iuVCWT7BE_-_8PAC=pGw1iJnQ… Fixes: f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") Signed-off-by: Shakeel Butt <shakeelb(a)google.com> Reported-by: Jason A. Donenfeld <Jason(a)zx2c4.com> Tested-by: Jason A. Donenfeld <Jason(a)zx2c4.com> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: David Rientjes <rientjes(a)google.com> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/slub.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff -puN mm/slub.c~slub-fix-__kmem_cache_empty-for-config_slub_debug mm/slub.c --- a/mm/slub.c~slub-fix-__kmem_cache_empty-for-config_slub_debug +++ a/mm/slub.c @@ -3673,9 +3673,23 @@ static void free_partial(struct kmem_cac bool __kmem_cache_empty(struct kmem_cache *s) { - int node; + int cpu, node; struct kmem_cache_node *n; + /* + * slabs_node will always be 0 for !CONFIG_SLUB_DEBUG. So, manually + * check slabs for all cpus. + */ + if (!IS_ENABLED(CONFIG_SLUB_DEBUG)) { + for_each_online_cpu(cpu) { + struct kmem_cache_cpu *c; + + c = per_cpu_ptr(s->cpu_slab, cpu); + if (c->page || slub_percpu_partial(c)) + return false; + } + } + for_each_kmem_cache_node(s, node, n) if (n->nr_partial || slabs_node(s, node)) return false; _ Patches currently in -mm which might be from shakeelb(a)google.com are slub-track-number-of-slabs-irrespective-of-config_slub_debug.patch

7 years, 3 months

1
0
0 0

[PATCH] slub: fix __kmem_cache_empty for !CONFIG_SLUB_DEBUG

by Shakeel Butt

For !CONFIG_SLUB_DEBUG, SLUB does not maintain the number of slabs allocated per node for a kmem_cache. Thus, slabs_node() in __kmem_cache_empty() will always return 0. So, in such situation, it is required to check per-cpu slabs to make sure if a kmem_cache is empty or not. Please note that __kmem_cache_shutdown() and __kmem_cache_shrink() are not affected by !CONFIG_SLUB_DEBUG as they call flush_all() to clear per-cpu slabs. Fixes: f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") Signed-off-by: Shakeel Butt <shakeelb(a)google.com> Reported-by: Jason A . Donenfeld <Jason(a)zx2c4.com> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: David Rientjes <rientjes(a)google.com> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: <stable(a)vger.kernel.org> --- mm/slub.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/mm/slub.c b/mm/slub.c index a3b8467c14af..731c02b371ae 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3673,9 +3673,23 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n) bool __kmem_cache_empty(struct kmem_cache *s) { - int node; + int cpu, node; struct kmem_cache_node *n; + /* + * slabs_node will always be 0 for !CONFIG_SLUB_DEBUG. So, manually + * check slabs for all cpus. + */ + if (!IS_ENABLED(CONFIG_SLUB_DEBUG)) { + for_each_online_cpu(cpu) { + struct kmem_cache_cpu *c; + + c = per_cpu_ptr(s->cpu_slab, cpu); + if (c->page || slub_percpu_partial(c)) + return false; + } + } + for_each_kmem_cache_node(s, node, n) if (n->nr_partial || slabs_node(s, node)) return false; -- 2.18.0.rc1.244.gcf134e6275-goog

7 years, 3 months

5
7
0 0

[PATCH] MIPS: Always use -march=<arch>, not -<arch> shortcuts

by Paul Burton

The VDSO Makefile filters CFLAGS to select a subset which it uses whilst building the VDSO ELF. One of the flags it allows through is the -march= flag that selects the architecture/ISA to target. Unfortunately in cases where CONFIG_CPU_MIPS32_R{1,2}=y and the toolchain defaults to building for MIPS64, the main MIPS Makefile ends up using the short-form -<arch> flags in cflags-y. This is because the calls to cc-option always fail to use the long-form -march=<arch> flag due to the lack of an -mabi=<abi> flag in KBUILD_CFLAGS at the point where the cc-option function is executed. The resulting GCC invocation is something like: $ mips64-linux-gcc -Werror -march=mips32r2 -c -x c /dev/null -o tmp cc1: error: '-march=mips32r2' is not compatible with the selected ABI These short-form -<arch> flags are dropped by the VDSO Makefile's filtering, and so we attempt to build the VDSO without specifying any architecture. This results in an attempt to build the VDSO using whatever the compiler's default architecture is, regardless of whether that is suitable for the kernel configuration. One encountered build failure resulting from this mismatch is a rejection of the sync instruction if the kernel is configured for a MIPS32 or MIPS64 r1 or r2 target but the toolchain defaults to an older architecture revision such as MIPS1 which did not include the sync instruction: CC arch/mips/vdso/gettimeofday.o /tmp/ccGQKoOj.s: Assembler messages: /tmp/ccGQKoOj.s:273: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:329: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:520: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:714: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1009: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1066: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1114: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1279: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1334: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1374: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1459: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1514: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:1814: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:2002: Error: opcode not supported on this processor: mips1 (mips1) `sync' /tmp/ccGQKoOj.s:2066: Error: opcode not supported on this processor: mips1 (mips1) `sync' make[2]: *** [scripts/Makefile.build:318: arch/mips/vdso/gettimeofday.o] Error 1 make[1]: *** [scripts/Makefile.build:558: arch/mips/vdso] Error 2 make[1]: *** Waiting for unfinished jobs.... This can be reproduced for example by attempting to build pistachio_defconfig using Arnd's GCC 8.1.0 mips64 toolchain from kernel.org: https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/… Resolve this problem by using the long-form -march=<arch> in all cases, which makes it through the arch/mips/vdso/Makefile's filtering & is thus consistently used to build both the kernel proper & the VDSO. The use of cc-option to prefer the long-form & fall back to the short-form flags makes no sense since the short-form is just an abbreviation for the also-supported long-form in all GCC versions that we support building with. This means there is no case in which we have to use the short-form -<arch> flags, so we can simply remove them. The manual redefinition of _MIPS_ISA is removed naturally along with the use of the short-form flags that it accompanied, and whilst here we remove the separate assembler ISA selection. I suspect that both of these were only required due to the mips32 vs mips2 mismatch that was introduced by commit 59b3e8e9aac6 ("[MIPS] Makefile crapectomy.") and fixed but not cleaned up by commit 9200c0b2a07c ("[MIPS] Fix Makefile bugs for MIPS32/MIPS64 R1 and R2."). I've marked this for backport as far as v4.4 where the MIPS VDSO was introduced. In earlier kernels there should be no ill effect to using the short-form flags. Signed-off-by: Paul Burton <paul.burton(a)mips.com> Cc: James Hogan <jhogan(a)kernel.org> Cc: Ralf Baechle <ralf(a)linux-mips.org> Cc: linux-mips(a)linux-mips.org Cc: stable(a)vger.kernel.org # v4.4+ --- arch/mips/Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index e2122cca4ae2..1e98d22ec119 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -155,15 +155,11 @@ cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap -cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ - -Wa,-mips32 -Wa,--trap -cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ - -Wa,-mips32r2 -Wa,--trap +cflags-$(CONFIG_CPU_MIPS32_R1) += -march=mips32 -Wa,--trap +cflags-$(CONFIG_CPU_MIPS32_R2) += -march=mips32r2 -Wa,--trap cflags-$(CONFIG_CPU_MIPS32_R6) += -march=mips32r6 -Wa,--trap -modd-spreg -cflags-$(CONFIG_CPU_MIPS64_R1) += $(call cc-option,-march=mips64,-mips64 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) \ - -Wa,-mips64 -Wa,--trap -cflags-$(CONFIG_CPU_MIPS64_R2) += $(call cc-option,-march=mips64r2,-mips64r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) \ - -Wa,-mips64r2 -Wa,--trap +cflags-$(CONFIG_CPU_MIPS64_R1) += -march=mips64 -Wa,--trap +cflags-$(CONFIG_CPU_MIPS64_R2) += -march=mips64r2 -Wa,--trap cflags-$(CONFIG_CPU_MIPS64_R6) += -march=mips64r6 -Wa,--trap cflags-$(CONFIG_CPU_R5000) += -march=r5000 -Wa,--trap cflags-$(CONFIG_CPU_R5432) += $(call cc-option,-march=r5400,-march=r5000) \ -- 2.17.1

7 years, 3 months

2
1
0 0

Linux 4.14.51

by Greg KH

I'm announcing the release of the 4.14.51 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/devicetree/bindings/display/panel/panel-common.txt | 2 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 6 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt | 2 Documentation/devicetree/bindings/serial/renesas,sci-serial.txt | 2 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 Makefile | 2 arch/arm/boot/compressed/head.S | 20 arch/arm/boot/dts/bcm-cygnus.dtsi | 2 arch/arm/boot/dts/da850.dtsi | 2 arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 arch/arm/kernel/machine_kexec.c | 34 - arch/arm/mach-davinci/board-da830-evm.c | 9 arch/arm/mach-davinci/board-da850-evm.c | 9 arch/arm/mach-davinci/board-dm355-evm.c | 6 arch/arm/mach-davinci/board-dm646x-evm.c | 5 arch/arm/mach-davinci/board-omapl138-hawk.c | 10 arch/arm/mach-davinci/dm646x.c | 3 arch/arm/mach-keystone/pm_domain.c | 1 arch/arm/mach-omap1/ams-delta-fiq.c | 28 arch/arm/mach-omap2/powerdomain.c | 4 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 arch/arm64/include/asm/cputype.h | 6 arch/arm64/kernel/ptrace.c | 20 arch/hexagon/include/asm/io.h | 6 arch/hexagon/lib/checksum.c | 1 arch/mips/boot/dts/img/boston.dts | 6 arch/mips/include/asm/io.h | 4 arch/parisc/kernel/drivers.c | 7 arch/parisc/kernel/smp.c | 3 arch/parisc/kernel/time.c | 2 arch/powerpc/platforms/powernv/memtrace.c | 17 arch/sh/kernel/cpu/sh2/probe.c | 4 arch/x86/events/intel/core.c | 9 arch/x86/include/asm/insn.h | 18 arch/x86/kernel/cpu/intel.c | 3 arch/x86/kernel/kexec-bzimage64.c | 5 arch/x86/kernel/kprobes/core.c | 4 arch/x86/kernel/uprobes.c | 4 arch/x86/kvm/hyperv.c | 2 arch/x86/kvm/svm.c | 5 arch/x86/kvm/vmx.c | 15 arch/x86/kvm/x86.c | 19 arch/x86/net/bpf_jit_comp.c | 4 arch/x86/xen/enlighten_hvm.c | 13 block/blk-cgroup.c | 22 block/blk-mq.c | 19 block/blk-mq.h | 4 block/genhd.c | 12 block/partition-generic.c | 10 drivers/acpi/acpi_watchdog.c | 59 +- drivers/acpi/sleep.c | 13 drivers/ata/ahci.c | 6 drivers/ata/ahci.h | 7 drivers/ata/ahci_mvebu.c | 56 + drivers/ata/ahci_qoriq.c | 2 drivers/ata/ahci_xgene.c | 4 drivers/ata/libahci.c | 20 drivers/ata/libata-eh.c | 4 drivers/ata/sata_highbank.c | 2 drivers/char/agp/uninorth-agp.c | 4 drivers/clk/clk-mux.c | 10 drivers/clk/clk.c | 7 drivers/clk/imx/clk-imx6ul.c | 2 drivers/clocksource/timer-imx-tpm.c | 8 drivers/firmware/efi/libstub/arm64-stub.c | 10 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 drivers/gpu/drm/drm_dumb_buffers.c | 7 drivers/gpu/drm/msm/dsi/dsi_host.c | 2 drivers/gpu/drm/msm/msm_fbdev.c | 11 drivers/gpu/drm/msm/msm_gem.c | 20 drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 drivers/gpu/drm/omapdrm/omap_connector.c | 10 drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 drivers/gpu/drm/omapdrm/tcm-sita.c | 2 drivers/hid/Kconfig | 7 drivers/hid/hid-ids.h | 8 drivers/hid/hid-lenovo.c | 36 + drivers/hid/intel-ish-hid/ishtp/bus.c | 2 drivers/hid/wacom_sys.c | 4 drivers/i2c/busses/i2c-pmcmsp.c | 4 drivers/i2c/busses/i2c-sprd.c | 22 drivers/i2c/busses/i2c-viperboard.c | 2 drivers/infiniband/Kconfig | 5 drivers/infiniband/core/cma.c | 60 +- drivers/infiniband/core/iwpm_util.c | 5 drivers/infiniband/core/mad.c | 4 drivers/infiniband/core/uverbs_ioctl.c | 9 drivers/infiniband/hw/hfi1/affinity.c | 11 drivers/infiniband/hw/hfi1/init.c | 4 drivers/infiniband/sw/rxe/rxe_opcode.c | 2 drivers/infiniband/sw/rxe/rxe_req.c | 1 drivers/infiniband/sw/rxe/rxe_resp.c | 6 drivers/infiniband/ulp/srp/Kconfig | 2 drivers/infiniband/ulp/srpt/Kconfig | 2 drivers/input/rmi4/rmi_spi.c | 7 drivers/input/touchscreen/atmel_mxt_ts.c | 186 +++--- drivers/iommu/dmar.c | 2 drivers/net/can/dev.c | 2 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 drivers/net/ethernet/hisilicon/hns/hnae.h | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 3 drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 drivers/net/ethernet/qlogic/qede/qede_rdma.c | 2 drivers/net/phy/marvell.c | 9 drivers/nvme/host/Kconfig | 2 drivers/nvme/host/core.c | 1 drivers/nvme/host/fabrics.c | 6 drivers/nvme/target/Kconfig | 2 drivers/pci/dwc/pcie-kirin.c | 2 drivers/remoteproc/qcom_q6v5_pil.c | 2 drivers/rpmsg/rpmsg_char.c | 2 drivers/s390/net/smsgiucv.c | 2 drivers/scsi/isci/port_config.c | 3 drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 drivers/scsi/scsi_transport_iscsi.c | 29 - drivers/scsi/storvsc_drv.c | 7 drivers/scsi/vmw_pvscsi.c | 2 drivers/soc/bcm/raspberrypi-power.c | 2 drivers/spi/spi-bcm2835aux.c | 5 drivers/spi/spi-cadence.c | 8 drivers/spi/spi-sh-msiof.c | 1 drivers/target/target_core_pscsi.c | 2 drivers/tee/tee_core.c | 11 drivers/thermal/int340x_thermal/int3403_thermal.c | 3 drivers/usb/musb/musb_host.c | 5 drivers/usb/musb/musb_host.h | 7 drivers/usb/musb/musb_virthub.c | 25 drivers/usb/typec/ucsi/Makefile | 2 drivers/xen/xenbus/xenbus_dev_frontend.c | 3 fs/afs/rxrpc.c | 7 fs/btrfs/scrub.c | 44 + fs/cifs/smb2ops.c | 6 fs/ecryptfs/crypto.c | 41 - fs/ecryptfs/file.c | 21 fs/isofs/inode.c | 3 fs/namespace.c | 2 fs/notify/fsnotify.c | 25 fs/ocfs2/refcounttree.c | 14 fs/proc/base.c | 6 fs/proc/kcore.c | 23 fs/proc/task_mmu.c | 6 include/linux/clk-provider.h | 3 include/linux/ethtool.h | 2 include/linux/genhd.h | 4 include/linux/kvm_host.h | 8 include/linux/mtd/map.h | 2 include/linux/percpu-rwsem.h | 6 include/linux/rwsem.h | 6 include/linux/sched.h | 50 + include/linux/sched/signal.h | 2 include/linux/stringhash.h | 4 include/soc/bcm2835/raspberrypi-firmware.h | 4 init/main.c | 7 kernel/kthread.c | 7 kernel/locking/rwsem-xadd.c | 19 kernel/locking/rwsem.c | 2 kernel/locking/rwsem.h | 30 - kernel/module.c | 5 kernel/sched/core.c | 17 kernel/sched/deadline.c | 4 kernel/sched/rt.c | 2 kernel/sched/sched.h | 5 kernel/signal.c | 17 kernel/stop_machine.c | 19 mm/memcontrol.c | 2 net/ipv4/tcp_input.c | 2 net/ipv6/netfilter/Kconfig | 55 - net/mac80211/agg-tx.c | 4 net/mac80211/mlme.c | 25 net/mac80211/tx.c | 3 net/netfilter/nf_tables_api.c | 2 net/rds/ib_cm.c | 3 net/rxrpc/af_rxrpc.c | 2 net/rxrpc/local_object.c | 57 +- net/sched/act_skbedit.c | 3 net/smc/af_smc.c | 6 net/tipc/monitor.c | 2 net/tipc/node.c | 28 sound/soc/codecs/msm8916-wcd-analog.c | 9 sound/soc/codecs/rt5514.c | 3 sound/soc/soc-topology.c | 6 tools/net/bpf_dbg.c | 7 tools/objtool/arch/x86/include/asm/insn.h | 18 tools/perf/util/symbol.c | 8 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc | 44 + tools/testing/selftests/x86/Makefile | 2 tools/testing/selftests/x86/mov_ss_trap.c | 285 ++++++++++ tools/testing/selftests/x86/mpx-mini-test.c | 7 tools/testing/selftests/x86/protection_keys.c | 254 ++++++-- virt/kvm/arm/vgic/vgic-mmio-v2.c | 5 194 files changed, 1863 insertions(+), 664 deletions(-) Adam Ford (2): ARM: dts: logicpd-som-lv: Fix WL127x Startup Issues ARM: dts: logicpd-som-lv: Fix Audio Mute Alexey Dobriyan (1): proc: revalidate kernel thread inodes to root:root Amir Goldstein (2): fsnotify: fix ignore mask logic in send_to_group() <linux/stringhash.h>: fix end_name_hash() for 64bit long Andres Rodriguez (1): drm/amdkfd: fix clock counter retrieval for node without GPU Andy Lutomirski (1): x86/selftests: Add mov_to_ss test Anson Huang (1): clocksource/drivers/imx-tpm: Correct some registers operation flow Arnaldo Carvalho de Melo (1): perf report: Fix switching to another perf.data file Arnd Bergmann (2): hexagon: add memset_io() helper hexagon: export csum_partial_copy_nocheck Arvind Yadav (2): HID: wacom: Release device resource data obtained by devres_alloc() HID: intel-ish-hid: use put_device() instead of kfree() Ashish Samant (1): ocfs2: take inode cluster lock before moving reflinked inode from orphan dir Balbir Singh (1): powerpc/powernv/memtrace: Let the arch hotunplug code flush cache Baolin Wang (3): parisc: time: Convert read_persistent_clock() to read_persistent_clock64() i2c: sprd: Prevent i2c accesses after suspend is called i2c: sprd: Fix the i2c count issue Ben Hutchings (2): drm/msm: Fix possible null dereference on failure of get_pages() mtd: Fix comparison in map_word_andequal() Bhadram Varka (1): arm64: tegra: Make BCM89610 PHY interrupt as active low Changbin Du (1): iommu/vt-d: fix shift-out-of-bounds in bug checking Chen Yu (1): ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016) Chengguang Xu (2): isofs: fix potential memory leak in mount option parsing nvme: fix potential memory leak in option parsing Chris Leech (1): scsi: iscsi: respond to netlink with unicast when appropriate Christophe JAILLET (1): Input: synaptics-rmi4 - fix an unchecked out of memory error path Clément Péron (1): ARM: dts: cygnus: fix irq type for arm global timer Colin Ian King (2): scsi: isci: Fix infinite loop in while loop RDMA/iwpm: fix memory leak on map_info Dag Moxnes (1): rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp Dan Carpenter (2): drm/omap: silence unititialized variable warning drm/dumb-buffers: Integer overflow in drm_mode_create_ioctl() Daniel Borkmann (1): bpf, x64: fix memleak when not converging after image Daniel Glöckner (1): usb: musb: fix remote wakeup racing with suspend Dave Hansen (10): x86/pkeys/selftests: Give better unexpected fault error messages x86/pkeys/selftests: Stop using assert() x86/pkeys/selftests: Remove dead debugging code, fix dprint_in_signal x86/pkeys/selftests: Allow faults on unknown keys x86/pkeys/selftests: Factor out "instruction page" x86/pkeys/selftests: Add PROT_EXEC test x86/pkeys/selftests: Fix pkey exhaustion test off-by-one x86/pkeys/selftests: Fix pointer math x86/pkeys/selftests: Save off 'prot' for allocations x86/pkeys/selftests: Add a test for pkey 0 Dave Young (1): kexec_file: do not add extra alignment to efi memmap David Gilhooley (1): arm64: Add MIDR encoding for NVIDIA CPUs David Howells (4): vfs: Undo an overly zealous MS_RDONLY -> SB_RDONLY conversion rxrpc: Fix error reception on AF_INET6 sockets rxrpc: Fix the min security level for kernel calls afs: Fix the non-encryption of calls Emil Tantilov (1): ixgbe: return error on unsupported SFP module when resetting Emil Velikov (1): drm/msm: don't deref error pointer in the msm_fbdev_create error path Eric Dumazet (1): tcp: do not overshoot window_clamp in tcp_rcv_space_adjust() Etienne Carriere (1): tee: check shm references are consistent in offset/size Evan Wang (2): libahci: Allow drivers to override stop_engine ata: ahci: mvebu: override ahci_stop_engine for mvebu AHCI Florian Fainelli (2): soc: bcm: raspberrypi-power: Fix use of __packed net: ethtool: Add missing kernel doc for FEC parameters Geert Uytterhoeven (3): soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure dt-bindings: meson-uart: DT fix s/clocks-names/clock-names/ dt-bindings: panel: lvds: Fix path to display timing bindings Greg Kroah-Hartman (1): Linux 4.14.51 Greg Thelen (5): nvme: depend on INFINIBAND_ADDR_TRANS nvmet-rdma: depend on INFINIBAND_ADDR_TRANS ib_srpt: depend on INFINIBAND_ADDR_TRANS ib_srp: depend on INFINIBAND_ADDR_TRANS IB: make INFINIBAND_ADDR_TRANS configurable Hans de Goede (1): thermal: int3403_thermal: Fix NULL pointer deref on module load / probe Helge Deller (2): parisc: drivers.c: Fix section mismatches parisc: Move setup_profiling_timer() out of init section Huang Ying (1): mm, pagemap: fix swap offset value for PMD migration entry Håkon Bugge (1): IB/core: Make ib_mad_client_id atomic Igor Russkikh (1): net: aquantia: driver should correctly declare vlan_features bits Ilan Peer (1): mac80211: Adjust SAE authentication timeout Ingo Molnar (3): objtool, kprobes/x86: Sync the latest <asm/insn.h> header with tools/objtool/arch/x86/include/asm/insn.h x86/pkeys/selftests: Adjust the self-test to fresh distros that export the pkeys ABI x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI Jacopo Mondi (2): dt-bindings: serial: sh-sci: Add support for r8a77965 (H)SCIF dt-bindings: dmaengine: rcar-dmac: document R8A77965 support Jakob Unterwurzacher (1): can: dev: increase bus-off message severity Jakub Kicinski (1): nfp: ignore signals when communicating with management FW Janusz Krzysztofik (1): ARM: OMAP1: ams-delta: fix deferred_fiq handler Jeffrey Hugo (1): init: fix false positives in W+X checking Jerome Brunet (1): clk: honor CLK_MUX_ROUND_CLOSEST in generic clk mux Jianchao Wang (1): IB/rxe: add RXE_START_MASK for rxe_opcode IB_OPCODE_RC_SEND_ONLY_INV Jiang Biao (2): blkcg: don't hold blkcg lock when deactivating policy blkcg: init root blkcg_gq under lock Jim Gill (1): scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts Jingju Hou (1): net: phy: marvell: clear wol event before setting it John Fastabend (1): bpf: fix uninitialized variable in bpf tools Jon Maloy (1): tipc: fix bug in function tipc_nl_node_dump_monitor Kan Liang (1): perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1 Keith Busch (1): nvme: Set integrity flag for user passthrough commands Krish Sadhukhan (1): x86: Add check for APIC access address for vmentry of L2 guests Laura Abbott (1): proc/kcore: don't bounds check against address 0 Liam Girdwood (1): ASoC: topology: Check widget kcontrols before deref. Liu Bo (2): Btrfs: fix scrub to repair raid6 corruption Btrfs: make raid6 rebuild retry more Loic Poulain (1): PCI: kirin: Fix reset gpio name Long Li (1): scsi: storvsc: Set up correct queue depth values for IDE devices Lukasz Majewski (1): doc: Add vendor prefix for Kieback & Peter GmbH Marian Rotariu (1): x86: Delay skip of emulated hypercall instruction Mark Rutland (4): arm64: ptrace: remove addr_limit manipulation arm64: fix possible spectre-v1 in ptrace_hbp_get_event() KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_mmio_read_apr() efi/libstub/arm64: Handle randomized TEXT_OFFSET Martin Schwidefsky (1): s390/smsgiucv: disable SMSG on module unload Masami Hiramatsu (3): selftests: ftrace: Add a testcase for multiple actions on trigger kprobes/x86: Prohibit probing on exception masking instructions uprobes/x86: Prohibit probing on MOV SS instruction Matan Barak (1): IB/uverbs: Fix validating mandatory attributes Matheus Castello (1): dt-bindings: pinctrl: sunxi: Fix reference to driver Mathieu Malaterre (4): driver core: add __printf verification to __ata_ehi_pushv_desc agp: uninorth: make two functions static sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h sched/deadline: Make the grub_reclaim() function static Matt Redfearn (1): MIPS: dts: Boston: Fix PCI bus dtc warnings: Michael J. Ruhl (1): IB/hfi1 Use correct type for num_user_context Michal Kalderon (2): qed: Fix l2 initializations over iWARP personality qede: Fix gfp flags sent to rdma event node allocation Mika Westerberg (1): ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 Minchan Kim (1): mm: memcg: add __GFP_NOWARN in __memcg_schedule_kmem_cache_create() Ming Lei (1): scsi: target: fix crash with iscsi target and dvd Nick Dyer (1): Input: atmel_mxt_ts - fix the firmware update Omar Sandoval (1): blk-mq: fix sysfs inflight counter Pablo Neira Ayuso (1): netfilter: nf_tables: NAT chain and extensions require NF_TABLES Parav Pandit (2): RDMA/cma: Fix use after destroy access to net namespace for IPoIB RDMA/cma: Do not query GID during QP state transition to RTR Paulo Alcantara (1): cifs: smb2ops: Fix listxattr() when there are no EAs Peter Rosin (3): i2c: pmcmsp: return message count on master_xfer success i2c: pmcmsp: fix error return from master_xfer i2c: viperboard: return message count on master_xfer success Peter Zijlstra (3): stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock kthread, sched/wait: Fix kthread_parkme() wait-loop sched/core: Introduce set_special_state() Ramon Fried (1): rpmsg: added MODULE_ALIAS for rpmsg_char Rich Felker (1): sh: fix build failure for J2 cpu with SMP disabled Rob Herring (1): spi: bcm2835aux: ensure interrupts are enabled for shared handler Roman Mashak (1): net sched actions: fix invalid pointer dereferencing if skbedit flags missing Russell King (2): ARM: keystone: fix platform_domain_notifier array overrun ARM: kexec: fix kdump register saving on panic() Sara Sharon (1): mac80211: use timeout from the AddBA response instead of the request Sasha Levin (1): Revert "Btrfs: fix scrub to repair raid6 corruption" Sebastian Sanchez (1): IB/hfi1: Fix memory leak in exception path in get_irq_affinity() Sekhar Nori (8): ARM: dts: da850: fix W=1 warnings with pinmux node ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup ARM: davinci: board-dm355-evm: fix broken networking ARM: davinci: dm646x: fix timer interrupt generation ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF ARM: davinci: board-dm646x-evm: set VPIF capture card name Simon Gaiser (1): xen: xenbus_dev_frontend: Really return response string Sinan Kaya (2): MIPS: io: Prevent compiler reordering writeX() MIPS: io: Add barrier after register read in readX() Srinivas Kandagatla (1): ASoC: msm8916-wcd-analog: use threaded context for mbhc events Stefan Agner (2): drm/msm/dsi: use correct enum in dsi_get_cmd_fmt clk: imx6ull: use OSC clock during AXI rate change Stefan Raspl (1): smc: fix sendpage() call Taehee Yoo (1): netfilter: nf_tables: fix out-of-bounds in nft_chain_commit_update Tero Kristo (1): ARM: OMAP2+: powerdomain: use raw_smp_processor_id() for trace Tobias Jordan (1): remoteproc: qcom: Fix potential device node leaks Tobias Regnery (1): usb: typec: ucsi: fix tracepoint related build error Tomi Valkeinen (4): drm/omap: fix uninitialized ret variable drm/omap: fix possible NULL ref issue in tiler_reserve_2d drm/omap: check return value from soc_device_match drm/omap: handle alloc failures in omap_connector Tung Nguyen (1): tipc: fix infinite loop when dumping link monitor summary Tyler Hicks (1): eCryptfs: don't pass up plaintext names when using filename encryption Vinson Lee (1): scsi: megaraid_sas: Do not log an error if FW successfully initializes. Vladimir Zapolskiy (1): spi: sh-msiof: Fix bit field overflow writes to TSCR/RSCR Waiman Long (2): locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag locking/percpu-rwsem: Annotate rwsem ownership transfer by setting RWSEM_OWNER_UNKNOWN Wanpeng Li (1): KVM: Extend MAX_IRQ_ROUTES to 4096 for all archs Yan Wang (1): ASoC: topology: Fix bugs of freeing soc topology Ying Xue (1): tipc: eliminate KMSAN uninit-value in strcmp complaint Zhu Yanjun (1): IB/rxe: avoid double kfree_skb dann frazier (1): net: hns: Avoid action name truncation hu huajun (1): KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update jacek.tomaka(a)poczta.fm (1): x86/cpu/intel: Add missing TLB cpuid values oder_chiou(a)realtek.com (1): ASoC: rt5514: Add the missing register in the readable table pgzh (1): HID: lenovo: Add support for IBM/Lenovo Scrollpoint mice sxauwsk (1): spi: cadence: Add usleep_range() for cdns_spi_fill_tx_fifo() van der Linden, Frank (1): x86/xen: Reset VCPU0 info pointer after shared_info remap Łukasz Stelmach (2): ARM: 8753/1: decompressor: add a missing parameter to the addruart macro ARM: 8758/1: decompressor: restore r1 and r2 just before jumping to the kernel

7 years, 3 months

1
1
0 0

Linux 4.16.17

by Greg KH

I'm announcing the release of the 4.16.17 kernel. All users of the 4.16 kernel series must upgrade. The updated 4.16.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.16.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/devicetree/bindings/display/panel/panel-common.txt | 2 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 Documentation/devicetree/bindings/net/renesas,ravb.txt | 1 Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 6 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt | 2 Documentation/devicetree/bindings/serial/mvebu-uart.txt | 2 Documentation/devicetree/bindings/serial/renesas,sci-serial.txt | 2 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 Makefile | 2 arch/arm/boot/compressed/Makefile | 8 arch/arm/boot/compressed/head.S | 20 arch/arm/boot/dts/bcm-cygnus.dtsi | 2 arch/arm/boot/dts/da850.dtsi | 2 arch/arm/boot/dts/dm8148-evm.dts | 2 arch/arm/boot/dts/dm8148-t410.dts | 2 arch/arm/boot/dts/dm8168-evm.dts | 2 arch/arm/boot/dts/dra62x-j5eco-evm.dts | 2 arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 arch/arm/boot/dts/omap4.dtsi | 8 arch/arm/include/uapi/asm/siginfo.h | 13 arch/arm/kernel/machine_kexec.c | 34 - arch/arm/mach-davinci/board-da830-evm.c | 9 arch/arm/mach-davinci/board-da850-evm.c | 9 arch/arm/mach-davinci/board-dm355-evm.c | 15 arch/arm/mach-davinci/board-dm644x-evm.c | 10 arch/arm/mach-davinci/board-dm646x-evm.c | 5 arch/arm/mach-davinci/board-omapl138-hawk.c | 10 arch/arm/mach-davinci/dm646x.c | 3 arch/arm/mach-keystone/pm_domain.c | 1 arch/arm/mach-omap1/ams-delta-fiq.c | 28 arch/arm/mach-omap2/powerdomain.c | 4 arch/arm/vfp/vfpmodule.c | 2 arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 12 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 4 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 61 + arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 17 arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi | 80 +- arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 2 arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 2 arch/arm64/include/asm/cputype.h | 6 arch/arm64/kernel/ptrace.c | 20 arch/arm64/kernel/traps.c | 3 arch/arm64/mm/kasan_init.c | 4 arch/hexagon/include/asm/io.h | 6 arch/hexagon/lib/checksum.c | 1 arch/mips/boot/dts/img/boston.dts | 6 arch/mips/include/asm/io.h | 4 arch/parisc/kernel/drivers.c | 7 arch/parisc/kernel/smp.c | 3 arch/parisc/kernel/time.c | 2 arch/powerpc/include/asm/topology.h | 13 arch/powerpc/kernel/setup_64.c | 11 arch/powerpc/kvm/booke.c | 7 arch/powerpc/platforms/cell/spufs/sched.c | 2 arch/powerpc/platforms/powernv/memtrace.c | 17 arch/riscv/Kconfig | 4 arch/riscv/kernel/vdso/Makefile | 2 arch/sh/Kconfig | 1 arch/sh/kernel/cpu/sh2/probe.c | 4 arch/sh/kernel/setup.c | 1 arch/sh/mm/init.c | 68 -- arch/sh/mm/numa.c | 19 arch/x86/events/intel/core.c | 9 arch/x86/include/asm/insn.h | 18 arch/x86/include/asm/kvm_host.h | 1 arch/x86/kernel/cpu/intel.c | 3 arch/x86/kernel/kexec-bzimage64.c | 5 arch/x86/kernel/kprobes/core.c | 4 arch/x86/kernel/uprobes.c | 4 arch/x86/kvm/hyperv.c | 2 arch/x86/kvm/svm.c | 31 arch/x86/kvm/vmx.c | 95 +- arch/x86/kvm/x86.c | 33 - arch/x86/net/bpf_jit_comp.c | 18 arch/x86/xen/enlighten_hvm.c | 13 block/blk-cgroup.c | 22 block/blk-mq.c | 19 block/blk-mq.h | 4 block/genhd.c | 12 block/partition-generic.c | 10 drivers/acpi/acpi_watchdog.c | 59 + drivers/acpi/scan.c | 2 drivers/acpi/sleep.c | 13 drivers/ata/ahci.c | 6 drivers/ata/ahci.h | 7 drivers/ata/ahci_mvebu.c | 56 + drivers/ata/ahci_qoriq.c | 2 drivers/ata/ahci_xgene.c | 4 drivers/ata/libahci.c | 20 drivers/ata/libata-eh.c | 4 drivers/ata/sata_highbank.c | 2 drivers/char/agp/uninorth-agp.c | 4 drivers/clk/clk-mux.c | 10 drivers/clk/clk.c | 7 drivers/clk/imx/clk-imx6ul.c | 2 drivers/clocksource/timer-imx-tpm.c | 8 drivers/cpufreq/Kconfig.arm | 10 drivers/cpufreq/brcmstb-avs-cpufreq.c | 323 ---------- drivers/firmware/efi/libstub/arm64-stub.c | 10 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 drivers/gpu/drm/drm_dumb_buffers.c | 7 drivers/gpu/drm/exynos/exynos_mixer.c | 22 drivers/gpu/drm/exynos/regs-mixer.h | 1 drivers/gpu/drm/msm/dsi/dsi_host.c | 2 drivers/gpu/drm/msm/msm_fbdev.c | 11 drivers/gpu/drm/msm/msm_gem.c | 20 drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 drivers/gpu/drm/omapdrm/omap_connector.c | 10 drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 drivers/gpu/drm/omapdrm/tcm-sita.c | 2 drivers/gpu/drm/vc4/vc4_dpi.c | 25 drivers/hid/Kconfig | 7 drivers/hid/hid-ids.h | 9 drivers/hid/hid-lenovo.c | 36 + drivers/hid/i2c-hid/i2c-hid.c | 2 drivers/hid/intel-ish-hid/ishtp/bus.c | 2 drivers/hid/wacom_sys.c | 4 drivers/i2c/busses/i2c-pmcmsp.c | 4 drivers/i2c/busses/i2c-sprd.c | 22 drivers/i2c/busses/i2c-viperboard.c | 2 drivers/infiniband/Kconfig | 5 drivers/infiniband/core/cma.c | 60 + drivers/infiniband/core/iwpm_util.c | 5 drivers/infiniband/core/mad.c | 4 drivers/infiniband/core/uverbs_ioctl.c | 9 drivers/infiniband/hw/hfi1/affinity.c | 11 drivers/infiniband/hw/hfi1/init.c | 41 - drivers/infiniband/hw/hfi1/platform.c | 1 drivers/infiniband/hw/hfi1/qsfp.c | 2 drivers/infiniband/hw/hns/hns_roce_hem.c | 8 drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 11 drivers/infiniband/hw/mlx4/mr.c | 2 drivers/infiniband/hw/mlx5/main.c | 4 drivers/infiniband/sw/rxe/rxe_opcode.c | 2 drivers/infiniband/sw/rxe/rxe_req.c | 1 drivers/infiniband/sw/rxe/rxe_resp.c | 6 drivers/infiniband/ulp/srp/Kconfig | 2 drivers/infiniband/ulp/srpt/Kconfig | 2 drivers/input/rmi4/rmi_spi.c | 7 drivers/input/touchscreen/atmel_mxt_ts.c | 186 +++-- drivers/iommu/dmar.c | 2 drivers/iommu/intel_irq_remapping.c | 2 drivers/mtd/onenand/omap2.c | 105 +-- drivers/net/can/dev.c | 2 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 21 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 drivers/net/ethernet/hisilicon/hns/hnae.h | 2 drivers/net/ethernet/ibm/ibmvnic.c | 3 drivers/net/ethernet/intel/igb/igb_main.c | 17 drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 drivers/net/ethernet/marvell/mvpp2.c | 15 drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 38 + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 drivers/net/ethernet/netronome/nfp/flower/main.c | 8 drivers/net/ethernet/netronome/nfp/flower/main.h | 8 drivers/net/ethernet/netronome/nfp/nfp_app_nic.c | 2 drivers/net/ethernet/netronome/nfp/nfp_main.h | 4 drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 31 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 3 drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 drivers/net/ethernet/qlogic/qede/qede_rdma.c | 2 drivers/net/phy/broadcom.c | 10 drivers/net/phy/marvell.c | 9 drivers/net/phy/microchip.c | 178 +++++ drivers/nvme/host/Kconfig | 2 drivers/nvme/host/core.c | 32 drivers/nvme/host/fabrics.c | 6 drivers/nvme/host/multipath.c | 24 drivers/nvme/host/nvme.h | 12 drivers/nvme/target/Kconfig | 2 drivers/pci/dwc/pcie-kirin.c | 2 drivers/pinctrl/intel/pinctrl-cherryview.c | 16 drivers/pinctrl/meson/pinctrl-meson-axg.c | 2 drivers/platform/x86/Kconfig | 2 drivers/remoteproc/qcom_q6v5_pil.c | 2 drivers/reset/reset-uniphier.c | 6 drivers/rpmsg/rpmsg_char.c | 2 drivers/s390/net/qeth_core_main.c | 51 - drivers/s390/net/qeth_core_mpc.h | 12 drivers/s390/net/qeth_l2_main.c | 4 drivers/s390/net/smsgiucv.c | 2 drivers/scsi/isci/port_config.c | 3 drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 drivers/scsi/scsi_transport_iscsi.c | 29 drivers/scsi/storvsc_drv.c | 7 drivers/scsi/vmw_pvscsi.c | 2 drivers/soc/bcm/raspberrypi-power.c | 2 drivers/spi/spi-bcm2835aux.c | 5 drivers/spi/spi-cadence.c | 8 drivers/spi/spi-sh-msiof.c | 1 drivers/target/target_core_pscsi.c | 2 drivers/tee/tee_core.c | 11 drivers/thermal/int340x_thermal/int3403_thermal.c | 3 drivers/usb/musb/musb_host.c | 5 drivers/usb/musb/musb_host.h | 7 drivers/usb/musb/musb_virthub.c | 25 drivers/usb/typec/tps6598x.c | 47 + drivers/usb/typec/ucsi/Makefile | 2 drivers/xen/xenbus/xenbus_dev_frontend.c | 3 fs/afs/addr_list.c | 25 fs/afs/callback.c | 56 + fs/afs/cmservice.c | 6 fs/afs/internal.h | 7 fs/afs/rotate.c | 20 fs/afs/rxrpc.c | 7 fs/afs/server.c | 22 fs/afs/server_list.c | 7 fs/cifs/Kconfig | 2 fs/cifs/smb2ops.c | 6 fs/cifs/smb2pdu.c | 68 +- fs/cifs/transport.c | 5 fs/ecryptfs/crypto.c | 41 - fs/ecryptfs/file.c | 21 fs/isofs/inode.c | 3 fs/namespace.c | 2 fs/notify/fsnotify.c | 25 fs/ocfs2/refcounttree.c | 14 fs/proc/base.c | 6 fs/proc/kcore.c | 23 fs/proc/loadavg.c | 2 fs/proc/task_mmu.c | 6 include/linux/brcmphy.h | 1 include/linux/clk-provider.h | 3 include/linux/ethtool.h | 2 include/linux/genhd.h | 4 include/linux/kthread.h | 1 include/linux/kvm_host.h | 8 include/linux/microchipphy.h | 8 include/linux/mtd/map.h | 2 include/linux/mtd/rawnand.h | 16 include/linux/percpu-rwsem.h | 6 include/linux/rwsem.h | 6 include/linux/sched.h | 50 + include/linux/sched/signal.h | 2 include/linux/stringhash.h | 4 include/soc/bcm2835/raspberrypi-firmware.h | 4 init/main.c | 7 kernel/bpf/syscall.c | 19 kernel/kthread.c | 50 - kernel/locking/rwsem-xadd.c | 19 kernel/locking/rwsem.c | 2 kernel/locking/rwsem.h | 30 kernel/module.c | 5 kernel/sched/core.c | 49 - kernel/sched/deadline.c | 4 kernel/sched/rt.c | 2 kernel/sched/sched.h | 5 kernel/signal.c | 17 kernel/stop_machine.c | 19 lib/find_bit_benchmark.c | 7 mm/memcontrol.c | 2 net/ipv6/ip6_vti.c | 4 net/ipv6/netfilter/Kconfig | 55 - net/mac80211/agg-tx.c | 4 net/mac80211/mlme.c | 25 net/mac80211/tx.c | 3 net/netfilter/nf_tables_api.c | 2 net/rds/ib_cm.c | 3 net/rxrpc/af_rxrpc.c | 2 net/rxrpc/ar-internal.h | 1 net/rxrpc/input.c | 2 net/rxrpc/local_object.c | 57 + net/rxrpc/output.c | 11 net/rxrpc/sendmsg.c | 10 net/sched/act_skbedit.c | 3 net/smc/af_smc.c | 6 net/sunrpc/xprtrdma/fmr_ops.c | 5 net/sunrpc/xprtrdma/frwr_ops.c | 9 net/sunrpc/xprtrdma/verbs.c | 5 net/sunrpc/xprtrdma/xprt_rdma.h | 2 net/tipc/monitor.c | 2 net/tipc/node.c | 28 scripts/Makefile.gcc-plugins | 2 sound/soc/codecs/msm8916-wcd-analog.c | 9 sound/soc/codecs/rt5514.c | 3 sound/soc/intel/Kconfig | 22 sound/soc/soc-topology.c | 6 tools/bpf/bpf_dbg.c | 7 tools/objtool/arch/x86/include/asm/insn.h | 18 tools/perf/util/cs-etm.c | 24 tools/perf/util/pmu.c | 20 tools/perf/util/symbol.c | 8 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc | 44 + tools/testing/selftests/x86/Makefile | 2 tools/testing/selftests/x86/mov_ss_trap.c | 285 ++++++++ tools/testing/selftests/x86/mpx-mini-test.c | 7 tools/testing/selftests/x86/pkey-helpers.h | 20 tools/testing/selftests/x86/protection_keys.c | 254 +++++-- virt/kvm/arm/vgic/vgic-mmio-v2.c | 5 virt/kvm/arm/vgic/vgic.c | 8 302 files changed, 2996 insertions(+), 1621 deletions(-) Adam Ford (2): ARM: dts: logicpd-som-lv: Fix WL127x Startup Issues ARM: dts: logicpd-som-lv: Fix Audio Mute Alexey Dobriyan (2): proc: revalidate kernel thread inodes to root:root proc: fix /proc/loadavg regression Amir Goldstein (2): fsnotify: fix ignore mask logic in send_to_group() <linux/stringhash.h>: fix end_name_hash() for 64bit long Andre Przywara (1): KVM: arm/arm64: vgic: Kick new VCPU on interrupt migration Andres Rodriguez (1): drm/amdkfd: fix clock counter retrieval for node without GPU Andrey Grodzovsky (1): drm/amdgpu: Switch to interruptable wait to recover from ring hang. Andrzej Hajda (1): drm/exynos/mixer: fix synchronization check in interlaced mode Andy Lutomirski (1): x86/selftests: Add mov_to_ss test Anson Huang (1): clocksource/drivers/imx-tpm: Correct some registers operation flow Arnaldo Carvalho de Melo (1): perf report: Fix switching to another perf.data file Arnd Bergmann (2): hexagon: add memset_io() helper hexagon: export csum_partial_copy_nocheck Arvind Yadav (2): HID: wacom: Release device resource data obtained by devres_alloc() HID: intel-ish-hid: use put_device() instead of kfree() Ashish Samant (1): ocfs2: take inode cluster lock before moving reflinked inode from orphan dir Aurelien Jarno (1): RISC-V: build vdso-dummy.o with -no-pie Balbir Singh (1): powerpc/powernv/memtrace: Let the arch hotunplug code flush cache Baolin Wang (3): parisc: time: Convert read_persistent_clock() to read_persistent_clock64() i2c: sprd: Prevent i2c accesses after suspend is called i2c: sprd: Fix the i2c count issue Ben Hutchings (2): drm/msm: Fix possible null dereference on failure of get_pages() mtd: Fix comparison in map_word_andequal() Bhadram Varka (2): arm64: tegra: Make BCM89610 PHY interrupt as active low net: phy: broadcom: add support for BCM89610 PHY Changbin Du (1): iommu/vt-d: fix shift-out-of-bounds in bug checking Chen Yu (1): ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016) Chengguang Xu (2): isofs: fix potential memory leak in mount option parsing nvme: fix potential memory leak in option parsing Chris Leech (1): scsi: iscsi: respond to netlink with unicast when appropriate Christoph Hellwig (1): riscv: select DMA_DIRECT_OPS instead of redefining it Christophe JAILLET (1): Input: synaptics-rmi4 - fix an unchecked out of memory error path Chuck Lever (1): xprtrdma: Fix list corruption / DMAR errors during MR recovery Clément Péron (1): ARM: dts: cygnus: fix irq type for arm global timer Colin Ian King (4): scsi: isci: Fix infinite loop in while loop RDMA/iwpm: fix memory leak on map_info net: aquantia: fix unsigned numvecs comparison with less than zero ixgbe: fix memory leak on ipsec allocation Dag Moxnes (1): rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp Dan Carpenter (2): drm/omap: silence unititialized variable warning drm/dumb-buffers: Integer overflow in drm_mode_create_ioctl() Daniel Borkmann (3): bpf, x64: fix memleak when not converging after image bpf, x64: fix memleak when not converging on calls bpf: use array_index_nospec in find_prog_type Daniel Glöckner (1): usb: musb: fix remote wakeup racing with suspend Darren Hart (1): platform/x86: DELL_WMI use depends on instead of select for DELL_SMBIOS Dave Hansen (11): x86/pkeys/selftests: Give better unexpected fault error messages x86/pkeys/selftests: Stop using assert() x86/pkeys/selftests: Remove dead debugging code, fix dprint_in_signal x86/pkeys/selftests: Avoid printf-in-signal deadlocks x86/pkeys/selftests: Allow faults on unknown keys x86/pkeys/selftests: Factor out "instruction page" x86/pkeys/selftests: Add PROT_EXEC test x86/pkeys/selftests: Fix pkey exhaustion test off-by-one x86/pkeys/selftests: Fix pointer math x86/pkeys/selftests: Save off 'prot' for allocations x86/pkeys/selftests: Add a test for pkey 0 Dave Young (1): kexec_file: do not add extra alignment to efi memmap David Gilhooley (1): arm64: Add MIDR encoding for NVIDIA CPUs David Howells (11): afs: Fix server record deletion vfs: Undo an overly zealous MS_RDONLY -> SB_RDONLY conversion rxrpc: Fix missing start of call timeout rxrpc: Fix error reception on AF_INET6 sockets rxrpc: Fix the min security level for kernel calls afs: Fix address list parsing afs: Fix refcounting in callback registration afs: Fix server rotation's handling of fileserver probe failure afs: Fix VNOVOL handling in address rotation afs: Fix the handling of CB.InitCallBackState3 to find the server by UUID afs: Fix the non-encryption of calls Emil Tantilov (1): ixgbe: return error on unsupported SFP module when resetting Emil Velikov (1): drm/msm: don't deref error pointer in the msm_fbdev_create error path Eric Anholt (1): drm/vc4: Fix oops dereferencing DPI's connector since panel_bridge. Etienne Carriere (1): tee: check shm references are consistent in offset/size Evan Wang (2): libahci: Allow drivers to override stop_engine ata: ahci: mvebu: override ahci_stop_engine for mvebu AHCI Florian Fainelli (2): soc: bcm: raspberrypi-power: Fix use of __packed net: ethtool: Add missing kernel doc for FEC parameters Ganesh Goudar (1): cxgb4: copy mbox log size to PF0-3 adap instances Geert Uytterhoeven (5): soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure dt-bindings: meson-uart: DT fix s/clocks-names/clock-names/ dt-bindings: mvebu-uart: DT fix s/interrupts-names/interrupt-names/ dt-bindings: panel: lvds: Fix path to display timing bindings mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit Gianluca Borello (1): bpf, x64: fix JIT emission for dead code Graeme Smecher (1): ARM: dts: correct missing "compatible" entry for ti81xx SoCs Greg Kroah-Hartman (1): Linux 4.16.17 Greg Thelen (6): nvme: depend on INFINIBAND_ADDR_TRANS nvmet-rdma: depend on INFINIBAND_ADDR_TRANS ib_srpt: depend on INFINIBAND_ADDR_TRANS cifs: smbd: depend on INFINIBAND_ADDR_TRANS ib_srp: depend on INFINIBAND_ADDR_TRANS IB: make INFINIBAND_ADDR_TRANS configurable Hans de Goede (2): thermal: int3403_thermal: Fix NULL pointer deref on module load / probe HID: i2c-hid: Add RESEND_REPORT_DESCR quirk for Toshiba Click Mini L9W-B Heikki Krogerus (1): usb: typec: tps6598x: handle block reads separately with plain-I2C adapters Helge Deller (2): parisc: drivers.c: Fix section mismatches parisc: Move setup_profiling_timer() out of init section Huang Ying (1): mm, pagemap: fix swap offset value for PMD migration entry Håkon Bugge (1): IB/core: Make ib_mad_client_id atomic Igor Russkikh (2): net: aquantia: driver should correctly declare vlan_features bits net: aquantia: Limit number of vectors to actually allocated irqs Ilan Peer (1): mac80211: Adjust SAE authentication timeout Ingo Molnar (3): objtool, kprobes/x86: Sync the latest <asm/insn.h> header with tools/objtool/arch/x86/include/asm/insn.h x86/pkeys/selftests: Adjust the self-test to fresh distros that export the pkeys ABI x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI Jack Morgenstein (1): IB/mlx4: Fix integer overflow when calculating optimal MTT size Jacopo Mondi (3): dt-bindings: net: ravb: Add support for r8a77965 SoC dt-bindings: serial: sh-sci: Add support for r8a77965 (H)SCIF dt-bindings: dmaengine: rcar-dmac: document R8A77965 support Jagannathan Raman (1): iommu/vt-d: Fix usage of force parameter in intel_ir_reconfigure_irte() Jakob Unterwurzacher (1): can: dev: increase bus-off message severity Jakub Kicinski (2): nfp: ignore signals when communicating with management FW nfp: don't depend on eth_tbl being available Janusz Krzysztofik (1): ARM: OMAP1: ams-delta: fix deferred_fiq handler Jeffrey Hugo (1): init: fix false positives in W+X checking Jerome Brunet (1): clk: honor CLK_MUX_ROUND_CLOSEST in generic clk mux Jianchao Wang (2): IB/rxe: add RXE_START_MASK for rxe_opcode IB_OPCODE_RC_SEND_ONLY_INV nvme: fix use-after-free in nvme_free_ns_head Jiang Biao (2): blkcg: don't hold blkcg lock when deactivating policy blkcg: init root blkcg_gq under lock Jim Gill (1): scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts Jingju Hou (1): net: phy: marvell: clear wol event before setting it John Fastabend (1): bpf: fix uninitialized variable in bpf tools Jon Maloy (1): tipc: fix bug in function tipc_nl_node_dump_monitor Julian Wiedmann (1): s390/qeth: fix request-side race during cmd IO timeout Junaid Shahid (1): kvm: apic: Flush TLB after APIC mode/address change if VPIDs are in use Kan Liang (2): perf pmu: Fix core PMU alias list for X86 platform perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1 KarimAllah Ahmed (1): X86/KVM: Properly update 'tsc_offset' to represent the running guest Keith Busch (3): nvme: Set integrity flag for user passthrough commands nvme/multipath: Disable runtime writable enabling parameter nvme/multipath: Fix multipath disabled naming collisions Krish Sadhukhan (1): x86: Add check for APIC access address for vmentry of L2 guests Ladislav Michl (1): mtd: onenand: omap2: Disable DMA for HIGHMEM buffers Laura Abbott (1): proc/kcore: don't bounds check against address 0 Laurentiu Tudor (1): powerpc/kvm/booke: Fix altivec related build break Leo Yan (1): perf cs-etm: Support unknown_thread in cs_etm_auxtrace Leon Romanovsky (1): RDMA/mlx5: Properly check return value of mlx5_get_uars_page Liam Girdwood (1): ASoC: topology: Check widget kcontrols before deref. Loic Poulain (1): PCI: kirin: Fix reset gpio name Long Li (2): scsi: storvsc: Set up correct queue depth values for IDE devices cifs: Allocate validate negotiation request through kmalloc Lukasz Majewski (1): doc: Add vendor prefix for Kieback & Peter GmbH Madhavan Srinivasan (1): powerpc/64s: Default l1d_size to 64K in RFI fallback flush Marc Dionne (1): afs: Fix afs_find_server search loop Marian Rotariu (1): x86: Delay skip of emulated hypercall instruction Mark Rutland (7): arm64: kasan: avoid pfn_to_nid() before page array is initialized arm64: ptrace: remove addr_limit manipulation arm64: only advance singlestep for user instruction traps arm64: fix possible spectre-v1 in ptrace_hbp_get_event() KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_mmio_read_apr() bpf: fix possible spectre-v1 in find_and_alloc_map() efi/libstub/arm64: Handle randomized TEXT_OFFSET Markus Mayer (1): cpufreq: brcmstb-avs-cpufreq: remove development debug support Martin Blumenstingl (7): ARM64: dts: meson-gxl: add USB host support ARM64: dts: meson-gxm: add GXM specific USB host configuration ARM64: dts: meson-gxl-s905x-p212: enable the USB controller ARM64: dts: meson-gx-p23x-q20x: enable the USB controller ARM64: dts: meson-gxl-s905x-libretech-cc: enable the USB controller ARM64: dts: meson-gxl-nexbox-a95x: enable the USB controller ARM64: dts: meson-gxm-khadas-vim2: enable the USB controller Martin Schwidefsky (1): s390/smsgiucv: disable SMSG on module unload Masahiro Yamada (3): arm64: dts: uniphier: fix input delay value for legacy mode of eMMC reset: uniphier: fix USB clock line for LD20 gcc-plugins: fix build condition of SANCOV plugin Masami Hiramatsu (3): selftests: ftrace: Add a testcase for multiple actions on trigger kprobes/x86: Prohibit probing on exception masking instructions uprobes/x86: Prohibit probing on MOV SS instruction Matan Barak (1): IB/uverbs: Fix validating mandatory attributes Matheus Castello (1): dt-bindings: pinctrl: sunxi: Fix reference to driver Mathieu Malaterre (4): driver core: add __printf verification to __ata_ehi_pushv_desc agp: uninorth: make two functions static sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h sched/deadline: Make the grub_reclaim() function static Matt Redfearn (1): MIPS: dts: Boston: Fix PCI bus dtc warnings: Maxime Chevallier (1): net: mvpp2: Fix clk error path in mvpp2_probe Michael Ellerman (1): powerpc/pseries: Fix CONFIG_NUMA=n build Michael J. Ruhl (1): IB/hfi1 Use correct type for num_user_context Michal Kalderon (2): qed: Fix l2 initializations over iWARP personality qede: Fix gfp flags sent to rdma event node allocation Mika Westerberg (3): ACPI / scan: Initialize watchdog before PNP ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 pinctrl: cherryview: Associate IRQ descriptors to irqdomain Minchan Kim (1): mm: memcg: add __GFP_NOWARN in __memcg_schedule_kmem_cache_create() Ming Lei (1): scsi: target: fix crash with iscsi target and dvd Nathan Fontenot (1): ibmvnic: Do not notify peers on parameter change resets Nick Dyer (1): Input: atmel_mxt_ts - fix the firmware update Nikita Yushchenko (1): ARM: dts: imx51-zii-rdu1: fix touchscreen bindings Omar Sandoval (1): blk-mq: fix sysfs inflight counter Pablo Neira Ayuso (1): netfilter: nf_tables: NAT chain and extensions require NF_TABLES Paolo Bonzini (1): kvm: x86: move MSR_IA32_TSC handling to x86.c Parav Pandit (2): RDMA/cma: Fix use after destroy access to net namespace for IPoIB RDMA/cma: Do not query GID during QP state transition to RTR Paulo Alcantara (1): cifs: smb2ops: Fix listxattr() when there are no EAs Peter Rosin (3): i2c: pmcmsp: return message count on master_xfer success i2c: pmcmsp: fix error return from master_xfer i2c: viperboard: return message count on master_xfer success Peter Zijlstra (4): stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock kthread, sched/wait: Fix kthread_parkme() wait-loop kthread, sched/wait: Fix kthread_parkme() completion issue sched/core: Introduce set_special_state() Pierre-Louis Bossart (1): ASoC: Intel: atom: fix ACPI/PCI Kconfig Pieter Jansen van Vuuren (1): nfp: flower: split and limit cmsg skb lists Raghuram Chary J (1): lan78xx: PHY DSP registers initialization to address EEE link drop issues with long cables Ramon Fried (1): rpmsg: added MODULE_ALIAS for rpmsg_char Rich Felker (1): sh: fix build failure for J2 cpu with SMP disabled Rob Herring (2): spi: bcm2835aux: ensure interrupts are enabled for shared handler sh: switch to NO_BOOTMEM Roman Mashak (1): net sched actions: fix invalid pointer dereferencing if skbedit flags missing Russell King (4): ARM: keystone: fix platform_domain_notifier array overrun ARM: kexec: fix kdump register saving on panic() ARM: replace unnecessary perl with sed and the shell $(( )) operator ARM: fix kill( ,SIGFPE) breakage Sara Sharon (1): mac80211: use timeout from the AddBA response instead of the request Sebastian Sanchez (2): IB/{hfi1, rdmavt}: Fix memory leak in hfi1_alloc_devdata() upon failure IB/hfi1: Fix memory leak in exception path in get_irq_affinity() Sekhar Nori (9): ARM: dts: da850: fix W=1 warnings with pinmux node ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup ARM: davinci: board-dm355-evm: fix broken networking ARM: davinci: fix GPIO lookup for I2C ARM: davinci: dm646x: fix timer interrupt generation ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF ARM: davinci: board-dm646x-evm: set VPIF capture card name Simon Gaiser (1): xen: xenbus_dev_frontend: Really return response string Sinan Kaya (2): MIPS: io: Prevent compiler reordering writeX() MIPS: io: Add barrier after register read in readX() Srinath Mannam (1): arm64: dts: correct SATA addresses for Stingray Srinivas Kandagatla (1): ASoC: msm8916-wcd-analog: use threaded context for mbhc events Stefan Agner (2): drm/msm/dsi: use correct enum in dsi_get_cmd_fmt clk: imx6ull: use OSC clock during AXI rate change Stefan Raspl (1): smc: fix sendpage() call Stefano Brivio (1): vti6: Change minimum MTU to IPV4_MIN_MTU, vti6 can carry IPv4 too Steve French (1): CIFS: set *resp_buf_type to NO_BUFFER on error Taehee Yoo (1): netfilter: nf_tables: fix out-of-bounds in nft_chain_commit_update Tero Kristo (1): ARM: OMAP2+: powerdomain: use raw_smp_processor_id() for trace Tobias Jakobi (1): drm/exynos: mixer: avoid Oops in vp_video_buffer() Tobias Jordan (1): remoteproc: qcom: Fix potential device node leaks Tobias Regnery (1): usb: typec: ucsi: fix tracepoint related build error Tomi Valkeinen (4): drm/omap: fix uninitialized ret variable drm/omap: fix possible NULL ref issue in tiler_reserve_2d drm/omap: check return value from soc_device_match drm/omap: handle alloc failures in omap_connector Tony Lindgren (1): ARM: dts: Fix cm2 and prm sizes for omap4 Tung Nguyen (1): tipc: fix infinite loop when dumping link monitor summary Tyler Hicks (1): eCryptfs: don't pass up plaintext names when using filename encryption Vinicius Costa Gomes (1): igb: Fix the transmission mode of queue 0 for Qav mode Vinson Lee (1): scsi: megaraid_sas: Do not log an error if FW successfully initializes. Vladimir Zapolskiy (1): spi: sh-msiof: Fix bit field overflow writes to TSCR/RSCR Waiman Long (2): locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag locking/percpu-rwsem: Annotate rwsem ownership transfer by setting RWSEM_OWNER_UNKNOWN Wanpeng Li (2): KVM: Extend MAX_IRQ_ROUTES to 4096 for all archs KVM: X86: Lower the default timer frequency limit to 200us Yan Wang (1): ASoC: topology: Fix bugs of freeing soc topology Ying Xue (1): tipc: eliminate KMSAN uninit-value in strcmp complaint Yixun Lan (1): pinctrl: meson-axg: fix the range of aobus bank Yury Norov (1): lib/find_bit_benchmark.c: avoid soft lockup in test_find_first_bit() Zhu Yanjun (1): IB/rxe: avoid double kfree_skb dann frazier (1): net: hns: Avoid action name truncation hu huajun (1): KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update jacek.tomaka(a)poczta.fm (1): x86/cpu/intel: Add missing TLB cpuid values oder_chiou(a)realtek.com (1): ASoC: rt5514: Add the missing register in the readable table oulijun (4): RDMA/hns: Bugfix for init hem table RDMA/hns: Intercept illegal RDMA operation when use inline data RDMA/hns: Fix the qp context state diagram RDMA/hns: Submit bad wr pgzh (1): HID: lenovo: Add support for IBM/Lenovo Scrollpoint mice sxauwsk (1): spi: cadence: Add usleep_range() for cdns_spi_fill_tx_fifo() van der Linden, Frank (1): x86/xen: Reset VCPU0 info pointer after shared_info remap Łukasz Stelmach (2): ARM: 8753/1: decompressor: add a missing parameter to the addruart macro ARM: 8758/1: decompressor: restore r1 and r2 just before jumping to the kernel

7 years, 3 months

1
1
0 0

[PATCH v2 1/2] iommu/vt-d: add definitions for PFSID

by Jacob Pan

When SRIOV VF device IOTLB is invalidated, we need to provide the PF source ID such that IOMMU hardware can gauge the depth of invalidation queue which is shared among VFs. This is needed when device invalidation throttle (DIT) capability is supported. This patch adds bit definitions for checking and tracking PFSID. Signed-off-by: Jacob Pan <jacob.jun.pan(a)linux.intel.com> Cc: stable(a)vger.kernel.org Cc: "Ashok Raj" <ashok.raj(a)intel.com> Cc: "Lu Baolu" <baolu.lu(a)linux.intel.com> --- drivers/iommu/intel-iommu.c | 1 + include/linux/intel-iommu.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 749d8f2..3d77d61 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -422,6 +422,7 @@ struct device_domain_info { struct list_head global; /* link to global list */ u8 bus; /* PCI bus number */ u8 devfn; /* PCI devfn number */ + u16 pfsid; /* SRIOV physical function source ID */ u8 pasid_supported:3; u8 pasid_enabled:1; u8 pri_supported:1; diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index ef169d6..af1c05f 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -114,6 +114,7 @@ * Extended Capability Register */ +#define ecap_dit(e) ((e >> 41) & 0x1) #define ecap_pasid(e) ((e >> 40) & 0x1) #define ecap_pss(e) ((e >> 35) & 0x1f) #define ecap_eafs(e) ((e >> 34) & 0x1) @@ -284,6 +285,7 @@ enum { #define QI_DEV_IOTLB_SID(sid) ((u64)((sid) & 0xffff) << 32) #define QI_DEV_IOTLB_QDEP(qdep) (((qdep) & 0x1f) << 16) #define QI_DEV_IOTLB_ADDR(addr) ((u64)(addr) & VTD_PAGE_MASK) +#define QI_DEV_IOTLB_PFSID(pfsid) (((u64)(pfsid & 0xf) << 12) | ((u64)(pfsid & 0xfff) << 52)) #define QI_DEV_IOTLB_SIZE 1 #define QI_DEV_IOTLB_MAX_INVS 32 @@ -308,6 +310,7 @@ enum { #define QI_DEV_EIOTLB_PASID(p) (((u64)p) << 32) #define QI_DEV_EIOTLB_SID(sid) ((u64)((sid) & 0xffff) << 16) #define QI_DEV_EIOTLB_QDEP(qd) ((u64)((qd) & 0x1f) << 4) +#define QI_DEV_EIOTLB_PFSID(pfsid) (((u64)(pfsid & 0xf) << 12) | ((u64)(pfsid & 0xfff) << 52)) #define QI_DEV_EIOTLB_MAX_INVS 32 #define QI_PGRP_IDX(idx) (((u64)(idx)) << 55) -- 2.7.4

7 years, 3 months

1
1
0 0

Re: Patch "livepatch: Initialize shadow variables safely by a custom callback" has been added to the 4.16-stable tree

by Miroslav Benes

On Sun, 17 Jun 2018, gregkh(a)linuxfoundation.org wrote: > > This is a note to let you know that I've just added the patch titled > > livepatch: Initialize shadow variables safely by a custom callback > > to the 4.16-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… > > The filename of the patch is: > livepatch-initialize-shadow-variables-safely-by-a-custom-callback.patch > and it can be found in the queue-4.16 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable(a)vger.kernel.org> know about it. Hi, I think the patch really should not be added to the stable tree. It is not a bug fix. It is a new feature. The original API was more limited and this patch extends it. The same applies to patch "livepatch: Allow to call a custom callback when freeing shadow variables". Regards, Miroslav

7 years, 3 months

2
1
0 0

[PATCH 4.14 000/189] 4.14.51-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.51 release. There are 189 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Jun 20 08:11:38 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.51-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.51-rc1 Eric Dumazet <edumazet(a)google.com> tcp: do not overshoot window_clamp in tcp_rcv_space_adjust() Liu Bo <bo.li.liu(a)oracle.com> Btrfs: make raid6 rebuild retry more Liu Bo <bo.li.liu(a)oracle.com> Btrfs: fix scrub to repair raid6 corruption Sasha Levin <Alexander.Levin(a)microsoft.com> Revert "Btrfs: fix scrub to repair raid6 corruption" Russell King <rmk+kernel(a)armlinux.org.uk> ARM: kexec: fix kdump register saving on panic() Łukasz Stelmach <l.stelmach(a)samsung.com> ARM: 8758/1: decompressor: restore r1 and r2 just before jumping to the kernel Łukasz Stelmach <l.stelmach(a)samsung.com> ARM: 8753/1: decompressor: add a missing parameter to the addruart macro Mark Rutland <mark.rutland(a)arm.com> efi/libstub/arm64: Handle randomized TEXT_OFFSET Helge Deller <deller(a)gmx.de> parisc: Move setup_profiling_timer() out of init section Mathieu Malaterre <malat(a)debian.org> sched/deadline: Make the grub_reclaim() function static Mathieu Malaterre <malat(a)debian.org> sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h Dan Carpenter <dan.carpenter(a)oracle.com> drm/dumb-buffers: Integer overflow in drm_mode_create_ioctl() Waiman Long <longman(a)redhat.com> locking/percpu-rwsem: Annotate rwsem ownership transfer by setting RWSEM_OWNER_UNKNOWN Waiman Long <longman(a)redhat.com> locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag Stefan Agner <stefan(a)agner.ch> clk: imx6ull: use OSC clock during AXI rate change Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm646x-evm: set VPIF capture card name Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: dm646x: fix timer interrupt generation Peter Rosin <peda(a)axentia.se> i2c: viperboard: return message count on master_xfer success Peter Rosin <peda(a)axentia.se> i2c: pmcmsp: fix error return from master_xfer Peter Rosin <peda(a)axentia.se> i2c: pmcmsp: return message count on master_xfer success Russell King <rmk+kernel(a)armlinux.org.uk> ARM: keystone: fix platform_domain_notifier array overrun Daniel Glöckner <dg(a)emlix.com> usb: musb: fix remote wakeup racing with suspend David Howells <dhowells(a)redhat.com> afs: Fix the non-encryption of calls Ben Hutchings <ben(a)decadent.org.uk> mtd: Fix comparison in map_word_andequal() Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Add a test for pkey 0 Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Save off 'prot' for allocations Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Fix pointer math Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Fix pkey exhaustion test off-by-one Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Add PROT_EXEC test Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Factor out "instruction page" Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Allow faults on unknown keys Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Remove dead debugging code, fix dprint_in_signal Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Stop using assert() Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Give better unexpected fault error messages Andy Lutomirski <luto(a)kernel.org> x86/selftests: Add mov_to_ss test Ingo Molnar <mingo(a)kernel.org> x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI Ingo Molnar <mingo(a)kernel.org> x86/pkeys/selftests: Adjust the self-test to fresh distros that export the pkeys ABI Ingo Molnar <mingo(a)kernel.org> objtool, kprobes/x86: Sync the latest <asm/insn.h> header with tools/objtool/arch/x86/include/asm/insn.h Masami Hiramatsu <mhiramat(a)kernel.org> uprobes/x86: Prohibit probing on MOV SS instruction Masami Hiramatsu <mhiramat(a)kernel.org> kprobes/x86: Prohibit probing on exception masking instructions Ashish Samant <ashish.samant(a)oracle.com> ocfs2: take inode cluster lock before moving reflinked inode from orphan dir Laura Abbott <labbott(a)redhat.com> proc/kcore: don't bounds check against address 0 Jeffrey Hugo <jhugo(a)codeaurora.org> init: fix false positives in W+X checking Roman Mashak <mrv(a)mojatatu.com> net sched actions: fix invalid pointer dereferencing if skbedit flags missing Emil Tantilov <emil.s.tantilov(a)intel.com> ixgbe: return error on unsupported SFP module when resetting Marian Rotariu <mrotariu(a)bitdefender.com> x86: Delay skip of emulated hypercall instruction Wanpeng Li <wanpengli(a)tencent.com> KVM: Extend MAX_IRQ_ROUTES to 4096 for all archs David Howells <dhowells(a)redhat.com> rxrpc: Fix the min security level for kernel calls David Howells <dhowells(a)redhat.com> rxrpc: Fix error reception on AF_INET6 sockets Michal Kalderon <Michal.Kalderon(a)cavium.com> qede: Fix gfp flags sent to rdma event node allocation Michal Kalderon <Michal.Kalderon(a)cavium.com> qed: Fix l2 initializations over iWARP personality Ying Xue <ying.xue(a)windriver.com> tipc: eliminate KMSAN uninit-value in strcmp complaint Mathieu Malaterre <malat(a)debian.org> agp: uninorth: make two functions static Paulo Alcantara <palcantara(a)suse.de> cifs: smb2ops: Fix listxattr() when there are no EAs David Gilhooley <dgilhooley(a)nvidia.com> arm64: Add MIDR encoding for NVIDIA CPUs Jakob Unterwurzacher <jakob.unterwurzacher(a)theobroma-systems.com> can: dev: increase bus-off message severity Igor Russkikh <igor.russkikh(a)aquantia.com> net: aquantia: driver should correctly declare vlan_features bits van der Linden, Frank <fllinden(a)amazon.com> x86/xen: Reset VCPU0 info pointer after shared_info remap Sara Sharon <sara.sharon(a)intel.com> mac80211: use timeout from the AddBA response instead of the request Clément Péron <peron.clem(a)gmail.com> ARM: dts: cygnus: fix irq type for arm global timer Mathieu Malaterre <malat(a)debian.org> driver core: add __printf verification to __ata_ehi_pushv_desc Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: handle alloc failures in omap_connector Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: check return value from soc_device_match Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: fix possible NULL ref issue in tiler_reserve_2d Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: fix uninitialized ret variable Dan Carpenter <dan.carpenter(a)oracle.com> drm/omap: silence unititialized variable warning Ilan Peer <ilan.peer(a)intel.com> mac80211: Adjust SAE authentication timeout Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/trace/syscalls: Update syscall name matching logic to account for ppc_ prefix Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/trace/syscalls: Update syscall name matching logic Etienne Carriere <etienne.carriere(a)linaro.org> tee: check shm references are consistent in offset/size Rich Felker <dalias(a)libc.org> sh: fix build failure for J2 cpu with SMP disabled Peter Zijlstra <peterz(a)infradead.org> sched/core: Introduce set_special_state() Rob Herring <robh(a)kernel.org> spi: bcm2835aux: ensure interrupts are enabled for shared handler Parav Pandit <parav(a)mellanox.com> RDMA/cma: Do not query GID during QP state transition to RTR Sebastian Sanchez <sebastian.sanchez(a)intel.com> IB/hfi1: Fix memory leak in exception path in get_irq_affinity() Michael J. Ruhl <michael.j.ruhl(a)intel.com> IB/hfi1 Use correct type for num_user_context Stefan Raspl <stefan.raspl(a)linux.ibm.com> smc: fix sendpage() call Janusz Krzysztofik <jmkrzyszt(a)gmail.com> ARM: OMAP1: ams-delta: fix deferred_fiq handler Keith Busch <keith.busch(a)intel.com> nvme: Set integrity flag for user passthrough commands Chengguang Xu <cgxu519(a)gmx.com> nvme: fix potential memory leak in option parsing Changbin Du <changbin.du(a)intel.com> iommu/vt-d: fix shift-out-of-bounds in bug checking Bhadram Varka <vbhadram(a)nvidia.com> arm64: tegra: Make BCM89610 PHY interrupt as active low Peter Zijlstra <peterz(a)infradead.org> kthread, sched/wait: Fix kthread_parkme() wait-loop Peter Zijlstra <peterz(a)infradead.org> stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock Helge Deller <deller(a)gmx.de> parisc: drivers.c: Fix section mismatches Daniel Borkmann <daniel(a)iogearbox.net> bpf, x64: fix memleak when not converging after image Jim Gill <jgill(a)vmware.com> scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts Arnd Bergmann <arnd(a)arndb.de> hexagon: export csum_partial_copy_nocheck Arnd Bergmann <arnd(a)arndb.de> hexagon: add memset_io() helper Nick Dyer <nick(a)shmanahar.org> Input: atmel_mxt_ts - fix the firmware update Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-som-lv: Fix Audio Mute Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-som-lv: Fix WL127x Startup Issues Tero Kristo <t-kristo(a)ti.com> ARM: OMAP2+: powerdomain: use raw_smp_processor_id() for trace Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: panel: lvds: Fix path to display timing bindings Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm355-evm: fix broken networking Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD Håkon Bugge <haakon.bugge(a)oracle.com> IB/core: Make ib_mad_client_id atomic Amir Goldstein <amir73il(a)gmail.com> <linux/stringhash.h>: fix end_name_hash() for 64bit long Zhu Yanjun <yanjun.zhu(a)oracle.com> IB/rxe: avoid double kfree_skb Jianchao Wang <jianchao.w.wang(a)oracle.com> IB/rxe: add RXE_START_MASK for rxe_opcode IB_OPCODE_RC_SEND_ONLY_INV Colin Ian King <colin.king(a)canonical.com> RDMA/iwpm: fix memory leak on map_info Parav Pandit <parav(a)mellanox.com> RDMA/cma: Fix use after destroy access to net namespace for IPoIB Matan Barak <matanb(a)mellanox.com> IB/uverbs: Fix validating mandatory attributes Greg Thelen <gthelen(a)google.com> IB: make INFINIBAND_ADDR_TRANS configurable Greg Thelen <gthelen(a)google.com> ib_srp: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> ib_srpt: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> nvmet-rdma: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> nvme: depend on INFINIBAND_ADDR_TRANS Jon Maloy <jon.maloy(a)ericsson.com> tipc: fix bug in function tipc_nl_node_dump_monitor Baolin Wang <baolin.wang(a)linaro.org> i2c: sprd: Fix the i2c count issue Baolin Wang <baolin.wang(a)linaro.org> i2c: sprd: Prevent i2c accesses after suspend is called John Fastabend <john.fastabend(a)gmail.com> bpf: fix uninitialized variable in bpf tools jacek.tomaka(a)poczta.fm <jacek.tomaka(a)poczta.fm> x86/cpu/intel: Add missing TLB cpuid values Evan Wang <xswang(a)marvell.com> ata: ahci: mvebu: override ahci_stop_engine for mvebu AHCI Evan Wang <xswang(a)marvell.com> libahci: Allow drivers to override stop_engine Mark Rutland <mark.rutland(a)arm.com> KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_mmio_read_apr() Mark Rutland <mark.rutland(a)arm.com> arm64: fix possible spectre-v1 in ptrace_hbp_get_event() Omar Sandoval <osandov(a)fb.com> blk-mq: fix sysfs inflight counter Arvind Yadav <arvind.yadav.cs(a)gmail.com> HID: intel-ish-hid: use put_device() instead of kfree() Ramon Fried <rfried(a)codeaurora.org> rpmsg: added MODULE_ALIAS for rpmsg_char Tobias Jordan <Tobias.Jordan(a)elektrobit.com> remoteproc: qcom: Fix potential device node leaks Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1 Dag Moxnes <dag.moxnes(a)oracle.com> rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp Masami Hiramatsu <mhiramat(a)kernel.org> selftests: ftrace: Add a testcase for multiple actions on trigger Arvind Yadav <arvind.yadav.cs(a)gmail.com> HID: wacom: Release device resource data obtained by devres_alloc() pgzh <peter.ganzhorn(a)gmail.com> HID: lenovo: Add support for IBM/Lenovo Scrollpoint mice Mark Rutland <mark.rutland(a)arm.com> arm64: ptrace: remove addr_limit manipulation Florian Fainelli <f.fainelli(a)gmail.com> net: ethtool: Add missing kernel doc for FEC parameters Hans de Goede <hdegoede(a)redhat.com> thermal: int3403_thermal: Fix NULL pointer deref on module load / probe Andres Rodriguez <andres.rodriguez(a)amd.com> drm/amdkfd: fix clock counter retrieval for node without GPU Mika Westerberg <mika.westerberg(a)linux.intel.com> ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 Sekhar Nori <nsekhar(a)ti.com> ARM: dts: da850: fix W=1 warnings with pinmux node Jingju Hou <Jingju.Hou(a)synaptics.com> net: phy: marvell: clear wol event before setting it Balbir Singh <bsingharora(a)gmail.com> powerpc/powernv/memtrace: Let the arch hotunplug code flush cache Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: meson-uart: DT fix s/clocks-names/clock-names/ Chen Yu <yu.c.chen(a)intel.com> ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016) Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qeth: use Read device to query hypervisor for MAC Tobias Regnery <tobias.regnery(a)gmail.com> usb: typec: ucsi: fix tracepoint related build error Minchan Kim <minchan(a)kernel.org> mm: memcg: add __GFP_NOWARN in __memcg_schedule_kmem_cache_create() Dave Young <dyoung(a)redhat.com> kexec_file: do not add extra alignment to efi memmap Alexey Dobriyan <adobriyan(a)gmail.com> proc: revalidate kernel thread inodes to root:root Huang Ying <ying.huang(a)intel.com> mm, pagemap: fix swap offset value for PMD migration entry Colin Ian King <colin.king(a)canonical.com> scsi: isci: Fix infinite loop in while loop Long Li <longli(a)microsoft.com> scsi: storvsc: Set up correct queue depth values for IDE devices Baolin Wang <baolin.wang(a)linaro.org> parisc: time: Convert read_persistent_clock() to read_persistent_clock64() David Howells <dhowells(a)redhat.com> vfs: Undo an overly zealous MS_RDONLY -> SB_RDONLY conversion dann frazier <dann.frazier(a)canonical.com> net: hns: Avoid action name truncation Jiang Biao <jiang.biao2(a)zte.com.cn> blkcg: init root blkcg_gq under lock Emil Velikov <emil.velikov(a)collabora.com> drm/msm: don't deref error pointer in the msm_fbdev_create error path Stefan Agner <stefan(a)agner.ch> drm/msm/dsi: use correct enum in dsi_get_cmd_fmt Ben Hutchings <ben.hutchings(a)codethink.co.uk> drm/msm: Fix possible null dereference on failure of get_pages() Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> ASoC: msm8916-wcd-analog: use threaded context for mbhc events Taehee Yoo <ap420073(a)gmail.com> netfilter: nf_tables: fix out-of-bounds in nft_chain_commit_update Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: NAT chain and extensions require NF_TABLES Ming Lei <ming.lei(a)redhat.com> scsi: target: fix crash with iscsi target and dvd Vinson Lee <vlee(a)freedesktop.org> scsi: megaraid_sas: Do not log an error if FW successfully initializes. Chris Leech <cleech(a)redhat.com> scsi: iscsi: respond to netlink with unicast when appropriate Tung Nguyen <tung.q.nguyen(a)dektech.com.au> tipc: fix infinite loop when dumping link monitor summary Jiang Biao <jiang.biao2(a)zte.com.cn> blkcg: don't hold blkcg lock when deactivating policy sxauwsk <sxauwsk(a)163.com> spi: cadence: Add usleep_range() for cdns_spi_fill_tx_fifo() Liam Girdwood <liam.r.girdwood(a)linux.intel.com> ASoC: topology: Check widget kcontrols before deref. Simon Gaiser <simon(a)invisiblethingslab.com> xen: xenbus_dev_frontend: Really return response string Yan Wang <yan.wang(a)linux.intel.com> ASoC: topology: Fix bugs of freeing soc topology Loic Poulain <loic.poulain(a)linaro.org> PCI: kirin: Fix reset gpio name Geert Uytterhoeven <geert(a)linux-m68k.org> soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure Florian Fainelli <f.fainelli(a)gmail.com> soc: bcm: raspberrypi-power: Fix use of __packed Tyler Hicks <tyhicks(a)canonical.com> eCryptfs: don't pass up plaintext names when using filename encryption oder_chiou(a)realtek.com <oder_chiou(a)realtek.com> ASoC: rt5514: Add the missing register in the readable table Jerome Brunet <jbrunet(a)baylibre.com> clk: honor CLK_MUX_ROUND_CLOSEST in generic clk mux Jacopo Mondi <jacopo+renesas(a)jmondi.org> dt-bindings: dmaengine: rcar-dmac: document R8A77965 support Jacopo Mondi <jacopo+renesas(a)jmondi.org> dt-bindings: serial: sh-sci: Add support for r8a77965 (H)SCIF Matheus Castello <matheus(a)castello.eng.br> dt-bindings: pinctrl: sunxi: Fix reference to driver Lukasz Majewski <lukma(a)denx.de> doc: Add vendor prefix for Kieback & Peter GmbH Vladimir Zapolskiy <vladimir_zapolskiy(a)mentor.com> spi: sh-msiof: Fix bit field overflow writes to TSCR/RSCR Matt Redfearn <matt.redfearn(a)mips.com> MIPS: dts: Boston: Fix PCI bus dtc warnings: Chengguang Xu <cgxu519(a)gmx.com> isofs: fix potential memory leak in mount option parsing Martin Schwidefsky <schwidefsky(a)de.ibm.com> s390/smsgiucv: disable SMSG on module unload Sinan Kaya <okaya(a)codeaurora.org> MIPS: io: Add barrier after register read in readX() Amir Goldstein <amir73il(a)gmail.com> fsnotify: fix ignore mask logic in send_to_group() Arnaldo Carvalho de Melo <acme(a)redhat.com> perf report: Fix switching to another perf.data file Jakub Kicinski <jakub.kicinski(a)netronome.com> nfp: ignore signals when communicating with management FW Sinan Kaya <okaya(a)codeaurora.org> MIPS: io: Prevent compiler reordering writeX() Krish Sadhukhan <krish.sadhukhan(a)oracle.com> x86: Add check for APIC access address for vmentry of L2 guests hu huajun <huhuajun(a)linux.alibaba.com> KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Input: synaptics-rmi4 - fix an unchecked out of memory error path Anson Huang <Anson.Huang(a)nxp.com> clocksource/drivers/imx-tpm: Correct some registers operation flow ------------- Diffstat: .../bindings/display/panel/panel-common.txt | 2 +- .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 6 +- .../bindings/serial/amlogic,meson-uart.txt | 2 +- .../bindings/serial/renesas,sci-serial.txt | 2 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Makefile | 4 +- arch/arm/boot/compressed/head.S | 20 +- arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- arch/arm/boot/dts/da850.dtsi | 2 - arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 +- arch/arm/kernel/machine_kexec.c | 34 ++- arch/arm/mach-davinci/board-da830-evm.c | 9 +- arch/arm/mach-davinci/board-da850-evm.c | 9 +- arch/arm/mach-davinci/board-dm355-evm.c | 6 + arch/arm/mach-davinci/board-dm646x-evm.c | 5 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 10 +- arch/arm/mach-davinci/dm646x.c | 3 +- arch/arm/mach-keystone/pm_domain.c | 1 + arch/arm/mach-omap1/ams-delta-fiq.c | 28 +- arch/arm/mach-omap2/powerdomain.c | 4 +- arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 +- arch/arm64/include/asm/cputype.h | 6 + arch/arm64/kernel/ptrace.c | 20 +- arch/hexagon/include/asm/io.h | 6 + arch/hexagon/lib/checksum.c | 1 + arch/mips/boot/dts/img/boston.dts | 6 + arch/mips/include/asm/io.h | 4 +- arch/parisc/kernel/drivers.c | 7 +- arch/parisc/kernel/smp.c | 3 +- arch/parisc/kernel/time.c | 2 +- arch/powerpc/include/asm/ftrace.h | 29 ++- arch/powerpc/platforms/powernv/memtrace.c | 17 -- arch/sh/kernel/cpu/sh2/probe.c | 4 + arch/x86/events/intel/core.c | 9 +- arch/x86/include/asm/insn.h | 18 ++ arch/x86/kernel/cpu/intel.c | 3 + arch/x86/kernel/kexec-bzimage64.c | 5 +- arch/x86/kernel/kprobes/core.c | 4 + arch/x86/kernel/uprobes.c | 4 + arch/x86/kvm/hyperv.c | 2 +- arch/x86/kvm/svm.c | 5 +- arch/x86/kvm/vmx.c | 15 +- arch/x86/kvm/x86.c | 19 +- arch/x86/net/bpf_jit_comp.c | 4 +- arch/x86/xen/enlighten_hvm.c | 13 + block/blk-cgroup.c | 22 +- block/blk-mq.c | 19 ++ block/blk-mq.h | 4 +- block/genhd.c | 12 + block/partition-generic.c | 10 +- drivers/acpi/acpi_watchdog.c | 59 ++++- drivers/acpi/sleep.c | 13 + drivers/ata/ahci.c | 6 +- drivers/ata/ahci.h | 7 + drivers/ata/ahci_mvebu.c | 56 ++++ drivers/ata/ahci_qoriq.c | 2 +- drivers/ata/ahci_xgene.c | 4 +- drivers/ata/libahci.c | 20 +- drivers/ata/libata-eh.c | 4 +- drivers/ata/sata_highbank.c | 2 +- drivers/char/agp/uninorth-agp.c | 4 +- drivers/clk/clk-mux.c | 10 +- drivers/clk/clk.c | 7 +- drivers/clk/imx/clk-imx6ul.c | 2 +- drivers/clocksource/timer-imx-tpm.c | 8 +- drivers/firmware/efi/libstub/arm64-stub.c | 10 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 +- drivers/gpu/drm/drm_dumb_buffers.c | 7 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- drivers/gpu/drm/msm/msm_fbdev.c | 11 +- drivers/gpu/drm/msm/msm_gem.c | 20 +- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 +- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- drivers/gpu/drm/omapdrm/omap_connector.c | 10 + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +- drivers/gpu/drm/omapdrm/tcm-sita.c | 2 +- drivers/hid/Kconfig | 7 +- drivers/hid/hid-ids.h | 8 + drivers/hid/hid-lenovo.c | 36 +++ drivers/hid/intel-ish-hid/ishtp/bus.c | 2 +- drivers/hid/wacom_sys.c | 4 +- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-sprd.c | 22 +- drivers/i2c/busses/i2c-viperboard.c | 2 +- drivers/infiniband/Kconfig | 5 +- drivers/infiniband/core/cma.c | 60 +++-- drivers/infiniband/core/iwpm_util.c | 5 +- drivers/infiniband/core/mad.c | 4 +- drivers/infiniband/core/uverbs_ioctl.c | 9 + drivers/infiniband/hw/hfi1/affinity.c | 11 +- drivers/infiniband/hw/hfi1/init.c | 4 +- drivers/infiniband/sw/rxe/rxe_opcode.c | 2 +- drivers/infiniband/sw/rxe/rxe_req.c | 1 - drivers/infiniband/sw/rxe/rxe_resp.c | 6 +- drivers/infiniband/ulp/srp/Kconfig | 2 +- drivers/infiniband/ulp/srpt/Kconfig | 2 +- drivers/input/rmi4/rmi_spi.c | 7 +- drivers/input/touchscreen/atmel_mxt_ts.c | 186 ++++++++------ drivers/iommu/dmar.c | 2 +- drivers/net/can/dev.c | 2 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 + drivers/net/ethernet/hisilicon/hns/hnae.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 +- drivers/net/ethernet/qlogic/qede/qede_rdma.c | 2 +- drivers/net/phy/marvell.c | 9 + drivers/nvme/host/Kconfig | 2 +- drivers/nvme/host/core.c | 1 + drivers/nvme/host/fabrics.c | 6 + drivers/nvme/target/Kconfig | 2 +- drivers/pci/dwc/pcie-kirin.c | 2 +- drivers/remoteproc/qcom_q6v5_pil.c | 2 + drivers/rpmsg/rpmsg_char.c | 2 + drivers/s390/net/qeth_core_main.c | 2 +- drivers/s390/net/smsgiucv.c | 2 +- drivers/scsi/isci/port_config.c | 3 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 +- drivers/scsi/scsi_transport_iscsi.c | 29 ++- drivers/scsi/storvsc_drv.c | 7 +- drivers/scsi/vmw_pvscsi.c | 2 +- drivers/soc/bcm/raspberrypi-power.c | 2 +- drivers/spi/spi-bcm2835aux.c | 5 + drivers/spi/spi-cadence.c | 8 + drivers/spi/spi-sh-msiof.c | 1 + drivers/target/target_core_pscsi.c | 2 + drivers/tee/tee_core.c | 11 + drivers/thermal/int340x_thermal/int3403_thermal.c | 3 +- drivers/usb/musb/musb_host.c | 5 +- drivers/usb/musb/musb_host.h | 7 +- drivers/usb/musb/musb_virthub.c | 25 +- drivers/usb/typec/ucsi/Makefile | 2 +- drivers/xen/xenbus/xenbus_dev_frontend.c | 3 +- fs/afs/rxrpc.c | 7 + fs/btrfs/scrub.c | 44 +++- fs/cifs/smb2ops.c | 6 + fs/ecryptfs/crypto.c | 41 ++- fs/ecryptfs/file.c | 21 +- fs/isofs/inode.c | 3 + fs/namespace.c | 2 +- fs/notify/fsnotify.c | 25 +- fs/ocfs2/refcounttree.c | 14 +- fs/proc/base.c | 6 + fs/proc/kcore.c | 23 +- fs/proc/task_mmu.c | 6 +- include/linux/clk-provider.h | 3 + include/linux/ethtool.h | 2 + include/linux/genhd.h | 4 +- include/linux/kvm_host.h | 8 +- include/linux/mtd/map.h | 2 +- include/linux/percpu-rwsem.h | 6 +- include/linux/rwsem.h | 6 + include/linux/sched.h | 50 +++- include/linux/sched/signal.h | 2 +- include/linux/stringhash.h | 4 +- include/soc/bcm2835/raspberrypi-firmware.h | 4 +- init/main.c | 7 + kernel/kthread.c | 7 +- kernel/locking/rwsem-xadd.c | 19 +- kernel/locking/rwsem.c | 2 - kernel/locking/rwsem.h | 30 ++- kernel/module.c | 5 + kernel/sched/core.c | 17 +- kernel/sched/deadline.c | 4 +- kernel/sched/rt.c | 2 - kernel/sched/sched.h | 5 +- kernel/signal.c | 17 +- kernel/stop_machine.c | 19 +- mm/memcontrol.c | 2 +- net/ipv4/tcp_input.c | 2 +- net/ipv6/netfilter/Kconfig | 55 ++-- net/mac80211/agg-tx.c | 4 + net/mac80211/mlme.c | 25 +- net/mac80211/tx.c | 3 +- net/netfilter/nf_tables_api.c | 2 +- net/rds/ib_cm.c | 3 +- net/rxrpc/af_rxrpc.c | 2 +- net/rxrpc/local_object.c | 57 +++-- net/sched/act_skbedit.c | 3 +- net/smc/af_smc.c | 6 +- net/tipc/monitor.c | 2 +- net/tipc/node.c | 28 +- sound/soc/codecs/msm8916-wcd-analog.c | 9 +- sound/soc/codecs/rt5514.c | 3 + sound/soc/soc-topology.c | 6 +- tools/net/bpf_dbg.c | 7 +- tools/objtool/arch/x86/include/asm/insn.h | 18 ++ tools/perf/util/symbol.c | 8 +- .../inter-event/trigger-multi-actions-accept.tc | 44 ++++ tools/testing/selftests/x86/Makefile | 2 +- tools/testing/selftests/x86/mov_ss_trap.c | 285 +++++++++++++++++++++ tools/testing/selftests/x86/mpx-mini-test.c | 7 +- tools/testing/selftests/x86/protection_keys.c | 254 ++++++++++++------ virt/kvm/arm/vgic/vgic-mmio-v2.c | 5 + 196 files changed, 1886 insertions(+), 674 deletions(-)

7 years, 3 months

5
179
0 0

[PATCH] mtd: rawnand: mxc: set spare area size register explicitly

by Martin Kaiser

The v21 version of the NAND flash controller contains a Spare Area Size Register (SPAS) at offset 0x10. Its setting defaults to the maximum spare area size of 218 bytes. The size that is set in this register is used by the controller when it calculates the ECC bytes internally in hardware. Usually, this register is updated from settings in the IIM fuses when the system is booting from nand flash. For other boot media, however, the SPAS register remains at the default setting, which may not work for the particular flash chip on the board. The same goes for flash chips whose configuration cannot be set in the IIM fuses (e.g. chips with 2k sector size and 128 bytes spare area size can't be configured in the IIM fuses on imx25 systems). Set the SPAS register explicitly during the preset operation. Derive the register value from mtd->oobsize that was detected during probe by decoding the flash chip's ID bytes. While at it, rename the define for the spare area register's offset to NFC_V21_RSLTSPARE_AREA. The register at offset 0x10 on v1 controllers is different from the register on v21 controllers. Signed-off-by: Martin Kaiser <martin(a)kaiser.cx> Cc: stable(a)vger.kernel.org --- drivers/mtd/nand/raw/mxc_nand.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index 45786e7..c2f8572 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -48,7 +48,7 @@ #define NFC_V1_V2_CONFIG (host->regs + 0x0a) #define NFC_V1_V2_ECC_STATUS_RESULT (host->regs + 0x0c) #define NFC_V1_V2_RSLTMAIN_AREA (host->regs + 0x0e) -#define NFC_V1_V2_RSLTSPARE_AREA (host->regs + 0x10) +#define NFC_V21_RSLTSPARE_AREA (host->regs + 0x10) #define NFC_V1_V2_WRPROT (host->regs + 0x12) #define NFC_V1_UNLOCKSTART_BLKADDR (host->regs + 0x14) #define NFC_V1_UNLOCKEND_BLKADDR (host->regs + 0x16) @@ -1274,6 +1274,9 @@ static void preset_v2(struct mtd_info *mtd) writew(config1, NFC_V1_V2_CONFIG1); /* preset operation */ + /* spare area size in 16bit words */ + writew(mtd->oobsize >> 1, NFC_V21_RSLTSPARE_AREA); + /* Unlock the internal RAM Buffer */ writew(0x2, NFC_V1_V2_CONFIG); -- 2.1.4

7 years, 3 months

4
11
0 0

[PATCH] MIPS: implement smp_cond_load_acquire() for Loongson-3

by Huacai Chen

After commit 7f56b58a92aaf2c ("locking/mcs: Use smp_cond_load_acquire() in MCS spin loop") Loongson-3 fails to boot. This is because Loongson-3 has SFB (Store Fill Buffer) and READ_ONCE() may get an old value in a tight loop. So in smp_cond_load_acquire() we need a __smp_mb() after every READ_ONCE(). This patch introduce a Loongson-specific smp_cond_load_acquire(). And it should be backported to as early as linux-4.5, in which release the smp_cond_acquire() is introduced. Cc: stable(a)vger.kernel.org Signed-off-by: Huacai Chen <chenhc(a)lemote.com> --- arch/mips/include/asm/barrier.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h index a5eb1bb..4ea384d 100644 --- a/arch/mips/include/asm/barrier.h +++ b/arch/mips/include/asm/barrier.h @@ -222,6 +222,23 @@ #define __smp_mb__before_atomic() __smp_mb__before_llsc() #define __smp_mb__after_atomic() smp_llsc_mb() +#ifdef CONFIG_CPU_LOONGSON3 +/* Loongson-3 need a __smp_mb() after READ_ONCE() here */ +#define smp_cond_load_acquire(ptr, cond_expr) \ +({ \ + typeof(ptr) __PTR = (ptr); \ + typeof(*ptr) VAL; \ + for (;;) { \ + VAL = READ_ONCE(*__PTR); \ + __smp_mb(); \ + if (cond_expr) \ + break; \ + cpu_relax(); \ + } \ + VAL; \ +}) +#endif /* CONFIG_CPU_LOONGSON3 */ + #include <asm-generic/barrier.h> #endif /* __ASM_BARRIER_H */ -- 2.7.0

7 years, 3 months

5
8
0 0

[PATCH v2 1/2] net: ethernet: fix suspend/resume in davinci_emac

by Bartosz Golaszewski

From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> This patch reverts commit 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") and adds a comment which should stop anyone from reintroducing the same "fix" in the future. We can't use bus_find_device_by_name() here because the device name is not guaranteed to be 'davinci_mdio'. On some systems it can be 'davinci_mdio.0' so we need to use strncmp() against the first part of the string to correctly match it. Fixes: 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") Cc: stable(a)vger.kernel.org Signed-off-by: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> Acked-by: Lukas Wunner <lukas(a)wunner.de> --- drivers/net/ethernet/ti/davinci_emac.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 06d7c9e4dcda..a1a6445b5a7e 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1385,6 +1385,11 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) return -EOPNOTSUPP; } +static int match_first_device(struct device *dev, void *data) +{ + return !strncmp(dev_name(dev), "davinci_mdio", 12); +} + /** * emac_dev_open - EMAC device open * @ndev: The DaVinci EMAC network adapter @@ -1484,8 +1489,14 @@ static int emac_dev_open(struct net_device *ndev) /* use the first phy on the bus if pdata did not give us a phy id */ if (!phydev && !priv->phy_id) { - phy = bus_find_device_by_name(&mdio_bus_type, NULL, - "davinci_mdio"); + /* NOTE: we can't use bus_find_device_by_name() here because + * the device name is not guaranteed to be 'davinci_mdio'. On + * some systems it can be 'davinci_mdio.0' so we need to use + * strncmp() against the first part of the string to correctly + * match it. + */ + phy = bus_find_device(&mdio_bus_type, NULL, NULL, + match_first_device); if (phy) { priv->phy_id = dev_name(phy); if (!priv->phy_id || !*priv->phy_id) -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH 1/3] net: ethernet: fix suspend/resume in davinci_emac

by Bartosz Golaszewski

From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> This patch reverts commit 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") and adds a comment which should stop anyone from reintroducing the same "fix" in the future. We can't use bus_find_device_by_name() here because the device name is not guaranteed to be 'davinci_mdio'. On some systems it can be 'davinci_mdio.0' so we need to use strncmp() against the first part of the string to correctly match it. Fixes: 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") Cc: stable(a)vger.kernel.org Signed-off-by: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> --- drivers/net/ethernet/ti/davinci_emac.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 06d7c9e4dcda..a1a6445b5a7e 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1385,6 +1385,11 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) return -EOPNOTSUPP; } +static int match_first_device(struct device *dev, void *data) +{ + return !strncmp(dev_name(dev), "davinci_mdio", 12); +} + /** * emac_dev_open - EMAC device open * @ndev: The DaVinci EMAC network adapter @@ -1484,8 +1489,14 @@ static int emac_dev_open(struct net_device *ndev) /* use the first phy on the bus if pdata did not give us a phy id */ if (!phydev && !priv->phy_id) { - phy = bus_find_device_by_name(&mdio_bus_type, NULL, - "davinci_mdio"); + /* NOTE: we can't use bus_find_device_by_name() here because + * the device name is not guaranteed to be 'davinci_mdio'. On + * some systems it can be 'davinci_mdio.0' so we need to use + * strncmp() against the first part of the string to correctly + * match it. + */ + phy = bus_find_device(&mdio_bus_type, NULL, NULL, + match_first_device); if (phy) { priv->phy_id = dev_name(phy); if (!priv->phy_id || !*priv->phy_id) -- 2.17.1

7 years, 3 months

3
3
0 0

[PATCH v4 06/15] mtd: rawnand: qcom: wait for desc completion in all BAM channels

by Abhishek Sahu

The BAM has 3 channels - tx, rx and command. command channel is used for register read/writes, tx channel for data writes and rx channel for data reads. Currently, the driver assumes the transfer completion once it gets all the command descriptors completed. Sometimes, there is race condition between data channel (tx/rx) and command channel completion. In these cases, the data present in buffer is not valid during small window between command descriptor completion and data descriptor completion. This patch generates NAND transfer completion when both (Data and Command) DMA channels have completed all its DMA descriptors. It assigns completion callback in last DMA descriptors of that channel and wait for completion. Fixes: 8d6b6d7e135e ("mtd: nand: qcom: support for command descriptor formation") Cc: stable(a)vger.kernel.org Acked-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Signed-off-by: Abhishek Sahu <absahu(a)codeaurora.org> --- * Changes from v3: 1. NONE * Changes from v2: 1. Changed commit message and comments slightly 2. Renamed wait_second_completion from first_chan_done and set it before submit desc 3. Mark for stable tree * Changes from v1: NONE drivers/mtd/nand/raw/qcom_nandc.c | 53 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c index 2375780..fc20149 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -213,6 +213,8 @@ #define QPIC_PER_CW_CMD_SGL 32 #define QPIC_PER_CW_DATA_SGL 8 +#define QPIC_NAND_COMPLETION_TIMEOUT msecs_to_jiffies(2000) + /* * Flags used in DMA descriptor preparation helper functions * (i.e. read_reg_dma/write_reg_dma/read_data_dma/write_data_dma) @@ -245,6 +247,11 @@ * @tx_sgl_start - start index in data sgl for tx. * @rx_sgl_pos - current index in data sgl for rx. * @rx_sgl_start - start index in data sgl for rx. + * @wait_second_completion - wait for second DMA desc completion before making + * the NAND transfer completion. + * @txn_done - completion for NAND transfer. + * @last_data_desc - last DMA desc in data channel (tx/rx). + * @last_cmd_desc - last DMA desc in command channel. */ struct bam_transaction { struct bam_cmd_element *bam_ce; @@ -258,6 +265,10 @@ struct bam_transaction { u32 tx_sgl_start; u32 rx_sgl_pos; u32 rx_sgl_start; + bool wait_second_completion; + struct completion txn_done; + struct dma_async_tx_descriptor *last_data_desc; + struct dma_async_tx_descriptor *last_cmd_desc; }; /* @@ -504,6 +515,8 @@ static void free_bam_transaction(struct qcom_nand_controller *nandc) bam_txn->data_sgl = bam_txn_buf; + init_completion(&bam_txn->txn_done); + return bam_txn; } @@ -523,11 +536,33 @@ static void clear_bam_transaction(struct qcom_nand_controller *nandc) bam_txn->tx_sgl_start = 0; bam_txn->rx_sgl_pos = 0; bam_txn->rx_sgl_start = 0; + bam_txn->last_data_desc = NULL; + bam_txn->wait_second_completion = false; sg_init_table(bam_txn->cmd_sgl, nandc->max_cwperpage * QPIC_PER_CW_CMD_SGL); sg_init_table(bam_txn->data_sgl, nandc->max_cwperpage * QPIC_PER_CW_DATA_SGL); + + reinit_completion(&bam_txn->txn_done); +} + +/* Callback for DMA descriptor completion */ +static void qpic_bam_dma_done(void *data) +{ + struct bam_transaction *bam_txn = data; + + /* + * In case of data transfer with NAND, 2 callbacks will be generated. + * One for command channel and another one for data channel. + * If current transaction has data descriptors + * (i.e. wait_second_completion is true), then set this to false + * and wait for second DMA descriptor completion. + */ + if (bam_txn->wait_second_completion) + bam_txn->wait_second_completion = false; + else + complete(&bam_txn->txn_done); } static inline struct qcom_nand_host *to_qcom_nand_host(struct nand_chip *chip) @@ -756,6 +791,12 @@ static int prepare_bam_async_desc(struct qcom_nand_controller *nandc, desc->dma_desc = dma_desc; + /* update last data/command descriptor */ + if (chan == nandc->cmd_chan) + bam_txn->last_cmd_desc = dma_desc; + else + bam_txn->last_data_desc = dma_desc; + list_add_tail(&desc->node, &nandc->desc_list); return 0; @@ -1273,10 +1314,20 @@ static int submit_descs(struct qcom_nand_controller *nandc) cookie = dmaengine_submit(desc->dma_desc); if (nandc->props->is_bam) { + bam_txn->last_cmd_desc->callback = qpic_bam_dma_done; + bam_txn->last_cmd_desc->callback_param = bam_txn; + if (bam_txn->last_data_desc) { + bam_txn->last_data_desc->callback = qpic_bam_dma_done; + bam_txn->last_data_desc->callback_param = bam_txn; + bam_txn->wait_second_completion = true; + } + dma_async_issue_pending(nandc->tx_chan); dma_async_issue_pending(nandc->rx_chan); + dma_async_issue_pending(nandc->cmd_chan); - if (dma_sync_wait(nandc->cmd_chan, cookie) != DMA_COMPLETE) + if (!wait_for_completion_timeout(&bam_txn->txn_done, + QPIC_NAND_COMPLETION_TIMEOUT)) return -ETIMEDOUT; } else { if (dma_sync_wait(nandc->chan, cookie) != DMA_COMPLETE) -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

7 years, 3 months

1
0
0 0

[PATCH] printk/nmi: Prevent deadlock when serializing NMI backtraces

by Petr Mladek

The commit 719f6a7040f1bdaf96fcc ("printk: Use the main logbuf in NMI when logbuf_lock is available") tried to detect when logbuf_lock was taken on another CPU. Then it looked safe to wait for the lock even in NMI. It would be safe if other locks were not involved. Ironically the same commit introduced an ABBA deadlock scenario. It added a spin lock into nmi_cpu_backtrace() to serialize logs from different CPUs. The effect is that also the NMI handlers are serialized. As a result, logbuf_lock might be blocked by NMI on another CPU: CPU0 CPU1 CPU2 printk() vprintk_emit() spin_lock(&logbuf_lock) trigger_all_cpu_backtrace() raise() nmi_enter() printk_nmi_enter() if (this_cpu_read(printk_context) & PRINTK_SAFE_CONTEXT_MASK) // false else // looks safe to use printk_deferred() this_cpu_or(printk_context, PRINTK_NMI_DEFERRED_CONTEXT_MASK); nmi_cpu_backtrace() arch_spin_lock(&lock); show_regs() nmi_enter() nmi_cpu_backtrace() arch_spin_lock(&lock); printk() vprintk_func() vprintk_deferred() vprintk_emit() spin_lock(&logbuf_lock) DEADLOCK: between &logbuf_lock from vprintk_emit() and &lock from nmi_cpu_backtrace(). CPU0 CPU1 lock(logbuf_lock) lock(lock) lock(lock) lock(logbuf_lock) I have found this problem when stress testing trigger_all_cpu_backtrace() and the system frozen. Note that lockdep is not able to detect these dependencies because there is no support for NMI context. Let's stay on the safe side and always use printk_safe buffers when logbuf_lock is taken when entering NMI. Fixes: 719f6a7040f1bdaf96fcc ("printk: Use the main logbuf in NMI when logbuf_lock is available") Cc: 4.13+ <stable(a)vger.kernel.org> # v4.13+ Signed-off-by: Petr Mladek <pmladek(a)suse.com> --- kernel/printk/printk_safe.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c index 449d67edfa4b..a2ebd749c053 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -310,15 +310,12 @@ void printk_nmi_enter(void) { /* * The size of the extra per-CPU buffer is limited. Use it only when - * the main one is locked. If this CPU is not in the safe context, - * the lock must be taken on another CPU and we could wait for it. + * the main one is locked. */ - if ((this_cpu_read(printk_context) & PRINTK_SAFE_CONTEXT_MASK) && - raw_spin_is_locked(&logbuf_lock)) { + if (raw_spin_is_locked(&logbuf_lock)) this_cpu_or(printk_context, PRINTK_NMI_CONTEXT_MASK); - } else { + else this_cpu_or(printk_context, PRINTK_NMI_DEFERRED_CONTEXT_MASK); - } } void printk_nmi_exit(void) -- 2.13.6

7 years, 3 months

4
21
0 0

Re: [PATCH 3.18 00/21] 3.18.113-stable review

by Greg Kroah-Hartman

On Tue, Jun 12, 2018 at 03:08:12PM -0700, kernelci.org bot wrote: > stable-rc/linux-3.18.y boot: 52 boots: 28 failed, 18 passed with 1 offline, 5 conflicts (v3.18.112-22-gb0582263e3c9) > > Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-3.18.y/kernel/v3.1… > Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-3.18.y/kernel/v3.18.112-2… > > Tree: stable-rc > Branch: linux-3.18.y > Git Describe: v3.18.112-22-gb0582263e3c9 > Git Commit: b0582263e3c9810fd887ca92d19cb9ff30a4d9f6 > Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git > Tested: 24 unique boards, 12 SoC families, 13 builds out of 183 > > Boot Regressions Detected: > > arm: > > bcm2835_defconfig: > bcm2835-rpi-b: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > davinci_all_defconfig: > dm365evm,legacy: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > exynos_defconfig: > exynos5800-peach-pi: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > imx_v6_v7_defconfig: > imx6dl-wandboard_dual: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > imx6dl-wandboard_solo: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > imx6q-wandboard: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > multi_v7_defconfig: > am335x-boneblack: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > armada-xp-openblocks-ax3-4: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > exynos5800-peach-pi: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > imx6dl-wandboard_dual: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > imx6dl-wandboard_solo: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > imx6q-wandboard: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > omap3-beagle: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > omap3-beagle-xm: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > omap4-panda: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > sun4i-a10-cubieboard: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > sun7i-a20-cubietruck: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > tegra124-jetson-tk1: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > tegra20-iris-512: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > tegra30-beaver: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > zynq-zc702: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > mvebu_v7_defconfig: > armada-xp-openblocks-ax3-4: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > omap2plus_defconfig: > am335x-boneblack: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > omap3-beagle: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > omap3-beagle-xm: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > omap3-beagle-xm,legacy: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > omap4-panda: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > sama5_defconfig: > at91-sama5d4ek: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > sunxi_defconfig: > sun4i-a10-cubieboard: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > sun7i-a20-cubietruck: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > > tegra_defconfig: > tegra124-jetson-tk1: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > tegra20-iris-512: > lab-baylibre-seattle: new failure (last pass: v3.18.112) > tegra30-beaver: > lab-baylibre-seattle: new failure (last pass: v3.18.112) That is a lot of new failures, did the whole lab fail, or is this really a problem in v3.18.112 here? thanks, greg k-h

7 years, 3 months

3
4
0 0

[PATCH v3] target: fix truncated PR-in ReadKeys response

by David Disseldorp

SPC5r17 states that the contents of the ADDITIONAL LENGTH field are not altered based on the allocation length, so always calculate and pack the full key list length even if the list itself is truncated. According to Maged: Yes it fixes the "Storage Spaces Persistent Reservation" test in the Windows 2016 Server Failover Cluster validation suites when having many connections that result in more than 8 registrations. I tested your patch on 4.17 with iblock. This behaviour can be tested using the libiscsi PrinReadKeys.Truncate test. Cc: stable(a)vger.kernel.org Signed-off-by: David Disseldorp <ddiss(a)suse.de> Reviewed-by: Mike Christie <mchristi(a)redhat.com> Tested-by: Maged Mokhtar <mmokhtar(a)petasan.org> Reviewed-by: Christoph Hellwig <hch(a)lst.de> --- Changes since v2: * drop unnecessary braces * add Christoph's Reviewed-by Changes since v1: * CC stable * mention Maged's Windows PR test fix comment in commit message * add Reviewed-by and Tested-by tags drivers/target/target_core_pr.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 01ac306131c1..10db5656fd5d 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c @@ -3727,11 +3727,16 @@ core_scsi3_pri_read_keys(struct se_cmd *cmd) * Check for overflow of 8byte PRI READ_KEYS payload and * next reservation key list descriptor. */ - if ((add_len + 8) > (cmd->data_length - 8)) - break; - - put_unaligned_be64(pr_reg->pr_res_key, &buf[off]); - off += 8; + if (off + 8 <= cmd->data_length) { + put_unaligned_be64(pr_reg->pr_res_key, &buf[off]); + off += 8; + } + /* + * SPC5r17: 6.16.2 READ KEYS service action + * The ADDITIONAL LENGTH field indicates the number of bytes in + * the Reservation key list. The contents of the ADDITIONAL + * LENGTH field are not altered based on the allocation length + */ add_len += 8; } spin_unlock(&dev->t10_pr.registration_lock); -- 2.13.7

7 years, 3 months

2
1
0 0

[PATCH] scsi: sd: Optimal I/O size should be a multiple of physical block size

by Martin K. Petersen

It was reported that some devices report an OPTIMAL TRANSFER LENGTH of 0xFFFF blocks. That looks bogus, especially for a device with a 4096-byte physical block size. Ignore OPTIMAL TRANSFER LENGTH if it is not a multiple of the device's reported physical block size. Cc: <stable(a)vger.kernel.org> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199759 Reported-by: Christoph Anton Mitterer <calestyo(a)scientia.net> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> --- Before: NAME ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC ROTA SCHED RQ-SIZE RA WSAME sda 0 4096 33553920 4096 512 0 mq-deadline 256 128 32M After: NAME ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC ROTA SCHED RQ-SIZE RA WSAME sda 0 4096 0 4096 512 0 mq-deadline 256 4096 32M --- drivers/scsi/sd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 9421d9877730..2d19eed3dfbc 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3067,7 +3067,7 @@ static int sd_revalidate_disk(struct gendisk *disk) struct request_queue *q = sdkp->disk->queue; sector_t old_capacity = sdkp->capacity; unsigned char *buffer; - unsigned int dev_max, rw_max; + unsigned int dev_max, rw_max, opt_xfer_bytes; SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_revalidate_disk\n")); @@ -3126,13 +3126,16 @@ static int sd_revalidate_disk(struct gendisk *disk) /* * Determine the device's preferred I/O size for reads and writes - * unless the reported value is unreasonably small, large, or - * garbage. + * unless the reported value is unreasonably small, large, not a + * multiple of the physical block size, or simply garbage. */ + opt_xfer_bytes = logical_to_bytes(sdp, sdkp->opt_xfer_blocks); + if (sdkp->opt_xfer_blocks && sdkp->opt_xfer_blocks <= dev_max && sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS && - logical_to_bytes(sdp, sdkp->opt_xfer_blocks) >= PAGE_SIZE) { + opt_xfer_bytes >= PAGE_SIZE && + (opt_xfer_bytes & (sdkp->physical_block_size - 1)) != 0) { q->limits.io_opt = logical_to_bytes(sdp, sdkp->opt_xfer_blocks); rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks); } else -- 2.17.1

7 years, 3 months

1
1
0 0

[PATCH v3 4/7] vmw_balloon: fix VMCI use when balloon built into kernel

by Nadav Amit

Currently, when all modules, including VMCI and VMware balloon are built into the kernel, the initialization of the balloon happens before the VMCI is probed. As a result, the balloon fails to initialize the VMCI doorbell, which it uses to get asynchronous requests for balloon size changes. The problem can be seen in the logs, in the form of the following message: "vmw_balloon: failed to initialize vmci doorbell" The driver would work correctly but slightly less efficiently, probing for requests periodically. This patch changes the balloon to be initialized using late_initcall() instead of module_init() to address this issue. It does not address a situation in which VMCI is built as a module and the balloon is built into the kernel. Fixes: 48e3d668b790 ("VMware balloon: Enable notification via VMCI") Cc: stable(a)vger.kernel.org Reviewed-by: Xavier Deguillard <xdeguillard(a)vmware.com> Signed-off-by: Nadav Amit <namit(a)vmware.com> --- drivers/misc/vmw_balloon.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index a7df4c24a28d..e7cfc85f6961 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -1297,7 +1297,14 @@ static int __init vmballoon_init(void) return 0; } -module_init(vmballoon_init); + +/* + * Using late_initcall() instead of module_init() allows the balloon to use the + * VMCI doorbell even when the balloon is built into the kernel. Otherwise the + * VMCI is probed only after the balloon is initialized. If the balloon is used + * as a module, late_initcall() is equivalent to module_init(). + */ +late_initcall(vmballoon_init); static void __exit vmballoon_exit(void) { -- 2.17.0

7 years, 3 months

1
0
0 0

[PATCH v3 3/7] vmw_balloon: VMCI_DOORBELL_SET does not check status

by Nadav Amit

When vmballoon_vmci_init() sets a doorbell using VMCI_DOORBELL_SET, for some reason it does not consider the status and looks at the result. However, the hypervisor does not update the result - it updates the status. This might cause VMCI doorbell not to be enabled, resulting in degraded performance. Fixes: 48e3d668b790 ("VMware balloon: Enable notification via VMCI") Cc: stable(a)vger.kernel.org Reviewed-by: Xavier Deguillard <xdeguillard(a)vmware.com> Signed-off-by: Nadav Amit <namit(a)vmware.com> --- drivers/misc/vmw_balloon.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 60ab83d3d0ef..a7df4c24a28d 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -1036,29 +1036,30 @@ static void vmballoon_vmci_cleanup(struct vmballoon *b) */ static int vmballoon_vmci_init(struct vmballoon *b) { - int error = 0; + unsigned long error, dummy; - if ((b->capabilities & VMW_BALLOON_SIGNALLED_WAKEUP_CMD) != 0) { - error = vmci_doorbell_create(&b->vmci_doorbell, - VMCI_FLAG_DELAYED_CB, - VMCI_PRIVILEGE_FLAG_RESTRICTED, - vmballoon_doorbell, b); - - if (error == VMCI_SUCCESS) { - VMWARE_BALLOON_CMD(VMCI_DOORBELL_SET, - b->vmci_doorbell.context, - b->vmci_doorbell.resource, error); - STATS_INC(b->stats.doorbell_set); - } - } + if ((b->capabilities & VMW_BALLOON_SIGNALLED_WAKEUP_CMD) == 0) + return 0; - if (error != 0) { - vmballoon_vmci_cleanup(b); + error = vmci_doorbell_create(&b->vmci_doorbell, VMCI_FLAG_DELAYED_CB, + VMCI_PRIVILEGE_FLAG_RESTRICTED, + vmballoon_doorbell, b); - return -EIO; - } + if (error != VMCI_SUCCESS) + goto fail; + + error = VMWARE_BALLOON_CMD(VMCI_DOORBELL_SET, b->vmci_doorbell.context, + b->vmci_doorbell.resource, dummy); + + STATS_INC(b->stats.doorbell_set); + + if (error != VMW_BALLOON_SUCCESS) + goto fail; return 0; +fail: + vmballoon_vmci_cleanup(b); + return -EIO; } /* -- 2.17.0

7 years, 3 months

1
0
0 0

[PATCH v3 2/7] vmw_balloon: do not use 2MB without batching

by Nadav Amit

If the hypervisor sets 2MB batching is on, while batching is cleared, the balloon code breaks. In this case the legacy mechanism is used with 2MB page. The VM would report a 2MB page is ballooned, and the hypervisor would only take the first 4KB. While the hypervisor should not report such settings, make the code more robust by not enabling 2MB support without batching. Fixes: 365bd7ef7ec8e ("VMware balloon: Support 2m page ballooning.") Cc: stable(a)vger.kernel.org Reviewed-by: Xavier Deguillard <xdeguillard(a)vmware.com> Signed-off-by: Nadav Amit <nadav.amit(a)gmail.com> --- drivers/misc/vmw_balloon.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 28e77ab1e136..60ab83d3d0ef 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -341,7 +341,13 @@ static bool vmballoon_send_start(struct vmballoon *b, unsigned long req_caps) success = false; } - if (b->capabilities & VMW_BALLOON_BATCHED_2M_CMDS) + /* + * 2MB pages are only supported with batching. If batching is for some + * reason disabled, do not use 2MB pages, since otherwise the legacy + * mechanism is used with 2MB pages, causing a failure. + */ + if ((b->capabilities & VMW_BALLOON_BATCHED_2M_CMDS) && + (b->capabilities & VMW_BALLOON_BATCHED_CMDS)) b->supported_page_sizes = 2; else b->supported_page_sizes = 1; -- 2.17.0

7 years, 3 months

1
0
0 0

[PATCH v3 1/7] vmw_balloon: fix inflation of 64-bit GFNs

by Nadav Amit

When balloon batching is not supported by the hypervisor, the guest frame number (GFN) must fit in 32-bit. However, due to a bug, this check was mistakenly ignored. In practice, when total RAM is greater than 16TB, the balloon does not work currently, making this bug unlikely to happen. Fixes: ef0f8f112984 ("VMware balloon: partially inline vmballoon_reserve_page.") Cc: stable(a)vger.kernel.org Reviewed-by: Xavier Deguillard <xdeguillard(a)vmware.com> Signed-off-by: Nadav Amit <namit(a)vmware.com> --- drivers/misc/vmw_balloon.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index efd733472a35..28e77ab1e136 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -450,7 +450,7 @@ static int vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn, pfn32 = (u32)pfn; if (pfn32 != pfn) - return -1; + return -EINVAL; STATS_INC(b->stats.lock[false]); @@ -460,7 +460,7 @@ static int vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn, pr_debug("%s - ppn %lx, hv returns %ld\n", __func__, pfn, status); STATS_INC(b->stats.lock_fail[false]); - return 1; + return -EIO; } static int vmballoon_send_batched_lock(struct vmballoon *b, @@ -597,11 +597,12 @@ static int vmballoon_lock_page(struct vmballoon *b, unsigned int num_pages, locked = vmballoon_send_lock_page(b, page_to_pfn(page), &hv_status, target); - if (locked > 0) { + if (locked) { STATS_INC(b->stats.refused_alloc[false]); - if (hv_status == VMW_BALLOON_ERROR_RESET || - hv_status == VMW_BALLOON_ERROR_PPN_NOTNEEDED) { + if (locked == -EIO && + (hv_status == VMW_BALLOON_ERROR_RESET || + hv_status == VMW_BALLOON_ERROR_PPN_NOTNEEDED)) { vmballoon_free_page(page, false); return -EIO; } @@ -617,7 +618,7 @@ static int vmballoon_lock_page(struct vmballoon *b, unsigned int num_pages, } else { vmballoon_free_page(page, false); } - return -EIO; + return locked; } /* track allocated page */ -- 2.17.0

7 years, 3 months

1
0
0 0

+ slub-fix-__kmem_cache_empty-for-config_slub_debug.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: slub: fix __kmem_cache_empty for !CONFIG_SLUB_DEBUG has been added to the -mm tree. Its filename is slub-fix-__kmem_cache_empty-for-config_slub_debug.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/slub-fix-__kmem_cache_empty-for-co… and later at http://ozlabs.org/~akpm/mmotm/broken-out/slub-fix-__kmem_cache_empty-for-co… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Shakeel Butt <shakeelb(a)google.com> Subject: slub: fix __kmem_cache_empty for !CONFIG_SLUB_DEBUG f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") causes crashes when using slub, as described at http://lkml.kernel.org/r/CAHmME9rtoPwxUSnktxzKso14iuVCWT7BE_-_8PAC=pGw1iJnQ… For !CONFIG_SLUB_DEBUG, SLUB does not maintain the number of slabs allocated per node for a kmem_cache. Thus, slabs_node() in __kmem_cache_empty() will always return 0. So, in such situation, it is required to check per-cpu slabs to make sure if a kmem_cache is empty or not. Please note that __kmem_cache_shutdown() and __kmem_cache_shrink() are not affected by !CONFIG_SLUB_DEBUG as they call flush_all() to clear per-cpu slabs. Link: http://lkml.kernel.org/r/20180619213352.71740-1-shakeelb@google.com Link: http://lkml.kernel.org/r/CAHmME9rtoPwxUSnktxzKso14iuVCWT7BE_-_8PAC=pGw1iJnQ… Fixes: f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()") Signed-off-by: Shakeel Butt <shakeelb(a)google.com> Reported-by: Jason A. Donenfeld <Jason(a)zx2c4.com> Tested-by: Jason A. Donenfeld <Jason(a)zx2c4.com> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: David Rientjes <rientjes(a)google.com> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/slub.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff -puN mm/slub.c~slub-fix-__kmem_cache_empty-for-config_slub_debug mm/slub.c --- a/mm/slub.c~slub-fix-__kmem_cache_empty-for-config_slub_debug +++ a/mm/slub.c @@ -3673,9 +3673,23 @@ static void free_partial(struct kmem_cac bool __kmem_cache_empty(struct kmem_cache *s) { - int node; + int cpu, node; struct kmem_cache_node *n; + /* + * slabs_node will always be 0 for !CONFIG_SLUB_DEBUG. So, manually + * check slabs for all cpus. + */ + if (!IS_ENABLED(CONFIG_SLUB_DEBUG)) { + for_each_online_cpu(cpu) { + struct kmem_cache_cpu *c; + + c = per_cpu_ptr(s->cpu_slab, cpu); + if (c->page || slub_percpu_partial(c)) + return false; + } + } + for_each_kmem_cache_node(s, node, n) if (n->nr_partial || slabs_node(s, node)) return false; _ Patches currently in -mm which might be from shakeelb(a)google.com are slub-fix-__kmem_cache_empty-for-config_slub_debug.patch

7 years, 3 months

1
0
0 0

[to-be-updated] mm-devm_memremap_pages-handle-errors-allocating-final-devres-action.patch removed from -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: mm, devm_memremap_pages: handle errors allocating final devres action has been removed from the -mm tree. Its filename was mm-devm_memremap_pages-handle-errors-allocating-final-devres-action.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Dan Williams <dan.j.williams(a)intel.com> Subject: mm, devm_memremap_pages: handle errors allocating final devres action The last step before devm_memremap_pages() returns success is to allocate a release action to tear the entire setup down. However, the result from devm_add_action() is not checked. Checking the error also means that we need to handle the fact that the percpu_ref may not be killed by the time devm_memremap_pages_release() runs. Add a new state flag for this case. Without this change we could fail to register the teardown of devm_memremap_pages(). The likelihood of hitting this failure is tiny as small memory allocations almost always succeed. However, the impact of the failure is large given any future reconfiguration, or disable/enable, of an nvdimm namespace will fail forever as subsequent calls to devm_memremap_pages() will fail to setup the pgmap_radix since there will be stale entries for the physical address range. Link: http://lkml.kernel.org/r/152694212460.5484.13180030631810166467.stgit@dwill… Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...") Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Cc: "Jérôme Glisse" <jglisse(a)redhat.com> Cc: Logan Gunthorpe <logang(a)deltatee.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- include/linux/memremap.h | 1 + kernel/memremap.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff -puN include/linux/memremap.h~mm-devm_memremap_pages-handle-errors-allocating-final-devres-action include/linux/memremap.h --- a/include/linux/memremap.h~mm-devm_memremap_pages-handle-errors-allocating-final-devres-action +++ a/include/linux/memremap.h @@ -115,6 +115,7 @@ struct dev_pagemap { dev_page_free_t page_free; struct vmem_altmap altmap; bool altmap_valid; + bool registered; struct resource res; struct percpu_ref *ref; struct device *dev; diff -puN kernel/memremap.c~mm-devm_memremap_pages-handle-errors-allocating-final-devres-action kernel/memremap.c --- a/kernel/memremap.c~mm-devm_memremap_pages-handle-errors-allocating-final-devres-action +++ a/kernel/memremap.c @@ -124,7 +124,7 @@ static void devm_memremap_pages_release( for_each_device_pfn(pfn, pgmap) put_page(pfn_to_page(pfn)); - if (percpu_ref_tryget_live(pgmap->ref)) { + if (pgmap->registered && percpu_ref_tryget_live(pgmap->ref)) { dev_WARN(dev, "%s: page mapping is still live!\n", __func__); percpu_ref_put(pgmap->ref); } @@ -246,7 +246,11 @@ void *devm_memremap_pages(struct device percpu_ref_get(pgmap->ref); } - devm_add_action(dev, devm_memremap_pages_release, pgmap); + error = devm_add_action_or_reset(dev, devm_memremap_pages_release, + pgmap); + if (error) + return ERR_PTR(error); + pgmap->registered = true; return __va(res->start); _ Patches currently in -mm which might be from dan.j.williams(a)intel.com are mm-hmm-use-devm-semantics-for-hmm_devmem_add-remove.patch mm-hmm-replace-hmm_devmem_pages_create-with-devm_memremap_pages.patch mm-hmm-mark-hmm_devmem_add-add_resource-export_symbol_gpl.patch

7 years, 3 months

1
0
0 0

[PATCH 4.4 1/2] Revert "Btrfs: fix scrub to repair raid6 corruption"

by Sasha Levin

This reverts commit 95b286daf7ba784191023ad110122703eb2ebabc. This commit used an incorrect log message. Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- fs/btrfs/raid56.c | 18 ++++-------------- fs/btrfs/volumes.c | 9 +-------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index b9fa99577bf7..1a33d3eb36de 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -2160,21 +2160,11 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio, } /* - * Loop retry: - * for 'mirror == 2', reconstruct from all other stripes. - * for 'mirror_num > 2', select a stripe to fail on every retry. + * reconstruct from the q stripe if they are + * asking for mirror 3 */ - if (mirror_num > 2) { - /* - * 'mirror == 3' is to fail the p stripe and - * reconstruct from the q stripe. 'mirror > 3' is to - * fail a data stripe and reconstruct from p+q stripe. - */ - rbio->failb = rbio->real_stripes - (mirror_num - 1); - ASSERT(rbio->failb > 0); - if (rbio->failb <= rbio->faila) - rbio->failb--; - } + if (mirror_num == 3) + rbio->failb = rbio->real_stripes - 2; ret = lock_stripe_add(rbio); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b4d63a9842fa..ed75d70b4bc2 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5056,14 +5056,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) else if (map->type & BTRFS_BLOCK_GROUP_RAID5) ret = 2; else if (map->type & BTRFS_BLOCK_GROUP_RAID6) - /* - * There could be two corrupted data stripes, we need - * to loop retry in order to rebuild the correct data. - * - * Fail a stripe at a time on every retry except the - * stripe under reconstruction. - */ - ret = map->num_stripes; + ret = 3; else ret = 1; free_extent_map(em); -- 2.17.1

7 years, 3 months

2
5
0 0

[PATCH 4.4 1/2] Revert "Btrfs: fix scrub to repair raid6 corruption"

by Sasha Levin

This reverts commit 95b286daf7ba784191023ad110122703eb2ebabc. This commit used an incorrect log message. Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- fs/btrfs/raid56.c | 18 ++++-------------- fs/btrfs/volumes.c | 9 +-------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index b9fa99577bf7..1a33d3eb36de 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -2160,21 +2160,11 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio, } /* - * Loop retry: - * for 'mirror == 2', reconstruct from all other stripes. - * for 'mirror_num > 2', select a stripe to fail on every retry. + * reconstruct from the q stripe if they are + * asking for mirror 3 */ - if (mirror_num > 2) { - /* - * 'mirror == 3' is to fail the p stripe and - * reconstruct from the q stripe. 'mirror > 3' is to - * fail a data stripe and reconstruct from p+q stripe. - */ - rbio->failb = rbio->real_stripes - (mirror_num - 1); - ASSERT(rbio->failb > 0); - if (rbio->failb <= rbio->faila) - rbio->failb--; - } + if (mirror_num == 3) + rbio->failb = rbio->real_stripes - 2; ret = lock_stripe_add(rbio); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b4d63a9842fa..ed75d70b4bc2 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5056,14 +5056,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) else if (map->type & BTRFS_BLOCK_GROUP_RAID5) ret = 2; else if (map->type & BTRFS_BLOCK_GROUP_RAID6) - /* - * There could be two corrupted data stripes, we need - * to loop retry in order to rebuild the correct data. - * - * Fail a stripe at a time on every retry except the - * stripe under reconstruction. - */ - ret = map->num_stripes; + ret = 3; else ret = 1; free_extent_map(em); -- 2.17.1

7 years, 3 months

1
1
0 0

[PATCH 4.9 1/2] Revert "Btrfs: fix scrub to repair raid6 corruption"

by Sasha Levin

This reverts commit 186a6519dc94964a4c5c68fca482f20f71551f26. This commit used an incorrect log message. Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- fs/btrfs/raid56.c | 18 ++++-------------- fs/btrfs/volumes.c | 9 +-------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index af6a776fa18c..d016d4a79864 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -2161,21 +2161,11 @@ int raid56_parity_recover(struct btrfs_root *root, struct bio *bio, } /* - * Loop retry: - * for 'mirror == 2', reconstruct from all other stripes. - * for 'mirror_num > 2', select a stripe to fail on every retry. + * reconstruct from the q stripe if they are + * asking for mirror 3 */ - if (mirror_num > 2) { - /* - * 'mirror == 3' is to fail the p stripe and - * reconstruct from the q stripe. 'mirror > 3' is to - * fail a data stripe and reconstruct from p+q stripe. - */ - rbio->failb = rbio->real_stripes - (mirror_num - 1); - ASSERT(rbio->failb > 0); - if (rbio->failb <= rbio->faila) - rbio->failb--; - } + if (mirror_num == 3) + rbio->failb = rbio->real_stripes - 2; ret = lock_stripe_add(rbio); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 76017e1b3c0f..c2495cde26f6 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5186,14 +5186,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) else if (map->type & BTRFS_BLOCK_GROUP_RAID5) ret = 2; else if (map->type & BTRFS_BLOCK_GROUP_RAID6) - /* - * There could be two corrupted data stripes, we need - * to loop retry in order to rebuild the correct data. - * - * Fail a stripe at a time on every retry except the - * stripe under reconstruction. - */ - ret = map->num_stripes; + ret = 3; else ret = 1; free_extent_map(em); -- 2.17.1

7 years, 3 months

1
1
0 0

[PATCH 4.14 1/3] Revert "Btrfs: fix scrub to repair raid6 corruption"

by Sasha Levin

This reverts commit d91bb7c6988bd6450284c762b33f2e1ea3fe7c97. This commit used an incorrect log message. Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- fs/btrfs/raid56.c | 18 ++++-------------- fs/btrfs/volumes.c | 9 +-------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 2e995e565633..d1bda68a3386 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -2172,21 +2172,11 @@ int raid56_parity_recover(struct btrfs_fs_info *fs_info, struct bio *bio, } /* - * Loop retry: - * for 'mirror == 2', reconstruct from all other stripes. - * for 'mirror_num > 2', select a stripe to fail on every retry. + * reconstruct from the q stripe if they are + * asking for mirror 3 */ - if (mirror_num > 2) { - /* - * 'mirror == 3' is to fail the p stripe and - * reconstruct from the q stripe. 'mirror > 3' is to - * fail a data stripe and reconstruct from p+q stripe. - */ - rbio->failb = rbio->real_stripes - (mirror_num - 1); - ASSERT(rbio->failb > 0); - if (rbio->failb <= rbio->faila) - rbio->failb--; - } + if (mirror_num == 3) + rbio->failb = rbio->real_stripes - 2; ret = lock_stripe_add(rbio); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 08afafb6ecf7..69bc37a87c5a 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5110,14 +5110,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) else if (map->type & BTRFS_BLOCK_GROUP_RAID5) ret = 2; else if (map->type & BTRFS_BLOCK_GROUP_RAID6) - /* - * There could be two corrupted data stripes, we need - * to loop retry in order to rebuild the correct data. - * - * Fail a stripe at a time on every retry except the - * stripe under reconstruction. - */ - ret = map->num_stripes; + ret = 3; else ret = 1; free_extent_map(em); -- 2.17.1

7 years, 3 months

1
2
0 0

[PATCH] Input elan_i2c_smbus - Fix more potential stack buffer overflows

by Ben Hutchings

Commit 40f7090bb1b4 ("Input: elan_i2c_smbus - fix corrupted stack") fixed most of the functions using i2c_smbus_read_block_data() to allocate a buffer with the maximum block size. However three functions were left unchanged: * In elan_smbus_initialize(), increase the buffer size in the same way. * In elan_smbus_calibrate_result(), the buffer is provided by the caller (calibrate_store()), so introduce a bounce buffer. Also name the result buffer size. * In elan_smbus_get_report(), the buffer is provided by the caller but happens to be the right length. Add a compile-time assertion to ensure this remains the case. Cc: <stable(a)vger.kernel.org> # 3.19+ Signed-off-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> --- This is compile-tested only. Ben. drivers/input/mouse/elan_i2c.h | 2 ++ drivers/input/mouse/elan_i2c_core.c | 2 +- drivers/input/mouse/elan_i2c_smbus.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/input/mouse/elan_i2c.h b/drivers/input/mouse/elan_i2c.h index 599544c1a91c..243e0fa6e3e3 100644 --- a/drivers/input/mouse/elan_i2c.h +++ b/drivers/input/mouse/elan_i2c.h @@ -27,6 +27,8 @@ #define ETP_DISABLE_POWER 0x0001 #define ETP_PRESSURE_OFFSET 25 +#define ETP_CALIBRATE_MAX_LEN 3 + /* IAP Firmware handling */ #define ETP_PRODUCT_ID_FORMAT_STRING "%d.0" #define ETP_FW_NAME "elan_i2c_" ETP_PRODUCT_ID_FORMAT_STRING ".bin" diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 75e757520ef0..d5f74dd7e23b 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -610,7 +610,7 @@ static ssize_t calibrate_store(struct device *dev, int tries = 20; int retval; int error; - u8 val[3]; + u8 val[ETP_CALIBRATE_MAX_LEN]; retval = mutex_lock_interruptible(&data->sysfs_mutex); if (retval) diff --git a/drivers/input/mouse/elan_i2c_smbus.c b/drivers/input/mouse/elan_i2c_smbus.c index cfcb32559925..c060d270bc4d 100644 --- a/drivers/input/mouse/elan_i2c_smbus.c +++ b/drivers/input/mouse/elan_i2c_smbus.c @@ -56,7 +56,7 @@ static int elan_smbus_initialize(struct i2c_client *client) { u8 check[ETP_SMBUS_HELLOPACKET_LEN] = { 0x55, 0x55, 0x55, 0x55, 0x55 }; - u8 values[ETP_SMBUS_HELLOPACKET_LEN] = { 0, 0, 0, 0, 0 }; + u8 values[I2C_SMBUS_BLOCK_MAX] = {0}; int len, error; /* Get hello packet */ @@ -117,12 +117,16 @@ static int elan_smbus_calibrate(struct i2c_client *client) static int elan_smbus_calibrate_result(struct i2c_client *client, u8 *val) { int error; + u8 buf[I2C_SMBUS_BLOCK_MAX] = {0}; + + BUILD_BUG_ON(ETP_CALIBRATE_MAX_LEN > sizeof(buf)); error = i2c_smbus_read_block_data(client, - ETP_SMBUS_CALIBRATE_QUERY, val); + ETP_SMBUS_CALIBRATE_QUERY, buf); if (error < 0) return error; + memcpy(val, buf, ETP_CALIBRATE_MAX_LEN); return 0; } @@ -472,6 +476,8 @@ static int elan_smbus_get_report(struct i2c_client *client, u8 *report) { int len; + BUILD_BUG_ON(I2C_SMBUS_BLOCK_MAX > ETP_SMBUS_REPORT_LEN); + len = i2c_smbus_read_block_data(client, ETP_SMBUS_PACKET_QUERY, &report[ETP_SMBUS_REPORT_OFFSET]); -- Ben Hutchings, Software Developer Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom

7 years, 3 months

3
2
0 0

[PATCH 4.4, 4.9] ipv4: Fix error return value in fib_convert_metrics()

by Ben Hutchings

The validation code modified by commit 5b5e7a0de2bb ("net: metrics: add proper netlink validation") is organised differently in older kernel versions. The fib_convert_metrics() function that is modified in the backports to 4.4 and 4.9 needs to returns an error code, not a success flag. Signed-off-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> --- net/ipv4/fib_semantics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 9d144cbd4e62..03ebff3950d8 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -980,7 +980,7 @@ fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg) return -EINVAL; } else { if (nla_len(nla) != sizeof(u32)) - return false; + return -EINVAL; val = nla_get_u32(nla); } if (type == RTAX_ADVMSS && val > 65535 - 40) -- Ben Hutchings, Software Developer Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom

7 years, 3 months

1
0
0 0

[PATCH] net: ethernet: fix suspend/resume in davinci_emac

by Bartosz Golaszewski

From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> This patch reverts commit 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") and adds a comment which should stop anyone from reintroducing the same "fix" in the future. We can't use bus_find_device_by_name() here because the device name is not guaranteed to be 'davinci_mdio'. On some systems it can be 'davinci_mdio.0' so we need to use strncmp() against the first part of the string to correctly match it. Fixes: 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") Cc: stable(a)vger.kernel.org Signed-off-by: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> --- drivers/net/ethernet/ti/davinci_emac.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 06d7c9e4dcda..a1a6445b5a7e 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1385,6 +1385,11 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) return -EOPNOTSUPP; } +static int match_first_device(struct device *dev, void *data) +{ + return !strncmp(dev_name(dev), "davinci_mdio", 12); +} + /** * emac_dev_open - EMAC device open * @ndev: The DaVinci EMAC network adapter @@ -1484,8 +1489,14 @@ static int emac_dev_open(struct net_device *ndev) /* use the first phy on the bus if pdata did not give us a phy id */ if (!phydev && !priv->phy_id) { - phy = bus_find_device_by_name(&mdio_bus_type, NULL, - "davinci_mdio"); + /* NOTE: we can't use bus_find_device_by_name() here because + * the device name is not guaranteed to be 'davinci_mdio'. On + * some systems it can be 'davinci_mdio.0' so we need to use + * strncmp() against the first part of the string to correctly + * match it. + */ + phy = bus_find_device(&mdio_bus_type, NULL, NULL, + match_first_device); if (phy) { priv->phy_id = dev_name(phy); if (!priv->phy_id || !*priv->phy_id) -- 2.17.1

7 years, 3 months

2
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror