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

[PATCH AUTOSEL 4.14 01/25] qed: Wait for ready indication before rereading the shmem

by Sasha Levin

From: Tomer Tayar <Tomer.Tayar(a)cavium.com> [ Upstream commit f00d25f3154b676fcea4502a25b94bd7f142ca74 ] The MFW might be reset and re-update its shared memory. Upon the detection of such a reset the driver rereads this memory, but it has to wait till the data is valid. This patch adds the missing wait for a data ready indication. Signed-off-by: Tomer Tayar <Tomer.Tayar(a)cavium.com> Signed-off-by: Ariel Elior <Ariel.Elior(a)cavium.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 50 +++++++++++++++++++---- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c index 3c469355f5a4..9348d367cfdf 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c @@ -182,18 +182,57 @@ int qed_mcp_free(struct qed_hwfn *p_hwfn) return 0; } +/* Maximum of 1 sec to wait for the SHMEM ready indication */ +#define QED_MCP_SHMEM_RDY_MAX_RETRIES 20 +#define QED_MCP_SHMEM_RDY_ITER_MS 50 + static int qed_load_mcp_offsets(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) { struct qed_mcp_info *p_info = p_hwfn->mcp_info; + u8 cnt = QED_MCP_SHMEM_RDY_MAX_RETRIES; + u8 msec = QED_MCP_SHMEM_RDY_ITER_MS; u32 drv_mb_offsize, mfw_mb_offsize; u32 mcp_pf_id = MCP_PF_ID(p_hwfn); p_info->public_base = qed_rd(p_hwfn, p_ptt, MISC_REG_SHARED_MEM_ADDR); - if (!p_info->public_base) - return 0; + if (!p_info->public_base) { + DP_NOTICE(p_hwfn, + "The address of the MCP scratch-pad is not configured\n"); + return -EINVAL; + } p_info->public_base |= GRCBASE_MCP; + /* Get the MFW MB address and number of supported messages */ + mfw_mb_offsize = qed_rd(p_hwfn, p_ptt, + SECTION_OFFSIZE_ADDR(p_info->public_base, + PUBLIC_MFW_MB)); + p_info->mfw_mb_addr = SECTION_ADDR(mfw_mb_offsize, mcp_pf_id); + p_info->mfw_mb_length = (u16)qed_rd(p_hwfn, p_ptt, + p_info->mfw_mb_addr + + offsetof(struct public_mfw_mb, + sup_msgs)); + + /* The driver can notify that there was an MCP reset, and might read the + * SHMEM values before the MFW has completed initializing them. + * To avoid this, the "sup_msgs" field in the MFW mailbox is used as a + * data ready indication. + */ + while (!p_info->mfw_mb_length && --cnt) { + msleep(msec); + p_info->mfw_mb_length = + (u16)qed_rd(p_hwfn, p_ptt, + p_info->mfw_mb_addr + + offsetof(struct public_mfw_mb, sup_msgs)); + } + + if (!cnt) { + DP_NOTICE(p_hwfn, + "Failed to get the SHMEM ready notification after %d msec\n", + QED_MCP_SHMEM_RDY_MAX_RETRIES * msec); + return -EBUSY; + } + /* Calculate the driver and MFW mailbox address */ drv_mb_offsize = qed_rd(p_hwfn, p_ptt, SECTION_OFFSIZE_ADDR(p_info->public_base, @@ -203,13 +242,6 @@ static int qed_load_mcp_offsets(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) "drv_mb_offsiz = 0x%x, drv_mb_addr = 0x%x mcp_pf_id = 0x%x\n", drv_mb_offsize, p_info->drv_mb_addr, mcp_pf_id); - /* Set the MFW MB address */ - mfw_mb_offsize = qed_rd(p_hwfn, p_ptt, - SECTION_OFFSIZE_ADDR(p_info->public_base, - PUBLIC_MFW_MB)); - p_info->mfw_mb_addr = SECTION_ADDR(mfw_mb_offsize, mcp_pf_id); - p_info->mfw_mb_length = (u16)qed_rd(p_hwfn, p_ptt, p_info->mfw_mb_addr); - /* Get the current driver mailbox sequence before sending * the first command */ -- 2.17.1

7 years, 3 months

1
24
0 0

[PATCH AUTOSEL 4.18 01/56] ARM: OMAP2+: Fix null hwmod for ti-sysc debug

by Sasha Levin

