6.15.3-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 367/780 arm64: dts: mediatek: mt8195: Reparent vdec1/2 and venc1 power domains
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 394f29033324e2317bfd6a7ed99b9a60832b36a2 ]
By hardware, the first and second core of the video decoder IP need the VDEC_SOC to be powered up in order to be able to be accessed (both internally, by firmware, and externally, by the kernel).
Similarly, for the video encoder IP, the second core needs the first core to be powered up in order to be accessible.
Fix that by reparenting the VDEC1/2 power domains to be children of VDEC0 (VDEC_SOC), and the VENC1 to be a child of VENC0.
--- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 50 +++++++++++++----------- 1 file changed, 27 insertions(+), 23 deletions(-)
arch/arm64/boot/dts/mediatek/mt8195.dtsi +27 -23
@@ -617,22 +617,6 @@ #size-cells = <0>; #power-domain-cells = <1>; - power-domain@MT8195_POWER_DOMAIN_VDEC1 { - reg = <MT8195_POWER_DOMAIN_VDEC1>; - clocks = <&vdecsys CLK_VDEC_LARB1>; - clock-names = "vdec1-0"; - mediatek,infracfg = <&infracfg_ao>; - #power-domain-cells = <0>; - }; - - power-domain@MT8195_POWER_DOMAIN_VENC_CORE1 { - reg = <MT8195_POWER_DOMAIN_VENC_CORE1>; - clocks = <&vencsys_core1 CLK_VENC_CORE1_LARB>; - clock-names = "venc1-larb"; - mediatek,infracfg = <&infracfg_ao>; - #power-domain-cells = <0>; - }; - power-domain@MT8195_POWER_DOMAIN_VDOSYS0 { reg = <MT8195_POWER_DOMAIN_VDOSYS0>; clocks = <&topckgen CLK_TOP_CFG_VDO0>,
@@ -678,15 +662,25 @@ clocks = <&vdecsys_soc CLK_VDEC_SOC_LARB1>; clock-names = "vdec0-0"; mediatek,infracfg = <&infracfg_ao>; + #address-cells = <1>; + #size-cells = <0>; #power-domain-cells = <0>; - }; - power-domain@MT8195_POWER_DOMAIN_VDEC2 { - reg = <MT8195_POWER_DOMAIN_VDEC2>; - clocks = <&vdecsys_core1 CLK_VDEC_CORE1_LARB1>; - clock-names = "vdec2-0"; - mediatek,infracfg = <&infracfg_ao>; - #power-domain-cells = <0>; + power-domain@MT8195_POWER_DOMAIN_VDEC1 { + reg = <MT8195_POWER_DOMAIN_VDEC1>; + clocks = <&vdecsys CLK_VDEC_LARB1>; + clock-names = "vdec1-0"; + mediatek,infracfg = <&infracfg_ao>; + #power-domain-cells = <0>; + }; + + power-domain@MT8195_POWER_DOMAIN_VDEC2 { + reg = <MT8195_POWER_DOMAIN_VDEC2>; + clocks = <&vdecsys_core1 CLK_VDEC_CORE1_LARB1>; + clock-names = "vdec2-0"; + mediatek,infracfg = <&infracfg_ao>; + #power-domain-cells = <0>; + }; }; power-domain@MT8195_POWER_DOMAIN_VENC {
@@ -694,7 +688,17 @@ clocks = <&vencsys CLK_VENC_LARB>; clock-names = "venc0-larb"; mediatek,infracfg = <&infracfg_ao>; + #address-cells = <1>; + #size-cells = <0>; #power-domain-cells = <0>; + + power-domain@MT8195_POWER_DOMAIN_VENC_CORE1 { + reg = <MT8195_POWER_DOMAIN_VENC_CORE1>; + clocks = <&vencsys_core1 CLK_VENC_CORE1_LARB>; + clock-names = "venc1-larb"; + mediatek,infracfg = <&infracfg_ao>; + #power-domain-cells = <0>; + }; }; power-domain@MT8195_POWER_DOMAIN_VDOSYS1 {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 368/780 arm64: dts: qcom: sdm660-xiaomi-lavender: Add missing SD card detect GPIO
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Minnekhanov <[email protected]>
[ Upstream commit 2eca6af66709de0d1ba14cdf8b6d200a1337a3a2 ]
During initial porting these cd-gpios were missed. Having card detect is beneficial because driver does not need to do polling every second and it can just use IRQ. SD card detection in U-Boot is also fixed by this.
--- arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts +2 -0
@@ -404,6 +404,8 @@ &sdhc_2 { status = "okay"; + cd-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; + vmmc-supply = <&vreg_l5b_2p95>; vqmmc-supply = <&vreg_l2b_2p95>; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 369/780 firmware: exynos-acpm: fix reading longer results
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Draszik <[email protected]>
[ Upstream commit 67af3cd813695fd3e6432b0849c453250c4685aa ]
ACPM commands that return more than 8 bytes currently don't work correctly, as this driver ignores any such returned bytes.
This is evident in at least acpm_pmic_bulk_read(), where up to 8 registers can be read back and those 8 register values are placed starting at &xfer->rxd[8].
The reason is that xfter->rxlen is initialized with the size of a pointer (8 bytes), rather than the size of the byte array that pointer points to (16 bytes)
Update the code such that we set the number of bytes expected to be the size of the rx buffer.
Note1: While different commands have different lengths rx buffers, we have to specify the same length for all rx buffers since acpm_get_rx() assumes they're all the same length.
Note2: The different commands also have different lengths tx buffers, but before switching the code to use the minimum possible length, some more testing would have to be done to ensure this works correctly in all situations. It seems wiser to just apply this fix here without additional logic changes for now.
--- drivers/firmware/samsung/exynos-acpm-pmic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/firmware/samsung/exynos-acpm-pmic.c +8 -8
@@ -43,13 +43,13 @@ static inline u32 acpm_pmic_get_bulk(u32 data, unsigned int i)return (data >> (ACPM_PMIC_BULK_SHIFT * i)) &ACPM_PMIC_BULK_MASK ; } -static void acpm_pmic_set_xfer (struct acpm_xfer *xfer,u32 *cmd, +static void acpm_pmic_set_xfer (struct acpm_xfer *xfer,u32 *cmd,size_t cmdlen,unsigned int acpm_chan_id) { xfer->txd = cmd; xfer->rxd = cmd; - xfer->txlen =sizeof (cmd); - xfer->rxlen =sizeof (cmd); + xfer->txlen = cmdlen; + xfer->rxlen = cmdlen; xfer->acpm_chan_id = acpm_chan_id; }
@@ -71,7 +71,7 @@ int acpm_pmic_read_reg(const struct acpm_handle *handle,int ret;acpm_pmic_init_read_cmd (cmd, type, reg, chan); -acpm_pmic_set_xfer (&xfer, cmd, acpm_chan_id); +acpm_pmic_set_xfer (&xfer, cmd,sizeof (cmd), acpm_chan_id); ret =acpm_do_xfer (handle, &xfer);if (ret)
@@ -104,7 +104,7 @@ int acpm_pmic_bulk_read(const struct acpm_handle *handle,return -EINVAL ;acpm_pmic_init_bulk_read_cmd (cmd, type, reg, chan, count); -acpm_pmic_set_xfer (&xfer, cmd, acpm_chan_id); +acpm_pmic_set_xfer (&xfer, cmd,sizeof (cmd), acpm_chan_id); ret =acpm_do_xfer (handle, &xfer);if (ret)
@@ -144,7 +144,7 @@ int acpm_pmic_write_reg(const struct acpm_handle *handle,int ret;acpm_pmic_init_write_cmd (cmd, type, reg, chan, value); -acpm_pmic_set_xfer (&xfer, cmd, acpm_chan_id); +acpm_pmic_set_xfer (&xfer, cmd,sizeof (cmd), acpm_chan_id); ret =acpm_do_xfer (handle, &xfer);if (ret)
@@ -184,7 +184,7 @@ int acpm_pmic_bulk_write(const struct acpm_handle *handle,return -EINVAL ;acpm_pmic_init_bulk_write_cmd (cmd, type, reg, chan, count, buf); -acpm_pmic_set_xfer (&xfer, cmd, acpm_chan_id); +acpm_pmic_set_xfer (&xfer, cmd,sizeof (cmd), acpm_chan_id); ret =acpm_do_xfer (handle, &xfer);if (ret)
@@ -214,7 +214,7 @@ int acpm_pmic_update_reg(const struct acpm_handle *handle,int ret;acpm_pmic_init_update_cmd (cmd, type, reg, chan, value, mask); -acpm_pmic_set_xfer (&xfer, cmd, acpm_chan_id); +acpm_pmic_set_xfer (&xfer, cmd,sizeof (cmd), acpm_chan_id); ret =acpm_do_xfer (handle, &xfer);if (ret)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 370/780 firmware: exynos-acpm: silence EPROBE_DEFER error on boot
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Draszik <[email protected]>
[ Upstream commit 53734383a73888e6d765aa07f4523802fdf1ee10 ]
This driver emits error messages when client drivers are trying to get an interface handle to this driver here before this driver has completed _probe().
Given this driver returns -EPROBE_DEFER in that case, this is not an error and shouldn't be emitted to the log, similar to how dev_err_probe() behaves, so just remove them.
This change also allows us to simplify the logic around releasing of the acpm_np handle.
--- drivers/firmware/samsung/exynos-acpm.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/firmware/samsung/exynos-acpm.c +2 -9
@@ -696,24 +696,17 @@ static const struct acpm_handle *acpm_get_by_phandle(struct device *dev,return ERR_PTR (-ENODEV ); pdev =of_find_device_by_node (acpm_np); -if (!pdev) { -dev_err (dev,"Cannot find device node %s\n" , acpm_np->name); -of_node_put (acpm_np); -return ERR_PTR (-EPROBE_DEFER ); - } -of_node_put (acpm_np); +if (!pdev) +return ERR_PTR (-EPROBE_DEFER ); acpm =platform_get_drvdata (pdev);if (!acpm) { -dev_err (dev,"Cannot get drvdata from %s\n" , -dev_name (&pdev->dev));platform_device_put (pdev);return ERR_PTR (-EPROBE_DEFER ); }if (!try_module_get (pdev->dev.driver->owner)) { -dev_err (dev,"Cannot get module reference.\n" );platform_device_put (pdev);return ERR_PTR (-EPROBE_DEFER ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 371/780 arm64: dts: mt8183: Add port node to mt8183.dtsi
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pin-yen Lin <[email protected]>
[ Upstream commit d15059f7be59f887c1a370037cc2337c2ff2ad56 ]
Add the port node to fix the binding schema check. Also update mt8183-kukui to reference the new port node.
--- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 10 +++------- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 4 ++++ 2 files changed, 7 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +3 -7
@@ -259,14 +259,10 @@ }; }; }; +}; - ports { - port { - dsi_out: endpoint { - remote-endpoint = <&panel_in>; - }; - }; - }; +&dsi_out { + remote-endpoint = <&panel_in>; }; &gic {
arch/arm64/boot/dts/mediatek/mt8183.dtsi +4 -0
@@ -1836,6 +1836,10 @@ phys = <&mipi_tx0>; phy-names = "dphy"; status = "disabled"; + + port { + dsi_out: endpoint { }; + }; }; dpi0: dpi@14015000 {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 372/780 arm64: dts: imx8mm-beacon: Fix RTC capacitive load
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 2e98d456666d63f897ba153210bcef9d78ba0f3a ]
Although not noticeable when used every day, the RTC appears to drift when left to sit over time. This is due to the capacitive load not being properly set. Fix RTC drift by correcting the capacitive load setting from 7000 to 12500, which matches the actual hardware configuration.
--- arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi +1 -0
@@ -233,6 +233,7 @@ rtc: rtc@51 { compatible = "nxp,pcf85263"; reg = <0x51>; + quartz-load-femtofarads = <12500>; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 373/780 arm64: dts: imx8mn-beacon: Fix RTC capacitive load
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit c3f03bec30efd5082b55876846d57b5d17dae7b9 ]
Although not noticeable when used every day, the RTC appears to drift when left to sit over time. This is due to the capacitive load not being properly set. Fix RTC drift by correcting the capacitive load setting from 7000 to 12500, which matches the actual hardware configuration.
--- arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi +1 -0
@@ -242,6 +242,7 @@ rtc: rtc@51 { compatible = "nxp,pcf85263"; reg = <0x51>; + quartz-load-femtofarads = <12500>; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 374/780 arm64: dts: imx8mp-beacon: Fix RTC capacitive load
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 6821ee17537938e919e8b86a541aae451f73165b ]
Although not noticeable when used every day, the RTC appears to drift when left to sit over time. This is due to the capacitive load not being properly set. Fix RTC drift by correcting the capacitive load setting from 7000 to 12500, which matches the actual hardware configuration.
--- arch/arm64/boot/dts/freescale/imx8mp-beacon-som.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mp-beacon-som.dtsi +1 -0
@@ -257,6 +257,7 @@ rtc: rtc@51 { compatible = "nxp,pcf85263"; reg = <0x51>; + quartz-load-femtofarads = <12500>; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 375/780 arm64: dts: imx8mm-beacon: Set SAI5 MCLK direction to output for HDMI audio
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 8c716f80dfe8cd6ed9a2696847cea1affeeff6ff ]
The HDMI bridge chip fails to generate an audio source due to the SAI5 master clock (MCLK) direction not being set to output. This prevents proper clocking of the HDMI audio interface.
Add the fsl,sai-mclk-direction-output property to the SAI5 node to ensure the MCLK is driven by the SoC, resolving the HDMI sound issue.
--- arch/arm64/boot/dts/freescale/imx8mm-beacon-kit.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mm-beacon-kit.dts +1 -0
@@ -124,6 +124,7 @@ assigned-clock-parents = <&clk IMX8MM_AUDIO_PLL1_OUT>; assigned-clock-rates = <24576000>; #sound-dai-cells = <0>; + fsl,sai-mclk-direction-output; status = "okay"; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 376/780 arm64: dts: imx8mn-beacon: Set SAI5 MCLK direction to output for HDMI audio
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit a747c4dd2a60c4d0179b372032a4b98548135096 ]
The HDMI bridge chip fails to generate an audio source due to the SAI5 master clock (MCLK) direction not being set to output. This prevents proper clocking of the HDMI audio interface.
Add the fsl,sai-mclk-direction-output property to the SAI5 node to ensure the MCLK is driven by the SoC, resolving the HDMI sound issue.
--- arch/arm64/boot/dts/freescale/imx8mn-beacon-kit.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mn-beacon-kit.dts +1 -0
@@ -124,6 +124,7 @@ assigned-clock-parents = <&clk IMX8MN_AUDIO_PLL1_OUT>; assigned-clock-rates = <24576000>; #sound-dai-cells = <0>; + fsl,sai-mclk-direction-output; status = "okay"; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 377/780 arm64: dts: mediatek: mt6357: Drop regulator-fixed compatibles
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit d77e89b7b03fb945b4353f2dcc4a70b34baa7bcb ]
Some of the regulators in the MT6357 PMIC dtsi have compatible set to regulator-fixed, even though they don't serve any purpose: all those regulators are handled as a whole by the mt6357-regulator driver. In fact this is the only dtsi in this family of chips where this is the
case: mt6359 and mt6358 don't have any such compatibles.
A side-effect caused by this is that the DT kselftest, which is supposed to identify nodes with compatibles that can be probed, but haven't, shows these nodes as failures.
Remove the useless compatibles to move the dtsi in line with the others in its family and fix the DT kselftest failures.
--- arch/arm64/boot/dts/mediatek/mt6357.dtsi | 10 ---------- 1 file changed, 10 deletions(-)
arch/arm64/boot/dts/mediatek/mt6357.dtsi +0 -10
@@ -60,7 +60,6 @@ }; mt6357_vfe28_reg: ldo-vfe28 { - compatible = "regulator-fixed"; regulator-name = "vfe28"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
@@ -75,7 +74,6 @@ }; mt6357_vrf18_reg: ldo-vrf18 { - compatible = "regulator-fixed"; regulator-name = "vrf18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -83,7 +81,6 @@ }; mt6357_vrf12_reg: ldo-vrf12 { - compatible = "regulator-fixed"; regulator-name = "vrf12"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
@@ -112,7 +109,6 @@ }; mt6357_vcn28_reg: ldo-vcn28 { - compatible = "regulator-fixed"; regulator-name = "vcn28"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
@@ -120,7 +116,6 @@ }; mt6357_vcn18_reg: ldo-vcn18 { - compatible = "regulator-fixed"; regulator-name = "vcn18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -142,7 +137,6 @@ }; mt6357_vcamio_reg: ldo-vcamio18 { - compatible = "regulator-fixed"; regulator-name = "vcamio"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -175,7 +169,6 @@ }; mt6357_vaux18_reg: ldo-vaux18 { - compatible = "regulator-fixed"; regulator-name = "vaux18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -183,7 +176,6 @@ }; mt6357_vaud28_reg: ldo-vaud28 { - compatible = "regulator-fixed"; regulator-name = "vaud28"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
@@ -191,7 +183,6 @@ }; mt6357_vio28_reg: ldo-vio28 { - compatible = "regulator-fixed"; regulator-name = "vio28"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
@@ -199,7 +190,6 @@ }; mt6357_vio18_reg: ldo-vio18 { - compatible = "regulator-fixed"; regulator-name = "vio18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 378/780 arm64: dts: mediatek: mt8390-genio-common: Set ssusb2 default dual role mode to host
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Louis-Alexis Eyraud <[email protected]>
[ Upstream commit f9167f15dd4e70b124023a2f7ba2b09401b3b6ff ]
On the Mediatek Genio 510-EVK and 700-EVK boards, ssusb2 controller is one but has two ports: one is routed to the M.2 slot, the other is on the RPi header who does support full OTG.
Since Mediatek Genio 700-EVK USB support was added, dual role mode property is set to otg for ssusb2. This config prevents the M.2 Wifi/Bluetooth module, present on those boards and exposing Bluetooth as an USB device to be properly detected at startup as the default role is device.
To keep the OTG functionality and make the M.2 module be detected at the same time, add role-switch-default-mode property set to host and also fix the polarity of GPIO associated to the USB connector, so the ssusb2 controller role is properly set to host when the other port is unused.
--- .../arm64/boot/dts/mediatek/mt8390-genio-common.dtsi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi +11 -1
@@ -1199,8 +1199,18 @@ }; &ssusb2 { + /* + * the ssusb2 controller is one but we got two ports : one is routed + * to the M.2 slot, the other is on the RPi header who does support + * full OTG. + * As the controller is shared between them, the role switch default + * mode is set to host to make any peripheral inserted in the M.2 + * slot (i.e BT/WIFI module) be detected when the other port is + * unused. + */ dr_mode = "otg"; maximum-speed = "high-speed"; + role-switch-default-mode = "host"; usb-role-switch; vusb33-supply = <&mt6359_vusb_ldo_reg>; wakeup-source;
@@ -1211,7 +1221,7 @@ connector { compatible = "gpio-usb-b-connector", "usb-b-connector"; type = "micro"; - id-gpios = <&pio 89 GPIO_ACTIVE_HIGH>; + id-gpios = <&pio 89 GPIO_ACTIVE_LOW>; vbus-supply = <&usb_p2_vbus>; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 379/780 arm64: dts: mt6359: Add missing compatible property to regulators node
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Julien Massot <[email protected]>
[ Upstream commit 1fe38d2a19950fa6dbc384ee8967c057aef9faf4 ]
The 'compatible' property is required by the 'mfd/mediatek,mt6397.yaml' binding. Add it to fix the following dtb-check error:
mediatek/mt8395-radxa-nio-12l.dtb: pmic: regulators:
'compatible' is a required property
--- arch/arm64/boot/dts/mediatek/mt6359.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/mediatek/mt6359.dtsi +2 -0
@@ -20,6 +20,8 @@ }; regulators { + compatible = "mediatek,mt6359-regulator"; + mt6359_vs1_buck_reg: buck_vs1 { regulator-name = "vs1"; regulator-min-microvolt = <800000>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 380/780 arm64: dts: qcom: sdm660-lavender: Add missing USB phy supply
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Minnekhanov <[email protected]>
[ Upstream commit dbf62a117a1b7f605a98dd1fd1fd6c85ec324ea0 ]
Fixes the following dtbs check error:
phy@c012000: 'vdda-pll-supply' is a required property
--- arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts +1 -0
@@ -107,6 +107,7 @@ status = "okay"; vdd-supply = <&vreg_l1b_0p925>; + vdda-pll-supply = <&vreg_l10a_1p8>; vdda-phy-dpdm-supply = <&vreg_l7b_3p125>; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 381/780 arm64: dts: qcom: sda660-ifc6560: Fix dt-validate warning
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Minnekhanov <[email protected]>
[ Upstream commit f5110806b41eaa0eb0ab1bf2787876a580c6246c ]
If you remove clocks property, you should remove clock-names, too. Fixes warning with dtbs check:
'clocks' is a dependency of 'clock-names'
--- arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts +2 -0
@@ -175,6 +175,7 @@ * BAM DMA interconnects support is in place. */ /delete-property/ clocks; + /delete-property/ clock-names; }; &blsp1_uart2 {
@@ -187,6 +188,7 @@ * BAM DMA interconnects support is in place. */ /delete-property/ clocks; + /delete-property/ clock-names; }; &blsp2_uart1 {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 382/780 arm64: dts: qcom: x1e001de-devkit: Describe USB retimers resets pin configs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abel Vesa <[email protected]>
[ Upstream commit f76fdcd2550991c854a698a9f881b1579455fc0a ]
Currently, on the X Elite Devkit, the pin configuration of the reset gpios for all three PS8830 USB retimers are left configured by the bootloader.
Fix that by describing their pin configuration.
--- arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 32 ++++++++++++++++++++ 1 file changed, 32 insertions(+)
arch/arm64/boot/dts/qcom/x1e001de-devkit.dts +32 -0
@@ -790,6 +790,9 @@ reset-gpios = <&tlmm 185 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&rtmr2_default>; + pinctrl-names = "default"; + orientation-switch; retimer-switch;
@@ -845,6 +848,9 @@ reset-gpios = <&pm8550_gpios 10 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&rtmr0_default>; + pinctrl-names = "default"; + retimer-switch; orientation-switch;
@@ -900,6 +906,9 @@ reset-gpios = <&tlmm 176 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&rtmr1_default>; + pinctrl-names = "default"; + retimer-switch; orientation-switch;
@@ -1018,6 +1027,15 @@ }; &pm8550_gpios { + rtmr0_default: rtmr0-reset-n-active-state { + pins = "gpio10"; + function = "normal"; + power-source = <1>; /* 1.8 V */ + bias-disable; + input-disable; + output-enable; + }; + usb0_3p3_reg_en: usb0-3p3-reg-en-state { pins = "gpio11"; function = "normal";
@@ -1205,6 +1223,20 @@ }; }; + rtmr1_default: rtmr1-reset-n-active-state { + pins = "gpio176"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + rtmr2_default: rtmr2-reset-n-active-state { + pins = "gpio185"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + rtmr1_1p15_reg_en: rtmr1-1p15-reg-en-state { pins = "gpio188"; function = "gpio";
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 383/780 arm64: dts: qcom: x1e001de-devkit: Fix pin config for USB0 retimer vregs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abel Vesa <[email protected]>
[ Upstream commit 635d0c8edf26994dc1dcbc09add9423aa61869b0 ]
Describe the missing power source, bias and direction for each of the USB0 retimer gpio-controlled voltage regulators related pin configuration.
--- arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/qcom/x1e001de-devkit.dts +12 -0
@@ -1039,6 +1039,10 @@ usb0_3p3_reg_en: usb0-3p3-reg-en-state { pins = "gpio11"; function = "normal"; + power-source = <1>; /* 1.8 V */ + bias-disable; + input-disable; + output-enable; }; };
@@ -1046,6 +1050,10 @@ usb0_pwr_1p15_en: usb0-pwr-1p15-en-state { pins = "gpio8"; function = "normal"; + power-source = <1>; /* 1.8 V */ + bias-disable; + input-disable; + output-enable; }; };
@@ -1053,6 +1061,10 @@ usb0_1p8_reg_en: usb0-1p8-reg-en-state { pins = "gpio8"; function = "normal"; + power-source = <1>; /* 1.8 V */ + bias-disable; + input-disable; + output-enable; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 384/780 arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Robinson <[email protected]>
[ Upstream commit a706a593cb19796f31d3a888423ef1a71885ae72 ]
As described in the radxa_rock_3c_v1400_schematic.pdf, the SPI Flash's VCC connector is connected to VCCIO_FLASH and according to the that same schematic, that belongs to the VCC_1V8 power source.
This fixes the following warning:
spi-nor spi4.0: supply vcc not found, using dummy regulator
--- arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts +1 -0
@@ -636,6 +636,7 @@ spi-max-frequency = <104000000>; spi-rx-bus-width = <4>; spi-tx-bus-width = <1>; + vcc-supply = <&vcc_1v8>; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 385/780 arm64: dts: allwinner: a100: set maximum MMC frequency
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andre Przywara <[email protected]>
[ Upstream commit d8f10550448b03d3c5c6d9392119205c65ebfc89 ]
The manual for the Allwinner A133 SoC mentions that the maximum supported MMC frequency is 150 MHz, for all of the MMC devices.
Describe that in the DT entry, to help drivers setting the right interface frequency.
--- arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi +3 -0
@@ -252,6 +252,7 @@ interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; + max-frequency = <150000000>; status = "disabled"; #address-cells = <1>; #size-cells = <0>;
@@ -267,6 +268,7 @@ interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; + max-frequency = <150000000>; status = "disabled"; #address-cells = <1>; #size-cells = <0>;
@@ -282,6 +284,7 @@ interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; + max-frequency = <150000000>; status = "disabled"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 386/780 arm64: dts: rockchip: Update eMMC for NanoPi R5 series
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Robinson <[email protected]>
[ Upstream commit 8eca9e979a1efbcc3d090f6eb3f4da621e7c87e0 ]
Add the 3.3v and 1.8v regulators that are connected to the eMMC on the R5 series devices, as well as adding the eMMC data strobe, and enable eMMC HS200 mode as the Foresee FEMDNN0xxG-A3A55 modules support it.
--- arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi +4 -1
@@ -486,9 +486,12 @@ &sdhci { bus-width = <8>; max-frequency = <200000000>; + mmc-hs200-1_8v; non-removable; pinctrl-names = "default"; - pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&vcc_1v8>; status = "okay"; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 387/780 arm64: dts: renesas: white-hawk-single: Improve Ethernet TSN description
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 8ffec7d62c6956199f442dac3b2d5d02231c3977 ]
- Add the missing "ethernet3" alias for the Ethernet TSN port, so U-Boot will fill its local-mac-address property based on the "eth3addr" environment variable (if set), avoiding a random MAC address being assigned by the OS,
- Rename the numerical Ethernet PHY label to "tsn0_phy", to avoid future conflicts, and for consistency with the "avbN_phy" labels.
--- arch/arm64/boot/dts/renesas/white-hawk-single.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/white-hawk-single.dtsi +6 -2
@@ -11,6 +11,10 @@ / { model = "Renesas White Hawk Single board"; compatible = "renesas,white-hawk-single"; + + aliases { + ethernet3 = &tsn0; + }; }; &hscif0 {
@@ -53,7 +57,7 @@ pinctrl-0 = <&tsn0_pins>; pinctrl-names = "default"; phy-mode = "rgmii"; - phy-handle = <&phy3>; + phy-handle = <&tsn0_phy>; status = "okay"; mdio {
@@ -63,7 +67,7 @@ reset-gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; reset-post-delay-us = <4000>; - phy3: ethernet-phy@0 { + tsn0_phy: ethernet-phy@0 { compatible = "ethernet-phy-id002b.0980", "ethernet-phy-ieee802.3-c22"; reg = <0>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 388/780 arm64: tegra: Drop remaining serial clock-names and reset-names
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Kling <[email protected]>
[ Upstream commit 4cd763297c2203c6ba587d7d4a9105f96597b998 ]
The referenced commit only removed some of the names, missing all that weren't in use at the time. The commit removes the rest.
--- arch/arm64/boot/dts/nvidia/tegra186.dtsi | 12 ------------ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 12 ------------ 2 files changed, 24 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +0 -12
@@ -621,9 +621,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA186_CLK_UARTB>; - clock-names = "serial"; resets = <&bpmp TEGRA186_RESET_UARTB>; - reset-names = "serial"; status = "disabled"; };
@@ -633,9 +631,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA186_CLK_UARTD>; - clock-names = "serial"; resets = <&bpmp TEGRA186_RESET_UARTD>; - reset-names = "serial"; status = "disabled"; };
@@ -645,9 +641,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA186_CLK_UARTE>; - clock-names = "serial"; resets = <&bpmp TEGRA186_RESET_UARTE>; - reset-names = "serial"; status = "disabled"; };
@@ -657,9 +651,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA186_CLK_UARTF>; - clock-names = "serial"; resets = <&bpmp TEGRA186_RESET_UARTF>; - reset-names = "serial"; status = "disabled"; };
@@ -1236,9 +1228,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA186_CLK_UARTC>; - clock-names = "serial"; resets = <&bpmp TEGRA186_RESET_UARTC>; - reset-names = "serial"; status = "disabled"; };
@@ -1248,9 +1238,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA186_CLK_UARTG>; - clock-names = "serial"; resets = <&bpmp TEGRA186_RESET_UARTG>; - reset-names = "serial"; status = "disabled"; };
arch/arm64/boot/dts/nvidia/tegra194.dtsi +0 -12
@@ -766,9 +766,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA194_CLK_UARTD>; - clock-names = "serial"; resets = <&bpmp TEGRA194_RESET_UARTD>; - reset-names = "serial"; status = "disabled"; };
@@ -778,9 +776,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA194_CLK_UARTE>; - clock-names = "serial"; resets = <&bpmp TEGRA194_RESET_UARTE>; - reset-names = "serial"; status = "disabled"; };
@@ -790,9 +786,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA194_CLK_UARTF>; - clock-names = "serial"; resets = <&bpmp TEGRA194_RESET_UARTF>; - reset-names = "serial"; status = "disabled"; };
@@ -817,9 +811,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA194_CLK_UARTH>; - clock-names = "serial"; resets = <&bpmp TEGRA194_RESET_UARTH>; - reset-names = "serial"; status = "disabled"; };
@@ -1616,9 +1608,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA194_CLK_UARTC>; - clock-names = "serial"; resets = <&bpmp TEGRA194_RESET_UARTC>; - reset-names = "serial"; status = "disabled"; };
@@ -1628,9 +1618,7 @@ reg-shift = <2>; interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA194_CLK_UARTG>; - clock-names = "serial"; resets = <&bpmp TEGRA194_RESET_UARTG>; - reset-names = "serial"; status = "disabled"; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 389/780 arm64: tegra: Add uartd serial alias for Jetson TX1 module
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Kling <[email protected]>
[ Upstream commit dfb25484bd73c8590954ead6fd58a1587ba3bbc5 ]
If a serial-tegra interface does not have an alias, the driver fails to probe with an error:
serial-tegra 70006300.serial: failed to get alias id, errno -19 This prevents the bluetooth device from being accessible.
--- arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +1 -0
@@ -11,6 +11,7 @@ rtc0 = "/i2c@7000d000/pmic@3c"; rtc1 = "/rtc@7000e000"; serial0 = &uarta; + serial3 = &uartd; }; chosen {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 390/780 arm64: dts: ti: k3-j721e-common-proc-board: Enable OSPI1 on J721E
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prasanth Babu Mantena <[email protected]>
[ Upstream commit 6b8deb2ff0d31848c43a73f6044e69ba9276b3ec ]
J721E SoM has MT25QU512AB Serial NOR flash connected to OSPI1 controller. Enable ospi1 node in device tree.
--- arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +1 -0
@@ -573,6 +573,7 @@ &ospi1 { pinctrl-names = "default"; pinctrl-0 = <&mcu_fss0_ospi1_pins_default>; + status = "okay"; flash@0 { compatible = "jedec,spi-nor";
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 391/780 soc: qcom: smp2p: Fix fallback to qcom,ipc parse
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Barnabás Czémán <[email protected]>
[ Upstream commit 421777a02bbd9cdabe0ae05a69ee06253150589d ]
mbox_request_channel() returning value was changed in case of error. It uses returning value of of_parse_phandle_with_args().
It is returning with -ENOENT instead of -ENODEV when no mboxes property exists.
--- drivers/soc/qcom/smp2p.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/smp2p.c +1 -1
@@ -575,7 +575,7 @@ static int qcom_smp2p_probe(struct platform_device *pdev) smp2p->mbox_client.knows_txdone = true; smp2p->mbox_chan =mbox_request_channel (&smp2p->mbox_client,0 );if (IS_ERR (smp2p->mbox_chan)) { -if (PTR_ERR (smp2p->mbox_chan) != -ENODEV ) +if (PTR_ERR (smp2p->mbox_chan) != -ENOENT )return PTR_ERR (smp2p->mbox_chan); smp2p->mbox_chan =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 392/780 Squashfs: check return result of sb_min_blocksize
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phillip Lougher <[email protected]>
[ Upstream commit 734aa85390ea693bb7eaf2240623d41b03705c84 ]
Syzkaller reports an "UBSAN: shift-out-of-bounds in squashfs_bio_read" bug.
Syzkaller forks multiple processes which after mounting the Squashfs filesystem, issues an ioctl("/dev/loop0", LOOP_SET_BLOCK_SIZE, 0x8000). Now if this ioctl occurs at the same time another process is in the process of mounting a Squashfs filesystem on /dev/loop0, the failure occurs. When this happens the following code in squashfs_fill_super() fails.
----msblk->devblksize = sb_min_blocksize(sb, SQUASHFS_DEVBLK_SIZE); msblk->devblksize_log2 = ffz(~msblk->devblksize);
----
sb_min_blocksize() returns 0, which means msblk->devblksize is set to 0.
As a result, ffz(~msblk->devblksize) returns 64, and msblk->devblksize_log2 is set to 64.
This subsequently causes the
UBSAN: shift-out-of-bounds in fs/squashfs/block.c:195:36
shift exponent 64 is too large for 64-bit type 'u64' (aka 'unsigned long long')
This commit adds a check for a 0 return by sb_min_blocksize().
--- fs/squashfs/super.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/squashfs/super.c +5 -0
@@ -202,6 +202,11 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc) msblk->panic_on_errors = (opts->errors == Opt_errors_panic); msblk->devblksize =sb_min_blocksize (sb,SQUASHFS_DEVBLK_SIZE ); +if (!msblk->devblksize) { +errorf (fc,"squashfs: unable to set blocksize\n" ); +return -EINVAL ; + } + msblk->devblksize_log2 =ffz (~msblk->devblksize);mutex_init (&msblk->meta_index_mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 393/780 ocfs2: fix possible memory leak in ocfs2_finish_quota_recovery
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Murad Masimov <[email protected]>
[ Upstream commit cdc3ed3035d0fe934aa1d9b78ce256752fd3bb7d ]
If ocfs2_finish_quota_recovery() exits due to an error before passing all rc_list elements to ocfs2_recover_local_quota_file() then it can lead to a memory leak as rc_list may still contain elements that have to be freed.
Release all memory allocated by ocfs2_add_recovery_chunk() using ocfs2_free_quota_recovery() instead of kfree().
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- fs/ocfs2/quota_local.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/quota_local.c +1 -1
@@ -674,7 +674,7 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb,break ; } out: -kfree (rec); +ocfs2_free_quota_recovery (rec);return status; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 394/780 nilfs2: add pointer check for nilfs_direct_propagate()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
[ Upstream commit f43f02429295486059605997bc43803527d69791 ]
Patch series "nilfs2: improve sanity checks in dirty state propagation".
This fixes one missed check for block mapping anomalies and one improper return of an error code during a preparation step for log writing, thereby improving checking for filesystem corruption on writeback.
This patch (of 2):
In nilfs_direct_propagate(), the printer get from nilfs_direct_get_ptr() need to be checked to ensure it is not an invalid pointer.
If the pointer value obtained by nilfs_direct_get_ptr() is NILFS_BMAP_INVALID_PTR, means that the metadata (in this case, i_bmap in the nilfs_inode_info struct) that should point to the data block at the buffer head of the argument is corrupted and the data block is orphaned, meaning that the file system has lost consistency.
Add a value check and return -EINVAL when it is an invalid pointer.
--- fs/nilfs2/direct.c | 3 +++ 1 file changed, 3 insertions(+)
fs/nilfs2/direct.c +3 -0
@@ -273,6 +273,9 @@ static int nilfs_direct_propagate(struct nilfs_bmap *bmap, dat =nilfs_bmap_get_dat (bmap); key =nilfs_bmap_data_get_key (bmap, bh); ptr =nilfs_direct_get_ptr (bmap, key); +if (ptr ==NILFS_BMAP_INVALID_PTR ) +return -EINVAL ; +if (!buffer_nilfs_volatile (bh)) { oldreq.pr_entry_nr = ptr; newreq.pr_entry_nr = ptr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 395/780 nilfs2: do not propagate ENOENT error from nilfs_btree_propagate()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit 8e39fbb1edbb4ec9d7c1124f403877fc167fcecd ]
In preparation for writing logs, in nilfs_btree_propagate(), which makes parent and ancestor node blocks dirty starting from a modified data block or b-tree node block, if the starting block does not belong to the b-tree, i.e. is isolated, nilfs_btree_do_lookup() called within the function fails with -ENOENT.
In this case, even though -ENOENT is an internal code, it is propagated to the log writer via nilfs_bmap_propagate() and may be erroneously returned to system calls such as fsync().
Fix this issue by changing the error code to -EINVAL in this case, and having the bmap layer detect metadata corruption and convert the error code appropriately.
--- fs/nilfs2/btree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nilfs2/btree.c +3 -1
@@ -2102,11 +2102,13 @@ static int nilfs_btree_propagate(struct nilfs_bmap *btree, ret =nilfs_btree_do_lookup (btree, path, key,NULL , level +1 ,0 );if (ret <0 ) { -if (unlikely (ret == -ENOENT )) +if (unlikely (ret == -ENOENT )) {nilfs_crit (btree->b_inode->i_sb,"writing node/leaf block does not appear in b-tree (ino=%lu) at key=%llu, level=%d" , btree->b_inode->i_ino, (unsigned long long )key, level); + ret = -EINVAL ; + } goto out; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 396/780 bus: fsl-mc: fix double-free on mc_dev
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ioana Ciornei <[email protected]>
[ Upstream commit d694bf8a9acdbd061596f3e7549bc8cb70750a60 ]
The blamed commit tried to simplify how the deallocations are done but, in the process, introduced a double-free on the mc_dev variable.
In case the MC device is a DPRC, a new mc_bus is allocated and the mc_dev variable is just a reference to one of its fields. In this circumstance, on the error path only the mc_bus should be freed.
This commit introduces back the following checkpatch warning which is a false-positive.
WARNING: kfree(NULL) is safe and this check is probably not required
+ if (mc_bus)
+ kfree(mc_bus);
--- drivers/bus/fsl-mc/fsl-mc-bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/bus/fsl-mc/fsl-mc-bus.c +4 -2
@@ -906,8 +906,10 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc, error_cleanup_dev:kfree (mc_dev->regions); -kfree (mc_bus); -kfree (mc_dev); +if (mc_bus) +kfree (mc_bus); +else +kfree (mc_dev);return error; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 397/780 bus: fsl_mc: Fix driver_managed_dma check
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Murphy <[email protected]>
[ Upstream commit 152f33ee30ee6a7f4c15bedd7529dc5945315547 ]
Since it's not currently safe to take device_lock() in the IOMMU probe path, that can race against really_probe() setting dev->driver before attempting to bind. The race itself isn't so bad, since we're only concerned with dereferencing dev->driver itself anyway, but sadly my attempt to implement the check with minimal churn leads to a kind of TOCTOU issue, where dev->driver becomes valid after to_fsl_mc_driver(NULL) is already computed, and thus the check fails to work as intended.
Will and I both hit this with the platform bus, but the pattern here is the same, so fix it for correctness too.
--- drivers/bus/fsl-mc/fsl-mc-bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bus/fsl-mc/fsl-mc-bus.c +3 -3
@@ -139,9 +139,9 @@ static int fsl_mc_bus_uevent(const struct device *dev, struct kobj_uevent_env *estatic int fsl_mc_dma_configure (struct device *dev) { +const struct device_driver *drv =READ_ONCE (dev->driver);struct device *dma_dev = dev;struct fsl_mc_device *mc_dev =to_fsl_mc_device (dev); -struct fsl_mc_driver *mc_drv =to_fsl_mc_driver (dev->driver);u32 input_id = mc_dev->icid;int ret;
@@ -153,8 +153,8 @@ static int fsl_mc_dma_configure(struct device *dev)else ret =acpi_dma_configure_id (dev,DEV_DMA_COHERENT , &input_id); -/* @mc_drv may not be valid when we're called from the IOMMU layer */ -if (!ret && dev->driver && !mc_drv->driver_managed_dma) { +/* @drv may not be valid when we're called from the IOMMU layer */ +if (!ret && drv && !to_fsl_mc_driver (drv)->driver_managed_dma) { ret =iommu_device_use_default_domain (dev);if (ret)arch_teardown_dma_ops (dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 398/780 dt-bindings: vendor-prefixes: Add Liontron name
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andre Przywara <[email protected]>
[ Upstream commit 9baa27a2e9fc746143ab686b6dbe2d515284a4c5 ]
Liontron is a company based in Shenzen, China, making industrial development boards and embedded computers, mostly using Rockchip and Allwinner SoCs.
Add their name to the list of vendors.
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -864,6 +864,8 @@ patternProperties: description: Linux-specific binding "^linx,.*": description: Linx Technologies + "^liontron,.*": + description: Shenzhen Liontron Technology Co., Ltd "^liteon,.*": description: LITE-ON Technology Corp. "^litex,.*":
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 399/780 ARM: dts: qcom: apq8064: add missing clocks to the timer node
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 4b0eb149df58b6750cd8113e5ee5b3ac7cc51743 ]
In order to fix DT schema warning and describe hardware properly, add missing sleep clock to the timer node.
--- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +2 -0
@@ -326,6 +326,8 @@ <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>; reg = <0x0200a000 0x100>; clock-frequency = <27000000>; + clocks = <&sleep_clk>; + clock-names = "sleep"; cpu-offset = <0x80000>; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 400/780 ARM: dts: qcom: apq8064 merge hw splinlock into corresponding syscon device
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 325c6a441ae1f8fcb1db9bb945b8bdbd3142141e ]
Follow up the expected way of describing the SFPB hwspinlock and merge hwspinlock node into corresponding syscon node, fixing several dt-schema warnings.
--- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +4 -9
@@ -213,12 +213,6 @@ }; }; - sfpb_mutex: hwmutex { - compatible = "qcom,sfpb-mutex"; - syscon = <&sfpb_wrapper_mutex 0x604 0x4>; - #hwlock-cells = <1>; - }; - smem { compatible = "qcom,smem"; memory-region = <&smem_region>;
@@ -305,9 +299,10 @@ pinctrl-0 = <&ps_hold_default_state>; }; - sfpb_wrapper_mutex: syscon@1200000 { - compatible = "syscon"; - reg = <0x01200000 0x8000>; + sfpb_mutex: hwmutex@1200600 { + compatible = "qcom,sfpb-mutex"; + reg = <0x01200600 0x100>; + #hwlock-cells = <1>; }; intc: interrupt-controller@2000000 {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 401/780 ARM: dts: qcom: apq8064: move replicator out of soc node
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit f2420037d90a8354594b3da541e19dcbb60c75e1 ]
The CoreSight static replicator device isn't a part of the system MMIO bus, as such it should not be a part of the soc node. Follow the example of other platforms and move it out of the soc bus to the top-level (and reoder ports to follow alphabetic order).
--- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 67 ++++++++++++------------ 1 file changed, 34 insertions(+), 33 deletions(-)
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +34 -33
@@ -278,6 +278,40 @@ }; }; + replicator { + compatible = "arm,coresight-static-replicator"; + + clocks = <&rpmcc RPM_QDSS_CLK>; + clock-names = "apb_pclk"; + + in-ports { + port { + replicator_in: endpoint { + remote-endpoint = <&funnel_out>; + }; + }; + }; + + out-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + replicator_out0: endpoint { + remote-endpoint = <&etb_in>; + }; + }; + + port@1 { + reg = <1>; + replicator_out1: endpoint { + remote-endpoint = <&tpiu_in>; + }; + }; + }; + }; + soc: soc { #address-cells = <1>; #size-cells = <1>;
@@ -1529,39 +1563,6 @@ }; }; - replicator { - compatible = "arm,coresight-static-replicator"; - - clocks = <&rpmcc RPM_QDSS_CLK>; - clock-names = "apb_pclk"; - - out-ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - replicator_out0: endpoint { - remote-endpoint = <&etb_in>; - }; - }; - port@1 { - reg = <1>; - replicator_out1: endpoint { - remote-endpoint = <&tpiu_in>; - }; - }; - }; - - in-ports { - port { - replicator_in: endpoint { - remote-endpoint = <&funnel_out>; - }; - }; - }; - }; - funnel@1a04000 { compatible = "arm,coresight-dynamic-funnel", "arm,primecell"; reg = <0x1a04000 0x1000>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 402/780 arm64: defconfig: mediatek: enable PHY drivers
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vignesh Raman <[email protected]>
[ Upstream commit f52cd248d844f9451858992f924988ac413fdc7e ]
The mediatek display driver fails to probe on mt8173-elm-hana and mt8183-kukui-jacuzzi-juniper-sku16 in v6.14-rc4 due to missing PHY configurations.
Commit 924d66011f24 ("drm/mediatek: stop selecting foreign drivers") stopped selecting the MediaTek PHY drivers, requiring them to be explicitly enabled in defconfig.
Enable the following PHY drivers for MediaTek platforms:CONFIG_PHY_MTK_HDMI=m for HDMI display CONFIG_PHY_MTK_MIPI_DSI=m for DSI display CONFIG_PHY_MTK_DP=m for DP display
--- arch/arm64/configs/defconfig | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/configs/defconfig +3 -0
@@ -1587,6 +1587,9 @@ CONFIG_PHY_HISTB_COMBPHY=y CONFIG_PHY_HISI_INNO_USB2=y CONFIG_PHY_MVEBU_CP110_COMPHY=y CONFIG_PHY_MTK_TPHY=y +CONFIG_PHY_MTK_HDMI=m +CONFIG_PHY_MTK_MIPI_DSI=m +CONFIG_PHY_MTK_DP=m CONFIG_PHY_QCOM_EDP=m CONFIG_PHY_QCOM_PCIE2=m CONFIG_PHY_QCOM_QMP=m
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 403/780 arm64: dts: qcom: sm8650: add the missing l2 cache node
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengyu Luo <[email protected]>
[ Upstream commit 4becd72352b6861de0c24074a8502ca85080fd63 ]
Only two little a520s share the same L2, every a720 has their own L2 cache.
--- arch/arm64/boot/dts/qcom/sm8650.dtsi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8650.dtsi +8 -1
@@ -159,13 +159,20 @@ power-domain-names = "psci"; enable-method = "psci"; - next-level-cache = <&l2_200>; + next-level-cache = <&l2_300>; capacity-dmips-mhz = <1792>; dynamic-power-coefficient = <238>; qcom,freq-domain = <&cpufreq_hw 3>; #cooling-cells = <2>; + + l2_300: l2-cache { + compatible = "cache"; + cache-level = <2>; + cache-unified; + next-level-cache = <&l3_0>; + }; }; cpu4: cpu@400 {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 404/780 arm64: dts: rockchip: disable unrouted USB controllers and PHY on RK3399 Puma
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quentin Schulz <[email protected]>
[ Upstream commit 3373af1d76bacd054b37f3e10266dd335ce425f8 ]
The u2phy1_host port is the part of the USB PHY1 (namely the HOST1_DP/DM lanes) which routes directly to the USB2.0 HOST controller[1]. The other lanes of the PHY are routed to the USB3.0 OTG controller (dwc3), which we do use.
The HOST1_DP/DM lanes aren't routed on RK3399 Puma so let's simply disable the USB2.0 controllers and associated part in USB2.0 PHY.
No intended functional change.
[1] https://rockchip.fr/Rockchip%20RK3399%20TRM%20V1.3%20Part2.pdf
Chapter 2 USB2.0 PHY
--- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 12 ------------ 1 file changed, 12 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +0 -12
@@ -585,10 +585,6 @@ u2phy1_otg: otg-port { status = "okay"; }; - - u2phy1_host: host-port { - status = "okay"; - }; }; &usbdrd3_1 {
@@ -622,11 +618,3 @@ vdd2-supply = <&vcc3v3_sys>; }; }; - -&usb_host1_ehci { - status = "okay"; -}; - -&usb_host1_ohci { - status = "okay"; -};
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 405/780 arm64: dts: rockchip: disable unrouted USB controllers and PHY on RK3399 Puma with Haikou
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quentin Schulz <[email protected]>
[ Upstream commit febd8c6ab52c683b447fe22fc740918c86feae43 ]
The u2phy0_host port is the part of the USB PHY0 (namely the HOST0_DP/DM lanes) which routes directly to the USB2.0 HOST controller[1]. The other lanes of the PHY are routed to the USB3.0 OTG controller (dwc3), which we do use.
The HOST0_DP/DM lanes aren't routed on RK3399 Puma so let's simply disable the USB2.0 controllers.
USB3 OTG has been known to be unstable on RK3399 Puma Haikou for a while, one of the recurring issues being that only USB2 is detected and not USB3 in host mode. Reading the justification above and seeing that we are keeping u2phy0_host in the Haikou carrierboard DTS probably may have bothered you since it should be changed to u2phy0_otg. The issue is that if it's switched to that, USB OTG on Haikou is entirely broken. I have checked the routing in the Gerber file, the lanes are going to the expected ball pins (that is, NOT HOST0_DP/DM).u2phy0_host is for sure the wrong part of the PHY to use, but it's the only one that works at the moment for that board so keep it until we figure out what exactly is broken.
No intended functional change.
[1] https://rockchip.fr/Rockchip%20RK3399%20TRM%20V1.3%20Part2.pdf
Chapter 2 USB2.0 PHY
--- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 8 -------- 1 file changed, 8 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +0 -8
@@ -312,14 +312,6 @@ status = "okay"; }; -&usb_host0_ehci { - status = "okay"; -}; - -&usb_host0_ohci { - status = "okay"; -}; - &vopb { status = "okay"; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 406/780 arm64: dts: qcom: qcm2290: fix (some) of QUP interconnects
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit e07d2d57a1c7254d25597dcdd34f318a91ec9398 ]
While adding interconnect support for the QCM2290 platform some of them got the c&p error, rogue MASTER_APPSS_PROC for the config_noc interconnect. Turn that into SLAVE_QUP_0 as expected.
--- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/qcom/qcm2290.dtsi +8 -8
@@ -1073,7 +1073,7 @@ interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>;
@@ -1092,7 +1092,7 @@ interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; status = "disabled";
@@ -1137,7 +1137,7 @@ interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>;
@@ -1184,7 +1184,7 @@ interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>;
@@ -1231,7 +1231,7 @@ interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>;
@@ -1278,7 +1278,7 @@ interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>;
@@ -1297,7 +1297,7 @@ interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; status = "disabled";
@@ -1342,7 +1342,7 @@ interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 407/780 arm64: dts: qcom: msm8998: Use the header with DSI phy clock IDs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit f4220c41decc1944ef319c859840aa5405eee6fa ]
Use the header with DSI phy clock IDs to make code more readable.
Stable-dep-of: 7ebdb205d4b9 ("arm64: dts: qcom: msm8998: Remove mdss_hdmi_phy phandle argument")
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/qcom/msm8998.dtsi +9 -8
@@ -2,6 +2,7 @@ /* Copyright (c) 2016, The Linux Foundation. All rights reserved. */ #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/clock/qcom,dsi-phy-28nm.h> #include <dt-bindings/clock/qcom,gcc-msm8998.h> #include <dt-bindings/clock/qcom,gpucc-msm8998.h> #include <dt-bindings/clock/qcom,mmcc-msm8998.h>
@@ -2790,10 +2791,10 @@ "gpll0_div"; clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, <&gcc GCC_MMSS_GPLL0_CLK>, - <&mdss_dsi0_phy 1>, - <&mdss_dsi0_phy 0>, - <&mdss_dsi1_phy 1>, - <&mdss_dsi1_phy 0>, + <&mdss_dsi0_phy DSI_PIXEL_PLL_CLK>, + <&mdss_dsi0_phy DSI_BYTE_PLL_CLK>, + <&mdss_dsi1_phy DSI_PIXEL_PLL_CLK>, + <&mdss_dsi1_phy DSI_BYTE_PLL_CLK>, <&mdss_hdmi_phy 0>, <0>, <0>,
@@ -2932,8 +2933,8 @@ "bus"; assigned-clocks = <&mmcc BYTE0_CLK_SRC>, <&mmcc PCLK0_CLK_SRC>; - assigned-clock-parents = <&mdss_dsi0_phy 0>, - <&mdss_dsi0_phy 1>; + assigned-clock-parents = <&mdss_dsi0_phy DSI_BYTE_PLL_CLK>, + <&mdss_dsi0_phy DSI_PIXEL_PLL_CLK>; operating-points-v2 = <&dsi_opp_table>; power-domains = <&rpmpd MSM8998_VDDCX>;
@@ -3008,8 +3009,8 @@ "bus"; assigned-clocks = <&mmcc BYTE1_CLK_SRC>, <&mmcc PCLK1_CLK_SRC>; - assigned-clock-parents = <&mdss_dsi1_phy 0>, - <&mdss_dsi1_phy 1>; + assigned-clock-parents = <&mdss_dsi1_phy DSI_BYTE_PLL_CLK>, + <&mdss_dsi1_phy DSI_PIXEL_PLL_CLK>; operating-points-v2 = <&dsi_opp_table>; power-domains = <&rpmpd MSM8998_VDDCX>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 408/780 arm64: dts: qcom: msm8998: Remove mdss_hdmi_phy phandle argument
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 7ebdb205d4b9dd839a93a9b8975ce8ccf86b882a ]
The node has #clock-cells = <0>, as it only provides a single clock output.
This leads to a turbo sneaky bug, where the dt checker shows that we have additional clocks in the array:
clock-controller@c8c0000: clocks: [[3, 0], [39, 178], [156, 1], [156, 0], [157, 1], [157, 0], [158], [0], [0], [0], [39, 184]] is too long
..which happens due to dtc interpreting <&mdss_hdmi_phy 0> as <&mdss_hdmi_phy>, <0> after taking cells into account.
Remove the superfluous argument to both silence the warning and fix the index-based lookup of subsequent entries in "clocks".
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8998.dtsi +1 -1
@@ -2795,7 +2795,7 @@ <&mdss_dsi0_phy DSI_BYTE_PLL_CLK>, <&mdss_dsi1_phy DSI_PIXEL_PLL_CLK>, <&mdss_dsi1_phy DSI_BYTE_PLL_CLK>, - <&mdss_hdmi_phy 0>, + <&mdss_hdmi_phy>, <0>, <0>, <&gcc GCC_MMSS_GPLL0_DIV_CLK>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 409/780 arm64: dts: qcom: qcs615: Fix up UFS clocks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit ea172f61f4fdb17aaaf8def980ee309a3b727eea ]
The clocks are out of order with the bindings' expectations.
Reorder them to resolve the errors.
--- arch/arm64/boot/dts/qcom/qcs615.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/qcom/qcs615.dtsi +8 -8
@@ -1022,10 +1022,10 @@ "bus_aggr_clk", "iface_clk", "core_clk_unipro", - "core_clk_ice", "ref_clk", "tx_lane0_sync_clk", - "rx_lane0_sync_clk"; + "rx_lane0_sync_clk", + "ice_core_clk"; resets = <&gcc GCC_UFS_PHY_BCR>; reset-names = "rst";
@@ -1060,10 +1060,10 @@ /bits/ 64 <0>, /bits/ 64 <0>, /bits/ 64 <37500000>, - /bits/ 64 <75000000>, /bits/ 64 <0>, /bits/ 64 <0>, - /bits/ 64 <0>; + /bits/ 64 <0>, + /bits/ 64 <75000000>; required-opps = <&rpmhpd_opp_low_svs>; };
@@ -1072,10 +1072,10 @@ /bits/ 64 <0>, /bits/ 64 <0>, /bits/ 64 <75000000>, - /bits/ 64 <150000000>, /bits/ 64 <0>, /bits/ 64 <0>, - /bits/ 64 <0>; + /bits/ 64 <0>, + /bits/ 64 <150000000>; required-opps = <&rpmhpd_opp_svs>; };
@@ -1084,10 +1084,10 @@ /bits/ 64 <0>, /bits/ 64 <0>, /bits/ 64 <150000000>, - /bits/ 64 <300000000>, /bits/ 64 <0>, /bits/ 64 <0>, - /bits/ 64 <0>; + /bits/ 64 <0>, + /bits/ 64 <300000000>; required-opps = <&rpmhpd_opp_nom>; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 410/780 arm64: dts: renesas: white-hawk-ard-audio: Fix TPU0 groups
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thuan Nguyen <[email protected]>
[ Upstream commit 652eea251dd852f02cef6223f367220acb3d1867 ]
White Hawk ARD audio uses a clock generated by the TPU, but commit 3d144ef10a44 ("pinctrl: renesas: r8a779g0: Fix TPU suffixes") renamed pin group "tpu_to0_a" to "tpu_to0_b". Update DTS accordingly otherwise the sound driver does not receive a clock signal.
--- arch/arm64/boot/dts/renesas/white-hawk-ard-audio-da7212.dtso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/white-hawk-ard-audio-da7212.dtso +1 -1
@@ -108,7 +108,7 @@ }; tpu0_pins: tpu0 { - groups = "tpu_to0_a"; + groups = "tpu_to0_b"; function = "tpu"; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 411/780 arm64: dts: mt6359: Rename RTC node to match binding expectations
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Julien Massot <[email protected]>
[ Upstream commit cfe035d8662cfbd6edff9bd89c4b516bbb34c350 ]
Rename the node 'mt6359rtc' to 'rtc', as required by the binding.
Fix the following dtb-check error:
mediatek/mt8395-radxa-nio-12l.dtb: pmic: 'mt6359rtc' do not match any of the regexes: 'pinctrl-[0-9]+'
--- arch/arm64/boot/dts/mediatek/mt6359.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt6359.dtsi +1 -1
@@ -300,7 +300,7 @@ }; }; - mt6359rtc: mt6359rtc { + mt6359rtc: rtc { compatible = "mediatek,mt6358-rtc"; }; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 412/780 ARM: aspeed: Dont select SRAM
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joel Stanley <[email protected]>
[ Upstream commit e4f59f873c3ffe2a0150e11115a83e2dfb671dbf ]
The ASPEED devices have SRAM, but don't require it for basic function (or any function; there's no known users of the driver).
--- arch/arm/mach-aspeed/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-aspeed/Kconfig +0 -1
@@ -2,7 +2,6 @@ menuconfig ARCH_ASPEED bool "Aspeed BMC architectures" depends on (CPU_LITTLE_ENDIAN && ARCH_MULTI_V5) || ARCH_MULTI_V6 || ARCH_MULTI_V7 - select SRAM select WATCHDOG select ASPEED_WATCHDOG select MFD_SYSCON
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 413/780 soc: aspeed: lpc: Fix impossible judgment condition
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit d9f0a97e859bdcef51f9c187b1eb712eb13fd3ff ]
smatch error:drivers/soc/aspeed/aspeed-lpc-snoop.c:169 aspeed_lpc_snoop_config_irq() warn: platform_get_irq() does not return zero
platform_get_irq() return non-zero IRQ number or negative error code, change '!lpc_snoop->irq' to 'lpc_snoop->irq < 0' to fix this.
--- drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/aspeed/aspeed-lpc-snoop.c +1 -1
@@ -166,7 +166,7 @@ static int aspeed_lpc_snoop_config_irq(struct aspeed_lpc_snoop *lpc_snoop,int rc; lpc_snoop->irq =platform_get_irq (pdev,0 ); -if (!lpc_snoop->irq) +if (lpc_snoop->irq <0 )return -ENODEV ; rc = devm_request_irq(dev, lpc_snoop->irq,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 414/780 soc: aspeed: Add NULL check in aspeed_lpc_enable_snoop()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit f1706e0e1a74b095cbc60375b9b1e6205f5f4c98 ]
devm_kasprintf() returns NULL when memory allocation fails. Currently, aspeed_lpc_enable_snoop() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after devm_kasprintf() to prevent this issue.
--- drivers/soc/aspeed/aspeed-lpc-snoop.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/soc/aspeed/aspeed-lpc-snoop.c +13 -2
@@ -200,11 +200,15 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop, lpc_snoop->chan[channel].miscdev.minor =MISC_DYNAMIC_MINOR ; lpc_snoop->chan[channel].miscdev.name =devm_kasprintf (dev,GFP_KERNEL ,"%s%d" ,DEVICE_NAME , channel); +if (!lpc_snoop->chan[channel].miscdev.name) { + rc = -ENOMEM ; + goto err_free_fifo; + } lpc_snoop->chan[channel].miscdev.fops = &snoop_fops; lpc_snoop->chan[channel].miscdev.parent = dev; rc =misc_register (&lpc_snoop->chan[channel].miscdev);if (rc) -return rc; + goto err_free_fifo;/* Enable LPC snoop channel at requested port */ switch (channel) {
@@ -221,7 +225,8 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop, hicrb_en =HICRB_ENSNP1D ;break ;default : -return -EINVAL ; + rc = -EINVAL ; + goto err_misc_deregister; }regmap_update_bits (lpc_snoop->regmap,HICR5 , hicr5_en, hicr5_en);
@@ -231,6 +236,12 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,regmap_update_bits (lpc_snoop->regmap,HICRB , hicrb_en, hicrb_en); +return 0 ; + +err_misc_deregister: +misc_deregister (&lpc_snoop->chan[channel].miscdev); +err_free_fifo: +kfifo_free (&lpc_snoop->chan[channel].fifo);return rc; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 415/780 ubsan: integer-overflow: depend on BROKEN to keep this out of CI
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit d6a0e0bfecccdcecb08defe75a137c7262352102 ]
Depending on !COMPILE_TEST isn't sufficient to keep this feature out of CI because we can't stop it from being included in randconfig builds. This feature is still highly experimental, and is developed in lock-step with Clang's Overflow Behavior Types[1]. Depend on BROKEN to keep it from being enabled by anyone not expecting it.
--- lib/Kconfig.ubsan | 2 ++ 1 file changed, 2 insertions(+)
lib/Kconfig.ubsan +2 -0
@@ -118,6 +118,8 @@ config UBSAN_UNREACHABLE config UBSAN_INTEGER_WRAP bool "Perform checking for integer arithmetic wrap-around" + # This is very experimental so drop the next line if you really want it + depends on BROKEN depends on !COMPILE_TEST depends on $(cc-option,-fsanitize-undefined-ignore-overflow-pattern=all) depends on $(cc-option,-fsanitize=signed-integer-overflow)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 416/780 fbdev: core: fbcvt: avoid division by 0 in fb_cvt_hperiod()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Shtylyov <[email protected]>
[ Upstream commit 3f6dae09fc8c306eb70fdfef70726e1f154e173a ]
In fb_find_mode_cvt(), iff mode->refresh somehow happens to be 0x80000000, cvt.f_refresh will become 0 when multiplying it by 2 due to overflow. It's then passed to fb_cvt_hperiod(), where it's used as a divider -- division by 0 will result in kernel oops. Add a sanity check for cvt.f_refresh to avoid such overflow...
Found by Linux Verification Center (linuxtesting.org) with the Svace static analysis tool.
--- drivers/video/fbdev/core/fbcvt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/core/fbcvt.c +1 -1
@@ -312,7 +312,7 @@ int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb) cvt.f_refresh = cvt.refresh; cvt.interlace =1 ; -if (!cvt.xres || !cvt.yres || !cvt.refresh) { +if (!cvt.xres || !cvt.yres || !cvt.refresh || cvt.f_refresh >INT_MAX ) {printk (KERN_INFO "fbcvt: Invalid input parameters\n" );return 1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 417/780 watchdog: lenovo_se30_wdt: Fix possible devm_ioremap() NULL pointer dereference in lenovo_se30_wdt_probe()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit a4e2401438a26131ecff9be6a3a1d4cbfea66f9a ]
devm_ioremap() returns NULL on error. Currently, lenovo_se30_wdt_probe() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after devm_ioremap() to prevent this issue.
--- drivers/watchdog/lenovo_se30_wdt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/lenovo_se30_wdt.c +2 -0
@@ -271,6 +271,8 @@ static int lenovo_se30_wdt_probe(struct platform_device *pdev)return -EBUSY ; priv->shm_base_addr =devm_ioremap (dev, base_phys,SHM_WIN_SIZE ); +if (!priv->shm_base_addr) +return -ENOMEM ; priv->wdt_cfg.mod =WDT_MODULE ; priv->wdt_cfg.idx =WDT_CFG_INDEX ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 418/780 randstruct: gcc-plugin: Remove bogus void member
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit e136a4062174a9a8d1c1447ca040ea81accfa6a8 ]
When building the randomized replacement tree of struct members, the randstruct GCC plugin would insert, as the first member, a 0-sized void member. This appears as though it was done to catch non-designated ("unnamed") static initializers, which wouldn't be stable since they depend on the original struct layout order.
This was accomplished by having the side-effect of the "void member" tripping an assert in GCC internals (count_type_elements) if the member list ever needed to be counted (e.g. for figuring out the order of members during a non-designated initialization), which would catch impossible type (void) in the struct:
security/landlock/fs.c: In function ‘hook_file_ioctl_common’:security/landlock/fs.c:1745:61: internal compiler error: in count_type_elements, at expr.cc:7075
1745 | .u.op = &(struct lsm_ioctlop_audit) {
| ^
static HOST_WIDE_INTcount_type_elements (const_tree type, bool for_ctor_p) {
switch (TREE_CODE (type))
...
case VOID_TYPE:
default:
gcc_unreachable ();
}
}However this is a redundant safety measure since randstruct uses the __designated_initializer attribute both internally and within the __randomized_layout attribute macro so that this would be enforced by the compiler directly even when randstruct was not enabled (via -Wdesignated-init).
A recent change in Landlock ended up tripping the same member counting routine when using a full-struct copy initializer as part of an anonymous initializer. This, however, is a false positive as the initializer is copying between identical structs (and hence identical layouts). The "path" member is "struct path", a randomized struct, and is being copied to from another "struct path", the "f_path" member:
landlock_log_denial(landlock_cred(file->f_cred), &(struct landlock_request) {
.type = LANDLOCK_REQUEST_FS_ACCESS,
.audit = {
.type = LSM_AUDIT_DATA_IOCTL_OP,
.u.op = &(struct lsm_ioctlop_audit) {
.path = file->f_path,
.cmd = cmd,
},
},
...As can be seen with the coming randstruct KUnit test, there appears to be no behavioral problems with this kind of initialization when the void member is removed from the randstruct GCC plugin, so remove it.
Stable-dep-of: f39f18f3c353 ("randstruct: gcc-plugin: Fix attribute addition")
--- scripts/gcc-plugins/randomize_layout_plugin.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)
scripts/gcc-plugins/randomize_layout_plugin.c +1 -17
@@ -344,29 +344,13 @@ static int relayout_struct(tree type)shuffle (type, (tree *)newtree, shuffle_length); -/* -* set up a bogus anonymous struct field designed to error out on unnamed struct initializers -* as gcc provides no other way to detect such code -*/ - list =make_node (FIELD_DECL ); -TREE_CHAIN (list) = newtree[0 ]; -TREE_TYPE (list) = void_type_node; -DECL_SIZE (list) = bitsize_zero_node; -DECL_NONADDRESSABLE_P (list) =1 ; -DECL_FIELD_BIT_OFFSET (list) = bitsize_zero_node; -DECL_SIZE_UNIT (list) = size_zero_node; -DECL_FIELD_OFFSET (list) = size_zero_node; -DECL_CONTEXT (list) = type; -// to satisfy the constify plugin -TREE_READONLY (list) =1 ; -for (i =0 ; i < num_fields -1 ; i++)TREE_CHAIN (newtree[i]) = newtree[i+1 ];TREE_CHAIN (newtree[num_fields -1 ]) =NULL_TREE ; main_variant =TYPE_MAIN_VARIANT (type);for (variant = main_variant; variant; variant =TYPE_NEXT_VARIANT (variant)) { -TYPE_FIELDS (variant) = list; +TYPE_FIELDS (variant) = newtree[0 ];TYPE_ATTRIBUTES (variant) =copy_list (TYPE_ATTRIBUTES (variant));TYPE_ATTRIBUTES (variant) =tree_cons (get_identifier ("randomize_performed" ),NULL_TREE ,TYPE_ATTRIBUTES (variant));TYPE_ATTRIBUTES (variant) =tree_cons (get_identifier ("designated_init" ),NULL_TREE ,TYPE_ATTRIBUTES (variant));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 419/780 randstruct: gcc-plugin: Fix attribute addition
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit f39f18f3c3531aa802b58a20d39d96e82eb96c14 ]
Based on changes in the 2021 public version of the randstruct out-of-tree GCC plugin[1], more carefully update the attributes on resulting decls, to avoid tripping checks in GCC 15's comptypes_check_enum_int() when it has been configured with "--enable-checking=misc":
arch/arm64/kernel/kexec_image.c:132:14: internal compiler error: in comptypes_check_enum_int, at c/c-typeck.cc:1519
132 | const struct kexec_file_ops kexec_image_ops = {
| ^~~~~~~~~~~~~~ internal_error(char const*, ...), at gcc/gcc/diagnostic-global-context.cc:517 fancy_abort(char const*, int, char const*), at gcc/gcc/diagnostic.cc:1803 comptypes_check_enum_int(tree_node*, tree_node*, bool*), at gcc/gcc/c/c-typeck.cc:1519
...
--- scripts/gcc-plugins/gcc-common.h | 32 +++++++++++++++++++ scripts/gcc-plugins/randomize_layout_plugin.c | 22 ++++++------- 2 files changed, 43 insertions(+), 11 deletions(-)
scripts/gcc-plugins/gcc-common.h +32 -0
@@ -123,6 +123,38 @@ static inline tree build_const_char_string(int len, const char *str)return cstr; } +static inline void __add_type_attr (tree type,const char *attr,tree args) +{ +tree oldattr; + +if (type ==NULL_TREE ) +return ; + oldattr =lookup_attribute (attr,TYPE_ATTRIBUTES (type)); +if (oldattr !=NULL_TREE ) { +gcc_assert (TREE_VALUE (oldattr) == args ||TREE_VALUE (TREE_VALUE (oldattr)) ==TREE_VALUE (args)); +return ; + } + +TYPE_ATTRIBUTES (type) =copy_list (TYPE_ATTRIBUTES (type)); +TYPE_ATTRIBUTES (type) =tree_cons (get_identifier (attr), args,TYPE_ATTRIBUTES (type)); +} + +static inline void add_type_attr (tree type,const char *attr,tree args) +{ +tree main_variant =TYPE_MAIN_VARIANT (type); + +__add_type_attr (TYPE_CANONICAL (type), attr, args); +__add_type_attr (TYPE_CANONICAL (main_variant), attr, args); +__add_type_attr (main_variant, attr, args); + +for (type =TYPE_NEXT_VARIANT (main_variant); type; type =TYPE_NEXT_VARIANT (type)) { +if (!lookup_attribute (attr,TYPE_ATTRIBUTES (type))) +TYPE_ATTRIBUTES (type) =TYPE_ATTRIBUTES (main_variant); + +__add_type_attr (TYPE_CANONICAL (type), attr, args); + } +} +#define PASS_INFO (NAME ,REF ,ID ,POS ) \ struct register_pass_info NAME##_pass_info = { \ .pass = make_##NAME##_pass(), \
scripts/gcc-plugins/randomize_layout_plugin.c +11 -11
@@ -73,6 +73,9 @@ static tree handle_randomize_layout_attr(tree *node, tree name, tree args, int fif (TYPE_P (*node)) { type = *node; + }else if (TREE_CODE (*node) ==FIELD_DECL ) { + *no_add_attrs = false; +return NULL_TREE ; }else {gcc_assert (TREE_CODE (*node) ==TYPE_DECL ); type =TREE_TYPE (*node);
@@ -348,15 +351,14 @@ static int relayout_struct(tree type)TREE_CHAIN (newtree[i]) = newtree[i+1 ];TREE_CHAIN (newtree[num_fields -1 ]) =NULL_TREE ; +add_type_attr (type,"randomize_performed" ,NULL_TREE ); +add_type_attr (type,"designated_init" ,NULL_TREE ); +if (has_flexarray) +add_type_attr (type,"has_flexarray" ,NULL_TREE ); + main_variant =TYPE_MAIN_VARIANT (type); -for (variant = main_variant; variant; variant =TYPE_NEXT_VARIANT (variant)) { +for (variant = main_variant; variant; variant =TYPE_NEXT_VARIANT (variant))TYPE_FIELDS (variant) = newtree[0 ]; -TYPE_ATTRIBUTES (variant) =copy_list (TYPE_ATTRIBUTES (variant)); -TYPE_ATTRIBUTES (variant) =tree_cons (get_identifier ("randomize_performed" ),NULL_TREE ,TYPE_ATTRIBUTES (variant)); -TYPE_ATTRIBUTES (variant) =tree_cons (get_identifier ("designated_init" ),NULL_TREE ,TYPE_ATTRIBUTES (variant)); -if (has_flexarray) -TYPE_ATTRIBUTES (type) =tree_cons (get_identifier ("has_flexarray" ),NULL_TREE ,TYPE_ATTRIBUTES (type)); - }/* * force a re-layout of the main variant
@@ -424,10 +426,8 @@ static void randomize_type(tree type)if (lookup_attribute ("randomize_layout" ,TYPE_ATTRIBUTES (TYPE_MAIN_VARIANT (type))) ||is_pure_ops_struct (type))relayout_struct (type); -for (variant =TYPE_MAIN_VARIANT (type); variant; variant =TYPE_NEXT_VARIANT (variant)) { -TYPE_ATTRIBUTES (type) =copy_list (TYPE_ATTRIBUTES (type)); -TYPE_ATTRIBUTES (type) =tree_cons (get_identifier ("randomize_considered" ),NULL_TREE ,TYPE_ATTRIBUTES (type)); - } +add_type_attr (type,"randomize_considered" ,NULL_TREE ); +#ifdef __DEBUG_PLUGINfprintf (stderr,"Marking randomize_considered on struct %s\n" ,ORIG_TYPE_NAME (type));#ifdef __DEBUG_VERBOSE
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 420/780 tools build: Dont set libunwind as available if test-all.c build succeeds
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 6559b83e4e71ba77461c8d6e6af7b89693c8e677 ]
The tools/build/feature/test-all.c file tries to detect the expected, most common set of libraries/features we expect to have available to build perf with.
At some point libunwind was deemed not to be part of that set of libries, but the patches making it to be opt-in ended up forgetting some details, fix one more.
Testing it:
$ rm -rf /tmp/build/$(basename $PWD)/ ; mkdir -p /tmp/build/$(basename $PWD)/
$ rpm -q libunwind-devel
libunwind-devel-1.8.0-3.fc40.x86_64
$ make -k LIBUNWIND=1 CORESIGHT=1 O=/tmp/build/$(basename $PWD)/ -C tools/perf install-bin |& grep unwind && ldd ~/bin/perf | grep unwind
... libunwind: [ on ]
CC /tmp/build/perf-tools-next/arch/x86/tests/dwarf-unwind.o
CC /tmp/build/perf-tools-next/arch/x86/util/unwind-libunwind.o
CC /tmp/build/perf-tools-next/util/arm64-frame-pointer-unwind-support.o
CC /tmp/build/perf-tools-next/tests/dwarf-unwind.o
CC /tmp/build/perf-tools-next/util/unwind-libunwind-local.o
CC /tmp/build/perf-tools-next/util/unwind-libunwind.o
libunwind-x86_64.so.8 => /lib64/libunwind-x86_64.so.8 (0x00007f615a549000)
libunwind.so.8 => /lib64/libunwind.so.8 (0x00007f615a52f000)
$ sudo rpm -e libunwind-devel
$ rm -rf /tmp/build/$(basename $PWD)/ ; mkdir -p /tmp/build/$(basename $PWD)/
$ make -k LIBUNWIND=1 CORESIGHT=1 O=/tmp/build/$(basename $PWD)/ -C tools/perf install-bin |& grep unwind && ldd ~/bin/perf | grep unwind
Makefile.config:653: No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR
... libunwind: [ OFF ]
CC /tmp/build/perf-tools-next/arch/x86/tests/dwarf-unwind.o
CC /tmp/build/perf-tools-next/arch/x86/util/unwind-libdw.o
CC /tmp/build/perf-tools-next/util/arm64-frame-pointer-unwind-support.o
CC /tmp/build/perf-tools-next/tests/dwarf-unwind.o
CC /tmp/build/perf-tools-next/util/unwind-libdw.o
$Should be in a separate patch, but tired now, so also adding a message about the need to use LIBUNWIND=1 in the output when its not available, so done here as well.
So, now when the devel files are not available we get:
$ make -k LIBUNWIND=1 CORESIGHT=1 O=/tmp/build/$(basename $PWD)/ -C tools/perf install-bin |& grep unwind && ldd ~/bin/perf | grep unwind Makefile.config:653: No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR and set LIBUNWIND=1 in the make command line as it is opt-in now ... libunwind: [ OFF ] $
--- tools/build/Makefile.feature | 1 - tools/perf/Makefile.config | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-)
tools/build/Makefile.feature +0 -1
@@ -87,7 +87,6 @@ FEATURE_TESTS_BASIC := \ libtracefs \ libcpupower \ libcrypto \ - libunwind \ pthread-attr-setaffinity-np \ pthread-barrier \ reallocarray \
tools/perf/Makefile.config +3 -1
@@ -625,6 +625,8 @@ endif ifndef NO_LIBUNWIND have_libunwind := + $(call feature_check,libunwind) + $(call feature_check,libunwind-x86) ifeq ($(feature-libunwind-x86), 1) $(call detected,CONFIG_LIBUNWIND_X86)
@@ -649,7 +651,7 @@ ifndef NO_LIBUNWIND endif ifneq ($(feature-libunwind), 1) - $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR) + $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR and set LIBUNWIND=1 in the make command line as it is opt-in now) NO_LOCAL_LIBUNWIND := 1 else have_libunwind := 1
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 421/780 tools build: Dont show libunwind build status as it is opt-in
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit a3a40391292273cf78a7920c119cdc386d694c38 ]
Since 13e17c9ff49119aa ("perf build: Make libunwind opt-in rather than opt-out") doesn't try to build with libunwind, so showing that it is OFF when building causes just distraction, remove it from FEATURES_DISPLAY.
For people that for some reason notice that there is always 'perf -vv', a short hand for 'perf version --build-options' and 'perf check feature libunwind' that now explains why it is not built:
$ perf check feature libunwind
libunwind: [ OFF ] # HAVE_LIBUNWIND_SUPPORT ( tip: Deprecated, use LIBUNWIND=1 and install libunwind-dev[el] to build with it )
$--- tools/build/Makefile.feature | 1 - 1 file changed, 1 deletion(-)
tools/build/Makefile.feature +0 -1
@@ -155,7 +155,6 @@ FEATURE_DISPLAY ?= \ libperl \ libpython \ libcrypto \ - libunwind \ libcapstone \ llvm-perf \ zlib \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 422/780 perf build: Warn when libdebuginfod devel files are not available
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 4fce4b91fd1aabb326c46e237eb4b19ab72598f8 ]
While working on 'perf version --build-options' I noticed that:
$ perf version --build-options
perf version 6.15.rc1.g312a07a00d31
aio: [ on ] # HAVE_AIO_SUPPORT
bpf: [ on ] # HAVE_LIBBPF_SUPPORT
bpf_skeletons: [ on ] # HAVE_BPF_SKEL
debuginfod: [ OFF ] # HAVE_DEBUGINFOD_SUPPORT
<SNIP>And looking at tools/perf/Makefile.config I also noticed that it is not opt-in, meaning we will attempt to build with it in all normal cases.
So add the usual warning at build time to let the user know that something recommended is missing, now we see:
Makefile.config:563: No elfutils/debuginfod.h found, no debuginfo server support, please install elfutils-debuginfod-client-devel or equivalent
And after following the recommendation:
$ perf check feature debuginfod
debuginfod: [ on ] # HAVE_DEBUGINFOD_SUPPORT
$ ldd ~/bin/perf | grep debuginfo
libdebuginfod.so.1 => /lib64/libdebuginfod.so.1 (0x00007fee5cf5f000)
$With this feature on several perf tools will fetch what is needed and not require all the contents of the debuginfo packages, for instance:
# rpm -qa | grep kernel-debuginfo
# pahole --running_kernel_vmlinux
pahole: couldn't find a vmlinux that matches the running kernel
HINT: Maybe you're inside a container or missing a debuginfo package?
#
# perf trace -e open* perf probe --vars icmp_rcv
0.000 ( 0.005 ms): perf/97391 openat(dfd: CWD, filename: "/etc/ld.so.cache", flags: RDONLY|CLOEXEC) = 3
0.014 ( 0.004 ms): perf/97391 openat(dfd: CWD, filename: "/lib64/libm.so.6", flags: RDONLY|CLOEXEC) = 3
<SNIP>
32130.100 ( 0.008 ms): perf/97391 openat(dfd: CWD, filename: "/root/.cache/debuginfod_client/aa3c82b4a13f9c0e0301bebb20fe958c4db6f362/debuginfo") = 3
<SNIP>
Available variables at icmp_rcv
@<icmp_rcv+0>
struct sk_buff* skb
<SNIP>
#
# pahole --running_kernel_vmlinux
/root/.cache/debuginfod_client/aa3c82b4a13f9c0e0301bebb20fe958c4db6f362/debuginfo
# file /root/.cache/debuginfod_client/aa3c82b4a13f9c0e0301bebb20fe958c4db6f362/debuginfo
/root/.cache/debuginfod_client/aa3c82b4a13f9c0e0301bebb20fe958c4db6f362/debuginfo: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), statically linked, BuildID[sha1]=aa3c82b4a13f9c0e0301bebb20fe958c4db6f362, with debug_info, not stripped
# ls -la /root/.cache/debuginfod_client/aa3c82b4a13f9c0e0301bebb20fe958c4db6f362/debuginfo
-r--------. 1 root root 475401512 Mar 27 21:00 /root/.cache/debuginfod_client/aa3c82b4a13f9c0e0301bebb20fe958c4db6f362/debuginfo
#Then, cached:
# perf stat --null perf probe --vars icmp_rcv
Available variables at icmp_rcv
@<icmp_rcv+0>
struct sk_buff* skb Performance counter stats for 'perf probe --vars icmp_rcv':
0.671389041 seconds time elapsed
0.519176000 seconds user
0.150860000 seconds sys--- tools/perf/Makefile.config | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/Makefile.config +2 -0
@@ -560,6 +560,8 @@ ifndef NO_LIBELF ifeq ($(feature-libdebuginfod), 1) CFLAGS += -DHAVE_DEBUGINFOD_SUPPORT EXTLIBS += -ldebuginfod + else + $(warning No elfutils/debuginfod.h found, no debuginfo server support, please install libdebuginfod-dev/elfutils-debuginfod-client-devel or equivalent) endif endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 423/780 tools build: Dont show libbfd build status as it is opt-in
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit e0eb84cd518084582c0d1db5d904f31b16902fdc ]
Since dd317df072071903 ("perf build: Make binutil libraries opt in") doesn't try to build with binutils libraries, so showing that it is OFF when building causes just distraction, remove it from FEATURES_DISPLAY.
For people that for some reason notice that there is always 'perf -vv', a short hand for 'perf version --build-options' and 'perf check feature libbfd' that now explains why it is not built:
$ perf check feature libbfd libbfd: [ OFF ] # HAVE_LIBBFD_SUPPORT ( tip: Deprecated, license incompatibility, use BUILD_NONDISTRO=1 and install binutils-dev[el] ) $
--- tools/build/Makefile.feature | 2 -- 1 file changed, 2 deletions(-)
tools/build/Makefile.feature +0 -2
@@ -147,8 +147,6 @@ endif FEATURE_DISPLAY ?= \ libdw \ glibc \ - libbfd \ - libbfd-buildid \ libelf \ libnuma \ numa_num_possible_cpus \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 424/780 perf ui browser hists: Set actions->thread before calling do_zoom_thread()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 1741189d843a1d5ef38538bc52a3760e2e46cb2e ]
In 7cecb7fe8388d5c3 ("perf hists: Move sort__has_comm into struct perf_hpp_list") it assumes that act->thread is set prior to calling do_zoom_thread().
This doesn't happen when we use ESC or the Left arrow key to Zoom out of a specific thread, making this operation not to work and we get stuck into the thread zoom.
In 6422184b087ff435 ("perf hists browser: Simplify zooming code using pstack_peek()") it says no need to set actions->thread, and at that point that was true, but in 7cecb7fe8388d5c3 a actions->thread == NULL check was added before the zoom out of thread could kick in.
We can zoom out using the alternative 't' thread zoom toggle hotkey to finally set actions->thread before calling do_zoom_thread() and zoom out, but lets also fix the ESC/Zoom out of thread case.
--- tools/perf/ui/browsers/hists.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/browsers/hists.c +1 -1
@@ -3274,10 +3274,10 @@ static int evsel__hists_browse(struct evsel *evsel, int nr_events, const char *h/* * No need to set actions->dso here since * it's just to remove the current filter. -* Ditto for thread below. */ do_zoom_dso (browser, actions); }else if (top == &browser->hists->thread_filter) { + actions->thread = thread;do_zoom_thread (browser, actions); }else if (top == &browser->hists->socket_filter) {do_zoom_socket (browser, actions);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 425/780 dm: dont change md if dm_table_set_restrictions() fails
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Marzinski <[email protected]>
[ Upstream commit 9eb7109a5bfc5b8226e9517e9f3cc6d414391884 ]
__bind was changing the disk capacity, geometry and mempools of the mapped device before calling dm_table_set_restrictions() which could fail, forcing dm to drop the new table. Failing here would leave the device using the old table but with the wrong capacity and mempools.
Move dm_table_set_restrictions() earlier in __bind(). Since it needs the capacity to be set, save the old version and restore it on failure.
--- drivers/md/dm.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/md/dm.c +12 -10
@@ -2421,21 +2421,29 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t, struct queue_limits *limits) {struct dm_table *old_map; -sector_t size; +sector_t size, old_size;int ret;lockdep_assert_held (&md->suspend_lock); size =dm_table_get_size (t); + old_size =dm_get_size (md); +set_capacity (md->disk, size); + + ret =dm_table_set_restrictions (t, md->queue, limits); +if (ret) { +set_capacity (md->disk, old_size); + old_map =ERR_PTR (ret); + goto out; + } +/* * Wipe any geometry if the size of the table changed. */ -if (size !=dm_get_size (md)) +if (size != old_size)memset (&md->geometry,0 ,sizeof (md->geometry)); -set_capacity (md->disk, size); -dm_table_event_callback (t, event_callback, md);if (dm_table_request_based (t)) {
@@ -2468,12 +2476,6 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t, t->mempools =NULL ; } - ret =dm_table_set_restrictions (t, md->queue, limits); -if (ret) { - old_map =ERR_PTR (ret); - goto out; - } - old_map =rcu_dereference_protected (md->map,lockdep_is_held (&md->suspend_lock));rcu_assign_pointer (md->map, (void *)t); md->immutable_target_type =dm_table_get_immutable_target_type (t);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 426/780 dm: free table mempools if not used in __bind
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Marzinski <[email protected]>
[ Upstream commit e8819e7f03470c5b468720630d9e4e1d5b99159e ]
With request-based dm, the mempools don't need reloading when switching tables, but the unused table mempools are not freed until the active table is finally freed. Free them immediately if they are not needed.
--- drivers/md/dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/md/dm.c +4 -4
@@ -2461,10 +2461,10 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,* requests in the queue may refer to bio from the old bioset, * so you must walk through the queue to unprep. */ -if (!md->mempools) { +if (!md->mempools) md->mempools = t->mempools; - t->mempools =NULL ; - } +else +dm_free_md_mempools (t->mempools); }else {/* * The md may already have mempools that need changing.
@@ -2473,8 +2473,8 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,*/ dm_free_md_mempools (md->mempools); md->mempools = t->mempools; - t->mempools =NULL ; } + t->mempools =NULL ; old_map =rcu_dereference_protected (md->map,lockdep_is_held (&md->suspend_lock));rcu_assign_pointer (md->map, (void *)t);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 427/780 dm: handle failures in dm_table_set_restrictions
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Marzinski <[email protected]>
[ Upstream commit 4ea30ec6fb3bb598bd1df04cdfab13b1140074d2 ]
If dm_table_set_restrictions() fails while swapping tables, device-mapper will continue using the previous table. It must be sure to leave the mapped_device in it's previous state on failure. Otherwise device-mapper could end up using the old table with settings from the unused table.
Do not update the mapped device in dm_set_zones_restrictions(). Wait till after dm_table_set_restrictions() is sure to succeed to update the md zoned settings. Do the same with the dax settings, and if dm_revalidate_zones() fails, restore the original queue limits.
--- drivers/md/dm-table.c | 26 +++++++++++++++++--------- drivers/md/dm-zone.c | 26 ++++++++++++++++++-------- drivers/md/dm.h | 1 + 3 files changed, 36 insertions(+), 17 deletions(-)
drivers/md/dm-table.c +17 -9
@@ -1834,6 +1834,7 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, struct queue_limits *limits) {int r; +struct queue_limits old_limits;if (!dm_table_supports_nowait (t)) limits->features &= ~BLK_FEAT_NOWAIT ;
@@ -1860,16 +1861,11 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,if (dm_table_supports_flush (t)) limits->features |=BLK_FEAT_WRITE_CACHE |BLK_FEAT_FUA ; -if (dm_table_supports_dax (t, device_not_dax_capable)) { +if (dm_table_supports_dax (t, device_not_dax_capable)) limits->features |=BLK_FEAT_DAX ; -if (dm_table_supports_dax (t, device_not_dax_synchronous_capable)) -set_dax_synchronous (t->md->dax_dev); - }else +else limits->features &= ~BLK_FEAT_DAX ; -if (dm_table_any_dev_attr (t, device_dax_write_cache_enabled,NULL )) -dax_write_cache (t->md->dax_dev, true); -/* For a zoned table, setup the zone related queue attributes. */ if (IS_ENABLED (CONFIG_BLK_DEV_ZONED ) && (limits->features &BLK_FEAT_ZONED )) {
@@ -1881,7 +1877,8 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,if (dm_table_supports_atomic_writes (t)) limits->features |=BLK_FEAT_ATOMIC_WRITES ; - r =queue_limits_set (q, limits); + old_limits =queue_limits_start_update (q); + r =queue_limits_commit_update (q, limits);if (r)return r;
@@ -1892,10 +1889,21 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,if (IS_ENABLED (CONFIG_BLK_DEV_ZONED ) && (limits->features &BLK_FEAT_ZONED )) { r =dm_revalidate_zones (t, q); -if (r) +if (r) { +queue_limits_set (q, &old_limits);return r; + } } +if (IS_ENABLED (CONFIG_BLK_DEV_ZONED )) +dm_finalize_zone_settings (t, limits); + +if (dm_table_supports_dax (t, device_not_dax_synchronous_capable)) +set_dax_synchronous (t->md->dax_dev); + +if (dm_table_any_dev_attr (t, device_dax_write_cache_enabled,NULL )) +dax_write_cache (t->md->dax_dev, true); +dm_update_crypto_profile (q, t);return 0 ; }
drivers/md/dm-zone.c +18 -8
@@ -340,12 +340,8 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q,* mapped device queue as needing zone append emulation. */ WARN_ON_ONCE (queue_is_mq (q)); -if (dm_table_supports_zone_append (t)) { -clear_bit (DMF_EMULATE_ZONE_APPEND , &md->flags); - }else { -set_bit (DMF_EMULATE_ZONE_APPEND , &md->flags); +if (!dm_table_supports_zone_append (t)) lim->max_hw_zone_append_sectors =0 ; - }/* * Determine the max open and max active zone limits for the mapped
@@ -383,9 +379,6 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q, lim->zone_write_granularity =0 ; lim->chunk_sectors =0 ; lim->features &= ~BLK_FEAT_ZONED ; -clear_bit (DMF_EMULATE_ZONE_APPEND , &md->flags); - md->nr_zones =0 ; - disk->nr_zones =0 ;return 0 ; }
@@ -408,6 +401,23 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q,return 0 ; } +void dm_finalize_zone_settings (struct dm_table *t,struct queue_limits *lim) +{ +struct mapped_device *md = t->md; + +if (lim->features &BLK_FEAT_ZONED ) { +if (dm_table_supports_zone_append (t)) +clear_bit (DMF_EMULATE_ZONE_APPEND , &md->flags); +else +set_bit (DMF_EMULATE_ZONE_APPEND , &md->flags); + }else { +clear_bit (DMF_EMULATE_ZONE_APPEND , &md->flags); + md->nr_zones =0 ; + md->disk->nr_zones =0 ; + } +} + +/* * IO completion callback called from clone_endio(). */
drivers/md/dm.h +1 -0
@@ -102,6 +102,7 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t);int dm_set_zones_restrictions (struct dm_table *t,struct request_queue *q,struct queue_limits *lim);int dm_revalidate_zones (struct dm_table *t,struct request_queue *q); +void dm_finalize_zone_settings (struct dm_table *t,struct queue_limits *lim);void dm_zone_endio (struct dm_io *io,struct bio *clone);#ifdef CONFIG_BLK_DEV_ZONED int dm_blk_report_zones(struct gendisk *disk, sector_t sector,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 428/780 backlight: pm8941: Add NULL check in wled_configure()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit e12d3e1624a02706cdd3628bbf5668827214fa33 ]
devm_kasprintf() returns NULL when memory allocation fails. Currently, wled_configure() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after devm_kasprintf() to prevent this issue.
--- drivers/video/backlight/qcom-wled.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/video/backlight/qcom-wled.c +4 -2
@@ -1406,9 +1406,11 @@ static int wled_configure(struct wled *wled) wled->ctrl_addr =be32_to_cpu (*prop_addr); rc =of_property_read_string (dev->of_node,"label" , &wled->name); -if (rc) +if (rc) { wled->name =devm_kasprintf (dev,GFP_KERNEL ,"%pOFn" , dev->of_node); - +if (!wled->name) +return -ENOMEM ; + }switch (wled->version) {case 3 : u32_opts = wled3_opts;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 429/780 HID: intel-thc-hid: intel-quicki2c: pass correct arguments to acpi_evaluate_object
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Guan <[email protected]>
[ Upstream commit 37d66cf07871927ea682c491b9e9a12dd73e6b5b ]
Delete unused argument, pass correct argument to acpi_evaluate_object.
Log:
intel_quicki2c 0000:00:10.0: enabling device (0000 -> 0002)
ACPI: \_SB.PC00.THC0.ICRS: 1 arguments were passed to a non-method ACPI object (Buffer) (20230628/nsarguments-211)
ACPI: \_SB.PC00.THC0.ISUB: 1 arguments were passed to a non-method ACPI object (Buffer) (20230628/nsarguments-211)
--- drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c +1 -6
@@ -82,15 +82,10 @@ static int quicki2c_acpi_get_dsd_property(struct acpi_device *adev, acpi_string {acpi_handle handle =acpi_device_handle (adev);struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL }; -union acpi_object obj = { .type = type }; -struct acpi_object_list arg_list = { - .count =1 , - .pointer = &obj, - };union acpi_object *ret_obj;acpi_status status; - status =acpi_evaluate_object (handle, dsd_method_name, &arg_list, &buffer); + status =acpi_evaluate_object (handle, dsd_method_name,NULL , &buffer);if (ACPI_FAILURE (status)) {acpi_handle_err (handle,"Can't evaluate %s method: %d\n" , dsd_method_name, status);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 430/780 HID: HID_APPLETB_KBD should depend on X86
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 2a647d400afecdf12ba5905424e1337fbc2d6750 ]
The Apple Touch Bar is only present on x86 MacBook Pros. Hence add a dependency on X86, to prevent asking the user about this driver when configuring a kernel for a different architecture.
--- drivers/hid/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/hid/Kconfig +1 -0
@@ -163,6 +163,7 @@ config HID_APPLETB_KBD depends on USB_HID depends on BACKLIGHT_CLASS_DEVICE depends on INPUT + depends on X86 || COMPILE_TEST select INPUT_SPARSEKMAP select HID_APPLETB_BL help
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 431/780 HID: HID_APPLETB_BL should depend on X86
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit de7ad66b16b4d397593eafbbb09e9557b558a7e3 ]
The Apple Touch Bar is only present on x86 MacBook Pros. Hence add a dependency on X86, to prevent asking the user about this driver when configuring a kernel for a different architecture.
--- drivers/hid/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/hid/Kconfig +1 -0
@@ -151,6 +151,7 @@ config HID_APPLEIR config HID_APPLETB_BL tristate "Apple Touch Bar Backlight" depends on BACKLIGHT_CLASS_DEVICE + depends on X86 || COMPILE_TEST help Say Y here if you want support for the backlight of Touch Bars on x86 MacBook Pros.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 432/780 x86/irq: Ensure initial PIR loads are performed exactly once
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 600e9606046ac3b9b7a3f0500d08a179df84c45e ]
Ensure the PIR is read exactly once at the start of handle_pending_pir(), to guarantee that checking for an outstanding posted interrupt in a given chuck doesn't reload the chunk from the "real" PIR. Functionally, a reload is benign, but it would defeat the purpose of pre-loading into a copy.
--- arch/x86/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/irq.c +1 -1
@@ -419,7 +419,7 @@ static __always_inline bool handle_pending_pir(u64 *pir, struct pt_regs *regs)bool handled = false;for (i =0 ; i <4 ; i++) - pir_copy[i] = pir[i]; + pir_copy[i] =READ_ONCE (pir[i]);for (i =0 ; i <4 ; i++) {if (!pir_copy[i])
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 433/780 perf tool_pmu: Fix aggregation on duration_time
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 68cb1567439fa325ba980f3b5b67f95d3953eafd ]
evsel__count_has_error() fails counters when the enabled or running time are 0. The duration_time event reads 0 when the cpu_map_idx != 0 to avoid aggregating time over CPUs. Change the enable and running time to always have a ratio of 100% so that evsel__count_has_error won't fail.
Before:
```
$ sudo /tmp/perf/perf stat --per-core -a -M UNCORE_FREQ sleep 1
Performance counter stats for 'system wide':
S0-D0-C0 1 2,615,819,485 UNC_CLOCK.SOCKET # 2.61 UNCORE_FREQ
S0-D0-C0 2 <not counted> duration_time
1.002111784 seconds time elapsed
```After:
```
$ perf stat --per-core -a -M UNCORE_FREQ sleep 1
Performance counter stats for 'system wide':
S0-D0-C0 1 758,160,296 UNC_CLOCK.SOCKET # 0.76 UNCORE_FREQ
S0-D0-C0 2 1,003,438,246 duration_time
1.002486017 seconds time elapsed
```Note: the metric reads the value a different way and isn't impacted.
--- tools/perf/util/tool_pmu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/util/tool_pmu.c +7 -1
@@ -486,8 +486,14 @@ int evsel__tool_pmu_read(struct evsel *evsel, int cpu_map_idx, int thread) delta_start *=1000000000 / ticks_per_sec; } count->val = delta_start; - count->ena = count->run = delta_start; count->lost =0 ; +/* +* The values of enabled and running must make a ratio of 100%. The +* exact values don't matter as long as they are non-zero to avoid +* issues with evsel__count_has_error. +*/ + count->ena++; + count->run++;return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 434/780 perf tests metric-only perf stat: Fix tests 84 and 86 s390
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Richter <[email protected]>
[ Upstream commit ccd4b5cdf00f358acae9f396d13029e7ae78522e ]
On s390x KVM and z/VM machines the CPU Measurement Facility is not available. Events cycles and instructions do not exist. Running above tests on s390 KVM and z/VM guests always fail with this error:
# ./perf test 84 86 84: perf stat JSON output linter : FAILED! 86: perf stat STD output linter : FAILED! #
Root cause is command:
# perf stat -j --metric-only -e instructions,cycles -- true
{"metric-value" : "none"}
#Which fails due to unsupported events and returns "none". Do not execute this test case on s390 KVM and z/VM machines.
Output after:
# ./perf test 84 86 84: perf stat JSON output linter : Ok 86: perf stat STD output linter : Ok #
--- tools/perf/tests/shell/lib/stat_output.sh | 5 +++++ tools/perf/tests/shell/stat+json_output.sh | 5 +++++ 2 files changed, 10 insertions(+)
tools/perf/tests/shell/lib/stat_output.sh +5 -0
@@ -151,6 +151,11 @@ check_per_socket() check_metric_only() { echo -n "Checking $1 output: metric only " + if [ "$(uname -m)" = "s390x" ] && ! grep '^facilities' /proc/cpuinfo | grep -qw 67 + then + echo "[Skip] CPU-measurement counter facility not installed" + return + fi perf stat --metric-only $2 -e instructions,cycles true commachecker --metric-only echo "[Success]"
tools/perf/tests/shell/stat+json_output.sh +5 -0
@@ -176,6 +176,11 @@ check_per_socket() check_metric_only() { echo -n "Checking json output: metric only " + if [ "$(uname -m)" = "s390x" ] && ! grep '^facilities' /proc/cpuinfo | grep -qw 67 + then + echo "[Skip] CPU-measurement counter facility not installed" + return + fi perf stat -j --metric-only -e instructions,cycles -o "${stat_output}" true $PYTHON $pythonchecker --metric-only --file "${stat_output}" echo "[Success]"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 435/780 mtd: nand: ecc-mxic: Fix use of uninitialized variable ret
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikhail Arkhipov <[email protected]>
[ Upstream commit d95846350aac72303036a70c4cdc69ae314aa26d ]
If ctx->steps is zero, the loop processing ECC steps is skipped, and the variable ret remains uninitialized. It is later checked and returned, which leads to undefined behavior and may cause unpredictable results in user space or kernel crashes.
This scenario can be triggered in edge cases such as misconfigured geometry, ECC engine misuse, or if ctx->steps is not validated after initialization.
Initialize ret to zero before the loop to ensure correct and safe behavior regardless of the ctx->steps value.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/mtd/nand/ecc-mxic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/ecc-mxic.c +1 -1
@@ -614,7 +614,7 @@ static int mxic_ecc_finish_io_req_external(struct nand_device *nand, {struct mxic_ecc_engine *mxic =nand_to_mxic (nand);struct mxic_ecc_ctx *ctx =nand_to_ecc_ctx (nand); -int nents, step, ret; +int nents, step, ret =0 ;if (req->mode ==MTD_OPS_RAW )return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 436/780 hwmon: (asus-ec-sensors) check sensor index in read_string()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Safin <[email protected]>
[ Upstream commit 25be318324563c63cbd9cb53186203a08d2f83a1 ]
Prevent a potential invalid memory access when the requested sensor is not found.
find_ec_sensor_index() may return a negative value (e.g. -ENOENT), but its result was used without checking, which could lead to undefined behavior when passed to get_sensor_info().
Add a proper check to return -EINVAL if sensor_index is negative.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/hwmon/asus-ec-sensors.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/hwmon/asus-ec-sensors.c +4 -0
@@ -933,6 +933,10 @@ static int asus_ec_hwmon_read_string(struct device *dev, {struct ec_sensors_data *state =dev_get_drvdata (dev);int sensor_index =find_ec_sensor_index (state, type, channel); + +if (sensor_index <0 ) +return sensor_index; + *str =get_sensor_info (state, sensor_index)->label;return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 437/780 perf symbol-minimal: Fix double free in filename__read_build_id
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit fa9c4977fbfbca182f9e410d57b3f98356a9d917 ]
Running the "perf script task-analyzer tests" with address sanitizer showed a double free:
```
FAIL: "test_csv_extended_times" Error message: "Failed to find required string:'Out-Out;'."
=================================================================
==19190==ERROR: AddressSanitizer: attempting double-free on 0x50b000017b10 in thread T0:
#0 0x55da9601c78a in free (perf+0x26078a) (BuildId: e7ef50e08970f017a96fde6101c5e2491acc674a)
#1 0x55da96640c63 in filename__read_build_id tools/perf/util/symbol-minimal.c:221:2
0x50b000017b10 is located 0 bytes inside of 112-byte region [0x50b000017b10,0x50b000017b80)
freed by thread T0 here:
#0 0x55da9601ce40 in realloc (perf+0x260e40) (BuildId: e7ef50e08970f017a96fde6101c5e2491acc674a)
#1 0x55da96640ad6 in filename__read_build_id tools/perf/util/symbol-minimal.c:204:10
previously allocated by thread T0 here:
#0 0x55da9601ca23 in malloc (perf+0x260a23) (BuildId: e7ef50e08970f017a96fde6101c5e2491acc674a)
#1 0x55da966407e7 in filename__read_build_id tools/perf/util/symbol-minimal.c:181:9
SUMMARY: AddressSanitizer: double-free (perf+0x26078a) (BuildId: e7ef50e08970f017a96fde6101c5e2491acc674a) in free
==19190==ABORTING
FAIL: "invocation of perf script report task-analyzer --csv-summary csvsummary --summary-extended command failed" Error message: ""
FAIL: "test_csvsummary_extended" Error message: "Failed to find required string:'Out-Out;'."
---- end(-1) ----
132: perf script task-analyzer tests : FAILED!
```The buf_size if always set to phdr->p_filesz, but that may be 0 causing a free and realloc to return NULL. This is treated in filename__read_build_id like a failure and the buffer is freed again.
To avoid this problem only grow buf, meaning the buf_size will never be 0. This also reduces the number of memory (re)allocations.
--- tools/perf/util/symbol-minimal.c | 34 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-)
tools/perf/util/symbol-minimal.c +18 -16
@@ -147,18 +147,19 @@ int filename__read_build_id(const char *filename, struct build_id *bid)if (phdr->p_type !=PT_NOTE )continue ; - buf_size = phdr->p_filesz; offset = phdr->p_offset; - tmp =realloc (buf, buf_size); -if (tmp ==NULL ) - goto out_free; - - buf = tmp; +if (phdr->p_filesz > buf_size) { + buf_size = phdr->p_filesz; + tmp =realloc (buf, buf_size); +if (tmp ==NULL ) + goto out_free; + buf = tmp; + }fseek (fp, offset,SEEK_SET ); -if (fread (buf, buf_size,1 , fp) !=1 ) +if (fread (buf, phdr->p_filesz,1 , fp) !=1 ) goto out_free; - ret =read_build_id (buf, buf_size, bid, need_swap); + ret =read_build_id (buf, phdr->p_filesz, bid, need_swap);if (ret ==0 ) { ret = bid->size;break ;
@@ -199,18 +200,19 @@ int filename__read_build_id(const char *filename, struct build_id *bid)if (phdr->p_type !=PT_NOTE )continue ; - buf_size = phdr->p_filesz; offset = phdr->p_offset; - tmp =realloc (buf, buf_size); -if (tmp ==NULL ) - goto out_free; - - buf = tmp; +if (phdr->p_filesz > buf_size) { + buf_size = phdr->p_filesz; + tmp =realloc (buf, buf_size); +if (tmp ==NULL ) + goto out_free; + buf = tmp; + }fseek (fp, offset,SEEK_SET ); -if (fread (buf, buf_size,1 , fp) !=1 ) +if (fread (buf, phdr->p_filesz,1 , fp) !=1 ) goto out_free; - ret =read_build_id (buf, buf_size, bid, need_swap); + ret =read_build_id (buf, phdr->p_filesz, bid, need_swap);if (ret ==0 ) { ret = bid->size;break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 438/780 dm: fix dm_blk_report_zones
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Marzinski <[email protected]>
[ Upstream commit 37f53a2c60d03743e0eacf7a0c01c279776fef4e ]
If dm_get_live_table() returned NULL, dm_put_live_table() was never called. Also, it is possible that md->zone_revalidate_map will change while calling this function. Only read it once, so that we are always using the same value. Otherwise we might miss a call to dm_put_live_table().
Finally, while md->zone_revalidate_map is set and a process is calling blk_revalidate_disk_zones() to set up the zone append emulation resources, it is possible that another process, perhaps triggered by blkdev_report_zones_ioctl(), will call dm_blk_report_zones(). If blk_revalidate_disk_zones() fails, these resources can be freed while the other process is still using them, causing a use-after-free error.
blk_revalidate_disk_zones() will only ever be called when initially setting up the zone append emulation resources, such as when setting up a zoned dm-crypt table for the first time. Further table swaps will not set md->zone_revalidate_map or call blk_revalidate_disk_zones(). However it must be called using the new table (referenced by md->zone_revalidate_map) and the new queue limits while the DM device is suspended. dm_blk_report_zones() needs some way to distinguish between a call from blk_revalidate_disk_zones(), which must be allowed to use md->zone_revalidate_map to access this not yet activated table, and all other calls to dm_blk_report_zones(), which should not be allowed while the device is suspended and cannot use md->zone_revalidate_map, since the zone resources might be freed by the process currently calling blk_revalidate_disk_zones().
Solve this by tracking the process that sets md->zone_revalidate_map in dm_revalidate_zones() and only allowing that process to make use of it in dm_blk_report_zones().
--- drivers/md/dm-core.h | 1 + drivers/md/dm-zone.c | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-)
drivers/md/dm-core.h +1 -0
@@ -141,6 +141,7 @@ struct mapped_device {#ifdef CONFIG_BLK_DEV_ZONED unsigned int nr_zones;void *zone_revalidate_map; +struct task_struct *revalidate_map_task;#endif #ifdef CONFIG_IMA
drivers/md/dm-zone.c +17 -8
@@ -56,24 +56,31 @@ int dm_blk_report_zones(struct gendisk *disk, sector_t sector, {struct mapped_device *md = disk->private_data;struct dm_table *map; -int srcu_idx, ret; +struct dm_table *zone_revalidate_map = md->zone_revalidate_map; +int srcu_idx, ret = -EIO ; +bool put_table = false; -if (!md->zone_revalidate_map) { -/* Regular user context */ +if (!zone_revalidate_map || md->revalidate_map_task != current) { +/* +* Regular user context or +* Zone revalidation during __bind() is in progress, but this +* call is from a different process +*/ if (dm_suspended_md (md))return -EAGAIN ; map =dm_get_live_table (md, &srcu_idx); -if (!map) -return -EIO ; + put_table = true; }else {/* Zone revalidation during __bind() */ - map = md->zone_revalidate_map; + map = zone_revalidate_map; } - ret =dm_blk_do_report_zones (md, map, sector, nr_zones, cb, data); +if (map) + ret =dm_blk_do_report_zones (md, map, sector, nr_zones, cb, + data); -if (!md->zone_revalidate_map) +if (put_table)dm_put_live_table (md, srcu_idx);return ret;
@@ -175,7 +182,9 @@ int dm_revalidate_zones(struct dm_table *t, struct request_queue *q)* our table for dm_blk_report_zones() to use directly. */ md->zone_revalidate_map = t; + md->revalidate_map_task = current; ret =blk_revalidate_disk_zones (disk); + md->revalidate_map_task =NULL ; md->zone_revalidate_map =NULL ;if (ret) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 439/780 dm: limit swapping tables for devices with zone write plugs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Marzinski <[email protected]>
[ Upstream commit 121218bef4c1df165181f5cd8fc3a2246bac817e ]
dm_revalidate_zones() only allowed new or previously unzoned devices to call blk_revalidate_disk_zones(). If the device was already zoned, disk->nr_zones would always equal md->nr_zones, so dm_revalidate_zones() returned without doing any work. This would make the zoned settings for the device not match the new table. If the device had zone write plug resources, it could run into errors like bdev_zone_is_seq() reading invalid memory because disk->conv_zones_bitmap was the wrong size.
If the device doesn't have any zone write plug resources, calling blk_revalidate_disk_zones() will always correctly update device. If blk_revalidate_disk_zones() fails, it can still overwrite or clear the current disk->nr_zones value. In this case, DM must restore the previous value of disk->nr_zones, so that the zoned settings will continue to match the previous value that it fell back to.
If the device already has zone write plug resources, blk_revalidate_disk_zones() will not correctly update them, if it is called for arbitrary zoned device changes. Since there is not much need for this ability, the easiest solution is to disallow any table reloads that change the zoned settings, for devices that already have zone plug resources. Specifically, if a device already has zone plug resources allocated, it can only switch to another zoned table that also emulates zone append. Also, it cannot change the device size or the zone size. A device can switch to an error target.
--- drivers/md/dm-table.c | 41 ++++++++++++++++++++++++++++++++++++----- drivers/md/dm-zone.c | 35 ++++++++++++++++++++++++++--------- drivers/md/dm.c | 6 ++++++ drivers/md/dm.h | 5 +++++ 4 files changed, 73 insertions(+), 14 deletions(-)
drivers/md/dm-table.c +36 -5
@@ -1490,6 +1490,18 @@ bool dm_table_has_no_data_devices(struct dm_table *t)return true; } +bool dm_table_is_wildcard (struct dm_table *t) +{ +for (unsigned int i =0 ; i < t->num_targets; i++) { +struct dm_target *ti =dm_table_get_target (t, i); + +if (!dm_target_is_wildcard (ti->type)) +return false; + } + +return true; +} +static int device_not_zoned (struct dm_target *ti,struct dm_dev *dev,sector_t start,sector_t len,void *data) {
@@ -1830,6 +1842,19 @@ static bool dm_table_supports_atomic_writes(struct dm_table *t)return true; } +bool dm_table_supports_size_change (struct dm_table *t,sector_t old_size, +sector_t new_size) +{ +if (IS_ENABLED (CONFIG_BLK_DEV_ZONED ) &&dm_has_zone_plugs (t->md) && + old_size != new_size) { +DMWARN ("%s: device has zone write plug resources. " +"Cannot change size" , +dm_device_name (t->md)); +return false; + } +return true; +} +int dm_table_set_restrictions (struct dm_table *t,struct request_queue *q,struct queue_limits *limits) {
@@ -1867,11 +1892,17 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, limits->features &= ~BLK_FEAT_DAX ;/* For a zoned table, setup the zone related queue attributes. */ -if (IS_ENABLED (CONFIG_BLK_DEV_ZONED ) && - (limits->features &BLK_FEAT_ZONED )) { - r =dm_set_zones_restrictions (t, q, limits); -if (r) -return r; +if (IS_ENABLED (CONFIG_BLK_DEV_ZONED )) { +if (limits->features &BLK_FEAT_ZONED ) { + r =dm_set_zones_restrictions (t, q, limits); +if (r) +return r; + }else if (dm_has_zone_plugs (t->md)) { +DMWARN ("%s: device has zone write plug resources. " +"Cannot switch to non-zoned table." , +dm_device_name (t->md)); +return -EINVAL ; + } }if (dm_table_supports_atomic_writes (t))
drivers/md/dm-zone.c +26 -9
@@ -160,22 +160,22 @@ int dm_revalidate_zones(struct dm_table *t, struct request_queue *q) {struct mapped_device *md = t->md;struct gendisk *disk = md->disk; +unsigned int nr_zones = disk->nr_zones;int ret;if (!get_capacity (disk))return 0 ; -/* Revalidate only if something changed. */ -if (!disk->nr_zones || disk->nr_zones != md->nr_zones) { -DMINFO ("%s using %s zone append" , - disk->disk_name, -queue_emulates_zone_append (q) ?"emulated" :"native" ); - md->nr_zones =0 ; - } - -if (md->nr_zones) +/* +* Do not revalidate if zone write plug resources have already +* been allocated. +*/ +if (dm_has_zone_plugs (md))return 0 ; +DMINFO ("%s using %s zone append" , disk->disk_name, +queue_emulates_zone_append (q) ?"emulated" :"native" ); +/* * Our table is not live yet. So the call to dm_get_live_table() * in dm_blk_report_zones() will fail. Set a temporary pointer to
@@ -189,6 +189,7 @@ int dm_revalidate_zones(struct dm_table *t, struct request_queue *q)if (ret) {DMERR ("Revalidate zones failed %d" , ret); + disk->nr_zones = nr_zones;return ret; }
@@ -385,12 +386,28 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q, lim->max_open_zones =0 ; lim->max_active_zones =0 ; lim->max_hw_zone_append_sectors =0 ; + lim->max_zone_append_sectors =0 ; lim->zone_write_granularity =0 ; lim->chunk_sectors =0 ; lim->features &= ~BLK_FEAT_ZONED ;return 0 ; } +if (get_capacity (disk) &&dm_has_zone_plugs (t->md)) { +if (q->limits.chunk_sectors != lim->chunk_sectors) { +DMWARN ("%s: device has zone write plug resources. " +"Cannot change zone size" , + disk->disk_name); +return -EINVAL ; + } +if (lim->max_hw_zone_append_sectors !=0 && + !dm_table_is_wildcard (t)) { +DMWARN ("%s: device has zone write plug resources. " +"New table must emulate zone append" , + disk->disk_name); +return -EINVAL ; + } + }/* * Warn once (when the capacity is not yet set) if the mapped device is * partially using zone resources of the target devices as that leads to
drivers/md/dm.c +6 -0
@@ -2429,6 +2429,12 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t, size =dm_table_get_size (t); old_size =dm_get_size (md); + +if (!dm_table_supports_size_change (t, old_size, size)) { + old_map =ERR_PTR (-EINVAL ); + goto out; + } +set_capacity (md->disk, size); ret =dm_table_set_restrictions (t, md->queue, limits);
drivers/md/dm.h +5 -0
@@ -58,6 +58,7 @@ void dm_table_event_callback(struct dm_table *t, void (*fn)(void *), void *context);struct dm_target *dm_table_find_target (struct dm_table *t,sector_t sector);bool dm_table_has_no_data_devices (struct dm_table *table); +bool dm_table_is_wildcard (struct dm_table *t);int dm_calculate_queue_limits (struct dm_table *table,struct queue_limits *limits); int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
@@ -72,6 +73,8 @@ struct target_type *dm_table_get_immutable_target_type(struct dm_table *t);struct dm_target *dm_table_get_immutable_target (struct dm_table *t);struct dm_target *dm_table_get_wildcard_target (struct dm_table *t);bool dm_table_request_based (struct dm_table *t); +bool dm_table_supports_size_change (struct dm_table *t,sector_t old_size, +sector_t new_size);void dm_lock_md_type (struct mapped_device *md);void dm_unlock_md_type (struct mapped_device *md);
@@ -111,12 +114,14 @@ bool dm_is_zone_write(struct mapped_device *md, struct bio *bio);int dm_zone_get_reset_bitmap (struct mapped_device *md,struct dm_table *t,sector_t sector,unsigned int nr_zones,unsigned long *need_reset); +#define dm_has_zone_plugs (md) ((md)->disk->zone_wplugs_hash != NULL)#else #define dm_blk_report_zones NULLstatic inline bool dm_is_zone_write (struct mapped_device *md,struct bio *bio) {return false; } +#define dm_has_zone_plugs (md) false#endif /*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 440/780 dm-flakey: error all IOs when num_features is absent
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Marzinski <[email protected]>
[ Upstream commit 40ed054f39bc99eac09871c33198e501f4acdf24 ]
dm-flakey would error all IOs if num_features was 0, but if it was absent, dm-flakey would never error any IO. Fix this so that no num_features works the same as num_features set to 0.
--- drivers/md/dm-flakey.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/md/dm-flakey.c +8 -8
@@ -53,8 +53,8 @@ struct per_bio_data {static int parse_features (struct dm_arg_set *as,struct flakey_c *fc,struct dm_target *ti) { -int r; -unsigned int argc; +int r =0 ; +unsigned int argc =0 ;const char *arg_name;static const struct dm_arg _args[] = {
@@ -65,14 +65,13 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, {0, PROBABILITY_BASE, "Invalid random corrupt argument"}, }; -/* No feature arguments supplied. */ -if (!as->argc) -return 0 ; - - r =dm_read_arg_group (_args, as, &argc, &ti->error); -if (r) +if (as->argc && (r =dm_read_arg_group (_args, as, &argc, &ti->error)))return r; +/* No feature arguments supplied. */ +if (!argc) + goto error_all_io; +while (argc) { arg_name =dm_shift_arg (as); argc--;
@@ -217,6 +216,7 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,if (!fc->corrupt_bio_byte && !test_bit (ERROR_READS , &fc->flags) && !test_bit (DROP_WRITES , &fc->flags) && !test_bit (ERROR_WRITES , &fc->flags) && !fc->random_read_corrupt && !fc->random_write_corrupt) { +error_all_io:set_bit (ERROR_WRITES , &fc->flags);set_bit (ERROR_READS , &fc->flags); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 441/780 dm-flakey: make corrupting read bios work
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Marzinski <[email protected]>
[ Upstream commit 13e79076c89f6e96a6cca8f6df38b40d025907b4 ]
dm-flakey corrupts the read bios in the endio function. However, the corrupt_bio_* functions checked bio_has_data() to see if there was data to corrupt. Since this was the endio function, there was no data left to complete, so bio_has_data() was always false. Fix this by saving a copy of the bio's bi_iter in flakey_map(), and using this to initialize the iter for corrupting the read bios. This patch also skips cloning the bio for write bios with no data.
--- drivers/md/dm-flakey.c | 54 ++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 26 deletions(-)
drivers/md/dm-flakey.c +28 -26
@@ -47,7 +47,8 @@ enum feature_flag_bits { };struct per_bio_data { -bool bio_submitted; +bool bio_can_corrupt; +struct bvec_iter saved_iter; }; static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
@@ -339,7 +340,8 @@ static void flakey_map_bio(struct dm_target *ti, struct bio *bio) }static void corrupt_bio_common (struct bio *bio,unsigned int corrupt_bio_byte, -unsigned char corrupt_bio_value) +unsigned char corrupt_bio_value, +struct bvec_iter start) {struct bvec_iter iter;struct bio_vec bvec;
@@ -348,7 +350,7 @@ static void corrupt_bio_common(struct bio *bio, unsigned int corrupt_bio_byte,* Overwrite the Nth byte of the bio's data, on whichever page * it falls. */ -bio_for_each_segment (bvec, bio, iter) { +__bio_for_each_segment (bvec, bio, iter, start) {if (bio_iter_len (bio, iter) > corrupt_bio_byte) {unsigned char *segment =bvec_kmap_local (&bvec); segment[corrupt_bio_byte] = corrupt_bio_value;
@@ -357,36 +359,31 @@ static void corrupt_bio_common(struct bio *bio, unsigned int corrupt_bio_byte,"(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n" , bio, corrupt_bio_value, corrupt_bio_byte, (bio_data_dir (bio) ==WRITE ) ?'w' :'r' , bio->bi_opf, - (unsigned long long )bio->bi_iter.bi_sector, - bio->bi_iter.bi_size); + (unsigned long long )start.bi_sector, + start.bi_size);break ; } corrupt_bio_byte -=bio_iter_len (bio, iter); } } -static void corrupt_bio_data (struct bio *bio,struct flakey_c *fc) +static void corrupt_bio_data (struct bio *bio,struct flakey_c *fc, +struct bvec_iter start) {unsigned int corrupt_bio_byte = fc->corrupt_bio_byte -1 ; -if (!bio_has_data (bio)) -return ; - -corrupt_bio_common (bio, corrupt_bio_byte, fc->corrupt_bio_value); +corrupt_bio_common (bio, corrupt_bio_byte, fc->corrupt_bio_value, start); } -static void corrupt_bio_random (struct bio *bio) +static void corrupt_bio_random (struct bio *bio,struct bvec_iter start) {unsigned int corrupt_byte;unsigned char corrupt_value; -if (!bio_has_data (bio)) -return ; - - corrupt_byte =get_random_u32 () % bio->bi_iter.bi_size; + corrupt_byte =get_random_u32 () % start.bi_size; corrupt_value =get_random_u8 (); -corrupt_bio_common (bio, corrupt_byte, corrupt_value); +corrupt_bio_common (bio, corrupt_byte, corrupt_value, start); }static void clone_free (struct bio *clone)
@@ -481,7 +478,7 @@ static int flakey_map(struct dm_target *ti, struct bio *bio)unsigned int elapsed;struct per_bio_data *pb =dm_per_bio_data (bio,sizeof (struct per_bio_data )); - pb->bio_submitted = false; + pb->bio_can_corrupt = false;if (op_is_zone_mgmt (bio_op (bio))) goto map_bio;
@@ -490,10 +487,11 @@ static int flakey_map(struct dm_target *ti, struct bio *bio) elapsed = (jiffies - fc->start_time) /HZ ;if (elapsed % (fc->up_interval + fc->down_interval) >= fc->up_interval) {bool corrupt_fixed, corrupt_random; -/* -* Flag this bio as submitted while down. -*/ - pb->bio_submitted = true; + +if (bio_has_data (bio)) { + pb->bio_can_corrupt = true; + pb->saved_iter = bio->bi_iter; + }/* * Error reads if neither corrupt_bio_byte or drop_writes or error_writes are set.
@@ -516,6 +514,8 @@ static int flakey_map(struct dm_target *ti, struct bio *bio)return DM_MAPIO_SUBMITTED ; } +if (!pb->bio_can_corrupt) + goto map_bio;/* * Corrupt matching writes. */
@@ -535,9 +535,11 @@ static int flakey_map(struct dm_target *ti, struct bio *bio)struct bio *clone =clone_bio (ti, fc, bio);if (clone) {if (corrupt_fixed) -corrupt_bio_data (clone, fc); +corrupt_bio_data (clone, fc, + clone->bi_iter);if (corrupt_random) -corrupt_bio_random (clone); +corrupt_bio_random (clone, + clone->bi_iter);submit_bio (clone);return DM_MAPIO_SUBMITTED ; }
@@ -559,21 +561,21 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio,if (op_is_zone_mgmt (bio_op (bio)))return DM_ENDIO_DONE ; -if (!*error && pb->bio_submitted && (bio_data_dir (bio) ==READ )) { +if (!*error && pb->bio_can_corrupt && (bio_data_dir (bio) ==READ )) {if (fc->corrupt_bio_byte) {if ((fc->corrupt_bio_rw ==READ ) &&all_corrupt_bio_flags_match (bio, fc)) {/* * Corrupt successful matching READs while in down state. */ -corrupt_bio_data (bio, fc); +corrupt_bio_data (bio, fc, pb->saved_iter); } }if (fc->random_read_corrupt) {u64 rnd =get_random_u64 ();u32 rem =do_div (rnd,PROBABILITY_BASE );if (rem < fc->random_read_corrupt) -corrupt_bio_random (bio); +corrupt_bio_random (bio, pb->saved_iter); }if (test_bit (ERROR_READS , &fc->flags)) {/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 442/780 perf trace: Fix leaks of struct thread in fprintf_sys_enter()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit bb3de7fa988c1b315ab8e87dc74e0d088284f142 ]
I've found some leaks from 'perf trace -a'.
It seems there are more leaks but this is what I can find for now.
--- tools/perf/builtin-trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-trace.c +1 -1
@@ -2842,7 +2842,7 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct evsel *evsel, e_machine =thread__e_machine (thread, trace->host); sc =trace__syscall_info (trace, evsel, e_machine, id);if (sc ==NULL ) -return -1 ; + goto out_put; ttrace =thread__trace (thread, trace);/* * We need to get ttrace just to make sure it is there when syscall__scnprintf_args()
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 443/780 perf trace: Fix leaks of struct thread in set_filter_loop_pids()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 30d20fb1f84ad5c92706fe2c6cbb2d4cc293e671 ]
I've found some leaks from 'perf trace -a'.
It seems there are more leaks but this is what I can find for now.
--- tools/perf/builtin-trace.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/builtin-trace.c +3 -0
@@ -4128,10 +4128,13 @@ static int trace__set_filter_loop_pids(struct trace *trace)if (!strcmp (thread__comm_str (parent),"sshd" ) ||strstarts (thread__comm_str (parent),"gnome-terminal" )) { pids[nr++] =thread__tid (parent); +thread__put (parent);break ; } +thread__put (thread); thread = parent; } +thread__put (thread); err =evlist__append_tp_filter_pids (trace->evlist, nr, pids);if (!err && trace->filter_pids.map)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 444/780 perf tests: Fix perf report tests installation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Petlan <[email protected]>
[ Upstream commit 4bfe27140edf8dd1322326c79f5ae8d29ff7e43d ]
There was a copy-paste mistake in the installation commands.
Also, we need to install stderr-whitelist.txt file, which contains allowed messages that are printed on stderr and should not cause test fail.
--- tools/perf/Makefile.perf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/Makefile.perf +2 -1
@@ -1147,7 +1147,8 @@ install-tests: all install-gtk $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_probe'; \ $(INSTALL) tests/shell/base_probe/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_probe'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_report'; \ - $(INSTALL) tests/shell/base_probe/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_report'; \ + $(INSTALL) tests/shell/base_report/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_report'; \ + $(INSTALL) tests/shell/base_report/*.txt '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_report'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight' ; \ $(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight' $(Q)$(MAKE) -C tests/shell/coresight install-tests
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 445/780 perf intel-pt: Fix PEBS-via-PT data_src
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit e00eac6b5b6d956f38d8880c44bf7fd9954063c3 ]
The Fixes commit did not add support for decoding PEBS-via-PT data_src. Fix by adding support.
PEBS-via-PT is a feature of some E-core processors, starting with processors based on Tremont microarchitecture. Because the kernel only supports Intel PT features that are on all processors, there is no support for PEBS-via-PT on hybrids.
Currently that leaves processors based on Tremont, Gracemont and Crestmont, however there are no events on Tremont that produce data_src information, and for Gracemont and Crestmont there are only:
mem-loads event=0xd0,umask=0x5,ldlat=3 mem-stores event=0xd0,umask=0x6
Affected processors include Alder Lake N (Gracemont), Sierra Forest (Crestmont) and Grand Ridge (Crestmont).
Example:
# perf record -d -e intel_pt/branch=0/ -e mem-loads/aux-output/pp uname
Before:
# perf.before script --itrace=o -Fdata_src
0 |OP No|LVL N/A|SNP N/A|TLB N/A|LCK No|BLK N/A
0 |OP No|LVL N/A|SNP N/A|TLB N/A|LCK No|BLK N/AAfter:
# perf script --itrace=o -Fdata_src 10268100142 |OP LOAD|LVL L1 hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A 10450100442 |OP LOAD|LVL L2 hit|SNP None|TLB L2 miss|LCK No|BLK N/A
--- tools/perf/util/intel-pt.c | 205 ++++++++++++++++++++++++++++++++++++- 1 file changed, 202 insertions(+), 3 deletions(-)
tools/perf/util/intel-pt.c +202 -3
@@ -127,6 +127,7 @@ struct intel_pt {bool single_pebs;bool sample_pebs; +int pebs_data_src_fmt;struct evsel *pebs_evsel;u64 evt_sample_type;
@@ -175,6 +176,7 @@ enum switch_state {struct intel_pt_pebs_event {struct evsel *evsel;u64 id; +int data_src_fmt; };struct intel_pt_queue {
@@ -2272,7 +2274,146 @@ static void intel_pt_add_lbrs(struct branch_stack *br_stack, } } -static int intel_pt_do_synth_pebs_sample (struct intel_pt_queue *ptq,struct evsel *evsel,u64 id) +#define P (a, b) PERF_MEM_S(a, b) +#define OP_LH (P(OP, LOAD) | P(LVL, HIT)) +#define LEVEL (x) P(LVLNUM, x) +#define REM P(REMOTE, REMOTE) +#define SNOOP_NONE_MISS (P(SNOOP, NONE) | P(SNOOP, MISS)) + +#define PERF_PEBS_DATA_SOURCE_GRT_MAX 0x10 +#define PERF_PEBS_DATA_SOURCE_GRT_MASK (PERF_PEBS_DATA_SOURCE_GRT_MAX - 1) + +/* Based on kernel __intel_pmu_pebs_data_source_grt() and pebs_data_source */ +static const u64 pebs_data_source_grt[PERF_PEBS_DATA_SOURCE_GRT_MAX ] = { +P (OP ,LOAD ) |P (LVL ,MISS ) |LEVEL (L3 ) |P (SNOOP ,NA ),/* L3 miss|SNP N/A */ +OP_LH |P (LVL ,L1 ) |LEVEL (L1 ) |P (SNOOP ,NONE ),/* L1 hit|SNP None */ +OP_LH |P (LVL ,LFB ) |LEVEL (LFB ) |P (SNOOP ,NONE ),/* LFB/MAB hit|SNP None */ +OP_LH |P (LVL ,L2 ) |LEVEL (L2 ) |P (SNOOP ,NONE ),/* L2 hit|SNP None */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOP ,NONE ),/* L3 hit|SNP None */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOP ,HIT ),/* L3 hit|SNP Hit */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOP ,HITM ),/* L3 hit|SNP HitM */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOP ,HITM ),/* L3 hit|SNP HitM */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOPX ,FWD ),/* L3 hit|SNP Fwd */ +OP_LH |P (LVL ,REM_CCE1 ) |REM |LEVEL (L3 ) |P (SNOOP ,HITM ),/* Remote L3 hit|SNP HitM */ +OP_LH |P (LVL ,LOC_RAM ) |LEVEL (RAM ) |P (SNOOP ,HIT ),/* RAM hit|SNP Hit */ +OP_LH |P (LVL ,REM_RAM1 ) |REM |LEVEL (L3 ) |P (SNOOP ,HIT ),/* Remote L3 hit|SNP Hit */ +OP_LH |P (LVL ,LOC_RAM ) |LEVEL (RAM ) |SNOOP_NONE_MISS ,/* RAM hit|SNP None or Miss */ +OP_LH |P (LVL ,REM_RAM1 ) |LEVEL (RAM ) |REM |SNOOP_NONE_MISS ,/* Remote RAM hit|SNP None or Miss */ +OP_LH |P (LVL ,IO ) |LEVEL (NA ) |P (SNOOP ,NONE ),/* I/O hit|SNP None */ +OP_LH |P (LVL ,UNC ) |LEVEL (NA ) |P (SNOOP ,NONE ),/* Uncached hit|SNP None */ +}; + +/* Based on kernel __intel_pmu_pebs_data_source_cmt() and pebs_data_source */ +static const u64 pebs_data_source_cmt[PERF_PEBS_DATA_SOURCE_GRT_MAX ] = { +P (OP ,LOAD ) |P (LVL ,MISS ) |LEVEL (L3 ) |P (SNOOP ,NA ),/* L3 miss|SNP N/A */ +OP_LH |P (LVL ,L1 ) |LEVEL (L1 ) |P (SNOOP ,NONE ),/* L1 hit|SNP None */ +OP_LH |P (LVL ,LFB ) |LEVEL (LFB ) |P (SNOOP ,NONE ),/* LFB/MAB hit|SNP None */ +OP_LH |P (LVL ,L2 ) |LEVEL (L2 ) |P (SNOOP ,NONE ),/* L2 hit|SNP None */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOP ,NONE ),/* L3 hit|SNP None */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOP ,MISS ),/* L3 hit|SNP Hit */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOP ,HIT ),/* L3 hit|SNP HitM */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOPX ,FWD ),/* L3 hit|SNP HitM */ +OP_LH |P (LVL ,L3 ) |LEVEL (L3 ) |P (SNOOP ,HITM ),/* L3 hit|SNP Fwd */ +OP_LH |P (LVL ,REM_CCE1 ) |REM |LEVEL (L3 ) |P (SNOOP ,HITM ),/* Remote L3 hit|SNP HitM */ +OP_LH |P (LVL ,LOC_RAM ) |LEVEL (RAM ) |P (SNOOP ,NONE ),/* RAM hit|SNP Hit */ +OP_LH |LEVEL (RAM ) |REM |P (SNOOP ,NONE ),/* Remote L3 hit|SNP Hit */ +OP_LH |LEVEL (RAM ) |REM |P (SNOOPX ,FWD ),/* RAM hit|SNP None or Miss */ +OP_LH |LEVEL (RAM ) |REM |P (SNOOP ,HITM ),/* Remote RAM hit|SNP None or Miss */ +OP_LH |P (LVL ,IO ) |LEVEL (NA ) |P (SNOOP ,NONE ),/* I/O hit|SNP None */ +OP_LH |P (LVL ,UNC ) |LEVEL (NA ) |P (SNOOP ,NONE ),/* Uncached hit|SNP None */ +}; + +/* Based on kernel pebs_set_tlb_lock() */ +static inline void pebs_set_tlb_lock (u64 *val,bool tlb,bool lock) +{ +/* +* TLB access +* 0 = did not miss 2nd level TLB +* 1 = missed 2nd level TLB +*/ +if (tlb) + *val |=P (TLB ,MISS ) |P (TLB ,L2 ); +else + *val |=P (TLB ,HIT ) |P (TLB ,L1 ) |P (TLB ,L2 ); + +/* locked prefix */ +if (lock) + *val |=P (LOCK ,LOCKED ); +} + +/* Based on kernel __grt_latency_data() */ +static u64 intel_pt_grt_latency_data (u8 dse,bool tlb,bool lock,bool blk, +const u64 *pebs_data_source) +{ +u64 val; + + dse &=PERF_PEBS_DATA_SOURCE_GRT_MASK ; + val = pebs_data_source[dse]; + +pebs_set_tlb_lock (&val, tlb, lock); + +if (blk) + val |=P (BLK ,DATA ); +else + val |=P (BLK ,NA ); + +return val; +} + +/* Default value for data source */ +#define PERF_MEM_NA (PERF_MEM_S(OP, NA) |\ + PERF_MEM_S(LVL, NA) |\ + PERF_MEM_S(SNOOP, NA) |\ + PERF_MEM_S(LOCK, NA) |\ + PERF_MEM_S(TLB, NA) |\ + PERF_MEM_S(LVLNUM, NA)) + +enum DATA_SRC_FORMAT { +DATA_SRC_FORMAT_ERR =-1 , +DATA_SRC_FORMAT_NA =0 , +DATA_SRC_FORMAT_GRT =1 , +DATA_SRC_FORMAT_CMT =2 , +}; + +/* Based on kernel grt_latency_data() and cmt_latency_data */ +static u64 intel_pt_get_data_src (u64 mem_aux_info,int data_src_fmt) +{ +switch (data_src_fmt) { +case DATA_SRC_FORMAT_GRT : { +union { +u64 val; +struct { +unsigned int dse:4 ; +unsigned int locked:1 ; +unsigned int stlb_miss:1 ; +unsigned int fwd_blk:1 ; +unsigned int reserved:25 ; + }; + } x = {.val = mem_aux_info}; +return intel_pt_grt_latency_data (x.dse, x.stlb_miss, x.locked, x.fwd_blk, + pebs_data_source_grt); + } +case DATA_SRC_FORMAT_CMT : { +union { +u64 val; +struct { +unsigned int dse:5 ; +unsigned int locked:1 ; +unsigned int stlb_miss:1 ; +unsigned int fwd_blk:1 ; +unsigned int reserved:24 ; + }; + } x = {.val = mem_aux_info}; +return intel_pt_grt_latency_data (x.dse, x.stlb_miss, x.locked, x.fwd_blk, + pebs_data_source_cmt); + } +default : +return PERF_MEM_NA ; + } +} + +static int intel_pt_do_synth_pebs_sample (struct intel_pt_queue *ptq,struct evsel *evsel, +u64 id,int data_src_fmt) {const struct intel_pt_blk_items *items = &ptq->state->items;struct perf_sample sample;
@@ -2393,6 +2534,18 @@ static int intel_pt_do_synth_pebs_sample(struct intel_pt_queue *ptq, struct evse } } +if (sample_type &PERF_SAMPLE_DATA_SRC ) { +if (items->has_mem_aux_info && data_src_fmt) { +if (data_src_fmt <0 ) { +pr_err ("Intel PT missing data_src info\n" ); +return -1 ; + } + sample.data_src =intel_pt_get_data_src (items->mem_aux_info, data_src_fmt); + }else { + sample.data_src =PERF_MEM_NA ; + } + } +if (sample_type &PERF_SAMPLE_TRANSACTION && items->has_tsx_aux_info) {u64 ax = items->has_rax ? items->rax :0 ;/* Refer kernel's intel_hsw_transaction() */
@@ -2413,9 +2566,10 @@ static int intel_pt_synth_single_pebs_sample(struct intel_pt_queue *ptq) {struct intel_pt *pt = ptq->pt;struct evsel *evsel = pt->pebs_evsel; +int data_src_fmt = pt->pebs_data_src_fmt;u64 id = evsel->core.id[0 ]; -return intel_pt_do_synth_pebs_sample (ptq, evsel, id); +return intel_pt_do_synth_pebs_sample (ptq, evsel, id, data_src_fmt); }static int intel_pt_synth_pebs_sample (struct intel_pt_queue *ptq)
@@ -2440,7 +2594,7 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq) hw_id);return intel_pt_synth_single_pebs_sample (ptq); } - err =intel_pt_do_synth_pebs_sample (ptq, pe->evsel, pe->id); + err =intel_pt_do_synth_pebs_sample (ptq, pe->evsel, pe->id, pe->data_src_fmt);if (err)return err; }
@@ -3407,6 +3561,49 @@ static int intel_pt_process_itrace_start(struct intel_pt *pt, event->itrace_start.tid); } +/* +* Events with data_src are identified by L1_Hit_Indication +* refer https://github.com/intel/perfmon +*/ +static int intel_pt_data_src_fmt (struct intel_pt *pt,struct evsel *evsel) +{ +struct perf_env *env = pt->machine->env; +int fmt =DATA_SRC_FORMAT_NA ; + +if (!env->cpuid) +return DATA_SRC_FORMAT_ERR ; + +/* +* PEBS-via-PT is only supported on E-core non-hybrid. Of those only +* Gracemont and Crestmont have data_src. Check for: +* Alderlake N (Gracemont) +* Sierra Forest (Crestmont) +* Grand Ridge (Crestmont) +*/ + +if (!strncmp (env->cpuid,"GenuineIntel,6,190," ,19 )) + fmt =DATA_SRC_FORMAT_GRT ; + +if (!strncmp (env->cpuid,"GenuineIntel,6,175," ,19 ) || + !strncmp (env->cpuid,"GenuineIntel,6,182," ,19 )) + fmt =DATA_SRC_FORMAT_CMT ; + +if (fmt ==DATA_SRC_FORMAT_NA ) +return fmt; + +/* +* Only data_src events are: +* mem-loads event=0xd0,umask=0x5 +* mem-stores event=0xd0,umask=0x6 +*/ +if (evsel->core.attr.type ==PERF_TYPE_RAW && + ((evsel->core.attr.config &0xffff ) ==0x5d0 || + (evsel->core.attr.config &0xffff ) ==0x6d0 )) +return fmt; + +return DATA_SRC_FORMAT_NA ; +} +static int intel_pt_process_aux_output_hw_id (struct intel_pt *pt,union perf_event *event,struct perf_sample *sample)
@@ -3427,6 +3624,7 @@ static int intel_pt_process_aux_output_hw_id(struct intel_pt *pt, ptq->pebs[hw_id].evsel = evsel; ptq->pebs[hw_id].id = sample->id; + ptq->pebs[hw_id].data_src_fmt =intel_pt_data_src_fmt (pt, evsel);return 0 ; }
@@ -3976,6 +4174,7 @@ static void intel_pt_setup_pebs_events(struct intel_pt *pt) } pt->single_pebs = true; pt->sample_pebs = true; + pt->pebs_data_src_fmt =intel_pt_data_src_fmt (pt, evsel); pt->pebs_evsel = evsel; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 446/780 perf scripts python: exported-sql-viewer.py: Fix pattern matching with Python 3
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 17e548405a81665fd14cee960db7d093d1396400 ]
The script allows the user to enter patterns to find symbols.
The pattern matching characters are converted for use in SQL.
For PostgreSQL the conversion involves using the Python maketrans() method which is slightly different in Python 3 compared with Python 2.
Fix to work in Python 3.
--- tools/perf/scripts/python/exported-sql-viewer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/scripts/python/exported-sql-viewer.py +4 -1
@@ -680,7 +680,10 @@ class CallGraphModelBase(TreeModel): s = value.replace("%", "\\%") s = s.replace("_", "\\_") # Translate * and ? into SQL LIKE pattern characters % and _ - trans = string.maketrans("*?", "%_") + if sys.version_info[0] == 3: + trans = str.maketrans("*?", "%_") + else: + trans = string.maketrans("*?", "%_") match = " LIKE '" + str(s).translate(trans) + "'" else: match = " GLOB '" + str(value) + "'"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 447/780 remoteproc: qcom_wcnss_iris: Add missing put_device() on error in probe
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 0cb4b1b97041d8a1f773425208ded253c1cb5869 ]
The device_del() call matches with the device_add() but we also need to call put_device() to trigger the qcom_iris_release().
--- drivers/remoteproc/qcom_wcnss_iris.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/remoteproc/qcom_wcnss_iris.c +2 -0
@@ -196,6 +196,7 @@ struct qcom_iris *qcom_iris_probe(struct device *parent, bool *use_48mhz_xo) err_device_del:device_del (&iris->dev); +put_device (&iris->dev);return ERR_PTR (ret); }
@@ -203,4 +204,5 @@ struct qcom_iris *qcom_iris_probe(struct device *parent, bool *use_48mhz_xo)void qcom_iris_remove (struct qcom_iris *iris) {device_del (&iris->dev); +put_device (&iris->dev); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 448/780 perf tools: Fix arm64 source package build
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit aea3496bbc7c20037ecc35411264de109d700fc7 ]
Syscall tables are generated from rules in the kernel tree. Add the related files to the MANIFEST to fix the Perf source package build.
--- tools/perf/MANIFEST | 6 ++++++ 1 file changed, 6 insertions(+)
tools/perf/MANIFEST +6 -0
@@ -1,8 +1,10 @@ COPYING LICENSES/preferred/GPL-2.0 arch/arm64/tools/gen-sysreg.awk +arch/arm64/tools/syscall_64.tbl arch/arm64/tools/sysreg arch/*/include/uapi/asm/bpf_perf_event.h +include/uapi/asm-generic/Kbuild tools/perf tools/arch tools/scripts
@@ -25,6 +27,10 @@ tools/lib/str_error_r.c tools/lib/vsprintf.c tools/lib/zalloc.c scripts/bpf_doc.py +scripts/Kbuild.include +scripts/Makefile.asm-headers +scripts/syscall.tbl +scripts/syscallhdr.sh tools/bpf/bpftool kernel/bpf/disasm.c kernel/bpf/disasm.h
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 449/780 remoteproc: k3-r5: Drop check performed in k3_r5_rproc_{mbox_callback/kick}
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddharth Vadapalli <[email protected]>
[ Upstream commit 9995dbfc2235efabdb3759606d522e1a7ec3bdcb ]
Commit f3f11cfe8907 ("remoteproc: k3-r5: Acquire mailbox handle during probe routine") introduced a check in the "k3_r5_rproc_mbox_callback()" and "k3_r5_rproc_kick()" callbacks, causing them to exit if the remote core's state is "RPROC_DETACHED". However, the "__rproc_attach()" function that is responsible for attaching to a remote core, updates the state of the remote core to "RPROC_ATTACHED" only after invoking "rproc_start_subdevices()".
The "rproc_start_subdevices()" function triggers the probe of the Virtio RPMsg devices associated with the remote core, which require that the "k3_r5_rproc_kick()" and "k3_r5_rproc_mbox_callback()" callbacks are functional. Hence, drop the check in the callbacks.
--- drivers/remoteproc/ti_k3_r5_remoteproc.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/remoteproc/ti_k3_r5_remoteproc.c +0 -8
@@ -194,10 +194,6 @@ static void k3_r5_rproc_mbox_callback(struct mbox_client *client, void *data)const char *name = kproc->rproc->name;u32 msg =omap_mbox_message (data); -/* Do not forward message from a detached core */ -if (kproc->rproc->state ==RPROC_DETACHED ) -return ; -dev_dbg (dev,"mbox msg: 0x%x\n" , msg);switch (msg) {
@@ -233,10 +229,6 @@ static void k3_r5_rproc_kick(struct rproc *rproc, int vqid)mbox_msg_t msg = (mbox_msg_t )vqid;int ret; -/* Do not forward message to a detached core */ -if (kproc->rproc->state ==RPROC_DETACHED ) -return ; -/* send the index of the triggered virtqueue in the mailbox payload */ ret =mbox_send_message (kproc->mbox, (void *)msg);if (ret <0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 450/780 remoteproc: k3-dsp: Drop check performed in k3_dsp_rproc_{mbox_callback/kick}
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddharth Vadapalli <[email protected]>
[ Upstream commit 349d62ab207f55f039c3ddb40b36e95c2f0b3ed0 ]
Commit ea1d6fb5b571 ("remoteproc: k3-dsp: Acquire mailbox handle during probe routine") introduced a check in the "k3_dsp_rproc_mbox_callback()" and "k3_dsp_rproc_kick()" callbacks, causing them to exit if the remote core's state is "RPROC_DETACHED". However, the "__rproc_attach()" function that is responsible for attaching to a remote core, updates the state of the remote core to "RPROC_ATTACHED" only after invoking "rproc_start_subdevices()".
The "rproc_start_subdevices()" function triggers the probe of the Virtio RPMsg devices associated with the remote core, which require that the "k3_dsp_rproc_kick()" and "k3_dsp_rproc_mbox_callback()" callbacks are functional. Hence, drop the check in the callbacks.
--- drivers/remoteproc/ti_k3_dsp_remoteproc.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/remoteproc/ti_k3_dsp_remoteproc.c +0 -8
@@ -115,10 +115,6 @@ static void k3_dsp_rproc_mbox_callback(struct mbox_client *client, void *data)const char *name = kproc->rproc->name;u32 msg =omap_mbox_message (data); -/* Do not forward messages from a detached core */ -if (kproc->rproc->state ==RPROC_DETACHED ) -return ; -dev_dbg (dev,"mbox msg: 0x%x\n" , msg);switch (msg) {
@@ -159,10 +155,6 @@ static void k3_dsp_rproc_kick(struct rproc *rproc, int vqid)mbox_msg_t msg = (mbox_msg_t )vqid;int ret; -/* Do not forward messages to a detached core */ -if (kproc->rproc->state ==RPROC_DETACHED ) -return ; -/* send the index of the triggered virtqueue in the mailbox payload */ ret =mbox_send_message (kproc->mbox, (void *)msg);if (ret <0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 451/780 remoteproc: k3-r5: Refactor sequential core power up/down operations
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Beleswar Padhi <[email protected]>
[ Upstream commit 701177511abd295e0fc2499796e466d8ff12165c ]
The existing implementation of the waiting mechanism in "k3_r5_cluster_rproc_init()" waits for the "released_from_reset" flag to be set as part of the firmware boot process in "k3_r5_rproc_start()". The "k3_r5_cluster_rproc_init()" function is invoked in the probe routine which causes unexpected failures in cases where the firmware is unavailable at boot time, resulting in probe failure and removal of the remoteproc handles in the sysfs paths.
To address this, the waiting mechanism is refactored out of the probe routine into the appropriate "k3_r5_rproc_{prepare/unprepare}()" functions. This allows the probe routine to complete without depending on firmware booting, while still maintaining the required power-synchronization between cores.
Further, this wait mechanism is dropped from "k3_r5_rproc_{start/stop}()" functions as they deal with Core Run/Halt operations, and as such, there is no constraint in Running or Halting the cores of a cluster in order.
--- drivers/remoteproc/ti_k3_r5_remoteproc.c | 110 +++++++++++++---------- 1 file changed, 63 insertions(+), 47 deletions(-)
drivers/remoteproc/ti_k3_r5_remoteproc.c +63 -47
@@ -440,13 +440,36 @@ static int k3_r5_rproc_prepare(struct rproc *rproc) {struct k3_r5_rproc *kproc = rproc->priv;struct k3_r5_cluster *cluster = kproc->cluster; -struct k3_r5_core *core = kproc->core; +struct k3_r5_core *core = kproc->core, *core0, *core1;struct device *dev = kproc->dev;u32 ctrl =0 , cfg =0 , stat =0 ;u64 boot_vec =0 ;bool mem_init_dis;int ret; +/* +* R5 cores require to be powered on sequentially, core0 should be in +* higher power state than core1 in a cluster. So, wait for core0 to +* power up before proceeding to core1 and put timeout of 2sec. This +* waiting mechanism is necessary because rproc_auto_boot_callback() for +* core1 can be called before core0 due to thread execution order. +* +* By placing the wait mechanism here in .prepare() ops, this condition +* is enforced for rproc boot requests from sysfs as well. +*/ + core0 = list_first_entry(&cluster->cores, struct k3_r5_core, elem); + core1 = list_last_entry(&cluster->cores, struct k3_r5_core, elem); +if (cluster->mode ==CLUSTER_MODE_SPLIT && core == core1 && + !core0->released_from_reset) { + ret =wait_event_interruptible_timeout (cluster->core_transition, + core0->released_from_reset, +msecs_to_jiffies (2000 )); +if (ret <=0 ) { +dev_err (dev,"can not power up core1 before core0" ); +return -EPERM ; + } + } + ret =ti_sci_proc_get_status (core->tsp, &boot_vec, &cfg, &ctrl, &stat);if (ret <0 )return ret;
@@ -462,6 +485,14 @@ static int k3_r5_rproc_prepare(struct rproc *rproc)return ret; } +/* +* Notify all threads in the wait queue when core0 state has changed so +* that threads waiting for this condition can be executed. +*/ + core->released_from_reset = true; +if (core == core0) +wake_up_interruptible (&cluster->core_transition); +/* * Newer IP revisions like on J7200 SoCs support h/w auto-initialization * of TCMs, so there is no need to perform the s/w memzero. This bit is
@@ -507,10 +538,30 @@ static int k3_r5_rproc_unprepare(struct rproc *rproc) {struct k3_r5_rproc *kproc = rproc->priv;struct k3_r5_cluster *cluster = kproc->cluster; -struct k3_r5_core *core = kproc->core; +struct k3_r5_core *core = kproc->core, *core0, *core1;struct device *dev = kproc->dev;int ret; +/* +* Ensure power-down of cores is sequential in split mode. Core1 must +* power down before Core0 to maintain the expected state. By placing +* the wait mechanism here in .unprepare() ops, this condition is +* enforced for rproc stop or shutdown requests from sysfs and device +* removal as well. +*/ + core0 = list_first_entry(&cluster->cores, struct k3_r5_core, elem); + core1 = list_last_entry(&cluster->cores, struct k3_r5_core, elem); +if (cluster->mode ==CLUSTER_MODE_SPLIT && core == core0 && + core1->released_from_reset) { + ret =wait_event_interruptible_timeout (cluster->core_transition, + !core1->released_from_reset, +msecs_to_jiffies (2000 )); +if (ret <=0 ) { +dev_err (dev,"can not power down core0 before core1" ); +return -EPERM ; + } + } +/* Re-use LockStep-mode reset logic for Single-CPU mode */ ret = (cluster->mode ==CLUSTER_MODE_LOCKSTEP || cluster->mode == CLUSTER_MODE_SINGLECPU) ?
@@ -518,6 +569,14 @@ static int k3_r5_rproc_unprepare(struct rproc *rproc)if (ret)dev_err (dev,"unable to disable cores, ret = %d\n" , ret); +/* +* Notify all threads in the wait queue when core1 state has changed so +* that threads waiting for this condition can be executed. +*/ + core->released_from_reset = false; +if (core == core1) +wake_up_interruptible (&cluster->core_transition); +return ret; }
@@ -543,7 +602,7 @@ static int k3_r5_rproc_start(struct rproc *rproc)struct k3_r5_rproc *kproc = rproc->priv;struct k3_r5_cluster *cluster = kproc->cluster;struct device *dev = kproc->dev; -struct k3_r5_core *core0, *core; +struct k3_r5_core *core;u32 boot_addr;int ret;
@@ -565,21 +624,9 @@ static int k3_r5_rproc_start(struct rproc *rproc) goto unroll_core_run; } }else { -/* do not allow core 1 to start before core 0 */ - core0 = list_first_entry(&cluster->cores, struct k3_r5_core, - elem); -if (core != core0 && core0->rproc->state ==RPROC_OFFLINE ) { -dev_err (dev,"%s: can not start core 1 before core 0\n" , - __func__); -return -EPERM ; - } - ret =k3_r5_core_run (core);if (ret)return ret; - - core->released_from_reset = true; -wake_up_interruptible (&cluster->core_transition); }return 0 ;
@@ -620,8 +667,7 @@ static int k3_r5_rproc_stop(struct rproc *rproc) {struct k3_r5_rproc *kproc = rproc->priv;struct k3_r5_cluster *cluster = kproc->cluster; -struct device *dev = kproc->dev; -struct k3_r5_core *core1, *core = kproc->core; +struct k3_r5_core *core = kproc->core;int ret;/* halt all applicable cores */
@@ -634,16 +680,6 @@ static int k3_r5_rproc_stop(struct rproc *rproc) } } }else { -/* do not allow core 0 to stop before core 1 */ - core1 = list_last_entry(&cluster->cores, struct k3_r5_core, - elem); -if (core != core1 && core1->rproc->state !=RPROC_OFFLINE ) { -dev_err (dev,"%s: can not stop core 0 before core 1\n" , - __func__); - ret = -EPERM ; - goto out; - } - ret =k3_r5_core_halt (core);if (ret) goto out;
@@ -1271,26 +1307,6 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) cluster->mode ==CLUSTER_MODE_SINGLECPU || cluster->mode == CLUSTER_MODE_SINGLECORE) break; - -/* -* R5 cores require to be powered on sequentially, core0 -* should be in higher power state than core1 in a cluster -* So, wait for current core to power up before proceeding -* to next core and put timeout of 2sec for each core. -* -* This waiting mechanism is necessary because -* rproc_auto_boot_callback() for core1 can be called before -* core0 due to thread execution order. -*/ - ret =wait_event_interruptible_timeout (cluster->core_transition, - core->released_from_reset, -msecs_to_jiffies (2000 )); -if (ret <=0 ) { -dev_err (dev, -"Timed out waiting for %s core to power up!\n" , - rproc->name); - goto out; - } }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 452/780 rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 5de775df3362090a6e90046d1f2d83fe62489aa0 ]
The "ret" variable isn't initialized if we don't enter the loop. For example, if "channel->state" is not SMD_CHANNEL_OPENED.
--- drivers/rpmsg/qcom_smd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rpmsg/qcom_smd.c +1 -1
@@ -746,7 +746,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,__le32 hdr[5 ] = {cpu_to_le32 (len), };int tlen =sizeof (hdr) + len;unsigned long flags; -int ret; +int ret =0 ;/* Word aligned channels only accept word size aligned data */ if (channel->info_word && len %4 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 453/780 netfs: Fix oops in write-retry from mis-resetting the subreq iterator
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 4481f7f2b3df123ec77e828c849138f75cff2bf2 ]
Fix the resetting of the subrequest iterator in netfs_retry_write_stream() to use the iterator-reset function as the iterator may have been shortened by a previous retry. In such a case, the amount of data to be written by the subrequest is not "subreq->len" but "subreq->len - subreq->transferred".
Without this, KASAN may see an error in iov_iter_revert():
BUG: KASAN: slab-out-of-bounds in iov_iter_revert lib/iov_iter.c:633 [inline]
BUG: KASAN: slab-out-of-bounds in iov_iter_revert+0x443/0x5a0 lib/iov_iter.c:611
Read of size 4 at addr ffff88802912a0b8 by task kworker/u32:7/1147
CPU: 1 UID: 0 PID: 1147 Comm: kworker/u32:7 Not tainted 6.15.0-rc6-syzkaller-00052-g9f35e33144ae #0 PREEMPT(full)
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014
Workqueue: events_unbound netfs_write_collection_worker
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:94 [inline]
dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120
print_address_description mm/kasan/report.c:408 [inline]
print_report+0xc3/0x670 mm/kasan/report.c:521
kasan_report+0xe0/0x110 mm/kasan/report.c:634
iov_iter_revert lib/iov_iter.c:633 [inline]
iov_iter_revert+0x443/0x5a0 lib/iov_iter.c:611
netfs_retry_write_stream fs/netfs/write_retry.c:44 [inline]
netfs_retry_writes+0x166d/0x1a50 fs/netfs/write_retry.c:231
netfs_collect_write_results fs/netfs/write_collect.c:352 [inline]
netfs_write_collection_worker+0x23fd/0x3830 fs/netfs/write_collect.c:374
process_one_work+0x9cf/0x1b70 kernel/workqueue.c:3238
process_scheduled_works kernel/workqueue.c:3319 [inline]
worker_thread+0x6c8/0xf10 kernel/workqueue.c:3400
kthread+0x3c2/0x780 kernel/kthread.c:464
ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:153
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245
</TASK>--- fs/netfs/write_retry.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/netfs/write_retry.c +3 -2
@@ -39,9 +39,10 @@ static void netfs_retry_write_stream(struct netfs_io_request *wreq,if (test_bit (NETFS_SREQ_FAILED , &subreq->flags))break ;if (__test_and_clear_bit (NETFS_SREQ_NEED_RETRY , &subreq->flags)) { -struct iov_iter source = subreq->io_iter; +struct iov_iter source; -iov_iter_revert (&source, subreq->len - source.count); +netfs_reset_iter (subreq); + source = subreq->io_iter;netfs_get_subrequest (subreq, netfs_sreq_trace_get_resubmit);netfs_reissue_write (stream, subreq, &source); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 454/780 netfs: Fix setting of transferred bytes with short DIO reads
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
[ Upstream commit 34eb98c6598c4057640ca56dd1fad6555187473a ]
A netfslib request comprises an ordered stream of subrequests that, when doing an unbuffered/DIO read, are contiguous. The subrequests may be performed in parallel, but may not be fully completed.
For instance, if we try and make a 256KiB DIO read from a 3-byte file with a 64KiB rsize and 256KiB bsize, netfslib will attempt to make a read of 256KiB, broken up into four 64KiB subreads, with the expectation that the first will be short and the subsequent three be completely devoid - but we do all four on the basis that the file may have been changed by a third party.
The read-collection code, however, walks through all the subreqs and advances the notion of how much data has been read in the stream to the start of each subreq plus its amount transferred (which are 3, 0, 0, 0 for the example above) - which gives an amount apparently read of 3*64KiB - which is incorrect.
Fix the collection code to cut short the calculation of the transferred amount with the first short subrequest in an unbuffered read; everything beyond that must be ignored as there's a hole that cannot be filled. This applies both to shortness due to hitting the EOF and shortness due to an error.
This is achieved by setting a flag on the request when we collect the first short subrequest (collection is done in ascending order).
This can be tested by mounting a cifs volume with rsize=65536,bsize=262144 and doing a 256k DIO read of a very small file (e.g. 3 bytes). read() should return 3, not >3.
This problem came in when netfs_read_collection() set rreq->transferred to stream->transferred, even for DIO. Prior to that, netfs_rreq_assess_dio() just went over the list and added up the subreqs till it met a short one - but now the subreqs are discarded earlier.
--- fs/netfs/read_collect.c | 21 +++++---------------- include/linux/netfs.h | 1 + 2 files changed, 6 insertions(+), 16 deletions(-)
fs/netfs/read_collect.c +5 -16
@@ -280,9 +280,13 @@ static void netfs_collect_read_results(struct netfs_io_request *rreq) stream->need_retry = true; notes |=NEED_RETRY |MADE_PROGRESS ;break ; + }else if (test_bit (NETFS_RREQ_SHORT_TRANSFER , &rreq->flags)) { + notes |=MADE_PROGRESS ; }else {if (!stream->failed) - stream->transferred = stream->collected_to - rreq->start; + stream->transferred += transferred; +if (front->transferred < front->len) +set_bit (NETFS_RREQ_SHORT_TRANSFER , &rreq->flags); notes |=MADE_PROGRESS ; }
@@ -342,23 +346,8 @@ static void netfs_collect_read_results(struct netfs_io_request *rreq)*/ static void netfs_rreq_assess_dio (struct netfs_io_request *rreq) { -struct netfs_io_subrequest *subreq; -struct netfs_io_stream *stream = &rreq->io_streams[0 ];unsigned int i; -/* Collect unbuffered reads and direct reads, adding up the transfer -* sizes until we find the first short or failed subrequest. -*/ -list_for_each_entry (subreq, &stream->subrequests, rreq_link) { - rreq->transferred += subreq->transferred; - -if (subreq->transferred < subreq->len || -test_bit (NETFS_SREQ_FAILED , &subreq->flags)) { - rreq->error = subreq->error; -break ; - } - } -if (rreq->origin ==NETFS_DIO_READ ) {for (i =0 ; i < rreq->direct_bv_count; i++) {flush_dcache_page (rreq->direct_bv[i].bv_page);
include/linux/netfs.h +1 -0
@@ -279,6 +279,7 @@ struct netfs_io_request {#define NETFS_RREQ_USE_IO_ITER 12/* Use ->io_iter rather than ->i_pages */ #define NETFS_RREQ_ALL_QUEUED 13/* All subreqs are now queued */ #define NETFS_RREQ_RETRYING 14/* Set if we're in the retry path */ +#define NETFS_RREQ_SHORT_TRANSFER 15/* Set if we have a short transfer */ #define NETFS_RREQ_USE_PGPRIV2 31/* [DEPRECATED] Use PG_private_2 to mark * write to cache on read */ const struct netfs_request_ops *netfs_ops;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 455/780 netfs: Fix the requests work item to not require a ref
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 20d72b00ca814d748f5663484e5c53bb2bf37a3a ]
When the netfs_io_request struct's work item is queued, it must be supplied with a ref to the work item struct to prevent it being deallocated whilst on the queue or whilst it is being processed. This is tricky to manage as we have to get a ref before we try and queue it and then we may find it's already queued and is thus already holding a ref - in which case we have to try and get rid of the ref again.
The problem comes if we're in BH or IRQ context and need to drop the ref:
if netfs_put_request() reduces the count to 0, we have to do the cleanup - but the cleanup may need to wait.
Fix this by adding a new work item to the request, ->cleanup_work, and dispatching that when the refcount hits zero. That can then synchronously cancel any outstanding work on the main work item before doing the cleanup.
Adding a new work item also deals with another problem upstream where it's sometimes changing the work func in the put function and requeuing it - which has occasionally in the past caused the cleanup to happen incorrectly.
As a bonus, this allows us to get rid of the 'was_async' parameter from a bunch of functions. This indicated whether the put function might not be permitted to sleep.
--- fs/9p/vfs_addr.c | 2 +- fs/afs/write.c | 8 ++--- fs/cachefiles/io.c | 16 +++++----- fs/ceph/addr.c | 2 +- fs/erofs/fscache.c | 6 ++-- fs/netfs/buffered_read.c | 30 +++++++++--------- fs/netfs/direct_read.c | 6 ++-- fs/netfs/direct_write.c | 2 +- fs/netfs/fscache_io.c | 10 +++--- fs/netfs/internal.h | 11 +++---- fs/netfs/objects.c | 47 +++++++++++++-------------- fs/netfs/read_collect.c | 44 ++++++++++++++++---------- fs/netfs/read_pgpriv2.c | 4 +-- fs/netfs/read_retry.c | 2 +- fs/netfs/read_single.c | 6 ++-- fs/netfs/write_collect.c | 61 +++++++++++++++++------------------- fs/netfs/write_issue.c | 16 +++++----- fs/netfs/write_retry.c | 2 +- fs/smb/client/cifsproto.h | 3 +- fs/smb/client/cifssmb.c | 4 +-- fs/smb/client/file.c | 7 ++--- fs/smb/client/smb2pdu.c | 4 +-- include/linux/fscache.h | 2 +- include/linux/netfs.h | 13 ++++---- include/trace/events/netfs.h | 7 ++--- net/9p/client.c | 6 ++-- 26 files changed, 159 insertions(+), 162 deletions(-)
fs/9p/vfs_addr.c +1 -1
@@ -59,7 +59,7 @@ static void v9fs_issue_write(struct netfs_io_subrequest *subreq) len =p9_client_write (fid, subreq->start, &subreq->io_iter, &err);if (len >0 )__set_bit (NETFS_SREQ_MADE_PROGRESS , &subreq->flags); -netfs_write_subrequest_terminated (subreq, len ?: err, false); +netfs_write_subrequest_terminated (subreq, len ?: err); }/**
fs/afs/write.c +4 -4
@@ -120,17 +120,17 @@ static void afs_issue_write_worker(struct work_struct *work)#if 0 // Error injection if (subreq->debug_index ==3 ) -return netfs_write_subrequest_terminated (subreq, -ENOANO , false); +return netfs_write_subrequest_terminated (subreq, -ENOANO );if (!subreq->retry_count) {set_bit (NETFS_SREQ_NEED_RETRY , &subreq->flags); -return netfs_write_subrequest_terminated (subreq, -EAGAIN , false); +return netfs_write_subrequest_terminated (subreq, -EAGAIN ); }#endif op =afs_alloc_operation (wreq->netfs_priv, vnode->volume);if (IS_ERR (op)) -return netfs_write_subrequest_terminated (subreq, -EAGAIN , false); +return netfs_write_subrequest_terminated (subreq, -EAGAIN );afs_op_set_vnode (op,0 , vnode); op->file[0 ].dv_delta =1 ;
@@ -166,7 +166,7 @@ static void afs_issue_write_worker(struct work_struct *work)break ; } -netfs_write_subrequest_terminated (subreq, ret <0 ? ret : subreq->len, false); +netfs_write_subrequest_terminated (subreq, ret <0 ? ret : subreq->len); }void afs_issue_write (struct netfs_io_subrequest *subreq)
fs/cachefiles/io.c +8 -8
@@ -63,7 +63,7 @@ static void cachefiles_read_complete(struct kiocb *iocb, long ret) ret = -ESTALE ; } - ki->term_func (ki->term_func_priv, ret, ki->was_async); + ki->term_func (ki->term_func_priv, ret); }cachefiles_put_kiocb (ki);
@@ -188,7 +188,7 @@ static int cachefiles_read(struct netfs_cache_resources *cres, presubmission_error:if (term_func) -term_func (term_func_priv, ret <0 ? ret : skipped, false); +term_func (term_func_priv, ret <0 ? ret : skipped);return ret; }
@@ -271,7 +271,7 @@ static void cachefiles_write_complete(struct kiocb *iocb, long ret)atomic_long_sub (ki->b_writing, &object->volume->cache->b_writing);set_bit (FSCACHE_COOKIE_HAVE_DATA , &object->cookie->flags);if (ki->term_func) - ki->term_func (ki->term_func_priv, ret, ki->was_async); + ki->term_func (ki->term_func_priv, ret);cachefiles_put_kiocb (ki); }
@@ -301,7 +301,7 @@ int __cachefiles_write(struct cachefiles_object *object, ki =kzalloc (sizeof (struct cachefiles_kiocb ),GFP_KERNEL );if (!ki) {if (term_func) -term_func (term_func_priv, -ENOMEM , false); +term_func (term_func_priv, -ENOMEM );return -ENOMEM ; }
@@ -366,7 +366,7 @@ static int cachefiles_write(struct netfs_cache_resources *cres, {if (!fscache_wait_for_operation (cres,FSCACHE_WANT_WRITE )) {if (term_func) -term_func (term_func_priv, -ENOBUFS , false); +term_func (term_func_priv, -ENOBUFS );trace_netfs_sreq (term_func_priv, netfs_sreq_trace_cache_nowrite);return -ENOBUFS ; }
@@ -665,7 +665,7 @@ static void cachefiles_issue_write(struct netfs_io_subrequest *subreq) pre =CACHEFILES_DIO_BLOCK_SIZE - off;if (pre >= len) {fscache_count_dio_misfit (); -netfs_write_subrequest_terminated (subreq, len, false); +netfs_write_subrequest_terminated (subreq, len);return ; } subreq->transferred += pre;
@@ -691,7 +691,7 @@ static void cachefiles_issue_write(struct netfs_io_subrequest *subreq) len -= post;if (len ==0 ) {fscache_count_dio_misfit (); -netfs_write_subrequest_terminated (subreq, post, false); +netfs_write_subrequest_terminated (subreq, post);return ; }iov_iter_truncate (&subreq->io_iter, len);
@@ -703,7 +703,7 @@ static void cachefiles_issue_write(struct netfs_io_subrequest *subreq) &start, &len, len, true);cachefiles_end_secure (cache, saved_cred);if (ret <0 ) { -netfs_write_subrequest_terminated (subreq, ret, false); +netfs_write_subrequest_terminated (subreq, ret);return ; }
fs/ceph/addr.c +1 -1
@@ -539,7 +539,7 @@ static void ceph_set_page_fscache(struct page *page)folio_start_private_2 (page_folio (page));/* [DEPRECATED] */ } -static void ceph_fscache_write_terminated (void *priv,ssize_t error,bool was_async) +static void ceph_fscache_write_terminated (void *priv,ssize_t error) {struct inode *inode = priv;
fs/erofs/fscache.c +2 -4
@@ -102,8 +102,7 @@ static void erofs_fscache_req_io_put(struct erofs_fscache_io *io)erofs_fscache_req_put (req); } -static void erofs_fscache_req_end_io (void *priv, -ssize_t transferred_or_error,bool was_async) +static void erofs_fscache_req_end_io (void *priv,ssize_t transferred_or_error) {struct erofs_fscache_io *io = priv;struct erofs_fscache_rq *req = io->private;
@@ -180,8 +179,7 @@ struct erofs_fscache_bio {struct bio_vec bvecs[BIO_MAX_VECS ]; }; -static void erofs_fscache_bio_endio (void *priv, -ssize_t transferred_or_error,bool was_async) +static void erofs_fscache_bio_endio (void *priv,ssize_t transferred_or_error) {struct erofs_fscache_bio *io = priv;
fs/netfs/buffered_read.c +14 -16
@@ -262,9 +262,9 @@ static void netfs_read_to_pagecache(struct netfs_io_request *rreq)if (ret <0 ) { subreq->error = ret;/* Not queued - release both refs. */ -netfs_put_subrequest (subreq, false, +netfs_put_subrequest (subreq, netfs_sreq_trace_put_cancel); -netfs_put_subrequest (subreq, false, +netfs_put_subrequest (subreq, netfs_sreq_trace_put_cancel);break ; }
@@ -297,8 +297,8 @@ static void netfs_read_to_pagecache(struct netfs_io_request *rreq) subreq->error = ret;trace_netfs_sreq (subreq, netfs_sreq_trace_cancel);/* Not queued - release both refs. */ -netfs_put_subrequest (subreq, false, netfs_sreq_trace_put_cancel); -netfs_put_subrequest (subreq, false, netfs_sreq_trace_put_cancel); +netfs_put_subrequest (subreq, netfs_sreq_trace_put_cancel); +netfs_put_subrequest (subreq, netfs_sreq_trace_put_cancel);break ; } size -= slice;
@@ -365,12 +365,10 @@ void netfs_readahead(struct readahead_control *ractl) goto cleanup_free;netfs_read_to_pagecache (rreq); -netfs_put_request (rreq, true, netfs_rreq_trace_put_return); -return ; +return netfs_put_request (rreq, netfs_rreq_trace_put_return); cleanup_free: -netfs_put_request (rreq, false, netfs_rreq_trace_put_failed); -return ; +return netfs_put_request (rreq, netfs_rreq_trace_put_failed); }EXPORT_SYMBOL (netfs_readahead);
@@ -470,11 +468,11 @@ static int netfs_read_gaps(struct file *file, struct folio *folio)folio_mark_uptodate (folio); }folio_unlock (folio); -netfs_put_request (rreq, false, netfs_rreq_trace_put_return); +netfs_put_request (rreq, netfs_rreq_trace_put_return);return ret <0 ? ret :0 ; discard: -netfs_put_request (rreq, false, netfs_rreq_trace_put_discard); +netfs_put_request (rreq, netfs_rreq_trace_put_discard); alloc_error:folio_unlock (folio);return ret;
@@ -530,11 +528,11 @@ int netfs_read_folio(struct file *file, struct folio *folio)netfs_read_to_pagecache (rreq); ret =netfs_wait_for_read (rreq); -netfs_put_request (rreq, false, netfs_rreq_trace_put_return); +netfs_put_request (rreq, netfs_rreq_trace_put_return);return ret <0 ? ret :0 ; discard: -netfs_put_request (rreq, false, netfs_rreq_trace_put_discard); +netfs_put_request (rreq, netfs_rreq_trace_put_discard); alloc_error:folio_unlock (folio);return ret;
@@ -689,7 +687,7 @@ int netfs_write_begin(struct netfs_inode *ctx, ret =netfs_wait_for_read (rreq);if (ret <0 ) goto error; -netfs_put_request (rreq, false, netfs_rreq_trace_put_return); +netfs_put_request (rreq, netfs_rreq_trace_put_return); have_folio: ret =folio_wait_private_2_killable (folio);
@@ -701,7 +699,7 @@ int netfs_write_begin(struct netfs_inode *ctx,return 0 ; error_put: -netfs_put_request (rreq, false, netfs_rreq_trace_put_failed); +netfs_put_request (rreq, netfs_rreq_trace_put_failed); error:if (folio) {folio_unlock (folio);
@@ -752,11 +750,11 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio,netfs_read_to_pagecache (rreq); ret =netfs_wait_for_read (rreq); -netfs_put_request (rreq, false, netfs_rreq_trace_put_return); +netfs_put_request (rreq, netfs_rreq_trace_put_return);return ret <0 ? ret :0 ; error_put: -netfs_put_request (rreq, false, netfs_rreq_trace_put_discard); +netfs_put_request (rreq, netfs_rreq_trace_put_discard); error:_leave (" = %d" , ret);return ret;
fs/netfs/direct_read.c +3 -3
@@ -85,7 +85,7 @@ static int netfs_dispatch_unbuffered_reads(struct netfs_io_request *rreq)if (rreq->netfs_ops->prepare_read) { ret = rreq->netfs_ops->prepare_read (subreq);if (ret <0 ) { -netfs_put_subrequest (subreq, false, netfs_sreq_trace_put_cancel); +netfs_put_subrequest (subreq, netfs_sreq_trace_put_cancel);break ; } }
@@ -144,7 +144,7 @@ static ssize_t netfs_unbuffered_read(struct netfs_io_request *rreq, bool sync) ret =netfs_dispatch_unbuffered_reads (rreq);if (!rreq->submitted) { -netfs_put_request (rreq, false, netfs_rreq_trace_put_no_submit); +netfs_put_request (rreq, netfs_rreq_trace_put_no_submit);inode_dio_end (rreq->inode); ret =0 ; goto out;
@@ -236,7 +236,7 @@ ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_iter *i } out: -netfs_put_request (rreq, false, netfs_rreq_trace_put_return); +netfs_put_request (rreq, netfs_rreq_trace_put_return);if (ret >0 ) orig_count -= ret;return ret;
fs/netfs/direct_write.c +1 -1
@@ -117,7 +117,7 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter * } out: -netfs_put_request (wreq, false, netfs_rreq_trace_put_return); +netfs_put_request (wreq, netfs_rreq_trace_put_return);return ret; }EXPORT_SYMBOL (netfs_unbuffered_write_iter_locked);
fs/netfs/fscache_io.c +4 -6
@@ -192,8 +192,7 @@ EXPORT_SYMBOL(__fscache_clear_page_bits);/* * Deal with the completion of writing the data to the cache. */ -static void fscache_wreq_done (void *priv,ssize_t transferred_or_error, -bool was_async) +static void fscache_wreq_done (void *priv,ssize_t transferred_or_error) {struct fscache_write_request *wreq = priv;
@@ -202,8 +201,7 @@ static void fscache_wreq_done(void *priv, ssize_t transferred_or_error, wreq->set_bits);if (wreq->term_func) - wreq->term_func (wreq->term_func_priv, transferred_or_error, - was_async); + wreq->term_func (wreq->term_func_priv, transferred_or_error);fscache_end_operation (&wreq->cache_resources);kfree (wreq); }
@@ -255,14 +253,14 @@ void __fscache_write_to_cache(struct fscache_cookie *cookie,return ; abandon_end: -return fscache_wreq_done (wreq, ret, false); +return fscache_wreq_done (wreq, ret); abandon_free:kfree (wreq); abandon:if (using_pgpriv2)fscache_clear_page_bits (mapping, start, len, cond);if (term_func) -term_func (term_func_priv, ret, false); +term_func (term_func_priv, ret); }EXPORT_SYMBOL (__fscache_write_to_cache);
fs/netfs/internal.h +5 -6
@@ -23,7 +23,7 @@/* * buffered_read.c */ -void netfs_cache_read_terminated (void *priv,ssize_t transferred_or_error,bool was_async); +void netfs_cache_read_terminated (void *priv,ssize_t transferred_or_error);int netfs_prefetch_for_write (struct file *file,struct folio *folio,size_t offset,size_t len);
@@ -71,9 +71,8 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, loff_t start, size_t len, enum netfs_io_origin origin);void netfs_get_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what); -void netfs_clear_subrequests (struct netfs_io_request *rreq,bool was_async); -void netfs_put_request (struct netfs_io_request *rreq,bool was_async, -enum netfs_rreq_ref_trace what); +void netfs_clear_subrequests (struct netfs_io_request *rreq); +void netfs_put_request (struct netfs_io_request *rreq,enum netfs_rreq_ref_trace what);struct netfs_io_subrequest *netfs_alloc_subrequest (struct netfs_io_request *rreq); static inline void netfs_see_request(struct netfs_io_request *rreq,
@@ -94,7 +93,7 @@ static inline void netfs_see_subrequest(struct netfs_io_subrequest *subreq,*/ void netfs_read_collection_worker (struct work_struct *work);void netfs_wake_read_collector (struct netfs_io_request *rreq); -void netfs_cache_read_terminated (void *priv,ssize_t transferred_or_error,bool was_async); +void netfs_cache_read_terminated (void *priv,ssize_t transferred_or_error);ssize_t netfs_wait_for_read (struct netfs_io_request *rreq);void netfs_wait_for_pause (struct netfs_io_request *rreq);
@@ -177,7 +176,7 @@ static inline void netfs_stat_d(atomic_t *stat)*/ int netfs_folio_written_back (struct folio *folio);void netfs_write_collection_worker (struct work_struct *work); -void netfs_wake_write_collector (struct netfs_io_request *wreq,bool was_async); +void netfs_wake_write_collector (struct netfs_io_request *wreq);/* * write_issue.c
fs/netfs/objects.c +24 -23
131 lines not on this page · raw message
fs/netfs/read_collect.c +27 -17
112 lines not on this page · raw message
fs/netfs/read_pgpriv2.c +2 -2
@@ -116,7 +116,7 @@ static struct netfs_io_request *netfs_pgpriv2_begin_copy_to_cache(return creq; cancel_put: -netfs_put_request (creq, false, netfs_rreq_trace_put_return); +netfs_put_request (creq, netfs_rreq_trace_put_return); cancel: rreq->copy_to_cache =ERR_PTR (-ENOBUFS );clear_bit (NETFS_RREQ_FOLIO_COPY_TO_CACHE , &rreq->flags);
@@ -155,7 +155,7 @@ void netfs_pgpriv2_end_copy_to_cache(struct netfs_io_request *rreq)smp_wmb ();/* Write lists before ALL_QUEUED. */ set_bit (NETFS_RREQ_ALL_QUEUED , &creq->flags); -netfs_put_request (creq, false, netfs_rreq_trace_put_return); +netfs_put_request (creq, netfs_rreq_trace_put_return); creq->copy_to_cache =NULL ; }
fs/netfs/read_retry.c +1 -1
@@ -173,7 +173,7 @@ static void netfs_retry_read_subrequests(struct netfs_io_request *rreq) &stream->subrequests, rreq_link) {trace_netfs_sreq (subreq, netfs_sreq_trace_superfluous);list_del (&subreq->rreq_link); -netfs_put_subrequest (subreq, false, netfs_sreq_trace_put_done); +netfs_put_subrequest (subreq, netfs_sreq_trace_put_done);if (subreq == to)break ; }
fs/netfs/read_single.c +3 -3
@@ -142,7 +142,7 @@ static int netfs_single_dispatch_read(struct netfs_io_request *rreq)set_bit (NETFS_RREQ_ALL_QUEUED , &rreq->flags);return ret; cancel: -netfs_put_subrequest (subreq, false, netfs_sreq_trace_put_cancel); +netfs_put_subrequest (subreq, netfs_sreq_trace_put_cancel);return ret; }
@@ -185,11 +185,11 @@ ssize_t netfs_read_single(struct inode *inode, struct file *file, struct iov_itenetfs_single_dispatch_read (rreq); ret =netfs_wait_for_read (rreq); -netfs_put_request (rreq, true, netfs_rreq_trace_put_return); +netfs_put_request (rreq, netfs_rreq_trace_put_return);return ret; cleanup_free: -netfs_put_request (rreq, false, netfs_rreq_trace_put_failed); +netfs_put_request (rreq, netfs_rreq_trace_put_failed);return ret; }EXPORT_SYMBOL (netfs_read_single);
fs/netfs/write_collect.c +28 -33
133 lines not on this page · raw message
fs/netfs/write_issue.c +9 -7
@@ -134,7 +134,7 @@ struct netfs_io_request *netfs_create_write_req(struct address_space *mapping,return wreq; nomem: wreq->error = -ENOMEM ; -netfs_put_request (wreq, false, netfs_rreq_trace_put_failed); +netfs_put_request (wreq, netfs_rreq_trace_put_failed);return ERR_PTR (-ENOMEM ); }
@@ -233,7 +233,7 @@ static void netfs_do_issue_write(struct netfs_io_stream *stream,_enter ("R=%x[%x],%zx" , wreq->debug_id, subreq->debug_index, subreq->len);if (test_bit (NETFS_SREQ_FAILED , &subreq->flags)) -return netfs_write_subrequest_terminated (subreq, subreq->error, false); +return netfs_write_subrequest_terminated (subreq, subreq->error);trace_netfs_sreq (subreq, netfs_sreq_trace_submit); stream->issue_write (subreq);
@@ -542,7 +542,7 @@ static void netfs_end_issue_write(struct netfs_io_request *wreq) }if (needs_poke) -netfs_wake_write_collector (wreq, false); +netfs_wake_write_collector (wreq); }/*
@@ -599,8 +599,9 @@ int netfs_writepages(struct address_space *mapping,netfs_end_issue_write (wreq);mutex_unlock (&ictx->wb_lock); +netfs_wake_write_collector (wreq); -netfs_put_request (wreq, false, netfs_rreq_trace_put_return); +netfs_put_request (wreq, netfs_rreq_trace_put_return);_leave (" = %d" , error);return error;
@@ -694,7 +695,7 @@ int netfs_end_writethrough(struct netfs_io_request *wreq, struct writeback_contrwait_on_bit (&wreq->flags,NETFS_RREQ_IN_PROGRESS ,TASK_UNINTERRUPTIBLE ); ret = wreq->error; } -netfs_put_request (wreq, false, netfs_rreq_trace_put_return); +netfs_put_request (wreq, netfs_rreq_trace_put_return);return ret; }
@@ -885,7 +886,7 @@ int netfs_writeback_single(struct address_space *mapping, goto couldnt_start; } -trace_netfs_write (wreq, netfs_write_trace_writeback); +trace_netfs_write (wreq, netfs_write_trace_writeback_single);netfs_stat (&netfs_n_wh_writepages);if (__test_and_set_bit (NETFS_RREQ_UPLOAD_TO_SERVER , &wreq->flags))
@@ -914,8 +915,9 @@ int netfs_writeback_single(struct address_space *mapping,set_bit (NETFS_RREQ_ALL_QUEUED , &wreq->flags);mutex_unlock (&ictx->wb_lock); +netfs_wake_write_collector (wreq); -netfs_put_request (wreq, false, netfs_rreq_trace_put_return); +netfs_put_request (wreq, netfs_rreq_trace_put_return);_leave (" = %d" , ret);return ret;
fs/netfs/write_retry.c +1 -1
@@ -132,7 +132,7 @@ static void netfs_retry_write_stream(struct netfs_io_request *wreq, &stream->subrequests, rreq_link) {trace_netfs_sreq (subreq, netfs_sreq_trace_discard);list_del (&subreq->rreq_link); -netfs_put_subrequest (subreq, false, netfs_sreq_trace_put_done); +netfs_put_subrequest (subreq, netfs_sreq_trace_put_done);if (subreq == to)break ; }
fs/smb/client/cifsproto.h +1 -2
@@ -151,8 +151,7 @@ extern bool is_size_safe_to_change(struct cifsInodeInfo *cifsInode, __u64 eof, bool from_readdir);extern void cifs_update_eof (struct cifsInodeInfo *cifsi,loff_t offset,unsigned int bytes_written); -void cifs_write_subrequest_terminated (struct cifs_io_subrequest *wdata,ssize_t result, -bool was_async); +void cifs_write_subrequest_terminated (struct cifs_io_subrequest *wdata,ssize_t result);extern struct cifsFileInfo *find_writable_file (struct cifsInodeInfo *,int ); extern int cifs_get_writable_file(struct cifsInodeInfo *cifs_inode, int flags,
fs/smb/client/cifssmb.c +2 -2
@@ -1725,7 +1725,7 @@ cifs_writev_callback(struct mid_q_entry *mid) server->credits, server->in_flight, 0, cifs_trace_rw_credits_write_response_clear); wdata->credits.value =0 ; -cifs_write_subrequest_terminated (wdata, result, true); +cifs_write_subrequest_terminated (wdata, result);release_mid (mid); trace_smb3_rw_credits(credits.rreq_debug_id, credits.rreq_debug_index, 0, server->credits, server->in_flight,
@@ -1813,7 +1813,7 @@ cifs_async_writev(struct cifs_io_subrequest *wdata) out:if (rc) {add_credits_and_wake_if (wdata->server, &wdata->credits,0 ); -cifs_write_subrequest_terminated (wdata, rc, false); +cifs_write_subrequest_terminated (wdata, rc); } }
fs/smb/client/file.c +3 -4
@@ -130,7 +130,7 @@ static void cifs_issue_write(struct netfs_io_subrequest *subreq)else trace_netfs_sreq (subreq, netfs_sreq_trace_fail);add_credits_and_wake_if (wdata->server, &wdata->credits,0 ); -cifs_write_subrequest_terminated (wdata, rc, false); +cifs_write_subrequest_terminated (wdata, rc); goto out; }
@@ -2423,8 +2423,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)return rc; } -void cifs_write_subrequest_terminated (struct cifs_io_subrequest *wdata,ssize_t result, -bool was_async) +void cifs_write_subrequest_terminated (struct cifs_io_subrequest *wdata,ssize_t result) {struct netfs_io_request *wreq = wdata->rreq;struct netfs_inode *ictx =netfs_inode (wreq->inode);
@@ -2441,7 +2440,7 @@ void cifs_write_subrequest_terminated(struct cifs_io_subrequest *wdata, ssize_tnetfs_resize_file (ictx, wrend, true); } -netfs_write_subrequest_terminated (&wdata->subreq, result, was_async); +netfs_write_subrequest_terminated (&wdata->subreq, result); } struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *cifs_inode,
fs/smb/client/smb2pdu.c +2 -2
@@ -4888,7 +4888,7 @@ smb2_writev_callback(struct mid_q_entry *mid) 0, cifs_trace_rw_credits_write_response_clear); wdata->credits.value =0 ;trace_netfs_sreq (&wdata->subreq, netfs_sreq_trace_io_progress); -cifs_write_subrequest_terminated (wdata, result ?: written, true); +cifs_write_subrequest_terminated (wdata, result ?: written);release_mid (mid); trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, 0, server->credits, server->in_flight,
@@ -5061,7 +5061,7 @@ smb2_async_writev(struct cifs_io_subrequest *wdata) -(int )wdata->credits.value, cifs_trace_rw_credits_write_response_clear);add_credits_and_wake_if (wdata->server, &wdata->credits,0 ); -cifs_write_subrequest_terminated (wdata, rc, true); +cifs_write_subrequest_terminated (wdata, rc); } }
include/linux/fscache.h +1 -1
@@ -628,7 +628,7 @@ static inline void fscache_write_to_cache(struct fscache_cookie *cookie, term_func, term_func_priv, using_pgpriv2, caching); else if (term_func) - term_func(term_func_priv, -ENOBUFS, false); + term_func(term_func_priv, -ENOBUFS); }
include/linux/netfs.h +6 -7
@@ -51,8 +51,7 @@ enum netfs_io_source {NETFS_INVALID_WRITE , } __mode(byte); -typedef void (*netfs_io_terminated_t )(void *priv,ssize_t transferred_or_error, -bool was_async); +typedef void (*netfs_io_terminated_t )(void *priv,ssize_t transferred_or_error);/* * Per-inode context. This wraps the VFS inode.
@@ -223,9 +222,10 @@ enum netfs_io_origin {*/ struct netfs_io_request {union { -struct work_struct work; +struct work_struct cleanup_work;/* Deferred cleanup work */ struct rcu_head rcu; }; +struct work_struct work;/* Result collector work */ struct inode *inode;/* The file being accessed */ struct address_space *mapping;/* The mapping being accessed */ struct kiocb *iocb;/* AIO completion vector */
@@ -270,7 +270,7 @@ struct netfs_io_request {#define NETFS_RREQ_NO_UNLOCK_FOLIO 2/* Don't unlock no_unlock_folio on completion */ #define NETFS_RREQ_DONT_UNLOCK_FOLIOS 3/* Don't unlock the folios on completion */ #define NETFS_RREQ_FAILED 4/* The request failed */ -#define NETFS_RREQ_IN_PROGRESS 5/* Unlocked when the request completes */ +#define NETFS_RREQ_IN_PROGRESS 5/* Unlocked when the request completes (has ref) */ #define NETFS_RREQ_FOLIO_COPY_TO_CACHE 6/* Copy current folio to cache from read */ #define NETFS_RREQ_UPLOAD_TO_SERVER 8/* Need to write to the server */ #define NETFS_RREQ_NONBLOCK 9/* Don't block if possible (O_NONBLOCK) */
@@ -440,15 +440,14 @@ void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq);void netfs_get_subrequest (struct netfs_io_subrequest *subreq,enum netfs_sreq_ref_trace what);void netfs_put_subrequest (struct netfs_io_subrequest *subreq, -bool was_async,enum netfs_sreq_ref_trace what); +enum netfs_sreq_ref_trace what);ssize_t netfs_extract_user_iter (struct iov_iter *orig,size_t orig_len,struct iov_iter *new,iov_iter_extraction_t extraction_flags);size_t netfs_limit_iter (const struct iov_iter *iter,size_t start_offset,size_t max_size,size_t max_segs);void netfs_prepare_write_failed (struct netfs_io_subrequest *subreq); -void netfs_write_subrequest_terminated (void *_op,ssize_t transferred_or_error, -bool was_async); +void netfs_write_subrequest_terminated (void *_op,ssize_t transferred_or_error);void netfs_queue_write_request (struct netfs_io_subrequest *subreq);int netfs_start_io_read (struct inode *inode);
include/trace/events/netfs.h +3 -4
@@ -30,6 +30,7 @@ EM(netfs_write_trace_dio_write, "DIO-WRITE") \ EM(netfs_write_trace_unbuffered_write, "UNB-WRITE") \ EM(netfs_write_trace_writeback, "WRITEBACK") \ + EM(netfs_write_trace_writeback_single, "WB-SINGLE") \ E_(netfs_write_trace_writethrough, "WRITETHRU")#define netfs_rreq_origins \
@@ -128,17 +129,15 @@#define netfs_rreq_ref_traces \ EM(netfs_rreq_trace_get_for_outstanding,"GET OUTSTND") \ EM(netfs_rreq_trace_get_subreq, "GET SUBREQ ") \ - EM(netfs_rreq_trace_get_work, "GET WORK ") \ EM(netfs_rreq_trace_put_complete, "PUT COMPLT ") \ EM(netfs_rreq_trace_put_discard, "PUT DISCARD") \ EM(netfs_rreq_trace_put_failed, "PUT FAILED ") \ EM(netfs_rreq_trace_put_no_submit, "PUT NO-SUBM") \ EM(netfs_rreq_trace_put_return, "PUT RETURN ") \ EM(netfs_rreq_trace_put_subreq, "PUT SUBREQ ") \ - EM(netfs_rreq_trace_put_work, "PUT WORK ") \ - EM(netfs_rreq_trace_put_work_complete, "PUT WORK CP") \ - EM(netfs_rreq_trace_put_work_nq, "PUT WORK NQ") \ + EM(netfs_rreq_trace_put_work_ip, "PUT WORK IP ") \ EM(netfs_rreq_trace_see_work, "SEE WORK ") \ + EM(netfs_rreq_trace_see_work_complete, "SEE WORK CP") \ E_(netfs_rreq_trace_new, "NEW ")#define netfs_sreq_ref_traces \
net/9p/client.c +3 -3
@@ -1704,7 +1704,7 @@ p9_client_write_subreq(struct netfs_io_subrequest *subreq) start, len, &subreq->io_iter); }if (IS_ERR (req)) { -netfs_write_subrequest_terminated (subreq,PTR_ERR (req), false); +netfs_write_subrequest_terminated (subreq,PTR_ERR (req));return ; }
@@ -1712,7 +1712,7 @@ p9_client_write_subreq(struct netfs_io_subrequest *subreq)if (err) {trace_9p_protocol_dump (clnt, &req->rc);p9_req_put (clnt, req); -netfs_write_subrequest_terminated (subreq, err, false); +netfs_write_subrequest_terminated (subreq, err);return ; }
@@ -1724,7 +1724,7 @@ p9_client_write_subreq(struct netfs_io_subrequest *subreq)p9_debug (P9_DEBUG_9P ,"<<< RWRITE count %d\n" , len);p9_req_put (clnt, req); -netfs_write_subrequest_terminated (subreq, written, false); +netfs_write_subrequest_terminated (subreq, written); }EXPORT_SYMBOL (p9_client_write_subreq);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 456/780 netfs: Fix wait/wake to be consistent about the waitqueue used
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 2b1424cd131cfaba4cf7040473133d26cddac088 ]
Fix further inconsistencies in the use of waitqueues (clear_and_wake_up_bit() vs private waitqueue).
Move some of this stuff from the read and write sides into common code so that it can be done in fewer places.
To make this work, async I/O needs to set NETFS_RREQ_OFFLOAD_COLLECTION to indicate that a workqueue will do the collecting and places that call the wait function need to deal with it returning the amount transferred.
--- fs/netfs/buffered_read.c | 2 +- fs/netfs/buffered_write.c | 2 +- fs/netfs/direct_read.c | 4 +- fs/netfs/direct_write.c | 10 +- fs/netfs/internal.h | 33 ++++-- fs/netfs/misc.c | 218 ++++++++++++++++++++++++++++++++++++++ fs/netfs/read_collect.c | 139 +----------------------- fs/netfs/read_retry.c | 24 +---- fs/netfs/write_collect.c | 36 ++----- fs/netfs/write_issue.c | 28 +++-- fs/netfs/write_retry.c | 12 +-- 11 files changed, 284 insertions(+), 224 deletions(-)
fs/netfs/buffered_read.c +1 -1
@@ -312,7 +312,7 @@ static void netfs_read_to_pagecache(struct netfs_io_request *rreq)if (unlikely (size >0 )) {smp_wmb ();/* Write lists before ALL_QUEUED. */ set_bit (NETFS_RREQ_ALL_QUEUED , &rreq->flags); -netfs_wake_read_collector (rreq); +netfs_wake_collector (rreq); }/* Defer error return as we may need to wait for outstanding I/O. */
fs/netfs/buffered_write.c +1 -1
@@ -386,7 +386,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,wbc_detach_inode (&wbc);if (ret2 == -EIOCBQUEUED )return ret2; -if (ret ==0 ) +if (ret ==0 && ret2 <0 ) ret = ret2; }
fs/netfs/direct_read.c +2 -2
@@ -103,7 +103,7 @@ static int netfs_dispatch_unbuffered_reads(struct netfs_io_request *rreq) rreq->netfs_ops->issue_read (subreq);if (test_bit (NETFS_RREQ_PAUSE , &rreq->flags)) -netfs_wait_for_pause (rreq); +netfs_wait_for_paused_read (rreq);if (test_bit (NETFS_RREQ_FAILED , &rreq->flags))break ; if (test_bit(NETFS_RREQ_BLOCKED, &rreq->flags) &&
@@ -115,7 +115,7 @@ static int netfs_dispatch_unbuffered_reads(struct netfs_io_request *rreq)if (unlikely (size >0 )) {smp_wmb ();/* Write lists before ALL_QUEUED. */ set_bit (NETFS_RREQ_ALL_QUEUED , &rreq->flags); -netfs_wake_read_collector (rreq); +netfs_wake_collector (rreq); }return ret;
fs/netfs/direct_write.c +4 -6
@@ -87,6 +87,8 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter * }__set_bit (NETFS_RREQ_USE_IO_ITER , &wreq->flags); +if (async) +__set_bit (NETFS_RREQ_OFFLOAD_COLLECTION , &wreq->flags);/* Copy the data into the bounce buffer and encrypt it. */ // TODO
@@ -105,13 +107,9 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *if (!async) {trace_netfs_rreq (wreq, netfs_rreq_trace_wait_ip); -wait_on_bit (&wreq->flags,NETFS_RREQ_IN_PROGRESS , -TASK_UNINTERRUPTIBLE ); - ret = wreq->error; -if (ret ==0 ) { - ret = wreq->transferred; + ret =netfs_wait_for_write (wreq); +if (ret >0 ) iocb->ki_pos += ret; - } }else { ret = -EIOCBQUEUED ; }
fs/netfs/internal.h +27 -6
@@ -62,6 +62,14 @@ static inline void netfs_proc_del_rreq(struct netfs_io_request *rreq) {}struct folio_queue *netfs_buffer_make_space (struct netfs_io_request *rreq,enum netfs_folioq_trace trace);void netfs_reset_iter (struct netfs_io_subrequest *subreq); +void netfs_wake_collector (struct netfs_io_request *rreq); +void netfs_subreq_clear_in_progress (struct netfs_io_subrequest *subreq); +void netfs_wait_for_in_progress_stream (struct netfs_io_request *rreq, +struct netfs_io_stream *stream); +ssize_t netfs_wait_for_read (struct netfs_io_request *rreq); +ssize_t netfs_wait_for_write (struct netfs_io_request *rreq); +void netfs_wait_for_paused_read (struct netfs_io_request *rreq); +void netfs_wait_for_paused_write (struct netfs_io_request *rreq);/* * objects.c
@@ -91,11 +99,9 @@ static inline void netfs_see_subrequest(struct netfs_io_subrequest *subreq,/* * read_collect.c */ +bool netfs_read_collection (struct netfs_io_request *rreq);void netfs_read_collection_worker (struct work_struct *work); -void netfs_wake_read_collector (struct netfs_io_request *rreq);void netfs_cache_read_terminated (void *priv,ssize_t transferred_or_error); -ssize_t netfs_wait_for_read (struct netfs_io_request *rreq); -void netfs_wait_for_pause (struct netfs_io_request *rreq);/* * read_pgpriv2.c
@@ -175,8 +181,8 @@ static inline void netfs_stat_d(atomic_t *stat)* write_collect.c */ int netfs_folio_written_back (struct folio *folio); +bool netfs_write_collection (struct netfs_io_request *wreq);void netfs_write_collection_worker (struct work_struct *work); -void netfs_wake_write_collector (struct netfs_io_request *wreq);/* * write_issue.c
@@ -197,8 +203,8 @@ struct netfs_io_request *netfs_begin_writethrough(struct kiocb *iocb, size_t lenint netfs_advance_writethrough (struct netfs_io_request *wreq,struct writeback_control *wbc,struct folio *folio,size_t copied,bool to_page_end,struct folio **writethrough_cache); -int netfs_end_writethrough (struct netfs_io_request *wreq,struct writeback_control *wbc, -struct folio *writethrough_cache); +ssize_t netfs_end_writethrough (struct netfs_io_request *wreq,struct writeback_control *wbc, +struct folio *writethrough_cache);int netfs_unbuffered_write (struct netfs_io_request *wreq,bool may_wait,size_t len);/*
@@ -253,6 +259,21 @@ static inline void netfs_put_group_many(struct netfs_group *netfs_group, int nr) netfs_group->free (netfs_group); } +/* +* Clear and wake up a NETFS_RREQ_* flag bit on a request. +*/ +static inline void netfs_wake_rreq_flag (struct netfs_io_request *rreq, +unsigned int rreq_flag, +enum netfs_rreq_trace trace) +{ +if (test_bit (rreq_flag, &rreq->flags)) { +trace_netfs_rreq (rreq, trace); +clear_bit_unlock (rreq_flag, &rreq->flags); +smp_mb__after_atomic ();/* Set flag before task state */ +wake_up (&rreq->waitq); + } +} +/* * fscache-cache.c */
fs/netfs/misc.c +218 -0
221 lines not on this page · raw message
fs/netfs/read_collect.c +5 -134
185 lines not on this page · raw message
fs/netfs/read_retry.c +2 -22
@@ -257,35 +257,15 @@ static void netfs_retry_read_subrequests(struct netfs_io_request *rreq)*/ void netfs_retry_reads (struct netfs_io_request *rreq) { -struct netfs_io_subrequest *subreq;struct netfs_io_stream *stream = &rreq->io_streams[0 ]; -DEFINE_WAIT (myself);netfs_stat (&netfs_n_rh_retry_read_req); -set_bit (NETFS_RREQ_RETRYING , &rreq->flags); -/* Wait for all outstanding I/O to quiesce before performing retries as * we may need to renegotiate the I/O sizes. */ -list_for_each_entry (subreq, &stream->subrequests, rreq_link) { -if (!test_bit (NETFS_SREQ_IN_PROGRESS , &subreq->flags)) -continue ; - -trace_netfs_rreq (rreq, netfs_rreq_trace_wait_queue); -for (;;) { -prepare_to_wait (&rreq->waitq, &myself,TASK_UNINTERRUPTIBLE ); - -if (!test_bit (NETFS_SREQ_IN_PROGRESS , &subreq->flags)) -break ; - -trace_netfs_sreq (subreq, netfs_sreq_trace_wait_for); -schedule (); -trace_netfs_rreq (rreq, netfs_rreq_trace_woke_queue); - } - -finish_wait (&rreq->waitq, &myself); - } +set_bit (NETFS_RREQ_RETRYING , &rreq->flags); +netfs_wait_for_in_progress_stream (rreq, stream);clear_bit (NETFS_RREQ_RETRYING , &rreq->flags);trace_netfs_rreq (rreq, netfs_rreq_trace_resubmit);
fs/netfs/write_collect.c +7 -29
@@ -321,18 +321,14 @@ static void netfs_collect_write_results(struct netfs_io_request *wreq)if (notes &NEED_RETRY ) goto need_retry; -if ((notes &MADE_PROGRESS ) &&test_bit (NETFS_RREQ_PAUSE , &wreq->flags)) { -trace_netfs_rreq (wreq, netfs_rreq_trace_unpause); -clear_bit_unlock (NETFS_RREQ_PAUSE , &wreq->flags); -smp_mb__after_atomic ();/* Set PAUSE before task state */ -wake_up (&wreq->waitq); - } -if (notes &NEED_REASSESS ) { +if (notes &MADE_PROGRESS ) { +netfs_wake_rreq_flag (wreq,NETFS_RREQ_PAUSE , netfs_rreq_trace_unpause);//cond_resched(); goto reassess_streams; } -if (notes &MADE_PROGRESS ) { + +if (notes &NEED_REASSESS ) {//cond_resched(); goto reassess_streams; }
@@ -356,7 +352,7 @@ static void netfs_collect_write_results(struct netfs_io_request *wreq)/* * Perform the collection of subrequests, folios and encryption buffers. */ -static bool netfs_write_collection (struct netfs_io_request *wreq) +bool netfs_write_collection (struct netfs_io_request *wreq) {struct netfs_inode *ictx =netfs_inode (wreq->inode);size_t transferred;
@@ -417,8 +413,7 @@ static bool netfs_write_collection(struct netfs_io_request *wreq)inode_dio_end (wreq->inode);_debug ("finished" ); -trace_netfs_rreq (wreq, netfs_rreq_trace_wake_ip); -clear_and_wake_up_bit (NETFS_RREQ_IN_PROGRESS , &wreq->flags); +netfs_wake_rreq_flag (wreq,NETFS_RREQ_IN_PROGRESS , netfs_rreq_trace_wake_ip);/* As we cleared NETFS_RREQ_IN_PROGRESS, we acquired its ref. */ if (wreq->iocb) {
@@ -448,14 +443,6 @@ void netfs_write_collection_worker(struct work_struct *work) } } -/* -* Wake the collection work item. -*/ -void netfs_wake_write_collector (struct netfs_io_request *wreq) -{ -queue_work (system_unbound_wq, &wreq->work); -} -/** * netfs_write_subrequest_terminated - Note the termination of a write operation. * @_op: The I/O request that has terminated.
@@ -479,7 +466,6 @@ void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error) {struct netfs_io_subrequest *subreq = _op;struct netfs_io_request *wreq = subreq->rreq; -struct netfs_io_stream *stream = &wreq->io_streams[subreq->stream_nr];_enter ("%x[%x] %zd" , wreq->debug_id, subreq->debug_index, transferred_or_error);
@@ -531,15 +517,7 @@ void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error) }trace_netfs_sreq (subreq, netfs_sreq_trace_terminated); - -clear_and_wake_up_bit (NETFS_SREQ_IN_PROGRESS , &subreq->flags); - -/* If we are at the head of the queue, wake up the collector, -* transferring a ref to it if we were the ones to do so. -*/ -if (list_is_first (&subreq->rreq_link, &stream->subrequests)) -netfs_wake_write_collector (wreq); - +netfs_subreq_clear_in_progress (subreq);netfs_put_subrequest (subreq, netfs_sreq_trace_put_terminated); }EXPORT_SYMBOL (netfs_write_subrequest_terminated);
fs/netfs/write_issue.c +13 -15
@@ -542,7 +542,7 @@ static void netfs_end_issue_write(struct netfs_io_request *wreq) }if (needs_poke) -netfs_wake_write_collector (wreq); +netfs_wake_collector (wreq); }/*
@@ -576,6 +576,7 @@ int netfs_writepages(struct address_space *mapping, goto couldnt_start; } +__set_bit (NETFS_RREQ_OFFLOAD_COLLECTION , &wreq->flags);trace_netfs_write (wreq, netfs_write_trace_writeback);netfs_stat (&netfs_n_wh_writepages);
@@ -599,7 +600,7 @@ int netfs_writepages(struct address_space *mapping,netfs_end_issue_write (wreq);mutex_unlock (&ictx->wb_lock); -netfs_wake_write_collector (wreq); +netfs_wake_collector (wreq);netfs_put_request (wreq, netfs_rreq_trace_put_return);_leave (" = %d" , error);
@@ -674,11 +675,11 @@ int netfs_advance_writethrough(struct netfs_io_request *wreq, struct writeback_c/* * End a write operation used when writing through the pagecache. */ -int netfs_end_writethrough (struct netfs_io_request *wreq,struct writeback_control *wbc, -struct folio *writethrough_cache) +ssize_t netfs_end_writethrough (struct netfs_io_request *wreq,struct writeback_control *wbc, +struct folio *writethrough_cache) {struct netfs_inode *ictx =netfs_inode (wreq->inode); -int ret; +ssize_t ret;_enter ("R=%x" , wreq->debug_id);
@@ -689,12 +690,10 @@ int netfs_end_writethrough(struct netfs_io_request *wreq, struct writeback_contrmutex_unlock (&ictx->wb_lock); -if (wreq->iocb) { +if (wreq->iocb) ret = -EIOCBQUEUED ; - }else { -wait_on_bit (&wreq->flags,NETFS_RREQ_IN_PROGRESS ,TASK_UNINTERRUPTIBLE ); - ret = wreq->error; - } +else + ret =netfs_wait_for_write (wreq);netfs_put_request (wreq, netfs_rreq_trace_put_return);return ret; }
@@ -723,10 +722,8 @@ int netfs_unbuffered_write(struct netfs_io_request *wreq, bool may_wait, size_t start += part; len -= part;rolling_buffer_advance (&wreq->buffer, part); -if (test_bit (NETFS_RREQ_PAUSE , &wreq->flags)) { -trace_netfs_rreq (wreq, netfs_rreq_trace_wait_pause); -wait_event (wreq->waitq, !test_bit (NETFS_RREQ_PAUSE , &wreq->flags)); - } +if (test_bit (NETFS_RREQ_PAUSE , &wreq->flags)) +netfs_wait_for_paused_write (wreq);if (test_bit (NETFS_RREQ_FAILED , &wreq->flags))break ; }
@@ -886,6 +883,7 @@ int netfs_writeback_single(struct address_space *mapping, goto couldnt_start; } +__set_bit (NETFS_RREQ_OFFLOAD_COLLECTION , &wreq->flags);trace_netfs_write (wreq, netfs_write_trace_writeback_single);netfs_stat (&netfs_n_wh_writepages);
@@ -915,7 +913,7 @@ int netfs_writeback_single(struct address_space *mapping,set_bit (NETFS_RREQ_ALL_QUEUED , &wreq->flags);mutex_unlock (&ictx->wb_lock); -netfs_wake_write_collector (wreq); +netfs_wake_collector (wreq);netfs_put_request (wreq, netfs_rreq_trace_put_return);_leave (" = %d" , ret);
fs/netfs/write_retry.c +4 -8
@@ -200,7 +200,6 @@ static void netfs_retry_write_stream(struct netfs_io_request *wreq,*/ void netfs_retry_writes (struct netfs_io_request *wreq) { -struct netfs_io_subrequest *subreq;struct netfs_io_stream *stream;int s;
@@ -209,16 +208,13 @@ void netfs_retry_writes(struct netfs_io_request *wreq)/* Wait for all outstanding I/O to quiesce before performing retries as * we may need to renegotiate the I/O sizes. */ +set_bit (NETFS_RREQ_RETRYING , &wreq->flags);for (s =0 ; s <NR_IO_STREAMS ; s++) { stream = &wreq->io_streams[s]; -if (!stream->active) -continue ; - -list_for_each_entry (subreq, &stream->subrequests, rreq_link) { -wait_on_bit (&subreq->flags,NETFS_SREQ_IN_PROGRESS , -TASK_UNINTERRUPTIBLE ); - } +if (stream->active) +netfs_wait_for_in_progress_stream (wreq, stream); } +clear_bit (NETFS_RREQ_RETRYING , &wreq->flags);// TODO: Enc: Fetch changed partial pages // TODO: Enc: Reencrypt content if needed.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 457/780 mfd: exynos-lpass: Fix an error handling path in exynos_lpass_probe()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 484f0f59f09edd1f6fa63703c12eb30d72a519ac ]
If an error occurs after a successful regmap_init_mmio(), regmap_exit() should be called as already done in the .remove() function.
Switch to devm_regmap_init_mmio() to avoid the leak and simplify the .remove() function.
--- drivers/mfd/exynos-lpass.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/mfd/exynos-lpass.c +2 -3
@@ -122,8 +122,8 @@ static int exynos_lpass_probe(struct platform_device *pdev)if (IS_ERR (lpass->sfr0_clk))return PTR_ERR (lpass->sfr0_clk); - lpass->top =regmap_init_mmio (dev, base_top, - &exynos_lpass_reg_conf); + lpass->top =devm_regmap_init_mmio (dev, base_top, + &exynos_lpass_reg_conf);if (IS_ERR (lpass->top)) {dev_err (dev,"LPASS top regmap initialization failed\n" );return PTR_ERR (lpass->top);
@@ -145,7 +145,6 @@ static void exynos_lpass_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev);if (!pm_runtime_status_suspended (&pdev->dev))exynos_lpass_disable (lpass); -regmap_exit (lpass->top); }static int __maybe_unused exynos_lpass_suspend (struct device *dev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 458/780 mfd: exynos-lpass: Avoid calling exynos_lpass_disable() twice in exynos_lpass_remove()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit b70b84556eeca5262d290e8619fe0af5b7664a52 ]
exynos_lpass_disable() is called twice in the remove function. Remove one of these calls.
--- drivers/mfd/exynos-lpass.c | 1 - 1 file changed, 1 deletion(-)
drivers/mfd/exynos-lpass.c +0 -1
@@ -141,7 +141,6 @@ static void exynos_lpass_remove(struct platform_device *pdev) {struct exynos_lpass *lpass =platform_get_drvdata (pdev); -exynos_lpass_disable (lpass);pm_runtime_disable (&pdev->dev);if (!pm_runtime_status_suspended (&pdev->dev))exynos_lpass_disable (lpass);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 459/780 mfd: exynos-lpass: Fix another error handling path in exynos_lpass_probe()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit f41cc37f4bc0e8cd424697bf6e26586cadcf4b9b ]
If devm_of_platform_populate() fails, some clean-up needs to be done, as already done in the remove function.
Add a new devm_add_action_or_reset() to fix the leak in the probe and remove the need of a remove function.
--- drivers/mfd/exynos-lpass.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
drivers/mfd/exynos-lpass.c +15 -10
@@ -104,11 +104,22 @@ static const struct regmap_config exynos_lpass_reg_conf = { .fast_io = true, }; +static void exynos_lpass_disable_lpass (void *data) +{ +struct platform_device *pdev = data; +struct exynos_lpass *lpass =platform_get_drvdata (pdev); + +pm_runtime_disable (&pdev->dev); +if (!pm_runtime_status_suspended (&pdev->dev)) +exynos_lpass_disable (lpass); +} +static int exynos_lpass_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct exynos_lpass *lpass;void __iomem *base_top; +int ret; lpass =devm_kzalloc (dev,sizeof (*lpass),GFP_KERNEL );if (!lpass)
@@ -134,16 +145,11 @@ static int exynos_lpass_probe(struct platform_device *pdev)pm_runtime_enable (dev);exynos_lpass_enable (lpass); -return devm_of_platform_populate (dev); -} - -static void exynos_lpass_remove (struct platform_device *pdev) -{ -struct exynos_lpass *lpass =platform_get_drvdata (pdev); + ret =devm_add_action_or_reset (dev, exynos_lpass_disable_lpass, pdev); +if (ret) +return ret; -pm_runtime_disable (&pdev->dev); -if (!pm_runtime_status_suspended (&pdev->dev)) -exynos_lpass_disable (lpass); +return devm_of_platform_populate (dev); }static int __maybe_unused exynos_lpass_suspend (struct device *dev)
@@ -183,7 +189,6 @@ static struct platform_driver exynos_lpass_driver = { .of_match_table = exynos_lpass_of_match, }, .probe = exynos_lpass_probe, - .remove = exynos_lpass_remove, };module_platform_driver (exynos_lpass_driver);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 460/780 mfd: stmpe-spi: Correct the name used in MODULE_DEVICE_TABLE
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Gladkov <[email protected]>
[ Upstream commit 59d60c16ed41475f3b5f7b605e75fbf8e3628720 ]
The name used in the macro does not exist.
drivers/mfd/stmpe-spi.c:132:26: error: use of undeclared identifier 'stmpe_id'
132 | MODULE_DEVICE_TABLE(spi, stmpe_id);
--- drivers/mfd/stmpe-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/stmpe-spi.c +1 -1
@@ -129,7 +129,7 @@ static const struct spi_device_id stmpe_spi_id[] = { { "stmpe2403", STMPE2403 }, { } }; -MODULE_DEVICE_TABLE(spi, stmpe_id); +MODULE_DEVICE_TABLE(spi, stmpe_spi_id); static struct spi_driver stmpe_spi_driver = { .driver = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 461/780 netfs: Fix undifferentiation of DIO reads from unbuffered reads
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit db26d62d79e4068934ad0dccdb92715df36352b9 ]
On cifs, "DIO reads" (specified by O_DIRECT) need to be differentiated from "unbuffered reads" (specified by cache=none in the mount parameters). The difference is flagged in the protocol and the server may behave
differently: Windows Server will, for example, mandate that DIO reads are block aligned.
Fix this by adding a NETFS_UNBUFFERED_READ to differentiate this from NETFS_DIO_READ, parallelling the write differentiation that already exists. cifs will then do the right thing.
--- fs/9p/vfs_addr.c | 3 ++- fs/afs/write.c | 1 + fs/ceph/addr.c | 4 +++- fs/netfs/direct_read.c | 3 ++- fs/netfs/main.c | 1 + fs/netfs/misc.c | 1 + fs/netfs/objects.c | 1 + fs/netfs/read_collect.c | 7 +++++-- fs/nfs/fscache.c | 1 + fs/smb/client/file.c | 3 ++- include/linux/netfs.h | 1 + include/trace/events/netfs.h | 1 + 12 files changed, 21 insertions(+), 6 deletions(-)
fs/9p/vfs_addr.c +2 -1
@@ -77,7 +77,8 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq)/* if we just extended the file size, any portion not in * cache won't be on server and is zeroes */ -if (subreq->rreq->origin !=NETFS_DIO_READ ) +if (subreq->rreq->origin !=NETFS_UNBUFFERED_READ && + subreq->rreq->origin !=NETFS_DIO_READ )__set_bit (NETFS_SREQ_CLEAR_TAIL , &subreq->flags);if (pos + total >=i_size_read (rreq->inode))__set_bit (NETFS_SREQ_HIT_EOF , &subreq->flags);
fs/afs/write.c +1 -0
@@ -202,6 +202,7 @@ void afs_retry_request(struct netfs_io_request *wreq, struct netfs_io_stream *stcase NETFS_READ_GAPS :case NETFS_READ_SINGLE :case NETFS_READ_FOR_WRITE : +case NETFS_UNBUFFERED_READ :case NETFS_DIO_READ :return ;default :
fs/ceph/addr.c +3 -1
@@ -238,6 +238,7 @@ static void finish_netfs_read(struct ceph_osd_request *req)if (sparse && err >0 ) err =ceph_sparse_ext_map_end (op);if (err < subreq->len && + subreq->rreq->origin !=NETFS_UNBUFFERED_READ && subreq->rreq->origin !=NETFS_DIO_READ )__set_bit (NETFS_SREQ_CLEAR_TAIL , &subreq->flags);if (IS_ENCRYPTED (inode) && err >0 ) {
@@ -281,7 +282,8 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq)size_t len;int mode; -if (rreq->origin !=NETFS_DIO_READ ) +if (rreq->origin !=NETFS_UNBUFFERED_READ && + rreq->origin !=NETFS_DIO_READ )__set_bit (NETFS_SREQ_CLEAR_TAIL , &subreq->flags);__clear_bit (NETFS_SREQ_COPY_TO_CACHE , &subreq->flags);
fs/netfs/direct_read.c +2 -1
@@ -188,7 +188,8 @@ ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_iter *i rreq =netfs_alloc_request (iocb->ki_filp->f_mapping, iocb->ki_filp, iocb->ki_pos, orig_count, -NETFS_DIO_READ ); + iocb->ki_flags &IOCB_DIRECT ? +NETFS_DIO_READ :NETFS_UNBUFFERED_READ );if (IS_ERR (rreq))return PTR_ERR (rreq);
fs/netfs/main.c +1 -0
@@ -39,6 +39,7 @@ static const char *netfs_origins[nr__netfs_io_origin] = { [NETFS_READ_GAPS] = "RG", [NETFS_READ_SINGLE] = "R1", [NETFS_READ_FOR_WRITE] = "RW", + [NETFS_UNBUFFERED_READ] = "UR", [NETFS_DIO_READ] = "DR", [NETFS_WRITEBACK] = "WB", [NETFS_WRITEBACK_SINGLE] = "W1",
fs/netfs/misc.c +1 -0
@@ -461,6 +461,7 @@ static ssize_t netfs_wait_for_request(struct netfs_io_request *rreq,case NETFS_DIO_READ :case NETFS_DIO_WRITE :case NETFS_READ_SINGLE : +case NETFS_UNBUFFERED_READ :case NETFS_UNBUFFERED_WRITE :break ;default :
fs/netfs/objects.c +1 -0
@@ -59,6 +59,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, origin == NETFS_READ_GAPS || origin == NETFS_READ_SINGLE || origin == NETFS_READ_FOR_WRITE || + origin == NETFS_UNBUFFERED_READ || origin == NETFS_DIO_READ) {INIT_WORK (&rreq->work, netfs_read_collection_worker); rreq->io_streams[0 ].avail = true;
fs/netfs/read_collect.c +5 -2
@@ -342,7 +342,8 @@ static void netfs_rreq_assess_dio(struct netfs_io_request *rreq) {unsigned int i; -if (rreq->origin ==NETFS_DIO_READ ) { +if (rreq->origin ==NETFS_UNBUFFERED_READ || + rreq->origin ==NETFS_DIO_READ ) {for (i =0 ; i < rreq->direct_bv_count; i++) {flush_dcache_page (rreq->direct_bv[i].bv_page);// TODO: cifs marks pages in the destination buffer
@@ -360,7 +361,8 @@ static void netfs_rreq_assess_dio(struct netfs_io_request *rreq) }if (rreq->netfs_ops->done) rreq->netfs_ops->done (rreq); -if (rreq->origin ==NETFS_DIO_READ ) +if (rreq->origin ==NETFS_UNBUFFERED_READ || + rreq->origin ==NETFS_DIO_READ )inode_dio_end (rreq->inode); }
@@ -416,6 +418,7 @@ bool netfs_read_collection(struct netfs_io_request *rreq)//netfs_rreq_is_still_valid(rreq); switch (rreq->origin) { +case NETFS_UNBUFFERED_READ :case NETFS_DIO_READ :case NETFS_READ_GAPS :netfs_rreq_assess_dio (rreq);
fs/nfs/fscache.c +1 -0
@@ -367,6 +367,7 @@ void nfs_netfs_read_completion(struct nfs_pgio_header *hdr) sreq = netfs->sreq;if (test_bit (NFS_IOHDR_EOF , &hdr->flags) && + sreq->rreq->origin !=NETFS_UNBUFFERED_READ && sreq->rreq->origin !=NETFS_DIO_READ )__set_bit (NETFS_SREQ_CLEAR_TAIL , &sreq->flags);
fs/smb/client/file.c +2 -1
@@ -219,7 +219,8 @@ static void cifs_issue_read(struct netfs_io_subrequest *subreq) goto failed; } -if (subreq->rreq->origin !=NETFS_DIO_READ ) +if (subreq->rreq->origin !=NETFS_UNBUFFERED_READ && + subreq->rreq->origin !=NETFS_DIO_READ )__set_bit (NETFS_SREQ_CLEAR_TAIL , &subreq->flags);trace_netfs_sreq (subreq, netfs_sreq_trace_submit);
include/linux/netfs.h +1 -0
@@ -206,6 +206,7 @@ enum netfs_io_origin {NETFS_READ_GAPS ,/* This read is a synchronous read to fill gaps */ NETFS_READ_SINGLE ,/* This read should be treated as a single object */ NETFS_READ_FOR_WRITE ,/* This read is to prepare a write */ +NETFS_UNBUFFERED_READ ,/* This is an unbuffered read */ NETFS_DIO_READ ,/* This is a direct I/O read */ NETFS_WRITEBACK ,/* This write was triggered by writepages */ NETFS_WRITEBACK_SINGLE, /* This monolithic write was triggered by writepages */
include/trace/events/netfs.h +1 -0
@@ -39,6 +39,7 @@ EM(NETFS_READ_GAPS, "RG") \ EM(NETFS_READ_SINGLE, "R1") \ EM(NETFS_READ_FOR_WRITE, "RW") \ + EM(NETFS_UNBUFFERED_READ, "UR") \ EM(NETFS_DIO_READ, "DR") \ EM(NETFS_WRITEBACK, "WB") \EM (NETFS_WRITEBACK_SINGLE ,"W1" ) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 462/780 perf tests switch-tracking: Fix timestamp comparison
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Yan <[email protected]>
[ Upstream commit 628e124404b3db5e10e17228e680a2999018ab33 ]
The test might fail on the Arm64 platform with the error:
# perf test -vvv "Track with sched_switch" Missing sched_switch events #
The issue is caused by incorrect handling of timestamp comparisons. The comparison result, a signed 64-bit value, was being directly cast to an int, leading to incorrect sorting for sched events.
The case does not fail everytime, usually I can trigger the failure after run 20 ~ 30 times:
# while true; do perf test "Track with sched_switch"; done 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : FAILED! 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok 106: Track with sched_switch : FAILED! 106: Track with sched_switch : Ok 106: Track with sched_switch : Ok
I used cross compiler to build Perf tool on my host machine and tested on Debian / Juno board. Generally, I think this issue is not very specific to GCC versions. As both internal CI and my local env can reproduce the issue.
My Host Build compiler:
# aarch64-linux-gnu-gcc --version aarch64-linux-gnu-gcc (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0
Juno Board:
# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm
Fix this by explicitly returning 0, 1, or -1 based on whether the result is zero, positive, or negative.
--- tools/perf/tests/switch-tracking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/switch-tracking.c +1 -1
@@ -264,7 +264,7 @@ static int compar(const void *a, const void *b)const struct event_node *nodeb = b;s64 cmp = nodea->event_time - nodeb->event_time; -return cmp; +return cmp <0 ?-1 : (cmp >0 ?1 :0 ); } static int process_events(struct evlist *evlist,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 463/780 mailbox: mchp-ipc-sbi: Fix COMPILE_TEST build error
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yue Haibing <[email protected]>
[ Upstream commit d635ba4207c31940398c41caa0cedd80f3b9c9c7 ]
If COMPILE_TEST is y but RISCV_SBI is n, build fails:
drivers/mailbox/mailbox-mchp-ipc-sbi.c: In function 'mchp_ipc_sbi_chan_send':drivers/mailbox/mailbox-mchp-ipc-sbi.c:119:23: error: storage size of 'ret' isn't known
struct sbiret ret; ^~~ CC drivers/nvmem/lpc18xx_otp.o drivers/mailbox/mailbox-mchp-ipc-sbi.c:121:15: error: implicit declaration of function 'sbi_ecall' [-Werror=implicit-function-declaration] ret = sbi_ecall(SBI_EXT_MICROCHIP_TECHNOLOGY, command, channel, ^~~~~~~~~
move COMPILE_TEST to ARCH_MICROCHIP dependency as other drivers.
--- drivers/mailbox/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mailbox/Kconfig +2 -2
@@ -191,8 +191,8 @@ config POLARFIRE_SOC_MAILBOX config MCHP_SBI_IPC_MBOX tristate "Microchip Inter-processor Communication (IPC) SBI driver" - depends on RISCV_SBI || COMPILE_TEST - depends on ARCH_MICROCHIP + depends on RISCV_SBI + depends on ARCH_MICROCHIP || COMPILE_TEST help Mailbox implementation for Microchip devices with an Inter-process communication (IPC) controller.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 464/780 mailbox: imx: Fix TXDB_V2 sending
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit f5cb07ec6aabd1bb56adbdeb5f0d70cb524db2cd ]
i.MX95 features several processing domains, Cortex-M7, Cortex-A55 secure, Cortex-A55 non-secure. Each domain could communicate with SCMI firmware with a dedicated MU. But the current NXP SCMI firmware is not a RTOS, all processing logic codes are in interrupt context. So if high priority Cortex-M7 is communicating with SCMI firmware and requires a bit more time to handle the SCMI call, Linux MU TXDB_V2 will be timeout with high possiblity in 1000us(the current value in imx-mailbox.c). Per NXP SCMI firmware design, if timeout, there is no recover logic, so SCMI agents should never timeout and always wait until the check condition met.
Based on the upper reason, enlarge the timeout value to 10ms which is less chance to timeout, and retry if timeout really happends.
--- drivers/mailbox/imx-mailbox.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/mailbox/imx-mailbox.c +15 -6
@@ -226,7 +226,7 @@ static int imx_mu_generic_tx(struct imx_mu_priv *priv, {u32 *arg = data;u32 val; -int ret; +int ret, count;switch (cp->type) {case IMX_MU_TYPE_TX :
@@ -240,11 +240,20 @@ static int imx_mu_generic_tx(struct imx_mu_priv *priv,case IMX_MU_TYPE_TXDB_V2 :imx_mu_write (priv,IMX_MU_xCR_GIRn (priv->dcfg->type, cp->idx), priv->dcfg->xCR[IMX_MU_GCR ]); - ret =readl_poll_timeout (priv->base + priv->dcfg->xCR[IMX_MU_GCR ], val, - !(val &IMX_MU_xCR_GIRn (priv->dcfg->type, cp->idx)), -0 ,1000 ); -if (ret) -dev_warn_ratelimited (priv->dev,"channel type: %d failure\n" , cp->type); + ret = -ETIMEDOUT ; + count =0 ; +while (ret && (count <10 )) { + ret = +readl_poll_timeout (priv->base + priv->dcfg->xCR[IMX_MU_GCR ], val, + !(val &IMX_MU_xCR_GIRn (priv->dcfg->type, cp->idx)), +0 ,10000 ); + +if (ret) { +dev_warn_ratelimited (priv->dev, +"channel type: %d timeout, %d times, retry\n" , + cp->type, ++count); + } + }break ;default :dev_warn_ratelimited (priv->dev,"Send data on wrong channel type: %d\n" , cp->type);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 465/780 mailbox: mtk-cmdq: Refine GCE_GCTL_VALUE setting
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason-JH Lin <[email protected]>
[ Upstream commit 9fcebcb37c3e0a4b6eb40768cc5a5faebf166fbe ]
Add cmdq_gctl_value_toggle() to configure GCE_CTRL_BY_SW and GCE_DDR_EN together in the same GCE_GCTL_VALUE register.
For the SoCs whose GCE is located in MMINFRA and uses MMINFRA_AO power, this allows it to be written without enabling the clocks. Otherwise, all GCE registers should be written after the GCE clocks are enabled. Move this function into cmdq_runtime_resume() and cmdq_runtime_suspend() to ensure it is called when the GCE clock is enabled.
--- drivers/mailbox/mtk-cmdq-mailbox.c | 51 +++++++++++++----------------- 1 file changed, 22 insertions(+), 29 deletions(-)
drivers/mailbox/mtk-cmdq-mailbox.c +22 -29
@@ -92,18 +92,6 @@ struct gce_plat {u32 gce_num; }; -static void cmdq_sw_ddr_enable (struct cmdq *cmdq,bool enable) -{ -WARN_ON (clk_bulk_enable (cmdq->pdata->gce_num, cmdq->clocks)); - -if (enable) -writel (GCE_DDR_EN |GCE_CTRL_BY_SW , cmdq->base +GCE_GCTL_VALUE ); -else -writel (GCE_CTRL_BY_SW , cmdq->base +GCE_GCTL_VALUE ); - -clk_bulk_disable (cmdq->pdata->gce_num, cmdq->clocks); -} -u8 cmdq_get_shift_pa (struct mbox_chan *chan) { struct cmdq *cmdq = container_of(chan->mbox, struct cmdq, mbox);
@@ -112,6 +100,19 @@ u8 cmdq_get_shift_pa(struct mbox_chan *chan) }EXPORT_SYMBOL (cmdq_get_shift_pa); +static void cmdq_gctl_value_toggle (struct cmdq *cmdq,bool ddr_enable) +{ +u32 val = cmdq->pdata->control_by_sw ?GCE_CTRL_BY_SW :0 ; + +if (!cmdq->pdata->control_by_sw && !cmdq->pdata->sw_ddr_en) +return ; + +if (cmdq->pdata->sw_ddr_en && ddr_enable) + val |=GCE_DDR_EN ; + +writel (val, cmdq->base +GCE_GCTL_VALUE ); +} +static int cmdq_thread_suspend (struct cmdq *cmdq,struct cmdq_thread *thread) {u32 status;
@@ -140,16 +141,10 @@ static void cmdq_thread_resume(struct cmdq_thread *thread)static void cmdq_init (struct cmdq *cmdq) {int i; -u32 gctl_regval =0 ;WARN_ON (clk_bulk_enable (cmdq->pdata->gce_num, cmdq->clocks)); -if (cmdq->pdata->control_by_sw) - gctl_regval =GCE_CTRL_BY_SW ; -if (cmdq->pdata->sw_ddr_en) - gctl_regval |=GCE_DDR_EN ; -if (gctl_regval) -writel (gctl_regval, cmdq->base +GCE_GCTL_VALUE ); +cmdq_gctl_value_toggle (cmdq, true);writel (CMDQ_THR_ACTIVE_SLOT_CYCLES , cmdq->base +CMDQ_THR_SLOT_CYCLES );for (i =0 ; i <=CMDQ_MAX_EVENT ; i++)
@@ -315,14 +310,21 @@ static irqreturn_t cmdq_irq_handler(int irq, void *dev)static int cmdq_runtime_resume (struct device *dev) {struct cmdq *cmdq =dev_get_drvdata (dev); +int ret; -return clk_bulk_enable (cmdq->pdata->gce_num, cmdq->clocks); + ret =clk_bulk_enable (cmdq->pdata->gce_num, cmdq->clocks); +if (ret) +return ret; + +cmdq_gctl_value_toggle (cmdq, true); +return 0 ; }static int cmdq_runtime_suspend (struct device *dev) {struct cmdq *cmdq =dev_get_drvdata (dev); +cmdq_gctl_value_toggle (cmdq, false);clk_bulk_disable (cmdq->pdata->gce_num, cmdq->clocks);return 0 ; }
@@ -347,9 +349,6 @@ static int cmdq_suspend(struct device *dev)if (task_running)dev_warn (dev,"exist running task(s) in suspend\n" ); -if (cmdq->pdata->sw_ddr_en) -cmdq_sw_ddr_enable (cmdq, false); -return pm_runtime_force_suspend (dev); }
@@ -360,9 +359,6 @@ static int cmdq_resume(struct device *dev)WARN_ON (pm_runtime_force_resume (dev)); cmdq->suspended = false; -if (cmdq->pdata->sw_ddr_en) -cmdq_sw_ddr_enable (cmdq, true); -return 0 ; }
@@ -370,9 +366,6 @@ static void cmdq_remove(struct platform_device *pdev) {struct cmdq *cmdq =platform_get_drvdata (pdev); -if (cmdq->pdata->sw_ddr_en) -cmdq_sw_ddr_enable (cmdq, false); -if (!IS_ENABLED (CONFIG_PM ))cmdq_runtime_suspend (&pdev->dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 466/780 iomap: dont lose folio dropbehind state for overwrites
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit 34ecde3c56066ba79e5ec3d93c5b14ea83e3603e ]
DONTCACHE I/O must have the completion punted to a workqueue, just like what is done for unwritten extents, as the completion needs task context to perform the invalidation of the folio(s). However, if writeback is started off filemap_fdatawrite_range() off generic_sync() and it's an overwrite, then the DONTCACHE marking gets lost as iomap_add_to_ioend() don't look at the folio being added and no further state is passed down to help it know that this is a dropbehind/DONTCACHE write.
Check if the folio being added is marked as dropbehind, and set IOMAP_IOEND_DONTCACHE if that is the case. Then XFS can factor this into the decision making of completion context in xfs_submit_ioend(). Additionally include this ioend flag in the NOMERGE flags, to avoid mixing it with unrelated IO.
Since this is the 3rd flag that will cause XFS to punt the completion to a workqueue, add a helper so that each one of them can get appropriately commented.
This fixes extra page cache being instantiated when the write performed is an overwrite, rather than newly instantiated blocks.
--- fs/iomap/buffered-io.c | 2 ++ fs/xfs/xfs_aops.c | 22 ++++++++++++++++++++-- include/linux/iomap.h | 5 ++++- 3 files changed, 26 insertions(+), 3 deletions(-)
fs/iomap/buffered-io.c +2 -0
@@ -1675,6 +1675,8 @@ static int iomap_add_to_ioend(struct iomap_writepage_ctx *wpc, ioend_flags |=IOMAP_IOEND_UNWRITTEN ;if (wpc->iomap.flags &IOMAP_F_SHARED ) ioend_flags |=IOMAP_IOEND_SHARED ; +if (folio_test_dropbehind (folio)) + ioend_flags |=IOMAP_IOEND_DONTCACHE ;if (pos == wpc->iomap.offset && (wpc->iomap.flags &IOMAP_F_BOUNDARY )) ioend_flags |=IOMAP_IOEND_BOUNDARY ;
fs/xfs/xfs_aops.c +20 -2
@@ -436,6 +436,25 @@ xfs_map_blocks(return 0 ; } +static bool +xfs_ioend_needs_wq_completion ( +struct iomap_ioend *ioend) +{ +/* Changing inode size requires a transaction. */ +if (xfs_ioend_is_append (ioend)) +return true; + +/* Extent manipulation requires a transaction. */ +if (ioend->io_flags & (IOMAP_IOEND_UNWRITTEN |IOMAP_IOEND_SHARED )) +return true; + +/* Page cache invalidation cannot be done in irq context. */ +if (ioend->io_flags &IOMAP_IOEND_DONTCACHE ) +return true; + +return false; +} + static int xfs_submit_ioend( struct iomap_writepage_ctx *wpc,
@@ -460,8 +479,7 @@ xfs_submit_ioend(memalloc_nofs_restore (nofs_flag);/* send ioends that might require a transaction to the completion wq */ -if (xfs_ioend_is_append (ioend) || - (ioend->io_flags & (IOMAP_IOEND_UNWRITTEN |IOMAP_IOEND_SHARED ))) +if (xfs_ioend_needs_wq_completion (ioend)) ioend->io_bio.bi_end_io = xfs_end_bio;if (status)
include/linux/iomap.h +4 -1
@@ -377,13 +377,16 @@ sector_t iomap_bmap(struct address_space *mapping, sector_t bno,#define IOMAP_IOEND_BOUNDARY (1U << 2)/* is direct I/O */ #define IOMAP_IOEND_DIRECT (1U << 3) +/* is DONTCACHE I/O */ +#define IOMAP_IOEND_DONTCACHE (1U << 4)/* * Flags that if set on either ioend prevent the merge of two ioends. * (IOMAP_IOEND_BOUNDARY also prevents merges, but only one-way) */ #define IOMAP_IOEND_NOMERGE_FLAGS \ - (IOMAP_IOEND_SHARED | IOMAP_IOEND_UNWRITTEN | IOMAP_IOEND_DIRECT) + (IOMAP_IOEND_SHARED | IOMAP_IOEND_UNWRITTEN | IOMAP_IOEND_DIRECT | \ + IOMAP_IOEND_DONTCACHE)/* * Structure for writeback I/O completions.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 467/780 perf pmu: Avoid segv for missing name/alias_name in wildcarding
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 2a2a7f5e7deffa363b438308812989ded126a48a ]
The pmu name or alias_name fields may be NULL and should be skipped if so. This is done in all loops of perf_pmu___name_match except the final wildcard loop which was an oversight.
--- tools/perf/util/pmu.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/util/pmu.c +3 -0
@@ -2052,6 +2052,9 @@ static bool perf_pmu___name_match(const struct perf_pmu *pmu, const char *to_matfor (size_t i =0 ; i <ARRAY_SIZE (names); i++) {const char *name = names[i]; +if (!name) +continue ; +if (wildcard &&perf_pmu__match_wildcard_uncore (name, to_match))return true;if (!wildcard &&perf_pmu__match_ignoring_suffix_uncore (name, to_match))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 468/780 perf symbol: Fix use-after-free in filename__read_build_id
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit fef8f648bb47726d96a5701fe31ed606268da73d ]
The same buf is used for the program headers and reading notes. As the notes memory may be reallocated then this corrupts the memory pointed to by the phdr. Using the same buffer is in any case a logic error. Rather than deal with the duplicated code, introduce an elf32 boolean and a union for either the elf32 or elf64 headers that are in use. Let the program headers have their own memory and grow the buffer for notes as necessary.
Before perf list -j compiled with asan would crash with:
```
==4176189==ERROR: AddressSanitizer: heap-use-after-free on address 0x5160000070b8 at pc 0x555d3b15075b bp 0x7ffebb5a8090 sp 0x7ffebb5a8088
READ of size 8 at 0x5160000070b8 thread T0
#0 0x555d3b15075a in filename__read_build_id tools/perf/util/symbol-minimal.c:212:25
#1 0x555d3ae43aff in filename__sprintf_build_id tools/perf/util/build-id.c:110:8
...
0x5160000070b8 is located 312 bytes inside of 560-byte region [0x516000006f80,0x5160000071b0)
freed by thread T0 here:
#0 0x555d3ab21840 in realloc (perf+0x264840) (BuildId: 12dff2f6629f738e5012abdf0e90055518e70b5e)
#1 0x555d3b1506e7 in filename__read_build_id tools/perf/util/symbol-minimal.c:206:11
...
previously allocated by thread T0 here:
#0 0x555d3ab21423 in malloc (perf+0x264423) (BuildId: 12dff2f6629f738e5012abdf0e90055518e70b5e)
#1 0x555d3b1503a2 in filename__read_build_id tools/perf/util/symbol-minimal.c:182:9
...
```Note: this bug is long standing and not introduced by the other asan fix in commit fa9c4977fbfb ("perf symbol-minimal: Fix double free in filename__read_build_id").
--- tools/perf/util/symbol-minimal.c | 168 +++++++++++++------------------ 1 file changed, 70 insertions(+), 98 deletions(-)
tools/perf/util/symbol-minimal.c +70 -98
@@ -90,11 +90,23 @@ int filename__read_build_id(const char *filename, struct build_id *bid) {FILE *fp;int ret =-1 ; -bool need_swap = false; +bool need_swap = false, elf32;u8 e_ident[EI_NIDENT ]; -size_t buf_size; -void *buf;int i; +union { +struct { +Elf32_Ehdr ehdr32; +Elf32_Phdr *phdr32; + }; +struct { +Elf64_Ehdr ehdr64; +Elf64_Phdr *phdr64; + }; + } hdrs; +void *phdr; +size_t phdr_size; +void *buf =NULL ; +size_t buf_size =0 ; fp =fopen (filename,"r" );if (fp ==NULL )
@@ -108,119 +120,79 @@ int filename__read_build_id(const char *filename, struct build_id *bid) goto out; need_swap =check_need_swap (e_ident[EI_DATA ]); + elf32 = e_ident[EI_CLASS ] ==ELFCLASS32 ; -/* for simplicity */ -fseek (fp,0 ,SEEK_SET ); - -if (e_ident[EI_CLASS ] ==ELFCLASS32 ) { -Elf32_Ehdr ehdr; -Elf32_Phdr *phdr; - -if (fread (&ehdr,sizeof (ehdr),1 , fp) !=1 ) - goto out; +if (fread (elf32 ? (void *)&hdrs.ehdr32 : (void *)&hdrs.ehdr64, + elf32 ?sizeof (hdrs.ehdr32) :sizeof (hdrs.ehdr64), +1 , fp) !=1 ) + goto out; -if (need_swap) { - ehdr.e_phoff =bswap_32 (ehdr.e_phoff); - ehdr.e_phentsize =bswap_16 (ehdr.e_phentsize); - ehdr.e_phnum =bswap_16 (ehdr.e_phnum); +if (need_swap) { +if (elf32) { + hdrs.ehdr32.e_phoff =bswap_32 (hdrs.ehdr32.e_phoff); + hdrs.ehdr32.e_phentsize =bswap_16 (hdrs.ehdr32.e_phentsize); + hdrs.ehdr32.e_phnum =bswap_16 (hdrs.ehdr32.e_phnum); + }else { + hdrs.ehdr64.e_phoff =bswap_64 (hdrs.ehdr64.e_phoff); + hdrs.ehdr64.e_phentsize =bswap_16 (hdrs.ehdr64.e_phentsize); + hdrs.ehdr64.e_phnum =bswap_16 (hdrs.ehdr64.e_phnum); } + } + phdr_size = elf32 ? hdrs.ehdr32.e_phentsize * hdrs.ehdr32.e_phnum + : hdrs.ehdr64.e_phentsize * hdrs.ehdr64.e_phnum; + phdr =malloc (phdr_size); +if (phdr ==NULL ) + goto out; - buf_size = ehdr.e_phentsize * ehdr.e_phnum; - buf =malloc (buf_size); -if (buf ==NULL ) - goto out; - -fseek (fp, ehdr.e_phoff,SEEK_SET ); -if (fread (buf, buf_size,1 , fp) !=1 ) - goto out_free; - -for (i =0 , phdr = buf; i < ehdr.e_phnum; i++, phdr++) { -void *tmp; -long offset; - -if (need_swap) { - phdr->p_type =bswap_32 (phdr->p_type); - phdr->p_offset =bswap_32 (phdr->p_offset); - phdr->p_filesz =bswap_32 (phdr->p_filesz); - } - -if (phdr->p_type !=PT_NOTE ) -continue ; - - offset = phdr->p_offset; -if (phdr->p_filesz > buf_size) { - buf_size = phdr->p_filesz; - tmp =realloc (buf, buf_size); -if (tmp ==NULL ) - goto out_free; - buf = tmp; - } -fseek (fp, offset,SEEK_SET ); -if (fread (buf, phdr->p_filesz,1 , fp) !=1 ) - goto out_free; +fseek (fp, elf32 ? hdrs.ehdr32.e_phoff : hdrs.ehdr64.e_phoff,SEEK_SET ); +if (fread (phdr, phdr_size,1 , fp) !=1 ) + goto out_free; - ret =read_build_id (buf, phdr->p_filesz, bid, need_swap); -if (ret ==0 ) { - ret = bid->size; -break ; - } - } - }else { -Elf64_Ehdr ehdr; -Elf64_Phdr *phdr; +if (elf32) + hdrs.phdr32 = phdr; +else + hdrs.phdr64 = phdr; -if (fread (&ehdr,sizeof (ehdr),1 , fp) !=1 ) - goto out; +for (i =0 ; i < elf32 ? hdrs.ehdr32.e_phnum : hdrs.ehdr64.e_phnum; i++) { +size_t p_filesz;if (need_swap) { - ehdr.e_phoff =bswap_64 (ehdr.e_phoff); - ehdr.e_phentsize =bswap_16 (ehdr.e_phentsize); - ehdr.e_phnum =bswap_16 (ehdr.e_phnum); +if (elf32) { + hdrs.phdr32[i].p_type =bswap_32 (hdrs.phdr32[i].p_type); + hdrs.phdr32[i].p_offset =bswap_32 (hdrs.phdr32[i].p_offset); + hdrs.phdr32[i].p_filesz =bswap_32 (hdrs.phdr32[i].p_offset); + }else { + hdrs.phdr64[i].p_type =bswap_32 (hdrs.phdr64[i].p_type); + hdrs.phdr64[i].p_offset =bswap_64 (hdrs.phdr64[i].p_offset); + hdrs.phdr64[i].p_filesz =bswap_64 (hdrs.phdr64[i].p_filesz); + } } +if ((elf32 ? hdrs.phdr32[i].p_type : hdrs.phdr64[i].p_type) !=PT_NOTE ) +continue ; - buf_size = ehdr.e_phentsize * ehdr.e_phnum; - buf =malloc (buf_size); -if (buf ==NULL ) - goto out; - -fseek (fp, ehdr.e_phoff,SEEK_SET ); -if (fread (buf, buf_size,1 , fp) !=1 ) - goto out_free; - -for (i =0 , phdr = buf; i < ehdr.e_phnum; i++, phdr++) { + p_filesz = elf32 ? hdrs.phdr32[i].p_filesz : hdrs.phdr64[i].p_filesz; +if (p_filesz > buf_size) {void *tmp; -long offset; - -if (need_swap) { - phdr->p_type =bswap_32 (phdr->p_type); - phdr->p_offset =bswap_64 (phdr->p_offset); - phdr->p_filesz =bswap_64 (phdr->p_filesz); - } - -if (phdr->p_type !=PT_NOTE ) -continue ; - offset = phdr->p_offset; -if (phdr->p_filesz > buf_size) { - buf_size = phdr->p_filesz; - tmp =realloc (buf, buf_size); -if (tmp ==NULL ) - goto out_free; - buf = tmp; - } -fseek (fp, offset,SEEK_SET ); -if (fread (buf, phdr->p_filesz,1 , fp) !=1 ) + buf_size = p_filesz; + tmp =realloc (buf, buf_size); +if (tmp ==NULL ) goto out_free; + buf = tmp; + } +fseek (fp, elf32 ? hdrs.phdr32[i].p_offset : hdrs.phdr64[i].p_offset,SEEK_SET ); +if (fread (buf, p_filesz,1 , fp) !=1 ) + goto out_free; - ret =read_build_id (buf, phdr->p_filesz, bid, need_swap); -if (ret ==0 ) { - ret = bid->size; -break ; - } + ret =read_build_id (buf, p_filesz, bid, need_swap); +if (ret ==0 ) { + ret = bid->size; +break ; } } out_free:free (buf); +free (phdr); out:fclose (fp);return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 469/780 s390/uv: Dont return 0 from make_hva_secure() if the operation was not successful
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit 3ec8a8330a1aa846dffbf1d64479213366c55b54 ]
If s390_wiggle_split_folio() returns 0 because splitting a large folio succeeded, we will return 0 from make_hva_secure() even though a retry is required. Return -EAGAIN in that case.
Otherwise, we'll return 0 from gmap_make_secure(), and consequently from unpack_one(). In kvm_s390_pv_unpack(), we assume that unpacking succeeded and skip unpacking this page. Later on, we run into issues and fail booting the VM.
So far, this issue was only observed with follow-up patches where we split large pagecache XFS folios. Maybe it can also be triggered with shmem?
We'll cleanup s390_wiggle_split_folio() a bit next, to also return 0 if no split was required.
Message-ID: <[email protected]>
Stable-dep-of: ab73b29efd36 ("s390/uv: Improve splitting of large folios that cannot be split while dirty")
--- arch/s390/kernel/uv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/s390/kernel/uv.c +4 -1
@@ -393,8 +393,11 @@ int make_hva_secure(struct mm_struct *mm, unsigned long hva, struct uv_cb_headerfolio_walk_end (&fw, vma);mmap_read_unlock (mm); -if (rc == -E2BIG || rc == -EBUSY ) +if (rc == -E2BIG || rc == -EBUSY ) { rc =s390_wiggle_split_folio (mm, folio, rc == -E2BIG ); +if (!rc) + rc = -EAGAIN ; + }folio_put (folio);return rc;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 470/780 s390/uv: Always return 0 from s390_wiggle_split_folio() if successful
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit bd428b8c79ed8e8658570e70c62c0092500e2eac ]
Let's consistently return 0 if the operation was successful, and just detect ourselves whether splitting is required -- folio_test_large() is a cheap operation.
Update the documentation.
Should we simply always return -EAGAIN instead of 0, so we don't have to handle it in the caller? Not sure, staring at the documentation, this way looks a bit cleaner.
Message-ID: <[email protected]>
Stable-dep-of: ab73b29efd36 ("s390/uv: Improve splitting of large folios that cannot be split while dirty")
--- arch/s390/kernel/uv.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
arch/s390/kernel/uv.c +12 -10
@@ -324,34 +324,36 @@ static int make_folio_secure(struct mm_struct *mm, struct folio *folio, struct u }/** -* s390_wiggle_split_folio() - try to drain extra references to a folio and optionally split. +* s390_wiggle_split_folio() - try to drain extra references to a folio and +* split the folio if it is large. * @mm: the mm containing the folio to work on * @folio: the folio -* @split: whether to split a large folio * * Context: Must be called while holding an extra reference to the folio; * the mm lock should not be held. -* Return: 0 if the folio was split successfully; -* -EAGAIN if the folio was not split successfully but another attempt -* can be made, or if @split was set to false; -* -EINVAL in case of other errors. See split_folio(). +* Return: 0 if the operation was successful; +* -EAGAIN if splitting the large folio was not successful, +* but another attempt can be made; +* -EINVAL in case of other folio splitting errors. See split_folio(). */ -static int s390_wiggle_split_folio (struct mm_struct *mm,struct folio *folio,bool split) +static int s390_wiggle_split_folio (struct mm_struct *mm,struct folio *folio) {int rc;lockdep_assert_not_held (&mm->mmap_lock);folio_wait_writeback (folio);lru_add_drain_all (); -if (split) { + +if (folio_test_large (folio)) {folio_lock (folio); rc =split_folio (folio);folio_unlock (folio);if (rc != -EBUSY )return rc; +return -EAGAIN ; } -return -EAGAIN ; +return 0 ; }int make_hva_secure (struct mm_struct *mm,unsigned long hva,struct uv_cb_header *uvcb)
@@ -394,7 +396,7 @@ int make_hva_secure(struct mm_struct *mm, unsigned long hva, struct uv_cb_headermmap_read_unlock (mm);if (rc == -E2BIG || rc == -EBUSY ) { - rc =s390_wiggle_split_folio (mm, folio, rc == -E2BIG ); + rc =s390_wiggle_split_folio (mm, folio);if (!rc) rc = -EAGAIN ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 471/780 s390/uv: Improve splitting of large folios that cannot be split while dirty
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit ab73b29efd36f8916c6cc9954e912c4723c9a1b0 ]
Currently, starting a PV VM on an iomap-based filesystem with large folio support, such as XFS, will not work. We'll be stuck in unpack_one()->gmap_make_secure(), because we can't seem to make progress splitting the large folio.
The problem is that we require a writable PTE but a writable PTE under such filesystems will imply a dirty folio.
So whenever we have a writable PTE, we'll have a dirty folio, and dirty iomap folios cannot currently get split, because split_folio()->split_huge_page_to_list_to_order()->filemap_release_folio() will fail in iomap_release_folio().
So we will not make any progress splitting such large folios.
Until dirty folios can be split more reliably, let's manually trigger writeback of the problematic folio using filemap_write_and_wait_range(), and retry the split immediately afterwards exactly once, before looking up the folio again.
Should this logic be part of split_folio()? Likely not; most split users don't have to split so eagerly to make any progress.
For now, this seems to affect xfs, zonefs and erofs, and this patch makes it work again (tested on xfs only).
While this could be considered a fix for commit 6795801366da ("xfs: Support large folios"), commit df2f9708ff1f ("zonefs: enable support for large folios") and commit ce529cc25b18 ("erofs: enable large folios for iomap mode"), before commit eef88fe45ac9 ("s390/uv: Split large folios in gmap_make_secure()"), we did not try splitting large folios at all. So it's all rather part of making SE compatible with file systems that support large folios. But to have some "Fixes:" tag, let's just use eef88fe45ac9.
Not CCing stable, because there are a lot of dependencies, and it simply not working is not critical in stable kernels.
Message-ID: <[email protected]>
--- arch/s390/kernel/uv.c | 66 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-)
arch/s390/kernel/uv.c +60 -6
@@ -15,6 +15,7 @@#include <linux/pagemap.h> #include <linux/swap.h> #include <linux/pagewalk.h> +#include <linux/backing-dev.h> #include <asm/facility.h> #include <asm/sections.h> #include <asm/uv.h>
@@ -338,22 +339,75 @@ static int make_folio_secure(struct mm_struct *mm, struct folio *folio, struct u*/ static int s390_wiggle_split_folio (struct mm_struct *mm,struct folio *folio) { -int rc; +int rc, tried_splits;lockdep_assert_not_held (&mm->mmap_lock);folio_wait_writeback (folio);lru_add_drain_all (); -if (folio_test_large (folio)) { +if (!folio_test_large (folio)) +return 0 ; + +for (tried_splits =0 ; tried_splits <2 ; tried_splits++) { +struct address_space *mapping; +loff_t lstart, lend; +struct inode *inode; +folio_lock (folio); rc =split_folio (folio); +if (rc != -EBUSY ) { +folio_unlock (folio); +return rc; + } + +/* +* Splitting with -EBUSY can fail for various reasons, but we +* have to handle one case explicitly for now: some mappings +* don't allow for splitting dirty folios; writeback will +* mark them clean again, including marking all page table +* entries mapping the folio read-only, to catch future write +* attempts. +* +* While the system should be writing back dirty folios in the +* background, we obtained this folio by looking up a writable +* page table entry. On these problematic mappings, writable +* page table entries imply dirty folios, preventing the +* split in the first place. +* +* To prevent a livelock when trigger writeback manually and +* letting the caller look up the folio again in the page +* table (turning it dirty), immediately try to split again. +* +* This is only a problem for some mappings (e.g., XFS); +* mappings that do not support writeback (e.g., shmem) do not +* apply. +*/ +if (!folio_test_dirty (folio) ||folio_test_anon (folio) || + !folio->mapping || !mapping_can_writeback (folio->mapping)) { +folio_unlock (folio); +break ; + } + +/* +* Ideally, we'd only trigger writeback on this exact folio. But +* there is no easy way to do that, so we'll stabilize the +* mapping while we still hold the folio lock, so we can drop +* the folio lock to trigger writeback on the range currently +* covered by the folio instead. +*/ + mapping = folio->mapping; + lstart =folio_pos (folio); + lend = lstart +folio_size (folio) -1 ; + inode =igrab (mapping->host);folio_unlock (folio); -if (rc != -EBUSY ) -return rc; -return -EAGAIN ; +if (unlikely (!inode)) +break ; + +filemap_write_and_wait_range (mapping, lstart, lend); +iput (mapping->host); } -return 0 ; +return -EAGAIN ; }int make_hva_secure (struct mm_struct *mm,unsigned long hva,struct uv_cb_header *uvcb)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 472/780 perf record: Fix incorrect --user-regs comments
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dapeng Mi <[email protected]>
[ Upstream commit a4a859eb6704a8aa46aa1cec5396c8d41383a26b ]
The comment of "--user-regs" option is not correct, fix it.
"on interrupt," -> "in user space,"
--- tools/perf/builtin-record.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-record.c +1 -1
@@ -3480,7 +3480,7 @@ static struct option __record_options[] = { "sample selected machine registers on interrupt," " use '-I?' to list register names", parse_intr_regs),OPT_CALLBACK_OPTARG (0 ,"user-regs" , &record.opts.sample_user_regs,NULL ,"any register" , -"sample selected machine registers on interrupt," +"sample selected machine registers in user space," " use '--user-regs=?' to list register names" , parse_user_regs),OPT_BOOLEAN (0 ,"running-time" , &record.opts.running_time, "Record running/enabled time of read (:S) events"),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 473/780 perf trace: Always print return value for syscalls returning a pid
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anubhav Shelat <[email protected]>
[ Upstream commit c7a48ea9b919e2fa0e4a1d9938fdb03e9afe276c ]
The syscalls that were consistently observed were set_robust_list and rseq. This is because perf cannot find their child process.
This change ensures that the return value is always printed.
Before:
0.256 ( 0.001 ms): set_robust_list(head: 0x7f09c77dba20, len: 24) =
0.259 ( 0.001 ms): rseq(rseq: 0x7f09c77dc0e0, rseq_len: 32, sig: 1392848979) =
After:
0.270 ( 0.002 ms): set_robust_list(head: 0x7f0bb14a6a20, len: 24) = 0
0.273 ( 0.002 ms): rseq(rseq: 0x7f0bb14a70e0, rseq_len: 32, sig: 1392848979) = 0Committer notes:
As discussed in the thread in the Link: tag below, these two don't return a pid, but for syscalls returning one, we need to print the result and if we manage to find the children in 'perf trace' data structures, then print its name as well.
--- tools/perf/builtin-trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-trace.c +1 -1
@@ -3005,8 +3005,8 @@ errno_print: {else if (sc->fmt->errpid) {struct thread *child =machine__find_thread (trace->host, ret, ret); +fprintf (trace->output,"%ld" , ret);if (child !=NULL ) { -fprintf (trace->output,"%ld" , ret);if (thread__comm_set (child))fprintf (trace->output," (%s)" ,thread__comm_str (child));thread__put (child);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 474/780 nfs: clear SB_RDONLY before getting superblock
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Lingfeng <[email protected]>
[ Upstream commit 8cd9b785943c57a136536250da80ba1eb6f8eb18 ]
As described in the link, commit 52cb7f8f1778 ("nfs: ignore SB_RDONLY when mounting nfs") removed the check for the ro flag when determining whether to share the superblock, which caused issues when mounting different subdirectories under the same export directory via NFSv3. However, this change did not affect NFSv4.
For NFSv3:
1) A single superblock is created for the initial mount.
2) When mounted read-only, this superblock carries the SB_RDONLY flag.
3) Before commit 52cb7f8f1778 ("nfs: ignore SB_RDONLY when mounting nfs"):
Subsequent rw mounts would not share the existing ro superblock due to flag mismatch, creating a new superblock without SB_RDONLY. After the commit:
The SB_RDONLY flag is ignored during superblock comparison, and this leads to sharing the existing superblock even for rw mounts. Ultimately results in write operations being rejected at the VFS layer.
For NFSv4:
1) Multiple superblocks are created and the last one will be kept.
2) The actually used superblock for ro mounts doesn't carry SB_RDONLY flag. Therefore, commit 52cb7f8f1778 doesn't affect NFSv4 mounts.
Clear SB_RDONLY before getting superblock when NFS_MOUNT_UNSHARED is not set to fix it.
--- fs/nfs/super.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/nfs/super.c +9 -0
@@ -1308,8 +1308,17 @@ int nfs_get_tree_common(struct fs_context *fc)if (IS_ERR (server))return PTR_ERR (server); +/* +* When NFS_MOUNT_UNSHARED is not set, NFS forces the sharing of a +* superblock among each filesystem that mounts sub-directories +* belonging to a single exported root path. +* To prevent interference between different filesystems, the +* SB_RDONLY flag should be removed from the superblock. +*/ if (server->flags &NFS_MOUNT_UNSHARED ) compare_super =NULL ; +else + fc->sb_flags &= ~SB_RDONLY ;/* -o noac implies -o sync */ if (server->flags &NFS_MOUNT_NOAC )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 475/780 nfs: ignore SB_RDONLY when remounting nfs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Lingfeng <[email protected]>
[ Upstream commit 80c4de6ab44c14e910117a02f2f8241ffc6ec54a ]
In some scenarios, when mounting NFS, more than one superblock may be created. The final superblock used is the last one created, but only the first superblock carries the ro flag passed from user space. If a ro flag is added to the superblock via remount, it will trigger the issue described in Link[1].
Link[2] attempted to address this by marking the superblock as ro during the initial mount. However, this introduced a new problem in scenarios where multiple mount points share the same superblock:
[root@a ~]# mount /dev/sdb /mnt/sdb
[root@a ~]# echo "/mnt/sdb *(rw,no_root_squash)" > /etc/exports [root@a ~]# echo "/mnt/sdb/test_dir2 *(ro,no_root_squash)" >> /etc/exports [root@a ~]# systemctl restart nfs-server
[root@a ~]# mount -t nfs -o rw 127.0.0.1:/mnt/sdb/test_dir1 /mnt/test_mp1 [root@a ~]# mount | grep nfs4
127.0.0.1:/mnt/sdb/test_dir1 on /mnt/test_mp1 type nfs4 (rw,relatime,... [root@a ~]# mount -t nfs -o ro 127.0.0.1:/mnt/sdb/test_dir2 /mnt/test_mp2 [root@a ~]# mount | grep nfs4
127.0.0.1:/mnt/sdb/test_dir1 on /mnt/test_mp1 type nfs4 (ro,relatime,... 127.0.0.1:/mnt/sdb/test_dir2 on /mnt/test_mp2 type nfs4 (ro,relatime,... [root@a ~]#
When mounting the second NFS, the shared superblock is marked as ro, causing the previous NFS mount to become read-only.
To resolve both issues, the ro flag is no longer applied to the superblock during remount. Instead, the ro flag on the mount is used to control whether the mount point is read-only.
Link[1]: https://lore.kernel.org/all/[email protected]/
Link[2]: https://lore.kernel.org/all/[email protected]/
--- fs/nfs/super.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/nfs/super.c +10 -0
@@ -1051,6 +1051,16 @@ int nfs_reconfigure(struct fs_context *fc)sync_filesystem (sb); +/* +* The SB_RDONLY flag has been removed from the superblock during +* mounts to prevent interference between different filesystems. +* Similarly, it is also necessary to ignore the SB_RDONLY flag +* during reconfiguration; otherwise, it may also result in the +* creation of redundant superblocks when mounting a directory with +* different rw and ro flags multiple times. +*/ + fc->sb_flags_mask &= ~SB_RDONLY ; +/* * Userspace mount programs that send binary options generally send * them populated with default values. We have no way to know which
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 476/780 nfs: fix incorrect handling of large-number NFS errors in nfs4_do_mkdir()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit dd862da61e91123ca745e06c03ba39ce71a929d9 ]
A recent commit introduced nfs4_do_mkdir() which reports an error from nfs4_call_sync() by returning it with ERR_PTR().
This is a problem as nfs4_call_sync() can return negative NFS-specific errors with values larger than MAX_ERRNO (4095). One example is NFS4ERR_DELAY which has value 10008.
This "pointer" gets to PTR_ERR_OR_ZERO() in nfs4_proc_mkdir() which chooses ZERO because it isn't in the range of value errors. Ultimately the pointer is dereferenced.
This patch changes nfs4_do_mkdir() to report the dentry pointer and status separately - pointer as a return value, status in an "int *" parameter.
The same separation is used for _nfs4_proc_mkdir() and the two are combined only in nfs4_proc_mkdir() after the status has passed through nfs4_handle_exception(), which ensures the error code does not exceed MAX_ERRNO.
It also fixes a problem in the even when nfs4_handle_exception() updated the error value, the original 'alias' was still returned.
--- fs/nfs/nfs4proc.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
fs/nfs/nfs4proc.c +20 -12
@@ -5164,13 +5164,15 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_ }static struct dentry *nfs4_do_mkdir (struct inode *dir,struct dentry *dentry, -struct nfs4_createdata *data) +struct nfs4_createdata *data,int *statusp) { -int status =nfs4_call_sync (NFS_SERVER (dir)->client,NFS_SERVER (dir), &data->msg, +struct dentry *ret; + + *statusp =nfs4_call_sync (NFS_SERVER (dir)->client,NFS_SERVER (dir), &data->msg, &data->arg.seq_args, &data->res.seq_res,1 ); -if (status) -return ERR_PTR (status); +if (*statusp) +return NULL ;spin_lock (&dir->i_lock);/* Creating a directory bumps nlink in the parent */
@@ -5179,7 +5181,11 @@ static struct dentry *nfs4_do_mkdir(struct inode *dir, struct dentry *dentry, data->res.fattr->time_start, NFS_INO_INVALID_DATA);spin_unlock (&dir->i_lock); -return nfs_add_or_obtain (dentry, data->res.fh, data->res.fattr); + ret =nfs_add_or_obtain (dentry, data->res.fh, data->res.fattr); +if (!IS_ERR (ret)) +return ret; + *statusp =PTR_ERR (ret); +return NULL ; }static void nfs4_free_createdata (struct nfs4_createdata *data)
@@ -5240,17 +5246,18 @@ static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,static struct dentry *_nfs4_proc_mkdir (struct inode *dir,struct dentry *dentry,struct iattr *sattr, -struct nfs4_label *label) +struct nfs4_label *label,int *statusp) {struct nfs4_createdata *data; -struct dentry *ret =ERR_PTR (-ENOMEM ); +struct dentry *ret =NULL ; + *statusp = -ENOMEM ; data =nfs4_alloc_createdata (dir, &dentry->d_name, sattr,NF4DIR );if (data ==NULL ) goto out; data->arg.label = label; - ret =nfs4_do_mkdir (dir, dentry, data); + ret =nfs4_do_mkdir (dir, dentry, data, statusp);nfs4_free_createdata (data); out:
@@ -5273,11 +5280,12 @@ static struct dentry *nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,if (!(server->attr_bitmask[2 ] &FATTR4_WORD2_MODE_UMASK )) sattr->ia_mode &= ~current_umask ();do { - alias =_nfs4_proc_mkdir (dir, dentry, sattr, label); - err =PTR_ERR_OR_ZERO (alias); + alias =_nfs4_proc_mkdir (dir, dentry, sattr, label, &err);trace_nfs4_mkdir (dir, &dentry->d_name, err); - err =nfs4_handle_exception (NFS_SERVER (dir), err, - &exception); +if (err) + alias =ERR_PTR (nfs4_handle_exception (NFS_SERVER (dir), + err, + &exception)); }while (exception.retry);nfs4_label_release_security (label);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 477/780 nfs_localio: use cmpxchg() to install new nfs_file_localio
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit ed9be317330c7390df7db9e1d046698c02001bd2 ]
Rather than using nfs_uuid.lock to protect installing a new ro_file or rw_file, change to use cmpxchg(). Removing the file already uses xchg() so this improves symmetry and also makes the code a little simpler.
Also remove the optimisation of not taking the lock, and not removing the nfs_file_localio from the linked list, when both ->ro_file and ->rw_file are already NULL. Given that ->nfs_uuid was not NULL, it is extremely unlikely that neither ->ro_file or ->rw_file is NULL so this optimisation can be of little value and it complicates understanding of the code - why can the list_del_init() be skipped?
Finally, move the assignment of NULL to ->nfs_uuid until after the last action on the nfs_file_localio (the list_del_init). As soon as this is NULL a racing nfs_close_local_fh() can bypass all the locking and go on to free the nfs_file_localio, so we must be certain to be finished with it first.
--- fs/nfs/localio.c | 11 +++-------- fs/nfs_common/nfslocalio.c | 39 +++++++++++++++++--------------------- 2 files changed, 20 insertions(+), 30 deletions(-)
fs/nfs/localio.c +3 -8
@@ -280,14 +280,9 @@ nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,return NULL ;rcu_read_lock ();/* try to swap in the pointer */ -spin_lock (&clp->cl_uuid.lock); - nf =rcu_dereference_protected (*pnf,1 ); -if (!nf) { - nf = new; - new =NULL ; -rcu_assign_pointer (*pnf, nf); - } -spin_unlock (&clp->cl_uuid.lock); + nf =unrcu_pointer (cmpxchg (pnf,NULL ,RCU_INITIALIZER (new))); +if (!nf) +swap (nf, new); } nf =nfs_local_file_get (nf);rcu_read_unlock ();
fs/nfs_common/nfslocalio.c +17 -22
@@ -273,8 +273,8 @@ EXPORT_SYMBOL_GPL(nfs_open_local_fh);void nfs_close_local_fh (struct nfs_file_localio *nfl) { -struct nfsd_file *ro_nf =NULL ; -struct nfsd_file *rw_nf =NULL ; +struct nfsd_file *ro_nf; +struct nfsd_file *rw_nf;nfs_uuid_t *nfs_uuid;rcu_read_lock ();
@@ -285,28 +285,23 @@ void nfs_close_local_fh(struct nfs_file_localio *nfl)return ; } - ro_nf =rcu_access_pointer (nfl->ro_file); - rw_nf =rcu_access_pointer (nfl->rw_file); -if (ro_nf || rw_nf) { -spin_lock (&nfs_uuid->lock); -if (ro_nf) - ro_nf =rcu_dereference_protected (xchg (&nfl->ro_file,NULL ),1 ); -if (rw_nf) - rw_nf =rcu_dereference_protected (xchg (&nfl->rw_file,NULL ),1 ); - -/* Remove nfl from nfs_uuid->files list */ -RCU_INIT_POINTER (nfl->nfs_uuid,NULL ); -list_del_init (&nfl->list); -spin_unlock (&nfs_uuid->lock); -rcu_read_unlock (); + ro_nf =unrcu_pointer (xchg (&nfl->ro_file,NULL )); + rw_nf =unrcu_pointer (xchg (&nfl->rw_file,NULL )); -if (ro_nf) -nfs_to_nfsd_file_put_local (ro_nf); -if (rw_nf) -nfs_to_nfsd_file_put_local (rw_nf); -return ; - } +spin_lock (&nfs_uuid->lock); +/* Remove nfl from nfs_uuid->files list */ +list_del_init (&nfl->list); +spin_unlock (&nfs_uuid->lock);rcu_read_unlock (); +/* Now we can allow racing nfs_close_local_fh() to +* skip the locking. +*/ +RCU_INIT_POINTER (nfl->nfs_uuid,NULL ); + +if (ro_nf) +nfs_to_nfsd_file_put_local (ro_nf); +if (rw_nf) +nfs_to_nfsd_file_put_local (rw_nf); }EXPORT_SYMBOL_GPL (nfs_close_local_fh);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 478/780 nfs_localio: always hold nfsd net ref with nfsd_file ref
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit 77e82fb2c6c27c122e785f543ae0062f7783c886 ]
Having separate nfsd_file_put and nfsd_file_put_local in struct nfsd_localio_operations doesn't make much sense. The difference is that nfsd_file_put doesn't drop a reference to the nfs_net which is what keeps nfsd from shutting down.
Currently, if nfsd tries to shutdown it will invalidate the files stored in the list from the nfs_uuid and this will drop all references to the nfsd net that the client holds. But the client could still hold some references to nfsd_files for active IO. So nfsd might think is has completely shut down local IO, but hasn't and has no way to wait for those active IO requests to complete.
So this patch changes nfsd_file_get to nfsd_file_get_local and has it increase the ref count on the nfsd net and it replaces all calls to ->nfsd_put_file to ->nfsd_put_file_local.
It also changes ->nfsd_open_local_fh to return with the refcount on the net elevated precisely when a valid nfsd_file is returned.
This means that whenever the client holds a valid nfsd_file, there will be an associated count on the nfsd net, and so the count can only reach zero when all nfsd_files have been returned.
nfs_local_file_put() is changed to call nfs_to_nfsd_file_put_local() instead of replacing calls to one with calls to the other because this will help a later patch which changes nfs_to_nfsd_file_put_local() to take an __rcu pointer while nfs_local_file_put() doesn't.
--- fs/nfs/localio.c | 4 ++-- fs/nfs_common/nfslocalio.c | 5 ++--- fs/nfsd/filecache.c | 21 +++++++++++++++++++++ fs/nfsd/filecache.h | 1 + fs/nfsd/localio.c | 9 +++++++-- include/linux/nfslocalio.h | 3 +-- 6 files changed, 34 insertions(+), 9 deletions(-)
fs/nfs/localio.c +2 -2
@@ -209,12 +209,12 @@ EXPORT_SYMBOL_GPL(nfs_local_probe_async);static inline struct nfsd_file *nfs_local_file_get (struct nfsd_file *nf) { -return nfs_to->nfsd_file_get (nf); +return nfs_to->nfsd_file_get_local (nf); }static inline void nfs_local_file_put (struct nfsd_file *nf) { - nfs_to->nfsd_file_put (nf); +nfs_to_nfsd_file_put_local (nf); }/*
fs/nfs_common/nfslocalio.c +2 -3
@@ -262,9 +262,8 @@ struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *uuid,/* We have an implied reference to net thanks to nfsd_net_try_get */ localio = nfs_to->nfsd_open_local_fh (net, uuid->dom, rpc_clnt, cred, nfs_fh, fmode); -if (IS_ERR (localio)) -nfs_to_nfsd_net_put (net); -else +nfs_to_nfsd_net_put (net); +if (!IS_ERR (localio))nfs_uuid_add_file (uuid, nfl);return localio;
fs/nfsd/filecache.c +21 -0
@@ -386,6 +386,27 @@ nfsd_file_put_local(struct nfsd_file *nf)return net; } +/** +* nfsd_file_get_local - get nfsd_file reference and reference to net +* @nf: nfsd_file of which to put the reference +* +* Get reference to both the nfsd_file and nf->nf_net. +*/ +struct nfsd_file * +nfsd_file_get_local (struct nfsd_file *nf) +{ +struct net *net = nf->nf_net; + +if (nfsd_net_try_get (net)) { + nf =nfsd_file_get (nf); +if (!nf) +nfsd_net_put (net); + }else { + nf =NULL ; + } +return nf; +} +/** * nfsd_file_file - get the backing file of an nfsd_file * @nf: nfsd_file of which to access the backing file.
fs/nfsd/filecache.h +1 -0
@@ -63,6 +63,7 @@ int nfsd_file_cache_start_net(struct net *net);void nfsd_file_cache_shutdown_net (struct net *net);void nfsd_file_put (struct nfsd_file *nf);struct net *nfsd_file_put_local (struct nfsd_file *nf); +struct nfsd_file *nfsd_file_get_local (struct nfsd_file *nf);struct nfsd_file *nfsd_file_get (struct nfsd_file *nf);struct file *nfsd_file_file (struct nfsd_file *nf);void nfsd_file_close_inode_sync (struct inode *inode);
fs/nfsd/localio.c +7 -2
@@ -29,8 +29,7 @@ static const struct nfsd_localio_operations nfsd_localio_ops = { .nfsd_net_put = nfsd_net_put, .nfsd_open_local_fh = nfsd_open_local_fh, .nfsd_file_put_local = nfsd_file_put_local, - .nfsd_file_get = nfsd_file_get, - .nfsd_file_put = nfsd_file_put, + .nfsd_file_get_local = nfsd_file_get_local, .nfsd_file_file = nfsd_file_file, };
@@ -71,6 +70,9 @@ nfsd_open_local_fh(struct net *net, struct auth_domain *dom,if (nfs_fh->size >NFS4_FHSIZE )return ERR_PTR (-EINVAL ); +if (!nfsd_net_try_get (net)) +return ERR_PTR (-ENXIO ); +/* nfs_fh -> svc_fh */ fh_init (&fh,NFS4_FHSIZE ); fh.fh_handle.fh_size = nfs_fh->size;
@@ -92,6 +94,9 @@ nfsd_open_local_fh(struct net *net, struct auth_domain *dom,if (rq_cred.cr_group_info)put_group_info (rq_cred.cr_group_info); +if (IS_ERR (localio)) +nfsd_net_put (net); +return localio; }EXPORT_SYMBOL_GPL (nfsd_open_local_fh);
include/linux/nfslocalio.h +1 -2
@@ -66,8 +66,7 @@ struct nfsd_localio_operations { const struct nfs_fh *, const fmode_t);struct net *(*nfsd_file_put_local)(struct nfsd_file *); -struct nfsd_file *(*nfsd_file_get)(struct nfsd_file *); -void (*nfsd_file_put)(struct nfsd_file *); +struct nfsd_file *(*nfsd_file_get_local)(struct nfsd_file *);struct file *(*nfsd_file_file)(struct nfsd_file *); }____cacheline_aligned ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 479/780 nfs_localio: simplify interface to nfsd for getting nfsd_file
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit e6f7e1487ab528a6c653bd0d42812ff2942846cd ]
The nfsd_localio_operations structure contains nfsd_file_get() to get a reference to an nfsd_file. This is only used in one place, where nfsd_open_local_fh() is also used.
This patch combines the two, calling nfsd_open_local_fh() passing a pointer to where the nfsd_file pointer might be stored. If there is a pointer there an nfsd_file_get() can get a reference, that reference is returned. If not a new nfsd_file is acquired, stored at the pointer, and returned. When we store a reference we also increase the refcount on the net, as that refcount is decrements when we clear the stored pointer.
We now get an extra reference *before* storing the new nfsd_file at the given location. This avoids possible races with the nfsd_file being freed before the final reference can be taken.
This patch moves the rcu_dereference() needed after fetching from ro_file or rw_file into the nfsd code where the 'struct nfs_file' is fully defined. This avoids an error reported by older versions of gcc such as gcc-8 which complain about rcu_dereference() use in contexts where the structure (which will supposedly be accessed) is not fully defined.
--- fs/nfs/localio.c | 31 ++++-------------- fs/nfs_common/nfslocalio.c | 3 +- fs/nfsd/localio.c | 65 +++++++++++++++++++++++++++----------- 3 files changed, 55 insertions(+), 44 deletions(-)
fs/nfs/localio.c +6 -25
@@ -207,11 +207,6 @@ void nfs_local_probe_async(struct nfs_client *clp) }EXPORT_SYMBOL_GPL (nfs_local_probe_async); -static inline struct nfsd_file *nfs_local_file_get (struct nfsd_file *nf) -{ -return nfs_to->nfsd_file_get_local (nf); -} -static inline void nfs_local_file_put (struct nfsd_file *nf) {nfs_to_nfsd_file_put_local (nf);
@@ -226,12 +221,13 @@ static inline void nfs_local_file_put(struct nfsd_file *nf)static struct nfsd_file *__nfs_local_open_fh (struct nfs_client *clp,const struct cred *cred,struct nfs_fh *fh,struct nfs_file_localio *nfl, +struct nfsd_file __rcu **pnf,const fmode_t mode) {struct nfsd_file *localio; localio =nfs_open_local_fh (&clp->cl_uuid, clp->cl_rpcclient, - cred, fh, nfl, mode); + cred, fh, nfl, pnf, mode);if (IS_ERR (localio)) {int status =PTR_ERR (localio);trace_nfs_local_open_fh (fh, mode, status);
@@ -258,7 +254,7 @@ nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred, struct nfs_fh *fh, struct nfs_file_localio *nfl, const fmode_t mode) { - struct nfsd_file *nf, *new, __rcu **pnf; + struct nfsd_file *nf, __rcu **pnf;if (!nfs_server_is_local (clp))return NULL ;
@@ -270,24 +266,9 @@ nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,else pnf = &nfl->ro_file; - new =NULL ; -rcu_read_lock (); - nf =rcu_dereference (*pnf); -if (!nf) { -rcu_read_unlock (); - new =__nfs_local_open_fh (clp, cred, fh, nfl, mode); -if (IS_ERR (new)) -return NULL ; -rcu_read_lock (); -/* try to swap in the pointer */ - nf =unrcu_pointer (cmpxchg (pnf,NULL ,RCU_INITIALIZER (new))); -if (!nf) -swap (nf, new); - } - nf =nfs_local_file_get (nf); -rcu_read_unlock (); -if (new) -nfs_to_nfsd_file_put_local (new); + nf =__nfs_local_open_fh (clp, cred, fh, nfl, pnf, mode); +if (IS_ERR (nf)) +return NULL ;return nf; }EXPORT_SYMBOL_GPL (nfs_local_open_fh);
fs/nfs_common/nfslocalio.c +2 -1
@@ -237,6 +237,7 @@ static void nfs_uuid_add_file(nfs_uuid_t *nfs_uuid, struct nfs_file_localio *nflstruct nfsd_file *nfs_open_local_fh (nfs_uuid_t *uuid,struct rpc_clnt *rpc_clnt,const struct cred *cred,const struct nfs_fh *nfs_fh,struct nfs_file_localio *nfl, +struct nfsd_file __rcu **pnf,const fmode_t fmode) {struct net *net;
@@ -261,7 +262,7 @@ struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *uuid,rcu_read_unlock ();/* We have an implied reference to net thanks to nfsd_net_try_get */ localio = nfs_to->nfsd_open_local_fh (net, uuid->dom, rpc_clnt, - cred, nfs_fh, fmode); + cred, nfs_fh, pnf, fmode);nfs_to_nfsd_net_put (net);if (!IS_ERR (localio))nfs_uuid_add_file (uuid, nfl);
fs/nfsd/localio.c +47 -18
101 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 480/780 nfs_localio: duplicate nfs_close_local_fh()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit 74fc55ab2a6a0c71628fcf3b9783aae7119b5199 ]
nfs_close_local_fh() is called from two different places for quite different use case.
It is called from nfs_uuid_put() when the nfs_uuid is being detached - possibly because the nfs server is not longer serving that filesystem. In this case there will always be an nfs_uuid and so rcu_read_lock() is not needed.
It is also called when the nfs_file_localio is no longer needed. In this case there may not be an active nfs_uuid.
These two can race, and handling the race properly while avoiding excessive locking will require different handling on each side.
This patch prepares the way by opencoding nfs_close_local_fh() into nfs_uuid_put(), then simplifying the code there as befits the context.
--- fs/nfs_common/nfslocalio.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
fs/nfs_common/nfslocalio.c +20 -1
@@ -171,7 +171,26 @@ static bool nfs_uuid_put(nfs_uuid_t *nfs_uuid)/* Walk list of files and ensure their last references dropped */ list_for_each_entry_safe (nfl, tmp, &local_files, list) { -nfs_close_local_fh (nfl); +struct nfsd_file *ro_nf; +struct nfsd_file *rw_nf; + + ro_nf =unrcu_pointer (xchg (&nfl->ro_file,NULL )); + rw_nf =unrcu_pointer (xchg (&nfl->rw_file,NULL )); + +spin_lock (&nfs_uuid->lock); +/* Remove nfl from nfs_uuid->files list */ +list_del_init (&nfl->list); +spin_unlock (&nfs_uuid->lock); +/* Now we can allow racing nfs_close_local_fh() to +* skip the locking. +*/ +RCU_INIT_POINTER (nfl->nfs_uuid,NULL ); + +if (ro_nf) +nfs_to_nfsd_file_put_local (ro_nf); +if (rw_nf) +nfs_to_nfsd_file_put_local (rw_nf); +cond_resched (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 481/780 nfs_localio: protect race between nfs_uuid_put() and nfs_close_local_fh()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit 21fb44034695185f1dcbcb37354c842cabfe83c1 ]
nfs_uuid_put() and nfs_close_local_fh() can race if a "struct nfs_file_localio" is released at the same time that nfsd calls nfs_localio_invalidate_clients().
It is important that neither of these functions completes after the other has started looking at a given nfs_file_localio and before it finishes.
If nfs_uuid_put() exits while nfs_close_local_fh() is closing ro_file and rw_file it could return to __nfd_file_cache_purge() while some files are still referenced so the purge may not succeed.
If nfs_close_local_fh() exits while nfsd_uuid_put() is still closing the files then the "struct nfs_file_localio" could be freed while nfsd_uuid_put() is still looking at it. This side is currently handled by copying the pointers out of ro_file and rw_file before deleting from the list in nfsd_uuid. We need to preserve this while ensuring that nfsd_uuid_put() does wait for nfs_close_local_fh().
This patch use nfl->uuid and nfl->list to provide the required interlock.
nfs_uuid_put() removes the nfs_file_localio from the list, then drops locks and puts the two files, then reclaims the spinlock and sets ->nfs_uuid to NULL.
nfs_close_local_fh() operates in the reverse order, setting ->nfs_uuid to NULL, then closing the files, then unlinking from the list.
If nfs_uuid_put() finds that ->nfs_uuid is already NULL, it waits for the nfs_file_localio to be removed from the list. If nfs_close_local_fh() find that it has already been unlinked it waits for ->nfs_uuid to become NULL. This ensure that one of the two tries to close the files, but they each waits for the other.
As nfs_uuid_put() is making the list empty, change from a list_for_each_safe loop to a while that always takes the first entry. This makes the intent more clear.
Also don't move the list to a temporary local list as this would defeat the guarantees required for the interlock.
--- fs/nfs_common/nfslocalio.c | 81 ++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 25 deletions(-)
fs/nfs_common/nfslocalio.c +56 -25
@@ -151,8 +151,7 @@ EXPORT_SYMBOL_GPL(nfs_localio_enable_client);*/ static bool nfs_uuid_put (nfs_uuid_t *nfs_uuid) { -LIST_HEAD (local_files); -struct nfs_file_localio *nfl, *tmp; +struct nfs_file_localio *nfl;spin_lock (&nfs_uuid->lock);if (unlikely (!rcu_access_pointer (nfs_uuid->net))) {
@@ -166,37 +165,49 @@ static bool nfs_uuid_put(nfs_uuid_t *nfs_uuid) nfs_uuid->dom =NULL ; } -list_splice_init (&nfs_uuid->files, &local_files); -spin_unlock (&nfs_uuid->lock); -/* Walk list of files and ensure their last references dropped */ -list_for_each_entry_safe (nfl, tmp, &local_files, list) { + +while ((nfl =list_first_entry_or_null (&nfs_uuid->files, + struct nfs_file_localio, + list)) !=NULL ) {struct nfsd_file *ro_nf;struct nfsd_file *rw_nf; +/* If nfs_uuid is already NULL, nfs_close_local_fh is +* closing and we must wait, else we unlink and close. +*/ +if (rcu_access_pointer (nfl->nfs_uuid) ==NULL ) { +/* nfs_close_local_fh() is doing the +* close and we must wait. until it unlinks +*/ +wait_var_event_spinlock (nfl, +list_first_entry_or_null ( + &nfs_uuid->files, + struct nfs_file_localio, + list) != nfl, + &nfs_uuid->lock); +continue ; + } + ro_nf =unrcu_pointer (xchg (&nfl->ro_file,NULL )); rw_nf =unrcu_pointer (xchg (&nfl->rw_file,NULL )); -spin_lock (&nfs_uuid->lock);/* Remove nfl from nfs_uuid->files list */ list_del_init (&nfl->list);spin_unlock (&nfs_uuid->lock); -/* Now we can allow racing nfs_close_local_fh() to -* skip the locking. -*/ -RCU_INIT_POINTER (nfl->nfs_uuid,NULL ); -if (ro_nf)nfs_to_nfsd_file_put_local (ro_nf);if (rw_nf)nfs_to_nfsd_file_put_local (rw_nf); -cond_resched (); +spin_lock (&nfs_uuid->lock); +/* Now we can allow racing nfs_close_local_fh() to +* skip the locking. +*/ +RCU_INIT_POINTER (nfl->nfs_uuid,NULL ); +wake_up_var_locked (&nfl->nfs_uuid, &nfs_uuid->lock); } -spin_lock (&nfs_uuid->lock); -BUG_ON (!list_empty (&nfs_uuid->files)); -/* Remove client from nn->local_clients */ if (nfs_uuid->list_lock) {spin_lock (nfs_uuid->list_lock);
@@ -304,23 +315,43 @@ void nfs_close_local_fh(struct nfs_file_localio *nfl)return ; } - ro_nf =unrcu_pointer (xchg (&nfl->ro_file,NULL )); - rw_nf =unrcu_pointer (xchg (&nfl->rw_file,NULL )); -spin_lock (&nfs_uuid->lock); -/* Remove nfl from nfs_uuid->files list */ -list_del_init (&nfl->list); +if (!rcu_access_pointer (nfl->nfs_uuid)) { +/* nfs_uuid_put has finished here */ +spin_unlock (&nfs_uuid->lock); +rcu_read_unlock (); +return ; + } +if (list_empty (&nfs_uuid->files)) { +/* nfs_uuid_put() has started closing files, wait for it +* to finished +*/ +spin_unlock (&nfs_uuid->lock); +rcu_read_unlock (); +wait_var_event (&nfl->nfs_uuid, +rcu_access_pointer (nfl->nfs_uuid) ==NULL ); +return ; + } +/* tell nfs_uuid_put() to wait for us */ +RCU_INIT_POINTER (nfl->nfs_uuid,NULL );spin_unlock (&nfs_uuid->lock);rcu_read_unlock (); -/* Now we can allow racing nfs_close_local_fh() to -* skip the locking. -*/ -RCU_INIT_POINTER (nfl->nfs_uuid,NULL ); + ro_nf =unrcu_pointer (xchg (&nfl->ro_file,NULL )); + rw_nf =unrcu_pointer (xchg (&nfl->rw_file,NULL ));if (ro_nf)nfs_to_nfsd_file_put_local (ro_nf);if (rw_nf)nfs_to_nfsd_file_put_local (rw_nf); + +/* Remove nfl from nfs_uuid->files list and signal nfs_uuid_put() +* that we are done. The moment we drop the spinlock the +* nfs_uuid could be freed. +*/ +spin_lock (&nfs_uuid->lock); +list_del_init (&nfl->list); +wake_up_var_locked (&nfl->nfs_uuid, &nfs_uuid->lock); +spin_unlock (&nfs_uuid->lock); }EXPORT_SYMBOL_GPL (nfs_close_local_fh);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 482/780 nfs_localio: change nfsd_file_put_local() to take a pointer to __rcu pointer
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit c25a89770d1f216dcedfc2d25d56b604f62ce0bd ]
Instead of calling xchg() and unrcu_pointer() before nfsd_file_put_local(), we now pass pointer to the __rcu pointer and call xchg() and unrcu_pointer() inside that function.
Where unrcu_pointer() is currently called the internals of "struct nfsd_file" are not known and that causes older compilers such as gcc-8 to complain.
In some cases we have a __kernel (aka normal) pointer not an __rcu pointer so we need to cast it to __rcu first. This is strictly a weakening so no information is lost. Somewhat surprisingly, this cast is accepted by gcc-8.
This has the pleasing result that the cmpxchg() which sets ro_file and rw_file, and also the xchg() which clears them, are both now in the nfsd code.
--- fs/nfs/localio.c | 11 +++++++++-- fs/nfs_common/nfslocalio.c | 24 ++++++------------------ fs/nfsd/filecache.c | 11 ++++++++--- fs/nfsd/filecache.h | 2 +- include/linux/nfslocalio.h | 23 ++++++++++++----------- 5 files changed, 36 insertions(+), 35 deletions(-)
fs/nfs/localio.c +9 -2
@@ -207,9 +207,16 @@ void nfs_local_probe_async(struct nfs_client *clp) }EXPORT_SYMBOL_GPL (nfs_local_probe_async); -static inline void nfs_local_file_put (struct nfsd_file *nf) +static inline void nfs_local_file_put (struct nfsd_file *localio) { -nfs_to_nfsd_file_put_local (nf); +/* nfs_to_nfsd_file_put_local() expects an __rcu pointer +* but we have a __kernel pointer. It is always safe +* to cast a __kernel pointer to an __rcu pointer +* because the cast only weakens what is known about the pointer. +*/ +struct nfsd_file __rcu *nf = (struct nfsd_file __rcu *) localio; + +nfs_to_nfsd_file_put_local (&nf); }/*
fs/nfs_common/nfslocalio.c +6 -18
@@ -170,9 +170,6 @@ static bool nfs_uuid_put(nfs_uuid_t *nfs_uuid)while ((nfl =list_first_entry_or_null (&nfs_uuid->files, struct nfs_file_localio, list)) !=NULL ) { -struct nfsd_file *ro_nf; -struct nfsd_file *rw_nf; -/* If nfs_uuid is already NULL, nfs_close_local_fh is * closing and we must wait, else we unlink and close. */
@@ -189,17 +186,14 @@ static bool nfs_uuid_put(nfs_uuid_t *nfs_uuid)continue ; } - ro_nf =unrcu_pointer (xchg (&nfl->ro_file,NULL )); - rw_nf =unrcu_pointer (xchg (&nfl->rw_file,NULL )); -/* Remove nfl from nfs_uuid->files list */ list_del_init (&nfl->list);spin_unlock (&nfs_uuid->lock); -if (ro_nf) -nfs_to_nfsd_file_put_local (ro_nf); -if (rw_nf) -nfs_to_nfsd_file_put_local (rw_nf); + +nfs_to_nfsd_file_put_local (&nfl->ro_file); +nfs_to_nfsd_file_put_local (&nfl->rw_file);cond_resched (); +spin_lock (&nfs_uuid->lock);/* Now we can allow racing nfs_close_local_fh() to * skip the locking.
@@ -303,8 +297,6 @@ EXPORT_SYMBOL_GPL(nfs_open_local_fh);void nfs_close_local_fh (struct nfs_file_localio *nfl) { -struct nfsd_file *ro_nf; -struct nfsd_file *rw_nf;nfs_uuid_t *nfs_uuid;rcu_read_lock ();
@@ -337,12 +329,8 @@ void nfs_close_local_fh(struct nfs_file_localio *nfl)spin_unlock (&nfs_uuid->lock);rcu_read_unlock (); - ro_nf =unrcu_pointer (xchg (&nfl->ro_file,NULL )); - rw_nf =unrcu_pointer (xchg (&nfl->rw_file,NULL )); -if (ro_nf) -nfs_to_nfsd_file_put_local (ro_nf); -if (rw_nf) -nfs_to_nfsd_file_put_local (rw_nf); +nfs_to_nfsd_file_put_local (&nfl->ro_file); +nfs_to_nfsd_file_put_local (&nfl->rw_file);/* Remove nfl from nfs_uuid->files list and signal nfs_uuid_put() * that we are done. The moment we drop the spinlock the
fs/nfsd/filecache.c +8 -3
@@ -378,11 +378,16 @@ nfsd_file_put(struct nfsd_file *nf)* the reference of the nfsd_file. */ struct net * -nfsd_file_put_local (struct nfsd_file *nf) +nfsd_file_put_local (struct nfsd_file __rcu **pnf) { -struct net *net = nf->nf_net; +struct nfsd_file *nf; +struct net *net =NULL ; -nfsd_file_put (nf); + nf =unrcu_pointer (xchg (pnf,NULL )); +if (nf) { + net = nf->nf_net; +nfsd_file_put (nf); + }return net; }
fs/nfsd/filecache.h +1 -1
@@ -62,7 +62,7 @@ void nfsd_file_cache_shutdown(void);int nfsd_file_cache_start_net (struct net *net);void nfsd_file_cache_shutdown_net (struct net *net);void nfsd_file_put (struct nfsd_file *nf); -struct net *nfsd_file_put_local (struct nfsd_file *nf); +struct net *nfsd_file_put_local (struct nfsd_file __rcu **nf);struct nfsd_file *nfsd_file_get_local (struct nfsd_file *nf);struct nfsd_file *nfsd_file_get (struct nfsd_file *nf);struct file *nfsd_file_file (struct nfsd_file *nf);
include/linux/nfslocalio.h +12 -11
@@ -50,10 +50,6 @@ void nfs_localio_invalidate_clients(struct list_head *nn_local_clients, spinlock_t *nn_local_clients_lock);/* localio needs to map filehandle -> struct nfsd_file */ -extern struct nfsd_file * -nfsd_open_local_fh (struct net *,struct auth_domain *,struct rpc_clnt *, -const struct cred *,const struct nfs_fh *, -const fmode_t )__must_hold (rcu);void nfs_close_local_fh (struct nfs_file_localio *);struct nfsd_localio_operations {
@@ -64,8 +60,9 @@ struct nfsd_localio_operations { struct rpc_clnt *, const struct cred *, const struct nfs_fh *, +struct nfsd_file __rcu **pnf, const fmode_t); -struct net *(*nfsd_file_put_local)(struct nfsd_file *); +struct net *(*nfsd_file_put_local)(struct nfsd_file __rcu **);struct nfsd_file *(*nfsd_file_get_local)(struct nfsd_file *);struct file *(*nfsd_file_file)(struct nfsd_file *); }____cacheline_aligned ;
@@ -76,6 +73,7 @@ extern const struct nfsd_localio_operations *nfs_to;struct nfsd_file *nfs_open_local_fh (nfs_uuid_t *,struct rpc_clnt *,const struct cred *,const struct nfs_fh *,struct nfs_file_localio *, +struct nfsd_file __rcu **pnf,const fmode_t );static inline void nfs_to_nfsd_net_put (struct net *net)
@@ -90,16 +88,19 @@ static inline void nfs_to_nfsd_net_put(struct net *net) rcu_read_unlock(); } -static inline void nfs_to_nfsd_file_put_local (struct nfsd_file *localio) +static inline void nfs_to_nfsd_file_put_local (struct nfsd_file __rcu **localio) {/* -* Must not hold RCU otherwise nfsd_file_put() can easily trigger: -* "Voluntary context switch within RCU read-side critical section!" -* by scheduling deep in underlying filesystem (e.g. XFS). +* Either *localio must be guaranteed to be non-NULL, or caller +* must prevent nfsd shutdown from completing as nfs_close_local_fh() +* does by blocking the nfs_uuid from being finally put. */ -struct net *net = nfs_to->nfsd_file_put_local (localio); +struct net *net; -nfs_to_nfsd_net_put (net); + net = nfs_to->nfsd_file_put_local (localio); + +if (net) +nfs_to_nfsd_net_put (net); }#else /* CONFIG_NFS_LOCALIO */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 483/780 perf trace: Set errpid to false for rseq and set_robust_list
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anubhav Shelat <[email protected]>
[ Upstream commit 8c56bfe53bd881c7b598c54a3a06216743c57bbc ]
The 'rseq' and 'set_robust_list' syscalls don't return a pid, so set errpid for both to false.
--- tools/perf/builtin-trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/builtin-trace.c +2 -2
@@ -1352,7 +1352,7 @@ static const struct syscall_fmt syscall_fmts[] = { .arg = { [0] = { .scnprintf = SCA_FDAT, /* olddirfd */ }, [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ }, [4] = { .scnprintf = SCA_RENAMEAT2_FLAGS, /* flags */ }, }, }, - { .name = "rseq", .errpid = true, + { .name = "rseq", .arg = { [0] = { .from_user = true /* rseq */, }, }, }, { .name = "rt_sigaction", .arg = { [0] = { .scnprintf = SCA_SIGNUM, /* sig */ }, }, },
@@ -1376,7 +1376,7 @@ static const struct syscall_fmt syscall_fmts[] = { { .name = "sendto", .arg = { [3] = { .scnprintf = SCA_MSG_FLAGS, /* flags */ }, [4] = SCA_SOCKADDR_FROM_USER(addr), }, }, - { .name = "set_robust_list", .errpid = true, + { .name = "set_robust_list", .arg = { [0] = { .from_user = true /* head */, }, }, }, { .name = "set_tid_address", .errpid = true, }, { .name = "setitimer",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 484/780 fs/dax: Fix "dont skip locked entries when scanning entries"
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alistair Popple <[email protected]>
[ Upstream commit dd59137bfe70cf3646021b4721e430213b9c71bd ]
Commit 6be3e21d25ca ("fs/dax: don't skip locked entries when scanning entries") introduced a new function, wait_entry_unlocked_exclusive(), which waits for the current entry to become unlocked without advancing the XArray iterator state.
Waiting for the entry to become unlocked requires dropping the XArray lock. This requires calling xas_pause() prior to dropping the lock which leaves the xas in a suitable state for the next iteration. However this has the side-effect of advancing the xas state to the next index. Normally this isn't an issue because xas_for_each() contains code to detect this state and thus avoid advancing the index a second time on the next loop iteration.
However both callers of and wait_entry_unlocked_exclusive() itself subsequently use the xas state to reload the entry. As xas_pause() updated the state to the next index this will cause the current entry which is being waited on to be skipped. This caused the following warning to fire intermittently when running xftest generic/068 on an XFS filesystem with FS DAX enabled:
[ 35.067397] ------------[ cut here ]------------ [ 35.068229] WARNING: CPU: 21 PID: 1640 at mm/truncate.c:89 truncate_folio_batch_exceptionals+0xd8/0x1e0 [ 35.069717] Modules linked in: nd_pmem dax_pmem nd_btt nd_e820 libnvdimm [ 35.071006] CPU: 21 UID: 0 PID: 1640 Comm: fstest Not tainted 6.15.0-rc7+ #77 PREEMPT(voluntary) [ 35.072613] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/204 [ 35.074845] RIP: 0010:truncate_folio_batch_exceptionals+0xd8/0x1e0 [ 35.075962] Code: a1 00 00 00 f6 47 0d 20 0f 84 97 00 00 00 4c 63 e8 41 39 c4 7f 0b eb 61 49 83 c5 01 45 39 ec 7e 58 42 f68 [ 35.079522] RSP: 0018:ffffb04e426c7850 EFLAGS: 00010202 [ 35.080359] RAX: 0000000000000000 RBX: ffff9d21e3481908 RCX: ffffb04e426c77f4 [ 35.081477] RDX: ffffb04e426c79e8 RSI: ffffb04e426c79e0 RDI: ffff9d21e34816e8 [ 35.082590] RBP: ffffb04e426c79e0 R08: 0000000000000001 R09: 0000000000000003 [ 35.083733] R10: 0000000000000000 R11: 822b53c0f7a49868 R12: 000000000000001f [ 35.084850] R13: 0000000000000000 R14: ffffb04e426c78e8 R15: fffffffffffffffe [ 35.085953] FS: 00007f9134c87740(0000) GS:ffff9d22abba0000(0000) knlGS:0000000000000000 [ 35.087346] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 35.088244] CR2: 00007f9134c86000 CR3: 000000040afff000 CR4: 00000000000006f0 [ 35.089354] Call Trace: [ 35.089749] <TASK> [ 35.090168] truncate_inode_pages_range+0xfc/0x4d0 [ 35.091078] truncate_pagecache+0x47/0x60 [ 35.091735] xfs_setattr_size+0xc7/0x3e0 [ 35.092648] xfs_vn_setattr+0x1ea/0x270 [ 35.093437] notify_change+0x1f4/0x510 [ 35.094219] ? do_truncate+0x97/0xe0 [ 35.094879] do_truncate+0x97/0xe0 [ 35.095640] path_openat+0xabd/0xca0 [ 35.096278] do_filp_open+0xd7/0x190 [ 35.096860] do_sys_openat2+0x8a/0xe0 [ 35.097459] __x64_sys_openat+0x6d/0xa0 [ 35.098076] do_syscall_64+0xbb/0x1d0 [ 35.098647] entry_SYSCALL_64_after_hwframe+0x77/0x7f [ 35.099444] RIP: 0033:0x7f9134d81fc1 [ 35.100033] Code: 75 57 89 f0 25 00 00 41 00 3d 00 00 41 00 74 49 80 3d 2a 26 0e 00 00 74 6d 89 da 48 89 ee bf 9c ff ff ff5 [ 35.102993] RSP: 002b:00007ffcd41e0d10 EFLAGS: 00000202 ORIG_RAX: 0000000000000101 [ 35.104263] RAX: ffffffffffffffda RBX: 0000000000000242 RCX: 00007f9134d81fc1 [ 35.105452] RDX: 0000000000000242 RSI: 00007ffcd41e1200 RDI: 00000000ffffff9c [ 35.106663] RBP: 00007ffcd41e1200 R08: 0000000000000000 R09: 0000000000000064 [ 35.107923] R10: 00000000000001a4 R11: 0000000000000202 R12: 0000000000000066 [ 35.109112] R13: 0000000000100000 R14: 0000000000100000 R15: 0000000000000400 [ 35.110357] </TASK> [ 35.110769] irq event stamp: 8415587 [ 35.111486] hardirqs last enabled at (8415599): [<ffffffff8d74b562>] __up_console_sem+0x52/0x60 [ 35.113067] hardirqs last disabled at (8415610): [<ffffffff8d74b547>] __up_console_sem+0x37/0x60 [ 35.114575] softirqs last enabled at (8415300): [<ffffffff8d6ac625>] handle_softirqs+0x315/0x3f0 [ 35.115933] softirqs last disabled at (8415291): [<ffffffff8d6ac811>] __irq_exit_rcu+0xa1/0xc0 [ 35.117316] ---[ end trace 0000000000000000 ]---
Fix this by using xas_reset() instead, which is equivalent in implementation to xas_pause() but does not advance the XArray state.
--- fs/dax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/dax.c +1 -1
@@ -257,7 +257,7 @@ static void *wait_entry_unlocked_exclusive(struct xa_state *xas, void *entry) wq =dax_entry_waitqueue (xas, entry, &ewait.key);prepare_to_wait_exclusive (wq, &ewait.wait,TASK_UNINTERRUPTIBLE ); -xas_pause (xas); +xas_reset (xas);xas_unlock_irq (xas);schedule ();finish_wait (wq, &ewait.wait);
Signature · 1 line
2.39.5