March 2019 - Linux-stable-mirror

[patch 06/22] mm/hotplug: fix offline undo_isolate_page_range()

by akpm＠linux-foundation.org

From: Qian Cai <cai(a)lca.pw> Subject: mm/hotplug: fix offline undo_isolate_page_range() f1dd2cd13c4b ("mm, memory_hotplug: do not associate hotadded memory to zones until online") introduced move_pfn_range_to_zone() which calls memmap_init_zone() during onlining a memory block. memmap_init_zone() will reset pagetype flags and makes migrate type to be MOVABLE. However, in __offline_pages(), it also call undo_isolate_page_range() after offline_isolated_pages() to do the same thing. Due to 2ce13640b3f4 ("mm: __first_valid_page skip over offline pages") changed __first_valid_page() to skip offline pages, undo_isolate_page_range() here just waste CPU cycles looping around the offlining PFN range while doing nothing, because __first_valid_page() will return NULL as offline_isolated_pages() has already marked all memory sections within the pfn range as offline via offline_mem_sections(). Also, after calling the "useless" undo_isolate_page_range() here, it reaches the point of no returning by notifying MEM_OFFLINE. Those pages will be marked as MIGRATE_MOVABLE again once onlining. The only thing left to do is to decrease the number of isolated pageblocks zone counter which would make some paths of the page allocation slower that the above commit introduced. Even if alloc_contig_range() can be used to isolate 16GB-hugetlb pages on ppc64, an "int" should still be enough to represent the number of pageblocks there. Fix an incorrect comment along the way. [cai(a)lca.pw: v4] Link: http://lkml.kernel.org/r/20190314150641.59358-1-cai@lca.pw Link: http://lkml.kernel.org/r/20190313143133.46200-1-cai@lca.pw Fixes: 2ce13640b3f4 ("mm: __first_valid_page skip over offline pages") Signed-off-by: Qian Cai <cai(a)lca.pw> Acked-by: Michal Hocko <mhocko(a)suse.com> Reviewed-by: Oscar Salvador <osalvador(a)suse.de> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: <stable(a)vger.kernel.org> [4.13+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- include/linux/page-isolation.h | 10 ------ mm/memory_hotplug.c | 17 ++++++++-- mm/page_alloc.c | 2 - mm/page_isolation.c | 48 +++++++++++++++++++------------ mm/sparse.c | 2 - 5 files changed, 45 insertions(+), 34 deletions(-) --- a/include/linux/page-isolation.h~mm-hotplug-fix-offline-undo_isolate_page_range +++ a/include/linux/page-isolation.h @@ -41,16 +41,6 @@ int move_freepages_block(struct zone *zo /* * Changes migrate type in [start_pfn, end_pfn) to be MIGRATE_ISOLATE. - * If specified range includes migrate types other than MOVABLE or CMA, - * this will fail with -EBUSY. - * - * For isolating all pages in the range finally, the caller have to - * free all pages in the range. test_page_isolated() can be used for - * test it. - * - * The following flags are allowed (they can be combined in a bit mask) - * SKIP_HWPOISON - ignore hwpoison pages - * REPORT_FAILURE - report details about the failure to isolate the range */ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, --- a/mm/memory_hotplug.c~mm-hotplug-fix-offline-undo_isolate_page_range +++ a/mm/memory_hotplug.c @@ -1576,7 +1576,7 @@ static int __ref __offline_pages(unsigne { unsigned long pfn, nr_pages; long offlined_pages; - int ret, node; + int ret, node, nr_isolate_pageblock; unsigned long flags; unsigned long valid_start, valid_end; struct zone *zone; @@ -1602,10 +1602,11 @@ static int __ref __offline_pages(unsigne ret = start_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE, SKIP_HWPOISON | REPORT_FAILURE); - if (ret) { + if (ret < 0) { reason = "failure to isolate range"; goto failed_removal; } + nr_isolate_pageblock = ret; arg.start_pfn = start_pfn; arg.nr_pages = nr_pages; @@ -1657,8 +1658,16 @@ static int __ref __offline_pages(unsigne /* Ok, all of our target is isolated. We cannot do rollback at this point. */ offline_isolated_pages(start_pfn, end_pfn); - /* reset pagetype flags and makes migrate type to be MOVABLE */ - undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE); + + /* + * Onlining will reset pagetype flags and makes migrate type + * MOVABLE, so just need to decrease the number of isolated + * pageblocks zone counter here. + */ + spin_lock_irqsave(&zone->lock, flags); + zone->nr_isolate_pageblock -= nr_isolate_pageblock; + spin_unlock_irqrestore(&zone->lock, flags); + /* removal success */ adjust_managed_page_count(pfn_to_page(start_pfn), -offlined_pages); zone->present_pages -= offlined_pages; --- a/mm/page_alloc.c~mm-hotplug-fix-offline-undo_isolate_page_range +++ a/mm/page_alloc.c @@ -8233,7 +8233,7 @@ int alloc_contig_range(unsigned long sta ret = start_isolate_page_range(pfn_max_align_down(start), pfn_max_align_up(end), migratetype, 0); - if (ret) + if (ret < 0) return ret; /* --- a/mm/page_isolation.c~mm-hotplug-fix-offline-undo_isolate_page_range +++ a/mm/page_isolation.c @@ -160,27 +160,36 @@ __first_valid_page(unsigned long pfn, un return NULL; } -/* - * start_isolate_page_range() -- make page-allocation-type of range of pages - * to be MIGRATE_ISOLATE. - * @start_pfn: The lower PFN of the range to be isolated. - * @end_pfn: The upper PFN of the range to be isolated. - * @migratetype: migrate type to set in error recovery. +/** + * start_isolate_page_range() - make page-allocation-type of range of pages to + * be MIGRATE_ISOLATE. + * @start_pfn: The lower PFN of the range to be isolated. + * @end_pfn: The upper PFN of the range to be isolated. + * start_pfn/end_pfn must be aligned to pageblock_order. + * @migratetype: Migrate type to set in error recovery. + * @flags: The following flags are allowed (they can be combined in + * a bit mask) + * SKIP_HWPOISON - ignore hwpoison pages + * REPORT_FAILURE - report details about the failure to + * isolate the range * * Making page-allocation-type to be MIGRATE_ISOLATE means free pages in * the range will never be allocated. Any free pages and pages freed in the - * future will not be allocated again. - * - * start_pfn/end_pfn must be aligned to pageblock_order. - * Return 0 on success and -EBUSY if any part of range cannot be isolated. + * future will not be allocated again. If specified range includes migrate types + * other than MOVABLE or CMA, this will fail with -EBUSY. For isolating all + * pages in the range finally, the caller have to free all pages in the range. + * test_page_isolated() can be used for test it. * * There is no high level synchronization mechanism that prevents two threads - * from trying to isolate overlapping ranges. If this happens, one thread + * from trying to isolate overlapping ranges. If this happens, one thread * will notice pageblocks in the overlapping range already set to isolate. * This happens in set_migratetype_isolate, and set_migratetype_isolate - * returns an error. We then clean up by restoring the migration type on - * pageblocks we may have modified and return -EBUSY to caller. This + * returns an error. We then clean up by restoring the migration type on + * pageblocks we may have modified and return -EBUSY to caller. This * prevents two threads from simultaneously working on overlapping ranges. + * + * Return: the number of isolated pageblocks on success and -EBUSY if any part + * of range cannot be isolated. */ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, unsigned migratetype, int flags) @@ -188,6 +197,7 @@ int start_isolate_page_range(unsigned lo unsigned long pfn; unsigned long undo_pfn; struct page *page; + int nr_isolate_pageblock = 0; BUG_ON(!IS_ALIGNED(start_pfn, pageblock_nr_pages)); BUG_ON(!IS_ALIGNED(end_pfn, pageblock_nr_pages)); @@ -196,13 +206,15 @@ int start_isolate_page_range(unsigned lo pfn < end_pfn; pfn += pageblock_nr_pages) { page = __first_valid_page(pfn, pageblock_nr_pages); - if (page && - set_migratetype_isolate(page, migratetype, flags)) { - undo_pfn = pfn; - goto undo; + if (page) { + if (set_migratetype_isolate(page, migratetype, flags)) { + undo_pfn = pfn; + goto undo; + } + nr_isolate_pageblock++; } } - return 0; + return nr_isolate_pageblock; undo: for (pfn = start_pfn; pfn < undo_pfn; --- a/mm/sparse.c~mm-hotplug-fix-offline-undo_isolate_page_range +++ a/mm/sparse.c @@ -567,7 +567,7 @@ void online_mem_sections(unsigned long s } #ifdef CONFIG_MEMORY_HOTREMOVE -/* Mark all memory sections within the pfn range as online */ +/* Mark all memory sections within the pfn range as offline */ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn) { unsigned long pfn; _

