5.16.3-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 794/1039 i3c: fix incorrect address slot lookup on 64-bit
In reply to Greg Kroah-HartmanFrom: Jamie Iles <[email protected]>
[ Upstream commit f18f98110f2b179792cb70d85cba697320a3790f ]
The address slot bitmap is an array of unsigned long's which are the same size as an int on 32-bit platforms but not 64-bit. Loading the bitmap into an int could result in the incorrect status being returned for a slot and slots being reported as the wrong status.
--- drivers/i3c/master.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i3c/master.c +2 -1
@@ -343,7 +343,8 @@ struct bus_type i3c_bus_type = {static enum i3c_addr_slot_status i3c_bus_get_addr_slot_status (struct i3c_bus *bus,u16 addr) { -int status, bitpos = addr *2 ; +unsigned long status; +int bitpos = addr *2 ;if (addr >I2C_MAX_ADDR )return I3C_ADDR_SLOT_RSVD ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 795/1039 i3c/master/mipi-i3c-hci: Fix a potentially infinite loop in hci_dat_v1_get_index()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 3f43926f271287fb1744c9ac9ae1122497f2b0c2 ]
The code in 'hci_dat_v1_get_index()' really looks like a hand coded version of 'for_each_set_bit()', except that a +1 is missing when searching for the next set bit.
This really looks odd and it seems that it will loop until 'dat_w0_read()' returns the expected result.
So use 'for_each_set_bit()' instead. It is less verbose and should be more correct.
--- drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/i3c/master/mipi-i3c-hci/dat_v1.c +1 -3
@@ -160,9 +160,7 @@ static int hci_dat_v1_get_index(struct i3c_hci *hci, u8 dev_addr)unsigned int dat_idx;u32 dat_w0; -for (dat_idx =find_first_bit (hci->DAT_data, hci->DAT_entries); - dat_idx < hci->DAT_entries; - dat_idx =find_next_bit (hci->DAT_data, hci->DAT_entries, dat_idx)) { +for_each_set_bit (dat_idx, hci->DAT_data, hci->DAT_entries) { dat_w0 =dat_w0_read (dat_idx);if (FIELD_GET (DAT_0_DYNAMIC_ADDRESS , dat_w0) == dev_addr)return dat_idx;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 796/1039 tracing: Do not let synth_events block other dyn_event systems during create
In reply to Greg Kroah-HartmanFrom: Beau Belgrave <[email protected]>
[ Upstream commit 4f67cca70c0f615e9cfe6ac42244f3416ec60877 ]
synth_events is returning -EINVAL if the dyn_event create command does not contain ' \t'. This prevents other systems from getting called back. synth_events needs to return -ECANCELED in these cases when the command is not targeting the synth_event system.
--- kernel/trace/trace_events_synth.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
kernel/trace/trace_events_synth.c +7 -6
@@ -2054,6 +2054,13 @@ static int create_synth_event(const char *raw_command)last_cmd_set (raw_command); + name = raw_command; + +/* Don't try to process if not our system */ +if (name[0 ] !='s' || name[1 ] !=':' ) +return -ECANCELED ; + name +=2 ; + p =strpbrk (raw_command," \t" );if (!p) {synth_err (SYNTH_ERR_INVALID_CMD ,0 );
@@ -2062,12 +2069,6 @@ static int create_synth_event(const char *raw_command) fields =skip_spaces (p); - name = raw_command; - -if (name[0 ] !='s' || name[1 ] !=':' ) -return -ECANCELED ; - name +=2 ; -/* This interface accepts group name prefix */ if (strchr (name,'/' )) { len =str_has_prefix (name,SYNTH_SYSTEM "/" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 797/1039 Input: ti_am335x_tsc - set ADCREFM for X configuration
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 73cca71a903202cddc8279fc76b2da4995da5bea ]
As reported by the STEPCONFIG[1-16] registered field descriptions of the TI reference manual, for the ADC "in single ended, SEL_INM_SWC_3_0 must be 1xxx".
Unlike the Y and Z coordinates, this bit has not been set for the step configuration registers used to sample the X coordinate.
--- drivers/input/touchscreen/ti_am335x_tsc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/touchscreen/ti_am335x_tsc.c +2 -1
@@ -131,7 +131,8 @@ static void titsc_step_config(struct titsc *ts_dev)u32 stepenable; config =STEPCONFIG_MODE_HWSYNC | -STEPCONFIG_AVG_16 | ts_dev->bit_xp; +STEPCONFIG_AVG_16 | ts_dev->bit_xp | +STEPCONFIG_INM_ADCREFM ;switch (ts_dev->wires) {case 4 : config |=STEPCONFIG_INP (ts_dev->inp_yp) | ts_dev->bit_xn;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 798/1039 Input: ti_am335x_tsc - fix STEPCONFIG setup for Z2
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 6bfeb6c21e1bdc11c328b7d996d20f0f73c6b9b0 ]
The Z2 step configuration doesn't erase the SEL_INP_SWC_3_0 bit-field before setting the ADC channel. This way its value could be corrupted by the ADC channel selected for the Z1 coordinate.
--- drivers/input/touchscreen/ti_am335x_tsc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/input/touchscreen/ti_am335x_tsc.c +4 -1
@@ -196,7 +196,10 @@ static void titsc_step_config(struct titsc *ts_dev) STEPCONFIG_OPENDLY); end_step++; - config |=STEPCONFIG_INP (ts_dev->inp_yn); + config =STEPCONFIG_MODE_HWSYNC | +STEPCONFIG_AVG_16 | ts_dev->bit_yp | + ts_dev->bit_xn |STEPCONFIG_INM_ADCREFM | +STEPCONFIG_INP (ts_dev->inp_yn);titsc_writel (ts_dev,REG_STEPCONFIG (end_step), config);titsc_writel (ts_dev,REG_STEPDELAY (end_step),STEPCONFIG_OPENDLY );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 799/1039 PCI: mvebu: Check for errors from pci_bridge_emul_init() call
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 5d18d702e5c9309f4195653475c7a7fdde4ca71f ]
Function pci_bridge_emul_init() may fail so correctly check for errors.
--- drivers/pci/controller/pci-mvebu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/pci/controller/pci-mvebu.c +12 -3
@@ -570,7 +570,7 @@ static struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = {* Initialize the configuration space of the PCI-to-PCI bridge * associated with the given PCIe interface. */ -static void mvebu_pci_bridge_emul_init (struct mvebu_pcie_port *port) +static int mvebu_pci_bridge_emul_init (struct mvebu_pcie_port *port) {struct pci_bridge_emul *bridge = &port->bridge;
@@ -589,7 +589,7 @@ static void mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port) bridge->data = port; bridge->ops = &mvebu_pci_bridge_emul_ops; -pci_bridge_emul_init (bridge,PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR ); +return pci_bridge_emul_init (bridge,PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR ); }static inline struct mvebu_pcie *sys_to_pcie (struct pci_sys_data *sys)
@@ -1112,9 +1112,18 @@ static int mvebu_pcie_probe(struct platform_device *pdev)continue ; } + ret =mvebu_pci_bridge_emul_init (port); +if (ret <0 ) { +dev_err (dev,"%s: cannot init emulated bridge\n" , + port->name); +devm_iounmap (dev, port->base); + port->base =NULL ; +mvebu_pcie_powerdown (port); +continue ; + } +mvebu_pcie_setup_hw (port);mvebu_pcie_set_local_dev_nr (port,1 ); -mvebu_pci_bridge_emul_init (port); } pcie->nports = i;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 800/1039 PCI: mvebu: Do not modify PCI IO type bits in conf_write
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 2cf150216e5b5619d7c25180ccf2cc8ac7bebc13 ]
PCI IO type bits are already initialized in mvebu_pci_bridge_emul_init() function and only when IO support is enabled. These type bits are read-only and pci-bridge-emul.c code already does not allow to modify them from upper layers.
When IO support is disabled then all IO registers should be read-only and return zeros. Therefore do not modify PCI IO type bits in mvebu_pci_bridge_emul_base_conf_write() callback.
--- drivers/pci/controller/pci-mvebu.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/pci/controller/pci-mvebu.c +0 -7
@@ -497,13 +497,6 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge, }case PCI_IO_BASE : -/* -* We keep bit 1 set, it is a read-only bit that -* indicates we support 32 bits addressing for the -* I/O -*/ - conf->iobase |=PCI_IO_RANGE_TYPE_32 ; - conf->iolimit |=PCI_IO_RANGE_TYPE_32 ;mvebu_pcie_handle_iobase_change (port);break ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 801/1039 PCI: mvebu: Fix support for bus mastering and PCI_COMMAND on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit e42b85583719adb87ab88dc7bcd41b38011f7d11 ]
According to PCI specifications bits [0:2] of Command Register, this should be by default disabled on reset. So explicitly disable these bits at early beginning of driver initialization.
Also remove code which unconditionally enables all 3 bits and let kernel code (via pci_set_master() function) to handle bus mastering of PCI Bridge via emulated PCI_COMMAND on emulated bridge.
Adjust existing functions mvebu_pcie_handle_iobase_change() and mvebu_pcie_handle_membase_change() to handle PCI_IO_BASE and PCI_MEM_BASE registers correctly even when bus mastering on emulated bridge is disabled.
--- drivers/pci/controller/pci-mvebu.c | 52 ++++++++++++++++++------------ 1 file changed, 32 insertions(+), 20 deletions(-)
drivers/pci/controller/pci-mvebu.c +32 -20
@@ -215,16 +215,14 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) {u32 cmd, mask; -/* Point PCIe unit MBUS decode windows to DRAM space. */ -mvebu_pcie_setup_wins (port); - -/* Master + slave enable. */ +/* Disable Root Bridge I/O space, memory space and bus mastering. */ cmd =mvebu_readl (port,PCIE_CMD_OFF ); - cmd |=PCI_COMMAND_IO ; - cmd |=PCI_COMMAND_MEMORY ; - cmd |=PCI_COMMAND_MASTER ; + cmd &= ~(PCI_COMMAND_IO |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER );mvebu_writel (port, cmd,PCIE_CMD_OFF ); +/* Point PCIe unit MBUS decode windows to DRAM space. */ +mvebu_pcie_setup_wins (port); +/* Enable interrupt lines A-D. */ mask =mvebu_readl (port,PCIE_MASK_OFF ); mask |=PCIE_MASK_ENABLE_INTS ;
@@ -371,8 +369,7 @@ static void mvebu_pcie_handle_iobase_change(struct mvebu_pcie_port *port)/* Are the new iobase/iolimit values invalid? */ if (conf->iolimit < conf->iobase || - conf->iolimitupper < conf->iobaseupper || - !(conf->command &PCI_COMMAND_IO )) { + conf->iolimitupper < conf->iobaseupper) {mvebu_pcie_set_window (port, port->io_target, port->io_attr, &desired, &port->iowin);return ;
@@ -409,8 +406,7 @@ static void mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port)struct pci_bridge_emul_conf *conf = &port->bridge.conf;/* Are the new membase/memlimit values invalid? */ -if (conf->memlimit < conf->membase || - !(conf->command &PCI_COMMAND_MEMORY )) { +if (conf->memlimit < conf->membase) {mvebu_pcie_set_window (port, port->mem_target, port->mem_attr, &desired, &port->memwin);return ;
@@ -430,6 +426,24 @@ static void mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port) &port->memwin); } +static pci_bridge_emul_read_status_t +mvebu_pci_bridge_emul_base_conf_read (struct pci_bridge_emul *bridge, +int reg,u32 *value) +{ +struct mvebu_pcie_port *port = bridge->data; + +switch (reg) { +case PCI_COMMAND : + *value =mvebu_readl (port,PCIE_CMD_OFF ); +break ; + +default : +return PCI_BRIDGE_EMUL_NOT_HANDLED ; + } + +return PCI_BRIDGE_EMUL_HANDLED ; +} +static pci_bridge_emul_read_status_t mvebu_pci_bridge_emul_pcie_conf_read (struct pci_bridge_emul *bridge,int reg,u32 *value)
@@ -484,17 +498,14 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge,switch (reg) {case PCI_COMMAND : - { -if (!mvebu_has_ioport (port)) - conf->command &= ~PCI_COMMAND_IO ; - -if ((old ^ new) &PCI_COMMAND_IO ) -mvebu_pcie_handle_iobase_change (port); -if ((old ^ new) &PCI_COMMAND_MEMORY ) -mvebu_pcie_handle_membase_change (port); +if (!mvebu_has_ioport (port)) { + conf->command =cpu_to_le16 ( +le16_to_cpu (conf->command) & ~PCI_COMMAND_IO ); + new &= ~PCI_COMMAND_IO ; + } +mvebu_writel (port, new,PCIE_CMD_OFF );break ; - }case PCI_IO_BASE :mvebu_pcie_handle_iobase_change (port);
@@ -554,6 +565,7 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge, }static struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = { + .read_base = mvebu_pci_bridge_emul_base_conf_read, .write_base = mvebu_pci_bridge_emul_base_conf_write, .read_pcie = mvebu_pci_bridge_emul_pcie_conf_read, .write_pcie = mvebu_pci_bridge_emul_pcie_conf_write,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 802/1039 PCI: mvebu: Fix configuring secondary bus of PCIe Root Port via emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 91a8d79fc797d3486ae978beebdfc55261c7d65b ]
It looks like that mvebu PCIe controller has for each PCIe link fully independent PCIe host bridge and so every PCIe Root Port is isolated not only on its own bus but also isolated from each others. But in past device tree structure was defined to put all PCIe Root Ports (as PCI Bridge devices) into one root bus 0 and this bus is emulated by pci-mvebu.c driver.
Probably reason for this decision was incorrect understanding of PCIe topology of these Armada SoCs and also reason of misunderstanding how is PCIe controller generating Type 0 and Type 1 config requests (it is fully different compared to other drivers). Probably incorrect setup leaded to very surprised things like having PCIe Root Port (PCI Bridge device, with even incorrect Device Class set to Memory Controller) and the PCIe device behind the Root Port on the same PCI bus, which obviously was needed to somehow hack (as these two devices cannot be in reality on the same bus).
Properly set mvebu local bus number and mvebu local device number based on PCI Bridge secondary bus number configuration. Also correctly report configured secondary bus number in config space. And explain in driver comment why this setup is correct.
--- drivers/pci/controller/pci-mvebu.c | 99 +++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-mvebu.c +97 -2
@@ -125,6 +125,11 @@ static bool mvebu_pcie_link_up(struct mvebu_pcie_port *port)return !(mvebu_readl (port,PCIE_STAT_OFF ) &PCIE_STAT_LINK_DOWN ); } +static u8 mvebu_pcie_get_local_bus_nr (struct mvebu_pcie_port *port) +{ +return (mvebu_readl (port,PCIE_STAT_OFF ) &PCIE_STAT_BUS ) >>8 ; +} +static void mvebu_pcie_set_local_bus_nr (struct mvebu_pcie_port *port,int nr) {u32 stat;
@@ -437,6 +442,20 @@ mvebu_pci_bridge_emul_base_conf_read(struct pci_bridge_emul *bridge, *value =mvebu_readl (port,PCIE_CMD_OFF );break ; +case PCI_PRIMARY_BUS : { +/* +* From the whole 32bit register we support reading from HW only +* secondary bus number which is mvebu local bus number. +* Other bits are retrieved only from emulated config buffer. +*/ +__le32 *cfgspace = (__le32 *)&bridge->conf; +u32 val =le32_to_cpu (cfgspace[PCI_PRIMARY_BUS /4 ]); + val &= ~0xff00 ; + val |=mvebu_pcie_get_local_bus_nr (port) <<8 ; + *value = val; +break ; + } +default :return PCI_BRIDGE_EMUL_NOT_HANDLED ; }
@@ -520,7 +539,8 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge,break ;case PCI_PRIMARY_BUS : -mvebu_pcie_set_local_bus_nr (port, conf->secondary_bus); +if (mask &0xff00 ) +mvebu_pcie_set_local_bus_nr (port, conf->secondary_bus);break ;default :
@@ -1127,8 +1147,83 @@ static int mvebu_pcie_probe(struct platform_device *pdev)continue ; } +/* +* PCIe topology exported by mvebu hw is quite complicated. In +* reality has something like N fully independent host bridges +* where each host bridge has one PCIe Root Port (which acts as +* PCI Bridge device). Each host bridge has its own independent +* internal registers, independent access to PCI config space, +* independent interrupt lines, independent window and memory +* access configuration. But additionally there is some kind of +* peer-to-peer support between PCIe devices behind different +* host bridges limited just to forwarding of memory and I/O +* transactions (forwarding of error messages and config cycles +* is not supported). So we could say there are N independent +* PCIe Root Complexes. +* +* For this kind of setup DT should have been structured into +* N independent PCIe controllers / host bridges. But instead +* structure in past was defined to put PCIe Root Ports of all +* host bridges into one bus zero, like in classic multi-port +* Root Complex setup with just one host bridge. +* +* This means that pci-mvebu.c driver provides "virtual" bus 0 +* on which registers all PCIe Root Ports (PCI Bridge devices) +* specified in DT by their BDF addresses and virtually routes +* PCI config access of each PCI bridge device to specific PCIe +* host bridge. +* +* Normally PCI Bridge should choose between Type 0 and Type 1 +* config requests based on primary and secondary bus numbers +* configured on the bridge itself. But because mvebu PCI Bridge +* does not have registers for primary and secondary bus numbers +* in its config space, it determinates type of config requests +* via its own custom way. +* +* There are two options how mvebu determinate type of config +* request. +* +* 1. If Secondary Bus Number Enable bit is not set or is not +* available (applies for pre-XP PCIe controllers) then Type 0 +* is used if target bus number equals Local Bus Number (bits +* [15:8] in register 0x1a04) and target device number differs +* from Local Device Number (bits [20:16] in register 0x1a04). +* Type 1 is used if target bus number differs from Local Bus +* Number. And when target bus number equals Local Bus Number +* and target device equals Local Device Number then request is +* routed to Local PCI Bridge (PCIe Root Port). +* +* 2. If Secondary Bus Number Enable bit is set (bit 7 in +* register 0x1a2c) then mvebu hw determinate type of config +* request like compliant PCI Bridge based on primary bus number +* which is configured via Local Bus Number (bits [15:8] in +* register 0x1a04) and secondary bus number which is configured +* via Secondary Bus Number (bits [7:0] in register 0x1a2c). +* Local PCI Bridge (PCIe Root Port) is available on primary bus +* as device with Local Device Number (bits [20:16] in register +* 0x1a04). +* +* Secondary Bus Number Enable bit is disabled by default and +* option 2. is not available on pre-XP PCIe controllers. Hence +* this driver always use option 1. +* +* Basically it means that primary and secondary buses shares +* one virtual number configured via Local Bus Number bits and +* Local Device Number bits determinates if accessing primary +* or secondary bus. Set Local Device Number to 1 and redirect +* all writes of PCI Bridge Secondary Bus Number register to +* Local Bus Number (bits [15:8] in register 0x1a04). +* +* So when accessing devices on buses behind secondary bus +* number it would work correctly. And also when accessing +* device 0 at secondary bus number via config space would be +* correctly routed to secondary bus. Due to issues described +* in mvebu_pcie_setup_hw(), PCI Bridges at primary bus (zero) +* are not accessed directly via PCI config space but rarher +* indirectly via kernel emulated PCI bridge driver. +*/ mvebu_pcie_setup_hw (port); -mvebu_pcie_set_local_dev_nr (port,1 ); +mvebu_pcie_set_local_dev_nr (port,0 ); } pcie->nports = i;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 803/1039 PCI: mvebu: Setup PCIe controller to Root Complex mode
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit df08ac016124bd88b8598ac0599d7b89c0642774 ]
This driver operates only in Root Complex mode, so ensure that hardware is properly configured in Root Complex mode.
--- drivers/pci/controller/pci-mvebu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-mvebu.c +7 -1
@@ -55,6 +55,7 @@#define PCIE_MASK_ENABLE_INTS 0x0f000000#define PCIE_CTRL_OFF 0x1a00#define PCIE_CTRL_X1_MODE 0x0001 +#define PCIE_CTRL_RC_MODE BIT(1)#define PCIE_STAT_OFF 0x1a04#define PCIE_STAT_BUS 0xff00#define PCIE_STAT_DEV 0x1f0000
@@ -218,7 +219,12 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)static void mvebu_pcie_setup_hw (struct mvebu_pcie_port *port) { -u32 cmd, mask; +u32 ctrl, cmd, mask; + +/* Setup PCIe controller to Root Complex mode. */ + ctrl =mvebu_readl (port,PCIE_CTRL_OFF ); + ctrl |=PCIE_CTRL_RC_MODE ; +mvebu_writel (port, ctrl,PCIE_CTRL_OFF );/* Disable Root Bridge I/O space, memory space and bus mastering. */ cmd =mvebu_readl (port,PCIE_CMD_OFF );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 804/1039 PCI: mvebu: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit d75404cc08832206f173668bd35391c581fea121 ]
Hardware supports PCIe Hot Reset via PCIE_CTRL_OFF register. Use it for implementing PCI_BRIDGE_CTL_BUS_RESET bit of PCI_BRIDGE_CONTROL register on emulated bridge.
With this change the function pci_reset_secondary_bus() starts working and can reset connected PCIe card.
--- drivers/pci/controller/pci-mvebu.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/pci/controller/pci-mvebu.c +28 -0
@@ -56,6 +56,7 @@#define PCIE_CTRL_OFF 0x1a00#define PCIE_CTRL_X1_MODE 0x0001#define PCIE_CTRL_RC_MODE BIT(1) +#define PCIE_CTRL_MASTER_HOT_RESET BIT(24)#define PCIE_STAT_OFF 0x1a04#define PCIE_STAT_BUS 0xff00#define PCIE_STAT_DEV 0x1f0000
@@ -462,6 +463,22 @@ mvebu_pci_bridge_emul_base_conf_read(struct pci_bridge_emul *bridge,break ; } +case PCI_INTERRUPT_LINE : { +/* +* From the whole 32bit register we support reading from HW only +* one bit: PCI_BRIDGE_CTL_BUS_RESET. +* Other bits are retrieved only from emulated config buffer. +*/ +__le32 *cfgspace = (__le32 *)&bridge->conf; +u32 val =le32_to_cpu (cfgspace[PCI_INTERRUPT_LINE /4 ]); +if (mvebu_readl (port,PCIE_CTRL_OFF ) &PCIE_CTRL_MASTER_HOT_RESET ) + val |=PCI_BRIDGE_CTL_BUS_RESET <<16 ; +else + val &= ~(PCI_BRIDGE_CTL_BUS_RESET <<16 ); + *value = val; +break ; + } +default :return PCI_BRIDGE_EMUL_NOT_HANDLED ; }
@@ -549,6 +566,17 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge,mvebu_pcie_set_local_bus_nr (port, conf->secondary_bus);break ; +case PCI_INTERRUPT_LINE : +if (mask & (PCI_BRIDGE_CTL_BUS_RESET <<16 )) { +u32 ctrl =mvebu_readl (port,PCIE_CTRL_OFF ); +if (new & (PCI_BRIDGE_CTL_BUS_RESET <<16 )) + ctrl |=PCIE_CTRL_MASTER_HOT_RESET ; +else + ctrl &= ~PCIE_CTRL_MASTER_HOT_RESET ; +mvebu_writel (port, ctrl,PCIE_CTRL_OFF ); + } +break ; +default :break ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 805/1039 PCI: mvebu: Fix support for PCI_EXP_DEVCTL on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit ecae073e393e65ee7be7ebf3fdd5258ab99f1636 ]
Comment in Armada 370 functional specification is misleading. PCI_EXP_DEVCTL_*RE bits are supported and configures receiving of error interrupts.
--- drivers/pci/controller/pci-mvebu.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/pci/controller/pci-mvebu.c +1 -10
@@ -498,9 +498,7 @@ mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,break ;case PCI_EXP_DEVCTL : - *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL ) & - ~(PCI_EXP_DEVCTL_URRE |PCI_EXP_DEVCTL_FERE | -PCI_EXP_DEVCTL_NFERE |PCI_EXP_DEVCTL_CERE ); + *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL );break ;case PCI_EXP_LNKCAP :
@@ -590,13 +588,6 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,switch (reg) {case PCI_EXP_DEVCTL : -/* -* Armada370 data says these bits must always -* be zero when in root complex mode. -*/ - new &= ~(PCI_EXP_DEVCTL_URRE |PCI_EXP_DEVCTL_FERE | -PCI_EXP_DEVCTL_NFERE |PCI_EXP_DEVCTL_CERE ); -mvebu_writel (port, new,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL );break ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 806/1039 PCI: mvebu: Fix support for PCI_EXP_RTSTA on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 838ff44a398ff47fe9b924961d91aee325821220 ]
PME Status bit in Root Status Register (PCIE_RC_RTSTA_OFF) is read-only and can be cleared only by writing 0b to the Interrupt Cause RW0C register (PCIE_INT_CAUSE_OFF).
--- drivers/pci/controller/pci-mvebu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-mvebu.c +10 -1
@@ -51,6 +51,8 @@ PCIE_CONF_FUNC(PCI_FUNC(devfn)) | PCIE_CONF_REG(where) | \ PCIE_CONF_ADDR_EN)#define PCIE_CONF_DATA_OFF 0x18fc +#define PCIE_INT_CAUSE_OFF 0x1900 +#define PCIE_INT_PM_PME BIT(28)#define PCIE_MASK_OFF 0x1910#define PCIE_MASK_ENABLE_INTS 0x0f000000#define PCIE_CTRL_OFF 0x1a00
@@ -604,7 +606,14 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,break ;case PCI_EXP_RTSTA : -mvebu_writel (port, new,PCIE_RC_RTSTA ); +/* +* PME Status bit in Root Status Register (PCIE_RC_RTSTA) +* is read-only and can be cleared only by writing 0b to the +* Interrupt Cause RW0C register (PCIE_INT_CAUSE_OFF). So +* clear PME via Interrupt Cause. +*/ +if (new &PCI_EXP_RTSTA_PME ) +mvebu_writel (port, ~PCIE_INT_PM_PME ,PCIE_INT_CAUSE_OFF );break ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 807/1039 PCI: mvebu: Fix support for DEVCAP2, DEVCTL2 and LNKCTL2 registers on emulated bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 4ab34548c55fbbb3898306a47dfaccd4860e1ccb ]
Armada XP and new hardware supports access to DEVCAP2, DEVCTL2 and LNKCTL2 configuration registers of PCIe core via PCIE_CAP_PCIEXP. So export them via emulated software root bridge.
Pre-XP hardware does not support these registers and returns zeros.
--- drivers/pci/controller/pci-mvebu.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/pci/controller/pci-mvebu.c +23 -0
@@ -524,6 +524,18 @@ mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge, *value =mvebu_readl (port,PCIE_RC_RTSTA );break ; +case PCI_EXP_DEVCAP2 : + *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_DEVCAP2 ); +break ; + +case PCI_EXP_DEVCTL2 : + *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL2 ); +break ; + +case PCI_EXP_LNKCTL2 : + *value =mvebu_readl (port,PCIE_CAP_PCIEXP +PCI_EXP_LNKCTL2 ); +break ; +default :return PCI_BRIDGE_EMUL_NOT_HANDLED ; }
@@ -615,6 +627,17 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,if (new &PCI_EXP_RTSTA_PME )mvebu_writel (port, ~PCIE_INT_PM_PME ,PCIE_INT_CAUSE_OFF );break ; + +case PCI_EXP_DEVCTL2 : +mvebu_writel (port, new,PCIE_CAP_PCIEXP +PCI_EXP_DEVCTL2 ); +break ; + +case PCI_EXP_LNKCTL2 : +mvebu_writel (port, new,PCIE_CAP_PCIEXP +PCI_EXP_LNKCTL2 ); +break ; + +default : +break ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 808/1039 KVM: RISC-V: Avoid spurious virtual interrupts after clearing hideleg CSR
In reply to Greg Kroah-HartmanFrom: Vincent Chen <[email protected]>
[ Upstream commit 33e5b5746cc2336660c8710ba109d9a3923627b5 ]
When the last VM is terminated, the host kernel will invoke function hardware_disable_nolock() on each CPU to disable the related virtualization functions. Here, RISC-V currently only clears hideleg CSR and hedeleg CSR. This behavior will cause the host kernel to receive spurious interrupts if hvip CSR has pending interrupts and the corresponding enable bits in vsie CSR are asserted. To avoid it, hvip CSR and vsie CSR must be cleared before clearing hideleg CSR.
--- arch/riscv/kvm/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/riscv/kvm/main.c +8 -0
@@ -58,6 +58,14 @@ int kvm_arch_hardware_enable(void)void kvm_arch_hardware_disable (void ) { +/* +* After clearing the hideleg CSR, the host kernel will receive +* spurious interrupts if hvip CSR has pending interrupts and the +* corresponding enable bits in vsie CSR are asserted. To avoid it, +* hvip CSR and vsie CSR must be cleared before clearing hideleg CSR. +*/ +csr_write (CSR_VSIE ,0 ); +csr_write (CSR_HVIP ,0 );csr_write (CSR_HEDELEG ,0 );csr_write (CSR_HIDELEG ,0 ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 809/1039 NFSD: Fix verifier returned in stable WRITEs
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit f11ad7aa653130b71e2e89bed207f387718216d5 ]
RFC 8881 explains the purpose of the write verifier this way:
Quoted 5 lines
The final portion of the result is the field writeverf. This field is the write verifier and is a cookie that the client can use to determine whether a server has changed instance state (e.g., server restart) between a call to WRITE and a subsequent call to either WRITE or COMMIT.
But then it says:
Quoted 6 lines
This cookie MUST be unchanged during a single instance of the NFSv4.1 server and MUST be unique between instances of the NFSv4.1 server. If the cookie changes, then the client MUST assume that any data written with an UNSTABLE4 value for committed and an old writeverf in the reply has been lost and will need to be recovered.
RFC 1813 has similar language for NFSv3. NFSv2 does not have a write verifier since it doesn't implement the COMMIT procedure.
Since commit 19e0663ff9bc ("nfsd: Ensure sampling of the write verifier is atomic with the write"), the Linux NFS server has returned a boot-time-based verifier for UNSTABLE WRITEs, but a zero verifier for FILE_SYNC and DATA_SYNC WRITEs. FILE_SYNC and DATA_SYNC WRITEs are not followed up with a COMMIT, so there's no need for clients to compare verifiers for stable writes.
However, by returning a different verifier for stable and unstable writes, the above commit puts the Linux NFS server a step farther out of compliance with the first MUST above. At least one NFS client (FreeBSD) noticed the difference, making this a potential regression.
--- fs/nfsd/vfs.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/nfsd/vfs.c +4 -0
@@ -987,6 +987,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,iov_iter_kvec (&iter,WRITE , vec, vlen, *cnt);if (flags &RWF_SYNC ) {down_write (&nf->nf_rwsem); +if (verf) +nfsd_copy_boot_verifier (verf, +net_generic (SVC_NET (rqstp), + nfsd_net_id)); host_err =vfs_iter_write (file, &iter, &pos, flags);if (host_err <0 ) nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp),
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 810/1039 Revert "nfsd: skip some unnecessary stats in the v4 case"
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 58f258f65267542959487dbe8b5641754411843d ]
On the wire, I observed NFSv4 OPEN(CREATE) operations sometimes returning a reasonable-looking value in the cinfo.before field and zero in the cinfo.after field.
RFC 8881 Section 10.8.1 says:
Quoted 5 lines
When a client is making changes to a given directory, it needs to determine whether there have been changes made to the directory by other clients. It does this by using the change attribute as reported before and after the directory operation in the associated
change_info4value returned for the operation.
and
Quoted 3 lines
... The post-operation change
value needs to be saved as the basis for futurechange_info4comparisons.
A good quality client implementation therefore saves the zero cinfo.after value. During a subsequent OPEN operation, it will receive a different non-zero value in the cinfo.before field for that directory, and it will incorrectly believe the directory has changed, triggering an undesirable directory cache invalidation.
There are filesystem types where fs_supports_change_attribute() returns false, tmpfs being one. On NFSv4 mounts, this means the fh_getattr() call site in fill_pre_wcc() and fill_post_wcc() is never invoked. Subsequently, nfsd4_change_attribute() is invoked with an uninitialized @stat argument.
In fill_pre_wcc(), @stat contains stale stack garbage, which is then placed on the wire. In fill_post_wcc(), ->fh_post_wc is all zeroes, so zero is placed on the wire. Both of these values are meaningless.
This fix can be applied immediately to stable kernels. Once there are more regression tests in this area, this optimization can be attempted again.
--- fs/nfsd/nfs3xdr.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-)
fs/nfsd/nfs3xdr.c +17 -27
@@ -487,11 +487,6 @@ neither:return true; } -static bool fs_supports_change_attribute (struct super_block *sb) -{ -return sb->s_flags &SB_I_VERSION || sb->s_export_op->fetch_iversion; -} -/* * Fill in the pre_op attr for the wcc data */
@@ -500,26 +495,24 @@ void fill_pre_wcc(struct svc_fh *fhp)struct inode *inode;struct kstat stat;bool v4 = (fhp->fh_maxsize ==NFS4_FHSIZE ); +__be32 err;if (fhp->fh_no_wcc || fhp->fh_pre_saved)return ; inode =d_inode (fhp->fh_dentry); -if (fs_supports_change_attribute (inode->i_sb) || !v4) { -__be32 err =fh_getattr (fhp, &stat); - -if (err) { -/* Grab the times from inode anyway */ - stat.mtime = inode->i_mtime; - stat.ctime = inode->i_ctime; - stat.size = inode->i_size; - } - fhp->fh_pre_mtime = stat.mtime; - fhp->fh_pre_ctime = stat.ctime; - fhp->fh_pre_size = stat.size; + err =fh_getattr (fhp, &stat); +if (err) { +/* Grab the times from inode anyway */ + stat.mtime = inode->i_mtime; + stat.ctime = inode->i_ctime; + stat.size = inode->i_size; }if (v4) fhp->fh_pre_change =nfsd4_change_attribute (&stat, inode); + fhp->fh_pre_mtime = stat.mtime; + fhp->fh_pre_ctime = stat.ctime; + fhp->fh_pre_size = stat.size; fhp->fh_pre_saved = true; }
@@ -530,6 +523,7 @@ void fill_post_wcc(struct svc_fh *fhp) {bool v4 = (fhp->fh_maxsize ==NFS4_FHSIZE );struct inode *inode =d_inode (fhp->fh_dentry); +__be32 err;if (fhp->fh_no_wcc)return ;
@@ -537,16 +531,12 @@ void fill_post_wcc(struct svc_fh *fhp)if (fhp->fh_post_saved)printk ("nfsd: inode locked twice during operation.\n" ); - fhp->fh_post_saved = true; - -if (fs_supports_change_attribute (inode->i_sb) || !v4) { -__be32 err =fh_getattr (fhp, &fhp->fh_post_attr); - -if (err) { - fhp->fh_post_saved = false; - fhp->fh_post_attr.ctime = inode->i_ctime; - } - } + err =fh_getattr (fhp, &fhp->fh_post_attr); +if (err) { + fhp->fh_post_saved = false; + fhp->fh_post_attr.ctime = inode->i_ctime; + }else + fhp->fh_post_saved = true;if (v4) fhp->fh_post_change =nfsd4_change_attribute (&fhp->fh_post_attr, inode);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 811/1039 nfsd: fix crash on COPY_NOTIFY with special stateid
In reply to Greg Kroah-HartmanFrom: J. Bruce Fields <[email protected]>
[ Upstream commit 074b07d94e0bb6ddce5690a9b7e2373088e8b33a ]
RTM says "If the special ONE stateid is passed to nfs4_preprocess_stateid_op(), it returns status=0 but does not set *cstid. nfsd4_copy_notify() depends on stid being set if status=0, and thus can crash if the client sends the right COPY_NOTIFY RPC."
RFC 7862 says "The cna_src_stateid MUST refer to either open or locking states provided earlier by the server. If it is invalid, then the operation MUST fail."
The RFC doesn't specify an error, and the choice doesn't matter much as this is clearly illegal client behavior, but bad_stateid seems reasonable.
Simplest is just to guarantee that nfs4_preprocess_stateid_op, called with non-NULL cstid, errors out if it can't return a stateid.
--- fs/nfsd/nfs4state.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/nfsd/nfs4state.c +5 -1
@@ -6040,7 +6040,11 @@ nfs4_preprocess_stateid_op(struct svc_rqst *rqstp, *nfp =NULL ;if (ZERO_STATEID (stateid) ||ONE_STATEID (stateid)) { - status =check_special_stateids (net, fhp, stateid, flags); +if (cstid) + status = nfserr_bad_stateid; +else + status =check_special_stateids (net, fhp, stateid, + flags); goto done; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 812/1039 x86/hyperv: Properly deal with empty cpumasks in hyperv_flush_tlb_multi()
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit 51500b71d500f251037ed339047a4d9e7d7e295b ]
KASAN detected the following issue:
BUG: KASAN: slab-out-of-bounds in hyperv_flush_tlb_multi+0xf88/0x1060
Read of size 4 at addr ffff8880011ccbc0 by task kcompactd0/33
CPU: 1 PID: 33 Comm: kcompactd0 Not tainted 5.14.0-39.el9.x86_64+debug #1
Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine,
BIOS Hyper-V UEFI Release v4.0 12/17/2019
Call Trace:
dump_stack_lvl+0x57/0x7d
print_address_description.constprop.0+0x1f/0x140
? hyperv_flush_tlb_multi+0xf88/0x1060
__kasan_report.cold+0x7f/0x11e
? hyperv_flush_tlb_multi+0xf88/0x1060
kasan_report+0x38/0x50
hyperv_flush_tlb_multi+0xf88/0x1060
flush_tlb_mm_range+0x1b1/0x200
ptep_clear_flush+0x10e/0x150
...
Allocated by task 0:
kasan_save_stack+0x1b/0x40
__kasan_kmalloc+0x7c/0x90
hv_common_init+0xae/0x115
hyperv_init+0x97/0x501
apic_intr_mode_init+0xb3/0x1e0
x86_late_time_init+0x92/0xa2
start_kernel+0x338/0x3eb
secondary_startup_64_no_verify+0xc2/0xcb
The buggy address belongs to the object at ffff8880011cc800
which belongs to the cache kmalloc-1k of size 1024
The buggy address is located 960 bytes inside of
1024-byte region [ffff8880011cc800, ffff8880011ccc00)'hyperv_flush_tlb_multi+0xf88/0x1060' points to hv_cpu_number_to_vp_number() and '960 bytes' means we're trying to get VP_INDEX for CPU#240. 'nr_cpus' here is exactly 240 so we're trying to access past hv_vp_index's last element. This can (and will) happen when 'cpus' mask is empty and cpumask_last() will return '>=nr_cpus'.
Commit ad0a6bad4475 ("x86/hyperv: check cpu mask after interrupt has been disabled") tried to deal with empty cpumask situation but apparently didn't fully fix the issue.
'cpus' cpumask which is passed to hyperv_flush_tlb_multi() is 'mm_cpumask(mm)' (which is '&mm->cpu_bitmap'). This mask changes every time the particular mm is scheduled/unscheduled on some CPU (see switch_mm_irqs_off()), disabling IRQs on the CPU which is performing remote TLB flush has zero influence on whether the particular process can get scheduled/unscheduled on _other_ CPUs so e.g. in the case where the mm was scheduled on one other CPU and got unscheduled during hyperv_flush_tlb_multi()'s execution will lead to cpumask becoming empty.
It doesn't seem that there's a good way to protect 'mm_cpumask(mm)' from changing during hyperv_flush_tlb_multi()'s execution. It would be possible to copy it in the very beginning of the function but this is a waste. It seems we can deal with changing cpumask just fine.
When 'cpus' cpumask changes during hyperv_flush_tlb_multi()'s execution, there are two possible issues:
- 'Under-flushing': we will not flush TLB on a CPU which got added to the mask while hyperv_flush_tlb_multi() was already running. This is not a problem as this is equal to mm getting scheduled on that CPU right after TLB flush.
- 'Over-flushing': we may flush TLB on a CPU which is already cleared from the mask. First, extra TLB flush preserves correctness. Second, Hyper-V's TLB flush hypercall takes 'mm->pgd' argument so Hyper-V may avoid the flush if CR3 doesn't match.
Fix the immediate issue with cpumask_last()/hv_cpu_number_to_vp_number() and remove the pointless cpumask_empty() check from the beginning of the function as it really doesn't protect anything. Also, avoid the hypercall altogether when 'flush->processor_mask' ends up being empty.
--- arch/x86/hyperv/mmu.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
arch/x86/hyperv/mmu.c +9 -10
@@ -68,15 +68,6 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus,local_irq_save (flags); -/* -* Only check the mask _after_ interrupt has been disabled to avoid the -* mask changing under our feet. -*/ -if (cpumask_empty (cpus)) { -local_irq_restore (flags); -return ; - } - flush_pcpu = (struct hv_tlb_flush **)this_cpu_ptr (hyperv_pcpu_input_arg);
@@ -115,7 +106,9 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus,* must. We will also check all VP numbers when walking the * supplied CPU set to remain correct in all cases. */ -if (hv_cpu_number_to_vp_number (cpumask_last (cpus)) >=64 ) + cpu =cpumask_last (cpus); + +if (cpu < nr_cpumask_bits &&hv_cpu_number_to_vp_number (cpu) >=64 ) goto do_ex_hypercall;for_each_cpu (cpu, cpus) {
@@ -131,6 +124,12 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus,__set_bit (vcpu, (unsigned long *) &flush->processor_mask); } + +/* nothing to flush if 'processor_mask' ends up being empty */ +if (!flush->processor_mask) { +local_irq_restore (flags); +return ; + } }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 813/1039 drm/i915/pxp: Hold RPM wakelock during PXP unbind
In reply to Greg Kroah-HartmanFrom: Juston Li <[email protected]>
[ Upstream commit f9535d28ac93c3cc326f7215fccd0abe1d3a6083 ]
Similar to commit b8d8436840ca ("drm/i915/gt: Hold RPM wakelock during PXP suspend") but to fix the same warning for unbind during shutdown:
------------[ cut here ]------------ RPM wakelock ref not held during HW access WARNING: CPU: 0 PID: 4139 at drivers/gpu/drm/i915/intel_runtime_pm.h:115 gen12_fwtable_write32+0x1b7/0 Modules linked in: 8021q ccm rfcomm cmac algif_hash algif_skcipher af_alg uinput snd_hda_codec_hdmi vf industrialio iwl7000_mac80211 cros_ec_sensorhub lzo_rle lzo_compress zram iwlwifi cfg80211 joydev CPU: 0 PID: 4139 Comm: halt Tainted: G U W 5.10.84 #13 344e11e079c4a03940d949e537eab645f6 RIP: 0010:gen12_fwtable_write32+0x1b7/0x200 Code: 48 c7 c7 fc b3 b5 89 31 c0 e8 2c f3 ad ff 0f 0b e9 04 ff ff ff c6 05 71 e9 1d 01 01 48 c7 c7 d67 RSP: 0018:ffffa09ec0bb3bb0 EFLAGS: 00010246 RAX: 12dde97bbd260300 RBX: 00000000000320f0 RCX: ffffffff89e60ea0 RDX: 0000000000000000 RSI: 00000000ffffdfff RDI: ffffffff89e60e70 RBP: ffffa09ec0bb3bd8 R08: 0000000000000000 R09: ffffa09ec0bb3950 R10: 00000000ffffdfff R11: ffffffff89e91160 R12: 0000000000000000 R13: 0000000028121969 R14: ffff9515c32f0990 R15: 0000000040000000 FS: 0000790dcf225740(0000) GS:ffff951737800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000058b25efae147 CR3: 0000000133ea6001 CR4: 0000000000770ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff07f0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: intel_pxp_fini_hw+0x2f/0x39 i915_pxp_tee_component_unbind+0x1c/0x42 component_unbind+0x32/0x48 component_unbind_all+0x80/0x9d take_down_master+0x24/0x36 component_master_del+0x56/0x70 mei_pxp_remove+0x2c/0x68 mei_cl_device_remove+0x35/0x68 device_release_driver_internal+0x100/0x1a1 mei_cl_bus_remove_device+0x21/0x79 mei_cl_bus_remove_devices+0x3b/0x51 mei_stop+0x3b/0xae mei_me_shutdown+0x23/0x58 device_shutdown+0x144/0x1d3 kernel_power_off+0x13/0x4c __se_sys_reboot+0x1d4/0x1e9 do_syscall_64+0x43/0x55 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x790dcf316273 Code: 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00
00 89 fa be 69 19 12 28 bf ad8
RSP: 002b:00007ffca0df9198 EFLAGS: 00000202 ORIG_RAX: 00000000000000a9
RAX: ffffffffffffffda RBX: 000000004321fedc RCX: 0000790dcf316273
RDX: 000000004321fedc RSI: 0000000028121969 RDI: 00000000fee1dead
RBP: 00007ffca0df9200 R08: 0000000000000007 R09: 0000563ce8cd8970
R10: 0000000000000000 R11: 0000000000000202 R12: 00007ffca0df9308
R13: 0000000000000001 R14: 0000000000000000 R15: 0000000000000003
---[ end trace 2f501b01b348f114 ]---
ACPI: Preparing to enter system sleep state S5
reboot: Power down
Changes since v1:
- Rebase to latest drm-tip
--- drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +4 -1
@@ -103,9 +103,12 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev,static void i915_pxp_tee_component_unbind (struct device *i915_kdev,struct device *tee_kdev,void *data) { +struct drm_i915_private *i915 =kdev_to_i915 (i915_kdev);struct intel_pxp *pxp =i915_dev_to_pxp (i915_kdev); +intel_wakeref_t wakeref; -intel_pxp_fini_hw (pxp); + with_intel_runtime_pm_if_in_use(&i915->runtime_pm, wakeref) +intel_pxp_fini_hw (pxp);mutex_lock (&pxp->tee_mutex); pxp->pxp_component =NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 814/1039 drm/i915: dont call free_mmap_offset when purging
In reply to Greg Kroah-HartmanFrom: Matthew Auld <[email protected]>
[ Upstream commit 4c2602ba8d74c35d550ed3d518809c697de08d88 ]
The TTM backend is in theory the only user here(also purge should only be called once we have dropped the pages), where it is setup at object creation and is only removed once the object is destroyed. Also resetting the node here might be iffy since the ttm fault handler uses the stored fake offset to determine the page offset within the pages array.
This also blows up in the dontneed-before-mmap test, since the expectation is that the vma_node will live on, until the object is destroyed:
<2> [749.062902] kernel BUG at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:943!
<4> [749.062923] invalid opcode: 0000 [#1] PREEMPT SMP NOPTI
<4> [749.062928] CPU: 0 PID: 1643 Comm: gem_madvise Tainted: G U W 5.16.0-rc8-CI-CI_DRM_11046+ #1
<4> [749.062933] Hardware name: Gigabyte Technology Co., Ltd. GB-Z390 Garuda/GB-Z390 Garuda-CF, BIOS IG1c 11/19/2019
<4> [749.062937] RIP: 0010:i915_ttm_mmap_offset.cold.35+0x5b/0x5d [i915]
<4> [749.063044] Code: 00 48 c7 c2 a0 23 4e a0 48 c7 c7 26 df 4a a0 e8 95 1d d0 e0 bf 01 00 00 00 e8 8b ec cf e0 31 f6 bf 09 00 00 00 e8 5f 30 c0 e0 <0f> 0b 48 c7 c1 24 4b 56 a0 ba 5b 03 00 00 48 c7 c6 c0 23 4e a0 48 <4> [749.063052] RSP: 0018:ffffc90002ab7d38 EFLAGS: 00010246
<4> [749.063056] RAX: 0000000000000240 RBX: ffff88811f2e61c0 RCX: 0000000000000006
<4> [749.063060] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000009
<4> [749.063063] RBP: ffffc90002ab7e58 R08: 0000000000000001 R09: 0000000000000001
<4> [749.063067] R10: 000000000123d0f8 R11: ffffc90002ab7b20 R12: ffff888112a1a000
<4> [749.063071] R13: 0000000000000004 R14: ffff88811f2e61c0 R15: ffff888112a1a000
<4> [749.063074] FS: 00007f6e5fcad500(0000) GS:ffff8884ad600000(0000) knlGS:0000000000000000
<4> [749.063078] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [749.063081] CR2: 00007efd264e39f0 CR3: 0000000115fd6005 CR4: 00000000003706f0
<4> [749.063085] Call Trace:
<4> [749.063087] <TASK> <4> [749.063089] __assign_mmap_offset+0x41/0x300 [i915] <4> [749.063171] __assign_mmap_offset_handle+0x159/0x270 [i915] <4> [749.063248] ? i915_gem_dumb_mmap_offset+0x70/0x70 [i915] <4> [749.063325] drm_ioctl_kernel+0xae/0x140 <4> [749.063330] drm_ioctl+0x201/0x3d0 <4> [749.063333] ? i915_gem_dumb_mmap_offset+0x70/0x70 [i915] <4> [749.063409] ? do_user_addr_fault+0x200/0x670 <4> [749.063415] __x64_sys_ioctl+0x6d/0xa0 <4> [749.063419] do_syscall_64+0x3a/0xb0 <4> [749.063423] entry_SYSCALL_64_after_hwframe+0x44/0xae
<4> [749.063428] RIP: 0033:0x7f6e5f100317
Testcase: igt/gem_madvise/dontneed-before-mmap
--- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_pages.c +0 -1
@@ -160,7 +160,6 @@ retry:/* Immediately discard the backing storage */ void i915_gem_object_truncate (struct drm_i915_gem_object *obj) { -drm_gem_free_mmap_offset (&obj->base);if (obj->ops->truncate) obj->ops->truncate (obj); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 815/1039 SUNRPC: Fix sockaddr handling in the svc_xprt_create_error trace point
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit dc6c6fb3d639756a532bcc47d4a9bf9f3965881b ]
While testing, I got an unexpected KASAN splat:
Jan 08 13:50:27 oracle-102.nfsv4.dev kernel: BUG: KASAN: stack-out-of-bounds in trace_event_raw_event_svc_xprt_create_err+0x190/0x210 [sunrpc] Jan 08 13:50:27 oracle-102.nfsv4.dev kernel: Read of size 28 at addr ffffc9000008f728 by task mount.nfs/4628
The memcpy() in the TP_fast_assign section of this trace point copies the size of the destination buffer in order that the buffer won't be overrun.
In other similar trace points, the source buffer for this memcpy is a "struct sockaddr_storage" so the actual length of the source buffer is always long enough to prevent the memcpy from reading uninitialized or unallocated memory.
However, for this trace point, the source buffer can be as small as a "struct sockaddr_in". For AF_INET sockaddrs, the memcpy() reads memory that follows the source buffer, which is not always valid memory.
To avoid copying past the end of the passed-in sockaddr, make the source address's length available to the memcpy(). It would be a little nicer if the tracing infrastructure was more friendly about storing socket addresses that are not AF_INET, but I could not find a way to make printk("%pIS") work with a dynamic array.
--- include/trace/events/sunrpc.h | 5 +++-- net/sunrpc/svc_xprt.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
include/trace/events/sunrpc.h +3 -2
@@ -1744,10 +1744,11 @@ TRACE_EVENT(svc_xprt_create_err,const char *program, const char *protocol, struct sockaddr *sap, + size_t salen, const struct svc_xprt *xprt ), -TP_ARGS (program ,protocol ,sap ,xprt ), +TP_ARGS (program ,protocol ,sap ,salen ,xprt ),TP_STRUCT__entry ( __field(long, error)
@@ -1760,7 +1761,7 @@ TRACE_EVENT(svc_xprt_create_err, __entry->error =PTR_ERR (xprt);__assign_str (program, program);__assign_str (protocol, protocol); -memcpy (__entry->addr, sap,sizeof (__entry->addr)); +memcpy (__entry->addr, sap,min (salen,sizeof (__entry->addr))); ), TP_printk("addr=%pISpc program=%s protocol=%s error=%ld",
net/sunrpc/svc_xprt.c +1 -1
@@ -243,7 +243,7 @@ static struct svc_xprt *__svc_xpo_create(struct svc_xprt_class *xcl, xprt = xcl->xcl_ops->xpo_create (serv, net, sap, len, flags);if (IS_ERR (xprt))trace_svc_xprt_create_err (serv->sv_program->pg_name, - xcl->xcl_name, sap, xprt); + xcl->xcl_name, sap, len, xprt);return xprt; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 816/1039 SUNRPC: Fix sockaddr handling in svcsock_accept_class trace points
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 16720861675393a35974532b3c837d9fd7bfe08c ]
Avoid potentially hazardous memory copying and the needless use of "%pIS" -- in the kernel, an RPC service listener is always bound to ANYADDR. Having the network namespace is helpful when recording errors, though.
--- include/trace/events/sunrpc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/trace/events/sunrpc.h +4 -4
@@ -2147,17 +2147,17 @@ DECLARE_EVENT_CLASS(svcsock_accept_class,TP_STRUCT__entry (__field (long ,status )__string (service, service) - __array(unsigned char, addr, sizeof(struct sockaddr_in6)) + __field(unsigned int, netns_ino) ),TP_fast_assign ( __entry->status = status;__assign_str (service, service); -memcpy (__entry->addr, &xprt->xpt_local,sizeof (__entry->addr)); + __entry->netns_ino = xprt->xpt_net->ns.inum; ), -TP_printk ("listener=%pISpc service=%s status=%ld" , - __entry->addr,__get_str (service), __entry->status +TP_printk ("addr=listener service=%s status=%ld" , +__get_str (service), __entry->status ) );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 817/1039 drm/sun4i: dw-hdmi: Fix missing put_device() call in sun8i_hdmi_phy_get
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c71af3dae3e34d2fde0c19623cf7f8483321f0e3 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +3 -1
@@ -658,8 +658,10 @@ int sun8i_hdmi_phy_get(struct sun8i_dw_hdmi *hdmi, struct device_node *node)return -EPROBE_DEFER ; phy =platform_get_drvdata (pdev); -if (!phy) +if (!phy) { +put_device (&pdev->dev);return -EPROBE_DEFER ; + } hdmi->phy = phy;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 818/1039 drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode
In reply to Greg Kroah-HartmanFrom: Liu Ying <[email protected]>
[ Upstream commit 69e630016ef4e4a1745310c446f204dc6243e907 ]
Actual hardware state of CRTC is controlled by the member 'active' in struct drm_crtc_state instead of the member 'enable', according to the kernel doc of the member 'enable'. In fact, the drm client modeset and atomic helpers are using the member 'active' to do the control.
Referencing the member 'enable' of new_crtc_state, the function crtc_needs_disable() may fail to reflect if CRTC needs disable in self refresh mode, e.g., when the framebuffer emulation will be blanked through the client modeset helper with the next commit, the member 'enable' of new_crtc_state is still true while the member 'active' is false, hence the relevant potential encoder and bridges won't be disabled.
So, let's check new_crtc_state->active to determine if CRTC needs disable in self refresh mode instead of new_crtc_state->enable.
--- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_atomic_helper.c +1 -1
@@ -1001,7 +1001,7 @@ crtc_needs_disable(struct drm_crtc_state *old_state,* it's in self refresh mode and needs to be fully disabled. */ return old_state->active || - (old_state->self_refresh_active && !new_state->enable) || + (old_state->self_refresh_active && !new_state->active) || new_state->self_refresh_active; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 819/1039 ntb_hw_switchtec: Fix pff ioread to read into mmio_part_cfg_all
In reply to Greg Kroah-HartmanFrom: Jeremy Pallotta <[email protected]>
[ Upstream commit 32c3d375b0ed84b6acb51ae5ebef35ff0d649d85 ]
Array mmio_part_cfg_all holds the partition configuration of all partitions, with partition number as index. Fix this by reading into mmio_part_cfg_all for pff.
--- drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ntb/hw/mscc/ntb_hw_switchtec.c +2 -2
@@ -419,8 +419,8 @@ static void switchtec_ntb_part_link_speed(struct switchtec_ntb *sndev, enum ntb_width *width) {struct switchtec_dev *stdev = sndev->stdev; - -u32 pff =ioread32 (&stdev->mmio_part_cfg[partition].vep_pff_inst_id); +u32 pff = +ioread32 (&stdev->mmio_part_cfg_all[partition].vep_pff_inst_id);u32 linksta =ioread32 (&stdev->mmio_pff_csr[pff].pci_cap_region[13 ]);if (speed)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 820/1039 ntb_hw_switchtec: Fix bug with more than 32 partitions
In reply to Greg Kroah-HartmanFrom: Wesley Sheng <[email protected]>
[ Upstream commit 7ff351c86b6b258f387502ab2c9b9d04f82c1c3d ]
Switchtec could support as mush as 48 partitions, but ffs & fls are for 32 bit argument, in case of partition index larger than 31, the current code could not parse the peer partition index correctly. Change to the 64 bit version __ffs64 & fls64 accordingly to fix this bug.
--- drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/ntb/hw/mscc/ntb_hw_switchtec.c +5 -7
@@ -840,7 +840,6 @@ static int switchtec_ntb_init_sndev(struct switchtec_ntb *sndev)u64 tpart_vec;int self;u64 part_map; -int bit; sndev->ntb.pdev = sndev->stdev->pdev; sndev->ntb.topo =NTB_TOPO_SWITCH ;
@@ -861,29 +860,28 @@ static int switchtec_ntb_init_sndev(struct switchtec_ntb *sndev) part_map =ioread64 (&sndev->mmio_ntb->ep_map); part_map &= ~(1 << sndev->self_partition); -if (!ffs (tpart_vec)) { +if (!tpart_vec) {if (sndev->stdev->partition_count !=2 ) {dev_err (&sndev->stdev->dev,"ntb target partition not defined\n" );return -ENODEV ; } - bit =ffs (part_map); -if (!bit) { +if (!part_map) {dev_err (&sndev->stdev->dev,"peer partition is not NT partition\n" );return -ENODEV ; } - sndev->peer_partition = bit -1 ; + sndev->peer_partition =__ffs64 (part_map); }else { -if (ffs (tpart_vec) !=fls (tpart_vec)) { +if (__ffs64 (tpart_vec) != (fls64 (tpart_vec) -1 )) {dev_err (&sndev->stdev->dev,"ntb driver only supports 1 pair of 1-1 ntb mapping\n" );return -ENODEV ; } - sndev->peer_partition =ffs (tpart_vec) -1 ; + sndev->peer_partition =__ffs64 (tpart_vec);if (!(part_map & (1ULL << sndev->peer_partition))) {dev_err (&sndev->stdev->dev,"ntb target partition is not NT partition\n" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 821/1039 drm/amd/display: invalid parameter check in dmub_hpd_callback
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
[ Upstream commit 978ffac878fd64039f95798b15b430032d2d89d5 ]
The function performs a check on the "adev" input parameter, however, it is used before the check.
Initialize the "dev" variable after the sanity check to avoid a possible NULL pointer dereference.
Addresses-Coverity-ID: 1493909 ("Null pointer dereference")
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
@@ -656,7 +656,7 @@ void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *notstruct drm_connector_list_iter iter;struct dc_link *link;uint8_t link_index =0 ; -struct drm_device *dev = adev->dm.ddev; +struct drm_device *dev;if (adev ==NULL )return ;
@@ -673,6 +673,7 @@ void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *not link_index = notify->link_index; link = adev->dm.dc->links[link_index]; + dev = adev->dm.ddev;drm_connector_list_iter_begin (dev, &iter);drm_for_each_connector_iter (connector, &iter) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 822/1039 drm/amdkfd: Check for null pointer after calling kmemdup
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit abfaf0eee97925905e742aa3b0b72e04a918fa9e ]
As the possible failure of the allocation, kmemdup() may return NULL pointer.
Therefore, it should be better to check the 'props2' in order to prevent the dereference of NULL pointer.
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +3 -0
@@ -1060,6 +1060,9 @@ static int kfd_parse_subtype_iolink(struct crat_subtype_iolink *iolink,return -ENODEV ;/* same everything but the other direction */ props2 =kmemdup (props,sizeof (*props2),GFP_KERNEL ); +if (!props2) +return -ENOMEM ; + props2->node_from = id_to; props2->node_to = id_from; props2->kobj =NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 823/1039 drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
[ Upstream commit 2096b74b1da5ca418827b54ac4904493bd9de89c ]
This is observed in SRIOV case with virtual KMS as display.
_raw_spin_lock_irqsave+0x37/0x40 drm_handle_vblank+0x69/0x350 [drm] ? try_to_wake_up+0x432/0x5c0 ? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu] drm_crtc_handle_vblank+0x17/0x20 [drm] amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu] __hrtimer_run_queues+0xfb/0x230 hrtimer_interrupt+0x109/0x220 __sysvec_apic_timer_interrupt+0x64/0xe0 asm_call_irq_on_stack+0x12/0x20
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +3 -2
@@ -142,15 +142,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc,static void amdgpu_vkms_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { +unsigned long flags;if (crtc->state->event) { -spin_lock (&crtc->dev->event_lock); +spin_lock_irqsave (&crtc->dev->event_lock, flags);if (drm_crtc_vblank_get (crtc) !=0 )drm_crtc_send_vblank_event (crtc, crtc->state->event);else drm_crtc_arm_vblank_event (crtc, crtc->state->event); -spin_unlock (&crtc->dev->event_lock); +spin_unlock_irqrestore (&crtc->dev->event_lock, flags); crtc->state->event =NULL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 824/1039 PCI: mt7621: Add missing MODULE_LICENSE()
In reply to Greg Kroah-HartmanFrom: Sergio Paracuellos <[email protected]>
[ Upstream commit e4b1cd02dc8d7967a79edccd510724831e5cdee8 ]
The MT7621 PCIe host controller driver can be built as a module, but it lacks a MODULE_LICENSE(), which causes a build error:
ERROR: modpost: missing MODULE_LICENSE() in drivers/pci/controller/pcie-mt7621.o
Add MODULE_LICENSE() to the driver.
--- drivers/pci/controller/pcie-mt7621.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/controller/pcie-mt7621.c +2 -0
@@ -598,3 +598,5 @@ static struct platform_driver mt7621_pci_driver = { }, };builtin_platform_driver (mt7621_pci_driver); + +MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 825/1039 i3c: master: dw: check return of dw_i3c_master_get_free_pos()
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 13462ba1815db5a96891293a9cfaa2451f7bd623 ]
Clang static analysis reports this problem dw-i3c-master.c:799:9: warning: The result of the left shift is
undefined because the left operand is negative
COMMAND_PORT_DEV_INDEX(pos) |
^~~~~~~~~~~~~~~~~~~~~~~~~~~pos can be negative because dw_i3c_master_get_free_pos() can return an error. So check for an error.
--- drivers/i3c/master/dw-i3c-master.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/i3c/master/dw-i3c-master.c +4 -0
@@ -793,6 +793,10 @@ static int dw_i3c_master_daa(struct i3c_master_controller *m)return -ENOMEM ; pos =dw_i3c_master_get_free_pos (master); +if (pos <0 ) { +dw_i3c_master_free_xfer (xfer); +return pos; + } cmd = &xfer->cmds[0 ]; cmd->cmd_hi =0x1 ; cmd->cmd_lo = COMMAND_PORT_DEV_COUNT(master->maxdevs - pos) |
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 826/1039 dma-buf: cma_heap: Fix mutex locking section
In reply to Greg Kroah-HartmanFrom: Weizhao Ouyang <[email protected]>
[ Upstream commit 54329e6f7beea6af56c1230da293acc97d6a6ee7 ]
Fix cma_heap_buffer mutex locking critical section to protect vmap_cnt and vaddr.
--- drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/dma-buf/heaps/cma_heap.c +4 -2
@@ -124,10 +124,11 @@ static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,struct cma_heap_buffer *buffer = dmabuf->priv;struct dma_heap_attachment *a; +mutex_lock (&buffer->lock); +if (buffer->vmap_cnt)invalidate_kernel_vmap_range (buffer->vaddr, buffer->len); -mutex_lock (&buffer->lock);list_for_each_entry (a, &buffer->attachments, list) {if (!a->mapped)continue ;
@@ -144,10 +145,11 @@ static int cma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf,struct cma_heap_buffer *buffer = dmabuf->priv;struct dma_heap_attachment *a; +mutex_lock (&buffer->lock); +if (buffer->vmap_cnt)flush_kernel_vmap_range (buffer->vaddr, buffer->len); -mutex_lock (&buffer->lock);list_for_each_entry (a, &buffer->attachments, list) {if (!a->mapped)continue ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 827/1039 tracing/uprobes: Check the return value of kstrdup() for tu->filename
In reply to Greg Kroah-HartmanFrom: Xiaoke Wang <[email protected]>
[ Upstream commit 8c7224245557707c613f130431cafbaaa4889615 ]
kstrdup() returns NULL when some internal memory errors happen, it is better to check the return value of it so to catch the memory error in time.
--- kernel/trace/trace_uprobe.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/trace/trace_uprobe.c +5 -0
@@ -1619,6 +1619,11 @@ create_local_trace_uprobe(char *name, unsigned long offs, tu->path = path; tu->ref_ctr_offset = ref_ctr_offset; tu->filename =kstrdup (name,GFP_KERNEL ); +if (!tu->filename) { + ret = -ENOMEM ; + goto error; + } +init_trace_event_call (tu); ptype =is_ret_probe (tu) ?PROBE_PRINT_RETURN :PROBE_PRINT_NORMAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 828/1039 tracing/probes: check the return value of kstrndup() for pbuf
In reply to Greg Kroah-HartmanFrom: Xiaoke Wang <[email protected]>
[ Upstream commit 1c1857d400355e96f0fe8b32adc6fa7594d03b52 ]
kstrndup() is a memory allocation-related function, it returns NULL when some internal memory errors happen. It is better to check the return value of it so to catch the memory error in time.
--- kernel/trace/trace_probe.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/trace_probe.c +2 -0
@@ -356,6 +356,8 @@ static int __parse_imm_string(char *str, char **pbuf, int offs)return -EINVAL ; } *pbuf =kstrndup (str, len -1 ,GFP_KERNEL ); +if (!*pbuf) +return -ENOMEM ;return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 829/1039 mm: defer kmemleak object creation of module_alloc()
In reply to Greg Kroah-HartmanFrom: Kefeng Wang <[email protected]>
[ Upstream commit 60115fa54ad7b913b7cb5844e6b7ffeb842d55f2 ]
Yongqiang reports a kmemleak panic when module insmod/rmmod with KASAN enabled(without KASAN_VMALLOC) on x86[1].
When the module area allocates memory, it's kmemleak_object is created successfully, but the KASAN shadow memory of module allocation is not ready, so when kmemleak scan the module's pointer, it will panic due to no shadow memory with KASAN check.
module_alloc
__vmalloc_node_range
kmemleak_vmalloc
kmemleak_scan
update_checksum
kasan_module_alloc
kmemleak_ignore
Note, there is no problem if KASAN_VMALLOC enabled, the modules area entire shadow memory is preallocated. Thus, the bug only exits on ARCH which supports dynamic allocation of module area per module load, for now, only x86/arm64/s390 are involved.
Add a VM_DEFER_KMEMLEAK flags, defer vmalloc'ed object register of kmemleak in module_alloc() to fix this issue.
[1] https://lore.kernel.org/all/[email protected]/
--- arch/arm64/kernel/module.c | 4 ++-- arch/s390/kernel/module.c | 5 +++-- arch/x86/kernel/module.c | 7 ++++--- include/linux/kasan.h | 4 ++-- include/linux/vmalloc.h | 7 +++++++ mm/kasan/shadow.c | 9 +++++++-- mm/vmalloc.c | 3 ++- 7 files changed, 27 insertions(+), 12 deletions(-)
arch/arm64/kernel/module.c +2 -2
@@ -36,7 +36,7 @@ void *module_alloc(unsigned long size) module_alloc_end =MODULES_END ; p =__vmalloc_node_range (size,MODULE_ALIGN , module_alloc_base, - module_alloc_end, gfp_mask,PAGE_KERNEL ,0 , + module_alloc_end, gfp_mask,PAGE_KERNEL ,VM_DEFER_KMEMLEAK ,NUMA_NO_NODE ,__builtin_return_address (0 )); if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&
@@ -58,7 +58,7 @@ void *module_alloc(unsigned long size)PAGE_KERNEL ,0 ,NUMA_NO_NODE , __builtin_return_address(0)); -if (p && (kasan_module_alloc (p, size) <0 )) { +if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
arch/s390/kernel/module.c +3 -2
@@ -37,14 +37,15 @@void *module_alloc (unsigned long size) { +gfp_t gfp_mask =GFP_KERNEL ;void *p;if (PAGE_ALIGN (size) >MODULES_LEN )return NULL ; p =__vmalloc_node_range (size,MODULE_ALIGN ,MODULES_VADDR ,MODULES_END , -GFP_KERNEL ,PAGE_KERNEL_EXEC ,0 ,NUMA_NO_NODE , + gfp_mask,PAGE_KERNEL_EXEC ,VM_DEFER_KMEMLEAK ,NUMA_NO_NODE ,__builtin_return_address (0 )); -if (p && (kasan_module_alloc (p, size) <0 )) { +if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
arch/x86/kernel/module.c +4 -3
@@ -67,6 +67,7 @@ static unsigned long int get_module_load_offset(void)void *module_alloc (unsigned long size) { +gfp_t gfp_mask =GFP_KERNEL ;void *p;if (PAGE_ALIGN (size) >MODULES_LEN )
@@ -74,10 +75,10 @@ void *module_alloc(unsigned long size) p =__vmalloc_node_range (size,MODULE_ALIGN ,MODULES_VADDR +get_module_load_offset (), -MODULES_END ,GFP_KERNEL , -PAGE_KERNEL ,0 ,NUMA_NO_NODE , +MODULES_END , gfp_mask, +PAGE_KERNEL ,VM_DEFER_KMEMLEAK ,NUMA_NO_NODE ,__builtin_return_address (0 )); -if (p && (kasan_module_alloc (p, size) <0 )) { +if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
include/linux/kasan.h +2 -2
@@ -474,12 +474,12 @@ static inline void kasan_populate_early_vm_area_shadow(void *start,* allocations with real shadow memory. With KASAN vmalloc, the special * case is unnecessary, as the work is handled in the generic case. */ -int kasan_module_alloc (void *addr,size_t size); +int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask);void kasan_free_shadow (const struct vm_struct *vm);#else /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */ -static inline int kasan_module_alloc (void *addr,size_t size) {return 0 ; } +static inline int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask) {return 0 ; }static inline void kasan_free_shadow (const struct vm_struct *vm) {}#endif /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */
include/linux/vmalloc.h +7 -0
@@ -28,6 +28,13 @@ struct notifier_block; /* in notifier.h */#define VM_MAP_PUT_PAGES 0x00000200/* put pages and free array in vfree */ #define VM_NO_HUGE_VMAP 0x00000400/* force PAGE_SIZE pte mapping */ +#if (defined(CONFIG_KASAN_GENERIC ) || defined(CONFIG_KASAN_SW_TAGS )) && \ + !defined(CONFIG_KASAN_VMALLOC ) +#define VM_DEFER_KMEMLEAK 0x00000800/* defer kmemleak object creation */ +#else +#define VM_DEFER_KMEMLEAK 0 +#endif +/* * VM_KASAN is used slightly differently depending on CONFIG_KASAN_VMALLOC. *
mm/kasan/shadow.c +7 -2
@@ -498,7 +498,7 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end,#else /* CONFIG_KASAN_VMALLOC */ -int kasan_module_alloc (void *addr,size_t size) +int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask) {void *ret;size_t scaled_size;
@@ -520,9 +520,14 @@ int kasan_module_alloc(void *addr, size_t size) __builtin_return_address(0));if (ret) { +struct vm_struct *vm =find_vm_area (addr);__memset (ret,KASAN_SHADOW_INIT , shadow_size); -find_vm_area (addr)->flags |=VM_KASAN ; + vm->flags |=VM_KASAN ;kmemleak_ignore (ret); + +if (vm->flags &VM_DEFER_KMEMLEAK ) +kmemleak_vmalloc (vm, size, gfp_mask); +return 0 ; }
mm/vmalloc.c +2 -1
@@ -3074,7 +3074,8 @@ again:clear_vm_uninitialized_flag (area); size =PAGE_ALIGN (size); -kmemleak_vmalloc (area, size, gfp_mask); +if (!(vm_flags &VM_DEFER_KMEMLEAK )) +kmemleak_vmalloc (area, size, gfp_mask);return addr;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 830/1039 kasan: fix quarantine conflicting with init_on_free
In reply to Greg Kroah-HartmanFrom: Andrey Konovalov <[email protected]>
[ Upstream commit 26dca996ea7b1ac7008b6b6063fc88b849e3ac3e ]
KASAN's quarantine might save its metadata inside freed objects. As this happens after the memory is zeroed by the slab allocator when init_on_free is enabled, the memory coming out of quarantine is not properly zeroed.
This causes lib/test_meminit.c tests to fail with Generic KASAN.
Zero the metadata when the object is removed from quarantine.
--- mm/kasan/quarantine.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
mm/kasan/quarantine.c +11 -0
@@ -132,11 +132,22 @@ static void *qlink_to_object(struct qlist_node *qlink, struct kmem_cache *cache)static void qlink_free (struct qlist_node *qlink,struct kmem_cache *cache) {void *object =qlink_to_object (qlink, cache); +struct kasan_free_meta *meta =kasan_get_free_meta (cache, object);unsigned long flags;if (IS_ENABLED (CONFIG_SLAB ))local_irq_save (flags); +/* +* If init_on_free is enabled and KASAN's free metadata is stored in +* the object, zero the metadata. Otherwise, the object's memory will +* not be properly zeroed, as KASAN saves the metadata after the slab +* allocator zeroes the object. +*/ +if (slab_want_init_on_free (cache) && + cache->kasan_info.free_meta_offset ==0 ) +memzero_explicit (meta,sizeof (*meta)); +/* * As the object now gets freed from the quarantine, assume that its * free track is no longer valid.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 831/1039 selftests/vm: make charge_reserved_hugetlb.sh work with existing cgroup setting
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit 209376ed2a8431ccb4c40fdcef11194fc1e749b0 ]
The hugetlb cgroup reservation test charge_reserved_hugetlb.sh assume that no cgroup filesystems are mounted before running the test. That is not true in many cases. As a result, the test fails to run. Fix that by querying the current cgroup mount setting and using the existing cgroup setup instead before attempting to freshly mount a cgroup filesystem.
Similar change is also made for hugetlb_reparenting_test.sh as well, though it still has problem if cgroup v2 isn't used.
The patched test scripts were run on a centos 8 based system to verify that they ran properly.
--- .../selftests/vm/charge_reserved_hugetlb.sh | 34 +++++++++++-------- .../selftests/vm/hugetlb_reparenting_test.sh | 21 +++++++----- .../selftests/vm/write_hugetlb_memory.sh | 2 +- 3 files changed, 34 insertions(+), 23 deletions(-)
tools/testing/selftests/vm/charge_reserved_hugetlb.sh +20 -14
@@ -24,19 +24,23 @@ if [[ "$1" == "-cgroup-v2" ]]; then reservation_usage_file=rsvd.current fi -cgroup_path=/dev/cgroup/memory -if [[ ! -e $cgroup_path ]]; then - mkdir -p $cgroup_path - if [[ $cgroup2 ]]; then +if [[ $cgroup2 ]]; then + cgroup_path=$(mount -t cgroup2 | head -1 | awk -e '{print $3}') + if [[ -z "$cgroup_path" ]]; then + cgroup_path=/dev/cgroup/memory mount -t cgroup2 none $cgroup_path - else + do_umount=1 + fi + echo "+hugetlb" >$cgroup_path/cgroup.subtree_control +else + cgroup_path=$(mount -t cgroup | grep ",hugetlb" | awk -e '{print $3}') + if [[ -z "$cgroup_path" ]]; then + cgroup_path=/dev/cgroup/memory mount -t cgroup memory,hugetlb $cgroup_path + do_umount=1 fi fi - -if [[ $cgroup2 ]]; then - echo "+hugetlb" >/dev/cgroup/memory/cgroup.subtree_control -fi +export cgroup_path function cleanup() { if [[ $cgroup2 ]]; then
@@ -108,7 +112,7 @@ function setup_cgroup() { function wait_for_hugetlb_memory_to_get_depleted() { local cgroup="$1" - local path="/dev/cgroup/memory/$cgroup/hugetlb.${MB}MB.$reservation_usage_file" + local path="$cgroup_path/$cgroup/hugetlb.${MB}MB.$reservation_usage_file" # Wait for hugetlbfs memory to get depleted. while [ $(cat $path) != 0 ]; do echo Waiting for hugetlb memory to get depleted.
@@ -121,7 +125,7 @@ function wait_for_hugetlb_memory_to_get_reserved() { local cgroup="$1" local size="$2" - local path="/dev/cgroup/memory/$cgroup/hugetlb.${MB}MB.$reservation_usage_file" + local path="$cgroup_path/$cgroup/hugetlb.${MB}MB.$reservation_usage_file" # Wait for hugetlbfs memory to get written. while [ $(cat $path) != $size ]; do echo Waiting for hugetlb memory reservation to reach size $size.
@@ -134,7 +138,7 @@ function wait_for_hugetlb_memory_to_get_written() { local cgroup="$1" local size="$2" - local path="/dev/cgroup/memory/$cgroup/hugetlb.${MB}MB.$fault_usage_file" + local path="$cgroup_path/$cgroup/hugetlb.${MB}MB.$fault_usage_file" # Wait for hugetlbfs memory to get written. while [ $(cat $path) != $size ]; do echo Waiting for hugetlb memory to reach size $size.
@@ -574,5 +578,7 @@ for populate in "" "-o"; do done # populate done # method -umount $cgroup_path -rmdir $cgroup_path +if [[ $do_umount ]]; then + umount $cgroup_path + rmdir $cgroup_path +fi
tools/testing/selftests/vm/hugetlb_reparenting_test.sh +13 -8
@@ -18,19 +18,24 @@ if [[ "$1" == "-cgroup-v2" ]]; then usage_file=current fi -CGROUP_ROOT='/dev/cgroup/memory' -MNT='/mnt/huge/' -if [[ ! -e $CGROUP_ROOT ]]; then - mkdir -p $CGROUP_ROOT - if [[ $cgroup2 ]]; then +if [[ $cgroup2 ]]; then + CGROUP_ROOT=$(mount -t cgroup2 | head -1 | awk -e '{print $3}') + if [[ -z "$CGROUP_ROOT" ]]; then + CGROUP_ROOT=/dev/cgroup/memory mount -t cgroup2 none $CGROUP_ROOT - sleep 1 - echo "+hugetlb +memory" >$CGROUP_ROOT/cgroup.subtree_control - else + do_umount=1 + fi + echo "+hugetlb +memory" >$CGROUP_ROOT/cgroup.subtree_control +else + CGROUP_ROOT=$(mount -t cgroup | grep ",hugetlb" | awk -e '{print $3}') + if [[ -z "$CGROUP_ROOT" ]]; then + CGROUP_ROOT=/dev/cgroup/memory mount -t cgroup memory,hugetlb $CGROUP_ROOT + do_umount=1 fi fi +MNT='/mnt/huge/' function get_machine_hugepage_size() { hpz=$(grep -i hugepagesize /proc/meminfo)
tools/testing/selftests/vm/write_hugetlb_memory.sh +1 -1
@@ -14,7 +14,7 @@ want_sleep=$8 reserve=$9 echo "Putting task in cgroup '$cgroup'" -echo $$ > /dev/cgroup/memory/"$cgroup"/cgroup.procs +echo $$ > ${cgroup_path:-/dev/cgroup/memory}/"$cgroup"/cgroup.procs echo "Method is $method"
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 832/1039 mm/page_isolation: unset migratetype directly for non Buddy page
In reply to Greg Kroah-HartmanFrom: Chen Wandun <[email protected]>
[ Upstream commit 721fb891ad0b3956d5c168b2931e3e5e4fb7ca40 ]
In unset_migratetype_isolate(), we can bypass the call to move_freepages_block() for non-buddy pages.
It will save a few cpu cycles for some situations such as cma and hugetlb when allocating continue pages, in these situation function alloc_contig_pages will be called.
alloc_contig_pages
__alloc_contig_migrate_range isolate_freepages_range ==> pages has been remove from buddy undo_isolate_page_range unset_migratetype_isolate ==> can directly set migratetype
[[email protected]: changelog tweak]
--- mm/page_isolation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page_isolation.c +1 -1
@@ -115,7 +115,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype)* onlining - just onlined memory won't immediately be considered for * allocation. */ -if (!isolated_page) { +if (!isolated_page &&PageBuddy (page)) { nr_pages =move_freepages_block (zone, page, migratetype,NULL );__mod_zone_freepage_state (zone, nr_pages, migratetype); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 833/1039 hugetlbfs: fix off-by-one error in hugetlb_vmdelete_list()
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit d6aba4c8e20d4d2bf65d589953f6d891c178f3a3 ]
Pass "end - 1" instead of "end" when walking the interval tree in hugetlb_vmdelete_list() to fix an inclusive vs. exclusive bug. The two callers that pass a non-zero "end" treat it as exclusive, whereas the interval tree iterator expects an inclusive "last". E.g. punching a hole in a file that precisely matches the size of a single hugepage, with a vma starting right on the boundary, will result in unmap_hugepage_range() being called twice, with the second call having start==end.
The off-by-one error doesn't cause functional problems as __unmap_hugepage_range() turns into a massive nop due to short-circuiting its for-loop on "address < end". But, the mmu_notifier invocations to invalid_range_{start,end}() are passed a bogus zero-sized range, which may be unexpected behavior for secondary MMUs.
The bug was exposed by commit ed922739c919 ("KVM: Use interval tree to do fast hva lookup in memslots"), currently queued in the KVM tree for 5.17, which added a WARN to detect ranges with start==end.
--- fs/hugetlbfs/inode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/hugetlbfs/inode.c +4 -3
@@ -409,10 +409,11 @@ hugetlb_vmdelete_list(struct rb_root_cacstruct vm_area_struct *vma;/* -* end == 0 indicates that the entire range after -* start should be unmapped. +* end == 0 indicates that the entire range after start should be +* unmapped. Note, end is exclusive, whereas the interval tree takes +* an inclusive "last". */ - vma_interval_tree_foreach(vma, root, start, end ? end : ULONG_MAX) { + vma_interval_tree_foreach(vma, root, start, end ? end - 1 : ULONG_MAX) {unsigned long v_offset;unsigned long v_end;
Greg Kroah-Hartman
maintainerPATCH 834/1039 rpmsg: core: Clean up resources on announce_create failure.
In reply to Greg Kroah-HartmanFrom: Arnaud Pouliquen <[email protected]>
commit 8066c615cb69b7da8a94f59379847b037b3a5e46 upstream.
During the rpmsg_dev_probe, if rpdev->ops->announce_create returns an error, the rpmsg device and default endpoint should be freed before exiting the function.
--- drivers/rpmsg/rpmsg_core.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/rpmsg/rpmsg_core.c +16 -4
@@ -540,13 +540,25 @@ static int rpmsg_dev_probe(struct device err = rpdrv->probe (rpdev);if (err) {dev_err (dev,"%s: failed: %d\n" , __func__, err); -if (ept) -rpmsg_destroy_ept (ept); - goto out; + goto destroy_ept; } -if (ept && rpdev->ops->announce_create) +if (ept && rpdev->ops->announce_create) { err = rpdev->ops->announce_create (rpdev); +if (err) { +dev_err (dev,"failed to announce creation\n" ); + goto remove_rpdev; + } + } + +return 0 ; + +remove_rpdev: +if (rpdrv->remove) + rpdrv->remove (rpdev); +destroy_ept: +if (ept) +rpmsg_destroy_ept (ept); out:return err; }
Greg Kroah-Hartman
maintainerPATCH 835/1039 ifcvf/vDPA: fix misuse virtio-net device config size for blk dev
In reply to Greg Kroah-HartmanFrom: Zhu Lingshan <[email protected]>
commit 0f420c383a2bb414ebccedf9289b5b815f1295fe upstream.
This commit fixes a misuse of virtio-net device config size issue for virtio-block devices.
A new member config_size in struct ifcvf_hw is introduced and would be initialized through vdpa_dev_add() to record correct device config size.
To be more generic, rename ifcvf_hw.net_config to ifcvf_hw.dev_config, the helpers ifcvf_read/write_net_config() to ifcvf_read/write_dev_config()
--- drivers/vdpa/ifcvf/ifcvf_base.c | 41 ++++++++++++++++++++++++++++++---------- drivers/vdpa/ifcvf/ifcvf_base.h | 9 +++++--- drivers/vdpa/ifcvf/ifcvf_main.c | 24 +++-------------------- 3 files changed, 41 insertions(+), 33 deletions(-)
drivers/vdpa/ifcvf/ifcvf_base.c +31 -10
@@ -143,8 +143,8 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, sIFCVF_DBG (pdev,"hw->isr = %p\n" , hw->isr);break ;case VIRTIO_PCI_CAP_DEVICE_CFG : - hw->net_cfg =get_cap_addr (hw, &cap); -IFCVF_DBG (pdev,"hw->net_cfg = %p\n" , hw->net_cfg); + hw->dev_cfg =get_cap_addr (hw, &cap); +IFCVF_DBG (pdev,"hw->dev_cfg = %p\n" , hw->dev_cfg);break ; }
@@ -153,7 +153,7 @@ next: }if (hw->common_cfg ==NULL || hw->notify_base ==NULL || - hw->isr ==NULL || hw->net_cfg ==NULL ) { + hw->isr ==NULL || hw->dev_cfg ==NULL ) {IFCVF_ERR (pdev,"Incomplete PCI capabilities\n" );return -EIO ; }
@@ -174,7 +174,7 @@ next:IFCVF_DBG (pdev,"PCI capability mapping: common cfg: %p, notify base: %p\n, isr cfg: %p, device cfg: %p, multiplier: %u\n" , hw->common_cfg, hw->notify_base, hw->isr, - hw->net_cfg, hw->notify_off_multiplier); + hw->dev_cfg, hw->notify_off_multiplier);return 0 ; }
@@ -242,33 +242,54 @@ int ifcvf_verify_min_features(struct ifcreturn 0 ; } -void ifcvf_read_net_config (struct ifcvf_hw *hw,u64 offset, +u32 ifcvf_get_config_size (struct ifcvf_hw *hw) +{ +struct ifcvf_adapter *adapter; +u32 config_size; + + adapter =vf_to_adapter (hw); +switch (hw->dev_type) { +case VIRTIO_ID_NET : + config_size =sizeof (struct virtio_net_config ); +break ; +case VIRTIO_ID_BLOCK : + config_size =sizeof (struct virtio_blk_config ); +break ; +default : + config_size =0 ; +IFCVF_ERR (adapter->pdev,"VIRTIO ID %u not supported\n" , hw->dev_type); + } + +return config_size; +} + +void ifcvf_read_dev_config (struct ifcvf_hw *hw,u64 offset,void *dst,int length) {u8 old_gen, new_gen, *p;int i; -WARN_ON (offset + length >sizeof (struct virtio_net_config )); +WARN_ON (offset + length > hw->config_size);do { old_gen =ifc_ioread8 (&hw->common_cfg->config_generation); p = dst;for (i =0 ; i < length; i++) - *p++ =ifc_ioread8 (hw->net_cfg + offset + i); + *p++ =ifc_ioread8 (hw->dev_cfg + offset + i); new_gen =ifc_ioread8 (&hw->common_cfg->config_generation); }while (old_gen != new_gen); } -void ifcvf_write_net_config (struct ifcvf_hw *hw,u64 offset, +void ifcvf_write_dev_config (struct ifcvf_hw *hw,u64 offset,const void *src,int length) {const u8 *p;int i; p = src; -WARN_ON (offset + length >sizeof (struct virtio_net_config )); +WARN_ON (offset + length > hw->config_size);for (i =0 ; i < length; i++) -ifc_iowrite8 (*p++, hw->net_cfg + offset + i); +ifc_iowrite8 (*p++, hw->dev_cfg + offset + i); }static void ifcvf_set_features (struct ifcvf_hw *hw,u64 features)
drivers/vdpa/ifcvf/ifcvf_base.h +6 -3
@@ -71,12 +71,14 @@ struct ifcvf_hw {u64 hw_features;u32 dev_type;struct virtio_pci_common_cfg __iomem *common_cfg; -void __iomem *net_cfg; +void __iomem *dev_cfg;struct vring_info vring[IFCVF_MAX_QUEUES ];void __iomem *const *base;char config_msix_name[256 ];struct vdpa_callback config_cb;unsigned int config_irq; +/* virtio-net or virtio-blk device config size */ +u32 config_size; };struct ifcvf_adapter {
@@ -105,9 +107,9 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, sint ifcvf_start_hw (struct ifcvf_hw *hw);void ifcvf_stop_hw (struct ifcvf_hw *hw);void ifcvf_notify_queue (struct ifcvf_hw *hw,u16 qid); -void ifcvf_read_net_config (struct ifcvf_hw *hw,u64 offset, +void ifcvf_read_dev_config (struct ifcvf_hw *hw,u64 offset,void *dst,int length); -void ifcvf_write_net_config (struct ifcvf_hw *hw,u64 offset, +void ifcvf_write_dev_config (struct ifcvf_hw *hw,u64 offset,const void *src,int length);u8 ifcvf_get_status (struct ifcvf_hw *hw);void ifcvf_set_status (struct ifcvf_hw *hw,u8 status);
@@ -120,4 +122,5 @@ u16 ifcvf_get_vq_state(struct ifcvf_hw *int ifcvf_set_vq_state (struct ifcvf_hw *hw,u16 qid,u16 num);struct ifcvf_adapter *vf_to_adapter (struct ifcvf_hw *hw);int ifcvf_probed_virtio_net (struct ifcvf_hw *hw); +u32 ifcvf_get_config_size (struct ifcvf_hw *hw);#endif /* _IFCVF_H_ */
drivers/vdpa/ifcvf/ifcvf_main.c +4 -20
@@ -366,24 +366,9 @@ static u32 ifcvf_vdpa_get_vq_align(strucstatic size_t ifcvf_vdpa_get_config_size (struct vdpa_device *vdpa_dev) { -struct ifcvf_adapter *adapter =vdpa_to_adapter (vdpa_dev);struct ifcvf_hw *vf =vdpa_to_vf (vdpa_dev); -struct pci_dev *pdev = adapter->pdev; -size_t size; -switch (vf->dev_type) { -case VIRTIO_ID_NET : - size =sizeof (struct virtio_net_config ); -break ; -case VIRTIO_ID_BLOCK : - size =sizeof (struct virtio_blk_config ); -break ; -default : - size =0 ; -IFCVF_ERR (pdev,"VIRTIO ID %u not supported\n" , vf->dev_type); - } - -return size; +return vf->config_size; } static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev,
@@ -392,8 +377,7 @@ static void ifcvf_vdpa_get_config(struct {struct ifcvf_hw *vf =vdpa_to_vf (vdpa_dev); -WARN_ON (offset + len >sizeof (struct virtio_net_config )); -ifcvf_read_net_config (vf, offset, buf, len); +ifcvf_read_dev_config (vf, offset, buf, len); } static void ifcvf_vdpa_set_config(struct vdpa_device *vdpa_dev,
@@ -402,8 +386,7 @@ static void ifcvf_vdpa_set_config(struct {struct ifcvf_hw *vf =vdpa_to_vf (vdpa_dev); -WARN_ON (offset + len >sizeof (struct virtio_net_config )); -ifcvf_write_net_config (vf, offset, buf, len); +ifcvf_write_dev_config (vf, offset, buf, len); } static void ifcvf_vdpa_set_config_cb(struct vdpa_device *vdpa_dev,
@@ -542,6 +525,7 @@ static int ifcvf_vdpa_dev_add(struct vdp vf->vring[i].irq = -EINVAL ; vf->hw_features =ifcvf_get_hw_features (vf); + vf->config_size =ifcvf_get_config_size (vf); adapter->vdpa.mdev = &ifcvf_mgmt_dev->mdev; ret =_vdpa_register_device (&adapter->vdpa, vf->nr_vring);
Greg Kroah-Hartman
maintainerPATCH 836/1039 crypto: omap-aes - Fix broken pm_runtime_and_get() usage
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
commit c2aec59be093bd44627bc4f6bc67e4614a93a7b6 upstream.
This fix is basically the same as 3d6b661330a7 ("crypto: stm32 - Revert broken pm_runtime_resume_and_get changes"), just for the omap driver. If the return value isn't used, then pm_runtime_get_sync() has to be used for ensuring that the usage count is balanced.
--- drivers/crypto/omap-aes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/omap-aes.c +1 -1
@@ -1302,7 +1302,7 @@ static int omap_aes_suspend(struct devicstatic int omap_aes_resume (struct device *dev) { -pm_runtime_resume_and_get (dev); +pm_runtime_get_sync (dev);return 0 ; }#endif
Greg Kroah-Hartman
maintainerPATCH 837/1039 crypto: stm32/crc32 - Fix kernel BUG triggered in probe()
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
commit 29009604ad4e3ef784fd9b9fef6f23610ddf633d upstream.
The include/linux/crypto.h struct crypto_alg field cra_driver_name description states "Unique name of the transformation provider. " ... " this contains the name of the chip or provider and the name of the transformation algorithm."
In case of the stm32-crc driver, field cra_driver_name is identical for all registered transformation providers and set to the name of the driver itself, which is incorrect. This patch fixes it by assigning a unique cra_driver_name to each registered transformation provider.
The kernel crash is triggered when the driver calls crypto_register_shashes() which calls crypto_register_shash(), which calls crypto_register_alg(), which calls __crypto_register_alg(), which returns -EEXIST, which is propagated back through this call chain. Upon -EEXIST from crypto_register_shash(), the crypto_register_shashes() starts unregistering the providers back, and calls crypto_unregister_shash(), which calls crypto_unregister_alg(), and this is where the BUG() triggers due to incorrect cra_refcnt.
--- drivers/crypto/stm32/stm32-crc32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/stm32/stm32-crc32.c +2 -2
@@ -279,7 +279,7 @@ static struct shash_alg algs[] = { .digestsize = CHKSUM_DIGEST_SIZE, .base = { .cra_name = "crc32", - .cra_driver_name = DRIVER_NAME, + .cra_driver_name = "stm32-crc32-crc32", .cra_priority = 200, .cra_flags = CRYPTO_ALG_OPTIONAL_KEY, .cra_blocksize = CHKSUM_BLOCK_SIZE,
@@ -301,7 +301,7 @@ static struct shash_alg algs[] = { .digestsize = CHKSUM_DIGEST_SIZE, .base = { .cra_name = "crc32c", - .cra_driver_name = DRIVER_NAME, + .cra_driver_name = "stm32-crc32-crc32c", .cra_priority = 200, .cra_flags = CRYPTO_ALG_OPTIONAL_KEY, .cra_blocksize = CHKSUM_BLOCK_SIZE,
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 838/1039 crypto: caam - replace this_cpu_ptr with raw_cpu_ptr
In reply to Greg Kroah-HartmanFrom: Meng Li <[email protected]>
commit efd21e10fc3bf4c6da122470a5ae89ec4ed8d180 upstream.
When enable the kernel debug config, there is below calltrace detected:
BUG: using smp_processor_id() in preemptible [00000000] code: cryptomgr_test/339 caller is debug_smp_processor_id+0x20/0x30 CPU: 9 PID: 339 Comm: cryptomgr_test Not tainted 5.10.63-yocto-standard #1 Hardware name: NXP Layerscape LX2160ARDB (DT) Call trace: dump_backtrace+0x0/0x1a0 show_stack+0x24/0x30 dump_stack+0xf0/0x13c check_preemption_disabled+0x100/0x110 debug_smp_processor_id+0x20/0x30 dpaa2_caam_enqueue+0x10c/0x25c ...... cryptomgr_test+0x38/0x60 kthread+0x158/0x164 ret_from_fork+0x10/0x38
According to the comment in commit ac5d15b4519f("crypto: caam/qi2
- use affine DPIOs "), because preemption is no longer disabled
while trying to enqueue an FQID, it might be possible to run the enqueue on a different CPU(due to migration, when in process context), however this wouldn't be a functionality issue. But there will be above calltrace when enable kernel debug config. So, replace this_cpu_ptr with raw_cpu_ptr to avoid above call trace.
--- drivers/crypto/caam/caamalg_qi2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/caam/caamalg_qi2.c +1 -1
@@ -5470,7 +5470,7 @@ int dpaa2_caam_enqueue(struct device *dedpaa2_fd_set_len (&fd,dpaa2_fl_get_len (&req->fd_flt[1 ]));dpaa2_fd_set_flc (&fd, req->flc_dma); - ppriv =this_cpu_ptr (priv->ppriv); + ppriv =raw_cpu_ptr (priv->ppriv);for (i =0 ; i < (priv->dpseci_attr.num_tx_queues <<1 ); i++) { err =dpaa2_io_service_enqueue_fq (ppriv->dpio, ppriv->req_fqid, &fd);
Greg Kroah-Hartman
maintainerPATCH 839/1039 ubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers
In reply to Greg Kroah-HartmanFrom: Petr Cvachoucek <[email protected]>
commit 3fea4d9d160186617ff40490ae01f4f4f36b28ff upstream.
it seems freeing the write buffers in the error path of the ubifs_remount_rw() is wrong. It leads later to a kernel oops like this:
[10016.431274] UBIFS (ubi0:0): start fixing up free space [10090.810042] UBIFS (ubi0:0): free space fixup complete [10090.814623] UBIFS error (ubi0:0 pid 512): ubifs_remount_fs: cannot spawn "ubifs_bgt0_0", error -4 [10101.915108] UBIFS (ubi0:0): background thread "ubifs_bgt0_0" started, PID 517 [10105.275498] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030 [10105.284352] Mem abort info: [10105.287160] ESR = 0x96000006 [10105.290252] EC = 0x25: DABT (current EL), IL = 32 bits [10105.295592] SET = 0, FnV = 0 [10105.298652] EA = 0, S1PTW = 0 [10105.301848] Data abort info: [10105.304723] ISV = 0, ISS = 0x00000006 [10105.308573] CM = 0, WnR = 0 [10105.311564] user pgtable: 4k pages, 48-bit VAs, pgdp=00000000f03d1000 [10105.318034] [0000000000000030] pgd=00000000f6cee003, pud=00000000f4884003, pmd=0000000000000000 [10105.326783] Internal error: Oops: 96000006 [#1] PREEMPT SMP [10105.332355] Modules linked in: ath10k_pci ath10k_core ath mac80211 libarc4 cfg80211 nvme nvme_core cryptodev(O) [10105.342468] CPU: 3 PID: 518 Comm: touch Tainted: G O 5.4.3 #1 [10105.349517] Hardware name: HYPEX CPU (DT) [10105.353525] pstate: 40000005 (nZcv daif -PAN -UAO) [10105.358324] pc : atomic64_try_cmpxchg_acquire.constprop.22+0x8/0x34 [10105.364596] lr : mutex_lock+0x1c/0x34 [10105.368253] sp : ffff000075633aa0 [10105.371563] x29: ffff000075633aa0 x28: 0000000000000001 [10105.376874] x27: ffff000076fa80c8 x26: 0000000000000004 [10105.382185] x25: 0000000000000030 x24: 0000000000000000 [10105.387495] x23: 0000000000000000 x22: 0000000000000038 [10105.392807] x21: 000000000000000c x20: ffff000076fa80c8 [10105.398119] x19: ffff000076fa8000 x18: 0000000000000000 [10105.403429] x17: 0000000000000000 x16: 0000000000000000 [10105.408741] x15: 0000000000000000 x14: fefefefefefefeff [10105.414052] x13: 0000000000000000 x12: 0000000000000fe0 [10105.419364] x11: 0000000000000fe0 x10: ffff000076709020 [10105.424675] x9 : 0000000000000000 x8 : 00000000000000a0 [10105.429986] x7 : ffff000076fa80f4 x6 : 0000000000000030 [10105.435297] x5 : 0000000000000000 x4 : 0000000000000000 [10105.440609] x3 : 0000000000000000 x2 : ffff00006f276040 [10105.445920] x1 : ffff000075633ab8 x0 : 0000000000000030 [10105.451232] Call trace: [10105.453676] atomic64_try_cmpxchg_acquire.constprop.22+0x8/0x34 [10105.459600] ubifs_garbage_collect+0xb4/0x334 [10105.463956] ubifs_budget_space+0x398/0x458 [10105.468139] ubifs_create+0x50/0x180 [10105.471712] path_openat+0x6a0/0x9b0 [10105.475284] do_filp_open+0x34/0x7c [10105.478771] do_sys_open+0x78/0xe4 [10105.482170] __arm64_sys_openat+0x1c/0x24 [10105.486180] el0_svc_handler+0x84/0xc8 [10105.489928] el0_svc+0x8/0xc [10105.492808] Code: 52800013 17fffffb d2800003 f9800011 (c85ffc05) [10105.498903] ---[ end trace 46b721d93267a586 ]---
To reproduce the problem:
1. Filesystem initially mounted read-only, free space fixup flag set.
2. mount -o remount,rw <mountpoint>
3. it takes some time (free space fixup running)
... try to terminate running mount by CTRL-C
... does not respond, only after free space fixup is complete ... then "ubifs_remount_fs: cannot spawn "ubifs_bgt0_0", error -4"
4. mount -o remount,rw <mountpoint>
... now finished instantly (fixup already done).
5. Create file or just unmount the filesystem and we get the oops.
--- fs/ubifs/super.c | 1 - 1 file changed, 1 deletion(-)
fs/ubifs/super.c +0 -1
@@ -1853,7 +1853,6 @@ out:kthread_stop (c->bgt); c->bgt =NULL ; } -free_wbufs (c);kfree (c->write_reserve_buf); c->write_reserve_buf =NULL ;vfree (c->ileb_buf);
Greg Kroah-Hartman
maintainerPATCH 840/1039 tpm: fix potential NULL pointer access in tpm_del_char_device
In reply to Greg Kroah-HartmanFrom: Lino Sanfilippo <[email protected]>
commit eabad7ba2c752392ae50f24a795093fb115b686d upstream.
Some SPI controller drivers unregister the controller in the shutdown handler (e.g. BCM2835). If such a controller is used with a TPM 2 slave chip->ops may be accessed when it is already NULL:
At system shutdown the pre-shutdown handler tpm_class_shutdown() shuts down TPM 2 and sets chip->ops to NULL. Then at SPI controller unregistration tpm_tis_spi_remove() is called and eventually calls tpm_del_char_device() which tries to shut down TPM 2 again. Thereby it accesses chip->ops again:
(tpm_del_char_device calls tpm_chip_start which calls tpm_clk_enable which calls chip->ops->clk_enable).
Avoid the NULL pointer access by testing if chip->ops is valid and skipping the TPM 2 shutdown procedure in case it is NULL.
--- drivers/char/tpm/tpm-chip.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/char/tpm/tpm-chip.c +13 -5
@@ -474,13 +474,21 @@ static void tpm_del_char_device(struct t/* Make the driver uncallable. */ down_write (&chip->ops_sem); -if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { -if (!tpm_chip_start (chip)) { -tpm2_shutdown (chip,TPM2_SU_CLEAR ); -tpm_chip_stop (chip); + +/* +* Check if chip->ops is still valid: In case that the controller +* drivers shutdown handler unregisters the controller in its +* shutdown handler we are called twice and chip->ops to NULL. +*/ +if (chip->ops) { +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { +if (!tpm_chip_start (chip)) { +tpm2_shutdown (chip,TPM2_SU_CLEAR ); +tpm_chip_stop (chip); + } } + chip->ops =NULL ; } - chip->ops =NULL ;up_write (&chip->ops_sem); }
Greg Kroah-Hartman
maintainerPATCH 841/1039 tpm: fix NPE on probe for missing device
In reply to Greg Kroah-HartmanFrom: Patrick Williams <[email protected]>
commit 84cc69589700b90a4c8d27b481a51fce8cca6051 upstream.
When using the tpm_tis-spi driver on a system missing the physical TPM, a null pointer exception was observed.
[ 0.938677] Unable to handle kernel NULL pointer dereference at virtual address 00000004
[ 0.939020] pgd = 10c753cb
[ 0.939237] [00000004] *pgd=00000000
[ 0.939808] Internal error: Oops: 5 [#1] SMP ARM
[ 0.940157] CPU: 0 PID: 48 Comm: kworker/u4:1 Not tainted 5.15.10-dd1e40c #1
[ 0.940364] Hardware name: Generic DT based system
[ 0.940601] Workqueue: events_unbound async_run_entry_fn
[ 0.941048] PC is at tpm_tis_remove+0x28/0xb4
[ 0.941196] LR is at tpm_tis_core_init+0x170/0x6acThis is due to an attempt in 'tpm_tis_remove' to use the drvdata, which was not initialized in 'tpm_tis_core_init' prior to the first error.
Move the initialization of drvdata earlier so 'tpm_tis_remove' has access to it.
--- drivers/char/tpm/tpm_tis_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/tpm/tpm_tis_core.c +2 -2
@@ -950,6 +950,8 @@ int tpm_tis_core_init(struct device *dev priv->timeout_max =TPM_TIMEOUT_USECS_MAX ; priv->phy_ops = phy_ops; +dev_set_drvdata (&chip->dev, priv); + rc =tpm_tis_read32 (priv,TPM_DID_VID (0 ), &vendor);if (rc <0 )return rc;
@@ -962,8 +964,6 @@ int tpm_tis_core_init(struct device *dev priv->timeout_max =TIS_TIMEOUT_MAX_ATML ; } -dev_set_drvdata (&chip->dev, priv); -if (is_bsw ()) { priv->ilb_base_addr =ioremap (INTEL_LEGACY_BLK_BASE_ADDR ,ILB_REMAP_SIZE );
Greg Kroah-Hartman
maintainerPATCH 842/1039 mfd: tps65910: Set PWR_OFF bit during driver probe
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit 7620ad0bdfac1efff4a1228cd36ae62a9d8206b0 upstream.
The PWR_OFF bit needs to be set in order to power off properly, without hanging PMIC. This bit needs to be set early in order to allow thermal protection of NVIDIA Terga SoCs to power off hardware properly, otherwise a battery re-plug may be needed on some devices to recover after the hang.
--- drivers/mfd/tps65910.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/mfd/tps65910.c +13 -9
@@ -436,15 +436,6 @@ static void tps65910_power_off(void) tps65910 =dev_get_drvdata (&tps65910_i2c_client->dev); -/* -* The PWR_OFF bit needs to be set separately, before transitioning -* to the OFF state. It enables the "sequential" power-off mode on -* TPS65911, it's a NO-OP on TPS65910. -*/ -if (regmap_set_bits (tps65910->regmap,TPS65910_DEVCTRL , -DEVCTRL_PWR_OFF_MASK ) <0 ) -return ; -regmap_update_bits (tps65910->regmap,TPS65910_DEVCTRL ,DEVCTRL_DEV_OFF_MASK |DEVCTRL_DEV_ON_MASK ,DEVCTRL_DEV_OFF_MASK );
@@ -504,6 +495,19 @@ static int tps65910_i2c_probe(struct i2ctps65910_sleepinit (tps65910, pmic_plat_data);if (pmic_plat_data->pm_off && !pm_power_off) { +/* +* The PWR_OFF bit needs to be set separately, before +* transitioning to the OFF state. It enables the "sequential" +* power-off mode on TPS65911, it's a NO-OP on TPS65910. +*/ + ret =regmap_set_bits (tps65910->regmap,TPS65910_DEVCTRL , +DEVCTRL_PWR_OFF_MASK ); +if (ret) { +dev_err (&i2c->dev,"failed to set power-off mode: %d\n" , + ret); +return ret; + } + tps65910_i2c_client = i2c; pm_power_off = tps65910_power_off; }
Greg Kroah-Hartman
maintainerPATCH 843/1039 spi: uniphier: Fix a bug that doesnt point to private data correctly
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
commit 80bb73a9fbcde4ecc55e12f10c73fabbe68a24d1 upstream.
In uniphier_spi_remove(), there is a wrong code to get private data from the platform device, so the driver can't be removed properly.
The driver should get spi_master from the platform device and retrieve the private data from it.
--- drivers/spi/spi-uniphier.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/spi/spi-uniphier.c +6 -5
@@ -767,12 +767,13 @@ out_master_put:static int uniphier_spi_remove (struct platform_device *pdev) { -struct uniphier_spi_priv *priv =platform_get_drvdata (pdev); +struct spi_master *master =platform_get_drvdata (pdev); +struct uniphier_spi_priv *priv =spi_master_get_devdata (master); -if (priv->master->dma_tx) -dma_release_channel (priv->master->dma_tx); -if (priv->master->dma_rx) -dma_release_channel (priv->master->dma_rx); +if (master->dma_tx) +dma_release_channel (master->dma_tx); +if (master->dma_rx) +dma_release_channel (master->dma_rx);clk_disable_unprepare (priv->clk);
Greg Kroah-Hartman
maintainerPATCH 844/1039 xen/gntdev: fix unmap notification order
In reply to Greg Kroah-HartmanFrom: Oleksandr Andrushchenko <[email protected]>
commit ce2f46f3531a03781181b7f4bd1ff9f8c5086e7e upstream.
While working with Xen's libxenvchan library I have faced an issue with unmap notifications sent in wrong order if both UNMAP_NOTIFY_SEND_EVENT and UNMAP_NOTIFY_CLEAR_BYTE were requested: first we send an event channel notification and then clear the notification byte which renders in the below inconsistency (cli_live is the byte which was requested to be cleared on unmap):
[ 444.514243] gntdev_put_map UNMAP_NOTIFY_SEND_EVENT map->notify.event 6 libxenvchan_is_open cli_live 1 [ 444.515239] __unmap_grant_pages UNMAP_NOTIFY_CLEAR_BYTE at 14
Thus it is not possible to reliably implement the checks like
- wait for the notification (UNMAP_NOTIFY_SEND_EVENT)
- check the variable (UNMAP_NOTIFY_CLEAR_BYTE)
because it is possible that the variable gets checked before it is cleared by the kernel.
To fix that we need to re-order the notifications, so the variable is first gets cleared and then the event channel notification is sent. With this fix I can see the correct order of execution:
[ 54.522611] __unmap_grant_pages UNMAP_NOTIFY_CLEAR_BYTE at 14 [ 54.537966] gntdev_put_map UNMAP_NOTIFY_SEND_EVENT map->notify.event 6
libxenvchan_is_open cli_live 0
--- drivers/xen/gntdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/xen/gntdev.c +3 -3
@@ -250,13 +250,13 @@ void gntdev_put_map(struct gntdev_priv *if (!refcount_dec_and_test (&map->users))return ; +if (map->pages && !use_ptemod) +unmap_grant_pages (map,0 , map->count); +if (map->notify.flags &UNMAP_NOTIFY_SEND_EVENT ) {notify_remote_via_evtchn (map->notify.event);evtchn_put (map->notify.event); } - -if (map->pages && !use_ptemod) -unmap_grant_pages (map,0 , map->count);gntdev_free_map (map); }
Greg Kroah-Hartman
maintainerPATCH 845/1039 md: Move alloc/free acct bioset in to personality
In reply to Greg Kroah-HartmanFrom: Xiao Ni <[email protected]>
commit 0c031fd37f69deb0cd8c43bbfcfccd62ebd7e952 upstream.
bioset acct is only needed for raid0 and raid5. Therefore, md_run only allocates it for raid0 and raid5. However, this does not cover personality takeover, which may cause uninitialized bioset. For example, the following repro steps:
mdadm -CR /dev/md0 -l1 -n2 /dev/loop0 /dev/loop1 mdadm --wait /dev/md0 mkfs.xfs /dev/md0 mdadm /dev/md0 --grow -l5 mount /dev/md0 /mnt
causes panic like:
[ 225.933939] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 225.934903] #PF: supervisor instruction fetch in kernel mode [ 225.935639] #PF: error_code(0x0010) - not-present page [ 225.936361] PGD 0 P4D 0 [ 225.936677] Oops: 0010 [#1] PREEMPT SMP DEBUG_PAGEALLOC KASAN PTI [ 225.937525] CPU: 27 PID: 1133 Comm: mount Not tainted 5.16.0-rc3+ #706 [ 225.938416] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-2.module_el8.4.0+547+a85d02ba 04/01/2014 [ 225.939922] RIP: 0010:0x0 [ 225.940289] Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6. [ 225.941196] RSP: 0018:ffff88815897eff0 EFLAGS: 00010246 [ 225.941897] RAX: 0000000000000000 RBX: 0000000000092800 RCX: ffffffff81370a39 [ 225.942813] RDX: dffffc0000000000 RSI: 0000000000000000 RDI: 0000000000092800 [ 225.943772] RBP: 1ffff1102b12fe04 R08: fffffbfff0b43c01 R09: fffffbfff0b43c01 [ 225.944807] R10: ffffffff85a1e007 R11: fffffbfff0b43c00 R12: ffff88810eaaaf58 [ 225.945757] R13: 0000000000000000 R14: ffff88810eaaafb8 R15: ffff88815897f040 [ 225.946709] FS: 00007ff3f2505080(0000) GS:ffff888fb5e00000(0000) knlGS:0000000000000000 [ 225.947814] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 225.948556] CR2: ffffffffffffffd6 CR3: 000000015aa5a006 CR4: 0000000000370ee0 [ 225.949537] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 225.950455] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 225.951414] Call Trace: [ 225.951787] <TASK> [ 225.952120] mempool_alloc+0xe5/0x250 [ 225.952625] ? mempool_resize+0x370/0x370 [ 225.953187] ? rcu_read_lock_sched_held+0xa1/0xd0 [ 225.953862] ? rcu_read_lock_bh_held+0xb0/0xb0 [ 225.954464] ? sched_clock_cpu+0x15/0x120 [ 225.955019] ? find_held_lock+0xac/0xd0 [ 225.955564] bio_alloc_bioset+0x1ed/0x2a0 [ 225.956080] ? lock_downgrade+0x3a0/0x3a0 [ 225.956644] ? bvec_alloc+0xc0/0xc0 [ 225.957135] bio_clone_fast+0x19/0x80 [ 225.957651] raid5_make_request+0x1370/0x1b70 [ 225.958286] ? sched_clock_cpu+0x15/0x120 [ 225.958797] ? __lock_acquire+0x8b2/0x3510 [ 225.959339] ? raid5_get_active_stripe+0xce0/0xce0 [ 225.959986] ? lock_is_held_type+0xd8/0x130 [ 225.960528] ? rcu_read_lock_sched_held+0xa1/0xd0 [ 225.961135] ? rcu_read_lock_bh_held+0xb0/0xb0 [ 225.961703] ? sched_clock_cpu+0x15/0x120 [ 225.962232] ? lock_release+0x27a/0x6c0 [ 225.962746] ? do_wait_intr_irq+0x130/0x130 [ 225.963302] ? lock_downgrade+0x3a0/0x3a0 [ 225.963815] ? lock_release+0x6c0/0x6c0 [ 225.964348] md_handle_request+0x342/0x530 [ 225.964888] ? set_in_sync+0x170/0x170 [ 225.965397] ? blk_queue_split+0x133/0x150 [ 225.965988] ? __blk_queue_split+0x8b0/0x8b0 [ 225.966524] ? submit_bio_checks+0x3b2/0x9d0 [ 225.967069] md_submit_bio+0x127/0x1c0
[...]
Fix this by moving alloc/free of acct bioset to pers->run and pers->free.
While we are on this, properly handle md_integrity_register() error in raid0_run().
--- drivers/md/md.c | 27 +++++++++++++++++---------- drivers/md/md.h | 2 ++ drivers/md/raid0.c | 38 ++++++++++++++++++++++++++++---------- drivers/md/raid5.c | 41 ++++++++++++++++++++++++++++++----------- 4 files changed, 77 insertions(+), 31 deletions(-)
drivers/md/md.c +17 -10
@@ -5875,13 +5875,6 @@ int md_run(struct mddev *mddev)if (err) goto exit_bio_set; } -if (mddev->level !=1 && mddev->level !=10 && - !bioset_initialized (&mddev->io_acct_set)) { - err =bioset_init (&mddev->io_acct_set,BIO_POOL_SIZE , - offsetof(struct md_io_acct , bio_clone),0 ); -if (err) - goto exit_sync_set; - }spin_lock (&pers_lock); pers =find_pers (mddev->level, mddev->clevel);
@@ -6058,9 +6051,6 @@ bitmap_abort:module_put (pers->owner);md_bitmap_destroy (mddev); abort: -if (mddev->level !=1 && mddev->level !=10 ) -bioset_exit (&mddev->io_acct_set); -exit_sync_set:bioset_exit (&mddev->sync_set); exit_bio_set:bioset_exit (&mddev->bio_set);
@@ -8594,6 +8584,23 @@ void md_submit_discard_bio(struct mddev }EXPORT_SYMBOL_GPL (md_submit_discard_bio); +int acct_bioset_init (struct mddev *mddev) +{ +int err =0 ; + +if (!bioset_initialized (&mddev->io_acct_set)) + err =bioset_init (&mddev->io_acct_set,BIO_POOL_SIZE , + offsetof(struct md_io_acct , bio_clone),0 ); +return err; +} +EXPORT_SYMBOL_GPL (acct_bioset_init); + +void acct_bioset_exit (struct mddev *mddev) +{ +bioset_exit (&mddev->io_acct_set); +} +EXPORT_SYMBOL_GPL (acct_bioset_exit); +static void md_end_io_acct (struct bio *bio) {struct md_io_acct *md_io_acct = bio->bi_private;
drivers/md/md.h +2 -0
@@ -721,6 +721,8 @@ extern void md_error(struct mddev *mddevextern void md_finish_reshape (struct mddev *mddev);void md_submit_discard_bio (struct mddev *mddev,struct md_rdev *rdev,struct bio *bio,sector_t start,sector_t size); +int acct_bioset_init (struct mddev *mddev); +void acct_bioset_exit (struct mddev *mddev);void md_account_bio (struct mddev *mddev,struct bio **bio);extern bool __must_check md_flush_request (struct mddev *mddev,struct bio *bio);
drivers/md/raid0.c +28 -10
@@ -356,7 +356,21 @@ static sector_t raid0_size(struct mddevreturn array_sectors; } -static void raid0_free (struct mddev *mddev,void *priv); +static void free_conf (struct mddev *mddev,struct r0conf *conf) +{ +kfree (conf->strip_zone); +kfree (conf->devlist); +kfree (conf); + mddev->private =NULL ; +} + +static void raid0_free (struct mddev *mddev,void *priv) +{ +struct r0conf *conf = priv; + +free_conf (mddev, conf); +acct_bioset_exit (mddev); +}static int raid0_run (struct mddev *mddev) {
@@ -370,11 +384,16 @@ static int raid0_run(struct mddev *mddevif (md_check_no_bitmap (mddev))return -EINVAL ; +if (acct_bioset_init (mddev)) { +pr_err ("md/raid0:%s: alloc acct bioset failed.\n" ,mdname (mddev)); +return -ENOMEM ; + } +/* if private is not null, we are here after takeover */ if (mddev->private ==NULL ) { ret =create_strip_zones (mddev, &conf);if (ret <0 ) -return ret; + goto exit_acct_set; mddev->private = conf; } conf = mddev->private;
@@ -413,17 +432,16 @@ static int raid0_run(struct mddev *mddevdump_zones (mddev); ret =md_integrity_register (mddev); +if (ret) + goto free;return ret; -} -static void raid0_free (struct mddev *mddev,void *priv) -{ -struct r0conf *conf = priv; - -kfree (conf->strip_zone); -kfree (conf->devlist); -kfree (conf); +free: +free_conf (mddev, conf); +exit_acct_set: +acct_bioset_exit (mddev); +return ret; }static void raid0_handle_discard (struct mddev *mddev,struct bio *bio)
drivers/md/raid5.c +30 -11
104 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 846/1039 HID: magicmouse: Fix an error handling path in magicmouse_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit 33812fc7c8d77a43b7e2bf36a0d5a57c277a4b0c upstream.
If the timer introduced by the commit below is started, then it must be deleted in the error handling of the probe. Otherwise it would trigger once the driver is no more.
--- drivers/hid/hid-magicmouse.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/hid-magicmouse.c +1 -0
@@ -873,6 +873,7 @@ static int magicmouse_probe(struct hid_dreturn 0 ; err_stop_hw: +del_timer_sync (&msc->battery_timer);hid_hw_stop (hdev);return ret; }
Greg Kroah-Hartman
maintainerPATCH 847/1039 x86/mce: Check regs before accessing it
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
commit 1acd85feba81084fcef00b73fc1601e42b77c5d8 upstream.
Commit in Fixes accesses pt_regs before checking whether it is NULL or not. Make sure the NULL pointer check happens first.
--- arch/x86/kernel/cpu/mce/severity.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mce/severity.c +4 -1
@@ -222,6 +222,9 @@ static bool is_copy_from_user(struct pt_struct insn insn;int ret; +if (!regs) +return false; +if (copy_from_kernel_nofault (insn_buf, (void *)regs->ip,MAX_INSN_SIZE ))return false;
@@ -283,7 +286,7 @@ static noinstr int error_context(structswitch (fixup_type) {case EX_TYPE_UACCESS :case EX_TYPE_COPY : -if (!regs || !copy_user) +if (!copy_user)return IN_KERNEL ; m->kflags |=MCE_IN_KERNEL_COPYIN ; fallthrough;
Greg Kroah-Hartman
maintainerPATCH 848/1039 fuse: Pass correct lend value to filemap_write_and_wait_range()
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
commit e388164ea385f04666c4633f5dc4f951fca71890 upstream.
The acceptable maximum value of lend parameter in filemap_write_and_wait_range() is LLONG_MAX rather than -1. And there is also some logic depending on LLONG_MAX check in write_cache_pages(). So let's pass LLONG_MAX to filemap_write_and_wait_range() in fuse_writeback_range() instead.
--- fs/fuse/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fuse/file.c +1 -1
@@ -2910,7 +2910,7 @@ fuse_direct_IO(struct kiocb *iocb, strucstatic int fuse_writeback_range (struct inode *inode,loff_t start,loff_t end) { -int err =filemap_write_and_wait_range (inode->i_mapping, start,-1 ); +int err =filemap_write_and_wait_range (inode->i_mapping, start,LLONG_MAX );if (!err)fuse_sync_writes (inode);
Greg Kroah-Hartman
maintainerPATCH 849/1039 serial: Fix incorrect rs485 polarity on uart open
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit d3b3404df318504ec084213ab1065b73f49b0f1d upstream.
Commit a6845e1e1b78 ("serial: core: Consider rs485 settings to drive RTS") sought to deassert RTS when opening an rs485-enabled uart port. That way, the transceiver does not occupy the bus until it transmits data.
Unfortunately, the commit mixed up the logic and *asserted* RTS instead of *deasserting* it:
The commit amended uart_port_dtr_rts(), which raises DTR and RTS when opening an rs232 port. "Raising" actually means lowering the signal that's coming out of the uart, because an rs232 transceiver not only changes a signal's voltage level, it also *inverts* the signal. See the simplified schematic in the MAX232 datasheet for an example:
https://www.ti.com/lit/ds/symlink/max232.pdf
So, to raise RTS on an rs232 port, TIOCM_RTS is *set* in port->mctrl and that results in the signal being driven low.
In contrast to rs232, the signal level for rs485 Transmit Enable is the identity, not the inversion: If the transceiver expects a "high" RTS signal for Transmit Enable, the signal coming out of the uart must also be high, so TIOCM_RTS must be *cleared* in port->mctrl.
The commit did the exact opposite, but it's easy to see why given the confusing semantics of rs232 and rs485. Fix it.
--- drivers/tty/serial/serial_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/serial_core.c +2 -2
@@ -162,7 +162,7 @@ static void uart_port_dtr_rts(struct uarint RTS_after_send = !!(uport->rs485.flags &SER_RS485_RTS_AFTER_SEND );if (raise) { -if (rs485_on && !RTS_after_send) { +if (rs485_on && RTS_after_send) {uart_set_mctrl (uport,TIOCM_DTR );uart_clear_mctrl (uport,TIOCM_RTS ); }else {
@@ -171,7 +171,7 @@ static void uart_port_dtr_rts(struct uar }else {unsigned int clear =TIOCM_DTR ; - clear |= (!rs485_on || !RTS_after_send) ?TIOCM_RTS :0 ; + clear |= (!rs485_on || RTS_after_send) ?TIOCM_RTS :0 ;uart_clear_mctrl (uport, clear); } }
Greg Kroah-Hartman
maintainerPATCH 850/1039 cputime, cpuacct: Include guest time in user time in cpuacct.stat
In reply to Greg Kroah-HartmanFrom: Andrey Ryabinin <[email protected]>
commit 9731698ecb9c851f353ce2496292ff9fcea39dff upstream.
cpuacct.stat in no-root cgroups shows user time without guest time included int it. This doesn't match with user time shown in root cpuacct.stat and /proc/<pid>/stat. This also affects cgroup2's cpu.stat in the same way.
Make account_guest_time() to add user time to cgroup's cpustat to fix this.
--- kernel/sched/cputime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/cputime.c +2 -2
@@ -148,10 +148,10 @@ void account_guest_time(struct task_stru/* Add guest time to cpustat. */ if (task_nice (p) >0 ) { - cpustat[CPUTIME_NICE ] += cputime; +task_group_account_field (p,CPUTIME_NICE , cputime); cpustat[CPUTIME_GUEST_NICE ] += cputime; }else { - cpustat[CPUTIME_USER ] += cputime; +task_group_account_field (p,CPUTIME_USER , cputime); cpustat[CPUTIME_GUEST ] += cputime; } }
Greg Kroah-Hartman
maintainerPATCH 851/1039 sched/cpuacct: Fix user/system in shown cpuacct.usage*
In reply to Greg Kroah-HartmanFrom: Andrey Ryabinin <[email protected]>
commit dd02d4234c9a2214a81c57a16484304a1a51872a upstream.
cpuacct has 2 different ways of accounting and showing user and system times.
The first one uses cpuacct_account_field() to account times and cpuacct.stat file to expose them. And this one seems to work ok.
The second one is uses cpuacct_charge() function for accounting and set of cpuacct.usage* files to show times. Despite some attempts to fix it in the past it still doesn't work. Sometimes while running KVM guest the cpuacct_charge() accounts most of the guest time as system time. This doesn't match with user&system times shown in cpuacct.stat or proc/<pid>/stat.
Demonstration:
# git clone https://github.com/aryabinin/kvmsample # make # mkdir /sys/fs/cgroup/cpuacct/test # echo $$ > /sys/fs/cgroup/cpuacct/test/tasks # ./kvmsample & # for i in {1..5}; do cat /sys/fs/cgroup/cpuacct/test/cpuacct.usage_sys; sleep 1; done 1976535645 2979839428 3979832704 4983603153 5983604157
Use cpustats accounted in cpuacct_account_field() as the source of user/sys times for cpuacct.usage* files. Make cpuacct_charge() to account only summary execution time.
--- kernel/sched/cpuacct.c | 79 +++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 47 deletions(-)
kernel/sched/cpuacct.c +32 -47
@@ -21,15 +21,11 @@ static const char * const cpuacct_stat_d [CPUACCT_STAT_SYSTEM] = "system", }; -struct cpuacct_usage { -u64 usages[CPUACCT_STAT_NSTATS ]; -}; -/* track CPU usage of a group of tasks and its child groups */ struct cpuacct {struct cgroup_subsys_state css;/* cpuusage holds pointer to a u64-type object on every CPU */ -struct cpuacct_usage __percpu *cpuusage; +u64 __percpu *cpuusage;struct kernel_cpustat __percpu *cpustat; };
@@ -49,7 +45,7 @@ static inline struct cpuacct *parent_ca(return css_ca (ca->css.parent); } -static DEFINE_PER_CPU(struct cpuacct_usage, root_cpuacct_cpuusage); +static DEFINE_PER_CPU(u64, root_cpuacct_cpuusage);static struct cpuacct root_cpuacct = { .cpustat = &kernel_cpustat, .cpuusage = &root_cpuacct_cpuusage,
@@ -68,7 +64,7 @@ cpuacct_css_alloc(struct cgroup_subsys_sif (!ca) goto out; - ca->cpuusage = alloc_percpu(struct cpuacct_usage); + ca->cpuusage =alloc_percpu (u64);if (!ca->cpuusage) goto out_free_ca;
@@ -99,7 +95,8 @@ static void cpuacct_css_free(struct cgrostatic u64 cpuacct_cpuusage_read (struct cpuacct *ca,int cpu,enum cpuacct_stat_index index) { -struct cpuacct_usage *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); +u64 *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); +u64 *cpustat =per_cpu_ptr (ca->cpustat, cpu)->cpustat;u64 data;/*
@@ -115,14 +112,17 @@ static u64 cpuacct_cpuusage_read(structraw_spin_rq_lock_irq (cpu_rq (cpu));#endif -if (index ==CPUACCT_STAT_NSTATS ) { -int i =0 ; - - data =0 ; -for (i =0 ; i <CPUACCT_STAT_NSTATS ; i++) - data += cpuusage->usages[i]; - }else { - data = cpuusage->usages[index]; +switch (index) { +case CPUACCT_STAT_USER : + data = cpustat[CPUTIME_USER ] + cpustat[CPUTIME_NICE ]; +break ; +case CPUACCT_STAT_SYSTEM : + data = cpustat[CPUTIME_SYSTEM ] + cpustat[CPUTIME_IRQ ] + + cpustat[CPUTIME_SOFTIRQ ]; +break ; +case CPUACCT_STAT_NSTATS : + data = *cpuusage; +break ; }#ifndef CONFIG_64BIT
@@ -132,10 +132,14 @@ static u64 cpuacct_cpuusage_read(structreturn data; } -static void cpuacct_cpuusage_write (struct cpuacct *ca,int cpu,u64 val) +static void cpuacct_cpuusage_write (struct cpuacct *ca,int cpu) { -struct cpuacct_usage *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); -int i; +u64 *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); +u64 *cpustat =per_cpu_ptr (ca->cpustat, cpu)->cpustat; + +/* Don't allow to reset global kernel_cpustat */ +if (ca == &root_cpuacct) +return ;#ifndef CONFIG_64BIT /*
@@ -143,9 +147,10 @@ static void cpuacct_cpuusage_write(struc*/ raw_spin_rq_lock_irq (cpu_rq (cpu));#endif - -for (i =0 ; i <CPUACCT_STAT_NSTATS ; i++) - cpuusage->usages[i] = val; + *cpuusage =0 ; + cpustat[CPUTIME_USER ] = cpustat[CPUTIME_NICE ] =0 ; + cpustat[CPUTIME_SYSTEM ] = cpustat[CPUTIME_IRQ ] =0 ; + cpustat[CPUTIME_SOFTIRQ ] =0 ;#ifndef CONFIG_64BIT raw_spin_rq_unlock_irq (cpu_rq (cpu));
@@ -196,7 +201,7 @@ static int cpuusage_write(struct cgroup_return -EINVAL ;for_each_possible_cpu (cpu) -cpuacct_cpuusage_write (ca, cpu,0 ); +cpuacct_cpuusage_write (ca, cpu);return 0 ; }
@@ -243,25 +248,10 @@ static int cpuacct_all_seq_show(struct sseq_puts (m,"\n" );for_each_possible_cpu (cpu) { -struct cpuacct_usage *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); -seq_printf (m,"%d" , cpu); - -for (index =0 ; index <CPUACCT_STAT_NSTATS ; index++) { -#ifndef CONFIG_64BIT -/* -* Take rq->lock to make 64-bit read safe on 32-bit -* platforms. -*/ -raw_spin_rq_lock_irq (cpu_rq (cpu)); -#endif - -seq_printf (m," %llu" , cpuusage->usages[index]); - -#ifndef CONFIG_64BIT -raw_spin_rq_unlock_irq (cpu_rq (cpu)); -#endif - } +for (index =0 ; index <CPUACCT_STAT_NSTATS ; index++) +seq_printf (m," %llu" , +cpuacct_cpuusage_read (ca, cpu, index));seq_puts (m,"\n" ); }return 0 ;
@@ -339,16 +329,11 @@ static struct cftype files[] = {void cpuacct_charge (struct task_struct *tsk,u64 cputime) {struct cpuacct *ca; -int index =CPUACCT_STAT_SYSTEM ; -struct pt_regs *regs =get_irq_regs () ? :task_pt_regs (tsk); - -if (regs &&user_mode (regs)) - index =CPUACCT_STAT_USER ;rcu_read_lock ();for (ca =task_ca (tsk); ca; ca =parent_ca (ca)) -__this_cpu_add (ca->cpuusage->usages[index], cputime); +__this_cpu_add (*ca->cpuusage, cputime);rcu_read_unlock (); }
Greg Kroah-Hartman
maintainerPATCH 852/1039 tracing/osnoise: Properly unhook events if start_per_cpu_kthreads() fails
In reply to Greg Kroah-HartmanFrom: Nikita Yushchenko <[email protected]>
commit 0878355b51f5f26632e652c848a8e174bb02d22d upstream.
If start_per_cpu_kthreads() called from osnoise_workload_start() returns error, event hooks are left in broken state: unhook_irq_events() called but unhook_thread_events() and unhook_softirq_events() not called, and trace_osnoise_callback_enabled flag not cleared.
On the next tracer enable, hooks get not installed due to trace_osnoise_callback_enabled flag.
And on the further tracer disable an attempt to remove non-installed hooks happened, hitting a WARN_ON_ONCE() in tracepoint_remove_func().
Fix the error path by adding the missing part of cleanup. While at this, introduce osnoise_unhook_events() to avoid code duplication between this error path and normal tracer disable.
--- kernel/trace/trace_osnoise.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
kernel/trace/trace_osnoise.c +16 -4
@@ -2123,6 +2123,13 @@ out_unhook_irq:return -EINVAL ; } +static void osnoise_unhook_events (void ) +{ +unhook_thread_events (); +unhook_softirq_events (); +unhook_irq_events (); +} +/* * osnoise_workload_start - start the workload and hook to events */
@@ -2155,7 +2162,14 @@ static int osnoise_workload_start(void) retval =start_per_cpu_kthreads ();if (retval) { -unhook_irq_events (); + trace_osnoise_callback_enabled = false; +/* +* Make sure that ftrace_nmi_enter/exit() see +* trace_osnoise_callback_enabled as false before continuing. +*/ +barrier (); + +osnoise_unhook_events ();return retval; }
@@ -2186,9 +2200,7 @@ static void osnoise_workload_stop(void)stop_per_cpu_kthreads (); -unhook_irq_events (); -unhook_softirq_events (); -unhook_thread_events (); +osnoise_unhook_events (); }static void osnoise_tracer_start (struct trace_array *tr)
Greg Kroah-Hartman
maintainerPATCH 853/1039 tracing/kprobes: nmissed not showed correctly for kretprobe
In reply to Greg Kroah-HartmanFrom: Xiangyang Zhang <[email protected]>
commit dfea08a2116fe327f79d8f4d4b2cf6e0c88be11f upstream.
The 'nmissed' column of the 'kprobe_profile' file for kretprobe is not showed correctly, kretprobe can be skipped by two reasons, shortage of kretprobe_instance which is counted by tk->rp.nmissed, and kprobe itself is missed by some reason, so to show the sum.
--- kernel/trace/trace_kprobe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/trace/trace_kprobe.c +4 -1
@@ -1175,15 +1175,18 @@ static int probes_profile_seq_show(struc {struct dyn_event *ev = v;struct trace_kprobe *tk; +unsigned long nmissed;if (!is_trace_kprobe (ev))return 0 ; tk =to_trace_kprobe (ev); + nmissed =trace_kprobe_is_return (tk) ? + tk->rp.kp.nmissed + tk->rp.nmissed : tk->rp.kp.nmissed;seq_printf (m," %-44s %15lu %15lu\n" ,trace_probe_name (&tk->tp),trace_kprobe_nhit (tk), - tk->rp.kp.nmissed); + nmissed);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 854/1039 tracing: Have syscall trace events use trace_event_buffer_lock_reserve()
In reply to Greg Kroah-HartmanFrom: Steven Rostedt <[email protected]>
commit 3e2a56e6f639492311e0a8533f0a7aed60816308 upstream.
Currently, the syscall trace events call trace_buffer_lock_reserve() directly, which means that it misses out on some of the filtering optimizations provided by the helper function trace_event_buffer_lock_reserve(). Have the syscall trace events call that instead, as it was missed when adding the update to use the temp buffer when filtering.
--- kernel/trace/trace_syscalls.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/trace/trace_syscalls.c +2 -4
@@ -323,8 +323,7 @@ static void ftrace_syscall_enter(void *d trace_ctx =tracing_gen_ctx (); - buffer = tr->array_buffer.buffer; - event =trace_buffer_lock_reserve (buffer, + event =trace_event_buffer_lock_reserve (&buffer, trace_file, sys_data->enter_event->event.type, size, trace_ctx);if (!event)return ;
@@ -367,8 +366,7 @@ static void ftrace_syscall_exit(void *da trace_ctx =tracing_gen_ctx (); - buffer = tr->array_buffer.buffer; - event =trace_buffer_lock_reserve (buffer, + event =trace_event_buffer_lock_reserve (&buffer, trace_file, sys_data->exit_event->event.type,sizeof (*entry), trace_ctx);if (!event)
Greg Kroah-Hartman
maintainerPATCH 855/1039 remoteproc: imx_rproc: Fix a resource leak in the remove function
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit 4da96175014be67c846fd274eace08066e525d75 upstream.
'priv->workqueue' is destroyed in the error handling path of the probe but not in the remove function.
Add the missing call to release some resources.
--- drivers/remoteproc/imx_rproc.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/imx_rproc.c +1 -0
@@ -804,6 +804,7 @@ static int imx_rproc_remove(struct platfclk_disable_unprepare (priv->clk);rproc_del (rproc);imx_rproc_free_mbox (rproc); +destroy_workqueue (priv->workqueue);rproc_free (rproc);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 856/1039 iwlwifi: mvm: Increase the scan timeout guard to 30 seconds
In reply to Greg Kroah-HartmanFrom: Ilan Peer <[email protected]>
commit ced50f1133af12f7521bb777fcf4046ca908fb77 upstream.
With the introduction of 6GHz channels the scan guard timeout should be adjusted to account for the following extreme case:
- All 6GHz channels are scanned passively: 58 channels.
- The scan is fragmented with the following parameters: 3 fragments, 95 TUs suspend time, 44 TUs maximal out of channel time.
The above would result with scan time of more than 24 seconds. Thus, set the timeout to 30 seconds.
--- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +1 -1
@@ -2495,7 +2495,7 @@ static int iwl_mvm_check_running_scans(sreturn -EIO ; } -#define SCAN_TIMEOUT 20000 +#define SCAN_TIMEOUT 30000void iwl_mvm_scan_timeout_wk (struct work_struct *work) {
Greg Kroah-Hartman
maintainerPATCH 857/1039 s390/mm: fix 2KB pgtable release race
In reply to Greg Kroah-HartmanFrom: Alexander Gordeev <[email protected]>
commit c2c224932fd0ee6854d6ebfc8d059c2bcad86606 upstream.
There is a race on concurrent 2KB-pgtables release paths when both upper and lower halves of the containing parent page are freed, one via page_table_free_rcu() + __tlb_remove_table(), and the other via page_table_free(). The race might lead to a corruption as result of remove of list item in page_table_free() concurrently with __free_page() in __tlb_remove_table().
Let's assume first the lower and next the upper 2KB-pgtables are freed from a page. Since both halves of the page are allocated the tracking byte (bits 24-31 of the page _refcount) has value of 0x03 initially:
CPU0 CPU1
---- ----
page_table_free_rcu() // lower half
{
// _refcount[31..24] == 0x03
...
atomic_xor_bits(&page->_refcount,
0x11U << (0 + 24));
// _refcount[31..24] <= 0x12
...
table = table | (1U << 0);
tlb_remove_table(tlb, table);
}
...
__tlb_remove_table()
{
// _refcount[31..24] == 0x12
mask = _table & 3;
// mask <= 0x01
...
page_table_free() // upper half
{
// _refcount[31..24] == 0x12
...
atomic_xor_bits(
&page->_refcount,
1U << (1 + 24));
// _refcount[31..24] <= 0x10
// mask <= 0x10
...
atomic_xor_bits(&page->_refcount,
mask << (4 + 24));
// _refcount[31..24] <= 0x00
// mask <= 0x00
...
if (mask != 0) // == false
break;
fallthrough;
...
if (mask & 3) // == false
...
else
__free_page(page); list_del(&page->lru);
^^^^^^^^^^^^^^^^^^ RACE! ^^^^^^^^^^^^^^^^^^^^^
} ...
}The problem is page_table_free() releases the page as result of lower nibble unset and __tlb_remove_table() observing zero too early. With this update page_table_free() will use the similar logic as page_table_free_rcu() + __tlb_remove_table(), and mark the fragment as pending for removal in the upper nibble until after the list_del().
In other words, the parent page is considered as unreferenced and safe to release only when the lower nibble is cleared already and unsetting a bit in upper nibble results in that nibble turned zero.
--- arch/s390/mm/pgalloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/s390/mm/pgalloc.c +3 -1
@@ -244,13 +244,15 @@ void page_table_free(struct mm_struct *m/* Free 2K page table fragment of a 4K page */ bit = ((unsigned long ) table & ~PAGE_MASK )/(PTRS_PER_PTE *sizeof (pte_t));spin_lock_bh (&mm->context.lock); - mask =atomic_xor_bits (&page->_refcount,1U << (bit +24 )); + mask =atomic_xor_bits (&page->_refcount,0x11U << (bit +24 )); mask >>=24 ;if (mask &3 )list_add (&page->lru, &mm->context.pgtable_list);else list_del (&page->lru);spin_unlock_bh (&mm->context.lock); + mask =atomic_xor_bits (&page->_refcount,0x10U << (bit +24 )); + mask >>=24 ;if (mask !=0 )return ; }else {
Greg Kroah-Hartman
maintainerPATCH 858/1039 device property: Fix fwnode_graph_devcon_match() fwnode leak
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
commit 4a7f4110f79163fd53ea65438041994ed615e3af upstream.
For each endpoint it encounters, fwnode_graph_devcon_match() checks whether the endpoint's remote port parent device is available. If it is not, it ignores the endpoint but does not put the reference to the remote endpoint port parent fwnode. For available devices the fwnode handle reference is put as expected.
Put the reference for unavailable devices now.
--- drivers/base/property.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/base/property.c +3 -1
@@ -1206,8 +1206,10 @@ fwnode_graph_devcon_match(struct fwnode_fwnode_graph_for_each_endpoint (fwnode, ep) { node =fwnode_graph_get_remote_port_parent (ep); -if (!fwnode_device_is_available (node)) +if (!fwnode_device_is_available (node)) { +fwnode_handle_put (node);continue ; + } ret =match (node, con_id, data);fwnode_handle_put (node);
Greg Kroah-Hartman
maintainerPATCH 859/1039 drm/tegra: submit: Add missing pm_runtime_mark_last_busy()
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit a21115dd38c6cf396ba39aefd561e7903ca6149d upstream.
Runtime PM auto-suspension doesn't work without pm_runtime_mark_last_busy(), add it.
--- drivers/gpu/drm/tegra/submit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/submit.c +3 -1
@@ -475,8 +475,10 @@ static void release_job(struct host1x_jokfree (job_data->used_mappings);kfree (job_data); -if (pm_runtime_enabled (client->base.dev)) +if (pm_runtime_enabled (client->base.dev)) { +pm_runtime_mark_last_busy (client->base.dev);pm_runtime_put_autosuspend (client->base.dev); + } } int tegra_drm_ioctl_channel_submit(struct drm_device *drm, void *data,
Greg Kroah-Hartman
maintainerPATCH 860/1039 drm/etnaviv: limit submit sizes
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 6dfa2fab8ddd46faa771a102672176bee7a065de upstream.
Currently we allow rediculous amounts of kernel memory being allocated via the etnaviv GEM_SUBMIT ioctl, which is a pretty easy DoS vector. Put some reasonable limits in to fix this.
The commandstream size is limited to 64KB, which was already a soft limit on older kernels after which the kernel only took submits on a best effort base, so there is no userspace that tries to submit commandstreams larger than this. Even if the whole commandstream is a single incrementing address load, the size limit also limits the number of potential relocs and referenced buffers to slightly under 64K, so use the same limit for those arguments. The performance monitoring infrastructure currently supports less than 50 performance counter signals, so limiting them to 128 on a single submit seems like a reasonably future-proof number for now. This number can be bumped if needed without breaking the interface.
--- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +6 -0
@@ -469,6 +469,12 @@ int etnaviv_ioctl_gem_submit(struct drm_return -EINVAL ; } +if (args->stream_size >SZ_64K || args->nr_relocs >SZ_64K || + args->nr_bos >SZ_64K || args->nr_pmrs >128 ) { +DRM_ERROR ("submit arguments out of size limits\n" ); +return -EINVAL ; + } +/* * Copy the command submission and bo array to kernel space in * one go, and do this outside of any locks.
Greg Kroah-Hartman
maintainerPATCH 861/1039 drm/amd/display: Fix the uninitialized variable in enable_stream_features()
In reply to Greg Kroah-HartmanFrom: Yizhuo Zhai <[email protected]>
commit 0726ed3065eeb910f9cea0c933bc021a848e00b3 upstream.
In function enable_stream_features(), the variable "old_downspread.raw" could be uninitialized if core_link_read_dpcd() fails, however, it is used in the later if statement, and further, core_link_write_dpcd() may write random value, which is potentially unsafe.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +2 -0
@@ -1844,6 +1844,8 @@ static void enable_stream_features(strucunion down_spread_ctrl old_downspread;union down_spread_ctrl new_downspread; +memset (&old_downspread,0 ,sizeof (old_downspread)); +core_link_read_dpcd (link,DP_DOWNSPREAD_CTRL , &old_downspread.raw,sizeof (old_downspread));
Greg Kroah-Hartman
maintainerPATCH 862/1039 drm/nouveau/kms/nv04: use vzalloc for nv04_display
In reply to Greg Kroah-HartmanFrom: Ilia Mirkin <[email protected]>
commit bd6e07e72f37f34535bec7eebc807e5fcfe37b43 upstream.
The struct is giant, and triggers an order-7 allocation (512K). There is no reason for this to be kmalloc-type memory, so switch to vmalloc. This should help loading nouveau on low-memory and/or long-running systems.
--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/disp.c +2 -2
@@ -205,7 +205,7 @@ nv04_display_destroy(struct drm_device *nvif_notify_dtor (&disp->flip);nouveau_display (dev)->priv =NULL ; -kfree (disp); +vfree (disp);nvif_object_unmap (&drm->client.device.object); }
@@ -223,7 +223,7 @@ nv04_display_create(struct drm_device *dstruct nv04_display *disp;int i, ret; - disp =kzalloc (sizeof (*disp),GFP_KERNEL ); + disp =vzalloc (sizeof (*disp));if (!disp)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 863/1039 drm/bridge: analogix_dp: Make PSR-exit block less
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit c4c6ef229593366ab593d4d424addc7025b54a76 upstream.
Prior to commit 6c836d965bad ("drm/rockchip: Use the helpers for PSR"), "PSR exit" used non-blocking analogix_dp_send_psr_spd(). The refactor started using the blocking variant, for a variety of reasons -- quoting Sean Paul's potentially-faulty memory:
"""
- To avoid racing a subsequent PSR entry (if exit takes a long time)
- To avoid racing disable/modeset
- We're not displaying new content while exiting PSR anyways, so there is minimal utility in allowing frames to be submitted
- We're lying to userspace telling them frames are on the screen when we're just dropping them on the floor
"""
However, I'm finding that this blocking transition is causing upwards of 60+ ms of unneeded latency on PSR-exit, to the point that initial cursor movements when leaving PSR are unbearably jumpy.
It turns out that we need to meet in the middle somewhere: Sean is right that we were "lying to userspace" with a non-blocking PSR-exit, but the new blocking behavior is also waiting too long:
According to the eDP specification, the sink device must support PSR entry transitions from both state 4 (ACTIVE_RESYNC) and state 0 (INACTIVE). It also states that in ACTIVE_RESYNC, "the Sink device must display the incoming active frames from the Source device with no visible glitches and/or artifacts."
Thus, for our purposes, we only need to wait for ACTIVE_RESYNC before moving on; we are ready to display video, and subsequent PSR-entry is safe.
Tested on a Samsung Chromebook Plus (i.e., Rockchip RK3399 Gru Kevin), where this saves about 60ms of latency, for PSR-exit that used to take about 80ms.
--- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +12 -2
@@ -998,11 +998,21 @@ int analogix_dp_send_psr_spd(struct analif (!blocking)return 0 ; +/* +* db[1]!=0: entering PSR, wait for fully active remote frame buffer. +* db[1]==0: exiting PSR, wait for either +* (a) ACTIVE_RESYNC - the sink "must display the +* incoming active frames from the Source device with no visible +* glitches and/or artifacts", even though timings may still be +* re-synchronizing; or +* (b) INACTIVE - the transition is fully complete. +*/ ret =readx_poll_timeout (analogix_dp_get_psr_status, dp, psr_status, psr_status >=0 && ((vsc->db[1 ] && psr_status ==DP_PSR_SINK_ACTIVE_RFB ) || - (!vsc->db[1 ] && psr_status ==DP_PSR_SINK_INACTIVE )),1500 , -DP_TIMEOUT_PSR_LOOP_MS *1000 ); + (!vsc->db[1 ] && (psr_status ==DP_PSR_SINK_ACTIVE_RESYNC || + psr_status ==DP_PSR_SINK_INACTIVE ))), +1500 ,DP_TIMEOUT_PSR_LOOP_MS *1000 );if (ret) {dev_warn (dp->dev,"Failed to apply PSR %d\n" , ret);return ret;
Greg Kroah-Hartman
maintainerPATCH 864/1039 parisc: Fix lpa and lpa_user defines
In reply to Greg Kroah-HartmanFrom: John David Anglin <[email protected]>
commit db19c6f1a2a353cc8dec35b4789733a3cf6e2838 upstream.
While working on the rewrite to the light-weight syscall and futex code, I experimented with using a hash index based on the user physical address of atomic variable. This exposed two problems with the lpa and lpa_user defines.
Because of the copy instruction, the pa argument needs to be an early clobber argument. This prevents gcc from allocating the va and pa arguments to the same register.
Secondly, the lpa instruction can cause a page fault so we need to catch exceptions.
--- arch/parisc/include/asm/special_insns.h | 44 +++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-)
arch/parisc/include/asm/special_insns.h +24 -20
@@ -2,28 +2,32 @@#ifndef __PARISC_SPECIAL_INSNS_H#define __PARISC_SPECIAL_INSNS_H -#define lpa (va) ({ \ - unsigned long pa; \ - __asm__ __volatile__( \ - "copy %%r0,%0\n\t" \ - "lpa %%r0(%1),%0" \ - : "=r" (pa) \ - : "r" (va) \ - : "memory" \ - ); \ - pa; \ +#define lpa (va) ({ \ + unsigned long pa; \ + __asm__ __volatile__( \ + "copy %%r0,%0\n" \ + "8:\tlpa %%r0(%1),%0\n" \ + "9:\n" \ + ASM_EXCEPTIONTABLE_ENTRY(8b, 9b) \ + : "=&r" (pa) \ + : "r" (va) \ + : "memory" \ + ); \ + pa; \ }) -#define lpa_user (va) ({ \ - unsigned long pa; \ - __asm__ __volatile__( \ - "copy %%r0,%0\n\t" \ - "lpa %%r0(%%sr3,%1),%0" \ - : "=r" (pa) \ - : "r" (va) \ - : "memory" \ - ); \ - pa; \ +#define lpa_user (va) ({ \ + unsigned long pa; \ + __asm__ __volatile__( \ + "copy %%r0,%0\n" \ + "8:\tlpa %%r0(%%sr3,%1),%0\n" \ + "9:\n" \ + ASM_EXCEPTIONTABLE_ENTRY(8b, 9b) \ + : "=&r" (pa) \ + : "r" (va) \ + : "memory" \ + ); \ + pa; \ })#define mfctl (reg) ({ \
Greg Kroah-Hartman
maintainerPATCH 865/1039 powerpc/64s/radix: Fix huge vmap false positive
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
commit 467ba14e1660b52a2f9338b484704c461bd23019 upstream.
pmd_huge() is defined to false when HUGETLB_PAGE is not configured, but the vmap code still installs huge PMDs. This leads to false bad PMD errors when vunmapping because it is not seen as a huge PTE, and the bad PMD check catches it. The end result may not be much more serious than some bad pmd warning messages, because the pmd_none_or_clear_bad() does what we wanted and clears the huge PTE anyway.
Fix this by checking pmd_is_leaf(), which checks for a PTE regardless of config options. The whole huge/large/leaf stuff is a tangled mess but that's kernel-wide and not something we can improve much in arch/powerpc code.
pmd_page(), pud_page(), etc., called by vmalloc_to_page() on huge vmaps can similarly trigger a false VM_BUG_ON when CONFIG_HUGETLB_PAGE=n, so those checks are adjusted. The checks were added by commit d6eacedd1f0e ("powerpc/book3s: Use config independent helpers for page table walk"), while implementing a similar fix for other page table walking functions.
--- arch/powerpc/mm/book3s64/radix_pgtable.c | 4 ++-- arch/powerpc/mm/pgtable_64.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-)
arch/powerpc/mm/book3s64/radix_pgtable.c +2 -2
@@ -1100,7 +1100,7 @@ int pud_set_huge(pud_t *pud, phys_addr_tint pud_clear_huge (pud_t *pud) { -if (pud_huge (*pud)) { +if (pud_is_leaf (*pud)) {pud_clear (pud);return 1 ; }
@@ -1147,7 +1147,7 @@ int pmd_set_huge(pmd_t *pmd, phys_addr_tint pmd_clear_huge (pmd_t *pmd) { -if (pmd_huge (*pmd)) { +if (pmd_is_leaf (*pmd)) {pmd_clear (pmd);return 1 ; }
arch/powerpc/mm/pgtable_64.c +11 -3
@@ -102,7 +102,8 @@ EXPORT_SYMBOL(__pte_frag_size_shift);struct page *p4d_page (p4d_t p4d) {if (p4d_is_leaf (p4d)) { -VM_WARN_ON (!p4d_huge (p4d)); +if (!IS_ENABLED (CONFIG_HAVE_ARCH_HUGE_VMAP )) +VM_WARN_ON (!p4d_huge (p4d));return pte_page (p4d_pte (p4d)); }return virt_to_page (p4d_pgtable (p4d));
@@ -112,7 +113,8 @@ struct page *p4d_page(p4d_t p4d)struct page *pud_page (pud_t pud) {if (pud_is_leaf (pud)) { -VM_WARN_ON (!pud_huge (pud)); +if (!IS_ENABLED (CONFIG_HAVE_ARCH_HUGE_VMAP )) +VM_WARN_ON (!pud_huge (pud));return pte_page (pud_pte (pud)); }return virt_to_page (pud_pgtable (pud));
@@ -125,7 +127,13 @@ struct page *pud_page(pud_t pud)struct page *pmd_page (pmd_t pmd) {if (pmd_is_leaf (pmd)) { -VM_WARN_ON (!(pmd_large (pmd) ||pmd_huge (pmd))); +/* +* vmalloc_to_page may be called on any vmap address (not only +* vmalloc), and it uses pmd_page() etc., when huge vmap is +* enabled so these checks can't be used. +*/ +if (!IS_ENABLED (CONFIG_HAVE_ARCH_HUGE_VMAP )) +VM_WARN_ON (!(pmd_large (pmd) ||pmd_huge (pmd)));return pte_page (pmd_pte (pmd)); }return virt_to_page (pmd_page_vaddr (pmd));
Greg Kroah-Hartman
maintainerPATCH 866/1039 scsi: lpfc: Fix lpfc_force_rscn ndlp kref imbalance
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
commit 7576d48c64f36f6fea9df2882f710a474fa35f40 upstream.
Issuing lpfc_force_rscn twice results in an ndlp kref use-after-free call trace.
A prior patch reworked the get/put handling by ensuring nlp_get was done before WQE submission and a put was done in the completion path. Unfortunately, the issue_els_rscn path had a piece of legacy code that did a nlp_put, causing an imbalance on the ref counts.
Fixed by removing the unnecessary legacy code snippet.
--- drivers/scsi/lpfc/lpfc_els.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +0 -5
@@ -3538,11 +3538,6 @@ lpfc_issue_els_rscn(struct lpfc_vport *vreturn 1 ; } -/* This will cause the callback-function lpfc_cmpl_els_cmd to -* trigger the release of node. -*/ -if (!(vport->fc_flag &FC_PT2PT )) -lpfc_nlp_put (ndlp);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 867/1039 drm/amdgpu: Use correct VIEWPORT_DIMENSION for DCN2
In reply to Greg Kroah-HartmanFrom: Harry Wentland <[email protected]>
commit dc5d4aff2e99c312df8abbe1ee9a731d2913bc1b upstream.
For some reason this file isn't using the appropriate register headers for DCN headers, which means that on DCN2 we're getting the VIEWPORT_DIMENSION offset wrong.
This means that we're not correctly carving out the framebuffer memory correctly for a framebuffer allocated by EFI and therefore see corruption when loading amdgpu before the display driver takes over control of the framebuffer scanout.
Fix this by checking the DCE_HWIP and picking the correct offset accordingly.
Long-term we should expose this info from DC as GMC shouldn't need to know about DCN registers.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +13 -1
@@ -72,6 +72,9 @@#define mmDCHUBBUB_SDPIF_MMIO_CNTRL_0 0x049d#define mmDCHUBBUB_SDPIF_MMIO_CNTRL_0_BASE_IDX 2 +#define mmHUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_DCN2 0x05ea +#define mmHUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_DCN2_BASE_IDX 2 +static const char *gfxhub_client_ids[] = {"CB" ,
@@ -1105,6 +1108,8 @@ static unsigned gmc_v9_0_get_vbios_fb_siu32 d1vga_control =RREG32_SOC15 (DCE ,0 , mmD1VGA_CONTROL);unsigned size; +/* TODO move to DC so GMC doesn't need to hard-code DCN registers */ +if (REG_GET_FIELD (d1vga_control,D1VGA_CONTROL ,D1VGA_MODE_ENABLE )) { size =AMDGPU_VBIOS_VGA_ALLOCATION ; }else {
@@ -1113,11 +1118,18 @@ static unsigned gmc_v9_0_get_vbios_fb_siswitch (adev->ip_versions[DCE_HWIP ][0 ]) {case IP_VERSION (1 ,0 ,0 ):case IP_VERSION (1 ,0 ,1 ): -case IP_VERSION (2 ,1 ,0 ): viewport =RREG32_SOC15 (DCE ,0 , mmHUBP0_DCSURF_PRI_VIEWPORT_DIMENSION); size = (REG_GET_FIELD (viewport,HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION ,PRI_VIEWPORT_HEIGHT ) *REG_GET_FIELD (viewport, +HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION ,PRI_VIEWPORT_WIDTH ) * +4 ); +break ; +case IP_VERSION (2 ,1 ,0 ): + viewport =RREG32_SOC15 (DCE ,0 , mmHUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_DCN2); + size = (REG_GET_FIELD (viewport, +HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION ,PRI_VIEWPORT_HEIGHT ) * +REG_GET_FIELD (viewport,HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION ,PRI_VIEWPORT_WIDTH ) *4 );break ;
Greg Kroah-Hartman
maintainerPATCH 868/1039 drm/amdgpu: Fix rejecting Tahiti GPUs
In reply to Greg Kroah-HartmanFrom: Lukas Fink <[email protected]>
commit 3993a799fc971bc9b918bd969aa55864447b5dde upstream.
eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device") added generic bindings to amdgpu so that that it binds to all display class devices with VID 0x1002 and then rejects those in amdgpu_pci_probe.
Unfortunately it reuses a driver_data value of 0 to detect those new bindings, which is already used to denote CHIP_TAHITI ASICs.
The driver_data value given to those new bindings was changed in dd0761fd24ea1 ("drm/amdgpu: set CHIP_IP_DISCOVERY as the asic type by default") to CHIP_IP_DISCOVERY (=36), but it seems that the check in amdgpu_pci_probe was forgotten to be changed. Therefore, it still rejects Tahiti GPUs.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -1928,7 +1928,7 @@ static int amdgpu_pci_probe(struct pci_dreturn -ENODEV ; } -if (flags ==0 ) { +if (flags ==CHIP_IP_DISCOVERY ) {DRM_INFO ("Unsupported asic. Remove me when IP discovery init is in place.\n" );return -ENODEV ; }
Greg Kroah-Hartman
maintainerPATCH 869/1039 drm/amdgpu: dont do resets on APUs which dont support it
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit e8309d50e97851ff135c4e33325d37b032666b94 upstream.
It can cause a hang. This is normally not enabled for GPU hangs on these asics, but was recently enabled for handling aborted suspends. This causes hangs on some platforms on suspend.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/vi.c | 4 ++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
@@ -1428,6 +1428,10 @@ static int cik_asic_reset(struct amdgpu_ {int r; +/* APUs don't have full asic reset */ +if (adev->flags &AMD_IS_APU ) +return 0 ; +if (cik_asic_reset_method (adev) ==AMD_RESET_METHOD_BACO ) {dev_info (adev->dev,"BACO reset\n" ); r =amdgpu_dpm_baco_reset (adev);
drivers/gpu/drm/amd/amdgpu/vi.c +4 -0
@@ -956,6 +956,10 @@ static int vi_asic_reset(struct amdgpu_d {int r; +/* APUs don't have full asic reset */ +if (adev->flags &AMD_IS_APU ) +return 0 ; +if (vi_asic_reset_method (adev) ==AMD_RESET_METHOD_BACO ) {dev_info (adev->dev,"BACO reset\n" ); r =amdgpu_dpm_baco_reset (adev);
Greg Kroah-Hartman
maintainerPATCH 870/1039 drm/amd/display: Revert W/A for hard hangs on DCN20/DCN21
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
commit c4849f88164b13dd141885e28210f599741b304b upstream.
The WA from commit 2a50edbf10c8 ("drm/amd/display: Apply w/a for hard hang on HPD") and commit 1bd3bc745e7f ("drm/amd/display: Extend w/a for hard hang on HPD to dcn20") causes a regression in s0ix where the system will fail to resume properly on many laptops. Pull the workarounds out to avoid that s0ix regression in the common case. This HPD hang happens with an external device in special circumstances and a new W/A will need to be developed for this in the future.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 11 ---- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 11 ---- drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c | 25 ----------- drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.h | 2 drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c | 25 ----------- drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.h | 2 drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 4 - 8 files changed, 3 insertions(+), 79 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +1 -10
@@ -38,7 +38,6 @@#include "clk/clk_11_0_0_offset.h" #include "clk/clk_11_0_0_sh_mask.h" -#include "irq/dcn20/irq_service_dcn20.h" #undef FN#define FN (reg_name, field_name) \
@@ -223,8 +222,6 @@ void dcn2_update_clocks(struct clk_mgr *bool force_reset = false;bool p_state_change_support;int total_plane_count; -int irq_src; -uint32_t hpd_state;if (dc->work_arounds.skip_clock_update)return ;
@@ -242,13 +239,7 @@ void dcn2_update_clocks(struct clk_mgr *if (dc->res_pool->pp_smu) pp_smu = &dc->res_pool->pp_smu->nv_funcs; -for (irq_src =DC_IRQ_SOURCE_HPD1 ; irq_src <=DC_IRQ_SOURCE_HPD6 ; irq_src++) { - hpd_state =dc_get_hpd_state_dcn20 (dc->res_pool->irqs, irq_src); -if (hpd_state) -break ; - } - -if (display_count ==0 && !hpd_state) +if (display_count ==0 ) enter_display_off = true;if (enter_display_off == safe_to_lower) {
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +1 -10
@@ -42,7 +42,6 @@#include "clk/clk_10_0_2_sh_mask.h" #include "renoir_ip_offset.h" -#include "irq/dcn21/irq_service_dcn21.h" /* Constants */
@@ -130,11 +129,9 @@ void rn_update_clocks(struct clk_mgr *clstruct dc_clocks *new_clocks = &context->bw_ctx.bw.dcn.clk;struct dc *dc = clk_mgr_base->ctx->dc;int display_count; -int irq_src;bool update_dppclk = false;bool update_dispclk = false;bool dpp_clock_lowered = false; -uint32_t hpd_state;struct dmcu *dmcu = clk_mgr_base->ctx->dc->res_pool->dmcu;
@@ -151,14 +148,8 @@ void rn_update_clocks(struct clk_mgr *cl display_count =rn_get_active_display_cnt_wa (dc, context); -for (irq_src =DC_IRQ_SOURCE_HPD1 ; irq_src <=DC_IRQ_SOURCE_HPD5 ; irq_src++) { - hpd_state =dc_get_hpd_state_dcn21 (dc->res_pool->irqs, irq_src); -if (hpd_state) -break ; - } -/* if we can go lower, go lower */ -if (display_count ==0 && !hpd_state) { +if (display_count ==0 ) {rn_vbios_smu_set_dcn_low_power_state (clk_mgr,DCN_PWR_STATE_LOW_POWER );/* update power state */ clk_mgr_base->clks.pwr_state =DCN_PWR_STATE_LOW_POWER ;
drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c +0 -25
@@ -132,31 +132,6 @@ enum dc_irq_source to_dal_irq_source_dcn } } -uint32_t dc_get_hpd_state_dcn20 (struct irq_service *irq_service,enum dc_irq_source source) -{ -const struct irq_source_info *info; -uint32_t addr; -uint32_t value; -uint32_t current_status; - - info =find_irq_source_info (irq_service, source); -if (!info) -return 0 ; - - addr = info->status_reg; -if (!addr) -return 0 ; - - value =dm_read_reg (irq_service->ctx, addr); - current_status = -get_reg_field_value ( - value, -HPD0_DC_HPD_INT_STATUS , -DC_HPD_SENSE ); - -return current_status; -} -static bool hpd_ack (struct irq_service *irq_service,const struct irq_source_info *info)
drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.h +0 -2
@@ -31,6 +31,4 @@struct irq_service *dal_irq_service_dcn20_create (struct irq_service_init_data *init_data); -uint32_t dc_get_hpd_state_dcn20 (struct irq_service *irq_service,enum dc_irq_source source); -#endif
drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c +0 -25
@@ -135,31 +135,6 @@ enum dc_irq_source to_dal_irq_source_dcnreturn DC_IRQ_SOURCE_INVALID ; } -uint32_t dc_get_hpd_state_dcn21 (struct irq_service *irq_service,enum dc_irq_source source) -{ -const struct irq_source_info *info; -uint32_t addr; -uint32_t value; -uint32_t current_status; - - info =find_irq_source_info (irq_service, source); -if (!info) -return 0 ; - - addr = info->status_reg; -if (!addr) -return 0 ; - - value =dm_read_reg (irq_service->ctx, addr); - current_status = -get_reg_field_value ( - value, -HPD0_DC_HPD_INT_STATUS , -DC_HPD_SENSE ); - -return current_status; -} -static bool hpd_ack (struct irq_service *irq_service,const struct irq_source_info *info)
drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.h +0 -2
@@ -31,6 +31,4 @@struct irq_service *dal_irq_service_dcn21_create (struct irq_service_init_data *init_data); -uint32_t dc_get_hpd_state_dcn21 (struct irq_service *irq_service,enum dc_irq_source source); -#endif
drivers/gpu/drm/amd/display/dc/irq/irq_service.c +1 -1
@@ -79,7 +79,7 @@ void dal_irq_service_destroy(struct irq_ *irq_service =NULL ; } -const struct irq_source_info *find_irq_source_info ( +static const struct irq_source_info *find_irq_source_info (struct irq_service *irq_service,enum dc_irq_source source) {
drivers/gpu/drm/amd/display/dc/irq/irq_service.h +0 -4
@@ -69,10 +69,6 @@ struct irq_service {const struct irq_service_funcs *funcs; }; -const struct irq_source_info *find_irq_source_info ( -struct irq_service *irq_service, -enum dc_irq_source source); -void dal_irq_service_construct (struct irq_service *irq_service,struct irq_service_init_data *init_data);
Greg Kroah-Hartman
maintainerPATCH 871/1039 drm/i915/display/ehl: Update voltage swing table
In reply to Greg Kroah-HartmanFrom: José Roberto de Souza <[email protected]>
commit ef3ac01564067a4337bb798b8eddc6ea7b78fd10 upstream.
EHL table was recently updated with some minor fixes.
BSpec: 21257
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +5 -5
@@ -477,14 +477,14 @@ static const struct intel_ddi_buf_transstatic const union intel_ddi_buf_trans_entry _ehl_combo_phy_trans_dp[] = {/* NT mV Trans mV db */ { .icl = {0xA ,0x33 ,0x3F ,0x00 ,0x00 } },/* 350 350 0.0 */ - { .icl = {0xA ,0x47 ,0x36 ,0x00 ,0x09 } },/* 350 500 3.1 */ - { .icl = {0xC ,0x64 ,0x34 ,0x00 ,0x0B } },/* 350 700 6.0 */ - { .icl = {0x6 ,0x7F ,0x30 ,0x00 ,0x0F } },/* 350 900 8.2 */ + { .icl = {0xA ,0x47 ,0x38 ,0x00 ,0x07 } },/* 350 500 3.1 */ + { .icl = {0xC ,0x64 ,0x33 ,0x00 ,0x0C } },/* 350 700 6.0 */ + { .icl = {0x6 ,0x7F ,0x2F ,0x00 ,0x10 } },/* 350 900 8.2 */ { .icl = {0xA ,0x46 ,0x3F ,0x00 ,0x00 } },/* 500 500 0.0 */ - { .icl = {0xC ,0x64 ,0x38 ,0x00 ,0x07 } },/* 500 700 2.9 */ + { .icl = {0xC ,0x64 ,0x37 ,0x00 ,0x08 } },/* 500 700 2.9 */ { .icl = {0x6 ,0x7F ,0x32 ,0x00 ,0x0D } },/* 500 900 5.1 */ { .icl = {0xC ,0x61 ,0x3F ,0x00 ,0x00 } },/* 650 700 0.6 */ - { .icl = {0x6 ,0x7F ,0x38 ,0x00 ,0x07 } },/* 600 900 3.5 */ + { .icl = {0x6 ,0x7F ,0x37 ,0x00 ,0x08 } },/* 600 900 3.5 */ { .icl = {0x6 ,0x7F ,0x3F ,0x00 ,0x00 } },/* 900 900 0.0 */ };
Greg Kroah-Hartman
maintainerPATCH 872/1039 PCI: xgene: Fix IB window setup
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
commit c7a75d07827a1f33d566e18e6098379cc2a0c2b2 upstream.
Commit 6dce5aa59e0b ("PCI: xgene: Use inbound resources for setup") broke PCI support on XGene. The cause is the IB resources are now sorted in address order instead of being in DT dma-ranges order. The result is which inbound registers are used for each region are swapped. I don't know the details about this h/w, but it appears that IB region 0 registers can't handle a size greater than 4GB. In any case, limiting the size for region 0 is enough to get back to the original assignment of dma-ranges to regions.
--- drivers/pci/controller/pci-xgene.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pci-xgene.c +1 -1
@@ -465,7 +465,7 @@ static int xgene_pcie_select_ib_reg(u8 *return 1 ; } -if ((size >SZ_1K ) && (size <SZ_1T ) && !(*ib_reg_mask & (1 <<0 ))) { +if ((size >SZ_1K ) && (size <SZ_4G ) && !(*ib_reg_mask & (1 <<0 ))) { *ib_reg_mask |= (1 <<0 );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 873/1039 PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 085a9f43433f30cbe8a1ade62d9d7827c3217f4d upstream.
Use down_read_nested() and down_write_nested() when taking the ctrl->reset_lock rw-sem, passing the number of PCIe hotplug controllers in the path to the PCI root bus as lock subclass parameter.
This fixes the following false-positive lockdep report when unplugging a Lenovo X1C8 from a Lenovo 2nd gen TB3 dock:
pcieport 0000:06:01.0: pciehp: Slot(1): Link Down
pcieport 0000:06:01.0: pciehp: Slot(1): Card not present
============================================
WARNING: possible recursive locking detected
5.16.0-rc2+ #621 Not tainted
--------------------------------------------
irq/124-pciehp/86 is trying to acquire lock:
ffff8e5ac4299ef8 (&ctrl->reset_lock){.+.+}-{3:3}, at: pciehp_check_presence+0x23/0x80
but task is already holding lock:
ffff8e5ac4298af8 (&ctrl->reset_lock){.+.+}-{3:3}, at: pciehp_ist+0xf3/0x180
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(&ctrl->reset_lock);
lock(&ctrl->reset_lock);*** DEADLOCK ***
May be due to missing lock nesting notation
3 locks held by irq/124-pciehp/86:
#0: ffff8e5ac4298af8 (&ctrl->reset_lock){.+.+}-{3:3}, at: pciehp_ist+0xf3/0x180 #1: ffffffffa3b024e8 (pci_rescan_remove_lock){+.+.}-{3:3}, at: pciehp_unconfigure_device+0x31/0x110 #2: ffff8e5ac1ee2248 (&dev->mutex){....}-{3:3}, at: device_release_driver+0x1c/0x40
stack backtrace: CPU: 4 PID: 86 Comm: irq/124-pciehp Not tainted 5.16.0-rc2+ #621 Hardware name: LENOVO 20U90SIT19/20U90SIT19, BIOS N2WET30W (1.20 ) 08/26/2021 Call Trace: <TASK> dump_stack_lvl+0x59/0x73 __lock_acquire.cold+0xc5/0x2c6 lock_acquire+0xb5/0x2b0 down_read+0x3e/0x50 pciehp_check_presence+0x23/0x80 pciehp_runtime_resume+0x5c/0xa0 device_for_each_child+0x45/0x70 pcie_port_device_runtime_resume+0x20/0x30 pci_pm_runtime_resume+0xa7/0xc0 __rpm_callback+0x41/0x110 rpm_callback+0x59/0x70 rpm_resume+0x512/0x7b0 __pm_runtime_resume+0x4a/0x90 __device_release_driver+0x28/0x240 device_release_driver+0x26/0x40 pci_stop_bus_device+0x68/0x90 pci_stop_bus_device+0x2c/0x90 pci_stop_and_remove_bus_device+0xe/0x20 pciehp_unconfigure_device+0x6c/0x110 pciehp_disable_slot+0x5b/0xe0 pciehp_handle_presence_or_link_change+0xc3/0x2f0 pciehp_ist+0x179/0x180
This lockdep warning is triggered because with Thunderbolt, hotplug ports are nested. When removing multiple devices in a daisy-chain, each hotplug port's reset_lock may be acquired recursively. It's never the same lock, so the lockdep splat is a false positive.
Because locks at the same hierarchy level are never acquired recursively, a per-level lockdep class is sufficient to fix the lockdep warning.
The choice to use one lockdep subclass per pcie-hotplug controller in the path to the root-bus was made to conserve class keys because their number is limited and the complexity grows quadratically with number of keys according to Documentation/locking/lockdep-design.rst.
--- drivers/pci/hotplug/pciehp.h | 3 +++ drivers/pci/hotplug/pciehp_core.c | 2 +- drivers/pci/hotplug/pciehp_hpc.c | 21 ++++++++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-)
drivers/pci/hotplug/pciehp.h +3 -0
@@ -75,6 +75,8 @@ extern int pciehp_poll_time;* @reset_lock: prevents access to the Data Link Layer Link Active bit in the * Link Status register and to the Presence Detect State bit in the Slot * Status register during a slot reset which may cause them to flap +* @depth: Number of additional hotplug ports in the path to the root bus, +* used as lock subclass for @reset_lock * @ist_running: flag to keep user request waiting while IRQ thread is running * @request_result: result of last user request submitted to the IRQ thread * @requester: wait queue to wake up on completion of user request,
@@ -106,6 +108,7 @@ struct controller {struct hotplug_slot hotplug_slot;/* hotplug core interface */ struct rw_semaphore reset_lock; +unsigned int depth;unsigned int ist_running;int request_result;wait_queue_head_t requester;
drivers/pci/hotplug/pciehp_core.c +1 -1
@@ -166,7 +166,7 @@ static void pciehp_check_presence(struct {int occupied; -down_read (&ctrl->reset_lock); +down_read_nested (&ctrl->reset_lock, ctrl->depth);mutex_lock (&ctrl->state_lock); occupied =pciehp_card_present_or_link_active (ctrl);
drivers/pci/hotplug/pciehp_hpc.c +18 -3
@@ -583,7 +583,7 @@ static void pciehp_ignore_dpc_link_chang* the corresponding link change may have been ignored above. * Synthesize it to ensure that it is acted on. */ -down_read (&ctrl->reset_lock); +down_read_nested (&ctrl->reset_lock, ctrl->depth);if (!pciehp_check_link_active (ctrl))pciehp_request (ctrl,PCI_EXP_SLTSTA_DLLSC );up_read (&ctrl->reset_lock);
@@ -746,7 +746,7 @@ static irqreturn_t pciehp_ist(int irq, v* Disable requests have higher priority than Presence Detect Changed * or Data Link Layer State Changed events. */ -down_read (&ctrl->reset_lock); +down_read_nested (&ctrl->reset_lock, ctrl->depth);if (events &DISABLE_SLOT )pciehp_handle_disable_request (ctrl);else if (events & (PCI_EXP_SLTSTA_PDC |PCI_EXP_SLTSTA_DLLSC ))
@@ -906,7 +906,7 @@ int pciehp_reset_slot(struct hotplug_sloif (probe)return 0 ; -down_write (&ctrl->reset_lock); +down_write_nested (&ctrl->reset_lock, ctrl->depth);if (!ATTN_BUTTN (ctrl)) { ctrl_mask |=PCI_EXP_SLTCTL_PDCE ;
@@ -962,6 +962,20 @@ static inline void dbg_ctrl(struct contr#define FLAG (x, y) (((x) & (y)) ? '+' : '-') +static inline int pcie_hotplug_depth (struct pci_dev *dev) +{ +struct pci_bus *bus = dev->bus; +int depth =0 ; + +while (bus->parent) { + bus = bus->parent; +if (bus->self && bus->self->is_hotplug_bridge) + depth++; + } + +return depth; +} +struct controller *pcie_init (struct pcie_device *dev) {struct controller *ctrl;
@@ -975,6 +989,7 @@ struct controller *pcie_init(struct pciereturn NULL ; ctrl->pcie = dev; + ctrl->depth =pcie_hotplug_depth (dev->port);pcie_capability_read_dword (pdev,PCI_EXP_SLTCAP , &slot_cap);if (pdev->hotplug_user_indicators)
Re: [PATCH 5.16 0873/1039] PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
Quoted 3 lines · Greg Kroah-Hartman
From: Hans de Goede <[email protected]>
commit
085a9f43433f30cbe8a1ade62d9d7827c3217f4dupstream.
I would hold off on backporting the pciehp changes until we resolve this regression in v5.17-rc1:
https://bugzilla.kernel.org/show_bug.cgi?id=215525
Quoted 183 lines
Use
down_read_nested()anddown_write_nested()when taking thectrl->reset_lockrw-sem, passing the number of PCIe hotplug controllers in the path to the PCI root bus as lock subclass parameter.This fixes the following false-positive lockdep report when unplugging a Lenovo X1C8 from a Lenovo 2nd gen TB3 dock:
pcieport 0000:06:01.0: pciehp: Slot(1): Link Down
pcieport 0000:06:01.0: pciehp: Slot(1): Card not present
============================================
WARNING: possible recursive locking detected
5.16.0-rc2+ #621 Not tainted
--------------------------------------------
irq/124-pciehp/86 is trying to acquire lock:
ffff8e5ac4299ef8(&ctrl->reset_lock){.+.+}-{3:3}, at:pciehp_check_presence+0x23/0x80but task is already holding lock:
ffff8e5ac4298af8(&ctrl->reset_lock){.+.+}-{3:3}, at:pciehp_ist+0xf3/0x180other info that might help us debug this: Possible unsafe locking scenario: CPU0 ---- lock(&ctrl->reset_lock); lock(&ctrl->reset_lock); *** DEADLOCK *** May be due to missing lock nesting notation3 locks held by irq/124-pciehp/86:
#0: ffff8e5ac4298af8 (&ctrl->reset_lock){.+.+}-{3:3}, at: pciehp_ist+0xf3/0x180 #1: ffffffffa3b024e8 (pci_rescan_remove_lock){+.+.}-{3:3}, at: pciehp_unconfigure_device+0x31/0x110 #2: ffff8e5ac1ee2248 (&dev->mutex){....}-{3:3}, at: device_release_driver+0x1c/0x40stack backtrace: CPU: 4 PID: 86 Comm: irq/124-pciehp Not tainted 5.16.0-rc2+ #621 Hardware name: LENOVO 20U90SIT19/20U90SIT19, BIOS N2WET30W (1.20 ) 08/26/2021 Call Trace: <TASK> dump_stack_lvl+0x59/0x73 __lock_acquire.cold+0xc5/0x2c6 lock_acquire+0xb5/0x2b0 down_read+0x3e/0x50 pciehp_check_presence+0x23/0x80 pciehp_runtime_resume+0x5c/0xa0 device_for_each_child+0x45/0x70 pcie_port_device_runtime_resume+0x20/0x30 pci_pm_runtime_resume+0xa7/0xc0 __rpm_callback+0x41/0x110 rpm_callback+0x59/0x70 rpm_resume+0x512/0x7b0 __pm_runtime_resume+0x4a/0x90 __device_release_driver+0x28/0x240 device_release_driver+0x26/0x40 pci_stop_bus_device+0x68/0x90 pci_stop_bus_device+0x2c/0x90 pci_stop_and_remove_bus_device+0xe/0x20 pciehp_unconfigure_device+0x6c/0x110 pciehp_disable_slot+0x5b/0xe0 pciehp_handle_presence_or_link_change+0xc3/0x2f0 pciehp_ist+0x179/0x180This lockdep warning is triggered because with Thunderbolt, hotplug ports are nested. When removing multiple devices in a daisy-chain, each hotplug port's
reset_lockmay be acquired recursively. It's never the same lock, so the lockdep splat is a false positive.Because locks at the same hierarchy level are never acquired recursively, a per-level lockdep class is sufficient to fix the lockdep warning.
The choice to use one lockdep subclass per pcie-hotplug controller in the path to the root-bus was made to conserve class keys because their number is limited and the complexity grows quadratically with number of keys according to
Documentation/locking/lockdep-design.rst.Reported-by "Theodore Ts'o" <[email protected]>Signed-off-by Hans de Goede <[email protected]>Signed-off-by Bjorn Helgaas <[email protected]>Reviewed-by Lukas Wunner <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/pci/hotplug/pciehp.h | 3 +++ drivers/pci/hotplug/pciehp_core.c | 2 +- drivers/pci/hotplug/pciehp_hpc.c | 21 ++++++++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-)drivers/pci/hotplug/pciehp.h +3
-0@@ -75,6 +75,8 @@ extern int pciehp_poll_time;* @reset_lock: prevents access to the Data Link Layer Link Active bit in the * Link Status register and to the Presence Detect State bit in the Slot * Status register during a slot reset which may cause them to flap +* @depth: Number of additional hotplug ports in the path to the root bus, +* used as lock subclass for @reset_lock * @ist_running: flag to keep user request waiting while IRQ thread is running * @request_result: result of last user request submitted to the IRQ thread * @requester: wait queue to wake up on completion of user request, @@ -106,6 +108,7 @@ struct controller {struct hotplug_slot hotplug_slot;/* hotplug core interface */ struct rw_semaphore reset_lock; +unsigned int depth;unsigned int ist_running;int request_result;wait_queue_head_t requester;drivers/pci/hotplug/pciehp_core.c +1
-1@@ -166,7 +166,7 @@ static void pciehp_check_presence(struct {int occupied; -down_read (&ctrl->reset_lock); +down_read_nested (&ctrl->reset_lock, ctrl->depth);mutex_lock (&ctrl->state_lock); occupied =pciehp_card_present_or_link_active (ctrl);drivers/pci/hotplug/pciehp_hpc.c +18
-3@@ -583,7 +583,7 @@ static void pciehp_ignore_dpc_link_chang* the corresponding link change may have been ignored above. * Synthesize it to ensure that it is acted on. */ -down_read (&ctrl->reset_lock); +down_read_nested (&ctrl->reset_lock, ctrl->depth);if (!pciehp_check_link_active (ctrl))pciehp_request (ctrl,PCI_EXP_SLTSTA_DLLSC );up_read (&ctrl->reset_lock);@@ -746,7 +746,7 @@ static irqreturn_t pciehp_ist(int irq, v* Disable requests have higher priority than Presence Detect Changed * or Data Link Layer State Changed events. */ -down_read (&ctrl->reset_lock); +down_read_nested (&ctrl->reset_lock, ctrl->depth);if (events &DISABLE_SLOT )pciehp_handle_disable_request (ctrl);else if (events & (PCI_EXP_SLTSTA_PDC |PCI_EXP_SLTSTA_DLLSC ))@@ -906,7 +906,7 @@ int pciehp_reset_slot(struct hotplug_sloif (probe)return 0 ; -down_write (&ctrl->reset_lock); +down_write_nested (&ctrl->reset_lock, ctrl->depth);if (!ATTN_BUTTN (ctrl)) { ctrl_mask |=PCI_EXP_SLTCTL_PDCE ;@@ -962,6 +962,20 @@ static inline void dbg_ctrl(struct contr#define FLAG (x, y) (((x) & (y)) ? '+' : '-') +static inline int pcie_hotplug_depth (struct pci_dev *dev) +{ +struct pci_bus *bus = dev->bus; +int depth =0 ; + +while (bus->parent) { + bus = bus->parent; +if (bus->self && bus->self->is_hotplug_bridge) + depth++; + } + +return depth; +} +struct controller *pcie_init (struct pcie_device *dev) {struct controller *ctrl;@@ -975,6 +989,7 @@ struct controller *pcie_init(struct pciereturn NULL ; ctrl->pcie = dev; + ctrl->depth =pcie_hotplug_depth (dev->port);pcie_capability_read_dword (pdev,PCI_EXP_SLTCAP , &slot_cap);if (pdev->hotplug_user_indicators)
Greg Kroah-Hartman
maintainerRe: [PATCH 5.16 0873/1039] PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
Quoted 9 lines · Bjorn Helgaas
Quoted 3 lines · Greg Kroah-Hartman
From: Hans de Goede <[email protected]>
commit
085a9f43433f30cbe8a1ade62d9d7827c3217f4dupstream.I would hold off on backporting the pciehp changes until we resolve this regression in v5.17-rc1:
Thanks, I will drop it from all queues now. If it gets resolved, please email stable@vger and we will be glad to add it back, along with the fix.
thanks,
greg k-h
Re: [PATCH 5.16 0873/1039] PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Bjorn Helgaas
Quoted 3 lines · Greg Kroah-Hartman
From: Hans de Goede <[email protected]>
commit
085a9f43433f30cbe8a1ade62d9d7827c3217f4dupstream.
Quoted 8 lines
Quoted 4 lines
I would hold off on backporting the pciehp changes until we resolve this regression in v5.17-rc1:
Thanks, I will drop it from all queues now. If it gets resolved, please email stable@vger and we will be glad to add it back, along with the fix.
This turned out not to be an actual regression. According to Bjorn, "it was arguably a bug that it *did* work before", see:
https://lore.kernel.org/linux-pci/20220202164308.GA17822@bhelgaas/
Also, the culprit was not pciehp, but rather a change to _OSC handling for VMD devices in commit 04b12ef163d1.
Thus, please consider re-adding these upstream commits to the stable queues:
085a9f43433f30cbe8a1ade62d9d7827c3217f4d (5.16, 5.15, 5.10) 23584c1ed3e15a6f4bfab8dc5a88d94ab929ee12 (5.16, 5.15, 5.10, 5.4)
The release numbers in parentheses are the ones you originally queued the commits up for.
Thanks!
Lukas
Greg Kroah-Hartman
maintainerRe: [PATCH 5.16 0873/1039] PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
Quoted 19 lines · Lukas Wunner
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Bjorn Helgaas
Quoted 3 lines · Greg Kroah-Hartman
From: Hans de Goede <[email protected]>
commit
085a9f43433f30cbe8a1ade62d9d7827c3217f4dupstream.Quoted 8 lines
Quoted 4 lines
I would hold off on backporting the pciehp changes until we resolve this regression in v5.17-rc1:
Thanks, I will drop it from all queues now. If it gets resolved, please email stable@vger and we will be glad to add it back, along with the fix.
This turned out not to be an actual regression. According to Bjorn, "it was arguably a bug that it *did* work before", see:
Quoted 8 lines
https://lore.kernel.org/linux-pci/20220202164308.GA17822@bhelgaas/
Also, the culprit was not pciehp, but rather a change to
_OSChandling for VMD devices in commit04b12ef163d1.Thus, please consider re-adding these upstream commits to the stable queues:
085a9f43433f30cbe8a1ade62d9d7827c3217f4d(5.16, 5.15, 5.10)
Already in the 5.10.94 5.15.17 5.16.3 releases :)
Quoted 1 line
23584c1ed3e15a6f4bfab8dc5a88d94ab929ee12(5.16, 5.15, 5.10, 5.4)
Now queued up, thanks.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 874/1039 PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 23584c1ed3e15a6f4bfab8dc5a88d94ab929ee12 upstream.
The Power Fault Detected bit in the Slot Status register differs from all other hotplug events in that it is sticky: It can only be cleared after turning off slot power. Per PCIe r5.0, sec. 6.7.1.8:
If a power controller detects a main power fault on the hot-plug slot, it must automatically set its internal main power fault latch [...]. The main power fault latch is cleared when software turns off power to the hot-plug slot.
The stickiness used to cause interrupt storms and infinite loops which were fixed in 2009 by commits 5651c48cfafe ("PCI pciehp: fix power fault interrupt storm problem") and 99f0169c17f3 ("PCI: pciehp: enable software notification on empty slots").
Unfortunately in 2020 the infinite loop issue was inadvertently reintroduced by commit 8edf5332c393 ("PCI: pciehp: Fix MSI interrupt race"): The hardirq handler pciehp_isr() clears the PFD bit until pciehp's power_fault_detected flag is set. That happens in the IRQ thread pciehp_ist(), which never learns of the event because the hardirq handler is stuck in an infinite loop. Fix by setting the power_fault_detected flag already in the hardirq handler.
--- drivers/pci/hotplug/pciehp_hpc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/pci/hotplug/pciehp_hpc.c +4 -3
@@ -642,6 +642,8 @@ read_status:*/ if (ctrl->power_fault_detected) status &= ~PCI_EXP_SLTSTA_PFD ; +else if (status &PCI_EXP_SLTSTA_PFD ) + ctrl->power_fault_detected = true; events |= status;if (!events) {
@@ -651,7 +653,7 @@ read_status: }if (status) { -pcie_capability_write_word (pdev,PCI_EXP_SLTSTA , events); +pcie_capability_write_word (pdev,PCI_EXP_SLTSTA , status);/* * In MSI mode, all event bits must be zero before the port
@@ -725,8 +727,7 @@ static irqreturn_t pciehp_ist(int irq, v }/* Check Power Fault Detected */ -if ((events &PCI_EXP_SLTSTA_PFD ) && !ctrl->power_fault_detected) { - ctrl->power_fault_detected =1 ; +if (events &PCI_EXP_SLTSTA_PFD ) {ctrl_err (ctrl,"Slot(%s): Power fault\n" ,slot_name (ctrl));pciehp_set_indicators (ctrl,PCI_EXP_SLTCTL_PWR_IND_OFF ,PCI_EXP_SLTCTL_ATTN_IND_ON );
Greg Kroah-Hartman
maintainerPATCH 875/1039 PCI: pci-bridge-emul: Make expansion ROM Base Address register read-only
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 1c1a3b4d3e86b997a313ffb297c1129540882859 upstream.
If expansion ROM is unsupported (which is the case of pci-bridge-emul.c driver) then ROM Base Address register must be implemented as read-only register that return 0 when read, same as for unused Base Address registers.
--- drivers/pci/pci-bridge-emul.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pci/pci-bridge-emul.c +6 -1
@@ -139,8 +139,13 @@ struct pci_bridge_reg_behavior pci_regs_ .ro = GENMASK(7, 0), }, +/* +* If expansion ROM is unsupported then ROM Base Address register must +* be implemented as read-only register that return 0 when read, same +* as for unused Base Address registers. +*/ [PCI_ROM_ADDRESS1 / 4] = { - .rw = GENMASK(31, 11) | BIT(0), + .ro = ~0, },/*
Greg Kroah-Hartman
maintainerPATCH 876/1039 PCI: pci-bridge-emul: Properly mark reserved PCIe bits in PCI config space
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 7b067ac63a5730d2fae18399fed7e45f23d36912 upstream.
Some bits in PCI config space are reserved when device is PCIe. Properly define behavior of PCI registers for PCIe emulated bridge and ensure that it would not be possible change these reserved bits.
--- drivers/pci/pci-bridge-emul.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/pci/pci-bridge-emul.c +21 -0
@@ -295,6 +295,27 @@ int pci_bridge_emul_init(struct pci_bridkfree (bridge->pci_regs_behavior);return -ENOMEM ; } +/* These bits are applicable only for PCI and reserved on PCIe */ + bridge->pci_regs_behavior[PCI_CACHE_LINE_SIZE /4 ].ro &= + ~GENMASK (15 ,8 ); + bridge->pci_regs_behavior[PCI_COMMAND /4 ].ro &= + ~((PCI_COMMAND_SPECIAL |PCI_COMMAND_INVALIDATE | +PCI_COMMAND_VGA_PALETTE |PCI_COMMAND_WAIT | +PCI_COMMAND_FAST_BACK ) | + (PCI_STATUS_66MHZ |PCI_STATUS_FAST_BACK | +PCI_STATUS_DEVSEL_MASK ) <<16 ); + bridge->pci_regs_behavior[PCI_PRIMARY_BUS /4 ].ro &= + ~GENMASK (31 ,24 ); + bridge->pci_regs_behavior[PCI_IO_BASE /4 ].ro &= + ~((PCI_STATUS_66MHZ |PCI_STATUS_FAST_BACK | +PCI_STATUS_DEVSEL_MASK ) <<16 ); + bridge->pci_regs_behavior[PCI_INTERRUPT_LINE /4 ].rw &= + ~((PCI_BRIDGE_CTL_MASTER_ABORT | +BIT (8 ) |BIT (9 ) |BIT (11 )) <<16 ); + bridge->pci_regs_behavior[PCI_INTERRUPT_LINE /4 ].ro &= + ~((PCI_BRIDGE_CTL_FAST_BACK ) <<16 ); + bridge->pci_regs_behavior[PCI_INTERRUPT_LINE /4 ].w1c &= + ~(BIT (10 ) <<16 ); }if (flags &PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR ) {
Greg Kroah-Hartman
maintainerPATCH 877/1039 PCI: pci-bridge-emul: Fix definitions of reserved bits
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 12998087d9f48b66965b97412069c7826502cd7e upstream.
Some bits in PCI_EXP registers are reserved for non-root ports. Driver pci-bridge-emul.c implements PCIe Root Port device therefore it should not allow setting reserved bits of registers.
Properly define non-reserved bits for all PCI_EXP registers.
--- drivers/pci/pci-bridge-emul.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)
drivers/pci/pci-bridge-emul.c +25 -11
@@ -176,41 +176,55 @@ struct pci_bridge_reg_behavior pcie_cap_ [PCI_CAP_LIST_ID / 4] = {/* * Capability ID, Next Capability Pointer and -* Capabilities register are all read-only. +* bits [14:0] of Capabilities register are all read-only. +* Bit 15 of Capabilities register is reserved. */ - .ro = ~0, + .ro = GENMASK(30, 0), }, [PCI_EXP_DEVCAP / 4] = { - .ro = ~0, +/* +* Bits [31:29] and [17:16] are reserved. +* Bits [27:18] are reserved for non-upstream ports. +* Bits 28 and [14:6] are reserved for non-endpoint devices. +* Other bits are read-only. +*/ + .ro = BIT(15) | GENMASK(5, 0), }, [PCI_EXP_DEVCTL / 4] = { -/* Device control register is RW */ - .rw = GENMASK(15, 0), +/* +* Device control register is RW, except bit 15 which is +* reserved for non-endpoints or non-PCIe-to-PCI/X bridges. +*/ + .rw = GENMASK(14, 0),/* * Device status register has bits 6 and [3:0] W1C, [5:4] RO, -* the rest is reserved +* the rest is reserved. Also bit 6 is reserved for non-upstream +* ports. */ - .w1c = (BIT(6) | GENMASK(3, 0)) << 16, + .w1c = GENMASK(3, 0) << 16, .ro = GENMASK(5, 4) << 16, }, [PCI_EXP_LNKCAP / 4] = { -/* All bits are RO, except bit 23 which is reserved */ - .ro = lower_32_bits(~BIT(23)), +/* +* All bits are RO, except bit 23 which is reserved and +* bit 18 which is reserved for non-upstream ports. +*/ + .ro = lower_32_bits(~(BIT(23) | PCI_EXP_LNKCAP_CLKPM)), }, [PCI_EXP_LNKCTL / 4] = {/* * Link control has bits [15:14], [11:3] and [1:0] RW, the -* rest is reserved. +* rest is reserved. Bit 8 is reserved for non-upstream ports. * * Link status has bits [13:0] RO, and bits [15:14] * W1C. */ - .rw = GENMASK(15, 14) | GENMASK(11, 3) | GENMASK(1, 0), + .rw = GENMASK(15, 14) | GENMASK(11, 9) | GENMASK(7, 3) | GENMASK(1, 0), .ro = GENMASK(13, 0) << 16, .w1c = GENMASK(15, 14) << 16, },
Greg Kroah-Hartman
maintainerPATCH 878/1039 PCI: pci-bridge-emul: Correctly set PCIe capabilities
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 1f1050c5e1fefb34ac90a506b43e9da803b5f8f7 upstream.
Older mvebu hardware provides PCIe Capability structure only in version 1. New mvebu and aardvark hardware provides it in version 2. So do not force version to 2 in pci_bridge_emul_init() and rather allow drivers to set correct version. Drivers need to set version in pcie_conf.cap field without overwriting PCI_CAP_LIST_ID register. Both drivers (mvebu and aardvark) do not provide slot support yet, so do not set PCI_EXP_FLAGS_SLOT flag.
--- drivers/pci/controller/pci-aardvark.c | 4 +++- drivers/pci/controller/pci-mvebu.c | 8 ++++++++ drivers/pci/pci-bridge-emul.c | 5 +---- 3 files changed, 12 insertions(+), 5 deletions(-)
drivers/pci/controller/pci-aardvark.c +3 -1
@@ -872,7 +872,6 @@ advk_pci_bridge_emul_pcie_conf_read(strureturn PCI_BRIDGE_EMUL_HANDLED ; } -case PCI_CAP_LIST_ID :case PCI_EXP_DEVCAP :case PCI_EXP_DEVCTL : *value =advk_readl (pcie,PCIE_CORE_PCIEXP_CAP + reg);
@@ -953,6 +952,9 @@ static int advk_sw_pci_bridge_init(struc/* Support interrupt A for MSI feature */ bridge->conf.intpin =PCIE_CORE_INT_A_ASSERT_ENABLE ; +/* Aardvark HW provides PCIe Capability structure in version 2 */ + bridge->pcie_conf.cap =cpu_to_le16 (2 ); +/* Indicates supports for Completion Retry Status */ bridge->pcie_conf.rootcap =cpu_to_le16 (PCI_EXP_RTCAP_CRSVIS );
drivers/pci/controller/pci-mvebu.c +8 -0
@@ -655,6 +655,8 @@ static struct pci_bridge_emul_ops mvebu_static int mvebu_pci_bridge_emul_init (struct mvebu_pcie_port *port) {struct pci_bridge_emul *bridge = &port->bridge; +u32 pcie_cap =mvebu_readl (port,PCIE_CAP_PCIEXP ); +u8 pcie_cap_ver = ((pcie_cap >>16 ) &PCI_EXP_FLAGS_VERS ); bridge->conf.vendor =PCI_VENDOR_ID_MARVELL ; bridge->conf.device =mvebu_readl (port,PCIE_DEV_ID_OFF ) >>16 ;
@@ -667,6 +669,12 @@ static int mvebu_pci_bridge_emul_init(st bridge->conf.iolimit =PCI_IO_RANGE_TYPE_32 ; } +/* +* Older mvebu hardware provides PCIe Capability structure only in +* version 1. New hardware provides it in version 2. +*/ + bridge->pcie_conf.cap =cpu_to_le16 (pcie_cap_ver); + bridge->has_pcie = true; bridge->data = port; bridge->ops = &mvebu_pci_bridge_emul_ops;
drivers/pci/pci-bridge-emul.c +1 -4
@@ -297,10 +297,7 @@ int pci_bridge_emul_init(struct pci_bridif (bridge->has_pcie) { bridge->conf.capabilities_pointer =PCI_CAP_PCIE_START ; bridge->pcie_conf.cap_id =PCI_CAP_ID_EXP ; -/* Set PCIe v2, root port, slot support */ - bridge->pcie_conf.cap = -cpu_to_le16 (PCI_EXP_TYPE_ROOT_PORT <<4 |2 | -PCI_EXP_FLAGS_SLOT ); + bridge->pcie_conf.cap |=cpu_to_le16 (PCI_EXP_TYPE_ROOT_PORT <<4 ); bridge->pcie_cap_regs_behavior = kmemdup(pcie_cap_regs_behavior, sizeof(pcie_cap_regs_behavior),
Greg Kroah-Hartman
maintainerPATCH 879/1039 PCI: pci-bridge-emul: Set PCI_STATUS_CAP_LIST for PCIe device
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 3be9d243b21724d49b65043d4520d688b6040b36 upstream.
Since all PCI Express device Functions are required to implement the PCI Express Capability structure, Capabilities List bit in PCI Status Register must be hardwired to 1b. Capabilities Pointer register (which is already set by pci-bride-emul.c driver) is valid only when Capabilities List is set to 1b.
--- drivers/pci/pci-bridge-emul.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/pci-bridge-emul.c +1 -0
@@ -296,6 +296,7 @@ int pci_bridge_emul_init(struct pci_bridif (bridge->has_pcie) { bridge->conf.capabilities_pointer =PCI_CAP_PCIE_START ; + bridge->conf.status |=cpu_to_le16 (PCI_STATUS_CAP_LIST ); bridge->pcie_conf.cap_id =PCI_CAP_ID_EXP ; bridge->pcie_conf.cap |=cpu_to_le16 (PCI_EXP_TYPE_ROOT_PORT <<4 ); bridge->pcie_cap_regs_behavior =
Greg Kroah-Hartman
maintainerPATCH 880/1039 xfrm: fix policy lookup for ipv6 gre packets
In reply to Greg Kroah-HartmanFrom: Ghalem Boudour <[email protected]>
commit bcf141b2eb551b3477b24997ebc09c65f117a803 upstream.
On egress side, xfrm lookup is called from __gre6_xmit() with the fl6_gre_key field not initialized leading to policies selectors check failure. Consequently, gre packets are sent without encryption.
On ingress side, INET6_PROTO_NOPOLICY was set, thus packets were not checked against xfrm policies. Like for egress side, fl6_gre_key should be correctly set, this is now done in decode_session6().
--- net/ipv6/ip6_gre.c | 5 ++++- net/xfrm/xfrm_policy.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-)
net/ipv6/ip6_gre.c +4 -1
@@ -755,6 +755,7 @@ static netdev_tx_t __gre6_xmit(struct sk fl6->daddr = key->u.ipv6.dst; fl6->flowlabel = key->label; fl6->flowi6_uid =sock_net_uid (dev_net (dev),NULL ); + fl6->fl6_gre_key =tunnel_id_to_key32 (key->tun_id); dsfield = key->tos; flags = key->tun_flags &
@@ -990,6 +991,7 @@ static netdev_tx_t ip6erspan_tunnel_xmit fl6.daddr = key->u.ipv6.dst; fl6.flowlabel = key->label; fl6.flowi6_uid =sock_net_uid (dev_net (dev),NULL ); + fl6.fl6_gre_key =tunnel_id_to_key32 (key->tun_id); dsfield = key->tos;if (!(tun_info->key.tun_flags &TUNNEL_ERSPAN_OPT ))
@@ -1098,6 +1100,7 @@ static void ip6gre_tnl_link_config_commo fl6->flowi6_oif = p->link; fl6->flowlabel =0 ; fl6->flowi6_proto =IPPROTO_GRE ; + fl6->fl6_gre_key = t->parms.o_key;if (!(p->flags&IP6_TNL_F_USE_ORIG_TCLASS )) fl6->flowlabel |=IPV6_TCLASS_MASK & p->flowinfo;
@@ -1544,7 +1547,7 @@ static void ip6gre_fb_tunnel_init(structstatic struct inet6_protocol ip6gre_protocol__read_mostly = { .handler = gre_rcv, .err_handler = ip6gre_err, - .flags =INET6_PROTO_NOPOLICY |INET6_PROTO_FINAL , + .flags =INET6_PROTO_FINAL , };static void ip6gre_destroy_tunnels (struct net *net,struct list_head *head)
net/xfrm/xfrm_policy.c +21 -0
@@ -33,6 +33,7 @@#include <net/flow.h> #include <net/xfrm.h> #include <net/ip.h> +#include <net/gre.h> #if IS_ENABLED (CONFIG_IPV6_MIP6 )#include <net/mip6.h> #endif
@@ -3422,6 +3423,26 @@ decode_session6(struct sk_buff *skb, str } fl6->flowi6_proto = nexthdr;return ; +case IPPROTO_GRE : +if (!onlyproto && + (nh + offset +12 < skb->data || +pskb_may_pull (skb, nh + offset +12 - skb->data))) { +struct gre_base_hdr *gre_hdr; +__be32 *gre_key; + + nh =skb_network_header (skb); + gre_hdr = (struct gre_base_hdr *)(nh + offset); + gre_key = (__be32 *)(gre_hdr +1 ); + +if (gre_hdr->flags &GRE_KEY ) { +if (gre_hdr->flags &GRE_CSUM ) + gre_key++; + fl6->fl6_gre_key = *gre_key; + } + } + fl6->flowi6_proto = nexthdr; +return ; +#if IS_ENABLED (CONFIG_IPV6_MIP6 )case IPPROTO_MH : offset +=ipv6_optlen (exthdr);
Greg Kroah-Hartman
maintainerPATCH 881/1039 xfrm: fix dflt policy check when there is no policy configured
In reply to Greg Kroah-HartmanFrom: Nicolas Dichtel <[email protected]>
commit ec3bb890817e4398f2d46e12e2e205495b116be9 upstream.
When there is no policy configured on the system, the default policy is checked in xfrm_route_forward. However, it was done with the wrong direction (XFRM_POLICY_FWD instead of XFRM_POLICY_OUT).
The default policy for XFRM_POLICY_FWD was checked just before, with a call to xfrm[46]_policy_check().
--- include/net/xfrm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/xfrm.h +1 -1
@@ -1167,7 +1167,7 @@ static inline int xfrm_route_forward(str {struct net *net =dev_net (skb->dev); -if (xfrm_default_allow (net,XFRM_POLICY_FWD )) +if (xfrm_default_allow (net,XFRM_POLICY_OUT ))return !net->xfrm.policy_count[XFRM_POLICY_OUT ] || (skb_dst (skb)->flags &DST_NOXFRM ) ||__xfrm_route_forward (skb, family);
Greg Kroah-Hartman
maintainerPATCH 882/1039 btrfs: fix deadlock between quota enable and other quota operations
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 232796df8c1437c41d308d161007f0715bac0a54 upstream.
When enabling quotas, we attempt to commit a transaction while holding the mutex fs_info->qgroup_ioctl_lock. This can result on a deadlock with other quota operations such as:
- qgroup creation and deletion, ioctl BTRFS_IOC_QGROUP_CREATE;
- adding and removing qgroup relations, ioctl BTRFS_IOC_QGROUP_ASSIGN.
This is because these operations join a transaction and after that they attempt to lock the mutex fs_info->qgroup_ioctl_lock. Acquiring that mutex after joining or starting a transaction is a pattern followed everywhere in qgroups, so the quota enablement operation is the one at fault here, and should not commit a transaction while holding that mutex.
Fix this by making the transaction commit while not holding the mutex. We are safe from two concurrent tasks trying to enable quotas because we are serialized by the rw semaphore fs_info->subvol_sem at btrfs_ioctl_quota_ctl(), which is the only call site for enabling quotas.
When this deadlock happens, it produces a trace like the following:
INFO: task syz-executor:25604 blocked for more than 143 seconds. Not tainted 5.15.0-rc6 #4 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:syz-executor state:D stack:24800 pid:25604 ppid: 24873 flags:0x00004004 Call Trace: context_switch kernel/sched/core.c:4940 [inline] __schedule+0xcd9/0x2530 kernel/sched/core.c:6287 schedule+0xd3/0x270 kernel/sched/core.c:6366 btrfs_commit_transaction+0x994/0x2e90 fs/btrfs/transaction.c:2201 btrfs_quota_enable+0x95c/0x1790 fs/btrfs/qgroup.c:1120 btrfs_ioctl_quota_ctl fs/btrfs/ioctl.c:4229 [inline] btrfs_ioctl+0x637e/0x7b70 fs/btrfs/ioctl.c:5010 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f86920b2c4d RSP: 002b:00007f868f61ac58 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007f86921d90a0 RCX: 00007f86920b2c4d RDX: 0000000020005e40 RSI: 00000000c0109428 RDI: 0000000000000008 RBP: 00007f869212bd80 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f86921d90a0 R13: 00007fff6d233e4f R14: 00007fff6d233ff0 R15: 00007f868f61adc0 INFO: task syz-executor:25628 blocked for more than 143 seconds. Not tainted 5.15.0-rc6 #4 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:syz-executor state:D stack:29080 pid:25628 ppid: 24873 flags:0x00004004 Call Trace: context_switch kernel/sched/core.c:4940 [inline] __schedule+0xcd9/0x2530 kernel/sched/core.c:6287 schedule+0xd3/0x270 kernel/sched/core.c:6366 schedule_preempt_disabled+0xf/0x20 kernel/sched/core.c:6425 __mutex_lock_common kernel/locking/mutex.c:669 [inline] __mutex_lock+0xc96/0x1680 kernel/locking/mutex.c:729 btrfs_remove_qgroup+0xb7/0x7d0 fs/btrfs/qgroup.c:1548 btrfs_ioctl_qgroup_create fs/btrfs/ioctl.c:4333 [inline] btrfs_ioctl+0x683c/0x7b70 fs/btrfs/ioctl.c:5014 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- fs/btrfs/qgroup.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
fs/btrfs/qgroup.c +19 -0
@@ -940,6 +940,14 @@ int btrfs_quota_enable(struct btrfs_fs_iint ret =0 ;int slot; +/* +* We need to have subvol_sem write locked, to prevent races between +* concurrent tasks trying to enable quotas, because we will unlock +* and relock qgroup_ioctl_lock before setting fs_info->quota_root +* and before setting BTRFS_FS_QUOTA_ENABLED. +*/ +lockdep_assert_held_write (&fs_info->subvol_sem); +mutex_lock (&fs_info->qgroup_ioctl_lock);if (fs_info->quota_root) goto out;
@@ -1117,8 +1125,19 @@ out_add_root: goto out_free_path; } +mutex_unlock (&fs_info->qgroup_ioctl_lock); +/* +* Commit the transaction while not holding qgroup_ioctl_lock, to avoid +* a deadlock with tasks concurrently doing other qgroup operations, such +* adding/removing qgroups or adding/deleting qgroup relations for example, +* because all qgroup operations first start or join a transaction and then +* lock the qgroup_ioctl_lock mutex. +* We are safe from a concurrent task trying to enable quotas, by calling +* this function, since we are serialized by fs_info->subvol_sem. +*/ ret =btrfs_commit_transaction (trans); trans =NULL ; +mutex_lock (&fs_info->qgroup_ioctl_lock);if (ret) goto out_free_path;
Greg Kroah-Hartman
maintainerPATCH 883/1039 btrfs: zoned: cache reported zone during mount
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit 16beac87e95e2fb278b552397c8260637f8a63f7 upstream.
When mounting a device, we are reporting the zones twice: once for checking the zone attributes in btrfs_get_dev_zone_info and once for loading block groups' zone info in btrfs_load_block_group_zone_info(). With a lot of block groups, that leads to a lot of REPORT ZONE commands and slows down the mount process.
This patch introduces a zone info cache in struct btrfs_zoned_device_info. The cache is populated while in btrfs_get_dev_zone_info() and used for btrfs_load_block_group_zone_info() to reduce the number of REPORT ZONE commands. The zone cache is then released after loading the block groups, as it will not be much effective during the run time.
Benchmark: Mount an HDD with 57,007 block groups
Before patch: 171.368 seconds
After patch: 64.064 seconds
While it still takes a minute due to the slowness of loading all the block groups, the patch reduces the mount time by 1/3.
--- fs/btrfs/dev-replace.c | 2 - fs/btrfs/disk-io.c | 2 + fs/btrfs/volumes.c | 2 - fs/btrfs/zoned.c | 86 +++++++++++++++++++++++++++++++++++++++++++------ fs/btrfs/zoned.h | 8 +++- 5 files changed, 87 insertions(+), 13 deletions(-)
fs/btrfs/dev-replace.c +1 -1
@@ -322,7 +322,7 @@ static int btrfs_init_dev_replace_tgtdevset_blocksize (device->bdev,BTRFS_BDEV_BLOCKSIZE ); device->fs_devices = fs_info->fs_devices; - ret =btrfs_get_dev_zone_info (device); + ret =btrfs_get_dev_zone_info (device, false);if (ret) goto error;
fs/btrfs/disk-io.c +2 -0
@@ -3571,6 +3571,8 @@ int __cold open_ctree(struct super_block goto fail_sysfs; } +btrfs_free_zone_cache (fs_info); +if (!sb_rdonly (sb) && fs_info->fs_devices->missing_devices && !btrfs_check_rw_degradable (fs_info,NULL )) { btrfs_warn(fs_info,
fs/btrfs/volumes.c +1 -1
@@ -2643,7 +2643,7 @@ int btrfs_init_new_device(struct btrfs_f device->fs_info = fs_info; device->bdev = bdev; - ret =btrfs_get_dev_zone_info (device); + ret =btrfs_get_dev_zone_info (device, false);if (ret) goto error_free_device;
fs/btrfs/zoned.c +77 -9
155 lines not on this page · raw message
fs/btrfs/zoned.h +6 -2
@@ -28,6 +28,7 @@ struct btrfs_zoned_device_info {unsigned long *seq_zones;unsigned long *empty_zones;unsigned long *active_zones; +struct blk_zone *zone_cache;struct blk_zone sb_zones[2 *BTRFS_SUPER_MIRROR_MAX ]; };
@@ -35,7 +36,7 @@ struct btrfs_zoned_device_info {int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone);int btrfs_get_dev_zone_info_all_devices (struct btrfs_fs_info *fs_info); -int btrfs_get_dev_zone_info (struct btrfs_device *device); +int btrfs_get_dev_zone_info (struct btrfs_device *device,bool populate_cache);void btrfs_destroy_dev_zone_info (struct btrfs_device *device);int btrfs_check_zoned_mode (struct btrfs_fs_info *fs_info);int btrfs_check_mountopts_zoned (struct btrfs_fs_info *info);
@@ -76,6 +77,7 @@ bool btrfs_can_activate_zone(struct btrfvoid btrfs_zone_finish_endio (struct btrfs_fs_info *fs_info,u64 logical,u64 length);void btrfs_clear_data_reloc_bg (struct btrfs_block_group *bg); +void btrfs_free_zone_cache (struct btrfs_fs_info *fs_info);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -88,7 +90,8 @@ static inline int btrfs_get_dev_zone_infreturn 0 ; } -static inline int btrfs_get_dev_zone_info (struct btrfs_device *device) +static inline int btrfs_get_dev_zone_info (struct btrfs_device *device, +bool populate_cache) {return 0 ; }
@@ -232,6 +235,7 @@ static inline void btrfs_zone_finish_endstatic inline void btrfs_clear_data_reloc_bg (struct btrfs_block_group *bg) { } +static inline void btrfs_free_zone_cache (struct btrfs_fs_info *fs_info) { }#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Greg Kroah-Hartman
maintainerPATCH 884/1039 btrfs: check the root node for uptodate before returning it
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 120de408e4b97504a2d9b5ca534b383de2c73d49 upstream.
Now that we clear the extent buffer uptodate if we fail to write it out we need to check to see if our root node is uptodate before we search down it. Otherwise we could return stale data (or potentially corrupt data that was caught by the write verification step) and think that the path is OK to search down.
--- fs/btrfs/ctree.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
fs/btrfs/ctree.c +15 -4
@@ -1570,12 +1570,9 @@ static struct extent_buffer *btrfs_searc {struct btrfs_fs_info *fs_info = root->fs_info;struct extent_buffer *b; -int root_lock; +int root_lock =0 ;int level =0 ; -/* We try very hard to do read locks on the root */ - root_lock =BTRFS_READ_LOCK ; -if (p->search_commit_root) {/* * The commit roots are read only so we always do read locks,
@@ -1613,6 +1610,9 @@ static struct extent_buffer *btrfs_searc goto out; } +/* We try very hard to do read locks on the root */ + root_lock =BTRFS_READ_LOCK ; +/* * If the level is set to maximum, we can skip trying to get the read * lock.
@@ -1639,6 +1639,17 @@ static struct extent_buffer *btrfs_searc level =btrfs_header_level (b); out: +/* +* The root may have failed to write out at some point, and thus is no +* longer valid, return an error in this case. +*/ +if (!extent_buffer_uptodate (b)) { +if (root_lock) +btrfs_tree_unlock_rw (b, root_lock); +free_extent_buffer (b); +return ERR_PTR (-EIO ); + } + p->nodes[level] = b;if (!p->skip_locking) p->locks[level] = root_lock;
Greg Kroah-Hartman
maintainerPATCH 885/1039 btrfs: add extent allocator hook to decide to allocate chunk or not
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit 50475cd57706359d6cc652be88369dace7a4c2eb upstream.
Introduce a new hook for an extent allocator policy. With the new hook, a policy can decide to allocate a new block group or not. If not, it will return -ENOSPC, so btrfs_reserve_extent() will cut the allocation size in half and retry the allocation if min_alloc_size is large enough.
The hook has a place holder and will be replaced with the real implementation in the next patch.
--- fs/btrfs/extent-tree.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/btrfs/extent-tree.c +17 -0
@@ -3947,6 +3947,19 @@ static void found_extent(struct find_fre } } +static bool can_allocate_chunk (struct btrfs_fs_info *fs_info, +struct find_free_extent_ctl *ffe_ctl) +{ +switch (ffe_ctl->policy) { +case BTRFS_EXTENT_ALLOC_CLUSTERED : +return true; +case BTRFS_EXTENT_ALLOC_ZONED : +return true; +default : +BUG (); + } +} +static int chunk_allocation_failed (struct find_free_extent_ctl *ffe_ctl) {switch (ffe_ctl->policy) {
@@ -4034,6 +4047,10 @@ static int find_free_extent_update_loop(struct btrfs_trans_handle *trans;int exist =0 ; +/*Check if allocation policy allows to create a new chunk */ +if (!can_allocate_chunk (fs_info, ffe_ctl)) +return -ENOSPC ; + trans = current->journal_info;if (trans) exist =1 ;
Greg Kroah-Hartman
maintainerPATCH 886/1039 btrfs: zoned: unset dedicated block group on allocation failure
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit 1ada69f61c88abb75a1038ee457633325658a183 upstream.
Allocating an extent from a block group can fail for various reasons. When an allocation from a dedicated block group (for tree-log or relocation data) fails, we need to unregister it as a dedicated one so that we can allocate a new block group for the dedicated one.
However, we are returning early when the block group in case it is read-only, fully used, or not be able to activate the zone. As a result, we keep the non-usable block group as a dedicated one, leading to further allocation failure. With many block groups, the allocator will iterate hopeless loop to find a free extent, results in a hung task.
Fix the issue by delaying the return and doing the proper cleanups.
--- fs/btrfs/extent-tree.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
fs/btrfs/extent-tree.c +16 -4
@@ -3790,23 +3790,35 @@ static int do_allocation_zoned(struct btspin_unlock (&fs_info->relocation_bg_lock);if (skip)return 1 ; +/* Check RO and no space case before trying to activate it */ spin_lock (&block_group->lock);if (block_group->ro || block_group->alloc_offset == block_group->zone_capacity) { -spin_unlock (&block_group->lock); -return 1 ; + ret =1 ; +/* +* May need to clear fs_info->{treelog,data_reloc}_bg. +* Return the error after taking the locks. +*/ }spin_unlock (&block_group->lock); -if (!btrfs_zone_activate (block_group)) -return 1 ; +if (!ret && !btrfs_zone_activate (block_group)) { + ret =1 ; +/* +* May need to clear fs_info->{treelog,data_reloc}_bg. +* Return the error after taking the locks. +*/ + }spin_lock (&space_info->lock);spin_lock (&block_group->lock);spin_lock (&fs_info->treelog_bg_lock);spin_lock (&fs_info->relocation_bg_lock); +if (ret) + goto out; +ASSERT (!ffe_ctl->for_treelog || block_group->start == fs_info->treelog_bg || fs_info->treelog_bg ==0 );
Greg Kroah-Hartman
maintainerPATCH 887/1039 btrfs: zoned: fix chunk allocation condition for zoned allocator
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit 82187d2ecdfb22ab7ee05f388402a39236d31428 upstream.
The ZNS specification defines a limit on the number of "active" zones. That limit impose us to limit the number of block groups which can be used for an allocation at the same time. Not to exceed the limit, we reuse the existing active block groups as much as possible when we can't activate any other zones without sacrificing an already activated block group in commit a85f05e59bc1 ("btrfs: zoned: avoid chunk allocation if active block group has enough space").
However, the check is wrong in two ways. First, it checks the condition for every raid index (ffe_ctl->index). Even if it reaches the condition and "ffe_ctl->max_extent_size >= ffe_ctl->min_alloc_size" is met, there can be other block groups having enough space to hold ffe_ctl->num_bytes. (Actually, this won't happen in the current zoned code as it only supports SINGLE profile. But, it can happen once it enables other RAID types.)
Second, it checks the active zone availability depending on the raid index. The raid index is just an index for space_info->block_groups, so it has nothing to do with chunk allocation.
These mistakes are causing a faulty allocation in a certain situation. Consider we are running zoned btrfs on a device whose max_active_zone == 0 (no limit). And, suppose no block group have a room to fit ffe_ctl->num_bytes but some room to meet ffe_ctl->min_alloc_size (i.e. max_extent_size > num_bytes >= min_alloc_size).
In this situation, the following occur:
- With SINGLE raid_index, it reaches the chunk allocation checking code
- The check returns true because we can activate a new zone (no limit)
- But, before allocating the chunk, it iterates to the next raid index (RAID5)
- Since there are no RAID5 block groups on zoned mode, it again reaches the check code
- The check returns false because of btrfs_can_activate_zone()'s "if (raid_index != BTRFS_RAID_SINGLE)" part
- That results in returning -ENOSPC without allocating a new chunk
As a result, we end up hitting -ENOSPC too early.
Move the check to the right place in the can_allocate_chunk() hook, and do the active zone check depending on the allocation flag, not on the raid index.
--- fs/btrfs/extent-tree.c | 21 +++++++++------------ fs/btrfs/zoned.c | 5 ++--- fs/btrfs/zoned.h | 5 ++--- 3 files changed, 13 insertions(+), 18 deletions(-)
fs/btrfs/extent-tree.c +9 -12
@@ -3966,6 +3966,15 @@ static bool can_allocate_chunk(struct btcase BTRFS_EXTENT_ALLOC_CLUSTERED :return true;case BTRFS_EXTENT_ALLOC_ZONED : +/* +* If we have enough free space left in an already +* active block group and we can't activate any other +* zone now, do not allow allocating a new chunk and +* let find_free_extent() retry with a smaller size. +*/ +if (ffe_ctl->max_extent_size >= ffe_ctl->min_alloc_size && + !btrfs_can_activate_zone (fs_info->fs_devices, ffe_ctl->flags)) +return false;return true;default :BUG ();
@@ -4012,18 +4021,6 @@ static int find_free_extent_update_loop(return 0 ; } -if (ffe_ctl->max_extent_size >= ffe_ctl->min_alloc_size && - !btrfs_can_activate_zone (fs_info->fs_devices, ffe_ctl->index)) { -/* -* If we have enough free space left in an already active block -* group and we can't activate any other zone now, retry the -* active ones with a smaller allocation size. Returning early -* from here will tell btrfs_reserve_extent() to haven the -* size. -*/ -return -ENOSPC ; - } -if (ffe_ctl->loop >=LOOP_CACHING_WAIT && ffe_ctl->have_caching_bg)return 1 ;
fs/btrfs/zoned.c +2 -3
@@ -1934,7 +1934,7 @@ int btrfs_zone_finish(struct btrfs_blockreturn ret; } -bool btrfs_can_activate_zone (struct btrfs_fs_devices *fs_devices,int raid_index) +bool btrfs_can_activate_zone (struct btrfs_fs_devices *fs_devices,u64 flags) {struct btrfs_device *device;bool ret = false;
@@ -1943,8 +1943,7 @@ bool btrfs_can_activate_zone(struct btrfreturn true;/* Non-single profiles are not supported yet */ -if (raid_index !=BTRFS_RAID_SINGLE ) -return false; +ASSERT ((flags &BTRFS_BLOCK_GROUP_PROFILE_MASK ) ==0 );/* Check if there is a device with active zones left */ mutex_lock (&fs_devices->device_list_mutex);
fs/btrfs/zoned.h +2 -3
@@ -72,8 +72,7 @@ struct btrfs_device *btrfs_zoned_get_dev u64 logical, u64 length);bool btrfs_zone_activate (struct btrfs_block_group *block_group);int btrfs_zone_finish (struct btrfs_block_group *block_group); -bool btrfs_can_activate_zone (struct btrfs_fs_devices *fs_devices, -int raid_index); +bool btrfs_can_activate_zone (struct btrfs_fs_devices *fs_devices,u64 flags);void btrfs_zone_finish_endio (struct btrfs_fs_info *fs_info,u64 logical,u64 length);void btrfs_clear_data_reloc_bg (struct btrfs_block_group *bg);
@@ -225,7 +224,7 @@ static inline int btrfs_zone_finish(stru }static inline bool btrfs_can_activate_zone (struct btrfs_fs_devices *fs_devices, -int raid_index) +u64 flags) {return true; }
Greg Kroah-Hartman
maintainerPATCH 888/1039 btrfs: respect the max size in the header when activating swap file
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit c2f822635df873c510bda6fb7fd1b10b7c31be2d upstream.
If we extended the size of a swapfile after its header was created (by the mkswap utility) and then try to activate it, we will map the entire file when activating the swap file, instead of limiting to the max size defined in the swap file's header.
Currently test case generic/643 from fstests fails because we do not respect that size limit defined in the swap file's header.
So fix this by not mapping file ranges beyond the max size defined in the swap header.
This is the same type of bug that iomap used to have, and was fixed in commit 36ca7943ac18ae ("mm/swap: consider max pages in iomap_swapfile_add_extent").
--- fs/btrfs/inode.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/btrfs/inode.c +11 -0
@@ -10595,9 +10595,19 @@ static int btrfs_add_swap_extent(struct struct btrfs_swap_info *bsi) {unsigned long nr_pages; +unsigned long max_pages;u64 first_ppage, first_ppage_reported, next_ppage;int ret; +/* +* Our swapfile may have had its size extended after the swap header was +* written. In that case activating the swapfile should not go beyond +* the max size set in the swap header. +*/ +if (bsi->nr_pages >= sis->max) +return 0 ; + + max_pages = sis->max - bsi->nr_pages; first_ppage =ALIGN (bsi->block_start,PAGE_SIZE ) >>PAGE_SHIFT ; next_ppage =ALIGN_DOWN (bsi->block_start + bsi->block_len,PAGE_SIZE ) >>PAGE_SHIFT ;
@@ -10605,6 +10615,7 @@ static int btrfs_add_swap_extent(structif (first_ppage >= next_ppage)return 0 ; nr_pages = next_ppage - first_ppage; + nr_pages =min (nr_pages, max_pages); first_ppage_reported = first_ppage;if (bsi->start ==0 )
Greg Kroah-Hartman
maintainerPATCH 889/1039 ext4: make sure to reset inode lockdep class when quota enabling fails
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 4013d47a5307fdb5c13370b5392498b00fedd274 upstream.
When we succeed in enabling some quota type but fail to enable another one with quota feature, we correctly disable all enabled quota types. However we forget to reset i_data_sem lockdep class. When the inode gets freed and reused, it will inherit this lockdep class (i_data_sem is initialized only when a slab is created) and thus eventually lockdep barfs about possible deadlocks.
--- fs/ext4/super.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
fs/ext4/super.c +12 -1
@@ -6361,8 +6361,19 @@ int ext4_enable_quotas(struct super_bloc"Failed to enable quota tracking " "(type=%d, err=%d). Please run " "e2fsck to fix.", type, err); -for (type--; type >=0 ; type--) +for (type--; type >=0 ; type--) { +struct inode *inode; + + inode =sb_dqopt (sb)->files[type]; +if (inode) + inode =igrab (inode);dquot_quota_off (sb, type); +if (inode) { +lockdep_set_quota_inode (inode, +I_DATA_SEM_NORMAL ); +iput (inode); + } + }return err; }
Greg Kroah-Hartman
maintainerPATCH 890/1039 ext4: make sure quota gets properly shutdown on error
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 15fc69bbbbbc8c72e5f6cc4e1be0f51283c5448e upstream.
When we hit an error when enabling quotas and setting inode flags, we do not properly shutdown quota subsystem despite returning error from Q_QUOTAON quotactl. This can lead to some odd situations like kernel using quota file while it is still writeable for userspace. Make sure we properly cleanup the quota subsystem in case of error.
--- fs/ext4/super.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/ext4/super.c +6 -4
@@ -6275,10 +6275,7 @@ static int ext4_quota_on(struct super_bllockdep_set_quota_inode (path->dentry->d_inode,I_DATA_SEM_QUOTA ); err =dquot_quota_on (sb, type, format_id, path); -if (err) { -lockdep_set_quota_inode (path->dentry->d_inode, -I_DATA_SEM_NORMAL ); - }else { +if (!err) {struct inode *inode =d_inode (path->dentry);handle_t *handle;
@@ -6298,7 +6295,12 @@ static int ext4_quota_on(struct super_blext4_journal_stop (handle); unlock_inode:inode_unlock (inode); +if (err) +dquot_quota_off (sb, type); } +if (err) +lockdep_set_quota_inode (path->dentry->d_inode, +I_DATA_SEM_NORMAL );return err; }
Greg Kroah-Hartman
maintainerPATCH 891/1039 ext4: fix a possible ABBA deadlock due to busy PA
In reply to Greg Kroah-HartmanFrom: Chunguang Xu <[email protected]>
commit 8c80fb312d7abf8bcd66cca1d843a80318a2c522 upstream.
We found on older kernel (3.10) that in the scenario of insufficient disk space, system may trigger an ABBA deadlock problem, it seems that this problem still exists in latest kernel, try to fix it here. The main process triggered by this problem is that task A occupies the PA and waits for the jbd2 transaction finish, the jbd2 transaction waits for the completion of task B's IO (plug_list), but task B waits for the release of PA by task A to finish discard, which indirectly forms an ABBA deadlock. The related calltrace is as follows:
Task A
vfs_write
ext4_mb_new_blocks()
ext4_mb_mark_diskspace_used() JBD2
jbd2_journal_get_write_access() -> jbd2_journal_commit_transaction()
->schedule() filemap_fdatawait()
| |
| Task B |
| do_unlinkat() |
| ext4_evict_inode() |
| jbd2_journal_begin_ordered_truncate() |
| filemap_fdatawrite_range() |
| ext4_mb_new_blocks() |-ext4_mb_discard_group_preallocations() <-----
Here, try to cancel ext4_mb_discard_group_preallocations() internal retry due to PA busy, and do a limited number of retries inside ext4_mb_discard_preallocations(), which can circumvent the above problems, but also has some advantages:
1. Since the PA is in a busy state, if other groups have free PAs, keeping the current PA may help to reduce fragmentation.
2. Continue to traverse forward instead of waiting for the current group PA to be released. In most scenarios, the PA discard time can be reduced.
However, in the case of smaller free space, if only a few groups have space, then due to multiple traversals of the group, it may increase CPU overhead. But in contrast, I feel that the overall benefit is better than the cost.
--- fs/ext4/mballoc.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-)
fs/ext4/mballoc.c +18 -22
@@ -4814,7 +4814,7 @@ ext4_mb_release_group_pa(struct ext4_bud*/ static noinline_for_stack intext4_mb_discard_group_preallocations (struct super_block *sb, -ext4_group_t group,int needed) +ext4_group_t group,int *busy) {struct ext4_group_info *grp =ext4_get_group_info (sb, group);struct buffer_head *bitmap_bh =NULL ;
@@ -4822,8 +4822,7 @@ ext4_mb_discard_group_preallocations(strstruct list_head list;struct ext4_buddy e4b;int err; -int busy =0 ; -int free, free_total =0 ; +int free =0 ;mb_debug (sb,"discard preallocation for group %u\n" , group);if (list_empty (&grp->bb_prealloc_list))
@@ -4846,19 +4845,14 @@ ext4_mb_discard_group_preallocations(str goto out_dbg; } -if (needed ==0 ) - needed =EXT4_CLUSTERS_PER_GROUP (sb) +1 ; -INIT_LIST_HEAD (&list); -repeat: - free =0 ;ext4_lock_group (sb, group);list_for_each_entry_safe (pa, tmp, &grp->bb_prealloc_list, pa_group_list) {spin_lock (&pa->pa_lock);if (atomic_read (&pa->pa_count)) {spin_unlock (&pa->pa_lock); - busy =1 ; + *busy =1 ;continue ; }if (pa->pa_deleted) {
@@ -4898,22 +4892,13 @@ repeat:call_rcu (&(pa)->u.pa_rcu, ext4_mb_pa_callback); } - free_total += free; - -/* if we still need more blocks and some PAs were used, try again */ -if (free_total < needed && busy) { -ext4_unlock_group (sb, group); -cond_resched (); - busy =0 ; - goto repeat; - }ext4_unlock_group (sb, group);ext4_mb_unload_buddy (&e4b);put_bh (bitmap_bh); out_dbg:mb_debug (sb,"discarded (%d) blocks preallocated for group %u bb_free (%d)\n" , - free_total, group, grp->bb_free); -return free_total; + free, group, grp->bb_free); +return free; }/*
@@ -5455,13 +5440,24 @@ static int ext4_mb_discard_preallocation {ext4_group_t i, ngroups =ext4_get_groups_count (sb);int ret; -int freed =0 ; +int freed =0 , busy =0 ; +int retry =0 ;trace_ext4_mb_discard_preallocations (sb, needed); + +if (needed ==0 ) + needed =EXT4_CLUSTERS_PER_GROUP (sb) +1 ; + repeat:for (i =0 ; i < ngroups && needed >0 ; i++) { - ret =ext4_mb_discard_group_preallocations (sb, i, needed); + ret =ext4_mb_discard_group_preallocations (sb, i, &busy); freed += ret; needed -= ret; +cond_resched (); + } + +if (needed >0 && busy && ++retry <3 ) { + busy =0 ; + goto repeat; }return freed;
Greg Kroah-Hartman
maintainerPATCH 892/1039 ext4: initialize err_blk before calling __ext4_get_inode_loc
In reply to Greg Kroah-HartmanFrom: Harshad Shirwadkar <[email protected]>
commit c27c29c6af4f3f4ce925a2111c256733c5a5b430 upstream.
It is not guaranteed that __ext4_get_inode_loc will definitely set err_blk pointer when it returns EIO. To avoid using uninitialized variables, let's first set err_blk to 0.
--- fs/ext4/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ext4/inode.c +2 -2
@@ -4523,7 +4523,7 @@ has_buffer:static int __ext4_get_inode_loc_noinmem (struct inode *inode,struct ext4_iloc *iloc) { -ext4_fsblk_t err_blk; +ext4_fsblk_t err_blk =0 ;int ret; ret = __ext4_get_inode_loc(inode->i_sb, inode->i_ino, NULL, iloc,
@@ -4538,7 +4538,7 @@ static int __ext4_get_inode_loc_noinmem(int ext4_get_inode_loc (struct inode *inode,struct ext4_iloc *iloc) { -ext4_fsblk_t err_blk; +ext4_fsblk_t err_blk =0 ;int ret; ret = __ext4_get_inode_loc(inode->i_sb, inode->i_ino, inode, iloc,
Greg Kroah-Hartman
maintainerPATCH 893/1039 ext4: fix fast commit may miss tracking range for FALLOC_FL_ZERO_RANGE
In reply to Greg Kroah-HartmanFrom: Xin Yin <[email protected]>
commit 5e4d0eba1ccaf19f93222abdeda5a368be141785 upstream.
when call falloc with FALLOC_FL_ZERO_RANGE, to set an range to unwritten, which has been already initialized. If the range is align to blocksize, fast commit will not track range for this change.
Also track range for unwritten range in ext4_map_blocks().
--- fs/ext4/extents.c | 2 -- fs/ext4/inode.c | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-)
fs/ext4/extents.c +0 -2
@@ -4647,8 +4647,6 @@ static long ext4_zero_range(struct file ret =ext4_mark_inode_dirty (handle, inode);if (unlikely (ret)) goto out_handle; -ext4_fc_track_range (handle, inode, offset >> inode->i_sb->s_blocksize_bits, - (offset + len -1 ) >> inode->i_sb->s_blocksize_bits);/* Zero out partial block at the edges of the range */ ret =ext4_zero_partial_blocks (handle, inode, offset, len);if (ret >=0 )
fs/ext4/inode.c +4 -3
@@ -741,10 +741,11 @@ out_sem:if (ret)return ret; } -ext4_fc_track_range (handle, inode, map->m_lblk, - map->m_lblk + map->m_len -1 ); } - +if (retval >0 && (map->m_flags &EXT4_MAP_UNWRITTEN || + map->m_flags &EXT4_MAP_MAPPED )) +ext4_fc_track_range (handle, inode, map->m_lblk, + map->m_lblk + map->m_len -1 );if (retval <0 )ext_debug (inode,"failed with err %d\n" , retval);return retval;
Greg Kroah-Hartman
maintainerPATCH 894/1039 ext4: set csum seed in tmp inode while migrating to extents
In reply to Greg Kroah-HartmanFrom: Luís Henriques <[email protected]>
commit e81c9302a6c3c008f5c30beb73b38adb0170ff2d upstream.
When migrating to extents, the temporary inode will have it's own checksum seed. This means that, when swapping the inodes data, the inode checksums will be incorrect.
This can be fixed by recalculating the extents checksums again. Or simply by copying the seed into the temporary inode.
--- fs/ext4/migrate.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
fs/ext4/migrate.c +11 -1
@@ -459,6 +459,17 @@ int ext4_ext_migrate(struct inode *inodeext4_journal_stop (handle); goto out_unlock; } +/* +* Use the correct seed for checksum (i.e. the seed from 'inode'). This +* is so that the metadata blocks will have the correct checksum after +* the migration. +* +* Note however that, if a crash occurs during the migration process, +* the recovery process is broken because the tmp_inode checksums will +* be wrong and the orphans cleanup will fail. +*/ + ei =EXT4_I (inode); +EXT4_I (tmp_inode)->i_csum_seed = ei->i_csum_seed;i_size_write (tmp_inode,i_size_read (inode));/* * Set the i_nlink to zero so it will be deleted later
@@ -502,7 +513,6 @@ int ext4_ext_migrate(struct inode *inode goto out_tmp_inode; } - ei =EXT4_I (inode); i_data = ei->i_data;memset (&lb,0 ,sizeof (lb));
Greg Kroah-Hartman
maintainerPATCH 895/1039 ext4: Fix BUG_ON in ext4_bread when write quota data
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit 380a0091cab482489e9b19e07f2a166ad2b76d5c upstream.
We got issue as follows when run syzkaller:
[ 167.936972] EXT4-fs error (device loop0): __ext4_remount:6314: comm rep: Abort forced by user [ 167.938306] EXT4-fs (loop0): Remounting filesystem read-only [ 167.981637] Assertion failure in ext4_getblk() at fs/ext4/inode.c:847: '(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY) || handle != NULL || create == 0' [ 167.983601] ------------[ cut here ]------------ [ 167.984245] kernel BUG at fs/ext4/inode.c:847! [ 167.984882] invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI [ 167.985624] CPU: 7 PID: 2290 Comm: rep Tainted: G B 5.16.0-rc5-next-20211217+ #123 [ 167.986823] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20190727_073836-buildvm-ppc64le-16.ppc.fedoraproject.org-3.fc31 04/01/2014 [ 167.988590] RIP: 0010:ext4_getblk+0x17e/0x504 [ 167.989189] Code: c6 01 74 28 49 c7 c0 a0 a3 5c 9b b9 4f 03 00 00 48 c7 c2 80 9c 5c 9b 48 c7 c6 40 b6 5c 9b 48 c7 c7 20 a4 5c 9b e8 77 e3 fd ff <0f> 0b 8b 04 244 [ 167.991679] RSP: 0018:ffff8881736f7398 EFLAGS: 00010282 [ 167.992385] RAX: 0000000000000094 RBX: 1ffff1102e6dee75 RCX: 0000000000000000 [ 167.993337] RDX: 0000000000000001 RSI: ffffffff9b6e29e0 RDI: ffffed102e6dee66 [ 167.994292] RBP: ffff88816a076210 R08: 0000000000000094 R09: ffffed107363fa09 [ 167.995252] R10: ffff88839b1fd047 R11: ffffed107363fa08 R12: ffff88816a0761e8 [ 167.996205] R13: 0000000000000000 R14: 0000000000000021 R15: 0000000000000001 [ 167.997158] FS: 00007f6a1428c740(0000) GS:ffff88839b000000(0000) knlGS:0000000000000000 [ 167.998238] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 167.999025] CR2: 00007f6a140716c8 CR3: 0000000133216000 CR4: 00000000000006e0 [ 167.999987] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 168.000944] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 168.001899] Call Trace: [ 168.002235] <TASK> [ 168.007167] ext4_bread+0xd/0x53 [ 168.007612] ext4_quota_write+0x20c/0x5c0 [ 168.010457] write_blk+0x100/0x220 [ 168.010944] remove_free_dqentry+0x1c6/0x440 [ 168.011525] free_dqentry.isra.0+0x565/0x830 [ 168.012133] remove_tree+0x318/0x6d0 [ 168.014744] remove_tree+0x1eb/0x6d0 [ 168.017346] remove_tree+0x1eb/0x6d0 [ 168.019969] remove_tree+0x1eb/0x6d0 [ 168.022128] qtree_release_dquot+0x291/0x340 [ 168.023297] v2_release_dquot+0xce/0x120 [ 168.023847] dquot_release+0x197/0x3e0 [ 168.024358] ext4_release_dquot+0x22a/0x2d0 [ 168.024932] dqput.part.0+0x1c9/0x900 [ 168.025430] __dquot_drop+0x120/0x190 [ 168.025942] ext4_clear_inode+0x86/0x220 [ 168.026472] ext4_evict_inode+0x9e8/0xa22 [ 168.028200] evict+0x29e/0x4f0 [ 168.028625] dispose_list+0x102/0x1f0 [ 168.029148] evict_inodes+0x2c1/0x3e0 [ 168.030188] generic_shutdown_super+0xa4/0x3b0 [ 168.030817] kill_block_super+0x95/0xd0 [ 168.031360] deactivate_locked_super+0x85/0xd0 [ 168.031977] cleanup_mnt+0x2bc/0x480 [ 168.033062] task_work_run+0xd1/0x170 [ 168.033565] do_exit+0xa4f/0x2b50 [ 168.037155] do_group_exit+0xef/0x2d0 [ 168.037666] __x64_sys_exit_group+0x3a/0x50 [ 168.038237] do_syscall_64+0x3b/0x90 [ 168.038751] entry_SYSCALL_64_after_hwframe+0x44/0xae
In order to reproduce this problem, the following conditions need to be met:
1. Ext4 filesystem with no journal;
2. Filesystem image with incorrect quota data;
3. Abort filesystem forced by user;
4. umount filesystem;
As in ext4_quota_write:
...
if (EXT4_SB(sb)->s_journal && !handle) {
ext4_msg(sb, KERN_WARNING, "Quota write (off=%llu, len=%llu)"
" cancelled because transaction is not started",
(unsigned long long)off, (unsigned long long)len);
return -EIO;
}...
We only check handle if NULL when filesystem has journal. There is need check handle if NULL even when filesystem has no journal.
--- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/super.c +1 -1
@@ -6479,7 +6479,7 @@ static ssize_t ext4_quota_write(struct sstruct buffer_head *bh;handle_t *handle =journal_current_handle (); -if (EXT4_SB (sb)->s_journal && !handle) { +if (!handle) {ext4_msg (sb,KERN_WARNING ,"Quota write (off=%llu, len=%llu)" " cancelled because transaction is not started" , (unsigned long long )off, (unsigned long long )len);
Greg Kroah-Hartman
maintainerPATCH 896/1039 ext4: use ext4_ext_remove_space() for fast commit replay delete range
In reply to Greg Kroah-HartmanFrom: Xin Yin <[email protected]>
commit 0b5b5a62b945a141e64011b2f90ee7e46f14be98 upstream.
For now ,we use ext4_punch_hole() during fast commit replay delete range procedure. But it will be affected by inode->i_size, which may not correct during fast commit replay procedure. The following test will failed.
-create & write foo (len 1000K)
-falloc FALLOC_FL_ZERO_RANGE foo (range 400K - 600K) -create & fsync bar
-falloc FALLOC_FL_PUNCH_HOLE foo (range 300K-500K) -fsync foo
-crash before a full commit
After the fast_commit reply procedure, the range 400K-500K will not be removed. Because in this case, when calling ext4_punch_hole() the inode->i_size is 0, and it just retruns with doing nothing.
Change to use ext4_ext_remove_space() instead of ext4_punch_hole() to remove blocks of inode directly.
--- fs/ext4/fast_commit.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
fs/ext4/fast_commit.c +8 -5
@@ -1812,11 +1812,14 @@ ext4_fc_replay_del_range(struct super_bl } } - ret =ext4_punch_hole (inode, -le32_to_cpu (lrange.fc_lblk) << sb->s_blocksize_bits, -le32_to_cpu (lrange.fc_len) << sb->s_blocksize_bits); -if (ret) -jbd_debug (1 ,"ext4_punch_hole returned %d" , ret); +down_write (&EXT4_I (inode)->i_data_sem); + ret =ext4_ext_remove_space (inode, lrange.fc_lblk, + lrange.fc_lblk + lrange.fc_len -1 ); +up_write (&EXT4_I (inode)->i_data_sem); +if (ret) { +iput (inode); +return 0 ; + }ext4_ext_replay_shrink_inode (inode,i_size_read (inode) >> sb->s_blocksize_bits);ext4_mark_inode_dirty (NULL , inode);
Greg Kroah-Hartman
maintainerPATCH 897/1039 ext4: fast commit may miss tracking unwritten range during ftruncate
In reply to Greg Kroah-HartmanFrom: Xin Yin <[email protected]>
commit 9725958bb75cdfa10f2ec11526fdb23e7485e8e4 upstream.
If use FALLOC_FL_KEEP_SIZE to alloc unwritten range at bottom, the inode->i_size will not include the unwritten range. When call ftruncate with fast commit enabled, it will miss to track the unwritten range.
Change to trace the full range during ftruncate.
--- fs/ext4/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/ext4/inode.c +1 -2
@@ -5428,8 +5428,7 @@ int ext4_setattr(struct user_namespace *ext4_fc_track_range (handle, inode, (attr->ia_size >0 ? attr->ia_size -1 :0 ) >> inode->i_sb->s_blocksize_bits, - (oldsize >0 ? oldsize -1 :0 ) >> - inode->i_sb->s_blocksize_bits); +EXT_MAX_BLOCKS -1 ); else ext4_fc_track_range( handle, inode,
Greg Kroah-Hartman
maintainerPATCH 898/1039 ext4: destroy ext4_fc_dentry_cachep kmemcache on module removal
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
commit ab047d516dea72f011c15c04a929851e4d053109 upstream.
The kmemcache for ext4_fc_dentry_cachep remains registered after module removal.
Destroy ext4_fc_dentry_cachep kmemcache on module removal.
--- fs/ext4/ext4.h | 1 + fs/ext4/fast_commit.c | 5 +++++ fs/ext4/super.c | 2 ++ 3 files changed, 8 insertions(+)
fs/ext4/ext4.h +1 -0
@@ -2935,6 +2935,7 @@ bool ext4_fc_replay_check_excluded(strucvoid ext4_fc_replay_cleanup (struct super_block *sb);int ext4_fc_commit (journal_t *journal,tid_t commit_tid);int __init ext4_fc_init_dentry_cache (void ); +void ext4_fc_destroy_dentry_cache (void );/* mballoc.c */ extern const struct seq_operations ext4_mb_seq_groups_ops;
fs/ext4/fast_commit.c +5 -0
@@ -2195,3 +2195,8 @@ int __init ext4_fc_init_dentry_cache(voireturn 0 ; } + +void ext4_fc_destroy_dentry_cache (void ) +{ +kmem_cache_destroy (ext4_fc_dentry_cachep); +}
fs/ext4/super.c +2 -0
@@ -6662,6 +6662,7 @@ static int __init ext4_init_fs(void) out:unregister_as_ext2 ();unregister_as_ext3 (); +ext4_fc_destroy_dentry_cache (); out05:destroy_inodecache (); out1:
@@ -6688,6 +6689,7 @@ static void __exit ext4_exit_fs(void)unregister_as_ext2 ();unregister_as_ext3 ();unregister_filesystem (&ext4_fs_type); +ext4_fc_destroy_dentry_cache ();destroy_inodecache ();ext4_exit_mballoc ();ext4_exit_sysfs ();
Greg Kroah-Hartman
maintainerPATCH 899/1039 ext4: fix null-ptr-deref in __ext4_journal_ensure_credits
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit 298b5c521746d69c07beb2757292fb5ccc1b0f85 upstream.
We got issue as follows when run syzkaller test:
[ 1901.130043] EXT4-fs error (device vda): ext4_remount:5624: comm syz-executor.5: Abort forced by user [ 1901.130901] Aborting journal on device vda-8. [ 1901.131437] EXT4-fs error (device vda): ext4_journal_check_start:61: comm syz-executor.16: Detected aborted journal [ 1901.131566] EXT4-fs error (device vda): ext4_journal_check_start:61: comm syz-executor.11: Detected aborted journal [ 1901.132586] EXT4-fs error (device vda): ext4_journal_check_start:61: comm syz-executor.18: Detected aborted journal [ 1901.132751] EXT4-fs error (device vda): ext4_journal_check_start:61: comm syz-executor.9: Detected aborted journal [ 1901.136149] EXT4-fs error (device vda) in ext4_reserve_inode_write:6035: Journal has aborted [ 1901.136837] EXT4-fs error (device vda): ext4_journal_check_start:61: comm syz-fuzzer: Detected aborted journal [ 1901.136915] ================================================================== [ 1901.138175] BUG: KASAN: null-ptr-deref in __ext4_journal_ensure_credits+0x74/0x140 [ext4] [ 1901.138343] EXT4-fs error (device vda): ext4_journal_check_start:61: comm syz-executor.13: Detected aborted journal [ 1901.138398] EXT4-fs error (device vda): ext4_journal_check_start:61: comm syz-executor.1: Detected aborted journal [ 1901.138808] Read of size 8 at addr 0000000000000000 by task syz-executor.17/968 [ 1901.138817] [ 1901.138852] EXT4-fs error (device vda): ext4_journal_check_start:61: comm syz-executor.30: Detected aborted journal [ 1901.144779] CPU: 1 PID: 968 Comm: syz-executor.17 Not tainted 4.19.90-vhulk2111.1.0.h893.eulerosv2r10.aarch64+ #1 [ 1901.146479] Hardware name: linux,dummy-virt (DT) [ 1901.147317] Call trace: [ 1901.147552] dump_backtrace+0x0/0x2d8 [ 1901.147898] show_stack+0x28/0x38 [ 1901.148215] dump_stack+0xec/0x15c [ 1901.148746] kasan_report+0x108/0x338 [ 1901.149207] __asan_load8+0x58/0xb0 [ 1901.149753] __ext4_journal_ensure_credits+0x74/0x140 [ext4] [ 1901.150579] ext4_xattr_delete_inode+0xe4/0x700 [ext4] [ 1901.151316] ext4_evict_inode+0x524/0xba8 [ext4] [ 1901.151985] evict+0x1a4/0x378 [ 1901.152353] iput+0x310/0x428 [ 1901.152733] do_unlinkat+0x260/0x428 [ 1901.153056] __arm64_sys_unlinkat+0x6c/0xc0 [ 1901.153455] el0_svc_common+0xc8/0x320 [ 1901.153799] el0_svc_handler+0xf8/0x160 [ 1901.154265] el0_svc+0x10/0x218 [ 1901.154682] ==================================================================
This issue may happens like this:
Process1 Process2ext4_evict_inode
ext4_journal_start
ext4_truncate
ext4_ind_truncate
ext4_free_branches
ext4_ind_truncate_ensure_credits
ext4_journal_ensure_credits_fn
ext4_journal_restart
handle->h_transaction = NULL;
mount -o remount,abort /mnt
-> trigger JBD abort
start_this_handle -> will return failed
ext4_xattr_delete_inode
ext4_journal_ensure_credits
ext4_journal_ensure_credits_fn
__ext4_journal_ensure_credits
jbd2_handle_buffer_credits
journal = handle->h_transaction->t_journal; ->null-ptr-derefNow, indirect truncate process didn't handle error. To solve this issue maybe simply add check handle is abort in '__ext4_journal_ensure_credits' is enough, and i also think this is necessary.
--- fs/ext4/ext4_jbd2.c | 2 ++ 1 file changed, 2 insertions(+)
fs/ext4/ext4_jbd2.c +2 -0
@@ -162,6 +162,8 @@ int __ext4_journal_ensure_credits(handle {if (!ext4_handle_valid (handle))return 0 ; +if (is_handle_aborted (handle)) +return -EROFS ;if (jbd2_handle_buffer_credits (handle) >= check_cred && handle->h_revoke_credits >= revoke_cred)return 0 ;
Greg Kroah-Hartman
maintainerPATCH 900/1039 ext4: fix an use-after-free issue about data=journal writeback mode
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
commit 5c48a7df91499e371ef725895b2e2d21a126e227 upstream.
Our syzkaller report an use-after-free issue that accessing the freed buffer_head on the writeback page in __ext4_journalled_writepage(). The problem is that if there was a truncate racing with the data=journalled writeback procedure, the writeback length could become zero and bget_one() refuse to get buffer_head's refcount, then the truncate procedure release buffer once we drop page lock, finally, the last ext4_walk_page_buffers() trigger the use-after-free problem.
sync truncateext4_sync_file()
file_write_and_wait_range()
ext4_setattr(0)
inode->i_size = 0 ext4_writepage()
len = 0
__ext4_journalled_writepage()
page_bufs = page_buffers(page) ext4_walk_page_buffers(bget_one) <- does not get refcount
do_invalidatepage()
free_buffer_head()
ext4_walk_page_buffers(page_bufs) <- trigger use-after-free
After commit bdf96838aea6 ("ext4: fix race between truncate and __ext4_journalled_writepage()"), we have already handled the racing case, so the bget_one() and bput_one() are not needed. So this patch simply remove these hunk, and recheck the i_size to make it safe.
--- fs/ext4/inode.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-)
fs/ext4/inode.c +10 -27
@@ -1845,30 +1845,16 @@ int ext4_da_get_block_prep(struct inodereturn 0 ; } -static int bget_one (handle_t *handle,struct inode *inode, -struct buffer_head *bh) -{ -get_bh (bh); -return 0 ; -} - -static int bput_one (handle_t *handle,struct inode *inode, -struct buffer_head *bh) -{ -put_bh (bh); -return 0 ; -} -static int __ext4_journalled_writepage (struct page *page,unsigned int len) {struct address_space *mapping = page->mapping;struct inode *inode = mapping->host; -struct buffer_head *page_bufs =NULL ;handle_t *handle =NULL ;int ret =0 , err =0 ;int inline_data =ext4_has_inline_data (inode);struct buffer_head *inode_bh =NULL ; +loff_t size;ClearPageChecked (page);
@@ -1878,14 +1864,6 @@ static int __ext4_journalled_writepage(s inode_bh =ext4_journalled_write_inline_data (inode, len, page);if (inode_bh ==NULL ) goto out; - }else { - page_bufs =page_buffers (page); -if (!page_bufs) { -BUG (); - goto out; - } -ext4_walk_page_buffers (handle, inode, page_bufs,0 , len, -NULL , bget_one); }/* * We need to release the page lock before we start the
@@ -1906,7 +1884,8 @@ static int __ext4_journalled_writepage(slock_page (page);put_page (page); -if (page->mapping != mapping) { + size =i_size_read (inode); +if (page->mapping != mapping ||page_offset (page) > size) {/* The page got truncated from under us */ ext4_journal_stop (handle); ret =0 ;
@@ -1916,6 +1895,13 @@ static int __ext4_journalled_writepage(sif (inline_data) { ret =ext4_mark_inode_dirty (handle, inode); }else { +struct buffer_head *page_bufs =page_buffers (page); + +if (page->index == size >>PAGE_SHIFT ) + len = size & ~PAGE_MASK ; +else + len =PAGE_SIZE ; + ret =ext4_walk_page_buffers (handle, inode, page_bufs,0 , len,NULL , do_journal_get_write_access);
@@ -1936,9 +1922,6 @@ static int __ext4_journalled_writepage(s out:unlock_page (page); out_no_pagelock: -if (!inline_data && page_bufs) -ext4_walk_page_buffers (NULL , inode, page_bufs,0 , len, -NULL , bput_one);brelse (inode_bh);return ret; }
Greg Kroah-Hartman
maintainerPATCH 901/1039 ext4: dont use the orphan list when migrating an inode
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 6eeaf88fd586f05aaf1d48cb3a139d2a5c6eb055 upstream.
We probably want to remove the indirect block to extents migration feature after a deprecation window, but until then, let's fix a potential data loss problem caused by the fact that we put the tmp_inode on the orphan list. In the unlikely case where we crash and do a journal recovery, the data blocks belonging to the inode being migrated are also represented in the tmp_inode on the orphan list --- and so its data blocks will get marked unallocated, and available for reuse.
Instead, stop putting the tmp_inode on the oprhan list. So in the case where we crash while migrating the inode, we'll leak an inode, which is not a disaster. It will be easily fixed the next time we run fsck, and it's better than potentially having blocks getting claimed by two different files, and losing data as a result.
--- fs/ext4/migrate.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
fs/ext4/migrate.c +4 -15
@@ -437,12 +437,12 @@ int ext4_ext_migrate(struct inode *inodepercpu_down_write (&sbi->s_writepages_rwsem);/* -* Worst case we can touch the allocation bitmaps, a bgd -* block, and a block to link in the orphan list. We do need -* need to worry about credits for modifying the quota inode. +* Worst case we can touch the allocation bitmaps and a block +* group descriptor block. We do need need to worry about +* credits for modifying the quota inode. */ handle =ext4_journal_start (inode,EXT4_HT_MIGRATE , -4 +EXT4_MAXQUOTAS_TRANS_BLOCKS (inode->i_sb)); +3 +EXT4_MAXQUOTAS_TRANS_BLOCKS (inode->i_sb));if (IS_ERR (handle)) { retval =PTR_ERR (handle);
@@ -463,10 +463,6 @@ int ext4_ext_migrate(struct inode *inode* Use the correct seed for checksum (i.e. the seed from 'inode'). This * is so that the metadata blocks will have the correct checksum after * the migration. -* -* Note however that, if a crash occurs during the migration process, -* the recovery process is broken because the tmp_inode checksums will -* be wrong and the orphans cleanup will fail. */ ei =EXT4_I (inode);EXT4_I (tmp_inode)->i_csum_seed = ei->i_csum_seed;
@@ -478,7 +474,6 @@ int ext4_ext_migrate(struct inode *inodeclear_nlink (tmp_inode);ext4_ext_tree_init (handle, tmp_inode); -ext4_orphan_add (handle, tmp_inode);ext4_journal_stop (handle);/*
@@ -503,12 +498,6 @@ int ext4_ext_migrate(struct inode *inode handle =ext4_journal_start (inode,EXT4_HT_MIGRATE ,1 );if (IS_ERR (handle)) { -/* -* It is impossible to update on-disk structures without -* a handle, so just rollback in-core changes and live other -* work to orphan_list_cleanup() -*/ -ext4_orphan_del (NULL , tmp_inode); retval =PTR_ERR (handle); goto out_tmp_inode; }
Greg Kroah-Hartman
maintainerPATCH 902/1039 Revert "drm/amdgpu: Dont inherit GEM object VMAs in child process"
In reply to Greg Kroah-HartmanFrom: Rajneesh Bhardwaj <[email protected]>
commit 8b5da5a458c95ad49571a6a6285800bf13409616 upstream.
This reverts commit fbcdbfde87509d523132b59f661a355c731139d0.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0 -3
@@ -264,9 +264,6 @@ static int amdgpu_gem_object_mmap(struct !(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))) vma->vm_flags &= ~VM_MAYWRITE; -if (bo->kfd_bo) - vma->vm_flags |=VM_DONTCOPY ; -return drm_gem_ttm_mmap (obj, vma); }
Greg Kroah-Hartman
maintainerPATCH 903/1039 drm/radeon: fix error handling in radeon_driver_open_kms
In reply to Greg Kroah-HartmanFrom: Christian König <[email protected]>
commit 4722f463896cc0ef1a6f1c3cb2e171e949831249 upstream.
The return value was never initialized so the cleanup code executed when it isn't even necessary.
Just add proper error handling.
--- drivers/gpu/drm/radeon/radeon_kms.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/radeon/radeon_kms.c +12 -10
@@ -666,18 +666,18 @@ int radeon_driver_open_kms(struct drm_de fpriv =kzalloc (sizeof (*fpriv),GFP_KERNEL );if (unlikely (!fpriv)) { r = -ENOMEM ; - goto out_suspend; + goto err_suspend; }if (rdev->accel_working) { vm = &fpriv->vm; r =radeon_vm_init (rdev, vm);if (r) - goto out_fpriv; + goto err_fpriv; r =radeon_bo_reserve (rdev->ring_tmp_bo.bo, false);if (r) - goto out_vm_fini; + goto err_vm_fini;/* map the ib pool buffer read only into * virtual address space */
@@ -685,7 +685,7 @@ int radeon_driver_open_kms(struct drm_de rdev->ring_tmp_bo.bo);if (!vm->ib_bo_va) { r = -ENOMEM ; - goto out_vm_fini; + goto err_vm_fini; } r = radeon_vm_bo_set_addr(rdev, vm->ib_bo_va,
@@ -693,19 +693,21 @@ int radeon_driver_open_kms(struct drm_deRADEON_VM_PAGE_READABLE | RADEON_VM_PAGE_SNOOPED);if (r) - goto out_vm_fini; + goto err_vm_fini; } file_priv->driver_priv = fpriv; } -if (!r) - goto out_suspend; +pm_runtime_mark_last_busy (dev->dev); +pm_runtime_put_autosuspend (dev->dev); +return 0 ; -out_vm_fini: +err_vm_fini:radeon_vm_fini (rdev, vm); -out_fpriv: +err_fpriv:kfree (fpriv); -out_suspend: + +err_suspend:pm_runtime_mark_last_busy (dev->dev);pm_runtime_put_autosuspend (dev->dev);return r;
Greg Kroah-Hartman
maintainerPATCH 904/1039 drm/amdgpu/display: Only set vblank_disable_immediate when PSR is not enabled
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
commit 70897848730470cc477d5d89e6222c0f6a9ac173 upstream.
[Why]
PSR currently relies on the kernel's delayed vblank on/off mechanism as an implicit bufferring mechanism to prevent excessive entry/exit.
Without this delay the user experience is impacted since it can take a few frames to enter/exit.
[How]
Only allow vblank disable immediate for DC when psr is not supported.
Leave a TODO indicating that this support should be extended in the future to delay independent of the vblank interrupt.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8 -3
@@ -1598,9 +1598,6 @@ static int amdgpu_dm_init(struct amdgpu_adev_to_drm (adev)->mode_config.cursor_width = adev->dm.dc->caps.max_cursor_size;adev_to_drm (adev)->mode_config.cursor_height = adev->dm.dc->caps.max_cursor_size; -/* Disable vblank IRQs aggressively for power-saving */ -adev_to_drm (adev)->vblank_disable_immediate = true; -if (drm_vblank_init (adev_to_drm (adev), adev->dm.display_indexes_num)) {DRM_ERROR ("amdgpu: failed to initialize sw for display support.\n" );
@@ -4285,6 +4282,14 @@ static int amdgpu_dm_initialize_drm_devi } +/* +* Disable vblank IRQs aggressively for power-saving. +* +* TODO: Fix vblank control helpers to delay PSR entry to allow this when PSR +* is also supported. +*/ +adev_to_drm (adev)->vblank_disable_immediate = !psr_feature_enabled; +/* Software is initialized. Now we can register interrupt handlers. */ switch (adev->asic_type) {#if defined(CONFIG_DRM_AMD_DC_SI )
Greg Kroah-Hartman
maintainerPATCH 905/1039 firmware: Update Kconfig help text for Google firmware
In reply to Greg Kroah-HartmanFrom: Ben Hutchings <[email protected]>
commit d185a3466f0cd5af8f1c5c782c53bc0e6f2e7136 upstream.
The help text for GOOGLE_FIRMWARE states that it should only be enabled when building a kernel for Google's own servers. However, many of the drivers dependent on it are also useful on Chromebooks or on any platform using coreboot.
Update the help text to reflect this double duty.
--- drivers/firmware/google/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/google/Kconfig +3 -3
@@ -3,9 +3,9 @@ menuconfig GOOGLE_FIRMWARE bool "Google Firmware Drivers" default n help - These firmware drivers are used by Google's servers. They are - only useful if you are working directly on one of their - proprietary servers. If in doubt, say "N". + These firmware drivers are used by Google servers, + Chromebooks and other devices using coreboot firmware. + If in doubt, say "N". if GOOGLE_FIRMWARE
Greg Kroah-Hartman
maintainerPATCH 906/1039 can: mcp251xfd: mcp251xfd_tef_obj_read(): fix typo in error message
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit 99e7cc3b3f85d9a583ab83f386315c59443509ae upstream.
This patch fixes a typo in the error message in mcp251xfd_tef_obj_read(), if trying to read too many objects.
--- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +1 -1
@@ -1336,7 +1336,7 @@ mcp251xfd_tef_obj_read(const struct mcp2 len > tx_ring->obj_num || offset + len > tx_ring->obj_num)) {netdev_err (priv->ndev, -"Trying to read to many TEF objects (max=%d, offset=%d, len=%d).\n" , +"Trying to read too many TEF objects (max=%d, offset=%d, len=%d).\n" , tx_ring->obj_num, offset, len);return -ERANGE ; }
Greg Kroah-Hartman
maintainerPATCH 907/1039 media: rcar-csi2: Optimize the selection PHTW register
In reply to Greg Kroah-HartmanFrom: Suresh Udipi <[email protected]>
commit 549cc89cd09a85aaa16dc07ef3db811d5cf9bcb1 upstream.
PHTW register is selected based on default bit rate from Table[1]. for the bit rates less than or equal to 250. Currently first value of default bit rate which is greater than or equal to the caculated mbps is selected. This selection can be further improved by selecting the default bit rate which is nearest to the calculated value.
[1] specs r19uh0105ej0200-r-car-3rd-generation.pdf [Table 25.12]
--- drivers/media/platform/rcar-vin/rcar-csi2.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/media/platform/rcar-vin/rcar-csi2.c +8 -1
@@ -1104,10 +1104,17 @@ static int rcsi2_phtw_write_mbps(struct const struct rcsi2_mbps_reg *values, u16 code) {const struct rcsi2_mbps_reg *value; +const struct rcsi2_mbps_reg *prev_value =NULL ; -for (value = values; value->mbps; value++) +for (value = values; value->mbps; value++) {if (value->mbps >= mbps)break ; + prev_value = value; + } + +if (prev_value && + ((mbps - prev_value->mbps) <= (value->mbps - mbps))) + value = prev_value;if (!value->mbps) {dev_err (priv->dev,"Unsupported PHY speed (%u Mbps)" , mbps);
Greg Kroah-Hartman
maintainerPATCH 908/1039 drm/vc4: hdmi: Make sure the device is powered with CEC
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
commit 20b0dfa86bef0e80b41b0e5ac38b92f23b6f27f9 upstream.
Similarly to what we encountered with the detect hook with DRM, nothing actually prevents any of the CEC callback from being run while the HDMI output is disabled.
However, this is an issue since any register access to the controller when it's powered down will result in a silent hang.
Let's make sure we run the runtime_pm hooks when the CEC adapter is opened and closed by the userspace to avoid that issue.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +9 -1
@@ -1736,8 +1736,14 @@ static int vc4_hdmi_cec_adap_enable(strustruct vc4_hdmi *vc4_hdmi =cec_get_drvdata (adap);/* clock period in microseconds */ const u32 usecs =1000000 /CEC_CLOCK_FREQ ; -u32 val =HDMI_READ (HDMI_CEC_CNTRL_5 ); +u32 val; +int ret; + ret =pm_runtime_resume_and_get (&vc4_hdmi->pdev->dev); +if (ret) +return ret; + + val =HDMI_READ (HDMI_CEC_CNTRL_5 ); val &= ~(VC4_HDMI_CEC_TX_SW_RESET |VC4_HDMI_CEC_RX_SW_RESET |VC4_HDMI_CEC_CNT_TO_4700_US_MASK |VC4_HDMI_CEC_CNT_TO_4500_US_MASK );
@@ -1883,6 +1889,8 @@ static int vc4_hdmi_cec_init(struct vc4_if (ret <0 ) goto err_remove_handlers; +pm_runtime_put (&vc4_hdmi->pdev->dev); +return 0 ; err_remove_handlers:
Greg Kroah-Hartman
maintainerPATCH 909/1039 media: correct MEDIA_TEST_SUPPORT help text
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 09f4d1513267d0ab712f5d29e7bd136535748709 upstream.
Fix grammar/wording in the help text for MEDIA_TEST_SUPPORT.
--- drivers/media/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/Kconfig +4 -4
@@ -141,10 +141,10 @@ config MEDIA_TEST_SUPPORT prompt "Test drivers" if MEDIA_SUPPORT_FILTER default y if !MEDIA_SUPPORT_FILTER help - Those drivers should not be used on production Kernels, but - can be useful on debug ones. It enables several dummy drivers - that simulate a real hardware. Very useful to test userspace - applications and to validate if the subsystem core is doesn't + These drivers should not be used on production kernels, but + can be useful on debug ones. This option enables several dummy drivers + that simulate real hardware. Very useful to test userspace + applications and to validate if the subsystem core doesn't have regressions. Say Y if you want to use some virtual test driver.
Greg Kroah-Hartman
maintainerPATCH 910/1039 Documentation: coresight: Fix documentation issue
In reply to Greg Kroah-HartmanFrom: Mike Leach <[email protected]>
commit 66bd1333abd7fa191f13b929c9119d6cd3df27b0 upstream.
Fix the description of the directories and attributes used in cs_etm as used by perf.
Drop the references to the 'configurations' sub-directory which had been removed in an earlier version of the patchset.
--- Documentation/trace/coresight/coresight-config.rst | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
Documentation/trace/coresight/coresight-config.rst +5 -11
@@ -211,19 +211,13 @@ also declared in the perf 'cs_etm' event be selected when running trace under perf:: $ ls /sys/devices/cs_etm - configurations format perf_event_mux_interval_ms sinks type - events nr_addr_filters power + cpu0 cpu2 events nr_addr_filters power subsystem uevent + cpu1 cpu3 format perf_event_mux_interval_ms sinks type -Key directories here are 'configurations' - which lists the loaded -configurations, and 'events' - a generic perf directory which allows -selection on the perf command line.:: +The key directory here is 'events' - a generic perf directory which allows +selection on the perf command line. As with the sinks entries, this provides +a hash of the configuration name. - $ ls configurations/ - autofdo - $ cat configurations/autofdo - 0xa7c3dddd - -As with the sinks entries, this provides a hash of the configuration name. The entry in the 'events' directory uses perfs built in syntax generator to substitute the syntax for the name when evaluating the command::
Greg Kroah-Hartman
maintainerPATCH 911/1039 Documentation: dmaengine: Correctly describe dmatest with channel unset
In reply to Greg Kroah-HartmanFrom: Daniel Thompson <[email protected]>
commit c61d7b2ef141abf81140756b45860a2306f395a2 upstream.
Currently the documentation states that channels must be configured before running the dmatest. This has not been true since commit 6b41030fdc79 ("dmaengine: dmatest: Restore default for channel"). Fix accordingly.
--- Documentation/driver-api/dmaengine/dmatest.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Documentation/driver-api/dmaengine/dmatest.rst +4 -3
@@ -143,13 +143,14 @@ Part 5 - Handling channel allocation Allocating Channels ------------------- -Channels are required to be configured prior to starting the test run. -Attempting to run the test without configuring the channels will fail. +Channels do not need to be configured prior to starting a test run. Attempting +to run the test without configuring the channels will result in testing any +channels that are available. Example:: % echo 1 > /sys/module/dmatest/parameters/run - dmatest: Could not start test, no channels configured + dmatest: No channels configured, continue with any Channels are registered using the "channel" parameter. Channels can be requested by their name, once requested, the channel is registered and a pending thread is added to the test list.
Greg Kroah-Hartman
maintainerPATCH 912/1039 Documentation: ACPI: Fix data node reference documentation
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
commit a11174952205d082f1658fab4314f0caf706e0a8 upstream.
The data node reference documentation was missing a package that must contain the property values, instead property name and multiple values being present in a single package. This is not aligned with the _DSD spec.
Fix it by adding the package for the values.
Also add the missing "reg" properties to two numbered nodes.
--- Documentation/firmware-guide/acpi/dsd/data-node-references.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Documentation/firmware-guide/acpi/dsd/data-node-references.rst +8 -2
@@ -5,7 +5,7 @@ Referencing hierarchical data nodes =================================== -:Copyright: |copy| 2018 Intel Corporation +:Copyright: |copy| 2018, 2021 Intel Corporation :Author: Sakari Ailus <[email protected]> ACPI in general allows referring to device objects in the tree only.
@@ -52,12 +52,14 @@ the ANOD object which is also the final Name (NOD0, Package() { ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { + Package () { "reg", 0 }, Package () { "random-property", 3 }, } }) Name (NOD1, Package() { ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"), Package () { + Package () { "reg", 1 }, Package () { "anothernode", "ANOD" }, } })
@@ -74,7 +76,11 @@ the ANOD object which is also the final Name (_DSD, Package () { ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { - Package () { "reference", ^DEV0, "node@1", "anothernode" }, + Package () { + "reference", Package () { + ^DEV0, "node@1", "anothernode" + } + }, } }) }
Greg Kroah-Hartman
maintainerPATCH 913/1039 Documentation, arch: Remove leftovers from raw device
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
commit 473dcf0ffc31ce1135cd10578e7e06698cf51f4a upstream.
Raw device interface was removed so remove all references to configs related to it.
--- Documentation/admin-guide/devices.txt | 8 +------- arch/arm/configs/spear13xx_defconfig | 1 - arch/arm/configs/spear3xx_defconfig | 1 - arch/arm/configs/spear6xx_defconfig | 1 - arch/powerpc/configs/pseries_defconfig | 1 - 5 files changed, 1 insertion(+), 11 deletions(-)
Documentation/admin-guide/devices.txt +1 -7
@@ -2339,13 +2339,7 @@ disks (see major number 3) except that the limit on partitions is 31. - 162 char Raw block device interface - 0 = /dev/rawctl Raw I/O control device - 1 = /dev/raw/raw1 First raw I/O device - 2 = /dev/raw/raw2 Second raw I/O device - ... - max minor number of raw device is set by kernel config - MAX_RAW_DEVS or raw module parameter 'max_raw_devs' + 162 char Used for (now removed) raw block device interface 163 char
arch/arm/configs/spear13xx_defconfig +0 -1
@@ -61,7 +61,6 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y
arch/arm/configs/spear3xx_defconfig +0 -1
@@ -41,7 +41,6 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y
arch/arm/configs/spear6xx_defconfig +0 -1
@@ -36,7 +36,6 @@ CONFIG_INPUT_FF_MEMLESS=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y
arch/powerpc/configs/pseries_defconfig +0 -1
@@ -189,7 +189,6 @@ CONFIG_HVCS=m CONFIG_VIRTIO_CONSOLE=m CONFIG_IBM_BSR=m CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=1024 CONFIG_I2C_CHARDEV=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y
Greg Kroah-Hartman
maintainerPATCH 914/1039 Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
commit 2ac7069ad7647cd1d9ca5b08765a1e116e13cdc4 upstream.
This config was removed so remove all references to it.
--- Documentation/admin-guide/cifs/usage.rst | 7 +++---- arch/arm/configs/cm_x300_defconfig | 1 - arch/arm/configs/ezx_defconfig | 1 - arch/arm/configs/imote2_defconfig | 1 - arch/arm/configs/nhk8815_defconfig | 1 - arch/arm/configs/pxa_defconfig | 1 - arch/mips/configs/fuloong2e_defconfig | 1 - arch/mips/configs/malta_qemu_32r6_defconfig | 1 - arch/mips/configs/maltaaprp_defconfig | 1 - arch/mips/configs/maltasmvp_defconfig | 1 - arch/mips/configs/maltasmvp_eva_defconfig | 1 - arch/mips/configs/maltaup_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/sh/configs/titan_defconfig | 1 - 14 files changed, 3 insertions(+), 17 deletions(-)
Documentation/admin-guide/cifs/usage.rst +3 -4
@@ -734,10 +734,9 @@ SecurityFlags Flags which control secur using weaker password hashes is 0x37037 (lanman, plaintext, ntlm, ntlmv2, signing allowed). Some SecurityFlags require the corresponding menuconfig - options to be enabled (lanman and plaintext require - CONFIG_CIFS_WEAK_PW_HASH for example). Enabling - plaintext authentication currently requires also - enabling lanman authentication in the security flags + options to be enabled. Enabling plaintext + authentication currently requires also enabling + lanman authentication in the security flags because the cifs module only supports sending laintext passwords using the older lanman dialect form of the session setup SMB. (e.g. for authentication
arch/arm/configs/cm_x300_defconfig +0 -1
@@ -146,7 +146,6 @@ CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_ISO8859_1=m
arch/arm/configs/ezx_defconfig +0 -1
@@ -314,7 +314,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_SMB_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m
arch/arm/configs/imote2_defconfig +0 -1
@@ -288,7 +288,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_SMB_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m
arch/arm/configs/nhk8815_defconfig +0 -1
@@ -127,7 +127,6 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y
arch/arm/configs/pxa_defconfig +0 -1
@@ -699,7 +699,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_DEFAULT="utf8"
arch/mips/configs/fuloong2e_defconfig +0 -1
@@ -206,7 +206,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m CONFIG_CIFS_STATS2=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_CIFS_DEBUG2=y
arch/mips/configs/malta_qemu_32r6_defconfig +0 -1
@@ -165,7 +165,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m
arch/mips/configs/maltaaprp_defconfig +0 -1
@@ -166,7 +166,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m
arch/mips/configs/maltasmvp_defconfig +0 -1
@@ -167,7 +167,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m
arch/mips/configs/maltasmvp_eva_defconfig +0 -1
@@ -169,7 +169,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m
arch/mips/configs/maltaup_defconfig +0 -1
@@ -165,7 +165,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m
arch/powerpc/configs/ppc6xx_defconfig +0 -1
@@ -1022,7 +1022,6 @@ CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y
arch/sh/configs/titan_defconfig +0 -1
@@ -242,7 +242,6 @@ CONFIG_NFSD=y CONFIG_NFSD_V3=y CONFIG_SMB_FS=m CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_ASCII=m
Greg Kroah-Hartman
maintainerPATCH 915/1039 Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization
In reply to Greg Kroah-HartmanFrom: Lukas Bulwahn <[email protected]>
commit 82ca67321f55a8d1da6ac3ed611da3c32818bb37 upstream.
The config RANDOMIZE_SLAB does not exist, the authors probably intended to refer to the config RANDOMIZE_BASE, which provides kernel address-space randomization. They probably just confused SLAB with BASE (these two four-letter words coincidentally share three common letters), as they also point out the config SLAB_FREELIST_RANDOM as further randomization within the same sentence.
Fix the reference of the config for kernel address-space randomization to the config that provides that.
--- Documentation/admin-guide/hw-vuln/spectre.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/admin-guide/hw-vuln/spectre.rst +1 -1
@@ -468,7 +468,7 @@ Spectre variant 2 before invoking any firmware code to prevent Spectre variant 2 exploits using the firmware. - Using kernel address space randomization (CONFIG_RANDOMIZE_SLAB=y + Using kernel address space randomization (CONFIG_RANDOMIZE_BASE=y and CONFIG_SLAB_FREELIST_RANDOM=y in the kernel configuration) makes attacks on the kernel generally more difficult.
Greg Kroah-Hartman
maintainerPATCH 916/1039 Documentation: fix firewire.rst ABI file path error
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit b0ac702f3329cdc8a06dcaac73183d4b5a2b942d upstream.
Adjust the path of the ABI files for firewire.rst to prevent a documentation build error. Prevents this problem:
Sphinx parallel build error:
docutils.utils.SystemMessage: Documentation/driver-api/firewire.rst:22: (SEVERE/4) Problems with "include" directive path:
InputError: [Errno 2] No such file or directory: '../Documentation/driver-api/ABI/stable/firewire-cdev'.
--- Documentation/driver-api/firewire.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/driver-api/firewire.rst +2 -2
@@ -19,7 +19,7 @@ of kernel interfaces is available via ex Firewire char device data structures ==================================== -.. include:: /ABI/stable/firewire-cdev +.. include:: ../ABI/stable/firewire-cdev :literal: .. kernel-doc:: include/uapi/linux/firewire-cdev.h
@@ -28,7 +28,7 @@ Firewire char device data structures Firewire device probing and sysfs interfaces ============================================ -.. include:: /ABI/stable/sysfs-bus-firewire +.. include:: ../ABI/stable/sysfs-bus-firewire :literal: .. kernel-doc:: drivers/firewire/core-device.c
Greg Kroah-Hartman
maintainerPATCH 917/1039 Bluetooth: btusb: Return error code when getting patch status failed
In reply to Greg Kroah-HartmanFrom: Mark Chen <[email protected]>
commit 995d948cf2e45834275f07afc1c9881a9902e73c upstream.
If there are failure cases in getting patch status, it should return the error code (-EIO).
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -2600,6 +2600,7 @@ static int btusb_mtk_setup_firmware_79xx }else {bt_dev_err (hdev,"Failed wmt patch dwnld status (%d)" , status); + err = -EIO ; goto err_release_fw; } }
Greg Kroah-Hartman
maintainerPATCH 918/1039 net: usb: Correct reset handling of smsc95xx
In reply to Greg Kroah-HartmanFrom: Markus Reichl <[email protected]>
commit 0bf3885324a8599e3af4c7379b8d4f621c9bbffa upstream.
On boards with LAN9514 and no preconfigured MAC address we don't get an ip address from DHCP after commit a049a30fc27c ("net: usb: Correct PHY handling of smsc95xx") anymore. Adding an explicit reset before starting the phy fixes the issue.
[1]
https://lore.kernel.org/netdev/[email protected]/
From: Gabriel Hojda <[email protected]>
--- drivers/net/usb/smsc95xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/usb/smsc95xx.c +2 -1
@@ -1962,7 +1962,8 @@ static const struct driver_info smsc95xx .bind = smsc95xx_bind, .unbind = smsc95xx_unbind, .link_reset = smsc95xx_link_reset, - .reset = smsc95xx_start_phy, + .reset = smsc95xx_reset, + .check_connect = smsc95xx_start_phy, .stop = smsc95xx_stop, .rx_fixup = smsc95xx_rx_fixup, .tx_fixup = smsc95xx_tx_fixup,
Greg Kroah-Hartman
maintainerPATCH 919/1039 Bluetooth: hci_sync: Fix not setting adv set duration
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
commit f16a491c65d9eb19398b25aefc10c2d3313d17b3 upstream.
10bbffa3e88e attempted to fix the use of rotation duration as advertising duration but it didn't change the if condition which still uses the duration instead of the timeout.
--- net/bluetooth/hci_request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hci_request.c +1 -1
@@ -1935,7 +1935,7 @@ int __hci_req_enable_ext_advertising(str/* Set duration per instance since controller is responsible for * scheduling it. */ -if (adv_instance && adv_instance->duration) { +if (adv_instance && adv_instance->timeout) {u16 duration = adv_instance->timeout *MSEC_PER_SEC ;/* Time = N * 10 ms */
Greg Kroah-Hartman
maintainerPATCH 920/1039 scsi: core: Show SCMD_LAST in text form
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit 3369046e54ca8f82e0cb17740643da2d80d3cfa8 upstream.
The SCSI debugfs code supports showing information about pending commands, including translating SCSI command flags from numeric into text format. Also convert the SCMD_LAST flag from numeric into text form.
--- drivers/scsi/scsi_debugfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/scsi_debugfs.c +1 -0
@@ -9,6 +9,7 @@static const char *const scsi_cmd_flags[] = {SCSI_CMD_FLAG_NAME (TAGGED ),SCSI_CMD_FLAG_NAME (INITIALIZED ), +SCSI_CMD_FLAG_NAME (LAST ), };#undef SCSI_CMD_FLAG_NAME
Greg Kroah-Hartman
maintainerPATCH 921/1039 of: base: Improve argument length mismatch error
In reply to Greg Kroah-HartmanFrom: Baruch Siach <[email protected]>
commit 5d05b811b5acb92fc581a7b328b36646c86f5ab9 upstream.
The cells_name field of of_phandle_iterator might be NULL. Use the phandle name instead. With this change instead of:
OF: /soc/pinctrl@1000000: (null) = 3 found 2
We get:
OF: /soc/pinctrl@1000000: phandle pinctrl@1000000 needs 3, found 2
Which is a more helpful messages making DT debugging easier.
In this particular example the phandle name looks like duplicate of the same node name. But note that the first node is the parent node (it->parent), while the second is the phandle target (it->node). They happen to be the same in the case that triggered this improvement. See commit 72cb4c48a46a ("arm64: dts: qcom: ipq6018: Fix gpio-ranges property").
--- drivers/of/base.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/of/base.c +8 -3
@@ -1349,9 +1349,14 @@ int of_phandle_iterator_next(struct of_p* property data length */ if (it->cur + count > it->list_end) { -pr_err ("%pOF: %s = %d found %td\n" , - it->parent, it->cells_name, - count, it->list_end - it->cur); +if (it->cells_name) +pr_err ("%pOF: %s = %d found %td\n" , + it->parent, it->cells_name, + count, it->list_end - it->cur); +else +pr_err ("%pOF: phandle %s needs %d, found %td\n" , + it->parent,of_node_full_name (it->node), + count, it->list_end - it->cur); goto err; } }
Greg Kroah-Hartman
maintainerPATCH 922/1039 scsi: ufs: ufs-mediatek: Fix error checking in ufs_mtk_init_va09_pwr_ctrl()
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 3ba880a12df5aa4488c18281701b5b1bc3d4531a upstream.
The function regulator_get() returns an error pointer. Use IS_ERR() to validate the return value.
--- drivers/scsi/ufs/ufs-mediatek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/ufs-mediatek.c +1 -1
@@ -557,7 +557,7 @@ static void ufs_mtk_init_va09_pwr_ctrl(sstruct ufs_mtk_host *host =ufshcd_get_variant (hba); host->reg_va09 =regulator_get (hba->dev,"va09" ); -if (!host->reg_va09) +if (IS_ERR (host->reg_va09))dev_info (hba->dev,"failed to get va09" );else host->caps |=UFS_MTK_CAP_VA09_PWR_CTRL ;
Greg Kroah-Hartman
maintainerPATCH 923/1039 dmaengine: uniphier-xdmac: Fix type of address variables
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
commit 105a8c525675bb7d4d64871f9b2edf39460de881 upstream.
The variables src_addr and dst_addr handle DMA addresses, so these should be declared as dma_addr_t.
--- drivers/dma/uniphier-xdmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/dma/uniphier-xdmac.c +3 -2
@@ -131,8 +131,9 @@ uniphier_xdmac_next_desc(struct uniphierstatic void uniphier_xdmac_chan_start (struct uniphier_xdmac_chan *xc,struct uniphier_xdmac_desc *xd) { -u32 src_mode, src_addr, src_width; -u32 dst_mode, dst_addr, dst_width; +u32 src_mode, src_width; +u32 dst_mode, dst_width; +dma_addr_t src_addr, dst_addr;u32 val, its, tnum;enum dma_slave_buswidth buswidth;
Greg Kroah-Hartman
maintainerPATCH 924/1039 dmaengine: idxd: fix wq settings post wq disable
In reply to Greg Kroah-HartmanFrom: Dave Jiang <[email protected]>
commit 0f225705cf6536826318180831e18a74595efc8d upstream.
By the spec, wq size and group association is not changeable unless device is disabled. Exclude clearing the shadow copy on wq disable/reset. This allows wq type to be changed after disable to be re-enabled.
Move the size and group association to its own cleanup and only call it during device disable.
--- drivers/dma/idxd/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/dma/idxd/device.c +10 -2
@@ -382,8 +382,6 @@ static void idxd_wq_disable_cleanup(strulockdep_assert_held (&wq->wq_lock);memset (wq->wqcfg,0 , idxd->wqcfg_size); wq->type =IDXD_WQT_NONE ; - wq->size =0 ; - wq->group =NULL ; wq->threshold =0 ; wq->priority =0 ; wq->ats_dis =0 ;
@@ -392,6 +390,15 @@ static void idxd_wq_disable_cleanup(strumemset (wq->name,0 ,WQ_NAME_SIZE ); } +static void idxd_wq_device_reset_cleanup (struct idxd_wq *wq) +{ +lockdep_assert_held (&wq->wq_lock); + +idxd_wq_disable_cleanup (wq); + wq->size =0 ; + wq->group =NULL ; +} +static void idxd_wq_ref_release (struct percpu_ref *ref) { struct idxd_wq *wq = container_of(ref, struct idxd_wq, wq_active);
@@ -699,6 +706,7 @@ static void idxd_device_wqs_clear_state(if (wq->state ==IDXD_WQ_ENABLED ) {idxd_wq_disable_cleanup (wq); +idxd_wq_device_reset_cleanup (wq); wq->state =IDXD_WQ_DISABLED ; } }
Greg Kroah-Hartman
maintainerPATCH 925/1039 RDMA/hns: Modify the mapping attribute of doorbell to device
In reply to Greg Kroah-HartmanFrom: Yixing Liu <[email protected]>
commit 39d5534b1302189c809e90641ffae8cbdc42a8fc upstream.
It is more general for ARM device drivers to use the device attribute to map PCI BAR spaces.
--- drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_main.c +1 -1
@@ -442,7 +442,7 @@ static int hns_roce_mmap(struct ib_ucont prot = vma->vm_page_prot;if (entry->mmap_type !=HNS_ROCE_MMAP_TYPE_TPTR ) - prot =pgprot_noncached (prot); + prot =pgprot_device (prot); ret =rdma_user_mmap_io (uctx, vma, pfn, rdma_entry->npages *PAGE_SIZE , prot, rdma_entry);
Greg Kroah-Hartman
maintainerPATCH 926/1039 RDMA/rxe: Fix a typo in opcode name
In reply to Greg Kroah-HartmanFrom: Chengguang Xu <[email protected]>
commit 8d1cfb884e881efd69a3be4ef10772c71cb22216 upstream.
There is a redundant ']' in the name of opcode IB_OPCODE_RC_SEND_MIDDLE, so just fix it.
--- drivers/infiniband/sw/rxe/rxe_opcode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_opcode.c +1 -1
@@ -117,7 +117,7 @@ struct rxe_opcode_info rxe_opcode[RXE_NU } }, [IB_OPCODE_RC_SEND_MIDDLE] = { - .name = "IB_OPCODE_RC_SEND_MIDDLE]", + .name = "IB_OPCODE_RC_SEND_MIDDLE", .mask =RXE_PAYLOAD_MASK |RXE_REQ_MASK |RXE_SEND_MASK | RXE_MIDDLE_MASK, .length = RXE_BTH_BYTES,
Greg Kroah-Hartman
maintainerPATCH 927/1039 dmaengine: stm32-mdma: fix STM32_MDMA_CTBR_TSEL_MASK
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
commit e7f110889a87307fb0fed408a5dee1707796ca04 upstream.
This patch fixes STM32_MDMA_CTBR_TSEL_MASK, which is [5:0], not [7:0].
--- drivers/dma/stm32-mdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/stm32-mdma.c +1 -1
@@ -184,7 +184,7 @@#define STM32_MDMA_CTBR (x) (0x68 + 0x40 * (x))#define STM32_MDMA_CTBR_DBUS BIT(17)#define STM32_MDMA_CTBR_SBUS BIT(16) -#define STM32_MDMA_CTBR_TSEL_MASK GENMASK(7, 0) +#define STM32_MDMA_CTBR_TSEL_MASK GENMASK(5, 0)#define STM32_MDMA_CTBR_TSEL (n) STM32_MDMA_SET(n, \ STM32_MDMA_CTBR_TSEL_MASK)
Greg Kroah-Hartman
maintainerPATCH 928/1039 Revert "net/mlx5: Add retry mechanism to the command entry index allocation"
In reply to Greg Kroah-HartmanFrom: Moshe Shemesh <[email protected]>
commit 4f6626b0e140867fd6d5a2e9d4ceaef97f10f46a upstream.
This reverts commit 410bd754cd73c4a2ac3856d9a03d7b08f9c906bf.
The reverted commit had added a retry mechanism to the command entry index allocation. The previous patch ensures that there is a free command entry index once the command work handler holds the command semaphore. Thus the retry mechanism is not needed.
--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +1 -20
@@ -904,25 +904,6 @@ static bool opcode_allowed(struct mlx5_creturn cmd->allowed_opcode == opcode; } -static int cmd_alloc_index_retry (struct mlx5_cmd *cmd) -{ -unsigned long alloc_end = jiffies +msecs_to_jiffies (1000 ); -int idx; - -retry: - idx =cmd_alloc_index (cmd); -if (idx <0 &&time_before (jiffies, alloc_end)) { -/* Index allocation can fail on heavy load of commands. This is a temporary -* situation as the current command already holds the semaphore, meaning that -* another command completion is being handled and it is expected to release -* the entry index soon. -*/ -cpu_relax (); - goto retry; - } -return idx; -} -bool mlx5_cmd_is_down (struct mlx5_core_dev *dev) { return pci_channel_offline(dev->pdev) ||
@@ -950,7 +931,7 @@ static void cmd_work_handler(struct work sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;down (sem);if (!ent->page_queue) { - alloc_ret =cmd_alloc_index_retry (cmd); + alloc_ret =cmd_alloc_index (cmd);if (alloc_ret <0 ) {mlx5_core_err_rl (dev,"failed to allocate command entry\n" );if (ent->callback) {
Greg Kroah-Hartman
maintainerPATCH 929/1039 powerpc/cell: Fix clang -Wimplicit-fallthrough warning
In reply to Greg Kroah-HartmanFrom: Anders Roxell <[email protected]>
commit e89257e28e844f5d1d39081bb901d9f1183a7705 upstream.
Clang warns:
arch/powerpc/platforms/cell/pervasive.c:81:2: error: unannotated fall-through between switch labels
case SRR1_WAKEEE:
^
arch/powerpc/platforms/cell/pervasive.c:81:2: note: insert 'break;' to avoid fall-through
case SRR1_WAKEEE:
^
break;1 error generated.
Clang is more pedantic than GCC, which does not warn when failing through to a case that is just break or return. Clang's version is more in line with the kernel's own stance in deprecated.rst. Add athe missing break to silence the warning.
--- arch/powerpc/platforms/cell/pervasive.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/cell/pervasive.c +1 -0
@@ -78,6 +78,7 @@ static int cbe_system_reset_exception(stswitch (regs->msr &SRR1_WAKEMASK ) {case SRR1_WAKEDEC :set_dec (1 ); +break ;case SRR1_WAKEEE :/* * Handle these when interrupts get re-enabled and we take
Greg Kroah-Hartman
maintainerPATCH 930/1039 powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses
In reply to Greg Kroah-HartmanFrom: Tobias Waldekranz <[email protected]>
commit 0d375d610fa96524e2ee2b46830a46a7bfa92a9f upstream.
This block is used in (at least) T1024 and T1040, including their variants like T1023 etc.
--- arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi +2 -0
@@ -79,6 +79,7 @@ fman0: fman@400000 { #size-cells = <0>; compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; reg = <0xfc000 0x1000>; + fsl,erratum-a009885; }; xmdio0: mdio@fd000 {
@@ -86,6 +87,7 @@ fman0: fman@400000 { #size-cells = <0>; compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; reg = <0xfd000 0x1000>; + fsl,erratum-a009885; }; };
Greg Kroah-Hartman
maintainerPATCH 931/1039 block: fix async_depth sysfs interface for mq-deadline
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
commit 46cdc45acb089c811d9a54fd50af33b96e5fae9d upstream.
A previous commit added this feature, but it inadvertently used the wrong variable to show/store the setting from/to, victimized by copy/paste. Fix it up so that the async_depth sysfs interface reads and writes from the right setting.
--- block/mq-deadline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/mq-deadline.c +2 -2
@@ -865,7 +865,7 @@ SHOW_JIFFIES(deadline_write_expire_show,SHOW_JIFFIES (deadline_prio_aging_expire_show, dd->prio_aging_expire);SHOW_INT (deadline_writes_starved_show, dd->writes_starved);SHOW_INT (deadline_front_merges_show, dd->front_merges); -SHOW_INT (deadline_async_depth_show, dd->front_merges); +SHOW_INT (deadline_async_depth_show, dd->async_depth);SHOW_INT (deadline_fifo_batch_show, dd->fifo_batch);#undef SHOW_INT#undef SHOW_JIFFIES
@@ -895,7 +895,7 @@ STORE_JIFFIES(deadline_write_expire_storSTORE_JIFFIES (deadline_prio_aging_expire_store, &dd->prio_aging_expire,0 ,INT_MAX );STORE_INT (deadline_writes_starved_store, &dd->writes_starved,INT_MIN ,INT_MAX );STORE_INT (deadline_front_merges_store, &dd->front_merges,0 ,1 ); -STORE_INT (deadline_async_depth_store, &dd->front_merges,1 ,INT_MAX ); +STORE_INT (deadline_async_depth_store, &dd->async_depth,1 ,INT_MAX );STORE_INT (deadline_fifo_batch_store, &dd->fifo_batch,0 ,INT_MAX );#undef STORE_FUNCTION#undef STORE_INT
Greg Kroah-Hartman
maintainerPATCH 932/1039 block: Fix fsync always failed if once failed
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit 8a7518931baa8ea023700987f3db31cb0a80610b upstream.
We do test with inject error fault base on v4.19, after test some time we found sync /dev/sda always failed.
[root@localhost] sync /dev/sda
sync: error syncing '/dev/sda': Input/output error
scsi log as follows:
[19069.812296] sd 0:0:0:0: [sda] tag#64 Send: scmd 0x00000000d03a0b6b [19069.812302] sd 0:0:0:0: [sda] tag#64 CDB: Synchronize Cache(10) 35 00 00 00 00 00 00 00 00 00 [19069.812533] sd 0:0:0:0: [sda] tag#64 Done: SUCCESS Result: hostbyte=DID_OK driverbyte=DRIVER_OK [19069.812536] sd 0:0:0:0: [sda] tag#64 CDB: Synchronize Cache(10) 35 00 00 00 00 00 00 00 00 00 [19069.812539] sd 0:0:0:0: [sda] tag#64 scsi host busy 1 failed 0 [19069.812542] sd 0:0:0:0: Notifying upper driver of completion (result 0) [19069.812546] sd 0:0:0:0: [sda] tag#64 sd_done: completed 0 of 0 bytes [19069.812549] sd 0:0:0:0: [sda] tag#64 0 sectors total, 0 bytes done. [19069.812564] print_req_error: I/O error, dev sda, sector 0
ftrace log as follows:
rep-306069 [007] .... 19654.923315: block_bio_queue: 8,0 FWS 0 + 0 [rep] rep-306069 [007] .... 19654.923333: block_getrq: 8,0 FWS 0 + 0 [rep]
kworker/7:1H-250 [007] .... 19654.923352: block_rq_issue: 8,0 FF 0 () 0 + 0 [kworker/7:1H]
<idle>-0 [007] ..s. 19654.923562: block_rq_complete: 8,0 FF () 18446744073709551615 + 0 [0]
<idle>-0 [007] d.s. 19654.923576: block_rq_complete: 8,0 WS () 0 + 0 [-5]
As 8d6996630c03 introduce 'fq->rq_status', this data only update when 'flush_rq' reference count isn't zero. If flush request once failed and record error code in 'fq->rq_status'. If there is no chance to update 'fq->rq_status',then do fsync will always failed.
To address this issue reset 'fq->rq_status' after return error code to upper layer.
--- block/blk-flush.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/blk-flush.c +3 -1
@@ -235,8 +235,10 @@ static void flush_end_io(struct request* avoiding use-after-free. */ WRITE_ONCE (flush_rq->state,MQ_RQ_IDLE ); -if (fq->rq_status !=BLK_STS_OK ) +if (fq->rq_status !=BLK_STS_OK ) { error = fq->rq_status; + fq->rq_status =BLK_STS_OK ; + }if (!q->elevator) { flush_rq->tag =BLK_MQ_NO_TAG ;
Greg Kroah-Hartman
maintainerPATCH 933/1039 drm/vc4: crtc: Drop feed_txp from state
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
commit a16c66401fd831f70a02d33e9bcaac585637c29f upstream.
Accessing the crtc->state pointer from outside the modesetting context is not allowed. We thus need to copy whatever we need from the KMS state to our structure in order to access it.
In VC4, a number of users of that pointers have crept in over the years, the first one being whether or not the downstream controller of the pixelvalve is our writeback controller.
Fortunately for us, Since commit 39fcb2808376 ("drm/vc4: txp: Turn the TXP into a CRTC of its own") this is no longer something that can change from one commit to the other and is hardcoded.
Let's set this flag in struct vc4_crtc if we happen to be the TXP, and drop the flag from our private state structure.
--- drivers/gpu/drm/vc4/vc4_crtc.c | 3 +-- drivers/gpu/drm/vc4/vc4_drv.h | 6 +++++- drivers/gpu/drm/vc4/vc4_hvs.c | 7 +++---- drivers/gpu/drm/vc4/vc4_kms.c | 3 ++- drivers/gpu/drm/vc4/vc4_txp.c | 3 +-- 5 files changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/vc4/vc4_crtc.c +1 -2
@@ -715,7 +715,7 @@ static void vc4_crtc_handle_page_flip(stspin_lock_irqsave (&dev->event_lock, flags);if (vc4_crtc->event && (vc4_state->mm.start ==HVS_READ (SCALER_DISPLACTX (chan)) || - vc4_state->feed_txp)) { + vc4_crtc->feeds_txp)) {drm_crtc_send_vblank_event (crtc, vc4_crtc->event); vc4_crtc->event =NULL ;drm_crtc_vblank_put (crtc);
@@ -893,7 +893,6 @@ struct drm_crtc_state *vc4_crtc_duplicatreturn NULL ; old_vc4_state =to_vc4_crtc_state (crtc->state); - vc4_state->feed_txp = old_vc4_state->feed_txp; vc4_state->margins = old_vc4_state->margins; vc4_state->assigned_channel = old_vc4_state->assigned_channel;
drivers/gpu/drm/vc4/vc4_drv.h +5 -1
@@ -495,6 +495,11 @@ struct vc4_crtc {struct drm_pending_vblank_event *event;struct debugfs_regset32 regset; + +/** +* @feeds_txp: True if the CRTC feeds our writeback controller. +*/ +bool feeds_txp; }; static inline struct vc4_crtc *
@@ -521,7 +526,6 @@ struct vc4_crtc_state {struct drm_crtc_state base;/* Dlist area for this CRTC configuration. */ struct drm_mm_node mm; -bool feed_txp;bool txp_armed;unsigned int assigned_channel;
drivers/gpu/drm/vc4/vc4_hvs.c +3 -4
@@ -375,7 +375,7 @@ static void vc4_hvs_update_dlist(structspin_lock_irqsave (&dev->event_lock, flags); -if (!vc4_state->feed_txp || vc4_state->txp_armed) { +if (!vc4_crtc->feeds_txp || vc4_state->txp_armed) { vc4_crtc->event = crtc->state->event; crtc->state->event =NULL ; }
@@ -395,10 +395,9 @@ void vc4_hvs_atomic_enable(struct drm_cr {struct drm_device *dev = crtc->dev;struct vc4_dev *vc4 =to_vc4_dev (dev); -struct drm_crtc_state *new_crtc_state =drm_atomic_get_new_crtc_state (state, crtc); -struct vc4_crtc_state *vc4_state =to_vc4_crtc_state (new_crtc_state);struct drm_display_mode *mode = &crtc->state->adjusted_mode; -bool oneshot = vc4_state->feed_txp; +struct vc4_crtc *vc4_crtc =to_vc4_crtc (crtc); +bool oneshot = vc4_crtc->feeds_txp;vc4_hvs_update_dlist (crtc);vc4_hvs_init_channel (vc4, crtc, mode, oneshot);
drivers/gpu/drm/vc4/vc4_kms.c +2 -1
@@ -233,6 +233,7 @@ static void vc4_hvs_pv_muxing_commit(strunsigned int i;for_each_new_crtc_in_state (state, crtc, crtc_state, i) { +struct vc4_crtc *vc4_crtc =to_vc4_crtc (crtc);struct vc4_crtc_state *vc4_state =to_vc4_crtc_state (crtc_state);u32 dispctrl;u32 dsp3_mux;
@@ -253,7 +254,7 @@ static void vc4_hvs_pv_muxing_commit(str* TXP IP, and we need to disable the FIFO2 -> pixelvalve1 * route. */ -if (vc4_state->feed_txp) +if (vc4_crtc->feeds_txp) dsp3_mux =VC4_SET_FIELD (3 ,SCALER_DISPCTRL_DSP3_MUX );else dsp3_mux =VC4_SET_FIELD (2 ,SCALER_DISPCTRL_DSP3_MUX );
drivers/gpu/drm/vc4/vc4_txp.c +1 -2
@@ -391,7 +391,6 @@ static int vc4_txp_atomic_check(struct d {struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, crtc); -struct vc4_crtc_state *vc4_state =to_vc4_crtc_state (crtc_state);int ret; ret =vc4_hvs_atomic_check (crtc, state);
@@ -399,7 +398,6 @@ static int vc4_txp_atomic_check(struct dreturn ret; crtc_state->no_vblank = true; - vc4_state->feed_txp = true;return 0 ; }
@@ -482,6 +480,7 @@ static int vc4_txp_bind(struct device *d vc4_crtc->pdev = pdev; vc4_crtc->data = &vc4_txp_crtc_data; + vc4_crtc->feeds_txp = true; txp->pdev = pdev;