From: Tony Lindgren <tony(a)atomide.com> [ Upstream commit 4769c003e0fcff0ee001a9102e2605bdaa5880f0 ] We may call omap_hwmod_parse_module_range() with no hwmod allocated yet and may have debug enabled. Let's fix this by checking for hwmod before trying to use it's name. Fixes: 6c72b3550672 ("ARM: OMAP2+: Parse module IO range from dts for legacy Signed-off-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- arch/arm/mach-omap2/omap_hwmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 2ceffd85dd3d..7f759abcf49c 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2220,7 +2220,7 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh, size = be32_to_cpup(ranges); pr_debug("omap_hwmod: %s %s at 0x%llx size 0x%llx\n", - oh->name, np->name, base, size); + oh ? oh->name : "", np->name, base, size); res->start = base; res->end = base + size - 1; -- 2.17.1

7 years, 3 months

1
55
0 0

[PATCH AUTOSEL 4.18 01/92] binfmt_elf: Respect error return from `regset->active'

by Sasha Levin

From: "Maciej W. Rozycki" <macro(a)mips.com> [ Upstream commit 2f819db565e82e5f73cd42b39925098986693378 ] The regset API documented in <linux/regset.h> defines -ENODEV as the result of the `->active' handler to be used where the feature requested is not available on the hardware found. However code handling core file note generation in `fill_thread_core_info' interpretes any non-zero result from the `->active' handler as the regset requested being active. Consequently processing continues (and hopefully gracefully fails later on) rather than being abandoned right away for the regset requested. Fix the problem then by making the code proceed only if a positive result is returned from the `->active' handler. Signed-off-by: Maciej W. Rozycki <macro(a)mips.com> Signed-off-by: Paul Burton <paul.burton(a)mips.com> Fixes: 4206d3aa1978 ("elf core dump: notes user_regset") Patchwork: https://patchwork.linux-mips.org/patch/19332/ Cc: Alexander Viro <viro(a)zeniv.linux.org.uk> Cc: James Hogan <jhogan(a)kernel.org> Cc: Ralf Baechle <ralf(a)linux-mips.org> Cc: linux-fsdevel(a)vger.kernel.org Cc: linux-mips(a)linux-mips.org Cc: linux-kernel(a)vger.kernel.org Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 816cc921cf36..efae2fb0930a 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1751,7 +1751,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t, const struct user_regset *regset = &view->regsets[i]; do_thread_regset_writeback(t->task, regset); if (regset->core_note_type && regset->get && - (!regset->active || regset->active(t->task, regset))) { + (!regset->active || regset->active(t->task, regset) > 0)) { int ret; size_t size = regset_size(t->task, regset); void *data = kmalloc(size, GFP_KERNEL); -- 2.17.1

7 years, 3 months

3
95
0 0

[PATCH v2 5/6] drm/i915: Fix intel_dp_mst_best_encoder()

by Lyude Paul

Currently, i915 appears to rely on blocking modesets on no-longer-present MSTB ports by simply returning NULL for ->best_encoder(), which in turn causes any new atomic commits that don't disable the CRTC to fail. This is wrong however, since we still want to allow userspace to disable CRTCs on no-longer-present MSTB ports by changing the DPMS state to off and this still requires that we retrieve an encoder. So, fix this by always returning a valid encoder regardless of the state of the MST port. Additionally, make intel_dp_mst_atomic_check() simply rely on drm_dp_mst_connector_atomic_check() to prevent new modesets on no-longer-present MSTB ports. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/i915/intel_dp_mst.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index a366f32b048a..2b798d4592f0 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -106,14 +106,21 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, } static int intel_dp_mst_atomic_check(struct drm_connector *connector, - struct drm_connector_state *new_conn_state) + struct drm_connector_state *new_conn_state) { struct drm_atomic_state *state = new_conn_state->state; struct drm_connector_state *old_conn_state; struct drm_crtc *old_crtc; struct drm_crtc_state *crtc_state; + struct drm_dp_mst_topology_mgr *mgr = + &to_intel_connector(connector)->mst_port->mst_mgr; int slots, ret = 0; + ret = drm_dp_mst_connector_atomic_check(connector, new_conn_state, + mgr); + if (ret) + return ret; + old_conn_state = drm_atomic_get_old_connector_state(state, connector); old_crtc = old_conn_state->crtc; if (!old_crtc) @@ -122,12 +129,6 @@ static int intel_dp_mst_atomic_check(struct drm_connector *connector, crtc_state = drm_atomic_get_new_crtc_state(state, old_crtc); slots = to_intel_crtc_state(crtc_state)->dp_m_n.tu; if (drm_atomic_crtc_needs_modeset(crtc_state) && slots > 0) { - struct drm_dp_mst_topology_mgr *mgr; - struct drm_encoder *old_encoder; - - old_encoder = old_conn_state->best_encoder; - mgr = &enc_to_mst(old_encoder)->primary->dp.mst_mgr; - ret = drm_dp_atomic_release_vcpi_slots(state, mgr, slots); if (ret) DRM_DEBUG_KMS("failed releasing %d vcpi slots:%d\n", slots, ret); @@ -407,8 +408,6 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *c struct intel_dp *intel_dp = intel_connector->mst_port; struct intel_crtc *crtc = to_intel_crtc(state->crtc); - if (intel_connector->mst_port_gone) - return NULL; return &intel_dp->mst_encoders[crtc->pipe]->base.base; } -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH v2 4/6] drm/i915: Skip vcpi allocation for MSTB ports that are gone

by Lyude Paul

Since we need to be able to allow DPMS on->off prop changes after an MST port has disappeared from the system, we need to be able to make sure we can compute a config for the resulting atomic commit. Currently this is impossible when the port has disappeared, since the VCPI slot searching we try to do in intel_dp_mst_compute_config() will fail with -EINVAL. Since the only commits we want to allow on no-longer-present MST ports are ones that shut off display hardware, we already know that no VCPI allocations are needed. So, hardcode the VCPI slot count to 0 when intel_dp_mst_compute_config() is called on an MST port that's gone. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/i915/intel_dp_mst.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index fcb9b87b9339..a366f32b048a 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -42,7 +42,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, to_intel_connector(conn_state->connector); struct drm_atomic_state *state = pipe_config->base.state; int bpp; - int lane_count, slots; + int lane_count, slots = 0; const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; int mst_pbn; bool reduce_m_n = drm_dp_has_quirk(&intel_dp->desc, @@ -76,11 +76,16 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp); pipe_config->pbn = mst_pbn; - slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr, - connector->port, mst_pbn); - if (slots < 0) { - DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", slots); - return false; + if (!connector->mst_port_gone) { + slots = drm_dp_atomic_find_vcpi_slots(state, + &intel_dp->mst_mgr, + connector->port, + mst_pbn); + if (slots < 0) { + DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", + slots); + return false; + } } intel_link_compute_m_n(bpp, lane_count, -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH v2 2/6] drm/nouveau: Unbreak nv50_mstc->best_encoder()

by Lyude Paul

As mentioned in the previous commit, we currently prevent new modesets on recently-removed MST connectors by returning no encoder from our ->best_encoder() callback once the MST port has disappeared. This is wrong however, because it prevents legacy modesetting users from being able to disable CRTCs on MST connectors after the connector's respective topology has disappeared. So, fix this by instead using the new drm_dp_mst_connector_atomic_check() helper instead while always returning a valid encoder from ->best_encoder(). Signed-off-by: Lyude Paul <lyude(a)redhat.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 9da0bdfe1e1c..8d6f6ee9bc75 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -881,22 +881,16 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, { struct nv50_head *head = nv50_head(connector_state->crtc); struct nv50_mstc *mstc = nv50_mstc(connector); - if (mstc->port) { - struct nv50_mstm *mstm = mstc->mstm; - return &mstm->msto[head->base.index]->encoder; - } - return NULL; + + return &mstc->mstm->msto[head->base.index]->encoder; } static struct drm_encoder * nv50_mstc_best_encoder(struct drm_connector *connector) { struct nv50_mstc *mstc = nv50_mstc(connector); - if (mstc->port) { - struct nv50_mstm *mstm = mstc->mstm; - return &mstm->msto[0]->encoder; - } - return NULL; + + return &mstc->mstm->msto[0]->encoder; } static enum drm_mode_status @@ -926,10 +920,21 @@ nv50_mstc_get_modes(struct drm_connector *connector) return ret; } +static int +nv50_mstc_atomic_check(struct drm_connector *connector, + struct drm_connector_state *state) +{ + struct nv50_mstc *mstc = nv50_mstc(connector); + + return drm_dp_mst_connector_atomic_check(connector, state, + &mstc->mstm->mgr); +} + static const struct drm_connector_helper_funcs nv50_mstc_help = { .get_modes = nv50_mstc_get_modes, .mode_valid = nv50_mstc_mode_valid, + .atomic_check = nv50_mstc_atomic_check, .best_encoder = nv50_mstc_best_encoder, .atomic_best_encoder = nv50_mstc_atomic_best_encoder, }; -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH V2 00/12] OPP: Don't create multiple OPP tables for devices sharing OPP table

by Viresh Kumar

Hello, Niklas Cassle recently reported some regressions with his Qcom cpufreq driver where he was getting some errors while creating the OPPs tables. After looking into it I realized that the OPP core incorrectly creates multiple OPP tables for the devices even if they are sharing the OPP table in DT. This happens when the request comes using different CPU devices. For example, dev_pm_opp_set_supported_hw() getting called using CPU0 and dev_pm_opp_of_add_table() getting called using CPU1. This series redesigns the internals of the OPP core to fix that. The redesign has simplified the core itself though. The first three patches are fixes really for the current code and the rest of them are making necessary changes to fix the issue defined in $subject here. Nikklas already tested this series and his Tested-by is already applied to series here. I would like to get this merged during the 4.20 merge window and will push the series to linux-next soon to get more test coverage. Please provide comments as soon as possible, else will send it as part of the pull request to Rafael for 4.20. -- viresh V1->V2: - Nikklas reported another regressions which is fixed by the 2nd commit in this series. Viresh Kumar (12): OPP: Free OPP table properly on performance state irregularities OPP: Don't try to remove all OPP tables on failure OPP: Protect dev_list with opp_table lock OPP: Pass index to _of_init_opp_table() OPP: Parse OPP table's DT properties from _of_init_opp_table() OPP: Don't take OPP table's kref for static OPPs OPP: Create separate kref for static OPPs list cpufreq: mvebu: Remove OPPs using dev_pm_opp_remove() OPP: Don't remove dynamic OPPs from _dev_pm_opp_remove_table() OPP: Use a single mechanism to free the OPP table OPP: Prevent creating multiple OPP tables for devices sharing OPP nodes OPP: Pass OPP table to _of_add_opp_table_v{1|2}() drivers/cpufreq/mvebu-cpufreq.c | 9 +- drivers/opp/core.c | 147 ++++++++++++++++++++----------- drivers/opp/cpu.c | 15 ++-- drivers/opp/of.c | 188 +++++++++++++++++++++------------------- drivers/opp/opp.h | 19 ++-- include/linux/pm_opp.h | 6 ++ 6 files changed, 226 insertions(+), 158 deletions(-) -- 2.14.1

7 years, 3 months

1
1
0 0

Re: [PATCH 1/6] drm/dp_mst: Introduce drm_dp_mst_connector_atomic_check() (fwd)

by Julia Lawall

Hello, I don't think you can update the loop index variable in list_for_each_entry, because the mcro uses th index variable to get to the next element. Perhaps list_for_each_entry_safe would be more suitable? julia ---------- Forwarded message ---------- Date: Thu, 20 Sep 2018 04:30:13 +0800 From: kbuild test robot <lkp(a)intel.com> To: kbuild(a)01.org Cc: Julia Lawall <julia.lawall(a)lip6.fr> Subject: Re: [PATCH 1/6] drm/dp_mst: Introduce drm_dp_mst_connector_atomic_check() CC: kbuild-all(a)01.org In-Reply-To: <20180918230637.20700-2-lyude(a)redhat.com> References: <20180918230637.20700-2-lyude(a)redhat.com> TO: Lyude Paul <lyude(a)redhat.com> CC: dri-devel(a)lists.freedesktop.org, nouveau(a)lists.freedesktop.org, intel-gfx(a)lists.freedesktop.org, amd-gfx(a)lists.freedesktop.org CC: David Airlie <airlied(a)linux.ie>, linux-kernel(a)vger.kernel.org, stable(a)vger.kernel.org, Sean Paul <sean(a)poorly.run> Hi Lyude, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on drm-intel/for-linux-next] [also build test WARNING on v4.19-rc4 next-20180919] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Lyude-Paul/Fix-legacy-DPMS-changes… base: git://anongit.freedesktop.org/drm-intel for-linux-next :::::: branch date: 8 hours ago :::::: commit date: 8 hours ago >> drivers/gpu/drm/drm_dp_mst_topology.c:3144:1-20: iterator with update on line 3145 # https://github.com/0day-ci/linux/commit/f8df31d5221b9a6da6698d4a37e622253bb… git remote add linux-review https://github.com/0day-ci/linux git remote update linux-review git checkout f8df31d5221b9a6da6698d4a37e622253bb17cdc vim +3144 drivers/gpu/drm/drm_dp_mst_topology.c 3f3353b7 Pandiyan, Dhinakaran 2017-04-20 3131 f8df31d5 Lyude Paul 2018-09-18 3132 static bool f8df31d5 Lyude Paul 2018-09-18 3133 drm_dp_mst_connector_still_exists(struct drm_connector *connector, f8df31d5 Lyude Paul 2018-09-18 3134 struct drm_dp_mst_topology_mgr *mgr, f8df31d5 Lyude Paul 2018-09-18 3135 struct drm_dp_mst_branch *mstb) f8df31d5 Lyude Paul 2018-09-18 3136 { f8df31d5 Lyude Paul 2018-09-18 3137 struct drm_dp_mst_port *port; f8df31d5 Lyude Paul 2018-09-18 3138 bool exists = false; f8df31d5 Lyude Paul 2018-09-18 3139 f8df31d5 Lyude Paul 2018-09-18 3140 mstb = drm_dp_get_validated_mstb_ref(mgr, mstb); f8df31d5 Lyude Paul 2018-09-18 3141 if (!mstb) f8df31d5 Lyude Paul 2018-09-18 3142 return false; f8df31d5 Lyude Paul 2018-09-18 3143 f8df31d5 Lyude Paul 2018-09-18 @3144 list_for_each_entry(port, &mstb->ports, next) { f8df31d5 Lyude Paul 2018-09-18 @3145 port = drm_dp_get_validated_port_ref(mgr, port); f8df31d5 Lyude Paul 2018-09-18 3146 if (!port) f8df31d5 Lyude Paul 2018-09-18 3147 continue; f8df31d5 Lyude Paul 2018-09-18 3148 f8df31d5 Lyude Paul 2018-09-18 3149 exists = (port->connector == connector || f8df31d5 Lyude Paul 2018-09-18 3150 (port->mstb && f8df31d5 Lyude Paul 2018-09-18 3151 drm_dp_mst_connector_still_exists(connector, mgr, f8df31d5 Lyude Paul 2018-09-18 3152 port->mstb))); f8df31d5 Lyude Paul 2018-09-18 3153 f8df31d5 Lyude Paul 2018-09-18 3154 drm_dp_put_port(port); f8df31d5 Lyude Paul 2018-09-18 3155 if (exists) f8df31d5 Lyude Paul 2018-09-18 3156 break; f8df31d5 Lyude Paul 2018-09-18 3157 } f8df31d5 Lyude Paul 2018-09-18 3158 f8df31d5 Lyude Paul 2018-09-18 3159 drm_dp_put_mst_branch_device(mstb); f8df31d5 Lyude Paul 2018-09-18 3160 return exists; f8df31d5 Lyude Paul 2018-09-18 3161 } f8df31d5 Lyude Paul 2018-09-18 3162 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

7 years, 3 months

2
1
0 0

[PATCH 00/11] OPP: Don't create multiple OPP tables for devices sharing OPP table

by Viresh Kumar

Hello, Niklas Cassle recently reported some regressions with his Qcom cpufreq driver where he was getting some errors while creating the OPPs tables. After looking into it I realized that the OPP core incorrectly creates multiple OPP tables for the devices even if they are sharing the OPP table in DT. This happens when the request comes using different CPU devices. For example, dev_pm_opp_set_supported_hw() getting called using CPU0 and dev_pm_opp_of_add_table() getting called using CPU1. This series redesigns the internals of the OPP core to fix that. The redesign has simplified the core itself though. @Niklas: Can you please confirm that this series fixes the issues you have reported ? I have already tested it on Hikey960. -- viresh Viresh Kumar (11): OPP: Free OPP table properly on performance state irregularities OPP: Protect dev_list with opp_table lock OPP: Pass index to _of_init_opp_table() OPP: Parse OPP table's DT properties from _of_init_opp_table() OPP: Don't take OPP table's kref for static OPPs OPP: Create separate kref for static OPPs list cpufreq: mvebu: Remove OPPs using dev_pm_opp_remove() OPP: Don't remove dynamic OPPs from _dev_pm_opp_remove_table() OPP: Use a single mechanism to free the OPP table OPP: Prevent creating multiple OPP tables for devices sharing OPP nodes OPP: Pass OPP table to _of_add_opp_table_v{1|2}() drivers/cpufreq/mvebu-cpufreq.c | 9 +- drivers/opp/core.c | 147 ++++++++++++++++--------- drivers/opp/cpu.c | 11 +- drivers/opp/of.c | 186 +++++++++++++++++--------------- drivers/opp/opp.h | 19 ++-- include/linux/pm_opp.h | 6 ++ 6 files changed, 221 insertions(+), 157 deletions(-) -- 2.18.0.rc1.242.g61856ae69a2c

7 years, 3 months

2
5
0 0

[PATCH] IB/srp: Avoid that sg_reset -d ${srp_device} triggers an infinite loop

by Bart Van Assche

Use different loop variables for the inner and outer loop. This avoids that an infinite loop occurs if there are more RDMA channels than target->req_ring_size. Fixes: d92c0da71a35 ("IB/srp: Add multichannel support") Signed-off-by: Bart Van Assche <bvanassche(a)acm.org> Cc: Max Gurtovoy <maxg(a)mellanox.com> Cc: Laurence Oberman <loberman(a)redhat.com> Cc: <stable(a)vger.kernel.org> --- drivers/infiniband/ulp/srp/ib_srp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 444d16520506..0b34e909505f 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -2951,7 +2951,7 @@ static int srp_reset_device(struct scsi_cmnd *scmnd) { struct srp_target_port *target = host_to_target(scmnd->device->host); struct srp_rdma_ch *ch; - int i; + int i, j; u8 status; shost_printk(KERN_ERR, target->scsi_host, "SRP reset_device called\n"); @@ -2965,8 +2965,8 @@ static int srp_reset_device(struct scsi_cmnd *scmnd) for (i = 0; i < target->ch_count; i++) { ch = &target->ch[i]; - for (i = 0; i < target->req_ring_size; ++i) { - struct srp_request *req = &ch->req_ring[i]; + for (j = 0; j < target->req_ring_size; ++j) { + struct srp_request *req = &ch->req_ring[j]; srp_finish_req(ch, req, scmnd->device, DID_RESET << 16); } -- 2.18.0

7 years, 3 months

2
1
0 0

Linux 4.4.157

by Greg KH

I'm announcing the release of the 4.4.157 kernel. All users of the 4.4 kernel series must upgrade. The updated 4.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 - arch/arc/configs/axs101_defconfig | 1 arch/arc/configs/axs103_defconfig | 1 arch/arc/configs/axs103_smp_defconfig | 1 arch/mips/cavium-octeon/octeon-platform.c | 2 + arch/mips/include/asm/io.h | 8 ++--- arch/mips/kernel/process.c | 1 arch/mips/mm/c-r4k.c | 6 ++- arch/openrisc/kernel/process.c | 2 - arch/x86/include/asm/processor.h | 4 +- arch/x86/kernel/cpu/bugs.c | 47 ++++++++++++++++++++++++++---- arch/x86/kernel/cpu/common.c | 2 + arch/x86/mm/fault.c | 2 - block/blk-cgroup.c | 9 +++-- block/cfq-iosched.c | 6 ++- block/partitions/aix.c | 13 +++++--- drivers/ata/libahci.c | 2 + drivers/bluetooth/Kconfig | 1 drivers/crypto/vmx/aes_cbc.c | 30 ++++++++----------- drivers/gpio/gpio-ml-ioh.c | 3 + drivers/gpio/gpio-tegra.c | 2 - drivers/i2c/busses/i2c-i801.c | 7 +++- drivers/i2c/busses/i2c-xiic.c | 4 ++ drivers/infiniband/core/cma.c | 13 ++++++-- drivers/input/touchscreen/atmel_mxt_ts.c | 7 ++-- drivers/iommu/ipmmu-vmsa.c | 9 ++--- drivers/macintosh/via-pmu.c | 9 +++-- drivers/md/raid5.c | 6 +++ drivers/mfd/ti_am335x_tscadc.c | 3 - drivers/misc/mic/scif/scif_api.c | 20 +++++------- drivers/misc/ti-st/st_kim.c | 4 +- drivers/misc/vmw_balloon.c | 1 drivers/mtd/ubi/wl.c | 8 +++-- drivers/net/ethernet/marvell/mvneta.c | 1 drivers/net/ethernet/ti/cpsw.c | 14 ++++---- drivers/net/ethernet/ti/cpsw.h | 1 drivers/net/ethernet/ti/davinci_emac.c | 1 drivers/net/wireless/ath/ath10k/mac.c | 7 ++++ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 +++ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 5 +++ drivers/scsi/3w-9xxx.c | 6 +++ drivers/scsi/3w-sas.c | 3 + drivers/scsi/3w-xxxx.c | 2 + drivers/staging/rts5208/rtsx_scsi.c | 2 - drivers/staging/rts5208/xd.c | 2 - drivers/target/target_core_transport.c | 5 +-- drivers/tty/rocket.c | 2 - drivers/uio/uio.c | 3 - drivers/usb/host/xhci.c | 3 + fs/autofs4/autofs_i.h | 4 +- fs/autofs4/inode.c | 1 fs/f2fs/segment.h | 3 + fs/f2fs/super.c | 21 ++++++++++++- fs/nfs/callback_xdr.c | 11 +++++-- include/linux/mm_types.h | 2 - include/linux/sched.h | 2 - include/linux/vm_event_item.h | 1 include/linux/vmacache.h | 5 --- include/uapi/linux/ethtool.h | 4 +- kernel/fork.c | 17 +++++++--- kernel/locking/osq_lock.c | 13 ++++++++ kernel/locking/rwsem-xadd.c | 27 +++++++++++++++++ mm/debug.c | 4 +- mm/vmacache.c | 38 ------------------------ net/bluetooth/hidp/core.c | 2 - net/dcb/dcbnl.c | 11 ++++--- net/netfilter/x_tables.c | 4 +- security/selinux/avc.c | 14 +++----- sound/pci/hda/hda_codec.c | 3 + tools/perf/perf.h | 2 + 70 files changed, 311 insertions(+), 176 deletions(-) Alexey Brodkin (1): ARC: [plat-axs*]: Enable SWAP Andi Kleen (1): x86/speculation/l1tf: Increase l1tf memory limit for Nehalem+ Anton Vasilyev (4): misc: ti-st: Fix memory leak in the error path of probe() tty: rocket: Fix possible buffer overwrite on register_PCI scsi: 3ware: fix return 0 on the error path of probe gpio: ml-ioh: Fix buffer underwrite on probe error path BingJing Chang (1): md/raid5: fix data corruption of replacements after originals dropped Chao Yu (1): f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize Christophe Leroy (1): perf tools: Allow overriding MAX_NR_CPUS at compile time Dan Carpenter (2): misc: mic: SCIF Fix scif_get_new_port() error handling uio: potential double frees if __uio_register_device() fails Daniel Micay (1): staging/rts5208: Fix read overflow in memcpy David Rivshin (1): drivers: net: cpsw: fix parsing of phy-handle DT property in dual_emac config Dmitry Osipenko (1): gpio: tegra: Move driver registration to subsys_init level Eric Dumazet (1): netfilter: x_tables: avoid stack-out-of-bounds read in xt_copy_counters_from_user Felipe Balbi (1): i2c: i801: fix DNV's SMBCTRL register offset Finn Thain (1): macintosh/via-pmu: Add missing mmio accessors Florian Fainelli (1): ethtool: Remove trailing semicolon for static inline Geert Uytterhoeven (1): iommu/ipmmu-vmsa: Fix allocation in atomic context Greg Kroah-Hartman (1): Linux 4.4.157 Ian Kent (1): autofs: fix autofs_sbi() does not check super block type Jia-Ju Bai (1): staging: rt5208: Fix a sleep-in-atomic bug in xd_copy_page Joerg Roedel (1): x86/mm: Remove in_nmi() warning from vmalloc_fault() Johan Hedberg (1): Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV Johan Hovold (1): net: ethernet: ti: cpsw: fix mdio device reference leak Linus Torvalds (1): mm: get rid of vmacache_flush_all() entirely Marcel Holtmann (1): Bluetooth: hidp: Fix handling of strncpy for hid->name information Mathias Nyman (1): xhci: Fix use-after-free in xhci_free_virt_device Mauricio Faria de Oliveira (2): partitions/aix: append null character to print data from disk partitions/aix: fix usage of uninitialized lv_info and lvname structures Michal Hocko (1): selinux: use GFP_NOWAIT in the AVC kmem_caches Mike Christie (1): scsi: target: fix __transport_register_session locking Nadav Amit (1): vmw_balloon: include asm/io.h Nicholas Mc Guire (1): MIPS: Octeon: add missing of_node_put() Nick Dyer (1): Input: atmel_mxt_ts - only use first T9 instance Olga Kornievskaia (1): NFSv4.0 fix client reference leak in callback Ondrej Mosnacek (1): crypto: vmx - Fix sleep-in-atomic bugs Parav Pandit (1): RDMA/cma: Do not ignore net namespace for unbound cm_id Paul Burton (2): MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON Peter Chen (1): ethernet: ti: davinci_emac: add missing of_node_put after calling of_parse_phandle Petr Machata (1): net: dcb: For wild-card lookups, use priority -1, not 0 Prateek Sood (2): locking/rwsem-xadd: Fix missed wakeup due to reordering of load locking/osq_lock: Fix osq_lock queue corruption Ritesh Harjani (1): cfq: Give a chance for arming slice idle timer in case of group_idle Shubhrajyoti Datta (1): i2c: xiic: Make the start and the byte count write atomic Srinivas Pandruvada (1): ata: libahci: Correct setting of DEVSLP register Surabhi Vishnoi (1): ath10k: disable bundle mgmt tx completion event support Sven Eckelmann (1): ath10k: prevent active scans on potential unusable channels Takashi Iwai (1): ALSA: hda - Fix cancel_work_sync() stall from jackpoll work Tejun Heo (1): block,blkcg: use __GFP_NOWARN for best-effort allocations in blkcg Vegard Nossum (2): kthread: Fix use-after-free if kthread fork fails kthread: fix boot hang (regression) on MIPS/OpenRISC Wei Yongjun (1): mtd: ubi: wl: Fix error return code in ubi_wl_init() Yelena Krivosheev (1): net: mvneta: fix mtu change on port without link Yunlong Song (1): f2fs: do not set free of current section Zumeng Chen (1): mfd: ti_am335x_tscadc: Fix struct clk memory leak

7 years, 3 months

1
1
0 0

Linux 4.9.128

by Greg KH

I'm announcing the release of the 4.9.128 kernel. All users of the 4.9 kernel series must upgrade. The updated 4.9.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 - arch/arc/configs/axs101_defconfig | 1 arch/arc/configs/axs103_defconfig | 1 arch/arc/configs/axs103_smp_defconfig | 1 arch/mips/cavium-octeon/octeon-platform.c | 2 + arch/mips/generic/init.c | 1 arch/mips/include/asm/io.h | 8 +++--- arch/mips/kernel/process.c | 1 arch/mips/mm/c-r4k.c | 6 +++- arch/openrisc/kernel/process.c | 2 - arch/s390/kvm/vsie.c | 3 +- arch/x86/mm/fault.c | 2 - block/blk-cgroup.c | 9 +++---- block/cfq-iosched.c | 6 +++- block/partitions/aix.c | 13 +++++++--- drivers/ata/libahci.c | 2 + drivers/bluetooth/Kconfig | 1 drivers/char/tpm/tpm_i2c_infineon.c | 8 +++--- drivers/char/tpm/tpm_tis_spi.c | 9 ++++++- drivers/gpio/gpio-ml-ioh.c | 3 +- drivers/gpio/gpio-tegra.c | 2 - drivers/i2c/busses/i2c-i801.c | 7 ++++- drivers/i2c/busses/i2c-xiic.c | 4 +++ drivers/infiniband/core/cma.c | 13 +++++++--- drivers/infiniband/sw/rxe/rxe_resp.c | 4 ++- drivers/input/touchscreen/atmel_mxt_ts.c | 7 +++-- drivers/iommu/ipmmu-vmsa.c | 9 +++---- drivers/macintosh/via-pmu.c | 9 +++---- drivers/md/raid5.c | 6 ++++ drivers/media/dvb-frontends/helene.c | 5 +++ drivers/media/platform/s5p-mfc/s5p_mfc.c | 23 +++++++++--------- drivers/mfd/ti_am335x_tscadc.c | 3 -- drivers/misc/mic/scif/scif_api.c | 20 +++++++-------- drivers/misc/ti-st/st_kim.c | 4 +-- drivers/mtd/ubi/wl.c | 8 ++++-- drivers/net/ethernet/marvell/mvneta.c | 1 drivers/net/phy/mdio-mux-bcm-iproc.c | 20 +++++++++++---- drivers/net/wireless/ath/ath10k/mac.c | 7 +++++ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 +++ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 5 +++ drivers/net/wireless/ath/ath9k/hw.c | 7 +++-- drivers/net/wireless/ath/ath9k/xmit.c | 3 +- drivers/net/wireless/ti/wlcore/rx.c | 8 ++++-- drivers/scsi/3w-9xxx.c | 6 +++- drivers/scsi/3w-sas.c | 3 ++ drivers/scsi/3w-xxxx.c | 2 + drivers/staging/rts5208/rtsx_scsi.c | 2 - drivers/staging/rts5208/xd.c | 2 - drivers/target/target_core_transport.c | 5 ++- drivers/tty/rocket.c | 2 - drivers/uio/uio.c | 3 -- drivers/usb/host/xhci.c | 3 ++ fs/autofs4/autofs_i.h | 4 ++- fs/autofs4/inode.c | 1 fs/f2fs/file.c | 2 - fs/f2fs/gc.c | 8 +++++- fs/f2fs/inline.c | 21 ++++++++++++++++ fs/f2fs/node.c | 4 ++- fs/f2fs/segment.h | 3 ++ fs/f2fs/super.c | 21 +++++++++++++++- fs/nfs/callback_proc.c | 4 +-- fs/nfs/callback_xdr.c | 11 ++++++-- include/linux/mm_types.h | 2 - include/linux/sched.h | 2 - include/linux/vm_event_item.h | 1 include/linux/vmacache.h | 5 --- include/uapi/linux/ethtool.h | 4 +-- kernel/fork.c | 17 +++++++++---- kernel/locking/osq_lock.c | 13 ++++++++++ kernel/locking/rwsem-xadd.c | 27 +++++++++++++++++++++ kernel/time/timer.c | 29 ++++++++++++---------- mm/debug.c | 4 +-- mm/vmacache.c | 38 ------------------------------ mm/vmscan.c | 3 +- net/bluetooth/hidp/core.c | 2 - net/dcb/dcbnl.c | 11 +++++--- net/netfilter/x_tables.c | 4 +-- net/wireless/nl80211.c | 3 ++ security/selinux/avc.c | 14 ++++------- sound/pci/hda/hda_codec.c | 3 +- tools/perf/perf.h | 2 + 81 files changed, 357 insertions(+), 195 deletions(-) Alexey Brodkin (1): ARC: [plat-axs*]: Enable SWAP Anton Vasilyev (4): misc: ti-st: Fix memory leak in the error path of probe() tty: rocket: Fix possible buffer overwrite on register_PCI scsi: 3ware: fix return 0 on the error path of probe gpio: ml-ioh: Fix buffer underwrite on probe error path Arun Parameswaran (1): net: phy: Fix the register offsets in Broadcom iProc mdio mux driver BingJing Chang (1): md/raid5: fix data corruption of replacements after originals dropped Chao Yu (4): f2fs: try grabbing node page lock aggressively in sync scenario f2fs: fix to skip GC if type in SSA and SIT is inconsistent f2fs: fix to do sanity check with reserved blkaddr of inline inode f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize Christophe Leroy (1): perf tools: Allow overriding MAX_NR_CPUS at compile time Dan Carpenter (3): misc: mic: SCIF Fix scif_get_new_port() error handling uio: potential double frees if __uio_register_device() fails f2fs: Fix uninitialized return in f2fs_ioc_shutdown() Daniel Micay (1): staging/rts5208: Fix read overflow in memcpy Dmitry Osipenko (1): gpio: tegra: Move driver registration to subsys_init level Eric Dumazet (1): netfilter: x_tables: avoid stack-out-of-bounds read in xt_copy_counters_from_user Felipe Balbi (1): i2c: i801: fix DNV's SMBCTRL register offset Felix Fietkau (2): ath9k: report tx status on EOSP ath9k_hw: fix channel maximum power level test Finn Thain (1): macintosh/via-pmu: Add missing mmio accessors Florian Fainelli (1): ethtool: Remove trailing semicolon for static inline Gaurav Kohli (1): timers: Clear timer_base::must_forward_clk with timer_base::lock held Geert Uytterhoeven (1): iommu/ipmmu-vmsa: Fix allocation in atomic context Greg Kroah-Hartman (1): Linux 4.9.128 Ian Kent (1): autofs: fix autofs_sbi() does not check super block type Jia-Ju Bai (1): staging: rt5208: Fix a sleep-in-atomic bug in xd_copy_page Joerg Roedel (1): x86/mm: Remove in_nmi() warning from vmalloc_fault() Johan Hedberg (1): Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV Johannes Berg (1): nl80211: fix null-ptr dereference on invalid mesh configuration Johannes Weiner (1): mm: remove seemingly spurious reclaimability check from laptop_mode gating Katsuhiro Suzuki (1): media: helene: fix xtal frequency setting at power on Kees Cook (1): IB/rxe: do not copy extra stack memory to skb Linus Torvalds (1): mm: get rid of vmacache_flush_all() entirely Linus Walleij (1): tpm_tis_spi: Pass the SPI IRQ down to the driver Loic Poulain (1): wlcore: Set rx_status boottime_ns field on rx Marcel Holtmann (1): Bluetooth: hidp: Fix handling of strncpy for hid->name information Mathias Nyman (1): xhci: Fix use-after-free in xhci_free_virt_device Mauricio Faria de Oliveira (2): partitions/aix: append null character to print data from disk partitions/aix: fix usage of uninitialized lv_info and lvname structures Mel Gorman (1): mm, vmscan: clear PGDAT_WRITEBACK when zone is balanced Michal Hocko (1): selinux: use GFP_NOWAIT in the AVC kmem_caches Mike Christie (1): scsi: target: fix __transport_register_session locking Nicholas Mc Guire (2): MIPS: Octeon: add missing of_node_put() MIPS: generic: fix missing of_node_put() Nick Dyer (1): Input: atmel_mxt_ts - only use first T9 instance Olga Kornievskaia (1): NFSv4.0 fix client reference leak in callback Parav Pandit (1): RDMA/cma: Do not ignore net namespace for unbound cm_id Paul Burton (2): MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON Peter Rosin (1): tpm/tpm_i2c_infineon: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Petr Machata (1): net: dcb: For wild-card lookups, use priority -1, not 0 Pierre Morel (1): KVM: s390: vsie: copy wrapping keys to right place Prateek Sood (2): locking/rwsem-xadd: Fix missed wakeup due to reordering of load locking/osq_lock: Fix osq_lock queue corruption Ritesh Harjani (1): cfq: Give a chance for arming slice idle timer in case of group_idle Shubhrajyoti Datta (1): i2c: xiic: Make the start and the byte count write atomic Srinivas Pandruvada (1): ata: libahci: Correct setting of DEVSLP register Surabhi Vishnoi (1): ath10k: disable bundle mgmt tx completion event support Sven Eckelmann (1): ath10k: prevent active scans on potential unusable channels Sylwester Nawrocki (1): media: s5p-mfc: Fix buffer look up in s5p_mfc_handle_frame_{new, copy_time} functions Takashi Iwai (1): ALSA: hda - Fix cancel_work_sync() stall from jackpoll work Tejun Heo (1): block,blkcg: use __GFP_NOWARN for best-effort allocations in blkcg Trond Myklebust (1): NFSv4.1: Fix a potential layoutget/layoutrecall deadlock Vegard Nossum (2): kthread: Fix use-after-free if kthread fork fails kthread: fix boot hang (regression) on MIPS/OpenRISC Wei Yongjun (1): mtd: ubi: wl: Fix error return code in ubi_wl_init() Yelena Krivosheev (1): net: mvneta: fix mtu change on port without link Yunlong Song (1): f2fs: do not set free of current section Zumeng Chen (1): mfd: ti_am335x_tscadc: Fix struct clk memory leak

7 years, 3 months

1
1
0 0

Linux 4.14.71

by Greg KH

I'm announcing the release of the 4.14.71 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/networking/ip-sysctl.txt | 13 Makefile | 2 arch/arc/configs/axs101_defconfig | 1 arch/arc/configs/axs103_defconfig | 1 arch/arc/configs/axs103_smp_defconfig | 1 arch/mips/cavium-octeon/octeon-platform.c | 2 arch/mips/generic/init.c | 1 arch/mips/include/asm/io.h | 8 arch/mips/kernel/vdso.c | 20 arch/mips/mm/c-r4k.c | 6 arch/powerpc/platforms/powernv/npu-dma.c | 5 arch/s390/kvm/vsie.c | 3 arch/x86/kernel/cpu/microcode/amd.c | 24 arch/x86/kernel/cpu/microcode/intel.c | 17 arch/x86/kvm/vmx.c | 4 arch/x86/mm/fault.c | 2 block/bfq-cgroup.c | 4 block/blk-mq-tag.c | 8 block/partitions/aix.c | 13 crypto/Makefile | 2 drivers/android/binder_alloc.c | 42 + drivers/ata/libahci.c | 20 drivers/block/nbd.c | 3 drivers/block/pktcdvd.c | 4 drivers/bluetooth/Kconfig | 1 drivers/char/tpm/tpm-interface.c | 50 + drivers/char/tpm/tpm.h | 12 drivers/char/tpm/tpm2-space.c | 16 drivers/char/tpm/tpm_crb.c | 101 --- drivers/char/tpm/tpm_i2c_infineon.c | 8 drivers/char/tpm/tpm_tis_spi.c | 9 drivers/firmware/google/vpd.c | 5 drivers/gpio/gpio-ml-ioh.c | 3 drivers/gpio/gpio-tegra.c | 2 drivers/gpu/drm/i915/i915_reg.h | 1 drivers/gpu/drm/i915/intel_ddi.c | 4 drivers/gpu/ipu-v3/ipu-common.c | 2 drivers/hv/hv.c | 14 drivers/i2c/busses/i2c-aspeed.c | 2 drivers/i2c/busses/i2c-i801.c | 7 drivers/i2c/busses/i2c-xiic.c | 4 drivers/infiniband/core/cma.c | 13 drivers/input/touchscreen/atmel_mxt_ts.c | 7 drivers/iommu/ipmmu-vmsa.c | 9 drivers/macintosh/via-pmu.c | 9 drivers/md/dm-cache-target.c | 19 drivers/md/raid5.c | 6 drivers/media/dvb-frontends/helene.c | 5 drivers/media/platform/davinci/vpif_display.c | 24 drivers/media/platform/qcom/camss-8x16/camss-csid.c | 16 drivers/media/platform/s5p-mfc/s5p_mfc.c | 23 drivers/media/usb/dvb-usb/dw2102.c | 19 drivers/mfd/ti_am335x_tscadc.c | 3 drivers/misc/mic/scif/scif_api.c | 20 drivers/misc/ti-st/st_kim.c | 4 drivers/mtd/ubi/wl.c | 8 drivers/net/ethernet/marvell/mvneta.c | 1 drivers/net/phy/mdio-mux-bcm-iproc.c | 20 drivers/net/tun.c | 21 drivers/net/wireless/ath/ath10k/mac.c | 7 drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 drivers/net/wireless/ath/ath10k/wmi-tlv.h | 5 drivers/net/wireless/ath/ath9k/hw.c | 7 drivers/net/wireless/ath/ath9k/xmit.c | 3 drivers/net/wireless/ti/wlcore/rx.c | 8 drivers/pci/switch/switchtec.c | 4 drivers/pinctrl/freescale/pinctrl-imx.c | 2 drivers/pinctrl/pinctrl-amd.c | 3 drivers/rpmsg/rpmsg_core.c | 7 drivers/scsi/3w-9xxx.c | 6 drivers/scsi/3w-sas.c | 3 drivers/scsi/3w-xxxx.c | 2 drivers/scsi/lpfc/lpfc.h | 2 drivers/target/target_core_transport.c | 5 drivers/tty/rocket.c | 2 drivers/uio/uio.c | 3 fs/autofs4/autofs_i.h | 4 fs/autofs4/inode.c | 1 fs/btrfs/ioctl.c | 19 fs/cifs/inode.c | 2 fs/cifs/smb2ops.c | 35 - fs/cifs/smb2pdu.c | 3 fs/f2fs/f2fs.h | 7 fs/f2fs/file.c | 2 fs/f2fs/gc.c | 8 fs/f2fs/inline.c | 22 fs/f2fs/node.c | 4 fs/f2fs/segment.h | 3 fs/f2fs/super.c | 21 fs/f2fs/sysfs.c | 10 fs/nfs/callback_proc.c | 4 fs/nfs/callback_xdr.c | 11 include/linux/mm_types.h | 2 include/linux/mm_types_task.h | 2 include/linux/rhashtable.h | 8 include/linux/skbuff.h | 50 + include/linux/tpm.h | 2 include/linux/vm_event_item.h | 1 include/linux/vmacache.h | 5 include/net/inet_frag.h | 135 ++-- include/net/ip.h | 1 include/net/ipv6.h | 26 include/uapi/linux/ethtool.h | 4 include/uapi/linux/snmp.h | 1 kernel/cpu.c | 11 kernel/time/timer.c | 29 - lib/rhashtable.c | 2 mm/debug.c | 4 mm/vmacache.c | 38 - net/bluetooth/hidp/core.c | 2 net/core/skbuff.c | 31 - net/dcb/dcbnl.c | 11 net/ieee802154/6lowpan/6lowpan_i.h | 26 net/ieee802154/6lowpan/reassembly.c | 153 ++--- net/ipv4/inet_fragment.c | 378 ++----------- net/ipv4/ip_fragment.c | 578 +++++++++++--------- net/ipv4/proc.c | 7 net/ipv4/tcp_fastopen.c | 8 net/ipv4/tcp_input.c | 33 - net/ipv6/netfilter/nf_conntrack_reasm.c | 105 +-- net/ipv6/proc.c | 5 net/ipv6/reassembly.c | 217 +++---- net/sched/sch_netem.c | 14 sound/pci/hda/hda_codec.c | 3 tools/perf/builtin-c2c.c | 3 tools/perf/perf.h | 2 tools/perf/util/evsel.c | 14 tools/testing/nvdimm/pmem-dax.c | 12 tools/testing/selftests/bpf/test_verifier.c | 6 129 files changed, 1472 insertions(+), 1361 deletions(-) Alexey Brodkin (1): ARC: [plat-axs*]: Enable SWAP Anton Vasilyev (7): media: davinci: vpif_display: Mix memory leak on probe error path media: dw2102: Fix memleak on sequence of probes misc: ti-st: Fix memory leak in the error path of probe() firmware: vpd: Fix section enabled flag on vpd_section_destroy tty: rocket: Fix possible buffer overwrite on register_PCI scsi: 3ware: fix return 0 on the error path of probe gpio: ml-ioh: Fix buffer underwrite on probe error path Arnd Bergmann (1): crypto: aes-generic - fix aes-generic regression on powerpc Arun Parameswaran (1): net: phy: Fix the register offsets in Broadcom iProc mdio mux driver BingJing Chang (1): md/raid5: fix data corruption of replacements after originals dropped Chao Yu (6): f2fs: fix to active page in lru list for read path f2fs: try grabbing node page lock aggressively in sync scenario f2fs: fix to skip GC if type in SSA and SIT is inconsistent f2fs: fix to do sanity check with reserved blkaddr of inline inode f2fs: fix to wait on page writeback before updating page f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize Christophe Leroy (1): perf tools: Allow overriding MAX_NR_CPUS at compile time Dan Carpenter (5): misc: mic: SCIF Fix scif_get_new_port() error handling uio: potential double frees if __uio_register_device() fails pinctrl: imx: off by one in imx_pinconf_group_dbg_show() f2fs: Fix uninitialized return in f2fs_ioc_shutdown() ipv4: frags: precedence bug in ip_expire() Daniel Kurtz (1): pinctrl/amd: only handle irq if it is pending and unmasked Dmitry Osipenko (1): gpio: tegra: Move driver registration to subsys_init level Eric Dumazet (22): inet: frags: change inet_frags_init_net() return value inet: frags: add a pointer to struct netns_frags inet: frags: refactor ipfrag_init() inet: frags: refactor ipv6_frag_init() inet: frags: refactor lowpan_net_frag_init() ipv6: export ip6 fragments sysctl to unprivileged users rhashtable: add schedule points inet: frags: use rhashtables for reassembly units inet: frags: remove some helpers inet: frags: get rif of inet_frag_evicting() inet: frags: remove inet_frag_maybe_warn_overflow() inet: frags: break the 2GB limit for frags storage inet: frags: do not clone skb in ip_expire() ipv6: frags: rewrite ip6_expire_frag_queue() rhashtable: reorganize struct rhashtable layout inet: frags: reorganize struct netns_frags inet: frags: get rid of ipfrag_skb_cb/FRAG_CB inet: frags: fix ip6frag_low_thresh boundary net: speed up skb_rbtree_purge() net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends net: add rb_to_skb() and other rb tree helpers net: sk_buff rbnode reorg Felipe Balbi (1): i2c: i801: fix DNV's SMBCTRL register offset Felix Fietkau (2): ath9k: report tx status on EOSP ath9k_hw: fix channel maximum power level test Filipe Manana (1): Btrfs: fix data corruption when deduplicating between different files Filippo Sironi (1): x86/microcode: Update the new microcode revision unconditionally Finn Thain (1): macintosh/via-pmu: Add missing mmio accessors Florian Fainelli (1): ethtool: Remove trailing semicolon for static inline Florian Westphal (1): ipv6: defrag: drop non-last frags smaller than min mtu Gaurav Kohli (1): timers: Clear timer_base::must_forward_clk with timer_base::lock held Geert Uytterhoeven (1): iommu/ipmmu-vmsa: Fix allocation in atomic context Greg Kroah-Hartman (1): Linux 4.14.71 Gustavo A. R. Silva (1): switchtec: Fix Spectre v1 vulnerability Huaisheng Ye (1): tools/testing/nvdimm: kaddr and pfn can be NULL to ->direct_access() Ian Kent (1): autofs: fix autofs_sbi() does not check super block type Jae Hyun Yoo (1): i2c: aspeed: Add an explicit type casting for *get_clk_reg_val James Smart (1): scsi: lpfc: Correct MDS diag and nvmet configuration Jani Nikula (1): drm/i915: set DP Main Stream Attribute for color range on DDI platforms Jason Wang (2): tun: fix use after free for ptr_ring tuntap: fix use after free during release Jens Axboe (1): nbd: don't allow invalid blocksize settings Jinbum Park (1): pktcdvd: Fix possible Spectre-v1 for pkt_devs Jiri Olsa (1): perf c2c report: Fix crash for empty browser Joerg Roedel (1): x86/mm: Remove in_nmi() warning from vmalloc_fault() Johan Hedberg (1): Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV John Pittman (1): dm cache: only allow a single io_mode cache feature to be requested Kan Liang (1): perf evlist: Fix error out while applying initial delay and LBR Katsuhiro Suzuki (1): media: helene: fix xtal frequency setting at power on Kees Cook (1): inet: frags: Convert timers to use timer_setup() Konstantin Khlebnikov (1): block: bfq: swap puts in bfqg_and_blkg_put Linus Torvalds (1): mm: get rid of vmacache_flush_all() entirely Linus Walleij (1): tpm_tis_spi: Pass the SPI IRQ down to the driver Loic Poulain (1): wlcore: Set rx_status boottime_ns field on rx Marcel Holtmann (1): Bluetooth: hidp: Fix handling of strncpy for hid->name information Mauricio Faria de Oliveira (2): partitions/aix: append null character to print data from disk partitions/aix: fix usage of uninitialized lv_info and lvname structures Michael Kelley (1): Drivers: hv: vmbus: Cleanup synic memory free path Mike Christie (1): scsi: target: fix __transport_register_session locking Minchan Kim (1): android: binder: fix the race mmap and alloc_new_buf_locked Ming Lei (1): blk-mq: fix updating tags depth Neeraj Upadhyay (1): cpu/hotplug: Adjust misplaced smb() in cpuhp_thread_fun() Nicholas Mc Guire (2): MIPS: Octeon: add missing of_node_put() MIPS: generic: fix missing of_node_put() Nick Dyer (1): Input: atmel_mxt_ts - only use first T9 instance Olga Kornievskaia (1): NFSv4.0 fix client reference leak in callback Parav Pandit (1): RDMA/cma: Do not ignore net namespace for unbound cm_id Paul Burton (3): MIPS: VDSO: Match data page cache colouring when D$ aliases MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON Peter Oskolkov (4): ip: discard IPv4 datagrams with overlapping segments. net: modify skb_rbtree_purge to return the truesize of all purged skbs. ip: add helpers to process in-order fragments faster. ip: process in-order fragments efficiently Peter Rosin (1): tpm/tpm_i2c_infineon: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Petr Machata (1): net: dcb: For wild-card lookups, use priority -1, not 0 Philipp Zabel (1): gpu: ipu-v3: default to id 0 on missing OF alias Pierre Morel (1): KVM: s390: vsie: copy wrapping keys to right place Prarit Bhargava (1): x86/microcode: Make sure boot_cpu_data.microcode is up-to-date Randy Dunlap (1): f2fs: fix defined but not used build warnings Reza Arbab (1): powerpc/powernv: Fix concurrency issue with npu->mmio_atsd_usage Roman Gushchin (1): selftests/bpf: fix a typo in map in map test Sean Christopherson (1): KVM: VMX: Do not allow reexecute_instruction() when skipping MMIO instr Shubhrajyoti Datta (1): i2c: xiic: Make the start and the byte count write atomic Srinivas Kandagatla (1): rpmsg: core: add support to power domains for devices Srinivas Pandruvada (2): ata: libahci: Allow reconfigure of DEVSLP register ata: libahci: Correct setting of DEVSLP register Steve French (2): SMB3: Backup intent flag missing for directory opens with backupuid mounts smb3: check for and properly advertise directory lease support Surabhi Vishnoi (1): ath10k: disable bundle mgmt tx completion event support Sven Eckelmann (1): ath10k: prevent active scans on potential unusable channels Sylwester Nawrocki (1): media: s5p-mfc: Fix buffer look up in s5p_mfc_handle_frame_{new, copy_time} functions Taehee Yoo (1): ip: frags: fix crash in ip_do_fragment() Takashi Iwai (1): ALSA: hda - Fix cancel_work_sync() stall from jackpoll work Thomas Gleixner (1): cpu/hotplug: Prevent state corruption on error rollback Todor Tomov (1): media: camss: csid: Configure data type and decode format properly Tomas Winkler (1): tpm: separate cmd_ready/go_idle from runtime_pm Trond Myklebust (1): NFSv4.1: Fix a potential layoutget/layoutrecall deadlock Wei Yongjun (1): mtd: ubi: wl: Fix error return code in ubi_wl_init() Yelena Krivosheev (1): net: mvneta: fix mtu change on port without link Yunlong Song (1): f2fs: do not set free of current section Zumeng Chen (1): mfd: ti_am335x_tscadc: Fix struct clk memory leak

7 years, 3 months

1
1
0 0

[PATCH 4.9] MIPS: VDSO: Match data page cache colouring when D$ aliases

by Paul Burton

[ Upstream commit 0f02cfbc3d9e413d450d8d0fd660077c23f67eff ] When a system suffers from dcache aliasing a user program may observe stale VDSO data from an aliased cache line. Notably this can break the expectation that clock_gettime(CLOCK_MONOTONIC, ...) is, as its name suggests, monotonic. In order to ensure that users observe updates to the VDSO data page as intended, align the user mappings of the VDSO data page such that their cache colouring matches that of the virtual address range which the kernel will use to update the data page - typically its unmapped address within kseg0. This ensures that we don't introduce aliasing cache lines for the VDSO data page, and therefore that userland will observe updates without requiring cache invalidation. Signed-off-by: Paul Burton <paul.burton(a)mips.com> Reported-by: Hauke Mehrtens <hauke(a)hauke-m.de> Reported-by: Rene Nielsen <rene.nielsen(a)microsemi.com> Reported-by: Alexandre Belloni <alexandre.belloni(a)bootlin.com> Fixes: ebb5e78cc634 ("MIPS: Initial implementation of a VDSO") Patchwork: https://patchwork.linux-mips.org/patch/20344/ Tested-by: Alexandre Belloni <alexandre.belloni(a)bootlin.com> Tested-by: Hauke Mehrtens <hauke(a)hauke-m.de> Cc: James Hogan <jhogan(a)kernel.org> Cc: linux-mips(a)linux-mips.org Cc: stable(a)vger.kernel.org # v4.4+ --- arch/mips/kernel/vdso.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c index f9dbfb14af33..e88344e3d508 100644 --- a/arch/mips/kernel/vdso.c +++ b/arch/mips/kernel/vdso.c @@ -14,12 +14,14 @@ #include <linux/init.h> #include <linux/ioport.h> #include <linux/irqchip/mips-gic.h> +#include <linux/kernel.h> #include <linux/mm.h> #include <linux/sched.h> #include <linux/slab.h> #include <linux/timekeeper_internal.h> #include <asm/abi.h> +#include <asm/page.h> #include <asm/vdso.h> /* Kernel-provided data used by the VDSO. */ @@ -129,12 +131,30 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) vvar_size = gic_size + PAGE_SIZE; size = vvar_size + image->size; + /* + * Find a region that's large enough for us to perform the + * colour-matching alignment below. + */ + if (cpu_has_dc_aliases) + size += shm_align_mask + 1; + base = get_unmapped_area(NULL, 0, size, 0, 0); if (IS_ERR_VALUE(base)) { ret = base; goto out; } + /* + * If we suffer from dcache aliasing, ensure that the VDSO data page + * mapping is coloured the same as the kernel's mapping of that memory. + * This ensures that when the kernel updates the VDSO data userland + * will observe it without requiring cache invalidations. + */ + if (cpu_has_dc_aliases) { + base = __ALIGN_MASK(base, shm_align_mask); + base += ((unsigned long)&vdso_data - gic_size) & shm_align_mask; + } + data_addr = base + gic_size; vdso_addr = data_addr + PAGE_SIZE; -- 2.18.0

7 years, 3 months

1
0
0 0

Linux 4.18.9

by Greg KH

I'm announcing the release of the 4.18.9 kernel. All users of the 4.18 kernel series must upgrade. The updated 4.18.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.18.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arc/boot/dts/axs10x_mb.dtsi | 7 arch/arc/boot/dts/hsdk.dts | 7 arch/arc/configs/axs101_defconfig | 1 arch/arc/configs/axs103_defconfig | 1 arch/arc/configs/axs103_smp_defconfig | 1 arch/arm64/kvm/hyp/switch.c | 9 - arch/mips/boot/dts/mscc/ocelot.dtsi | 2 arch/mips/cavium-octeon/octeon-platform.c | 2 arch/mips/generic/init.c | 1 arch/mips/include/asm/io.h | 8 - arch/mips/kernel/vdso.c | 20 ++ arch/mips/mm/c-r4k.c | 6 arch/powerpc/include/asm/book3s/64/pgalloc.h | 23 ++- arch/powerpc/kvm/book3s_64_mmu_radix.c | 6 arch/powerpc/platforms/4xx/msi.c | 51 ++++-- arch/powerpc/platforms/powernv/npu-dma.c | 5 arch/powerpc/platforms/pseries/setup.c | 25 ++- arch/s390/kvm/vsie.c | 3 arch/x86/include/asm/kdebug.h | 12 + arch/x86/include/asm/kvm_host.h | 16 +- arch/x86/kernel/apic/vector.c | 2 arch/x86/kernel/cpu/microcode/amd.c | 24 ++- arch/x86/kernel/cpu/microcode/intel.c | 17 +- arch/x86/kernel/dumpstack.c | 11 - arch/x86/kernel/process_32.c | 4 arch/x86/kernel/process_64.c | 12 + arch/x86/kvm/mmu.c | 21 ++ arch/x86/kvm/svm.c | 4 arch/x86/kvm/vmx.c | 4 arch/x86/kvm/x86.c | 10 + arch/x86/mm/fault.c | 2 block/bfq-cgroup.c | 4 block/blk-core.c | 5 block/blk-mq-tag.c | 8 - block/partitions/aix.c | 13 + drivers/acpi/acpi_lpss.c | 2 drivers/android/binder_alloc.c | 43 ++++- drivers/ata/libahci.c | 20 +- drivers/base/memory.c | 20 +- drivers/block/nbd.c | 3 drivers/block/pktcdvd.c | 4 drivers/bluetooth/Kconfig | 1 drivers/char/tpm/tpm_i2c_infineon.c | 8 - drivers/char/tpm/tpm_tis_spi.c | 9 + drivers/clk/clk-scmi.c | 5 drivers/dax/pmem.c | 12 + drivers/firmware/google/vpd.c | 5 drivers/gpio/gpio-ml-ioh.c | 3 drivers/gpio/gpio-pxa.c | 35 +++- drivers/gpio/gpio-tegra.c | 2 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 38 +++-- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 drivers/gpu/ipu-v3/ipu-common.c | 2 drivers/hid/hid-ids.h | 1 drivers/hid/hid-input.c | 5 drivers/hid/hid-multitouch.c | 19 ++ drivers/hid/i2c-hid/i2c-hid.c | 2 drivers/hv/hv.c | 14 + drivers/i2c/busses/i2c-aspeed.c | 2 drivers/i2c/busses/i2c-i801.c | 7 drivers/i2c/busses/i2c-xiic.c | 4 drivers/infiniband/core/cma.c | 13 + drivers/infiniband/hw/hns/hns_roce_hem.c | 3 drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 12 + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 1 drivers/input/touchscreen/atmel_mxt_ts.c | 7 drivers/iommu/arm-smmu-v3.c | 22 ++- drivers/iommu/ipmmu-vmsa.c | 9 - drivers/macintosh/via-pmu.c | 9 - drivers/md/dm-cache-target.c | 19 ++ drivers/md/raid5.c | 6 drivers/media/dvb-frontends/helene.c | 5 drivers/media/platform/davinci/vpif_display.c | 24 ++- drivers/media/platform/qcom/camss-8x16/camss-csid.c | 16 +- drivers/media/platform/rcar-vin/rcar-csi2.c | 20 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 23 +-- drivers/media/usb/dvb-usb/dw2102.c | 19 +- drivers/media/usb/em28xx/em28xx-cards.c | 4 drivers/media/usb/em28xx/em28xx-core.c | 4 drivers/media/usb/em28xx/em28xx-dvb.c | 4 drivers/memory/ti-aemif.c | 2 drivers/mfd/rave-sp.c | 7 drivers/mfd/ti_am335x_tscadc.c | 3 drivers/misc/mic/scif/scif_api.c | 20 +- drivers/misc/ti-st/st_kim.c | 4 drivers/mtd/nand/raw/nand_base.c | 44 +++--- drivers/net/ethernet/marvell/mvneta.c | 1 drivers/net/phy/mdio-mux-bcm-iproc.c | 20 ++ drivers/net/wireless/ath/ath10k/mac.c | 7 drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 drivers/net/wireless/ath/ath10k/wmi-tlv.h | 5 drivers/net/wireless/ath/ath9k/hw.c | 7 drivers/net/wireless/ath/ath9k/xmit.c | 3 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 24 +-- drivers/net/wireless/ti/wlcore/rx.c | 8 - drivers/pci/controller/pcie-mobiveil.c | 4 drivers/pci/switch/switchtec.c | 4 drivers/pinctrl/berlin/berlin.c | 14 + drivers/pinctrl/freescale/pinctrl-imx.c | 2 drivers/pinctrl/pinctrl-amd.c | 3 drivers/regulator/tps65217-regulator.c | 2 drivers/rpmsg/rpmsg_core.c | 7 drivers/scsi/3w-9xxx.c | 6 drivers/scsi/3w-sas.c | 3 drivers/scsi/3w-xxxx.c | 2 drivers/scsi/lpfc/lpfc.h | 2 drivers/scsi/lpfc/lpfc_nvme.c | 22 +-- drivers/scsi/qla2xxx/qla_init.c | 9 - drivers/scsi/qla2xxx/qla_target.c | 3 drivers/scsi/qla2xxx/qla_tmpl.c | 9 + drivers/target/target_core_transport.c | 5 drivers/target/target_core_user.c | 73 +++++----- drivers/thermal/rcar_thermal.c | 2 drivers/thermal/thermal_hwmon.c | 1 drivers/tty/rocket.c | 2 drivers/uio/uio.c | 19 -- fs/autofs/autofs_i.h | 4 fs/autofs/inode.c | 1 fs/btrfs/extent-tree.c | 17 +- fs/btrfs/ioctl.c | 19 ++ fs/cifs/connect.c | 2 fs/cifs/inode.c | 2 fs/cifs/smb2ops.c | 35 +++- fs/cifs/smb2pdu.c | 3 fs/f2fs/f2fs.h | 15 +- fs/f2fs/file.c | 2 fs/f2fs/gc.c | 8 - fs/f2fs/inline.c | 22 +++ fs/f2fs/inode.c | 19 ++ fs/f2fs/node.c | 46 ++++-- fs/f2fs/recovery.c | 4 fs/f2fs/segment.c | 20 ++ fs/f2fs/segment.h | 3 fs/f2fs/super.c | 25 ++- fs/f2fs/sysfs.c | 16 +- fs/nfs/callback_proc.c | 4 fs/nfs/callback_xdr.c | 11 + fs/nfs/nfs4client.c | 6 include/linux/hid.h | 1 include/linux/mm_types.h | 2 include/linux/mm_types_task.h | 2 include/linux/mtd/rawnand.h | 16 +- include/linux/vm_event_item.h | 1 include/linux/vmacache.h | 5 include/uapi/linux/ethtool.h | 4 kernel/cpu.c | 11 - kernel/time/clocksource.c | 40 ++++- kernel/time/timer.c | 29 ++- mm/debug.c | 4 mm/memory_hotplug.c | 3 mm/page_alloc.c | 4 mm/vmacache.c | 38 ----- net/bluetooth/hidp/core.c | 2 net/dcb/dcbnl.c | 11 - net/mac80211/rx.c | 1 sound/pci/hda/hda_codec.c | 3 sound/pci/hda/patch_realtek.c | 1 sound/soc/soc-pcm.c | 5 tools/perf/Makefile.config | 4 tools/perf/builtin-c2c.c | 3 tools/perf/perf.h | 2 tools/perf/util/evsel.c | 14 + tools/testing/nvdimm/pmem-dax.c | 12 + tools/testing/selftests/bpf/test_verifier.c | 6 tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json | 24 +-- tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json | 3 virt/kvm/arm/mmu.c | 9 + 170 files changed, 1166 insertions(+), 579 deletions(-) AceLan Kao (1): HID: i2c-hid: Fix flooded incomplete report after S3 on Rayd touchscreen Akshu Agrawal (1): ASoC: soc-pcm: Use delay set in component pointer function Alexandru Gagniuc (1): ALSA: hda/realtek - Add mute LED quirk for HP Spectre x360 Alexey Brodkin (2): ARC: [plat-axs*/plat-hsdk]: Allow U-Boot to pass MAC-address to the kernel ARC: [plat-axs*]: Enable SWAP Amit Daniel Kachhap (1): clk: scmi: Fix the rounding of clock rate Andrey Smirnov (1): mfd: rave-sp: Initialize flow control and parity of the port Aneesh Kumar K.V (1): mm/hugetlb: filter out hugetlb pages if HUGEPAGE migration is not supported. Anthony Koo (1): drm/amd/display: Prevent PSR from being enabled if initialization fails Anton Vasilyev (8): media: davinci: vpif_display: Mix memory leak on probe error path media: dw2102: Fix memleak on sequence of probes misc: ti-st: Fix memory leak in the error path of probe() firmware: vpd: Fix section enabled flag on vpd_section_destroy tty: rocket: Fix possible buffer overwrite on register_PCI scsi: 3ware: fix return 0 on the error path of probe regulator: tps65217: Fix NULL pointer dereference on probe gpio: ml-ioh: Fix buffer underwrite on probe error path Arun Parameswaran (1): net: phy: Fix the register offsets in Broadcom iProc mdio mux driver Bartosz Golaszewski (1): memory: ti-aemif: fix a potential NULL-pointer dereference Benjamin Tissoires (2): HID: multitouch: fix Elan panels with 2 input modes declaration HID: core: fix grouping by application BingJing Chang (1): md/raid5: fix data corruption of replacements after originals dropped Brad Love (2): media: em28xx: Fix dual transport stream operation media: em28xx: Fix DualHD disconnect oops Calum Mackay (1): nfs: Referrals not inheriting proto setting from parent Chao Yu (10): f2fs: fix to active page in lru list for read path f2fs: fix to detect looped node chain correctly f2fs: try grabbing node page lock aggressively in sync scenario f2fs: fix to skip GC if type in SSA and SIT is inconsistent f2fs: fix to do sanity check with reserved blkaddr of inline inode f2fs: fix to wait on page writeback before updating page f2fs: fix to do sanity check with secs_per_zone f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize f2fs: fix to propagate return value of scan_nat_page() f2fs: fix to do sanity check with extra_attr feature Christophe Leroy (1): perf tools: Allow overriding MAX_NR_CPUS at compile time Dan Carpenter (4): misc: mic: SCIF Fix scif_get_new_port() error handling uio: potential double frees if __uio_register_device() fails pinctrl: imx: off by one in imx_pinconf_group_dbg_show() f2fs: Fix uninitialized return in f2fs_ioc_shutdown() Daniel Kurtz (1): pinctrl/amd: only handle irq if it is pending and unmasked Daniel Mack (1): gpio: pxa: disable pinctrl calls for PXA3xx Daniel Rosenberg (1): f2fs: Keep alloc_valid_block_count in sync Denis Drozdov (1): IB/IPoIB: Set ah valid flag in multicast send flow Dmitry Osipenko (1): gpio: tegra: Move driver registration to subsys_init level Emmanuel Grumbach (2): mac80211: don't update the PM state of a peer upon a multicast frame iwlwifi: pcie: don't access periphery registers when not available Felipe Balbi (1): i2c: i801: fix DNV's SMBCTRL register offset Felix Fietkau (2): ath9k: report tx status on EOSP ath9k_hw: fix channel maximum power level test Filipe Manana (1): Btrfs: fix data corruption when deduplicating between different files Filippo Sironi (1): x86/microcode: Update the new microcode revision unconditionally Finn Thain (1): macintosh/via-pmu: Add missing mmio accessors Florian Fainelli (1): ethtool: Remove trailing semicolon for static inline Gaurav Kohli (1): timers: Clear timer_base::must_forward_clk with timer_base::lock held Geert Uytterhoeven (1): iommu/ipmmu-vmsa: Fix allocation in atomic context Greg Kroah-Hartman (1): Linux 4.18.9 Guenter Roeck (1): powerpc/4xx: Fix error return path in ppc4xx_msi_probe() Gustavo A. R. Silva (1): switchtec: Fix Spectre v1 vulnerability Huaisheng Ye (1): tools/testing/nvdimm: kaddr and pfn can be NULL to ->direct_access() Ian Kent (1): autofs: fix autofs_sbi() does not check super block type Jae Hyun Yoo (1): i2c: aspeed: Add an explicit type casting for *get_clk_reg_val Jaegeuk Kim (1): f2fs: avoid potential deadlock in f2fs_sbi_store James Smart (2): scsi: lpfc: Correct MDS diag and nvmet configuration scsi: lpfc: Fix driver crash when re-registering NVME rports. Jann Horn (1): x86/process: Don't mix user/kernel regs in 64bit __show_regs() Jens Axboe (1): nbd: don't allow invalid blocksize settings Jinbum Park (1): pktcdvd: Fix possible Spectre-v1 for pkt_devs Jiri Olsa (1): perf c2c report: Fix crash for empty browser Joerg Roedel (1): x86/mm: Remove in_nmi() warning from vmalloc_fault() Johan Hedberg (1): Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV John Pittman (1): dm cache: only allow a single io_mode cache feature to be requested Kan Liang (1): perf evlist: Fix error out while applying initial delay and LBR Katsuhiro Suzuki (1): media: helene: fix xtal frequency setting at power on Konstantin Khlebnikov (1): block: bfq: swap puts in bfqg_and_blkg_put Lijun Ou (2): RDMA/hns: Add illegal hop_num judgement RDMA/hns: Update the data type of immediate data Linus Torvalds (1): mm: get rid of vmacache_flush_all() entirely Linus Walleij (1): tpm_tis_spi: Pass the SPI IRQ down to the driver Loic Poulain (1): wlcore: Set rx_status boottime_ns field on rx Lorenzo Pieralisi (2): PCI: mobiveil: Add missing ../pci.h include PCI: mobiveil: Fix struct mobiveil_pcie.pcie_reg_base address type Lu Fengqi (1): btrfs: fix qgroup_free wrong num_bytes in btrfs_subvolume_reserve_metadata Marc Zyngier (3): arm64: KVM: Only force FPEXC32_EL2.EN if trapping FPSIMD KVM: arm/arm64: Clean dcache to PoC when changing PTE due to CoW thermal_hwmon: Sanitize attribute name passed to hwmon Marcel Holtmann (1): Bluetooth: hidp: Fix handling of strncpy for hid->name information Mauricio Faria de Oliveira (2): partitions/aix: append null character to print data from disk partitions/aix: fix usage of uninitialized lv_info and lvname structures Michael Ellerman (1): powerpc/mm: Don't report PUDs as memory leaks when using kmemleak Michael Kelley (1): Drivers: hv: vmbus: Cleanup synic memory free path Mike Christie (2): scsi: target: fix __transport_register_session locking scsi: tcmu: do not set max_blocks if data_bitmap has been setup Mikhail Zaslonko (1): memory_hotplug: fix kernel_panic on offline page processing Mikulas Patocka (1): block: don't warn when doing fsync on read-only devices Minchan Kim (1): android: binder: fix the race mmap and alloc_new_buf_locked Ming Lei (1): blk-mq: fix updating tags depth Miquel Raynal (1): mtd: rawnand: make subop helpers return unsigned values Neeraj Upadhyay (1): cpu/hotplug: Adjust misplaced smb() in cpuhp_thread_fun() Nicholas Mc Guire (2): MIPS: Octeon: add missing of_node_put() MIPS: generic: fix missing of_node_put() Nick Dyer (1): Input: atmel_mxt_ts - only use first T9 instance Niklas Söderlund (1): media: rcar-csi2: update stream start for V3M Olga Kornievskaia (1): NFSv4.0 fix client reference leak in callback Parav Pandit (1): RDMA/cma: Do not ignore net namespace for unbound cm_id Paul Burton (3): MIPS: VDSO: Match data page cache colouring when D$ aliases MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON Paul Mackerras (1): KVM: PPC: Book3S HV: Use correct pagesize in kvm_unmap_radix() Peter Rosin (1): tpm/tpm_i2c_infineon: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Peter Zijlstra (1): clocksource: Revert "Remove kthread" Petr Machata (1): net: dcb: For wild-card lookups, use priority -1, not 0 Philipp Zabel (1): gpu: ipu-v3: default to id 0 on missing OF alias Pierre Morel (1): KVM: s390: vsie: copy wrapping keys to right place Prarit Bhargava (1): x86/microcode: Make sure boot_cpu_data.microcode is up-to-date Quentin Schulz (1): MIPS: mscc: ocelot: fix length of memory address space for MIIM Quinn Tran (3): scsi: qla2xxx: Fix unintended Logout scsi: qla2xxx: Fix session state stuck in Get Port DB scsi: qla2xxx: Silent erroneous message Randy Dunlap (1): f2fs: fix defined but not used build warnings Reza Arbab (1): powerpc/powernv: Fix concurrency issue with npu->mmio_atsd_usage Robert Schlabbach (1): media: em28xx: explicitly disable TS packet filter Roman Gushchin (1): selftests/bpf: fix a typo in map in map test Sam Bobroff (1): powerpc/pseries: fix EEH recovery of some IOV devices Sean Christopherson (6): KVM: x86: SVM: Set EMULTYPE_NO_REEXECUTE for RSM emulation KVM: VMX: Do not allow reexecute_instruction() when skipping MMIO instr KVM: x86: Invert emulation re-execute behavior to make it opt-in KVM: x86: Merge EMULTYPE_RETRY and EMULTYPE_ALLOW_REEXECUTE KVM: x86: Default to not allowing emulation retry in kvm_mmu_page_fault KVM: x86: Do not re-{try,execute} after failed emulation in L2 Shubhrajyoti Datta (1): i2c: xiic: Make the start and the byte count write atomic Simon Horman (1): thermal: rcar_thermal: avoid NULL dereference in absence of IRQ resources Srinivas Kandagatla (1): rpmsg: core: add support to power domains for devices Srinivas Pandruvada (2): ata: libahci: Allow reconfigure of DEVSLP register ata: libahci: Correct setting of DEVSLP register Stefan Agner (1): HID: input: fix leaking custom input node name Stefan Hajnoczi (1): device-dax: avoid hang on error before devm_memremap_pages() Steve French (2): SMB3: Backup intent flag missing for directory opens with backupuid mounts smb3: check for and properly advertise directory lease support Surabhi Vishnoi (1): ath10k: disable bundle mgmt tx completion event support Sven Eckelmann (1): ath10k: prevent active scans on potential unusable channels Sylwester Nawrocki (1): media: s5p-mfc: Fix buffer look up in s5p_mfc_handle_frame_{new, copy_time} functions Takashi Iwai (1): ALSA: hda - Fix cancel_work_sync() stall from jackpoll work Thomas Gleixner (2): cpu/hotplug: Prevent state corruption on error rollback x86/apic/vector: Make error return value negative Thomas Richter (1): perf build: Fix installation directory for eBPF Thomas Werschlein (1): cifs: connect to servername instead of IP for IPC$ share Todor Tomov (1): media: camss: csid: Configure data type and decode format properly Trond Myklebust (1): NFSv4.1: Fix a potential layoutget/layoutrecall deadlock Vlad Buslov (2): tc-testing: flush gact actions on test teardown tc-testing: remove duplicate spaces in connmark match patterns Will Deacon (1): iommu/arm-smmu-v3: Abort all transactions if SMMU is enabled in kdump kernel Xiubo Li (1): uio: fix possible circular locking dependency Yelena Krivosheev (1): net: mvneta: fix mtu change on port without link YueHaibing (1): pinctrl: berlin: fix 'pctrl->functions' allocation in berlin_pinctrl_build_state Yunlong Song (2): f2fs: do not set free of current section f2fs: issue discard align to section in LFS mode Zhang Rui (1): ACPI / LPSS: Force LPSS quirks on boot Zumeng Chen (1): mfd: ti_am335x_tscadc: Fix struct clk memory leak

7 years, 3 months

1
1
0 0

[PATCH 05/40] drm/i915: Handle incomplete Z_FINISH for compressed error states

by Chris Wilson

The final call to zlib_deflate(Z_FINISH) may require more output space to be allocated and so needs to re-invoked. Failure to do so in the current code leads to incomplete zlib streams (albeit intact due to the use of Z_SYNC_FLUSH) resulting in the occasional short object capture. Testcase: igt/i915-error-capture.js Fixes: 0a97015d45ee ("drm/i915: Compress GPU objects in error state") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> # v4.10+ --- drivers/gpu/drm/i915/i915_gpu_error.c | 60 +++++++++++++++++++++------ 1 file changed, 47 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 2835cacd0d08..9789f4ff8c32 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -237,6 +237,7 @@ static int compress_page(struct compress *c, struct drm_i915_error_object *dst) { struct z_stream_s *zstream = &c->zstream; + int flush = Z_NO_FLUSH; zstream->next_in = src; if (c->tmp && i915_memcpy_from_wc(c->tmp, src, PAGE_SIZE)) @@ -257,8 +258,11 @@ static int compress_page(struct compress *c, zstream->avail_out = PAGE_SIZE; } - if (zlib_deflate(zstream, Z_SYNC_FLUSH) != Z_OK) + if (zlib_deflate(zstream, flush) != Z_OK) return -EIO; + + if (zstream->avail_out) + flush = Z_SYNC_FLUSH; } while (zstream->avail_in); /* Fallback to uncompressed if we increase size? */ @@ -268,19 +272,43 @@ static int compress_page(struct compress *c, return 0; } -static void compress_fini(struct compress *c, +static int compress_flush(struct compress *c, struct drm_i915_error_object *dst) { struct z_stream_s *zstream = &c->zstream; + unsigned long page; - if (dst) { - zlib_deflate(zstream, Z_FINISH); - dst->unused = zstream->avail_out; - } + do { + switch (zlib_deflate(zstream, Z_FINISH)) { + case Z_OK: /* more space requested */ + page = __get_free_page(GFP_ATOMIC | __GFP_NOWARN); + if (!page) + return -ENOMEM; + + dst->pages[dst->page_count++] = (void *)page; + zstream->next_out = (void *)page; + zstream->avail_out = PAGE_SIZE; + break; + case Z_STREAM_END: + goto end; + default: /* any error */ + return -EIO; + } + } while (1); + +end: + memset(zstream->next_out, 0, zstream->avail_out); + dst->unused = zstream->avail_out; + return 0; +} + +static void compress_fini(struct compress *c, + struct drm_i915_error_object *dst) +{ + struct z_stream_s *zstream = &c->zstream; zlib_deflateEnd(zstream); kfree(zstream->workspace); - if (c->tmp) free_page((unsigned long)c->tmp); } @@ -319,6 +347,12 @@ static int compress_page(struct compress *c, return 0; } +static int compress_flush(struct compress *c, + struct drm_i915_error_object *dst) +{ + return 0; +} + static void compress_fini(struct compress *c, struct drm_i915_error_object *dst) { @@ -951,15 +985,15 @@ i915_error_object_create(struct drm_i915_private *i915, if (ret) goto unwind; } - goto out; + if (compress_flush(&compress, dst)) { unwind: - while (dst->page_count--) - free_page((unsigned long)dst->pages[dst->page_count]); - kfree(dst); - dst = NULL; + while (dst->page_count--) + free_page((unsigned long)dst->pages[dst->page_count]); + kfree(dst); + dst = NULL; + } -out: compress_fini(&compress, dst); ggtt->vm.clear_range(&ggtt->vm, slot, PAGE_SIZE); return dst; -- 2.19.0

7 years, 3 months

1
0
0 0

FAILED: patch "[PATCH] mei: bus: type promotion bug in mei_nfc_if_version()" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b40b3e9358fbafff6a4ba0f4b9658f6617146f9c Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter(a)oracle.com> Date: Wed, 11 Jul 2018 15:29:31 +0300 Subject: [PATCH] mei: bus: type promotion bug in mei_nfc_if_version() We accidentally removed the check for negative returns without considering the issue of type promotion. The "if_version_length" variable is type size_t so if __mei_cl_recv() returns a negative then "bytes_recv" is type promoted to a high positive value and treated as success. Cc: <stable(a)vger.kernel.org> Fixes: 582ab27a063a ("mei: bus: fix received data size check in NFC fixup") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c index e45fe826d87d..65e28be3c8cc 100644 --- a/drivers/misc/mei/bus-fixup.c +++ b/drivers/misc/mei/bus-fixup.c @@ -341,7 +341,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, ret = 0; bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length, 0, 0); - if (bytes_recv < if_version_length) { + if (bytes_recv < 0 || bytes_recv < if_version_length) { dev_err(bus->dev, "Could not read IF version\n"); ret = -EIO; goto err;

7 years, 3 months

2
1
0 0

[PATCH 2/2] usb: roles: Take care of driver module reference counting

by Heikki Krogerus

This fixes potential "BUG: unable to handle kernel paging request at ..." from happening. Fixes: fde0aa6c175a ("usb: common: Small class for USB role switches") Cc: <stable(a)vger.kernel.org> Acked-by: Hans de Goede <hdegoede(a)redhat.com> Tested-by: Hans de Goede <hdegoede(a)redhat.com> Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> --- drivers/usb/common/roles.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/usb/common/roles.c b/drivers/usb/common/roles.c index 15cc76e22123..99116af07f1d 100644 --- a/drivers/usb/common/roles.c +++ b/drivers/usb/common/roles.c @@ -109,8 +109,15 @@ static void *usb_role_switch_match(struct device_connection *con, int ep, */ struct usb_role_switch *usb_role_switch_get(struct device *dev) { - return device_connection_find_match(dev, "usb-role-switch", NULL, - usb_role_switch_match); + struct usb_role_switch *sw; + + sw = device_connection_find_match(dev, "usb-role-switch", NULL, + usb_role_switch_match); + + if (!IS_ERR_OR_NULL(sw)) + WARN_ON(!try_module_get(sw->dev.parent->driver->owner)); + + return sw; } EXPORT_SYMBOL_GPL(usb_role_switch_get); @@ -122,8 +129,10 @@ EXPORT_SYMBOL_GPL(usb_role_switch_get); */ void usb_role_switch_put(struct usb_role_switch *sw) { - if (!IS_ERR_OR_NULL(sw)) + if (!IS_ERR_OR_NULL(sw)) { put_device(&sw->dev); + module_put(sw->dev.parent->driver->owner); + } } EXPORT_SYMBOL_GPL(usb_role_switch_put); -- 2.18.0

7 years, 3 months

2
1
0 0

Re: [PATCH] printk: Fix panic caused by passing log_buf_len to command line

by Sasha Levin

Hi, [This is an automated email] This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all The bot has tested the following trees: v4.18.8, v4.14.70, v4.9.127, v4.4.156, v3.18.122, v4.18.8: Build OK! v4.14.70: Build OK! v4.9.127: Build OK! v4.4.156: Build OK! v3.18.122: Build failed! Errors: Please let us know how to resolve this. -- Thanks, Sasha

7 years, 3 months

1
0
0 0

[GIT PULL] ring-buffer: Allow for rescheduling when removing pages

by Steven Rostedt

Linus (aka Greg), Vaibhav Nagarnaik found that modifying the ring buffer size could cause a huge latency in the system because it does a while loop to free pages without releasing the CPU (on non preempt kernels). In a case where there are hundreds of thousands of pages to free it could actually cause a system stall. A properly place cond_resched() solves this issue. Please pull the latest trace-v4.19-rc4 tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git trace-v4.19-rc4 Tag SHA1: 977e4fb3741e24151a255ee13bd4a1224545ae4e Head SHA1: 83f365554e47997ec68dc4eca3f5dce525cd15c3 Vaibhav Nagarnaik (1): ring-buffer: Allow for rescheduling when removing pages ---- kernel/trace/ring_buffer.c | 2 ++ 1 file changed, 2 insertions(+) --------------------------- commit 83f365554e47997ec68dc4eca3f5dce525cd15c3 Author: Vaibhav Nagarnaik <vnagarnaik(a)google.com> Date: Fri Sep 7 15:31:29 2018 -0700 ring-buffer: Allow for rescheduling when removing pages When reducing ring buffer size, pages are removed by scheduling a work item on each CPU for the corresponding CPU ring buffer. After the pages are removed from ring buffer linked list, the pages are free()d in a tight loop. The loop does not give up CPU until all pages are removed. In a worst case behavior, when lot of pages are to be freed, it can cause system stall. After the pages are removed from the list, the free() can happen while the work is rescheduled. Call cond_resched() in the loop to prevent the system hangup. Link: http://lkml.kernel.org/r/20180907223129.71994-1-vnagarnaik@google.com Cc: stable(a)vger.kernel.org Fixes: 83f40318dab00 ("ring-buffer: Make removal of ring buffer pages atomic") Reported-by: Jason Behmer <jbehmer(a)google.com> Signed-off-by: Vaibhav Nagarnaik <vnagarnaik(a)google.com> Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 1d92d4a982fd..65bd4616220d 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1546,6 +1546,8 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages) tmp_iter_page = first_page; do { + cond_resched(); + to_remove_page = tmp_iter_page; rb_inc_page(cpu_buffer, &tmp_iter_page);

7 years, 3 months

2
3
0 0

Interested in purchasing posts on your site

by Andy Macia

Hi There, Im reaching out to you because Im interested in purchasing a backlink from your site. The link will go to a high quality drug and alcohol rehabilitation information page. Ive made a short video explaining exactly what Im looking for: http://mtrack.me/tracking/raWzMz50paMkCGD1BQRlZGV5AwLzMKWjqzA2pzSaqaR9AGV4A… Ideally, the link will be placed in a relevant, existing post/page on your website. Please let me know your rates as soon as possible. Thank you for your time and consideration, Andy Macia (949) 467-1404 [Unsubscribe ] <http://mtrack.me/unsub/eng/raWzMz50paMkCGD1BQRlZGV5AwLzMKWjqzA2pzSaqaR9AGV4…>

7 years, 3 months

1
0
0 0

[PATCH 13/19] mtd: nand: pxa3xx: Fix READOOB implementation

by kostap＠marvell.com

From: Boris Brezillon <boris.brezillon(a)free-electrons.com> In the current driver, OOB bytes are accessed in raw mode, and when a page access is done with NDCR_SPARE_EN set and NDCR_ECC_EN cleared, the driver must read the whole spare area (64 bytes in case of a 2k page, 16 bytes for a 512 page). The driver was only reading the free OOB bytes, which was leaving some unread data in the FIFO and was somehow leading to a timeout. We could patch the driver to read ->spare_size + ->ecc_size instead of just ->spare_size when READOOB is requested, but we'd better make in-band and OOB accesses consistent. Since the driver is always accessing in-band data in non-raw mode (with the ECC engine enabled), we should also access OOB data in this mode. That's particularly useful when using the BCH engine because in this mode the free OOB bytes are also ECC protected. Fixes: 43bcfd2bb24a ("mtd: nand: pxa3xx: Add driver-specific ECC BCH support") Cc: stable(a)vger.kernel.org Reported-by: Sean Nyekjær <sean.nyekjaer(a)prevas.dk> Tested-by: Willy Tarreau <w(a)1wt.eu> Signed-off-by: Boris Brezillon <boris.brezillon(a)free-electrons.com> Acked-by: Ezequiel Garcia <ezequiel(a)vanguardiasur.com.ar> Tested-by: Sean Nyekjaer <sean.nyekjaer(a)prevas.dk> Acked-by: Robert Jarzmik <robert.jarzmik(a)free.fr> Signed-off-by: Richard Weinberger <richard(a)nod.at> Signed-off-by: Ofer Heifetz <oferh(a)marvell.com> Reviewed-by: Igal Liberman <igall(a)marvell.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> --- drivers/mtd/nand/pxa3xx_nand.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index b64dd0d..c1f7d61 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -750,6 +750,7 @@ static void prepare_start_command(struct pxa3xx_nand_info *info, int command) switch (command) { case NAND_CMD_READ0: + case NAND_CMD_READOOB: case NAND_CMD_PAGEPROG: info->use_ecc = 1; break; -- 2.7.4

7 years, 3 months

2
1
0 0

[PATCH 5/6] drm/i915: Fix intel_dp_mst_best_encoder()

by Lyude Paul

Currently, i915 appears to rely on blocking modesets on no-longer-present MSTB ports by simply returning NULL for ->best_encoder(), which in turn causes any new atomic commits that don't disable the CRTC to fail. This is wrong however, since we still want to allow userspace to disable CRTCs on no-longer-present MSTB ports by changing the DPMS state to off and this still requires that we retrieve an encoder. So, fix this by always returning a valid encoder regardless of the state of the MST port. Additionally, make intel_dp_mst_atomic_check() simply rely on drm_dp_mst_connector_atomic_check() to prevent new modesets on no-longer-present MSTB ports. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/i915/intel_dp_mst.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index a366f32b048a..2b798d4592f0 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -106,14 +106,21 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, } static int intel_dp_mst_atomic_check(struct drm_connector *connector, - struct drm_connector_state *new_conn_state) + struct drm_connector_state *new_conn_state) { struct drm_atomic_state *state = new_conn_state->state; struct drm_connector_state *old_conn_state; struct drm_crtc *old_crtc; struct drm_crtc_state *crtc_state; + struct drm_dp_mst_topology_mgr *mgr = + &to_intel_connector(connector)->mst_port->mst_mgr; int slots, ret = 0; + ret = drm_dp_mst_connector_atomic_check(connector, new_conn_state, + mgr); + if (ret) + return ret; + old_conn_state = drm_atomic_get_old_connector_state(state, connector); old_crtc = old_conn_state->crtc; if (!old_crtc) @@ -122,12 +129,6 @@ static int intel_dp_mst_atomic_check(struct drm_connector *connector, crtc_state = drm_atomic_get_new_crtc_state(state, old_crtc); slots = to_intel_crtc_state(crtc_state)->dp_m_n.tu; if (drm_atomic_crtc_needs_modeset(crtc_state) && slots > 0) { - struct drm_dp_mst_topology_mgr *mgr; - struct drm_encoder *old_encoder; - - old_encoder = old_conn_state->best_encoder; - mgr = &enc_to_mst(old_encoder)->primary->dp.mst_mgr; - ret = drm_dp_atomic_release_vcpi_slots(state, mgr, slots); if (ret) DRM_DEBUG_KMS("failed releasing %d vcpi slots:%d\n", slots, ret); @@ -407,8 +408,6 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *c struct intel_dp *intel_dp = intel_connector->mst_port; struct intel_crtc *crtc = to_intel_crtc(state->crtc); - if (intel_connector->mst_port_gone) - return NULL; return &intel_dp->mst_encoders[crtc->pipe]->base.base; } -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH 4/6] drm/i915: Skip vcpi allocation for MSTB ports that are gone

by Lyude Paul

Since we need to be able to allow DPMS on->off prop changes after an MST port has disappeared from the system, we need to be able to make sure we can compute a config for the resulting atomic commit. Currently this is impossible when the port has disappeared, since the VCPI slot searching we try to do in intel_dp_mst_compute_config() will fail with -EINVAL. Since the only commits we want to allow on no-longer-present MST ports are ones that shut off display hardware, we already know that no VCPI allocations are needed. So, hardcode the VCPI slot count to 0 when intel_dp_mst_compute_config() is called on an MST port that's gone. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/i915/intel_dp_mst.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index fcb9b87b9339..a366f32b048a 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -42,7 +42,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, to_intel_connector(conn_state->connector); struct drm_atomic_state *state = pipe_config->base.state; int bpp; - int lane_count, slots; + int lane_count, slots = 0; const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; int mst_pbn; bool reduce_m_n = drm_dp_has_quirk(&intel_dp->desc, @@ -76,11 +76,16 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp); pipe_config->pbn = mst_pbn; - slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr, - connector->port, mst_pbn); - if (slots < 0) { - DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", slots); - return false; + if (!connector->mst_port_gone) { + slots = drm_dp_atomic_find_vcpi_slots(state, + &intel_dp->mst_mgr, + connector->port, + mst_pbn); + if (slots < 0) { + DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", + slots); + return false; + } } intel_link_compute_m_n(bpp, lane_count, -- 2.17.1

7 years, 3 months

1
0
0 0

[PATCH 2/6] drm/nouveau: Unbreak nv50_mstc->best_encoder()

by Lyude Paul

As mentioned in the previous commit, we currently prevent new modesets on recently-removed MST connectors by returning no encoder from our ->best_encoder() callback once the MST port has disappeared. This is wrong however, because it prevents legacy modesetting users from being able to disable CRTCs on MST connectors after the connector's respective topology has disappeared. So, fix this by instead using the new drm_dp_mst_connector_atomic_check() helper instead while always returning a valid encoder from ->best_encoder(). Signed-off-by: Lyude Paul <lyude(a)redhat.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 9da0bdfe1e1c..8d6f6ee9bc75 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -881,22 +881,16 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, { struct nv50_head *head = nv50_head(connector_state->crtc); struct nv50_mstc *mstc = nv50_mstc(connector); - if (mstc->port) { - struct nv50_mstm *mstm = mstc->mstm; - return &mstm->msto[head->base.index]->encoder; - } - return NULL; + + return &mstc->mstm->msto[head->base.index]->encoder; } static struct drm_encoder * nv50_mstc_best_encoder(struct drm_connector *connector) { struct nv50_mstc *mstc = nv50_mstc(connector); - if (mstc->port) { - struct nv50_mstm *mstm = mstc->mstm; - return &mstm->msto[0]->encoder; - } - return NULL; + + return &mstc->mstm->msto[0]->encoder; } static enum drm_mode_status @@ -926,10 +920,21 @@ nv50_mstc_get_modes(struct drm_connector *connector) return ret; } +static int +nv50_mstc_atomic_check(struct drm_connector *connector, + struct drm_connector_state *state) +{ + struct nv50_mstc *mstc = nv50_mstc(connector); + + return drm_dp_mst_connector_atomic_check(connector, state, + &mstc->mstm->mgr); +} + static const struct drm_connector_helper_funcs nv50_mstc_help = { .get_modes = nv50_mstc_get_modes, .mode_valid = nv50_mstc_mode_valid, + .atomic_check = nv50_mstc_atomic_check, .best_encoder = nv50_mstc_best_encoder, .atomic_best_encoder = nv50_mstc_atomic_best_encoder, }; -- 2.17.1

7 years, 3 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror