* [GIT PULL for-4.9 02/96] drm: bridge: add DT bindings for TI ths8135
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 03/96] GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next Levin, Alexander (Sasha Levin)
` (95 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
[ Upstream commit 2e644be30fcc08c736f66b60f4898d274d4873ab ]
THS8135 is a configurable video DAC. Add DT bindings for this chip.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1481623759-12786-3-git-send-email-bgolaszewski@baylibre.com
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
.../bindings/display/bridge/ti,ths8135.txt | 46 ++++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt
diff --git a/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt b/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt
new file mode 100644
index 000000000000..6ec1a880ac18
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt
@@ -0,0 +1,46 @@
+THS8135 Video DAC
+-----------------
+
+This is the binding for Texas Instruments THS8135 Video DAC bridge.
+
+Required properties:
+
+- compatible: Must be "ti,ths8135"
+
+Required nodes:
+
+This device has two video ports. Their connections are modelled using the OF
+graph bindings specified in Documentation/devicetree/bindings/graph.txt.
+
+- Video port 0 for RGB input
+- Video port 1 for VGA output
+
+Example
+-------
+
+vga-bridge {
+ compatible = "ti,ths8135";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ vga_bridge_in: endpoint {
+ remote-endpoint = <&lcdc_out_vga>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+
+ vga_bridge_out: endpoint {
+ remote-endpoint = <&vga_con_in>;
+ };
+ };
+ };
+};
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 03/96] GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 02/96] drm: bridge: add DT bindings for TI ths8135 Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 01/96] drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define Levin, Alexander (Sasha Levin)
` (94 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Dan Carpenter <dan.carpenter@oracle.com>
[ Upstream commit 14d37564fa3dc4e5d4c6828afcd26ac14e6796c5 ]
This patch fixes a place where function gfs2_glock_iter_next can
reference an invalid error pointer.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
fs/gfs2/glock.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 7bff6f46f5da..95bc0ae71d81 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1820,16 +1820,18 @@ void gfs2_glock_exit(void)
static void gfs2_glock_iter_next(struct gfs2_glock_iter *gi)
{
- do {
- gi->gl = rhashtable_walk_next(&gi->hti);
+ while ((gi->gl = rhashtable_walk_next(&gi->hti))) {
if (IS_ERR(gi->gl)) {
if (PTR_ERR(gi->gl) == -EAGAIN)
continue;
gi->gl = NULL;
+ return;
}
- /* Skip entries for other sb and dead entries */
- } while ((gi->gl) && ((gi->sdp != gi->gl->gl_name.ln_sbd) ||
- __lockref_is_dead(&gi->gl->gl_lockref)));
+ /* Skip entries for other sb and dead entries */
+ if (gi->sdp == gi->gl->gl_name.ln_sbd &&
+ !__lockref_is_dead(&gi->gl->gl_lockref))
+ return;
+ }
}
static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 01/96] drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 02/96] drm: bridge: add DT bindings for TI ths8135 Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 03/96] GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 04/96] drm/i915: Fix the overlay frontbuffer tracking Levin, Alexander (Sasha Levin)
` (93 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: "Kristian H. Kristensen" <hoegsberg@gmail.com>
[ Upstream commit af913418261d6d3e7a29f06cf35f04610ead667c ]
We need to define DRM_FORMAT_MOD_VENDOR_NONE for the fourcc_mod_code()
macro to work correctly.
Signed-off-by: Kristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1481657272-25975-1-git-send-email-hoegsberg@google.com
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
include/uapi/drm/drm_fourcc.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index a5890bf44c0a..d1601a621929 100644
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -154,6 +154,7 @@ extern "C" {
/* Vendor Ids: */
#define DRM_FORMAT_MOD_NONE 0
+#define DRM_FORMAT_MOD_VENDOR_NONE 0
#define DRM_FORMAT_MOD_VENDOR_INTEL 0x01
#define DRM_FORMAT_MOD_VENDOR_AMD 0x02
#define DRM_FORMAT_MOD_VENDOR_NV 0x03
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 04/96] drm/i915: Fix the overlay frontbuffer tracking
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (2 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 01/96] drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 06/96] clk: sunxi-ng: fix PLL_CPUX adjusting on H3 Levin, Alexander (Sasha Levin)
` (92 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
[ Upstream commit 58d09ebdb4edf5d3ab3a2aee851ab0168bc83ec6 ]
Do the overlay frontbuffer tracking properly so that it matches
the state of the overlay on/off/continue requests.
One slight problem is that intel_frontbuffer_flip_complete()
may get delayed by an arbitrarily liong time due to the fact that
the overlay code likes to bail out when a signal occurs. So the
flip may not get completed until the ioctl is restarted. But fixing
that would require bigger surgery, so I decided to ignore it for now.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1481131693-27993-5-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/gpu/drm/i915/intel_overlay.c | 64 +++++++++++++++++++++++-------------
1 file changed, 41 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index a2655cd5a84e..8ab6f30dc23c 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -272,8 +272,30 @@ static int intel_overlay_on(struct intel_overlay *overlay)
return intel_overlay_do_wait_request(overlay, req, NULL);
}
+static void intel_overlay_flip_prepare(struct intel_overlay *overlay,
+ struct i915_vma *vma)
+{
+ enum pipe pipe = overlay->crtc->pipe;
+
+ WARN_ON(overlay->old_vma);
+
+ i915_gem_track_fb(overlay->vma ? overlay->vma->obj : NULL,
+ vma ? vma->obj : NULL,
+ INTEL_FRONTBUFFER_OVERLAY(pipe));
+
+ intel_frontbuffer_flip_prepare(overlay->i915,
+ INTEL_FRONTBUFFER_OVERLAY(pipe));
+
+ overlay->old_vma = overlay->vma;
+ if (vma)
+ overlay->vma = i915_vma_get(vma);
+ else
+ overlay->vma = NULL;
+}
+
/* overlay needs to be enabled in OCMD reg */
static int intel_overlay_continue(struct intel_overlay *overlay,
+ struct i915_vma *vma,
bool load_polyphase_filter)
{
struct drm_i915_private *dev_priv = overlay->i915;
@@ -308,43 +330,44 @@ static int intel_overlay_continue(struct intel_overlay *overlay,
intel_ring_emit(ring, flip_addr);
intel_ring_advance(ring);
+ intel_overlay_flip_prepare(overlay, vma);
+
intel_overlay_submit_request(overlay, req, NULL);
return 0;
}
-static void intel_overlay_release_old_vid_tail(struct i915_gem_active *active,
- struct drm_i915_gem_request *req)
+static void intel_overlay_release_old_vma(struct intel_overlay *overlay)
{
- struct intel_overlay *overlay =
- container_of(active, typeof(*overlay), last_flip);
struct i915_vma *vma;
vma = fetch_and_zero(&overlay->old_vma);
if (WARN_ON(!vma))
return;
- i915_gem_track_fb(vma->obj, NULL,
- INTEL_FRONTBUFFER_OVERLAY(overlay->crtc->pipe));
+ intel_frontbuffer_flip_complete(overlay->i915,
+ INTEL_FRONTBUFFER_OVERLAY(overlay->crtc->pipe));
i915_gem_object_unpin_from_display_plane(vma);
i915_vma_put(vma);
}
+static void intel_overlay_release_old_vid_tail(struct i915_gem_active *active,
+ struct drm_i915_gem_request *req)
+{
+ struct intel_overlay *overlay =
+ container_of(active, typeof(*overlay), last_flip);
+
+ intel_overlay_release_old_vma(overlay);
+}
+
static void intel_overlay_off_tail(struct i915_gem_active *active,
struct drm_i915_gem_request *req)
{
struct intel_overlay *overlay =
container_of(active, typeof(*overlay), last_flip);
- struct i915_vma *vma;
-
- /* never have the overlay hw on without showing a frame */
- vma = fetch_and_zero(&overlay->vma);
- if (WARN_ON(!vma))
- return;
- i915_gem_object_unpin_from_display_plane(vma);
- i915_vma_put(vma);
+ intel_overlay_release_old_vma(overlay);
overlay->crtc->overlay = NULL;
overlay->crtc = NULL;
@@ -398,6 +421,8 @@ static int intel_overlay_off(struct intel_overlay *overlay)
}
intel_ring_advance(ring);
+ intel_overlay_flip_prepare(overlay, NULL);
+
return intel_overlay_do_wait_request(overlay, req,
intel_overlay_off_tail);
}
@@ -836,18 +861,10 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
intel_overlay_unmap_regs(overlay, regs);
- ret = intel_overlay_continue(overlay, scale_changed);
+ ret = intel_overlay_continue(overlay, vma, scale_changed);
if (ret)
goto out_unpin;
- i915_gem_track_fb(overlay->vma ? overlay->vma->obj : NULL,
- vma->obj, INTEL_FRONTBUFFER_OVERLAY(pipe));
-
- overlay->old_vma = overlay->vma;
- overlay->vma = vma;
-
- intel_frontbuffer_flip(dev_priv, INTEL_FRONTBUFFER_OVERLAY(pipe));
-
return 0;
out_unpin:
@@ -1215,6 +1232,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
mutex_unlock(&dev->struct_mutex);
drm_modeset_unlock_all(dev);
+ i915_gem_object_put(new_bo);
kfree(params);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 06/96] clk: sunxi-ng: fix PLL_CPUX adjusting on H3
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (3 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 04/96] drm/i915: Fix the overlay frontbuffer tracking Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 05/96] ARM: dts: exynos: Add CPU OPPs for Exynos4412 Prime Levin, Alexander (Sasha Levin)
` (91 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Ondrej Jirman <megous@megous.com>
[ Upstream commit a43c96427e713bea94e9ef50e8be1f493afc0691 ]
When adjusting PLL_CPUX on H3, the PLL is temporarily driven
too high, and the system becomes unstable (oopses or hangs).
Add a notifier to avoid this situation by temporarily switching
to a known stable 24 MHz oscillator.
Signed-off-by: Ondrej Jirman <megous@megous.com>
Tested-by: Lutz Sammer <johns98@gmx.net>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
index 21c427d86f28..a26c8a19fe93 100644
--- a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
@@ -803,6 +803,13 @@ static const struct sunxi_ccu_desc sun8i_h3_ccu_desc = {
.num_resets = ARRAY_SIZE(sun8i_h3_ccu_resets),
};
+static struct ccu_mux_nb sun8i_h3_cpu_nb = {
+ .common = &cpux_clk.common,
+ .cm = &cpux_clk.mux,
+ .delay_us = 1, /* > 8 clock cycles at 24 MHz */
+ .bypass_index = 1, /* index of 24 MHz oscillator */
+};
+
static void __init sun8i_h3_ccu_setup(struct device_node *node)
{
void __iomem *reg;
@@ -821,6 +828,9 @@ static void __init sun8i_h3_ccu_setup(struct device_node *node)
writel(val | (3 << 16), reg + SUN8I_H3_PLL_AUDIO_REG);
sunxi_ccu_probe(node, reg, &sun8i_h3_ccu_desc);
+
+ ccu_mux_notifier_register(pll_cpux_clk.common.hw.clk,
+ &sun8i_h3_cpu_nb);
}
CLK_OF_DECLARE(sun8i_h3_ccu, "allwinner,sun8i-h3-ccu",
sun8i_h3_ccu_setup);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 05/96] ARM: dts: exynos: Add CPU OPPs for Exynos4412 Prime
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (4 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 06/96] clk: sunxi-ng: fix PLL_CPUX adjusting on H3 Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 07/96] RDS: RDMA: Fix the composite message user notification Levin, Alexander (Sasha Levin)
` (90 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
[ Upstream commit 80b7a2e2498bcffb1a79980dfbeb7a1275577b28 ]
Add CPU operating points for Exynos4412 Prime (it supports
additional 1704MHz & 1600MHz OPPs and 1500MHz OPP is just
a regular non-turbo OPP on this SoC). Also update relevant
cooling maps to account for new OPPs.
ODROID-X2/U2/U3 boards use Exynos4412 Prime SoC version so
update their board files accordingly.
Based on Hardkernel's kernel for ODROID-X2/U2/U3 boards.
Cc: Doug Anderson <dianders@chromium.org>
Cc: Andreas Faerber <afaerber@suse.de>
Cc: Thomas Abraham <thomas.ab@samsung.com>
Cc: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Cc: Ben Gamari <ben@smart-cactus.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 +--
arch/arm/boot/dts/exynos4412-odroidu3.dts | 5 +--
arch/arm/boot/dts/exynos4412-odroidx2.dts | 1 +
arch/arm/boot/dts/exynos4412-prime.dtsi | 41 +++++++++++++++++++++++++
arch/arm/boot/dts/exynos4412.dtsi | 2 +-
5 files changed, 48 insertions(+), 5 deletions(-)
create mode 100644 arch/arm/boot/dts/exynos4412-prime.dtsi
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 8aa19ba14436..5282d69e55bd 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -97,11 +97,11 @@
thermal-zones {
cpu_thermal: cpu-thermal {
cooling-maps {
- map0 {
+ cooling_map0: map0 {
/* Corresponds to 800MHz at freq_table */
cooling-device = <&cpu0 7 7>;
};
- map1 {
+ cooling_map1: map1 {
/* Corresponds to 200MHz at freq_table */
cooling-device = <&cpu0 13 13>;
};
diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
index 99634c54dca9..7504a5aa538e 100644
--- a/arch/arm/boot/dts/exynos4412-odroidu3.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
@@ -13,6 +13,7 @@
/dts-v1/;
#include "exynos4412-odroid-common.dtsi"
+#include "exynos4412-prime.dtsi"
/ {
model = "Hardkernel ODROID-U3 board based on Exynos4412";
@@ -47,11 +48,11 @@
cooling-maps {
map0 {
trip = <&cpu_alert1>;
- cooling-device = <&cpu0 7 7>;
+ cooling-device = <&cpu0 9 9>;
};
map1 {
trip = <&cpu_alert2>;
- cooling-device = <&cpu0 13 13>;
+ cooling-device = <&cpu0 15 15>;
};
map2 {
trip = <&cpu_alert0>;
diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts
index 4d228858f172..d6e92ebc3874 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -12,6 +12,7 @@
*/
#include "exynos4412-odroidx.dts"
+#include "exynos4412-prime.dtsi"
/ {
model = "Hardkernel ODROID-X2 board based on Exynos4412";
diff --git a/arch/arm/boot/dts/exynos4412-prime.dtsi b/arch/arm/boot/dts/exynos4412-prime.dtsi
new file mode 100644
index 000000000000..e75bc170c89c
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-prime.dtsi
@@ -0,0 +1,41 @@
+/*
+ * Samsung's Exynos4412 Prime SoC device tree source
+ *
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * Exynos4412 Prime SoC revision supports higher CPU frequencies than
+ * non-Prime version. Therefore we need to update OPPs table and
+ * thermal maps accordingly.
+ */
+
+&cpu0_opp_1500 {
+ /delete-property/turbo-mode;
+};
+
+&cpu0_opp_table {
+ opp@1600000000 {
+ opp-hz = /bits/ 64 <1600000000>;
+ opp-microvolt = <1350000>;
+ clock-latency-ns = <200000>;
+ };
+ opp@1704000000 {
+ opp-hz = /bits/ 64 <1704000000>;
+ opp-microvolt = <1350000>;
+ clock-latency-ns = <200000>;
+ };
+};
+
+&cooling_map0 {
+ cooling-device = <&cpu0 9 9>;
+};
+
+&cooling_map1 {
+ cooling-device = <&cpu0 15 15>;
+};
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 40beede46e55..3ebdf01d814c 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -130,7 +130,7 @@
opp-microvolt = <1287500>;
clock-latency-ns = <200000>;
};
- opp@1500000000 {
+ cpu0_opp_1500: opp@1500000000 {
opp-hz = /bits/ 64 <1500000000>;
opp-microvolt = <1350000>;
clock-latency-ns = <200000>;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 07/96] RDS: RDMA: Fix the composite message user notification
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (5 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 05/96] ARM: dts: exynos: Add CPU OPPs for Exynos4412 Prime Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 09/96] MIPS: Ensure bss section ends on a long-aligned address Levin, Alexander (Sasha Levin)
` (89 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
[ Upstream commit 941f8d55f6d613a460a5e080d25a38509f45eb75 ]
When application sends an RDS RDMA composite message consist of
RDMA transfer to be followed up by non RDMA payload, it expect to
be notified *only* when the full message gets delivered. RDS RDMA
notification doesn't behave this way though.
Thanks to Venkat for debug and root casuing the issue
where only first part of the message(RDMA) was
successfully delivered but remainder payload delivery failed.
In that case, application should not be notified with
a false positive of message delivery success.
Fix this case by making sure the user gets notified only after
the full message delivery.
Reviewed-by: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
net/rds/ib_send.c | 25 +++++++++++++++----------
net/rds/rdma.c | 10 ++++++++++
net/rds/rds.h | 1 +
net/rds/send.c | 4 +++-
4 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index 84d90c97332f..191098173018 100644
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -69,16 +69,6 @@ static void rds_ib_send_complete(struct rds_message *rm,
complete(rm, notify_status);
}
-static void rds_ib_send_unmap_data(struct rds_ib_connection *ic,
- struct rm_data_op *op,
- int wc_status)
-{
- if (op->op_nents)
- ib_dma_unmap_sg(ic->i_cm_id->device,
- op->op_sg, op->op_nents,
- DMA_TO_DEVICE);
-}
-
static void rds_ib_send_unmap_rdma(struct rds_ib_connection *ic,
struct rm_rdma_op *op,
int wc_status)
@@ -139,6 +129,21 @@ static void rds_ib_send_unmap_atomic(struct rds_ib_connection *ic,
rds_ib_stats_inc(s_ib_atomic_fadd);
}
+static void rds_ib_send_unmap_data(struct rds_ib_connection *ic,
+ struct rm_data_op *op,
+ int wc_status)
+{
+ struct rds_message *rm = container_of(op, struct rds_message, data);
+
+ if (op->op_nents)
+ ib_dma_unmap_sg(ic->i_cm_id->device,
+ op->op_sg, op->op_nents,
+ DMA_TO_DEVICE);
+
+ if (rm->rdma.op_active && rm->data.op_notify)
+ rds_ib_send_unmap_rdma(ic, &rm->rdma, wc_status);
+}
+
/*
* Unmap the resources associated with a struct send_work.
*
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 4c93badeabf2..8d3a851a3476 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -626,6 +626,16 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm,
}
op->op_notifier->n_user_token = args->user_token;
op->op_notifier->n_status = RDS_RDMA_SUCCESS;
+
+ /* Enable rmda notification on data operation for composite
+ * rds messages and make sure notification is enabled only
+ * for the data operation which follows it so that application
+ * gets notified only after full message gets delivered.
+ */
+ if (rm->data.op_sg) {
+ rm->rdma.op_notify = 0;
+ rm->data.op_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME);
+ }
}
/* The cookie contains the R_Key of the remote memory region, and
diff --git a/net/rds/rds.h b/net/rds/rds.h
index 67ba67c058b1..f107a968ddff 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -414,6 +414,7 @@ struct rds_message {
} rdma;
struct rm_data_op {
unsigned int op_active:1;
+ unsigned int op_notify:1;
unsigned int op_nents;
unsigned int op_count;
unsigned int op_dmasg;
diff --git a/net/rds/send.c b/net/rds/send.c
index 896626b9a0ef..f28651b6ae83 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -475,12 +475,14 @@ void rds_rdma_send_complete(struct rds_message *rm, int status)
struct rm_rdma_op *ro;
struct rds_notifier *notifier;
unsigned long flags;
+ unsigned int notify = 0;
spin_lock_irqsave(&rm->m_rs_lock, flags);
+ notify = rm->rdma.op_notify | rm->data.op_notify;
ro = &rm->rdma;
if (test_bit(RDS_MSG_ON_SOCK, &rm->m_flags) &&
- ro->op_active && ro->op_notify && ro->op_notifier) {
+ ro->op_active && notify && ro->op_notifier) {
notifier = ro->op_notifier;
rs = rm->m_rs;
sock_hold(rds_rs_to_sk(rs));
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 09/96] MIPS: Ensure bss section ends on a long-aligned address
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (6 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 07/96] RDS: RDMA: Fix the composite message user notification Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 08/96] ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for msiof nodes Levin, Alexander (Sasha Levin)
` (88 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Paul Burton <paul.burton@imgtec.com>
[ Upstream commit 3f00f4d8f083bc61005d0a1ef592b149f5c88bbd ]
When clearing the .bss section in kernel_entry we do so using LONG_S
instructions, and branch whilst the current write address doesn't equal
the end of the .bss section minus the size of a long integer. The .bss
section always begins at a long-aligned address and we always increment
the write pointer by the size of a long integer - we therefore rely upon
the .bss section ending at a long-aligned address. If this is not the
case then the long-aligned write address can never be equal to the
non-long-aligned end address & we will continue to increment past the
end of the .bss section, attempting to zero the rest of memory.
Despite this requirement that .bss end at a long-aligned address we pass
0 as the end alignment requirement to the BSS_SECTION macro and thus
don't guarantee any particular alignment, allowing us to hit the error
condition described above.
Fix this by instead passing 8 bytes as the end alignment argument to
the BSS_SECTION macro, ensuring that the end of the .bss section is
always at least long-aligned.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14526/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/kernel/vmlinux.lds.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index d5de67591735..f0a0e6d62be3 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -182,7 +182,7 @@ SECTIONS
* Force .bss to 64K alignment so that .bss..swapper_pg_dir
* gets that alignment. .sbss should be empty, so there will be
* no holes after __init_end. */
- BSS_SECTION(0, 0x10000, 0)
+ BSS_SECTION(0, 0x10000, 8)
_end = . ;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 08/96] ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for msiof nodes
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (7 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 09/96] MIPS: Ensure bss section ends on a long-aligned address Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 10/96] MIPS: fix mem=X@Y commandline processing Levin, Alexander (Sasha Levin)
` (87 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Simon Horman <horms+renesas@verge.net.au>
[ Upstream commit 654450baf2afba86cf328e1849ccac61ec4630af ]
Use recently added R-Car Gen 2 fallback binding for msiof nodes in
DT for r8a7790 SoC.
This has no run-time effect for the current driver as the initialisation
sequence is the same for the SoC-specific binding for r8a7790 and the
fallback binding for R-Car Gen 2.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/arm/boot/dts/r8a7790.dtsi | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 351fcc2f87df..b6c6410ca384 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1493,7 +1493,8 @@
};
msiof0: spi@e6e20000 {
- compatible = "renesas,msiof-r8a7790";
+ compatible = "renesas,msiof-r8a7790",
+ "renesas,rcar-gen2-msiof";
reg = <0 0xe6e20000 0 0x0064>;
interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp0_clks R8A7790_CLK_MSIOF0>;
@@ -1507,7 +1508,8 @@
};
msiof1: spi@e6e10000 {
- compatible = "renesas,msiof-r8a7790";
+ compatible = "renesas,msiof-r8a7790",
+ "renesas,rcar-gen2-msiof";
reg = <0 0xe6e10000 0 0x0064>;
interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_MSIOF1>;
@@ -1521,7 +1523,8 @@
};
msiof2: spi@e6e00000 {
- compatible = "renesas,msiof-r8a7790";
+ compatible = "renesas,msiof-r8a7790",
+ "renesas,rcar-gen2-msiof";
reg = <0 0xe6e00000 0 0x0064>;
interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_MSIOF2>;
@@ -1535,7 +1538,8 @@
};
msiof3: spi@e6c90000 {
- compatible = "renesas,msiof-r8a7790";
+ compatible = "renesas,msiof-r8a7790",
+ "renesas,rcar-gen2-msiof";
reg = <0 0xe6c90000 0 0x0064>;
interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7790_CLK_MSIOF3>;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 10/96] MIPS: fix mem=X@Y commandline processing
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (8 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 08/96] ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for msiof nodes Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 11/96] MIPS: kexec: Do not reserve invalid crashkernel memory on boot Levin, Alexander (Sasha Levin)
` (86 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
[ Upstream commit 73fbc1eba7ffa3bf0ad12486232a8a1edb4e4411 ]
When a memory offset is specified through the commandline, add the
memory in range PHYS_OFFSET:Y as reserved memory area.
Otherwise the bootmem allocator is initialised with low page equal to
min_low_pfn = PHYS_OFFSET, and in free_all_bootmem will process pages
starting from min_low_pfn instead of PFN(Y).
Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14613/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/kernel/setup.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index f66e5ce505b2..38697f25d168 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -589,6 +589,10 @@ static int __init early_parse_mem(char *p)
start = memparse(p + 1, &p);
add_memory_region(start, size, BOOT_MEM_RAM);
+
+ if (start && start > PHYS_OFFSET)
+ add_memory_region(PHYS_OFFSET, start - PHYS_OFFSET,
+ BOOT_MEM_RESERVED);
return 0;
}
early_param("mem", early_parse_mem);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 11/96] MIPS: kexec: Do not reserve invalid crashkernel memory on boot
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (9 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 10/96] MIPS: fix mem=X@Y commandline processing Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 12/96] MIPS: ralink: Fix a typo in the pinmux setup Levin, Alexander (Sasha Levin)
` (85 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
[ Upstream commit a8f108d70c74d83574c157648383eb2e4285a190 ]
Do not reserve memory for the crashkernel if the commandline argument
points to a wrong location. This can happen if the location is specified
wrong or if the same commandline is reused when starting the crashkernel
- in the latter case the reserved memory would point to the location
from which the crashkernel is executing.
Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14612/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/kernel/setup.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 38697f25d168..d64ee5d3cc89 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -668,6 +668,11 @@ static void __init mips_parse_crashkernel(void)
if (ret != 0 || crash_size <= 0)
return;
+ if (!memory_region_available(crash_base, crash_size)) {
+ pr_warn("Invalid memory region reserved for crash kernel\n");
+ return;
+ }
+
crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 12/96] MIPS: ralink: Fix a typo in the pinmux setup.
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (10 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 11/96] MIPS: kexec: Do not reserve invalid crashkernel memory on boot Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 13/96] MIPS: ralink: Fix incorrect assignment on ralink_soc Levin, Alexander (Sasha Levin)
` (84 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: John Crispin <john@phrozen.org>
[ Upstream commit 58181a117d353427127a2e7afc7cf1ab44759828 ]
There is a typo inside the pinmux setup code. The function is really
called utif and not util. This was recently discovered when people were
trying to make the UTIF interface work.
Signed-off-by: John Crispin <john@phrozen.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14899/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/ralink/mt7620.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index 3c7c9bf57bf3..6f892c1f3ad7 100644
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
@@ -176,7 +176,7 @@ static struct rt2880_pmx_func spi_cs1_grp_mt7628[] = {
static struct rt2880_pmx_func spis_grp_mt7628[] = {
FUNC("pwm_uart2", 3, 14, 4),
- FUNC("util", 2, 14, 4),
+ FUNC("utif", 2, 14, 4),
FUNC("gpio", 1, 14, 4),
FUNC("spis", 0, 14, 4),
};
@@ -190,28 +190,28 @@ static struct rt2880_pmx_func gpio_grp_mt7628[] = {
static struct rt2880_pmx_func p4led_kn_grp_mt7628[] = {
FUNC("jtag", 3, 30, 1),
- FUNC("util", 2, 30, 1),
+ FUNC("utif", 2, 30, 1),
FUNC("gpio", 1, 30, 1),
FUNC("p4led_kn", 0, 30, 1),
};
static struct rt2880_pmx_func p3led_kn_grp_mt7628[] = {
FUNC("jtag", 3, 31, 1),
- FUNC("util", 2, 31, 1),
+ FUNC("utif", 2, 31, 1),
FUNC("gpio", 1, 31, 1),
FUNC("p3led_kn", 0, 31, 1),
};
static struct rt2880_pmx_func p2led_kn_grp_mt7628[] = {
FUNC("jtag", 3, 32, 1),
- FUNC("util", 2, 32, 1),
+ FUNC("utif", 2, 32, 1),
FUNC("gpio", 1, 32, 1),
FUNC("p2led_kn", 0, 32, 1),
};
static struct rt2880_pmx_func p1led_kn_grp_mt7628[] = {
FUNC("jtag", 3, 33, 1),
- FUNC("util", 2, 33, 1),
+ FUNC("utif", 2, 33, 1),
FUNC("gpio", 1, 33, 1),
FUNC("p1led_kn", 0, 33, 1),
};
@@ -232,28 +232,28 @@ static struct rt2880_pmx_func wled_kn_grp_mt7628[] = {
static struct rt2880_pmx_func p4led_an_grp_mt7628[] = {
FUNC("jtag", 3, 39, 1),
- FUNC("util", 2, 39, 1),
+ FUNC("utif", 2, 39, 1),
FUNC("gpio", 1, 39, 1),
FUNC("p4led_an", 0, 39, 1),
};
static struct rt2880_pmx_func p3led_an_grp_mt7628[] = {
FUNC("jtag", 3, 40, 1),
- FUNC("util", 2, 40, 1),
+ FUNC("utif", 2, 40, 1),
FUNC("gpio", 1, 40, 1),
FUNC("p3led_an", 0, 40, 1),
};
static struct rt2880_pmx_func p2led_an_grp_mt7628[] = {
FUNC("jtag", 3, 41, 1),
- FUNC("util", 2, 41, 1),
+ FUNC("utif", 2, 41, 1),
FUNC("gpio", 1, 41, 1),
FUNC("p2led_an", 0, 41, 1),
};
static struct rt2880_pmx_func p1led_an_grp_mt7628[] = {
FUNC("jtag", 3, 42, 1),
- FUNC("util", 2, 42, 1),
+ FUNC("utif", 2, 42, 1),
FUNC("gpio", 1, 42, 1),
FUNC("p1led_an", 0, 42, 1),
};
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 13/96] MIPS: ralink: Fix incorrect assignment on ralink_soc
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (11 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 12/96] MIPS: ralink: Fix a typo in the pinmux setup Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 14/96] power: supply: axp288_fuel_gauge: Fix fuel_gauge_reg_readb return on error Levin, Alexander (Sasha Levin)
` (83 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Colin Ian King <colin.king@canonical.com>
[ Upstream commit 08d90c81b714482dceb5323d14f6617bcf55ee61 ]
ralink_soc sould be assigned to RT3883_SOC, replace incorrect
comparision with assignment.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Fixes: 418d29c87061 ("MIPS: ralink: Unify SoC id handling")
Cc: John Crispin <john@phrozen.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14903/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/ralink/rt3883.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
index 9e4631acfcb5..3e68e35daf21 100644
--- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c
@@ -145,5 +145,5 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
rt2880_pinmux_data = rt3883_pinmux_data;
- ralink_soc == RT3883_SOC;
+ ralink_soc = RT3883_SOC;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 14/96] power: supply: axp288_fuel_gauge: Fix fuel_gauge_reg_readb return on error
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (12 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 13/96] MIPS: ralink: Fix incorrect assignment on ralink_soc Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 15/96] scsi: be2iscsi: Add checks to validate CID alloc/free Levin, Alexander (Sasha Levin)
` (82 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Hans de Goede <hdegoede@redhat.com>
[ Upstream commit 6f074bc878dc9b00c0df0bf3a8cb1d9e294cd881 ]
If reading the register fails, return the actual error code, instead
of the uninitialized val variable;
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/power/supply/axp288_fuel_gauge.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c
index 5bdde692f724..f62f9dfea984 100644
--- a/drivers/power/supply/axp288_fuel_gauge.c
+++ b/drivers/power/supply/axp288_fuel_gauge.c
@@ -169,8 +169,10 @@ static int fuel_gauge_reg_readb(struct axp288_fg_info *info, int reg)
break;
}
- if (ret < 0)
+ if (ret < 0) {
dev_err(&info->pdev->dev, "axp288 reg read err:%d\n", ret);
+ return ret;
+ }
return val;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 15/96] scsi: be2iscsi: Add checks to validate CID alloc/free
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (13 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 14/96] power: supply: axp288_fuel_gauge: Fix fuel_gauge_reg_readb return on error Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 16/96] ARM: dts: am335x-chilisom: Wakeup from RTC-only state by power on event Levin, Alexander (Sasha Levin)
` (81 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
[ Upstream commit 413f365657a8b9669bd0ba3628e9fde9ce63604e ]
Set CID slot to 0xffff to indicate empty.
Check if connection already exists in conn_table before binding.
Check if endpoint already NULL before putting back CID.
Break ep->conn link in free_ep to ignore completions after freeing.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/scsi/be2iscsi/be_iscsi.c | 163 ++++++++++++++++++++-------------------
drivers/scsi/be2iscsi/be_main.c | 7 +-
drivers/scsi/be2iscsi/be_main.h | 1 +
3 files changed, 87 insertions(+), 84 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index ba258217614e..963c732a3d24 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -166,33 +166,6 @@ beiscsi_conn_create(struct iscsi_cls_session *cls_session, u32 cid)
}
/**
- * beiscsi_bindconn_cid - Bind the beiscsi_conn with phba connection table
- * @beiscsi_conn: The pointer to beiscsi_conn structure
- * @phba: The phba instance
- * @cid: The cid to free
- */
-static int beiscsi_bindconn_cid(struct beiscsi_hba *phba,
- struct beiscsi_conn *beiscsi_conn,
- unsigned int cid)
-{
- uint16_t cri_index = BE_GET_CRI_FROM_CID(cid);
-
- if (phba->conn_table[cri_index]) {
- beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
- "BS_%d : Connection table already occupied. Detected clash\n");
-
- return -EINVAL;
- } else {
- beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
- "BS_%d : phba->conn_table[%d]=%p(beiscsi_conn)\n",
- cri_index, beiscsi_conn);
-
- phba->conn_table[cri_index] = beiscsi_conn;
- }
- return 0;
-}
-
-/**
* beiscsi_conn_bind - Binds iscsi session/connection with TCP connection
* @cls_session: pointer to iscsi cls session
* @cls_conn: pointer to iscsi cls conn
@@ -212,6 +185,7 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session,
struct hwi_wrb_context *pwrb_context;
struct beiscsi_endpoint *beiscsi_ep;
struct iscsi_endpoint *ep;
+ uint16_t cri_index;
ep = iscsi_lookup_endpoint(transport_fd);
if (!ep)
@@ -229,20 +203,34 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session,
return -EEXIST;
}
-
- pwrb_context = &phwi_ctrlr->wrb_context[BE_GET_CRI_FROM_CID(
- beiscsi_ep->ep_cid)];
+ cri_index = BE_GET_CRI_FROM_CID(beiscsi_ep->ep_cid);
+ if (phba->conn_table[cri_index]) {
+ if (beiscsi_conn != phba->conn_table[cri_index] ||
+ beiscsi_ep != phba->conn_table[cri_index]->ep) {
+ __beiscsi_log(phba, KERN_ERR,
+ "BS_%d : conn_table not empty at %u: cid %u conn %p:%p\n",
+ cri_index,
+ beiscsi_ep->ep_cid,
+ beiscsi_conn,
+ phba->conn_table[cri_index]);
+ return -EINVAL;
+ }
+ }
beiscsi_conn->beiscsi_conn_cid = beiscsi_ep->ep_cid;
beiscsi_conn->ep = beiscsi_ep;
beiscsi_ep->conn = beiscsi_conn;
+ /**
+ * Each connection is associated with a WRBQ kept in wrb_context.
+ * Store doorbell offset for transmit path.
+ */
+ pwrb_context = &phwi_ctrlr->wrb_context[cri_index];
beiscsi_conn->doorbell_offset = pwrb_context->doorbell_offset;
-
beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
- "BS_%d : beiscsi_conn=%p conn=%p ep_cid=%d\n",
- beiscsi_conn, conn, beiscsi_ep->ep_cid);
-
- return beiscsi_bindconn_cid(phba, beiscsi_conn, beiscsi_ep->ep_cid);
+ "BS_%d : cid %d phba->conn_table[%u]=%p\n",
+ beiscsi_ep->ep_cid, cri_index, beiscsi_conn);
+ phba->conn_table[cri_index] = beiscsi_conn;
+ return 0;
}
static int beiscsi_iface_create_ipv4(struct beiscsi_hba *phba)
@@ -973,9 +961,9 @@ int beiscsi_conn_start(struct iscsi_cls_conn *cls_conn)
*/
static int beiscsi_get_cid(struct beiscsi_hba *phba)
{
- unsigned short cid = 0xFFFF, cid_from_ulp;
- struct ulp_cid_info *cid_info = NULL;
uint16_t cid_avlbl_ulp0, cid_avlbl_ulp1;
+ unsigned short cid, cid_from_ulp;
+ struct ulp_cid_info *cid_info;
/* Find the ULP which has more CID available */
cid_avlbl_ulp0 = (phba->cid_array_info[BEISCSI_ULP0]) ?
@@ -984,20 +972,27 @@ static int beiscsi_get_cid(struct beiscsi_hba *phba)
BEISCSI_ULP1_AVLBL_CID(phba) : 0;
cid_from_ulp = (cid_avlbl_ulp0 > cid_avlbl_ulp1) ?
BEISCSI_ULP0 : BEISCSI_ULP1;
-
- if (test_bit(cid_from_ulp, (void *)&phba->fw_config.ulp_supported)) {
- cid_info = phba->cid_array_info[cid_from_ulp];
- if (!cid_info->avlbl_cids)
- return cid;
-
- cid = cid_info->cid_array[cid_info->cid_alloc++];
-
- if (cid_info->cid_alloc == BEISCSI_GET_CID_COUNT(
- phba, cid_from_ulp))
- cid_info->cid_alloc = 0;
-
- cid_info->avlbl_cids--;
+ /**
+ * If iSCSI protocol is loaded only on ULP 0, and when cid_avlbl_ulp
+ * is ZERO for both, ULP 1 is returned.
+ * Check if ULP is loaded before getting new CID.
+ */
+ if (!test_bit(cid_from_ulp, (void *)&phba->fw_config.ulp_supported))
+ return BE_INVALID_CID;
+
+ cid_info = phba->cid_array_info[cid_from_ulp];
+ cid = cid_info->cid_array[cid_info->cid_alloc];
+ if (!cid_info->avlbl_cids || cid == BE_INVALID_CID) {
+ __beiscsi_log(phba, KERN_ERR,
+ "BS_%d : failed to get cid: available %u:%u\n",
+ cid_info->avlbl_cids, cid_info->cid_free);
+ return BE_INVALID_CID;
}
+ /* empty the slot */
+ cid_info->cid_array[cid_info->cid_alloc++] = BE_INVALID_CID;
+ if (cid_info->cid_alloc == BEISCSI_GET_CID_COUNT(phba, cid_from_ulp))
+ cid_info->cid_alloc = 0;
+ cid_info->avlbl_cids--;
return cid;
}
@@ -1008,22 +1003,28 @@ static int beiscsi_get_cid(struct beiscsi_hba *phba)
*/
static void beiscsi_put_cid(struct beiscsi_hba *phba, unsigned short cid)
{
- uint16_t cid_post_ulp;
- struct hwi_controller *phwi_ctrlr;
- struct hwi_wrb_context *pwrb_context;
- struct ulp_cid_info *cid_info = NULL;
uint16_t cri_index = BE_GET_CRI_FROM_CID(cid);
+ struct hwi_wrb_context *pwrb_context;
+ struct hwi_controller *phwi_ctrlr;
+ struct ulp_cid_info *cid_info;
+ uint16_t cid_post_ulp;
phwi_ctrlr = phba->phwi_ctrlr;
pwrb_context = &phwi_ctrlr->wrb_context[cri_index];
cid_post_ulp = pwrb_context->ulp_num;
cid_info = phba->cid_array_info[cid_post_ulp];
- cid_info->avlbl_cids++;
-
+ /* fill only in empty slot */
+ if (cid_info->cid_array[cid_info->cid_free] != BE_INVALID_CID) {
+ __beiscsi_log(phba, KERN_ERR,
+ "BS_%d : failed to put cid %u: available %u:%u\n",
+ cid, cid_info->avlbl_cids, cid_info->cid_free);
+ return;
+ }
cid_info->cid_array[cid_info->cid_free++] = cid;
if (cid_info->cid_free == BEISCSI_GET_CID_COUNT(phba, cid_post_ulp))
cid_info->cid_free = 0;
+ cid_info->avlbl_cids++;
}
/**
@@ -1037,8 +1038,8 @@ static void beiscsi_free_ep(struct beiscsi_endpoint *beiscsi_ep)
beiscsi_put_cid(phba, beiscsi_ep->ep_cid);
beiscsi_ep->phba = NULL;
- phba->ep_array[BE_GET_CRI_FROM_CID
- (beiscsi_ep->ep_cid)] = NULL;
+ /* clear this to track freeing in beiscsi_ep_disconnect */
+ phba->ep_array[BE_GET_CRI_FROM_CID(beiscsi_ep->ep_cid)] = NULL;
/**
* Check if any connection resource allocated by driver
@@ -1049,6 +1050,11 @@ static void beiscsi_free_ep(struct beiscsi_endpoint *beiscsi_ep)
return;
beiscsi_conn = beiscsi_ep->conn;
+ /**
+ * Break ep->conn link here so that completions after
+ * this are ignored.
+ */
+ beiscsi_ep->conn = NULL;
if (beiscsi_conn->login_in_progress) {
beiscsi_free_mgmt_task_handles(beiscsi_conn,
beiscsi_conn->task);
@@ -1079,7 +1085,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep,
"BS_%d : In beiscsi_open_conn\n");
beiscsi_ep->ep_cid = beiscsi_get_cid(phba);
- if (beiscsi_ep->ep_cid == 0xFFFF) {
+ if (beiscsi_ep->ep_cid == BE_INVALID_CID) {
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
"BS_%d : No free cid available\n");
return ret;
@@ -1285,26 +1291,6 @@ static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag)
}
/**
- * beiscsi_unbind_conn_to_cid - Unbind the beiscsi_conn from phba conn table
- * @phba: The phba instance
- * @cid: The cid to free
- */
-static int beiscsi_unbind_conn_to_cid(struct beiscsi_hba *phba,
- unsigned int cid)
-{
- uint16_t cri_index = BE_GET_CRI_FROM_CID(cid);
-
- if (phba->conn_table[cri_index])
- phba->conn_table[cri_index] = NULL;
- else {
- beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
- "BS_%d : Connection table Not occupied.\n");
- return -EINVAL;
- }
- return 0;
-}
-
-/**
* beiscsi_ep_disconnect - Tears down the TCP connection
* @ep: endpoint to be used
*
@@ -1318,13 +1304,23 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)
unsigned int tag;
uint8_t mgmt_invalidate_flag, tcp_upload_flag;
unsigned short savecfg_flag = CMD_ISCSI_SESSION_SAVE_CFG_ON_FLASH;
+ uint16_t cri_index;
beiscsi_ep = ep->dd_data;
phba = beiscsi_ep->phba;
beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
- "BS_%d : In beiscsi_ep_disconnect for ep_cid = %d\n",
+ "BS_%d : In beiscsi_ep_disconnect for ep_cid = %u\n",
beiscsi_ep->ep_cid);
+ cri_index = BE_GET_CRI_FROM_CID(beiscsi_ep->ep_cid);
+ if (!phba->ep_array[cri_index]) {
+ __beiscsi_log(phba, KERN_ERR,
+ "BS_%d : ep_array at %u cid %u empty\n",
+ cri_index,
+ beiscsi_ep->ep_cid);
+ return;
+ }
+
if (beiscsi_ep->conn) {
beiscsi_conn = beiscsi_ep->conn;
iscsi_suspend_queue(beiscsi_conn->conn);
@@ -1356,7 +1352,12 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)
free_ep:
msleep(BEISCSI_LOGOUT_SYNC_DELAY);
beiscsi_free_ep(beiscsi_ep);
- beiscsi_unbind_conn_to_cid(phba, beiscsi_ep->ep_cid);
+ if (!phba->conn_table[cri_index])
+ __beiscsi_log(phba, KERN_ERR,
+ "BS_%d : conn_table empty at %u: cid %u\n",
+ cri_index,
+ beiscsi_ep->ep_cid);
+ phba->conn_table[cri_index] = NULL;
iscsi_destroy_endpoint(beiscsi_ep->openiscsi_ep);
}
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index d9239c2d49b1..741cc96379cb 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -4085,9 +4085,10 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)
}
/* Allocate memory for CID array */
- ptr_cid_info->cid_array = kzalloc(sizeof(void *) *
- BEISCSI_GET_CID_COUNT(phba,
- ulp_num), GFP_KERNEL);
+ ptr_cid_info->cid_array =
+ kcalloc(BEISCSI_GET_CID_COUNT(phba, ulp_num),
+ sizeof(*ptr_cid_info->cid_array),
+ GFP_KERNEL);
if (!ptr_cid_info->cid_array) {
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
"BM_%d : Failed to allocate memory"
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 6376657e45f7..02d00ab6d981 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -358,6 +358,7 @@ struct beiscsi_hba {
unsigned int age;
struct list_head hba_queue;
#define BE_MAX_SESSION 2048
+#define BE_INVALID_CID 0xffff
#define BE_SET_CID_TO_CRI(cri_index, cid) \
(phba->cid_to_cri_map[cid] = cri_index)
#define BE_GET_CRI_FROM_CID(cid) (phba->cid_to_cri_map[cid])
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 16/96] ARM: dts: am335x-chilisom: Wakeup from RTC-only state by power on event
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (14 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 15/96] scsi: be2iscsi: Add checks to validate CID alloc/free Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 18/96] extcon: axp288: Use vbus-valid instead of -present to determine cable presence Levin, Alexander (Sasha Levin)
` (80 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Marcin Niestroj <m.niestroj@grinn-global.com>
[ Upstream commit ca244a83ecc7f0a9242ee2116e622cb6d7ec2a90 ]
On chiliSOM TPS65217 nWAKEUP pin is connected to AM335x internal RTC
EXT_WAKEUP input. In RTC-only state TPS65217 is notifying about power on
events (such as power buton presses) by setting nWAKEUP output
low. After that it waits 5s for proper device boot. Currently it doesn't
happen, as the processor doesn't listen for such events. Consequently
TPS65217 changes state from SLEEP (RTC-only state) to OFF.
Enable EXT_WAKEUP input of AM335x's RTC, so the processor can properly
detect power on events and recover immediately from RTC-only states,
without powering off RTC and losing time.
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/arm/boot/dts/am335x-chilisom.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-chilisom.dtsi b/arch/arm/boot/dts/am335x-chilisom.dtsi
index f9ee5859c154..1b43ebd08b38 100644
--- a/arch/arm/boot/dts/am335x-chilisom.dtsi
+++ b/arch/arm/boot/dts/am335x-chilisom.dtsi
@@ -124,6 +124,14 @@
&rtc {
system-power-controller;
+
+ pinctrl-0 = <&ext_wakeup>;
+ pinctrl-names = "default";
+
+ ext_wakeup: ext-wakeup {
+ pins = "ext_wakeup0";
+ input-enable;
+ };
};
/* NAND Flash */
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 18/96] extcon: axp288: Use vbus-valid instead of -present to determine cable presence
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (15 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 16/96] ARM: dts: am335x-chilisom: Wakeup from RTC-only state by power on event Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 19/96] reset: ti_syscon: fix a ti_syscon_reset_status issue Levin, Alexander (Sasha Levin)
` (79 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Hans de Goede <hdegoede@redhat.com>
[ Upstream commit 5757aca10146061befd168dab37fb0db1ccd8f73 ]
The vbus-present bit in the power status register also gets set to 1
when a usb-host cable (id-pin shorted to ground) is plugged in and a 5v
boost converter is supplying 5v to the otg usb bus.
This causes a "disconnect or unknown or ID event" warning in dmesg as
well as the extcon device to report the last detected charger cable
type as being connected even though none is connected.
This commit switches to checking the vbus-valid bit instead, which is
only 1 when both vbus is present and the vbus-path is enabled in the
vbus-path control register (the vbus-path gets disabled when a usb-host
cable is detected, to avoid the pmic drawing power from the 5v boost
converter).
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/extcon/extcon-axp288.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index 42f41e808292..27f67c28e700 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -168,7 +168,7 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
return ret;
}
- vbus_attach = (pwr_stat & PS_STAT_VBUS_PRESENT);
+ vbus_attach = (pwr_stat & PS_STAT_VBUS_VALID);
if (!vbus_attach)
goto notify_otg;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 19/96] reset: ti_syscon: fix a ti_syscon_reset_status issue
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (16 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 18/96] extcon: axp288: Use vbus-valid instead of -present to determine cable presence Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 17/96] igb: re-assign hw address pointer on reset after PCI error Levin, Alexander (Sasha Levin)
` (78 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Jiancheng Xue <xuejiancheng@hisilicon.com>
[ Upstream commit 5987b4bf512101137fa60c5c0ccac3db51541221 ]
If STATUS_SET was not set, ti_syscon_reset_status would always return 0
no matter whether the status_bit was set or not.
Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
Fixes: cc7c2bb1493c ("reset: add TI SYSCON based reset driver")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/reset/reset-ti-syscon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/reset/reset-ti-syscon.c b/drivers/reset/reset-ti-syscon.c
index 47f0ffd3b013..1799fd423901 100644
--- a/drivers/reset/reset-ti-syscon.c
+++ b/drivers/reset/reset-ti-syscon.c
@@ -154,8 +154,8 @@ static int ti_syscon_reset_status(struct reset_controller_dev *rcdev,
if (ret)
return ret;
- return (reset_state & BIT(control->status_bit)) &&
- (control->flags & STATUS_SET);
+ return !(reset_state & BIT(control->status_bit)) ==
+ !(control->flags & STATUS_SET);
}
static struct reset_control_ops ti_syscon_reset_ops = {
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 17/96] igb: re-assign hw address pointer on reset after PCI error
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (17 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 19/96] reset: ti_syscon: fix a ti_syscon_reset_status issue Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 21/96] clk/axs10x: Clear init field in driver probe Levin, Alexander (Sasha Levin)
` (77 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Guilherme G Piccoli <gpiccoli@linux.vnet.ibm.com>
[ Upstream commit 69b97cf6dbce7403845a28bbc75d57f5be7b12ac ]
Whenever the igb driver detects the result of a read operation returns
a value composed only by F's (like 0xFFFFFFFF), it will detach the
net_device, clear the hw_addr pointer and warn to the user that adapter's
link is lost - those steps happen on igb_rd32().
In case a PCI error happens on Power architecture, there's a recovery
mechanism called EEH, that will reset the PCI slot and call driver's
handlers to reset the adapter and network functionality as well.
We observed that once hw_addr is NULL after the error is detected on
igb_rd32(), it's never assigned back, so in the process of resetting
the network functionality we got a NULL pointer dereference in both
igb_configure_tx_ring() and igb_configure_rx_ring(). In order to avoid
such bug, this patch re-assigns the hw_addr value in the slot_reset
handler.
Reported-by: Anthony H Thai <ahthai@us.ibm.com>
Reported-by: Harsha Thyagaraja <hathyaga@in.ibm.com>
Signed-off-by: Guilherme G Piccoli <gpiccoli@linux.vnet.ibm.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 9affd7c198bd..6a62447fe377 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -7882,6 +7882,11 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
pci_enable_wake(pdev, PCI_D3hot, 0);
pci_enable_wake(pdev, PCI_D3cold, 0);
+ /* In case of PCI error, adapter lose its HW address
+ * so we should re-assign it here.
+ */
+ hw->hw_addr = adapter->io_addr;
+
igb_reset(adapter);
wr32(E1000_WUS, ~0);
result = PCI_ERS_RESULT_RECOVERED;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 21/96] clk/axs10x: Clear init field in driver probe
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (18 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 17/96] igb: re-assign hw address pointer on reset after PCI error Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 22/96] usb: make the MTK XHCI driver compile for older MIPS SoCs Levin, Alexander (Sasha Levin)
` (76 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Jose Abreu <Jose.Abreu@synopsys.com>
[ Upstream commit 6205406cf6f282d622f31de25036e6d1ab3a2ff5 ]
Init field must be cleared in driver probe as this structure is not
dinamically allocated. If not, wrong flags can be passed to core.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: Carlos Palminha <palminha@synopsys.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Fixes: 923587aafc2c ("clk/axs10x: Add I2S PLL clock driver")
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/040cc9afdfa0e95ce7a01c406ff427ef7dc0c0fd.1481540717.git.joabreu@synopsys.com
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/clk/axs10x/i2s_pll_clock.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/clk/axs10x/i2s_pll_clock.c b/drivers/clk/axs10x/i2s_pll_clock.c
index 411310d29581..02d3bcd6216c 100644
--- a/drivers/clk/axs10x/i2s_pll_clock.c
+++ b/drivers/clk/axs10x/i2s_pll_clock.c
@@ -182,6 +182,7 @@ static int i2s_pll_clk_probe(struct platform_device *pdev)
if (IS_ERR(pll_clk->base))
return PTR_ERR(pll_clk->base);
+ memset(&init, 0, sizeof(init));
clk_name = node->name;
init.name = clk_name;
init.ops = &i2s_pll_ops;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 22/96] usb: make the MTK XHCI driver compile for older MIPS SoCs
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (19 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 21/96] clk/axs10x: Clear init field in driver probe Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 20/96] sh_eth: use correct name for ECMR_MPDE bit Levin, Alexander (Sasha Levin)
` (75 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: John Crispin <john@phrozen.org>
[ Upstream commit 808cf33d4817c730008de9b2736b357708a3d7f6 ]
The MIPS based MT7621 shares the same XHCI core as the newer generation of
ARM based SoCs. The driver works out of the box and we only need to make it
buildable in Kconfig.
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/usb/host/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 0b80cee30da4..eb121b2a55d4 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -45,9 +45,9 @@ config USB_XHCI_PLATFORM
If unsure, say N.
config USB_XHCI_MTK
- tristate "xHCI support for Mediatek MT65xx"
+ tristate "xHCI support for Mediatek MT65xx/MT7621"
select MFD_SYSCON
- depends on ARCH_MEDIATEK || COMPILE_TEST
+ depends on (MIPS && SOC_MT7621) || ARCH_MEDIATEK || COMPILE_TEST
---help---
Say 'Y' to enable the support for the xHCI host controller
found in Mediatek MT65xx SoCs.
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 20/96] sh_eth: use correct name for ECMR_MPDE bit
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (20 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 22/96] usb: make the MTK XHCI driver compile for older MIPS SoCs Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 23/96] hwmon: (gl520sm) Fix overflows and crash seen when writing into limit attributes Levin, Alexander (Sasha Levin)
` (74 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
[ Upstream commit 6dcf45e514974a1ff10755015b5e06746a033e5f ]
This bit was wrongly named due to a typo, Sergei checked the SH7734/63
manuals and this bit should be named MPDE.
Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/ethernet/renesas/sh_eth.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index d050f37f3e0f..5024280f5af2 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -339,7 +339,7 @@ enum FELIC_MODE_BIT {
ECMR_DPAD = 0x00200000, ECMR_RZPF = 0x00100000,
ECMR_ZPF = 0x00080000, ECMR_PFR = 0x00040000, ECMR_RXF = 0x00020000,
ECMR_TXF = 0x00010000, ECMR_MCT = 0x00002000, ECMR_PRCEF = 0x00001000,
- ECMR_PMDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020,
+ ECMR_MPDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020,
ECMR_RTM = 0x00000010, ECMR_ILB = 0x00000008, ECMR_ELB = 0x00000004,
ECMR_DM = 0x00000002, ECMR_PRM = 0x00000001,
};
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 23/96] hwmon: (gl520sm) Fix overflows and crash seen when writing into limit attributes
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (21 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 20/96] sh_eth: use correct name for ECMR_MPDE bit Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 26/96] iio: adc: hx711: Add DT binding for avia,hx711 Levin, Alexander (Sasha Levin)
` (73 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Guenter Roeck <linux@roeck-us.net>
[ Upstream commit 87cdfa9d60f4f40e6d71b04b10b36d9df3c89282 ]
Writes into limit attributes can overflow due to multplications and
additions with unbound input values. Writing into fan limit attributes
can result in a crash with a division by zero if very large values are
written and the fan divider is larger than 1.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/hwmon/gl520sm.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index dee93ec87d02..84e0994aafdd 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -208,11 +208,13 @@ static ssize_t get_cpu_vid(struct device *dev, struct device_attribute *attr,
}
static DEVICE_ATTR(cpu0_vid, S_IRUGO, get_cpu_vid, NULL);
-#define VDD_FROM_REG(val) (((val) * 95 + 2) / 4)
-#define VDD_TO_REG(val) clamp_val((((val) * 4 + 47) / 95), 0, 255)
+#define VDD_FROM_REG(val) DIV_ROUND_CLOSEST((val) * 95, 4)
+#define VDD_CLAMP(val) clamp_val(val, 0, 255 * 95 / 4)
+#define VDD_TO_REG(val) DIV_ROUND_CLOSEST(VDD_CLAMP(val) * 4, 95)
-#define IN_FROM_REG(val) ((val) * 19)
-#define IN_TO_REG(val) clamp_val((((val) + 9) / 19), 0, 255)
+#define IN_FROM_REG(val) ((val) * 19)
+#define IN_CLAMP(val) clamp_val(val, 0, 255 * 19)
+#define IN_TO_REG(val) DIV_ROUND_CLOSEST(IN_CLAMP(val), 19)
static ssize_t get_in_input(struct device *dev, struct device_attribute *attr,
char *buf)
@@ -349,8 +351,13 @@ static SENSOR_DEVICE_ATTR(in4_max, S_IRUGO | S_IWUSR,
#define DIV_FROM_REG(val) (1 << (val))
#define FAN_FROM_REG(val, div) ((val) == 0 ? 0 : (480000 / ((val) << (div))))
-#define FAN_TO_REG(val, div) ((val) <= 0 ? 0 : \
- clamp_val((480000 + ((val) << ((div)-1))) / ((val) << (div)), 1, 255))
+
+#define FAN_BASE(div) (480000 >> (div))
+#define FAN_CLAMP(val, div) clamp_val(val, FAN_BASE(div) / 255, \
+ FAN_BASE(div))
+#define FAN_TO_REG(val, div) ((val) == 0 ? 0 : \
+ DIV_ROUND_CLOSEST(480000, \
+ FAN_CLAMP(val, div) << (div)))
static ssize_t get_fan_input(struct device *dev, struct device_attribute *attr,
char *buf)
@@ -513,9 +520,9 @@ static SENSOR_DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
static DEVICE_ATTR(fan1_off, S_IRUGO | S_IWUSR,
get_fan_off, set_fan_off);
-#define TEMP_FROM_REG(val) (((val) - 130) * 1000)
-#define TEMP_TO_REG(val) clamp_val(((((val) < 0 ? \
- (val) - 500 : (val) + 500) / 1000) + 130), 0, 255)
+#define TEMP_FROM_REG(val) (((val) - 130) * 1000)
+#define TEMP_CLAMP(val) clamp_val(val, -130000, 125000)
+#define TEMP_TO_REG(val) (DIV_ROUND_CLOSEST(TEMP_CLAMP(val), 1000) + 130)
static ssize_t get_temp_input(struct device *dev, struct device_attribute *attr,
char *buf)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 26/96] iio: adc: hx711: Add DT binding for avia,hx711
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (22 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 23/96] hwmon: (gl520sm) Fix overflows and crash seen when writing into limit attributes Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 24/96] iio: adc: imx25-gcq: Fix module autoload Levin, Alexander (Sasha Levin)
` (72 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Andreas Klinger <ak@it-klinger.de>
[ Upstream commit ff1293f67734da68e23fecb6ecdae7112b8c43f9 ]
Add DT bindings for avia,hx711
Add vendor avia to vendor list
Signed-off-by: Andreas Klinger <ak@it-klinger.de>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
.../devicetree/bindings/iio/adc/avia-hx711.txt | 18 ++++++++++++++++++
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
2 files changed, 19 insertions(+)
create mode 100644 Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
diff --git a/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt b/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
new file mode 100644
index 000000000000..b3629405f568
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
@@ -0,0 +1,18 @@
+* AVIA HX711 ADC chip for weight cells
+ Bit-banging driver
+
+Required properties:
+ - compatible: Should be "avia,hx711"
+ - sck-gpios: Definition of the GPIO for the clock
+ - dout-gpios: Definition of the GPIO for data-out
+ See Documentation/devicetree/bindings/gpio/gpio.txt
+ - avdd-supply: Definition of the regulator used as analog supply
+
+Example:
+weight@0 {
+ compatible = "avia,hx711";
+ sck-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;
+ dout-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+ avdd-suppy = <&avdd>;
+};
+
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index f0a48ea78659..bceffffb7502 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -38,6 +38,7 @@ atmel Atmel Corporation
auo AU Optronics Corporation
auvidea Auvidea GmbH
avago Avago Technologies
+avia avia semiconductor
avic Shanghai AVIC Optoelectronics Co., Ltd.
axis Axis Communications AB
boe BOE Technology Group Co., Ltd.
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 24/96] iio: adc: imx25-gcq: Fix module autoload
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (23 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 26/96] iio: adc: hx711: Add DT binding for avia,hx711 Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 27/96] IB/rxe: Add a runtime check in alloc_index() Levin, Alexander (Sasha Levin)
` (71 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Javier Martinez Canillas <javier@osg.samsung.com>
[ Upstream commit 8f0d7daf53972da0004f7a5a4d938c85333db300 ]
If the driver is built as a module, autoload won't work because the module
alias information is not filled. So user-space can't match the registered
device with the corresponding module.
Export the module alias information using the MODULE_DEVICE_TABLE() macro.
Before this patch:
$ modinfo drivers/iio/adc/fsl-imx25-gcq.ko | grep alias
$
After this patch:
$ modinfo drivers/iio/adc/fsl-imx25-gcq.ko | grep alias
alias: of:N*T*Cfsl,imx25-gcqC*
alias: of:N*T*Cfsl,imx25-gcq
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/iio/adc/fsl-imx25-gcq.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c
index 72b32c1ab257..ea264fa9e567 100644
--- a/drivers/iio/adc/fsl-imx25-gcq.c
+++ b/drivers/iio/adc/fsl-imx25-gcq.c
@@ -401,6 +401,7 @@ static const struct of_device_id mx25_gcq_ids[] = {
{ .compatible = "fsl,imx25-gcq", },
{ /* Sentinel */ }
};
+MODULE_DEVICE_TABLE(of, mx25_gcq_ids);
static struct platform_driver mx25_gcq_driver = {
.driver = {
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 27/96] IB/rxe: Add a runtime check in alloc_index()
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (24 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 24/96] iio: adc: imx25-gcq: Fix module autoload Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 25/96] iio: adc: axp288: Drop bogus AXP288_ADC_TS_PIN_CTRL register modifications Levin, Alexander (Sasha Levin)
` (70 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Bart Van Assche <bart.vanassche@sandisk.com>
[ Upstream commit 642c7cbcaf2ffc1e27f67eda3dc47347ac5aff37 ]
Since index values equal to or above 'range' can trigger memory
corruption, complain if index >= range.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Andrew Boyer <andrew.boyer@dell.com>
Cc: Moni Shoua <monis@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/infiniband/sw/rxe/rxe_pool.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
index 6bac0717c540..ee26a1b1b4ed 100644
--- a/drivers/infiniband/sw/rxe/rxe_pool.c
+++ b/drivers/infiniband/sw/rxe/rxe_pool.c
@@ -274,6 +274,7 @@ static u32 alloc_index(struct rxe_pool *pool)
if (index >= range)
index = find_first_zero_bit(pool->table, range);
+ WARN_ON_ONCE(index >= range);
set_bit(index, pool->table);
pool->last = index;
return index + pool->min_index;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 25/96] iio: adc: axp288: Drop bogus AXP288_ADC_TS_PIN_CTRL register modifications
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (25 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 27/96] IB/rxe: Add a runtime check in alloc_index() Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 29/96] ARM: 8635/1: nommu: allow enabling REMAP_VECTORS_TO_RAM Levin, Alexander (Sasha Levin)
` (69 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Hans de Goede <hdegoede@redhat.com>
[ Upstream commit fa2849e9649b5180ffc4cb3c3b005261c403093a ]
For some reason the axp288_adc driver was modifying the
AXP288_ADC_TS_PIN_CTRL register, changing bits 0-1 depending on
whether the GP_ADC channel or another channel was written.
These bits control when a bias current is send to the TS_PIN, the
GP_ADC has its own pin and a separate bit in another register to
control the bias current.
Not only does changing when to enable the TS_PIN bias current
(always or only when sampling) when reading the GP_ADC make no sense
at all, the code is modifying these bits is writing the entire register,
assuming that all the other bits have their default value.
So if the firmware has configured a different bias-current for either
pin, then that change gets clobbered by the write, likewise if the
firmware has set bit 2 to indicate that the battery has no thermal sensor,
this will get clobbered by the write.
This commit fixes all this, by simply removing all writes to the
AXP288_ADC_TS_PIN_CTRL register, they are not needed to read the
GP_ADC pin, and can actually be harmful.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/iio/adc/axp288_adc.c | 32 +-------------------------------
1 file changed, 1 insertion(+), 31 deletions(-)
diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c
index 7fd24949c0c1..64799ad7ebad 100644
--- a/drivers/iio/adc/axp288_adc.c
+++ b/drivers/iio/adc/axp288_adc.c
@@ -28,8 +28,6 @@
#include <linux/iio/driver.h>
#define AXP288_ADC_EN_MASK 0xF1
-#define AXP288_ADC_TS_PIN_GPADC 0xF2
-#define AXP288_ADC_TS_PIN_ON 0xF3
enum axp288_adc_id {
AXP288_ADC_TS,
@@ -123,16 +121,6 @@ static int axp288_adc_read_channel(int *val, unsigned long address,
return IIO_VAL_INT;
}
-static int axp288_adc_set_ts(struct regmap *regmap, unsigned int mode,
- unsigned long address)
-{
- /* channels other than GPADC do not need to switch TS pin */
- if (address != AXP288_GP_ADC_H)
- return 0;
-
- return regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL, mode);
-}
-
static int axp288_adc_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val, int *val2, long mask)
@@ -143,16 +131,7 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev,
mutex_lock(&indio_dev->mlock);
switch (mask) {
case IIO_CHAN_INFO_RAW:
- if (axp288_adc_set_ts(info->regmap, AXP288_ADC_TS_PIN_GPADC,
- chan->address)) {
- dev_err(&indio_dev->dev, "GPADC mode\n");
- ret = -EINVAL;
- break;
- }
ret = axp288_adc_read_channel(val, chan->address, info->regmap);
- if (axp288_adc_set_ts(info->regmap, AXP288_ADC_TS_PIN_ON,
- chan->address))
- dev_err(&indio_dev->dev, "TS pin restore\n");
break;
default:
ret = -EINVAL;
@@ -162,15 +141,6 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev,
return ret;
}
-static int axp288_adc_set_state(struct regmap *regmap)
-{
- /* ADC should be always enabled for internal FG to function */
- if (regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL, AXP288_ADC_TS_PIN_ON))
- return -EIO;
-
- return regmap_write(regmap, AXP20X_ADC_EN1, AXP288_ADC_EN_MASK);
-}
-
static const struct iio_info axp288_adc_iio_info = {
.read_raw = &axp288_adc_read_raw,
.driver_module = THIS_MODULE,
@@ -199,7 +169,7 @@ static int axp288_adc_probe(struct platform_device *pdev)
* Set ADC to enabled state at all time, including system suspend.
* otherwise internal fuel gauge functionality may be affected.
*/
- ret = axp288_adc_set_state(axp20x->regmap);
+ ret = regmap_write(info->regmap, AXP20X_ADC_EN1, AXP288_ADC_EN_MASK);
if (ret) {
dev_err(&pdev->dev, "unable to enable ADC device\n");
return ret;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 29/96] ARM: 8635/1: nommu: allow enabling REMAP_VECTORS_TO_RAM
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (26 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 25/96] iio: adc: axp288: Drop bogus AXP288_ADC_TS_PIN_CTRL register modifications Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 28/96] IB/rxe: Fix a MR reference leak in check_rkey() Levin, Alexander (Sasha Levin)
` (68 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Afzal Mohammed <afzal.mohd.ma@gmail.com>
[ Upstream commit 8a792e9afbce84a0fdaf213fe42bb97382487094 ]
REMAP_VECTORS_TO_RAM depends on DRAM_BASE, but since DRAM_BASE is a
hex, REMAP_VECTORS_TO_RAM could never get enabled. Also depending on
DRAM_BASE is redundant as whenever REMAP_VECTORS_TO_RAM makes itself
available to Kconfig, DRAM_BASE also is available as the Kconfig
gets sourced on !MMU.
Signed-off-by: Afzal Mohammed <afzal.mohd.ma@gmail.com>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/arm/Kconfig-nommu | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu
index aed66d5df7f1..b7576349528c 100644
--- a/arch/arm/Kconfig-nommu
+++ b/arch/arm/Kconfig-nommu
@@ -34,8 +34,7 @@ config PROCESSOR_ID
used instead of the auto-probing which utilizes the register.
config REMAP_VECTORS_TO_RAM
- bool 'Install vectors to the beginning of RAM' if DRAM_BASE
- depends on DRAM_BASE
+ bool 'Install vectors to the beginning of RAM'
help
The kernel needs to change the hardware exception vectors.
In nommu mode, the hardware exception vectors are normally
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 28/96] IB/rxe: Fix a MR reference leak in check_rkey()
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (27 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 29/96] ARM: 8635/1: nommu: allow enabling REMAP_VECTORS_TO_RAM Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 31/96] serial: 8250: moxa: Store num_ports in brd Levin, Alexander (Sasha Levin)
` (67 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Bart Van Assche <bart.vanassche@sandisk.com>
[ Upstream commit b3a459961014b14c267544c327db033669493295 ]
Avoid that calling check_rkey() for mem->state == RXE_MEM_STATE_FREE
triggers an MR reference leak.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Andrew Boyer <andrew.boyer@dell.com>
Cc: Moni Shoua <monis@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/infiniband/sw/rxe/rxe_resp.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c
index ccf624763565..69ed4e0d7a0d 100644
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@ -418,7 +418,7 @@ static enum resp_states check_length(struct rxe_qp *qp,
static enum resp_states check_rkey(struct rxe_qp *qp,
struct rxe_pkt_info *pkt)
{
- struct rxe_mem *mem;
+ struct rxe_mem *mem = NULL;
u64 va;
u32 rkey;
u32 resid;
@@ -452,38 +452,38 @@ static enum resp_states check_rkey(struct rxe_qp *qp,
mem = lookup_mem(qp->pd, access, rkey, lookup_remote);
if (!mem) {
state = RESPST_ERR_RKEY_VIOLATION;
- goto err1;
+ goto err;
}
if (unlikely(mem->state == RXE_MEM_STATE_FREE)) {
state = RESPST_ERR_RKEY_VIOLATION;
- goto err1;
+ goto err;
}
if (mem_check_range(mem, va, resid)) {
state = RESPST_ERR_RKEY_VIOLATION;
- goto err2;
+ goto err;
}
if (pkt->mask & RXE_WRITE_MASK) {
if (resid > mtu) {
if (pktlen != mtu || bth_pad(pkt)) {
state = RESPST_ERR_LENGTH;
- goto err2;
+ goto err;
}
qp->resp.resid = mtu;
} else {
if (pktlen != resid) {
state = RESPST_ERR_LENGTH;
- goto err2;
+ goto err;
}
if ((bth_pad(pkt) != (0x3 & (-resid)))) {
/* This case may not be exactly that
* but nothing else fits.
*/
state = RESPST_ERR_LENGTH;
- goto err2;
+ goto err;
}
}
}
@@ -493,9 +493,9 @@ static enum resp_states check_rkey(struct rxe_qp *qp,
qp->resp.mr = mem;
return RESPST_EXECUTE;
-err2:
- rxe_drop_ref(mem);
-err1:
+err:
+ if (mem)
+ rxe_drop_ref(mem);
return state;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 31/96] serial: 8250: moxa: Store num_ports in brd
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (28 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 28/96] IB/rxe: Fix a MR reference leak in check_rkey() Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 30/96] drm/i915/psr: disable psr2 for resolution greater than 32X20 Levin, Alexander (Sasha Levin)
` (66 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: "Matwey V. Kornilov" <matwey@sai.msu.ru>
[ Upstream commit 9c4b60fe5313c125b1bf68ef04b0010512c27f2d ]
When struct moxa8250_board is allocated, then num_ports should
be initialized in order to use it later in moxa8250_remove.
Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/tty/serial/8250/8250_moxa.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/tty/serial/8250/8250_moxa.c b/drivers/tty/serial/8250/8250_moxa.c
index 26eb5393a263..d5069b2d4d79 100644
--- a/drivers/tty/serial/8250/8250_moxa.c
+++ b/drivers/tty/serial/8250/8250_moxa.c
@@ -68,6 +68,7 @@ static int moxa8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)
sizeof(unsigned int) * nr_ports, GFP_KERNEL);
if (!brd)
return -ENOMEM;
+ brd->num_ports = nr_ports;
memset(&uart, 0, sizeof(struct uart_8250_port));
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 30/96] drm/i915/psr: disable psr2 for resolution greater than 32X20
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (29 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 31/96] serial: 8250: moxa: Store num_ports in brd Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 34/96] IB/ipoib: Fix deadlock over vlan_mutex Levin, Alexander (Sasha Levin)
` (65 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: "Nagaraju, Vathsala" <vathsala.nagaraju@intel.com>
[ Upstream commit acf45d11050abd751dcec986ab121cb2367dcbba ]
PSR2 is restricted to work with panel resolutions upto 3200x2000,
move the check to intel_psr_match_conditions and fully block psr.
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jim Bride <jim.bride@linux.intel.com>
Suggested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1484031746-20874-1-git-send-email-vathsala.nagaraju@intel.com
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/gpu/drm/i915/intel_psr.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 9b307cee3008..dff478498f05 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -387,6 +387,13 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
return false;
}
+ /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
+ if (intel_crtc->config->pipe_src_w > 3200 ||
+ intel_crtc->config->pipe_src_h > 2000) {
+ dev_priv->psr.psr2_support = false;
+ return false;
+ }
+
dev_priv->psr.source_ok = true;
return true;
}
@@ -425,7 +432,6 @@ void intel_psr_enable(struct intel_dp *intel_dp)
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
struct drm_device *dev = intel_dig_port->base.base.dev;
struct drm_i915_private *dev_priv = to_i915(dev);
- struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc);
if (!HAS_PSR(dev)) {
DRM_DEBUG_KMS("PSR not supported on this platform\n");
@@ -452,12 +458,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)
hsw_psr_setup_vsc(intel_dp);
if (dev_priv->psr.psr2_support) {
- /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
- if (crtc->config->pipe_src_w > 3200 ||
- crtc->config->pipe_src_h > 2000)
- dev_priv->psr.psr2_support = false;
- else
- skl_psr_setup_su_vsc(intel_dp);
+ skl_psr_setup_su_vsc(intel_dp);
}
/*
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 34/96] IB/ipoib: Fix deadlock over vlan_mutex
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (30 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 30/96] drm/i915/psr: disable psr2 for resolution greater than 32X20 Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 33/96] serial: 8250_port: Remove dangerous pr_debug() Levin, Alexander (Sasha Levin)
` (64 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Feras Daoud <ferasda@mellanox.com>
[ Upstream commit 1c3098cdb05207e740715857df7b0998e372f527 ]
This patch fixes Deadlock while executing ipoib_vlan_delete.
The function takes the vlan_rwsem semaphore and calls
unregister_netdevice. The later function calls
ipoib_mcast_stop_thread that cause workqueue flush.
When the queue has one of the ipoib_ib_dev_flush_xxx events,
a deadlock occur because these events also tries to catch the
same vlan_rwsem semaphore.
To fix, unregister_netdevice should be called after releasing
the semaphore.
Fixes: cbbe1efa4972 ("IPoIB: Fix deadlock between ipoib_open() and child interface create")
Signed-off-by: Feras Daoud <ferasda@mellanox.com>
Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Reviewed-by: Alex Vesker <valex@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 57eadd2b7a71..8151d1a6acb1 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -193,7 +193,6 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
if (priv->pkey == pkey &&
priv->child_type == IPOIB_LEGACY_CHILD) {
- unregister_netdevice(priv->dev);
list_del(&priv->list);
dev = priv->dev;
break;
@@ -201,6 +200,11 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
}
up_write(&ppriv->vlan_rwsem);
+ if (dev) {
+ ipoib_dbg(ppriv, "delete child vlan %s\n", dev->name);
+ unregister_netdevice(dev);
+ }
+
rtnl_unlock();
if (dev) {
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 33/96] serial: 8250_port: Remove dangerous pr_debug()
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (31 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 34/96] IB/ipoib: Fix deadlock over vlan_mutex Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 32/96] tty: goldfish: Fix a parameter of a call to free_irq Levin, Alexander (Sasha Levin)
` (63 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
[ Upstream commit 699a11ba7ec869b006623182881f2f1f5b4aea53 ]
With CONFIG_DYNAMIC_DEBUG if dyndbg enables debug output in
8250_port.c deadlock happens inevitably on UART IRQ handling.
That's the problematic execution path:
---------------------------->8------------------------
UART IRQ:
serial8250_interrupt() ->
serial8250_handle_irq(): lock "port->lock" ->
pr_debug() ->
serial8250_console_write(): bump in locked "port->lock".
OR (if above pr_debug() gets removed):
serial8250_tx_chars() ->
pr_debug() ->
serial8250_console_write(): bump in locked "port->lock".
---------------------------->8------------------------
So let's get rid of those not that much useful debug entries.
Discussed problem could be easily reproduced with QEMU for x86_64.
As well as this fix could be mimicked with muting of dynamic debug for
the problematic lines as simple as:
---------------------------->8------------------------
dyndbg="+p; file 8250_port.c line 1756 -p; file 8250_port.c line 1822 -p"
---------------------------->8------------------------
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: Phillip Raffeck <phillip.raffeck@fau.de>
Cc: Anton Wuerfel <anton.wuerfel@fau.de>
Cc: "Matwey V. Kornilov" <matwey@sai.msu.ru>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
Cc: Thor Thayer <tthayer@opensource.altera.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/tty/serial/8250/8250_port.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index f24d3030b98c..1ef31e3ee4a1 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1751,8 +1751,6 @@ void serial8250_tx_chars(struct uart_8250_port *up)
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_write_wakeup(port);
- pr_debug("%s: THRE\n", __func__);
-
/*
* With RPM enabled, we have to wait until the FIFO is empty before the
* HW can go idle. So we get here once again with empty FIFO and disable
@@ -1817,8 +1815,6 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
status = serial_port_in(port, UART_LSR);
- pr_debug("%s: status = %x\n", __func__, status);
-
if (status & (UART_LSR_DR | UART_LSR_BI)) {
if (!up->dma || handle_rx_dma(up, iir))
status = serial8250_rx_chars(up, status);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 32/96] tty: goldfish: Fix a parameter of a call to free_irq
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (32 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 33/96] serial: 8250_port: Remove dangerous pr_debug() Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 35/96] IB/ipoib: rtnl_unlock can not come after free_netdev Levin, Alexander (Sasha Levin)
` (62 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
[ Upstream commit 1a5c2d1de7d35f5eb9793266237903348989502b ]
'request_irq()' and 'free_irq()' should be called with the same dev_id.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/tty/goldfish.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index 3fc912373adf..996bd473dd03 100644
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -300,7 +300,7 @@ static int goldfish_tty_probe(struct platform_device *pdev)
return 0;
err_tty_register_device_failed:
- free_irq(irq, pdev);
+ free_irq(irq, qtty);
err_request_irq_failed:
goldfish_tty_current_line_count--;
if (goldfish_tty_current_line_count == 0)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 35/96] IB/ipoib: rtnl_unlock can not come after free_netdev
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (33 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 32/96] tty: goldfish: Fix a parameter of a call to free_irq Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 37/96] arm: dts: mt2701: Add subsystem clock controller device nodes Levin, Alexander (Sasha Levin)
` (61 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Feras Daoud <ferasda@mellanox.com>
[ Upstream commit 89a3987ab7a923c047c6dec008e60ad6f41fac22 ]
The ipoib_vlan_add function calls rtnl_unlock after free_netdev,
rtnl_unlock not only releases the lock, but also calls netdev_run_todo.
The latter function browses the net_todo_list array and completes the
unregistration of all its net_device instances. If we call free_netdev
before rtnl_unlock, then netdev_run_todo call over the freed device causes
panic.
To fix, move rtnl_unlock call before free_netdev call.
Fixes: 9baa0b036410 ("IB/ipoib: Add rtnl_link_ops support")
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Feras Daoud <ferasda@mellanox.com>
Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 8151d1a6acb1..93b50be14438 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -165,11 +165,11 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
out:
up_write(&ppriv->vlan_rwsem);
+ rtnl_unlock();
+
if (result)
free_netdev(priv->dev);
- rtnl_unlock();
-
return result;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 37/96] arm: dts: mt2701: Add subsystem clock controller device nodes
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (34 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 35/96] IB/ipoib: rtnl_unlock can not come after free_netdev Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 38/96] drm/amdkfd: fix improper return value on error Levin, Alexander (Sasha Levin)
` (60 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: James Liao <jamesjj.liao@mediatek.com>
[ Upstream commit f235c7e7a75325f28a33559a71f25a0eca6112db ]
Add MT2701 subsystem clock controllers, inlcude mmsys, imgsys,
vdecsys, hifsys, ethsys and bdpsys.
Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/arm/boot/dts/mt2701.dtsi | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
index 18596a2c58a1..77c6b931dc24 100644
--- a/arch/arm/boot/dts/mt2701.dtsi
+++ b/arch/arm/boot/dts/mt2701.dtsi
@@ -174,4 +174,40 @@
clocks = <&uart_clk>;
status = "disabled";
};
+
+ mmsys: syscon@14000000 {
+ compatible = "mediatek,mt2701-mmsys", "syscon";
+ reg = <0 0x14000000 0 0x1000>;
+ #clock-cells = <1>;
+ };
+
+ imgsys: syscon@15000000 {
+ compatible = "mediatek,mt2701-imgsys", "syscon";
+ reg = <0 0x15000000 0 0x1000>;
+ #clock-cells = <1>;
+ };
+
+ vdecsys: syscon@16000000 {
+ compatible = "mediatek,mt2701-vdecsys", "syscon";
+ reg = <0 0x16000000 0 0x1000>;
+ #clock-cells = <1>;
+ };
+
+ hifsys: syscon@1a000000 {
+ compatible = "mediatek,mt2701-hifsys", "syscon";
+ reg = <0 0x1a000000 0 0x1000>;
+ #clock-cells = <1>;
+ };
+
+ ethsys: syscon@1b000000 {
+ compatible = "mediatek,mt2701-ethsys", "syscon";
+ reg = <0 0x1b000000 0 0x1000>;
+ #clock-cells = <1>;
+ };
+
+ bdpsys: syscon@1c000000 {
+ compatible = "mediatek,mt2701-bdpsys", "syscon";
+ reg = <0 0x1c000000 0 0x1000>;
+ #clock-cells = <1>;
+ };
};
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 38/96] drm/amdkfd: fix improper return value on error
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (35 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 37/96] arm: dts: mt2701: Add subsystem clock controller device nodes Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 39/96] USB: serial: mos7720: fix control-message error handling Levin, Alexander (Sasha Levin)
` (59 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Pan Bian <bianpan2016@163.com>
[ Upstream commit 8bf793883da213864efc50c274d2b38ec0ca58b2 ]
In function kfd_wait_on_events(), when the call to copy_from_user()
fails, the value of return variable ret is 0. 0 indicates success, which
is inconsistent with the execution status. This patch fixes the bug by
assigning "-EFAULT" to ret when copy_from_user() returns an unexpected
value.
Signed-off-by: Pan Bian <bianpan2016@163.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
index a6a4b2b1c0d9..6a3470f84998 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
@@ -739,8 +739,10 @@ int kfd_wait_on_events(struct kfd_process *p,
struct kfd_event_data event_data;
if (copy_from_user(&event_data, &events[i],
- sizeof(struct kfd_event_data)))
+ sizeof(struct kfd_event_data))) {
+ ret = -EFAULT;
goto fail;
+ }
ret = init_event_waiter(p, &event_waiters[i],
event_data.event_id, i);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 39/96] USB: serial: mos7720: fix control-message error handling
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (36 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 38/96] drm/amdkfd: fix improper return value on error Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 36/96] IB/ipoib: Replace list_del of the neigh->list with list_del_init Levin, Alexander (Sasha Levin)
` (58 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Johan Hovold <johan@kernel.org>
[ Upstream commit 0d130367abf582e7cbf60075c2a7ab53817b1d14 ]
Make sure to log an error on short transfers when reading a device
register.
Also clear the provided buffer (which if often an uninitialised
automatic variable) on errors as the driver currently does not bother to
check for errors.
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/usb/serial/mos7720.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 136ff5e1b7c1..135eb04368f9 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -234,11 +234,16 @@ static int read_mos_reg(struct usb_serial *serial, unsigned int serial_portnum,
status = usb_control_msg(usbdev, pipe, request, requesttype, value,
index, buf, 1, MOS_WDR_TIMEOUT);
- if (status == 1)
+ if (status == 1) {
*data = *buf;
- else if (status < 0)
+ } else {
dev_err(&usbdev->dev,
"mos7720: usb_control_msg() failed: %d\n", status);
+ if (status >= 0)
+ status = -EIO;
+ *data = 0;
+ }
+
kfree(buf);
return status;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 36/96] IB/ipoib: Replace list_del of the neigh->list with list_del_init
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (37 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 39/96] USB: serial: mos7720: fix control-message error handling Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 44/96] ASoC: dapm: handle probe deferrals Levin, Alexander (Sasha Levin)
` (57 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Feras Daoud <ferasda@mellanox.com>
[ Upstream commit c586071d1dc8227a7182179b8e50ee92cc43f6d2 ]
In order to resolve a situation where a few process delete
the same list element in sequence and cause panic, list_del
is replaced with list_del_init. In this case if the first
process that calls list_del releases the lock before acquiring
it again, other processes who can acquire the lock will call
list_del_init.
Fixes: b63b70d87741 ("IPoIB: Use a private hash table for path lookup")
Signed-off-by: Feras Daoud <ferasda@mellanox.com>
Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Reviewed-by: Alex Vesker <valex@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 08c4b0287304..183db0cd849e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1302,7 +1302,7 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv)
rcu_dereference_protected(neigh->hnext,
lockdep_is_held(&priv->lock)));
/* remove from path/mc list */
- list_del(&neigh->list);
+ list_del_init(&neigh->list);
call_rcu(&neigh->rcu, ipoib_neigh_reclaim);
} else {
np = &neigh->hnext;
@@ -1466,7 +1466,7 @@ void ipoib_neigh_free(struct ipoib_neigh *neigh)
rcu_dereference_protected(neigh->hnext,
lockdep_is_held(&priv->lock)));
/* remove from parent list */
- list_del(&neigh->list);
+ list_del_init(&neigh->list);
call_rcu(&neigh->rcu, ipoib_neigh_reclaim);
return;
} else {
@@ -1551,7 +1551,7 @@ void ipoib_del_neighs_by_gid(struct net_device *dev, u8 *gid)
rcu_dereference_protected(neigh->hnext,
lockdep_is_held(&priv->lock)));
/* remove from parent list */
- list_del(&neigh->list);
+ list_del_init(&neigh->list);
call_rcu(&neigh->rcu, ipoib_neigh_reclaim);
} else {
np = &neigh->hnext;
@@ -1593,7 +1593,7 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv)
rcu_dereference_protected(neigh->hnext,
lockdep_is_held(&priv->lock)));
/* remove from path/mc list */
- list_del(&neigh->list);
+ list_del_init(&neigh->list);
call_rcu(&neigh->rcu, ipoib_neigh_reclaim);
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 44/96] ASoC: dapm: handle probe deferrals
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (38 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 36/96] IB/ipoib: Replace list_del of the neigh->list with list_del_init Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 41/96] sfc: get PIO buffer size from the NIC Levin, Alexander (Sasha Levin)
` (56 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Linus Walleij <linus.walleij@linaro.org>
[ Upstream commit 37e1df8c95e2c8a57c77eafc097648f6e40a60ff ]
This starts to handle probe deferrals on regulators and clocks
on the ASoC DAPM.
I came to this patch after audio stopped working on Ux500 ages
ago and I finally looked into it to see what is wrong. I had
messages like this in the console since a while back:
ab8500-codec.0: ASoC: Failed to request audioclk: -517
ab8500-codec.0: ASoC: Failed to create DAPM control audioclk
ab8500-codec.0: Failed to create new controls -12
snd-soc-mop500.0: ASoC: failed to instantiate card -12
snd-soc-mop500.0: Error: snd_soc_register_card failed (-12)!
snd-soc-mop500: probe of snd-soc-mop500.0 failed with error -12
Apparently because the widget table for the codec looks like
this (sound/soc/codecs/ab8500-codec.c):
static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = {
/* Clocks */
SND_SOC_DAPM_CLOCK_SUPPLY("audioclk"),
/* Regulators */
SND_SOC_DAPM_REGULATOR_SUPPLY("V-AUD", 0, 0),
SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC1", 0, 0),
SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC2", 0, 0),
SND_SOC_DAPM_REGULATOR_SUPPLY("V-DMIC", 0, 0),
So when we call snd_soc_register_codec() and any of these widgets
get a deferred probe we do not get an -EPROBE_DEFER (-517) back as
we should and instead we just fail. Apparently the code assumes
that clocks and regulators must be available at this point and
not defer.
After this patch it rather looks like this:
ab8500-codec.0: Failed to create new controls -517
snd-soc-mop500.0: ASoC: failed to instantiate card -517
snd-soc-mop500.0: Error: snd_soc_register_card failed (-517)!
(...)
abx500-clk.0: registered clocks for ab850x
snd-soc-mop500.0: ab8500-codec-dai.0 <-> ux500-msp-i2s.1 mapping ok
snd-soc-mop500.0: ab8500-codec-dai.1 <-> ux500-msp-i2s.3 mapping ok
I'm pretty happy about the patch as it it, but I'm a bit
uncertain on how to proceed: there are a lot of users of the
external functions snd_soc_dapm_new_control() (111 sites)
and that will now return an occassional error pointer, which
is not handled in the calling sites.
I want an indication from the maintainers whether I should just
go in and augment all these call sites, or if deferred probe
is frowned upon when it leads to this much overhead.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
sound/soc/soc-dapm.c | 42 ++++++++++++++++++++++++++++++++++++++++++
sound/soc/soc-topology.c | 9 +++++++++
2 files changed, 51 insertions(+)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 3bbe32ee4630..411f7574dd0b 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -358,6 +358,10 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
snd_soc_dapm_new_control_unlocked(widget->dapm,
&template);
kfree(name);
+ if (IS_ERR(data->widget)) {
+ ret = PTR_ERR(data->widget);
+ goto err_data;
+ }
if (!data->widget) {
ret = -ENOMEM;
goto err_data;
@@ -392,6 +396,10 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
data->widget = snd_soc_dapm_new_control_unlocked(
widget->dapm, &template);
kfree(name);
+ if (IS_ERR(data->widget)) {
+ ret = PTR_ERR(data->widget);
+ goto err_data;
+ }
if (!data->widget) {
ret = -ENOMEM;
goto err_data;
@@ -3311,11 +3319,22 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
w = snd_soc_dapm_new_control_unlocked(dapm, widget);
+ /* Do not nag about probe deferrals */
+ if (IS_ERR(w)) {
+ int ret = PTR_ERR(w);
+
+ if (ret != -EPROBE_DEFER)
+ dev_err(dapm->dev,
+ "ASoC: Failed to create DAPM control %s (%d)\n",
+ widget->name, ret);
+ goto out_unlock;
+ }
if (!w)
dev_err(dapm->dev,
"ASoC: Failed to create DAPM control %s\n",
widget->name);
+out_unlock:
mutex_unlock(&dapm->card->dapm_mutex);
return w;
}
@@ -3338,6 +3357,8 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
w->regulator = devm_regulator_get(dapm->dev, w->name);
if (IS_ERR(w->regulator)) {
ret = PTR_ERR(w->regulator);
+ if (ret == -EPROBE_DEFER)
+ return ERR_PTR(ret);
dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n",
w->name, ret);
return NULL;
@@ -3356,6 +3377,8 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
w->clk = devm_clk_get(dapm->dev, w->name);
if (IS_ERR(w->clk)) {
ret = PTR_ERR(w->clk);
+ if (ret == -EPROBE_DEFER)
+ return ERR_PTR(ret);
dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n",
w->name, ret);
return NULL;
@@ -3474,6 +3497,16 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);
for (i = 0; i < num; i++) {
w = snd_soc_dapm_new_control_unlocked(dapm, widget);
+ if (IS_ERR(w)) {
+ ret = PTR_ERR(w);
+ /* Do not nag about probe deferrals */
+ if (ret == -EPROBE_DEFER)
+ break;
+ dev_err(dapm->dev,
+ "ASoC: Failed to create DAPM control %s (%d)\n",
+ widget->name, ret);
+ break;
+ }
if (!w) {
dev_err(dapm->dev,
"ASoC: Failed to create DAPM control %s\n",
@@ -3750,6 +3783,15 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name);
w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template);
+ if (IS_ERR(w)) {
+ ret = PTR_ERR(w);
+ /* Do not nag about probe deferrals */
+ if (ret != -EPROBE_DEFER)
+ dev_err(card->dev,
+ "ASoC: Failed to create %s widget (%d)\n",
+ link_name, ret);
+ goto outfree_kcontrol_news;
+ }
if (!w) {
dev_err(card->dev, "ASoC: Failed to create %s widget\n",
link_name);
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 6b05047a4134..8a758c994506 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1473,6 +1473,15 @@ widget:
widget = snd_soc_dapm_new_control(dapm, &template);
else
widget = snd_soc_dapm_new_control_unlocked(dapm, &template);
+ if (IS_ERR(widget)) {
+ ret = PTR_ERR(widget);
+ /* Do not nag about probe deferrals */
+ if (ret != -EPROBE_DEFER)
+ dev_err(tplg->dev,
+ "ASoC: failed to create widget %s controls (%d)\n",
+ w->name, ret);
+ goto hdr_err;
+ }
if (widget == NULL) {
dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n",
w->name);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 41/96] sfc: get PIO buffer size from the NIC
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (39 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 44/96] ASoC: dapm: handle probe deferrals Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 43/96] partitions/efi: Fix integer overflow in GPT size calculation Levin, Alexander (Sasha Levin)
` (55 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Edward Cree <ecree@solarflare.com>
[ Upstream commit c634700f7eec3c0da46e299cd0a0ae8b594f9b55 ]
The 8000 series SFC NICs have 4K PIO buffers, rather than the 2K of
the 7000 series. Rather than having a hard-coded PIO buffer size
(ER_DZ_TX_PIOBUF_SIZE), read it from the GET_CAPABILITIES_V2 MCDI
response.
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/ethernet/sfc/ef10.c | 16 ++++++++++------
drivers/net/ethernet/sfc/nic.h | 2 ++
drivers/net/ethernet/sfc/tx.c | 1 -
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index c4ada7227f40..1d85109cb8ed 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -197,11 +197,15 @@ static int efx_ef10_init_datapath_caps(struct efx_nic *efx)
nic_data->datapath_caps =
MCDI_DWORD(outbuf, GET_CAPABILITIES_OUT_FLAGS1);
- if (outlen >= MC_CMD_GET_CAPABILITIES_V2_OUT_LEN)
+ if (outlen >= MC_CMD_GET_CAPABILITIES_V2_OUT_LEN) {
nic_data->datapath_caps2 = MCDI_DWORD(outbuf,
GET_CAPABILITIES_V2_OUT_FLAGS2);
- else
+ nic_data->piobuf_size = MCDI_WORD(outbuf,
+ GET_CAPABILITIES_V2_OUT_SIZE_PIO_BUFF);
+ } else {
nic_data->datapath_caps2 = 0;
+ nic_data->piobuf_size = ER_DZ_TX_PIOBUF_SIZE;
+ }
/* record the DPCPU firmware IDs to determine VEB vswitching support.
*/
@@ -825,8 +829,8 @@ static int efx_ef10_link_piobufs(struct efx_nic *efx)
offset = ((efx->tx_channel_offset + efx->n_tx_channels -
tx_queue->channel->channel - 1) *
efx_piobuf_size);
- index = offset / ER_DZ_TX_PIOBUF_SIZE;
- offset = offset % ER_DZ_TX_PIOBUF_SIZE;
+ index = offset / nic_data->piobuf_size;
+ offset = offset % nic_data->piobuf_size;
/* When the host page size is 4K, the first
* host page in the WC mapping may be within
@@ -1161,11 +1165,11 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx)
* functions of the controller.
*/
if (efx_piobuf_size != 0 &&
- ER_DZ_TX_PIOBUF_SIZE / efx_piobuf_size * EF10_TX_PIOBUF_COUNT >=
+ nic_data->piobuf_size / efx_piobuf_size * EF10_TX_PIOBUF_COUNT >=
efx->n_tx_channels) {
unsigned int n_piobufs =
DIV_ROUND_UP(efx->n_tx_channels,
- ER_DZ_TX_PIOBUF_SIZE / efx_piobuf_size);
+ nic_data->piobuf_size / efx_piobuf_size);
rc = efx_ef10_alloc_piobufs(efx, n_piobufs);
if (rc)
diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
index 73bee7ea332a..73028f21a2d7 100644
--- a/drivers/net/ethernet/sfc/nic.h
+++ b/drivers/net/ethernet/sfc/nic.h
@@ -500,6 +500,7 @@ enum {
* @pio_write_base: Base address for writing PIO buffers
* @pio_write_vi_base: Relative VI number for @pio_write_base
* @piobuf_handle: Handle of each PIO buffer allocated
+ * @piobuf_size: size of a single PIO buffer
* @must_restore_piobufs: Flag: PIO buffers have yet to be restored after MC
* reboot
* @rx_rss_context: Firmware handle for our RSS context
@@ -537,6 +538,7 @@ struct efx_ef10_nic_data {
void __iomem *wc_membase, *pio_write_base;
unsigned int pio_write_vi_base;
unsigned int piobuf_handle[EF10_TX_PIOBUF_COUNT];
+ u16 piobuf_size;
bool must_restore_piobufs;
u32 rx_rss_context;
bool rx_rss_context_exclusive;
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index 233778911557..6f26acd0aa61 100644
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -27,7 +27,6 @@
#ifdef EFX_USE_PIO
-#define EFX_PIOBUF_SIZE_MAX ER_DZ_TX_PIOBUF_SIZE
#define EFX_PIOBUF_SIZE_DEF ALIGN(256, L1_CACHE_BYTES)
unsigned int efx_piobuf_size __read_mostly = EFX_PIOBUF_SIZE_DEF;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 43/96] partitions/efi: Fix integer overflow in GPT size calculation
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (40 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 41/96] sfc: get PIO buffer size from the NIC Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 40/96] USB: serial: mos7840: fix control-message error handling Levin, Alexander (Sasha Levin)
` (54 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Alden Tondettar <alden.tondettar@gmail.com>
[ Upstream commit c5082b70adfe8e1ea1cf4a8eff92c9f260e364d2 ]
If a GUID Partition Table claims to have more than 2**25 entries, the
calculation of the partition table size in alloc_read_gpt_entries() will
overflow a 32-bit integer and not enough space will be allocated for the
table.
Nothing seems to get written out of bounds, but later efi_partition() will
read up to 32768 bytes from a 128 byte buffer, possibly OOPSing or exposing
information to /proc/partitions and uevents.
The problem exists on both 64-bit and 32-bit platforms.
Fix the overflow and also print a meaningful debug message if the table
size is too large.
Signed-off-by: Alden Tondettar <alden.tondettar@gmail.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
block/partitions/efi.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index bcd86e5cd546..39f70d968754 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -293,7 +293,7 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
if (!gpt)
return NULL;
- count = le32_to_cpu(gpt->num_partition_entries) *
+ count = (size_t)le32_to_cpu(gpt->num_partition_entries) *
le32_to_cpu(gpt->sizeof_partition_entry);
if (!count)
return NULL;
@@ -352,7 +352,7 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba,
gpt_header **gpt, gpt_entry **ptes)
{
u32 crc, origcrc;
- u64 lastlba;
+ u64 lastlba, pt_size;
if (!ptes)
return 0;
@@ -434,13 +434,20 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba,
goto fail;
}
+ /* Sanity check partition table size */
+ pt_size = (u64)le32_to_cpu((*gpt)->num_partition_entries) *
+ le32_to_cpu((*gpt)->sizeof_partition_entry);
+ if (pt_size > KMALLOC_MAX_SIZE) {
+ pr_debug("GUID Partition Table is too large: %llu > %lu bytes\n",
+ (unsigned long long)pt_size, KMALLOC_MAX_SIZE);
+ goto fail;
+ }
+
if (!(*ptes = alloc_read_gpt_entries(state, *gpt)))
goto fail;
/* Check the GUID Partition Entry Array CRC */
- crc = efi_crc32((const unsigned char *) (*ptes),
- le32_to_cpu((*gpt)->num_partition_entries) *
- le32_to_cpu((*gpt)->sizeof_partition_entry));
+ crc = efi_crc32((const unsigned char *) (*ptes), pt_size);
if (crc != le32_to_cpu((*gpt)->partition_entry_array_crc32)) {
pr_debug("GUID Partition Entry Array CRC check failed.\n");
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 40/96] USB: serial: mos7840: fix control-message error handling
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (41 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 43/96] partitions/efi: Fix integer overflow in GPT size calculation Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 42/96] pinctrl: mvebu: Use seq_puts() in mvebu_pinconf_group_dbg_show() Levin, Alexander (Sasha Levin)
` (53 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Johan Hovold <johan@kernel.org>
[ Upstream commit cd8db057e93ddaacbec025b567490555d2bca280 ]
Make sure to detect short transfers when reading a device register.
The modem-status handling had sufficient error checks in place, but move
handling of short transfers into the register accessor function itself
for consistency.
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/usb/serial/mos7840.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 5c4fc3abf6a7..6baacf64b21e 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -285,9 +285,15 @@ static int mos7840_get_reg_sync(struct usb_serial_port *port, __u16 reg,
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), MCS_RDREQ,
MCS_RD_RTYPE, 0, reg, buf, VENDOR_READ_LENGTH,
MOS_WDR_TIMEOUT);
+ if (ret < VENDOR_READ_LENGTH) {
+ if (ret >= 0)
+ ret = -EIO;
+ goto out;
+ }
+
*val = buf[0];
dev_dbg(&port->dev, "%s offset is %x, return val %x\n", __func__, reg, *val);
-
+out:
kfree(buf);
return ret;
}
@@ -353,8 +359,13 @@ static int mos7840_get_uart_reg(struct usb_serial_port *port, __u16 reg,
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), MCS_RDREQ,
MCS_RD_RTYPE, Wval, reg, buf, VENDOR_READ_LENGTH,
MOS_WDR_TIMEOUT);
+ if (ret < VENDOR_READ_LENGTH) {
+ if (ret >= 0)
+ ret = -EIO;
+ goto out;
+ }
*val = buf[0];
-
+out:
kfree(buf);
return ret;
}
@@ -1490,10 +1501,10 @@ static int mos7840_tiocmget(struct tty_struct *tty)
return -ENODEV;
status = mos7840_get_uart_reg(port, MODEM_STATUS_REGISTER, &msr);
- if (status != 1)
+ if (status < 0)
return -EIO;
status = mos7840_get_uart_reg(port, MODEM_CONTROL_REGISTER, &mcr);
- if (status != 1)
+ if (status < 0)
return -EIO;
result = ((mcr & MCR_DTR) ? TIOCM_DTR : 0)
| ((mcr & MCR_RTS) ? TIOCM_RTS : 0)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 42/96] pinctrl: mvebu: Use seq_puts() in mvebu_pinconf_group_dbg_show()
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (42 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 40/96] USB: serial: mos7840: fix control-message error handling Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 45/96] audit: log 32-bit socketcalls Levin, Alexander (Sasha Levin)
` (52 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Markus Elfring <elfring@users.sourceforge.net>
[ Upstream commit 420dc61642920849d824a0de2aa853db59f5244f ]
Strings which did not contain data format specifications should be put
into a sequence. Thus use the corresponding function "seq_puts".
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/pinctrl/mvebu/pinctrl-mvebu.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index b6ec6db78351..ac8a2ab9b35e 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -195,11 +195,12 @@ static void mvebu_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,
seq_printf(s, "o");
seq_printf(s, ")");
}
- } else
- seq_printf(s, "current: UNKNOWN");
+ } else {
+ seq_puts(s, "current: UNKNOWN");
+ }
if (grp->num_settings > 1) {
- seq_printf(s, ", available = [");
+ seq_puts(s, ", available = [");
for (n = 0; n < grp->num_settings; n++) {
if (curr == &grp->settings[n])
continue;
@@ -222,7 +223,7 @@ static void mvebu_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,
seq_printf(s, ")");
}
}
- seq_printf(s, " ]");
+ seq_puts(s, " ]");
}
return;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 45/96] audit: log 32-bit socketcalls
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (43 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 42/96] pinctrl: mvebu: Use seq_puts() in mvebu_pinconf_group_dbg_show() Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 47/96] spi: pxa2xx: Add support for Intel Gemini Lake Levin, Alexander (Sasha Levin)
` (51 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Richard Guy Briggs <rgb@redhat.com>
[ Upstream commit 62bc306e2083436675e33b5bdeb6a77907d35971 ]
32-bit socketcalls were not being logged by audit on x86_64 systems.
Log them. This is basically a duplicate of the call from
net/socket.c:sys_socketcall(), but it addresses the impedance mismatch
between 32-bit userspace process and 64-bit kernel audit.
See: https://github.com/linux-audit/audit-kernel/issues/14
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
include/linux/audit.h | 20 ++++++++++++++++++++
net/compat.c | 17 ++++++++++++++---
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 9d4443f93db6..2be99b276d29 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -387,6 +387,20 @@ static inline int audit_socketcall(int nargs, unsigned long *args)
return __audit_socketcall(nargs, args);
return 0;
}
+
+static inline int audit_socketcall_compat(int nargs, u32 *args)
+{
+ unsigned long a[AUDITSC_ARGS];
+ int i;
+
+ if (audit_dummy_context())
+ return 0;
+
+ for (i = 0; i < nargs; i++)
+ a[i] = (unsigned long)args[i];
+ return __audit_socketcall(nargs, a);
+}
+
static inline int audit_sockaddr(int len, void *addr)
{
if (unlikely(!audit_dummy_context()))
@@ -513,6 +527,12 @@ static inline int audit_socketcall(int nargs, unsigned long *args)
{
return 0;
}
+
+static inline int audit_socketcall_compat(int nargs, u32 *args)
+{
+ return 0;
+}
+
static inline void audit_fd_pair(int fd1, int fd2)
{ }
static inline int audit_sockaddr(int len, void *addr)
diff --git a/net/compat.c b/net/compat.c
index 1cd2ec046164..a96fd2f3507b 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -22,6 +22,7 @@
#include <linux/filter.h>
#include <linux/compat.h>
#include <linux/security.h>
+#include <linux/audit.h>
#include <linux/export.h>
#include <net/scm.h>
@@ -781,14 +782,24 @@ COMPAT_SYSCALL_DEFINE5(recvmmsg, int, fd, struct compat_mmsghdr __user *, mmsg,
COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
{
- int ret;
- u32 a[6];
+ u32 a[AUDITSC_ARGS];
+ unsigned int len;
u32 a0, a1;
+ int ret;
if (call < SYS_SOCKET || call > SYS_SENDMMSG)
return -EINVAL;
- if (copy_from_user(a, args, nas[call]))
+ len = nas[call];
+ if (len > sizeof(a))
+ return -EINVAL;
+
+ if (copy_from_user(a, args, len))
return -EFAULT;
+
+ ret = audit_socketcall_compat(len / sizeof(a[0]), a);
+ if (ret)
+ return ret;
+
a0 = a[0];
a1 = a[1];
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 47/96] spi: pxa2xx: Add support for Intel Gemini Lake
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (44 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 45/96] audit: log 32-bit socketcalls Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 46/96] ath10k: prevent sta pointer rcu violation Levin, Alexander (Sasha Levin)
` (50 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: "David E. Box" <david.e.box@linux.intel.com>
[ Upstream commit e18a80acd1365e91e3efcd69942d9073936cf851 ]
Gemini Lake reuses the same LPSS SPI configuration as Broxton
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/spi/spi-pxa2xx.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index d6239fa718be..3f3751e2b521 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1458,6 +1458,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {
{ PCI_VDEVICE(INTEL, 0x1ac2), LPSS_BXT_SSP },
{ PCI_VDEVICE(INTEL, 0x1ac4), LPSS_BXT_SSP },
{ PCI_VDEVICE(INTEL, 0x1ac6), LPSS_BXT_SSP },
+ /* GLK */
+ { PCI_VDEVICE(INTEL, 0x31c2), LPSS_BXT_SSP },
+ { PCI_VDEVICE(INTEL, 0x31c4), LPSS_BXT_SSP },
+ { PCI_VDEVICE(INTEL, 0x31c6), LPSS_BXT_SSP },
/* APL */
{ PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP },
{ PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP },
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 46/96] ath10k: prevent sta pointer rcu violation
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (45 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 47/96] spi: pxa2xx: Add support for Intel Gemini Lake Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 48/96] iommu/arm-smmu: Set privileged attribute to 'default' instead of 'unprivileged' Levin, Alexander (Sasha Levin)
` (49 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Michal Kazior <michal.kazior@tieto.com>
[ Upstream commit 0a744d927406389e00687560d9ce3c5ab0e58db9 ]
Station pointers are RCU protected so driver must
be extra careful if it tries to store them
internally for later use outside of the RCU
section it obtained it in.
It was possible for station teardown to race with
some htt events. The possible outcome could be a
use-after-free and a crash.
Only peer-flow-control capable firmware was
affected (so hardware-wise qca99x0 and qca4019).
This could be done in sta_state() itself via
explicit synchronize_net() call but there's
already a convenient sta_pre_rcu_remove() op that
can be hooked up to avoid extra rcu stall.
The peer->sta pointer itself can't be set to
NULL/ERR_PTR because it is later used in
sta_state() for extra sanity checks.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/wireless/ath/ath10k/core.h | 1 +
drivers/net/wireless/ath/ath10k/mac.c | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index be5b527472f9..90c0c4a7175d 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -314,6 +314,7 @@ struct ath10k_peer {
struct ieee80211_vif *vif;
struct ieee80211_sta *sta;
+ bool removed;
int vdev_id;
u8 addr[ETH_ALEN];
DECLARE_BITMAP(peer_ids, ATH10K_MAX_NUM_PEER_IDS);
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index f2e85eb22afe..30e98afa2e68 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3738,6 +3738,9 @@ struct ieee80211_txq *ath10k_mac_txq_lookup(struct ath10k *ar,
if (!peer)
return NULL;
+ if (peer->removed)
+ return NULL;
+
if (peer->sta)
return peer->sta->txq[tid];
else if (peer->vif)
@@ -7422,6 +7425,20 @@ ath10k_mac_op_switch_vif_chanctx(struct ieee80211_hw *hw,
return 0;
}
+static void ath10k_mac_op_sta_pre_rcu_remove(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta)
+{
+ struct ath10k *ar;
+ struct ath10k_peer *peer;
+
+ ar = hw->priv;
+
+ list_for_each_entry(peer, &ar->peers, list)
+ if (peer->sta == sta)
+ peer->removed = true;
+}
+
static const struct ieee80211_ops ath10k_ops = {
.tx = ath10k_mac_op_tx,
.wake_tx_queue = ath10k_mac_op_wake_tx_queue,
@@ -7462,6 +7479,7 @@ static const struct ieee80211_ops ath10k_ops = {
.assign_vif_chanctx = ath10k_mac_op_assign_vif_chanctx,
.unassign_vif_chanctx = ath10k_mac_op_unassign_vif_chanctx,
.switch_vif_chanctx = ath10k_mac_op_switch_vif_chanctx,
+ .sta_pre_rcu_remove = ath10k_mac_op_sta_pre_rcu_remove,
CFG80211_TESTMODE_CMD(ath10k_tm_cmd)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 48/96] iommu/arm-smmu: Set privileged attribute to 'default' instead of 'unprivileged'
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (46 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 46/96] ath10k: prevent sta pointer rcu violation Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 51/96] ASoC: dapm: fix some pointer error handling Levin, Alexander (Sasha Levin)
` (48 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Sricharan R <sricharan@codeaurora.org>
[ Upstream commit e19898077cfb642fe151ba22981e795c74d9e114 ]
Currently the driver sets all the device transactions privileges
to UNPRIVILEGED, but there are cases where the iommu masters wants
to isolate privileged supervisor and unprivileged user.
So don't override the privileged setting to unprivileged, instead
set it to default as incoming and let it be controlled by the pagetable
settings.
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/iommu/arm-smmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 8f7281444551..5a9a4416f467 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1211,7 +1211,7 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain,
continue;
s2cr[idx].type = type;
- s2cr[idx].privcfg = S2CR_PRIVCFG_UNPRIV;
+ s2cr[idx].privcfg = S2CR_PRIVCFG_DEFAULT;
s2cr[idx].cbndx = cbndx;
arm_smmu_write_s2cr(smmu, idx);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 51/96] ASoC: dapm: fix some pointer error handling
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (47 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 48/96] iommu/arm-smmu: Set privileged attribute to 'default' instead of 'unprivileged' Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 52/96] drm: mali-dp: Fix destination size handling when rotating Levin, Alexander (Sasha Levin)
` (47 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Linus Walleij <linus.walleij@linaro.org>
[ Upstream commit 639467c8f26d834c934215e8b59129ce442475fe ]
commit 66feeec9322132689d42723df2537d60f96f8e44
"RFC: ASoC: dapm: handle probe deferrals"
forgot a to update some two sites where the call
was used. The static codechecks quickly found them.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 66feeec93221 ("RFC: ASoC: dapm: handle probe deferrals")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
sound/soc/soc-dapm.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 411f7574dd0b..6780eba55ec2 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3843,6 +3843,16 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
template.name);
w = snd_soc_dapm_new_control_unlocked(dapm, &template);
+ if (IS_ERR(w)) {
+ int ret = PTR_ERR(w);
+
+ /* Do not nag about probe deferrals */
+ if (ret != -EPROBE_DEFER)
+ dev_err(dapm->dev,
+ "ASoC: Failed to create %s widget (%d)\n",
+ dai->driver->playback.stream_name, ret);
+ return ret;
+ }
if (!w) {
dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",
dai->driver->playback.stream_name);
@@ -3862,6 +3872,16 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
template.name);
w = snd_soc_dapm_new_control_unlocked(dapm, &template);
+ if (IS_ERR(w)) {
+ int ret = PTR_ERR(w);
+
+ /* Do not nag about probe deferrals */
+ if (ret != -EPROBE_DEFER)
+ dev_err(dapm->dev,
+ "ASoC: Failed to create %s widget (%d)\n",
+ dai->driver->playback.stream_name, ret);
+ return ret;
+ }
if (!w) {
dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",
dai->driver->capture.stream_name);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 52/96] drm: mali-dp: Fix destination size handling when rotating
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (48 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 51/96] ASoC: dapm: fix some pointer error handling Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 49/96] usb: chipidea: vbus event may exist before starting gadget Levin, Alexander (Sasha Levin)
` (46 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Brian Starkey <brian.starkey@arm.com>
[ Upstream commit edabb3c4cd2d035bc93a3d67b25a304ea6217301 ]
The destination rectangle provided by userspace in the CRTC_X/Y/W/H
properties is already expressed as the dimensions after rotation.
This means we shouldn't swap the width and height ourselves when a
90/270 degree rotation is requested, so remove the code doing the swap.
Fixes: ad49f8602fe8 ("drm/arm: Add support for Mali Display Processors")
Signed-off-by: Brian Starkey <brian.starkey@arm.com>
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/gpu/drm/arm/malidp_planes.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 82c193e5e0d6..a6bdd91d6c9e 100644
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -150,13 +150,8 @@ static void malidp_de_plane_update(struct drm_plane *plane,
/* convert src values from Q16 fixed point to integer */
src_w = plane->state->src_w >> 16;
src_h = plane->state->src_h >> 16;
- if (plane->state->rotation & MALIDP_ROTATED_MASK) {
- dest_w = plane->state->crtc_h;
- dest_h = plane->state->crtc_w;
- } else {
- dest_w = plane->state->crtc_w;
- dest_h = plane->state->crtc_h;
- }
+ dest_w = plane->state->crtc_w;
+ dest_h = plane->state->crtc_h;
malidp_hw_write(mp->hwdev, format_id, mp->layer->base);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 49/96] usb: chipidea: vbus event may exist before starting gadget
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (49 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 52/96] drm: mali-dp: Fix destination size handling when rotating Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 50/96] rtl8xxxu: Add additional USB IDs for rtl8192eu devices Levin, Alexander (Sasha Levin)
` (45 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Peter Chen <peter.chen@nxp.com>
[ Upstream commit c3b674a04b8ab62a1d35e86714d466af0a0ecc18 ]
At some situations, the vbus may already be there before starting
gadget. So we need to check vbus event after switching to gadget in
order to handle missing vbus event. The typical use cases are plugging
vbus cable before driver load or the vbus has already been there
after stopping host but before starting gadget.
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Tested-by: Stephen Boyd <stephen.boyd@linaro.org>
Reported-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/usb/chipidea/otg.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
index 0cf149edddd8..f36a1ac3bfbd 100644
--- a/drivers/usb/chipidea/otg.c
+++ b/drivers/usb/chipidea/otg.c
@@ -134,9 +134,9 @@ void ci_handle_vbus_change(struct ci_hdrc *ci)
if (!ci->is_otg)
return;
- if (hw_read_otgsc(ci, OTGSC_BSV))
+ if (hw_read_otgsc(ci, OTGSC_BSV) && !ci->vbus_active)
usb_gadget_vbus_connect(&ci->gadget);
- else
+ else if (!hw_read_otgsc(ci, OTGSC_BSV) && ci->vbus_active)
usb_gadget_vbus_disconnect(&ci->gadget);
}
@@ -175,14 +175,21 @@ static void ci_handle_id_switch(struct ci_hdrc *ci)
ci_role_stop(ci);
- if (role == CI_ROLE_GADGET)
+ if (role == CI_ROLE_GADGET &&
+ IS_ERR(ci->platdata->vbus_extcon.edev))
/*
- * wait vbus lower than OTGSC_BSV before connecting
- * to host
+ * Wait vbus lower than OTGSC_BSV before connecting
+ * to host. If connecting status is from an external
+ * connector instead of register, we don't need to
+ * care vbus on the board, since it will not affect
+ * external connector status.
*/
hw_wait_vbus_lower_bsv(ci);
ci_role_start(ci, role);
+ /* vbus change may have already occurred */
+ if (role == CI_ROLE_GADGET)
+ ci_handle_vbus_change(ci);
}
}
/**
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 50/96] rtl8xxxu: Add additional USB IDs for rtl8192eu devices
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (50 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 49/96] usb: chipidea: vbus event may exist before starting gadget Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 53/96] drm: mali-dp: Fix transposed horizontal/vertical flip Levin, Alexander (Sasha Levin)
` (44 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Axel Köllhofer <AxelKoellhofer@web.de>
[ Upstream commit 5407fd7de69f3352aed659244d4bef18e3cabf5c ]
These IDs originate from the vendor driver
Signed-off-by: Axel Köllhofer <AxelKoellhofer@web.de>
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 82d949ede294..4e725d165aa6 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -6316,6 +6316,13 @@ static struct usb_device_id dev_table[] = {
.driver_info = (unsigned long)&rtl8192cu_fops},
{USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0x7822, 0xff, 0xff, 0xff),
.driver_info = (unsigned long)&rtl8192cu_fops},
+/* found in rtl8192eu vendor driver */
+{USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0107, 0xff, 0xff, 0xff),
+ .driver_info = (unsigned long)&rtl8192eu_fops},
+{USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0xab33, 0xff, 0xff, 0xff),
+ .driver_info = (unsigned long)&rtl8192eu_fops},
+{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x818c, 0xff, 0xff, 0xff),
+ .driver_info = (unsigned long)&rtl8192eu_fops},
#endif
{ }
};
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 53/96] drm: mali-dp: Fix transposed horizontal/vertical flip
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (51 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 50/96] rtl8xxxu: Add additional USB IDs for rtl8192eu devices Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 54/96] HID: wacom: release the resources before leaving despite devm Levin, Alexander (Sasha Levin)
` (43 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Brian Starkey <brian.starkey@arm.com>
[ Upstream commit 7916efe5b57505080b3cebf5bdb228b4eda008ea ]
The horizontal and vertical flip flags were the wrong way around,
causing reflect-x to result in reflect-y being applied and vice-versa.
Fix them.
Fixes: ad49f8602fe8 ("drm/arm: Add support for Mali Display Processors")
Signed-off-by: Brian Starkey <brian.starkey@arm.com>
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/gpu/drm/arm/malidp_planes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index a6bdd91d6c9e..afe0480d95c9 100644
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -184,9 +184,9 @@ static void malidp_de_plane_update(struct drm_plane *plane,
if (plane->state->rotation & DRM_ROTATE_MASK)
val = ilog2(plane->state->rotation & DRM_ROTATE_MASK) << LAYER_ROT_OFFSET;
if (plane->state->rotation & DRM_REFLECT_X)
- val |= LAYER_V_FLIP;
- if (plane->state->rotation & DRM_REFLECT_Y)
val |= LAYER_H_FLIP;
+ if (plane->state->rotation & DRM_REFLECT_Y)
+ val |= LAYER_V_FLIP;
/* set the 'enable layer' bit */
val |= LAYER_ENABLE;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 54/96] HID: wacom: release the resources before leaving despite devm
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (52 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 53/96] drm: mali-dp: Fix transposed horizontal/vertical flip Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 55/96] MIPS: Lantiq: Fix another request_mem_region() return code check Levin, Alexander (Sasha Levin)
` (42 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
[ Upstream commit 5b779fc52020ac6f5beea31c5eafc3d25cf70dc1 ]
In the general case, the resources are properly released by devm without
needing to do anything. However, when unplugging the wireless receiver,
the kernel segfaults from time to time while calling devres_release_all().
I think in that case the resources attempt to access hid_get_drvdata(hdev)
which has been set to null while leaving wacom_remove().
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/hid/wacom_sys.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 0c535d0f3b95..53ac19b3727a 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2433,6 +2433,8 @@ static void wacom_remove(struct hid_device *hdev)
if (hdev->bus == BUS_BLUETOOTH)
device_remove_file(&hdev->dev, &dev_attr_speed);
+ wacom_release_resources(wacom);
+
hid_set_drvdata(hdev, NULL);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 55/96] MIPS: Lantiq: Fix another request_mem_region() return code check
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (53 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 54/96] HID: wacom: release the resources before leaving despite devm Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 56/96] mips: ath79: clock:- Unmap region obtained by of_iomap Levin, Alexander (Sasha Levin)
` (41 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Arnd Bergmann <arnd@arndb.de>
[ Upstream commit 98ea51cb0c8ce009d9da1fd7b48f0ff1d7a9bbb0 ]
Hauke already fixed a couple of them, but one instance remains
that checks for a negative integer when it should check
for a NULL pointer:
arch/mips/lantiq/xway/sysctrl.c: In function 'ltq_soc_init':
arch/mips/lantiq/xway/sysctrl.c:473:19: error: ordered comparison of pointer with integer zero [-Werror=extra]
Fixes: 6e807852676a ("MIPS: Lantiq: Fix check for return value of request_mem_region()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: John Crispin <john@phrozen.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15043/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/lantiq/xway/sysctrl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
index 90565477dfbd..95bec460b651 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -469,8 +469,8 @@ void __init ltq_soc_init(void)
panic("Failed to load xbar nodes from devicetree");
if (of_address_to_resource(np_xbar, 0, &res_xbar))
panic("Failed to get xbar resources");
- if (request_mem_region(res_xbar.start, resource_size(&res_xbar),
- res_xbar.name) < 0)
+ if (!request_mem_region(res_xbar.start, resource_size(&res_xbar),
+ res_xbar.name))
panic("Failed to get xbar resources");
ltq_xbar_membase = ioremap_nocache(res_xbar.start,
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 56/96] mips: ath79: clock:- Unmap region obtained by of_iomap
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (54 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 55/96] MIPS: Lantiq: Fix another request_mem_region() return code check Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 58/96] net: core: Prevent from dereferencing null pointer when releasing SKB Levin, Alexander (Sasha Levin)
` (40 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Arvind Yadav <arvind.yadav.cs@gmail.com>
[ Upstream commit b3d91db3f71d5f70ea60d900425a3f96aeb3d065 ]
Free memory mapping, if ath79_clocks_init_dt_ng is not successful.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Fixes: 3bdf1071ba7d ("MIPS: ath79: update devicetree clock support for AR9132")
Cc: antonynpavlov@gmail.com
Cc: albeu@free.fr
Cc: hackpascal@gmail.com
Cc: sboyd@codeaurora.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14915/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/ath79/clock.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c
index cc3a1e33a600..7e2bb12b64ea 100644
--- a/arch/mips/ath79/clock.c
+++ b/arch/mips/ath79/clock.c
@@ -508,16 +508,19 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np)
ar9330_clk_init(ref_clk, pll_base);
else {
pr_err("%s: could not find any appropriate clk_init()\n", dnfn);
- goto err_clk;
+ goto err_iounmap;
}
if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) {
pr_err("%s: could not register clk provider\n", dnfn);
- goto err_clk;
+ goto err_iounmap;
}
return;
+err_iounmap:
+ iounmap(pll_base);
+
err_clk:
clk_put(ref_clk);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 58/96] net: core: Prevent from dereferencing null pointer when releasing SKB
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (55 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 56/96] mips: ath79: clock:- Unmap region obtained by of_iomap Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 59/96] net/packet: check length in getsockopt() called with PACKET_HDRLEN Levin, Alexander (Sasha Levin)
` (39 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Myungho Jung <mhjungk@gmail.com>
[ Upstream commit 9899886d5e8ec5b343b1efe44f185a0e68dc6454 ]
Added NULL check to make __dev_kfree_skb_irq consistent with kfree
family of functions.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=195289
Signed-off-by: Myungho Jung <mhjungk@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
net/core/dev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/core/dev.c b/net/core/dev.c
index ba7b8121a414..7f2caad46a3d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2355,6 +2355,9 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)
{
unsigned long flags;
+ if (unlikely(!skb))
+ return;
+
if (likely(atomic_read(&skb->users) == 1)) {
smp_rmb();
atomic_set(&skb->users, 0);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 59/96] net/packet: check length in getsockopt() called with PACKET_HDRLEN
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (56 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 58/96] net: core: Prevent from dereferencing null pointer when releasing SKB Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 57/96] lkdtm: Fix Oops when unloading the module Levin, Alexander (Sasha Levin)
` (38 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Alexander Potapenko <glider@google.com>
[ Upstream commit fd2c83b35752f0a8236b976978ad4658df14a59f ]
In the case getsockopt() is called with PACKET_HDRLEN and optlen < 4
|val| remains uninitialized and the syscall may behave differently
depending on its value, and even copy garbage to userspace on certain
architectures. To fix this we now return -EINVAL if optlen is too small.
This bug has been detected with KMSAN.
Signed-off-by: Alexander Potapenko <glider@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
net/packet/af_packet.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 35ba4b60d927..9c92c6cb6a4f 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3884,6 +3884,8 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
case PACKET_HDRLEN:
if (len > sizeof(int))
len = sizeof(int);
+ if (len < sizeof(int))
+ return -EINVAL;
if (copy_from_user(&val, optval, len))
return -EFAULT;
switch (val) {
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 57/96] lkdtm: Fix Oops when unloading the module
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (57 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 59/96] net/packet: check length in getsockopt() called with PACKET_HDRLEN Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 60/96] team: fix memory leaks Levin, Alexander (Sasha Levin)
` (37 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Juerg Haefliger <juerg.haefliger@hpe.com>
[ Upstream commit 9ba60573638e2006170ebcc5489fb1e068afbc8f ]
No jprobe is registered when the module is loaded without specifying a
crashpoint that uses a jprobe. At the moment, we unconditionally try to
unregister the jprobe on module unload which results in an Oops. Add a
check to fix this.
Signed-off-by: Juerg Haefliger <juerg.haefliger@hpe.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/misc/lkdtm_core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/lkdtm_core.c b/drivers/misc/lkdtm_core.c
index f9154b8d67f6..b2989f2d3126 100644
--- a/drivers/misc/lkdtm_core.c
+++ b/drivers/misc/lkdtm_core.c
@@ -533,7 +533,9 @@ static void __exit lkdtm_module_exit(void)
/* Handle test-specific clean-up. */
lkdtm_usercopy_exit();
- unregister_jprobe(lkdtm_jprobe);
+ if (lkdtm_jprobe != NULL)
+ unregister_jprobe(lkdtm_jprobe);
+
pr_info("Crash point unregistered\n");
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 60/96] team: fix memory leaks
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (58 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 57/96] lkdtm: Fix Oops when unloading the module Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 61/96] usb: plusb: Add support for PL-27A1 Levin, Alexander (Sasha Levin)
` (36 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Pan Bian <bianpan2016@163.com>
[ Upstream commit 72ec0bc64b9a5d8e0efcb717abfc757746b101b7 ]
In functions team_nl_send_port_list_get() and
team_nl_send_options_get(), pointer skb keeps the return value of
nlmsg_new(). When the call to genlmsg_put() fails, the memory is not
freed(). This will result in memory leak bugs.
Fixes: 9b00cf2d1024 ("team: implement multipart netlink messages for options transfers")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/team/team.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index a380649bf6b5..26681707fc7a 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2366,8 +2366,10 @@ start_again:
hdr = genlmsg_put(skb, portid, seq, &team_nl_family, flags | NLM_F_MULTI,
TEAM_CMD_OPTIONS_GET);
- if (!hdr)
+ if (!hdr) {
+ nlmsg_free(skb);
return -EMSGSIZE;
+ }
if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex))
goto nla_put_failure;
@@ -2639,8 +2641,10 @@ start_again:
hdr = genlmsg_put(skb, portid, seq, &team_nl_family, flags | NLM_F_MULTI,
TEAM_CMD_PORT_LIST_GET);
- if (!hdr)
+ if (!hdr) {
+ nlmsg_free(skb);
return -EMSGSIZE;
+ }
if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex))
goto nla_put_failure;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 61/96] usb: plusb: Add support for PL-27A1
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (59 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 60/96] team: fix memory leaks Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 65/96] mmc: sdio: fix alignment issue in struct sdio_func Levin, Alexander (Sasha Levin)
` (35 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Roman Spychała <roed@onet.eu>
[ Upstream commit 6f2aee0c0de65013333bbc26fe50c9c7b09a37f7 ]
This patch adds support for the PL-27A1 by adding the appropriate
USB ID's. This chip is used in the goobay Active USB 3.0 Data Link
and Unitek Y-3501 cables.
Signed-off-by: Roman Spychała <roed@onet.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/usb/Kconfig | 2 +-
drivers/net/usb/plusb.c | 15 +++++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index cdde59089f72..3a7286256db0 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -364,7 +364,7 @@ config USB_NET_NET1080
optionally with LEDs that indicate traffic
config USB_NET_PLUSB
- tristate "Prolific PL-2301/2302/25A1 based cables"
+ tristate "Prolific PL-2301/2302/25A1/27A1 based cables"
# if the handshake/init/reset problems, from original 'plusb',
# are ever resolved ... then remove "experimental"
depends on USB_USBNET
diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c
index 22e1a9a99a7d..6fe59373cba9 100644
--- a/drivers/net/usb/plusb.c
+++ b/drivers/net/usb/plusb.c
@@ -102,7 +102,7 @@ static int pl_reset(struct usbnet *dev)
}
static const struct driver_info prolific_info = {
- .description = "Prolific PL-2301/PL-2302/PL-25A1",
+ .description = "Prolific PL-2301/PL-2302/PL-25A1/PL-27A1",
.flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT,
/* some PL-2302 versions seem to fail usb_set_interface() */
.reset = pl_reset,
@@ -139,6 +139,17 @@ static const struct usb_device_id products [] = {
* Host-to-Host Cable
*/
.driver_info = (unsigned long) &prolific_info,
+
+},
+
+/* super speed cables */
+{
+ USB_DEVICE(0x067b, 0x27a1), /* PL-27A1, no eeprom
+ * also: goobay Active USB 3.0
+ * Data Link,
+ * Unitek Y-3501
+ */
+ .driver_info = (unsigned long) &prolific_info,
},
{ }, // END
@@ -158,5 +169,5 @@ static struct usb_driver plusb_driver = {
module_usb_driver(plusb_driver);
MODULE_AUTHOR("David Brownell");
-MODULE_DESCRIPTION("Prolific PL-2301/2302/25A1 USB Host to Host Link Driver");
+MODULE_DESCRIPTION("Prolific PL-2301/2302/25A1/27A1 USB Host to Host Link Driver");
MODULE_LICENSE("GPL");
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 65/96] mmc: sdio: fix alignment issue in struct sdio_func
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (60 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 61/96] usb: plusb: Add support for PL-27A1 Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 63/96] net: dsa: b53: Include IMP/CPU port in dumb forwarding mode Levin, Alexander (Sasha Levin)
` (34 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Heiner Kallweit <hkallweit1@gmail.com>
[ Upstream commit 5ef1ecf060f28ecef313b5723f1fd39bf5a35f56 ]
Certain 64-bit systems (e.g. Amlogic Meson GX) require buffers to be
used for DMA to be 8-byte-aligned. struct sdio_func has an embedded
small DMA buffer not meeting this requirement.
When testing switching to descriptor chain mode in meson-gx driver
SDIO is broken therefore. Fix this by allocating the small DMA buffer
separately as kmalloc ensures that the returned memory area is
properly aligned for every basic data type.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Tested-by: Helmut Klein <hgkr.klein@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/mmc/core/sdio_bus.c | 12 +++++++++++-
include/linux/mmc/sdio_func.h | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 86f5b3223aae..d56a3b6c2fb9 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -266,7 +266,7 @@ static void sdio_release_func(struct device *dev)
sdio_free_func_cis(func);
kfree(func->info);
-
+ kfree(func->tmpbuf);
kfree(func);
}
@@ -281,6 +281,16 @@ struct sdio_func *sdio_alloc_func(struct mmc_card *card)
if (!func)
return ERR_PTR(-ENOMEM);
+ /*
+ * allocate buffer separately to make sure it's properly aligned for
+ * DMA usage (incl. 64 bit DMA)
+ */
+ func->tmpbuf = kmalloc(4, GFP_KERNEL);
+ if (!func->tmpbuf) {
+ kfree(func);
+ return ERR_PTR(-ENOMEM);
+ }
+
func->card = card;
device_initialize(&func->dev);
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index aab032a6ae61..97ca105347a6 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -53,7 +53,7 @@ struct sdio_func {
unsigned int state; /* function state */
#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */
- u8 tmpbuf[4]; /* DMA:able scratch buffer */
+ u8 *tmpbuf; /* DMA:able scratch buffer */
unsigned num_info; /* number of info strings */
const char **info; /* info strings */
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 63/96] net: dsa: b53: Include IMP/CPU port in dumb forwarding mode
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (61 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 65/96] mmc: sdio: fix alignment issue in struct sdio_func Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 62/96] udp: disable inner UDP checksum offloads in IPsec case Levin, Alexander (Sasha Levin)
` (33 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Florian Fainelli <f.fainelli@gmail.com>
[ Upstream commit a424f0de61638cbb5047e0a888c54da9cf471f90 ]
Since Broadcom tags are not enabled in b53 (DSA_PROTO_TAG_NONE), we need
to make sure that the IMP/CPU port is included in the forwarding
decision.
Without this change, switching between non-management ports would work,
but not between management ports and non-management ports thus breaking
the default state in which DSA switch are brought up.
Fixes: 967dd82ffc52 ("net: dsa: b53: Add support for Broadcom RoboSwitch")
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/dsa/b53/b53_common.c | 10 ++++++++++
drivers/net/dsa/b53/b53_regs.h | 4 ++++
2 files changed, 14 insertions(+)
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 3ec573c13dac..c26debc531ee 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -326,6 +326,7 @@ static void b53_get_vlan_entry(struct b53_device *dev, u16 vid,
static void b53_set_forwarding(struct b53_device *dev, int enable)
{
+ struct dsa_switch *ds = dev->ds;
u8 mgmt;
b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &mgmt);
@@ -336,6 +337,15 @@ static void b53_set_forwarding(struct b53_device *dev, int enable)
mgmt &= ~SM_SW_FWD_EN;
b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);
+
+ /* Include IMP port in dumb forwarding mode when no tagging protocol is
+ * set
+ */
+ if (ds->ops->get_tag_protocol(ds) == DSA_TAG_PROTO_NONE) {
+ b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt);
+ mgmt |= B53_MII_DUMB_FWDG_EN;
+ b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);
+ }
}
static void b53_enable_vlan(struct b53_device *dev, bool enable)
diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h
index dac0af4e2cd0..81044000ce75 100644
--- a/drivers/net/dsa/b53/b53_regs.h
+++ b/drivers/net/dsa/b53/b53_regs.h
@@ -104,6 +104,10 @@
#define B53_UC_FWD_EN BIT(6)
#define B53_MC_FWD_EN BIT(7)
+/* Switch control (8 bit) */
+#define B53_SWITCH_CTRL 0x22
+#define B53_MII_DUMB_FWDG_EN BIT(6)
+
/* (16 bit) */
#define B53_UC_FLOOD_MASK 0x32
#define B53_MC_FLOOD_MASK 0x34
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 62/96] udp: disable inner UDP checksum offloads in IPsec case
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (62 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 63/96] net: dsa: b53: Include IMP/CPU port in dumb forwarding mode Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 64/96] qed: Fix possible system hang in the dcbnl-getdcbx() path Levin, Alexander (Sasha Levin)
` (32 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Ansis Atteka <aatteka@ovn.org>
[ Upstream commit b40c5f4fde22fb98eff205b3aece05b471c24eed ]
Otherwise, UDP checksum offloads could corrupt ESP packets by attempting
to calculate UDP checksum when this inner UDP packet is already protected
by IPsec.
One way to reproduce this bug is to have a VM with virtio_net driver (UFO
set to ON in the guest VM); and then encapsulate all guest's Ethernet
frames in Geneve; and then further encrypt Geneve with IPsec. In this
case following symptoms are observed:
1. If using ixgbe NIC, then it will complain with following error message:
ixgbe 0000:01:00.1: partial checksum but l4 proto=32!
2. Receiving IPsec stack will drop all the corrupted ESP packets and
increase XfrmInStateProtoError counter in /proc/net/xfrm_stat.
3. iperf UDP test from the VM with packet sizes above MTU will not work at
all.
4. iperf TCP test from the VM will get ridiculously low performance because.
Signed-off-by: Ansis Atteka <aatteka@ovn.org>
Co-authored-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
net/ipv4/udp_offload.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 6de016f80f17..0932c85b42af 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -29,6 +29,7 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,
u16 mac_len = skb->mac_len;
int udp_offset, outer_hlen;
__wsum partial;
+ bool need_ipsec;
if (unlikely(!pskb_may_pull(skb, tnl_hlen)))
goto out;
@@ -62,8 +63,10 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,
ufo = !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP);
+ need_ipsec = skb_dst(skb) && dst_xfrm(skb_dst(skb));
/* Try to offload checksum if possible */
offload_csum = !!(need_csum &&
+ !need_ipsec &&
(skb->dev->features &
(is_ipv6 ? (NETIF_F_HW_CSUM | NETIF_F_IPV6_CSUM) :
(NETIF_F_HW_CSUM | NETIF_F_IP_CSUM))));
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 64/96] qed: Fix possible system hang in the dcbnl-getdcbx() path.
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (63 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 62/96] udp: disable inner UDP checksum offloads in IPsec case Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 69/96] sata_via: Enable hotplug only on VT6421 Levin, Alexander (Sasha Levin)
` (31 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: "sudarsana.kalluru@cavium.com" <sudarsana.kalluru@cavium.com>
[ Upstream commit 62289ba27558553871fd047baadaaeda886c6a63 ]
qed_dcbnl_get_dcbx() API uses kmalloc in GFT_KERNEL mode. The API gets
invoked in the interrupt context by qed_dcbnl_getdcbx callback. Need
to invoke this kmalloc in atomic mode.
Signed-off-by: Sudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index a4789a93b692..9d59cb85c012 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -1222,7 +1222,7 @@ static struct qed_dcbx_get *qed_dcbnl_get_dcbx(struct qed_hwfn *hwfn,
{
struct qed_dcbx_get *dcbx_info;
- dcbx_info = kzalloc(sizeof(*dcbx_info), GFP_KERNEL);
+ dcbx_info = kmalloc(sizeof(*dcbx_info), GFP_ATOMIC);
if (!dcbx_info)
return NULL;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 69/96] sata_via: Enable hotplug only on VT6421
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (64 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 64/96] qed: Fix possible system hang in the dcbnl-getdcbx() path Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 67/96] Btrfs: fix segmentation fault when doing dio read Levin, Alexander (Sasha Levin)
` (30 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Ondrej Zary <linux@rainbow-software.org>
[ Upstream commit 3cf864520e877505158f09075794a08abab11bbe ]
Commit 57e5568fda27 ("sata_via: Implement hotplug for VT6421") adds
hotplug IRQ handler for VT6421 but enables hotplug on all chips. This
is a bug because it causes "irq xx: nobody cared" error on VT6420 when
hot-(un)plugging a drive:
[ 381.839948] irq 20: nobody cared (try booting with the "irqpoll" option)
[ 381.840014] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.10.0-rc5+ #148
[ 381.840066] Hardware name: P4VM800/P4VM800, BIOS P1.60 05/29/2006
[ 381.840117] Call Trace:
[ 381.840167] <IRQ>
[ 381.840225] ? dump_stack+0x44/0x58
[ 381.840278] ? __report_bad_irq+0x14/0x97
[ 381.840327] ? handle_edge_irq+0xa5/0xa5
[ 381.840376] ? note_interrupt+0x155/0x1cf
[ 381.840426] ? handle_edge_irq+0xa5/0xa5
[ 381.840474] ? handle_irq_event_percpu+0x32/0x38
[ 381.840524] ? handle_irq_event+0x1f/0x38
[ 381.840573] ? handle_fasteoi_irq+0x69/0xb8
[ 381.840625] ? handle_irq+0x4f/0x5d
[ 381.840672] </IRQ>
[ 381.840726] ? do_IRQ+0x2e/0x8b
[ 381.840782] ? common_interrupt+0x2c/0x34
[ 381.840836] ? mwait_idle+0x60/0x82
[ 381.840892] ? arch_cpu_idle+0x6/0x7
[ 381.840949] ? do_idle+0x96/0x18e
[ 381.841002] ? cpu_startup_entry+0x16/0x1a
[ 381.841057] ? start_kernel+0x319/0x31c
[ 381.841111] ? startup_32_smp+0x166/0x168
[ 381.841165] handlers:
[ 381.841219] [<c12a7263>] ata_bmdma_interrupt
[ 381.841274] Disabling IRQ #20
Seems that VT6420 can do hotplug too (there's no documentation) but the
comments say that SCR register access (required for detecting hotplug
events) can cause problems on these chips.
For now, just keep hotplug disabled on anything other than VT6421.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/ata/sata_via.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 0636d84fbefe..f3f538eec7b3 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -644,14 +644,16 @@ static void svia_configure(struct pci_dev *pdev, int board_id,
pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8);
}
- /* enable IRQ on hotplug */
- pci_read_config_byte(pdev, SVIA_MISC_3, &tmp8);
- if ((tmp8 & SATA_HOTPLUG) != SATA_HOTPLUG) {
- dev_dbg(&pdev->dev,
- "enabling SATA hotplug (0x%x)\n",
- (int) tmp8);
- tmp8 |= SATA_HOTPLUG;
- pci_write_config_byte(pdev, SVIA_MISC_3, tmp8);
+ if (board_id == vt6421) {
+ /* enable IRQ on hotplug */
+ pci_read_config_byte(pdev, SVIA_MISC_3, &tmp8);
+ if ((tmp8 & SATA_HOTPLUG) != SATA_HOTPLUG) {
+ dev_dbg(&pdev->dev,
+ "enabling SATA hotplug (0x%x)\n",
+ (int) tmp8);
+ tmp8 |= SATA_HOTPLUG;
+ pci_write_config_byte(pdev, SVIA_MISC_3, tmp8);
+ }
}
/*
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 67/96] Btrfs: fix segmentation fault when doing dio read
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (65 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 69/96] sata_via: Enable hotplug only on VT6421 Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 68/96] Btrfs: fix potential use-after-free for cloned bio Levin, Alexander (Sasha Levin)
` (29 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Liu Bo <bo.li.liu@oracle.com>
[ Upstream commit 97bf5a5589aa3a59c60aa775fc12ec0483fc5002 ]
Commit 2dabb3248453 ("Btrfs: Direct I/O read: Work on sectorsized blocks")
introduced this bug during iterating bio pages in dio read's endio hook,
and it could end up with segment fault of the dio reading task.
So the reason is 'if (nr_sectors--)', and it makes the code assume that
there is one more block in the same page, so page offset is increased and
the bio which is created to repair the bad block then has an incorrect
bvec.bv_offset, and a later access of the page content would throw a
segmentation fault.
This also adds ASSERT to check page offset against page size.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
fs/btrfs/inode.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8a05fa7e2152..f089d7d8afe7 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8050,8 +8050,10 @@ next_block_or_try_again:
start += sectorsize;
- if (nr_sectors--) {
+ nr_sectors--;
+ if (nr_sectors) {
pgoff += sectorsize;
+ ASSERT(pgoff < PAGE_SIZE);
goto next_block_or_try_again;
}
}
@@ -8157,8 +8159,10 @@ next:
ASSERT(nr_sectors);
- if (--nr_sectors) {
+ nr_sectors--;
+ if (nr_sectors) {
pgoff += sectorsize;
+ ASSERT(pgoff < PAGE_SIZE);
goto next_block;
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 68/96] Btrfs: fix potential use-after-free for cloned bio
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (66 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 67/96] Btrfs: fix segmentation fault when doing dio read Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 66/96] bridge: netlink: register netdevice before executing changelink Levin, Alexander (Sasha Levin)
` (28 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Liu Bo <bo.li.liu@oracle.com>
[ Upstream commit a967efb30b3afa3d858edd6a17f544f9e9e46eea ]
KASAN reports that there is a use-after-free case of bio in btrfs_map_bio.
If we need to submit IOs to several disks at a time, the original bio
would get cloned and mapped to the destination disk, but we really should
use the original bio instead of a cloned bio to do the sanity check
because cloned bios are likely to be freed by its endio.
Reported-by: Diego <diegocg@gmail.com>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
fs/btrfs/volumes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 71a60cc01451..06a77e47957d 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6226,7 +6226,7 @@ int btrfs_map_bio(struct btrfs_root *root, struct bio *bio,
for (dev_nr = 0; dev_nr < total_devs; dev_nr++) {
dev = bbio->stripes[dev_nr].dev;
if (!dev || !dev->bdev ||
- (bio_op(bio) == REQ_OP_WRITE && !dev->writeable)) {
+ (bio_op(first_bio) == REQ_OP_WRITE && !dev->writeable)) {
bbio_error(bbio, first_bio, logical);
continue;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 66/96] bridge: netlink: register netdevice before executing changelink
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (67 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 68/96] Btrfs: fix potential use-after-free for cloned bio Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 73/96] netfilter: invoke synchronize_rcu after set the _hook_ to NULL Levin, Alexander (Sasha Levin)
` (27 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Ido Schimmel <idosch@mellanox.com>
[ Upstream commit 5b8d5429daa05bebef6ffd3297df3b502cc6f184 ]
Peter reported a kernel oops when executing the following command:
$ ip link add name test type bridge vlan_default_pvid 1
[13634.939408] BUG: unable to handle kernel NULL pointer dereference at
0000000000000190
[13634.939436] IP: __vlan_add+0x73/0x5f0
[...]
[13634.939783] Call Trace:
[13634.939791] ? pcpu_next_unpop+0x3b/0x50
[13634.939801] ? pcpu_alloc+0x3d2/0x680
[13634.939810] ? br_vlan_add+0x135/0x1b0
[13634.939820] ? __br_vlan_set_default_pvid.part.28+0x204/0x2b0
[13634.939834] ? br_changelink+0x120/0x4e0
[13634.939844] ? br_dev_newlink+0x50/0x70
[13634.939854] ? rtnl_newlink+0x5f5/0x8a0
[13634.939864] ? rtnl_newlink+0x176/0x8a0
[13634.939874] ? mem_cgroup_commit_charge+0x7c/0x4e0
[13634.939886] ? rtnetlink_rcv_msg+0xe1/0x220
[13634.939896] ? lookup_fast+0x52/0x370
[13634.939905] ? rtnl_newlink+0x8a0/0x8a0
[13634.939915] ? netlink_rcv_skb+0xa1/0xc0
[13634.939925] ? rtnetlink_rcv+0x24/0x30
[13634.939934] ? netlink_unicast+0x177/0x220
[13634.939944] ? netlink_sendmsg+0x2fe/0x3b0
[13634.939954] ? _copy_from_user+0x39/0x40
[13634.939964] ? sock_sendmsg+0x30/0x40
[13634.940159] ? ___sys_sendmsg+0x29d/0x2b0
[13634.940326] ? __alloc_pages_nodemask+0xdf/0x230
[13634.940478] ? mem_cgroup_commit_charge+0x7c/0x4e0
[13634.940592] ? mem_cgroup_try_charge+0x76/0x1a0
[13634.940701] ? __handle_mm_fault+0xdb9/0x10b0
[13634.940809] ? __sys_sendmsg+0x51/0x90
[13634.940917] ? entry_SYSCALL_64_fastpath+0x1e/0xad
The problem is that the bridge's VLAN group is created after setting the
default PVID, when registering the netdevice and executing its
ndo_init().
Fix this by changing the order of both operations, so that
br_changelink() is only processed after the netdevice is registered,
when the VLAN group is already initialized.
Fixes: b6677449dff6 ("bridge: netlink: call br_changelink() during br_dev_newlink()")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reported-by: Peter V. Saveliev <peter@svinota.eu>
Tested-by: Peter V. Saveliev <peter@svinota.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
net/bridge/br_netlink.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 7625ec8458de..5d4006e589cb 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -1098,11 +1098,14 @@ static int br_dev_newlink(struct net *src_net, struct net_device *dev,
spin_unlock_bh(&br->lock);
}
- err = br_changelink(dev, tb, data);
+ err = register_netdevice(dev);
if (err)
return err;
- return register_netdevice(dev);
+ err = br_changelink(dev, tb, data);
+ if (err)
+ unregister_netdevice(dev);
+ return err;
}
static size_t br_get_size(const struct net_device *brdev)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 73/96] netfilter: invoke synchronize_rcu after set the _hook_ to NULL
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (68 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 66/96] bridge: netlink: register netdevice before executing changelink Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 72/96] drivers/rapidio/devices/tsi721.c: make module parameter variable name unique Levin, Alexander (Sasha Levin)
` (26 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Liping Zhang <zlpnobody@gmail.com>
[ Upstream commit 3b7dabf029478bb80507a6c4500ca94132a2bc0b ]
Otherwise, another CPU may access the invalid pointer. For example:
CPU0 CPU1
- rcu_read_lock();
- pfunc = _hook_;
_hook_ = NULL; -
mod unload -
- pfunc(); // invalid, panic
- rcu_read_unlock();
So we must call synchronize_rcu() to wait the rcu reader to finish.
Also note, in nf_nat_snmp_basic_fini, synchronize_rcu() will be invoked
by later nf_conntrack_helper_unregister, but I'm inclined to add a
explicit synchronize_rcu after set the nf_nat_snmp_hook to NULL. Depend
on such obscure assumptions is not a good idea.
Last, in nfnetlink_cttimeout, we use kfree_rcu to free the time object,
so in cttimeout_exit, invoking rcu_barrier() is not necessary at all,
remove it too.
Signed-off-by: Liping Zhang <zlpnobody@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
net/ipv4/netfilter/nf_nat_snmp_basic.c | 1 +
net/netfilter/nf_conntrack_ecache.c | 2 ++
net/netfilter/nf_conntrack_netlink.c | 1 +
net/netfilter/nf_nat_core.c | 2 ++
net/netfilter/nfnetlink_cttimeout.c | 2 +-
5 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
index c9b52c361da2..5a8f7c360887 100644
--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
@@ -1304,6 +1304,7 @@ static int __init nf_nat_snmp_basic_init(void)
static void __exit nf_nat_snmp_basic_fini(void)
{
RCU_INIT_POINTER(nf_nat_snmp_hook, NULL);
+ synchronize_rcu();
nf_conntrack_helper_unregister(&snmp_trap_helper);
}
diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
index da9df2d56e66..22fc32143e9c 100644
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -290,6 +290,7 @@ void nf_conntrack_unregister_notifier(struct net *net,
BUG_ON(notify != new);
RCU_INIT_POINTER(net->ct.nf_conntrack_event_cb, NULL);
mutex_unlock(&nf_ct_ecache_mutex);
+ /* synchronize_rcu() is called from ctnetlink_exit. */
}
EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier);
@@ -326,6 +327,7 @@ void nf_ct_expect_unregister_notifier(struct net *net,
BUG_ON(notify != new);
RCU_INIT_POINTER(net->ct.nf_expect_event_cb, NULL);
mutex_unlock(&nf_ct_ecache_mutex);
+ /* synchronize_rcu() is called from ctnetlink_exit. */
}
EXPORT_SYMBOL_GPL(nf_ct_expect_unregister_notifier);
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 04111c1c3988..d5caed5bcfb1 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -3413,6 +3413,7 @@ static void __exit ctnetlink_exit(void)
#ifdef CONFIG_NETFILTER_NETLINK_GLUE_CT
RCU_INIT_POINTER(nfnl_ct_hook, NULL);
#endif
+ synchronize_rcu();
}
module_init(ctnetlink_init);
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index dde64c4565d2..2916f4815c9c 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -892,6 +892,8 @@ static void __exit nf_nat_cleanup(void)
#ifdef CONFIG_XFRM
RCU_INIT_POINTER(nf_nat_decode_session_hook, NULL);
#endif
+ synchronize_rcu();
+
for (i = 0; i < NFPROTO_NUMPROTO; i++)
kfree(nf_nat_l4protos[i]);
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index 139e0867e56e..47d6656c9119 100644
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -646,8 +646,8 @@ static void __exit cttimeout_exit(void)
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
RCU_INIT_POINTER(nf_ct_timeout_find_get_hook, NULL);
RCU_INIT_POINTER(nf_ct_timeout_put_hook, NULL);
+ synchronize_rcu();
#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
- rcu_barrier();
}
module_init(cttimeout_init);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 72/96] drivers/rapidio/devices/tsi721.c: make module parameter variable name unique
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (69 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 73/96] netfilter: invoke synchronize_rcu after set the _hook_ to NULL Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 71/96] kasan: do not sanitize kexec purgatory Levin, Alexander (Sasha Levin)
` (25 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Randy Dunlap <rdunlap@infradead.org>
[ Upstream commit 4785603bd05b0b029c647080937674d9991600f9 ]
kbuild test robot reported a non-static variable name collision between
a staging driver and a RapidIO driver, with a generic variable name of
'dbg_level'.
Both drivers should be changed so that they don't use this generic
public variable name. This patch fixes the RapidIO driver but does not
change the user interface (name) for the module parameter.
drivers/staging/built-in.o:(.bss+0x109d0): multiple definition of `dbg_level'
drivers/rapidio/built-in.o:(.bss+0x16c): first defined here
Link: http://lkml.kernel.org/r/ab527fc5-aa3c-4b07-5d48-eef5de703192@infradead.org
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/rapidio/devices/tsi721.c | 4 ++--
drivers/rapidio/devices/tsi721.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index 9d19b9a62011..315a4be8dc1e 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -37,8 +37,8 @@
#include "tsi721.h"
#ifdef DEBUG
-u32 dbg_level;
-module_param(dbg_level, uint, S_IWUSR | S_IRUGO);
+u32 tsi_dbg_level;
+module_param_named(dbg_level, tsi_dbg_level, uint, S_IWUSR | S_IRUGO);
MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)");
#endif
diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h
index 5941437cbdd1..957eadc58150 100644
--- a/drivers/rapidio/devices/tsi721.h
+++ b/drivers/rapidio/devices/tsi721.h
@@ -40,11 +40,11 @@ enum {
};
#ifdef DEBUG
-extern u32 dbg_level;
+extern u32 tsi_dbg_level;
#define tsi_debug(level, dev, fmt, arg...) \
do { \
- if (DBG_##level & dbg_level) \
+ if (DBG_##level & tsi_dbg_level) \
dev_dbg(dev, "%s: " fmt "\n", __func__, ##arg); \
} while (0)
#else
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 71/96] kasan: do not sanitize kexec purgatory
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (70 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 72/96] drivers/rapidio/devices/tsi721.c: make module parameter variable name unique Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 70/96] hugetlbfs: initialize shared policy as part of inode allocation Levin, Alexander (Sasha Levin)
` (24 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Mike Galbraith <efault@gmx.de>
[ Upstream commit 13a6798e4a03096b11bf402a063786a7be55d426 ]
Fixes this:
kexec: Undefined symbol: __asan_load8_noabort
kexec-bzImage64: Loading purgatory failed
Link: http://lkml.kernel.org/r/1489672155.4458.7.camel@gmx.de
Signed-off-by: Mike Galbraith <efault@gmx.de>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/x86/purgatory/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
index 555b9fa0ad43..7dbdb780264d 100644
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@ -8,6 +8,7 @@ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib
targets += purgatory.ro
+KASAN_SANITIZE := n
KCOV_INSTRUMENT := n
# Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 70/96] hugetlbfs: initialize shared policy as part of inode allocation
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (71 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 71/96] kasan: do not sanitize kexec purgatory Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 76/96] [media] exynos-gsc: Do not swap cb/cr for semi planar formats Levin, Alexander (Sasha Levin)
` (23 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Mike Kravetz <mike.kravetz@oracle.com>
[ Upstream commit 4742a35d9de745e867405b4311e1aac412f0ace1 ]
Any time after inode allocation, destroy_inode can be called. The
hugetlbfs inode contains a shared_policy structure, and
mpol_free_shared_policy is unconditionally called as part of
hugetlbfs_destroy_inode. Initialize the policy as part of inode
allocation so that any quick (error path) calls to destroy_inode will be
handed an initialized policy.
syzkaller fuzzer found this bug, that resulted in the following:
BUG: KASAN: user-memory-access in atomic_inc
include/asm-generic/atomic-instrumented.h:87 [inline] at addr
000000131730bd7a
BUG: KASAN: user-memory-access in __lock_acquire+0x21a/0x3a80
kernel/locking/lockdep.c:3239 at addr 000000131730bd7a
Write of size 4 by task syz-executor6/14086
CPU: 3 PID: 14086 Comm: syz-executor6 Not tainted 4.11.0-rc3+ #364
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
Call Trace:
atomic_inc include/asm-generic/atomic-instrumented.h:87 [inline]
__lock_acquire+0x21a/0x3a80 kernel/locking/lockdep.c:3239
lock_acquire+0x1ee/0x590 kernel/locking/lockdep.c:3762
__raw_write_lock include/linux/rwlock_api_smp.h:210 [inline]
_raw_write_lock+0x33/0x50 kernel/locking/spinlock.c:295
mpol_free_shared_policy+0x43/0xb0 mm/mempolicy.c:2536
hugetlbfs_destroy_inode+0xca/0x120 fs/hugetlbfs/inode.c:952
alloc_inode+0x10d/0x180 fs/inode.c:216
new_inode_pseudo+0x69/0x190 fs/inode.c:889
new_inode+0x1c/0x40 fs/inode.c:918
hugetlbfs_get_inode+0x40/0x420 fs/hugetlbfs/inode.c:734
hugetlb_file_setup+0x329/0x9f0 fs/hugetlbfs/inode.c:1282
newseg+0x422/0xd30 ipc/shm.c:575
ipcget_new ipc/util.c:285 [inline]
ipcget+0x21e/0x580 ipc/util.c:639
SYSC_shmget ipc/shm.c:673 [inline]
SyS_shmget+0x158/0x230 ipc/shm.c:657
entry_SYSCALL_64_fastpath+0x1f/0xc2
Analysis provided by Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Link: http://lkml.kernel.org/r/1490477850-7944-1-git-send-email-mike.kravetz@oracle.com
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
fs/hugetlbfs/inode.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 704fa0b17309..2c2f182cde03 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -695,14 +695,11 @@ static struct inode *hugetlbfs_get_root(struct super_block *sb,
inode = new_inode(sb);
if (inode) {
- struct hugetlbfs_inode_info *info;
inode->i_ino = get_next_ino();
inode->i_mode = S_IFDIR | config->mode;
inode->i_uid = config->uid;
inode->i_gid = config->gid;
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
- info = HUGETLBFS_I(inode);
- mpol_shared_policy_init(&info->policy, NULL);
inode->i_op = &hugetlbfs_dir_inode_operations;
inode->i_fop = &simple_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
@@ -733,7 +730,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb,
inode = new_inode(sb);
if (inode) {
- struct hugetlbfs_inode_info *info;
inode->i_ino = get_next_ino();
inode_init_owner(inode, dir, mode);
lockdep_set_class(&inode->i_mapping->i_mmap_rwsem,
@@ -741,15 +737,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb,
inode->i_mapping->a_ops = &hugetlbfs_aops;
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
inode->i_mapping->private_data = resv_map;
- info = HUGETLBFS_I(inode);
- /*
- * The policy is initialized here even if we are creating a
- * private inode because initialization simply creates an
- * an empty rb tree and calls rwlock_init(), later when we
- * call mpol_free_shared_policy() it will just return because
- * the rb tree will still be empty.
- */
- mpol_shared_policy_init(&info->policy, NULL);
switch (mode & S_IFMT) {
default:
init_special_inode(inode, mode, dev);
@@ -937,6 +924,18 @@ static struct inode *hugetlbfs_alloc_inode(struct super_block *sb)
hugetlbfs_inc_free_inodes(sbinfo);
return NULL;
}
+
+ /*
+ * Any time after allocation, hugetlbfs_destroy_inode can be called
+ * for the inode. mpol_free_shared_policy is unconditionally called
+ * as part of hugetlbfs_destroy_inode. So, initialize policy here
+ * in case of a quick call to destroy.
+ *
+ * Note that the policy is initialized even if we are creating a
+ * private inode. This simplifies hugetlbfs_destroy_inode.
+ */
+ mpol_shared_policy_init(&p->policy, NULL);
+
return &p->vfs_inode;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 76/96] [media] exynos-gsc: Do not swap cb/cr for semi planar formats
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (72 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 70/96] hugetlbfs: initialize shared policy as part of inode allocation Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 75/96] iommu/exynos: Block SYSMMU while invalidating FLPD cache Levin, Alexander (Sasha Levin)
` (22 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Thibault Saunier <thibault.saunier@osg.samsung.com>
[ Upstream commit d7f3e33df4fbdc9855fb151f4a328ec46447e3ba ]
In the case of semi planar formats cb and cr are in the same plane
in memory, meaning that will be set to 'cb' whatever the format is,
and whatever the (packed) order of those components are.
Suggested-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Thibault Saunier <thibault.saunier@osg.samsung.com>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/media/platform/exynos-gsc/gsc-core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 787bd16c19e5..bbb5feef8308 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -849,9 +849,7 @@ int gsc_prepare_addr(struct gsc_ctx *ctx, struct vb2_buffer *vb,
if ((frame->fmt->pixelformat == V4L2_PIX_FMT_VYUY) ||
(frame->fmt->pixelformat == V4L2_PIX_FMT_YVYU) ||
- (frame->fmt->pixelformat == V4L2_PIX_FMT_NV61) ||
(frame->fmt->pixelformat == V4L2_PIX_FMT_YVU420) ||
- (frame->fmt->pixelformat == V4L2_PIX_FMT_NV21) ||
(frame->fmt->pixelformat == V4L2_PIX_FMT_YVU420M))
swap(addr->cb, addr->cr);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 75/96] iommu/exynos: Block SYSMMU while invalidating FLPD cache
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (73 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 76/96] [media] exynos-gsc: Do not swap cb/cr for semi planar formats Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 74/96] MIPS: IRQ Stack: Unwind IRQ stack onto task stack Levin, Alexander (Sasha Levin)
` (21 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Marek Szyprowski <m.szyprowski@samsung.com>
[ Upstream commit 7d2aa6b814476a2e2794960f844344519246df72 ]
Documentation specifies that SYSMMU should be in blocked state while
performing TLB/FLPD cache invalidation, so add needed calls to
sysmmu_block/unblock.
Fixes: 66a7ed84b345d ("iommu/exynos: Apply workaround of caching fault page table entries")
CC: stable@vger.kernel.org # v4.10+
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/iommu/exynos-iommu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 30808e91b775..c7820b3ea80e 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -542,7 +542,10 @@ static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
spin_lock_irqsave(&data->lock, flags);
if (is_sysmmu_active(data) && data->version >= MAKE_MMU_VER(3, 3)) {
clk_enable(data->clk_master);
- __sysmmu_tlb_invalidate_entry(data, iova, 1);
+ if (sysmmu_block(data)) {
+ __sysmmu_tlb_invalidate_entry(data, iova, 1);
+ sysmmu_unblock(data);
+ }
clk_disable(data->clk_master);
}
spin_unlock_irqrestore(&data->lock, flags);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 74/96] MIPS: IRQ Stack: Unwind IRQ stack onto task stack
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (74 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 75/96] iommu/exynos: Block SYSMMU while invalidating FLPD cache Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 77/96] MIPS: smp-cps: Fix retrieval of VPE mask on big endian CPUs Levin, Alexander (Sasha Levin)
` (20 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Matt Redfearn <matt.redfearn@imgtec.com>
[ Upstream commit db8466c581cca1a08b505f1319c3ecd246f16fa8 ]
When the separate IRQ stack was introduced, stack unwinding only
proceeded as far as the top of the IRQ stack, leading to kernel
backtraces being less useful, lacking the trace of what was interrupted.
Fix this by providing a means for the kernel to unwind the IRQ stack
onto the interrupted task stack. The processor state is saved to the
kernel task stack on interrupt. The IRQ_STACK_START macro reserves an
unsigned long at the top of the IRQ stack where the interrupted task
stack pointer can be saved. After the active stack is switched to the
IRQ stack, save the interrupted tasks stack pointer to the reserved
location.
Fix the stack unwinding code to look for the frame being the top of the
IRQ stack and if so get the next frame from the saved location. The
existing test does not work with the separate stack since the ra is no
longer pointed at ret_from_{irq,exception}.
The test to stop unwinding the stack 32 bytes from the top of a stack
must be modified to allow unwinding to continue up to the location of
the saved task stack pointer when on the IRQ stack. The low / high marks
of the stack are set depending on whether the sp is on an irq stack or
not.
Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: Masanari Iida <standby24x7@gmail.com>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jason A. Donenfeld <jason@zx2c4.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15788/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/include/asm/irq.h | 15 +++++++++++
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/genex.S | 8 ++++--
arch/mips/kernel/process.c | 56 ++++++++++++++++++++++++++++--------------
4 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h
index 956db6e201d1..ddd1c918103b 100644
--- a/arch/mips/include/asm/irq.h
+++ b/arch/mips/include/asm/irq.h
@@ -18,9 +18,24 @@
#include <irq.h>
#define IRQ_STACK_SIZE THREAD_SIZE
+#define IRQ_STACK_START (IRQ_STACK_SIZE - sizeof(unsigned long))
extern void *irq_stack[NR_CPUS];
+/*
+ * The highest address on the IRQ stack contains a dummy frame put down in
+ * genex.S (handle_int & except_vec_vi_handler) which is structured as follows:
+ *
+ * top ------------
+ * | task sp | <- irq_stack[cpu] + IRQ_STACK_START
+ * ------------
+ * | | <- First frame of IRQ context
+ * ------------
+ *
+ * task sp holds a copy of the task stack pointer where the struct pt_regs
+ * from exception entry can be found.
+ */
+
static inline bool on_irq_stack(int cpu, unsigned long sp)
{
unsigned long low = (unsigned long)irq_stack[cpu];
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 4be2763f835d..bfff6ea45d51 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -103,6 +103,7 @@ void output_thread_info_defines(void)
DEFINE(_THREAD_SIZE, THREAD_SIZE);
DEFINE(_THREAD_MASK, THREAD_MASK);
DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE);
+ DEFINE(_IRQ_STACK_START, IRQ_STACK_START);
BLANK();
}
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 2ac6c2625c13..ae810da4d499 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -215,9 +215,11 @@ NESTED(handle_int, PT_SIZE, sp)
beq t0, t1, 2f
/* Switch to IRQ stack */
- li t1, _IRQ_STACK_SIZE
+ li t1, _IRQ_STACK_START
PTR_ADD sp, t0, t1
+ /* Save task's sp on IRQ stack so that unwinding can follow it */
+ LONG_S s1, 0(sp)
2:
jal plat_irq_dispatch
@@ -325,9 +327,11 @@ NESTED(except_vec_vi_handler, 0, sp)
beq t0, t1, 2f
/* Switch to IRQ stack */
- li t1, _IRQ_STACK_SIZE
+ li t1, _IRQ_STACK_START
PTR_ADD sp, t0, t1
+ /* Save task's sp on IRQ stack so that unwinding can follow it */
+ LONG_S s1, 0(sp)
2:
jalr v0
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index fbbf5fcc695a..1b50958a1373 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -487,31 +487,52 @@ unsigned long notrace unwind_stack_by_address(unsigned long stack_page,
unsigned long pc,
unsigned long *ra)
{
+ unsigned long low, high, irq_stack_high;
struct mips_frame_info info;
unsigned long size, ofs;
+ struct pt_regs *regs;
int leaf;
- extern void ret_from_irq(void);
- extern void ret_from_exception(void);
if (!stack_page)
return 0;
/*
- * If we reached the bottom of interrupt context,
- * return saved pc in pt_regs.
+ * IRQ stacks start at IRQ_STACK_START
+ * task stacks at THREAD_SIZE - 32
*/
- if (pc == (unsigned long)ret_from_irq ||
- pc == (unsigned long)ret_from_exception) {
- struct pt_regs *regs;
- if (*sp >= stack_page &&
- *sp + sizeof(*regs) <= stack_page + THREAD_SIZE - 32) {
- regs = (struct pt_regs *)*sp;
- pc = regs->cp0_epc;
- if (!user_mode(regs) && __kernel_text_address(pc)) {
- *sp = regs->regs[29];
- *ra = regs->regs[31];
- return pc;
- }
+ low = stack_page;
+ if (!preemptible() && on_irq_stack(raw_smp_processor_id(), *sp)) {
+ high = stack_page + IRQ_STACK_START;
+ irq_stack_high = high;
+ } else {
+ high = stack_page + THREAD_SIZE - 32;
+ irq_stack_high = 0;
+ }
+
+ /*
+ * If we reached the top of the interrupt stack, start unwinding
+ * the interrupted task stack.
+ */
+ if (unlikely(*sp == irq_stack_high)) {
+ unsigned long task_sp = *(unsigned long *)*sp;
+
+ /*
+ * Check that the pointer saved in the IRQ stack head points to
+ * something within the stack of the current task
+ */
+ if (!object_is_on_stack((void *)task_sp))
+ return 0;
+
+ /*
+ * Follow pointer to tasks kernel stack frame where interrupted
+ * state was saved.
+ */
+ regs = (struct pt_regs *)task_sp;
+ pc = regs->cp0_epc;
+ if (!user_mode(regs) && __kernel_text_address(pc)) {
+ *sp = regs->regs[29];
+ *ra = regs->regs[31];
+ return pc;
}
return 0;
}
@@ -532,8 +553,7 @@ unsigned long notrace unwind_stack_by_address(unsigned long stack_page,
if (leaf < 0)
return 0;
- if (*sp < stack_page ||
- *sp + info.frame_size > stack_page + THREAD_SIZE - 32)
+ if (*sp < low || *sp + info.frame_size > high)
return 0;
if (leaf)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 77/96] MIPS: smp-cps: Fix retrieval of VPE mask on big endian CPUs
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (75 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 74/96] MIPS: IRQ Stack: Unwind IRQ stack onto task stack Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 78/96] nvme-rdma: handle cpu unplug when re-establishing the controller Levin, Alexander (Sasha Levin)
` (19 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Matt Redfearn <matt.redfearn@imgtec.com>
[ Upstream commit fb2155e3c30dc2043b52020e26965067a3e7779c ]
The vpe_mask member of struct core_boot_config is of type atomic_t,
which is a 32bit type. In cps-vec.S this member was being retrieved by a
PTR_L macro, which on 64bit systems is a 64bit load. On little endian
systems this is OK, since the double word that is retrieved will have
the required less significant word in the correct position. However, on
big endian systems the less significant word of the load is retrieved
from address+4, and the more significant from address+0. The destination
register therefore ends up with the required word in the more
significant word
e.g. when starting the second VP of a big endian 64bit system, the load
PTR_L ta2, COREBOOTCFG_VPEMASK(a0)
ends up setting register ta2 to 0x0000000300000000
When this value is written to the CPC it is ignored, since it is
invalid to write anything larger than 4 bits. This results in any VP
other than VP0 in a core failing to start in 64bit big endian systems.
Change the load to a 32bit load word instruction to fix the bug.
Fixes: f12401d7219f ("MIPS: smp-cps: Pull boot config retrieval out of mips_cps_boot_vpes")
Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15787/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/mips/kernel/cps-vec.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
index 59476a607add..a00e87b0256d 100644
--- a/arch/mips/kernel/cps-vec.S
+++ b/arch/mips/kernel/cps-vec.S
@@ -361,7 +361,7 @@ LEAF(mips_cps_get_bootcfg)
END(mips_cps_get_bootcfg)
LEAF(mips_cps_boot_vpes)
- PTR_L ta2, COREBOOTCFG_VPEMASK(a0)
+ lw ta2, COREBOOTCFG_VPEMASK(a0)
PTR_L ta3, COREBOOTCFG_VPECONFIG(a0)
#if defined(CONFIG_CPU_MIPSR6)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 78/96] nvme-rdma: handle cpu unplug when re-establishing the controller
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (76 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 77/96] MIPS: smp-cps: Fix retrieval of VPE mask on big endian CPUs Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 81/96] nfs: make nfs4_cb_sv_ops static Levin, Alexander (Sasha Levin)
` (18 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Sagi Grimberg <sagi@grimberg.me>
[ Upstream commit c248c64387fac5a6b31b343d9acb78f478e8619c ]
If a cpu unplug event has occured, we need to take the minimum
of the provided nr_io_queues and the number of online cpus,
otherwise we won't be able to connect them as blk-mq mapping
won't dispatch to those queues.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/nvme/host/rdma.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 286fda4ee100..ab4f8db2a8ca 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -337,8 +337,6 @@ static int __nvme_rdma_init_request(struct nvme_rdma_ctrl *ctrl,
struct ib_device *ibdev = dev->dev;
int ret;
- BUG_ON(queue_idx >= ctrl->queue_count);
-
ret = nvme_rdma_alloc_qe(ibdev, &req->sqe, sizeof(struct nvme_command),
DMA_TO_DEVICE);
if (ret)
@@ -643,8 +641,22 @@ out_free_queues:
static int nvme_rdma_init_io_queues(struct nvme_rdma_ctrl *ctrl)
{
+ struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;
+ unsigned int nr_io_queues;
int i, ret;
+ nr_io_queues = min(opts->nr_io_queues, num_online_cpus());
+ ret = nvme_set_queue_count(&ctrl->ctrl, &nr_io_queues);
+ if (ret)
+ return ret;
+
+ ctrl->queue_count = nr_io_queues + 1;
+ if (ctrl->queue_count < 2)
+ return 0;
+
+ dev_info(ctrl->ctrl.device,
+ "creating %d I/O queues.\n", nr_io_queues);
+
for (i = 1; i < ctrl->queue_count; i++) {
ret = nvme_rdma_init_queue(ctrl, i,
ctrl->ctrl.opts->queue_size);
@@ -1795,20 +1807,8 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = {
static int nvme_rdma_create_io_queues(struct nvme_rdma_ctrl *ctrl)
{
- struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;
int ret;
- ret = nvme_set_queue_count(&ctrl->ctrl, &opts->nr_io_queues);
- if (ret)
- return ret;
-
- ctrl->queue_count = opts->nr_io_queues + 1;
- if (ctrl->queue_count < 2)
- return 0;
-
- dev_info(ctrl->ctrl.device,
- "creating %d I/O queues.\n", opts->nr_io_queues);
-
ret = nvme_rdma_init_io_queues(ctrl);
if (ret)
return ret;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 81/96] nfs: make nfs4_cb_sv_ops static
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (77 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 78/96] nvme-rdma: handle cpu unplug when re-establishing the controller Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 80/96] parisc: perf: Fix potential NULL pointer dereference Levin, Alexander (Sasha Levin)
` (17 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Jason Yan <yanaijie@huawei.com>
[ Upstream commit 05fae7bbc237bc7de0ee9c3dcf85b2572a80e3b5 ]
Fixes the following sparse warning:
fs/nfs/callback.c:235:21: warning: symbol 'nfs4_cb_sv_ops' was not
declared. Should it be static?
Signed-off-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
fs/nfs/callback.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 0a2115084c3f..a227bd835439 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -231,12 +231,12 @@ static struct svc_serv_ops nfs41_cb_sv_ops = {
.svo_module = THIS_MODULE,
};
-struct svc_serv_ops *nfs4_cb_sv_ops[] = {
+static struct svc_serv_ops *nfs4_cb_sv_ops[] = {
[0] = &nfs40_cb_sv_ops,
[1] = &nfs41_cb_sv_ops,
};
#else
-struct svc_serv_ops *nfs4_cb_sv_ops[] = {
+static struct svc_serv_ops *nfs4_cb_sv_ops[] = {
[0] = &nfs40_cb_sv_ops,
[1] = NULL,
};
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 80/96] parisc: perf: Fix potential NULL pointer dereference
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (78 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 81/96] nfs: make nfs4_cb_sv_ops static Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 79/96] netfilter: nfnl_cthelper: fix incorrect helper->expect_class_max Levin, Alexander (Sasha Levin)
` (16 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Arvind Yadav <arvind.yadav.cs@gmail.com>
[ Upstream commit 74e3f6e63da6c8e8246fba1689e040bc926b4a1a ]
Fix potential NULL pointer dereference and clean up
coding style errors (code indent, trailing whitespaces).
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/parisc/kernel/perf.c | 94 ++++++++++++++++++++++++-----------------------
1 file changed, 49 insertions(+), 45 deletions(-)
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index 518f4f5f1f43..d63d42533133 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -39,7 +39,7 @@
* the PDC INTRIGUE calls. This is done to eliminate bugs introduced
* in various PDC revisions. The code is much more maintainable
* and reliable this way vs having to debug on every version of PDC
- * on every box.
+ * on every box.
*/
#include <linux/capability.h>
@@ -195,8 +195,8 @@ static int perf_config(uint32_t *image_ptr);
static int perf_release(struct inode *inode, struct file *file);
static int perf_open(struct inode *inode, struct file *file);
static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t *ppos);
-static ssize_t perf_write(struct file *file, const char __user *buf, size_t count,
- loff_t *ppos);
+static ssize_t perf_write(struct file *file, const char __user *buf,
+ size_t count, loff_t *ppos);
static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
static void perf_start_counters(void);
static int perf_stop_counters(uint32_t *raddr);
@@ -222,7 +222,7 @@ extern void perf_intrigue_disable_perf_counters (void);
/*
* configure:
*
- * Configure the cpu with a given data image. First turn off the counters,
+ * Configure the cpu with a given data image. First turn off the counters,
* then download the image, then turn the counters back on.
*/
static int perf_config(uint32_t *image_ptr)
@@ -234,7 +234,7 @@ static int perf_config(uint32_t *image_ptr)
error = perf_stop_counters(raddr);
if (error != 0) {
printk("perf_config: perf_stop_counters = %ld\n", error);
- return -EINVAL;
+ return -EINVAL;
}
printk("Preparing to write image\n");
@@ -242,7 +242,7 @@ printk("Preparing to write image\n");
error = perf_write_image((uint64_t *)image_ptr);
if (error != 0) {
printk("perf_config: DOWNLOAD = %ld\n", error);
- return -EINVAL;
+ return -EINVAL;
}
printk("Preparing to start counters\n");
@@ -254,7 +254,7 @@ printk("Preparing to start counters\n");
}
/*
- * Open the device and initialize all of its memory. The device is only
+ * Open the device and initialize all of its memory. The device is only
* opened once, but can be "queried" by multiple processes that know its
* file descriptor.
*/
@@ -298,8 +298,8 @@ static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t
* called on the processor that the download should happen
* on.
*/
-static ssize_t perf_write(struct file *file, const char __user *buf, size_t count,
- loff_t *ppos)
+static ssize_t perf_write(struct file *file, const char __user *buf,
+ size_t count, loff_t *ppos)
{
int err;
size_t image_size;
@@ -307,11 +307,11 @@ static ssize_t perf_write(struct file *file, const char __user *buf, size_t coun
uint32_t interface_type;
uint32_t test;
- if (perf_processor_interface == ONYX_INTF)
+ if (perf_processor_interface == ONYX_INTF)
image_size = PCXU_IMAGE_SIZE;
- else if (perf_processor_interface == CUDA_INTF)
+ else if (perf_processor_interface == CUDA_INTF)
image_size = PCXW_IMAGE_SIZE;
- else
+ else
return -EFAULT;
if (!capable(CAP_SYS_ADMIN))
@@ -331,22 +331,22 @@ static ssize_t perf_write(struct file *file, const char __user *buf, size_t coun
/* First check the machine type is correct for
the requested image */
- if (((perf_processor_interface == CUDA_INTF) &&
- (interface_type != CUDA_INTF)) ||
- ((perf_processor_interface == ONYX_INTF) &&
- (interface_type != ONYX_INTF)))
+ if (((perf_processor_interface == CUDA_INTF) &&
+ (interface_type != CUDA_INTF)) ||
+ ((perf_processor_interface == ONYX_INTF) &&
+ (interface_type != ONYX_INTF)))
return -EINVAL;
/* Next check to make sure the requested image
is valid */
- if (((interface_type == CUDA_INTF) &&
+ if (((interface_type == CUDA_INTF) &&
(test >= MAX_CUDA_IMAGES)) ||
- ((interface_type == ONYX_INTF) &&
- (test >= MAX_ONYX_IMAGES)))
+ ((interface_type == ONYX_INTF) &&
+ (test >= MAX_ONYX_IMAGES)))
return -EINVAL;
/* Copy the image into the processor */
- if (interface_type == CUDA_INTF)
+ if (interface_type == CUDA_INTF)
return perf_config(cuda_images[test]);
else
return perf_config(onyx_images[test]);
@@ -360,7 +360,7 @@ static ssize_t perf_write(struct file *file, const char __user *buf, size_t coun
static void perf_patch_images(void)
{
#if 0 /* FIXME!! */
-/*
+/*
* NOTE: this routine is VERY specific to the current TLB image.
* If the image is changed, this routine might also need to be changed.
*/
@@ -368,9 +368,9 @@ static void perf_patch_images(void)
extern void $i_dtlb_miss_2_0();
extern void PA2_0_iva();
- /*
+ /*
* We can only use the lower 32-bits, the upper 32-bits should be 0
- * anyway given this is in the kernel
+ * anyway given this is in the kernel
*/
uint32_t itlb_addr = (uint32_t)&($i_itlb_miss_2_0);
uint32_t dtlb_addr = (uint32_t)&($i_dtlb_miss_2_0);
@@ -378,21 +378,21 @@ static void perf_patch_images(void)
if (perf_processor_interface == ONYX_INTF) {
/* clear last 2 bytes */
- onyx_images[TLBMISS][15] &= 0xffffff00;
+ onyx_images[TLBMISS][15] &= 0xffffff00;
/* set 2 bytes */
onyx_images[TLBMISS][15] |= (0x000000ff&((dtlb_addr) >> 24));
onyx_images[TLBMISS][16] = (dtlb_addr << 8)&0xffffff00;
onyx_images[TLBMISS][17] = itlb_addr;
/* clear last 2 bytes */
- onyx_images[TLBHANDMISS][15] &= 0xffffff00;
+ onyx_images[TLBHANDMISS][15] &= 0xffffff00;
/* set 2 bytes */
onyx_images[TLBHANDMISS][15] |= (0x000000ff&((dtlb_addr) >> 24));
onyx_images[TLBHANDMISS][16] = (dtlb_addr << 8)&0xffffff00;
onyx_images[TLBHANDMISS][17] = itlb_addr;
/* clear last 2 bytes */
- onyx_images[BIG_CPI][15] &= 0xffffff00;
+ onyx_images[BIG_CPI][15] &= 0xffffff00;
/* set 2 bytes */
onyx_images[BIG_CPI][15] |= (0x000000ff&((dtlb_addr) >> 24));
onyx_images[BIG_CPI][16] = (dtlb_addr << 8)&0xffffff00;
@@ -405,24 +405,24 @@ static void perf_patch_images(void)
} else if (perf_processor_interface == CUDA_INTF) {
/* Cuda interface */
- cuda_images[TLBMISS][16] =
+ cuda_images[TLBMISS][16] =
(cuda_images[TLBMISS][16]&0xffff0000) |
((dtlb_addr >> 8)&0x0000ffff);
- cuda_images[TLBMISS][17] =
+ cuda_images[TLBMISS][17] =
((dtlb_addr << 24)&0xff000000) | ((itlb_addr >> 16)&0x000000ff);
cuda_images[TLBMISS][18] = (itlb_addr << 16)&0xffff0000;
- cuda_images[TLBHANDMISS][16] =
+ cuda_images[TLBHANDMISS][16] =
(cuda_images[TLBHANDMISS][16]&0xffff0000) |
((dtlb_addr >> 8)&0x0000ffff);
- cuda_images[TLBHANDMISS][17] =
+ cuda_images[TLBHANDMISS][17] =
((dtlb_addr << 24)&0xff000000) | ((itlb_addr >> 16)&0x000000ff);
cuda_images[TLBHANDMISS][18] = (itlb_addr << 16)&0xffff0000;
- cuda_images[BIG_CPI][16] =
+ cuda_images[BIG_CPI][16] =
(cuda_images[BIG_CPI][16]&0xffff0000) |
((dtlb_addr >> 8)&0x0000ffff);
- cuda_images[BIG_CPI][17] =
+ cuda_images[BIG_CPI][17] =
((dtlb_addr << 24)&0xff000000) | ((itlb_addr >> 16)&0x000000ff);
cuda_images[BIG_CPI][18] = (itlb_addr << 16)&0xffff0000;
} else {
@@ -434,7 +434,7 @@ static void perf_patch_images(void)
/*
* ioctl routine
- * All routines effect the processor that they are executed on. Thus you
+ * All routines effect the processor that they are executed on. Thus you
* must be running on the processor that you wish to change.
*/
@@ -460,7 +460,7 @@ static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
/* copy out the Counters */
- if (copy_to_user((void __user *)arg, raddr,
+ if (copy_to_user((void __user *)arg, raddr,
sizeof (raddr)) != 0) {
error = -EFAULT;
break;
@@ -488,7 +488,7 @@ static const struct file_operations perf_fops = {
.open = perf_open,
.release = perf_release
};
-
+
static struct miscdevice perf_dev = {
MISC_DYNAMIC_MINOR,
PA_PERF_DEV,
@@ -596,7 +596,7 @@ static int perf_stop_counters(uint32_t *raddr)
/* OR sticky2 (bit 1496) to counter2 bit 32 */
tmp64 |= (userbuf[23] >> 8) & 0x0000000080000000;
raddr[2] = (uint32_t)tmp64;
-
+
/* Counter3 is bits 1497 to 1528 */
tmp64 = (userbuf[23] >> 7) & 0x00000000ffffffff;
/* OR sticky3 (bit 1529) to counter3 bit 32 */
@@ -618,7 +618,7 @@ static int perf_stop_counters(uint32_t *raddr)
userbuf[22] = 0;
userbuf[23] = 0;
- /*
+ /*
* Write back the zeroed bytes + the image given
* the read was destructive.
*/
@@ -626,13 +626,13 @@ static int perf_stop_counters(uint32_t *raddr)
} else {
/*
- * Read RDR-15 which contains the counters and sticky bits
+ * Read RDR-15 which contains the counters and sticky bits
*/
if (!perf_rdr_read_ubuf(15, userbuf)) {
return -13;
}
- /*
+ /*
* Clear out the counters
*/
perf_rdr_clear(15);
@@ -645,7 +645,7 @@ static int perf_stop_counters(uint32_t *raddr)
raddr[2] = (uint32_t)((userbuf[1] >> 32) & 0x00000000ffffffffUL);
raddr[3] = (uint32_t)(userbuf[1] & 0x00000000ffffffffUL);
}
-
+
return 0;
}
@@ -683,7 +683,7 @@ static int perf_rdr_read_ubuf(uint32_t rdr_num, uint64_t *buffer)
i = tentry->num_words;
while (i--) {
buffer[i] = 0;
- }
+ }
/* Check for bits an even number of 64 */
if ((xbits = width & 0x03f) != 0) {
@@ -809,18 +809,22 @@ static int perf_write_image(uint64_t *memaddr)
}
runway = ioremap_nocache(cpu_device->hpa.start, 4096);
+ if (!runway) {
+ pr_err("perf_write_image: ioremap failed!\n");
+ return -ENOMEM;
+ }
/* Merge intrigue bits into Runway STATUS 0 */
tmp64 = __raw_readq(runway + RUNWAY_STATUS) & 0xffecfffffffffffful;
- __raw_writeq(tmp64 | (*memaddr++ & 0x0013000000000000ul),
+ __raw_writeq(tmp64 | (*memaddr++ & 0x0013000000000000ul),
runway + RUNWAY_STATUS);
-
+
/* Write RUNWAY DEBUG registers */
for (i = 0; i < 8; i++) {
__raw_writeq(*memaddr++, runway + RUNWAY_DEBUG);
}
- return 0;
+ return 0;
}
/*
@@ -844,7 +848,7 @@ printk("perf_rdr_write\n");
perf_rdr_shift_out_U(rdr_num, buffer[i]);
} else {
perf_rdr_shift_out_W(rdr_num, buffer[i]);
- }
+ }
}
printk("perf_rdr_write done\n");
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 79/96] netfilter: nfnl_cthelper: fix incorrect helper->expect_class_max
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (79 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 80/96] parisc: perf: Fix potential NULL pointer dereference Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 83/96] cpufreq: intel_pstate: Update pid_params.sample_rate_ns in pid_param_set() Levin, Alexander (Sasha Levin)
` (15 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Liping Zhang <zlpnobody@gmail.com>
[ Upstream commit ae5c682113f9f94cc5e76f92cf041ee624c173ee ]
The helper->expect_class_max must be set to the total number of
expect_policy minus 1, since we will use the statement "if (class >
helper->expect_class_max)" to validate the CTA_EXPECT_CLASS attr in
ctnetlink_alloc_expect.
So for compatibility, set the helper->expect_class_max to the
NFCTH_POLICY_SET_NUM attr's value minus 1.
Also: it's invalid when the NFCTH_POLICY_SET_NUM attr's value is zero.
1. this will result "expect_policy = kzalloc(0, GFP_KERNEL);";
2. we cannot set the helper->expect_class_max to a proper value.
So if nla_get_be32(tb[NFCTH_POLICY_SET_NUM]) is zero, report -EINVAL to
the userspace.
Signed-off-by: Liping Zhang <zlpnobody@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
net/netfilter/nfnetlink_cthelper.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c
index 3b79f34b5095..b1fcfa08f0b4 100644
--- a/net/netfilter/nfnetlink_cthelper.c
+++ b/net/netfilter/nfnetlink_cthelper.c
@@ -161,6 +161,7 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper,
int i, ret;
struct nf_conntrack_expect_policy *expect_policy;
struct nlattr *tb[NFCTH_POLICY_SET_MAX+1];
+ unsigned int class_max;
ret = nla_parse_nested(tb, NFCTH_POLICY_SET_MAX, attr,
nfnl_cthelper_expect_policy_set);
@@ -170,19 +171,18 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper,
if (!tb[NFCTH_POLICY_SET_NUM])
return -EINVAL;
- helper->expect_class_max =
- ntohl(nla_get_be32(tb[NFCTH_POLICY_SET_NUM]));
-
- if (helper->expect_class_max != 0 &&
- helper->expect_class_max > NF_CT_MAX_EXPECT_CLASSES)
+ class_max = ntohl(nla_get_be32(tb[NFCTH_POLICY_SET_NUM]));
+ if (class_max == 0)
+ return -EINVAL;
+ if (class_max > NF_CT_MAX_EXPECT_CLASSES)
return -EOVERFLOW;
expect_policy = kzalloc(sizeof(struct nf_conntrack_expect_policy) *
- helper->expect_class_max, GFP_KERNEL);
+ class_max, GFP_KERNEL);
if (expect_policy == NULL)
return -ENOMEM;
- for (i=0; i<helper->expect_class_max; i++) {
+ for (i = 0; i < class_max; i++) {
if (!tb[NFCTH_POLICY_SET+i])
goto err;
@@ -191,6 +191,8 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper,
if (ret < 0)
goto err;
}
+
+ helper->expect_class_max = class_max - 1;
helper->expect_policy = expect_policy;
return 0;
err:
@@ -377,10 +379,10 @@ nfnl_cthelper_dump_policy(struct sk_buff *skb,
goto nla_put_failure;
if (nla_put_be32(skb, NFCTH_POLICY_SET_NUM,
- htonl(helper->expect_class_max)))
+ htonl(helper->expect_class_max + 1)))
goto nla_put_failure;
- for (i=0; i<helper->expect_class_max; i++) {
+ for (i = 0; i < helper->expect_class_max + 1; i++) {
nest_parms2 = nla_nest_start(skb,
(NFCTH_POLICY_SET+i) | NLA_F_NESTED);
if (nest_parms2 == NULL)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 83/96] cpufreq: intel_pstate: Update pid_params.sample_rate_ns in pid_param_set()
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (80 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 79/96] netfilter: nfnl_cthelper: fix incorrect helper->expect_class_max Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 85/96] iommu/io-pgtable-arm: Check for leaf entry before dereferencing it Levin, Alexander (Sasha Levin)
` (14 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
[ Upstream commit 6e7408acd04d06c04981c0c0fb5a2462b16fae4f ]
Fix the debugfs interface for PID tuning to actually update
pid_params.sample_rate_ns on PID parameters updates, as changing
pid_params.sample_rate_ms via debugfs has no effect now.
Fixes: a4675fbc4a7a (cpufreq: intel_pstate: Replace timers with utilization update callbacks)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/cpufreq/intel_pstate.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 80fa656da5ab..a59ae8e24d3d 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -609,6 +609,7 @@ static void intel_pstate_hwp_set_online_cpus(void)
static int pid_param_set(void *data, u64 val)
{
*(u32 *)data = val;
+ pid_params.sample_rate_ns = pid_params.sample_rate_ms * NSEC_PER_MSEC;
intel_pstate_reset_all_pid();
return 0;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 85/96] iommu/io-pgtable-arm: Check for leaf entry before dereferencing it
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (81 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 83/96] cpufreq: intel_pstate: Update pid_params.sample_rate_ns in pid_param_set() Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 84/96] x86/acpi: Restore the order of CPU IDs Levin, Alexander (Sasha Levin)
` (13 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
[ Upstream commit ed46e66cc1b3d684042f92dfa2ab15ee917b4cac ]
Do a check for already installed leaf entry at the current level before
dereferencing it in order to avoid walking the page table down with
wrong pointer to the next level.
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
CC: Will Deacon <will.deacon@arm.com>
CC: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/iommu/io-pgtable-arm.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index f5c90e1366ce..7c9d632f1d09 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -335,8 +335,12 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova,
if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS)
pte |= ARM_LPAE_PTE_NSTABLE;
__arm_lpae_set_pte(ptep, pte, cfg);
- } else {
+ } else if (!iopte_leaf(pte, lvl)) {
cptep = iopte_deref(pte, data);
+ } else {
+ /* We require an unmap first */
+ WARN_ON(!selftest_running);
+ return -EEXIST;
}
/* Rinse, repeat */
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 84/96] x86/acpi: Restore the order of CPU IDs
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (82 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 85/96] iommu/io-pgtable-arm: Check for leaf entry before dereferencing it Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 82/96] ibmvnic: Free tx/rx scrq pointer array when releasing sub-crqs Levin, Alexander (Sasha Levin)
` (12 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Dou Liyang <douly.fnst@cn.fujitsu.com>
[ Upstream commit 2b85b3d22920db7473e5fed5719e7955c0ec323e ]
The following commits:
f7c28833c2 ("x86/acpi: Enable acpi to register all possible cpus at
boot time") and 8f54969dc8 ("x86/acpi: Introduce persistent storage
for cpuid <-> apicid mapping")
... registered all the possible CPUs at boot time via ACPI tables to
make the mapping of cpuid <-> apicid fixed. Both enabled and disabled
CPUs could have a logical CPU ID after boot time.
But, ACPI tables are unreliable. the number amd order of Local APIC
entries which depends on the firmware is often inconsistent with the
physical devices. Even if they are consistent, The disabled CPUs which
take up some logical CPU IDs will also make the order discontinuous.
Revert the part of disabled CPUs registration, keep the allocation
logic of logical CPU IDs and also keep some code location changes.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Tested-by: Xiaolong Ye <xiaolong.ye@intel.com>
Cc: rjw@rjwysocki.net
Cc: linux-acpi@vger.kernel.org
Cc: guzheng1@huawei.com
Cc: izumi.taku@jp.fujitsu.com
Cc: lenb@kernel.org
Link: http://lkml.kernel.org/r/1488528147-2279-4-git-send-email-douly.fnst@cn.fujitsu.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/x86/kernel/acpi/boot.c | 7 ++++++-
arch/x86/kernel/apic/apic.c | 26 +++++++-------------------
2 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index d3e0d049a0c2..b89bef95f63b 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -176,10 +176,15 @@ static int acpi_register_lapic(int id, u32 acpiid, u8 enabled)
return -EINVAL;
}
+ if (!enabled) {
+ ++disabled_cpus;
+ return -EINVAL;
+ }
+
if (boot_cpu_physical_apicid != -1U)
ver = boot_cpu_apic_version;
- cpu = __generic_processor_info(id, ver, enabled);
+ cpu = generic_processor_info(id, ver);
if (cpu >= 0)
early_per_cpu(x86_cpu_to_acpiid, cpu) = acpiid;
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index f2234918e494..e2ead34da465 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2070,7 +2070,7 @@ static int allocate_logical_cpuid(int apicid)
return nr_logical_cpuids++;
}
-int __generic_processor_info(int apicid, int version, bool enabled)
+int generic_processor_info(int apicid, int version)
{
int cpu, max = nr_cpu_ids;
bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid,
@@ -2128,11 +2128,9 @@ int __generic_processor_info(int apicid, int version, bool enabled)
if (num_processors >= nr_cpu_ids) {
int thiscpu = max + disabled_cpus;
- if (enabled) {
- pr_warning("APIC: NR_CPUS/possible_cpus limit of %i "
- "reached. Processor %d/0x%x ignored.\n",
- max, thiscpu, apicid);
- }
+ pr_warning("APIC: NR_CPUS/possible_cpus limit of %i "
+ "reached. Processor %d/0x%x ignored.\n",
+ max, thiscpu, apicid);
disabled_cpus++;
return -EINVAL;
@@ -2184,23 +2182,13 @@ int __generic_processor_info(int apicid, int version, bool enabled)
apic->x86_32_early_logical_apicid(cpu);
#endif
set_cpu_possible(cpu, true);
-
- if (enabled) {
- num_processors++;
- physid_set(apicid, phys_cpu_present_map);
- set_cpu_present(cpu, true);
- } else {
- disabled_cpus++;
- }
+ physid_set(apicid, phys_cpu_present_map);
+ set_cpu_present(cpu, true);
+ num_processors++;
return cpu;
}
-int generic_processor_info(int apicid, int version)
-{
- return __generic_processor_info(apicid, version, true);
-}
-
int hard_smp_processor_id(void)
{
return read_apic_id();
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 82/96] ibmvnic: Free tx/rx scrq pointer array when releasing sub-crqs
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (83 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 84/96] x86/acpi: Restore the order of CPU IDs Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 88/96] rds: ib: add error handle Levin, Alexander (Sasha Levin)
` (11 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
[ Upstream commit 9501df3cd9204f5859f649182431616a31ee88a1 ]
The pointer array for the tx/rx sub crqs should be free'ed when
releasing the tx/rx sub crqs.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 9f2184be55dc..b8778e7b1f79 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1253,6 +1253,7 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter)
release_sub_crq_queue(adapter,
adapter->tx_scrq[i]);
}
+ kfree(adapter->tx_scrq);
adapter->tx_scrq = NULL;
}
@@ -1265,6 +1266,7 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter)
release_sub_crq_queue(adapter,
adapter->rx_scrq[i]);
}
+ kfree(adapter->rx_scrq);
adapter->rx_scrq = NULL;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 88/96] rds: ib: add error handle
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (84 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 82/96] ibmvnic: Free tx/rx scrq pointer array when releasing sub-crqs Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 90/96] netfilter: nf_tables: set pktinfo->thoff at AH header if found Levin, Alexander (Sasha Levin)
` (10 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Zhu Yanjun <yanjun.zhu@oracle.com>
[ Upstream commit 3b12f73a5c2977153f28a224392fd4729b50d1dc ]
In the function rds_ib_setup_qp, the error handle is missing. When some
error occurs, it is possible that memory leak occurs. As such, error
handle is added.
Cc: Joe Jin <joe.jin@oracle.com>
Reviewed-by: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: Guanglei Li <guanglei.li@oracle.com>
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
net/rds/ib_cm.c | 47 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 36 insertions(+), 11 deletions(-)
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 5b2ab95afa07..169156cfd4c8 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -405,7 +405,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
ret = PTR_ERR(ic->i_send_cq);
ic->i_send_cq = NULL;
rdsdebug("ib_create_cq send failed: %d\n", ret);
- goto out;
+ goto rds_ibdev_out;
}
cq_attr.cqe = ic->i_recv_ring.w_nr;
@@ -416,19 +416,19 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
ret = PTR_ERR(ic->i_recv_cq);
ic->i_recv_cq = NULL;
rdsdebug("ib_create_cq recv failed: %d\n", ret);
- goto out;
+ goto send_cq_out;
}
ret = ib_req_notify_cq(ic->i_send_cq, IB_CQ_NEXT_COMP);
if (ret) {
rdsdebug("ib_req_notify_cq send failed: %d\n", ret);
- goto out;
+ goto recv_cq_out;
}
ret = ib_req_notify_cq(ic->i_recv_cq, IB_CQ_SOLICITED);
if (ret) {
rdsdebug("ib_req_notify_cq recv failed: %d\n", ret);
- goto out;
+ goto recv_cq_out;
}
/* XXX negotiate max send/recv with remote? */
@@ -453,7 +453,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
ret = rdma_create_qp(ic->i_cm_id, ic->i_pd, &attr);
if (ret) {
rdsdebug("rdma_create_qp failed: %d\n", ret);
- goto out;
+ goto recv_cq_out;
}
ic->i_send_hdrs = ib_dma_alloc_coherent(dev,
@@ -463,7 +463,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
if (!ic->i_send_hdrs) {
ret = -ENOMEM;
rdsdebug("ib_dma_alloc_coherent send failed\n");
- goto out;
+ goto qp_out;
}
ic->i_recv_hdrs = ib_dma_alloc_coherent(dev,
@@ -473,7 +473,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
if (!ic->i_recv_hdrs) {
ret = -ENOMEM;
rdsdebug("ib_dma_alloc_coherent recv failed\n");
- goto out;
+ goto send_hdrs_dma_out;
}
ic->i_ack = ib_dma_alloc_coherent(dev, sizeof(struct rds_header),
@@ -481,7 +481,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
if (!ic->i_ack) {
ret = -ENOMEM;
rdsdebug("ib_dma_alloc_coherent ack failed\n");
- goto out;
+ goto recv_hdrs_dma_out;
}
ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work),
@@ -489,7 +489,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
if (!ic->i_sends) {
ret = -ENOMEM;
rdsdebug("send allocation failed\n");
- goto out;
+ goto ack_dma_out;
}
ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work),
@@ -497,7 +497,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
if (!ic->i_recvs) {
ret = -ENOMEM;
rdsdebug("recv allocation failed\n");
- goto out;
+ goto sends_out;
}
rds_ib_recv_init_ack(ic);
@@ -505,8 +505,33 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
rdsdebug("conn %p pd %p cq %p %p\n", conn, ic->i_pd,
ic->i_send_cq, ic->i_recv_cq);
-out:
+ return ret;
+
+sends_out:
+ vfree(ic->i_sends);
+ack_dma_out:
+ ib_dma_free_coherent(dev, sizeof(struct rds_header),
+ ic->i_ack, ic->i_ack_dma);
+recv_hdrs_dma_out:
+ ib_dma_free_coherent(dev, ic->i_recv_ring.w_nr *
+ sizeof(struct rds_header),
+ ic->i_recv_hdrs, ic->i_recv_hdrs_dma);
+send_hdrs_dma_out:
+ ib_dma_free_coherent(dev, ic->i_send_ring.w_nr *
+ sizeof(struct rds_header),
+ ic->i_send_hdrs, ic->i_send_hdrs_dma);
+qp_out:
+ rdma_destroy_qp(ic->i_cm_id);
+recv_cq_out:
+ if (!ib_destroy_cq(ic->i_recv_cq))
+ ic->i_recv_cq = NULL;
+send_cq_out:
+ if (!ib_destroy_cq(ic->i_send_cq))
+ ic->i_send_cq = NULL;
+rds_ibdev_out:
+ rds_ib_remove_conn(rds_ibdev, conn);
rds_ib_dev_put(rds_ibdev);
+
return ret;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 90/96] netfilter: nf_tables: set pktinfo->thoff at AH header if found
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (85 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 88/96] rds: ib: add error handle Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 87/96] mm/cgroup: avoid panic when init with low memory Levin, Alexander (Sasha Levin)
` (9 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Pablo Neira Ayuso <pablo@netfilter.org>
[ Upstream commit 568af6de058cb2b0c5b98d98ffcf37cdc6bc38a7 ]
Phil Sutter reports that IPv6 AH header matching is broken. From
userspace, nft generates bytecode that expects to find the AH header at
NFT_PAYLOAD_TRANSPORT_HEADER both for IPv4 and IPv6. However,
pktinfo->thoff is set to the inner header after the AH header in IPv6,
while in IPv4 pktinfo->thoff points to the AH header indeed. This
behaviour is inconsistent. This patch fixes this problem by updating
ipv6_find_hdr() to get the IP6_FH_F_AUTH flag so this function stops at
the AH header, so both IPv4 and IPv6 pktinfo->thoff point to the AH
header.
This is also inconsistent when trying to match encapsulated headers:
1) A packet that looks like IPv4 + AH + TCP dport 22 will *not* match.
2) A packet that looks like IPv6 + AH + TCP dport 22 will match.
Reported-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
include/net/netfilter/nf_tables_ipv6.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/net/netfilter/nf_tables_ipv6.h b/include/net/netfilter/nf_tables_ipv6.h
index d150b5066201..97983d1c05e4 100644
--- a/include/net/netfilter/nf_tables_ipv6.h
+++ b/include/net/netfilter/nf_tables_ipv6.h
@@ -9,12 +9,13 @@ nft_set_pktinfo_ipv6(struct nft_pktinfo *pkt,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
+ unsigned int flags = IP6_FH_F_AUTH;
int protohdr, thoff = 0;
unsigned short frag_off;
nft_set_pktinfo(pkt, skb, state);
- protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, NULL);
+ protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, &flags);
if (protohdr < 0) {
nft_set_pktinfo_proto_unspec(pkt, skb);
return;
@@ -32,6 +33,7 @@ __nft_set_pktinfo_ipv6_validate(struct nft_pktinfo *pkt,
const struct nf_hook_state *state)
{
#if IS_ENABLED(CONFIG_IPV6)
+ unsigned int flags = IP6_FH_F_AUTH;
struct ipv6hdr *ip6h, _ip6h;
unsigned int thoff = 0;
unsigned short frag_off;
@@ -50,7 +52,7 @@ __nft_set_pktinfo_ipv6_validate(struct nft_pktinfo *pkt,
if (pkt_len + sizeof(*ip6h) > skb->len)
return -1;
- protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, NULL);
+ protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, &flags);
if (protohdr < 0)
return -1;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 87/96] mm/cgroup: avoid panic when init with low memory
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (86 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 90/96] netfilter: nf_tables: set pktinfo->thoff at AH header if found Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 86/96] arm64: kasan: avoid bad virt_to_pfn() Levin, Alexander (Sasha Levin)
` (8 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Laurent Dufour <ldufour@linux.vnet.ibm.com>
[ Upstream commit bfc7228b9a9647e1c353e50b40297a2929801759 ]
The system may panic when initialisation is done when almost all the
memory is assigned to the huge pages using the kernel command line
parameter hugepage=xxxx. Panic may occur like this:
Unable to handle kernel paging request for data at address 0x00000000
Faulting instruction address: 0xc000000000302b88
Oops: Kernel access of bad area, sig: 11 [#1]
SMP NR_CPUS=2048 [ 0.082424] NUMA
pSeries
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.9.0-15-generic #16-Ubuntu
task: c00000021ed01600 task.stack: c00000010d108000
NIP: c000000000302b88 LR: c000000000270e04 CTR: c00000000016cfd0
REGS: c00000010d10b2c0 TRAP: 0300 Not tainted (4.9.0-15-generic)
MSR: 8000000002009033 <SF,VEC,EE,ME,IR,DR,RI,LE>[ 0.082770] CR: 28424422 XER: 00000000
CFAR: c0000000003d28b8 DAR: 0000000000000000 DSISR: 40000000 SOFTE: 1
GPR00: c000000000270e04 c00000010d10b540 c00000000141a300 c00000010fff6300
GPR04: 0000000000000000 00000000026012c0 c00000010d10b630 0000000487ab0000
GPR08: 000000010ee90000 c000000001454fd8 0000000000000000 0000000000000000
GPR12: 0000000000004400 c00000000fb80000 00000000026012c0 00000000026012c0
GPR16: 00000000026012c0 0000000000000000 0000000000000000 0000000000000002
GPR20: 000000000000000c 0000000000000000 0000000000000000 00000000024200c0
GPR24: c0000000016eef48 0000000000000000 c00000010fff7d00 00000000026012c0
GPR28: 0000000000000000 c00000010fff7d00 c00000010fff6300 c00000010d10b6d0
NIP mem_cgroup_soft_limit_reclaim+0xf8/0x4f0
LR do_try_to_free_pages+0x1b4/0x450
Call Trace:
do_try_to_free_pages+0x1b4/0x450
try_to_free_pages+0xf8/0x270
__alloc_pages_nodemask+0x7a8/0xff0
new_slab+0x104/0x8e0
___slab_alloc+0x620/0x700
__slab_alloc+0x34/0x60
kmem_cache_alloc_node_trace+0xdc/0x310
mem_cgroup_init+0x158/0x1c8
do_one_initcall+0x68/0x1d0
kernel_init_freeable+0x278/0x360
kernel_init+0x24/0x170
ret_from_kernel_thread+0x5c/0x74
Instruction dump:
eb81ffe0 eba1ffe8 ebc1fff0 ebe1fff8 4e800020 3d230001 e9499a42 3d220004
3929acd8 794a1f24 7d295214 eac90100 <e9360000> 2fa90000 419eff74 3b200000
---[ end trace 342f5208b00d01b6 ]---
This is a chicken and egg issue where the kernel try to get free memory
when allocating per node data in mem_cgroup_init(), but in that path
mem_cgroup_soft_limit_reclaim() is called which assumes that these data
are allocated.
As mem_cgroup_soft_limit_reclaim() is best effort, it should return when
these data are not yet allocated.
This patch also fixes potential null pointer access in
mem_cgroup_remove_from_trees() and mem_cgroup_update_tree().
Link: http://lkml.kernel.org/r/1487856999-16581-2-git-send-email-ldufour@linux.vnet.ibm.com
Signed-off-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Balbir Singh <bsingharora@gmail.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
mm/memcontrol.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 47559cc0cdcc..2a800c4a39bd 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -462,6 +462,8 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page)
struct mem_cgroup_tree_per_node *mctz;
mctz = soft_limit_tree_from_page(page);
+ if (!mctz)
+ return;
/*
* Necessary to update all ancestors when hierarchy is used.
* because their event counter is not touched.
@@ -499,7 +501,8 @@ static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg)
for_each_node(nid) {
mz = mem_cgroup_nodeinfo(memcg, nid);
mctz = soft_limit_tree_node(nid);
- mem_cgroup_remove_exceeded(mz, mctz);
+ if (mctz)
+ mem_cgroup_remove_exceeded(mz, mctz);
}
}
@@ -2565,7 +2568,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order,
* is empty. Do it lockless to prevent lock bouncing. Races
* are acceptable as soft limit is best effort anyway.
*/
- if (RB_EMPTY_ROOT(&mctz->rb_root))
+ if (!mctz || RB_EMPTY_ROOT(&mctz->rb_root))
return 0;
/*
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 86/96] arm64: kasan: avoid bad virt_to_pfn()
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (87 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 87/96] mm/cgroup: avoid panic when init with low memory Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 89/96] md/raid10: submit bio directly to replacement disk Levin, Alexander (Sasha Levin)
` (7 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Mark Rutland <mark.rutland@arm.com>
[ Upstream commit b0de0ccc8b9edd8846828e0ecdc35deacdf186b0 ]
Booting a v4.11-rc1 kernel with DEBUG_VIRTUAL and KASAN enabled produces
the following splat (trimmed for brevity):
[ 0.000000] virt_to_phys used for non-linear address: ffff200008080000 (0xffff200008080000)
[ 0.000000] WARNING: CPU: 0 PID: 0 at arch/arm64/mm/physaddr.c:14 __virt_to_phys+0x48/0x70
[ 0.000000] PC is at __virt_to_phys+0x48/0x70
[ 0.000000] LR is at __virt_to_phys+0x48/0x70
[ 0.000000] Call trace:
[ 0.000000] [<ffff2000080b1ac0>] __virt_to_phys+0x48/0x70
[ 0.000000] [<ffff20000a03b86c>] kasan_init+0x1c0/0x498
[ 0.000000] [<ffff20000a034018>] setup_arch+0x2fc/0x948
[ 0.000000] [<ffff20000a030c68>] start_kernel+0xb8/0x570
[ 0.000000] [<ffff20000a0301e8>] __primary_switched+0x6c/0x74
This is because we use virt_to_pfn() on a kernel image address when
trying to figure out its nid, so that we can allocate its shadow from
the same node.
As with other recent changes, this patch uses lm_alias() to solve this.
We could instead use NUMA_NO_NODE, as x86 does for all shadow
allocations, though we'll likely want the "real" memory shadow to be
backed from its corresponding nid anyway, so we may as well be
consistent and find the nid for the image shadow.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Acked-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/arm64/mm/kasan_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c
index 757009daa9ed..ff43da269fe8 100644
--- a/arch/arm64/mm/kasan_init.c
+++ b/arch/arm64/mm/kasan_init.c
@@ -153,7 +153,7 @@ void __init kasan_init(void)
clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END);
vmemmap_populate(kimg_shadow_start, kimg_shadow_end,
- pfn_to_nid(virt_to_pfn(_text)));
+ pfn_to_nid(virt_to_pfn(lm_alias(_text))));
/*
* vmemmap_populate() has populated the shadow region that covers the
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 89/96] md/raid10: submit bio directly to replacement disk
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (88 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 86/96] arm64: kasan: avoid bad virt_to_pfn() Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 92/96] xfs: remove kmem_zalloc_greedy Levin, Alexander (Sasha Levin)
` (6 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Shaohua Li <shli@fb.com>
[ Upstream commit 6d399783e9d4e9bd44931501948059d24ad96ff8 ]
Commit 57c67df(md/raid10: submit IO from originating thread instead of
md thread) submits bio directly for normal disks but not for replacement
disks. There is no point we shouldn't do this for replacement disks.
Cc: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/md/raid10.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 4c4aab02e311..b19b551bb34b 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1407,11 +1407,24 @@ retry_write:
mbio->bi_private = r10_bio;
atomic_inc(&r10_bio->remaining);
+
+ cb = blk_check_plugged(raid10_unplug, mddev,
+ sizeof(*plug));
+ if (cb)
+ plug = container_of(cb, struct raid10_plug_cb,
+ cb);
+ else
+ plug = NULL;
spin_lock_irqsave(&conf->device_lock, flags);
- bio_list_add(&conf->pending_bio_list, mbio);
- conf->pending_count++;
+ if (plug) {
+ bio_list_add(&plug->pending, mbio);
+ plug->pending_cnt++;
+ } else {
+ bio_list_add(&conf->pending_bio_list, mbio);
+ conf->pending_count++;
+ }
spin_unlock_irqrestore(&conf->device_lock, flags);
- if (!mddev_check_plugged(mddev))
+ if (!plug)
md_wakeup_thread(mddev->thread);
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 92/96] xfs: remove kmem_zalloc_greedy
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (89 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 89/96] md/raid10: submit bio directly to replacement disk Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 91/96] i2c: meson: fix wrong variable usage in meson_i2c_put_data Levin, Alexander (Sasha Levin)
` (5 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: "Darrick J. Wong" <darrick.wong@oracle.com>
[ Upstream commit 08b005f1333154ae5b404ca28766e0ffb9f1c150 ]
The sole remaining caller of kmem_zalloc_greedy is bulkstat, which uses
it to grab 1-4 pages for staging of inobt records. The infinite loop in
the greedy allocation function is causing hangs[1] in generic/269, so
just get rid of the greedy allocator in favor of kmem_zalloc_large.
This makes bulkstat somewhat more likely to ENOMEM if there's really no
pages to spare, but eliminates a source of hangs.
[1] http://lkml.kernel.org/r/20170301044634.rgidgdqqiiwsmfpj%40XZHOUW.usersys.redhat.com
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
v2: remove single-page fallback
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
fs/xfs/kmem.c | 18 ------------------
fs/xfs/kmem.h | 2 --
fs/xfs/xfs_itable.c | 6 ++----
3 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index 339c696bbc01..bb2beaef531a 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -24,24 +24,6 @@
#include "kmem.h"
#include "xfs_message.h"
-/*
- * Greedy allocation. May fail and may return vmalloced memory.
- */
-void *
-kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize)
-{
- void *ptr;
- size_t kmsize = maxsize;
-
- while (!(ptr = vzalloc(kmsize))) {
- if ((kmsize >>= 1) <= minsize)
- kmsize = minsize;
- }
- if (ptr)
- *size = kmsize;
- return ptr;
-}
-
void *
kmem_alloc(size_t size, xfs_km_flags_t flags)
{
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h
index 689f746224e7..f0fc84fcaac2 100644
--- a/fs/xfs/kmem.h
+++ b/fs/xfs/kmem.h
@@ -69,8 +69,6 @@ static inline void kmem_free(const void *ptr)
}
-extern void *kmem_zalloc_greedy(size_t *, size_t, size_t);
-
static inline void *
kmem_zalloc(size_t size, xfs_km_flags_t flags)
{
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index d8a77dbf4e3a..26d67ce3c18d 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -361,7 +361,6 @@ xfs_bulkstat(
xfs_agino_t agino; /* inode # in allocation group */
xfs_agnumber_t agno; /* allocation group number */
xfs_btree_cur_t *cur; /* btree cursor for ialloc btree */
- size_t irbsize; /* size of irec buffer in bytes */
xfs_inobt_rec_incore_t *irbuf; /* start of irec buffer */
int nirbuf; /* size of irbuf */
int ubcount; /* size of user's buffer */
@@ -388,11 +387,10 @@ xfs_bulkstat(
*ubcountp = 0;
*done = 0;
- irbuf = kmem_zalloc_greedy(&irbsize, PAGE_SIZE, PAGE_SIZE * 4);
+ irbuf = kmem_zalloc_large(PAGE_SIZE * 4, KM_SLEEP);
if (!irbuf)
return -ENOMEM;
-
- nirbuf = irbsize / sizeof(*irbuf);
+ nirbuf = (PAGE_SIZE * 4) / sizeof(*irbuf);
/*
* Loop over the allocation groups, starting from the last
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 91/96] i2c: meson: fix wrong variable usage in meson_i2c_put_data
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (90 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 92/96] xfs: remove kmem_zalloc_greedy Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 93/96] ASoC: wm_adsp: Return an error on write to a disabled volatile control Levin, Alexander (Sasha Levin)
` (4 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Heiner Kallweit <hkallweit1@gmail.com>
[ Upstream commit 3b0277f198ac928f323c42e180680d2f79aa980d ]
Most likely a copy & paste error.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Fixes: 30021e3707a7 ("i2c: add support for Amlogic Meson I2C controller")
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/i2c/busses/i2c-meson.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index 2aa61bbbd307..73b97c71a484 100644
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -175,7 +175,7 @@ static void meson_i2c_put_data(struct meson_i2c *i2c, char *buf, int len)
wdata1 |= *buf++ << ((i - 4) * 8);
writel(wdata0, i2c->regs + REG_TOK_WDATA0);
- writel(wdata0, i2c->regs + REG_TOK_WDATA1);
+ writel(wdata1, i2c->regs + REG_TOK_WDATA1);
dev_dbg(i2c->dev, "%s: data %08x %08x len %d\n", __func__,
wdata0, wdata1, len);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 93/96] ASoC: wm_adsp: Return an error on write to a disabled volatile control
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (91 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 91/96] i2c: meson: fix wrong variable usage in meson_i2c_put_data Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:41 ` [GIT PULL for-4.9 94/96] libata: transport: Remove circular dependency at free time Levin, Alexander (Sasha Levin)
` (3 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
[ Upstream commit 67430a39ca7a6af28aade5acb92d43ee257c1014 ]
Volatile controls should only be accessed when the firmware is active,
currently however writes to these controls will succeed, but the data
will be lost, if the firmware is powered down. Update this behaviour such
that an error is returned the same as it is for reads.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
sound/soc/codecs/wm_adsp.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index b943dde8dbe5..3bdd81930486 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -789,7 +789,10 @@ static int wm_coeff_put(struct snd_kcontrol *kctl,
mutex_lock(&ctl->dsp->pwr_lock);
- memcpy(ctl->cache, p, ctl->len);
+ if (ctl->flags & WMFW_CTL_FLAG_VOLATILE)
+ ret = -EPERM;
+ else
+ memcpy(ctl->cache, p, ctl->len);
ctl->set = 1;
if (ctl->enabled && ctl->dsp->running)
@@ -816,6 +819,8 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl,
ctl->set = 1;
if (ctl->enabled && ctl->dsp->running)
ret = wm_coeff_write_control(ctl, ctl->cache, size);
+ else if (ctl->flags & WMFW_CTL_FLAG_VOLATILE)
+ ret = -EPERM;
}
mutex_unlock(&ctl->dsp->pwr_lock);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 94/96] libata: transport: Remove circular dependency at free time
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (92 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 93/96] ASoC: wm_adsp: Return an error on write to a disabled volatile control Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:41 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:42 ` [GIT PULL for-4.9 96/96] tools/power turbostat: bugfix: GFXMHz column not changing Levin, Alexander (Sasha Levin)
` (2 subsequent siblings)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:41 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Gwendal Grignou <gwendal@chromium.org>
[ Upstream commit d85fc67dd11e9a32966140677d4d6429ca540b25 ]
Without this patch, failed probe would not free resources like irq.
ata port tdev object currently hold a reference to the ata port
object. Therefore the ata port object release function will not get
called until the ata_tport_release is called. But that would never
happen, releasing the last reference of ata port dev is done by
scsi_host_release, which is called by ata_host_release when the ata
port object is released.
The ata device objects actually do not need to explicitly hold a
reference to their real counterpart, given the transport objects are
the children of these objects and device_add() is call for each child.
We know the parent will not be deleted until we call the child's
device_del().
Reported-by: Matthew Whitehead <tedheadster@gmail.com>
Tested-by: Matthew Whitehead <tedheadster@gmail.com>
Suggested-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
drivers/ata/libata-transport.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
index 7ef16c085058..20e2b7ad8925 100644
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -224,7 +224,6 @@ static DECLARE_TRANSPORT_CLASS(ata_port_class,
static void ata_tport_release(struct device *dev)
{
- put_device(dev->parent);
}
/**
@@ -284,7 +283,7 @@ int ata_tport_add(struct device *parent,
device_initialize(dev);
dev->type = &ata_port_type;
- dev->parent = get_device(parent);
+ dev->parent = parent;
dev->release = ata_tport_release;
dev_set_name(dev, "ata%d", ap->print_id);
transport_setup_device(dev);
@@ -348,7 +347,6 @@ static DECLARE_TRANSPORT_CLASS(ata_link_class,
static void ata_tlink_release(struct device *dev)
{
- put_device(dev->parent);
}
/**
@@ -410,7 +408,7 @@ int ata_tlink_add(struct ata_link *link)
int error;
device_initialize(dev);
- dev->parent = get_device(&ap->tdev);
+ dev->parent = &ap->tdev;
dev->release = ata_tlink_release;
if (ata_is_host_link(link))
dev_set_name(dev, "link%d", ap->print_id);
@@ -589,7 +587,6 @@ static DECLARE_TRANSPORT_CLASS(ata_dev_class,
static void ata_tdev_release(struct device *dev)
{
- put_device(dev->parent);
}
/**
@@ -662,7 +659,7 @@ static int ata_tdev_add(struct ata_device *ata_dev)
int error;
device_initialize(dev);
- dev->parent = get_device(&link->tdev);
+ dev->parent = &link->tdev;
dev->release = ata_tdev_release;
if (ata_is_host_link(link))
dev_set_name(dev, "dev%d.%d", ap->print_id,ata_dev->devno);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 96/96] tools/power turbostat: bugfix: GFXMHz column not changing
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (93 preceding siblings ...)
2017-09-24 18:41 ` [GIT PULL for-4.9 94/96] libata: transport: Remove circular dependency at free time Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:42 ` Levin, Alexander (Sasha Levin)
2017-09-24 18:42 ` [GIT PULL for-4.9 95/96] ARM: dts: BCM5301X: Fix memory start address Levin, Alexander (Sasha Levin)
2017-10-02 0:39 ` [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:42 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Len Brown <len.brown@intel.com>
[ Upstream commit 22048c5485503749754b3b5daf9d99ef89fcacdc ]
turbostat displays a GFXMHz column, which comes from reading
/sys/class/graphics/fb0/device/drm/card0/gt_cur_freq_mhz
But GFXMHz was not changing, even when a manual
cat /sys/class/graphics/fb0/device/drm/card0/gt_cur_freq_mhz
showed a new value.
It turns out that a rewind() on the open file is not sufficient,
fflush() (or a close/open) is needed to read fresh values.
Reported-by: Yaroslav Isakov <yaroslav.isakov@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/power/x86/turbostat/turbostat.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 3e199b508a96..9664b1ff4285 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2003,8 +2003,10 @@ int snapshot_gfx_mhz(void)
if (fp == NULL)
fp = fopen_or_die("/sys/class/graphics/fb0/device/drm/card0/gt_cur_freq_mhz", "r");
- else
+ else {
rewind(fp);
+ fflush(fp);
+ }
retval = fscanf(fp, "%d", &gfx_cur_mhz);
if (retval != 1)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* [GIT PULL for-4.9 95/96] ARM: dts: BCM5301X: Fix memory start address
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (94 preceding siblings ...)
2017-09-24 18:42 ` [GIT PULL for-4.9 96/96] tools/power turbostat: bugfix: GFXMHz column not changing Levin, Alexander (Sasha Levin)
@ 2017-09-24 18:42 ` Levin, Alexander (Sasha Levin)
2017-10-02 0:39 ` [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
96 siblings, 0 replies; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-09-24 18:42 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
From: Jon Mason <jon.mason@broadcom.com>
[ Upstream commit 88d1fa70c21d7b431386cfe70cdc514d98b0c9c4 ]
Memory starts at 0x80000000, not 0. 0 "works" due to mirrior of the
first 128M of RAM to that address. Anything greater than 128M will
quickly find nothing there. Correcting the starting address has
everything working again.
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
Fixes: 7eb05f6d ("ARM: dts: bcm5301x: Add BCM SVK DT files")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/arm/boot/dts/bcm953012k.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/bcm953012k.dts b/arch/arm/boot/dts/bcm953012k.dts
index 05a985a20378..6208e85acd9d 100644
--- a/arch/arm/boot/dts/bcm953012k.dts
+++ b/arch/arm/boot/dts/bcm953012k.dts
@@ -48,7 +48,7 @@
};
memory {
- reg = <0x00000000 0x10000000>;
+ reg = <0x80000000 0x10000000>;
};
};
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread* Re: [GIT PULL for-4.9 00/96] Commits for v4.9 LTS
2017-09-24 18:41 [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
` (95 preceding siblings ...)
2017-09-24 18:42 ` [GIT PULL for-4.9 95/96] ARM: dts: BCM5301X: Fix memory start address Levin, Alexander (Sasha Levin)
@ 2017-10-02 0:39 ` Levin, Alexander (Sasha Levin)
2017-10-02 6:33 ` gregkh
96 siblings, 1 reply; 101+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-10-02 0:39 UTC (permalink / raw)
To: gregkh@linuxfoundation.org; +Cc: stable@vger.kernel.org
Ping?
I was planning on doing weekly batches (~50 commits) for the foreseeable future, is there a schedule that'll work better with yours?
On Sun, Sep 24, 2017 at 02:39:54PM -0400, Sasha Levin wrote:
>Hi Greg,
>
>The following commits were sent for review 7+ days ago, and comments were addressed.
>
>Please pull for v4.9 LTS.
>
>===
>
>The following changes since commit 089d7720383d7bc9ca6b8824a05dfa66f80d1f41:
>
> Linux 4.9.51 (2017-09-20 08:20:15 +0200)
>
>are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git for-greg-4.9
>
>for you to fetch changes up to 58ddde00e60bbb32131a6935d5f2df438be9de13:
>
> tools/power turbostat: bugfix: GFXMHz column not changing (2017-09-24 14:26:22 -0400)
>
>----------------------------------------------------------------
>
>Afzal Mohammed (1):
> ARM: 8635/1: nommu: allow enabling REMAP_VECTORS_TO_RAM
>
>Alden Tondettar (1):
> partitions/efi: Fix integer overflow in GPT size calculation
>
>Alexander Potapenko (1):
> net/packet: check length in getsockopt() called with PACKET_HDRLEN
>
>Alexey Brodkin (1):
> serial: 8250_port: Remove dangerous pr_debug()
>
>Andreas Klinger (1):
> iio: adc: hx711: Add DT binding for avia,hx711
>
>Ansis Atteka (1):
> udp: disable inner UDP checksum offloads in IPsec case
>
>Arnd Bergmann (1):
> MIPS: Lantiq: Fix another request_mem_region() return code check
>
>Arvind Yadav (2):
> mips: ath79: clock:- Unmap region obtained by of_iomap
> parisc: perf: Fix potential NULL pointer dereference
>
>Axel Köllhofer (1):
> rtl8xxxu: Add additional USB IDs for rtl8192eu devices
>
>Bart Van Assche (2):
> IB/rxe: Add a runtime check in alloc_index()
> IB/rxe: Fix a MR reference leak in check_rkey()
>
>Bartlomiej Zolnierkiewicz (1):
> ARM: dts: exynos: Add CPU OPPs for Exynos4412 Prime
>
>Bartosz Golaszewski (1):
> drm: bridge: add DT bindings for TI ths8135
>
>Benjamin Tissoires (1):
> HID: wacom: release the resources before leaving despite devm
>
>Brian Starkey (2):
> drm: mali-dp: Fix destination size handling when rotating
> drm: mali-dp: Fix transposed horizontal/vertical flip
>
>Charles Keepax (1):
> ASoC: wm_adsp: Return an error on write to a disabled volatile control
>
>Christophe JAILLET (1):
> tty: goldfish: Fix a parameter of a call to free_irq
>
>Colin Ian King (1):
> MIPS: ralink: Fix incorrect assignment on ralink_soc
>
>Dan Carpenter (1):
> GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next
>
>Darrick J. Wong (1):
> xfs: remove kmem_zalloc_greedy
>
>David E. Box (1):
> spi: pxa2xx: Add support for Intel Gemini Lake
>
>Dou Liyang (1):
> x86/acpi: Restore the order of CPU IDs
>
>Edward Cree (1):
> sfc: get PIO buffer size from the NIC
>
>Feras Daoud (3):
> IB/ipoib: Fix deadlock over vlan_mutex
> IB/ipoib: rtnl_unlock can not come after free_netdev
> IB/ipoib: Replace list_del of the neigh->list with list_del_init
>
>Florian Fainelli (1):
> net: dsa: b53: Include IMP/CPU port in dumb forwarding mode
>
>Guenter Roeck (1):
> hwmon: (gl520sm) Fix overflows and crash seen when writing into limit
> attributes
>
>Guilherme G Piccoli (1):
> igb: re-assign hw address pointer on reset after PCI error
>
>Gwendal Grignou (1):
> libata: transport: Remove circular dependency at free time
>
>Hans de Goede (3):
> power: supply: axp288_fuel_gauge: Fix fuel_gauge_reg_readb return on
> error
> extcon: axp288: Use vbus-valid instead of -present to determine cable
> presence
> iio: adc: axp288: Drop bogus AXP288_ADC_TS_PIN_CTRL register
> modifications
>
>Heiner Kallweit (2):
> mmc: sdio: fix alignment issue in struct sdio_func
> i2c: meson: fix wrong variable usage in meson_i2c_put_data
>
>Ido Schimmel (1):
> bridge: netlink: register netdevice before executing changelink
>
>James Liao (1):
> arm: dts: mt2701: Add subsystem clock controller device nodes
>
>Jason Yan (1):
> nfs: make nfs4_cb_sv_ops static
>
>Javier Martinez Canillas (1):
> iio: adc: imx25-gcq: Fix module autoload
>
>Jiancheng Xue (1):
> reset: ti_syscon: fix a ti_syscon_reset_status issue
>
>Jitendra Bhivare (1):
> scsi: be2iscsi: Add checks to validate CID alloc/free
>
>Johan Hovold (2):
> USB: serial: mos7720: fix control-message error handling
> USB: serial: mos7840: fix control-message error handling
>
>John Crispin (2):
> MIPS: ralink: Fix a typo in the pinmux setup.
> usb: make the MTK XHCI driver compile for older MIPS SoCs
>
>Jon Mason (1):
> ARM: dts: BCM5301X: Fix memory start address
>
>Jose Abreu (1):
> clk/axs10x: Clear init field in driver probe
>
>Juerg Haefliger (1):
> lkdtm: Fix Oops when unloading the module
>
>Kristian H. Kristensen (1):
> drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define
>
>Laurent Dufour (1):
> mm/cgroup: avoid panic when init with low memory
>
>Len Brown (1):
> tools/power turbostat: bugfix: GFXMHz column not changing
>
>Linus Walleij (2):
> ASoC: dapm: handle probe deferrals
> ASoC: dapm: fix some pointer error handling
>
>Liping Zhang (2):
> netfilter: invoke synchronize_rcu after set the _hook_ to NULL
> netfilter: nfnl_cthelper: fix incorrect helper->expect_class_max
>
>Liu Bo (2):
> Btrfs: fix segmentation fault when doing dio read
> Btrfs: fix potential use-after-free for cloned bio
>
>Marcin Niestroj (1):
> ARM: dts: am335x-chilisom: Wakeup from RTC-only state by power on
> event
>
>Marcin Nowakowski (2):
> MIPS: fix mem=X@Y commandline processing
> MIPS: kexec: Do not reserve invalid crashkernel memory on boot
>
>Marek Szyprowski (1):
> iommu/exynos: Block SYSMMU while invalidating FLPD cache
>
>Mark Rutland (1):
> arm64: kasan: avoid bad virt_to_pfn()
>
>Markus Elfring (1):
> pinctrl: mvebu: Use seq_puts() in mvebu_pinconf_group_dbg_show()
>
>Matt Redfearn (2):
> MIPS: IRQ Stack: Unwind IRQ stack onto task stack
> MIPS: smp-cps: Fix retrieval of VPE mask on big endian CPUs
>
>Matwey V. Kornilov (1):
> serial: 8250: moxa: Store num_ports in brd
>
>Michal Kazior (1):
> ath10k: prevent sta pointer rcu violation
>
>Mike Galbraith (1):
> kasan: do not sanitize kexec purgatory
>
>Mike Kravetz (1):
> hugetlbfs: initialize shared policy as part of inode allocation
>
>Myungho Jung (1):
> net: core: Prevent from dereferencing null pointer when releasing SKB
>
>Nagaraju, Vathsala (1):
> drm/i915/psr: disable psr2 for resolution greater than 32X20
>
>Nathan Fontenot (1):
> ibmvnic: Free tx/rx scrq pointer array when releasing sub-crqs
>
>Niklas Söderlund (1):
> sh_eth: use correct name for ECMR_MPDE bit
>
>Oleksandr Tyshchenko (1):
> iommu/io-pgtable-arm: Check for leaf entry before dereferencing it
>
>Ondrej Jirman (1):
> clk: sunxi-ng: fix PLL_CPUX adjusting on H3
>
>Ondrej Zary (1):
> sata_via: Enable hotplug only on VT6421
>
>Pablo Neira Ayuso (1):
> netfilter: nf_tables: set pktinfo->thoff at AH header if found
>
>Pan Bian (2):
> drm/amdkfd: fix improper return value on error
> team: fix memory leaks
>
>Paul Burton (1):
> MIPS: Ensure bss section ends on a long-aligned address
>
>Peter Chen (1):
> usb: chipidea: vbus event may exist before starting gadget
>
>Rafael J. Wysocki (1):
> cpufreq: intel_pstate: Update pid_params.sample_rate_ns in
> pid_param_set()
>
>Randy Dunlap (1):
> drivers/rapidio/devices/tsi721.c: make module parameter variable name
> unique
>
>Richard Guy Briggs (1):
> audit: log 32-bit socketcalls
>
>Roman Spychała (1):
> usb: plusb: Add support for PL-27A1
>
>Sagi Grimberg (1):
> nvme-rdma: handle cpu unplug when re-establishing the controller
>
>Santosh Shilimkar (1):
> RDS: RDMA: Fix the composite message user notification
>
>Shaohua Li (1):
> md/raid10: submit bio directly to replacement disk
>
>Simon Horman (1):
> ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for msiof nodes
>
>Sricharan R (1):
> iommu/arm-smmu: Set privileged attribute to 'default' instead of
> 'unprivileged'
>
>Thibault Saunier (1):
> [media] exynos-gsc: Do not swap cb/cr for semi planar formats
>
>Ville Syrjälä (1):
> drm/i915: Fix the overlay frontbuffer tracking
>
>Zhu Yanjun (1):
> rds: ib: add error handle
>
>sudarsana.kalluru@cavium.com (1):
> qed: Fix possible system hang in the dcbnl-getdcbx() path.
>
> .../bindings/display/bridge/ti,ths8135.txt | 46 ++++++
> .../devicetree/bindings/iio/adc/avia-hx711.txt | 18 +++
> .../devicetree/bindings/vendor-prefixes.txt | 1 +
> arch/arm/Kconfig-nommu | 3 +-
> arch/arm/boot/dts/am335x-chilisom.dtsi | 8 +
> arch/arm/boot/dts/bcm953012k.dts | 2 +-
> arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 +-
> arch/arm/boot/dts/exynos4412-odroidu3.dts | 5 +-
> arch/arm/boot/dts/exynos4412-odroidx2.dts | 1 +
> arch/arm/boot/dts/exynos4412-prime.dtsi | 41 ++++++
> arch/arm/boot/dts/exynos4412.dtsi | 2 +-
> arch/arm/boot/dts/mt2701.dtsi | 36 +++++
> arch/arm/boot/dts/r8a7790.dtsi | 12 +-
> arch/arm64/mm/kasan_init.c | 2 +-
> arch/mips/ath79/clock.c | 7 +-
> arch/mips/include/asm/irq.h | 15 ++
> arch/mips/kernel/asm-offsets.c | 1 +
> arch/mips/kernel/cps-vec.S | 2 +-
> arch/mips/kernel/genex.S | 8 +-
> arch/mips/kernel/process.c | 56 ++++---
> arch/mips/kernel/setup.c | 9 ++
> arch/mips/kernel/vmlinux.lds.S | 2 +-
> arch/mips/lantiq/xway/sysctrl.c | 4 +-
> arch/mips/ralink/mt7620.c | 18 +--
> arch/mips/ralink/rt3883.c | 2 +-
> arch/parisc/kernel/perf.c | 94 ++++++------
> arch/x86/kernel/acpi/boot.c | 7 +-
> arch/x86/kernel/apic/apic.c | 26 +---
> arch/x86/purgatory/Makefile | 1 +
> block/partitions/efi.c | 17 ++-
> drivers/ata/libata-transport.c | 9 +-
> drivers/ata/sata_via.c | 18 ++-
> drivers/clk/axs10x/i2s_pll_clock.c | 1 +
> drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 ++
> drivers/cpufreq/intel_pstate.c | 1 +
> drivers/extcon/extcon-axp288.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +-
> drivers/gpu/drm/arm/malidp_planes.c | 13 +-
> drivers/gpu/drm/i915/intel_overlay.c | 64 +++++---
> drivers/gpu/drm/i915/intel_psr.c | 15 +-
> drivers/hid/wacom_sys.c | 2 +
> drivers/hwmon/gl520sm.c | 25 ++--
> drivers/i2c/busses/i2c-meson.c | 2 +-
> drivers/iio/adc/axp288_adc.c | 32 +---
> drivers/iio/adc/fsl-imx25-gcq.c | 1 +
> drivers/infiniband/sw/rxe/rxe_pool.c | 1 +
> drivers/infiniband/sw/rxe/rxe_resp.c | 20 +--
> drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 +-
> drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 10 +-
> drivers/iommu/arm-smmu.c | 2 +-
> drivers/iommu/exynos-iommu.c | 5 +-
> drivers/iommu/io-pgtable-arm.c | 6 +-
> drivers/md/raid10.c | 19 ++-
> drivers/media/platform/exynos-gsc/gsc-core.c | 2 -
> drivers/misc/lkdtm_core.c | 4 +-
> drivers/mmc/core/sdio_bus.c | 12 +-
> drivers/net/dsa/b53/b53_common.c | 10 ++
> drivers/net/dsa/b53/b53_regs.h | 4 +
> drivers/net/ethernet/ibm/ibmvnic.c | 2 +
> drivers/net/ethernet/intel/igb/igb_main.c | 5 +
> drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 +-
> drivers/net/ethernet/renesas/sh_eth.h | 2 +-
> drivers/net/ethernet/sfc/ef10.c | 16 +-
> drivers/net/ethernet/sfc/nic.h | 2 +
> drivers/net/ethernet/sfc/tx.c | 1 -
> drivers/net/team/team.c | 8 +-
> drivers/net/usb/Kconfig | 2 +-
> drivers/net/usb/plusb.c | 15 +-
> drivers/net/wireless/ath/ath10k/core.h | 1 +
> drivers/net/wireless/ath/ath10k/mac.c | 18 +++
> .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 7 +
> drivers/nvme/host/rdma.c | 28 ++--
> drivers/pinctrl/mvebu/pinctrl-mvebu.c | 9 +-
> drivers/power/supply/axp288_fuel_gauge.c | 4 +-
> drivers/rapidio/devices/tsi721.c | 4 +-
> drivers/rapidio/devices/tsi721.h | 4 +-
> drivers/reset/reset-ti-syscon.c | 4 +-
> drivers/scsi/be2iscsi/be_iscsi.c | 163 +++++++++++----------
> drivers/scsi/be2iscsi/be_main.c | 7 +-
> drivers/scsi/be2iscsi/be_main.h | 1 +
> drivers/spi/spi-pxa2xx.c | 4 +
> drivers/tty/goldfish.c | 2 +-
> drivers/tty/serial/8250/8250_moxa.c | 1 +
> drivers/tty/serial/8250/8250_port.c | 4 -
> drivers/usb/chipidea/otg.c | 17 ++-
> drivers/usb/host/Kconfig | 4 +-
> drivers/usb/serial/mos7720.c | 9 +-
> drivers/usb/serial/mos7840.c | 19 ++-
> fs/btrfs/inode.c | 8 +-
> fs/btrfs/volumes.c | 2 +-
> fs/gfs2/glock.c | 12 +-
> fs/hugetlbfs/inode.c | 25 ++--
> fs/nfs/callback.c | 4 +-
> fs/xfs/kmem.c | 18 ---
> fs/xfs/kmem.h | 2 -
> fs/xfs/xfs_itable.c | 6 +-
> include/linux/audit.h | 20 +++
> include/linux/mmc/sdio_func.h | 2 +-
> include/net/netfilter/nf_tables_ipv6.h | 6 +-
> include/uapi/drm/drm_fourcc.h | 1 +
> mm/memcontrol.c | 7 +-
> net/bridge/br_netlink.c | 7 +-
> net/compat.c | 17 ++-
> net/core/dev.c | 3 +
> net/ipv4/netfilter/nf_nat_snmp_basic.c | 1 +
> net/ipv4/udp_offload.c | 3 +
> net/netfilter/nf_conntrack_ecache.c | 2 +
> net/netfilter/nf_conntrack_netlink.c | 1 +
> net/netfilter/nf_nat_core.c | 2 +
> net/netfilter/nfnetlink_cthelper.c | 20 +--
> net/netfilter/nfnetlink_cttimeout.c | 2 +-
> net/packet/af_packet.c | 2 +
> net/rds/ib_cm.c | 47 ++++--
> net/rds/ib_send.c | 25 ++--
> net/rds/rdma.c | 10 ++
> net/rds/rds.h | 1 +
> net/rds/send.c | 4 +-
> sound/soc/codecs/wm_adsp.c | 7 +-
> sound/soc/soc-dapm.c | 62 ++++++++
> sound/soc/soc-topology.c | 9 ++
> tools/power/x86/turbostat/turbostat.c | 4 +-
> 121 files changed, 985 insertions(+), 474 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt
> create mode 100644 Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
> create mode 100644 arch/arm/boot/dts/exynos4412-prime.dtsi
>
>--
>2.11.0
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 101+ messages in thread* Re: [GIT PULL for-4.9 00/96] Commits for v4.9 LTS
2017-10-02 0:39 ` [GIT PULL for-4.9 00/96] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
@ 2017-10-02 6:33 ` gregkh
2017-10-03 13:02 ` gregkh
0 siblings, 1 reply; 101+ messages in thread
From: gregkh @ 2017-10-02 6:33 UTC (permalink / raw)
To: Levin, Alexander (Sasha Levin); +Cc: stable@vger.kernel.org
On Mon, Oct 02, 2017 at 12:39:29AM +0000, Levin, Alexander (Sasha Levin) wrote:
> Ping?
>
> I was planning on doing weekly batches (~50 commits) for the foreseeable future, is there a schedule that'll work better with yours?
Due to travel/conferences over the past few weeks, I'm a bit behind on
stable patches, so give me a chance to catch up :)
Yes, weekly batches is fine, as long as I can keep on top of them...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [GIT PULL for-4.9 00/96] Commits for v4.9 LTS
2017-10-02 6:33 ` gregkh
@ 2017-10-03 13:02 ` gregkh
2017-10-05 8:35 ` gregkh
0 siblings, 1 reply; 101+ messages in thread
From: gregkh @ 2017-10-03 13:02 UTC (permalink / raw)
To: Levin, Alexander (Sasha Levin); +Cc: stable@vger.kernel.org
On Mon, Oct 02, 2017 at 08:33:09AM +0200, gregkh@linuxfoundation.org wrote:
> On Mon, Oct 02, 2017 at 12:39:29AM +0000, Levin, Alexander (Sasha Levin) wrote:
> > Ping?
> >
> > I was planning on doing weekly batches (~50 commits) for the foreseeable future, is there a schedule that'll work better with yours?
>
> Due to travel/conferences over the past few weeks, I'm a bit behind on
> stable patches, so give me a chance to catch up :)
>
> Yes, weekly batches is fine, as long as I can keep on top of them...
I've caught up with everything else, so these three series will go into
the next release, after the ones that come out in a few days.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [GIT PULL for-4.9 00/96] Commits for v4.9 LTS
2017-10-03 13:02 ` gregkh
@ 2017-10-05 8:35 ` gregkh
0 siblings, 0 replies; 101+ messages in thread
From: gregkh @ 2017-10-05 8:35 UTC (permalink / raw)
To: Levin, Alexander (Sasha Levin); +Cc: stable@vger.kernel.org
On Tue, Oct 03, 2017 at 03:02:53PM +0200, gregkh@linuxfoundation.org wrote:
> On Mon, Oct 02, 2017 at 08:33:09AM +0200, gregkh@linuxfoundation.org wrote:
> > On Mon, Oct 02, 2017 at 12:39:29AM +0000, Levin, Alexander (Sasha Levin) wrote:
> > > Ping?
> > >
> > > I was planning on doing weekly batches (~50 commits) for the foreseeable future, is there a schedule that'll work better with yours?
> >
> > Due to travel/conferences over the past few weeks, I'm a bit behind on
> > stable patches, so give me a chance to catch up :)
> >
> > Yes, weekly batches is fine, as long as I can keep on top of them...
>
> I've caught up with everything else, so these three series will go into
> the next release, after the ones that come out in a few days.
All now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 101+ messages in thread