September 2019 - Linux-stable-mirror

[PATCH for-next 3/3] IB/hfi1: Define variables as unsigned long to fix KASAN warning

by Dennis Dalessandro

From: Ira Weiny <ira.weiny(a)intel.com> Define the working variables to be unsigned long to be compatible with for_each_set_bit and change types as needed. While we are at it remove unused variables from a couple of functions. This was found because of the following KASAN warning: [ 1383.018461] ================================================================== [ 1383.029116] BUG: KASAN: stack-out-of-bounds in find_first_bit+0x19/0x70 [ 1383.038646] Read of size 8 at addr ffff888362d778d0 by task kworker/u308:2/1889 [ 1383.049006] [ 1383.052766] CPU: 21 PID: 1889 Comm: kworker/u308:2 Tainted: G W 5.3.0-rc2-mm1+ #2 [ 1383.064765] Hardware name: Intel Corporation W2600CR/W2600CR, BIOS SE5C600.86B.02.04.0003.102320141138 10/23/2014 [ 1383.078498] Workqueue: ib-comp-unb-wq ib_cq_poll_work [ib_core] [ 1383.087314] Call Trace: [ 1383.092211] dump_stack+0x9a/0xf0 [ 1383.098074] ? find_first_bit+0x19/0x70 [ 1383.104546] print_address_description+0x6c/0x332 [ 1383.111986] ? find_first_bit+0x19/0x70 [ 1383.118443] ? find_first_bit+0x19/0x70 [ 1383.124882] __kasan_report.cold.6+0x1a/0x3b [ 1383.131808] ? find_first_bit+0x19/0x70 [ 1383.138244] kasan_report+0xe/0x12 [ 1383.144169] find_first_bit+0x19/0x70 [ 1383.150413] pma_get_opa_portstatus+0x5cc/0xa80 [hfi1] [ 1383.158275] ? ret_from_fork+0x3a/0x50 [ 1383.164583] ? pma_get_opa_port_ectrs+0x200/0x200 [hfi1] [ 1383.172629] ? stack_trace_consume_entry+0x80/0x80 [ 1383.180097] hfi1_process_mad+0x39b/0x26c0 [hfi1] [ 1383.187420] ? __lock_acquire+0x65e/0x21b0 [ 1383.194081] ? clear_linkup_counters+0xb0/0xb0 [hfi1] [ 1383.201788] ? check_chain_key+0x1d7/0x2e0 [ 1383.208391] ? lock_downgrade+0x3a0/0x3a0 [ 1383.214906] ? match_held_lock+0x2e/0x250 [ 1383.221479] ib_mad_recv_done+0x698/0x15e0 [ib_core] [ 1383.229187] ? clear_linkup_counters+0xb0/0xb0 [hfi1] [ 1383.236977] ? ib_mad_send_done+0xc80/0xc80 [ib_core] [ 1383.244778] ? mark_held_locks+0x79/0xa0 [ 1383.251341] ? _raw_spin_unlock_irqrestore+0x44/0x60 [ 1383.259086] ? rvt_poll_cq+0x1e1/0x340 [rdmavt] [ 1383.266362] __ib_process_cq+0x97/0x100 [ib_core] [ 1383.273822] ib_cq_poll_work+0x31/0xb0 [ib_core] [ 1383.281169] process_one_work+0x4ee/0xa00 [ 1383.287822] ? pwq_dec_nr_in_flight+0x110/0x110 [ 1383.295047] ? do_raw_spin_lock+0x113/0x1d0 [ 1383.301880] worker_thread+0x57/0x5a0 [ 1383.308138] ? process_one_work+0xa00/0xa00 [ 1383.314937] kthread+0x1bb/0x1e0 [ 1383.320643] ? kthread_create_on_node+0xc0/0xc0 [ 1383.327822] ret_from_fork+0x3a/0x50 [ 1383.333928] [ 1383.337640] The buggy address belongs to the page: [ 1383.345080] page:ffffea000d8b5dc0 refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 [ 1383.356490] flags: 0x17ffffc0000000() [ 1383.362705] raw: 0017ffffc0000000 0000000000000000 ffffea000d8b5dc8 0000000000000000 [ 1383.373530] raw: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000 [ 1383.384321] page dumped because: kasan: bad access detected [ 1383.392659] [ 1383.396350] addr ffff888362d778d0 is located in stack of task kworker/u308:2/1889 at offset 32 in frame: [ 1383.409191] pma_get_opa_portstatus+0x0/0xa80 [hfi1] [ 1383.416843] [ 1383.420497] this frame has 1 object: [ 1383.426494] [32, 36) 'vl_select_mask' [ 1383.426495] [ 1383.436313] Memory state around the buggy address: [ 1383.443706] ffff888362d77780: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 1383.453865] ffff888362d77800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 1383.464033] >ffff888362d77880: 00 00 00 00 00 00 f1 f1 f1 f1 04 f2 f2 f2 00 00 [ 1383.474199] ^ [ 1383.482828] ffff888362d77900: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 1383.493071] ffff888362d77980: 00 00 00 00 00 00 00 00 f1 f1 f1 f1 04 f2 f2 f2 [ 1383.503314] ================================================================== Cc: <stable(a)vger.kernel.org> Reviewed-by: Mike Marciniszyn <mike.marciniszyn(a)intel.com> Signed-off-by: Ira Weiny <ira.weiny(a)intel.com> Signed-off-by: Kaike Wan <kaike.wan(a)intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro(a)intel.com> --- drivers/infiniband/hw/hfi1/mad.c | 45 ++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c index 184dba3..d8ff063 100644 --- a/drivers/infiniband/hw/hfi1/mad.c +++ b/drivers/infiniband/hw/hfi1/mad.c @@ -2326,7 +2326,7 @@ struct opa_port_status_req { __be32 vl_select_mask; }; -#define VL_MASK_ALL 0x000080ff +#define VL_MASK_ALL 0x00000000000080ffUL struct opa_port_status_rsp { __u8 port_num; @@ -2625,15 +2625,14 @@ static int pma_get_opa_classportinfo(struct opa_pma_mad *pmp, } static void a0_portstatus(struct hfi1_pportdata *ppd, - struct opa_port_status_rsp *rsp, u32 vl_select_mask) + struct opa_port_status_rsp *rsp) { if (!is_bx(ppd->dd)) { unsigned long vl; u64 sum_vl_xmit_wait = 0; - u32 vl_all_mask = VL_MASK_ALL; + unsigned long vl_all_mask = VL_MASK_ALL; - for_each_set_bit(vl, (unsigned long *)&(vl_all_mask), - 8 * sizeof(vl_all_mask)) { + for_each_set_bit(vl, &vl_all_mask, BITS_PER_LONG) { u64 tmp = sum_vl_xmit_wait + read_port_cntr(ppd, C_TX_WAIT_VL, idx_from_vl(vl)); @@ -2730,12 +2729,12 @@ static int pma_get_opa_portstatus(struct opa_pma_mad *pmp, (struct opa_port_status_req *)pmp->data; struct hfi1_devdata *dd = dd_from_ibdev(ibdev); struct opa_port_status_rsp *rsp; - u32 vl_select_mask = be32_to_cpu(req->vl_select_mask); + unsigned long vl_select_mask = be32_to_cpu(req->vl_select_mask); unsigned long vl; size_t response_data_size; u32 nports = be32_to_cpu(pmp->mad_hdr.attr_mod) >> 24; u8 port_num = req->port_num; - u8 num_vls = hweight32(vl_select_mask); + u8 num_vls = hweight64(vl_select_mask); struct _vls_pctrs *vlinfo; struct hfi1_ibport *ibp = to_iport(ibdev, port); struct hfi1_pportdata *ppd = ppd_from_ibp(ibp); @@ -2770,7 +2769,7 @@ static int pma_get_opa_portstatus(struct opa_pma_mad *pmp, hfi1_read_link_quality(dd, &rsp->link_quality_indicator); - rsp->vl_select_mask = cpu_to_be32(vl_select_mask); + rsp->vl_select_mask = cpu_to_be32((u32)vl_select_mask); rsp->port_xmit_data = cpu_to_be64(read_dev_cntr(dd, C_DC_XMIT_FLITS, CNTR_INVALID_VL)); rsp->port_rcv_data = cpu_to_be64(read_dev_cntr(dd, C_DC_RCV_FLITS, @@ -2841,8 +2840,7 @@ static int pma_get_opa_portstatus(struct opa_pma_mad *pmp, * So in the for_each_set_bit() loop below, we don't need * any additional checks for vl. */ - for_each_set_bit(vl, (unsigned long *)&(vl_select_mask), - 8 * sizeof(vl_select_mask)) { + for_each_set_bit(vl, &vl_select_mask, BITS_PER_LONG) { memset(vlinfo, 0, sizeof(*vlinfo)); tmp = read_dev_cntr(dd, C_DC_RX_FLIT_VL, idx_from_vl(vl)); @@ -2883,7 +2881,7 @@ static int pma_get_opa_portstatus(struct opa_pma_mad *pmp, vfi++; } - a0_portstatus(ppd, rsp, vl_select_mask); + a0_portstatus(ppd, rsp); if (resp_len) *resp_len += response_data_size; @@ -2930,16 +2928,14 @@ static u64 get_error_counter_summary(struct ib_device *ibdev, u8 port, return error_counter_summary; } -static void a0_datacounters(struct hfi1_pportdata *ppd, struct _port_dctrs *rsp, - u32 vl_select_mask) +static void a0_datacounters(struct hfi1_pportdata *ppd, struct _port_dctrs *rsp) { if (!is_bx(ppd->dd)) { unsigned long vl; u64 sum_vl_xmit_wait = 0; - u32 vl_all_mask = VL_MASK_ALL; + unsigned long vl_all_mask = VL_MASK_ALL; - for_each_set_bit(vl, (unsigned long *)&(vl_all_mask), - 8 * sizeof(vl_all_mask)) { + for_each_set_bit(vl, &vl_all_mask, BITS_PER_LONG) { u64 tmp = sum_vl_xmit_wait + read_port_cntr(ppd, C_TX_WAIT_VL, idx_from_vl(vl)); @@ -2994,7 +2990,7 @@ static int pma_get_opa_datacounters(struct opa_pma_mad *pmp, u64 port_mask; u8 port_num; unsigned long vl; - u32 vl_select_mask; + unsigned long vl_select_mask; int vfi; u16 link_width; u16 link_speed; @@ -3071,8 +3067,7 @@ static int pma_get_opa_datacounters(struct opa_pma_mad *pmp, * So in the for_each_set_bit() loop below, we don't need * any additional checks for vl. */ - for_each_set_bit(vl, (unsigned long *)&(vl_select_mask), - 8 * sizeof(req->vl_select_mask)) { + for_each_set_bit(vl, &vl_select_mask, BITS_PER_LONG) { memset(vlinfo, 0, sizeof(*vlinfo)); rsp->vls[vfi].port_vl_xmit_data = @@ -3120,7 +3115,7 @@ static int pma_get_opa_datacounters(struct opa_pma_mad *pmp, vfi++; } - a0_datacounters(ppd, rsp, vl_select_mask); + a0_datacounters(ppd, rsp); if (resp_len) *resp_len += response_data_size; @@ -3215,7 +3210,7 @@ static int pma_get_opa_porterrors(struct opa_pma_mad *pmp, struct _vls_ectrs *vlinfo; unsigned long vl; u64 port_mask, tmp; - u32 vl_select_mask; + unsigned long vl_select_mask; int vfi; req = (struct opa_port_error_counters64_msg *)pmp->data; @@ -3273,8 +3268,7 @@ static int pma_get_opa_porterrors(struct opa_pma_mad *pmp, vlinfo = &rsp->vls[0]; vfi = 0; vl_select_mask = be32_to_cpu(req->vl_select_mask); - for_each_set_bit(vl, (unsigned long *)&(vl_select_mask), - 8 * sizeof(req->vl_select_mask)) { + for_each_set_bit(vl, &vl_select_mask, BITS_PER_LONG) { memset(vlinfo, 0, sizeof(*vlinfo)); rsp->vls[vfi].port_vl_xmit_discards = cpu_to_be64(read_port_cntr(ppd, C_SW_XMIT_DSCD_VL, @@ -3485,7 +3479,7 @@ static int pma_set_opa_portstatus(struct opa_pma_mad *pmp, u32 nports = be32_to_cpu(pmp->mad_hdr.attr_mod) >> 24; u64 portn = be64_to_cpu(req->port_select_mask[3]); u32 counter_select = be32_to_cpu(req->counter_select_mask); - u32 vl_select_mask = VL_MASK_ALL; /* clear all per-vl cnts */ + unsigned long vl_select_mask = VL_MASK_ALL; /* clear all per-vl cnts */ unsigned long vl; if ((nports != 1) || (portn != 1 << port)) { @@ -3579,8 +3573,7 @@ static int pma_set_opa_portstatus(struct opa_pma_mad *pmp, if (counter_select & CS_UNCORRECTABLE_ERRORS) write_dev_cntr(dd, C_DC_UNC_ERR, CNTR_INVALID_VL, 0); - for_each_set_bit(vl, (unsigned long *)&(vl_select_mask), - 8 * sizeof(vl_select_mask)) { + for_each_set_bit(vl, &vl_select_mask, BITS_PER_LONG) { if (counter_select & CS_PORT_XMIT_DATA) write_port_cntr(ppd, C_TX_FLIT_VL, idx_from_vl(vl), 0);

5 years, 1 month

3
2
0 0

stable-rc/linux-4.14.y boot: 128 boots: 0 failed, 118 passed with 9 offline, 1 untried/unknown (v4.14.143-20-g6e4882db0a08)

by kernelci.org bot

stable-rc/linux-4.14.y boot: 128 boots: 0 failed, 118 passed with 9 offline, 1 untried/unknown (v4.14.143-20-g6e4882db0a08) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.14.y/kernel/v4.1… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.14.y/kernel/v4.14.143-2… Tree: stable-rc Branch: linux-4.14.y Git Describe: v4.14.143-20-g6e4882db0a08 Git Commit: 6e4882db0a081e884c684513eaa7b89d7ad964a2 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 66 unique boards, 23 SoC families, 13 builds out of 201 Offline Platforms: arm64: defconfig: gcc-8 apq8016-sbc: 1 offline lab arm: multi_v7_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sun5i-r8-chip: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab qcom_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sunxi_defconfig: gcc-8 sun5i-r8-chip: 1 offline lab sun7i-a20-bananapi: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 1 month

1
0
0 0

Please add 18dfa7117a3f37986 to 5.2.x tree

by David Sterba

Hi, please add the commit 18dfa7117a3f379862dcd3f67cadd678013bb9dd Btrfs: fix unwritten extent buffers and hangs on future writeback attempts to the 5.2.x tree. It fixes a regression introduced in 5.2 with a big user impact. Thanks.

