May 2019 - Linux-stable-mirror

patch "USB: serial: f81232: fix interrupt worker not stop" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: serial: f81232: fix interrupt worker not stop 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-testing 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 be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 804dbee1e49774918339c1e5a87400988c0819e8 Mon Sep 17 00:00:00 2001 From: "Ji-Ze Hong (Peter Hong)" <hpeter(a)gmail.com> Date: Tue, 30 Apr 2019 09:22:29 +0800 Subject: USB: serial: f81232: fix interrupt worker not stop The F81232 will use interrupt worker to handle MSR change. This patch will fix the issue that interrupt work should stop in close() and suspend(). This also fixes line-status events being disabled after a suspend cycle until the port is re-opened. Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel(a)gmail.com> [ johan: amend commit message ] Fixes: 87fe5adcd8de ("USB: f81232: implement read IIR/MSR with endpoint") Cc: stable <stable(a)vger.kernel.org> # 4.1 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/usb/serial/f81232.c | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 0dcdcb4b2cde..dee6f2caf9b5 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -556,9 +556,12 @@ static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port) static void f81232_close(struct usb_serial_port *port) { + struct f81232_private *port_priv = usb_get_serial_port_data(port); + f81232_port_disable(port); usb_serial_generic_close(port); usb_kill_urb(port->interrupt_in_urb); + flush_work(&port_priv->interrupt_work); } static void f81232_dtr_rts(struct usb_serial_port *port, int on) @@ -632,6 +635,40 @@ static int f81232_port_remove(struct usb_serial_port *port) return 0; } +static int f81232_suspend(struct usb_serial *serial, pm_message_t message) +{ + struct usb_serial_port *port = serial->port[0]; + struct f81232_private *port_priv = usb_get_serial_port_data(port); + int i; + + for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) + usb_kill_urb(port->read_urbs[i]); + + usb_kill_urb(port->interrupt_in_urb); + + if (port_priv) + flush_work(&port_priv->interrupt_work); + + return 0; +} + +static int f81232_resume(struct usb_serial *serial) +{ + struct usb_serial_port *port = serial->port[0]; + int result; + + if (tty_port_initialized(&port->port)) { + result = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO); + if (result) { + dev_err(&port->dev, "submit interrupt urb failed: %d\n", + result); + return result; + } + } + + return usb_serial_generic_resume(serial); +} + static struct usb_serial_driver f81232_device = { .driver = { .owner = THIS_MODULE, @@ -655,6 +692,8 @@ static struct usb_serial_driver f81232_device = { .read_int_callback = f81232_read_int_callback, .port_probe = f81232_port_probe, .port_remove = f81232_port_remove, + .suspend = f81232_suspend, + .resume = f81232_resume, }; static struct usb_serial_driver * const serial_drivers[] = { -- 2.21.0

5 years, 7 months

1
0
0 0

[PATCH-tip v7 01/20] locking/rwsem: Prevent decrement of reader count before increment

by Waiman Long