6 years, 2 months

1
0
0 0

[patch 05/22] fs/open.c: allow opening only regular files during execve()

by akpm＠linux-foundation.org

From: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> Subject: fs/open.c: allow opening only regular files during execve() syzbot is hitting lockdep warning [1] due to trying to open a fifo during an execve() operation. But we don't need to open non regular files during an execve() operation, for all files which we will need are the executable file itself and the interpreter programs like /bin/sh and ld-linux.so.2 . Since the manpage for execve(2) says that execve() returns EACCES when the file or a script interpreter is not a regular file, and the manpage for uselib(2) says that uselib() can return EACCES, and we use FMODE_EXEC when opening for execve()/uselib(), we can bail out if a non regular file is requested with FMODE_EXEC set. Since this deadlock followed by khungtaskd warnings is trivially reproducible by a local unprivileged user, and syzbot's frequent crash due to this deadlock defers finding other bugs, let's workaround this deadlock until we get a chance to find a better solution. [1] https://syzkaller.appspot.com/bug?id=b5095bfec44ec84213bac54742a82483aad578… Link: http://lkml.kernel.org/r/1552044017-7890-1-git-send-email-penguin-kernel@I-… Reported-by: syzbot <syzbot+e93a80c1bb7c5c56e522461c149f8bf55eab1b2b(a)syzkaller.appspotmail.com> Fixes: 8924feff66f35fe2 ("splice: lift pipe_lock out of splice_to_pipe()") Signed-off-by: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> Acked-by: Kees Cook <keescook(a)chromium.org> Cc: Al Viro <viro(a)zeniv.linux.org.uk> Cc: Eric Biggers <ebiggers3(a)gmail.com> Cc: Dmitry Vyukov <dvyukov(a)google.com> Cc: <stable(a)vger.kernel.org> [4.9+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- fs/open.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/fs/open.c~fs-allow-opening-only-regular-files-during-execve +++ a/fs/open.c @@ -733,6 +733,12 @@ static int do_dentry_open(struct file *f return 0; } + /* Any file opened for execve()/uselib() has to be a regular file. */ + if (unlikely(f->f_flags & FMODE_EXEC && !S_ISREG(inode->i_mode))) { + error = -EACCES; + goto cleanup_file; + } + if (f->f_mode & FMODE_WRITE && !special_file(inode->i_mode)) { error = get_write_access(inode); if (unlikely(error)) _

6 years, 2 months

1
0
0 0

[patch 02/22] mm/memory.c: fix modifying of page protection by insert_pfn()

by akpm＠linux-foundation.org

From: Jan Kara <jack(a)suse.cz> Subject: mm/memory.c: fix modifying of page protection by insert_pfn() Aneesh has reported that PPC triggers the following warning when excercising DAX code: [c00000000007610c] set_pte_at+0x3c/0x190 LR [c000000000378628] insert_pfn+0x208/0x280 Call Trace: [c0000002125df980] [8000000000000104] 0x8000000000000104 (unreliable) [c0000002125df9c0] [c000000000378488] insert_pfn+0x68/0x280 [c0000002125dfa30] [c0000000004a5494] dax_iomap_pte_fault.isra.7+0x734/0xa40 [c0000002125dfb50] [c000000000627250] __xfs_filemap_fault+0x280/0x2d0 [c0000002125dfbb0] [c000000000373abc] do_wp_page+0x48c/0xa40 [c0000002125dfc00] [c000000000379170] __handle_mm_fault+0x8d0/0x1fd0 [c0000002125dfd00] [c00000000037a9b0] handle_mm_fault+0x140/0x250 [c0000002125dfd40] [c000000000074bb0] __do_page_fault+0x300/0xd60 [c0000002125dfe20] [c00000000000acf4] handle_page_fault+0x18 Now that is WARN_ON in set_pte_at which is VM_WARN_ON(pte_hw_valid(*ptep) && !pte_protnone(*ptep)); The problem is that on some architectures set_pte_at() cannot cope with a situation where there is already some (different) valid entry present. Use ptep_set_access_flags() instead to modify the pfn which is built to deal with modifying existing PTE. Link: http://lkml.kernel.org/r/20190311084537.16029-1-jack@suse.cz Fixes: b2770da64254 "mm: add vm_insert_mixed_mkwrite()" Signed-off-by: Jan Kara <jack(a)suse.cz> Reported-by: "Aneesh Kumar K.V" <aneesh.kumar(a)linux.ibm.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> Acked-by: Dan Williams <dan.j.williams(a)intel.com> Cc: Chandan Rajendra <chandan(a)linux.ibm.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/memory.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- a/mm/memory.c~mm-fix-modifying-of-page-protection-by-insert_pfn +++ a/mm/memory.c @@ -1549,10 +1549,12 @@ static vm_fault_t insert_pfn(struct vm_a WARN_ON_ONCE(!is_zero_pfn(pte_pfn(*pte))); goto out_unlock; } - entry = *pte; - goto out_mkwrite; - } else - goto out_unlock; + entry = pte_mkyoung(*pte); + entry = maybe_mkwrite(pte_mkdirty(entry), vma); + if (ptep_set_access_flags(vma, addr, pte, entry, 1)) + update_mmu_cache(vma, addr, pte); + } + goto out_unlock; } /* Ok, finally just insert the thing.. */ @@ -1561,7 +1563,6 @@ static vm_fault_t insert_pfn(struct vm_a else entry = pte_mkspecial(pfn_t_pte(pfn, prot)); -out_mkwrite: if (mkwrite) { entry = pte_mkyoung(entry); entry = maybe_mkwrite(pte_mkdirty(entry), vma); _

6 years, 2 months

1
0
0 0

[PATCH v2 1/2] mtd: maps: physmap: Store gpio_values correctly

by Chris Packham

When the gpio-addr-flash.c driver was merged with physmap-core.c the code to store the current gpio_values was lost. This meant that once a gpio was asserted it was never de-asserted. Fix this by storing the current offset in gpio_values like the old driver used to. Fixes: commit ba32ce95cbd9 ("mtd: maps: Merge gpio-addr-flash.c into physmap-core.c") Cc: <stable(a)vger.kernel.org> Signed-off-by: Chris Packham <chris.packham(a)alliedtelesis.co.nz> Reviewed-by: Boris Brezillon <boris.brezillon(a)collabora.com> --- Changes in v2: - Cc stable, add Boris' review drivers/mtd/maps/physmap-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c index d9a3e4bebe5d..21b556afc305 100644 --- a/drivers/mtd/maps/physmap-core.c +++ b/drivers/mtd/maps/physmap-core.c @@ -132,6 +132,8 @@ static void physmap_set_addr_gpios(struct physmap_flash_info *info, gpiod_set_value(info->gpios->desc[i], !!(BIT(i) & ofs)); } + + info->gpio_values = ofs; } #define win_mask(order) (BIT(order) - 1) -- 2.21.0

6 years, 2 months

1
0
0 0

✅ PASS: Stable queue: queue-5.0

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 1f6f316a537d - Linux 5.0.5 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out a ref: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Ref: 1f6f316a537d - Linux 5.0.5 We then merged the patchset with `git am`: bluetooth-check-l2cap-option-sizes-returned-from-l2cap_get_conf_opt.patch bluetooth-verify-that-l2cap_get_conf_opt-provides-large-enough-buffer.patch netfilter-nf_tables-fix-set-double-free-in-abort-pat.patch dccp-do-not-use-ipv6-header-for-ipv4-flow.patch genetlink-fix-a-memory-leak-on-error-path.patch gtp-change-net_udp_tunnel-dependency-to-select.patch ipv6-make-ip6_create_rt_rcu-return-ip6_null_entry-instead-of-null.patch mac8390-fix-mmio-access-size-probe.patch misdn-hfcpci-test-both-vendor-device-id-for-digium-hfc4s.patch net-aquantia-fix-rx-checksum-offload-for-udp-tcp-over-ipv6.patch net-datagram-fix-unbounded-loop-in-__skb_try_recv_datagram.patch net-packet-set-__gfp_nowarn-upon-allocation-in-alloc_pg_vec.patch net-phy-meson-gxl-fix-interrupt-support.patch net-rose-fix-a-possible-stack-overflow.patch net-stmmac-fix-memory-corruption-with-large-mtus.patch net-sysfs-call-dev_hold-if-kobject_init_and_add-success.patch net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch net-usb-aqc111-extend-hwid-table-by-qnap-device.patch packets-always-register-packet-sk-in-the-same-order.patch rhashtable-still-do-rehash-when-we-get-eexist.patch sctp-get-sctphdr-by-offset-in-sctp_compute_cksum.patch sctp-use-memdup_user-instead-of-vmemdup_user.patch tcp-do-not-use-ipv6-header-for-ipv4-flow.patch tipc-allow-service-ranges-to-be-connect-ed-on-rdm-dgram.patch tipc-change-to-check-tipc_own_id-to-return-in-tipc_net_stop.patch tipc-fix-cancellation-of-topology-subscriptions.patch tun-properly-test-for-iff_up.patch vrf-prevent-adding-upper-devices.patch vxlan-don-t-call-gro_cells_destroy-before-device-is-unregistered.patch thunderx-enable-page-recycling-for-non-xdp-case.patch thunderx-eliminate-extra-calls-to-put_page-for-pages-held-for-recycling.patch net-dsa-mv88e6xxx-fix-few-issues-in-mv88e6390x_port_set_cmode.patch net-mii-fix-pause-cap-advertisement-from-linkmode_adv_to_lcl_adv_t-helper.patch net-phy-don-t-clear-bmcr-in-genphy_soft_reset.patch r8169-fix-cable-re-plugging-issue.patch ila-fix-rhashtable-walker-list-corruption.patch Compile testing --------------- We compiled the kernel for 3 architectures: aarch64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/aarch64/61675e3017f8384e70a9d7c03e… kernel build: https://artifacts.cki-project.org/builds/aarch64/61675e3017f8384e70a9d7c03e… ppc64le: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/ppc64le/24fcf0140e877669a1a30e5961… kernel build: https://artifacts.cki-project.org/builds/ppc64le/24fcf0140e877669a1a30e5961… x86_64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/x86_64/151946f5db94e46f223b5566ab4… kernel build: https://artifacts.cki-project.org/builds/x86_64/151946f5db94e46f223b5566ab4… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: ✅ Boot test [0] ✅ LTP lite - release 20190115 [1] ✅ AMTU (Abstract Machine Test Utility) [2] 🚧 ✅ Networking route: pmtu [3] 🚧 ❎ audit: audit testsuite test [4] ✅ httpd: mod_ssl smoke sanity [5] ✅ httpd: php sanity [6] 🚧 ✅ iotop: sanity [7] 🚧 ✅ /CoreOS/net-snmp/Regression/bz251332-tcp-transport 🚧 ✅ tuned: tune-processes-through-perf [8] ppc64le: ✅ Boot test [0] ✅ LTP lite - release 20190115 [1] ✅ AMTU (Abstract Machine Test Utility) [2] 🚧 ✅ Networking route: pmtu [3] 🚧 ❎ audit: audit testsuite test [4] ✅ httpd: mod_ssl smoke sanity [5] ✅ httpd: php sanity [6] 🚧 ✅ iotop: sanity [7] 🚧 ✅ /CoreOS/net-snmp/Regression/bz251332-tcp-transport 🚧 ✅ selinux-policy: serge-testsuite [9] 🚧 ✅ tuned: tune-processes-through-perf [8] x86_64: ✅ Boot test [0] ✅ LTP lite - release 20190115 [1] ✅ AMTU (Abstract Machine Test Utility) [2] 🚧 ✅ Networking route: pmtu [3] 🚧 ❎ audit: audit testsuite test [4] ✅ httpd: mod_ssl smoke sanity [5] ✅ httpd: php sanity [6] 🚧 ✅ iotop: sanity [7] 🚧 ✅ /CoreOS/net-snmp/Regression/bz251332-tcp-transport 🚧 ✅ selinux-policy: serge-testsuite [9] 🚧 ✅ tuned: tune-processes-through-perf [8] Test source: [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