5 years, 1 month

2
1
0 0

stable-rc/linux-5.2.y boot: 144 boots: 1 failed, 133 passed with 9 offline, 1 untried/unknown (v5.2.14-35-g4cc71036e95e)

by kernelci.org bot

stable-rc/linux-5.2.y boot: 144 boots: 1 failed, 133 passed with 9 offline, 1 untried/unknown (v5.2.14-35-g4cc71036e95e) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-5.2.y/kernel/v5.2.… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-5.2.y/kernel/v5.2.14-35-g… Tree: stable-rc Branch: linux-5.2.y Git Describe: v5.2.14-35-g4cc71036e95e Git Commit: 4cc71036e95e04498aa42628ed0b50cf7e854f0e Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 83 unique boards, 28 SoC families, 17 builds out of 209 Boot Failure Detected: arm64: defconfig: gcc-8: meson-gxl-s805x-libretech-ac: 1 failed lab Offline Platforms: arm64: defconfig: gcc-8 apq8016-sbc: 1 offline lab arm: multi_v7_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sun5i-r8-chip: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab qcom_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sunxi_defconfig: gcc-8 sun5i-r8-chip: 1 offline lab sun7i-a20-bananapi: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 1 month

1
0
0 0

stable-rc/linux-4.19.y boot: 134 boots: 0 failed, 125 passed with 9 offline (v4.19.72-189-g464c8ea4cd98)

by kernelci.org bot

stable-rc/linux-4.19.y boot: 134 boots: 0 failed, 125 passed with 9 offline (v4.19.72-189-g464c8ea4cd98) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.19.y/kernel/v4.1… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.19.y/kernel/v4.19.72-18… Tree: stable-rc Branch: linux-4.19.y Git Describe: v4.19.72-189-g464c8ea4cd98 Git Commit: 464c8ea4cd98f1cec8eec0b1d3ea6ef923150c22 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 75 unique boards, 25 SoC families, 15 builds out of 206 Offline Platforms: arm64: defconfig: gcc-8 apq8016-sbc: 1 offline lab arm: multi_v7_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sun5i-r8-chip: 1 offline lab sun7i-a20-bananapi: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab qcom_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sunxi_defconfig: gcc-8 sun5i-r8-chip: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 1 month

1
0
0 0

Re: [PATCH] drm/ttm: Restore ttm prefaulting

by Souptick Joarder

On Fri, Sep 13, 2019 at 12:09 AM Thomas Hellström (VMware) <thomas_os(a)shipmail.org> wrote: > > From: Thomas Hellstrom <thellstrom(a)vmware.com> > > Commit 4daa4fba3a38 ("gpu: drm: ttm: Adding new return type vm_fault_t") > broke TTM prefaulting. Since vmf_insert_mixed() typically always returns > VM_FAULT_NOPAGE, prefaulting stops after the second PTE. > > Restore (almost) the original behaviour. Unfortunately we can no longer > with the new vm_fault_t return type determine whether a prefaulting > PTE insertion hit an already populated PTE, and terminate the insertion > loop. Instead we continue with the pre-determined number of prefaults. > > Fixes: 4daa4fba3a38 ("gpu: drm: ttm: Adding new return type vm_fault_t") > Cc: Souptick Joarder <jrdr.linux(a)gmail.com> > Cc: Christian König <christian.koenig(a)amd.com> > Signed-off-by: Thomas Hellstrom <thellstrom(a)vmware.com> This commit merged into 4.19. Need to Cc stable. Cc: stable(a)vger.kernel.org # v4.19+ > --- > drivers/gpu/drm/ttm/ttm_bo_vm.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c > index 5a580adeb9d1..aa18e8a53727 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > @@ -290,15 +290,13 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, > else > ret = vmf_insert_pfn(&cvma, address, pfn); > > - /* > - * Somebody beat us to this PTE or prefaulting to > - * an already populated PTE, or prefaulting error. > - */ > - > - if (unlikely((ret == VM_FAULT_NOPAGE && i > 0))) > - break; > - else if (unlikely(ret & VM_FAULT_ERROR)) > - goto out_io_unlock; > + /* Never error on prefaulted PTEs */ > + if (unlikely((ret & VM_FAULT_ERROR))) { > + if (i == 0) > + goto out_io_unlock; > + else > + break; > + } > > address += PAGE_SIZE; > if (unlikely(++page_offset >= page_last)) > -- > 2.20.1 >

5 years, 1 month

1
0
0 0

stable-rc/linux-4.4.y boot: 100 boots: 1 failed, 90 passed with 9 offline (v4.4.192-9-g160225f8cfe2)

by kernelci.org bot

stable-rc/linux-4.4.y boot: 100 boots: 1 failed, 90 passed with 9 offline (v4.4.192-9-g160225f8cfe2) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.4.y/kernel/v4.4.… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.4.y/kernel/v4.4.192-9-g… Tree: stable-rc Branch: linux-4.4.y Git Describe: v4.4.192-9-g160225f8cfe2 Git Commit: 160225f8cfe282fb0b3ce73c781139b521b4b979 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 46 unique boards, 18 SoC families, 13 builds out of 190 Boot Failure Detected: arm64: defconfig: gcc-8: qcom-qdf2400: 1 failed lab Offline Platforms: arm64: defconfig: gcc-8 apq8016-sbc: 1 offline lab arm: multi_v7_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sun5i-r8-chip: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab qcom_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sunxi_defconfig: gcc-8 sun5i-r8-chip: 1 offline lab sun7i-a20-bananapi: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 1 month

1
0
0 0

stable-rc/linux-4.9.y boot: 113 boots: 0 failed, 105 passed with 8 offline (v4.9.192-13-g8da69d43f5d3)

by kernelci.org bot

stable-rc/linux-4.9.y boot: 113 boots: 0 failed, 105 passed with 8 offline (v4.9.192-13-g8da69d43f5d3) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.9.y/kernel/v4.9.… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.9.y/kernel/v4.9.192-13-… Tree: stable-rc Branch: linux-4.9.y Git Describe: v4.9.192-13-g8da69d43f5d3 Git Commit: 8da69d43f5d3f7f8787117ee78cfc4060c4c0d29 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 55 unique boards, 22 SoC families, 14 builds out of 197 Offline Platforms: arm64: defconfig: gcc-8 apq8016-sbc: 1 offline lab arm: multi_v7_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sun5i-r8-chip: 1 offline lab davinci_all_defconfig: gcc-8 dm365evm,legacy: 1 offline lab qcom_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sunxi_defconfig: gcc-8 sun5i-r8-chip: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 1 month

1
0
0 0

[PATCH 3/3] mmc: tmio: Fixup runtime PM management during remove

by Ulf Hansson

Accessing the device when it may be runtime suspended is a bug, which is the case in tmio_mmc_host_remove(). Let's fix the behaviour. Cc: stable(a)vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson(a)linaro.org> --- drivers/mmc/host/tmio_mmc_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 32f9679ec42e..9b6e1001e77c 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1274,12 +1274,11 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) struct platform_device *pdev = host->pdev; struct mmc_host *mmc = host->mmc; + pm_runtime_get_sync(&pdev->dev); + if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0000); - if (!host->native_hotplug) - pm_runtime_get_sync(&pdev->dev); - dev_pm_qos_hide_latency_limit(&pdev->dev); mmc_remove_host(mmc); @@ -1288,6 +1287,8 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) tmio_mmc_release_dma(host); pm_runtime_dont_use_autosuspend(&pdev->dev); + if (host->native_hotplug) + pm_runtime_put_noidle(&pdev->dev); pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); } -- 2.17.1

5 years, 1 month

1
0
0 0

[PATCH 2/3] mmc: tmio: Fixup runtime PM management during probe

by Ulf Hansson

The tmio_mmc_host_probe() calls pm_runtime_set_active() to update the runtime PM status of the device, as to make it reflect the current status of the HW. This works fine for most cases, but unfortunate not for all. Especially, there is a generic problem when the device has a genpd attached and that genpd have the ->start|stop() callbacks assigned. More precisely, if the driver calls pm_runtime_set_active() during ->probe(), genpd does not get to invoke the ->start() callback for it, which means the HW isn't really fully powered on. Furthermore, in the next phase, when the device becomes runtime suspended, genpd will invoke the ->stop() callback for it, potentially leading to usage count imbalance problems, depending on what's implemented behind the callbacks of course. To fix this problem, convert to call pm_runtime_get_sync() from tmio_mmc_host_probe() rather than pm_runtime_set_active(). Additionally, to avoid bumping usage counters and unnecessary re-initializing the HW the first time the tmio driver's ->runtime_resume() callback is called, introduce a state flag to keeping track of this. Cc: stable(a)vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson(a)linaro.org> --- drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_core.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index c5ba13fae399..2f0b092d6dcc 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -163,6 +163,7 @@ struct tmio_mmc_host { unsigned long last_req_ts; struct mutex ios_lock; /* protect set_ios() context */ bool native_hotplug; + bool runtime_synced; bool sdio_irq_enabled; /* Mandatory callback */ diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 8b299c1f0069..32f9679ec42e 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1248,20 +1248,22 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) /* See if we also get DMA */ tmio_mmc_request_dma(_host, pdata); - pm_runtime_set_active(&pdev->dev); pm_runtime_set_autosuspend_delay(&pdev->dev, 50); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); + pm_runtime_get_sync(&pdev->dev); ret = mmc_add_host(mmc); if (ret) goto remove_host; dev_pm_qos_expose_latency_limit(&pdev->dev, 100); + pm_runtime_put(&pdev->dev); return 0; remove_host: + pm_runtime_put_noidle(&pdev->dev); tmio_mmc_host_remove(_host); return ret; } @@ -1330,6 +1332,11 @@ int tmio_mmc_host_runtime_resume(struct device *dev) { struct tmio_mmc_host *host = dev_get_drvdata(dev); + if (!host->runtime_synced) { + host->runtime_synced = true; + return 0; + } + tmio_mmc_clk_enable(host); tmio_mmc_hw_reset(host->mmc); -- 2.17.1

5 years, 1 month

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2019