During my rwsem testing, it was found that after a down_read(), the reader count may occasionally become 0 or even negative. Consequently, a writer may steal the lock at that time and execute with the reader in parallel thus breaking the mutual exclusion guarantee of the write lock. In other words, both readers and writer can become rwsem owners simultaneously. The current reader wakeup code does it in one pass to clear waiter->task and put them into wake_q before fully incrementing the reader count. Once waiter->task is cleared, the corresponding reader may see it, finish the critical section and do unlock to decrement the count before the count is incremented. This is not a problem if there is only one reader to wake up as the count has been pre-incremented by 1. It is a problem if there are more than one readers to be woken up and writer can steal the lock. The wakeup was actually done in 2 passes before the v4.9 commit 70800c3c0cc5 ("locking/rwsem: Scan the wait_list for readers only once"). To fix this problem, the wakeup is now done in two passes again. In the first pass, we collect the readers and count them. The reader count is then fully incremented. In the second pass, the waiter->task is then cleared and they are put into wake_q to be woken up later. Fixes: 70800c3c0cc5 ("locking/rwsem: Scan the wait_list for readers only once") Cc: <stable(a)vger.kernel.org> Signed-off-by: Waiman Long <longman(a)redhat.com> --- kernel/locking/rwsem-xadd.c | 46 +++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c index 6b3ee9948bf1..0b1f77957240 100644 --- a/kernel/locking/rwsem-xadd.c +++ b/kernel/locking/rwsem-xadd.c @@ -130,6 +130,7 @@ static void __rwsem_mark_wake(struct rw_semaphore *sem, { struct rwsem_waiter *waiter, *tmp; long oldcount, woken = 0, adjustment = 0; + struct list_head wlist; /* * Take a peek at the queue head waiter such that we can determine @@ -188,18 +189,43 @@ static void __rwsem_mark_wake(struct rw_semaphore *sem, * of the queue. We know that woken will be at least 1 as we accounted * for above. Note we increment the 'active part' of the count by the * number of readers before waking any processes up. + * + * We have to do wakeup in 2 passes to prevent the possibility that + * the reader count may be decremented before it is incremented. It + * is because the to-be-woken waiter may not have slept yet. So it + * may see waiter->task got cleared, finish its critical section and + * do an unlock before the reader count increment. + * + * 1) Collect the read-waiters in a separate list, count them and + * fully increment the reader count in rwsem. + * 2) For each waiters in the new list, clear waiter->task and + * put them into wake_q to be woken up later. */ - list_for_each_entry_safe(waiter, tmp, &sem->wait_list, list) { - struct task_struct *tsk; - + list_for_each_entry(waiter, &sem->wait_list, list) { if (waiter->type == RWSEM_WAITING_FOR_WRITE) break; woken++; - tsk = waiter->task; + } + list_cut_before(&wlist, &sem->wait_list, &waiter->list); + + adjustment = woken * RWSEM_ACTIVE_READ_BIAS - adjustment; + lockevent_cond_inc(rwsem_wake_reader, woken); + if (list_empty(&sem->wait_list)) { + /* hit end of list above */ + adjustment -= RWSEM_WAITING_BIAS; + } + + if (adjustment) + atomic_long_add(adjustment, &sem->count); + + /* 2nd pass */ + list_for_each_entry_safe(waiter, tmp, &wlist, list) { + struct task_struct *tsk; + tsk = waiter->task; get_task_struct(tsk); - list_del(&waiter->list); + /* * Ensure calling get_task_struct() before setting the reader * waiter to nil such that rwsem_down_read_failed() cannot @@ -213,16 +239,6 @@ static void __rwsem_mark_wake(struct rw_semaphore *sem, */ wake_q_add_safe(wake_q, tsk); } - - adjustment = woken * RWSEM_ACTIVE_READ_BIAS - adjustment; - lockevent_cond_inc(rwsem_wake_reader, woken); - if (list_empty(&sem->wait_list)) { - /* hit end of list above */ - adjustment -= RWSEM_WAITING_BIAS; - } - - if (adjustment) - atomic_long_add(adjustment, &sem->count); } /* -- 2.18.1

5 years, 7 months

2
2
0 0

[PATCH 5.0 00/89] 5.0.11-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.0.11 release. There are 89 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 02 May 2019 11:35:03 AM UTC. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.0.11-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.0.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.0.11-rc1 Jakub Kicinski <jakub.kicinski(a)netronome.com> net/tls: don't leak IV and record seq when offload fails Jakub Kicinski <jakub.kicinski(a)netronome.com> net/tls: avoid potential deadlock in tls_set_device_offload_rx() Maxim Mikityanskiy <maximmi(a)mellanox.com> net/mlx5e: Fix use-after-free after xdp_return_frame Maxim Mikityanskiy <maximmi(a)mellanox.com> net/mlx5e: Fix the max MTU check in case of XDP Petr Machata <petrm(a)mellanox.com> mlxsw: spectrum: Put MC TCs into DWRR mode Ido Schimmel <idosch(a)mellanox.com> mlxsw: pci: Reincrease PCI reset timeout Tao Ren <taoren(a)fb.com> net/ncsi: handle overflow when incrementing mac address Ilias Apalodimas <ilias.apalodimas(a)linaro.org> net: socionext: replace napi_alloc_frag with the netdev variant on init Hangbin Liu <liuhangbin(a)gmail.com> team: fix possible recursive locking when add slaves Su Bao Cheng <baocheng.su(a)siemens.com> stmmac: pci: Adjust IOT2000 matching Jakub Kicinski <jakub.kicinski(a)netronome.com> net/tls: fix refcount adjustment in fallback Vinod Koul <vkoul(a)kernel.org> net: stmmac: move stmmac_check_ether_addr() to driver probe Eric Dumazet <edumazet(a)google.com> net/rose: fix unbound loop in rose_loopback_timer() Zhu Yanjun <yanjun.zhu(a)oracle.com> net: rds: exchange of 8K and 1M pool Erez Alfasi <ereza(a)mellanox.com> net/mlx5e: ethtool, Remove unsupported SFP EEPROM high pages query Amit Cohen <amitc(a)mellanox.com> mlxsw: spectrum: Fix autoneg status in ethtool ZhangXiaoxu <zhangxiaoxu5(a)huawei.com> ipv4: set the tcp_min_rtt_wlen range from 0 to one day Eric Dumazet <edumazet(a)google.com> ipv4: add sanity checks in ipv4_link_failure() Linus Torvalds <torvalds(a)linux-foundation.org> rdma: fix build errors on s390 and MIPS due to bad ZERO_PAGE use Daniel Borkmann <daniel(a)iogearbox.net> x86/retpolines: Disable switch jump tables when retpolines are enabled Daniel Borkmann <daniel(a)iogearbox.net> x86, retpolines: Raise limit for generating indirect calls from switch-case Al Viro <viro(a)zeniv.linux.org.uk> Fix aio_poll() races Al Viro <viro(a)zeniv.linux.org.uk> aio: store event at final iocb_put() Al Viro <viro(a)zeniv.linux.org.uk> aio: keep io_event in aio_kiocb Al Viro <viro(a)zeniv.linux.org.uk> aio: fold lookup_kiocb() into its sole caller Linus Torvalds <torvalds(a)linux-foundation.org> pin iocb through aio. Eric Dumazet <edumazet(a)google.com> rxrpc: fix race condition in rxrpc_input_packet() Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> net/rds: Check address length before reading address family YueHaibing <yuehaibing(a)huawei.com> net: netrom: Fix error cleanup path of nr_proto_init Xin Long <lucien.xin(a)gmail.com> tipc: check link name with right length in tipc_nl_compat_link_set Xin Long <lucien.xin(a)gmail.com> tipc: check bearer name with right length in tipc_nl_compat_bearer_enable Yue Haibing <yuehaibing(a)huawei.com> fm10k: Fix a potential NULL pointer dereference Florian Westphal <fw(a)strlen.de> netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family. Johannes Berg <johannes.berg(a)intel.com> mac80211_hwsim: calculate if_combination.max_interfaces luca abeni <luca.abeni(a)santannapisa.it> sched/deadline: Correctly handle active 0-lag timers Todd Kjos <tkjos(a)android.com> binder: fix handling of misaligned binder object Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> workqueue: Try to catch flush_work() without INIT_WORK(). Linus Torvalds <torvalds(a)linux-foundation.org> slip: make slhc_free() silently accept an error pointer Xin Long <lucien.xin(a)gmail.com> tipc: handle the err returned from cmd header function Dongli Zhang <dongli.zhang(a)oracle.com> loop: do not print warn message if partition scan is successful Dan Carpenter <dan.carpenter(a)oracle.com> ext4: fix some error pointer dereferences Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: Consolidate LPM checks to avoid enabling LPM twice Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: Add new USB LPM helpers Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> drm/vc4: Fix compilation error reported by kbuild test bot Dave Airlie <airlied(a)redhat.com> Revert "drm/i915/fbdev: Actually configure untiled displays" Christian König <christian.koenig(a)amd.com> drm/ttm: fix re-init of global structures Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> drm/vc4: Fix memory leak during gpu reset. Michael Ellerman <mpe(a)ellerman.id.au> powerpc/mm/radix: Make Radix require HUGETLB_PAGE Ard Biesheuvel <ard.biesheuvel(a)linaro.org> ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache Shun-Chih Yu <shun-chih.yu(a)mediatek.com> dmaengine: mediatek-cqdma: fix wrong register usage in mtk_cqdma_start Achim Dahlhoff <Achim.Dahlhoff(a)de.bosch.com> dmaengine: sh: rcar-dmac: Fix glitch in dmaengine_tx_status Dirk Behme <dirk.behme(a)de.bosch.com> dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid Alex Williamson <alex.williamson(a)redhat.com> vfio/type1: Limit DMA mappings per container Lucas Stach <l.stach(a)pengutronix.de> Input: synaptics-rmi4 - write config register values to the right offset Harry Pan <harry.pan(a)intel.com> perf/x86/intel: Update KBL Package C-state events to also include PC8/PC9/PC10 counters NeilBrown <neilb(a)suse.com> sunrpc: don't mark uninitialised items as VALID. Jeff Layton <jlayton(a)kernel.org> nfsd: wake blocked file lock waiters before sending callback Jeff Layton <jlayton(a)kernel.org> nfsd: wake waiters blocked on file_lock before deleting it Trond Myklebust <trondmy(a)gmail.com> nfsd: Don't release the callback slot unless it was actually held Yan, Zheng <zyan(a)redhat.com> ceph: fix ci->i_head_snapc leak Jeff Layton <jlayton(a)kernel.org> ceph: ensure d_name stability in ceph_dentry_hash() Jeff Layton <jlayton(a)kernel.org> ceph: only use d_name directly when parent is locked Xie XiuQi <xiexiuqi(a)huawei.com> sched/numa: Fix a possible divide-by-zero Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/ucontext: Fix regression with disassociate Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/mlx5: Use rdma_user_map_io for mapping BAR pages Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/mlx5: Do not allow the user to write to the clock page Josh Collier <josh.d.collier(a)intel.com> IB/rdmavt: Fix frwr memory registration Bjorn Andersson <bjorn.andersson(a)linaro.org> arm64: mm: Ensure tail of unaligned initrd is reserved Mel Gorman <mgorman(a)techsingularity.net> mm: do not boost watermarks to avoid fragmentation for the DISCONTIG memory model Peter Zijlstra <peterz(a)infradead.org> trace: Fix preempt_enable_no_resched() abuse Aurelien Jarno <aurelien(a)aurel32.net> MIPS: scall64-o32: Fix indirect syscall number load YueHaibing <yuehaibing(a)huawei.com> lib/Kconfig.debug: fix build error without CONFIG_BLOCK Jérôme Glisse <jglisse(a)redhat.com> zram: pass down the bvec we need to read into in the work struct Baolin Wang <baolin.wang(a)linaro.org> gpio: eic: sprd: Fix incorrect irq type setting for the sync EIC Herbert Xu <herbert(a)gondor.apana.org.au> crypto: lrw - Fix atomic sleep when walking skcipher Herbert Xu <herbert(a)gondor.apana.org.au> crypto: xts - Fix atomic sleep when walking skcipher Jann Horn <jannh(a)google.com> tracing: Fix buffer_ref pipe ops Wenwen Wang <wang6495(a)umn.edu> tracing: Fix a memory leak by early error exit in trace_pid_write() Frank Sorenson <sorenson(a)redhat.com> cifs: do not attempt cifs operation on smb2+ rename error Jérôme Glisse <jglisse(a)redhat.com> cifs: fix page reference leak with readv/writev Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: fix memory leak in SMB2_read Paolo Valente <paolo.valente(a)linaro.org> block, bfq: fix use after free in bfq_bfqq_expire YueHaibing <yuehaibing(a)huawei.com> fs/proc/proc_sysctl.c: Fix a NULL pointer dereference Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Move to ACT_INIT state Christophe Leroy <christophe.leroy(a)c-s.fr> powerpc/vdso32: fix CLOCK_MONOTONIC on PPC64 Alexander Shishkin <alexander.shishkin(a)linux.intel.com> intel_th: gth: Fix an off-by-one in output unassigning Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: bogus EBUSY in helper removal from transaction Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: bogus EBUSY when deleting set after flush ------------- Diffstat: Documentation/networking/ip-sysctl.txt | 1 + Documentation/sysctl/vm.txt | 16 +- Makefile | 4 +- arch/arm/boot/compressed/head.S | 16 +- arch/arm64/mm/init.c | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/powerpc/configs/skiroot_defconfig | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 2 +- arch/powerpc/platforms/Kconfig.cputype | 2 +- arch/x86/Makefile | 9 + arch/x86/events/intel/cstate.c | 10 +- block/bfq-iosched.c | 15 +- block/bfq-iosched.h | 2 +- block/bfq-wf2q.c | 17 +- crypto/lrw.c | 6 +- crypto/xts.c | 6 +- drivers/android/binder_alloc.c | 18 +- drivers/block/loop.c | 5 +- drivers/block/zram/zram_drv.c | 5 +- drivers/dma/mediatek/mtk-cqdma.c | 2 +- drivers/dma/sh/rcar-dmac.c | 30 +++- drivers/gpio/gpio-eic-sprd.c | 1 + drivers/gpu/drm/i915/intel_fbdev.c | 12 +- drivers/gpu/drm/ttm/ttm_bo.c | 10 +- drivers/gpu/drm/ttm/ttm_memory.c | 5 +- drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- drivers/hwtracing/intel_th/gth.c | 2 +- drivers/infiniband/core/uverbs.h | 1 + drivers/infiniband/core/uverbs_main.c | 52 +++++- drivers/infiniband/hw/mlx5/main.c | 10 +- drivers/infiniband/sw/rdmavt/mr.c | 17 +- drivers/input/rmi4/rmi_f11.c | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 24 ++- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 3 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 - drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 2 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 +- drivers/net/ethernet/socionext/netsec.c | 11 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 8 +- drivers/net/slip/slhc.c | 2 +- drivers/net/team/team.c | 7 + drivers/net/wireless/mac80211_hwsim.c | 19 +- drivers/usb/core/driver.c | 23 ++- drivers/usb/core/hub.c | 16 +- drivers/usb/core/message.c | 3 +- drivers/usb/core/sysfs.c | 5 +- drivers/usb/core/usb.h | 10 +- drivers/vfio/vfio_iommu_type1.c | 14 ++ fs/aio.c | 200 +++++++++------------ fs/ceph/dir.c | 6 +- fs/ceph/mds_client.c | 70 ++++++-- fs/ceph/snap.c | 7 +- fs/cifs/file.c | 15 +- fs/cifs/inode.c | 4 + fs/cifs/misc.c | 23 ++- fs/cifs/smb2pdu.c | 1 + fs/ext4/xattr.c | 3 + fs/nfs/super.c | 3 +- fs/nfsd/nfs4callback.c | 8 +- fs/nfsd/nfs4state.c | 12 +- fs/nfsd/state.h | 1 + fs/proc/proc_sysctl.c | 6 +- fs/splice.c | 4 +- include/drm/ttm/ttm_bo_driver.h | 1 - include/linux/etherdevice.h | 12 ++ include/linux/pipe_fs_i.h | 1 + include/net/netfilter/nf_tables.h | 6 + include/net/netrom.h | 2 +- kernel/sched/deadline.c | 3 +- kernel/sched/fair.c | 4 + kernel/trace/ring_buffer.c | 2 +- kernel/trace/trace.c | 33 ++-- kernel/workqueue.c | 3 + lib/Kconfig.debug | 1 + mm/page_alloc.c | 13 ++ net/bridge/netfilter/ebtables.c | 3 +- net/ipv4/route.c | 32 +++- net/ipv4/sysctl_net_ipv4.c | 5 +- net/ncsi/ncsi-rsp.c | 6 +- net/netfilter/nf_tables_api.c | 28 ++- net/netfilter/nft_dynset.c | 13 +- net/netfilter/nft_lookup.c | 13 +- net/netfilter/nft_objref.c | 32 +++- net/netrom/af_netrom.c | 76 +++++--- net/netrom/nr_loopback.c | 2 +- net/netrom/nr_route.c | 2 +- net/netrom/sysctl_net_netrom.c | 5 +- net/rds/af_rds.c | 3 + net/rds/bind.c | 2 + net/rds/ib_fmr.c | 11 ++ net/rds/ib_rdma.c | 3 - net/rose/rose_loopback.c | 27 +-- net/rxrpc/input.c | 12 +- net/rxrpc/local_object.c | 3 +- net/sunrpc/cache.c | 3 + net/tipc/netlink_compat.c | 24 ++- net/tls/tls_device.c | 4 +- net/tls/tls_device_fallback.c | 13 +- net/tls/tls_main.c | 5 +- net/tls/tls_sw.c | 3 + sound/pci/hda/patch_realtek.c | 41 +++-- 105 files changed, 874 insertions(+), 396 deletions(-)

5 years, 7 months

9
105
0 0

[PATCH v6 00/12] mm: Sub-section memory hotplug support

by Dan Williams

Changes since v5 [1]: - Rebase on next-20190416 and the new 'struct mhp_restrictions' infrastructure. - Extend mhp_restrictions to the 'remove' case so the sub-section policy can be clarified with respect to the memblock-api in a symmetric manner with the 'add' case. - Kill is_dev_zone() since cleanups have now made it moot [1]: https://lwn.net/Articles/783808/ --- The memory hotplug section is an arbitrary / convenient unit for memory hotplug. 'Section-size' units have bled into the user interface ('memblock' sysfs) and can not be changed without breaking existing userspace. The section-size constraint, while mostly benign for typical memory hotplug, has and continues to wreak havoc with 'device-memory' use cases, persistent memory (pmem) in particular. Recall that pmem uses devm_memremap_pages(), and subsequently arch_add_memory(), to allocate a 'struct page' memmap for pmem. However, it does not use the 'bottom half' of memory hotplug, i.e. never marks pmem pages online and never exposes the userspace memblock interface for pmem. This leaves an opening to redress the section-size constraint. To date, the libnvdimm subsystem has attempted to inject padding to satisfy the internal constraints of arch_add_memory(). Beyond complicating the code, leading to bugs [2], wasting memory, and limiting configuration flexibility, the padding hack is broken when the platform changes this physical memory alignment of pmem from one boot to the next. Device failure (intermittent or permanent) and physical reconfiguration are events that can cause the platform firmware to change the physical placement of pmem on a subsequent boot, and device failure is an everyday event in a data-center. It turns out that sections are only a hard requirement of the user-facing interface for memory hotplug and with a bit more infrastructure sub-section arch_add_memory() support can be added for kernel internal usages like devm_memremap_pages(). Here is an analysis of the current design assumptions in the current code and how they are addressed in the new implementation: Current design assumptions: - Sections that describe boot memory (early sections) are never unplugged / removed. - pfn_valid(), in the CONFIG_SPARSEMEM_VMEMMAP=y, case devolves to a valid_section() check - __add_pages() and helper routines assume all operations occur in PAGES_PER_SECTION units. - The memblock sysfs interface only comprehends full sections New design assumptions: - Sections are instrumented with a sub-section bitmask to track (on x86) individual 2MB sub-divisions of a 128MB section. - Partially populated early sections can be extended with additional sub-sections, and those sub-sections can be removed with arch_remove_memory(). With this in place we no longer lose usable memory capacity to padding. - pfn_valid() is updated to look deeper than valid_section() to also check the active-sub-section mask. This indication is in the same cacheline as the valid_section() so the performance impact is expected to be negligible. So far the lkp robot has not reported any regressions. - Outside of the core vmemmap population routines which are replaced, other helper routines like shrink_{zone,pgdat}_span() are updated to handle the smaller granularity. Core memory hotplug routines that deal with online memory are not touched. - The existing memblock sysfs user api guarantees / assumptions are not touched since this capability is limited to !online !memblock-sysfs-accessible sections. Meanwhile the issue reports continue to roll in from users that do not understand when and how the 128MB constraint will bite them. The current implementation relied on being able to support at least one misaligned namespace, but that immediately falls over on any moderately complex namespace creation attempt. Beyond the initial problem of 'System RAM' colliding with pmem, and the unsolvable problem of physical alignment changes, Linux is now being exposed to platforms that collide pmem ranges with other pmem ranges by default [3]. In short, devm_memremap_pages() has pushed the venerable section-size constraint past the breaking point, and the simplicity of section-aligned arch_add_memory() is no longer tenable. These patches are exposed to the kbuild robot on my libnvdimm-pending branch [4], and a preview of the unit test for this functionality is available on the 'subsection-pending' branch of ndctl [5]. [2]: https://lore.kernel.org/r/155000671719.348031.2347363160141119237.stgit@dwi… [3]: https://github.com/pmem/ndctl/issues/76 [4]: https://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm.git/log/?h=libn… [5]: https://github.com/pmem/ndctl/commit/7c59b4867e1c --- Dan Williams (12): mm/sparsemem: Introduce struct mem_section_usage mm/sparsemem: Introduce common definitions for the size and mask of a section mm/sparsemem: Add helpers track active portions of a section at boot mm/hotplug: Prepare shrink_{zone,pgdat}_span for sub-section removal mm/sparsemem: Convert kmalloc_section_memmap() to populate_section_memmap() mm/hotplug: Add mem-hotplug restrictions for remove_memory() mm: Kill is_dev_zone() helper mm/sparsemem: Prepare for sub-section ranges mm/sparsemem: Support sub-section hotplug mm/devm_memremap_pages: Enable sub-section remap libnvdimm/pfn: Fix fsdax-mode namespace info-block zero-fields libnvdimm/pfn: Stop padding pmem namespaces to section alignment arch/ia64/mm/init.c | 4 arch/powerpc/mm/mem.c | 5 - arch/s390/mm/init.c | 2 arch/sh/mm/init.c | 4 arch/x86/mm/init_32.c | 4 arch/x86/mm/init_64.c | 9 + drivers/nvdimm/dax_devs.c | 2 drivers/nvdimm/pfn.h | 12 - drivers/nvdimm/pfn_devs.c | 93 +++------- include/linux/memory_hotplug.h | 12 + include/linux/mm.h | 4 include/linux/mmzone.h | 72 ++++++-- kernel/memremap.c | 70 +++----- mm/hmm.c | 2 mm/memory_hotplug.c | 148 +++++++++------- mm/page_alloc.c | 8 + mm/sparse-vmemmap.c | 21 ++ mm/sparse.c | 371 +++++++++++++++++++++++++++------------- 18 files changed, 503 insertions(+), 340 deletions(-)

5 years, 7 months

5
14
0 0

Linux 3.16.66

by Ben Hutchings

I'm announcing the release of the 3.16.66 kernel. All users of the 3.16 kernel series should upgrade. The updated 3.16.y git tree can be found at: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.16.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git The diff from 3.16.65 is attached to this message. Ben. ------------ Makefile | 2 +- arch/alpha/mm/fault.c | 2 +- arch/arc/kernel/head.S | 4 +- arch/arc/kernel/setup.c | 88 ++++++++++---- arch/arc/kernel/signal.c | 39 +++--- arch/arc/kernel/troubleshoot.c | 27 ++--- arch/arc/mm/fault.c | 13 +- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 4 +- arch/arm/mach-iop32x/n2100.c | 3 +- arch/arm/plat-pxa/ssp.c | 3 - arch/arm64/include/asm/signal32.h | 11 +- arch/arm64/kernel/signal.c | 48 ++++---- arch/arm64/kernel/signal32.c | 14 +-- arch/avr32/kernel/signal.c | 43 +++---- arch/blackfin/kernel/signal.c | 39 +++--- arch/c6x/kernel/signal.c | 43 +++---- arch/cris/arch-v10/kernel/signal.c | 79 +++++------- arch/cris/arch-v32/kernel/signal.c | 77 +++++------- arch/frv/kernel/signal.c | 99 +++++++-------- arch/hexagon/kernel/signal.c | 45 +++---- arch/ia64/kernel/signal.c | 46 ++++--- arch/m32r/kernel/signal.c | 47 ++++---- arch/m68k/kernel/signal.c | 63 ++++------ arch/microblaze/kernel/signal.c | 48 +++----- arch/mips/include/asm/abi.h | 10 +- arch/mips/kernel/process.c | 7 +- arch/mips/kernel/signal-common.h | 2 +- arch/mips/kernel/signal.c | 72 +++++------ arch/mips/kernel/signal32.c | 39 +++--- arch/mips/kernel/signal_n32.c | 20 ++-- arch/mips/pci/msi-octeon.c | 4 +- arch/mips/pci/pci-octeon.c | 10 +- arch/mn10300/kernel/signal.c | 89 ++++++-------- arch/parisc/kernel/signal.c | 58 ++++----- arch/powerpc/kernel/signal.c | 41 ++----- arch/powerpc/kernel/signal.h | 14 +-- arch/powerpc/kernel/signal_32.c | 36 +++--- arch/powerpc/kernel/signal_64.c | 28 ++--- arch/s390/include/asm/mmu_context.h | 12 +- arch/s390/kernel/compat_signal.c | 79 ++++++------ arch/s390/kernel/early.c | 4 +- arch/s390/kernel/entry.h | 4 +- arch/s390/kernel/setup.c | 2 + arch/s390/kernel/signal.c | 78 +++++------- arch/s390/kernel/smp.c | 4 + arch/score/kernel/signal.c | 43 +++---- arch/sh/kernel/signal_32.c | 79 +++++------- arch/sh/kernel/signal_64.c | 82 +++++-------- arch/tile/include/asm/compat.h | 3 +- arch/tile/kernel/compat_signal.c | 29 ++--- arch/tile/kernel/signal.c | 54 ++++----- arch/um/include/shared/frame_kern.h | 12 +- arch/um/kernel/signal.c | 27 ++--- arch/unicore32/kernel/signal.c | 51 ++++---- arch/x86/boot/compressed/aslr.c | 4 +- arch/x86/ia32/ia32_aout.c | 6 +- arch/x86/include/asm/uaccess.h | 7 +- arch/x86/kernel/cpu/perf_event.c | 9 ++ arch/x86/kernel/cpu/perf_event.h | 21 ++++ arch/x86/kernel/cpu/perf_event_intel.c | 9 ++ arch/x86/kernel/cpu/perf_event_intel_uncore.c | 4 +- arch/x86/kvm/vmx.c | 7 +- arch/x86/kvm/x86.c | 3 +- arch/x86/um/signal.c | 45 ++++--- arch/xtensa/kernel/signal.c | 43 +++---- crypto/authenc.c | 14 ++- drivers/acpi/power.c | 22 ++++ drivers/ata/libata-core.c | 1 + drivers/block/rbd.c | 9 +- drivers/char/Kconfig | 2 +- drivers/char/ipmi/ipmi_msghandler.c | 6 + drivers/char/mwave/mwavedd.c | 7 ++ drivers/dma/bcm2835-dma.c | 124 +++++++++++-------- drivers/dma/dmatest.c | 30 ++--- drivers/dma/imx-dma.c | 8 +- drivers/gpu/drm/drm_fb_helper.c | 133 ++++++++++++--------- drivers/gpu/drm/drm_modes.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/hv/hyperv_vmbus.h | 5 +- drivers/hv/ring_buffer.c | 31 +++-- drivers/hv/vmbus_drv.c | 91 +++++++++----- drivers/i2c/busses/i2c-cadence.c | 9 +- drivers/i2c/i2c-dev.c | 6 + drivers/infiniband/ulp/ipoib/ipoib.h | 1 - drivers/infiniband/ulp/ipoib/ipoib_cm.c | 3 +- drivers/input/misc/bma150.c | 9 +- drivers/input/mouse/elantech.c | 23 ++++ drivers/iommu/amd_iommu.c | 15 ++- drivers/md/dm-thin.c | 55 ++++++++- drivers/media/usb/em28xx/em28xx-dvb.c | 20 +--- drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- drivers/mfd/ab8500-core.c | 2 +- drivers/mfd/tps6586x.c | 24 ++++ drivers/mmc/host/mmc_spi.c | 1 + drivers/mmc/host/tmio_mmc_pio.c | 8 +- drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 13 +- drivers/net/can/dev.c | 27 ++--- drivers/net/ethernet/marvell/skge.c | 6 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 68 +++++++---- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 22 ++-- drivers/net/phy/mdio_bus.c | 1 - drivers/net/phy/micrel.c | 41 ++++++- drivers/net/team/team.c | 27 +---- drivers/net/vxlan.c | 13 +- drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 29 ++--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 4 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 76 +++++++++--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 32 +++-- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 16 ++- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 11 +- drivers/net/wireless/brcm80211/brcmfmac/proto.h | 18 ++- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 + drivers/s390/block/dasd_eckd.c | 8 ++ drivers/s390/char/sclp_config.c | 2 + drivers/s390/net/qeth_core.h | 3 +- drivers/s390/net/qeth_core_main.c | 35 ++++-- drivers/s390/net/qeth_l2_main.c | 7 +- drivers/s390/net/qeth_l3_main.c | 3 + drivers/scsi/bnx2fc/bnx2fc_io.c | 4 +- drivers/scsi/isci/init.c | 14 +-- drivers/scsi/libsas/sas_expander.c | 2 + drivers/scsi/sd.c | 7 ++ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + drivers/tty/n_hdlc.c | 1 + drivers/tty/serial/serial_core.c | 12 +- drivers/tty/tty_io.c | 3 +- drivers/tty/vt/vt.c | 3 +- drivers/usb/class/cdc-acm.c | 7 ++ drivers/usb/core/quirks.c | 3 +- drivers/usb/gadget/net2272.c | 2 +- drivers/usb/musb/musb_gadget.c | 13 +- drivers/usb/musb/musbhsdma.c | 21 ++-- drivers/usb/phy/phy-am335x.c | 5 +- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 2 + drivers/usb/serial/usb-serial-simple.c | 3 +- drivers/usb/storage/scsiglue.c | 8 +- drivers/usb/storage/unusual_devs.h | 12 ++ drivers/vfio/vfio_iommu_type1.c | 15 +++ drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 + fs/binfmt_elf.c | 3 +- fs/ceph/snap.c | 3 +- fs/cifs/file.c | 8 +- fs/cifs/smb2file.c | 4 +- fs/cifs/smb2pdu.c | 6 +- fs/cifs/transport.c | 2 +- fs/dcache.c | 6 +- fs/debugfs/inode.c | 7 ++ fs/fuse/dev.c | 4 +- fs/fuse/file.c | 2 +- fs/proc/task_mmu.c | 22 +++- include/keys/user-type.h | 2 +- include/linux/perf_event.h | 5 + include/linux/sched.h | 21 ++++ include/linux/signal.h | 15 +-- include/linux/tracehook.h | 8 +- include/sound/compress_driver.h | 6 +- ipc/shm.c | 4 +- kernel/events/core.c | 70 ++++++++--- kernel/events/ring_buffer.c | 3 + kernel/signal.c | 105 ++++++++++++---- lib/assoc_array.c | 8 +- mm/memory-failure.c | 3 +- mm/migrate.c | 8 +- mm/mmap.c | 24 ++-- mm/oom_kill.c | 8 ++ mm/shmem.c | 12 +- net/batman-adv/hard-interface.c | 4 +- net/batman-adv/soft-interface.c | 4 + net/bluetooth/l2cap_core.c | 83 ++++++++----- net/bridge/br_forward.c | 26 ++-- net/can/bcm.c | 27 +++++ net/dsa/slave.c | 13 +- net/ipv4/cipso_ipv4.c | 6 +- net/ipv6/addrconf.c | 3 +- net/ipv6/sit.c | 3 +- net/l2tp/l2tp_core.c | 5 +- net/mac80211/tx.c | 9 +- net/netfilter/nf_tables_api.c | 3 + net/netfilter/nft_compat.c | 120 +++++++++++-------- net/nfc/llcp_commands.c | 20 ++++ net/nfc/llcp_core.c | 24 +++- net/packet/af_packet.c | 12 +- net/sched/sch_netem.c | 10 +- net/vmw_vsock/vmci_transport.c | 4 + net/x25/af_x25.c | 13 +- scripts/kallsyms.c | 4 +- security/apparmor/apparmorfs.c | 1 + security/keys/key.c | 4 +- security/keys/keyring.c | 4 +- security/keys/proc.c | 11 +- security/keys/request_key.c | 1 + security/keys/request_key_auth.c | 2 +- security/yama/yama_lsm.c | 4 +- sound/pci/cs46xx/dsp_spos.c | 3 + sound/soc/codecs/tlv320aic32x4.c | 4 + sound/soc/intel/sst-mfld-platform-pcm.c | 8 +- sound/usb/card.c | 5 + sound/usb/mixer.c | 10 +- sound/usb/pcm.c | 9 +- sound/usb/quirks-table.h | 6 + sound/usb/stream.c | 31 +++-- tools/perf/tests/evsel-tp-sched.c | 8 +- 206 files changed, 2363 insertions(+), 1833 deletions(-) Aaro Koskinen (1): MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled Alex Williamson (1): vfio/type1: Limit DMA mappings per container Alexander Popov (1): KVM: x86: Fix single-step debugging Alexandru Ardelean (1): dmaengine: dmatest: unmap data on a single code-path when xfer done Andrea Arcangeli (1): coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping Andy Lutomirski (1): x86/uaccess: Don't leak the AC flag into __put_user() value evaluation Andy Shevchenko (1): dmaengine: dmatest: Abort test in case of mapping error Arend van Spriel (5): brcmfmac: assure SSID length from firmware is limited brcmfmac: consolidate ifp lookup in driver core brcmfmac: make brcmf_proto_hdrpull() return struct brcmf_if instance brcmfmac: revise handling events in receive path brcmfmac: add subtype check for event handling in data path Aya Levin (1): net/mlx4_core: Add masking for a few queries on HCA caps Ben Hutchings (2): binfmt_elf: Fix missing SIGKILL for empty PIE Linux 3.16.66 Bin Liu (1): usb: phy: am335x: fix race condition in _probe Borislav Petkov (1): x86/a.out: Clear the dump structure initially Charles Keepax (1): ALSA: compress: Fix stop handling on compressed capture streams Charles Yeh (1): USB: serial: pl2303: add new PID to support PL2303TB Christian Borntraeger (1): s390/early: improve machine detection Christoph Paasch (1): net/packet: Set __GFP_NOWARN upon allocation in alloc_pg_vec Cong Wang (1): team: avoid complex list operations in team_nl_cmd_options_set() Dan Carpenter (4): mfd: ab8500-core: Return zero in get_register_interruptible() ALSA: cs46xx: Potential NULL dereference in probe scsi: bnx2fc: Fix error handling in probe() skge: potential memory corruption in skge_get_regs() Daniel Drake (1): x86/kaslr: Fix incorrect i8254 outb() parameters Daniele Palmas (1): usb: cdc-acm: send ZLP for Telit 3G Intel based modems Darrick J. Wong (2): tmpfs: fix link accounting when a tmpfile is linked in tmpfs: fix uninitialized return value in shmem_link David Hildenbrand (1): mm: migrate: don't rely on __PageMovable() of newpage after unlocking it David Howells (1): assoc_array: Fix shortcut creation Davidlohr Bueso (1): arc: do not export symbols in troubleshoot.c Dexuan Cui (1): Drivers: hv: vmbus: Check for ring when getting debug info Eric Biggers (5): crypto: authenc - fix parsing key with misaligned rta_len KEYS: allow reaching the keys quotas exactly KEYS: user: Align the payload buffer KEYS: restrict /proc/keys by credentials at open time KEYS: always initialize keyring_index_key::desc_len Eric Dumazet (3): vxlan: test dev->flags & IFF_UP before calling netif_rx() batman-adv: fix uninit-value in batadv_interface_tx() net/x25: fix a race in x25_bind() Eric W. Biederman (4): signal: Always notice exiting tasks signal: Better detection of synchronous signals signal: Restore the stop PTRACE_EVENT_EXIT ipc/shm: Fix pid freeing. Eugene Loh (1): kallsyms: Handle too long symbols in kallsyms.c Eugeniy Paltsev (1): ARC: U-boot: check arguments paranoidly Felix Fietkau (1): mac80211: ensure that mgmt tx skbs have tailroom for encryption Feras Daoud (1): IB/ipoib: Fix for use-after-free in ipoib_cm_tx_start Florian Westphal (1): netfilter: nf_tables: nft_compat: fix refcount leak on xt module Franky Lin (1): brcmfmac: screening firmware event packet Gabriel Krisman Bertazi (1): sd: Clear PS bit before Mode Select. Gavin Li (1): brcmfmac: fix incorrect event channel deduction Gerald Schaefer (1): s390/smp: fix CPU hotplug deadlock with CPU rescan Greg Kroah-Hartman (3): tty: Handle problem if line discipline does not have receive_buf debugfs: fix debugfs_rename parameter checking tty: mark Siemens R3964 line discipline as BROKEN Grygorii Strashko (1): net: phy: micrel: ksz9031: reconfigure autoneg after phy autoneg workaround Guenter Roeck (1): unicore32: Fix build error Gustavo A. R. Silva (4): char/mwave: fix potential Spectre v1 vulnerability ipmi: msghandler: Fix potential Spectre v1 vulnerabilities usb: gadget: udc: net2272: Fix bitwise and boolean operations perf tests evsel-tp-sched: Fix bitwise operator Hangbin Liu (1): sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach() Hans de Goede (2): ACPI: power: Skip duplicate power resource references in _PRx libata: Add NOLPM quirk for SAMSUNG MZ7TE512HMHP-000L1 SSD Heiner Kallweit (1): net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ9031 Hui Peng (1): ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks Icenowy Zheng (2): USB: storage: don't insert sane sense for SPC3+ when bad sense specified USB: storage: add quirk for SMI SM3350 Ilya Dryomov (1): rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is set Ingo Molnar (1): perf/core: Fix impossible ring-buffer sizes warning Ivan Mironov (3): scsi: sd: Fix cache_type_store() drm/fb-helper: Partially bring back workaround for bugs of SDL 1.2 drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock Jack Stocker (1): USB: Add USB_QUIRK_DELAY_CTRL_MSG quirk for Corsair K70 RGB Jacob Wen (1): l2tp: copy 4 more bytes to linear part if necessary Jann Horn (2): fuse: call pipe_buf_release() under pipe lock mm: enforce min addr even if capable() in expand_downwards() Jason Gunthorpe (1): packet: Do not leak dev refcounts on error exit Jiri Olsa (1): perf/x86: Add check_period PMU callback John Garry (1): scsi: libsas: Fix rphy phy_identifier for PHYs with end devices attached John Johansen (1): apparmor: provide userspace flag indicating binfmt_elf_mmap change Jonathan Bakker (1): Input: bma150 - register input device after setting private data Jonathan Hunter (1): mfd: tps6586x: Handle interrupts on suspend Jonathan Neuschäfer (1): mmc: spi: Fix card detection during probe Jose Abreu (1): net: stmmac: Fix a race in EEE enable callback Julian Wiedmann (3): s390/qeth: fix use-after-free in error path s390/qeth: cancel close_dev work before removing a card s390/qeth: conclude all event processing before offlining a card Jun-Ru Chang (1): MIPS: Remove function size check in get_frame_info() Kal Conley (1): net/packet: fix 4gb buffer limit due to overflow check Kan Liang (1): perf/x86/intel/uncore: Add Node ID mask Kangjie Lu (1): ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages Kees Cook (1): Yama: Check for pid death before checking ancestry Leonid Iziumtsev (1): dmaengine: imx-dma: fix wrong callback invoke Linus Torvalds (1): binfmt_elf: switch to new creds when switching to new mm Linus Walleij (1): ARM: dts: kirkwood: Fix polarity of GPIO fan lines Liping Zhang (1): netfilter: nft_compat: fix crash when related match/target module is removed Logan Gunthorpe (1): scsi: isci: initialize shost fully before calling scsi_add_host() Lukas Wunner (2): dmaengine: bcm2835: Fix interrupt race on RT dmaengine: bcm2835: Fix abort of transactions Manfred Schlaegl (1): can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it Manuel Reinhardt (1): ALSA: usb-audio: Fix implicit fb endpoint setup by quirk Marcel Holtmann (2): Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer Bluetooth: Check L2CAP option sizes returned from l2cap_get_conf_opt Mark Rutland (1): perf/core: Don't WARN() for impossible ring-buffer sizes Martin Kepplinger (1): mtd: rawnand: gpmi: fix MX28 bus master lockup problem Martin Schwidefsky (1): s390/mm: always force a load of the primary ASCE on context switch Martin Sperl (1): dmaengine: bcm2835: add additional defines for DMA-registers Matthias Schwarzott (1): media: em28xx: Fix use-after-free when disconnecting Matti Kurkela (2): Input: elantech - force needed quirks on Fujitsu H760 Input: elantech - enable 3rd button support on Fujitsu CELSIUS H780 Max Schulze (1): USB: serial: simple: add Motorola Tetra TPG2200 device id Michael Straube (1): staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1 Miklos Szeredi (2): fuse: handle zero sized retrieve correctly fuse: decrement NR_WRITEBACK_TEMP on the right page Naoya Horiguchi (1): mm: hwpoison: use do_send_sig_info() instead of force_sig() Nathan Sullivan (1): net/phy: micrel: Add workaround for bad autoneg Naveen N. Rao (1): powerpc/signal: Properly handle return value from uprobe_deny_signal() Nicolas Pitre (2): vt: always call notifier with the console lock held vt: invoke notifier on screen size change Nikos Tsironis (1): dm thin: fix bug where bio that overwrites thin block ignores FUA Oleg Nesterov (1): mm/mmap.c: expand_downwards: don't require the gap if !vm_prev Oliver Hartkopp (1): can: bcm: check timer values before ktime conversion Pablo Neira Ayuso (2): netfilter: nft_compat: use-after-free when deleting targets netfilter: nf_tables: fix flush after rule deletion in the same batch Paolo Abeni (1): vsock: cope with memory allocation failure at socket creation time Paul Elder (1): usb: gadget: musb: fix short isoc packets with inventra dma Paul Fulghum (1): tty/n_hdlc: fix __might_sleep warning Paul Moore (1): netlabel: fix out-of-bounds memory accesses Pavel Shilovsky (3): CIFS: Do not hide EINTR after sending network packets CIFS: Do not count -ENODATA as failure for query directory CIFS: Do not consider -ENODATA as stat failure for reads Peng Hao (1): ARM: pxa: ssp: unneeded to free devm_ allocated data Peter Zijlstra (1): perf/core: Fix perf_event_open() vs. execve() race Rajasingh Thavamani (1): net: phy: Micrel KSZ8061: link failure after cable connect Richard Weinberger (28): arc: Use get_signal() signal_setup_done() arm64: Use get_signal() signal_setup_done() avr32: Use get_signal() signal_setup_done() blackfin: Use get_signal() signal_setup_done() c6x: Use get_signal() signal_setup_done() cris: Use get_signal() signal_setup_done() frv: Use get_signal() signal_setup_done() hexagon: Use get_signal() signal_setup_done() ia64: Use get_signal() signal_setup_done() m32r: Use get_signal() signal_setup_done() m68k: Use get_signal() signal_setup_done() microblaze: Use get_signal() signal_setup_done() mips: Use get_signal() signal_setup_done() mips: Use sigsp() mn10300: Use get_signal() signal_setup_done() parisc: Use get_signal() signal_setup_done() powerpc: Use get_signal() signal_setup_done() powerpc: Use sigsp() s390: Use get_signal() signal_setup_done() score: Use get_signal() signal_setup_done() sh: Use get_signal() signal_setup_done() tile: Use get_signal() signal_setup_done() um: Use get_signal() signal_setup_done() unicore32: Use get_signal() signal_setup_done() xtensa: Use get_signal() signal_setup_done() tracehook_signal_handler: Remove sig, info, ka and regs Clean up signal_delivered() Rip out get_signal_to_deliver() Ross Lagerwall (1): cifs: Fix potential OOB access of lock element array Rundong Ge (1): net: dsa: slave: Don't propagate flag changes on down slave interfaces Russell King (1): ARM: iop32x/n2100: fix PCI IRQ mapping Sakari Ailus (1): media: v4l: ioctl: Validate num_planes for debug messages Samir Virmani (1): uart: Fix crash in uart_write and uart_put_char Sergei Shtylyov (1): mmc: tmio_mmc_core: don't claim spurious interrupts Sergei Trofimovich (1): alpha: fix page fault handling for r16-r18 targets Shakeel Butt (1): mm, oom: fix use-after-free in oom_kill_process Sheng Lan (1): net: netem: fix skb length BUG_ON in __skb_to_sgvec Shuah Khan (1): media: em28xx-dvb - fix em28xx_dvb_resume() to not unregister i2c and dvb Shubhrajyoti Datta (1): i2c: cadence: Fix the hold bit setting Stefan Haberland (1): s390/dasd: fix using offset into zero size array error Suravee Suthikulpanit (1): iommu/amd: Fix IOMMU page flush when detach device from a domain Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit Takashi Iwai (2): ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit() ALSA: usb-audio: Always check descriptor sizes in parser code Thomas Hellstrom (2): drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user drm/vmwgfx: Fix setting of dma masks Thomas Richter (1): perf test: Fix failure of 'evsel-tp-sched' test on s390 Tina Zhang (1): drm/modes: Prevent division by zero htotal Vineet Gupta (2): ARC: show_regs: lockdep: avoid page allocator... ARC: mm: do_page_fault fixes #1: relinquish mmap_sem if signal arrives while handle_mm_fault Vitaly Kuznetsov (1): x86/kvm/nVMX: read from MSR_IA32_VMX_PROCBASED_CTLS2 only when it is available Vlad Tsyrklevich (1): omap2fb: Fix stack memory disclosure Waiman Long (1): fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb() Willem de Bruijn (2): packet: validate address length packet: validate address length if non-zero Yan, Zheng (1): ceph: avoid repeatedly adding inode to mdsc->snap_flush_list Yi Zeng (1): i2c: dev: prevent adapter retries and timeout being set as minus value YueHaibing (2): mdio_bus: Fix use-after-free on device_register fails net: nfc: Fix NULL dereference on nfc_llcp_build_tlv fails YunQiang Su (1): Disable MSI also when pcie-octeon.pcie_disable on Yunjian Wang (1): net: bridge: Fix ethernet header pointer before check skb forwardable Zach Brown (1): net/phy: micrel: configure intterupts after autoneg workaround Zhiqiang Liu (1): net: fix IPv6 prefix route residue b-ak (1): ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode

5 years, 7 months

1
0
0 0

[GIT PULL 01/22] intel_th: msu: Fix single mode with IOMMU

by Alexander Shishkin

Currently, the pages that are allocated for the single mode of MSC are not mapped into the device's dma space and the code is incorrectly using *_to_phys() in place of a dma address. This fails with IOMMU enabled and is otherwise bad practice. Fix the single mode buffer allocation to map the pages into the device's DMA space. Signed-off-by: Alexander Shishkin <alexander.shishkin(a)linux.intel.com> Fixes: ba82664c134e ("intel_th: Add Memory Storage Unit driver") Cc: stable(a)vger.kernel.org # v4.4+ --- drivers/hwtracing/intel_th/msu.c | 35 +++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c index ba7aaf421f36..8ff326c0c406 100644 --- a/drivers/hwtracing/intel_th/msu.c +++ b/drivers/hwtracing/intel_th/msu.c @@ -84,6 +84,7 @@ struct msc_iter { * @reg_base: register window base address * @thdev: intel_th_device pointer * @win_list: list of windows in multiblock mode + * @single_sgt: single mode buffer * @nr_pages: total number of pages allocated for this buffer * @single_sz: amount of data in single mode * @single_wrap: single mode wrap occurred @@ -104,6 +105,7 @@ struct msc { struct intel_th_device *thdev; struct list_head win_list; + struct sg_table single_sgt; unsigned long nr_pages; unsigned long single_sz; unsigned int single_wrap : 1; @@ -617,22 +619,45 @@ static void intel_th_msc_deactivate(struct intel_th_device *thdev) */ static int msc_buffer_contig_alloc(struct msc *msc, unsigned long size) { + unsigned long nr_pages = size >> PAGE_SHIFT; unsigned int order = get_order(size); struct page *page; + int ret; if (!size) return 0; + ret = sg_alloc_table(&msc->single_sgt, 1, GFP_KERNEL); + if (ret) + goto err_out; + + ret = -ENOMEM; page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order); if (!page) - return -ENOMEM; + goto err_free_sgt; split_page(page, order); - msc->nr_pages = size >> PAGE_SHIFT; + sg_set_buf(msc->single_sgt.sgl, page_address(page), size); + + ret = dma_map_sg(msc_dev(msc)->parent->parent, msc->single_sgt.sgl, 1, + DMA_FROM_DEVICE); + if (ret < 0) + goto err_free_pages; + + msc->nr_pages = nr_pages; msc->base = page_address(page); - msc->base_addr = page_to_phys(page); + msc->base_addr = sg_dma_address(msc->single_sgt.sgl); return 0; + +err_free_pages: + __free_pages(page, order); + +err_free_sgt: + sg_free_table(&msc->single_sgt); + +err_out: + return ret; } /** @@ -643,6 +668,10 @@ static void msc_buffer_contig_free(struct msc *msc) { unsigned long off; + dma_unmap_sg(msc_dev(msc)->parent->parent, msc->single_sgt.sgl, + 1, DMA_FROM_DEVICE); + sg_free_table(&msc->single_sgt); + for (off = 0; off < msc->nr_pages << PAGE_SHIFT; off += PAGE_SIZE) { struct page *page = virt_to_page(msc->base + off); -- 2.20.1

5 years, 7 months

1
0
0 0

[PATCH] ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX

by Fabio Estevam

Since commit 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx") some characters loss is noticed on i.MX6ULL UART as reported by Christoph Niedermaier. The intention of such commit was to increase the SW2ISO field for i.MX6SX only, but since cpuidle-imx6sx is also used on i.MX6UL/i.MX6ULL this caused unintended side effects on other SoCs. Fix this problem by keeping the original SW2ISO value for i.MX6UL/i.MX6ULL and only increase SW2ISO in the i.MX6SX case. Cc: stable(a)vger.kernel.org Fixes: 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx") Reported-by: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- arch/arm/mach-imx/cpuidle-imx6sx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/cpuidle-imx6sx.c b/arch/arm/mach-imx/cpuidle-imx6sx.c index fd0053e47a15..57cb9c763222 100644 --- a/arch/arm/mach-imx/cpuidle-imx6sx.c +++ b/arch/arm/mach-imx/cpuidle-imx6sx.c @@ -15,6 +15,7 @@ #include "common.h" #include "cpuidle.h" +#include "hardware.h" static int imx6sx_idle_finish(unsigned long val) { @@ -99,8 +100,12 @@ static struct cpuidle_driver imx6sx_cpuidle_driver = { .safe_state_index = 0, }; +#define SW2ISO_ORIGINAL 0x2 +#define SW2ISO_IMX6SX 0xf int __init imx6sx_cpuidle_init(void) { + u32 sw2iso = SW2ISO_ORIGINAL; + imx6_set_int_mem_clk_lpm(true); imx6_enable_rbc(false); imx_gpc_set_l2_mem_power_in_lpm(false); @@ -110,7 +115,9 @@ int __init imx6sx_cpuidle_init(void) * except for power up sw2iso which need to be * larger than LDO ramp up time. */ - imx_gpc_set_arm_power_up_timing(0xf, 1); + if (cpu_is_imx6sx()) + sw2iso = SW2ISO_IMX6SX; + imx_gpc_set_arm_power_up_timing(sw2iso, 1); imx_gpc_set_arm_power_down_timing(1, 1); return cpuidle_register(&imx6sx_cpuidle_driver, NULL); -- 2.17.1

5 years, 7 months

3
2
0 0

[PATCH] powerpc/powernv: Restrict OPAL symbol map to only be readable by root

by Andrew Donnellan

Currently the OPAL symbol map is globally readable, which seems bad as it contains physical addresses. Restrict it to root. Suggested-by: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Jordan Niethe <jniethe5(a)gmail.com> Cc: Stewart Smith <stewart(a)linux.ibm.com> Fixes: c8742f85125d ("powerpc/powernv: Expose OPAL firmware symbol map") Cc: stable(a)vger.kernel.org Signed-off-by: Andrew Donnellan <ajd(a)linux.ibm.com> --- arch/powerpc/platforms/powernv/opal.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index 2b0eca104f86..505460a72052 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c @@ -681,7 +681,10 @@ static ssize_t symbol_map_read(struct file *fp, struct kobject *kobj, bin_attr->size); } -static BIN_ATTR_RO(symbol_map, 0); +static struct bin_attribute symbol_map_attr = { + .attr = {.name = "symbol_map", .mode = 0400}, + .read = symbol_map_read +}; static void opal_export_symmap(void) { @@ -698,10 +701,10 @@ static void opal_export_symmap(void) return; /* Setup attributes */ - bin_attr_symbol_map.private = __va(be64_to_cpu(syms[0])); - bin_attr_symbol_map.size = be64_to_cpu(syms[1]); + symbol_map_attr.private = __va(be64_to_cpu(syms[0])); + symbol_map_attr.size = be64_to_cpu(syms[1]); - rc = sysfs_create_bin_file(opal_kobj, &bin_attr_symbol_map); + rc = sysfs_create_bin_file(opal_kobj, &symbol_map_attr); if (rc) pr_warn("Error %d creating OPAL symbols file\n", rc); } -- 2.20.1

5 years, 7 months

2
2
0 0

[PATCH v2] powerpc/booke64: set RI in default MSR

by laurentiu.tudor＠nxp.com

From: Laurentiu Tudor <laurentiu.tudor(a)nxp.com> Set RI in the default kernel's MSR so that the architected way of detecting unrecoverable machine check interrupts has a chance to work. This is inline with the MSR setup of the rest of booke powerpc architectures configured here. Signed-off-by: Laurentiu Tudor <laurentiu.tudor(a)nxp.com> Cc: stable(a)vger.kernel.org --- Changes in v2: - fixed typo - s/SI/RI arch/powerpc/include/asm/reg_booke.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h index eb2a33d5df26..e382bd6ede84 100644 --- a/arch/powerpc/include/asm/reg_booke.h +++ b/arch/powerpc/include/asm/reg_booke.h @@ -41,7 +41,7 @@ #if defined(CONFIG_PPC_BOOK3E_64) #define MSR_64BIT MSR_CM -#define MSR_ (MSR_ME | MSR_CE) +#define MSR_ (MSR_ME | MSR_RI | MSR_CE) #define MSR_KERNEL (MSR_ | MSR_64BIT) #define MSR_USER32 (MSR_ | MSR_PR | MSR_EE) #define MSR_USER64 (MSR_USER32 | MSR_64BIT) -- 2.17.1

5 years, 7 months

2
1
0 0

patch "staging: most: cdev: fix chrdev_region leak in mod_exit" added to staging-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled staging: most: cdev: fix chrdev_region leak in mod_exit 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-next 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 also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From af708900e9a48c0aa46070c8a8cdf0608a1d2025 Mon Sep 17 00:00:00 2001 From: Suresh Udipi <sudipi(a)jp.adit-jv.com> Date: Wed, 24 Apr 2019 21:23:43 +0200 Subject: staging: most: cdev: fix chrdev_region leak in mod_exit It looks like v4.18-rc1 commit [0] which upstreams mld-1.8.0 commit [1] missed to fix the memory leak in mod_exit function. Do it now. [0] aba258b7310167 ("staging: most: cdev: fix chrdev_region leak") [1] https://github.com/microchip-ais/linux/commit/a2d8f7ae7ea381 ("staging: most: cdev: fix leak for chrdev_region") Signed-off-by: Suresh Udipi <sudipi(a)jp.adit-jv.com> Signed-off-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> Acked-by: Christian Gromm <christian.gromm(a)microchip.com> Fixes: aba258b73101 ("staging: most: cdev: fix chrdev_region leak") Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/most/cdev/cdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/most/cdev/cdev.c b/drivers/staging/most/cdev/cdev.c index d98977c57a4b..d0cc0b746107 100644 --- a/drivers/staging/most/cdev/cdev.c +++ b/drivers/staging/most/cdev/cdev.c @@ -555,7 +555,7 @@ static void __exit mod_exit(void) destroy_cdev(c); destroy_channel(c); } - unregister_chrdev_region(comp.devno, 1); + unregister_chrdev_region(comp.devno, CHRDEV_REGION_SIZE); ida_destroy(&comp.minor_id); class_destroy(comp.class); } -- 2.21.0

5 years, 7 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror May 2019