6.12.13-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 430/590 PCI: dwc: Always stop link in the dw_pcie_suspend_noirq
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Zhu <[email protected]>
[ Upstream commit 86a016e278b78cc2281edd4ffaddbc011c87a593 ]
On the i.MX8QM, PCIe link can't be re-established again in dw_pcie_resume_noirq(), if the LTSSM_EN bit is not cleared properly in dw_pcie_suspend_noirq().
So, add dw_pcie_stop_link() to dw_pcie_suspend_noirq() to fix this issue and to align the suspend/resume functions since there is dw_pcie_start_link() in dw_pcie_resume_noirq() already.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pcie-designware-host.c +1 -0
@@ -946,6 +946,7 @@ int dw_pcie_suspend_noirq(struct dw_pcie *pci)return ret; } +dw_pcie_stop_link (pci);if (pci->pp.ops->deinit) pci->pp.ops->deinit (&pci->pp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 431/590 PCI: endpoint: pci-epf-test: Set dma_chan_rx pointer to NULL on error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mohamed Khalfella <[email protected]>
[ Upstream commit b1b1f4b12969130c0a6ec0cf0299460cb01e799c ]
If dma_chan_tx allocation fails, set dma_chan_rx to NULL after it is freed.
--- drivers/pci/endpoint/functions/pci-epf-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/endpoint/functions/pci-epf-test.c +1 -1
@@ -251,7 +251,7 @@ static int pci_epf_test_init_dma_chan(struct pci_epf_test *epf_test) fail_back_rx:dma_release_channel (epf_test->dma_chan_rx); - epf_test->dma_chan_tx =NULL ; + epf_test->dma_chan_rx =NULL ; fail_back_tx:dma_cap_zero (mask);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 432/590 PCI: endpoint: pci-epf-test: Fix check for DMA MEMCPY test
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 235c2b197a8de2887f13990094a3343d2392155b ]
Currently, if DMA MEMCPY test is requested by the host, and if the endpoint DMA controller supports DMA_PRIVATE, the test will fail. This is not correct since there is no check for DMA_MEMCPY capability and the DMA controller can support both DMA_PRIVATE and DMA_MEMCPY.
Fix the check and also reword the error message.
--- drivers/pci/endpoint/functions/pci-epf-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/endpoint/functions/pci-epf-test.c +2 -2
@@ -361,8 +361,8 @@ static void pci_epf_test_copy(struct pci_epf_test *epf_test,ktime_get_ts64 (&start);if (reg->flags &FLAG_USE_DMA ) { -if (epf_test->dma_private) { -dev_err (dev,"Cannot transfer data using DMA\n" ); +if (!dma_has_cap (DMA_MEMCPY , epf_test->dma_chan_tx->device->cap_mask)) { +dev_err (dev,"DMA controller doesn't support MEMCPY\n" ); ret = -EINVAL ; goto err_map_addr; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 433/590 PCI: microchip: Add support for using either Root Port 1 or 2
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Conor Dooley <[email protected]>
[ Upstream commit ac7f53b7e7283fee35ad12de8359f20989a47eb5 ]
The PCI host controller on PolarFire SoC has multiple Root Port instances, each with their own bridge and ctrl address spaces. The original binding has an "apb" register region, and it is expected to be set to the base address of the Root Complex register space. Some defines in the Linux driver were used to compute the addresses of the bridge and ctrl address ranges corresponding to Root Port instance 1. Some customers want to use Root Port instance 2 however, which requires changing the defines in the driver, which is clearly not a portable solution.
The binding has been changed from a single register region to a pair, corresponding to the bridge and ctrl regions respectively, so modify the driver to read these regions directly from the devicetree rather than compute them from the base address of the abp region.
To maintain backwards compatibility with the existing binding, the driver retains code to handle the "abp" reg and computes the base address of the bridge and ctrl regions using the defines if it is present. reg-names has always been a required property, so this is safe to do.
Stable-dep-of: 1390a33b3d04 ("PCI: microchip: Set inbound address translation for coherent or non-coherent mode")
--- .../pci/controller/plda/pcie-microchip-host.c | 126 ++++++++++-------- 1 file changed, 67 insertions(+), 59 deletions(-)
drivers/pci/controller/plda/pcie-microchip-host.c +67 -59
@@ -25,9 +25,6 @@#define MC_PCIE1_BRIDGE_ADDR 0x00008000u#define MC_PCIE1_CTRL_ADDR 0x0000a000u -#define MC_PCIE_BRIDGE_ADDR (MC_PCIE1_BRIDGE_ADDR) -#define MC_PCIE_CTRL_ADDR (MC_PCIE1_CTRL_ADDR) -/* PCIe Controller Phy Regs */ #define SEC_ERROR_EVENT_CNT 0x20#define DED_ERROR_EVENT_CNT 0x24
@@ -128,7 +125,6 @@ [EVENT_LOCAL_ ## x] = { __stringify(x), s }#define PCIE_EVENT (x) \ - .base = MC_PCIE_CTRL_ADDR, \ .offset = PCIE_EVENT_INT, \ .mask_offset = PCIE_EVENT_INT, \ .mask_high = 1, \
@@ -136,7 +132,6 @@ .enb_mask = PCIE_EVENT_INT_ENB_MASK#define SEC_EVENT (x) \ - .base = MC_PCIE_CTRL_ADDR, \ .offset = SEC_ERROR_INT, \ .mask_offset = SEC_ERROR_INT_MASK, \ .mask = SEC_ERROR_INT_ ## x ## _INT, \
@@ -144,7 +139,6 @@ .enb_mask = 0#define DED_EVENT (x) \ - .base = MC_PCIE_CTRL_ADDR, \ .offset = DED_ERROR_INT, \ .mask_offset = DED_ERROR_INT_MASK, \ .mask_high = 1, \
@@ -152,7 +146,6 @@ .enb_mask = 0#define LOCAL_EVENT (x) \ - .base = MC_PCIE_BRIDGE_ADDR, \ .offset = ISTATUS_LOCAL, \ .mask_offset = IMASK_LOCAL, \ .mask_high = 0, \
@@ -179,7 +172,8 @@ struct event_map {struct mc_pcie {struct plda_pcie_rp plda; -void __iomem *axi_base_addr; +void __iomem *bridge_base_addr; +void __iomem *ctrl_base_addr; };struct cause {
@@ -253,7 +247,6 @@ static struct event_map local_status_to_event[] = { }; static struct { - u32 base; u32 offset; u32 mask; u32 shift;
@@ -325,8 +318,7 @@ static inline u32 reg_to_event(u32 reg, struct event_map field)static u32 pcie_events (struct mc_pcie *port) { -void __iomem *ctrl_base_addr = port->axi_base_addr +MC_PCIE_CTRL_ADDR ; -u32 reg =readl_relaxed (ctrl_base_addr +PCIE_EVENT_INT ); +u32 reg =readl_relaxed (port->ctrl_base_addr +PCIE_EVENT_INT );u32 val =0 ;int i;
@@ -338,8 +330,7 @@ static u32 pcie_events(struct mc_pcie *port)static u32 sec_errors (struct mc_pcie *port) { -void __iomem *ctrl_base_addr = port->axi_base_addr +MC_PCIE_CTRL_ADDR ; -u32 reg =readl_relaxed (ctrl_base_addr +SEC_ERROR_INT ); +u32 reg =readl_relaxed (port->ctrl_base_addr +SEC_ERROR_INT );u32 val =0 ;int i;
@@ -351,8 +342,7 @@ static u32 sec_errors(struct mc_pcie *port)static u32 ded_errors (struct mc_pcie *port) { -void __iomem *ctrl_base_addr = port->axi_base_addr +MC_PCIE_CTRL_ADDR ; -u32 reg =readl_relaxed (ctrl_base_addr +DED_ERROR_INT ); +u32 reg =readl_relaxed (port->ctrl_base_addr +DED_ERROR_INT );u32 val =0 ;int i;
@@ -364,8 +354,7 @@ static u32 ded_errors(struct mc_pcie *port)static u32 local_events (struct mc_pcie *port) { -void __iomem *bridge_base_addr = port->axi_base_addr +MC_PCIE_BRIDGE_ADDR ; -u32 reg =readl_relaxed (bridge_base_addr +ISTATUS_LOCAL ); +u32 reg =readl_relaxed (port->bridge_base_addr +ISTATUS_LOCAL );u32 val =0 ;int i;
@@ -412,8 +401,12 @@ static void mc_ack_event_irq(struct irq_data *data)void __iomem *addr;u32 mask; - addr = mc_port->axi_base_addr + event_descs[event].base + - event_descs[event].offset; +if (event_descs[event].offset ==ISTATUS_LOCAL ) + addr = mc_port->bridge_base_addr; +else + addr = mc_port->ctrl_base_addr; + + addr += event_descs[event].offset; mask = event_descs[event].mask; mask |= event_descs[event].enb_mask;
@@ -429,8 +422,12 @@ static void mc_mask_event_irq(struct irq_data *data)u32 mask;u32 val; - addr = mc_port->axi_base_addr + event_descs[event].base + - event_descs[event].mask_offset; +if (event_descs[event].offset ==ISTATUS_LOCAL ) + addr = mc_port->bridge_base_addr; +else + addr = mc_port->ctrl_base_addr; + + addr += event_descs[event].mask_offset; mask = event_descs[event].mask;if (event_descs[event].enb_mask) { mask <<=PCIE_EVENT_INT_ENB_SHIFT ;
@@ -460,8 +457,12 @@ static void mc_unmask_event_irq(struct irq_data *data)u32 mask;u32 val; - addr = mc_port->axi_base_addr + event_descs[event].base + - event_descs[event].mask_offset; +if (event_descs[event].offset ==ISTATUS_LOCAL ) + addr = mc_port->bridge_base_addr; +else + addr = mc_port->ctrl_base_addr; + + addr += event_descs[event].mask_offset; mask = event_descs[event].mask;if (event_descs[event].enb_mask)
@@ -554,26 +555,20 @@ static const struct plda_event mc_event = {static inline void mc_clear_secs (struct mc_pcie *port) { -void __iomem *ctrl_base_addr = port->axi_base_addr +MC_PCIE_CTRL_ADDR ; - -writel_relaxed (SEC_ERROR_INT_ALL_RAM_SEC_ERR_INT , ctrl_base_addr + -SEC_ERROR_INT ); -writel_relaxed (0 , ctrl_base_addr +SEC_ERROR_EVENT_CNT ); +writel_relaxed (SEC_ERROR_INT_ALL_RAM_SEC_ERR_INT , + port->ctrl_base_addr +SEC_ERROR_INT ); +writel_relaxed (0 , port->ctrl_base_addr +SEC_ERROR_EVENT_CNT ); }static inline void mc_clear_deds (struct mc_pcie *port) { -void __iomem *ctrl_base_addr = port->axi_base_addr +MC_PCIE_CTRL_ADDR ; - -writel_relaxed (DED_ERROR_INT_ALL_RAM_DED_ERR_INT , ctrl_base_addr + -DED_ERROR_INT ); -writel_relaxed (0 , ctrl_base_addr +DED_ERROR_EVENT_CNT ); +writel_relaxed (DED_ERROR_INT_ALL_RAM_DED_ERR_INT , + port->ctrl_base_addr +DED_ERROR_INT ); +writel_relaxed (0 , port->ctrl_base_addr +DED_ERROR_EVENT_CNT ); }static void mc_disable_interrupts (struct mc_pcie *port) { -void __iomem *bridge_base_addr = port->axi_base_addr +MC_PCIE_BRIDGE_ADDR ; -void __iomem *ctrl_base_addr = port->axi_base_addr +MC_PCIE_CTRL_ADDR ;u32 val;/* Ensure ECC bypass is enabled */
@@ -581,22 +576,22 @@ static void mc_disable_interrupts(struct mc_pcie *port)ECC_CONTROL_RX_RAM_ECC_BYPASS |ECC_CONTROL_PCIE2AXI_RAM_ECC_BYPASS |ECC_CONTROL_AXI2PCIE_RAM_ECC_BYPASS ; -writel_relaxed (val, ctrl_base_addr +ECC_CONTROL ); +writel_relaxed (val, port->ctrl_base_addr +ECC_CONTROL );/* Disable SEC errors and clear any outstanding */ -writel_relaxed (SEC_ERROR_INT_ALL_RAM_SEC_ERR_INT , ctrl_base_addr + -SEC_ERROR_INT_MASK ); +writel_relaxed (SEC_ERROR_INT_ALL_RAM_SEC_ERR_INT , + port->ctrl_base_addr +SEC_ERROR_INT_MASK );mc_clear_secs (port);/* Disable DED errors and clear any outstanding */ -writel_relaxed (DED_ERROR_INT_ALL_RAM_DED_ERR_INT , ctrl_base_addr + -DED_ERROR_INT_MASK ); +writel_relaxed (DED_ERROR_INT_ALL_RAM_DED_ERR_INT , + port->ctrl_base_addr +DED_ERROR_INT_MASK );mc_clear_deds (port);/* Disable local interrupts and clear any outstanding */ -writel_relaxed (0 , bridge_base_addr +IMASK_LOCAL ); -writel_relaxed (GENMASK (31 ,0 ), bridge_base_addr +ISTATUS_LOCAL ); -writel_relaxed (GENMASK (31 ,0 ), bridge_base_addr +ISTATUS_MSI ); +writel_relaxed (0 , port->bridge_base_addr +IMASK_LOCAL ); +writel_relaxed (GENMASK (31 ,0 ), port->bridge_base_addr +ISTATUS_LOCAL ); +writel_relaxed (GENMASK (31 ,0 ), port->bridge_base_addr +ISTATUS_MSI );/* Disable PCIe events and clear any outstanding */ val = PCIE_EVENT_INT_L2_EXIT_INT |
@@ -605,11 +600,11 @@ static void mc_disable_interrupts(struct mc_pcie *port)PCIE_EVENT_INT_L2_EXIT_INT_MASK |PCIE_EVENT_INT_HOTRST_EXIT_INT_MASK |PCIE_EVENT_INT_DLUP_EXIT_INT_MASK ; -writel_relaxed (val, ctrl_base_addr +PCIE_EVENT_INT ); +writel_relaxed (val, port->ctrl_base_addr +PCIE_EVENT_INT );/* Disable host interrupts and clear any outstanding */ -writel_relaxed (0 , bridge_base_addr +IMASK_HOST ); -writel_relaxed (GENMASK (31 ,0 ), bridge_base_addr +ISTATUS_HOST ); +writel_relaxed (0 , port->bridge_base_addr +IMASK_HOST ); +writel_relaxed (GENMASK (31 ,0 ), port->bridge_base_addr +ISTATUS_HOST ); }static int mc_platform_init (struct pci_config_window *cfg)
@@ -617,12 +612,10 @@ static int mc_platform_init(struct pci_config_window *cfg)struct device *dev = cfg->parent;struct platform_device *pdev =to_platform_device (dev);struct pci_host_bridge *bridge =platform_get_drvdata (pdev); -void __iomem *bridge_base_addr = - port->axi_base_addr +MC_PCIE_BRIDGE_ADDR ;int ret;/* Configure address translation table 0 for PCIe config space */ -plda_pcie_setup_window (bridge_base_addr,0 , cfg->res.start, +plda_pcie_setup_window (port->bridge_base_addr,0 , cfg->res.start, cfg->res.start,resource_size (&cfg->res));
@@ -649,7 +642,7 @@ static int mc_platform_init(struct pci_config_window *cfg)static int mc_host_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; -void __iomem *bridge_base_addr; +void __iomem *apb_base_addr;struct plda_pcie_rp *plda;int ret;u32 val;
@@ -661,30 +654,45 @@ static int mc_host_probe(struct platform_device *pdev) plda = &port->plda; plda->dev = dev; - port->axi_base_addr =devm_platform_ioremap_resource (pdev,1 ); -if (IS_ERR (port->axi_base_addr)) -return PTR_ERR (port->axi_base_addr); + port->bridge_base_addr =devm_platform_ioremap_resource_byname (pdev, +"bridge" ); + port->ctrl_base_addr =devm_platform_ioremap_resource_byname (pdev, +"ctrl" ); +if (!IS_ERR (port->bridge_base_addr) && !IS_ERR (port->ctrl_base_addr)) + goto addrs_set; + +/* +* The original, incorrect, binding that lumped the control and +* bridge addresses together still needs to be handled by the driver. +*/ + apb_base_addr =devm_platform_ioremap_resource_byname (pdev,"apb" ); +if (IS_ERR (apb_base_addr)) +return dev_err_probe (dev,PTR_ERR (apb_base_addr), +"both legacy apb register and ctrl/bridge regions missing" ); + + port->bridge_base_addr = apb_base_addr +MC_PCIE1_BRIDGE_ADDR ; + port->ctrl_base_addr = apb_base_addr +MC_PCIE1_CTRL_ADDR ; +addrs_set:mc_disable_interrupts (port); - bridge_base_addr = port->axi_base_addr +MC_PCIE_BRIDGE_ADDR ; - plda->bridge_addr = bridge_base_addr; + plda->bridge_addr = port->bridge_base_addr; plda->num_events =NUM_EVENTS ;/* Allow enabling MSI by disabling MSI-X */ - val =readl (bridge_base_addr +PCIE_PCI_IRQ_DW0 ); + val =readl (port->bridge_base_addr +PCIE_PCI_IRQ_DW0 ); val &= ~MSIX_CAP_MASK ; -writel (val, bridge_base_addr +PCIE_PCI_IRQ_DW0 ); +writel (val, port->bridge_base_addr +PCIE_PCI_IRQ_DW0 );/* Pick num vectors from bitfile programmed onto FPGA fabric */ - val =readl (bridge_base_addr +PCIE_PCI_IRQ_DW0 ); + val =readl (port->bridge_base_addr +PCIE_PCI_IRQ_DW0 ); val &=NUM_MSI_MSGS_MASK ; val >>=NUM_MSI_MSGS_SHIFT ; plda->msi.num_vectors =1 << val;/* Pick vector address from design */ - plda->msi.vector_phy =readl_relaxed (bridge_base_addr +IMSI_ADDR ); + plda->msi.vector_phy =readl_relaxed (port->bridge_base_addr +IMSI_ADDR ); ret =mc_pcie_init_clks (dev);if (ret) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 434/590 PCI: microchip: Set inbound address translation for coherent or non-coherent mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daire McNamara <[email protected]>
[ Upstream commit 1390a33b3d04fdf6ba4e3e7082107a12027fc188 ]
On Microchip PolarFire SoC the PCIe Root Port can be behind one of three general purpose Fabric Interface Controller (FIC) buses that encapsulates an AXI-S bus. Depending on which FIC(s) the Root Port is connected through to CPU space, and what address translation is done by that FIC, the Root Port driver's inbound address translation may vary.
For all current supported designs and all future expected designs, inbound address translation done by a FIC on PolarFire SoC varies depending on whether PolarFire SoC is operating in coherent DMA mode or noncoherent DMA mode.
The setup of the outbound address translation tables in the Root Port driver only needs to handle these two cases.
Setup the inbound address translation tables to one of two address translations, depending on whether the Root Port is being used with coherent DMA or noncoherent DMA.
[bhelgaas: adapt for ac7f53b7e728 ("PCI: microchip: Add support for using either Root Port 1 or 2")]
--- .../pci/controller/plda/pcie-microchip-host.c | 96 +++++++++++++++++++ drivers/pci/controller/plda/pcie-plda-host.c | 17 +++- drivers/pci/controller/plda/pcie-plda.h | 6 +- 3 files changed, 114 insertions(+), 5 deletions(-)
drivers/pci/controller/plda/pcie-microchip-host.c +96 -0
@@ -7,20 +7,27 @@* Author: Daire McNamara <[email protected]> */ +#include <linux/align.h> +#include <linux/bits.h> #include <linux/bitfield.h> #include <linux/clk.h> #include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h> +#include <linux/log2.h> #include <linux/module.h> #include <linux/msi.h> #include <linux/of_address.h> #include <linux/of_pci.h> #include <linux/pci-ecam.h> #include <linux/platform_device.h> +#include <linux/wordpart.h> #include "../../pci.h" #include "pcie-plda.h" +#define MC_MAX_NUM_INBOUND_WINDOWS 8 +#define MPFS_NC_BOUNCE_ADDR 0x80000000 +/* PCIe Bridge Phy and Controller Phy offsets */ #define MC_PCIE1_BRIDGE_ADDR 0x00008000u#define MC_PCIE1_CTRL_ADDR 0x0000a000u
@@ -607,6 +614,91 @@ static void mc_disable_interrupts(struct mc_pcie *port)writel_relaxed (GENMASK (31 ,0 ), port->bridge_base_addr +ISTATUS_HOST ); } +static void mc_pcie_setup_inbound_atr (struct mc_pcie *port,int window_index, +u64 axi_addr,u64 pcie_addr,u64 size) +{ +u32 table_offset = window_index *ATR_ENTRY_SIZE ; +void __iomem *table_addr = port->bridge_base_addr + table_offset; +u32 atr_sz; +u32 val; + + atr_sz =ilog2 (size) -1 ; + + val =ALIGN_DOWN (lower_32_bits (pcie_addr),SZ_4K ); + val |=FIELD_PREP (ATR_SIZE_MASK , atr_sz); + val |=ATR_IMPL_ENABLE ; + +writel (val, table_addr +ATR0_PCIE_WIN0_SRCADDR_PARAM ); + +writel (upper_32_bits (pcie_addr), table_addr +ATR0_PCIE_WIN0_SRC_ADDR ); + +writel (lower_32_bits (axi_addr), table_addr +ATR0_PCIE_WIN0_TRSL_ADDR_LSB ); +writel (upper_32_bits (axi_addr), table_addr +ATR0_PCIE_WIN0_TRSL_ADDR_UDW ); + +writel (TRSL_ID_AXI4_MASTER_0 , table_addr +ATR0_PCIE_WIN0_TRSL_PARAM ); +} + +static int mc_pcie_setup_inbound_ranges (struct platform_device *pdev, +struct mc_pcie *port) +{ +struct device *dev = &pdev->dev; +struct device_node *dn = dev->of_node; +struct of_range_parser parser; +struct of_range range; +int atr_index =0 ; + +/* +* MPFS PCIe Root Port is 32-bit only, behind a Fabric Interface +* Controller FPGA logic block which contains the AXI-S interface. +* +* From the point of view of the PCIe Root Port, there are only two +* supported Root Port configurations: +* +* Configuration 1: for use with fully coherent designs; supports a +* window from 0x0 (CPU space) to specified PCIe space. +* +* Configuration 2: for use with non-coherent designs; supports two +* 1 GB windows to CPU space; one mapping CPU space 0 to PCIe space +* 0x80000000 and a second mapping CPU space 0x40000000 to PCIe +* space 0xc0000000. This cfg needs two windows because of how the +* MSI space is allocated in the AXI-S range on MPFS. +* +* The FIC interface outside the PCIe block *must* complete the +* inbound address translation as per MCHP MPFS FPGA design +* guidelines. +*/ +if (device_property_read_bool (dev,"dma-noncoherent" )) { +/* +* Always need same two tables in this case. Need two tables +* due to hardware interactions between address and size. +*/ +mc_pcie_setup_inbound_atr (port,0 ,0 , +MPFS_NC_BOUNCE_ADDR ,SZ_1G ); +mc_pcie_setup_inbound_atr (port,1 ,SZ_1G , +MPFS_NC_BOUNCE_ADDR +SZ_1G ,SZ_1G ); + }else { +/* Find any DMA ranges */ +if (of_pci_dma_range_parser_init (&parser, dn)) { +/* No DMA range property - setup default */ +mc_pcie_setup_inbound_atr (port,0 ,0 ,0 ,SZ_4G ); +return 0 ; + } + +for_each_of_range (&parser, &range) { +if (atr_index >=MC_MAX_NUM_INBOUND_WINDOWS ) { +dev_err (dev,"too many inbound ranges; %d available tables\n" , +MC_MAX_NUM_INBOUND_WINDOWS ); +return -EINVAL ; + } +mc_pcie_setup_inbound_atr (port, atr_index,0 , + range.pci_addr, range.size); + atr_index++; + } + } + +return 0 ; +} +static int mc_platform_init (struct pci_config_window *cfg) {struct device *dev = cfg->parent;
@@ -627,6 +719,10 @@ static int mc_platform_init(struct pci_config_window *cfg)if (ret)return ret; + ret =mc_pcie_setup_inbound_ranges (pdev, port); +if (ret) +return ret; + port->plda.event_ops = &mc_event_ops; port->plda.event_irq_chip = &mc_event_irq_chip; port->plda.events_bitmap =GENMASK (NUM_EVENTS -1 ,0 );
drivers/pci/controller/plda/pcie-plda-host.c +14 -3
@@ -8,11 +8,14 @@* Author: Daire McNamara <[email protected]> */ +#include <linux/align.h> +#include <linux/bitfield.h> #include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h> #include <linux/msi.h> #include <linux/pci_regs.h> #include <linux/pci-ecam.h> +#include <linux/wordpart.h> #include "pcie-plda.h"
@@ -502,8 +505,9 @@ void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,writel (val, bridge_base_addr + (index *ATR_ENTRY_SIZE ) +ATR0_AXI4_SLV0_TRSL_PARAM ); - val =lower_32_bits (axi_addr) | (atr_sz <<ATR_SIZE_SHIFT ) | -ATR_IMPL_ENABLE ; + val =ALIGN_DOWN (lower_32_bits (axi_addr),SZ_4K ); + val |=FIELD_PREP (ATR_SIZE_MASK , atr_sz); + val |=ATR_IMPL_ENABLE ;writel (val, bridge_base_addr + (index *ATR_ENTRY_SIZE ) +ATR0_AXI4_SLV0_SRCADDR_PARAM );
@@ -518,13 +522,20 @@ void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index, val =upper_32_bits (pci_addr);writel (val, bridge_base_addr + (index *ATR_ENTRY_SIZE ) +ATR0_AXI4_SLV0_TRSL_ADDR_UDW ); +} +EXPORT_SYMBOL_GPL (plda_pcie_setup_window); + +void plda_pcie_setup_inbound_address_translation (struct plda_pcie_rp *port) +{ +void __iomem *bridge_base_addr = port->bridge_addr; +u32 val; val =readl (bridge_base_addr +ATR0_PCIE_WIN0_SRCADDR_PARAM ); val |= (ATR0_PCIE_ATR_SIZE <<ATR0_PCIE_ATR_SIZE_SHIFT );writel (val, bridge_base_addr +ATR0_PCIE_WIN0_SRCADDR_PARAM );writel (0 , bridge_base_addr +ATR0_PCIE_WIN0_SRC_ADDR ); } -EXPORT_SYMBOL_GPL (plda_pcie_setup_window); +EXPORT_SYMBOL_GPL (plda_pcie_setup_inbound_address_translation);int plda_pcie_setup_iomems (struct pci_host_bridge *bridge,struct plda_pcie_rp *port)
drivers/pci/controller/plda/pcie-plda.h +4 -2
@@ -89,14 +89,15 @@/* PCIe AXI slave table init defines */ #define ATR0_AXI4_SLV0_SRCADDR_PARAM 0x800u -#define ATR_SIZE_SHIFT 1 -#define ATR_IMPL_ENABLE 1 +#define ATR_SIZE_MASK GENMASK(6, 1) +#define ATR_IMPL_ENABLE BIT(0)#define ATR0_AXI4_SLV0_SRC_ADDR 0x804u#define ATR0_AXI4_SLV0_TRSL_ADDR_LSB 0x808u#define ATR0_AXI4_SLV0_TRSL_ADDR_UDW 0x80cu#define ATR0_AXI4_SLV0_TRSL_PARAM 0x810u#define PCIE_TX_RX_INTERFACE 0x00000000u#define PCIE_CONFIG_INTERFACE 0x00000001u +#define TRSL_ID_AXI4_MASTER_0 0x00000004u#define CONFIG_SPACE_ADDR_OFFSET 0x1000u
@@ -204,6 +205,7 @@ int plda_init_interrupts(struct platform_device *pdev,void plda_pcie_setup_window (void __iomem *bridge_base_addr,u32 index,phys_addr_t axi_addr,phys_addr_t pci_addr,size_t size); +void plda_pcie_setup_inbound_address_translation (struct plda_pcie_rp *port);int plda_pcie_setup_iomems (struct pci_host_bridge *bridge,struct plda_pcie_rp *port); int plda_pcie_host_init(struct plda_pcie_rp *port, struct pci_ops *ops,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 435/590 scsi: mpt3sas: Set ioc->manu_pg11.EEDPTagMode directly to 1
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Menzel <[email protected]>
[ Upstream commit ad7c3c0cb8f61d6d5a48b83e62ca4a9fd2f26153 ]
Currently, the code does:
if (x == 0) {
x &= ~0x3;
x |= 0x1;
}Zeroing bits 0 and 1 of a variable that is 0 is not necessary. So directly set the variable to 1.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +1 -2
@@ -5629,8 +5629,7 @@ _base_static_config_pages(struct MPT3SAS_ADAPTER *ioc)if (!ioc->is_gen35_ioc && ioc->manu_pg11.EEDPTagMode ==0 ) {pr_err ("%s: overriding NVDATA EEDPTagMode setting\n" , ioc->name); - ioc->manu_pg11.EEDPTagMode &= ~0x3 ; - ioc->manu_pg11.EEDPTagMode |=0x1 ; + ioc->manu_pg11.EEDPTagMode =0x1 ;mpt3sas_config_set_manufacturing_pg11 (ioc, &mpi_reply, &ioc->manu_pg11); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 436/590 scsi: ufs: bsg: Delete bsg_dev when setting up bsg fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guixin Liu <[email protected]>
[ Upstream commit fcf247deb3c3e1c6be5774e3fa03bbd018eff1a9 ]
We should remove the bsg device when bsg_setup_queue() fails to release the resources.
--- drivers/ufs/core/ufs_bsg.c | 1 + 1 file changed, 1 insertion(+)
drivers/ufs/core/ufs_bsg.c +1 -0
@@ -257,6 +257,7 @@ int ufs_bsg_probe(struct ufs_hba *hba) NULL, 0);if (IS_ERR (q)) { ret =PTR_ERR (q); +device_del (bsg_dev); goto out; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 437/590 scsi: mpi3mr: Fix possible crash when setting up bsg fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guixin Liu <[email protected]>
[ Upstream commit 295006f6e8c17212d3098811166e29627d19e05c ]
If bsg_setup_queue() fails, the bsg_queue is assigned a non-NULL value. Consequently, in mpi3mr_bsg_exit(), the condition "if(!mrioc->bsg_queue)" will not be satisfied, preventing execution from entering bsg_remove_queue(), which could lead to the following crash:
BUG: kernel NULL pointer dereference, address: 000000000000041c Call Trace: <TASK> mpi3mr_bsg_exit+0x1f/0x50 [mpi3mr] mpi3mr_remove+0x6f/0x340 [mpi3mr] pci_device_remove+0x3f/0xb0 device_release_driver_internal+0x19d/0x220 unbind_store+0xa4/0xb0 kernfs_fop_write_iter+0x11f/0x200 vfs_write+0x1fc/0x3e0 ksys_write+0x67/0xe0 do_syscall_64+0x38/0x80 entry_SYSCALL_64_after_hwframe+0x78/0xe2
--- drivers/scsi/mpi3mr/mpi3mr_app.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/mpi3mr/mpi3mr_app.c +6 -2
@@ -2951,6 +2951,7 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc) .max_hw_sectors = MPI3MR_MAX_APP_XFER_SECTORS, .max_segments = MPI3MR_MAX_APP_XFER_SEGMENTS, }; +struct request_queue *q;device_initialize (bsg_dev);
@@ -2966,14 +2967,17 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc)return ; } - mrioc->bsg_queue =bsg_setup_queue (bsg_dev,dev_name (bsg_dev), &lim, + q =bsg_setup_queue (bsg_dev,dev_name (bsg_dev), &lim, mpi3mr_bsg_request,NULL ,0 ); -if (IS_ERR (mrioc->bsg_queue)) { +if (IS_ERR (q)) {ioc_err (mrioc,"%s: bsg registration failed\n" ,dev_name (bsg_dev));device_del (bsg_dev);put_device (bsg_dev); +return ; } + + mrioc->bsg_queue = q; }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 438/590 firewire: test: Fix potential null dereference in firewire kunit test
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Han <[email protected]>
[ Upstream commit 352fafe97784e81a10a7c74bd508f71a19b53c2a ]
kunit_kzalloc() may return a NULL pointer, dereferencing it without NULL check may lead to NULL dereference.
Add a NULL check for test_state.
--- drivers/firewire/device-attribute-test.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/firewire/device-attribute-test.c +2 -0
@@ -99,6 +99,7 @@ static void device_attr_simple_avc(struct kunit *test)struct device *unit0_dev = (struct device *)&unit0.device;static const int unit0_expected_ids[] = {0x00ffffff ,0x00ffffff ,0x0000a02d ,0x00010001 };char *buf =kunit_kzalloc (test,PAGE_SIZE ,GFP_KERNEL ); +KUNIT_ASSERT_NOT_ERR_OR_NULL (test, buf);int ids[4 ] = {0 ,0 ,0 ,0 };// Ensure associations for node and unit devices.
@@ -180,6 +181,7 @@ static void device_attr_legacy_avc(struct kunit *test)struct device *unit0_dev = (struct device *)&unit0.device;static const int unit0_expected_ids[] = {0x00012345 ,0x00fedcba ,0x00abcdef ,0x00543210 };char *buf =kunit_kzalloc (test,PAGE_SIZE ,GFP_KERNEL ); +KUNIT_ASSERT_NOT_ERR_OR_NULL (test, buf);int ids[4 ] = {0 ,0 ,0 ,0 };// Ensure associations for node and unit devices.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 439/590 erofs: get rid of erofs_{find,insert}_workgroup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Xiang <[email protected]>
[ Upstream commit b091e8ed24b7965953147a389bac1dc7c3e8a11c ]
Just fold them into the only two callers since
they are simple enough.
Stable-dep-of: db902986dee4 ("erofs: fix potential return value overflow of z_erofs_shrink_scan()")
--- fs/erofs/internal.h | 5 +---- fs/erofs/zdata.c | 38 +++++++++++++++++++++++++--------- fs/erofs/zutil.c | 50 +-------------------------------------------- 3 files changed, 30 insertions(+), 63 deletions(-)
fs/erofs/internal.h +1 -4
@@ -453,10 +453,7 @@ void erofs_release_pages(struct page **pagepool);#ifdef CONFIG_EROFS_FS_ZIP void erofs_workgroup_put (struct erofs_workgroup *grp); -struct erofs_workgroup *erofs_find_workgroup (struct super_block *sb, -pgoff_t index); -struct erofs_workgroup *erofs_insert_workgroup (struct super_block *sb, -struct erofs_workgroup *grp); +bool erofs_workgroup_get (struct erofs_workgroup *grp);void erofs_workgroup_free_rcu (struct erofs_workgroup *grp);void erofs_shrinker_register (struct super_block *sb);void erofs_shrinker_unregister (struct super_block *sb);
fs/erofs/zdata.c +28 -10
@@ -714,9 +714,10 @@ static int z_erofs_register_pcluster(struct z_erofs_decompress_frontend *fe) {struct erofs_map_blocks *map = &fe->map;struct super_block *sb = fe->inode->i_sb; +struct erofs_sb_info *sbi =EROFS_SB (sb);bool ztailpacking = map->m_flags &EROFS_MAP_META ;struct z_erofs_pcluster *pcl; -struct erofs_workgroup *grp; +struct erofs_workgroup *grp, *pre;int err; if (!(map->m_flags & EROFS_MAP_ENCODED) ||
@@ -752,15 +753,23 @@ static int z_erofs_register_pcluster(struct z_erofs_decompress_frontend *fe) pcl->obj.index =0 ;/* which indicates ztailpacking */ }else { pcl->obj.index =erofs_blknr (sb, map->m_pa); - - grp =erofs_insert_workgroup (fe->inode->i_sb, &pcl->obj); -if (IS_ERR (grp)) { - err =PTR_ERR (grp); - goto err_out; +while (1 ) { +xa_lock (&sbi->managed_pslots); + pre =__xa_cmpxchg (&sbi->managed_pslots, grp->index, +NULL , grp,GFP_KERNEL ); +if (!pre ||xa_is_err (pre) ||erofs_workgroup_get (pre)) { +xa_unlock (&sbi->managed_pslots); +break ; + } +/* try to legitimize the current in-tree one */ +xa_unlock (&sbi->managed_pslots); +cond_resched (); } - -if (grp != &pcl->obj) { - fe->pcl =container_of (grp, +if (xa_is_err (pre)) { + err =xa_err (pre); + goto err_out; + }else if (pre) { + fe->pcl =container_of (pre, struct z_erofs_pcluster, obj); err = -EEXIST ; goto err_out;
@@ -789,7 +798,16 @@ static int z_erofs_pcluster_begin(struct z_erofs_decompress_frontend *fe)DBG_BUGON (fe->owned_head ==Z_EROFS_PCLUSTER_NIL );if (!(map->m_flags &EROFS_MAP_META )) { - grp =erofs_find_workgroup (sb, blknr); +while (1 ) { +rcu_read_lock (); + grp =xa_load (&EROFS_SB (sb)->managed_pslots, blknr); +if (!grp ||erofs_workgroup_get (grp)) { +DBG_BUGON (grp && blknr != grp->index); +rcu_read_unlock (); +break ; + } +rcu_read_unlock (); + } }else if ((map->m_pa & ~PAGE_MASK ) + map->m_plen >PAGE_SIZE ) {DBG_BUGON (1 );return -EFSCORRUPTED ;
fs/erofs/zutil.c +1 -49
62 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 440/590 erofs: move erofs_workgroup operations into zdata.c
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Xiang <[email protected]>
[ Upstream commit 9c91f959626e6d9f460b8906e27c37fca1b6456a ]
Move related helpers into zdata.c as an intermediate step of getting rid of struct erofs_workgroup, and rename:
erofs_workgroup_put => z_erofs_put_pcluster erofs_workgroup_get => z_erofs_get_pcluster erofs_try_to_release_workgroup => erofs_try_to_release_pcluster erofs_shrink_workstation => z_erofs_shrink_scan
Stable-dep-of: db902986dee4 ("erofs: fix potential return value overflow of z_erofs_shrink_scan()")
--- fs/erofs/internal.h | 8 ++-- fs/erofs/zdata.c | 102 ++++++++++++++++++++++++++++++++++++++--- fs/erofs/zutil.c | 107 +++----------------------------------------- 3 files changed, 105 insertions(+), 112 deletions(-)
fs/erofs/internal.h +3 -5
@@ -452,17 +452,15 @@ static inline void erofs_pagepool_add(struct page **pagepool, struct page *page)void erofs_release_pages (struct page **pagepool);#ifdef CONFIG_EROFS_FS_ZIP -void erofs_workgroup_put (struct erofs_workgroup *grp); -bool erofs_workgroup_get (struct erofs_workgroup *grp); -void erofs_workgroup_free_rcu (struct erofs_workgroup *grp); +extern atomic_long_t erofs_global_shrink_cnt;void erofs_shrinker_register (struct super_block *sb);void erofs_shrinker_unregister (struct super_block *sb);int __init erofs_init_shrinker (void );void erofs_exit_shrinker (void );int __init z_erofs_init_subsystem (void );void z_erofs_exit_subsystem (void ); -int erofs_try_to_free_all_cached_folios (struct erofs_sb_info *sbi, -struct erofs_workgroup *egrp); +unsigned long z_erofs_shrink_scan (struct erofs_sb_info *sbi, +unsigned long nr_shrink);int z_erofs_map_blocks_iter (struct inode *inode,struct erofs_map_blocks *map,int flags);void *z_erofs_get_gbuf (unsigned int requiredpages);
fs/erofs/zdata.c +95 -7
150 lines not on this page · raw message
fs/erofs/zutil.c +7 -100
140 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 441/590 erofs: sunset `struct erofs_workgroup`
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Xiang <[email protected]>
[ Upstream commit bf1aa03980f4eb1599b866ccd2c4ac577ef56a8a ]
struct erofs_workgroup was introduced to provide a unique header for all physically indexed objects. However, after big pclusters and shared pclusters are implemented upstream, it seems that all EROFS encoded data (which requires transformation) can be represented with struct z_erofs_pcluster directly.
Move all members into struct z_erofs_pcluster for simplicity.
Stable-dep-of: db902986dee4 ("erofs: fix potential return value overflow of z_erofs_shrink_scan()")
--- fs/erofs/internal.h | 6 -- fs/erofs/zdata.c | 131 ++++++++++++++++++++------------------------ 2 files changed, 60 insertions(+), 77 deletions(-)
fs/erofs/internal.h +0 -6
@@ -205,12 +205,6 @@ enum {EROFS_ZIP_CACHE_READAROUND }; -/* basic unit of the workstation of a super_block */ -struct erofs_workgroup { -pgoff_t index; -struct lockref lockref; -}; -enum erofs_kmap_type {EROFS_NO_KMAP ,/* don't map the buffer */ EROFS_KMAP ,/* use kmap_local_page() to map the buffer */
fs/erofs/zdata.c +60 -71
332 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 442/590 erofs: fix potential return value overflow of z_erofs_shrink_scan()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Xiang <[email protected]>
[ Upstream commit db902986dee453bfb5835cbc8efa67154ab34caf ]
z_erofs_shrink_scan() could return small numbers due to the mistyped freed.
Although I don't think it has any visible impact.
--- fs/erofs/zdata.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/erofs/zdata.c +1 -2
@@ -923,8 +923,7 @@ unsigned long z_erofs_shrink_scan(struct erofs_sb_info *sbi, unsigned long nr_shrink) {struct z_erofs_pcluster *pcl; -unsigned int freed =0 ; -unsigned long index; +unsigned long index, freed =0 ;xa_lock (&sbi->managed_pslots);xa_for_each (&sbi->managed_pslots, index, pcl) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 443/590 ocfs2: mark dquot as inactive if failed to start trans while releasing dquot
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Yue <[email protected]>
[ Upstream commit 276c61385f6bc3223a5ecd307cf4aba2dfbb9a31 ]
While running fstests generic/329, the kernel workqueue quota_release_workfn is dead looping in calling ocfs2_release_dquot(). The ocfs2 state is already readonly but ocfs2_release_dquot wants to start a transaction but fails and returns.
=====================================================================
[ 2918.123602 ][ T275 ] On-disk corruption discovered. Please run fsck.ocfs2 once the filesystem is unmounted.
[ 2918.124034 ][ T275 ] (kworker/u135:1,275,11):ocfs2_release_dquot:765
ERROR: status = -30
[ 2918.124452 ][ T275 ] (kworker/u135:1,275,11):ocfs2_release_dquot:795
ERROR: status = -30
[ 2918.124883 ][ T275 ] (kworker/u135:1,275,11):ocfs2_start_trans:357
ERROR: status = -30
[ 2918.125276 ][ T275 ] OCFS2: abort (device dm-0): ocfs2_start_trans:
Detected aborted journal
[ 2918.125710 ][ T275 ] On-disk corruption discovered. Please run fsck.ocfs2 once the filesystem is unmounted.
=====================================================================
ocfs2_release_dquot() is much like dquot_release(), which is called by ext4 to handle similar situation. So here fix it by marking the dquot as inactive like what dquot_release() does.
--- fs/ocfs2/quota_global.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/ocfs2/quota_global.c +5 -0
@@ -761,6 +761,11 @@ static int ocfs2_release_dquot(struct dquot *dquot) handle =ocfs2_start_trans (osb,ocfs2_calc_qdel_credits (dquot->dq_sb, dquot->dq_id.type));if (IS_ERR (handle)) { +/* +* Mark dquot as inactive to avoid endless cycle in +* quota_release_workfn(). +*/ +clear_bit (DQ_ACTIVE_B , &dquot->dq_flags); status =PTR_ERR (handle);mlog_errno (status); goto out_ilock;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 444/590 nilfs2: do not force clear folio if buffer is referenced
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit ca76bb226bf47ff04c782cacbd299f12ddee1ec1 ]
Patch series "nilfs2: protect busy buffer heads from being force-cleared".
This series fixes the buffer head state inconsistency issues reported by syzbot that occurs when the filesystem is corrupted and falls back to read-only, and the associated buffer head use-after-free issue.
This patch (of 2):
Syzbot has reported that after nilfs2 detects filesystem corruption and falls back to read-only, inconsistencies in the buffer state may occur.
One of the inconsistencies is that when nilfs2 calls mark_buffer_dirty() to set a data or metadata buffer as dirty, but it detects that the buffer is not in the uptodate state:
WARNING: CPU: 0 PID: 6049 at fs/buffer.c:1177 mark_buffer_dirty+0x2e5/0x520 fs/buffer.c:1177 ... Call Trace: <TASK> nilfs_palloc_commit_alloc_entry+0x4b/0x160 fs/nilfs2/alloc.c:598 nilfs_ifile_create_inode+0x1dd/0x3a0 fs/nilfs2/ifile.c:73 nilfs_new_inode+0x254/0x830 fs/nilfs2/inode.c:344 nilfs_mkdir+0x10d/0x340 fs/nilfs2/namei.c:218 vfs_mkdir+0x2f9/0x4f0 fs/namei.c:4257 do_mkdirat+0x264/0x3a0 fs/namei.c:4280 __do_sys_mkdirat fs/namei.c:4295 [inline] __se_sys_mkdirat fs/namei.c:4293 [inline] __x64_sys_mkdirat+0x87/0xa0 fs/namei.c:4293 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
The other is when nilfs_btree_propagate(), which propagates the dirty state to the ancestor nodes of a b-tree that point to a dirty buffer, detects that the origin buffer is not dirty, even though it should be:
WARNING: CPU: 0 PID: 5245 at fs/nilfs2/btree.c:2089 nilfs_btree_propagate+0xc79/0xdf0 fs/nilfs2/btree.c:2089 ... Call Trace: <TASK> nilfs_bmap_propagate+0x75/0x120 fs/nilfs2/bmap.c:345 nilfs_collect_file_data+0x4d/0xd0 fs/nilfs2/segment.c:587 nilfs_segctor_apply_buffers+0x184/0x340 fs/nilfs2/segment.c:1006 nilfs_segctor_scan_file+0x28c/0xa50 fs/nilfs2/segment.c:1045 nilfs_segctor_collect_blocks fs/nilfs2/segment.c:1216 [inline] nilfs_segctor_collect fs/nilfs2/segment.c:1540 [inline] nilfs_segctor_do_construct+0x1c28/0x6b90 fs/nilfs2/segment.c:2115 nilfs_segctor_construct+0x181/0x6b0 fs/nilfs2/segment.c:2479 nilfs_segctor_thread_construct fs/nilfs2/segment.c:2587 [inline] nilfs_segctor_thread+0x69e/0xe80 fs/nilfs2/segment.c:2701 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 </TASK>
Both of these issues are caused by the callbacks that handle the page/folio write requests, forcibly clear various states, including the working state of the buffers they hold, at unexpected times when they detect read-only fallback.
Fix these issues by checking if the buffer is referenced before clearing the page/folio state, and skipping the clear if it is.
--- fs/nilfs2/page.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)
fs/nilfs2/page.c +27 -4
@@ -392,6 +392,11 @@ void nilfs_clear_dirty_pages(struct address_space *mapping)/** * nilfs_clear_folio_dirty - discard dirty folio * @folio: dirty folio that will be discarded +* +* nilfs_clear_folio_dirty() clears working states including dirty state for +* the folio and its buffers. If the folio has buffers, clear only if it is +* confirmed that none of the buffer heads are busy (none have valid +* references and none are locked). */ void nilfs_clear_folio_dirty (struct folio *folio) {
@@ -399,10 +404,6 @@ void nilfs_clear_folio_dirty(struct folio *folio)BUG_ON (!folio_test_locked (folio)); -folio_clear_uptodate (folio); -folio_clear_mappedtodisk (folio); -folio_clear_checked (folio); - head =folio_buffers (folio);if (head) { const unsigned long clear_bits =
@@ -410,6 +411,25 @@ void nilfs_clear_folio_dirty(struct folio *folio)BIT (BH_Async_Write) |BIT (BH_NILFS_Volatile) |BIT (BH_NILFS_Checked) |BIT (BH_NILFS_Redirected) | BIT(BH_Delay)); +bool busy, invalidated = false; + +recheck_buffers: + busy = false; + bh = head; +do { +if (atomic_read (&bh->b_count) |buffer_locked (bh)) { + busy = true; +break ; + } + }while (bh = bh->b_this_page, bh != head); + +if (busy) { +if (invalidated) +return ; +invalidate_bh_lrus (); + invalidated = true; + goto recheck_buffers; + } bh = head; do {
@@ -419,6 +439,9 @@ void nilfs_clear_folio_dirty(struct folio *folio) }while (bh = bh->b_this_page, bh != head); } +folio_clear_uptodate (folio); +folio_clear_mappedtodisk (folio); +folio_clear_checked (folio);__nilfs_clear_folio_dirty (folio); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 445/590 nilfs2: protect access to buffers with no active references
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit 367a9bffabe08c04f6d725032cce3d891b2b9e1a ]
nilfs_lookup_dirty_data_buffers(), which iterates through the buffers attached to dirty data folios/pages, accesses the attached buffers without locking the folios/pages.
For data cache, nilfs_clear_folio_dirty() may be called asynchronously when the file system degenerates to read only, so nilfs_lookup_dirty_data_buffers() still has the potential to cause use after free issues when buffers lose the protection of their dirty state midway due to this asynchronous clearing and are unintentionally freed by try_to_free_buffers().
Eliminate this race issue by adjusting the lock section in this function.
--- fs/nilfs2/segment.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nilfs2/segment.c +3 -1
@@ -734,7 +734,6 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,if (!head) head =create_empty_buffers (folio,i_blocksize (inode),0 ); -folio_unlock (folio); bh = head; do {
@@ -744,11 +743,14 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,list_add_tail (&bh->b_assoc_buffers, listp); ndirties++;if (unlikely (ndirties >= nlimit)) { +folio_unlock (folio);folio_batch_release (&fbatch);cond_resched ();return ndirties; } }while (bh = bh->b_this_page, bh != head); + +folio_unlock (folio); }folio_batch_release (&fbatch);cond_resched ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 446/590 nilfs2: handle errors that nilfs_prepare_chunk() may return
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit ee70999a988b8abc3490609142f50ebaa8344432 ]
Patch series "nilfs2: fix issues with rename operations".
This series fixes BUG_ON check failures reported by syzbot around rename operations, and a minor behavioral issue where the mtime of a child directory changes when it is renamed instead of moved.
This patch (of 2):
The directory manipulation routines nilfs_set_link() and nilfs_delete_entry() rewrite the directory entry in the folio/page previously read by nilfs_find_entry(), so error handling is omitted on the assumption that nilfs_prepare_chunk(), which prepares the buffer for rewriting, will always succeed for these. And if an error is returned, it triggers the legacy BUG_ON() checks in each routine.
This assumption is wrong, as proven by syzbot: the buffer layer called by nilfs_prepare_chunk() may call nilfs_get_block() if necessary, which may fail due to metadata corruption or other reasons. This has been there all along, but improved sanity checks and error handling may have made it more reproducible in fuzzing tests.
Fix this issue by adding missing error paths in nilfs_set_link(), nilfs_delete_entry(), and their caller nilfs_rename().
--- fs/nilfs2/dir.c | 13 ++++++++++--- fs/nilfs2/namei.c | 29 +++++++++++++++-------------- fs/nilfs2/nilfs.h | 4 ++-- 3 files changed, 27 insertions(+), 19 deletions(-)
fs/nilfs2/dir.c +10 -3
@@ -400,7 +400,7 @@ int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino)return 0 ; } -void nilfs_set_link (struct inode *dir,struct nilfs_dir_entry *de, +int nilfs_set_link (struct inode *dir,struct nilfs_dir_entry *de,struct folio *folio,struct inode *inode) {size_t from =offset_in_folio (folio, de);
@@ -410,11 +410,15 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,folio_lock (folio); err =nilfs_prepare_chunk (folio, from, to); -BUG_ON (err); +if (unlikely (err)) { +folio_unlock (folio); +return err; + } de->inode =cpu_to_le64 (inode->i_ino); de->file_type =fs_umode_to_ftype (inode->i_mode);nilfs_commit_chunk (folio, mapping, from, to);inode_set_mtime_to_ts (dir,inode_set_ctime_current (dir)); +return 0 ; }/*
@@ -543,7 +547,10 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct folio *folio) from = (char *)pde - kaddr;folio_lock (folio); err =nilfs_prepare_chunk (folio, from, to); -BUG_ON (err); +if (unlikely (err)) { +folio_unlock (folio); + goto out; + }if (pde) pde->rec_len =nilfs_rec_len_to_disk (to - from); dir->inode =0 ;
fs/nilfs2/namei.c +15 -14
@@ -406,8 +406,10 @@ static int nilfs_rename(struct mnt_idmap *idmap, err =PTR_ERR (new_de); goto out_dir; } -nilfs_set_link (new_dir, new_de, new_folio, old_inode); + err =nilfs_set_link (new_dir, new_de, new_folio, old_inode);folio_release_kmap (new_folio, new_de); +if (unlikely (err)) + goto out_dir;nilfs_mark_inode_dirty (new_dir);inode_set_ctime_current (new_inode);if (dir_de)
@@ -430,28 +432,27 @@ static int nilfs_rename(struct mnt_idmap *idmap,*/ inode_set_ctime_current (old_inode); -nilfs_delete_entry (old_de, old_folio); - -if (dir_de) { -nilfs_set_link (old_inode, dir_de, dir_folio, new_dir); -folio_release_kmap (dir_folio, dir_de); -drop_nlink (old_dir); + err =nilfs_delete_entry (old_de, old_folio); +if (likely (!err)) { +if (dir_de) { + err =nilfs_set_link (old_inode, dir_de, dir_folio, + new_dir); +drop_nlink (old_dir); + } +nilfs_mark_inode_dirty (old_dir); } -folio_release_kmap (old_folio, old_de); - -nilfs_mark_inode_dirty (old_dir);nilfs_mark_inode_dirty (old_inode); - err =nilfs_transaction_commit (old_dir->i_sb); -return err; - out_dir:if (dir_de)folio_release_kmap (dir_folio, dir_de); out_old:folio_release_kmap (old_folio, old_de); out: -nilfs_transaction_abort (old_dir->i_sb); +if (likely (!err)) + err =nilfs_transaction_commit (old_dir->i_sb); +else +nilfs_transaction_abort (old_dir->i_sb);return err; }
fs/nilfs2/nilfs.h +2 -2
@@ -261,8 +261,8 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *, const struct qstr *,int nilfs_delete_entry (struct nilfs_dir_entry *,struct folio *);int nilfs_empty_dir (struct inode *);struct nilfs_dir_entry *nilfs_dotdot (struct inode *,struct folio **); -void nilfs_set_link (struct inode *,struct nilfs_dir_entry *, -struct folio *,struct inode *); +int nilfs_set_link (struct inode *dir,struct nilfs_dir_entry *de, +struct folio *folio,struct inode *inode);/* file.c */ extern int nilfs_sync_file (struct file *,loff_t ,loff_t ,int );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 447/590 module: Extend the preempt disabled section in dereference_symbol_descriptor().
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit a145c848d69f9c6f32008d8319edaa133360dd74 ]
dereference_symbol_descriptor() needs to obtain the module pointer belonging to pointer in order to resolve that pointer.
The returned mod pointer is obtained under RCU-sched/ preempt_disable() guarantees and needs to be used within this section to ensure that the module is not removed in the meantime.
Extend the preempt_disable() section to also cover dereference_module_function_descriptor().
--- include/linux/kallsyms.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/kallsyms.h +1 -1
@@ -57,10 +57,10 @@ static inline void *dereference_symbol_descriptor(void *ptr)preempt_disable (); mod =__module_address ((unsigned long )ptr); -preempt_enable ();if (mod) ptr =dereference_module_function_descriptor (mod, ptr); +preempt_enable ();#endif return ptr; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 448/590 module: Dont fail module loading when setting ro_after_init section RO failed
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 110b1e070f1d50f5217bd2c758db094998bb7b77 ]
Once module init has succeded it is too late to cancel loading. If setting ro_after_init data section to read-only fails, all we can do is to inform the user through a warning.
--- kernel/module/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/module/main.c +4 -3
@@ -2583,7 +2583,10 @@ static noinline int do_init_module(struct module *mod)#endif ret =module_enable_rodata_ro (mod, true);if (ret) - goto fail_mutex_unlock; +pr_warn ("%s: module_enable_rodata_ro_after_init() returned %d, " +"ro_after_init data might still be writable\n" , + mod->name, ret); +mod_tree_remove_init (mod);module_arch_freeing_init (mod); for_class_mod_mem_type(type, init) {
@@ -2622,8 +2625,6 @@ static noinline int do_init_module(struct module *mod)return 0 ; -fail_mutex_unlock: -mutex_unlock (&module_mutex); fail_free_freeinit:kfree (freeinit); fail:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 449/590 driver core: class: Fix wild pointer dereferences in API class_dev_iter_next()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit e128f82f7006991c99a58114f70ef61e937b1ac1 ]
There are a potential wild pointer dereferences issue regarding APIs class_dev_iter_(init|next|exit)(), as explained by below typical usage:
// All members of @iter are wild pointers.
struct class_dev_iter iter;
// class_dev_iter_init(@iter, @class, ...) checks parameter @class for // potential class_to_subsys() error, and it returns void type and does // not initialize its output parameter @iter, so caller can not detect // the error and continues to invoke class_dev_iter_next(@iter) even if // @iter still contains wild pointers. class_dev_iter_init(&iter, ...);
// Dereference these wild pointers in @iter here once suffer the error. while (dev = class_dev_iter_next(&iter)) { ... };
// Also dereference these wild pointers here.class_dev_iter_exit(&iter);
Actually, all callers of these APIs have such usage pattern in kernel tree. Fix by:
- Initialize output parameter @iter by memset() in class_dev_iter_init() and give callers prompt by pr_crit() for the error.
- Check if @iter is valid in class_dev_iter_next().
--- drivers/base/class.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/base/class.c +8 -1
@@ -323,8 +323,12 @@ void class_dev_iter_init(struct class_dev_iter *iter, const struct class *class,struct subsys_private *sp =class_to_subsys (class);struct klist_node *start_knode =NULL ; -if (!sp) +memset (iter,0 ,sizeof (*iter)); +if (!sp) { +pr_crit ("%s: class %p was not registered yet\n" , + __func__, class);return ; + }if (start) start_knode = &start->p->knode_class;
@@ -351,6 +355,9 @@ struct device *class_dev_iter_next(struct class_dev_iter *iter)struct klist_node *knode;struct device *dev; +if (!iter->sp) +return NULL ; +while (1 ) { knode =klist_next (&iter->ki);if (!knode)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 450/590 tty: mips_ejtag_fdc: fix one more u8 warning
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit 6dd1de91e7a62bfd3878992c1db6e1d443022c76 ]
The LKP robot complains about:
drivers/tty/mips_ejtag_fdc.c:1224:31: error: incompatible pointer types passing 'const char *[1]' to parameter of type 'const u8 **' (aka 'const unsigned char **')
Fix this by turning the missing pieces (fetch from kgdbfdc_wbuf) to u8 too. Note the filling part (kgdbfdc_write_char()) already receives and stores u8 to kgdbfdc_wbuf.
--- drivers/tty/mips_ejtag_fdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/mips_ejtag_fdc.c +2 -2
@@ -1154,7 +1154,7 @@ static char kgdbfdc_rbuf[4];/* write buffer to allow compaction */ static unsigned int kgdbfdc_wbuflen; -static char kgdbfdc_wbuf[4 ]; +static u8 kgdbfdc_wbuf[4 ];static void __iomem *kgdbfdc_setup (void ) {
@@ -1215,7 +1215,7 @@ static int kgdbfdc_read_char(void)/* push an FDC word from write buffer to TX FIFO */ static void kgdbfdc_push_one (void ) { -const char *bufs[1 ] = { kgdbfdc_wbuf }; +const u8 *bufs[1 ] = { kgdbfdc_wbuf };struct fdc_word word;void __iomem *regs;unsigned int i;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 451/590 serial: 8250: Adjust the timeout for FIFO mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Ogness <[email protected]>
[ Upstream commit d91f98be26510f5f81ec66425bb0306d1ccd571a ]
After a console has written a record into UART_TX, it uses wait_for_xmitr() to wait until the data has been sent out before returning. However, wait_for_xmitr() will timeout after 10ms, regardless if the data has been transmitted or not.
For single bytes, this timeout is sufficient even at very slow baud rates, such as 1200bps. However, when FIFO mode is used, there may be 64 bytes pushed into the FIFO at once. At a baud rate of 115200bps, the 10ms timeout is still sufficient. But when using lower baud rates (such as 57600bps), the timeout is _not_ sufficient. This causes longer lines to be cut off, resulting in lost and horribly misformatted output on the console.
When using FIFO mode, take the number of bytes into account to determine an appropriate maximum timeout. Increasing the timeout does not affect performance since ideally the timeout never occurs.
--- drivers/tty/serial/8250/8250_port.c | 32 +++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)
drivers/tty/serial/8250/8250_port.c +26 -6
@@ -2059,7 +2059,8 @@ static void serial8250_break_ctl(struct uart_port *port, int break_state)serial8250_rpm_put (up); } -static void wait_for_lsr (struct uart_8250_port *up,int bits) +/* Returns true if @bits were set, false on timeout */ +static bool wait_for_lsr (struct uart_8250_port *up,int bits) {unsigned int status, tmout =10000 ;
@@ -2074,11 +2075,11 @@ static void wait_for_lsr(struct uart_8250_port *up, int bits)udelay (1 );touch_nmi_watchdog (); } + +return (tmout !=0 ); } -/* -* Wait for transmitter & holding register to empty -*/ +/* Wait for transmitter and holding register to empty with timeout */ static void wait_for_xmitr (struct uart_8250_port *up,int bits) {unsigned int tmout;
@@ -3297,6 +3298,16 @@ static void serial8250_console_restore(struct uart_8250_port *up)serial8250_out_MCR (up, up->mcr |UART_MCR_DTR |UART_MCR_RTS ); } +static void fifo_wait_for_lsr (struct uart_8250_port *up,unsigned int count) +{ +unsigned int i; + +for (i =0 ; i < count; i++) { +if (wait_for_lsr (up,UART_LSR_THRE )) +return ; + } +} +/* * Print a string to the serial port using the device FIFO *
@@ -3306,13 +3317,15 @@ static void serial8250_console_restore(struct uart_8250_port *up)static void serial8250_console_fifo_write (struct uart_8250_port *up,const char *s,unsigned int count) { -int i;const char *end = s + count;unsigned int fifosize = up->tx_loadsz; +unsigned int tx_count =0 ;bool cr_sent = false; +unsigned int i;while (s != end) { -wait_for_lsr (up,UART_LSR_THRE ); +/* Allow timeout for each byte of a possibly full FIFO */ +fifo_wait_for_lsr (up, fifosize);for (i =0 ; i < fifosize && s != end; ++i) {if (*s =='\n' && !cr_sent) {
@@ -3323,7 +3336,14 @@ static void serial8250_console_fifo_write(struct uart_8250_port *up, cr_sent = false; } } + tx_count = i; } + +/* +* Allow timeout for each byte written since the caller will only wait +* for UART_LSR_BOTH_EMPTY using the timeout of a single character +*/ +fifo_wait_for_lsr (up, tx_count); }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 452/590 nfs: fix incorrect error handling in LOCALIO
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Snitzer <[email protected]>
[ Upstream commit ead11ac50ad4b8ef1b64806e962ea984862d96ad ]
nfs4_stat_to_errno() expects a NFSv4 error code as an argument and returns a POSIX errno.
The problem is LOCALIO is passing nfs4_stat_to_errno() the POSIX errno return values from filp->f_op->read_iter(), filp->f_op->write_iter() and vfs_fsync_range().
So the POSIX errno that nfs_local_pgio_done() and nfs_local_commit_done() are passing to nfs4_stat_to_errno() are failing to match any NFSv4 error code, which results in nfs4_stat_to_errno() defaulting to returning -EREMOTEIO. This causes assertions in upper layers due to -EREMOTEIO not being a valid NFSv4 error code.
Fix this by updating nfs_local_pgio_done() and nfs_local_commit_done() to use the new nfs_localio_errno_to_nfs4_stat() to map a POSIX errno to an NFSv4 error code.
Care was taken to factor out nfs4_errtbl_common[] to avoid duplicating the same NFS error to errno table. nfs4_errtbl_common[] is checked first by both nfs4_stat_to_errno and nfs_localio_errno_to_nfs4_stat before they check their own more specialized tables (nfs4_errtbl[] and nfs4_errtbl_localio[] respectively).
While auditing the associated error mapping tables, the (ab)use of -1 for the last table entry was removed in favor of using ARRAY_SIZE to iterate the nfs_errtbl[] and nfs4_errtbl[]. And 'errno_NFSERR_IO' was removed because it caused needless obfuscation.
--- fs/nfs/localio.c | 4 +- fs/nfs_common/common.c | 89 +++++++++++++++++++++++++++++++++----- include/linux/nfs_common.h | 3 +- 3 files changed, 82 insertions(+), 14 deletions(-)
fs/nfs/localio.c +2 -2
@@ -331,7 +331,7 @@ nfs_local_pgio_done(struct nfs_pgio_header *hdr, long status) hdr->res.op_status =NFS4_OK ; hdr->task.tk_status =0 ; }else { - hdr->res.op_status =nfs4_stat_to_errno (status); + hdr->res.op_status =nfs_localio_errno_to_nfs4_stat (status); hdr->task.tk_status = status; } }
@@ -669,7 +669,7 @@ nfs_local_commit_done(struct nfs_commit_data *data, int status) data->task.tk_status =0 ; }else {nfs_reset_boot_verifier (data->inode); - data->res.op_status =nfs4_stat_to_errno (status); + data->res.op_status =nfs_localio_errno_to_nfs4_stat (status); data->task.tk_status = status; } }
fs/nfs_common/common.c +78 -11
143 lines not on this page · raw message
include/linux/nfs_common.h +2 -1
@@ -9,9 +9,10 @@#include <uapi/linux/nfs.h> /* Mapping from NFS error code to "errno" error code. */ -#define errno_NFSERR_IO EIOint nfs_stat_to_errno (enum nfs_stat status);int nfs4_stat_to_errno (int stat); +__u32 nfs_localio_errno_to_nfs4_stat (int errno); +#endif /* _LINUX_NFS_COMMON_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 453/590 NFSv4.2: fix COPY_NOTIFY xdr buf size calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit e8380c2d06055665b3df6c03964911375d7f9290 ]
We need to include sequence size in the compound.
--- fs/nfs/nfs42xdr.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/nfs42xdr.c +2 -0
@@ -144,9 +144,11 @@ decode_putfh_maxsz + \ decode_offload_cancel_maxsz)#define NFS4_enc_copy_notify_sz (compound_encode_hdr_maxsz + \ + encode_sequence_maxsz + \ encode_putfh_maxsz + \ encode_copy_notify_maxsz)#define NFS4_dec_copy_notify_sz (compound_decode_hdr_maxsz + \ + decode_sequence_maxsz + \ decode_putfh_maxsz + \ decode_copy_notify_maxsz)#define NFS4_enc_deallocate_sz (compound_encode_hdr_maxsz + \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 454/590 NFSv4.2: mark OFFLOAD_CANCEL MOVEABLE
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit 668135b9348c53fd205f5e07d11e82b10f31b55b ]
OFFLOAD_CANCEL should be marked MOVEABLE for when we need to move tasks off a non-functional transport.
--- fs/nfs/nfs42proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs42proc.c +1 -1
@@ -552,7 +552,7 @@ static int nfs42_do_offload_cancel_async(struct file *dst, .rpc_message = &msg, .callback_ops = &nfs42_offload_cancel_ops, .workqueue = nfsiod_workqueue, - .flags = RPC_TASK_ASYNC, + .flags = RPC_TASK_ASYNC | RPC_TASK_MOVEABLE, };int status;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 455/590 LoongArch: Fix warnings during S3 suspend
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit 26c0a2d93af55d30a46d5f45d3e9c42cde730168 ]
The enable_gpe_wakeup() function calls acpi_enable_all_wakeup_gpes(), and the later one may call the preempt_schedule_common() function, resulting in a thread switch and causing the CPU to be in an interrupt enabled state after the enable_gpe_wakeup() function returns, leading to the warnings as follow.
[ C0] WARNING: ... at kernel/time/timekeeping.c:845 ktime_get+0xbc/0xc8
[ C0] ...
[ C0] Call Trace:
[ C0] [<90000000002243b4>] show_stack+0x64/0x188
[ C0] [<900000000164673c>] dump_stack_lvl+0x60/0x88
[ C0] [<90000000002687e4>] __warn+0x8c/0x148
[ C0] [<90000000015e9978>] report_bug+0x1c0/0x2b0
[ C0] [<90000000016478e4>] do_bp+0x204/0x3b8
[ C0] [<90000000025b1924>] exception_handlers+0x1924/0x10000 [ C0] [<9000000000343bbc>] ktime_get+0xbc/0xc8
[ C0] [<9000000000354c08>] tick_sched_timer+0x30/0xb0
[ C0] [<90000000003408e0>] __hrtimer_run_queues+0x160/0x378 [ C0] [<9000000000341f14>] hrtimer_interrupt+0x144/0x388
[ C0] [<9000000000228348>] constant_timer_interrupt+0x38/0x48 [ C0] [<90000000002feba4>] __handle_irq_event_percpu+0x64/0x1e8 [ C0] [<90000000002fed48>] handle_irq_event_percpu+0x20/0x80 [ C0] [<9000000000306b9c>] handle_percpu_irq+0x5c/0x98
[ C0] [<90000000002fd4a0>] generic_handle_domain_irq+0x30/0x48 [ C0] [<9000000000d0c7b0>] handle_cpu_irq+0x70/0xa8
[ C0] [<9000000001646b30>] handle_loongarch_irq+0x30/0x48
[ C0] [<9000000001646bc8>] do_vint+0x80/0xe0
[ C0] [<90000000002aea1c>] finish_task_switch.isra.0+0x8c/0x2a8 [ C0] [<900000000164e34c>] __schedule+0x314/0xa48
[ C0] [<900000000164ead8>] schedule+0x58/0xf0
[ C0] [<9000000000294a2c>] worker_thread+0x224/0x498
[ C0] [<900000000029d2f0>] kthread+0xf8/0x108
[ C0] [<9000000000221f28>] ret_from_kernel_thread+0xc/0xa4
[ C0]
[ C0] ---[ end trace 0000000000000000 ]---
The root cause is acpi_enable_all_wakeup_gpes() uses a mutex to protect acpi_hw_enable_all_wakeup_gpes(), and acpi_ut_acquire_mutex() may cause a thread switch. Since there is no longer concurrent execution during loongarch_acpi_suspend(), we can call acpi_hw_enable_all_wakeup_gpes() directly in enable_gpe_wakeup().
The solution is similar to commit 22db06337f590d01 ("ACPI: sleep: Avoid breaking S3 wakeup due to might_sleep()").
--- arch/loongarch/power/platform.c | 2 +- drivers/acpi/acpica/achware.h | 2 -- include/acpi/acpixf.h | 1 + 3 files changed, 2 insertions(+), 3 deletions(-)
arch/loongarch/power/platform.c +1 -1
@@ -17,7 +17,7 @@ void enable_gpe_wakeup(void)if (acpi_gbl_reduced_hardware)return ; -acpi_enable_all_wakeup_gpes (); +acpi_hw_enable_all_wakeup_gpes (); }void enable_pci_wakeup (void )
drivers/acpi/acpica/achware.h +0 -2
@@ -103,8 +103,6 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info *gpe_event_info,acpi_status acpi_hw_enable_all_runtime_gpes (void ); -acpi_status acpi_hw_enable_all_wakeup_gpes (void ); -u8 acpi_hw_check_all_gpes (acpi_handle gpe_skip_device,u32 gpe_skip_number); acpi_status
include/acpi/acpixf.h +1 -0
@@ -763,6 +763,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status *event_status)) ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number)) ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_hw_disable_all_gpes(void)) +ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_hw_enable_all_wakeup_gpes(void)) ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void)) ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void)) ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 456/590 tools/bootconfig: Fix the wrong format specifier
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luo Yifan <[email protected]>
[ Upstream commit f6ab7384d554ba80ff4793259d75535874b366f5 ]
Use '%u' instead of '%d' for unsigned int.
--- tools/bootconfig/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/bootconfig/main.c +2 -2
@@ -226,7 +226,7 @@ static int load_xbc_from_initrd(int fd, char **buf)/* Wrong Checksum */ rcsum =xbc_calc_checksum (*buf, size);if (csum != rcsum) { -pr_err ("checksum error: %d != %d\n" , csum, rcsum); +pr_err ("checksum error: %u != %u\n" , csum, rcsum);return -EINVAL ; }
@@ -395,7 +395,7 @@ static int apply_xbc(const char *path, const char *xbc_path)xbc_get_info (&ret,NULL );printf ("\tNumber of nodes: %d\n" , ret);printf ("\tSize: %u bytes\n" , (unsigned int )size); -printf ("\tChecksum: %d\n" , (unsigned int )csum); +printf ("\tChecksum: %u\n" , (unsigned int )csum);/* TODO: Check the options by schema */ xbc_exit ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 457/590 xfrm: replay: Fix the update of replay_esn->oseq_hi for GSO
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianbo Liu <[email protected]>
[ Upstream commit c05c5e5aa163f4682ca97a2f0536575fc7dbdecb ]
When skb needs GSO and wrap around happens, if xo->seq.low (seqno of the first skb segment) is before the last seq number but oseq (seqno of the last segment) is after it, xo->seq.low is still bigger than replay_esn->oseq while oseq is smaller than it, so the update of replay_esn->oseq_hi is missed for this case wrap around because of the change in the cited commit.
For example, if sending a packet with gso_segs=3 while old replay_esn->oseq=0xfffffffe, we calculate:
xo->seq.low = 0xfffffffe + 1 = 0x0xffffffff
oseq = 0xfffffffe + 3 = 0x1(oseq < replay_esn->oseq) is true, but (xo->seq.low < replay_esn->oseq) is false, so replay_esn->oseq_hi is not incremented.
To fix this issue, change the outer checking back for the update of replay_esn->oseq_hi. And add new checking inside for the update of packet's oseq_hi.
--- net/xfrm/xfrm_replay.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/xfrm/xfrm_replay.c +6 -4
@@ -714,10 +714,12 @@ static int xfrm_replay_overflow_offload_esn(struct xfrm_state *x, struct sk_buff oseq +=skb_shinfo (skb)->gso_segs; } -if (unlikely (xo->seq.low < replay_esn->oseq)) { -XFRM_SKB_CB (skb)->seq.output.hi = ++oseq_hi; - xo->seq.hi = oseq_hi; - replay_esn->oseq_hi = oseq_hi; +if (unlikely (oseq < replay_esn->oseq)) { + replay_esn->oseq_hi = ++oseq_hi; +if (xo->seq.low < replay_esn->oseq) { +XFRM_SKB_CB (skb)->seq.output.hi = oseq_hi; + xo->seq.hi = oseq_hi; + }if (replay_esn->oseq_hi ==0 ) { replay_esn->oseq--; replay_esn->oseq_hi--;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 458/590 xfrm: Add support for per cpu xfrm state handling.
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 1ddf9916ac09313128e40d6581cef889c0b4ce84 ]
Currently all flows for a certain SA must be processed by the same cpu to avoid packet reordering and lock contention of the xfrm state lock.
To get rid of this limitation, the IETF standardized per cpu SAs in RFC 9611. This patch implements the xfrm part of it.
We add the cpu as a lookup key for xfrm states and a config option to generate acquire messages for each cpu.
With that, we can have on each cpu a SA with identical traffic selector so that flows can be processed in parallel on all cpus.
Stable-dep-of: e952837f3ddb ("xfrm: state: fix out-of-bounds read during lookup")
--- include/net/xfrm.h | 5 ++-- include/uapi/linux/xfrm.h | 2 ++ net/key/af_key.c | 7 +++-- net/xfrm/xfrm_compat.c | 6 ++-- net/xfrm/xfrm_state.c | 58 +++++++++++++++++++++++++++++++-------- net/xfrm/xfrm_user.c | 56 ++++++++++++++++++++++++++++++++++--- 6 files changed, 112 insertions(+), 22 deletions(-)
include/net/xfrm.h +3 -2
@@ -188,6 +188,7 @@ struct xfrm_state {refcount_t refcnt;spinlock_t lock; +u32 pcpu_num;struct xfrm_id id;struct xfrm_selector sel;struct xfrm_mark mark;
@@ -1684,7 +1685,7 @@ struct xfrmk_spdinfo {u32 spdhmcnt; }; -struct xfrm_state *xfrm_find_acq_byseq (struct net *net,u32 mark,u32 seq); +struct xfrm_state *xfrm_find_acq_byseq (struct net *net,u32 mark,u32 seq,u32 pcpu_num);int xfrm_state_delete (struct xfrm_state *x);int xfrm_state_flush (struct net *net,u8 proto,bool task_valid,bool sync);int xfrm_dev_state_flush (struct net *net,struct net_device *dev,bool task_valid);
@@ -1796,7 +1797,7 @@ int verify_spi_info(u8 proto, u32 min, u32 max, struct netlink_ext_ack *extack);int xfrm_alloc_spi (struct xfrm_state *x,u32 minspi,u32 maxspi,struct netlink_ext_ack *extack);struct xfrm_state *xfrm_find_acq (struct net *net,const struct xfrm_mark *mark, -u8 mode,u32 reqid,u32 if_id,u8 proto, +u8 mode,u32 reqid,u32 if_id,u32 pcpu_num,u8 proto,const xfrm_address_t *daddr,const xfrm_address_t *saddr,int create,unsigned short family);
include/uapi/linux/xfrm.h +2 -0
@@ -322,6 +322,7 @@ enum xfrm_attr_type_t {XFRMA_MTIMER_THRESH ,/* __u32 in seconds for input SA */ XFRMA_SA_DIR ,/* __u8 */ XFRMA_NAT_KEEPALIVE_INTERVAL ,/* __u32 in seconds for NAT keepalive */ +XFRMA_SA_PCPU ,/* __u32 */ __XFRMA_MAX#define XFRMA_OUTPUT_MARK XFRMA_SET_MARK/* Compatibility */
@@ -437,6 +438,7 @@ struct xfrm_userpolicy_info {#define XFRM_POLICY_LOCALOK 1/* Allow user to override global policy */ /* Automatically expand selector to include matching ICMP payloads. */ #define XFRM_POLICY_ICMP 2 +#define XFRM_POLICY_CPU_ACQUIRE 4__u8 share; };
net/key/af_key.c +4 -3
@@ -1354,7 +1354,7 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, const struct sadb_ }if (hdr->sadb_msg_seq) { - x =xfrm_find_acq_byseq (net,DUMMY_MARK , hdr->sadb_msg_seq); + x =xfrm_find_acq_byseq (net,DUMMY_MARK , hdr->sadb_msg_seq,UINT_MAX );if (x && !xfrm_addr_equal (&x->id.daddr, xdaddr, family)) {xfrm_state_put (x); x =NULL ;
@@ -1362,7 +1362,8 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, const struct sadb_ }if (!x) - x =xfrm_find_acq (net, &dummy_mark, mode, reqid,0 , proto, xdaddr, xsaddr,1 , family); + x =xfrm_find_acq (net, &dummy_mark, mode, reqid,0 ,UINT_MAX , + proto, xdaddr, xsaddr,1 , family);if (x ==NULL )return -ENOENT ;
@@ -1417,7 +1418,7 @@ static int pfkey_acquire(struct sock *sk, struct sk_buff *skb, const struct sadbif (hdr->sadb_msg_seq ==0 || hdr->sadb_msg_errno ==0 )return 0 ; - x =xfrm_find_acq_byseq (net,DUMMY_MARK , hdr->sadb_msg_seq); + x =xfrm_find_acq_byseq (net,DUMMY_MARK , hdr->sadb_msg_seq,UINT_MAX );if (x ==NULL )return 0 ;
net/xfrm/xfrm_compat.c +4 -2
@@ -132,6 +132,7 @@ static const struct nla_policy compat_policy[XFRMA_MAX+1] = { [XFRMA_MTIMER_THRESH] = { .type = NLA_U32 }, [XFRMA_SA_DIR] = NLA_POLICY_RANGE(NLA_U8, XFRM_SA_DIR_IN, XFRM_SA_DIR_OUT), [XFRMA_NAT_KEEPALIVE_INTERVAL] = { .type = NLA_U32 }, + [XFRMA_SA_PCPU] = { .type = NLA_U32 }, }; static struct nlmsghdr *xfrm_nlmsg_put_compat(struct sk_buff *skb,
@@ -282,9 +283,10 @@ static int xfrm_xlate64_attr(struct sk_buff *dst, const struct nlattr *src)case XFRMA_MTIMER_THRESH :case XFRMA_SA_DIR :case XFRMA_NAT_KEEPALIVE_INTERVAL : +case XFRMA_SA_PCPU :return xfrm_nla_cpy (dst, src,nla_len (src));default : -BUILD_BUG_ON (XFRMA_MAX !=XFRMA_NAT_KEEPALIVE_INTERVAL ); +BUILD_BUG_ON (XFRMA_MAX !=XFRMA_SA_PCPU );pr_warn_once ("unsupported nla_type %d\n" , src->nla_type);return -EOPNOTSUPP ; }
@@ -439,7 +441,7 @@ static int xfrm_xlate32_attr(void *dst, const struct nlattr *nla,int err;if (type >XFRMA_MAX ) { -BUILD_BUG_ON (XFRMA_MAX !=XFRMA_NAT_KEEPALIVE_INTERVAL ); +BUILD_BUG_ON (XFRMA_MAX !=XFRMA_SA_PCPU );NL_SET_ERR_MSG (extack,"Bad attribute" );return -EOPNOTSUPP ; }
net/xfrm/xfrm_state.c +47 -11
193 lines not on this page · raw message
net/xfrm/xfrm_user.c +52 -4
147 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 459/590 xfrm: Cache used outbound xfrm states at the policy.
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 0045e3d80613cc7174dc15f189ee6fc4e73b9365 ]
Now that we can have percpu xfrm states, the number of active states might increase. To get a better lookup performance, we cache the used xfrm states at the policy for outbound IPsec traffic.
Stable-dep-of: e952837f3ddb ("xfrm: state: fix out-of-bounds read during lookup")
--- include/net/xfrm.h | 4 +++ net/xfrm/xfrm_policy.c | 12 +++++++++ net/xfrm/xfrm_state.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+)
include/net/xfrm.h +4 -0
@@ -184,6 +184,7 @@ struct xfrm_state { };struct hlist_node byspi;struct hlist_node byseq; +struct hlist_node state_cache;refcount_t refcnt;spinlock_t lock;
@@ -537,6 +538,7 @@ struct xfrm_policy_queue {* @xp_net: network namespace the policy lives in * @bydst: hlist node for SPD hash table or rbtree list * @byidx: hlist node for index hash table +* @state_cache_list: hlist head for policy cached xfrm states * @lock: serialize changes to policy structure members * @refcnt: reference count, freed once it reaches 0 * @pos: kernel internal tie-breaker to determine age of policy
@@ -567,6 +569,8 @@ struct xfrm_policy {struct hlist_node bydst;struct hlist_node byidx; +struct hlist_head state_cache_list; +/* This lock only affects elements except for entry. */ rwlock_t lock;refcount_t refcnt;
net/xfrm/xfrm_policy.c +12 -0
@@ -434,6 +434,7 @@ struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp)if (policy) {write_pnet (&policy->xp_net, net);INIT_LIST_HEAD (&policy->walk.all); +INIT_HLIST_HEAD (&policy->state_cache_list);INIT_HLIST_NODE (&policy->bydst);INIT_HLIST_NODE (&policy->byidx);rwlock_init (&policy->lock);
@@ -475,6 +476,9 @@ EXPORT_SYMBOL(xfrm_policy_destroy);static void xfrm_policy_kill (struct xfrm_policy *policy) { +struct net *net =xp_net (policy); +struct xfrm_state *x; +xfrm_dev_policy_delete (policy);write_lock_bh (&policy->lock);
@@ -490,6 +494,13 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)if (del_timer (&policy->timer))xfrm_pol_put (policy); +/* XXX: Flush state cache */ +spin_lock_bh (&net->xfrm.xfrm_state_lock); +hlist_for_each_entry_rcu (x, &policy->state_cache_list, state_cache) { +hlist_del_init_rcu (&x->state_cache); + } +spin_unlock_bh (&net->xfrm.xfrm_state_lock); +xfrm_pol_put (policy); }
@@ -3275,6 +3286,7 @@ struct dst_entry *xfrm_lookup_with_ifid(struct net *net,dst_release (dst); dst = dst_orig; } + ok:xfrm_pols_put (pols, drop_pols); if (dst && dst->xfrm &&
net/xfrm/xfrm_state.c +55 -0
97 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 460/590 xfrm: Add an inbound percpu state cache.
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 81a331a0e72ddc2f75092603d9577bd1a0ca23ad ]
Now that we can have percpu xfrm states, the number of active states might increase. To get a better lookup performance, we add a percpu cache to cache the used inbound xfrm states.
Stable-dep-of: e952837f3ddb ("xfrm: state: fix out-of-bounds read during lookup")
--- include/net/netns/xfrm.h | 1 + include/net/xfrm.h | 5 ++++ net/ipv4/esp4_offload.c | 6 ++--- net/ipv6/esp6_offload.c | 6 ++--- net/xfrm/xfrm_input.c | 2 +- net/xfrm/xfrm_state.c | 57 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 70 insertions(+), 7 deletions(-)
include/net/netns/xfrm.h +1 -0
@@ -43,6 +43,7 @@ struct netns_xfrm {struct hlist_head __rcu *state_bysrc;struct hlist_head __rcu *state_byspi;struct hlist_head __rcu *state_byseq; +struct hlist_head __percpu *state_cache_input;unsigned int state_hmask;unsigned int state_num;struct work_struct state_hash_work;
include/net/xfrm.h +5 -0
@@ -185,6 +185,7 @@ struct xfrm_state {struct hlist_node byspi;struct hlist_node byseq;struct hlist_node state_cache; +struct hlist_node state_cache_input;refcount_t refcnt;spinlock_t lock;
@@ -1650,6 +1651,10 @@ int xfrm_state_update(struct xfrm_state *x);struct xfrm_state *xfrm_state_lookup (struct net *net,u32 mark,const xfrm_address_t *daddr,__be32 spi,u8 proto,unsigned short family); +struct xfrm_state *xfrm_input_state_lookup (struct net *net,u32 mark, +const xfrm_address_t *daddr, +__be32 spi,u8 proto, +unsigned short family); struct xfrm_state *xfrm_state_lookup_byaddr(struct net *net, u32 mark, const xfrm_address_t *daddr, const xfrm_address_t *saddr,
net/ipv4/esp4_offload.c +3 -3
@@ -53,9 +53,9 @@ static struct sk_buff *esp4_gro_receive(struct list_head *head,if (sp->len ==XFRM_MAX_DEPTH ) goto out_reset; - x =xfrm_state_lookup (dev_net (skb->dev), skb->mark, - (xfrm_address_t *)&ip_hdr (skb)->daddr, - spi,IPPROTO_ESP ,AF_INET ); + x =xfrm_input_state_lookup (dev_net (skb->dev), skb->mark, + (xfrm_address_t *)&ip_hdr (skb)->daddr, + spi,IPPROTO_ESP ,AF_INET );if (unlikely (x && x->dir && x->dir !=XFRM_SA_DIR_IN )) {/* non-offload path will record the error and audit log */
net/ipv6/esp6_offload.c +3 -3
@@ -80,9 +80,9 @@ static struct sk_buff *esp6_gro_receive(struct list_head *head,if (sp->len ==XFRM_MAX_DEPTH ) goto out_reset; - x =xfrm_state_lookup (dev_net (skb->dev), skb->mark, - (xfrm_address_t *)&ipv6_hdr (skb)->daddr, - spi,IPPROTO_ESP ,AF_INET6 ); + x =xfrm_input_state_lookup (dev_net (skb->dev), skb->mark, + (xfrm_address_t *)&ipv6_hdr (skb)->daddr, + spi,IPPROTO_ESP ,AF_INET6 );if (unlikely (x && x->dir && x->dir !=XFRM_SA_DIR_IN )) {/* non-offload path will record the error and audit log */
net/xfrm/xfrm_input.c +1 -1
@@ -572,7 +572,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) goto drop; } - x =xfrm_state_lookup (net, mark, daddr, spi, nexthdr, family); + x =xfrm_input_state_lookup (net, mark, daddr, spi, nexthdr, family);if (x ==NULL ) {secpath_reset (skb);XFRM_INC_STATS (net,LINUX_MIB_XFRMINNOSTATES );
net/xfrm/xfrm_state.c +57 -0
87 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 461/590 xfrm: state: fix out-of-bounds read during lookup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit e952837f3ddb0ff726d5b582aa1aad9aa38d024d ]
lookup and resize can run in parallel.
The xfrm_state_hash_generation seqlock ensures a retry, but the hash functions can observe a hmask value that is too large for the new hlist array.
rehash does:
rcu_assign_pointer(net->xfrm.state_bydst, ndst) [..] net->xfrm.state_hmask = nhashmask;
While state lookup does:
h = xfrm_dst_hash(net, daddr, saddr, tmpl->reqid, encap_family); hlist_for_each_entry_rcu(x, net->xfrm.state_bydst + h, bydst) {
This is only safe in case the update to state_bydst is larger than net->xfrm.xfrm_state_hmask (or if the lookup function gets serialized via state spinlock again).
Fix this by prefetching state_hmask and the associated pointers. The xfrm_state_hash_generation seqlock retry will ensure that the pointer and the hmask will be consistent.
The existing helpers, like xfrm_dst_hash(), are now unsafe for RCU side, add lockdep assertions to document that they are only safe for insert side.
xfrm_state_lookup_byaddr() uses the spinlock rather than RCU. AFAICS this is an oversight from back when state lookup was converted to RCU, this lock should be replaced with RCU in a future patch.
--- net/xfrm/xfrm_state.c | 89 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 19 deletions(-)
net/xfrm/xfrm_state.c +70 -19
@@ -34,6 +34,8 @@#define xfrm_state_deref_prot (table, net) \ rcu_dereference_protected((table), lockdep_is_held(&(net)->xfrm.xfrm_state_lock)) +#define xfrm_state_deref_check (table, net) \ + rcu_dereference_check((table), lockdep_is_held(&(net)->xfrm.xfrm_state_lock))static void xfrm_state_gc_task (struct work_struct *work);
@@ -62,6 +64,8 @@ static inline unsigned int xfrm_dst_hash(struct net *net, u32 reqid, unsigned short family) { +lockdep_assert_held (&net->xfrm.xfrm_state_lock); +return __xfrm_dst_hash (daddr, saddr, reqid, family, net->xfrm.state_hmask); }
@@ -70,6 +74,8 @@ static inline unsigned int xfrm_src_hash(struct net *net,const xfrm_address_t *saddr, unsigned short family) { + lockdep_assert_held(&net->xfrm.xfrm_state_lock); +return __xfrm_src_hash (daddr, saddr, family, net->xfrm.state_hmask); }
@@ -77,11 +83,15 @@ static inline unsigned int xfrm_spi_hash(struct net *net, const xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family) { + lockdep_assert_held(&net->xfrm.xfrm_state_lock); +return __xfrm_spi_hash (daddr, spi, proto, family, net->xfrm.state_hmask); }static unsigned int xfrm_seq_hash (struct net *net,u32 seq) { +lockdep_assert_held (&net->xfrm.xfrm_state_lock); +return __xfrm_seq_hash (seq, net->xfrm.state_hmask); }
@@ -1041,16 +1051,38 @@ xfrm_init_tempstate(struct xfrm_state *x, const struct flowi *fl, x->props.family = tmpl->encap_family; } -static struct xfrm_state *__xfrm_state_lookup_all (struct net *net,u32 mark, +struct xfrm_hash_state_ptrs { +const struct hlist_head *bydst; +const struct hlist_head *bysrc; +const struct hlist_head *byspi; +unsigned int hmask; +}; + +static void xfrm_hash_ptrs_get (const struct net *net,struct xfrm_hash_state_ptrs *ptrs) +{ +unsigned int sequence; + +do { + sequence =read_seqcount_begin (&net->xfrm.xfrm_state_hash_generation); + + ptrs->bydst =xfrm_state_deref_check (net->xfrm.state_bydst, net); + ptrs->bysrc =xfrm_state_deref_check (net->xfrm.state_bysrc, net); + ptrs->byspi =xfrm_state_deref_check (net->xfrm.state_byspi, net); + ptrs->hmask = net->xfrm.state_hmask; + }while (read_seqcount_retry (&net->xfrm.xfrm_state_hash_generation, sequence)); +} + +static struct xfrm_state *__xfrm_state_lookup_all (const struct xfrm_hash_state_ptrs *state_ptrs, +u32 mark,const xfrm_address_t *daddr,__be32 spi,u8 proto,unsigned short family,struct xfrm_dev_offload *xdo) { -unsigned int h =xfrm_spi_hash (net, daddr, spi, proto, family); +unsigned int h =__xfrm_spi_hash (daddr, spi, proto, family, state_ptrs->hmask);struct xfrm_state *x; -hlist_for_each_entry_rcu (x, net->xfrm.state_byspi + h, byspi) { +hlist_for_each_entry_rcu (x, state_ptrs->byspi + h, byspi) {#ifdef CONFIG_XFRM_OFFLOAD if (xdo->type ==XFRM_DEV_OFFLOAD_PACKET ) {if (x->xso.type !=XFRM_DEV_OFFLOAD_PACKET )
@@ -1084,15 +1116,16 @@ static struct xfrm_state *__xfrm_state_lookup_all(struct net *net, u32 mark,return NULL ; } -static struct xfrm_state *__xfrm_state_lookup (struct net *net,u32 mark, +static struct xfrm_state *__xfrm_state_lookup (const struct xfrm_hash_state_ptrs *state_ptrs, +u32 mark,const xfrm_address_t *daddr,__be32 spi,u8 proto,unsigned short family) { -unsigned int h =xfrm_spi_hash (net, daddr, spi, proto, family); +unsigned int h =__xfrm_spi_hash (daddr, spi, proto, family, state_ptrs->hmask);struct xfrm_state *x; -hlist_for_each_entry_rcu (x, net->xfrm.state_byspi + h, byspi) { +hlist_for_each_entry_rcu (x, state_ptrs->byspi + h, byspi) { if (x->props.family != family || x->id.spi != spi || x->id.proto != proto ||
@@ -1114,6 +1147,7 @@ struct xfrm_state *xfrm_input_state_lookup(struct net *net, u32 mark, __be32 spi, u8 proto, unsigned short family) { + struct xfrm_hash_state_ptrs state_ptrs;struct hlist_head *state_cache_input;struct xfrm_state *x =NULL ;int cpu =get_cpu ();
@@ -1135,7 +1169,9 @@ struct xfrm_state *xfrm_input_state_lookup(struct net *net, u32 mark, goto out; } - x =__xfrm_state_lookup (net, mark, daddr, spi, proto, family); +xfrm_hash_ptrs_get (net, &state_ptrs); + + x =__xfrm_state_lookup (&state_ptrs, mark, daddr, spi, proto, family);if (x && x->km.state ==XFRM_STATE_VALID ) {spin_lock_bh (&net->xfrm.xfrm_state_lock);
@@ -1155,15 +1191,16 @@ struct xfrm_state *xfrm_input_state_lookup(struct net *net, u32 mark, }EXPORT_SYMBOL (xfrm_input_state_lookup); -static struct xfrm_state *__xfrm_state_lookup_byaddr (struct net *net,u32 mark, +static struct xfrm_state *__xfrm_state_lookup_byaddr (const struct xfrm_hash_state_ptrs *state_ptrs, +u32 mark,const xfrm_address_t *daddr,const xfrm_address_t *saddr,u8 proto,unsigned short family) { -unsigned int h =xfrm_src_hash (net, daddr, saddr, family); +unsigned int h =__xfrm_src_hash (daddr, saddr, family, state_ptrs->hmask);struct xfrm_state *x; -hlist_for_each_entry_rcu (x, net->xfrm.state_bysrc + h, bysrc) { +hlist_for_each_entry_rcu (x, state_ptrs->bysrc + h, bysrc) { if (x->props.family != family || x->id.proto != proto || !xfrm_addr_equal(&x->id.daddr, daddr, family) ||
@@ -1183,14 +1220,17 @@ static struct xfrm_state *__xfrm_state_lookup_byaddr(struct net *net, u32 mark,static inline struct xfrm_state *__xfrm_state_locate (struct xfrm_state *x,int use_spi,int family) { +struct xfrm_hash_state_ptrs state_ptrs;struct net *net =xs_net (x);u32 mark = x->mark.v & x->mark.m; +xfrm_hash_ptrs_get (net, &state_ptrs); +if (use_spi) -return __xfrm_state_lookup (net, mark, &x->id.daddr, +return __xfrm_state_lookup (&state_ptrs, mark, &x->id.daddr, x->id.spi, x->id.proto, family);else -return __xfrm_state_lookup_byaddr (net, mark, +return __xfrm_state_lookup_byaddr (&state_ptrs, mark, &x->id.daddr, &x->props.saddr, x->id.proto, family);
@@ -1264,6 +1304,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, unsigned short family, u32 if_id) {static xfrm_address_t saddr_wildcard = { }; +struct xfrm_hash_state_ptrs state_ptrs;struct net *net =xp_net (pol);unsigned int h, h_wildcard;struct xfrm_state *x, *x0, *to_put;
@@ -1328,8 +1369,10 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr,else if (acquire_in_progress)/* XXX: acquire_in_progress should not happen */ WARN_ON (1 ); - h =xfrm_dst_hash (net, daddr, saddr, tmpl->reqid, encap_family); -hlist_for_each_entry_rcu (x, net->xfrm.state_bydst + h, bydst) { +xfrm_hash_ptrs_get (net, &state_ptrs); + + h =__xfrm_dst_hash (daddr, saddr, tmpl->reqid, encap_family, state_ptrs.hmask); +hlist_for_each_entry_rcu (x, state_ptrs.bydst + h, bydst) {#ifdef CONFIG_XFRM_OFFLOAD if (pol->xdo.type ==XFRM_DEV_OFFLOAD_PACKET ) {if (x->xso.type !=XFRM_DEV_OFFLOAD_PACKET )
@@ -1362,8 +1405,9 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr,if (best || acquire_in_progress) goto found; - h_wildcard =xfrm_dst_hash (net, daddr, &saddr_wildcard, tmpl->reqid, encap_family); -hlist_for_each_entry_rcu (x, net->xfrm.state_bydst + h_wildcard, bydst) { + h_wildcard =__xfrm_dst_hash (daddr, &saddr_wildcard, tmpl->reqid, + encap_family, state_ptrs.hmask); +hlist_for_each_entry_rcu (x, state_ptrs.bydst + h_wildcard, bydst) {#ifdef CONFIG_XFRM_OFFLOAD if (pol->xdo.type ==XFRM_DEV_OFFLOAD_PACKET ) {if (x->xso.type !=XFRM_DEV_OFFLOAD_PACKET )
@@ -1401,7 +1445,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr,if (!x && !error && !acquire_in_progress) {if (tmpl->id.spi && - (x0 =__xfrm_state_lookup_all (net, mark, daddr, + (x0 =__xfrm_state_lookup_all (&state_ptrs, mark, daddr, tmpl->id.spi, tmpl->id.proto, encap_family, &pol->xdo)) !=NULL ) {
@@ -2179,10 +2223,13 @@ struct xfrm_state * xfrm_state_lookup(struct net *net, u32 mark, const xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family) { + struct xfrm_hash_state_ptrs state_ptrs;struct xfrm_state *x;rcu_read_lock (); - x =__xfrm_state_lookup (net, mark, daddr, spi, proto, family); +xfrm_hash_ptrs_get (net, &state_ptrs); + + x =__xfrm_state_lookup (&state_ptrs, mark, daddr, spi, proto, family);rcu_read_unlock ();return x; }
@@ -2193,10 +2240,14 @@ xfrm_state_lookup_byaddr(struct net *net, u32 mark, const xfrm_address_t *daddr, const xfrm_address_t *saddr, u8 proto, unsigned short family) { + struct xfrm_hash_state_ptrs state_ptrs;struct xfrm_state *x;spin_lock_bh (&net->xfrm.xfrm_state_lock); - x =__xfrm_state_lookup_byaddr (net, mark, daddr, saddr, proto, family); + +xfrm_hash_ptrs_get (net, &state_ptrs); + + x =__xfrm_state_lookup_byaddr (&state_ptrs, mark, daddr, saddr, proto, family);spin_unlock_bh (&net->xfrm.xfrm_state_lock);return x; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 462/590 phy: freescale: fsl-samsung-hdmi: Replace register defines with macro
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 4a5a9e2577d61a4ee3e9788e0c2b0c1cbc5ba7b3 ]
There are 47 registers defined as PHY_REG_xx were xx goes from 00 to
47. Simplify this by replacing them all with a macro which is passed the register number to return the proper register offset.
Stable-dep-of: d567679f2b6a ("phy: freescale: fsl-samsung-hdmi: Clean up fld_tg_code calculation")
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 133 ++++++------------- 1 file changed, 43 insertions(+), 90 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +43 -90
@@ -14,76 +14,29 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> -#define PHY_REG_00 0x00 -#define PHY_REG_01 0x04 -#define PHY_REG_02 0x08 -#define PHY_REG_08 0x20 -#define PHY_REG_09 0x24 -#define PHY_REG_10 0x28 -#define PHY_REG_11 0x2c - -#define PHY_REG_12 0x30 -#define REG12_CK_DIV_MASK GENMASK(5, 4) - -#define PHY_REG_13 0x34 -#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) - -#define PHY_REG_14 0x38 -#define REG14_TOL_MASK GENMASK(7, 4) -#define REG14_RP_CODE_MASK GENMASK(3, 1) -#define REG14_TG_CODE_HIGH_MASK GENMASK(0, 0) - -#define PHY_REG_15 0x3c -#define PHY_REG_16 0x40 -#define PHY_REG_17 0x44 -#define PHY_REG_18 0x48 -#define PHY_REG_19 0x4c -#define PHY_REG_20 0x50 - -#define PHY_REG_21 0x54 -#define REG21_SEL_TX_CK_INV BIT(7) -#define REG21_PMS_S_MASK GENMASK(3, 0) - -#define PHY_REG_22 0x58 -#define PHY_REG_23 0x5c -#define PHY_REG_24 0x60 -#define PHY_REG_25 0x64 -#define PHY_REG_26 0x68 -#define PHY_REG_27 0x6c -#define PHY_REG_28 0x70 -#define PHY_REG_29 0x74 -#define PHY_REG_30 0x78 -#define PHY_REG_31 0x7c -#define PHY_REG_32 0x80 +#define PHY_REG (reg) (reg * 4) +#define REG12_CK_DIV_MASK GENMASK(5, 4) + +#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) + +#define REG14_TOL_MASK GENMASK(7, 4) +#define REG14_RP_CODE_MASK GENMASK(3, 1) +#define REG14_TG_CODE_HIGH_MASK GENMASK(0, 0) + +#define REG21_SEL_TX_CK_INV BIT(7) +#define REG21_PMS_S_MASK GENMASK(3, 0)/* * REG33 does not match the ref manual. According to Sandor Yu from NXP, * "There is a doc issue on the i.MX8MP latest RM" * REG33 is being used per guidance from Sandor */ +#define REG33_MODE_SET_DONE BIT(7) +#define REG33_FIX_DA BIT(1) -#define PHY_REG_33 0x84 -#define REG33_MODE_SET_DONE BIT(7) -#define REG33_FIX_DA BIT(1) - -#define PHY_REG_34 0x88 -#define REG34_PHY_READY BIT(7) -#define REG34_PLL_LOCK BIT(6) -#define REG34_PHY_CLK_READY BIT(5) - -#define PHY_REG_35 0x8c -#define PHY_REG_36 0x90 -#define PHY_REG_37 0x94 -#define PHY_REG_38 0x98 -#define PHY_REG_39 0x9c -#define PHY_REG_40 0xa0 -#define PHY_REG_41 0xa4 -#define PHY_REG_42 0xa8 -#define PHY_REG_43 0xac -#define PHY_REG_44 0xb0 -#define PHY_REG_45 0xb4 -#define PHY_REG_46 0xb8 -#define PHY_REG_47 0xbc +#define REG34_PHY_READY BIT(7) +#define REG34_PLL_LOCK BIT(6) +#define REG34_PHY_CLK_READY BIT(5)#define PHY_PLL_DIV_REGS_NUM 6
@@ -369,29 +322,29 @@ struct reg_settings { };static const struct reg_settings common_phy_cfg[] = { - {PHY_REG_00 ,0x00 }, {PHY_REG_01 ,0xd1 }, - {PHY_REG_08 ,0x4f }, {PHY_REG_09 ,0x30 }, - {PHY_REG_10 ,0x33 }, {PHY_REG_11 ,0x65 }, + {PHY_REG (0 ),0x00 }, {PHY_REG (1 ),0xd1 }, + {PHY_REG (8 ),0x4f }, {PHY_REG (9 ),0x30 }, + {PHY_REG (10 ),0x33 }, {PHY_REG (11 ),0x65 },/* REG12 pixclk specific */ /* REG13 pixclk specific */ /* REG14 pixclk specific */ - {PHY_REG_15 ,0x80 }, {PHY_REG_16 ,0x6c }, - {PHY_REG_17 ,0xf2 }, {PHY_REG_18 ,0x67 }, - {PHY_REG_19 ,0x00 }, {PHY_REG_20 ,0x10 }, + {PHY_REG (15 ),0x80 }, {PHY_REG (16 ),0x6c }, + {PHY_REG (17 ),0xf2 }, {PHY_REG (18 ),0x67 }, + {PHY_REG (19 ),0x00 }, {PHY_REG (20 ),0x10 },/* REG21 pixclk specific */ - {PHY_REG_22 ,0x30 }, {PHY_REG_23 ,0x32 }, - {PHY_REG_24 ,0x60 }, {PHY_REG_25 ,0x8f }, - {PHY_REG_26 ,0x00 }, {PHY_REG_27 ,0x00 }, - {PHY_REG_28 ,0x08 }, {PHY_REG_29 ,0x00 }, - {PHY_REG_30 ,0x00 }, {PHY_REG_31 ,0x00 }, - {PHY_REG_32 ,0x00 }, {PHY_REG_33 ,0x80 }, - {PHY_REG_34 ,0x00 }, {PHY_REG_35 ,0x00 }, - {PHY_REG_36 ,0x00 }, {PHY_REG_37 ,0x00 }, - {PHY_REG_38 ,0x00 }, {PHY_REG_39 ,0x00 }, - {PHY_REG_40 ,0x00 }, {PHY_REG_41 ,0xe0 }, - {PHY_REG_42 ,0x83 }, {PHY_REG_43 ,0x0f }, - {PHY_REG_44 ,0x3E }, {PHY_REG_45 ,0xf8 }, - {PHY_REG_46 ,0x00 }, {PHY_REG_47 ,0x00 } + {PHY_REG (22 ),0x30 }, {PHY_REG (23 ),0x32 }, + {PHY_REG (24 ),0x60 }, {PHY_REG (25 ),0x8f }, + {PHY_REG (26 ),0x00 }, {PHY_REG (27 ),0x00 }, + {PHY_REG (28 ),0x08 }, {PHY_REG (29 ),0x00 }, + {PHY_REG (30 ),0x00 }, {PHY_REG (31 ),0x00 }, + {PHY_REG (32 ),0x00 }, {PHY_REG (33 ),0x80 }, + {PHY_REG (34 ),0x00 }, {PHY_REG (35 ),0x00 }, + {PHY_REG (36 ),0x00 }, {PHY_REG (37 ),0x00 }, + {PHY_REG (38 ),0x00 }, {PHY_REG (39 ),0x00 }, + {PHY_REG (40 ),0x00 }, {PHY_REG (41 ),0xe0 }, + {PHY_REG (42 ),0x83 }, {PHY_REG (43 ),0x0f }, + {PHY_REG (44 ),0x3E }, {PHY_REG (45 ),0xf8 }, + {PHY_REG (46 ),0x00 }, {PHY_REG (47 ),0x00 } };struct fsl_samsung_hdmi_phy {
@@ -442,7 +395,7 @@ fsl_samsung_hdmi_phy_configure_pixclk(struct fsl_samsung_hdmi_phy *phy, }writeb (REG21_SEL_TX_CK_INV |FIELD_PREP (REG21_PMS_S_MASK , div), - phy->regs +PHY_REG_21 ); + phy->regs +PHY_REG (21 )); } static void
@@ -469,7 +422,7 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,break ; } -writeb (FIELD_PREP (REG12_CK_DIV_MASK ,ilog2 (div)), phy->regs +PHY_REG_12 ); +writeb (FIELD_PREP (REG12_CK_DIV_MASK ,ilog2 (div)), phy->regs +PHY_REG (12 ));/* * Calculation for the frequency lock detector target code (fld_tg_code)
@@ -489,11 +442,11 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,/* FLD_TOL and FLD_RP_CODE taken from downstream driver */ writeb (FIELD_PREP (REG13_TG_CODE_LOW_MASK , fld_tg_code), - phy->regs +PHY_REG_13 ); + phy->regs +PHY_REG (13 ));writeb (FIELD_PREP (REG14_TOL_MASK ,2 ) |FIELD_PREP (REG14_RP_CODE_MASK ,2 ) |FIELD_PREP (REG14_TG_CODE_HIGH_MASK , fld_tg_code >>8 ), - phy->regs +PHY_REG_14 ); + phy->regs +PHY_REG (14 )); } static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,
@@ -503,7 +456,7 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,u8 val;/* HDMI PHY init */ -writeb (REG33_FIX_DA , phy->regs +PHY_REG_33 ); +writeb (REG33_FIX_DA , phy->regs +PHY_REG (33 ));/* common PHY registers */ for (i =0 ; i <ARRAY_SIZE (common_phy_cfg); i++)
@@ -511,14 +464,14 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,/* set individual PLL registers PHY_REG2 ... PHY_REG7 */ for (i =0 ; i <PHY_PLL_DIV_REGS_NUM ; i++) -writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG_02 + i *4 ); +writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (2 ) + i *4 );fsl_samsung_hdmi_phy_configure_pixclk (phy, cfg);fsl_samsung_hdmi_phy_configure_pll_lock_det (phy, cfg); -writeb (REG33_FIX_DA |REG33_MODE_SET_DONE , phy->regs +PHY_REG_33 ); +writeb (REG33_FIX_DA |REG33_MODE_SET_DONE , phy->regs +PHY_REG (33 )); - ret =readb_poll_timeout (phy->regs +PHY_REG_34 , val, + ret =readb_poll_timeout (phy->regs +PHY_REG (34 ), val, val ®34_PLL_LOCK ,50 ,20000 );if (ret)dev_err (phy->dev,"PLL failed to lock\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 463/590 phy: freescale: fsl-samsung-hdmi: Simplify REG21_PMS_S_MASK lookup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 375ee44adb3640099508c5c0c01d86f0bdb16e97 ]
The value of 'S' is writen to two places, PHY_REG3[7:4] and PHY_REG21[3:0]. There is a lookup table which contains the value of PHY_REG3. Rather than using a switch statement based on the pixel clock to search for the value of 'S' again, just shift the contents of PHY_REG3[7:4] >> 4 and place the value in PHY_REG21[3:0]. Doing this can eliminate an entire function.
Stable-dep-of: d567679f2b6a ("phy: freescale: fsl-samsung-hdmi: Clean up fld_tg_code calculation")
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 39 ++------------------ 1 file changed, 4 insertions(+), 35 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +4 -35
@@ -364,40 +364,6 @@ to_fsl_samsung_hdmi_phy(struct clk_hw *hw) return container_of(hw, struct fsl_samsung_hdmi_phy, hw); } -static void -fsl_samsung_hdmi_phy_configure_pixclk (struct fsl_samsung_hdmi_phy *phy, -const struct phy_config *cfg) -{ -u8 div =0x1 ; - -switch (cfg->pixclk) { - case 22250000 ... 33750000: - div =0xf ; -break ; - case 35000000 ... 40000000: - div =0xb ; -break ; - case 43200000 ... 47500000: - div =0x9 ; -break ; - case 50349650 ... 63500000: - div =0x7 ; -break ; - case 67500000 ... 90000000: - div =0x5 ; -break ; - case 94000000 ... 148500000: - div =0x3 ; -break ; - case 154000000 ... 297000000: - div =0x1 ; -break ; - } - -writeb (REG21_SEL_TX_CK_INV |FIELD_PREP (REG21_PMS_S_MASK , div), - phy->regs +PHY_REG (21 )); -} -static void fsl_samsung_hdmi_phy_configure_pll_lock_det (struct fsl_samsung_hdmi_phy *phy,const struct phy_config *cfg)
@@ -466,7 +432,10 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,for (i =0 ; i <PHY_PLL_DIV_REGS_NUM ; i++)writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (2 ) + i *4 ); -fsl_samsung_hdmi_phy_configure_pixclk (phy, cfg); +/* High nibble of pll_div_regs[1] contains S which also gets written to REG21 */ +writeb (REG21_SEL_TX_CK_INV |FIELD_PREP (REG21_PMS_S_MASK , + cfg->pll_div_regs[1 ] >>4 ), phy->regs +PHY_REG (21 )); +fsl_samsung_hdmi_phy_configure_pll_lock_det (phy, cfg);writeb (REG33_FIX_DA |REG33_MODE_SET_DONE , phy->regs +PHY_REG (33 ));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 464/590 phy: freescale: fsl-samsung-hdmi: Support dynamic integer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 1951dbb41d1dff7c135eed4fa1a6330df6971549 ]
There is currently a look-up table for a variety of resolutions. Since the phy has the ability to dynamically calculate the values necessary to use the intger divider which should allow more resolutions without having to update the look-up-table.
If the lookup table cannot find an exact match, fall back to the dynamic calculator of the integer divider.
Previously, the value of P was hard-coded to 1, this required an update to the phy_pll_cfg table to add in the extra value into the table, so if the value of P is calculated to be something else by the PMS calculator, the calculated_phy_pll_cfg structure can be used instead without having to keep track of which method was used.
Stable-dep-of: d567679f2b6a ("phy: freescale: fsl-samsung-hdmi: Clean up fld_tg_code calculation")
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 377 +++++++++++++------ 1 file changed, 270 insertions(+), 107 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +270 -107
@@ -16,6 +16,8 @@#define PHY_REG (reg) (reg * 4) +#define REG01_PMS_P_MASK GENMASK(3, 0) +#define REG03_PMS_S_MASK GENMASK(7, 4)#define REG12_CK_DIV_MASK GENMASK(5, 4)#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0)
@@ -38,281 +40,296 @@#define REG34_PLL_LOCK BIT(6)#define REG34_PHY_CLK_READY BIT(5) -#define PHY_PLL_DIV_REGS_NUM 6 +#ifndef MHZ +#define MHZ (1000UL * 1000UL) +#endif + +#define PHY_PLL_DIV_REGS_NUM 7struct phy_config {u32 pixclk;u8 pll_div_regs[PHY_PLL_DIV_REGS_NUM ]; }; +/* +* The calculated_phy_pll_cfg only handles integer divider for PMS, +* meaning the last four entries will be fixed, but the first three will +* be calculated by the PMS calculator. +*/ +static struct phy_config calculated_phy_pll_cfg = { + .pixclk =0 , + .pll_div_regs = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x80 ,0x00 }, +}; + +/* The lookup table contains values for which the fractional divder is used */ static const struct phy_config phy_pll_cfg[] = { { .pixclk =22250000 , - .pll_div_regs = {0x4b ,0xf1 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4b ,0xf1 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =23750000 , - .pll_div_regs = {0x50 ,0xf1 ,0x86 ,0x85 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf1 ,0x86 ,0x85 ,0x80 ,0x40 }, }, { .pixclk =24000000 , - .pll_div_regs = {0x50 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =24024000 , - .pll_div_regs = {0x50 ,0xf1 ,0x99 ,0x02 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0xf1 ,0x99 ,0x02 ,0x80 ,0x40 }, }, { .pixclk =25175000 , - .pll_div_regs = {0x54 ,0xfc ,0xcc ,0x91 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0xfc ,0xcc ,0x91 ,0x80 ,0x40 }, }, { .pixclk =25200000 , - .pll_div_regs = {0x54 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =26750000 , - .pll_div_regs = {0x5a ,0xf2 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf2 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =27000000 , - .pll_div_regs = {0x5a ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =27027000 , - .pll_div_regs = {0x5a ,0xf2 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xf2 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =29500000 , - .pll_div_regs = {0x62 ,0xf4 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0xf4 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =30750000 , - .pll_div_regs = {0x66 ,0xf4 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0xf4 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =30888000 , - .pll_div_regs = {0x66 ,0xf4 ,0x99 ,0x18 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0xf4 ,0x99 ,0x18 ,0x88 ,0x45 }, }, { .pixclk =33750000 , - .pll_div_regs = {0x70 ,0xf4 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0xf4 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =35000000 , - .pll_div_regs = {0x58 ,0xb8 ,0x8b ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x58 ,0xb8 ,0x8b ,0x88 ,0x80 ,0x40 }, }, { .pixclk =36000000 , - .pll_div_regs = {0x5a ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =36036000 , - .pll_div_regs = {0x5a ,0xb2 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0xb2 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =40000000 , - .pll_div_regs = {0x64 ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x64 ,0xb0 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =43200000 , - .pll_div_regs = {0x5a ,0x90 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x90 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =43243200 , - .pll_div_regs = {0x5a ,0x92 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x92 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =44500000 , - .pll_div_regs = {0x5c ,0x92 ,0x98 ,0x11 ,0x84 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5c ,0x92 ,0x98 ,0x11 ,0x84 ,0x41 }, }, { .pixclk =47000000 , - .pll_div_regs = {0x62 ,0x94 ,0x95 ,0x82 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x94 ,0x95 ,0x82 ,0x80 ,0x40 }, }, { .pixclk =47500000 , - .pll_div_regs = {0x63 ,0x96 ,0xa1 ,0x82 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x63 ,0x96 ,0xa1 ,0x82 ,0x80 ,0x40 }, }, { .pixclk =50349650 , - .pll_div_regs = {0x54 ,0x7c ,0xc3 ,0x8f ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x7c ,0xc3 ,0x8f ,0x80 ,0x40 }, }, { .pixclk =50400000 , - .pll_div_regs = {0x54 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =53250000 , - .pll_div_regs = {0x58 ,0x72 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x72 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =53500000 , - .pll_div_regs = {0x5a ,0x72 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x72 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =54000000 , - .pll_div_regs = {0x5a ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =54054000 , - .pll_div_regs = {0x5a ,0x72 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x72 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =59000000 , - .pll_div_regs = {0x62 ,0x74 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x74 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =59340659 , - .pll_div_regs = {0x62 ,0x74 ,0xdb ,0x52 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x62 ,0x74 ,0xdb ,0x52 ,0x88 ,0x47 }, }, { .pixclk =59400000 , - .pll_div_regs = {0x63 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x70 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =61500000 , - .pll_div_regs = {0x66 ,0x74 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x74 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =63500000 , - .pll_div_regs = {0x69 ,0x74 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x74 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =67500000 , - .pll_div_regs = {0x54 ,0x52 ,0x87 ,0x03 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x52 ,0x87 ,0x03 ,0x80 ,0x40 }, }, { .pixclk =70000000 , - .pll_div_regs = {0x58 ,0x58 ,0x8b ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x58 ,0x58 ,0x8b ,0x88 ,0x80 ,0x40 }, }, { .pixclk =72000000 , - .pll_div_regs = {0x5a ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =72072000 , - .pll_div_regs = {0x5a ,0x52 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x52 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =74176000 , - .pll_div_regs = {0x5d ,0x58 ,0xdb ,0xA2 ,0x88 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5d ,0x58 ,0xdb ,0xA2 ,0x88 ,0x41 }, }, { .pixclk =74250000 , - .pll_div_regs = {0x5c ,0x52 ,0x90 ,0x0d ,0x84 ,0x41 }, + .pll_div_regs = {0xd1 ,0x5c ,0x52 ,0x90 ,0x0d ,0x84 ,0x41 }, }, { .pixclk =78500000 , - .pll_div_regs = {0x62 ,0x54 ,0x87 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x54 ,0x87 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =80000000 , - .pll_div_regs = {0x64 ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x64 ,0x50 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =82000000 , - .pll_div_regs = {0x66 ,0x54 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x54 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =82500000 , - .pll_div_regs = {0x67 ,0x54 ,0x88 ,0x01 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x67 ,0x54 ,0x88 ,0x01 ,0x90 ,0x49 }, }, { .pixclk =89000000 , - .pll_div_regs = {0x70 ,0x54 ,0x84 ,0x83 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x54 ,0x84 ,0x83 ,0x80 ,0x40 }, }, { .pixclk =90000000 , - .pll_div_regs = {0x70 ,0x54 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x54 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =94000000 , - .pll_div_regs = {0x4e ,0x32 ,0xa7 ,0x10 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x32 ,0xa7 ,0x10 ,0x80 ,0x40 }, }, { .pixclk =95000000 , - .pll_div_regs = {0x50 ,0x31 ,0x86 ,0x85 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x50 ,0x31 ,0x86 ,0x85 ,0x80 ,0x40 }, }, { .pixclk =98901099 , - .pll_div_regs = {0x52 ,0x3a ,0xdb ,0x4c ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x3a ,0xdb ,0x4c ,0x88 ,0x47 }, }, { .pixclk =99000000 , - .pll_div_regs = {0x52 ,0x32 ,0x82 ,0x01 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x32 ,0x82 ,0x01 ,0x88 ,0x47 }, }, { .pixclk =100699300 , - .pll_div_regs = {0x54 ,0x3c ,0xc3 ,0x8f ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x54 ,0x3c ,0xc3 ,0x8f ,0x80 ,0x40 }, }, { .pixclk =100800000 , - .pll_div_regs = {0x54 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x54 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =102500000 , - .pll_div_regs = {0x55 ,0x32 ,0x8c ,0x05 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x55 ,0x32 ,0x8c ,0x05 ,0x90 ,0x4b }, }, { .pixclk =104750000 , - .pll_div_regs = {0x57 ,0x32 ,0x98 ,0x07 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x57 ,0x32 ,0x98 ,0x07 ,0x90 ,0x49 }, }, { .pixclk =106500000 , - .pll_div_regs = {0x58 ,0x32 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x32 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =107000000 , - .pll_div_regs = {0x5a ,0x32 ,0x89 ,0x88 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x32 ,0x89 ,0x88 ,0x80 ,0x40 }, }, { .pixclk =108000000 , - .pll_div_regs = {0x5a ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =108108000 , - .pll_div_regs = {0x5a ,0x32 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x32 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =118000000 , - .pll_div_regs = {0x62 ,0x34 ,0x95 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x62 ,0x34 ,0x95 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =118800000 , - .pll_div_regs = {0x63 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =123000000 , - .pll_div_regs = {0x66 ,0x34 ,0x82 ,0x01 ,0x88 ,0x45 }, + .pll_div_regs = {0xd1 ,0x66 ,0x34 ,0x82 ,0x01 ,0x88 ,0x45 }, }, { .pixclk =127000000 , - .pll_div_regs = {0x69 ,0x34 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x34 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =135000000 , - .pll_div_regs = {0x70 ,0x34 ,0x82 ,0x01 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x70 ,0x34 ,0x82 ,0x01 ,0x80 ,0x40 }, }, { .pixclk =135580000 , - .pll_div_regs = {0x71 ,0x39 ,0xe9 ,0x82 ,0x9c ,0x5b }, + .pll_div_regs = {0xd1 ,0x71 ,0x39 ,0xe9 ,0x82 ,0x9c ,0x5b }, }, { .pixclk =137520000 , - .pll_div_regs = {0x72 ,0x38 ,0x99 ,0x10 ,0x85 ,0x41 }, + .pll_div_regs = {0xd1 ,0x72 ,0x38 ,0x99 ,0x10 ,0x85 ,0x41 }, }, { .pixclk =138750000 , - .pll_div_regs = {0x73 ,0x35 ,0x88 ,0x05 ,0x90 ,0x4d }, + .pll_div_regs = {0xd1 ,0x73 ,0x35 ,0x88 ,0x05 ,0x90 ,0x4d }, }, { .pixclk =140000000 , - .pll_div_regs = {0x75 ,0x36 ,0xa7 ,0x90 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x75 ,0x36 ,0xa7 ,0x90 ,0x80 ,0x40 }, }, { .pixclk =144000000 , - .pll_div_regs = {0x78 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x78 ,0x30 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =148352000 , - .pll_div_regs = {0x7b ,0x35 ,0xdb ,0x39 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x35 ,0xdb ,0x39 ,0x90 ,0x45 }, }, { .pixclk =148500000 , - .pll_div_regs = {0x7b ,0x35 ,0x84 ,0x03 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x35 ,0x84 ,0x03 ,0x90 ,0x45 }, }, { .pixclk =154000000 , - .pll_div_regs = {0x40 ,0x18 ,0x83 ,0x01 ,0x00 ,0x40 }, + .pll_div_regs = {0xd1 ,0x40 ,0x18 ,0x83 ,0x01 ,0x00 ,0x40 }, }, { .pixclk =157000000 , - .pll_div_regs = {0x41 ,0x11 ,0xa7 ,0x14 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x41 ,0x11 ,0xa7 ,0x14 ,0x80 ,0x40 }, }, { .pixclk =160000000 , - .pll_div_regs = {0x42 ,0x12 ,0xa1 ,0x20 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x42 ,0x12 ,0xa1 ,0x20 ,0x80 ,0x40 }, }, { .pixclk =162000000 , - .pll_div_regs = {0x43 ,0x18 ,0x8b ,0x08 ,0x96 ,0x55 }, + .pll_div_regs = {0xd1 ,0x43 ,0x18 ,0x8b ,0x08 ,0x96 ,0x55 }, }, { .pixclk =164000000 , - .pll_div_regs = {0x45 ,0x11 ,0x83 ,0x82 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x45 ,0x11 ,0x83 ,0x82 ,0x90 ,0x4b }, }, { .pixclk =165000000 , - .pll_div_regs = {0x45 ,0x11 ,0x84 ,0x81 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x45 ,0x11 ,0x84 ,0x81 ,0x90 ,0x4b }, }, { .pixclk =180000000 , - .pll_div_regs = {0x4b ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x4b ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =185625000 , - .pll_div_regs = {0x4e ,0x12 ,0x9a ,0x95 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x12 ,0x9a ,0x95 ,0x80 ,0x40 }, }, { .pixclk =188000000 , - .pll_div_regs = {0x4e ,0x12 ,0xa7 ,0x10 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x4e ,0x12 ,0xa7 ,0x10 ,0x80 ,0x40 }, }, { .pixclk =198000000 , - .pll_div_regs = {0x52 ,0x12 ,0x82 ,0x01 ,0x88 ,0x47 }, + .pll_div_regs = {0xd1 ,0x52 ,0x12 ,0x82 ,0x01 ,0x88 ,0x47 }, }, { .pixclk =205000000 , - .pll_div_regs = {0x55 ,0x12 ,0x8c ,0x05 ,0x90 ,0x4b }, + .pll_div_regs = {0xd1 ,0x55 ,0x12 ,0x8c ,0x05 ,0x90 ,0x4b }, }, { .pixclk =209500000 , - .pll_div_regs = {0x57 ,0x12 ,0x98 ,0x07 ,0x90 ,0x49 }, + .pll_div_regs = {0xd1 ,0x57 ,0x12 ,0x98 ,0x07 ,0x90 ,0x49 }, }, { .pixclk =213000000 , - .pll_div_regs = {0x58 ,0x12 ,0x84 ,0x03 ,0x82 ,0x41 }, + .pll_div_regs = {0xd1 ,0x58 ,0x12 ,0x84 ,0x03 ,0x82 ,0x41 }, }, { .pixclk =216000000 , - .pll_div_regs = {0x5a ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x5a ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =216216000 , - .pll_div_regs = {0x5a ,0x12 ,0xfd ,0x0c ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x5a ,0x12 ,0xfd ,0x0c ,0x80 ,0x40 }, }, { .pixclk =237600000 , - .pll_div_regs = {0x63 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x63 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =254000000 , - .pll_div_regs = {0x69 ,0x14 ,0x89 ,0x08 ,0x80 ,0x40 }, + .pll_div_regs = {0xd1 ,0x69 ,0x14 ,0x89 ,0x08 ,0x80 ,0x40 }, }, { .pixclk =277500000 , - .pll_div_regs = {0x73 ,0x15 ,0x88 ,0x05 ,0x90 ,0x4d }, + .pll_div_regs = {0xd1 ,0x73 ,0x15 ,0x88 ,0x05 ,0x90 ,0x4d }, }, { .pixclk =288000000 , - .pll_div_regs = {0x78 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, + .pll_div_regs = {0xd1 ,0x78 ,0x10 ,0x00 ,0x00 ,0x80 ,0x00 }, }, { .pixclk =297000000 , - .pll_div_regs = {0x7b ,0x15 ,0x84 ,0x03 ,0x90 ,0x45 }, + .pll_div_regs = {0xd1 ,0x7b ,0x15 ,0x84 ,0x03 ,0x90 ,0x45 }, }, };
@@ -322,7 +339,8 @@ struct reg_settings { };static const struct reg_settings common_phy_cfg[] = { - {PHY_REG (0 ),0x00 }, {PHY_REG (1 ),0xd1 }, + {PHY_REG (0 ),0x00 }, +/* PHY_REG(1-7) pix clk specific */ {PHY_REG (8 ),0x4f }, {PHY_REG (9 ),0x30 }, {PHY_REG (10 ),0x33 }, {PHY_REG (11 ),0x65 },/* REG12 pixclk specific */
@@ -415,6 +433,83 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, phy->regs + PHY_REG(14)); } +static unsigned long fsl_samsung_hdmi_phy_find_pms (unsigned long fout,u8 *p,u16 *m,u8 *s) +{ +unsigned long best_freq =0 ; +u32 min_delta =0xffffffff ; +u8 _p, best_p; +u16 _m, best_m; +u8 _s, best_s; + +/* +* Figure 13-78 of the reference manual states the PLL should be TMDS x 5 +* while the TMDS_CLKO should be the PLL / 5. So to calculate the PLL, +* take the pix clock x 5, then return the value of the PLL / 5. +*/ + fout *=5 ; + +/* The ref manual states the values of 'P' range from 1 to 11 */ +for (_p =1 ; _p <=11 ; ++_p) { +for (_s =1 ; _s <=16 ; ++_s) { +u64 tmp; +u32 delta; + +/* s must be one or even */ +if (_s >1 && (_s &0x01 ) ==1 ) + _s++; + +/* _s cannot be 14 per the TRM */ +if (_s ==14 ) +continue ; + +/* +* TODO: Ref Manual doesn't state the range of _m +* so this should be further refined if possible. +* This range was set based on the original values +* in the lookup table +*/ + tmp = (u64 )fout * (_p * _s); +do_div (tmp,24 *MHZ ); + _m = tmp; +if (_m <0x30 || _m >0x7b ) +continue ; + +/* +* Rev 2 of the Ref Manual states the +* VCO can range between 750MHz and +* 3GHz. The VCO is assumed to be +* Fvco = (M * f_ref) / P, +* where f_ref is 24MHz. +*/ + tmp = (u64 )_m *24 *MHZ ; +do_div (tmp, _p); +if (tmp <750 *MHZ || + tmp >3000 *MHZ ) +continue ; + +/* Final frequency after post-divider */ +do_div (tmp, _s); + + delta =abs (fout - tmp); +if (delta < min_delta) { + best_p = _p; + best_s = _s; + best_m = _m; + min_delta = delta; + best_freq = tmp; + } + } + } + +if (best_freq) { + *p = best_p; + *m = best_m; + *s = best_s; + } + +return best_freq /5 ; +} +static int fsl_samsung_hdmi_phy_configure (struct fsl_samsung_hdmi_phy *phy,const struct phy_config *cfg) {
@@ -428,13 +523,13 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,for (i =0 ; i <ARRAY_SIZE (common_phy_cfg); i++)writeb (common_phy_cfg[i].val, phy->regs + common_phy_cfg[i].reg); -/* set individual PLL registers PHY_REG2 ... PHY_REG7 */ +/* set individual PLL registers PHY_REG1 ... PHY_REG7 */ for (i =0 ; i <PHY_PLL_DIV_REGS_NUM ; i++) -writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (2 ) + i *4 ); +writeb (cfg->pll_div_regs[i], phy->regs +PHY_REG (1 ) + i *4 ); -/* High nibble of pll_div_regs[1] contains S which also gets written to REG21 */ +/* High nibble of PHY_REG3 and low nibble of PHY_REG21 both contain 'S' */ writeb (REG21_SEL_TX_CK_INV |FIELD_PREP (REG21_PMS_S_MASK , - cfg->pll_div_regs[1 ] >>4 ), phy->regs +PHY_REG (21 )); + cfg->pll_div_regs[2 ] >>4 ), phy->regs +PHY_REG (21 ));fsl_samsung_hdmi_phy_configure_pll_lock_det (phy, cfg);
@@ -459,34 +554,102 @@ static unsigned long phy_clk_recalc_rate(struct clk_hw *hw,return phy->cur_cfg->pixclk; } -static long phy_clk_round_rate (struct clk_hw *hw, -unsigned long rate,unsigned long *parent_rate) +/* Helper function to lookup the available fractional-divider rate */ +static const struct phy_config *fsl_samsung_hdmi_phy_lookup_rate (unsigned long rate) {int i; +/* Search the lookup table */ for (i =ARRAY_SIZE (phy_pll_cfg) -1 ; i >=0 ; i--)if (phy_pll_cfg[i].pixclk <= rate) -return phy_pll_cfg[i].pixclk; +break ; + +return &phy_pll_cfg[i]; +} + +static void fsl_samsung_hdmi_calculate_phy (struct phy_config *cal_phy,unsigned long rate, +u8 p,u16 m,u8 s) +{ + cal_phy->pixclk = rate; + cal_phy->pll_div_regs[0 ] =FIELD_PREP (REG01_PMS_P_MASK , p); + cal_phy->pll_div_regs[1 ] = m; + cal_phy->pll_div_regs[2 ] =FIELD_PREP (REG03_PMS_S_MASK , s-1 ); +/* pll_div_regs 3-6 are fixed and pre-defined already */ +} + +static long phy_clk_round_rate (struct clk_hw *hw, +unsigned long rate,unsigned long *parent_rate) +{ +const struct phy_config *fract_div_phy; +u32 int_div_clk; +u16 m; +u8 p, s; + +/* If the clock is out of range return error instead of searching */ +if (rate >297000000 || rate <22250000 ) +return -EINVAL ; + +/* Search the fractional divider lookup table */ + fract_div_phy =fsl_samsung_hdmi_phy_lookup_rate (rate); -return -EINVAL ; +/* If the rate is an exact match, return that value */ +if (rate == fract_div_phy->pixclk) +return fract_div_phy->pixclk; + +/* If the exact match isn't found, calculate the integer divider */ + int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); + +/* If the int_div_clk rate is an exact match, return that value */ +if (int_div_clk == rate) +return int_div_clk; + +/* If neither rate is an exact match, use the value from the LUT */ +return fract_div_phy->pixclk; +} + +static int phy_use_fract_div (struct fsl_samsung_hdmi_phy *phy,const struct phy_config *fract_div_phy) +{ + phy->cur_cfg = fract_div_phy; +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: using fractional divider rate = %u\n" , + phy->cur_cfg->pixclk); +return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); }static int phy_clk_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long parent_rate) {struct fsl_samsung_hdmi_phy *phy =to_fsl_samsung_hdmi_phy (hw); -int i; +const struct phy_config *fract_div_phy; +u32 int_div_clk; +u16 m; +u8 p, s; -for (i =ARRAY_SIZE (phy_pll_cfg) -1 ; i >=0 ; i--) -if (phy_pll_cfg[i].pixclk <= rate) -break ; +/* Search the fractional divider lookup table */ + fract_div_phy =fsl_samsung_hdmi_phy_lookup_rate (rate); -if (i <0 ) -return -EINVAL ; +/* If the rate is an exact match, use that value */ +if (fract_div_phy->pixclk == rate) +return phy_use_fract_div (phy, fract_div_phy); - phy->cur_cfg = &phy_pll_cfg[i]; +/* +* If the rate from the fractional divider is not exact, check the integer divider, +* and use it if that value is an exact match. +*/ + int_div_clk =fsl_samsung_hdmi_phy_find_pms (rate, &p, &m, &s); +if (int_div_clk == rate) { +dev_dbg (phy->dev,"fsl_samsung_hdmi_phy: integer divider rate = %u\n" , + int_div_clk); + +fsl_samsung_hdmi_calculate_phy (&calculated_phy_pll_cfg, int_div_clk, p, m, s); + phy->cur_cfg = &calculated_phy_pll_cfg; +return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); + } -return fsl_samsung_hdmi_phy_configure (phy, phy->cur_cfg); +/* +* If neither the fractional divider nor the integer divider can find an exact value +* fall back to using the fractional divider +*/ +return phy_use_fract_div (phy, fract_div_phy); }static const struct clk_ops phy_clk_ops = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 465/590 phy: freescale: fsl-samsung-hdmi: Clean up fld_tg_code calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit d567679f2b6a8bcea20589bbea6488c0236886cd ]
Currently, the calcuation for fld_tg_code is based on a lookup table, but there are gaps in the lookup table, and frequencies in these gaps may not properly use the correct divider. Based on the description of FLD_CK_DIV, the internal PLL frequency should be less than 50 MHz, so directly calcuate the value of FLD_CK_DIV from pixclk. This allow for proper calcuation of any pixel clock and eliminates a few gaps in the LUT.
Since the value of the int_pllclk is in Hz, do the fixed-point math in Hz to achieve a more accurate value and reduces the complexity of the caluation to 24MHz * (256 / int_pllclk).
--- drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 32 +++++++------------- 1 file changed, 11 insertions(+), 21 deletions(-)
drivers/phy/freescale/phy-fsl-samsung-hdmi.c +11 -21
@@ -388,25 +388,17 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, {u32 pclk = cfg->pixclk;u32 fld_tg_code; -u32 pclk_khz; -u8 div =1 ; - -switch (cfg->pixclk) { - case 22250000 ... 47500000: - div =1 ; -break ; - case 50349650 ... 99000000: - div =2 ; -break ; - case 100699300 ... 198000000: - div =4 ; -break ; - case 205000000 ... 297000000: - div =8 ; -break ; +u32 int_pllclk; +u8 div; + +/* Find int_pllclk speed */ +for (div =0 ; div <4 ; div++) { + int_pllclk = pclk / (1 << div); +if (int_pllclk < (50 *MHZ )) +break ; } -writeb (FIELD_PREP (REG12_CK_DIV_MASK ,ilog2 (div)), phy->regs +PHY_REG (12 )); +writeb (FIELD_PREP (REG12_CK_DIV_MASK , div), phy->regs +PHY_REG (12 ));/* * Calculation for the frequency lock detector target code (fld_tg_code)
@@ -419,10 +411,8 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,* settings rounding up always too. TODO: Check if that is * correct. */ - pclk /= div; - pclk_khz = pclk /1000 ; - fld_tg_code =256 *1000 *1000 / pclk_khz *24 ; - fld_tg_code =DIV_ROUND_UP (fld_tg_code,1000 ); + + fld_tg_code =DIV_ROUND_UP (24 *MHZ *256 , int_pllclk);/* FLD_TOL and FLD_RP_CODE taken from downstream driver */ writeb(FIELD_PREP(REG13_TG_CODE_LOW_MASK, fld_tg_code),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 466/590 dmaengine: ti: edma: fix OF node reference leaks in edma_driver
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Hattori <[email protected]>
[ Upstream commit e883c64778e5a9905fce955681f8ee38c7197e0f ]
The .probe() of edma_driver calls of_parse_phandle_with_fixed_args() but does not release the obtained OF nodes. Thus add a of_node_put() call.
This bug was found by an experimental verification tool that I am developing.
--- drivers/dma/ti/edma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/dma/ti/edma.c +1 -2
@@ -208,7 +208,6 @@ struct edma_desc {struct edma_cc ;struct edma_tc { -struct device_node *node;u16 id; };
@@ -2466,13 +2465,13 @@ static int edma_probe(struct platform_device *pdev)if (ret || i == ecc->num_tc)break ; - ecc->tc_list[i].node = tc_args.np; ecc->tc_list[i].id = i; queue_priority_mapping[i][1 ] = tc_args.args[0 ];if (queue_priority_mapping[i][1 ] > lowest_priority) { lowest_priority = queue_priority_mapping[i][1 ]; info->default_queue = i; } +of_node_put (tc_args.np); }/* See if we have optional dma-channel-mask array */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 467/590 xfrm: delete intermediate secpath entry in packet offload mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Cassen <[email protected]>
[ Upstream commit 600258d555f0710b9c47fb78d2d80a4aecd608cc ]
Packets handled by hardware have added secpath as a way to inform XFRM core code that this path was already handled. That secpath is not needed at all after policy is checked and it is removed later in the stack.
However, in the case of IP forwarding is enabled (/proc/sys/net/ipv4/ip_forward), that secpath is not removed and packets which already were handled are reentered to the driver TX path with xfrm_offload set.
The following kernel panic is observed in mlx5 in such case:
mlx5_core 0000:04:00.0 enp4s0f0np0: Link up
mlx5_core 0000:04:00.1 enp4s0f1np1: Link up
Initializing XFRM netlink socket
IPsec XFRM device driver
BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor instruction fetch in kernel mode #PF: error_code(0x0010) - not-present page PGD 0 P4D 0 Oops: Oops: 0010 [#1] PREEMPT SMP CPU: 0 UID: 0 PID: 0 Comm: swapper/0 Not tainted 6.13.0-rc1-alex #3 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:0x0 Code: Unable to access opcode bytes at 0xffffffffffffffd6. RSP: 0018:ffffb87380003800 EFLAGS: 00010206 RAX: ffff8df004e02600 RBX: ffffb873800038d8 RCX: 00000000ffff98cf RDX: ffff8df00733e108 RSI: ffff8df00521fb80 RDI: ffff8df001661f00 RBP: ffffb87380003850 R08: ffff8df013980000 R09: 0000000000000010 R10: 0000000000000002 R11: 0000000000000002 R12: ffff8df001661f00 R13: ffff8df00521fb80 R14: ffff8df00733e108 R15: ffff8df011faf04e FS: 0000000000000000(0000) GS:ffff8df46b800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 0000000106384000 CR4: 0000000000350ef0 Call Trace: <IRQ> ? show_regs+0x63/0x70 ? __die_body+0x20/0x60 ? __die+0x2b/0x40 ? page_fault_oops+0x15c/0x550 ? do_user_addr_fault+0x3ed/0x870 ? exc_page_fault+0x7f/0x190 ? asm_exc_page_fault+0x27/0x30 mlx5e_ipsec_handle_tx_skb+0xe7/0x2f0 [mlx5_core] mlx5e_xmit+0x58e/0x1980 [mlx5_core] ? __fib_lookup+0x6a/0xb0 dev_hard_start_xmit+0x82/0x1d0 sch_direct_xmit+0xfe/0x390 __dev_queue_xmit+0x6d8/0xee0 ? __fib_lookup+0x6a/0xb0 ? internal_add_timer+0x48/0x70 ? mod_timer+0xe2/0x2b0 neigh_resolve_output+0x115/0x1b0 __neigh_update+0x26a/0xc50 neigh_update+0x14/0x20 arp_process+0x2cb/0x8e0 ? __napi_build_skb+0x5e/0x70 arp_rcv+0x11e/0x1c0 ? dev_gro_receive+0x574/0x820 __netif_receive_skb_list_core+0x1cf/0x1f0 netif_receive_skb_list_internal+0x183/0x2a0 napi_complete_done+0x76/0x1c0 mlx5e_napi_poll+0x234/0x7a0 [mlx5_core] __napi_poll+0x2d/0x1f0 net_rx_action+0x1a6/0x370 ? atomic_notifier_call_chain+0x3b/0x50 ? irq_int_handler+0x15/0x20 [mlx5_core] handle_softirqs+0xb9/0x2f0 ? handle_irq_event+0x44/0x60 irq_exit_rcu+0xdb/0x100 common_interrupt+0x98/0xc0 </IRQ> <TASK> asm_common_interrupt+0x27/0x40 RIP: 0010:pv_native_safe_halt+0xb/0x10 Code: 09 c3 66 66 2e 0f 1f 84 00 00 00 00 00 66 90 0f 22 0f 1f 84 00 00 00 00 00 90 eb 07 0f 00 2d 7f e9 36 00 fb
40 00 83 ff 07 77 21 89 ff ff 24 fd 88 3d a1 bd 0f 21 f8
RSP: 0018:ffffffffbe603de8 EFLAGS: 00000202
RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000f92f46680
RDX: 0000000000000037 RSI: 00000000ffffffff RDI: 00000000000518d4
RBP: ffffffffbe603df0 R08: 000000cd42e4dffb R09: ffffffffbe603d70
R10: 0000004d80d62680 R11: 0000000000000001 R12: ffffffffbe60bf40
R13: 0000000000000000 R14: 0000000000000000 R15: ffffffffbe60aff8
? default_idle+0x9/0x20 arch_cpu_idle+0x9/0x10 default_idle_call+0x29/0xf0 do_idle+0x1f2/0x240 cpu_startup_entry+0x2c/0x30 rest_init+0xe7/0x100 start_kernel+0x76b/0xb90 x86_64_start_reservations+0x18/0x30 x86_64_start_kernel+0xc0/0x110 ? setup_ghcb+0xe/0x130 common_startup_64+0x13e/0x141 </TASK> Modules linked in: esp4_offload esp4 xfrm_interface
xfrm6_tunnel tunnel4 tunnel6 xfrm_user xfrm_algo binfmt_misc intel_rapl_msr intel_rapl_common kvm_amd ccp kvm input_leds serio_raw qemu_fw_cfg sch_fq_codel dm_multipath scsi_dh_rdac scsi_dh_emc scsi_dh_alua efi_pstore ip_tables x_tables autofs4 raid10 raid456 async_raid6_recov async_memcpy async_pq raid6_pq async_xor xor async_tx libcrc32c raid1 raid0 mlx5_core crct10dif_pclmul crc32_pclmul polyval_clmulni polyval_generic ghash_clmulni_intel sha256_ssse3 sha1_ssse3 ahci mlxfw i2c_i801 libahci i2c_mux i2c_smbus psample virtio_rng pci_hyperv_intf aesni_intel crypto_simd cryptd
CR2: 0000000000000000
---[ end trace 0000000000000000 ]--- RIP: 0010:0x0 Code: Unable to access opcode bytes at 0xffffffffffffffd6. RSP: 0018:ffffb87380003800 EFLAGS: 00010206 RAX: ffff8df004e02600 RBX: ffffb873800038d8 RCX: 00000000ffff98cf RDX: ffff8df00733e108 RSI: ffff8df00521fb80 RDI: ffff8df001661f00 RBP: ffffb87380003850 R08: ffff8df013980000 R09: 0000000000000010 R10: 0000000000000002 R11: 0000000000000002 R12: ffff8df001661f00 R13: ffff8df00521fb80 R14: ffff8df00733e108 R15: ffff8df011faf04e FS: 0000000000000000(0000) GS:ffff8df46b800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 0000000106384000 CR4: 0000000000350ef0 Kernel panic - not syncing: Fatal exception in interrupt Kernel Offset: 0x3b800000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) ---[ end Kernel panic - not syncing: Fatal exception in interrupt ]---
--- include/net/xfrm.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
include/net/xfrm.h +13 -3
@@ -1223,9 +1223,19 @@ static inline int __xfrm_policy_check2(struct sock *sk, int dir,if (xo) { x =xfrm_input_state (skb); -if (x->xso.type ==XFRM_DEV_OFFLOAD_PACKET ) -return (xo->flags &CRYPTO_DONE ) && - (xo->status &CRYPTO_SUCCESS ); +if (x->xso.type ==XFRM_DEV_OFFLOAD_PACKET ) { +bool check = (xo->flags &CRYPTO_DONE ) && + (xo->status &CRYPTO_SUCCESS ); + +/* The packets here are plain ones and secpath was +* needed to indicate that hardware already handled +* them and there is no need to do nothing in addition. +* +* Consume secpath which was set by drivers. +*/ +secpath_reset (skb); +return check; + } } return __xfrm_check_nopolicy(net, skb, dir) ||
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 468/590 rtc: tps6594: Fix integer overflow on 32bit systems
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 09c4a610153286cef54d4f0c85398f4e32fc227e ]
The problem is this multiply in tps6594_rtc_set_offset()
tmp = offset * TICKS_PER_HOUR;
The "tmp" variable is an s64 but "offset" is a long in the (-277774)-277774 range. On 32bit systems a long can hold numbers up to approximately two billion. The number of TICKS_PER_HOUR is really large, (32768 * 3600) or roughly a hundred million. When you start multiplying by a hundred million it doesn't take long to overflow the two billion mark.
Probably the safest way to fix this is to change the type of TICKS_PER_HOUR to long long because it's such a large number.
--- drivers/rtc/rtc-tps6594.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-tps6594.c +1 -1
@@ -37,7 +37,7 @@#define MAX_OFFSET (277774)// Number of ticks per hour -#define TICKS_PER_HOUR (32768 * 3600) +#define TICKS_PER_HOUR (32768 * 3600LL)// Multiplier for ppb conversions #define PPB_MULT NANO
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 469/590 rtc: pcf85063: fix potential OOB write in PCF85063 NVMEM read
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
[ Upstream commit 3ab8c5ed4f84fa20cd16794fe8dc31f633fbc70c ]
The nvmem interface supports variable buffer sizes, while the regmap interface operates with fixed-size storage. If an nvmem client uses a buffer size less than 4 bytes, regmap_read will write out of bounds as it expects the buffer to point at an unsigned int.
Fix this by using an intermediary unsigned int to hold the value.
--- drivers/rtc/rtc-pcf85063.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/rtc/rtc-pcf85063.c +10 -1
@@ -322,7 +322,16 @@ static const struct rtc_class_ops pcf85063_rtc_ops = {static int pcf85063_nvmem_read (void *priv,unsigned int offset,void *val,size_t bytes) { -return regmap_read (priv,PCF85063_REG_RAM , val); +unsigned int tmp; +int ret; + + ret =regmap_read (priv,PCF85063_REG_RAM , &tmp); +if (ret <0 ) +return ret; + + *(u8 *)val = tmp; + +return 0 ; } static int pcf85063_nvmem_write(void *priv, unsigned int offset,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 470/590 rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Wang <[email protected]>
[ Upstream commit 09471d8f5b390883eaf21b917c4bf3ced1b8a1df ]
The TOY_MATCH0_REG should be cleared to 0 in the RTC interrupt handler, otherwise the interrupt cannot be cleared, which will cause the loongson_rtc_isr() to be triggered multiple times.
The previous code cleared TOY_MATCH0_REG in the loongson_rtc_handler(), which is an ACPI interrupt. This did not prevent loongson_rtc_isr() from being triggered multiple times.
This commit moves the clearing of TOY_MATCH0_REG to the loongson_rtc_isr() to ensure that the interrupt is properly cleared.
--- drivers/rtc/rtc-loongson.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/rtc/rtc-loongson.c +8 -5
@@ -114,6 +114,13 @@ static irqreturn_t loongson_rtc_isr(int irq, void *id)struct loongson_rtc_priv *priv = (struct loongson_rtc_priv *)id;rtc_update_irq (priv->rtcdev,1 ,RTC_AF |RTC_IRQF ); + +/* +* The TOY_MATCH0_REG should be cleared 0 here, +* otherwise the interrupt cannot be cleared. +*/ +regmap_write (priv->regmap,TOY_MATCH0_REG ,0 ); +return IRQ_HANDLED ; }
@@ -131,11 +138,7 @@ static u32 loongson_rtc_handler(void *id)writel (RTC_STS , priv->pm_base +PM1_STS_REG );spin_unlock (&priv->lock); -/* -* The TOY_MATCH0_REG should be cleared 0 here, -* otherwise the interrupt cannot be cleared. -*/ -return regmap_write (priv->regmap,TOY_MATCH0_REG ,0 ); +return ACPI_INTERRUPT_HANDLED ; }static int loongson_rtc_set_enabled (struct device *dev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 471/590 ubifs: skip dumping tnc tree when zroot is null
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: pangliyuan <[email protected]>
[ Upstream commit bdb0ca39e0acccf6771db49c3f94ed787d05f2d7 ]
Clearing slab cache will free all znode in memory and make c->zroot.znode = NULL, then dumping tnc tree will access c->zroot.znode which cause null pointer dereference.
--- fs/ubifs/debug.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
fs/ubifs/debug.c +13 -9
@@ -946,16 +946,20 @@ void ubifs_dump_tnc(struct ubifs_info *c)pr_err ("\n" );pr_err ("(pid %d) start dumping TNC tree\n" , current->pid); - znode =ubifs_tnc_levelorder_next (c, c->zroot.znode,NULL ); - level = znode->level; -pr_err ("== Level %d ==\n" , level); -while (znode) { -if (level != znode->level) { - level = znode->level; -pr_err ("== Level %d ==\n" , level); +if (c->zroot.znode) { + znode =ubifs_tnc_levelorder_next (c, c->zroot.znode,NULL ); + level = znode->level; +pr_err ("== Level %d ==\n" , level); +while (znode) { +if (level != znode->level) { + level = znode->level; +pr_err ("== Level %d ==\n" , level); + } +ubifs_dump_znode (c, znode); + znode =ubifs_tnc_levelorder_next (c, c->zroot.znode, znode); } -ubifs_dump_znode (c, znode); - znode =ubifs_tnc_levelorder_next (c, c->zroot.znode, znode); + }else { +pr_err ("empty TNC tree in memory\n" ); }pr_err ("(pid %d) finish dumping TNC tree\n" , current->pid); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 472/590 regulator: core: Add missing newline character
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
[ Upstream commit 155c569fa4c3b340fbf8571a0e42dd415c025377 ]
dev_err_probe() error messages need newline character.
--- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/core.c +1 -1
@@ -4946,7 +4946,7 @@ int _regulator_bulk_get(struct device *dev, int num_consumers, consumers[i].supply, get_type);if (IS_ERR (consumers[i].consumer)) { ret =dev_err_probe (dev,PTR_ERR (consumers[i].consumer), -"Failed to get supply '%s'" , +"Failed to get supply '%s'\n" , consumers[i].supply); consumers[i].consumer =NULL ; goto err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 473/590 net: airoha: Fix wrong GDM4 register definition
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Marangi <[email protected]>
[ Upstream commit d31a49d37cb132b31cc6683eef2122f8609d6229 ]
Fix wrong GDM4 register definition, in Airoha SDK GDM4 is defined at offset 0x2400 but this doesn't make sense as it does conflict with the CDM4 that is in the same location.
Following the pattern where each GDM base is at the FWD_CFG, currently GDM4 base offset is set to 0x2500. This is correct but REG_GDM4_FWD_CFG and REG_GDM4_SRC_PORT_SET are still using the SDK reference with the 0x2400 offset. Fix these 2 define by subtracting 0x100 to each register to reflect the real address location.
--- drivers/net/ethernet/mediatek/airoha_eth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mediatek/airoha_eth.c +2 -2
@@ -258,11 +258,11 @@#define REG_GDM3_FWD_CFG GDM3_BASE#define GDM3_PAD_EN_MASK BIT(28) -#define REG_GDM4_FWD_CFG (GDM4_BASE + 0x100) +#define REG_GDM4_FWD_CFG GDM4_BASE#define GDM4_PAD_EN_MASK BIT(28)#define GDM4_SPORT_OFFSET0_MASK GENMASK(11, 8) -#define REG_GDM4_SRC_PORT_SET (GDM4_BASE + 0x33c) +#define REG_GDM4_SRC_PORT_SET (GDM4_BASE + 0x23c)#define GDM4_SPORT_OFF2_MASK GENMASK(19, 16)#define GDM4_SPORT_OFF1_MASK GENMASK(15, 12)#define GDM4_SPORT_OFF0_MASK GENMASK(11, 8)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 474/590 net: hns3: fix oops when unload drivers paralleling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian Shen <[email protected]>
[ Upstream commit 92e5995773774a3e70257e9c95ea03518268bea5 ]
When unload hclge driver, it tries to disable sriov first for each ae_dev node from hnae3_ae_dev_list. If user unloads hns3 driver at the time, because it removes all the ae_dev nodes, and it may cause oops.
But we can't simply use hnae3_common_lock for this. Because in the process flow of pci_disable_sriov(), it will trigger the remove flow of VF, which will also take hnae3_common_lock.
To fixes it, introduce a new mutex to protect the unload process.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 15 +++++++++++++++ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 ++ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 ++ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 ++ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 ++ 5 files changed, 23 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hnae3.c +15 -0
@@ -40,6 +40,21 @@ EXPORT_SYMBOL(hnae3_unregister_ae_algo_prepare);*/ static DEFINE_MUTEX (hnae3_common_lock); +/* ensure the drivers being unloaded one by one */ +static DEFINE_MUTEX (hnae3_unload_lock); + +void hnae3_acquire_unload_lock (void ) +{ +mutex_lock (&hnae3_unload_lock); +} +EXPORT_SYMBOL (hnae3_acquire_unload_lock); + +void hnae3_release_unload_lock (void ) +{ +mutex_unlock (&hnae3_unload_lock); +} +EXPORT_SYMBOL (hnae3_release_unload_lock); +static bool hnae3_client_match (enum hnae3_client_type client_type) { if (client_type == HNAE3_CLIENT_KNIC ||
drivers/net/ethernet/hisilicon/hns3/hnae3.h +2 -0
@@ -963,4 +963,6 @@ int hnae3_register_client(struct hnae3_client *client);void hnae3_set_client_init_flag (struct hnae3_client *client,struct hnae3_ae_dev *ae_dev,unsigned int inited); +void hnae3_acquire_unload_lock (void ); +void hnae3_release_unload_lock (void );#endif
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +2 -0
@@ -6002,9 +6002,11 @@ module_init(hns3_init_module);*/ static void __exit hns3_exit_module(void) { +hnae3_acquire_unload_lock ();pci_unregister_driver (&hns3_driver);hnae3_unregister_client (&client);hns3_dbg_unregister_debugfs (); +hnae3_release_unload_lock (); }module_exit (hns3_exit_module);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +2 -0
@@ -12929,9 +12929,11 @@ static int __init hclge_init(void) static void __exit hclge_exit(void) { +hnae3_acquire_unload_lock ();hnae3_unregister_ae_algo_prepare (&ae_algo);hnae3_unregister_ae_algo (&ae_algo);destroy_workqueue (hclge_wq); +hnae3_release_unload_lock (); }module_init (hclge_init);module_exit (hclge_exit);
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +2 -0
@@ -3412,8 +3412,10 @@ static int __init hclgevf_init(void) static void __exit hclgevf_exit(void) { +hnae3_acquire_unload_lock ();hnae3_unregister_ae_algo (&ae_algovf);destroy_workqueue (hclgevf_wq); +hnae3_release_unload_lock (); }module_init (hclgevf_init);module_exit (hclgevf_exit);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 475/590 gpio: mxc: remove dead code after switch to DT-only
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
[ Upstream commit b049e7abe9001a780d58e78e3833dcceee22f396 ]
struct platform_device::id was only set by board code, but since i.MX became a devicetree-only platform, this will always be -1 (PLATFORM_DEVID_NONE).
Note: of_alias_get_id() returns a negative number on error and base treats all negative errors the same, so we need not add any additional error handling.
--- drivers/gpio/gpio-mxc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpio/gpio-mxc.c +1 -2
@@ -490,8 +490,7 @@ static int mxc_gpio_probe(struct platform_device *pdev) port->gc.request = mxc_gpio_request; port->gc.free = mxc_gpio_free; port->gc.to_irq = mxc_gpio_to_irq; - port->gc.base = (pdev->id <0 ) ?of_alias_get_id (np,"gpio" ) *32 : - pdev->id *32 ; + port->gc.base =of_alias_get_id (np,"gpio" ) *32 ; err =devm_gpiochip_add_data (&pdev->dev, &port->gc, port);if (err)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 476/590 net: phy: marvell-88q2xxx: Fix temperature measurement with reset-gpios
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dimitri Fedrau <[email protected]>
[ Upstream commit a197004cf3c2e6c8cc0695c787a97e62e3229754 ]
When using temperature measurement on Marvell 88Q2XXX devices and the reset-gpios property is set in DT, the device does a hardware reset when interface is brought down and up again. That means that the content of the register MDIO_MMD_PCS_MV_TEMP_SENSOR2 is reset to default and that leads to permanent deactivation of the temperature measurement, because activation is done in mv88q2xxx_probe. To fix this move activation of temperature measurement to mv88q222x_config_init.
--- drivers/net/phy/marvell-88q2xxx.c | 33 ++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-)
drivers/net/phy/marvell-88q2xxx.c +26 -7
@@ -95,6 +95,10 @@#define MDIO_MMD_PCS_MV_TDR_OFF_CUTOFF 65246 +struct mv88q2xxx_priv { +bool enable_temp; +}; +struct mmd_val {int devad;u32 regnum;
@@ -669,17 +673,12 @@ static const struct hwmon_chip_info mv88q2xxx_hwmon_chip_info = {static int mv88q2xxx_hwmon_probe (struct phy_device *phydev) { +struct mv88q2xxx_priv *priv = phydev->priv;struct device *dev = &phydev->mdio.dev;struct device *hwmon;char *hwmon_name; -int ret; - -/* Enable temperature sense */ - ret =phy_modify_mmd (phydev,MDIO_MMD_PCS ,MDIO_MMD_PCS_MV_TEMP_SENSOR2 , -MDIO_MMD_PCS_MV_TEMP_SENSOR2_DIS_MASK ,0 ); -if (ret <0 ) -return ret; + priv->enable_temp = true; hwmon_name =devm_hwmon_sanitize_name (dev,dev_name (dev));if (IS_ERR (hwmon_name))return PTR_ERR (hwmon_name);
@@ -702,6 +701,14 @@ static int mv88q2xxx_hwmon_probe(struct phy_device *phydev)static int mv88q2xxx_probe (struct phy_device *phydev) { +struct mv88q2xxx_priv *priv; + + priv =devm_kzalloc (&phydev->mdio.dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + phydev->priv = priv; +return mv88q2xxx_hwmon_probe (phydev); }
@@ -792,6 +799,18 @@ static int mv88q222x_revb1_revb2_config_init(struct phy_device *phydev)static int mv88q222x_config_init (struct phy_device *phydev) { +struct mv88q2xxx_priv *priv = phydev->priv; +int ret; + +/* Enable temperature sense */ +if (priv->enable_temp) { + ret =phy_modify_mmd (phydev,MDIO_MMD_PCS , +MDIO_MMD_PCS_MV_TEMP_SENSOR2 , +MDIO_MMD_PCS_MV_TEMP_SENSOR2_DIS_MASK ,0 ); +if (ret <0 ) +return ret; + } +if (phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD ] ==PHY_ID_88Q2220_REVB0 )return mv88q222x_revb0_config_init (phydev);else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 477/590 net: fec: implement TSO descriptor cleanup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dheeraj Reddy Jonnalagadda <[email protected]>
[ Upstream commit 61dc1fd9205bc9d9918aa933a847b08e80b4dc20 ]
Implement cleanup of descriptors in the TSO error path of fec_enet_txq_submit_tso(). The cleanup
- Unmaps DMA buffers for data descriptors skipping TSO header
- Clears all buffer descriptors
- Handles extended descriptors by clearing cbd_esc when enabled
--- drivers/net/ethernet/freescale/fec_main.c | 31 ++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/fec_main.c +30 -1
@@ -840,6 +840,8 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq,struct fec_enet_private *fep =netdev_priv (ndev);int hdr_len, total_len, data_left;struct bufdesc *bdp = txq->bd.cur; +struct bufdesc *tmp_bdp; +struct bufdesc_ex *ebdp;struct tso_t tso;unsigned int index =0 ;int ret;
@@ -913,7 +915,34 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq,return 0 ; err_release: -/* TODO: Release all used data descriptors for TSO */ +/* Release all used data descriptors for TSO */ + tmp_bdp = txq->bd.cur; + +while (tmp_bdp != bdp) { +/* Unmap data buffers */ +if (tmp_bdp->cbd_bufaddr && + !IS_TSO_HEADER (txq,fec32_to_cpu (tmp_bdp->cbd_bufaddr))) +dma_unmap_single (&fep->pdev->dev, +fec32_to_cpu (tmp_bdp->cbd_bufaddr), +fec16_to_cpu (tmp_bdp->cbd_datlen), +DMA_TO_DEVICE ); + +/* Clear standard buffer descriptor fields */ + tmp_bdp->cbd_sc =0 ; + tmp_bdp->cbd_datlen =0 ; + tmp_bdp->cbd_bufaddr =0 ; + +/* Handle extended descriptor if enabled */ +if (fep->bufdesc_ex) { + ebdp = (struct bufdesc_ex *)tmp_bdp; + ebdp->cbd_esc =0 ; + } + + tmp_bdp =fec_enet_get_nextdesc (tmp_bdp, &txq->bd); + } + +dev_kfree_skb_any (skb); +return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 478/590 ipmr: do not call mr_mfc_uses_dev() for unres entries
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 15a901361ec3fb1c393f91880e1cbf24ec0a88bd ]
syzbot found that calling mr_mfc_uses_dev() for unres entries would crash [1], because c->mfc_un.res.minvif / c->mfc_un.res.maxvif alias to "struct sk_buff_head unresolved", which contain two pointers.
This code never worked, lets remove it.
[1]
Unable to handle kernel paging request at virtual address ffff5fff2d536613 KASAN: maybe wild-memory-access in range [0xfffefff96a9b3098-0xfffefff96a9b309f] Modules linked in: CPU: 1 UID: 0 PID: 7321 Comm: syz.0.16 Not tainted 6.13.0-rc7-syzkaller-g1950a0af2d55 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : mr_mfc_uses_dev net/ipv4/ipmr_base.c:290 [inline] pc : mr_table_dump+0x5a4/0x8b0 net/ipv4/ipmr_base.c:334 lr : mr_mfc_uses_dev net/ipv4/ipmr_base.c:289 [inline] lr : mr_table_dump+0x694/0x8b0 net/ipv4/ipmr_base.c:334 Call trace: mr_mfc_uses_dev net/ipv4/ipmr_base.c:290 [inline] (P) mr_table_dump+0x5a4/0x8b0 net/ipv4/ipmr_base.c:334 (P) mr_rtm_dumproute+0x254/0x454 net/ipv4/ipmr_base.c:382 ipmr_rtm_dumproute+0x248/0x4b4 net/ipv4/ipmr.c:2648 rtnl_dump_all+0x2e4/0x4e8 net/core/rtnetlink.c:4327 rtnl_dumpit+0x98/0x1d0 net/core/rtnetlink.c:6791 netlink_dump+0x4f0/0xbc0 net/netlink/af_netlink.c:2317 netlink_recvmsg+0x56c/0xe64 net/netlink/af_netlink.c:1973 sock_recvmsg_nosec net/socket.c:1033 [inline] sock_recvmsg net/socket.c:1055 [inline] sock_read_iter+0x2d8/0x40c net/socket.c:1125 new_sync_read fs/read_write.c:484 [inline] vfs_read+0x740/0x970 fs/read_write.c:565 ksys_read+0x15c/0x26c fs/read_write.c:708
--- net/ipv4/ipmr_base.c | 3 --- 1 file changed, 3 deletions(-)
net/ipv4/ipmr_base.c +0 -3
@@ -330,9 +330,6 @@ int mr_table_dump(struct mr_table *mrt, struct sk_buff *skb,list_for_each_entry (mfc, &mrt->mfc_unres_queue, list) {if (e < s_e) goto next_entry2; -if (filter->dev && - !mr_mfc_uses_dev (mrt, mfc, filter->dev)) - goto next_entry2; err =fill (mrt, skb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, mfc,RTM_NEWROUTE , flags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 479/590 PM: hibernate: Add error handling for syscore_suspend()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
[ Upstream commit e20a70c572539a486dbd91b225fa6a194a5e2122 ]
In hibernation_platform_enter(), the code did not check the return value of syscore_suspend(), potentially leading to a situation where syscore_resume() would be called even if syscore_suspend() failed. This could cause unpredictable behavior or system instability.
Modify the code sequence in question to properly handle errors returned by syscore_suspend(). If an error occurs in the suspend path, the code now jumps to label 'Enable_irqs' skipping the syscore_resume() call and only enabling interrupts after setting the system state to SYSTEM_RUNNING.
--- kernel/power/hibernate.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/power/hibernate.c +6 -1
@@ -608,7 +608,11 @@ int hibernation_platform_enter(void)local_irq_disable (); system_state =SYSTEM_SUSPEND ; -syscore_suspend (); + + error =syscore_suspend (); +if (error) + goto Enable_irqs; +if (pm_wakeup_pending ()) { error = -EAGAIN ; goto Power_up;
@@ -620,6 +624,7 @@ int hibernation_platform_enter(void) Power_up:syscore_resume (); + Enable_irqs: system_state =SYSTEM_RUNNING ;local_irq_enable ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 480/590 perf trace: Fix BPF loading failure (-E2BIG)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Howard Chu <[email protected]>
[ Upstream commit 013eb043f37bd87c4d60d51034401a5a6d105bcf ]
As reported by Namhyung Kim and acknowledged by Qiao Zhao (link:
https://lore.kernel.org/linux-perf-users/[email protected]/),
on certain machines, perf trace failed to load the BPF program into the kernel. The verifier runs perf trace's BPF program for up to 1 million instructions, returning an E2BIG error, whereas the perf trace BPF program should be much less complex than that. This patch aims to fix the issue described above.
The E2BIG problem from clang-15 to clang-16 is cause by this line:
} else if (size < 0 && size >= -6) { /* buffer */
Specifically this check: size < 0. seems like clang generates a cool optimization to this sign check that breaks things.
Making 'size' s64, and use
} else if ((int)size < 0 && size >= -6) { /* buffer */
Solves the problem. This is some Hogwarts magic.
And the unbounded access of clang-12 and clang-14 (clang-13 works this time) is fixed by making variable 'aug_size' s64.
As for this:
-if (aug_size > TRACE_AUG_MAX_BUF)
- aug_size = TRACE_AUG_MAX_BUF;
+aug_size = args->args[index] > TRACE_AUG_MAX_BUF ? TRACE_AUG_MAX_BUF : args->args[index];
This makes the BPF skel generated by clang-18 work. Yes, new clangs introduce problems too.
Sorry, I only know that it works, but I don't know how it works. I'm not an expert in the BPF verifier. I really hope this is not a kernel version issue, as that would make the test case (kernel_nr) * (clang_nr), a true horror story. I will test it on more kernel versions in the future.
--- tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c +4 -7
@@ -431,9 +431,9 @@ static bool pid_filter__has(struct pids_filtered *pids, pid_t pid)static int augment_sys_enter (void *ctx,struct syscall_enter_args *args) {bool augmented, do_output = false; -int zero =0 , size, aug_size, index, - value_size =sizeof (struct augmented_arg ) - offsetof(struct augmented_arg , value); +int zero =0 , index, value_size =sizeof (struct augmented_arg ) - offsetof(struct augmented_arg , value);u64 output =0 ;/* has to be u64, otherwise it won't pass the verifier */ +s64 aug_size, size;unsigned int nr, *beauty_map;struct beauty_payload_enter *payload;void *arg, *payload_offset;
@@ -484,14 +484,11 @@ static int augment_sys_enter(void *ctx, struct syscall_enter_args *args) }else if (size >0 && size <= value_size) {/* struct */ if (!bpf_probe_read_user (((struct augmented_arg *)payload_offset)->value, size, arg)) augmented = true; - }else if (size <0 && size >=-6 ) {/* buffer */ + }else if ((int )size <0 && size >=-6 ) {/* buffer */ index = -(size +1 );barrier_var (index);// Prevent clang (noticed with v18) from removing the &= 7 trick. index &=7 ;// Satisfy the bounds checking with the verifier in some kernels. - aug_size = args->args[index]; - -if (aug_size >TRACE_AUG_MAX_BUF ) - aug_size =TRACE_AUG_MAX_BUF ; + aug_size = args->args[index] >TRACE_AUG_MAX_BUF ?TRACE_AUG_MAX_BUF : args->args[index];if (aug_size >0 ) {if (!bpf_probe_read_user (((struct augmented_arg *)payload_offset)->value, aug_size, arg))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 481/590 xfrm: Dont disable preemption while looking up cache state.
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Sewior <[email protected]>
[ Upstream commit 6c9b7db96db62ee9ad8d359d90ff468d462518c4 ]
For the state cache lookup xfrm_input_state_lookup() first disables preemption, to remain on the CPU and then retrieves a per-CPU pointer. Within the preempt-disable section it also acquires netns_xfrm::xfrm_state_lock, a spinlock_t. This lock must not be acquired with explicit disabled preemption (such as by get_cpu()) because this lock becomes a sleeping lock on PREEMPT_RT.
To remain on the same CPU is just an optimisation for the CPU local lookup. The actual modification of the per-CPU variable happens with netns_xfrm::xfrm_state_lock acquired.
Remove get_cpu() and use the state_cache_input on the current CPU.
--- net/xfrm/xfrm_state.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/xfrm/xfrm_state.c +1 -3
@@ -1150,9 +1150,8 @@ struct xfrm_state *xfrm_input_state_lookup(struct net *net, u32 mark,struct xfrm_hash_state_ptrs state_ptrs;struct hlist_head *state_cache_input;struct xfrm_state *x =NULL ; -int cpu =get_cpu (); - state_cache_input =per_cpu_ptr (net->xfrm.state_cache_input, cpu); + state_cache_input =raw_cpu_ptr (net->xfrm.state_cache_input);rcu_read_lock ();hlist_for_each_entry_rcu (x, state_cache_input, state_cache_input) {
@@ -1186,7 +1185,6 @@ struct xfrm_state *xfrm_input_state_lookup(struct net *net, u32 mark, out:rcu_read_unlock (); -put_cpu ();return x; }EXPORT_SYMBOL (xfrm_input_state_lookup);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 482/590 idpf: add read memory barrier when checking descriptor done bit
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emil Tantilov <[email protected]>
[ Upstream commit 396f0165672c6a74d7379027d344b83b5f05948c ]
Add read memory barrier to ensure the order of operations when accessing control queue descriptors. Specifically, we want to avoid cases where loads can be reordered:
1. Load #1 is dispatched to read descriptor flags.
2. Load #2 is dispatched to read some other field from the descriptor.
3. Load #2 completes, accessing memory/cache at a point in time when the DD flag is zero.
4. NIC DMA overwrites the descriptor, now the DD flag is one.
5. Any fields loaded before step 4 are now inconsistent with the actual descriptor state.
Add read memory barrier between steps 1 and 2, so that load #2 is not executed until load #1 has completed.
--- drivers/net/ethernet/intel/idpf/idpf_controlq.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/idpf/idpf_controlq.c +6 -0
@@ -376,6 +376,9 @@ int idpf_ctlq_clean_sq(struct idpf_ctlq_info *cq, u16 *clean_count,if (!(le16_to_cpu (desc->flags) &IDPF_CTLQ_FLAG_DD ))break ; +/* Ensure no other fields are read until DD flag is checked */ +dma_rmb (); +/* strip off FW internal code */ desc_err =le16_to_cpu (desc->ret_val) &0xff ;
@@ -563,6 +566,9 @@ int idpf_ctlq_recv(struct idpf_ctlq_info *cq, u16 *num_q_msg,if (!(flags &IDPF_CTLQ_FLAG_DD ))break ; +/* Ensure no other fields are read until DD flag is checked */ +dma_rmb (); + q_msg[i].vmvf_type = (flags & (IDPF_CTLQ_FLAG_FTYPE_VM | IDPF_CTLQ_FLAG_FTYPE_PF)) >>
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 483/590 idpf: fix transaction timeouts on reset
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emil Tantilov <[email protected]>
[ Upstream commit 137da75ba72593598898a4e79da34f4b2da5d151 ]
Restore the call to idpf_vc_xn_shutdown() at the beginning of idpf_vc_core_deinit() provided the function is not called on remove. In the reset path the mailbox is destroyed, leading to all transactions timing out.
--- drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +10 -1
@@ -3077,12 +3077,21 @@ int idpf_vc_core_init(struct idpf_adapter *adapter)*/ void idpf_vc_core_deinit (struct idpf_adapter *adapter) { +bool remove_in_prog; +if (!test_bit (IDPF_VC_CORE_INIT , adapter->flags))return ; +/* Avoid transaction timeouts when called during reset */ + remove_in_prog =test_bit (IDPF_REMOVE_IN_PROG , adapter->flags); +if (!remove_in_prog) +idpf_vc_xn_shutdown (adapter->vcxn_mngr); +idpf_deinit_task (adapter);idpf_intr_rel (adapter); -idpf_vc_xn_shutdown (adapter->vcxn_mngr); + +if (remove_in_prog) +idpf_vc_xn_shutdown (adapter->vcxn_mngr);cancel_delayed_work_sync (&adapter->serv_task);cancel_delayed_work_sync (&adapter->mbx_task);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 484/590 idpf: Acquire the lock before accessing the xn->salt
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manoj Vishwanathan <[email protected]>
[ Upstream commit d15fe4edd7decdf14d8ad2b78df100ea23302065 ]
The transaction salt was being accessed before acquiring the idpf_vc_xn_lock when idpf has to forward the virtchnl reply.
--- drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +2 -1
@@ -612,14 +612,15 @@ idpf_vc_xn_forward_reply(struct idpf_adapter *adapter,return -EINVAL ; } xn = &adapter->vcxn_mngr->ring[xn_idx]; +idpf_vc_xn_lock (xn); salt =FIELD_GET (IDPF_VC_XN_SALT_M , msg_info);if (xn->salt != salt) {dev_err_ratelimited (&adapter->pdev->dev,"Transaction salt does not match (%02x != %02x)\n" , xn->salt, salt); +idpf_vc_xn_unlock (xn);return -EINVAL ; } -idpf_vc_xn_lock (xn);switch (xn->state) {case IDPF_VC_XN_WAITING :/* success */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 485/590 idpf: convert workqueues to unbound
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Leogrande <[email protected]>
[ Upstream commit 9a5b021cb8186f1854bac2812bd4f396bb1e881c ]
When a workqueue is created with WQ_UNBOUND, its work items are served by special worker-pools, whose host workers are not bound to any specific CPU. In the default configuration (i.e. when queue_delayed_work and friends do not specify which CPU to run the work item on), WQ_UNBOUND allows the work item to be executed on any CPU in the same node of the CPU it was enqueued on. While this solution potentially sacrifices locality, it avoids contention with other processes that might dominate the CPU time of the processor the work item was scheduled on.
This is not just a theoretical problem: in a particular scenario misconfigured process was hogging most of the time from CPU0, leaving less than 0.5% of its CPU time to the kworker. The IDPF workqueues that were using the kworker on CPU0 suffered large completion delays as a result, causing performance degradation, timeouts and eventual system crash.
Tested:
* I have also run a manual test to gauge the performance improvement. The test consists of an antagonist process (./stress --cpu 2) consuming as much of CPU 0 as possible. This process is run under taskset 01 to bind it to CPU0, and its priority is changed with chrt -pQ 9900 10000 ${pid} and renice -n -20 ${pid} after start.
Then, the IDPF driver is forced to prefer CPU0 by editing all calls to queue_delayed_work, mod_delayed_work, etc... to use CPU 0.
Finally, ktraces for the workqueue events are collected.
Without the current patch, the antagonist process can force arbitrary delays between workqueue_queue_work and workqueue_execute_start, that in my tests were as high as 30ms. With the current patch applied, the workqueue can be migrated to another unloaded CPU in the same node, and, keeping everything else equal, the maximum delay I could see was 6us.
--- drivers/net/ethernet/intel/idpf/idpf_main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/idpf/idpf_main.c +10 -5
@@ -174,7 +174,8 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_master (pdev);pci_set_drvdata (pdev, adapter); - adapter->init_wq =alloc_workqueue ("%s-%s-init" ,0 ,0 , + adapter->init_wq =alloc_workqueue ("%s-%s-init" , +WQ_UNBOUND |WQ_MEM_RECLAIM ,0 ,dev_driver_string (dev),dev_name (dev));if (!adapter->init_wq) {
@@ -183,7 +184,8 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_free; } - adapter->serv_wq =alloc_workqueue ("%s-%s-service" ,0 ,0 , + adapter->serv_wq =alloc_workqueue ("%s-%s-service" , +WQ_UNBOUND |WQ_MEM_RECLAIM ,0 ,dev_driver_string (dev),dev_name (dev));if (!adapter->serv_wq) {
@@ -192,7 +194,8 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_serv_wq_alloc; } - adapter->mbx_wq =alloc_workqueue ("%s-%s-mbx" ,0 ,0 , + adapter->mbx_wq =alloc_workqueue ("%s-%s-mbx" , +WQ_UNBOUND |WQ_MEM_RECLAIM ,0 ,dev_driver_string (dev),dev_name (dev));if (!adapter->mbx_wq) {
@@ -201,7 +204,8 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_mbx_wq_alloc; } - adapter->stats_wq =alloc_workqueue ("%s-%s-stats" ,0 ,0 , + adapter->stats_wq =alloc_workqueue ("%s-%s-stats" , +WQ_UNBOUND |WQ_MEM_RECLAIM ,0 ,dev_driver_string (dev),dev_name (dev));if (!adapter->stats_wq) {
@@ -210,7 +214,8 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_stats_wq_alloc; } - adapter->vc_event_wq =alloc_workqueue ("%s-%s-vc_event" ,0 ,0 , + adapter->vc_event_wq =alloc_workqueue ("%s-%s-vc_event" , +WQ_UNBOUND |WQ_MEM_RECLAIM ,0 ,dev_driver_string (dev),dev_name (dev));if (!adapter->vc_event_wq) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 486/590 ice: fix ice_parser_rt::bst_key array size
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit 18625e26fefced78f2ae28b25e80a07079821e04 ]
Fix &ice_parser_rt::bst_key size. It was wrongly set to 10 instead of 20 in the initial impl commit (see Fixes tag). All usage code assumed it was of size 20. That was also the initial size present up to v2 of the intro series [2], but halved by v3 [3] refactor described as "Replace magic hardcoded values with macros." The introducing series was so big that some ugliness was unnoticed, same for bugs :/
ICE_BST_KEY_TCAM_SIZE and ICE_BST_TCAM_KEY_SIZE were differing by one. There was tmp variable @j in the scope of edited function, but was not used in all places. This ugliness is now gone.
I'm moving ice_parser_rt::pg_prio a few positions up, to fill up one of the holes in order to compensate for the added 10 bytes to the ::bst_key, resulting in the same size of the whole as prior to the fix, and minimal changes in the offsets of the fields.
Extend also the debug dump print of the key to cover all bytes. To not have string with 20 "%02x" and 20 params, switch to ice_debug_array_w_prefix().
This fix obsoletes Ahmed's attempt at [1].
[1] https://lore.kernel.org/intel-wired-lan/[email protected]
[2] https://lore.kernel.org/intel-wired-lan/[email protected]
[3] https://lore.kernel.org/intel-wired-lan/[email protected]
--- drivers/net/ethernet/intel/ice/ice_parser.h | 6 ++---- drivers/net/ethernet/intel/ice/ice_parser_rt.c | 12 +++++------- 2 files changed, 7 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/ice/ice_parser.h +2 -4
@@ -257,7 +257,6 @@ ice_pg_nm_cam_match(struct ice_pg_nm_cam_item *table, int size,/*** ICE_SID_RXPARSER_BOOST_TCAM and ICE_SID_LBL_RXPARSER_TMEM sections ***/ #define ICE_BST_TCAM_TABLE_SIZE 256#define ICE_BST_TCAM_KEY_SIZE 20 -#define ICE_BST_KEY_TCAM_SIZE 19/* Boost TCAM item */ struct ice_bst_tcam_item {
@@ -401,7 +400,6 @@ u16 ice_xlt_kb_flag_get(struct ice_xlt_kb *kb, u64 pkt_flag);#define ICE_PARSER_GPR_NUM 128#define ICE_PARSER_FLG_NUM 64#define ICE_PARSER_ERR_NUM 16 -#define ICE_BST_KEY_SIZE 10#define ICE_MARKER_ID_SIZE 9#define ICE_MARKER_MAX_SIZE \ (ICE_MARKER_ID_SIZE * BITS_PER_BYTE - 1)
@@ -431,13 +429,13 @@ struct ice_parser_rt {u8 pkt_buf[ICE_PARSER_MAX_PKT_LEN +ICE_PARSER_PKT_REV ];u16 pkt_len;u16 po; -u8 bst_key[ICE_BST_KEY_SIZE ]; +u8 bst_key[ICE_BST_TCAM_KEY_SIZE ];struct ice_pg_cam_key pg_key; +u8 pg_prio;struct ice_alu *alu0;struct ice_alu *alu1;struct ice_alu *alu2;struct ice_pg_cam_action *action; -u8 pg_prio;struct ice_gpr_pu pu;u8 markers[ICE_MARKER_ID_SIZE ];bool protocols[ICE_PO_PAIR_SIZE ];
drivers/net/ethernet/intel/ice/ice_parser_rt.c +5 -7
@@ -125,22 +125,20 @@ static void ice_bst_key_init(struct ice_parser_rt *rt,else key[idd] = imem->b_kb.prio; - idd =ICE_BST_KEY_TCAM_SIZE -1 ; + idd =ICE_BST_TCAM_KEY_SIZE -2 ;for (i = idd; i >=0 ; i--) {int j; j = ho + idd - i;if (j <ICE_PARSER_MAX_PKT_LEN ) - key[i] = rt->pkt_buf[ho + idd - i]; + key[i] = rt->pkt_buf[j];else key[i] =0 ; } -ice_debug (rt->psr->hw,ICE_DBG_PARSER ,"Generated Boost TCAM Key:\n" ); -ice_debug (rt->psr->hw,ICE_DBG_PARSER ,"%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n" , - key[0 ], key[1 ], key[2 ], key[3 ], key[4 ], - key[5 ], key[6 ], key[7 ], key[8 ], key[9 ]); -ice_debug (rt->psr->hw,ICE_DBG_PARSER ,"\n" ); +ice_debug_array_w_prefix (rt->psr->hw,ICE_DBG_PARSER , +KBUILD_MODNAME ": Generated Boost TCAM Key" , + key,ICE_BST_TCAM_KEY_SIZE ); }static u16 ice_bit_rev_u16 (u16 v,int len)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 487/590 ice: rework of dump serdes equalizer values feature
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Polchlopek <[email protected]>
[ Upstream commit 8ea085937dad2d0b5399bc58722934f562b9abef ]
Refactor function ice_get_tx_rx_equa() to iterate over new table of params instead of multiple calls to ice_aq_get_phy_equalization().
Subsequent commit will extend that function by add more serdes equalizer values to dump.
Shorten the fields of struct ice_serdes_equalization_to_ethtool for readability purposes.
Stable-dep-of: c5cc2a27e04f ("ice: remove invalid parameter of equalizer")
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 93 ++++++-------------- drivers/net/ethernet/intel/ice/ice_ethtool.h | 22 ++--- 2 files changed, 38 insertions(+), 77 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +27 -66
@@ -693,75 +693,36 @@ static int ice_get_port_topology(struct ice_hw *hw, u8 lport,static int ice_get_tx_rx_equa (struct ice_hw *hw,u8 serdes_num,struct ice_serdes_equalization_to_ethtool *ptr) { +static const int tx =ICE_AQC_OP_CODE_TX_EQU ; +static const int rx =ICE_AQC_OP_CODE_RX_EQU ; +struct { +int data_in; +int opcode; +int *out; + } aq_params[] = { + {ICE_AQC_TX_EQU_PRE1 , tx, &ptr->tx_equ_pre1 }, + {ICE_AQC_TX_EQU_PRE3 , tx, &ptr->tx_equ_pre3 }, + {ICE_AQC_TX_EQU_ATTEN , tx, &ptr->tx_equ_atten }, + {ICE_AQC_TX_EQU_POST1 , tx, &ptr->tx_equ_post1 }, + {ICE_AQC_TX_EQU_PRE2 , tx, &ptr->tx_equ_pre2 }, + {ICE_AQC_RX_EQU_PRE2 , rx, &ptr->rx_equ_pre2 }, + {ICE_AQC_RX_EQU_PRE1 , rx, &ptr->rx_equ_pre1 }, + {ICE_AQC_RX_EQU_POST1 , rx, &ptr->rx_equ_post1 }, + {ICE_AQC_RX_EQU_BFLF , rx, &ptr->rx_equ_bflf }, + {ICE_AQC_RX_EQU_BFHF , rx, &ptr->rx_equ_bfhf }, + {ICE_AQC_RX_EQU_DRATE , rx, &ptr->rx_equ_drate }, + };int err; - err =ice_aq_get_phy_equalization (hw,ICE_AQC_TX_EQU_PRE1 , -ICE_AQC_OP_CODE_TX_EQU , serdes_num, - &ptr->tx_equalization_pre1); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_TX_EQU_PRE3 , -ICE_AQC_OP_CODE_TX_EQU , serdes_num, - &ptr->tx_equalization_pre3); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_TX_EQU_ATTEN , -ICE_AQC_OP_CODE_TX_EQU , serdes_num, - &ptr->tx_equalization_atten); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_TX_EQU_POST1 , -ICE_AQC_OP_CODE_TX_EQU , serdes_num, - &ptr->tx_equalization_post1); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_TX_EQU_PRE2 , -ICE_AQC_OP_CODE_TX_EQU , serdes_num, - &ptr->tx_equalization_pre2); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_RX_EQU_PRE2 , -ICE_AQC_OP_CODE_RX_EQU , serdes_num, - &ptr->rx_equalization_pre2); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_RX_EQU_PRE1 , -ICE_AQC_OP_CODE_RX_EQU , serdes_num, - &ptr->rx_equalization_pre1); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_RX_EQU_POST1 , -ICE_AQC_OP_CODE_RX_EQU , serdes_num, - &ptr->rx_equalization_post1); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_RX_EQU_BFLF , -ICE_AQC_OP_CODE_RX_EQU , serdes_num, - &ptr->rx_equalization_bflf); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_RX_EQU_BFHF , -ICE_AQC_OP_CODE_RX_EQU , serdes_num, - &ptr->rx_equalization_bfhf); -if (err) -return err; - - err =ice_aq_get_phy_equalization (hw,ICE_AQC_RX_EQU_DRATE , -ICE_AQC_OP_CODE_RX_EQU , serdes_num, - &ptr->rx_equalization_drate); -if (err) -return err; +for (int i =0 ; i <ARRAY_SIZE (aq_params); i++) { + err =ice_aq_get_phy_equalization (hw, aq_params[i].data_in, + aq_params[i].opcode, + serdes_num, aq_params[i].out); +if (err) +break ; + } -return 0 ; +return err; }/**
drivers/net/ethernet/intel/ice/ice_ethtool.h +11 -11
@@ -10,17 +10,17 @@ struct ice_phy_type_to_ethtool { };struct ice_serdes_equalization_to_ethtool { -int rx_equalization_pre2; -int rx_equalization_pre1; -int rx_equalization_post1; -int rx_equalization_bflf; -int rx_equalization_bfhf; -int rx_equalization_drate; -int tx_equalization_pre1; -int tx_equalization_pre3; -int tx_equalization_atten; -int tx_equalization_post1; -int tx_equalization_pre2; +int rx_equ_pre2; +int rx_equ_pre1; +int rx_equ_post1; +int rx_equ_bflf; +int rx_equ_bfhf; +int rx_equ_drate; +int tx_equ_pre1; +int tx_equ_pre3; +int tx_equ_atten; +int tx_equ_post1; +int tx_equ_pre2; };struct ice_regdump_to_ethtool {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 488/590 ice: extend dump serdes equalizer values feature
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Polchlopek <[email protected]>
[ Upstream commit 99dbcab0cdd60e35d9f208b2f7515a19ba523ff6 ]
Extend the work done in commit 70838938e89c ("ice: Implement driver functionality to dump serdes equalizer values") by adding the new set of Rx registers that can be read using command:
$ ethtool -d interface_name
Rx equalization parameters are E810 PHY registers used by end user to gather information about configuration and status to debug link and connection issues in the field.
Stable-dep-of: c5cc2a27e04f ("ice: remove invalid parameter of equalizer")
--- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 17 +++++++++++++++++ drivers/net/ethernet/intel/ice/ice_ethtool.c | 17 +++++++++++++++++ drivers/net/ethernet/intel/ice/ice_ethtool.h | 17 +++++++++++++++++ 3 files changed, 51 insertions(+)
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +17 -0
@@ -1492,6 +1492,23 @@ struct ice_aqc_dnl_equa_param {#define ICE_AQC_RX_EQU_BFLF (0x13 << ICE_AQC_RX_EQU_SHIFT)#define ICE_AQC_RX_EQU_BFHF (0x14 << ICE_AQC_RX_EQU_SHIFT)#define ICE_AQC_RX_EQU_DRATE (0x15 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_CTLE_GAINHF (0x20 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_CTLE_GAINLF (0x21 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_CTLE_GAINDC (0x22 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_CTLE_BW (0x23 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_GAIN (0x30 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_GAIN2 (0x31 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_2 (0x32 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_3 (0x33 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_4 (0x34 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_5 (0x35 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_6 (0x36 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_7 (0x37 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_8 (0x38 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_9 (0x39 << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_10 (0x3A << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_11 (0x3B << ICE_AQC_RX_EQU_SHIFT) +#define ICE_AQC_RX_EQU_DFE_12 (0x3C << ICE_AQC_RX_EQU_SHIFT)#define ICE_AQC_TX_EQU_PRE1 0x0#define ICE_AQC_TX_EQU_PRE3 0x3#define ICE_AQC_TX_EQU_ATTEN 0x4
drivers/net/ethernet/intel/ice/ice_ethtool.c +17 -0
@@ -711,6 +711,23 @@ static int ice_get_tx_rx_equa(struct ice_hw *hw, u8 serdes_num, { ICE_AQC_RX_EQU_BFLF, rx, &ptr->rx_equ_bflf }, { ICE_AQC_RX_EQU_BFHF, rx, &ptr->rx_equ_bfhf }, { ICE_AQC_RX_EQU_DRATE, rx, &ptr->rx_equ_drate }, + { ICE_AQC_RX_EQU_CTLE_GAINHF, rx, &ptr->rx_equ_ctle_gainhf }, + { ICE_AQC_RX_EQU_CTLE_GAINLF, rx, &ptr->rx_equ_ctle_gainlf }, + { ICE_AQC_RX_EQU_CTLE_GAINDC, rx, &ptr->rx_equ_ctle_gaindc }, + { ICE_AQC_RX_EQU_CTLE_BW, rx, &ptr->rx_equ_ctle_bw }, + { ICE_AQC_RX_EQU_DFE_GAIN, rx, &ptr->rx_equ_dfe_gain }, + { ICE_AQC_RX_EQU_DFE_GAIN2, rx, &ptr->rx_equ_dfe_gain_2 }, + { ICE_AQC_RX_EQU_DFE_2, rx, &ptr->rx_equ_dfe_2 }, + { ICE_AQC_RX_EQU_DFE_3, rx, &ptr->rx_equ_dfe_3 }, + { ICE_AQC_RX_EQU_DFE_4, rx, &ptr->rx_equ_dfe_4 }, + { ICE_AQC_RX_EQU_DFE_5, rx, &ptr->rx_equ_dfe_5 }, + { ICE_AQC_RX_EQU_DFE_6, rx, &ptr->rx_equ_dfe_6 }, + { ICE_AQC_RX_EQU_DFE_7, rx, &ptr->rx_equ_dfe_7 }, + { ICE_AQC_RX_EQU_DFE_8, rx, &ptr->rx_equ_dfe_8 }, + { ICE_AQC_RX_EQU_DFE_9, rx, &ptr->rx_equ_dfe_9 }, + { ICE_AQC_RX_EQU_DFE_10, rx, &ptr->rx_equ_dfe_10 }, + { ICE_AQC_RX_EQU_DFE_11, rx, &ptr->rx_equ_dfe_11 }, + { ICE_AQC_RX_EQU_DFE_12, rx, &ptr->rx_equ_dfe_12 }, };int err;
drivers/net/ethernet/intel/ice/ice_ethtool.h +17 -0
@@ -16,6 +16,23 @@ struct ice_serdes_equalization_to_ethtool {int rx_equ_bflf;int rx_equ_bfhf;int rx_equ_drate; +int rx_equ_ctle_gainhf; +int rx_equ_ctle_gainlf; +int rx_equ_ctle_gaindc; +int rx_equ_ctle_bw; +int rx_equ_dfe_gain; +int rx_equ_dfe_gain_2; +int rx_equ_dfe_2; +int rx_equ_dfe_3; +int rx_equ_dfe_4; +int rx_equ_dfe_5; +int rx_equ_dfe_6; +int rx_equ_dfe_7; +int rx_equ_dfe_8; +int rx_equ_dfe_9; +int rx_equ_dfe_10; +int rx_equ_dfe_11; +int rx_equ_dfe_12;int tx_equ_pre1;int tx_equ_pre3;int tx_equ_atten;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 489/590 ice: remove invalid parameter of equalizer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Polchlopek <[email protected]>
[ Upstream commit c5cc2a27e04f2fcd77c74ada9aef76a758a24697 ]
It occurred that in the commit 70838938e89c ("ice: Implement driver functionality to dump serdes equalizer values") the invalid DRATE parameter for reading has been added. The output of the command:
$ ethtool -d <ethX>
returns the garbage value in the place where DRATE value should be stored.
Remove mentioned parameter to prevent return of corrupted data to userspace.
--- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 1 - drivers/net/ethernet/intel/ice/ice_ethtool.c | 1 - drivers/net/ethernet/intel/ice/ice_ethtool.h | 1 - 3 files changed, 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +0 -1
@@ -1491,7 +1491,6 @@ struct ice_aqc_dnl_equa_param {#define ICE_AQC_RX_EQU_POST1 (0x12 << ICE_AQC_RX_EQU_SHIFT)#define ICE_AQC_RX_EQU_BFLF (0x13 << ICE_AQC_RX_EQU_SHIFT)#define ICE_AQC_RX_EQU_BFHF (0x14 << ICE_AQC_RX_EQU_SHIFT) -#define ICE_AQC_RX_EQU_DRATE (0x15 << ICE_AQC_RX_EQU_SHIFT)#define ICE_AQC_RX_EQU_CTLE_GAINHF (0x20 << ICE_AQC_RX_EQU_SHIFT)#define ICE_AQC_RX_EQU_CTLE_GAINLF (0x21 << ICE_AQC_RX_EQU_SHIFT)#define ICE_AQC_RX_EQU_CTLE_GAINDC (0x22 << ICE_AQC_RX_EQU_SHIFT)
drivers/net/ethernet/intel/ice/ice_ethtool.c +0 -1
@@ -710,7 +710,6 @@ static int ice_get_tx_rx_equa(struct ice_hw *hw, u8 serdes_num, { ICE_AQC_RX_EQU_POST1, rx, &ptr->rx_equ_post1 }, { ICE_AQC_RX_EQU_BFLF, rx, &ptr->rx_equ_bflf }, { ICE_AQC_RX_EQU_BFHF, rx, &ptr->rx_equ_bfhf }, - { ICE_AQC_RX_EQU_DRATE, rx, &ptr->rx_equ_drate }, { ICE_AQC_RX_EQU_CTLE_GAINHF, rx, &ptr->rx_equ_ctle_gainhf }, { ICE_AQC_RX_EQU_CTLE_GAINLF, rx, &ptr->rx_equ_ctle_gainlf }, { ICE_AQC_RX_EQU_CTLE_GAINDC, rx, &ptr->rx_equ_ctle_gaindc },
drivers/net/ethernet/intel/ice/ice_ethtool.h +0 -1
@@ -15,7 +15,6 @@ struct ice_serdes_equalization_to_ethtool {int rx_equ_post1;int rx_equ_bflf;int rx_equ_bfhf; -int rx_equ_drate;int rx_equ_ctle_gainhf;int rx_equ_ctle_gainlf;int rx_equ_ctle_gaindc;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 490/590 iavf: allow changing VLAN state without calling PF
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Swiatkowski <[email protected]>
[ Upstream commit ee7d79433d783346430ee32f28c9df44a88b3bb6 ]
First case:
Quoted 3 lines
ip l a l $VF name vlanx type vlan id 100
ip l d vlanx
ip l a l $VF name vlanx type vlan id 100
As workqueue can be execute after sometime, there is a window to have call trace like that:
- iavf_del_vlan
- iavf_add_vlan
- iavf_del_vlans (wq)
It means that our VLAN 100 will change the state from IAVF_VLAN_ACTIVE to IAVF_VLAN_REMOVE (iavf_del_vlan). After that in iavf_add_vlan state won't be changed because VLAN 100 is on the filter list. The final result is that the VLAN 100 filter isn't added in hardware (no iavf_add_vlans call).
To fix that change the state if the filter wasn't removed yet directly to active. It is save as IAVF_VLAN_REMOVE means that virtchnl message wasn't sent yet.
Second case:
Quoted 1 line
ip l a l $VF name vlanx type vlan id 100
Any type of VF reset ex. change trust
Quoted 3 lines
ip l s $PF vf $VF_NUM trust on
ip l d vlanx
ip l a l $VF name vlanx type vlan id 100
In case of reset iavf driver is responsible for readding all filters that are being used. To do that all VLAN filters state are changed to IAVF_VLAN_ADD. Here is even longer window for changing VLAN state from kernel side, as workqueue isn't called immediately. We can have call trace like that:
- changing to IAVF_VLAN_ADD (after reset)
- iavf_del_vlan (called from kernel ops)
- iavf_del_vlans (wq)
Not exsisitng VLAN filters will be removed from hardware. It isn't a bug, ice driver will handle it fine. However, we can have call trace like that:
- changing to IAVF_VLAN_ADD (after reset)
- iavf_del_vlan (called from kernel ops)
- iavf_add_vlan (called from kernel ops)
- iavf_del_vlans (wq)
With fix for previous case we end up with no VLAN filters in hardware. We have to remove VLAN filters if the state is IAVF_VLAN_ADD and delete VLAN was called. It is save as IAVF_VLAN_ADD means that virtchnl message wasn't sent yet.
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +17 -2
@@ -773,6 +773,11 @@ iavf_vlan_filter *iavf_add_vlan(struct iavf_adapter *adapter, f->state =IAVF_VLAN_ADD ; adapter->num_vlan_filters++;iavf_schedule_aq_request (adapter,IAVF_FLAG_AQ_ADD_VLAN_FILTER ); + }else if (f->state ==IAVF_VLAN_REMOVE ) { +/* IAVF_VLAN_REMOVE means that VLAN wasn't yet removed. +* We can safely only change the state here. +*/ + f->state =IAVF_VLAN_ACTIVE ; } clearout:
@@ -793,8 +798,18 @@ static void iavf_del_vlan(struct iavf_adapter *adapter, struct iavf_vlan vlan) f =iavf_find_vlan (adapter, vlan);if (f) { - f->state =IAVF_VLAN_REMOVE ; -iavf_schedule_aq_request (adapter,IAVF_FLAG_AQ_DEL_VLAN_FILTER ); +/* IAVF_ADD_VLAN means that VLAN wasn't even added yet. +* Remove it from the list. +*/ +if (f->state ==IAVF_VLAN_ADD ) { +list_del (&f->list); +kfree (f); + adapter->num_vlan_filters--; + }else { + f->state =IAVF_VLAN_REMOVE ; +iavf_schedule_aq_request (adapter, +IAVF_FLAG_AQ_DEL_VLAN_FILTER ); + } }spin_unlock_bh (&adapter->mac_vlan_list_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 491/590 s390/mm: Allow large pages for KASAN shadow mapping
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Gorbik <[email protected]>
[ Upstream commit ff123eb7741638d55abf82fac090bb3a543c1e74 ]
Commit c98d2ecae08f ("s390/mm: Uncouple physical vs virtual address spaces") introduced a large_allowed() helper that restricts which mapping modes can use large pages. This change unintentionally prevented KASAN shadow mappings from using large pages, despite there being no reason to avoid them. In fact, large pages are preferred for performance.
Add POPULATE_KASAN_MAP_SHADOW to the allowed list in large_allowed() to restore large page mappings for KASAN shadows.
While large_allowed() isn't strictly necessary with current mapping modes since disallowed modes either don't map anything or fail alignment and size checks, keep it for clarity.
--- arch/s390/boot/vmem.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/s390/boot/vmem.c +11 -1
@@ -264,7 +264,17 @@ static unsigned long _pa(unsigned long addr, unsigned long size, enum populate_mstatic bool large_allowed (enum populate_mode mode) { -return (mode ==POPULATE_DIRECT ) || (mode ==POPULATE_IDENTITY ) || (mode ==POPULATE_KERNEL ); +switch (mode) { +case POPULATE_DIRECT : +case POPULATE_IDENTITY : +case POPULATE_KERNEL : +#ifdef CONFIG_KASAN +case POPULATE_KASAN_MAP_SHADOW : +#endif +return true; +default : +return false; + } } static bool can_large_pud(pud_t *pu_dir, unsigned long addr, unsigned long end,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 492/590 net/ncsi: use dev_set_mac_address() for Get MC MAC Address handling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Fertser <[email protected]>
[ Upstream commit 05d91cdb1f9108426b14975ef4eeddf15875ca05 ]
Copy of the rationale from 790071347a0a1a89e618eedcd51c687ea783aeb3:
Change ndo_set_mac_address to dev_set_mac_address because dev_set_mac_address provides a way to notify network layer about MAC change. In other case, services may not aware about MAC change and keep using old one which set from network adapter driver.
As example, DHCP client from systemd do not update MAC address without notification from net subsystem which leads to the problem with acquiring the right address from DHCP server.
Since dev_set_mac_address requires RTNL lock the operation can not be performed directly in the response handler, see 9e2bbab94b88295dcc57c7580393c9ee08d7314d.
The way of selecting the first suitable MAC address from the list is changed, instead of having the driver check it this patch just assumes any valid MAC should be good.
--- net/ncsi/ncsi-rsp.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
net/ncsi/ncsi-rsp.c +8 -10
@@ -1089,14 +1089,12 @@ static int ncsi_rsp_handler_netlink(struct ncsi_request *nr)static int ncsi_rsp_handler_gmcma (struct ncsi_request *nr) {struct ncsi_dev_priv *ndp = nr->ndp; +struct sockaddr *saddr = &ndp->pending_mac;struct net_device *ndev = ndp->ndev.dev;struct ncsi_rsp_gmcma_pkt *rsp; -struct sockaddr saddr; -int ret =-1 ;int i; rsp = (struct ncsi_rsp_gmcma_pkt *)skb_network_header (nr->rsp); - saddr.sa_family = ndev->type; ndev->priv_flags |=IFF_LIVE_ADDR_CHANGE ; netdev_info(ndev, "NCSI: Received %d provisioned MAC addresses\n",
@@ -1108,20 +1106,20 @@ static int ncsi_rsp_handler_gmcma(struct ncsi_request *nr) rsp->addresses[i][4], rsp->addresses[i][5]); } + saddr->sa_family = ndev->type;for (i =0 ; i < rsp->address_count; i++) { -memcpy (saddr.sa_data, &rsp->addresses[i],ETH_ALEN ); - ret = ndev->netdev_ops->ndo_set_mac_address (ndev, &saddr); -if (ret <0 ) { +if (!is_valid_ether_addr (rsp->addresses[i])) {netdev_warn (ndev,"NCSI: Unable to assign %pM to device\n" , - saddr.sa_data); + rsp->addresses[i]);continue ; } -netdev_warn (ndev,"NCSI: Set MAC address to %pM\n" , saddr.sa_data); +memcpy (saddr->sa_data, rsp->addresses[i],ETH_ALEN ); +netdev_warn (ndev,"NCSI: Will set MAC address to %pM\n" , saddr->sa_data);break ; } - ndp->gma_flag = ret ==0 ; -return ret; + ndp->gma_flag =1 ; +return 0 ; } static struct ncsi_rsp_handler {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 493/590 net: rose: fix timer races against user threads
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 5de7665e0a0746b5ad7943554b34db8f8614a196 ]
Rose timers only acquire the socket spinlock, without checking if the socket is owned by one user thread.
Add a check and rearm the timers if needed.
BUG: KASAN: slab-use-after-free in rose_timer_expiry+0x31d/0x360 net/rose/rose_timer.c:174 Read of size 2 at addr ffff88802f09b82a by task swapper/0/0 CPU: 0 UID: 0 PID: 0 Comm: swapper/0 Not tainted 6.13.0-rc5-syzkaller-00172-gd1bf27c4e176 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0x169/0x550 mm/kasan/report.c:489 kasan_report+0x143/0x180 mm/kasan/report.c:602 rose_timer_expiry+0x31d/0x360 net/rose/rose_timer.c:174 call_timer_fn+0x187/0x650 kernel/time/timer.c:1793 expire_timers kernel/time/timer.c:1844 [inline] __run_timers kernel/time/timer.c:2418 [inline] __run_timer_base+0x66a/0x8e0 kernel/time/timer.c:2430 run_timer_base kernel/time/timer.c:2439 [inline] run_timer_softirq+0xb7/0x170 kernel/time/timer.c:2449 handle_softirqs+0x2d4/0x9b0 kernel/softirq.c:561 __do_softirq kernel/softirq.c:595 [inline] invoke_softirq kernel/softirq.c:435 [inline] __irq_exit_rcu+0xf7/0x220 kernel/softirq.c:662 irq_exit_rcu+0x9/0x30 kernel/softirq.c:678 instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1049 [inline] sysvec_apic_timer_interrupt+0xa6/0xc0 arch/x86/kernel/apic/apic.c:1049 </IRQ>
--- net/rose/rose_timer.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
net/rose/rose_timer.c +15 -0
@@ -122,6 +122,10 @@ static void rose_heartbeat_expiry(struct timer_list *t)struct rose_sock *rose =rose_sk (sk);bh_lock_sock (sk); +if (sock_owned_by_user (sk)) { +sk_reset_timer (sk, &sk->sk_timer, jiffies +HZ /20 ); + goto out; + }switch (rose->state) {case ROSE_STATE_0 :/* Magic here: If we listen() and a new link dies before it
@@ -152,6 +156,7 @@ static void rose_heartbeat_expiry(struct timer_list *t) }rose_start_heartbeat (sk); +out:bh_unlock_sock (sk);sock_put (sk); }
@@ -162,6 +167,10 @@ static void rose_timer_expiry(struct timer_list *t)struct sock *sk = &rose->sock;bh_lock_sock (sk); +if (sock_owned_by_user (sk)) { +sk_reset_timer (sk, &rose->timer, jiffies +HZ /20 ); + goto out; + }switch (rose->state) {case ROSE_STATE_1 :/* T1 */ case ROSE_STATE_4 :/* T2 */
@@ -182,6 +191,7 @@ static void rose_timer_expiry(struct timer_list *t) }break ; } +out:bh_unlock_sock (sk);sock_put (sk); }
@@ -192,6 +202,10 @@ static void rose_idletimer_expiry(struct timer_list *t)struct sock *sk = &rose->sock;bh_lock_sock (sk); +if (sock_owned_by_user (sk)) { +sk_reset_timer (sk, &rose->idletimer, jiffies +HZ /20 ); + goto out; + }rose_clear_queues (sk);rose_write_internal (sk,ROSE_CLEAR_REQUEST );
@@ -207,6 +221,7 @@ static void rose_idletimer_expiry(struct timer_list *t) sk->sk_state_change (sk);sock_set_flag (sk,SOCK_DEAD ); } +out:bh_unlock_sock (sk);sock_put (sk); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 494/590 net: netdevsim: try to close UDP port harness races
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 50bf398e1ceacb9a7f85bd3bdca065ebe5cb6159 ]
syzbot discovered that we remove the debugfs files after we free the netdev. Try to clean up the relevant dir while the device is still around.
--- drivers/net/netdevsim/netdevsim.h | 1 + drivers/net/netdevsim/udp_tunnels.c | 23 +++++++++++-------- .../drivers/net/netdevsim/udp_tunnel_nic.sh | 16 ++++++------- 3 files changed, 23 insertions(+), 17 deletions(-)
drivers/net/netdevsim/netdevsim.h +1 -0
@@ -129,6 +129,7 @@ struct netdevsim {u32 sleep;u32 __ports[2 ][NSIM_UDP_TUNNEL_N_PORTS ];u32 (*ports)[NSIM_UDP_TUNNEL_N_PORTS ]; +struct dentry *ddir;struct debugfs_u32_array dfs_ports[2 ]; } udp_ports;
drivers/net/netdevsim/udp_tunnels.c +14 -9
@@ -112,9 +112,11 @@ nsim_udp_tunnels_info_reset_write(struct file *file, const char __user *data,struct net_device *dev = file->private_data;struct netdevsim *ns =netdev_priv (dev); -memset (ns->udp_ports.ports,0 ,sizeof (ns->udp_ports.__ports));rtnl_lock (); -udp_tunnel_nic_reset_ntf (dev); +if (dev->reg_state ==NETREG_REGISTERED ) { +memset (ns->udp_ports.ports,0 ,sizeof (ns->udp_ports.__ports)); +udp_tunnel_nic_reset_ntf (dev); + }rtnl_unlock ();return count;
@@ -144,23 +146,23 @@ int nsim_udp_tunnels_info_create(struct nsim_dev *nsim_dev,else ns->udp_ports.ports = nsim_dev->udp_ports.__ports; -debugfs_create_u32 ("udp_ports_inject_error" ,0600 , - ns->nsim_dev_port->ddir, + ns->udp_ports.ddir =debugfs_create_dir ("udp_ports" , + ns->nsim_dev_port->ddir); + +debugfs_create_u32 ("inject_error" ,0600 , ns->udp_ports.ddir, &ns->udp_ports.inject_error); ns->udp_ports.dfs_ports[0 ].array = ns->udp_ports.ports[0 ]; ns->udp_ports.dfs_ports[0 ].n_elements =NSIM_UDP_TUNNEL_N_PORTS ; -debugfs_create_u32_array ("udp_ports_table0" ,0400 , - ns->nsim_dev_port->ddir, +debugfs_create_u32_array ("table0" ,0400 , ns->udp_ports.ddir, &ns->udp_ports.dfs_ports[0 ]); ns->udp_ports.dfs_ports[1 ].array = ns->udp_ports.ports[1 ]; ns->udp_ports.dfs_ports[1 ].n_elements =NSIM_UDP_TUNNEL_N_PORTS ; -debugfs_create_u32_array ("udp_ports_table1" ,0400 , - ns->nsim_dev_port->ddir, +debugfs_create_u32_array ("table1" ,0400 , ns->udp_ports.ddir, &ns->udp_ports.dfs_ports[1 ]); -debugfs_create_file ("udp_ports_reset" ,0200 , ns->nsim_dev_port->ddir, +debugfs_create_file ("reset" ,0200 , ns->udp_ports.ddir, dev, &nsim_udp_tunnels_info_reset_fops);/* Note: it's not normal to allocate the info struct like this!
@@ -196,6 +198,9 @@ int nsim_udp_tunnels_info_create(struct nsim_dev *nsim_dev,void nsim_udp_tunnels_info_destroy (struct net_device *dev) { +struct netdevsim *ns =netdev_priv (dev); + +debugfs_remove_recursive (ns->udp_ports.ddir);kfree (dev->udp_tunnel_nic_info); dev->udp_tunnel_nic_info =NULL ; }
tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh +8 -8
@@ -142,7 +142,7 @@ function pre_ethtool { } function check_table { - local path=$NSIM_DEV_DFS/ports/$port/udp_ports_table$1 + local path=$NSIM_DEV_DFS/ports/$port/udp_ports/table$1 local -n expected=$2 local last=$3
@@ -212,7 +212,7 @@ function check_tables { } function print_table { - local path=$NSIM_DEV_DFS/ports/$port/udp_ports_table$1 + local path=$NSIM_DEV_DFS/ports/$port/udp_ports/table$1 read -a have < $path tree $NSIM_DEV_DFS/
@@ -641,7 +641,7 @@ for port in 0 1; do NSIM_NETDEV=`get_netdev_name old_netdevs` ip link set dev $NSIM_NETDEV up - echo 110 > $NSIM_DEV_DFS/ports/$port/udp_ports_inject_error + echo 110 > $NSIM_DEV_DFS/ports/$port/udp_ports/inject_error msg="1 - create VxLANs v6" exp0=( 0 0 0 0 )
@@ -663,7 +663,7 @@ for port in 0 1; do new_geneve gnv0 20000 msg="2 - destroy GENEVE" - echo 2 > $NSIM_DEV_DFS/ports/$port/udp_ports_inject_error + echo 2 > $NSIM_DEV_DFS/ports/$port/udp_ports/inject_error exp1=( `mke 20000 2` 0 0 0 ) del_dev gnv0
@@ -764,7 +764,7 @@ for port in 0 1; do msg="create VxLANs v4" new_vxlan vxlan0 10000 $NSIM_NETDEV - echo 1 > $NSIM_DEV_DFS/ports/$port/udp_ports_reset + echo 1 > $NSIM_DEV_DFS/ports/$port/udp_ports/reset check_tables msg="NIC device goes down"
@@ -775,7 +775,7 @@ for port in 0 1; do fi check_tables - echo 1 > $NSIM_DEV_DFS/ports/$port/udp_ports_reset + echo 1 > $NSIM_DEV_DFS/ports/$port/udp_ports/reset check_tables msg="NIC device goes up again"
@@ -789,7 +789,7 @@ for port in 0 1; do del_dev vxlan0 check_tables - echo 1 > $NSIM_DEV_DFS/ports/$port/udp_ports_reset + echo 1 > $NSIM_DEV_DFS/ports/$port/udp_ports/reset check_tables msg="destroy NIC"
@@ -896,7 +896,7 @@ msg="vacate VxLAN in overflow table" exp0=( `mke 10000 1` `mke 10004 1` 0 `mke 10003 1` ) del_dev vxlan2 -echo 1 > $NSIM_DEV_DFS/ports/$port/udp_ports_reset +echo 1 > $NSIM_DEV_DFS/ports/$port/udp_ports/reset check_tables msg="tunnels destroyed 2"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 495/590 tools: ynl: c: correct reverse decode of empty attrs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 964417a5d4a06614ef7fb3ae69bb17c91a2dc016 ]
netlink reports which attribute was incorrect by sending back an attribute offset. Offset points to the address of struct nlattr, but to interpret the type we also need the nesting path. Attribute IDs have different meaning in different nests of the same message.
Correct the condition for "is the offset within current attribute". ynl_attr_data_len() does not include the attribute header, so the end offset was off by 4 bytes.
This means that we'd always skip over flags and empty nests.
The devmem tests, for example, issues an invalid request with empty queue nests, resulting in the following error:
YNL failed: Kernel error: missing attribute: .queues.ifindex
The message is incorrect, "queues" nest does not have an "ifindex" attribute defined. With this fix we decend correctly into the nest:
YNL failed: Kernel error: missing attribute: .queues.id
--- tools/net/ynl/lib/ynl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/net/ynl/lib/ynl.c +1 -1
@@ -95,7 +95,7 @@ ynl_err_walk(struct ynl_sock *ys, void *start, void *end, unsigned int off,ynl_attr_for_each_payload (start, data_len, attr) { astart_off = (char *)attr - (char *)start; - aend_off = astart_off +ynl_attr_data_len (attr); + aend_off = (char *)ynl_attr_data_end (attr) - (char *)start;if (aend_off <= off)continue ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 496/590 selftests: mptcp: extend CFLAGS to keep options from environment
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Stancek <[email protected]>
[ Upstream commit 23b3a7c4a7583eac9e3976355928a832c87caa0f ]
Package build environments like Fedora rpmbuild introduced hardening options (e.g. -pie -Wl,-z,now) by passing a -spec option to CFLAGS and LDFLAGS.
mptcp Makefile currently overrides CFLAGS but not LDFLAGS, which leads
to a mismatch and build failure, for example:
make[1]: *** [../../lib.mk:222: tools/testing/selftests/net/mptcp/mptcp_sockopt] Error 1
/usr/bin/ld: /tmp/ccqyMVdb.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a PIE object; recompile with -fPIE /usr/bin/ld: failed to set dynamic section sizes: bad value
collect2: error: ld returned 1 exit status
--- tools/testing/selftests/net/mptcp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/mptcp/Makefile +1 -1
@@ -2,7 +2,7 @@ top_srcdir = ../../../../.. -CFLAGS = -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES) +CFLAGS += -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES) TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \ simult_flows.sh mptcp_sockopt.sh userspace_pm.sh
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 497/590 selftests: net/{lib,openvswitch}: extend CFLAGS to keep options from environment
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Stancek <[email protected]>
[ Upstream commit 9b06d5b956131bde535f5c045cf8c1ff6bfba76c ]
Package build environments like Fedora rpmbuild introduced hardening options (e.g. -pie -Wl,-z,now) by passing a -spec option to CFLAGS and LDFLAGS.
Some Makefiles currently override CFLAGS but not LDFLAGS, which leads to a mismatch and build failure, for example:
/usr/bin/ld: /tmp/ccd2apay.o: relocation R_X86_64_32 against
`.rodata.str1.1' can not be used when making a PIE object; recompile with -fPIE
/usr/bin/ld: failed to set dynamic section sizes: bad value
collect2: error: ld returned 1 exit status
make[1]: *** [../../lib.mk:222: tools/testing/selftests/net/lib/csum] Error 1
openvswitch/Makefile CFLAGS currently do not appear to be used, but fix it anyway for the case when new tests are introduced in future.
--- tools/testing/selftests/net/lib/Makefile | 2 +- tools/testing/selftests/net/openvswitch/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/lib/Makefile +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS = -Wall -Wl,--no-as-needed -O2 -g +CFLAGS += -Wall -Wl,--no-as-needed -O2 -g CFLAGS += -I../../../../../usr/include/ $(KHDR_INCLUDES) # Additional include paths needed by kselftest.h CFLAGS += -I../../
tools/testing/selftests/net/openvswitch/Makefile +1 -1
@@ -2,7 +2,7 @@ top_srcdir = ../../../../.. -CFLAGS = -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES) +CFLAGS += -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES) TEST_PROGS := openvswitch.sh
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 498/590 rxrpc, afs: Fix peer hash locking vs RCU callback
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 79d458c13056559d49b5e41fbc4b6890e68cf65b ]
In its address list, afs now retains pointers to and refs on one or more rxrpc_peer objects. The address list is freed under RCU and at this time, it puts the refs on those peers.
Now, when an rxrpc_peer object runs out of refs, it gets removed from the peer hash table and, for that, rxrpc has to take a spinlock. However, it is now being called from afs's RCU cleanup, which takes place in BH context - but it is just taking an ordinary spinlock.
The put may also be called from non-BH context, and so there exists the possibility of deadlock if the BH-based RCU cleanup happens whilst the hash spinlock is held. This led to the attached lockdep complaint.
Fix this by changing spinlocks of rxnet->peer_hash_lock back to BH-disabling locks.
================================
WARNING: inconsistent lock state
6.13.0-rc5-build2+ #1223 Tainted: G E
--------------------------------
inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
swapper/1/0 [HC0[0]:SC1[1]:HE1:SE0] takes:
ffff88810babe228 (&rxnet->peer_hash_lock){+.?.}-{3:3}, at: rxrpc_put_peer+0xcb/0x180
{SOFTIRQ-ON-W} state was registered at:
mark_usage+0x164/0x180
__lock_acquire+0x544/0x990
lock_acquire.part.0+0x103/0x280
_raw_spin_lock+0x2f/0x40
rxrpc_peer_keepalive_worker+0x144/0x440
process_one_work+0x486/0x7c0
process_scheduled_works+0x73/0x90
worker_thread+0x1c8/0x2a0
kthread+0x19b/0x1b0
ret_from_fork+0x24/0x40
ret_from_fork_asm+0x1a/0x30
irq event stamp: 972402
hardirqs last enabled at (972402): [<ffffffff8244360e>] _raw_spin_unlock_irqrestore+0x2e/0x50
hardirqs last disabled at (972401): [<ffffffff82443328>] _raw_spin_lock_irqsave+0x18/0x60
softirqs last enabled at (972300): [<ffffffff810ffbbe>] handle_softirqs+0x3ee/0x430
softirqs last disabled at (972313): [<ffffffff810ffc54>] __irq_exit_rcu+0x44/0x110
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(&rxnet->peer_hash_lock);
<Interrupt>
lock(&rxnet->peer_hash_lock);
*** DEADLOCK ***
1 lock held by swapper/1/0:
#0: ffffffff83576be0 (rcu_callback){....}-{0:0}, at: rcu_lock_acquire+0x7/0x30
stack backtrace:
CPU: 1 UID: 0 PID: 0 Comm: swapper/1 Tainted: G E 6.13.0-rc5-build2+ #1223
Tainted: [E]=UNSIGNED_MODULE
Hardware name: ASUS All Series/H97-PLUS, BIOS 2306 10/09/2014
Call Trace:
<IRQ>
dump_stack_lvl+0x57/0x80
print_usage_bug.part.0+0x227/0x240
valid_state+0x53/0x70
mark_lock_irq+0xa5/0x2f0
mark_lock+0xf7/0x170
mark_usage+0xe1/0x180
__lock_acquire+0x544/0x990
lock_acquire.part.0+0x103/0x280
_raw_spin_lock+0x2f/0x40
rxrpc_put_peer+0xcb/0x180
afs_free_addrlist+0x46/0x90 [kafs]
rcu_do_batch+0x2d2/0x640
rcu_core+0x2f7/0x350
handle_softirqs+0x1ee/0x430
__irq_exit_rcu+0x44/0x110
irq_exit_rcu+0xa/0x30
sysvec_apic_timer_interrupt+0x7f/0xa0
</IRQ>--- net/rxrpc/peer_event.c | 16 ++++++++-------- net/rxrpc/peer_object.c | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-)
net/rxrpc/peer_event.c +8 -8
@@ -238,7 +238,7 @@ static void rxrpc_peer_keepalive_dispatch(struct rxrpc_net *rxnet,bool use;int slot; -spin_lock (&rxnet->peer_hash_lock); +spin_lock_bh (&rxnet->peer_hash_lock);while (!list_empty (collector)) { peer = list_entry(collector->next,
@@ -249,7 +249,7 @@ static void rxrpc_peer_keepalive_dispatch(struct rxrpc_net *rxnet,continue ; use =__rxrpc_use_local (peer->local, rxrpc_local_use_peer_keepalive); -spin_unlock (&rxnet->peer_hash_lock); +spin_unlock_bh (&rxnet->peer_hash_lock);if (use) { keepalive_at = peer->last_tx_at +RXRPC_KEEPALIVE_TIME ;
@@ -269,17 +269,17 @@ static void rxrpc_peer_keepalive_dispatch(struct rxrpc_net *rxnet,*/ slot += cursor; slot &= mask; -spin_lock (&rxnet->peer_hash_lock); +spin_lock_bh (&rxnet->peer_hash_lock);list_add_tail (&peer->keepalive_link, &rxnet->peer_keepalive[slot & mask]); -spin_unlock (&rxnet->peer_hash_lock); +spin_unlock_bh (&rxnet->peer_hash_lock);rxrpc_unuse_local (peer->local, rxrpc_local_unuse_peer_keepalive); }rxrpc_put_peer (peer, rxrpc_peer_put_keepalive); -spin_lock (&rxnet->peer_hash_lock); +spin_lock_bh (&rxnet->peer_hash_lock); } -spin_unlock (&rxnet->peer_hash_lock); +spin_unlock_bh (&rxnet->peer_hash_lock); }/*
@@ -309,7 +309,7 @@ void rxrpc_peer_keepalive_worker(struct work_struct *work)* second; the bucket at cursor + 1 goes at now + 1s and so * on... */ -spin_lock (&rxnet->peer_hash_lock); +spin_lock_bh (&rxnet->peer_hash_lock);list_splice_init (&rxnet->peer_keepalive_new, &collector); stop = cursor +ARRAY_SIZE (rxnet->peer_keepalive);
@@ -321,7 +321,7 @@ void rxrpc_peer_keepalive_worker(struct work_struct *work) } base = now; -spin_unlock (&rxnet->peer_hash_lock); +spin_unlock_bh (&rxnet->peer_hash_lock); rxnet->peer_keepalive_base = base; rxnet->peer_keepalive_cursor = cursor;
net/rxrpc/peer_object.c +6 -6
@@ -313,10 +313,10 @@ void rxrpc_new_incoming_peer(struct rxrpc_local *local, struct rxrpc_peer *peer) hash_key =rxrpc_peer_hash_key (local, &peer->srx);rxrpc_init_peer (local, peer, hash_key); -spin_lock (&rxnet->peer_hash_lock); +spin_lock_bh (&rxnet->peer_hash_lock);hash_add_rcu (rxnet->peer_hash, &peer->hash_link, hash_key);list_add_tail (&peer->keepalive_link, &rxnet->peer_keepalive_new); -spin_unlock (&rxnet->peer_hash_lock); +spin_unlock_bh (&rxnet->peer_hash_lock); }/*
@@ -348,7 +348,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_local *local,return NULL ; } -spin_lock (&rxnet->peer_hash_lock); +spin_lock_bh (&rxnet->peer_hash_lock);/* Need to check that we aren't racing with someone else */ peer =__rxrpc_lookup_peer_rcu (local, srx, hash_key);
@@ -361,7 +361,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_local *local, &rxnet->peer_keepalive_new); } -spin_unlock (&rxnet->peer_hash_lock); +spin_unlock_bh (&rxnet->peer_hash_lock);if (peer)rxrpc_free_peer (candidate);
@@ -411,10 +411,10 @@ static void __rxrpc_put_peer(struct rxrpc_peer *peer)ASSERT (hlist_empty (&peer->error_targets)); -spin_lock (&rxnet->peer_hash_lock); +spin_lock_bh (&rxnet->peer_hash_lock);hash_del_rcu (&peer->hash_link);list_del_init (&peer->keepalive_link); -spin_unlock (&rxnet->peer_hash_lock); +spin_unlock_bh (&rxnet->peer_hash_lock);rxrpc_free_peer (peer); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 499/590 vxlan: Fix uninit-value in vxlan_vnifilter_dump()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shigeru Yoshida <[email protected]>
[ Upstream commit 5066293b9b7046a906eff60e3949a887ae185a43 ]
KMSAN reported an uninit-value access in vxlan_vnifilter_dump() [1].
If the length of the netlink message payload is less than sizeof(struct tunnel_msg), vxlan_vnifilter_dump() accesses bytes beyond the message. This can lead to uninit-value access. Fix this by returning an error in such situations.
[1]
BUG: KMSAN: uninit-value in vxlan_vnifilter_dump+0x328/0x920 drivers/net/vxlan/vxlan_vnifilter.c:422 vxlan_vnifilter_dump+0x328/0x920 drivers/net/vxlan/vxlan_vnifilter.c:422 rtnl_dumpit+0xd5/0x2f0 net/core/rtnetlink.c:6786 netlink_dump+0x93e/0x15f0 net/netlink/af_netlink.c:2317 __netlink_dump_start+0x716/0xd60 net/netlink/af_netlink.c:2432 netlink_dump_start include/linux/netlink.h:340 [inline] rtnetlink_dump_start net/core/rtnetlink.c:6815 [inline] rtnetlink_rcv_msg+0x1256/0x14a0 net/core/rtnetlink.c:6882 netlink_rcv_skb+0x467/0x660 net/netlink/af_netlink.c:2542 rtnetlink_rcv+0x35/0x40 net/core/rtnetlink.c:6944 netlink_unicast_kernel net/netlink/af_netlink.c:1321 [inline] netlink_unicast+0xed6/0x1290 net/netlink/af_netlink.c:1347 netlink_sendmsg+0x1092/0x1230 net/netlink/af_netlink.c:1891 sock_sendmsg_nosec net/socket.c:711 [inline] __sock_sendmsg+0x330/0x3d0 net/socket.c:726 ____sys_sendmsg+0x7f4/0xb50 net/socket.c:2583 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2637 __sys_sendmsg net/socket.c:2669 [inline] __do_sys_sendmsg net/socket.c:2674 [inline] __se_sys_sendmsg net/socket.c:2672 [inline] __x64_sys_sendmsg+0x211/0x3e0 net/socket.c:2672 x64_sys_call+0x3878/0x3d90 arch/x86/include/generated/asm/syscalls_64.h:47 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xd9/0x1d0 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
Uninit was created at:
slab_post_alloc_hook mm/slub.c:4110 [inline] slab_alloc_node mm/slub.c:4153 [inline] kmem_cache_alloc_node_noprof+0x800/0xe80 mm/slub.c:4205 kmalloc_reserve+0x13b/0x4b0 net/core/skbuff.c:587 __alloc_skb+0x347/0x7d0 net/core/skbuff.c:678 alloc_skb include/linux/skbuff.h:1323 [inline] netlink_alloc_large_skb+0xa5/0x280 net/netlink/af_netlink.c:1196 netlink_sendmsg+0xac9/0x1230 net/netlink/af_netlink.c:1866 sock_sendmsg_nosec net/socket.c:711 [inline] __sock_sendmsg+0x330/0x3d0 net/socket.c:726 ____sys_sendmsg+0x7f4/0xb50 net/socket.c:2583 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2637 __sys_sendmsg net/socket.c:2669 [inline] __do_sys_sendmsg net/socket.c:2674 [inline] __se_sys_sendmsg net/socket.c:2672 [inline] __x64_sys_sendmsg+0x211/0x3e0 net/socket.c:2672 x64_sys_call+0x3878/0x3d90 arch/x86/include/generated/asm/syscalls_64.h:47 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xd9/0x1d0 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f CPU: 0 UID: 0 PID: 30991 Comm: syz.4.10630 Not tainted 6.12.0-10694-gc44daa7e3c73 #29 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-3.fc41 04/01/2014
--- drivers/net/vxlan/vxlan_vnifilter.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/vxlan/vxlan_vnifilter.c +5 -0
@@ -411,6 +411,11 @@ static int vxlan_vnifilter_dump(struct sk_buff *skb, struct netlink_callback *cbstruct tunnel_msg *tmsg;struct net_device *dev; +if (cb->nlh->nlmsg_len <nlmsg_msg_size (sizeof (struct tunnel_msg ))) { +NL_SET_ERR_MSG (cb->extack,"Invalid msg length" ); +return -EINVAL ; + } + tmsg =nlmsg_data (cb->nlh);if (tmsg->flags & ~TUNNEL_MSG_VALID_USER_FLAGS ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 500/590 net: davicom: fix UAF in dm9000_drv_remove
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 19e65c45a1507a1a2926649d2db3583ed9d55fd9 ]
dm is netdev private data and it cannot be
used after free_netdev() call. Using dm after free_netdev() can cause UAF bug. Fix it by moving free_netdev() at the end of the function.
This is similar to the issue fixed in commit ad297cd2db89 ("net: qcom/emac: fix UAF in emac_remove").
This bug is detected by our static analysis tool.
--- drivers/net/ethernet/davicom/dm9000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/davicom/dm9000.c +2 -1
@@ -1777,10 +1777,11 @@ static void dm9000_drv_remove(struct platform_device *pdev)unregister_netdev (ndev);dm9000_release_board (pdev, dm); -free_netdev (ndev);/* free device structure */ if (dm->power_supply)regulator_disable (dm->power_supply); +free_netdev (ndev);/* free device structure */ +dev_dbg (&pdev->dev,"released and freed device\n" ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 501/590 ptp: Properly handle compat ioctls
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit 19ae40f572a9ce1ade9954990af709a03fd37010 ]
Pointer arguments passed to ioctls need to pass through compat_ptr() to work correctly on s390; as explained in Documentation/driver-api/ioctl.rst. Detect compat mode at runtime and call compat_ptr() for those commands which do take pointer arguments.
--- drivers/ptp/ptp_chardev.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/ptp/ptp_chardev.c +4 -0
@@ -4,6 +4,7 @@* * Copyright (C) 2010 OMICRON electronics GmbH */ +#include <linux/compat.h> #include <linux/module.h> #include <linux/posix-clock.h> #include <linux/poll.h>
@@ -176,6 +177,9 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd,struct timespec64 ts;int enable, err =0 ; +if (in_compat_syscall () && cmd !=PTP_ENABLE_PPS && cmd !=PTP_ENABLE_PPS2 ) + arg = (unsigned long )compat_ptr (arg); + tsevq = pccontext->private_clkdata;switch (cmd) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 502/590 net: ethtool: only allow set_rxnfc with rss + ring_cookie if driver opts in
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Cree <[email protected]>
[ Upstream commit 9e43ad7a1edef268acac603e1975c8f50a20d02f ]
Ethtool ntuple filters with FLOW_RSS were originally defined as adding
the base queue ID (ring_cookie) to the value from the indirection table, so that the same table could distribute over more than one set of queues when used by different filters.
However, some drivers / hardware ignore the ring_cookie, and simply use
the indirection table entries as queue IDs directly. Thus, for drivers which have not opted in by setting ethtool_ops.cap_rss_rxnfc_adds to declare that they support the original (addition) semantics, reject in ethtool_set_rxnfc any filter which combines FLOW_RSS and a nonzero ring.
(For a ring_cookie of zero, both behaviours are equivalent.) Set the cap bit in sfc, as it is known to support this feature.
Stable-dep-of: 4f5a52adeb1a ("ethtool: Fix set RXNFC command with symmetric RSS hash")
--- drivers/net/ethernet/sfc/ef100_ethtool.c | 1 + drivers/net/ethernet/sfc/ethtool.c | 1 + include/linux/ethtool.h | 4 ++++ net/ethtool/ioctl.c | 5 +++++ 4 files changed, 11 insertions(+)
drivers/net/ethernet/sfc/ef100_ethtool.c +1 -0
@@ -59,6 +59,7 @@ const struct ethtool_ops ef100_ethtool_ops = { .get_rxfh_indir_size = efx_ethtool_get_rxfh_indir_size, .get_rxfh_key_size = efx_ethtool_get_rxfh_key_size, .rxfh_per_ctx_key = true, + .cap_rss_rxnfc_adds = true, .rxfh_priv_size = sizeof(struct efx_rss_context_priv), .get_rxfh = efx_ethtool_get_rxfh, .set_rxfh = efx_ethtool_set_rxfh,
drivers/net/ethernet/sfc/ethtool.c +1 -0
@@ -263,6 +263,7 @@ const struct ethtool_ops efx_ethtool_ops = { .get_rxfh_indir_size = efx_ethtool_get_rxfh_indir_size, .get_rxfh_key_size = efx_ethtool_get_rxfh_key_size, .rxfh_per_ctx_key = true, + .cap_rss_rxnfc_adds = true, .rxfh_priv_size = sizeof(struct efx_rss_context_priv), .get_rxfh = efx_ethtool_get_rxfh, .set_rxfh = efx_ethtool_set_rxfh,
include/linux/ethtool.h +4 -0
@@ -734,6 +734,9 @@ struct kernel_ethtool_ts_info {* @rxfh_per_ctx_key: device supports setting different RSS key for each * additional context. Netlink API should report hfunc, key, and input_xfrm * for every context, not just context 0. +* @cap_rss_rxnfc_adds: device supports nonzero ring_cookie in filters with +* %FLOW_RSS flag; the queue ID from the filter is added to the value from +* the indirection table to determine the delivery queue. * @rxfh_indir_space: max size of RSS indirection tables, if indirection table * size as returned by @get_rxfh_indir_size may change during lifetime * of the device. Leave as 0 if the table size is constant.
@@ -956,6 +959,7 @@ struct ethtool_ops { u32 cap_rss_ctx_supported:1; u32 cap_rss_sym_xor_supported:1; u32 rxfh_per_ctx_key:1; + u32 cap_rss_rxnfc_adds:1;u32 rxfh_indir_space;u16 rxfh_key_space;u16 rxfh_priv_size;
net/ethtool/ioctl.c +5 -0
@@ -992,6 +992,11 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev,if (rc)return rc; +/* Nonzero ring with RSS only makes sense if NIC adds them together */ +if (info.flow_type &FLOW_RSS && !ops->cap_rss_rxnfc_adds && +ethtool_get_flow_spec_ring (info.fs.ring_cookie)) +return -EINVAL ; +if (ops->get_rxfh) {struct ethtool_rxfh_param rxfh = {};
Signature · 1 line
2.39.5
Re: [PATCH 6.12 502/590] net: ethtool: only allow set_rxnfc with rss + ring_cookie if driver opts in
Quoted 20 lines · Greg Kroah-Hartman
6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Cree <[email protected]>
[ Upstream commit
9e43ad7a1edef268acac603e1975c8f50a20d02f]Ethtool ntuple filters with
FLOW_RSSwere originally defined as adding
the base queue ID (ring_cookie) to the value from the indirection table, so that the same table could distribute over more than one set of queues when used by different filters.
However, some drivers / hardware ignore thering_cookie, and simply use
the indirection table entries as queue IDs directly. Thus, for drivers which have not opted in by setting ethtool_ops.cap_rss_rxnfc_adds to declare that they support the original (addition) semantics, reject inethtool_set_rxnfcany filter which combinesFLOW_RSSand a nonzero ring.
(For aring_cookieof zero, both behaviours are equivalent.) Set the cap bit in sfc, as it is known to support this feature.
Quoted 6 lines
Signed-off-by Edward Cree <[email protected]>Reviewed-by Martin Habets <[email protected]>Link https://patch.msgid.link/cc3da0844083b0e301a33092a6299e4042b65221.1731499022.git.ecree.xilinx@gmail.com open hereSigned-off-by Jakub Kicinski <[email protected]>Stable-dep-of:
4f5a52adeb1a("ethtool: Fix set RXNFC command with symmetric RSS hash")Signed-off-by Sasha Levin <[email protected]>
If you're taking this you probably also want the very recent 2b91cc1214b1 ("ethtool: ntuple: fix rss + ring_cookie check") which fixes a bug in this patch.
Greg Kroah-Hartman
maintainerRe: [PATCH 6.12 502/590] net: ethtool: only allow set_rxnfc with rss + ring_cookie if driver opts in
Quoted 28 lines · Edward Cree
Quoted 20 lines · Greg Kroah-Hartman
6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Cree <[email protected]>
[ Upstream commit
9e43ad7a1edef268acac603e1975c8f50a20d02f]Ethtool ntuple filters with
FLOW_RSSwere originally defined as adding
the base queue ID (ring_cookie) to the value from the indirection table, so that the same table could distribute over more than one set of queues when used by different filters.
However, some drivers / hardware ignore thering_cookie, and simply use
the indirection table entries as queue IDs directly. Thus, for drivers which have not opted in by setting ethtool_ops.cap_rss_rxnfc_adds to declare that they support the original (addition) semantics, reject inethtool_set_rxnfcany filter which combinesFLOW_RSSand a nonzero ring.
(For aring_cookieof zero, both behaviours are equivalent.) Set the cap bit in sfc, as it is known to support this feature.Quoted 6 lines
Signed-off-by Edward Cree <[email protected]>Reviewed-by Martin Habets <[email protected]>Link https://patch.msgid.link/cc3da0844083b0e301a33092a6299e4042b65221.1731499022.git.ecree.xilinx@gmail.com open hereSigned-off-by Jakub Kicinski <[email protected]>Stable-dep-of:
4f5a52adeb1a("ethtool: Fix set RXNFC command with symmetric RSS hash")Signed-off-by Sasha Levin <[email protected]>
Quoted 3 lines
If you're taking this you probably also want the very recent
2b91cc1214b1("ethtool: ntuple: fix rss +ring_cookiecheck") which fixes a bug in this patch.
Thanks, I'll go queue that up now.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 503/590 ethtool: Fix set RXNFC command with symmetric RSS hash
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit 4f5a52adeb1ad675ca33f1e1eacd9c0bbaf393d4 ]
The sanity check that both source and destination are set when symmetric RSS hash is requested is only relevant for ETHTOOL_SRXFH (rx-flow-hash), it should not be performed on any other commands (e.g. ETHTOOL_SRXCLSRLINS/ETHTOOL_SRXCLSRLDEL).
This resolves accessing uninitialized 'info.data' field, and fixes false errors in rule insertion:
# ethtool --config-ntuple eth2 flow-type ip4 dst-ip 255.255.255.255 action -1 loc 0 rmgr: Cannot insert RX class rule: Invalid argument Cannot insert classification rule
--- net/ethtool/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/ioctl.c +1 -1
@@ -997,7 +997,7 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev, ethtool_get_flow_spec_ring(info.fs.ring_cookie))return -EINVAL ; -if (ops->get_rxfh) { +if (cmd ==ETHTOOL_SRXFH && ops->get_rxfh) {struct ethtool_rxfh_param rxfh = {}; rc = ops->get_rxfh (dev, &rxfh);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 504/590 net: stmmac: Limit the number of MTL queues to hardware capability
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunihiko Hayashi <[email protected]>
[ Upstream commit f5fb35a3d6b36d378b2e2ecbfb9caa337d5428e6 ]
The number of MTL queues to use is specified by the parameter "snps,{tx,rx}-queues-to-use" from stmmac_platform layer.
However, the maximum numbers of queues are constrained by upper limits determined by the capability of each hardware feature. It's appropriate to limit the values not to exceed the upper limit values and display a warning message.
This only works if the hardware capability has the upper limit values.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +15 -0
@@ -7236,6 +7236,21 @@ static int stmmac_hw_init(struct stmmac_priv *priv)if (priv->dma_cap.tsoen)dev_info (priv->device,"TSO supported\n" ); +if (priv->dma_cap.number_rx_queues && + priv->plat->rx_queues_to_use > priv->dma_cap.number_rx_queues) { +dev_warn (priv->device, +"Number of Rx queues (%u) exceeds dma capability\n" , + priv->plat->rx_queues_to_use); + priv->plat->rx_queues_to_use = priv->dma_cap.number_rx_queues; + } +if (priv->dma_cap.number_tx_queues && + priv->plat->tx_queues_to_use > priv->dma_cap.number_tx_queues) { +dev_warn (priv->device, +"Number of Tx queues (%u) exceeds dma capability\n" , + priv->plat->tx_queues_to_use); + priv->plat->tx_queues_to_use = priv->dma_cap.number_tx_queues; + } + priv->hw->vlan_fail_q_en = (priv->plat->flags &STMMAC_FLAG_VLAN_FAIL_Q_EN ); priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 505/590 net: stmmac: Limit FIFO size by hardware capability
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunihiko Hayashi <[email protected]>
[ Upstream commit 044f2fbaa2725696ecbf1f02ba7ab0a8ccb7e1ae ]
Tx/Rx FIFO size is specified by the parameter "{tx,rx}-fifo-depth" from stmmac_platform layer.
However, these values are constrained by upper limits determined by the capabilities of each hardware feature. There is a risk that the upper bits will be truncated due to the calculation, so it's appropriate to limit them to the upper limit values and display a warning message.
This only works if the hardware capability has the upper limit values.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +15 -0
@@ -7251,6 +7251,21 @@ static int stmmac_hw_init(struct stmmac_priv *priv) priv->plat->tx_queues_to_use = priv->dma_cap.number_tx_queues; } +if (priv->dma_cap.rx_fifo_size && + priv->plat->rx_fifo_size > priv->dma_cap.rx_fifo_size) { +dev_warn (priv->device, +"Rx FIFO size (%u) exceeds dma capability\n" , + priv->plat->rx_fifo_size); + priv->plat->rx_fifo_size = priv->dma_cap.rx_fifo_size; + } +if (priv->dma_cap.tx_fifo_size && + priv->plat->tx_fifo_size > priv->dma_cap.tx_fifo_size) { +dev_warn (priv->device, +"Tx FIFO size (%u) exceeds dma capability\n" , + priv->plat->tx_fifo_size); + priv->plat->tx_fifo_size = priv->dma_cap.tx_fifo_size; + } + priv->hw->vlan_fail_q_en = (priv->plat->flags &STMMAC_FLAG_VLAN_FAIL_Q_EN ); priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 506/590 s390/sclp: Initialize sclp subsystem via arch_cpu_finalize_init()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
[ Upstream commit 3bcc8a1af581af152d43e42b53db3534018301b5 ]
With the switch to GENERIC_CPU_DEVICES an early call to the sclp subsystem was added to smp_prepare_cpus(). This will usually succeed since the sclp subsystem is implicitly initialized early enough if an sclp based console is present.
If no such console is present the initialization happens with an arch_initcall(); in such cases calls to the sclp subsystem will fail. For CPU detection this means that the fallback sigp loop will be used permanently to detect CPUs instead of the preferred READ_CPU_INFO sclp request.
Fix this by adding an explicit early sclp_init() call via arch_cpu_finalize_init().
--- arch/s390/Kconfig | 1 + arch/s390/include/asm/sclp.h | 1 + arch/s390/kernel/setup.c | 5 +++++ drivers/s390/char/sclp.c | 12 ++---------- 4 files changed, 9 insertions(+), 10 deletions(-)
arch/s390/Kconfig +1 -0
@@ -65,6 +65,7 @@ config S390 select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM select ARCH_ENABLE_MEMORY_HOTREMOVE select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 + select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_CURRENT_STACK_POINTER select ARCH_HAS_DEBUG_VIRTUAL select ARCH_HAS_DEBUG_VM_PGTABLE
arch/s390/include/asm/sclp.h +1 -0
@@ -137,6 +137,7 @@ void sclp_early_printk(const char *s);void __sclp_early_printk (const char *s,unsigned int len);void sclp_emergency_printk (const char *s); +int sclp_init (void );int sclp_early_get_memsize (unsigned long *mem);int sclp_early_get_hsa_size (unsigned long *hsa_size);int _sclp_get_core_info (struct sclp_core_info *info);
arch/s390/kernel/setup.c +5 -0
@@ -1006,3 +1006,8 @@ void __init setup_arch(char **cmdline_p)/* Add system specific data to the random pool */ setup_randomness (); } + +void __init arch_cpu_finalize_init (void ) +{ +sclp_init (); +}
drivers/s390/char/sclp.c +2 -10
@@ -245,7 +245,6 @@ static void sclp_request_timeout(bool force_restart);static void sclp_process_queue (void );static void __sclp_make_read_req (void );static int sclp_init_mask (int calculate); -static int sclp_init (void );static void __sclp_queue_read_req (void )
@@ -1251,8 +1250,7 @@ static struct platform_driver sclp_pdrv = {/* Initialize SCLP driver. Return zero if driver is operational, non-zero * otherwise. */ -static int -sclp_init (void ) +int sclp_init (void ) {unsigned long flags;int rc =0 ;
@@ -1305,13 +1303,7 @@ sclp_init(void)static __init int sclp_initcall (void ) { -int rc; - - rc =platform_driver_register (&sclp_pdrv); -if (rc) -return rc; - -return sclp_init (); +return platform_driver_register (&sclp_pdrv); }arch_initcall (sclp_initcall);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 507/590 perf trace: Fix runtime error of index out of bounds
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Howard Chu <[email protected]>
[ Upstream commit c7b87ce0dd10b64b68a0b22cb83bbd556e28fe81 ]
libtraceevent parses and returns an array of argument fields, sometimes larger than RAW_SYSCALL_ARGS_NUM (6) because it includes "__syscall_nr", idx will traverse to index 6 (7th element) whereas sc->fmt->arg holds 6 elements max, creating an out-of-bounds access. This runtime error is found by UBsan. The error message:
$ sudo UBSAN_OPTIONS=print_stacktrace=1 ./perf trace -a --max-events=1
builtin-trace.c:1966:35: runtime error: index 6 out of bounds for type 'syscall_arg_fmt [6]'
#0 0x5c04956be5fe in syscall__alloc_arg_fmts /home/howard/hw/linux-perf/tools/perf/builtin-trace.c:1966
#1 0x5c04956c0510 in trace__read_syscall_info /home/howard/hw/linux-perf/tools/perf/builtin-trace.c:2110
#2 0x5c04956c372b in trace__syscall_info /home/howard/hw/linux-perf/tools/perf/builtin-trace.c:2436
#3 0x5c04956d2f39 in trace__init_syscalls_bpf_prog_array_maps /home/howard/hw/linux-perf/tools/perf/builtin-trace.c:3897
#4 0x5c04956d6d25 in trace__run /home/howard/hw/linux-perf/tools/perf/builtin-trace.c:4335
#5 0x5c04956e112e in cmd_trace /home/howard/hw/linux-perf/tools/perf/builtin-trace.c:5502
#6 0x5c04956eda7d in run_builtin /home/howard/hw/linux-perf/tools/perf/perf.c:351
#7 0x5c04956ee0a8 in handle_internal_command /home/howard/hw/linux-perf/tools/perf/perf.c:404
#8 0x5c04956ee37f in run_argv /home/howard/hw/linux-perf/tools/perf/perf.c:448
#9 0x5c04956ee8e9 in main /home/howard/hw/linux-perf/tools/perf/perf.c:556
#10 0x79eb3622a3b7 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
#11 0x79eb3622a47a in __libc_start_main_impl ../csu/libc-start.c:360
#12 0x5c04955422d4 in _start (/home/howard/hw/linux-perf/tools/perf/perf+0x4e02d4) (BuildId: 5b6cab2d59e96a4341741765ad6914a4d784dbc6)0.000 ( 0.014 ms): Chrome_ChildIO/117244 write(fd: 238, buf: !, count: 1) = 1
--- tools/perf/builtin-trace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/builtin-trace.c +5 -1
@@ -2122,8 +2122,12 @@ static int trace__read_syscall_info(struct trace *trace, int id)return PTR_ERR (sc->tp_format); } +/* +* The tracepoint format contains __syscall_nr field, so it's one more +* than the actual number of syscall arguments. +*/ if (syscall__alloc_arg_fmts (sc,IS_ERR (sc->tp_format) ? -RAW_SYSCALL_ARGS_NUM : sc->tp_format->format.nr_fields)) +RAW_SYSCALL_ARGS_NUM : sc->tp_format->format.nr_fields -1 ))return -ENOMEM ; sc->args = sc->tp_format->format.fields;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 508/590 perf test: Skip syscall enum test if no landlock syscall
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 72d81e10628be6a948463259cbb6d3b670b20054 ]
The perf trace enum augmentation test specifically targets landlock_ add_rule syscall but IIUC it's an optional and can be opt-out by a kernel config.
Currently trace_landlock() runs perf test -w landlock before the actual testing to check the availability but it's not enough since the workload always returns 0. Instead it could check if perf trace output has 'landlock' string.
--- tools/perf/tests/shell/trace_btf_enum.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/tests/shell/trace_btf_enum.sh +6 -2
@@ -26,8 +26,12 @@ check_vmlinux() { trace_landlock() { echo "Tracing syscall ${syscall}" - # test flight just to see if landlock_add_rule and libbpf are available - $TESTPROG + # test flight just to see if landlock_add_rule is available + if ! perf trace $TESTPROG 2>&1 | grep -q landlock + then + echo "No landlock system call found, skipping to non-syscall tracing." + return + fi if perf trace -e $syscall $TESTPROG 2>&1 | \ grep -q -E ".*landlock_add_rule\(ruleset_fd: 11, rule_type: (LANDLOCK_RULE_PATH_BENEATH|LANDLOCK_RULE_NET_PORT), rule_attr: 0x[a-f0-9]+, flags: 45\) = -1.*"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 509/590 PM: sleep: core: Synchronize runtime PM status of parents and children
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 3775fc538f535a7c5adaf11990c7932a0bd1f9eb ]
Commit 6e176bf8d461 ("PM: sleep: core: Do not skip callbacks in the resume phase") overlooked the case in which the parent of a device with DPM_FLAG_SMART_SUSPEND set did not use that flag and could be runtime- suspended before a transition into a system-wide sleep state. In that case, if the child is resumed during the subsequent transition from that state into the working state, its runtime PM status will be set to RPM_ACTIVE, but the runtime PM status of the parent will not be updated accordingly, even though the parent will be resumed too, because of the dev_pm_skip_suspend() check in device_resume_noirq().
Address this problem by tracking the need to set the runtime PM status to RPM_ACTIVE during system-wide resume transitions for devices with DPM_FLAG_SMART_SUSPEND set and all of the devices depended on by them.
--- drivers/base/power/main.c | 29 ++++++++++++++++++++--------- include/linux/pm.h | 1 + 2 files changed, 21 insertions(+), 9 deletions(-)
drivers/base/power/main.c +20 -9
@@ -642,13 +642,15 @@ static void device_resume_noirq(struct device *dev, pm_message_t state, bool asy* so change its status accordingly. * * Otherwise, the device is going to be resumed, so set its PM-runtime -* status to "active", but do that only if DPM_FLAG_SMART_SUSPEND is set -* to avoid confusing drivers that don't use it. +* status to "active" unless its power.set_active flag is clear, in +* which case it is not necessary to update its PM-runtime status. */ -if (skip_resume) +if (skip_resume) {pm_runtime_set_suspended (dev); -else if (dev_pm_skip_suspend (dev)) + }else if (dev->power.set_active) {pm_runtime_set_active (dev); + dev->power.set_active = false; + }if (dev->pm_domain) { info ="noirq power domain " ;
@@ -1175,18 +1177,24 @@ static pm_message_t resume_event(pm_message_t sleep_state)return PMSG_ON ; } -static void dpm_superior_set_must_resume (struct device *dev) +static void dpm_superior_set_must_resume (struct device *dev,bool set_active) {struct device_link *link;int idx; -if (dev->parent) +if (dev->parent) { dev->parent->power.must_resume = true; +if (set_active) + dev->parent->power.set_active = true; + } idx =device_links_read_lock (); -list_for_each_entry_rcu_locked (link, &dev->links.suppliers, c_node) +list_for_each_entry_rcu_locked (link, &dev->links.suppliers, c_node) { link->supplier->power.must_resume = true; +if (set_active) + link->supplier->power.set_active = true; + }device_links_read_unlock (idx); }
@@ -1264,8 +1272,11 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state, bool asy dev->power.may_skip_resume)) dev->power.must_resume = true; -if (dev->power.must_resume) -dpm_superior_set_must_resume (dev); +if (dev->power.must_resume) { + dev->power.set_active = dev->power.set_active || +dev_pm_test_driver_flags (dev,DPM_FLAG_SMART_SUSPEND ); +dpm_superior_set_must_resume (dev, dev->power.set_active); + } Complete:complete_all (&dev->power.completion);
include/linux/pm.h +1 -0
@@ -683,6 +683,7 @@ struct dev_pm_info { bool no_pm_callbacks:1; /* Owned by the PM core */ bool async_in_progress:1; /* Owned by the PM core */ bool must_resume:1; /* Owned by the PM core */ + bool set_active:1; /* Owned by the PM core */ bool may_skip_resume:1; /* Set by subsystems */#else bool should_wakeup:1;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 510/590 Bluetooth: btusb: mediatek: Add locks for usb_driver_claim_interface()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit e9087e828827e5a5c85e124ce77503f2b81c3491 ]
The documentation for usb_driver_claim_interface() says that "the device lock" is needed when the function is called from places other than probe(). This appears to be the lock for the USB interface device. The Mediatek btusb code gets called via this path:
Workqueue: hci0 hci_power_on [bluetooth] Call trace: usb_driver_claim_interface btusb_mtk_claim_iso_intf btusb_mtk_setup hci_dev_open_sync hci_power_on process_scheduled_works worker_thread kthread
With the above call trace the device lock hasn't been claimed. Claim it.
Without this fix, we'd sometimes see the error "Failed to claim iso interface". Sometimes we'd even see worse errors, like a NULL pointer dereference (where intf->dev.driver was NULL) with a trace like:
Call trace: usb_suspend_both usb_runtime_suspend __rpm_callback rpm_suspend pm_runtime_work process_scheduled_works
Both errors appear to be fixed with the proper locking.
--- drivers/bluetooth/btusb.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/bluetooth/btusb.c +7 -0
@@ -2632,8 +2632,15 @@ static void btusb_mtk_claim_iso_intf(struct btusb_data *data)struct btmtk_data *btmtk_data =hci_get_priv (data->hdev);int err; +/* +* The function usb_driver_claim_interface() is documented to need +* locks held if it's not called from a probe routine. The code here +* is called from the hci_power_on workqueue, so grab the lock. +*/ +device_lock (&btmtk_data->isopkt_intf->dev); err =usb_driver_claim_interface (&btusb_driver, btmtk_data->isopkt_intf, data); +device_unlock (&btmtk_data->isopkt_intf->dev);if (err <0 ) { btmtk_data->isopkt_intf =NULL ;bt_dev_err (data->hdev,"Failed to claim iso interface" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 511/590 Bluetooth: btnxpuart: Fix glitches seen in dual A2DP streaming
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neeraj Sanjay Kale <[email protected]>
[ Upstream commit 7de119bb79a63f6a1959b83117a98734914fb0b0 ]
This fixes a regression caused by previous commit for fixing truncated ACL data, which is causing some intermittent glitches when running two A2DP streams.
serdev_device_write_buf() is the root cause of the glitch, which is reverted, and the TX work will continue to write until the queue is empty.
This change fixes both issues. No A2DP streaming glitches or truncated ACL data issue observed.
--- drivers/bluetooth/btnxpuart.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/bluetooth/btnxpuart.c +1 -2
@@ -1336,13 +1336,12 @@ static void btnxpuart_tx_work(struct work_struct *work)while ((skb =nxp_dequeue (nxpdev))) { len =serdev_device_write_buf (serdev, skb->data, skb->len); -serdev_device_wait_until_sent (serdev,0 ); hdev->stat.byte_tx += len;skb_pull (skb, len);if (skb->len >0 ) {skb_queue_head (&nxpdev->txq, skb); -break ; +continue ; }switch (hci_skb_pkt_type (skb)) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 512/590 vsock: Keep the binding until socket destruction
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
[ Upstream commit fcdd2242c0231032fc84e1404315c245ae56322a ]
Preserve sockets bindings; this includes both resulting from an explicit bind() and those implicitly bound through autobind during connect().
Prevents socket unbinding during a transport reassignment, which fixes a use-after-free:
1. vsock_create() (refcnt=1) calls vsock_insert_unbound() (refcnt=2)
2. transport->release() calls vsock_remove_bound() without checking if sk was bound and moved to bound list (refcnt=1)
3. vsock_bind() assumes sk is in unbound list and before __vsock_insert_bound(vsock_bound_sockets()) calls __vsock_remove_bound() which does:
list_del_init(&vsk->bound_table); // nop
sock_put(&vsk->sk); // refcnt=0
BUG: KASAN: slab-use-after-free in __vsock_bind+0x62e/0x730 Read of size 4 at addr ffff88816b46a74c by task a.out/2057 dump_stack_lvl+0x68/0x90 print_report+0x174/0x4f6 kasan_report+0xb9/0x190 __vsock_bind+0x62e/0x730 vsock_bind+0x97/0xe0 __sys_bind+0x154/0x1f0 __x64_sys_bind+0x6e/0xb0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e Allocated by task 2057: kasan_save_stack+0x1e/0x40 kasan_save_track+0x10/0x30 __kasan_slab_alloc+0x85/0x90 kmem_cache_alloc_noprof+0x131/0x450 sk_prot_alloc+0x5b/0x220 sk_alloc+0x2c/0x870 __vsock_create.constprop.0+0x2e/0xb60 vsock_create+0xe4/0x420 __sock_create+0x241/0x650 __sys_socket+0xf2/0x1a0 __x64_sys_socket+0x6e/0xb0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e Freed by task 2057: kasan_save_stack+0x1e/0x40 kasan_save_track+0x10/0x30 kasan_save_free_info+0x37/0x60 __kasan_slab_free+0x4b/0x70 kmem_cache_free+0x1a1/0x590 __sk_destruct+0x388/0x5a0 __vsock_bind+0x5e1/0x730 vsock_bind+0x97/0xe0 __sys_bind+0x154/0x1f0 __x64_sys_bind+0x6e/0xb0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
refcount_t: addition on 0; use-after-free.
WARNING: CPU: 7 PID: 2057 at lib/refcount.c:25 refcount_warn_saturate+0xce/0x150 RIP: 0010:refcount_warn_saturate+0xce/0x150 __vsock_bind+0x66d/0x730 vsock_bind+0x97/0xe0 __sys_bind+0x154/0x1f0 __x64_sys_bind+0x6e/0xb0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
refcount_t: underflow; use-after-free.
WARNING: CPU: 7 PID: 2057 at lib/refcount.c:28 refcount_warn_saturate+0xee/0x150 RIP: 0010:refcount_warn_saturate+0xee/0x150 vsock_remove_bound+0x187/0x1e0 __vsock_release+0x383/0x4a0 vsock_release+0x90/0x120 __sock_release+0xa3/0x250 sock_close+0x14/0x20 __fput+0x359/0xa80 task_work_run+0x107/0x1d0 do_exit+0x847/0x2560 do_group_exit+0xb8/0x250 __x64_sys_exit_group+0x3a/0x50 x64_sys_call+0xfec/0x14f0 do_syscall_64+0x93/0x1b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
--- net/vmw_vsock/af_vsock.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/vmw_vsock/af_vsock.c +6 -2
@@ -337,7 +337,10 @@ EXPORT_SYMBOL_GPL(vsock_find_connected_socket);void vsock_remove_sock (struct vsock_sock *vsk) { -vsock_remove_bound (vsk); +/* Transport reassignment must not remove the binding. */ +if (sock_flag (sk_vsock (vsk),SOCK_DEAD )) +vsock_remove_bound (vsk); +vsock_remove_connected (vsk); }EXPORT_SYMBOL_GPL (vsock_remove_sock);
@@ -821,12 +824,13 @@ static void __vsock_release(struct sock *sk, int level)*/ lock_sock_nested (sk, level); +sock_orphan (sk); +if (vsk->transport) vsk->transport->release (vsk);else if (sock_type_connectible (sk->sk_type))vsock_remove_sock (vsk); -sock_orphan (sk); sk->sk_shutdown =SHUTDOWN_MASK ;skb_queue_purge (&sk->sk_receive_queue);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 513/590 vsock: Allow retrying on connect() failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
[ Upstream commit aa388c72113b7458127b709bdd7d3628af26e9b4 ]
sk_err is set when a (connectible) connect() fails. Effectively, this makes an otherwise still healthy SS_UNCONNECTED socket impossible to use for any subsequent connection attempts.
Clear sk_err upon trying to establish a connection.
--- net/vmw_vsock/af_vsock.c | 5 +++++ 1 file changed, 5 insertions(+)
net/vmw_vsock/af_vsock.c +5 -0
@@ -1523,6 +1523,11 @@ static int vsock_connect(struct socket *sock, struct sockaddr *addr,if (err <0 ) goto out; +/* sk_err might have been set as a result of an earlier +* (failed) connect attempt. +*/ + sk->sk_err =0 ; +/* Mark sock as connecting and set the error code to in * progress in case this is a non-blocking connect. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 514/590 bgmac: reduce max frame size to support just MTU 1500
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafał Miłecki <[email protected]>
[ Upstream commit 752e5fcc2e77358936d36ef8e522d6439372e201 ]
bgmac allocates new replacement buffer before handling each received frame. Allocating & DMA-preparing 9724 B each time consumes a lot of CPU time. Ideally bgmac should just respect currently set MTU but it isn't the case right now. For now just revert back to the old limited frame size.
This change bumps NAT masquerade speed by ~95%.
Since commit 8218f62c9c9b ("mm: page_frag: use initial zero offset for page_frag_alloc_align()"), the bgmac driver fails to open its network interface successfully and runs out of memory in the following call stack:
bgmac_open
-> bgmac_dma_init
-> bgmac_dma_rx_skb_for_slot
-> netdev_alloc_fragBGMAC_RX_ALLOC_SIZE = 10048 and PAGE_FRAG_CACHE_MAX_SIZE = 32768.
Eventually we land into __page_frag_alloc_align() with the following parameters across multiple successive calls:
__page_frag_alloc_align: fragsz=10048, align_mask=-1, size=32768, offset=0 __page_frag_alloc_align: fragsz=10048, align_mask=-1, size=32768, offset=10048 __page_frag_alloc_align: fragsz=10048, align_mask=-1, size=32768, offset=20096 __page_frag_alloc_align: fragsz=10048, align_mask=-1, size=32768, offset=30144
So in that case we do indeed have offset + fragsz (40192) > size (32768) and so we would eventually return NULL. Reverting to the older 1500 bytes MTU allows the network driver to be usable again.
--- drivers/net/ethernet/broadcom/bgmac.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bgmac.h +1 -2
@@ -328,8 +328,7 @@#define BGMAC_RX_FRAME_OFFSET 30/* There are 2 unused bytes between header and real data */ #define BGMAC_RX_BUF_OFFSET (NET_SKB_PAD + NET_IP_ALIGN - \ BGMAC_RX_FRAME_OFFSET) -/* Jumbo frame size with FCS */ -#define BGMAC_RX_MAX_FRAME_SIZE 9724 +#define BGMAC_RX_MAX_FRAME_SIZE 1536#define BGMAC_RX_BUF_SIZE (BGMAC_RX_FRAME_OFFSET + BGMAC_RX_MAX_FRAME_SIZE)#define BGMAC_RX_ALLOC_SIZE (SKB_DATA_ALIGN(BGMAC_RX_BUF_SIZE + BGMAC_RX_BUF_OFFSET) + \ SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 515/590 tcp: correct handling of extreme memory squeeze
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jon Maloy <[email protected]>
[ Upstream commit 8c670bdfa58e48abad1d5b6ca1ee843ca91f7303 ]
Testing with iperf3 using the "pasta" protocol splicer has revealed a problem in the way tcp handles window advertising in extreme memory squeeze situations.
Under memory pressure, a socket endpoint may temporarily advertise a zero-sized window, but this is not stored as part of the socket data. The reasoning behind this is that it is considered a temporary setting which shouldn't influence any further calculations.
However, if we happen to stall at an unfortunate value of the current window size, the algorithm selecting a new value will consistently fail to advertise a non-zero window once we have freed up enough memory. This means that this side's notion of the current window size is different from the one last advertised to the peer, causing the latter to not send any data to resolve the sitution.
The problem occurs on the iperf3 server side, and the socket in question is a completely regular socket with the default settings for the fedora40 kernel. We do not use SO_PEEK or SO_RCVBUF on the socket.
The following excerpt of a logging session, with own comments added, shows more in detail what is happening:
// tcp_v4_rcv(->)
// tcp_rcv_established(->)
[5201<->39222]: ==== Activating log @ net/ipv4/tcp_input.c/tcp_data_queue()/5257 ====
[5201<->39222]: tcp_data_queue(->)
[5201<->39222]: DROPPING skb [265600160..265665640], reason: SKB_DROP_REASON_PROTO_MEM
[rcv_nxt 265600160, rcv_wnd 262144, snt_ack 265469200, win_now 131184]
[copied_seq 259909392->260034360 (124968), unread 5565800, qlen 85, ofoq 0]
[OFO queue: gap: 65480, len: 0]
[5201<->39222]: tcp_data_queue(<-)
[5201<->39222]: __tcp_transmit_skb(->)
[tp->rcv_wup: 265469200, tp->rcv_wnd: 262144, tp->rcv_nxt 265600160]
[5201<->39222]: tcp_select_window(->)
[5201<->39222]: (inet_csk(sk)->icsk_ack.pending & ICSK_ACK_NOMEM) ? --> TRUE
[tp->rcv_wup: 265469200, tp->rcv_wnd: 262144, tp->rcv_nxt 265600160]
returning 0[5201<->39222]: tcp_select_window(<-)
[5201<->39222]: ADVERTISING WIN 0, ACK_SEQ: 265600160
[5201<->39222]: [__tcp_transmit_skb(<-)
[5201<->39222]: tcp_rcv_established(<-)
[5201<->39222]: tcp_v4_rcv(<-)
// Receive queue is at 85 buffers and we are out of memory. // We drop the incoming buffer, although it is in sequence, and decide // to send an advertisement with a window of zero.
// We don't update tp->rcv_wnd and tp->rcv_wup accordingly, which means // we unconditionally shrink the window.
[5201<->39222]: tcp_recvmsg_locked(->)
[5201<->39222]: __tcp_cleanup_rbuf(->) tp->rcv_wup: 265469200, tp->rcv_wnd: 262144, tp->rcv_nxt 265600160
[5201<->39222]: [new_win = 0, win_now = 131184, 2 * win_now = 262368]
[5201<->39222]: [new_win >= (2 * win_now) ? --> time_to_ack = 0]
[5201<->39222]: NOT calling tcp_send_ack()
[tp->rcv_wup: 265469200, tp->rcv_wnd: 262144, tp->rcv_nxt 265600160]
[5201<->39222]: __tcp_cleanup_rbuf(<-)
[rcv_nxt 265600160, rcv_wnd 262144, snt_ack 265469200, win_now 131184]
[copied_seq 260040464->260040464 (0), unread 5559696, qlen 85, ofoq 0]
returning 6104 bytes[5201<->39222]: tcp_recvmsg_locked(<-)
// After each read, the algorithm for calculating the new receive // window in __tcp_cleanup_rbuf() finds it is too small to advertise // or to update tp->rcv_wnd.
// Meanwhile, the peer thinks the window is zero, and will not send // any more data to trigger an update from the interrupt mode side.
[5201<->39222]: tcp_recvmsg_locked(->)
[5201<->39222]: __tcp_cleanup_rbuf(->) tp->rcv_wup: 265469200, tp->rcv_wnd: 262144, tp->rcv_nxt 265600160
[5201<->39222]: [new_win = 262144, win_now = 131184, 2 * win_now = 262368]
[5201<->39222]: [new_win >= (2 * win_now) ? --> time_to_ack = 0]
[5201<->39222]: NOT calling tcp_send_ack()
[tp->rcv_wup: 265469200, tp->rcv_wnd: 262144, tp->rcv_nxt 265600160]
[5201<->39222]: __tcp_cleanup_rbuf(<-)
[rcv_nxt 265600160, rcv_wnd 262144, snt_ack 265469200, win_now 131184]
[copied_seq 260099840->260171536 (71696), unread 5428624, qlen 83, ofoq 0]
returning 131072 bytes[5201<->39222]: tcp_recvmsg_locked(<-)
// The above pattern repeats again and again, since nothing changes // between the reads.
[...]
[5201<->39222]: tcp_recvmsg_locked(->)
[5201<->39222]: __tcp_cleanup_rbuf(->) tp->rcv_wup: 265469200, tp->rcv_wnd: 262144, tp->rcv_nxt 265600160
[5201<->39222]: [new_win = 262144, win_now = 131184, 2 * win_now = 262368]
[5201<->39222]: [new_win >= (2 * win_now) ? --> time_to_ack = 0]
[5201<->39222]: NOT calling tcp_send_ack()
[tp->rcv_wup: 265469200, tp->rcv_wnd: 262144, tp->rcv_nxt 265600160]
[5201<->39222]: __tcp_cleanup_rbuf(<-)
[rcv_nxt 265600160, rcv_wnd 262144, snt_ack 265469200, win_now 131184]
[copied_seq 265600160->265600160 (0), unread 0, qlen 0, ofoq 0]
returning 54672 bytes[5201<->39222]: tcp_recvmsg_locked(<-)
// The receive queue is empty, but no new advertisement has been sent. // The peer still thinks the receive window is zero, and sends nothing. // We have ended up in a deadlock situation.
Note that well behaved endpoints will send win0 probes, so the problem will not occur.
Furthermore, we have observed that in these situations this side may send out an updated 'th->ack_seq´ which is not stored in tp->rcv_wup as it should be. Backing ack_seq seems to be harmless, but is of course still wrong from a protocol viewpoint.
We fix this by updating the socket state correctly when a packet has been dropped because of memory exhaustion and we have to advertize a zero window.
Further testing shows that the connection recovers neatly from the squeeze situation, and traffic can continue indefinitely.
--- net/ipv4/tcp_output.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv4/tcp_output.c +6 -3
@@ -265,11 +265,14 @@ static u16 tcp_select_window(struct sock *sk)u32 cur_win, new_win;/* Make the window 0 if we failed to queue the data because we -* are out of memory. The window is temporary, so we don't store -* it on the socket. +* are out of memory. */ -if (unlikely (inet_csk (sk)->icsk_ack.pending &ICSK_ACK_NOMEM )) +if (unlikely (inet_csk (sk)->icsk_ack.pending &ICSK_ACK_NOMEM )) { + tp->pred_flags =0 ; + tp->rcv_wnd =0 ; + tp->rcv_wup = tp->rcv_nxt;return 0 ; + } cur_win =tcp_receive_window (tp); new_win =__tcp_select_window (sk);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 516/590 net: xdp: Disallow attaching device-bound programs in generic mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 3595599fa8360bb3c7afa7ee50c810b4a64106ea ]
Device-bound programs are used to support RX metadata kfuncs. These kfuncs are driver-specific and rely on the driver context to read the metadata. This means they can't work in generic XDP mode. However, there is no check to disallow such programs from being attached in generic mode, in which case the metadata kfuncs will be called in an invalid context, leading to crashes.
Fix this by adding a check to disallow attaching device-bound programs in generic mode.
--- net/core/dev.c | 4 ++++ 1 file changed, 4 insertions(+)
net/core/dev.c +4 -0
@@ -9595,6 +9595,10 @@ static int dev_xdp_attach(struct net_device *dev, struct netlink_ext_ack *extackNL_SET_ERR_MSG (extack,"Program bound to different device" );return -EINVAL ; } +if (bpf_prog_is_dev_bound (new_prog->aux) && mode ==XDP_MODE_SKB ) { +NL_SET_ERR_MSG (extack,"Can't attach device-bound programs in generic mode" ); +return -EINVAL ; + }if (new_prog->expected_attach_type ==BPF_XDP_DEVMAP ) {NL_SET_ERR_MSG (extack,"BPF_XDP_DEVMAP programs can not be attached to a device" );return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 517/590 net: ravb: Fix missing rtnl lock in suspend/resume path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kory Maincent <[email protected]>
[ Upstream commit 2c2ebb2b49573e5f8726112ad06b1dffc3c9ea03 ]
Fix the suspend/resume path by ensuring the rtnl lock is held where required. Calls to ravb_open, ravb_close and wol operations must be performed under the rtnl lock to prevent conflicts with ongoing ndo operations.
Without this fix, the following warning is triggered:
[ 39.032969] ============================= [ 39.032983] WARNING: suspicious RCU usage [ 39.033019] ----------------------------- [ 39.033033] drivers/net/phy/phy_device.c:2004 suspicious rcu_dereference_protected() usage! ... [ 39.033597] stack backtrace: [ 39.033613] CPU: 0 UID: 0 PID: 174 Comm: python3 Not tainted 6.13.0-rc7-next-20250116-arm64-renesas-00002-g35245dfdc62c #7 [ 39.033623] Hardware name: Renesas SMARC EVK version 2 based on r9a08g045s33 (DT) [ 39.033628] Call trace: [ 39.033633] show_stack+0x14/0x1c (C) [ 39.033652] dump_stack_lvl+0xb4/0xc4 [ 39.033664] dump_stack+0x14/0x1c [ 39.033671] lockdep_rcu_suspicious+0x16c/0x22c [ 39.033682] phy_detach+0x160/0x190 [ 39.033694] phy_disconnect+0x40/0x54 [ 39.033703] ravb_close+0x6c/0x1cc [ 39.033714] ravb_suspend+0x48/0x120 [ 39.033721] dpm_run_callback+0x4c/0x14c [ 39.033731] device_suspend+0x11c/0x4dc [ 39.033740] dpm_suspend+0xdc/0x214 [ 39.033748] dpm_suspend_start+0x48/0x60 [ 39.033758] suspend_devices_and_enter+0x124/0x574 [ 39.033769] pm_suspend+0x1ac/0x274 [ 39.033778] state_store+0x88/0x124 [ 39.033788] kobj_attr_store+0x14/0x24 [ 39.033798] sysfs_kf_write+0x48/0x6c [ 39.033808] kernfs_fop_write_iter+0x118/0x1a8 [ 39.033817] vfs_write+0x27c/0x378 [ 39.033825] ksys_write+0x64/0xf4 [ 39.033833] __arm64_sys_write+0x18/0x20 [ 39.033841] invoke_syscall+0x44/0x104 [ 39.033852] el0_svc_common.constprop.0+0xb4/0xd4 [ 39.033862] do_el0_svc+0x18/0x20 [ 39.033870] el0_svc+0x3c/0xf0 [ 39.033880] el0t_64_sync_handler+0xc0/0xc4 [ 39.033888] el0t_64_sync+0x154/0x158 [ 39.041274] ravb 11c30000.ethernet eth0: Link is Down
--- drivers/net/ethernet/renesas/ravb_main.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/net/ethernet/renesas/ravb_main.c +14 -8
@@ -3208,10 +3208,15 @@ static int ravb_suspend(struct device *dev)netif_device_detach (ndev); -if (priv->wol_enabled) -return ravb_wol_setup (ndev); +rtnl_lock (); +if (priv->wol_enabled) { + ret =ravb_wol_setup (ndev); +rtnl_unlock (); +return ret; + } ret =ravb_close (ndev); +rtnl_unlock ();if (ret)return ret;
@@ -3236,19 +3241,20 @@ static int ravb_resume(struct device *dev)if (!netif_running (ndev))return 0 ; +rtnl_lock ();/* If WoL is enabled restore the interface. */ -if (priv->wol_enabled) { +if (priv->wol_enabled) ret =ravb_wol_restore (ndev); -if (ret) -return ret; - }else { +else ret =pm_runtime_force_resume (dev); -if (ret) -return ret; +if (ret) { +rtnl_unlock (); +return ret; }/* Reopening the interface will restore the device to the working state. */ ret =ravb_open (ndev); +rtnl_unlock ();if (ret <0 ) goto out_rpm_put;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 518/590 net: sh_eth: Fix missing rtnl lock in suspend/resume path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kory Maincent <[email protected]>
[ Upstream commit b95102215a8d0987789715ce11c0d4ec031cbfbe ]
Fix the suspend/resume path by ensuring the rtnl lock is held where required. Calls to sh_eth_close, sh_eth_open and wol operations must be performed under the rtnl lock to prevent conflicts with ongoing ndo operations.
--- drivers/net/ethernet/renesas/sh_eth.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/renesas/sh_eth.c +4 -0
@@ -3494,10 +3494,12 @@ static int sh_eth_suspend(struct device *dev)netif_device_detach (ndev); +rtnl_lock ();if (mdp->wol_enabled) ret =sh_eth_wol_setup (ndev);else ret =sh_eth_close (ndev); +rtnl_unlock ();return ret; }
@@ -3511,10 +3513,12 @@ static int sh_eth_resume(struct device *dev)if (!netif_running (ndev))return 0 ; +rtnl_lock ();if (mdp->wol_enabled) ret =sh_eth_wol_restore (ndev);else ret =sh_eth_open (ndev); +rtnl_unlock ();if (ret <0 )return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 519/590 net: hsr: fix fill_frame_info() regression vs VLAN packets
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 0f5697f1a3f99bc2b674b8aa3c5da822c5673c11 ]
Stephan Wurm reported that my recent patch broke VLAN support.
Apparently skb->mac_len is not correct for VLAN traffic as shown by debug traces [1].
Use instead pskb_may_pull() to make sure the expected header is present in skb->head.
Many thanks to Stephan for his help.
[1]
kernel: skb len=170 headroom=2 headlen=170 tailroom=20
mac=(2,14) mac_len=14 net=(16,-1) trans=-1
shinfo(txflags=0 nr_frags=0 gso(size=0 type=0 segs=0))
csum(0x0 start=0 offset=0 ip_summed=0 complete_sw=0 valid=0 level=0)
hash(0x0 sw=0 l4=0) proto=0x0000 pkttype=0 iif=0
priority=0x0 mark=0x0 alloc_cpu=0 vlan_all=0x0
encapsulation=0 inner(proto=0x0000, mac=0, net=0, trans=0)kernel: dev name=prp0 feat=0x0000000000007000
kernel: sk family=17 type=3 proto=0
kernel: skb headroom: 00000000: 74 00
kernel: skb linear: 00000000: 01 0c cd 01 00 01 00 d0 93 53 9c cb 81 00 80 00
kernel: skb linear: 00000010: 88 b8 00 01 00 98 00 00 00 00 61 81 8d 80 16 52
kernel: skb linear: 00000020: 45 47 44 4e 43 54 52 4c 2f 4c 4c 4e 30 24 47 4f
kernel: skb linear: 00000030: 24 47 6f 43 62 81 01 14 82 16 52 45 47 44 4e 43
kernel: skb linear: 00000040: 54 52 4c 2f 4c 4c 4e 30 24 44 73 47 6f 6f 73 65
kernel: skb linear: 00000050: 83 07 47 6f 49 64 65 6e 74 84 08 67 8d f5 93 7e
kernel: skb linear: 00000060: 76 c8 00 85 01 01 86 01 00 87 01 00 88 01 01 89
kernel: skb linear: 00000070: 01 00 8a 01 02 ab 33 a2 15 83 01 00 84 03 03 00
kernel: skb linear: 00000080: 00 91 08 67 8d f5 92 77 4b c6 1f 83 01 00 a2 1a
kernel: skb linear: 00000090: a2 06 85 01 00 83 01 00 84 03 03 00 00 91 08 67
kernel: skb linear: 000000a0: 8d f5 92 77 4b c6 1f 83 01 00
kernel: skb tailroom: 00000000: 80 18 02 00 fe 4e 00 00 01 01 08 0a 4f fd 5e d1
kernel: skb tailroom: 00000010: 4f fd 5e cd
--- net/hsr/hsr_forward.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/hsr/hsr_forward.c +5 -2
@@ -688,9 +688,12 @@ static int fill_frame_info(struct hsr_frame_info *frame, frame->is_vlan = true;if (frame->is_vlan) { - if (skb->mac_len < offsetofend(struct hsr_vlan_ethhdr, vlanhdr)) +/* Note: skb->mac_len might be wrong here. */ +if (!pskb_may_pull (skb, +skb_mac_offset (skb) + + offsetofend(struct hsr_vlan_ethhdr, vlanhdr)))return -EINVAL ; - vlan_hdr = (struct hsr_vlan_ethhdr *)ethhdr; + vlan_hdr = (struct hsr_vlan_ethhdr *)skb_mac_header (skb); proto = vlan_hdr->vlanhdr.h_vlan_encapsulated_proto;/* FIXME: */ netdev_warn_once (skb->dev,"VLAN not yet supported" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 520/590 genksyms: fix memory leak when the same symbol is added from source
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 45c9c4101d3d2fdfa00852274bbebba65fcc3cf2 ]
When a symbol that is already registered is added again, __add_symbol() returns without freeing the symbol definition, making it unreachable.
The following test cases demonstrate different memory leak points.
[Test Case 1]
Forward declaration with exactly the same definition
$ cat foo.c
#include <linux/export.h>
void foo(void);
void foo(void) {}
EXPORT_SYMBOL(foo);[Test Case 2]
Forward declaration with a different definition (e.g. attribute)
$ cat foo.c
#include <linux/export.h>
void foo(void);
__attribute__((__section__(".ref.text"))) void foo(void) {}
EXPORT_SYMBOL(foo);[Test Case 3]
Preserving an overridden symbol (compile with KBUILD_PRESERVE=1)
$ cat foo.c
#include <linux/export.h>
void foo(void);
void foo(void) { }
EXPORT_SYMBOL(foo);$ cat foo.symref override foo void foo ( int )
The memory leaks in Test Case 1 and 2 have existed since the introduction of genksyms into the kernel tree. [1]
The memory leak in Test Case 3 was introduced by commit 5dae9a550a74 ("genksyms: allow to ignore symbol checksum changes").
When multiple init_declarators are reduced to an init_declarator_list, the decl_spec must be duplicated. Otherwise, the following Test Case 4 would result in a double-free bug.
[Test Case 4]
$ cat foo.c #include <linux/export.h>
extern int foo, bar;
int foo, bar; EXPORT_SYMBOL(foo);
In this case, 'foo' and 'bar' share the same decl_spec, 'int'. It must be unshared before being passed to add_symbol().
--- scripts/genksyms/genksyms.c | 3 +++ scripts/genksyms/parse.y | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)
scripts/genksyms/genksyms.c +3 -0
@@ -239,6 +239,7 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type, "unchanged\n"); } sym->is_declared =1 ; +free_list (defn,NULL );return sym; }else if (!sym->is_declared) {if (sym->is_override && flag_preserve) {
@@ -247,6 +248,7 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,print_type_name (type, name);fprintf (stderr," modversion change\n" ); sym->is_declared =1 ; +free_list (defn,NULL );return sym; }else { status = is_unknown_symbol(sym) ?
@@ -254,6 +256,7 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type, } }else {error_with_pos ("redefinition of %s" , name); +free_list (defn,NULL );return sym; }break ;
scripts/genksyms/parse.y +12 -2
@@ -152,14 +152,19 @@ simple_declaration: ; init_declarator_list_opt: - /* empty */ { $$ = NULL; } - | init_declarator_list + /* empty */ { $$ = NULL; } + | init_declarator_list { free_list(decl_spec, NULL); $$ = $1; } ; init_declarator_list: init_declarator { struct string_list *decl = *$1; *$1 = NULL; + + /* avoid sharing among multiple init_declarators */ + if (decl_spec) + decl_spec = copy_list_range(decl_spec, NULL); + add_symbol(current_name, is_typedef ? SYM_TYPEDEF : SYM_NORMAL, decl, is_extern); current_name = NULL;
@@ -170,6 +175,11 @@ init_declarator_list: *$3 = NULL; free_list(*$2, NULL); *$2 = decl_spec; + + /* avoid sharing among multiple init_declarators */ + if (decl_spec) + decl_spec = copy_list_range(decl_spec, NULL); + add_symbol(current_name, is_typedef ? SYM_TYPEDEF : SYM_NORMAL, decl, is_extern); current_name = NULL;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 521/590 genksyms: fix memory leak when the same symbol is read from *.symref file
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit be2fa44b5180a1f021efb40c55fdf63c249c3209 ]
When a symbol that is already registered is read again from *.symref file, __add_symbol() removes the previous one from the hash table without freeing it.
[Test Case]
$ cat foo.c
#include <linux/export.h>
void foo(void);
void foo(void) {}
EXPORT_SYMBOL(foo);$ cat foo.symref foo void foo ( void ) foo void foo ( void )
When a symbol is removed from the hash table, it must be freed along with its ->name and ->defn members. However, sym->name cannot be freed because it is sometimes shared with node->string, but not always. If sym->name and node->string share the same memory, free(sym->name) could lead to a double-free bug.
To resolve this issue, always assign a strdup'ed string to sym->name.
--- scripts/genksyms/genksyms.c | 8 ++++++-- scripts/genksyms/genksyms.h | 2 +- scripts/genksyms/parse.y | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-)
scripts/genksyms/genksyms.c +6 -2
@@ -272,11 +272,15 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,break ; } } + +free_list (sym->defn,NULL ); +free (sym->name); +free (sym); --nsyms; } sym =xmalloc (sizeof (*sym)); - sym->name = name; + sym->name =xstrdup (name); sym->type = type; sym->defn = defn; sym->expansion_trail =NULL ;
@@ -483,7 +487,7 @@ static void read_reference(FILE *f) defn = def; def =read_node (f); } - subsym =add_reference_symbol (xstrdup (sym->string), sym->tag, + subsym =add_reference_symbol (sym->string, sym->tag, defn, is_extern); subsym->is_override = is_override;free_node (sym);
scripts/genksyms/genksyms.h +1 -1
@@ -32,7 +32,7 @@ struct string_list {struct symbol {struct symbol *hash_next; -const char *name; +char *name;enum symbol_type type;struct string_list *defn;struct symbol *expansion_trail;
scripts/genksyms/parse.y +2 -2
@@ -482,12 +482,12 @@ enumerator_list: enumerator: IDENT { - const char *name = strdup((*$1)->string); + const char *name = (*$1)->string; add_symbol(name, SYM_ENUM_CONST, NULL, 0); } | IDENT '=' EXPRESSION_PHRASE { - const char *name = strdup((*$1)->string); + const char *name = (*$1)->string; struct string_list *expr = copy_list_range(*$3, *$2); add_symbol(name, SYM_ENUM_CONST, expr, 0); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 522/590 hostfs: fix string handling in __dentry_name()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 60a6002432448bb3f291d80768ae98d62efc9c77 ]
strcpy() should not be used with destination potentially overlapping the source; what's more, strscpy() in there is pointless - we already know the amount we want to copy; might as well use memcpy().
--- fs/hostfs/hostfs_kern.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)
fs/hostfs/hostfs_kern.c +6 -21
@@ -94,32 +94,17 @@ __uml_setup("hostfs=", hostfs_args,static char *__dentry_name (struct dentry *dentry,char *name) {char *p =dentry_path_raw (dentry, name,PATH_MAX ); -char *root; -size_t len; -struct hostfs_fs_info *fsi; - - fsi = dentry->d_sb->s_fs_info; - root = fsi->host_root_path; - len =strlen (root); -if (IS_ERR (p)) { -__putname (name); -return NULL ; - } - -/* -* This function relies on the fact that dentry_path_raw() will place -* the path name at the end of the provided buffer. -*/ -BUG_ON (p +strlen (p) +1 != name +PATH_MAX ); +struct hostfs_fs_info *fsi = dentry->d_sb->s_fs_info; +char *root = fsi->host_root_path; +size_t len =strlen (root); -strscpy (name, root,PATH_MAX ); -if (len > p - name) { +if (IS_ERR (p) || len > p - name) {__putname (name);return NULL ; } -if (p > name + len) -strcpy (name + len, p); +memcpy (name, root, len); +memmove (name + len, p, name +PATH_MAX - p);return name; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 523/590 tools/power turbostat: Allow using cpu device in perf counters on hybrid platforms
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patryk Wlazlyn <[email protected]>
[ Upstream commit ae2cdf8d92ffc326104524a1f9da4cf75b6ea996 ]
Intel hybrid platforms expose different perf devices for P and E cores. Instead of one, "/sys/bus/event_source/devices/cpu" device, there are "/sys/bus/event_source/devices/{cpu_core,cpu_atom}".
This, however makes it more complicated for the user, because most of the counters are available on both and had to be handled manually.
This patch allows users to use "virtual" cpu device that is seemingly translated to cpu_core and cpu_atom perf devices, depending on the type of a CPU we are opening the counter for.
Stable-dep-of: 2f60f03934a5 ("tools/power turbostat: Fix PMT mmaped file size rounding")
--- tools/power/x86/turbostat/turbostat.8 | 25 ++++++ tools/power/x86/turbostat/turbostat.c | 105 ++++++++++++++++++++++++-- 2 files changed, 123 insertions(+), 7 deletions(-)
tools/power/x86/turbostat/turbostat.8 +25 -0
@@ -33,6 +33,9 @@ name as necessary to disambiguate it from others is necessary. Note that option msr0xXXX is a hex offset, eg. msr0x10 /sys/path... is an absolute path to a sysfs attribute <device> is a perf device from /sys/bus/event_source/devices/<device> eg. cstate_core + On Intel hybrid platforms, instead of one "cpu" perf device there are two, "cpu_core" and "cpu_atom" devices for P and E cores respectively. + Turbostat, in this case, allow user to use "cpu" device and will automatically detect the type of a CPU and translate it to "cpu_core" and "cpu_atom" accordingly. + For a complete example see "ADD PERF COUNTER EXAMPLE #2 (using virtual "cpu" device)". <event> is a perf event for given device from /sys/bus/event_source/devices/<device>/events/<event> eg. c1-residency perf/cstate_core/c1-residency would then use /sys/bus/event_source/devices/cstate_core/events/c1-residency
@@ -387,6 +390,28 @@ CPU pCPU%c1 CPU%c1 .fi +.SH ADD PERF COUNTER EXAMPLE #2 (using virtual cpu device) +Here we run on hybrid, Raptor Lake platform. +We limit turbostat to show output for just cpu0 (pcore) and cpu12 (ecore). +We add a counter showing number of L3 cache misses, using virtual "cpu" device, +labeling it with the column header, "VCMISS". +We add a counter showing number of L3 cache misses, using virtual "cpu_core" device, +labeling it with the column header, "PCMISS". This will fail on ecore cpu12. +We add a counter showing number of L3 cache misses, using virtual "cpu_atom" device, +labeling it with the column header, "ECMISS". This will fail on pcore cpu0. +We display it only once, after the conclusion of 0.1 second sleep. +.nf +sudo ./turbostat --quiet --cpu 0,12 --show CPU --add perf/cpu/cache-misses,cpu,delta,raw,VCMISS --add perf/cpu_core/cache-misses,cpu,delta,raw,PCMISS --add perf/cpu_atom/cache-misses,cpu,delta,raw,ECMISS sleep .1 +turbostat: added_perf_counters_init_: perf/cpu_atom/cache-misses: failed to open counter on cpu0 +turbostat: added_perf_counters_init_: perf/cpu_core/cache-misses: failed to open counter on cpu12 +0.104630 sec +CPU ECMISS PCMISS VCMISS +- 0x0000000000000000 0x0000000000000000 0x0000000000000000 +0 0x0000000000000000 0x0000000000007951 0x0000000000007796 +12 0x000000000001137a 0x0000000000000000 0x0000000000011392 + +.fi + .SH ADD PMT COUNTER EXAMPLE Here we limit turbostat to showing just the CPU number 0. We add two counters, showing crystal clock count and the DC6 residency.
tools/power/x86/turbostat/turbostat.c +98 -7
170 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 524/590 tools/power turbostat: Fix PMT mmaped file size rounding
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patryk Wlazlyn <[email protected]>
[ Upstream commit 2f60f03934a50bc1fb69bb4f47a25cddd6807b0b ]
This (the old code) is just not how you round up to a page size. Noticed on a recent Intel platform. Previous ones must have been reporting sizes already aligned to a page and so the bug was missed when testing.
--- tools/power/x86/turbostat/turbostat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/power/x86/turbostat/turbostat.c +3 -1
@@ -95,6 +95,8 @@#define INTEL_ECORE_TYPE 0x20#define INTEL_PCORE_TYPE 0x40 +#define ROUND_UP_TO_PAGE_SIZE (n) (((n) + 0x1000UL-1UL) & ~(0x1000UL-1UL)) +enum counter_scope {SCOPE_CPU ,SCOPE_CORE ,SCOPE_PACKAGE };enum counter_type {COUNTER_ITEMS ,COUNTER_CYCLES ,COUNTER_SECONDS ,COUNTER_USEC ,COUNTER_K2M };enum counter_format {FORMAT_RAW ,FORMAT_DELTA ,FORMAT_PERCENT ,FORMAT_AVERAGE };
@@ -8853,7 +8855,7 @@ struct pmt_mmio *pmt_mmio_open(unsigned int target_guid)if (fd_pmt ==-1 ) goto loop_cleanup_and_break; - mmap_size = (size +0x1000UL ) & (~0x1000UL ); + mmap_size =ROUND_UP_TO_PAGE_SIZE (size); mmio =mmap (0 , mmap_size,PROT_READ ,MAP_SHARED , fd_pmt,0 );if (mmio !=MAP_FAILED ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 525/590 RISC-V: Mark riscv_v_init() as __init
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Palmer Dabbelt <[email protected]>
[ Upstream commit 9d87cf525fd2e1a5fcbbb40ee3df216d1d266c88 ]
This trips up with Xtheadvector enabled, but as far as I can tell it's just been an issue since the original patchset.
--- arch/riscv/kernel/vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/vector.c +1 -1
@@ -309,7 +309,7 @@ static int __init riscv_v_sysctl_init(void)static int __init riscv_v_sysctl_init (void ) {return 0 ; }#endif /* ! CONFIG_SYSCTL */ -static int riscv_v_init (void ) +static int __init riscv_v_init (void ) {return riscv_v_sysctl_init (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 526/590 ASoC: rockchip: i2s_tdm: Re-add the set_sysclk callback
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Detlev Casanova <[email protected]>
[ Upstream commit 5323186e2e8d33c073fad51e24f18e2d6dbae2da ]
In commit9e2ab4b18ebd ("ASoC: rockchip: i2s-tdm: Fix inaccurate sampling rates"), the set_sysclk callback was removed as considered unused as the mclk rate can be set in the hw_params callback.
The difference between hw_params and set_sysclk is that the former is called with the audio sampling rate set in the params (e.g.: 48000 Hz) while the latter is called with a clock rate already computed with
sampling_rate * mclk-fs (e.g.: 48000 * 256)
For HDMI audio using the Rockchip I2S TDM driver, the mclk-fs value must be set to 128 instead of the default 256, and that value is set in the device tree at the machine driver level (like a simple-audio-card compatible node).
Therefore, the i2s_tdm driver has no idea that another mclk-fs value can be configured and simply computes the mclk rate in the hw_params callback with DEFAULT_MCLK_FS * params_rate(params), which is wrong for HDMI audio.
Re-add the set_sysclk callback so that the mclk rate is computed by the machine driver which has the correct mclk-fs value set in its device tree node.
--- sound/soc/rockchip/rockchip_i2s_tdm.c | 31 +++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)
sound/soc/rockchip/rockchip_i2s_tdm.c +29 -2
@@ -22,7 +22,6 @@#define DRV_NAME "rockchip-i2s-tdm" -#define DEFAULT_MCLK_FS 256#define CH_GRP_MAX 4/* The max channel 8 / 2 */ #define MULTIPLEX_CH_MAX 10
@@ -70,6 +69,8 @@ struct rk_i2s_tdm_dev {bool has_playback;bool has_capture;struct snd_soc_dai_driver *dai; +unsigned int mclk_rx_freq; +unsigned int mclk_tx_freq; };static int to_ch_num (unsigned int val)
@@ -645,6 +646,27 @@ static int rockchip_i2s_trcm_mode(struct snd_pcm_substream *substream,return 0 ; } +static int rockchip_i2s_tdm_set_sysclk (struct snd_soc_dai *cpu_dai,int stream, +unsigned int freq,int dir) +{ +struct rk_i2s_tdm_dev *i2s_tdm =to_info (cpu_dai); + +if (i2s_tdm->clk_trcm) { + i2s_tdm->mclk_tx_freq = freq; + i2s_tdm->mclk_rx_freq = freq; + }else { +if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) + i2s_tdm->mclk_tx_freq = freq; +else + i2s_tdm->mclk_rx_freq = freq; + } + +dev_dbg (i2s_tdm->dev,"The target mclk_%s freq is: %d\n" , + stream ?"rx" :"tx" , freq); + +return 0 ; +} +static int rockchip_i2s_tdm_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai)
@@ -659,15 +681,19 @@ static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream,if (i2s_tdm->clk_trcm ==TRCM_TX ) { mclk = i2s_tdm->mclk_tx; + mclk_rate = i2s_tdm->mclk_tx_freq; }else if (i2s_tdm->clk_trcm ==TRCM_RX ) { mclk = i2s_tdm->mclk_rx; + mclk_rate = i2s_tdm->mclk_rx_freq; }else if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { mclk = i2s_tdm->mclk_tx; + mclk_rate = i2s_tdm->mclk_tx_freq; }else { mclk = i2s_tdm->mclk_rx; + mclk_rate = i2s_tdm->mclk_rx_freq; } - err =clk_set_rate (mclk,DEFAULT_MCLK_FS *params_rate (params)); + err =clk_set_rate (mclk, mclk_rate);if (err)return err;
@@ -827,6 +853,7 @@ static const struct snd_soc_dai_ops rockchip_i2s_tdm_dai_ops = { .hw_params = rockchip_i2s_tdm_hw_params, .set_bclk_ratio = rockchip_i2s_tdm_set_bclk_ratio, .set_fmt = rockchip_i2s_tdm_set_fmt, + .set_sysclk = rockchip_i2s_tdm_set_sysclk, .set_tdm_slot = rockchip_dai_tdm_slot, .trigger = rockchip_i2s_tdm_trigger, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 527/590 io_uring/uring_cmd: use cached cmd_op in io_uring_cmd_sock()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit d58d82bd0efd6c8edd452fc2f6c6dd052ec57cb2 ]
io_uring_cmd_sock() does a normal read of cmd->sqe->cmd_op, where it really should be using a READ_ONCE() as ->sqe may still be pointing to the original SQE. Since the prep side already does this READ_ONCE() and stores it locally, use that value rather than re-read it.
--- io_uring/uring_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/uring_cmd.c +1 -1
@@ -340,7 +340,7 @@ int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags)if (!prot || !prot->ioctl)return -EOPNOTSUPP ; -switch (cmd->sqe->cmd_op) { +switch (cmd->cmd_op) {case SOCKET_URING_OP_SIOCINQ : ret = prot->ioctl (sk,SIOCINQ , &arg);if (ret)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 528/590 ASoC: amd: acp: Fix possible deadlock
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Baluta <[email protected]>
[ Upstream commit 3ff53862c322aa7bb115d84348d5a641dc905d87 ]
On error path, function acp_i2s_set_tdm_slot returns without releasing the lock and this could result in potential deadlocks in the future.
Error reported by sparse:sound/soc/amd/acp/acp-i2s.c:95:12: error: context imbalance in 'acp_i2s_set_tdm_slot' - different lock contexts for basic block
--- sound/soc/amd/acp/acp-i2s.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/amd/acp/acp-i2s.c +1 -0
@@ -181,6 +181,7 @@ static int acp_i2s_set_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, u32 rx_masbreak ;default :dev_err (dev,"Unknown chip revision %d\n" , chip->acp_rev); +spin_unlock_irq (&adata->acp_lock);return -EINVAL ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 529/590 tools/power turbostat: Fix forked child affinity regression
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Len Brown <[email protected]>
[ Upstream commit b32c36975da48afc9089f8b61f7b2dcc40e479d2 ]
In "one-shot" mode, turbostat
1. takes a counter snapshot
2. forks and waits for a child
3. takes the end counter snapshot and prints the result.
But turbostat counter snapshots currently use affinity to travel around the system so that counter reads are "local", and this affinity must be cleared between #1 and #2 above.
The offending commit removed that reset that allowed the child to run on cpu_present_set.
Fix that issue, and improve upon the original by using cpu_possible_set for the child. This allows the child to also run on CPUs that hotplug online during its runtime.
--- tools/power/x86/turbostat/turbostat.c | 54 ++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-)
tools/power/x86/turbostat/turbostat.c +52 -2
@@ -1087,8 +1087,8 @@ int backwards_count;char *progname;#define CPU_SUBSET_MAXCPUS 1024/* need to use before probe... */ -cpu_set_t *cpu_present_set, *cpu_effective_set, *cpu_allowed_set, *cpu_affinity_set, *cpu_subset; -size_t cpu_present_setsize, cpu_effective_setsize, cpu_allowed_setsize, cpu_affinity_setsize, cpu_subset_size; +cpu_set_t *cpu_present_set, *cpu_possible_set, *cpu_effective_set, *cpu_allowed_set, *cpu_affinity_set, *cpu_subset; +size_t cpu_present_setsize, cpu_possible_setsize, cpu_effective_setsize, cpu_allowed_setsize, cpu_affinity_setsize, cpu_subset_size;#define MAX_ADDED_THREAD_COUNTERS 24#define MAX_ADDED_CORE_COUNTERS 8#define MAX_ADDED_PACKAGE_COUNTERS 16
@@ -8223,6 +8223,33 @@ int dir_filter(const struct dirent *dirp)return 0 ; } +char *possible_file ="/sys/devices/system/cpu/possible" ; +char possible_buf[1024 ]; + +int initialize_cpu_possible_set (void ) +{ +FILE *fp; + + fp =fopen (possible_file,"r" ); +if (!fp) { +warn ("open %s" , possible_file); +return -1 ; + } +if (fread (possible_buf,sizeof (char ),1024 , fp) ==0 ) { +warn ("read %s" , possible_file); + goto err; + } +if (parse_cpu_str (possible_buf, cpu_possible_set, cpu_possible_setsize)) { +warnx ("%s: cpu str malformat %s\n" , possible_file, cpu_effective_str); + goto err; + } +return 0 ; + +err: +fclose (fp); +return -1 ; +} +void topology_probe (bool startup) {int i;
@@ -8254,6 +8281,16 @@ void topology_probe(bool startup)CPU_ZERO_S (cpu_present_setsize, cpu_present_set);for_all_proc_cpus (mark_cpu_present); +/* +* Allocate and initialize cpu_possible_set +*/ + cpu_possible_set =CPU_ALLOC ((topo.max_cpu_num +1 )); +if (cpu_possible_set ==NULL ) +err (3 ,"CPU_ALLOC" ); + cpu_possible_setsize =CPU_ALLOC_SIZE ((topo.max_cpu_num +1 )); +CPU_ZERO_S (cpu_possible_setsize, cpu_possible_set); +initialize_cpu_possible_set (); +/* * Allocate and initialize cpu_effective_set */
@@ -9094,6 +9131,18 @@ void turbostat_init() } } +void affinitize_child (void ) +{ +/* Prefer cpu_possible_set, if available */ +if (sched_setaffinity (0 , cpu_possible_setsize, cpu_possible_set)) { +warn ("sched_setaffinity cpu_possible_set" ); + +/* Otherwise, allow child to run on same cpu set as turbostat */ +if (sched_setaffinity (0 , cpu_allowed_setsize, cpu_allowed_set)) +warn ("sched_setaffinity cpu_allowed_set" ); + } +} +int fork_it (char **argv) {pid_t child_pid;
@@ -9109,6 +9158,7 @@ int fork_it(char **argv) child_pid =fork ();if (!child_pid) {/* child */ +affinitize_child ();execvp (argv[0 ], argv);err (errno,"exec %s" , argv[0 ]); }else {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 530/590 cifs: Validate EAs for WSL reparse points
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit ef201e8759d20bf82b5943101147072de12bc524 ]
Major and minor numbers for char and block devices are mandatory for stat. So check that the WSL EA $LXDEV is present for WSL CHR and BLK reparse points.
WSL reparse point tag determinate type of the file. But file type is present also in the WSL EA $LXMOD. So check that both file types are same.
--- fs/smb/client/reparse.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
fs/smb/client/reparse.c +18 -4
@@ -674,11 +674,12 @@ int smb2_parse_reparse_point(struct cifs_sb_info *cifs_sb,return parse_reparse_point (buf, plen, cifs_sb, full_path, true, data); } -static void wsl_to_fattr (struct cifs_open_info_data *data, +static bool wsl_to_fattr (struct cifs_open_info_data *data,struct cifs_sb_info *cifs_sb,u32 tag,struct cifs_fattr *fattr) {struct smb2_file_full_ea_info *ea; +bool have_xattr_dev = false;u32 next =0 ;switch (tag) {
@@ -721,13 +722,24 @@ static void wsl_to_fattr(struct cifs_open_info_data *data, fattr->cf_uid =wsl_make_kuid (cifs_sb, v); else if (!strncmp(name, SMB2_WSL_XATTR_GID, nlen)) fattr->cf_gid = wsl_make_kgid(cifs_sb, v); - else if (!strncmp(name, SMB2_WSL_XATTR_MODE, nlen)) + else if (!strncmp(name, SMB2_WSL_XATTR_MODE, nlen)) { +/* File type in reparse point tag and in xattr mode must match. */ +if (S_DT (fattr->cf_mode) !=S_DT (le32_to_cpu (*(__le32 *)v))) +return false; fattr->cf_mode = (umode_t )le32_to_cpu (*(__le32 *)v); - else if (!strncmp(name, SMB2_WSL_XATTR_DEV, nlen)) + } else if (!strncmp(name, SMB2_WSL_XATTR_DEV, nlen)) { fattr->cf_rdev =reparse_mkdev (v); + have_xattr_dev = true; + } }while (next); out: + +/* Major and minor numbers for char and block devices are mandatory. */ +if (!have_xattr_dev && (tag ==IO_REPARSE_TAG_LX_CHR || tag ==IO_REPARSE_TAG_LX_BLK )) +return false; + fattr->cf_dtype =S_DT (fattr->cf_mode); +return true; } static bool posix_reparse_to_fattr(struct cifs_sb_info *cifs_sb,
@@ -801,7 +813,9 @@ bool cifs_reparse_point_to_fattr(struct cifs_sb_info *cifs_sb,case IO_REPARSE_TAG_AF_UNIX :case IO_REPARSE_TAG_LX_CHR :case IO_REPARSE_TAG_LX_BLK : -wsl_to_fattr (data, cifs_sb, tag, fattr); + ok =wsl_to_fattr (data, cifs_sb, tag, fattr); +if (!ok) +return false;break ;case IO_REPARSE_TAG_NFS : ok =posix_reparse_to_fattr (cifs_sb, fattr, data);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 531/590 cifs: Fix getting and setting SACLs over SMB1
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit 8b19dfb34d17e77a0809d433cc128b779282131b ]
SMB1 callback get_cifs_acl_by_fid() currently ignores its last argument and therefore ignores request for SACL_SECINFO. Fix this issue by correctly propagating info argument from get_cifs_acl() and get_cifs_acl_by_fid() to CIFSSMBGetCIFSACL() function and pass SACL_SECINFO when requested.
For accessing SACLs it is needed to open object with SYSTEM_SECURITY access. Pass this flag when trying to get or set SACLs.
Same logic is in the SMB2+ code path.
This change fixes getting and setting of "system.cifs_ntsd_full" and "system.smb3_ntsd_full" xattrs over SMB1 as currently it silentely ignored SACL part of passed xattr buffer.
--- fs/smb/client/cifsacl.c | 25 +++++++++++++++---------- fs/smb/client/cifsproto.h | 2 +- fs/smb/client/cifssmb.c | 4 ++-- 3 files changed, 18 insertions(+), 13 deletions(-)
fs/smb/client/cifsacl.c +15 -10
@@ -1395,7 +1395,7 @@ static int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *pnntsd,#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY struct smb_ntsd *get_cifs_acl_by_fid (struct cifs_sb_info *cifs_sb,const struct cifs_fid *cifsfid,u32 *pacllen, -u32 __maybe_unused unused) +u32 info) {struct smb_ntsd *pntsd =NULL ;unsigned int xid;
@@ -1407,7 +1407,7 @@ struct smb_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, xid =get_xid (); rc =CIFSSMBGetCIFSACL (xid,tlink_tcon (tlink), cifsfid->netfid, &pntsd, - pacllen); + pacllen, info);free_xid (xid);cifs_put_tlink (tlink);
@@ -1419,7 +1419,7 @@ struct smb_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, }static struct smb_ntsd *get_cifs_acl_by_path (struct cifs_sb_info *cifs_sb, -const char *path,u32 *pacllen) +const char *path,u32 *pacllen,u32 info) {struct smb_ntsd *pntsd =NULL ;int oplock =0 ;
@@ -1446,9 +1446,12 @@ static struct smb_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, .fid = &fid, }; +if (info &SACL_SECINFO ) + oparms.desired_access |=SYSTEM_SECURITY ; + rc =CIFS_open (xid, &oparms, &oplock,NULL );if (!rc) { - rc =CIFSSMBGetCIFSACL (xid, tcon, fid.netfid, &pntsd, pacllen); + rc =CIFSSMBGetCIFSACL (xid, tcon, fid.netfid, &pntsd, pacllen, info);CIFSSMBClose (xid, tcon, fid.netfid); }
@@ -1472,7 +1475,7 @@ struct smb_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb,if (inode) open_file =find_readable_file (CIFS_I (inode), true);if (!open_file) -return get_cifs_acl_by_path (cifs_sb, path, pacllen); +return get_cifs_acl_by_path (cifs_sb, path, pacllen, info); pntsd =get_cifs_acl_by_fid (cifs_sb, &open_file->fid, pacllen, info);cifsFileInfo_put (open_file);
@@ -1485,7 +1488,7 @@ int set_cifs_acl(struct smb_ntsd *pnntsd, __u32 acllen, {int oplock =0 ;unsigned int xid; -int rc, access_flags; +int rc, access_flags =0 ;struct cifs_tcon *tcon;struct cifs_sb_info *cifs_sb =CIFS_SB (inode->i_sb);struct tcon_link *tlink =cifs_sb_tlink (cifs_sb);
@@ -1498,10 +1501,12 @@ int set_cifs_acl(struct smb_ntsd *pnntsd, __u32 acllen, tcon =tlink_tcon (tlink); xid =get_xid (); -if (aclflag ==CIFS_ACL_OWNER || aclflag ==CIFS_ACL_GROUP ) - access_flags =WRITE_OWNER ; -else - access_flags =WRITE_DAC ; +if (aclflag &CIFS_ACL_OWNER || aclflag &CIFS_ACL_GROUP ) + access_flags |=WRITE_OWNER ; +if (aclflag &CIFS_ACL_SACL ) + access_flags |=SYSTEM_SECURITY ; +if (aclflag &CIFS_ACL_DACL ) + access_flags |=WRITE_DAC ; oparms = (struct cifs_open_parms ) { .tcon = tcon,
fs/smb/client/cifsproto.h +1 -1
@@ -568,7 +568,7 @@ extern int CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon,const struct nls_table *nls_codepage, struct cifs_sb_info *cifs_sb);extern int CIFSSMBGetCIFSACL (const unsigned int xid,struct cifs_tcon *tcon, -__u16 fid,struct smb_ntsd **acl_inf,__u32 *buflen); +__u16 fid,struct smb_ntsd **acl_inf,__u32 *buflen,__u32 info);extern int CIFSSMBSetCIFSACL (const unsigned int ,struct cifs_tcon *,__u16 ,struct smb_ntsd *pntsd,__u32 len,int aclflag); extern int cifs_do_get_acl(const unsigned int xid, struct cifs_tcon *tcon,
fs/smb/client/cifssmb.c +2 -2
@@ -3427,7 +3427,7 @@ validate_ntransact(char *buf, char **ppparm, char **ppdata,/* Get Security Descriptor (by handle) from remote server for a file or dir */ int CIFSSMBGetCIFSACL (const unsigned int xid,struct cifs_tcon *tcon,__u16 fid, -struct smb_ntsd **acl_inf,__u32 *pbuflen) +struct smb_ntsd **acl_inf,__u32 *pbuflen,__u32 info) {int rc =0 ;int buf_type =0 ;
@@ -3450,7 +3450,7 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid, pSMB->MaxSetupCount =0 ; pSMB->Fid = fid;/* file handle always le */ pSMB->AclFlags =cpu_to_le32 (CIFS_ACL_OWNER |CIFS_ACL_GROUP | -CIFS_ACL_DACL ); +CIFS_ACL_DACL | info); pSMB->ByteCount =cpu_to_le16 (11 );/* 3 bytes pad + 8 bytes parm */ inc_rfc1001_len (pSMB,11 ); iov[0 ].iov_base = (char *)pSMB;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 532/590 kconfig: fix file name in warnings when loading KCONFIG_DEFCONFIG_LIST
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit a314f52a0210730d0d556de76bb7388e76d4597d ]
Most 'make *config' commands use .config as the base configuration file.
When .config does not exist, Kconfig tries to load a file listed in KCONFIG_DEFCONFIG_LIST instead.
However, since commit b75b0a819af9 ("kconfig: change defconfig_list option to environment variable"), warning messages have displayed an incorrect file name in such cases.
Below is a demonstration using Debian Trixie. While loading /boot/config-6.12.9-amd64, the warning messages incorrectly show .config as the file name.
With this commit, the correct file name is displayed in warnings.
[Before]
$ rm -f .config $ make config # # using defaults found in /boot/config-6.12.9-amd64 # .config:6804:warning: symbol value 'm' invalid for FB_BACKLIGHT .config:9895:warning: symbol value 'm' invalid for ANDROID_BINDER_IPC
[After]
$ rm -f .config $ make config # # using defaults found in /boot/config-6.12.9-amd64 # /boot/config-6.12.9-amd64:6804:warning: symbol value 'm' invalid for FB_BACKLIGHT /boot/config-6.12.9-amd64:9895:warning: symbol value 'm' invalid for ANDROID_BINDER_IPC
--- scripts/kconfig/confdata.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
scripts/kconfig/confdata.c +4 -2
@@ -360,10 +360,12 @@ int conf_read_simple(const char *name, int def) *p ='\0' ; - in =zconf_fopen (env); + name = env; + + in =zconf_fopen (name);if (in) {conf_message ("using defaults found in %s" , - env); + name); goto load; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 533/590 kconfig: fix memory leak in sym_warn_unmet_dep()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit a409fc1463d664002ea9bf700ae4674df03de111 ]
The string allocated in sym_warn_unmet_dep() is never freed, leading to a memory leak when an unmet dependency is detected.
--- scripts/kconfig/symbol.c | 1 + 1 file changed, 1 insertion(+)
scripts/kconfig/symbol.c +1 -0
@@ -376,6 +376,7 @@ static void sym_warn_unmet_dep(const struct symbol *sym) " Selected by [m]:\n");fputs (str_get (&gs), stderr); +str_free (&gs); sym_warnings++; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 534/590 hexagon: fix using plain integer as NULL pointer warning in cmpxchg
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Willem de Bruijn <[email protected]>
[ Upstream commit 8a20030038742b9915c6d811a4e6c14b126cafb4 ]
Sparse reports
net/ipv4/inet_diag.c:1511:17: sparse: sparse: Using plain integer as NULL pointer
Due to this code calling cmpxchg on a non-integer type struct inet_diag_handler *
return !cmpxchg((const struct inet_diag_handler**)&inet_diag_table[type],
NULL, h) ? 0 : -EEXIST;
While hexagon's cmpxchg assigns an integer value to a variable of this type.
__typeof__(*(ptr)) __oldval = 0;
Update this assignment to cast 0 to the correct type.
The original issue is easily reproduced at head with the below block, and is absent after this change.
make LLVM=1 ARCH=hexagon defconfig
make C=1 LLVM=1 ARCH=hexagon net/ipv4/inet_diag.o
--- arch/hexagon/include/asm/cmpxchg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/hexagon/include/asm/cmpxchg.h +1 -1
@@ -56,7 +56,7 @@ __arch_xchg(unsigned long x, volatile void *ptr, int size)__typeof__ (ptr) __ptr = (ptr); \ __typeof__(*(ptr)) __old = (old); \ __typeof__(*(ptr)) __new = (new); \ - __typeof__(*(ptr)) __oldval = 0; \ + __typeof__(*(ptr)) __oldval = (__typeof__(*(ptr))) 0; \ \ asmvolatile ( \ "1: %0 = memw_locked(%1);\n" \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 535/590 hexagon: Fix unbalanced spinlock in die()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Yujun <[email protected]>
[ Upstream commit 03410e87563a122075c3721acc7d5510e41d8332 ]
die executes holding the spinlock of &die.lock and unlock it after printing the oops message.
However in the code if the notify_die() returns NOTIFY_STOP , die() exit with returning 1 but never unlocked the spinlock.
Fix this by adding spin_unlock_irq(&die.lock) before returning.
--- arch/hexagon/kernel/traps.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/hexagon/kernel/traps.c +3 -1
@@ -195,8 +195,10 @@ int die(const char *str, struct pt_regs *regs, long err)printk (KERN_EMERG "Oops: %s[#%d]:\n" , str, ++die.counter);if (notify_die (DIE_OOPS , str, regs, err,pt_cause (regs),SIGSEGV ) == -NOTIFY_STOP ) +NOTIFY_STOP ) { +spin_unlock_irq (&die.lock);return 1 ; + }print_modules ();show_regs (regs);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 536/590 f2fs: Introduce linear search for dentries
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Lee <[email protected]>
commit 91b587ba79e1b68bb718d12b0758dbcdab4e9cb7 upstream.
This patch addresses an issue where some files in case-insensitive directories become inaccessible due to changes in how the kernel function, utf8_casefold(), generates case-folded strings from the commit 5c26d2f1d3f5 ("unicode: Don't special case ignorable code points").
F2FS uses these case-folded names to calculate hash values for locating dentries and stores them on disk. Since utf8_casefold() can produce different output across kernel versions, stored hash values and newly calculated hash values may differ. This results in affected files no longer being found via the hash-based lookup.
To resolve this, the patch introduces a linear search fallback. If the initial hash-based search fails, F2FS will sequentially scan the directory entries.
--- fs/f2fs/dir.c | 53 ++++++++++++++++++++++++++++++++++++++--------------- fs/f2fs/f2fs.h | 6 ++++-- fs/f2fs/inline.c | 5 +++-- 3 files changed, 45 insertions(+), 19 deletions(-)
fs/f2fs/dir.c +38 -15
@@ -175,7 +175,8 @@ static unsigned long dir_block_index(unsstatic struct f2fs_dir_entry *find_in_block (struct inode *dir,struct page *dentry_page,const struct f2fs_filename *fname, -int *max_slots) +int *max_slots, +bool use_hash) {struct f2fs_dentry_block *dentry_blk;struct f2fs_dentry_ptr d;
@@ -183,7 +184,7 @@ static struct f2fs_dir_entry *find_in_bl dentry_blk = (struct f2fs_dentry_block *)page_address (dentry_page);make_dentry_ptr_block (dir, &d, dentry_blk); -return f2fs_find_target_dentry (&d, fname, max_slots); +return f2fs_find_target_dentry (&d, fname, max_slots, use_hash); } static inline int f2fs_match_name(const struct inode *dir,
@@ -208,7 +209,8 @@ static inline int f2fs_match_name(const }struct f2fs_dir_entry *f2fs_find_target_dentry (const struct f2fs_dentry_ptr *d, -const struct f2fs_filename *fname,int *max_slots) +const struct f2fs_filename *fname,int *max_slots, +bool use_hash) {struct f2fs_dir_entry *de;unsigned long bit_pos =0 ;
@@ -231,7 +233,7 @@ struct f2fs_dir_entry *f2fs_find_target_continue ; } -if (de->hash_code == fname->hash) { +if (!use_hash || de->hash_code == fname->hash) { res =f2fs_match_name (d->inode, fname, d->filename[bit_pos],le16_to_cpu (de->name_len));
@@ -258,11 +260,12 @@ found:static struct f2fs_dir_entry *find_in_level (struct inode *dir,unsigned int level,const struct f2fs_filename *fname, -struct page **res_page) +struct page **res_page, +bool use_hash) {int s =GET_DENTRY_SLOTS (fname->disk_name.len);unsigned int nbucket, nblock; -unsigned int bidx, end_block; +unsigned int bidx, end_block, bucket_no;struct page *dentry_page;struct f2fs_dir_entry *de =NULL ;pgoff_t next_pgofs;
@@ -272,8 +275,11 @@ static struct f2fs_dir_entry *find_in_le nbucket =dir_buckets (level,F2FS_I (dir)->i_dir_level); nblock =bucket_blocks (level); + bucket_no = use_hash ?le32_to_cpu (fname->hash) % nbucket :0 ; + +start_find_bucket: bidx =dir_block_index (level,F2FS_I (dir)->i_dir_level, -le32_to_cpu (fname->hash) % nbucket); + bucket_no); end_block = bidx + nblock;while (bidx < end_block) {
@@ -290,7 +296,7 @@ static struct f2fs_dir_entry *find_in_le } } - de =find_in_block (dir, dentry_page, fname, &max_slots); + de =find_in_block (dir, dentry_page, fname, &max_slots, use_hash);if (IS_ERR (de)) { *res_page =ERR_CAST (de); de =NULL ;
@@ -307,12 +313,18 @@ static struct f2fs_dir_entry *find_in_le bidx++; } -if (!de && room &&F2FS_I (dir)->chash != fname->hash) { -F2FS_I (dir)->chash = fname->hash; -F2FS_I (dir)->clevel = level; - } +if (de) +return de; -return de; +if (likely (use_hash)) { +if (room &&F2FS_I (dir)->chash != fname->hash) { +F2FS_I (dir)->chash = fname->hash; +F2FS_I (dir)->clevel = level; + } + }else if (++bucket_no < nbucket) { + goto start_find_bucket; + } +return NULL ; } struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir,
@@ -323,11 +335,15 @@ struct f2fs_dir_entry *__f2fs_find_entrystruct f2fs_dir_entry *de =NULL ;unsigned int max_depth;unsigned int level; +bool use_hash = true; *res_page =NULL ; +#if IS_ENABLED (CONFIG_UNICODE ) +start_find_entry: +#endif if (f2fs_has_inline_dentry (dir)) { - de =f2fs_find_in_inline_dir (dir, fname, res_page); + de =f2fs_find_in_inline_dir (dir, fname, res_page, use_hash); goto out; }
@@ -343,11 +359,18 @@ struct f2fs_dir_entry *__f2fs_find_entry }for (level =0 ; level < max_depth; level++) { - de =find_in_level (dir, level, fname, res_page); + de =find_in_level (dir, level, fname, res_page, use_hash);if (de ||IS_ERR (*res_page))break ; } + out: +#if IS_ENABLED (CONFIG_UNICODE ) +if (IS_CASEFOLDED (dir) && !de && use_hash) { + use_hash = false; + goto start_find_entry; + } +#endif /* This is to increase the speed of f2fs_create */ if (!de)F2FS_I (dir)->task = current;
fs/f2fs/f2fs.h +4 -2
@@ -3579,7 +3579,8 @@ int f2fs_prepare_lookup(struct inode *di struct f2fs_filename *fname);void f2fs_free_filename (struct f2fs_filename *fname);struct f2fs_dir_entry *f2fs_find_target_dentry (const struct f2fs_dentry_ptr *d, -const struct f2fs_filename *fname,int *max_slots); +const struct f2fs_filename *fname,int *max_slots, +bool use_hash);int f2fs_fill_dentries (struct dir_context *ctx,struct f2fs_dentry_ptr *d,unsigned int start_pos,struct fscrypt_str *fstr); void f2fs_do_make_empty_dir(struct inode *inode, struct inode *parent,
@@ -4199,7 +4200,8 @@ int f2fs_write_inline_data(struct inodeint f2fs_recover_inline_data (struct inode *inode,struct page *npage);struct f2fs_dir_entry *f2fs_find_in_inline_dir (struct inode *dir,const struct f2fs_filename *fname, -struct page **res_page); +struct page **res_page, +bool use_hash);int f2fs_make_empty_inline_dir (struct inode *inode,struct inode *parent,struct page *ipage); int f2fs_add_inline_entry(struct inode *dir, const struct f2fs_filename *fname,
fs/f2fs/inline.c +3 -2
@@ -352,7 +352,8 @@ process_inline:struct f2fs_dir_entry *f2fs_find_in_inline_dir (struct inode *dir,const struct f2fs_filename *fname, -struct page **res_page) +struct page **res_page, +bool use_hash) {struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb);struct f2fs_dir_entry *de;
@@ -369,7 +370,7 @@ struct f2fs_dir_entry *f2fs_find_in_inli inline_dentry =inline_data_addr (dir, ipage);make_dentry_ptr_inline (dir, &d, inline_dentry); - de =f2fs_find_target_dentry (&d, fname,NULL ); + de =f2fs_find_target_dentry (&d, fname,NULL , use_hash);unlock_page (ipage);if (IS_ERR (de)) { *res_page =ERR_CAST (de);
Greg Kroah-Hartman
maintainerPATCH 537/590 md/md-bitmap: factor behind write counters out from bitmap_{start/end}write()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
commit 08c50142a128dcb2d7060aa3b4c5db8837f7a46a upstream.
behind_write is only used in raid1, prepare to refactor bitmap_{start/end}write(), there are no functional changes.
--- drivers/md/md-bitmap.c | 57 +++++++++++++++++++++++++++++------------------ drivers/md/md-bitmap.h | 7 ++++- drivers/md/raid1.c | 12 +++++---- drivers/md/raid10.c | 6 +--- drivers/md/raid5-cache.c | 3 -- drivers/md/raid5.c | 11 ++++----- 6 files changed, 56 insertions(+), 40 deletions(-)
drivers/md/md-bitmap.c +36 -21
@@ -1671,24 +1671,13 @@ __acquires(bitmap->lock) }static int bitmap_startwrite (struct mddev *mddev,sector_t offset, -unsigned long sectors,bool behind) +unsigned long sectors) {struct bitmap *bitmap = mddev->bitmap;if (!bitmap)return 0 ; -if (behind) { -int bw; -atomic_inc (&bitmap->behind_writes); - bw =atomic_read (&bitmap->behind_writes); -if (bw > bitmap->behind_writes_used) - bitmap->behind_writes_used = bw; - -pr_debug ("inc write-behind count %d/%lu\n" , - bw, bitmap->mddev->bitmap_info.max_write_behind); - } -while (sectors) {sector_t blocks;bitmap_counter_t *bmc;
@@ -1737,21 +1726,13 @@ static int bitmap_startwrite(struct mdde }static void bitmap_endwrite (struct mddev *mddev,sector_t offset, -unsigned long sectors,bool success,bool behind) +unsigned long sectors,bool success) {struct bitmap *bitmap = mddev->bitmap;if (!bitmap)return ; -if (behind) { -if (atomic_dec_and_test (&bitmap->behind_writes)) -wake_up (&bitmap->behind_wait); -pr_debug ("dec write-behind count %d/%lu\n" , -atomic_read (&bitmap->behind_writes), - bitmap->mddev->bitmap_info.max_write_behind); - } -while (sectors) {sector_t blocks;unsigned long flags;
@@ -2062,6 +2043,37 @@ static void md_bitmap_free(void *data)kfree (bitmap); } +static void bitmap_start_behind_write (struct mddev *mddev) +{ +struct bitmap *bitmap = mddev->bitmap; +int bw; + +if (!bitmap) +return ; + +atomic_inc (&bitmap->behind_writes); + bw =atomic_read (&bitmap->behind_writes); +if (bw > bitmap->behind_writes_used) + bitmap->behind_writes_used = bw; + +pr_debug ("inc write-behind count %d/%lu\n" , + bw, bitmap->mddev->bitmap_info.max_write_behind); +} + +static void bitmap_end_behind_write (struct mddev *mddev) +{ +struct bitmap *bitmap = mddev->bitmap; + +if (!bitmap) +return ; + +if (atomic_dec_and_test (&bitmap->behind_writes)) +wake_up (&bitmap->behind_wait); +pr_debug ("dec write-behind count %d/%lu\n" , +atomic_read (&bitmap->behind_writes), + bitmap->mddev->bitmap_info.max_write_behind); +} +static void bitmap_wait_behind_writes (struct mddev *mddev) {struct bitmap *bitmap = mddev->bitmap;
@@ -2981,6 +2993,9 @@ static struct bitmap_operations bitmap_o .dirty_bits = bitmap_dirty_bits, .unplug = bitmap_unplug, .daemon_work = bitmap_daemon_work, + + .start_behind_write = bitmap_start_behind_write, + .end_behind_write = bitmap_end_behind_write, .wait_behind_writes = bitmap_wait_behind_writes, .startwrite = bitmap_startwrite,
drivers/md/md-bitmap.h +5 -2
@@ -84,12 +84,15 @@ struct bitmap_operations { unsigned long e);void (*unplug)(struct mddev *mddev,bool sync);void (*daemon_work)(struct mddev *mddev); + +void (*start_behind_write)(struct mddev *mddev); +void (*end_behind_write)(struct mddev *mddev);void (*wait_behind_writes)(struct mddev *mddev);int (*startwrite)(struct mddev *mddev,sector_t offset, -unsigned long sectors,bool behind); +unsigned long sectors);void (*endwrite)(struct mddev *mddev,sector_t offset, -unsigned long sectors,bool success,bool behind); +unsigned long sectors,bool success);bool (*start_sync)(struct mddev *mddev,sector_t offset,sector_t *blocks,bool degraded);void (*end_sync)(struct mddev *mddev,sector_t offset,sector_t *blocks);
drivers/md/raid1.c +7 -5
@@ -420,10 +420,11 @@ static void close_write(struct r1bio *r1 r1_bio->behind_master_bio =NULL ; } +if (test_bit (R1BIO_BehindIO, &r1_bio->state)) + mddev->bitmap_ops->end_behind_write (mddev);/* clear the bitmap if all writes complete successfully */ mddev->bitmap_ops->endwrite (mddev, r1_bio->sector, r1_bio->sectors, - !test_bit (R1BIO_Degraded, &r1_bio->state), -test_bit (R1BIO_BehindIO, &r1_bio->state)); + !test_bit (R1BIO_Degraded, &r1_bio->state));md_write_end (mddev); }
@@ -1611,9 +1612,10 @@ static void raid1_write_request(struct m stats.behind_writes < max_write_behind)alloc_behind_master_bio (r1_bio, bio); - mddev->bitmap_ops->startwrite ( - mddev, r1_bio->sector, r1_bio->sectors, -test_bit (R1BIO_BehindIO, &r1_bio->state)); +if (test_bit (R1BIO_BehindIO, &r1_bio->state)) + mddev->bitmap_ops->start_behind_write (mddev); + mddev->bitmap_ops->startwrite (mddev, r1_bio->sector, + r1_bio->sectors); first_clone =0 ; }
drivers/md/raid10.c +2 -4
@@ -430,8 +430,7 @@ static void close_write(struct r10bio *r/* clear the bitmap if all writes complete successfully */ mddev->bitmap_ops->endwrite (mddev, r10_bio->sector, r10_bio->sectors, - !test_bit (R10BIO_Degraded, &r10_bio->state), - false); + !test_bit (R10BIO_Degraded, &r10_bio->state));md_write_end (mddev); }
@@ -1493,8 +1492,7 @@ static void raid10_write_request(structmd_account_bio (mddev, &bio); r10_bio->master_bio = bio;atomic_set (&r10_bio->remaining,1 ); - mddev->bitmap_ops->startwrite (mddev, r10_bio->sector, r10_bio->sectors, - false); + mddev->bitmap_ops->startwrite (mddev, r10_bio->sector, r10_bio->sectors);for (i =0 ; i < conf->copies; i++) {if (r10_bio->devs[i].bio)
drivers/md/raid5-cache.c +1 -2
@@ -315,8 +315,7 @@ void r5c_handle_cached_data_endio(structr5c_return_dev_pending_writes (conf, &sh->dev[i]); conf->mddev->bitmap_ops->endwrite (conf->mddev, sh->sector,RAID5_STRIPE_SECTORS (conf), - !test_bit (STRIPE_DEGRADED , &sh->state), - false); + !test_bit (STRIPE_DEGRADED , &sh->state)); } } }
drivers/md/raid5.c +5 -6
@@ -3564,7 +3564,7 @@ static void __add_stripe_bio(struct striset_bit (STRIPE_BITMAP_PENDING , &sh->state);spin_unlock_irq (&sh->stripe_lock); conf->mddev->bitmap_ops->startwrite (conf->mddev, sh->sector, -RAID5_STRIPE_SECTORS (conf), false); +RAID5_STRIPE_SECTORS (conf));spin_lock_irq (&sh->stripe_lock);clear_bit (STRIPE_BITMAP_PENDING , &sh->state);if (!sh->batch_head) {
@@ -3665,7 +3665,7 @@ handle_failed_stripe(struct r5conf *confif (bitmap_end) conf->mddev->bitmap_ops->endwrite (conf->mddev, sh->sector,RAID5_STRIPE_SECTORS (conf), - false, false); + false); bitmap_end =0 ;/* and fail all 'written' */ bi = sh->dev[i].written;
@@ -3712,7 +3712,7 @@ handle_failed_stripe(struct r5conf *confif (bitmap_end) conf->mddev->bitmap_ops->endwrite (conf->mddev, sh->sector,RAID5_STRIPE_SECTORS (conf), - false, false); + false);/* If we were in the middle of a write the parity block might * still be locked - so just clear all R5_LOCKED flags */
@@ -4063,8 +4063,7 @@ returnbi: } conf->mddev->bitmap_ops->endwrite (conf->mddev, sh->sector,RAID5_STRIPE_SECTORS (conf), - !test_bit (STRIPE_DEGRADED , &sh->state), - false); + !test_bit (STRIPE_DEGRADED , &sh->state));if (head_sh->batch_head) { sh = list_first_entry(&sh->batch_list, struct stripe_head,
@@ -5788,7 +5787,7 @@ static void make_discard_request(structfor (d =0 ; d < conf->raid_disks - conf->max_degraded; d++) mddev->bitmap_ops->startwrite (mddev, sh->sector, -RAID5_STRIPE_SECTORS (conf), false); +RAID5_STRIPE_SECTORS (conf)); sh->bm_seq = conf->seq_flush +1 ;set_bit (STRIPE_BIT_DELAY , &sh->state); }
Greg Kroah-Hartman
maintainerPATCH 538/590 md/md-bitmap: remove the last parameter for bimtap_ops->endwrite()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
commit 4f0e7d0e03b7b80af84759a9e7cfb0f81ac4adae upstream.
For the case that IO failed for one rdev, the bit will be mark as NEEDED in following cases:
1) If badblocks is set and rdev is not faulty;
2) If rdev is faulty;
Case 1) is useless because synchronize data to badblocks make no sense. Case 2) can be replaced with mddev->degraded.
Also remove R1BIO_Degraded, R10BIO_Degraded and STRIPE_DEGRADED since case 2) no longer use them.
--- drivers/md/md-bitmap.c | 19 ++++++++++--------- drivers/md/md-bitmap.h | 2 +- drivers/md/raid1.c | 26 +++----------------------- drivers/md/raid1.h | 1 - drivers/md/raid10.c | 23 +++-------------------- drivers/md/raid10.h | 1 - drivers/md/raid5-cache.c | 3 +-- drivers/md/raid5.c | 15 +++------------ drivers/md/raid5.h | 1 - 9 files changed, 21 insertions(+), 70 deletions(-)
drivers/md/md-bitmap.c +10 -9
@@ -1726,7 +1726,7 @@ static int bitmap_startwrite(struct mdde }static void bitmap_endwrite (struct mddev *mddev,sector_t offset, -unsigned long sectors,bool success) +unsigned long sectors) {struct bitmap *bitmap = mddev->bitmap;
@@ -1745,15 +1745,16 @@ static void bitmap_endwrite(struct mddevreturn ; } -if (success && !bitmap->mddev->degraded && - bitmap->events_cleared < bitmap->mddev->events) { - bitmap->events_cleared = bitmap->mddev->events; - bitmap->need_sync =1 ; -sysfs_notify_dirent_safe (bitmap->sysfs_can_clear); - } - -if (!success && !NEEDED (*bmc)) +if (!bitmap->mddev->degraded) { +if (bitmap->events_cleared < bitmap->mddev->events) { + bitmap->events_cleared = bitmap->mddev->events; + bitmap->need_sync =1 ; +sysfs_notify_dirent_safe ( + bitmap->sysfs_can_clear); + } + }else if (!NEEDED (*bmc)) { *bmc |=NEEDED_MASK ; + }if (COUNTER (*bmc) ==COUNTER_MAX )wake_up (&bitmap->overflow_wait);
drivers/md/md-bitmap.h +1 -1
@@ -92,7 +92,7 @@ struct bitmap_operations {int (*startwrite)(struct mddev *mddev,sector_t offset,unsigned long sectors);void (*endwrite)(struct mddev *mddev,sector_t offset, -unsigned long sectors,bool success); +unsigned long sectors);bool (*start_sync)(struct mddev *mddev,sector_t offset,sector_t *blocks,bool degraded);void (*end_sync)(struct mddev *mddev,sector_t offset,sector_t *blocks);
drivers/md/raid1.c +3 -23
@@ -423,8 +423,7 @@ static void close_write(struct r1bio *r1if (test_bit (R1BIO_BehindIO, &r1_bio->state)) mddev->bitmap_ops->end_behind_write (mddev);/* clear the bitmap if all writes complete successfully */ - mddev->bitmap_ops->endwrite (mddev, r1_bio->sector, r1_bio->sectors, - !test_bit (R1BIO_Degraded, &r1_bio->state)); + mddev->bitmap_ops->endwrite (mddev, r1_bio->sector, r1_bio->sectors);md_write_end (mddev); }
@@ -481,8 +480,6 @@ static void raid1_end_write_request(struif (!test_bit (Faulty, &rdev->flags))set_bit (R1BIO_WriteError, &r1_bio->state);else { -/* Fail the request */ -set_bit (R1BIO_Degraded, &r1_bio->state);/* Finished with this branch */ r1_bio->bios[mirror] =NULL ; to_put = bio;
@@ -1493,11 +1490,8 @@ static void raid1_write_request(struct mbreak ; } r1_bio->bios[i] =NULL ; -if (!rdev ||test_bit (Faulty, &rdev->flags)) { -if (i < conf->raid_disks) -set_bit (R1BIO_Degraded, &r1_bio->state); +if (!rdev ||test_bit (Faulty, &rdev->flags))continue ; - }atomic_inc (&rdev->nr_pending);if (test_bit (WriteErrorSeen, &rdev->flags)) {
@@ -1523,16 +1517,6 @@ static void raid1_write_request(struct m*/ max_sectors = bad_sectors;rdev_dec_pending (rdev, mddev); -/* We don't set R1BIO_Degraded as that -* only applies if the disk is -* missing, so it might be re-added, -* and we want to know to recover this -* chunk. -* In this case the device is here, -* and the fact that this chunk is not -* in-sync is recorded in the bad -* block log -*/ continue ; }if (is_bad) {
@@ -2569,12 +2553,10 @@ static void handle_write_finished(struct* errors. */ fail = true; -if (!narrow_write_error (r1_bio, m)) { +if (!narrow_write_error (r1_bio, m))md_error (conf->mddev, conf->mirrors[m].rdev);/* an I/O failed, we can't clear the bitmap */ -set_bit (R1BIO_Degraded, &r1_bio->state); - }rdev_dec_pending (conf->mirrors[m].rdev, conf->mddev); }
@@ -2665,8 +2647,6 @@ static void raid1d(struct md_thread *thrlist_del (&r1_bio->retry_list); idx =sector_to_idx (r1_bio->sector);atomic_dec (&conf->nr_queued[idx]); -if (mddev->degraded) -set_bit (R1BIO_Degraded, &r1_bio->state);if (test_bit (R1BIO_WriteError, &r1_bio->state))close_write (r1_bio);raid_end_bio_io (r1_bio);
drivers/md/raid1.h +0 -1
@@ -188,7 +188,6 @@ struct r1bio {enum r1bio_state { R1BIO_Uptodate, R1BIO_IsSync, - R1BIO_Degraded, R1BIO_BehindIO,/* Set ReadError on bios that experience a readerror so that * raid1d knows what to do with them.
drivers/md/raid10.c +3 -20
@@ -429,8 +429,7 @@ static void close_write(struct r10bio *rstruct mddev *mddev = r10_bio->mddev;/* clear the bitmap if all writes complete successfully */ - mddev->bitmap_ops->endwrite (mddev, r10_bio->sector, r10_bio->sectors, - !test_bit (R10BIO_Degraded, &r10_bio->state)); + mddev->bitmap_ops->endwrite (mddev, r10_bio->sector, r10_bio->sectors);md_write_end (mddev); }
@@ -500,7 +499,6 @@ static void raid10_end_write_request(strset_bit (R10BIO_WriteError, &r10_bio->state); else {/* Fail the request */ -set_bit (R10BIO_Degraded, &r10_bio->state); r10_bio->devs[slot].bio =NULL ; to_put = bio; dec_rdev =1 ;
@@ -1429,10 +1427,8 @@ static void raid10_write_request(struct r10_bio->devs[i].bio =NULL ; r10_bio->devs[i].repl_bio =NULL ; -if (!rdev && !rrdev) { -set_bit (R10BIO_Degraded, &r10_bio->state); +if (!rdev && !rrdev)continue ; - }if (rdev &&test_bit (WriteErrorSeen, &rdev->flags)) {sector_t first_bad;sector_t dev_sector = r10_bio->devs[i].addr;
@@ -1449,14 +1445,6 @@ static void raid10_write_request(struct* to other devices yet */ max_sectors = bad_sectors; -/* We don't set R10BIO_Degraded as that -* only applies if the disk is missing, -* so it might be re-added, and we want to -* know to recover this chunk. -* In this case the device is here, and the -* fact that this chunk is not in-sync is -* recorded in the bad block log. -*/ continue ; }if (is_bad) {
@@ -2908,11 +2896,8 @@ static void handle_write_completed(strucrdev_dec_pending (rdev, conf->mddev); }else if (bio !=NULL && bio->bi_status) { fail = true; -if (!narrow_write_error (r10_bio, m)) { +if (!narrow_write_error (r10_bio, m))md_error (conf->mddev, rdev); -set_bit (R10BIO_Degraded, - &r10_bio->state); - }rdev_dec_pending (rdev, conf->mddev); } bio = r10_bio->devs[m].repl_bio;
@@ -2971,8 +2956,6 @@ static void raid10d(struct md_thread *th r10_bio = list_first_entry(&tmp, struct r10bio, retry_list);list_del (&r10_bio->retry_list); -if (mddev->degraded) -set_bit (R10BIO_Degraded, &r10_bio->state);if (test_bit (R10BIO_WriteError, &r10_bio->state))
drivers/md/raid10.h +0 -1
@@ -161,7 +161,6 @@ enum r10bio_state { R10BIO_IsSync, R10BIO_IsRecover, R10BIO_IsReshape, - R10BIO_Degraded,/* Set ReadError on bios that experience a read error * so that raid10d knows what to do with them. */
drivers/md/raid5-cache.c +1 -2
@@ -314,8 +314,7 @@ void r5c_handle_cached_data_endio(structset_bit (R5_UPTODATE , &sh->dev[i].flags);r5c_return_dev_pending_writes (conf, &sh->dev[i]); conf->mddev->bitmap_ops->endwrite (conf->mddev, - sh->sector,RAID5_STRIPE_SECTORS (conf), - !test_bit (STRIPE_DEGRADED , &sh->state)); + sh->sector,RAID5_STRIPE_SECTORS (conf)); } } }
drivers/md/raid5.c +3 -12
@@ -1345,8 +1345,6 @@ again:submit_bio_noacct (rbi); }if (!rdev && !rrdev) { -if (op_is_write (op)) -set_bit (STRIPE_DEGRADED , &sh->state);pr_debug ("skip op %d on disc %d for sector %llu\n" , bi->bi_opf, i, (unsigned long long )sh->sector);clear_bit (R5_LOCKED , &sh->dev[i].flags);
@@ -2884,7 +2882,6 @@ static void raid5_end_write_request(struset_bit (R5_MadeGoodRepl, &sh->dev[i].flags); }else {if (bi->bi_status) { -set_bit (STRIPE_DEGRADED , &sh->state);set_bit (WriteErrorSeen, &rdev->flags);set_bit (R5_WriteError, &sh->dev[i].flags);if (!test_and_set_bit (WantReplacement, &rdev->flags))
@@ -3664,8 +3661,7 @@ handle_failed_stripe(struct r5conf *conf }if (bitmap_end) conf->mddev->bitmap_ops->endwrite (conf->mddev, - sh->sector,RAID5_STRIPE_SECTORS (conf), - false); + sh->sector,RAID5_STRIPE_SECTORS (conf)); bitmap_end =0 ;/* and fail all 'written' */ bi = sh->dev[i].written;
@@ -3711,8 +3707,7 @@ handle_failed_stripe(struct r5conf *conf }if (bitmap_end) conf->mddev->bitmap_ops->endwrite (conf->mddev, - sh->sector,RAID5_STRIPE_SECTORS (conf), - false); + sh->sector,RAID5_STRIPE_SECTORS (conf));/* If we were in the middle of a write the parity block might * still be locked - so just clear all R5_LOCKED flags */
@@ -4062,8 +4057,7 @@ returnbi: wbi = wbi2; } conf->mddev->bitmap_ops->endwrite (conf->mddev, - sh->sector,RAID5_STRIPE_SECTORS (conf), - !test_bit (STRIPE_DEGRADED , &sh->state)); + sh->sector,RAID5_STRIPE_SECTORS (conf));if (head_sh->batch_head) { sh = list_first_entry(&sh->batch_list, struct stripe_head,
@@ -4340,7 +4334,6 @@ static void handle_parity_checks5(struct s->locked++;set_bit (R5_Wantwrite, &dev->flags); -clear_bit (STRIPE_DEGRADED , &sh->state);set_bit (STRIPE_INSYNC , &sh->state);break ;case check_state_run:
@@ -4497,7 +4490,6 @@ static void handle_parity_checks6(structclear_bit (R5_Wantwrite, &dev->flags); s->locked--; } -clear_bit (STRIPE_DEGRADED , &sh->state);set_bit (STRIPE_INSYNC , &sh->state);break ;
@@ -4900,7 +4892,6 @@ static void break_stripe_batch_list(struset_mask_bits (&sh->state, ~(STRIPE_EXPAND_SYNC_FLAGS | (1 <<STRIPE_PREREAD_ACTIVE ) | - (1 <<STRIPE_DEGRADED ) | (1 <<STRIPE_ON_UNPLUG_LIST )), head_sh->state & (1 <<STRIPE_INSYNC ));
drivers/md/raid5.h +0 -1
@@ -358,7 +358,6 @@ enum {STRIPE_REPLACED ,STRIPE_PREREAD_ACTIVE ,STRIPE_DELAYED , -STRIPE_DEGRADED ,STRIPE_BIT_DELAY ,STRIPE_EXPANDING , STRIPE_EXPAND_SOURCE,
Greg Kroah-Hartman
maintainerPATCH 539/590 md: add a new callback pers->bitmap_sector()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
commit 0c984a283a3ea3f10bebecd6c57c1d41b2e4f518 upstream.
This callback will be used in raid5 to convert io ranges from array to bitmap.
--- drivers/md/md.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/md/md.h +3 -0
@@ -746,6 +746,9 @@ struct md_personalityvoid *(*takeover) (struct mddev *mddev);/* Changes the consistency policy of an active array. */ int (*change_consistency_policy)(struct mddev *mddev,const char *buf); +/* convert io ranges from array to bitmap */ +void (*bitmap_sector)(struct mddev *mddev,sector_t *offset, +unsigned long *sectors); };struct md_sysfs_entry {
Greg Kroah-Hartman
maintainerPATCH 540/590 md/raid5: implement pers->bitmap_sector()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
commit 9c89f604476cf15c31fbbdb043cff7fbf1dbe0cb upstream.
Bitmap is used for the whole array for raid1/raid10, hence IO for the array can be used directly for bitmap. However, bitmap is used for underlying disks for raid5, hence IO for the array can't be used directly for bitmap.
Implement pers->bitmap_sector() for raid5 to convert IO ranges from the array to the underlying disks.
--- drivers/md/raid5.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
drivers/md/raid5.c +51 -0
@@ -5919,6 +5919,54 @@ static enum reshape_loc get_reshape_loc(return LOC_BEHIND_RESHAPE ; } +static void raid5_bitmap_sector (struct mddev *mddev,sector_t *offset, +unsigned long *sectors) +{ +struct r5conf *conf = mddev->private; +sector_t start = *offset; +sector_t end = start + *sectors; +sector_t prev_start = start; +sector_t prev_end = end; +int sectors_per_chunk; +enum reshape_loc loc; +int dd_idx; + + sectors_per_chunk = conf->chunk_sectors * + (conf->raid_disks - conf->max_degraded); + start =round_down (start, sectors_per_chunk); + end =round_up (end, sectors_per_chunk); + + start =raid5_compute_sector (conf, start,0 , &dd_idx,NULL ); + end =raid5_compute_sector (conf, end,0 , &dd_idx,NULL ); + +/* +* For LOC_INSIDE_RESHAPE, this IO will wait for reshape to make +* progress, hence it's the same as LOC_BEHIND_RESHAPE. +*/ + loc =get_reshape_loc (mddev, conf, prev_start); +if (likely (loc !=LOC_AHEAD_OF_RESHAPE )) { + *offset = start; + *sectors = end - start; +return ; + } + + sectors_per_chunk = conf->prev_chunk_sectors * + (conf->previous_raid_disks - conf->max_degraded); + prev_start =round_down (prev_start, sectors_per_chunk); + prev_end =round_down (prev_end, sectors_per_chunk); + + prev_start =raid5_compute_sector (conf, prev_start,1 , &dd_idx,NULL ); + prev_end =raid5_compute_sector (conf, prev_end,1 , &dd_idx,NULL ); + +/* +* for LOC_AHEAD_OF_RESHAPE, reshape can make progress before this IO +* is handled in make_stripe_request(), we can't know this here hence +* we set bits for both. +*/ + *offset =min (start, prev_start); + *sectors =max (end, prev_end) - *offset; +} +static enum stripe_result make_stripe_request (struct mddev *mddev,struct r5conf *conf,struct stripe_request_ctx *ctx,sector_t logical_sector,struct bio *bi)
@@ -8967,6 +9015,7 @@ static struct md_personality raid6_perso .takeover = raid6_takeover, .change_consistency_policy = raid5_change_consistency_policy, .prepare_suspend = raid5_prepare_suspend, + .bitmap_sector = raid5_bitmap_sector, };static struct md_personality raid5_personality = {
@@ -8992,6 +9041,7 @@ static struct md_personality raid5_perso .takeover = raid5_takeover, .change_consistency_policy = raid5_change_consistency_policy, .prepare_suspend = raid5_prepare_suspend, + .bitmap_sector = raid5_bitmap_sector, }; static struct md_personality raid4_personality =
@@ -9018,6 +9068,7 @@ static struct md_personality raid4_perso .takeover = raid4_takeover, .change_consistency_policy = raid5_change_consistency_policy, .prepare_suspend = raid5_prepare_suspend, + .bitmap_sector = raid5_bitmap_sector, };static int __init raid5_init (void )
Greg Kroah-Hartman
maintainerPATCH 541/590 md/md-bitmap: move bitmap_{start, end}write to md upper layer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
commit cd5fc653381811f1e0ba65f5d169918cab61476f upstream.
There are two BUG reports that raid5 will hang at bitmap_startwrite([1],[2]), root cause is that bitmap start write and end write is unbalanced, it's not quite clear where, and while reviewing raid5 code, it's found that bitmap operations can be optimized. For example, for a 4 disks raid5, with chunksize=8k, if user issue a IO (0 + 48k) to the array:
┌────────────────────────────────────────────────────────────┐ │chunk 0 │ │ ┌────────────┬─────────────┬─────────────┬────────────┼ │ sh0 │A0: 0 + 4k │A1: 8k + 4k │A2: 16k + 4k │A3: P │ │ ┼────────────┼─────────────┼─────────────┼────────────┼ │ sh1 │B0: 4k + 4k │B1: 12k + 4k │B2: 20k + 4k │B3: P │ ┼──────┴────────────┴─────────────┴─────────────┴────────────┼ │chunk 1 │ │ ┌────────────┬─────────────┬─────────────┬────────────┤ │ sh2 │C0: 24k + 4k│C1: 32k + 4k │C2: P │C3: 40k + 4k│ │ ┼────────────┼─────────────┼─────────────┼────────────┼ │ sh3 │D0: 28k + 4k│D1: 36k + 4k │D2: P │D3: 44k + 4k│ └──────┴────────────┴─────────────┴─────────────┴────────────┘
Before this patch, 4 stripe head will be used, and each sh will attach bio for 3 disks, and each attached bio will trigger bitmap_startwrite() once, which means total 12 times.
- 3 times (0 + 4k), for (A0, A1 and A2)
- 3 times (4 + 4k), for (B0, B1 and B2)
- 3 times (8 + 4k), for (C0, C1 and C3)
- 3 times (12 + 4k), for (D0, D1 and D3)
After this patch, md upper layer will calculate that IO range (0 + 48k) is corresponding to the bitmap (0 + 16k), and call bitmap_startwrite() just once.
Noted that this patch will align bitmap ranges to the chunks, for example, if user issue a IO (0 + 4k) to array:
- Before this patch, 1 time (0 + 4k), for A0;
- After this patch, 1 time (0 + 8k) for chunk 0;
Usually, one bitmap bit will represent more than one disk chunk, and this doesn't have any difference. And even if user really created a array that one chunk contain multiple bits, the overhead is that more data will be recovered after power failure.
Also remove STRIPE_BITMAP_PENDING since it's not used anymore.
[1] https://lore.kernel.org/all/CAJpMwyjmHQLvm6zg1cmQErttNNQPDAAXPKM3xgTjMhbfts986Q@mail.gmail.com/
[2] https://lore.kernel.org/all/[email protected]/
--- drivers/md/md.c | 29 +++++++++++++++++++++++++++ drivers/md/md.h | 2 + drivers/md/raid1.c | 4 --- drivers/md/raid10.c | 3 -- drivers/md/raid5-cache.c | 2 - drivers/md/raid5.c | 50 +++++------------------------------------------ drivers/md/raid5.h | 3 -- 7 files changed, 37 insertions(+), 56 deletions(-)
drivers/md/md.c +29 -0
@@ -8745,12 +8745,32 @@ void md_submit_discard_bio(struct mddev }EXPORT_SYMBOL_GPL (md_submit_discard_bio); +static void md_bitmap_start (struct mddev *mddev, +struct md_io_clone *md_io_clone) +{ +if (mddev->pers->bitmap_sector) + mddev->pers->bitmap_sector (mddev, &md_io_clone->offset, + &md_io_clone->sectors); + + mddev->bitmap_ops->startwrite (mddev, md_io_clone->offset, + md_io_clone->sectors); +} + +static void md_bitmap_end (struct mddev *mddev,struct md_io_clone *md_io_clone) +{ + mddev->bitmap_ops->endwrite (mddev, md_io_clone->offset, + md_io_clone->sectors); +} +static void md_end_clone_io (struct bio *bio) {struct md_io_clone *md_io_clone = bio->bi_private;struct bio *orig_bio = md_io_clone->orig_bio;struct mddev *mddev = md_io_clone->mddev; +if (bio_data_dir (orig_bio) ==WRITE && mddev->bitmap) +md_bitmap_end (mddev, md_io_clone); +if (bio->bi_status && !orig_bio->bi_status) orig_bio->bi_status = bio->bi_status;
@@ -8775,6 +8795,12 @@ static void md_clone_bio(struct mddev *mif (blk_queue_io_stat (bdev->bd_disk->queue)) md_io_clone->start_time =bio_start_io_acct (*bio); +if (bio_data_dir (*bio) ==WRITE && mddev->bitmap) { + md_io_clone->offset = (*bio)->bi_iter.bi_sector; + md_io_clone->sectors =bio_sectors (*bio); +md_bitmap_start (mddev, md_io_clone); + } + clone->bi_end_io = md_end_clone_io; clone->bi_private = md_io_clone; *bio = clone;
@@ -8793,6 +8819,9 @@ void md_free_cloned_bio(struct bio *bio)struct bio *orig_bio = md_io_clone->orig_bio;struct mddev *mddev = md_io_clone->mddev; +if (bio_data_dir (orig_bio) ==WRITE && mddev->bitmap) +md_bitmap_end (mddev, md_io_clone); +if (bio->bi_status && !orig_bio->bi_status) orig_bio->bi_status = bio->bi_status;
drivers/md/md.h +2 -0
@@ -831,6 +831,8 @@ struct md_io_clone {struct mddev *mddev;struct bio *orig_bio;unsigned long start_time; +sector_t offset; +unsigned long sectors;struct bio bio_clone; };
drivers/md/raid1.c +0 -4
@@ -422,8 +422,6 @@ static void close_write(struct r1bio *r1if (test_bit (R1BIO_BehindIO, &r1_bio->state)) mddev->bitmap_ops->end_behind_write (mddev); -/* clear the bitmap if all writes complete successfully */ - mddev->bitmap_ops->endwrite (mddev, r1_bio->sector, r1_bio->sectors);md_write_end (mddev); }
@@ -1598,8 +1596,6 @@ static void raid1_write_request(struct mif (test_bit (R1BIO_BehindIO, &r1_bio->state)) mddev->bitmap_ops->start_behind_write (mddev); - mddev->bitmap_ops->startwrite (mddev, r1_bio->sector, - r1_bio->sectors); first_clone =0 ; }
drivers/md/raid10.c +0 -3
@@ -428,8 +428,6 @@ static void close_write(struct r10bio *r {struct mddev *mddev = r10_bio->mddev; -/* clear the bitmap if all writes complete successfully */ - mddev->bitmap_ops->endwrite (mddev, r10_bio->sector, r10_bio->sectors);md_write_end (mddev); }
@@ -1480,7 +1478,6 @@ static void raid10_write_request(structmd_account_bio (mddev, &bio); r10_bio->master_bio = bio;atomic_set (&r10_bio->remaining,1 ); - mddev->bitmap_ops->startwrite (mddev, r10_bio->sector, r10_bio->sectors);for (i =0 ; i < conf->copies; i++) {if (r10_bio->devs[i].bio)
drivers/md/raid5-cache.c +0 -2
@@ -313,8 +313,6 @@ void r5c_handle_cached_data_endio(structif (sh->dev[i].written) {set_bit (R5_UPTODATE , &sh->dev[i].flags);r5c_return_dev_pending_writes (conf, &sh->dev[i]); - conf->mddev->bitmap_ops->endwrite (conf->mddev, - sh->sector,RAID5_STRIPE_SECTORS (conf)); } } }
drivers/md/raid5.c +6 -44
110 lines not on this page · raw message
drivers/md/raid5.h +0 -3
@@ -371,9 +371,6 @@ enum {STRIPE_ON_RELEASE_LIST ,STRIPE_BATCH_READY ,STRIPE_BATCH_ERR , -STRIPE_BITMAP_PENDING ,/* Being added to bitmap, don't add -* to batch yet. -*/ STRIPE_LOG_TRAPPED, /* trapped into log (see raid5-cache.c)* this bit is used in two scenarios: *
Greg Kroah-Hartman
maintainerPATCH 542/590 Revert "SUNRPC: Reduce thread wake-up rate when receiving large RPC messages"
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
commit 966a675da844f1a764bb44557c21561cc3d09840 upstream.
I noticed that a handful of NFSv3 fstests were taking an unexpectedly long time to run. Troubleshooting showed that the server's TCP window closed and never re-opened, which caused the client to trigger an RPC retransmit timeout after 180 seconds.
The client's recovery action was to establish a fresh connection and retransmit the timed-out requests. This worked, but it adds a long delay.
I tracked the problem to the commit that attempted to reduce the rate at which the network layer delivers TCP socket data_ready callbacks. Under most circumstances this change worked as expected, but for NFSv3, which has no session or other type of throttling, it can overwhelm the receiver on occasion.
I'm sure I could tweak the lowat settings, but the small benefit doesn't seem worth the bother. Just revert it.
--- net/sunrpc/svcsock.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
net/sunrpc/svcsock.c +1 -11
@@ -1083,9 +1083,6 @@ static void svc_tcp_fragment_received(st/* If we have more data, signal svc_xprt_enqueue() to try again */ svsk->sk_tcplen =0 ; svsk->sk_marker = xdr_zero; - -smp_wmb (); -tcp_set_rcvlowat (svsk->sk_sk,1 ); }/**
@@ -1175,17 +1172,10 @@ err_incomplete: goto err_delete;if (len == want)svc_tcp_fragment_received (svsk); -else { -/* Avoid more ->sk_data_ready() calls until the rest -* of the message has arrived. This reduces service -* thread wake-ups on large incoming messages. */ -tcp_set_rcvlowat (svsk->sk_sk, -svc_sock_reclen (svsk) - svsk->sk_tcplen); - +else trace_svcsock_tcp_recv_short (&svsk->sk_xprt,svc_sock_reclen (svsk), svsk->sk_tcplen -sizeof (rpc_fraghdr)); - } goto err_noclose; error:if (len != -EAGAIN )
Greg Kroah-Hartman
maintainerPATCH 543/590 kbuild: switch from lz4c to lz4 for compression
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Parth Pancholi <[email protected]>
commit e397a603e49cc7c7c113fad9f55a09637f290c34 upstream.
Replace lz4c with lz4 for kernel image compression.
Although lz4 and lz4c are functionally similar, lz4c has been deprecated upstream since 2018. Since as early as Ubuntu 16.04 and Fedora 25, lz4 and lz4c have been packaged together, making it safe to update the requirement from lz4c to lz4.
Consequently, some distributions and build systems, such as OpenEmbedded, have fully transitioned to using lz4. OpenEmbedded core adopted this change in commit fe167e082cbd ("bitbake.conf: require lz4 instead of lz4c"), causing compatibility issues when building the mainline kernel in the latest OpenEmbedded environment, as seen in the errors below.
This change also updates the LZ4 compression commands to make it backward compatible by replacing stdin and stdout with the '-' option, due to some unclear reason, the stdout keyword does not work for lz4 and '-' works for both. In addition, this modifies the legacy '-c1' with '-9' which is also compatible with both. This fixes the mainline kernel build failures with the latest master OpenEmbedded builds associated with the mentioned compatibility issues.
LZ4 arch/arm/boot/compressed/piggy_data/bin/sh: 1: lz4c: not found
...
...
ERROR: oe_runmake failed
--- Makefile | 2 +- scripts/Makefile.lib | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Makefile +1 -1
@@ -509,7 +509,7 @@ KGZIP = gzip KBZIP2 = bzip2 KLZOP = lzop LZMA = lzma -LZ4 = lz4c +LZ4 = lz4 XZ = xz ZSTD = zstd
scripts/Makefile.lib +2 -2
@@ -371,10 +371,10 @@ quiet_cmd_lzo_with_size = LZO $@ cmd_lzo_with_size = { cat $(real-prereqs) | $(KLZOP) -9; $(size_append); } > $@ quiet_cmd_lz4 = LZ4 $@ - cmd_lz4 = cat $(real-prereqs) | $(LZ4) -l -c1 stdin stdout > $@ + cmd_lz4 = cat $(real-prereqs) | $(LZ4) -l -9 - - > $@ quiet_cmd_lz4_with_size = LZ4 $@ - cmd_lz4_with_size = { cat $(real-prereqs) | $(LZ4) -l -c1 stdin stdout; \ + cmd_lz4_with_size = { cat $(real-prereqs) | $(LZ4) -l -9 - -; \ $(size_append); } > $@ # U-Boot mkimage
Greg Kroah-Hartman
maintainerPATCH 544/590 netfilter: nf_tables: reject mismatching sum of field_len with set key length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 1b9335a8000fb70742f7db10af314104b6ace220 upstream.
The field length description provides the length of each separated key field in the concatenation, each field gets rounded up to 32-bits to calculate the pipapo rule width from pipapo_init(). The set key length provides the total size of the key aligned to 32-bits.
Register-based arithmetics still allows for combining mismatching set key length and field length description, eg. set key length 10 and field description [ 5, 4 ] leading to pipapo width of 12.
--- net/netfilter/nf_tables_api.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +4 -4
@@ -4968,7 +4968,7 @@ static int nft_set_desc_concat_parse(constatic int nft_set_desc_concat (struct nft_set_desc *desc,const struct nlattr *nla) { -u32 num_regs =0 , key_num_regs =0 ; +u32 len =0 , num_regs;struct nlattr *attr;int rem, err, i;
@@ -4982,12 +4982,12 @@ static int nft_set_desc_concat(struct nf }for (i =0 ; i < desc->field_count; i++) - num_regs +=DIV_ROUND_UP (desc->field_len[i],sizeof (u32)); + len +=round_up (desc->field_len[i],sizeof (u32)); - key_num_regs =DIV_ROUND_UP (desc->klen,sizeof (u32)); -if (key_num_regs != num_regs) +if (len != desc->klen)return -EINVAL ; + num_regs =DIV_ROUND_UP (desc->klen,sizeof (u32));if (num_regs >NFT_REG32_COUNT )return -E2BIG ;
Greg Kroah-Hartman
maintainerPATCH 545/590 drm/amd/display: Reduce accessing remote DPCD overhead
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wayne Lin <[email protected]>
commit adb4998f4928a17d91be054218a902ba9f8c1f93 upstream.
[Why]
Observed frame rate get dropped by tool like glxgear. Even though the output to monitor is 60Hz, the rendered frame rate drops to 30Hz lower.
It's due to code path in some cases will trigger dm_dp_mst_is_port_support_mode() to read out remote Link status to assess the available bandwidth for dsc maniplation. Overhead of keep reading remote DPCD is considerable.
[How]
Store the remote link BW in mst_local_bw and use end-to-end full_pbn as an indicator to decide whether update the remote link bw or not.
Whenever we need the info to assess the BW, visit the stored one first.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 34 ++++++++---- 2 files changed, 27 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +2 -0
@@ -697,6 +697,8 @@ struct amdgpu_dm_connector {struct drm_dp_mst_port *mst_output_port;struct amdgpu_dm_connector *mst_root;struct drm_dp_aux *dsc_aux; +uint32_t mst_local_bw; +uint16_t vc_full_pbn;struct mutex handle_mst_msg_ready;/* TODO see if we can merge with ddc_bus or make a dm_connector */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +25 -9
@@ -155,6 +155,17 @@ amdgpu_dm_mst_connector_late_register(streturn 0 ; } + +static inline void +amdgpu_dm_mst_reset_mst_connector_setting (struct amdgpu_dm_connector *aconnector) +{ + aconnector->edid =NULL ; + aconnector->dsc_aux =NULL ; + aconnector->mst_output_port->passthrough_aux =NULL ; + aconnector->mst_local_bw =0 ; + aconnector->vc_full_pbn =0 ; +} +static void amdgpu_dm_mst_connector_early_unregister (struct drm_connector *connector) {
@@ -182,9 +193,7 @@ amdgpu_dm_mst_connector_early_unregisterdc_sink_release (dc_sink); aconnector->dc_sink =NULL ; - aconnector->edid =NULL ; - aconnector->dsc_aux =NULL ; - port->passthrough_aux =NULL ; +amdgpu_dm_mst_reset_mst_connector_setting (aconnector); } aconnector->mst_status =MST_STATUS_DEFAULT ;
@@ -500,9 +509,7 @@ dm_dp_mst_detect(struct drm_connector *cdc_sink_release (aconnector->dc_sink); aconnector->dc_sink =NULL ; - aconnector->edid =NULL ; - aconnector->dsc_aux =NULL ; - port->passthrough_aux =NULL ; +amdgpu_dm_mst_reset_mst_connector_setting (aconnector); amdgpu_dm_set_mst_status(&aconnector->mst_status, MST_REMOTE_EDID | MST_ALLOCATE_NEW_PAYLOAD | MST_CLEAR_ALLOCATED_PAYLOAD,
@@ -1815,9 +1822,18 @@ enum dc_status dm_dp_mst_is_port_supportstruct drm_dp_mst_port *immediate_upstream_port =NULL ;uint32_t end_link_bw =0 ; -/*Get last DP link BW capability*/ -if (dp_get_link_current_set_bw (&aconnector->mst_output_port->aux, &end_link_bw)) { -if (stream_kbps > end_link_bw) { +/*Get last DP link BW capability. Mode shall be supported by Legacy peer*/ +if (aconnector->mst_output_port->pdt !=DP_PEER_DEVICE_DP_LEGACY_CONV && + aconnector->mst_output_port->pdt !=DP_PEER_DEVICE_NONE ) { +if (aconnector->vc_full_pbn != aconnector->mst_output_port->full_pbn) { +dp_get_link_current_set_bw (&aconnector->mst_output_port->aux, &end_link_bw); + aconnector->vc_full_pbn = aconnector->mst_output_port->full_pbn; + aconnector->mst_local_bw = end_link_bw; + }else { + end_link_bw = aconnector->mst_local_bw; + } + +if (end_link_bw >0 && stream_kbps > end_link_bw) {DRM_DEBUG_DRIVER ("MST_DSC dsc decode at last link." "Mode required bw can't fit into last link\n" );return DC_FAIL_BANDWIDTH_VALIDATE ;