6 years, 2 months

1
0
0 0

[PATCH] usb: typec: mux: Store module handle

by Heikki Krogerus

It is possible that the driver of the mux device has been unbind by the time typec_mux_put() or typec_switch_put() is called. To prevent the NULL Pointer Dereference from happening in this case when decrementing the reference count of the module by using dev->driver->owner, storing the module handle to the mux and switch data structures, and using the stored value instead. Fixes: ("3e3b81965cbf usb: typec: mux: Take care of driver module reference counting") Cc: stable(a)vger.kernel.org Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> --- drivers/usb/typec/mux.c | 10 ++++++---- include/linux/usb/typec_mux.h | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index 2ce54f3fc79c..617687c4eb20 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -63,7 +63,8 @@ struct typec_switch *typec_switch_get(struct device *dev) sw = device_connection_find_match(dev, "orientation-switch", NULL, typec_switch_match); if (!IS_ERR_OR_NULL(sw)) { - WARN_ON(!try_module_get(sw->dev->driver->owner)); + sw->module = sw->dev->driver->owner; + WARN_ON(!try_module_get(sw->module)); get_device(sw->dev); } mutex_unlock(&switch_lock); @@ -81,7 +82,7 @@ EXPORT_SYMBOL_GPL(typec_switch_get); void typec_switch_put(struct typec_switch *sw) { if (!IS_ERR_OR_NULL(sw)) { - module_put(sw->dev->driver->owner); + module_put(sw->module); put_device(sw->dev); } } @@ -206,7 +207,8 @@ struct typec_mux *typec_mux_get(struct device *dev, mux = device_connection_find_match(dev, "mode-switch", (void *)desc, typec_mux_match); if (!IS_ERR_OR_NULL(mux)) { - WARN_ON(!try_module_get(mux->dev->driver->owner)); + mux->module = mux->dev->driver->owner; + WARN_ON(!try_module_get(mux->module)); get_device(mux->dev); } mutex_unlock(&mux_lock); @@ -224,7 +226,7 @@ EXPORT_SYMBOL_GPL(typec_mux_get); void typec_mux_put(struct typec_mux *mux) { if (!IS_ERR_OR_NULL(mux)) { - module_put(mux->dev->driver->owner); + module_put(mux->module); put_device(mux->dev); } } diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h index 43f40685e53c..b31498020bf3 100644 --- a/include/linux/usb/typec_mux.h +++ b/include/linux/usb/typec_mux.h @@ -20,6 +20,7 @@ struct device; */ struct typec_switch { struct device *dev; + struct module *module; struct list_head entry; int (*set)(struct typec_switch *sw, enum typec_orientation orientation); @@ -37,6 +38,7 @@ struct typec_switch { */ struct typec_mux { struct device *dev; + struct module *module; struct list_head entry; int (*set)(struct typec_mux *mux, int state); -- 2.20.1

6 years, 2 months

2
2
0 0

[PATCH] perf pmu: Fix parser error for uncore event alias

by kan.liang＠linux.intel.com

From: Kan Liang <kan.liang(a)linux.intel.com> Perf fails to parse uncore event alias, for example: #perf stat -e unc_m_clockticks -a --no-merge sleep 1 event syntax error: 'unc_m_clockticks' \___ parser error Current code assumes that the event alias is from one specific PMU. To find the PMU, perf strcmp the pmu name of event alias with the real pmu name on the system. However, the uncore event alias may be from multiple PMUs with common prefix. The pmu name of uncore event alias is the common prefix. For example, UNC_M_CLOCKTICKS is clock event for iMC, which include 6 PMUs with the same prefix "uncore_imc" on a skylake server. The real pmu names on the system for iMC are uncore_imc_0 ... uncore_imc_5. The strncmp is used to only check the common prefix for uncore event alias. With the patch, #perf stat -e unc_m_clockticks -a --no-merge sleep 1 Performance counter stats for 'system wide': 723,594,722 unc_m_clockticks [uncore_imc_5] 724,001,954 unc_m_clockticks [uncore_imc_3] 724,042,655 unc_m_clockticks [uncore_imc_1] 724,161,001 unc_m_clockticks [uncore_imc_4] 724,293,713 unc_m_clockticks [uncore_imc_2] 724,340,901 unc_m_clockticks [uncore_imc_0] 1.002090060 seconds time elapsed Signed-off-by: Kan Liang <kan.liang(a)linux.intel.com> Cc: Thomas Richter <tmricht(a)linux.ibm.com> Cc: stable(a)vger.kernel.org Fixes: ea1fa48c055f ("perf stat: Handle different PMU names with common prefix") --- tools/perf/util/pmu.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 51d437f..395308f 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -732,10 +732,20 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) if (!is_arm_pmu_core(name)) { pname = pe->pmu ? pe->pmu : "cpu"; + + /* + * uncore alias may be from different PMU + * with common prefix + */ + if (pmu_is_uncore(name) && + !strncmp(pname, name, strlen(pname))) + goto new_alias; + if (strcmp(pname, name)) continue; } +new_alias: /* need type casts to override 'const' */ __perf_pmu__new_alias(head, NULL, (char *)pe->name, (char *)pe->desc, (char *)pe->event, -- 2.7.4

6 years, 2 months

4
3
0 0

[PATCH 3.18 000/134] 3.18.137-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 3.18.137 release. There are 134 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 Sun Mar 24 11:10:54 UTC 2019. 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/v3.x/stable-review/patch-3.18.137-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-3.18.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 3.18.137-rc1 Gustavo A. R. Silva <gustavo(a)embeddedor.com> drm/radeon/evergreen_cs: fix missing break in switch statement Sakari Ailus <sakari.ailus(a)linux.intel.com> media: uvcvideo: Avoid NULL pointer dereference at the end of streaming Zhang, Jun <jun.zhang(a)intel.com> rcu: Do RCU GP kthread self-wakeup from softirq and interrupt Aditya Pakki <pakki001(a)umn.edu> md: Fix failed allocation of md_register_thread Yihao Wu <wuyihao(a)linux.alibaba.com> nfsd: fix wrong check in write_v4_end_grace() NeilBrown <neilb(a)suse.com> nfsd: fix memory corruption caused by readdir Gustavo A. R. Silva <gustavo(a)embeddedor.com> ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify Christophe Leroy <christophe.leroy(a)c-s.fr> powerpc/83xx: Also save/restore SPRG4-7 during suspend Jordan Niethe <jniethe5(a)gmail.com> powerpc/powernv: Make opal log only readable by root Christophe Leroy <christophe.leroy(a)c-s.fr> powerpc/wii: properly disable use of BATs when requested. Christophe Leroy <christophe.leroy(a)c-s.fr> powerpc/32: Clear on-stack exception marker upon exception return zhangyi (F) <yi.zhang(a)huawei.com> jbd2: clear dirty flag when revoking a buffer from an older transaction QiaoChong <qiaochong(a)loongson.cn> parport_pc: fix find_superio io compare code, should use equal test. Zev Weiss <zev(a)bewilderbeest.net> kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv Roman Penyaev <rpenyaev(a)suse.de> mm/vmalloc: fix size check for remap_vmalloc_range_partial() Jan Kara <jack(a)suse.cz> ext2: Fix underflow in ext2_max_size() Jan Kara <jack(a)suse.cz> ext4: fix crash during online resizing Arnd Bergmann <arnd(a)arndb.de> cpufreq: pxa2xx: remove incorrect __init annotation Eric Biggers <ebiggers(a)google.com> crypto: pcbc - remove bogus memcpy()s with src == dest Filipe Manana <fdmanana(a)suse.com> Btrfs: fix corruption reading shared and compressed extents after hole punching Finn Thain <fthain(a)telegraphics.com.au> m68k: Add -ffreestanding to CFLAGS Bart Van Assche <bvanassche(a)acm.org> scsi: target/iscsi: Avoid iscsit_release_commands_from_conn() deadlock Felipe Franciosi <felipe(a)nutanix.com> scsi: virtio_scsi: don't send sc payload with tmfs Stuart Menefy <stuart.menefy(a)mathembedded.com> regulator: s2mpa01: Fix step values for some LDOs Krzysztof Kozlowski <krzk(a)kernel.org> regulator: s2mps11: Fix steps for buck7, buck8 and LDO35 Pavel Shilovsky <piastryyy(a)gmail.com> CIFS: Fix read after write for files with read caching Mao Wenan <maowenan(a)huawei.com> net: set static variable an initial value in atl2_probe() Darrick J. Wong <darrick.wong(a)oracle.com> tmpfs: fix link accounting when a tmpfile is linked in Vladimir Murzin <vladimir.murzin(a)arm.com> arm64: Relax GIC version check during early boot Alexey Khoroshilov <khoroshilov(a)ispras.ru> net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe() Florian Fainelli <f.fainelli(a)gmail.com> net: systemport: Fix reception of BPDUs Anoob Soman <anoob.soman(a)citrix.com> scsi: libiscsi: Fix race between iscsi_xmit_task and iscsi_complete_task David Howells <dhowells(a)redhat.com> assoc_array: Fix shortcut creation Gabriel Fernandez <gabriel.fernandez(a)st.com> Input: st-keyscan - fix potential zalloc NULL dereference Shubhrajyoti Datta <shubhrajyoti.datta(a)xilinx.com> i2c: cadence: Fix the hold bit setting Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: matrix_keypad - use flush_delayed_work() Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix using offset into zero size array error Eric Biggers <ebiggers(a)google.com> crypto: ahash - fix another early termination in hash walk S.j. Wang <shengjiu.wang(a)nxp.com> ASoC: fsl_esai: fix register setting issue in RIGHT_J mode zhengbin <zhengbin13(a)huawei.com> 9p/net: fix memory leak in p9_client_create Xiao Ni <xni(a)redhat.com> It's wrong to add len to sector_nr in raid10 reshape twice Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: bebob: use more identical mod_alias for Saffire Pro 10 I/O against Liquid Saffire 56 Eric Dumazet <edumazet(a)google.com> gro_cells: make sure device is up in gro_cells_receive() Eric Dumazet <edumazet(a)google.com> net/hsr: fix possible crash in add_timer() Eric Dumazet <edumazet(a)google.com> vxlan: test dev->flags & IFF_UP before calling gro_cells_receive() Al Viro <viro(a)zeniv.linux.org.uk> missing barriers in some of unix_sock ->addr and ->path accesses Kalash Nainwal <kalash(a)arista.com> net: Set rtm_table to RT_TABLE_COMPAT for ipv6 for tables > 255 YueHaibing <yuehaibing(a)huawei.com> mdio_bus: Fix use-after-free on device_register fails Eric Dumazet <edumazet(a)google.com> net/x25: fix a race in x25_bind() Jack Morgenstein <jackm(a)dev.mellanox.co.il> net/mlx4_core: Fix qp mtt size calculation Xin Long <lucien.xin(a)gmail.com> pptp: dst_release sk_dst_cache in pptp_sock_destruct Eric Dumazet <edumazet(a)google.com> net/x25: reset state in x25_connect() Eric Dumazet <edumazet(a)google.com> net/x25: fix use-after-free in x25_device_event() Miaohe Lin <linmiaohe(a)huawei.com> net: sit: fix UBSAN Undefined behaviour in check_6rd Mao Wenan <maowenan(a)huawei.com> net: hsr: fix memory leak in hsr_dev_finalize() Eric Dumazet <edumazet(a)google.com> l2tp: fix infoleak in l2tp_ip6_recvmsg() Gustavo A. R. Silva <gustavo(a)embeddedor.com> iscsi_ibft: Fix missing break in switch statement Jason Gerecke <jason.gerecke(a)wacom.com> Input: wacom_serial4 - add support for Wacom ArtPad II tablet Jiri Olsa <jolsa(a)redhat.com> perf symbols: Filter out hidden symbols from labels Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix use-after-free in error path Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> dmaengine: dmatest: Abort test in case of mapping error Lubomir Rintel <lkundrak(a)v3.sk> irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable Peng Hao <peng.hao2(a)zte.com.cn> ARM: pxa: ssp: unneeded to free devm_ allocated data Ian Kent <raven(a)themaw.net> autofs: fix error return in autofs_fill_super() Pan Bian <bianpan2016(a)163.com> autofs: drop dentry reference only when it is never used Michal Hocko <mhocko(a)suse.com> mm, memory_hotplug: is_mem_section_removable do not pass the end of a zone Kairui Song <kasong(a)redhat.com> x86/kexec: Don't setup EFI info if EFI runtime is not enabled Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: fix computation for MAX_SMB2_HDR_SIZE Sinan Kaya <okaya(a)kernel.org> platform/x86: Fix unmet dependency warning for SAMSUNG_Q10 Ming Lu <ming.lu(a)citrix.com> scsi: libfc: free skb when receiving invalid flogi resp Yao Liu <yotta.liu(a)ucloud.cn> nfs: Fix NULL pointer dereference of dev_name Tomonori Sakita <tomonori.sakita(a)sord.co.jp> net: altera_tse: fix msgdma_tx_completion on non-zero fill_level case Max Filippov <jcmvbkbc(a)gmail.com> xtensa: SMP: limit number of possible CPUs by NR_CPUS Max Filippov <jcmvbkbc(a)gmail.com> xtensa: SMP: mark each possible CPU as present Max Filippov <jcmvbkbc(a)gmail.com> xtensa: smp_lx200_defconfig: fix vectors clash Max Filippov <jcmvbkbc(a)gmail.com> xtensa: SMP: fix secondary CPU initialization Suravee Suthikulpanit <suravee.suthikulpanit(a)amd.com> iommu/amd: Fix IOMMU page flush when detach device from a domain ZhangXiaoxu <zhangxiaoxu5(a)huawei.com> ipvs: Fix signed integer overflow when setsockopt timeout Stephane Eranian <eranian(a)google.com> perf tools: Handle TOPOLOGY headers with no CPU Su Yanjun <suyj.fnst(a)cn.fujitsu.com> vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel Alistair Strachan <astrachan(a)google.com> media: uvcvideo: Fix 'type' check leading to overflow Mike Kravetz <mike.kravetz(a)oracle.com> hugetlbfs: fix races and page leaks during migration Ido Schimmel <idosch(a)mellanox.com> ip6mr: Do not call __IP6_INC_STATS() from preemptible context Paul Moore <paul(a)paul-moore.com> netlabel: fix out-of-bounds memory accesses Rajasingh Thavamani <T.Rajasingh(a)landisgyr.com> net: phy: Micrel KSZ8061: link failure after cable connect Nazarov Sergey <s-nazarov(a)yandex.ru> net: avoid use IPCB in cipso_v4_error Nazarov Sergey <s-nazarov(a)yandex.ru> net: Add __icmp_send helper. YueHaibing <yuehaibing(a)huawei.com> net: nfc: Fix NULL dereference on nfc_llcp_build_tlv fails Ido Schimmel <idosch(a)mellanox.com> team: Free BPF filter when unregistering netdev Kai-Heng Feng <kai.heng.feng(a)canonical.com> sky2: Disable MSI on Dell Inspiron 1545 and Gateway P-79 YueHaibing <yuehaibing(a)huawei.com> net-sysfs: Fix mem leak in netdev_register_kobject Ivan Mironov <mironov.ivan(a)gmail.com> USB: serial: cp210x: add ID for Ingenico 3070 Jann Horn <jannh(a)google.com> mm: enforce min addr even if capable() in expand_downwards() Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> mmc: spi: Fix card detection during probe Vitaly Kuznetsov <vkuznets(a)redhat.com> KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1 Chaitanya Tata <chaitanya.tata(a)bluwirelesstechnology.com> cfg80211: extend range deviation for DMG Balaji Pothunoori <bpothuno(a)codeaurora.org> mac80211: don't initiate TDLS connection if station is not associated to AP Thomas Falcon <tlfalcon(a)linux.ibm.com> ibmveth: Do not process frames after calling napi_reschedule Atsushi Nemoto <atsushi.nemoto(a)sord.co.jp> net: altera_tse: fix connect_local_phy error path Varun Prakash <varun(a)chelsio.com> scsi: csiostor: fix NULL pointer dereference in csio_vport_set_state() Tomonori Sakita <tomonori.sakita(a)sord.co.jp> serial: fsl_lpuart: fix maximum acceptable baud rate with over-sampling Bob Copeland <me(a)bobcopeland.com> mac80211: fix miscounting of ttl-dropped frames Silvio Cesare <silvio.cesare(a)gmail.com> ASoC: imx-audmux: change snprintf to scnprintf for possible overflow Dan Carpenter <dan.carpenter(a)oracle.com> usb: gadget: Potential NULL dereference on allocation error Zeng Tao <prime.zeng(a)hisilicon.com> usb: dwc3: gadget: Fix the uninitialized link_state when udc starts Dan Carpenter <dan.carpenter(a)oracle.com> ALSA: compress: prevent potential divide by zero bugs Rander Wang <rander.wang(a)linux.intel.com> ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field Kristian H. Kristensen <hoegsberg(a)gmail.com> drm/msm: Unblock writer if reader closes file John Garry <john.garry(a)huawei.com> scsi: libsas: Fix rphy phy_identifier for PHYs with end devices attached Ilya Dryomov <idryomov(a)gmail.com> libceph: handle an empty authorize reply Arad, Ronen <ronen.arad(a)intel.com> netlink: Trim skb to alloc size to avoid MSG_TRUNC Hangbin Liu <liuhangbin(a)gmail.com> sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach() Cong Wang <xiyou.wangcong(a)gmail.com> team: avoid complex list operations in team_nl_cmd_options_set() Kal Conley <kal.conley(a)dectris.com> net/packet: fix 4gb buffer limit due to overflow check Eric Dumazet <edumazet(a)google.com> batman-adv: fix uninit-value in batadv_interface_tx() Eric Biggers <ebiggers(a)google.com> KEYS: always initialize keyring_index_key::desc_len Eric Biggers <ebiggers(a)google.com> KEYS: user: Align the payload buffer Nathan Chancellor <natechancellor(a)gmail.com> isdn: avm: Fix string plus integer warning from Clang Kangjie Lu <kjlu(a)umn.edu> leds: lp5523: fix a missing check of return value of lp55xx_read Colin Ian King <colin.king(a)canonical.com> atm: he: fix sign-extension overflow on large shift Jia-Ju Bai <baijiaju1990(a)gmail.com> isdn: i4l: isdn_tty: Fix some concurrency double-free bugs Thomas Bogendoerfer <tbogendoerfer(a)suse.de> MIPS: jazz: fix 64bit build Logan Gunthorpe <logang(a)deltatee.com> scsi: isci: initialize shost fully before calling scsi_add_host() YueHaibing <yuehaibing(a)huawei.com> scsi: qla4xxx: check return code of qla4xxx_copy_from_fwddb_param Alban Bedel <albeu(a)free.fr> MIPS: ath79: Enable OF serial ports in the default config Kangjie Lu <kjlu(a)umn.edu> mfd: mc13xxx: Fix a missing check of a register-read failure Charles Keepax <ckeepax(a)opensource.cirrus.com> mfd: wm5110: Add missing ASRC rate register Dan Carpenter <dan.carpenter(a)oracle.com> mfd: ab8500-core: Return zero in get_register_interruptible() Nathan Chancellor <natechancellor(a)gmail.com> mfd: db8500-prcmu: Fix some section annotations Nathan Chancellor <natechancellor(a)gmail.com> mfd: twl-core: Fix section annotations on {,un}protect_pm_master Vignesh R <vigneshr(a)ti.com> mfd: ti_am335x_tscadc: Use PLATFORM_DEVID_AUTO while registering mfd cells Eric Biggers <ebiggers(a)google.com> KEYS: allow reaching the keys quotas exactly Ralph Campbell <rcampbell(a)nvidia.com> numa: change get_mempolicy() to use nr_node_ids instead of MAX_NUMNODES Yan, Zheng <zyan(a)redhat.com> ceph: avoid repeatedly adding inode to mdsc->snap_flush_list ------------- Diffstat: Makefile | 4 +- arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 8 ++-- arch/arm/plat-pxa/ssp.c | 3 -- arch/arm64/kernel/head.S | 3 +- arch/m68k/Makefile | 5 ++- arch/mips/configs/ath79_defconfig | 1 + arch/mips/jazz/jazzdma.c | 5 ++- arch/powerpc/kernel/entry_32.S | 9 ++++ arch/powerpc/platforms/83xx/suspend-asm.S | 34 ++++++++++++--- arch/powerpc/platforms/embedded6xx/wii.c | 4 ++ arch/powerpc/platforms/powernv/opal-msglog.c | 2 +- arch/x86/kernel/kexec-bzimage64.c | 3 ++ arch/x86/kvm/svm.c | 8 ++++ arch/xtensa/configs/smp_lx200_defconfig | 1 + arch/xtensa/kernel/head.S | 5 ++- arch/xtensa/kernel/smp.c | 41 ++++++++++++------ crypto/ahash.c | 14 +++--- crypto/pcbc.c | 14 ++---- drivers/atm/he.c | 2 +- drivers/cpufreq/pxa2xx-cpufreq.c | 4 +- drivers/dma/dmatest.c | 28 ++++++------ drivers/firmware/iscsi_ibft.c | 1 + drivers/gpu/drm/msm/msm_rd.c | 7 ++- drivers/gpu/drm/radeon/evergreen_cs.c | 1 + drivers/i2c/busses/i2c-cadence.c | 9 +++- drivers/input/keyboard/matrix_keypad.c | 2 +- drivers/input/keyboard/st-keyscan.c | 4 +- drivers/input/tablet/wacom_serial4.c | 2 + drivers/iommu/amd_iommu.c | 15 +++++-- drivers/irqchip/irq-mmp.c | 6 ++- drivers/isdn/hardware/avm/b1.c | 2 +- drivers/isdn/i4l/isdn_tty.c | 6 ++- drivers/leds/leds-lp5523.c | 4 +- drivers/md/raid10.c | 3 +- drivers/md/raid5.c | 2 + drivers/media/usb/uvc/uvc_driver.c | 14 ++++-- drivers/media/usb/uvc/uvc_video.c | 8 ++++ drivers/mfd/ab8500-core.c | 2 +- drivers/mfd/db8500-prcmu.c | 4 +- drivers/mfd/mc13xxx-core.c | 4 +- drivers/mfd/ti_am335x_tscadc.c | 5 ++- drivers/mfd/twl-core.c | 4 +- drivers/mfd/wm5110-tables.c | 2 + drivers/mmc/host/mmc_spi.c | 1 + drivers/net/ethernet/altera/altera_msgdma.c | 3 +- drivers/net/ethernet/altera/altera_tse_main.c | 4 +- drivers/net/ethernet/atheros/atlx/atl2.c | 4 +- drivers/net/ethernet/broadcom/bcmsysport.c | 4 ++ drivers/net/ethernet/ibm/ibmveth.c | 2 - drivers/net/ethernet/marvell/mv643xx_eth.c | 7 ++- drivers/net/ethernet/marvell/sky2.c | 24 ++++++++++- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 6 +-- drivers/net/phy/mdio_bus.c | 1 - drivers/net/phy/micrel.c | 14 +++++- drivers/net/ppp/pptp.c | 1 + drivers/net/team/team.c | 27 +++--------- drivers/net/team/team_mode_loadbalance.c | 15 +++++++ drivers/net/vxlan.c | 10 +++++ drivers/parport/parport_pc.c | 2 +- drivers/platform/x86/Kconfig | 1 + drivers/regulator/s2mpa01.c | 10 ++--- drivers/regulator/s2mps11.c | 6 +-- drivers/s390/block/dasd_eckd.c | 8 ++++ drivers/s390/net/qeth_core_main.c | 15 +++---- drivers/scsi/csiostor/csio_attr.c | 2 +- drivers/scsi/isci/init.c | 14 +++--- drivers/scsi/libfc/fc_lport.c | 6 +-- drivers/scsi/libiscsi.c | 6 +++ drivers/scsi/libsas/sas_expander.c | 2 + drivers/scsi/qla4xxx/ql4_os.c | 2 + drivers/scsi/virtio_scsi.c | 2 - drivers/target/iscsi/iscsi_target.c | 4 +- drivers/tty/serial/fsl_lpuart.c | 2 +- drivers/usb/dwc3/gadget.c | 1 + drivers/usb/gadget/function/f_sourcesink.c | 2 +- drivers/usb/serial/cp210x.c | 1 + fs/autofs4/expire.c | 3 +- fs/autofs4/inode.c | 4 +- fs/btrfs/extent_io.c | 4 +- fs/ceph/snap.c | 3 +- fs/cifs/file.c | 12 +++--- fs/cifs/smb2pdu.h | 4 +- fs/ext2/super.c | 39 +++++++++++------ fs/ext4/resize.c | 3 +- fs/hugetlbfs/inode.c | 12 ++++++ fs/jbd2/transaction.c | 17 +++++--- fs/nfs/super.c | 5 +++ fs/nfsd/nfs3proc.c | 16 ++++++- fs/nfsd/nfs3xdr.c | 1 + fs/nfsd/nfsctl.c | 2 +- include/keys/user-type.h | 2 +- include/net/gro_cells.h | 12 +++++- include/net/icmp.h | 9 +++- include/net/ip.h | 2 + kernel/rcu/tree.c | 20 ++++++--- kernel/sysctl.c | 11 ++++- lib/assoc_array.c | 8 ++-- mm/hugetlb.c | 14 +++++- mm/memory_hotplug.c | 3 +- mm/mempolicy.c | 6 +-- mm/migrate.c | 11 +++++ mm/mmap.c | 7 ++- mm/shmem.c | 10 +++-- mm/vmalloc.c | 2 +- net/9p/client.c | 2 +- net/batman-adv/soft-interface.c | 2 + net/ceph/messenger.c | 12 ++++-- net/core/net-sysfs.c | 3 ++ net/hsr/hsr_device.c | 18 ++++---- net/hsr/hsr_framereg.c | 12 ++++++ net/hsr/hsr_framereg.h | 1 + net/ipv4/cipso_ipv4.c | 23 ++++++++-- net/ipv4/icmp.c | 7 +-- net/ipv4/ip_options.c | 22 +++++++--- net/ipv4/ip_vti.c | 50 ++++++++++++++++++++++ net/ipv6/ip6mr.c | 8 ++-- net/ipv6/route.c | 2 +- net/ipv6/sit.c | 7 +-- net/l2tp/l2tp_ip6.c | 4 +- net/mac80211/cfg.c | 4 ++ net/mac80211/rx.c | 4 +- net/netfilter/ipvs/ip_vs_ctl.c | 12 ++++++ net/netlink/af_netlink.c | 34 +++++++++------ net/nfc/llcp_commands.c | 20 +++++++++ net/nfc/llcp_core.c | 24 +++++++++-- net/packet/af_packet.c | 2 +- net/unix/af_unix.c | 48 +++++++++++++-------- net/unix/diag.c | 3 +- net/wireless/reg.c | 4 +- net/x25/af_x25.c | 20 ++++++--- security/keys/key.c | 4 +- security/keys/keyring.c | 4 +- security/keys/proc.c | 3 +- security/keys/request_key.c | 1 + security/keys/request_key_auth.c | 2 +- security/lsm_audit.c | 10 +++-- sound/core/compress_offload.c | 3 +- sound/firewire/bebob/bebob.c | 14 +++++- sound/soc/fsl/fsl_esai.c | 7 +-- sound/soc/fsl/imx-audmux.c | 24 +++++------ sound/soc/intel/broadwell.c | 2 +- sound/soc/intel/haswell.c | 2 +- tools/perf/util/cpumap.c | 11 ++++- tools/perf/util/symbol-elf.c | 9 +++- 144 files changed, 850 insertions(+), 350 deletions(-)

6 years, 2 months

7
148
0 0

Re: [PATCH v3] usb: typec: fix bug in typec_register_port call

by Heikki Krogerus

On Fri, Mar 15, 2019 at 03:43:21PM -0700, anil.kumar.k(a)intel.com wrote: > From: Anil Kumar <anil.kumar.k(a)intel.com> > > typec_register_port function used variable port->id without > initializing it. This patch fixes the issue by using the local > instance for the error case > > Issue is not observed in the mainline tree (5.x) > > Signed-off-by: Anil Kumar <anil.kumar.k(a)intel.com> > Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers") > Cc: stable(a)vger.kernel.org #4.19.x You have the tag, but I don't see stable(a)vger.kernel.org on your CC line? I'm adding it there now. The patch is otherwise OK. Acked-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> > --- > drivers/usb/typec/class.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c > index e61dffb..5a442e4 100644 > --- a/drivers/usb/typec/class.c > +++ b/drivers/usb/typec/class.c > @@ -1611,7 +1611,7 @@ struct typec_port *typec_register_port(struct device *parent, > typec_switch_put(port->sw); > > err_switch: > - ida_simple_remove(&typec_index_ida, port->id); > + ida_simple_remove(&typec_index_ida, id); > kfree(port); > > return ERR_PTR(ret); > -- > 2.7.4 thanks, -- heikki

6 years, 2 months

2
3
0 0

[PATCH] mm: Fix modifying of page protection by insert_pfn()

by Jan Kara

Aneesh has reported that PPC triggers the following warning when excercising DAX code: [c00000000007610c] set_pte_at+0x3c/0x190 LR [c000000000378628] insert_pfn+0x208/0x280 Call Trace: [c0000002125df980] [8000000000000104] 0x8000000000000104 (unreliable) [c0000002125df9c0] [c000000000378488] insert_pfn+0x68/0x280 [c0000002125dfa30] [c0000000004a5494] dax_iomap_pte_fault.isra.7+0x734/0xa40 [c0000002125dfb50] [c000000000627250] __xfs_filemap_fault+0x280/0x2d0 [c0000002125dfbb0] [c000000000373abc] do_wp_page+0x48c/0xa40 [c0000002125dfc00] [c000000000379170] __handle_mm_fault+0x8d0/0x1fd0 [c0000002125dfd00] [c00000000037a9b0] handle_mm_fault+0x140/0x250 [c0000002125dfd40] [c000000000074bb0] __do_page_fault+0x300/0xd60 [c0000002125dfe20] [c00000000000acf4] handle_page_fault+0x18 Now that is WARN_ON in set_pte_at which is VM_WARN_ON(pte_hw_valid(*ptep) && !pte_protnone(*ptep)); The problem is that on some architectures set_pte_at() cannot cope with a situation where there is already some (different) valid entry present. Use ptep_set_access_flags() instead to modify the pfn which is built to deal with modifying existing PTE. CC: stable(a)vger.kernel.org Fixes: b2770da64254 "mm: add vm_insert_mixed_mkwrite()" Reported-by: "Aneesh Kumar K.V" <aneesh.kumar(a)linux.ibm.com> Signed-off-by: Jan Kara <jack(a)suse.cz> --- mm/memory.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 47fe250307c7..ab650c21bccd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1549,10 +1549,12 @@ static vm_fault_t insert_pfn(struct vm_area_struct *vma, unsigned long addr, WARN_ON_ONCE(!is_zero_pfn(pte_pfn(*pte))); goto out_unlock; } - entry = *pte; - goto out_mkwrite; - } else - goto out_unlock; + entry = pte_mkyoung(*pte); + entry = maybe_mkwrite(pte_mkdirty(entry), vma); + if (ptep_set_access_flags(vma, addr, pte, entry, 1)) + update_mmu_cache(vma, addr, pte); + } + goto out_unlock; } /* Ok, finally just insert the thing.. */ @@ -1561,7 +1563,6 @@ static vm_fault_t insert_pfn(struct vm_area_struct *vma, unsigned long addr, else entry = pte_mkspecial(pfn_t_pte(pfn, prot)); -out_mkwrite: if (mkwrite) { entry = pte_mkyoung(entry); entry = maybe_mkwrite(pte_mkdirty(entry), vma); -- 2.16.4

6 years, 2 months

4
7
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror March 2019