6.15.6-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 145/178 xhci: dbc: Flush queued requests before stopping dbc
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit efe3e3ae5a66cb38ef29c909e951b4039044bae9 upstream.
Flush dbc requests when dbc is stopped and transfer rings are freed. Failure to flush them lead to leaking memory and dbc completing odd requests after resuming from suspend, leading to error messages such as:
[ 95.344392] xhci_hcd 0000:00:0d.0: no matched request
--- drivers/usb/host/xhci-dbgcap.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/host/xhci-dbgcap.c +4 -0
@@ -652,6 +652,10 @@ static void xhci_dbc_stop(struct xhci_dbcase DS_DISABLED :return ;case DS_CONFIGURED : +spin_lock (&dbc->lock); +xhci_dbc_flush_requests (dbc); +spin_unlock (&dbc->lock); +if (dbc->driver->disconnect) dbc->driver->disconnect (dbc);break ;
Greg Kroah-Hartman
maintainerPATCH 146/178 xhci: Disable stream for xHC controller with XHCI_BROKEN_STREAMS
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hongyu Xie <[email protected]>
commit cd65ee81240e8bc3c3119b46db7f60c80864b90b upstream.
Disable stream for platform xHC controller with broken stream.
--- drivers/usb/host/xhci-plat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-plat.c +2 -1
@@ -326,7 +326,8 @@ int xhci_plat_probe(struct platform_devi } usb3_hcd =xhci_get_usb3_hcd (xhci); -if (usb3_hcd &&HCC_MAX_PSA (xhci->hcc_params) >=4 ) +if (usb3_hcd &&HCC_MAX_PSA (xhci->hcc_params) >=4 && + !(xhci->quirks &XHCI_BROKEN_STREAMS )) usb3_hcd->can_do_streams =1 ;if (xhci->shared_hcd) {
Greg Kroah-Hartman
maintainerPATCH 147/178 HID: appletb-kbd: fix memory corruption of input_handler_list
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
commit c80f2b047d5cc42fbd2dff9d1942d4ba7545100f upstream.
In appletb_kbd_probe an input handler is initialised and then registered with input core through input_register_handler(). When this happens input core will add the input handler (specifically its node) to the global input_handler_list. The input_handler_list is central to the functionality of input core and is traversed in various places in input core. An example of this is when a new input device is plugged in and gets registered with input core.
The input_handler in probe is allocated as device managed memory. If a probe failure occurs after input_register_handler() the input_handler memory is freed, yet it will remain in the input_handler_list. This effectively means the input_handler_list contains a dangling pointer to data belonging to a freed input handler.
This causes an issue when any other input device is plugged in - in my case I had an old PixArt HP USB optical mouse and I decided to plug it in after a failure occurred after input_register_handler(). This lead to the registration of this input device via input_register_device which involves traversing over every handler in the corrupted input_handler_list and calling input_attach_handler(), giving each handler a chance to bind to newly registered device.
The core of this bug is a UAF which causes memory corruption of input_handler_list and to fix it we must ensure the input handler is unregistered from input core, this is done through input_unregister_handler().
[ 63.191597] ================================================================== [ 63.192094] BUG: KASAN: slab-use-after-free in input_attach_handler.isra.0+0x1a9/0x1e0 [ 63.192094] Read of size 8 at addr ffff888105ea7c80 by task kworker/0:2/54 [ 63.192094] [ 63.192094] CPU: 0 UID: 0 PID: 54 Comm: kworker/0:2 Not tainted 6.16.0-rc2-00321-g2aa6621d [ 63.192094] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-debian-1.164 [ 63.192094] Workqueue: usb_hub_wq hub_event [ 63.192094] Call Trace: [ 63.192094] <TASK> [ 63.192094] dump_stack_lvl+0x53/0x70 [ 63.192094] print_report+0xce/0x670 [ 63.192094] kasan_report+0xce/0x100 [ 63.192094] input_attach_handler.isra.0+0x1a9/0x1e0 [ 63.192094] input_register_device+0x76c/0xd00 [ 63.192094] hidinput_connect+0x686d/0xad60 [ 63.192094] hid_connect+0xf20/0x1b10 [ 63.192094] hid_hw_start+0x83/0x100 [ 63.192094] hid_device_probe+0x2d1/0x680 [ 63.192094] really_probe+0x1c3/0x690 [ 63.192094] __driver_probe_device+0x247/0x300 [ 63.192094] driver_probe_device+0x49/0x210 [ 63.192094] __device_attach_driver+0x160/0x320 [ 63.192094] bus_for_each_drv+0x10f/0x190 [ 63.192094] __device_attach+0x18e/0x370 [ 63.192094] bus_probe_device+0x123/0x170 [ 63.192094] device_add+0xd4d/0x1460 [ 63.192094] hid_add_device+0x30b/0x910 [ 63.192094] usbhid_probe+0x920/0xe00 [ 63.192094] usb_probe_interface+0x363/0x9a0 [ 63.192094] really_probe+0x1c3/0x690 [ 63.192094] __driver_probe_device+0x247/0x300 [ 63.192094] driver_probe_device+0x49/0x210 [ 63.192094] __device_attach_driver+0x160/0x320 [ 63.192094] bus_for_each_drv+0x10f/0x190 [ 63.192094] __device_attach+0x18e/0x370 [ 63.192094] bus_probe_device+0x123/0x170 [ 63.192094] device_add+0xd4d/0x1460 [ 63.192094] usb_set_configuration+0xd14/0x1880 [ 63.192094] usb_generic_driver_probe+0x78/0xb0 [ 63.192094] usb_probe_device+0xaa/0x2e0 [ 63.192094] really_probe+0x1c3/0x690 [ 63.192094] __driver_probe_device+0x247/0x300 [ 63.192094] driver_probe_device+0x49/0x210 [ 63.192094] __device_attach_driver+0x160/0x320 [ 63.192094] bus_for_each_drv+0x10f/0x190 [ 63.192094] __device_attach+0x18e/0x370 [ 63.192094] bus_probe_device+0x123/0x170 [ 63.192094] device_add+0xd4d/0x1460 [ 63.192094] usb_new_device+0x7b4/0x1000 [ 63.192094] hub_event+0x234d/0x3fa0 [ 63.192094] process_one_work+0x5bf/0xfe0 [ 63.192094] worker_thread+0x777/0x13a0 [ 63.192094] </TASK> [ 63.192094] [ 63.192094] Allocated by task 54: [ 63.192094] kasan_save_stack+0x33/0x60 [ 63.192094] kasan_save_track+0x14/0x30 [ 63.192094] __kasan_kmalloc+0x8f/0xa0 [ 63.192094] __kmalloc_node_track_caller_noprof+0x195/0x420 [ 63.192094] devm_kmalloc+0x74/0x1e0 [ 63.192094] appletb_kbd_probe+0x39/0x440 [ 63.192094] hid_device_probe+0x2d1/0x680 [ 63.192094] really_probe+0x1c3/0x690 [ 63.192094] __driver_probe_device+0x247/0x300 [ 63.192094] driver_probe_device+0x49/0x210 [ 63.192094] __device_attach_driver+0x160/0x320 [...] [ 63.192094] [ 63.192094] Freed by task 54: [ 63.192094] kasan_save_stack+0x33/0x60 [ 63.192094] kasan_save_track+0x14/0x30 [ 63.192094] kasan_save_free_info+0x3b/0x60 [ 63.192094] __kasan_slab_free+0x37/0x50 [ 63.192094] kfree+0xcf/0x360 [ 63.192094] devres_release_group+0x1f8/0x3c0 [ 63.192094] hid_device_probe+0x315/0x680 [ 63.192094] really_probe+0x1c3/0x690 [ 63.192094] __driver_probe_device+0x247/0x300 [ 63.192094] driver_probe_device+0x49/0x210 [ 63.192094] __device_attach_driver+0x160/0x320
[...]
--- drivers/hid/hid-appletb-kbd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hid/hid-appletb-kbd.c +3 -1
@@ -427,13 +427,15 @@ static int appletb_kbd_probe(struct hid_ ret =appletb_kbd_set_mode (kbd, appletb_tb_def_mode);if (ret) {dev_err_probe (dev, ret,"Failed to set touchbar mode\n" ); - goto close_hw; + goto unregister_handler; }hid_set_drvdata (hdev, kbd);return 0 ; +unregister_handler: +input_unregister_handler (&kbd->inp_handler); close_hw:if (kbd->backlight_dev)put_device (&kbd->backlight_dev->dev);
Greg Kroah-Hartman
maintainerPATCH 148/178 Input: xpad - support Acer NGR 200 Controller
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nilton Perim Neto <[email protected]>
commit 22c69d786ef8fb789c61ca75492a272774221324 upstream.
Add the NGR 200 Xbox 360 to the list of recognized controllers.
--- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/joystick/xpad.c +2 -0
@@ -174,6 +174,7 @@ static const struct xpad_device { { 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", 0, XTYPE_XBOX }, { 0x05fe, 0x3030, "Chic Controller", 0, XTYPE_XBOX }, { 0x05fe, 0x3031, "Chic Controller", 0, XTYPE_XBOX }, + { 0x0502, 0x1305, "Acer NGR200", 0, XTYPE_XBOX }, { 0x062a, 0x0020, "Logic3 Xbox GamePad", 0, XTYPE_XBOX }, { 0x062a, 0x0033, "Competition Pro Steering Wheel", 0, XTYPE_XBOX }, { 0x06a3, 0x0200, "Saitek Racing Wheel", 0, XTYPE_XBOX },
@@ -520,6 +521,7 @@ static const struct usb_device_id xpad_tXPAD_XBOX360_VENDOR (0x045e ),/* Microsoft Xbox 360 controllers */ XPAD_XBOXONE_VENDOR (0x045e ),/* Microsoft Xbox One controllers */ XPAD_XBOX360_VENDOR (0x046d ),/* Logitech Xbox 360-style controllers */ +XPAD_XBOX360_VENDOR (0x0502 ),/* Acer Inc. Xbox 360 style controllers */ XPAD_XBOX360_VENDOR (0x056e ),/* Elecom JC-U3613M */ XPAD_XBOX360_VENDOR (0x06a3 ),/* Saitek P3600 */ XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz Xbox 360 controllers */
Greg Kroah-Hartman
maintainerPATCH 149/178 Input: iqs7222 - explicitly define number of external channels
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff LaBundy <[email protected]>
commit 63f4970a1219b5256e8ea952096c86dab666d312 upstream.
The number of external channels is assumed to be a multiple of 10, but this is not the case for IQS7222D. As a result, some CRx pins are wrongly prevented from being assigned to some channels.
Address this problem by explicitly defining the number of external channels for cases in which the number of external channels is not equal to the total number of available channels.
--- drivers/input/misc/iqs7222.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/input/misc/iqs7222.c +5 -2
@@ -301,6 +301,7 @@ struct iqs7222_dev_desc {int allow_offset;int event_offset;int comms_offset; +int ext_chan;bool legacy_gesture;struct iqs7222_reg_grp_desc reg_grps[IQS7222_NUM_REG_GRPS ]; };
@@ -315,6 +316,7 @@ static const struct iqs7222_dev_desc iqs .allow_offset = 9, .event_offset = 10, .comms_offset = 12, + .ext_chan = 10, .reg_grps = { [IQS7222_REG_GRP_STAT] = { .base = IQS7222_SYS_STATUS,
@@ -373,6 +375,7 @@ static const struct iqs7222_dev_desc iqs .allow_offset = 9, .event_offset = 10, .comms_offset = 12, + .ext_chan = 10, .legacy_gesture = true, .reg_grps = { [IQS7222_REG_GRP_STAT] = {
@@ -2244,7 +2247,7 @@ static int iqs7222_parse_chan(struct iqsconst struct iqs7222_dev_desc *dev_desc = iqs7222->dev_desc;struct i2c_client *client = iqs7222->client;int num_chan = dev_desc->reg_grps[IQS7222_REG_GRP_CHAN ].num_row; -int ext_chan =rounddown (num_chan,10 ); +int ext_chan = dev_desc->ext_chan ? : num_chan;int error, i;u16 *chan_setup = iqs7222->chan_setup[chan_index];u16 *sys_setup = iqs7222->sys_setup;
@@ -2445,7 +2448,7 @@ static int iqs7222_parse_sldr(struct iqsconst struct iqs7222_dev_desc *dev_desc = iqs7222->dev_desc;struct i2c_client *client = iqs7222->client;int num_chan = dev_desc->reg_grps[IQS7222_REG_GRP_CHAN ].num_row; -int ext_chan =rounddown (num_chan,10 ); +int ext_chan = dev_desc->ext_chan ? : num_chan;int count, error, reg_offset, i;u16 *event_mask = &iqs7222->sys_setup[dev_desc->event_offset];u16 *sldr_setup = iqs7222->sldr_setup[sldr_index];
Greg Kroah-Hartman
maintainerPATCH 150/178 usb: cdnsp: do not disable slot for disabled slot
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Chen <[email protected]>
commit 7e2c421ef88e9da9c39e01496b7f5b0b354b42bc upstream.
It doesn't need to do it, and the related command event returns 'Slot Not Enabled Error' status.
--- drivers/usb/cdns3/cdnsp-ring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/cdns3/cdnsp-ring.c +3 -1
@@ -772,7 +772,9 @@ static int cdnsp_update_port_id(struct c }if (port_id != old_port) { -cdnsp_disable_slot (pdev); +if (pdev->slot_id) +cdnsp_disable_slot (pdev); + pdev->active_port = port;cdnsp_enable_slot (pdev); }
Greg Kroah-Hartman
maintainerPATCH 151/178 usb: cdnsp: Fix issue with CV Bad Descriptor test
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pawel Laszczak <[email protected]>
commit 2831a81077f5162f104ba5a97a7d886eb371c21c upstream.
The SSP2 controller has extra endpoint state preserve bit (ESP) which setting causes that endpoint state will be preserved during Halt Endpoint command. It is used only for EP0.
Without this bit the Command Verifier "TD 9.10 Bad Descriptor Test" failed.
Setting this bit doesn't have any impact for SSP controller.
--- drivers/usb/cdns3/cdnsp-debug.h | 5 +++-- drivers/usb/cdns3/cdnsp-ep0.c | 18 +++++++++++++++--- drivers/usb/cdns3/cdnsp-gadget.h | 6 ++++++ drivers/usb/cdns3/cdnsp-ring.c | 3 ++- 4 files changed, 26 insertions(+), 6 deletions(-)
drivers/usb/cdns3/cdnsp-debug.h +3 -2
@@ -327,12 +327,13 @@ static inline const char *cdnsp_decode_tcase TRB_RESET_EP :case TRB_HALT_ENDPOINT : ret =scnprintf (str, size, -"%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c" , +"%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c %c" ,cdnsp_trb_type_string (type), ep_num, ep_id %2 ?"out" :"in" ,TRB_TO_EP_INDEX (field3), field1, field0,TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + field3 &TRB_CYCLE ?'C' :'c' , + field3 &TRB_ESP ?'P' :'p' );break ;case TRB_STOP_RING : ret = scnprintf(str, size,
drivers/usb/cdns3/cdnsp-ep0.c +15 -3
@@ -414,6 +414,7 @@ static int cdnsp_ep0_std_request(structvoid cdnsp_setup_analyze (struct cdnsp_device *pdev) {struct usb_ctrlrequest *ctrl = &pdev->setup; +struct cdnsp_ep *pep;int ret = -EINVAL ;u16 len;
@@ -427,10 +428,21 @@ void cdnsp_setup_analyze(struct cdnsp_de goto out; } + pep = &pdev->eps[0 ]; +/* Restore the ep0 to Stopped/Running state. */ -if (pdev->eps[0 ].ep_state &EP_HALTED ) { -trace_cdnsp_ep0_halted ("Restore to normal state" ); -cdnsp_halt_endpoint (pdev, &pdev->eps[0 ],0 ); +if (pep->ep_state &EP_HALTED ) { +if (GET_EP_CTX_STATE (pep->out_ctx) ==EP_STATE_HALTED ) +cdnsp_halt_endpoint (pdev, pep,0 ); + +/* +* Halt Endpoint Command for SSP2 for ep0 preserve current +* endpoint state and driver has to synchronize the +* software endpoint state with endpoint output context +* state. +*/ + pep->ep_state &= ~EP_HALTED ; + pep->ep_state |=EP_STOPPED ; }/*
drivers/usb/cdns3/cdnsp-gadget.h +6 -0
@@ -987,6 +987,12 @@ enum cdnsp_setup_dev {#define STREAM_ID_FOR_TRB (p) ((((p)) << 16) & GENMASK(31, 16))#define SCT_FOR_TRB (p) (((p) << 1) & 0x7) +/* +* Halt Endpoint Command TRB field. +* The ESP bit only exists in the SSP2 controller. +*/ +#define TRB_ESP BIT(9) +/* Link TRB specific fields. */ #define TRB_TC BIT(1)
drivers/usb/cdns3/cdnsp-ring.c +2 -1
@@ -2485,7 +2485,8 @@ void cdnsp_queue_halt_endpoint(struct cd {cdnsp_queue_command (pdev,0 ,0 ,0 ,TRB_TYPE (TRB_HALT_ENDPOINT ) |SLOT_ID_FOR_TRB (pdev->slot_id) | -EP_ID_FOR_TRB (ep_index)); +EP_ID_FOR_TRB (ep_index) | + (!ep_index ?TRB_ESP :0 )); }void cdnsp_force_header_wakeup (struct cdnsp_device *pdev,int intf_num)
Greg Kroah-Hartman
maintainerPATCH 152/178 usb: dwc3: Abort suspend on soft disconnect failure
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuen-Han Tsai <[email protected]>
commit 630a1dec3b0eba2a695b9063f1c205d585cbfec9 upstream.
When dwc3_gadget_soft_disconnect() fails, dwc3_suspend_common() keeps going with the suspend, resulting in a period where the power domain is off, but the gadget driver remains connected. Within this time frame, invoking vbus_event_work() will cause an error as it attempts to access DWC3 registers for endpoint disabling after the power domain has been completely shut down.
Abort the suspend sequence when dwc3_gadget_suspend() cannot halt the controller and proceeds with a soft connect.
--- drivers/usb/dwc3/core.c | 9 +++++++-- drivers/usb/dwc3/gadget.c | 22 +++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-)
drivers/usb/dwc3/core.c +7 -2
@@ -2388,6 +2388,7 @@ static int dwc3_suspend_common(struct dw {u32 reg;int i; +int ret;if (!pm_runtime_suspended (dwc->dev) && !PMSG_IS_AUTO (msg)) { dwc->susphy_state = (dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)) &
@@ -2406,7 +2407,9 @@ static int dwc3_suspend_common(struct dwcase DWC3_GCTL_PRTCAP_DEVICE :if (pm_runtime_suspended (dwc->dev))break ; -dwc3_gadget_suspend (dwc); + ret =dwc3_gadget_suspend (dwc); +if (ret) +return ret;synchronize_irq (dwc->irq_gadget);dwc3_core_exit (dwc);break ;
@@ -2441,7 +2444,9 @@ static int dwc3_suspend_common(struct dwbreak ;if (dwc->current_otg_role ==DWC3_OTG_ROLE_DEVICE ) { -dwc3_gadget_suspend (dwc); + ret =dwc3_gadget_suspend (dwc); +if (ret) +return ret;synchronize_irq (dwc->irq_gadget); }
drivers/usb/dwc3/gadget.c +9 -13
@@ -4821,26 +4821,22 @@ int dwc3_gadget_suspend(struct dwc3 *dwcint ret; ret =dwc3_gadget_soft_disconnect (dwc); -if (ret) - goto err; - -spin_lock_irqsave (&dwc->lock, flags); -if (dwc->gadget_driver) -dwc3_disconnect_gadget (dwc); -spin_unlock_irqrestore (&dwc->lock, flags); - -return 0 ; - -err:/* * Attempt to reset the controller's state. Likely no * communication can be established until the host * performs a port reset. */ -if (dwc->softconnect) +if (ret && dwc->softconnect) {dwc3_gadget_soft_connect (dwc); +return -EAGAIN ; + } -return ret; +spin_lock_irqsave (&dwc->lock, flags); +if (dwc->gadget_driver) +dwc3_disconnect_gadget (dwc); +spin_unlock_irqrestore (&dwc->lock, flags); + +return 0 ; }int dwc3_gadget_resume (struct dwc3 *dwc)
Greg Kroah-Hartman
maintainerPATCH 153/178 usb: dwc3: gadget: Fix TRB reclaim logic for short transfers and ZLPs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: SCHNEIDER Johannes <[email protected]>
commit 80e08394377559ed5a2ccadd861e62d24b826911 upstream.
Commit 96c7bf8f6b3e ("usb: dwc3: gadget: Cleanup SG handling") updated the TRB reclaim path to use the TRB CHN (Chain) bit to determine whether a TRB was part of a chain. However, this inadvertently changed the behavior of reclaiming the final TRB in some scatter-gather or short transfer cases.
In particular, if the final TRB did not have the CHN bit set, the cleanup path could incorrectly skip clearing the HWO (Hardware Own) bit, leaving stale TRBs in the ring. This resulted in broken data transfer completions in userspace, notably for MTP over FunctionFS.
Fix this by unconditionally clearing the HWO bit during TRB reclaim, regardless of the CHN bit state. This restores correct behavior especially for transfers that require ZLPs or end on non-CHN TRBs.
--- drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +1 -1
@@ -3516,7 +3516,7 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,* We're going to do that here to avoid problems of HW trying * to use bogus TRBs for transfers. */ -if (chain && (trb->ctrl &DWC3_TRB_CTRL_HWO )) +if (trb->ctrl &DWC3_TRB_CTRL_HWO ) trb->ctrl &= ~DWC3_TRB_CTRL_HWO ;/*
Signature · 1 line
2.50.0
Greg Kroah-Hartman
maintainerPATCH 154/178 usb: chipidea: udc: disconnect/reconnect from host when do suspend/resume
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
commit 31a6afbe86e8e9deba9ab53876ec49eafc7fd901 upstream.
Shawn and John reported a hang issue during system suspend as below:
- USB gadget is enabled as Ethernet
- There is data transfer over USB Ethernet (scp a big file between host and device)
- Device is going in/out suspend (echo mem > /sys/power/state)
The root cause is the USB device controller is suspended but the USB bus is still active which caused the USB host continues to transfer data with device and the device continues to queue USB requests (in this case, a delayed TCP ACK packet trigger the issue) after controller is suspended, however the USB controller clock is already gated off. Then if udc driver access registers after that point, the system will hang.
The correct way to avoid such issue is to disconnect device from host when the USB bus is not at suspend state. Then the host will receive disconnect event and stop data transfer in time. To continue make USB gadget device work after system resume, this will reconnect device automatically.
To make usb wakeup work if USB bus is already at suspend state, this will keep connection for it only when USB device controller has enabled wakeup capability.
--- drivers/usb/chipidea/udc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/chipidea/udc.c +7 -0
@@ -2374,6 +2374,10 @@ static void udc_suspend(struct ci_hdrc **/ if (hw_read (ci,OP_ENDPTLISTADDR , ~0 ) ==0 )hw_write (ci,OP_ENDPTLISTADDR , ~0 , ~0 ); + +if (ci->gadget.connected && + (!ci->suspended || !device_may_wakeup (ci->dev))) +usb_gadget_disconnect (&ci->gadget); }static void udc_resume (struct ci_hdrc *ci,bool power_lost)
@@ -2384,6 +2388,9 @@ static void udc_resume(struct ci_hdrc *c OTGSC_BSVIS | OTGSC_BSVIE);if (ci->vbus_active)usb_gadget_vbus_disconnect (&ci->gadget); + }else if (ci->vbus_active && ci->driver && + !ci->gadget.connected) { +usb_gadget_connect (&ci->gadget); }/* Restore value 0 if it was set for power lost check */
Greg Kroah-Hartman
maintainerPATCH 155/178 usb: acpi: fix device link removal
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heikki Krogerus <[email protected]>
commit 3b18405763c1ebb1efc15feef5563c9cdb2cc3a7 upstream.
The device link to the USB4 host interface has to be removed manually since it's no longer auto removed.
--- drivers/usb/core/hub.c | 3 +++ drivers/usb/core/usb-acpi.c | 4 +++- include/linux/usb.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-)
drivers/usb/core/hub.c +3 -0
@@ -2337,6 +2337,9 @@ void usb_disconnect(struct usb_device **usb_remove_ep_devs (&udev->ep0);usb_unlock_device (udev); +if (udev->usb4_link) +device_link_del (udev->usb4_link); +/* Unregister the device. The device driver is responsible * for de-configuring the device and invoking the remove-device * notifier chain (used by usbfs and possibly others).
drivers/usb/core/usb-acpi.c +3 -1
@@ -157,7 +157,7 @@ EXPORT_SYMBOL_GPL(usb_acpi_set_power_sta*/ static int usb_acpi_add_usb4_devlink (struct usb_device *udev) { -const struct device_link *link; +struct device_link *link;struct usb_port *port_dev;struct usb_hub *hub;
@@ -188,6 +188,8 @@ static int usb_acpi_add_usb4_devlink(strdev_dbg (&port_dev->dev,"Created device link from %s to %s\n" ,dev_name (&port_dev->child->dev),dev_name (nhi_fwnode->dev)); + udev->usb4_link = link; +return 0 ; }
include/linux/usb.h +2 -0
@@ -614,6 +614,7 @@ struct usb3_lpm_parameters {* FIXME -- complete doc * @authenticated: Crypto authentication passed * @tunnel_mode: Connection native or tunneled over USB4 +* @usb4_link: device link to the USB4 host interface * @lpm_capable: device supports LPM * @lpm_devinit_allow: Allow USB3 device initiated LPM, exit latency is in range * @usb2_hw_lpm_capable: device can perform USB2 hardware LPM
@@ -724,6 +725,7 @@ struct usb_device { unsigned reset_resume:1; unsigned port_is_suspended:1;enum usb_link_tunnel_mode tunnel_mode; +struct device_link *usb4_link;int slot_id;struct usb2_lpm_parameters l1_params;
Greg Kroah-Hartman
maintainerPATCH 156/178 smb: client: fix readdir returning wrong type with POSIX extensions
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Kerling <[email protected]>
commit b8f89cb723b9e66f5dbd7199e4036fee34fb0de0 upstream.
When SMB 3.1.1 POSIX Extensions are negotiated, userspace applications using readdir() or getdents() calls without stat() on each individual file (such as a simple "ls" or "find") would misidentify file types and exhibit strange behavior such as not descending into directories. The reason for this behavior is an oversight in the cifs_posix_to_fattr conversion function. Instead of extracting the entry type for cf_dtype from the properly converted cf_mode field, it tries to extract the type from the PDU. While the wire representation of the entry mode is similar in structure to POSIX stat(), the assignments of the entry types are different. Applying the S_DT macro to cf_mode instead yields the correct result. This is also what the equivalent function smb311_posix_info_to_fattr in inode.c already does for stat() etc.; which is why "ls -l" would give the correct file type but "ls" would not (as identified by the colors).
--- fs/smb/client/readdir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/smb/client/readdir.c +1 -1
@@ -263,7 +263,7 @@ cifs_posix_to_fattr(struct cifs_fattr *f/* The Mode field in the response can now include the file type as well */ fattr->cf_mode =wire_mode_to_posix (le32_to_cpu (info->Mode), fattr->cf_cifsattrs &ATTR_DIRECTORY ); - fattr->cf_dtype =S_DT (le32_to_cpu (info->Mode)); + fattr->cf_dtype =S_DT (fattr->cf_mode);switch (fattr->cf_mode &S_IFMT ) {case S_IFLNK :
Greg Kroah-Hartman
maintainerPATCH 157/178 cifs: all initializations for tcon should happen in tcon_info_alloc
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Prasad N <[email protected]>
commit 74ebd02163fde05baa23129e06dde4b8f0f2377a upstream.
Today, a few work structs inside tcon are initialized inside cifs_get_tcon and not in tcon_info_alloc. As a result, if a tcon is obtained from tcon_info_alloc, but not called as a part of cifs_get_tcon, we may trip over.
--- fs/smb/client/cifsproto.h | 1 + fs/smb/client/connect.c | 8 +------- fs/smb/client/misc.c | 6 ++++++ 3 files changed, 8 insertions(+), 7 deletions(-)
fs/smb/client/cifsproto.h +1 -0
@@ -136,6 +136,7 @@ extern int SendReceiveBlockingLock(conststruct smb_hdr *out_buf, int *bytes_returned); +void smb2_query_server_interfaces (struct work_struct *work);void cifs_signal_cifsd_for_reconnect (struct TCP_Server_Info *server,bool all_channels);
fs/smb/client/connect.c +1 -7
@@ -97,7 +97,7 @@ static int reconn_set_ipaddr_from_hostnareturn rc; } -static void smb2_query_server_interfaces (struct work_struct *work) +void smb2_query_server_interfaces (struct work_struct *work) {int rc;int xid;
@@ -2880,20 +2880,14 @@ cifs_get_tcon(struct cifs_ses *ses, stru tcon->max_cached_dirs = ctx->max_cached_dirs; tcon->nodelete = ctx->nodelete; tcon->local_lease = ctx->local_lease; -INIT_LIST_HEAD (&tcon->pending_opens); tcon->status =TID_GOOD ; -INIT_DELAYED_WORK (&tcon->query_interfaces, - smb2_query_server_interfaces);if (ses->server->dialect >=SMB30_PROT_ID && (ses->server->capabilities &SMB2_GLOBAL_CAP_MULTI_CHANNEL )) {/* schedule query interfaces poll */ queue_delayed_work (cifsiod_wq, &tcon->query_interfaces, (SMB_INTERFACE_POLL_INTERVAL *HZ )); } -#ifdef CONFIG_CIFS_DFS_UPCALL -INIT_DELAYED_WORK (&tcon->dfs_cache_work, dfs_cache_refresh); -#endif spin_lock (&cifs_tcp_ses_lock);list_add (&tcon->tcon_list, &ses->tcon_list);spin_unlock (&cifs_tcp_ses_lock);
fs/smb/client/misc.c +6 -0
@@ -151,6 +151,12 @@ tcon_info_alloc(bool dir_leases_enabled,#ifdef CONFIG_CIFS_DFS_UPCALL INIT_LIST_HEAD (&ret_buf->dfs_ses_list);#endif +INIT_LIST_HEAD (&ret_buf->pending_opens); +INIT_DELAYED_WORK (&ret_buf->query_interfaces, + smb2_query_server_interfaces); +#ifdef CONFIG_CIFS_DFS_UPCALL +INIT_DELAYED_WORK (&ret_buf->dfs_cache_work, dfs_cache_refresh); +#endif return ret_buf; }
Greg Kroah-Hartman
maintainerPATCH 158/178 dma-buf: fix timeout handling in dma_resv_wait_timeout v2
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian König <[email protected]>
commit 2b95a7db6e0f75587bffddbb490399cbb87e4985 upstream.
Even the kerneldoc says that with a zero timeout the function should not wait for anything, but still return 1 to indicate that the fences are signaled now.
Unfortunately that isn't what was implemented, instead of only returning 1 we also waited for at least one jiffies.
Fix that by adjusting the handling to what the function is actually documented to do.
v2: improve code readability
--- drivers/dma-buf/dma-resv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/dma-buf/dma-resv.c +7 -5
@@ -685,11 +685,13 @@ long dma_resv_wait_timeout(struct dma_redma_resv_iter_begin (&cursor, obj, usage);dma_resv_for_each_fence_unlocked (&cursor, fence) { - ret =dma_fence_wait_timeout (fence, intr, ret); -if (ret <=0 ) { -dma_resv_iter_end (&cursor); -return ret; - } + ret =dma_fence_wait_timeout (fence, intr, timeout); +if (ret <=0 ) +break ; + +/* Even for zero timeout the return value is 1 */ +if (timeout) + timeout = ret; }dma_resv_iter_end (&cursor);
Greg Kroah-Hartman
maintainerPATCH 159/178 HID: appletb-kbd: fix slab use-after-free bug in appletb_kbd_probe
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
commit 38224c472a038fa9ccd4085511dd9f3d6119dbf9 upstream.
In probe appletb_kbd_probe() a "struct appletb_kbd *kbd" is allocated via devm_kzalloc() to store touch bar keyboard related data. Later on if backlight_device_get_by_name() finds a backlight device with name "appletb_backlight" a timer (kbd->inactivity_timer) is setup with appletb_inactivity_timer() and the timer is armed to run after appletb_tb_dim_timeout (60) seconds.
A use-after-free is triggered when failure occurs after the timer is armed. This ultimately means probe failure occurs and as a result the "struct appletb_kbd *kbd" which is device managed memory is freed. After 60 seconds the timer will have expired and __run_timers will attempt to access the timer (kbd->inactivity_timer) however the kdb structure has been freed causing a use-after free.
[ 71.636938] ================================================================== [ 71.637915] BUG: KASAN: slab-use-after-free in __run_timers+0x7ad/0x890 [ 71.637915] Write of size 8 at addr ffff8881178c5958 by task swapper/1/0 [ 71.637915] [ 71.637915] CPU: 1 UID: 0 PID: 0 Comm: swapper/1 Not tainted 6.16.0-rc2-00318-g739a6c93cc75-dirty #12 PREEMPT(voluntary) [ 71.637915] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 [ 71.637915] Call Trace: [ 71.637915] <IRQ> [ 71.637915] dump_stack_lvl+0x53/0x70 [ 71.637915] print_report+0xce/0x670 [ 71.637915] ? __run_timers+0x7ad/0x890 [ 71.637915] kasan_report+0xce/0x100 [ 71.637915] ? __run_timers+0x7ad/0x890 [ 71.637915] __run_timers+0x7ad/0x890 [ 71.637915] ? __pfx___run_timers+0x10/0x10 [ 71.637915] ? update_process_times+0xfc/0x190 [ 71.637915] ? __pfx_update_process_times+0x10/0x10 [ 71.637915] ? _raw_spin_lock_irq+0x80/0xe0 [ 71.637915] ? _raw_spin_lock_irq+0x80/0xe0 [ 71.637915] ? __pfx__raw_spin_lock_irq+0x10/0x10 [ 71.637915] run_timer_softirq+0x141/0x240 [ 71.637915] ? __pfx_run_timer_softirq+0x10/0x10 [ 71.637915] ? __pfx___hrtimer_run_queues+0x10/0x10 [ 71.637915] ? kvm_clock_get_cycles+0x18/0x30 [ 71.637915] ? ktime_get+0x60/0x140 [ 71.637915] handle_softirqs+0x1b8/0x5c0 [ 71.637915] ? __pfx_handle_softirqs+0x10/0x10 [ 71.637915] irq_exit_rcu+0xaf/0xe0 [ 71.637915] sysvec_apic_timer_interrupt+0x6c/0x80 [ 71.637915] </IRQ> [ 71.637915] [ 71.637915] Allocated by task 39: [ 71.637915] kasan_save_stack+0x33/0x60 [ 71.637915] kasan_save_track+0x14/0x30 [ 71.637915] __kasan_kmalloc+0x8f/0xa0 [ 71.637915] __kmalloc_node_track_caller_noprof+0x195/0x420 [ 71.637915] devm_kmalloc+0x74/0x1e0 [ 71.637915] appletb_kbd_probe+0x37/0x3c0 [ 71.637915] hid_device_probe+0x2d1/0x680 [ 71.637915] really_probe+0x1c3/0x690 [ 71.637915] __driver_probe_device+0x247/0x300 [ 71.637915] driver_probe_device+0x49/0x210 [...] [ 71.637915] [ 71.637915] Freed by task 39: [ 71.637915] kasan_save_stack+0x33/0x60 [ 71.637915] kasan_save_track+0x14/0x30 [ 71.637915] kasan_save_free_info+0x3b/0x60 [ 71.637915] __kasan_slab_free+0x37/0x50 [ 71.637915] kfree+0xcf/0x360 [ 71.637915] devres_release_group+0x1f8/0x3c0 [ 71.637915] hid_device_probe+0x315/0x680 [ 71.637915] really_probe+0x1c3/0x690 [ 71.637915] __driver_probe_device+0x247/0x300 [ 71.637915] driver_probe_device+0x49/0x210
[...]
The root cause of the issue is that the timer is not disarmed on failure paths leading to it remaining active and accessing freed memory. To fix this call timer_delete_sync() to deactivate the timer.
Another small issue is that timer_delete_sync is called unconditionally in appletb_kbd_remove(), fix this by checking for a valid kbd->backlight_dev before calling timer_delete_sync.
--- drivers/hid/hid-appletb-kbd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/hid/hid-appletb-kbd.c +6 -4
@@ -437,8 +437,10 @@ static int appletb_kbd_probe(struct hid_ unregister_handler:input_unregister_handler (&kbd->inp_handler); close_hw: -if (kbd->backlight_dev) +if (kbd->backlight_dev) {put_device (&kbd->backlight_dev->dev); +timer_delete_sync (&kbd->inactivity_timer); + }hid_hw_close (hdev); stop_hw:hid_hw_stop (hdev);
@@ -452,10 +454,10 @@ static void appletb_kbd_remove(struct hiappletb_kbd_set_mode (kbd,APPLETB_KBD_MODE_OFF );input_unregister_handler (&kbd->inp_handler); -timer_delete_sync (&kbd->inactivity_timer); - -if (kbd->backlight_dev) +if (kbd->backlight_dev) {put_device (&kbd->backlight_dev->dev); +timer_delete_sync (&kbd->inactivity_timer); + }hid_hw_close (hdev);hid_hw_stop (hdev);
Greg Kroah-Hartman
maintainerPATCH 160/178 dt-bindings: i2c: realtek,rtl9301: Fix missing reg constraint
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 5f05fc6e2218db7ecc52c60eb34b707fe69262c2 upstream.
Lists should have fixed amount if items, so add missing constraint to the 'reg' property (only one address space entry).
--- Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml +2 -1
@@ -26,7 +26,8 @@ properties: - const: realtek,rtl9301-i2c reg: - description: Register offset and size this I2C controller. + items: + - description: Register offset and size this I2C controller. "#address-cells": const: 1
Greg Kroah-Hartman
maintainerPATCH 161/178 i2c/designware: Fix an initialization issue
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael J. Ruhl <[email protected]>
commit 3d30048958e0d43425f6d4e76565e6249fa71050 upstream.
The i2c_dw_xfer_init() function requires msgs and msg_write_idx from the dev context to be initialized.
amd_i2c_dw_xfer_quirk() inits msgs and msgs_num, but not msg_write_idx.
This could allow an out of bounds access (of msgs).
Initialize msg_write_idx before calling i2c_dw_xfer_init().
--- drivers/i2c/busses/i2c-designware-master.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-designware-master.c +1 -0
@@ -363,6 +363,7 @@ static int amd_i2c_dw_xfer_quirk(struct dev->msgs = msgs; dev->msgs_num = num_msgs; + dev->msg_write_idx =0 ;i2c_dw_xfer_init (dev);/* Initiate messages read/write transaction */
Greg Kroah-Hartman
maintainerPATCH 162/178 Logitech C-270 even more broken
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit cee4392a57e14a799fbdee193bc4c0de65b29521 upstream.
Some varieties of this device don't work withRESET_RESUME alone.
--- drivers/usb/core/quirks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/core/quirks.c +2 -1
@@ -227,7 +227,8 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME }, /* Logitech HD Webcam C270 */ - { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME | + USB_QUIRK_NO_LPM}, /* Logitech HD Pro Webcams C920, C920-C, C922, C925e and C930e */ { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT },
Greg Kroah-Hartman
maintainerPATCH 163/178 optee: ffa: fix sleep in atomic context
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Wiklander <[email protected]>
commit 312d02adb959ea199372f375ada06e0186f651e4 upstream.
The OP-TEE driver registers the function notif_callback() for FF-A notifications. However, this function is called in an atomic context leading to errors like this when processing asynchronous notifications:
| BUG: sleeping function called from invalid context at kernel/locking/mutex.c:258 | in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 9, name: kworker/0:0 | preempt_count: 1, expected: 0 | RCU nest depth: 0, expected: 0 | CPU: 0 UID: 0 PID: 9 Comm: kworker/0:0 Not tainted 6.14.0-00019-g657536ebe0aa #13 | Hardware name: linux,dummy-virt (DT) | Workqueue: ffa_pcpu_irq_notification notif_pcpu_irq_work_fn | Call trace: | show_stack+0x18/0x24 (C) | dump_stack_lvl+0x78/0x90 | dump_stack+0x18/0x24 | __might_resched+0x114/0x170 | __might_sleep+0x48/0x98 | mutex_lock+0x24/0x80 | optee_get_msg_arg+0x7c/0x21c | simple_call_with_arg+0x50/0xc0 | optee_do_bottom_half+0x14/0x20 | notif_callback+0x3c/0x48 | handle_notif_callbacks+0x9c/0xe0 | notif_get_and_handle+0x40/0x88 | generic_exec_single+0x80/0xc0 | smp_call_function_single+0xfc/0x1a0 | notif_pcpu_irq_work_fn+0x2c/0x38 | process_one_work+0x14c/0x2b4 | worker_thread+0x2e4/0x3e0 | kthread+0x13c/0x210 | ret_from_fork+0x10/0x20
Fix this by adding work queue to process the notification in a non-atomic context.
--- drivers/tee/optee/ffa_abi.c | 41 +++++++++++++++++++++++++++++--------- drivers/tee/optee/optee_private.h | 2 + 2 files changed, 34 insertions(+), 9 deletions(-)
drivers/tee/optee/ffa_abi.c +32 -9
@@ -728,12 +728,21 @@ static bool optee_ffa_exchange_caps(strureturn true; } +static void notif_work_fn (struct work_struct *work) +{ + struct optee_ffa *optee_ffa = container_of(work, struct optee_ffa, + notif_work); + struct optee *optee = container_of(optee_ffa, struct optee, ffa); + +optee_do_bottom_half (optee->ctx); +} +static void notif_callback (int notify_id,void *cb_data) {struct optee *optee = cb_data;if (notify_id == optee->ffa.bottom_half_value) -optee_do_bottom_half (optee->ctx); +queue_work (optee->ffa.notif_wq, &optee->ffa.notif_work);else optee_notif_send (optee, notify_id); }
@@ -817,9 +826,11 @@ static void optee_ffa_remove(struct ffa_struct optee *optee =ffa_dev_get_drvdata (ffa_dev);u32 bottom_half_id = optee->ffa.bottom_half_value; -if (bottom_half_id !=U32_MAX ) +if (bottom_half_id !=U32_MAX ) { ffa_dev->ops->notifier_ops->notify_relinquish (ffa_dev, bottom_half_id); +destroy_workqueue (optee->ffa.notif_wq); + }optee_remove_common (optee);mutex_destroy (&optee->ffa.mutex);
@@ -835,6 +846,13 @@ static int optee_ffa_async_notif_init(stu32 notif_id =0 ;int rc; +INIT_WORK (&optee->ffa.notif_work, notif_work_fn); + optee->ffa.notif_wq =create_workqueue ("optee_notification" ); +if (!optee->ffa.notif_wq) { + rc = -EINVAL ; + goto err; + } +while (true) { rc = ffa_dev->ops->notifier_ops->notify_request(ffa_dev, is_per_vcpu,
@@ -851,19 +869,24 @@ static int optee_ffa_async_notif_init(st* notifications in that case. */ if (rc != -EACCES ) -return rc; + goto err_wq; notif_id++;if (notif_id >=OPTEE_FFA_MAX_ASYNC_NOTIF_VALUE ) -return rc; + goto err_wq; } optee->ffa.bottom_half_value = notif_id; rc =enable_async_notif (optee); -if (rc <0 ) { - ffa_dev->ops->notifier_ops->notify_relinquish (ffa_dev, - notif_id); - optee->ffa.bottom_half_value =U32_MAX ; - } +if (rc <0 ) + goto err_rel; + +return 0 ; +err_rel: + ffa_dev->ops->notifier_ops->notify_relinquish (ffa_dev, notif_id); +err_wq: +destroy_workqueue (optee->ffa.notif_wq); +err: + optee->ffa.bottom_half_value =U32_MAX ;return rc; }
drivers/tee/optee/optee_private.h +2 -0
@@ -165,6 +165,8 @@ struct optee_ffa {/* Serializes access to @global_ids */ struct mutex mutex;struct rhashtable global_ids; +struct workqueue_struct *notif_wq; +struct work_struct notif_work; };struct optee ;
Greg Kroah-Hartman
maintainerPATCH 164/178 iommu/rockchip: prevent iommus dead loop when two masters share one IOMMU
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Xue <[email protected]>
commit 62e062a29ad5133f67c20b333ba0a952a99161ae upstream.
When two masters share an IOMMU, calling ops->of_xlate during the second master's driver init may overwrite iommu->domain set by the first. This causes the check if (iommu->domain == domain) in rk_iommu_attach_device() to fail, resulting in the same iommu->node being added twice to &rk_domain->iommus, which can lead to an infinite loop in subsequent &rk_domain->iommus operations.
--- drivers/iommu/rockchip-iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/rockchip-iommu.c +2 -1
@@ -1155,7 +1155,6 @@ static int rk_iommu_of_xlate(struct devireturn -ENOMEM ; data->iommu =platform_get_drvdata (iommu_dev); - data->iommu->domain = &rk_identity_domain;dev_iommu_priv_set (dev, data);platform_device_put (iommu_dev);
@@ -1193,6 +1192,8 @@ static int rk_iommu_probe(struct platforif (!iommu)return -ENOMEM ; + iommu->domain = &rk_identity_domain; +platform_set_drvdata (pdev, iommu); iommu->dev = dev; iommu->num_mmu =0 ;
Greg Kroah-Hartman
maintainerPATCH 165/178 iommu/vt-d: Assign devtlb cache tag on ATS enablement
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lu Baolu <[email protected]>
commit 25b1b75bbaf96331750fb01302825069657b2ff8 upstream.
Commit <4f1492efb495> ("iommu/vt-d: Revert ATS timing change to fix boot failure") placed the enabling of ATS in the probe_finalize callback. This occurs after the default domain attachment, which is when the ATS cache tag is assigned. Consequently, the device TLB cache tag is missed when the domain is attached, leading to the device TLB not being invalidated in the iommu_unmap paths.
Fix this by assigning the CACHE_TAG_DEVTLB cache tag when ATS is enabled.
--- drivers/iommu/intel/cache.c | 5 ++--- drivers/iommu/intel/iommu.c | 11 ++++++++++- drivers/iommu/intel/iommu.h | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-)
drivers/iommu/intel/cache.c +2 -3
@@ -40,9 +40,8 @@ static bool cache_tage_match(struct cach }/* Assign a cache tag with specified type to domain. */ -static int cache_tag_assign (struct dmar_domain *domain,u16 did, -struct device *dev,ioasid_t pasid, -enum cache_tag_type type) +int cache_tag_assign (struct dmar_domain *domain,u16 did,struct device *dev, +ioasid_t pasid,enum cache_tag_type type) {struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu = info->iommu;
drivers/iommu/intel/iommu.c +10 -1
@@ -3819,8 +3819,17 @@ static void intel_iommu_probe_finalize(s !pci_enable_pasid(to_pci_dev(dev), info->pasid_supported & ~1)) info->pasid_enabled = 1; -if (sm_supported (iommu) && !dev_is_real_dma_subdevice (dev)) +if (sm_supported (iommu) && !dev_is_real_dma_subdevice (dev)) {iommu_enable_pci_ats (info); +/* Assign a DEVTLB cache tag to the default domain. */ +if (info->ats_enabled && info->domain) { +u16 did =domain_id_iommu (info->domain, iommu); + +if (cache_tag_assign (info->domain, did, dev, +IOMMU_NO_PASID ,CACHE_TAG_DEVTLB )) +iommu_disable_pci_ats (info); + } + }iommu_enable_pci_pri (info); }
drivers/iommu/intel/iommu.h +2 -0
@@ -1277,6 +1277,8 @@ struct cache_tag {unsigned int users; }; +int cache_tag_assign (struct dmar_domain *domain,u16 did,struct device *dev, +ioasid_t pasid,enum cache_tag_type type);int cache_tag_assign_domain (struct dmar_domain *domain,struct device *dev,ioasid_t pasid); void cache_tag_unassign_domain(struct dmar_domain *domain,
Greg Kroah-Hartman
maintainerPATCH 166/178 powercap: intel_rapl: Do not change CLAMPING bit if ENABLE bit cannot be changed
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
commit 964209202ebe1569c858337441e87ef0f9d71416 upstream.
PL1 cannot be disabled on some platforms. The ENABLE bit is still set after software clears it. This behavior leads to a scenario where, upon user request to disable the Power Limit through the powercap sysfs, the ENABLE bit remains set while the CLAMPING bit is inadvertently cleared.
According to the Intel Software Developer's Manual, the CLAMPING bit, "When set, allows the processor to go below the OS requested P states in order to maintain the power below specified Platform Power Limit value."
Thus this means the system may operate at higher power levels than intended on such platforms.
Enhance the code to check ENABLE bit after writing to it, and stop further processing if ENABLE bit cannot be changed.
--- drivers/powercap/intel_rapl_common.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/powercap/intel_rapl_common.c +17 -1
@@ -340,12 +340,28 @@ static int set_domain_enable(struct powe {struct rapl_domain *rd =power_zone_to_rapl_domain (power_zone);struct rapl_defaults *defaults =get_defaults (rd->rp); +u64 val;int ret;cpus_read_lock (); ret =rapl_write_pl_data (rd,POWER_LIMIT1 ,PL_ENABLE , mode); -if (!ret && defaults->set_floor_freq) +if (ret) + goto end; + + ret =rapl_read_pl_data (rd,POWER_LIMIT1 ,PL_ENABLE , false, &val); +if (ret) + goto end; + +if (mode != val) { +pr_debug ("%s cannot be %s\n" , power_zone->name, +str_enabled_disabled (mode)); + goto end; + } + +if (defaults->set_floor_freq) defaults->set_floor_freq (rd, mode); + +end:cpus_read_unlock ();return ret;
Greg Kroah-Hartman
maintainerPATCH 167/178 riscv: cpu_ops_sbi: Use static array for boot_data
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vivian Wang <[email protected]>
commit 2b29be967ae456fc09c320d91d52278cf721be1e upstream.
Since commit 6b9f29b81b15 ("riscv: Enable pcpu page first chunk allocator"), if NUMA is enabled, the page percpu allocator may be used on very sparse configurations, or when requested on boot with percpu_alloc=page.
In that case, percpu data gets put in the vmalloc area. However, sbi_hsm_hart_start() needs the physical address of a sbi_hart_boot_data, and simply assumes that __pa() would work. This causes the just started hart to immediately access an invalid address and hang.
Fortunately, struct sbi_hart_boot_data is not too large, so we can simply allocate an array for boot_data statically, putting it in the kernel image.
This fixes NUMA=y SMP boot on Sophgo SG2042.
To reproduce on QEMU: Set CONFIG_NUMA=y and CONFIG_DEBUG_VIRTUAL=y, then run with:
qemu-system-riscv64 -M virt -smp 2 -nographic \
-kernel arch/riscv/boot/Image \
-append "percpu_alloc=page"Kernel output:
[ 0.000000] Booting Linux on hartid 0 [ 0.000000] Linux version 6.16.0-rc1 (dram@sakuya) (riscv64-unknown-linux-gnu-gcc (GCC) 14.2.1 20250322, GNU ld (GNU Binutils) 2.44) #11 SMP Tue Jun 24 14:56:22 CST 2025 ... [ 0.000000] percpu: 28 4K pages/cpu s85784 r8192 d20712 ... [ 0.083192] smp: Bringing up secondary CPUs ... [ 0.086722] ------------[ cut here ]------------ [ 0.086849] virt_to_phys used for non-linear address: (____ptrval____) (0xff2000000001d080) [ 0.088001] WARNING: CPU: 0 PID: 1 at arch/riscv/mm/physaddr.c:14 __virt_to_phys+0xae/0xe8 [ 0.088376] Modules linked in: [ 0.088656] CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.16.0-rc1 #11 NONE [ 0.088833] Hardware name: riscv-virtio,qemu (DT) [ 0.088948] epc : __virt_to_phys+0xae/0xe8 [ 0.089001] ra : __virt_to_phys+0xae/0xe8 [ 0.089037] epc : ffffffff80021eaa ra : ffffffff80021eaa sp : ff2000000004bbc0 [ 0.089057] gp : ffffffff817f49c0 tp : ff60000001d60000 t0 : 5f6f745f74726976 [ 0.089076] t1 : 0000000000000076 t2 : 705f6f745f747269 s0 : ff2000000004bbe0 [ 0.089095] s1 : ff2000000001d080 a0 : 0000000000000000 a1 : 0000000000000000 [ 0.089113] a2 : 0000000000000000 a3 : 0000000000000000 a4 : 0000000000000000 [ 0.089131] a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000000000000 [ 0.089155] s2 : ffffffff8130dc00 s3 : 0000000000000001 s4 : 0000000000000001 [ 0.089174] s5 : ffffffff8185eff8 s6 : ff2000007f1eb000 s7 : ffffffff8002a2ec [ 0.089193] s8 : 0000000000000001 s9 : 0000000000000001 s10: 0000000000000000 [ 0.089211] s11: 0000000000000000 t3 : ffffffff8180a9f7 t4 : ffffffff8180a9f7 [ 0.089960] t5 : ffffffff8180a9f8 t6 : ff2000000004b9d8 [ 0.089984] status: 0000000200000120 badaddr: ffffffff80021eaa cause: 0000000000000003 [ 0.090101] [<ffffffff80021eaa>] __virt_to_phys+0xae/0xe8 [ 0.090228] [<ffffffff8001d796>] sbi_cpu_start+0x6e/0xe8 [ 0.090247] [<ffffffff8001a5da>] __cpu_up+0x1e/0x8c [ 0.090260] [<ffffffff8002a32e>] bringup_cpu+0x42/0x258 [ 0.090277] [<ffffffff8002914c>] cpuhp_invoke_callback+0xe0/0x40c [ 0.090292] [<ffffffff800294e0>] __cpuhp_invoke_callback_range+0x68/0xfc [ 0.090320] [<ffffffff8002a96a>] _cpu_up+0x11a/0x244 [ 0.090334] [<ffffffff8002aae6>] cpu_up+0x52/0x90 [ 0.090384] [<ffffffff80c09350>] bringup_nonboot_cpus+0x78/0x118 [ 0.090411] [<ffffffff80c11060>] smp_init+0x34/0xb8 [ 0.090425] [<ffffffff80c01220>] kernel_init_freeable+0x148/0x2e4 [ 0.090442] [<ffffffff80b83802>] kernel_init+0x1e/0x14c [ 0.090455] [<ffffffff800124ca>] ret_from_fork_kernel+0xe/0xf0 [ 0.090471] [<ffffffff80b8d9c2>] ret_from_fork_kernel_asm+0x16/0x18 [ 0.090560] ---[ end trace 0000000000000000 ]--- [ 1.179875] CPU1: failed to come online [ 1.190324] smp: Brought up 1 node, 1 CPU
--- arch/riscv/kernel/cpu_ops_sbi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/riscv/kernel/cpu_ops_sbi.c +3 -3
@@ -18,10 +18,10 @@ const struct cpu_operations cpu_ops_sbi;/* * Ordered booting via HSM brings one cpu at a time. However, cpu hotplug can -* be invoked from multiple threads in parallel. Define a per cpu data +* be invoked from multiple threads in parallel. Define an array of boot data * to handle that. */ -static DEFINE_PER_CPU(struct sbi_hart_boot_data, boot_data); +static struct sbi_hart_boot_data boot_data[NR_CPUS ];static int sbi_hsm_hart_start (unsigned long hartid,unsigned long saddr,unsigned long priv)
@@ -67,7 +67,7 @@ static int sbi_cpu_start(unsigned int cpunsigned long boot_addr =__pa_symbol (secondary_start_sbi);unsigned long hartid =cpuid_to_hartid_map (cpuid);unsigned long hsm_data; -struct sbi_hart_boot_data *bdata = &per_cpu (boot_data, cpuid); +struct sbi_hart_boot_data *bdata = &boot_data[cpuid];/* Make sure tidle is updated */ smp_mb ();
Greg Kroah-Hartman
maintainerPATCH 168/178 platform/x86: think-lmi: Create ksets consecutively
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
commit 8dab34ca77293b409c3223636dde915a22656748 upstream.
Avoid entering tlmi_release_attr() in error paths if both ksets are not yet created.
This is accomplished by initializing them side by side.
--- drivers/platform/x86/think-lmi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/platform/x86/think-lmi.c +8 -6
@@ -1455,6 +1455,14 @@ static int tlmi_sysfs_init(void) goto fail_device_created; } + tlmi_priv.authentication_kset =kset_create_and_add ("authentication" ,NULL , + &tlmi_priv.class_dev->kobj); +if (!tlmi_priv.authentication_kset) { +kset_unregister (tlmi_priv.attribute_kset); + ret = -ENOMEM ; + goto fail_device_created; + } +for (i =0 ; i <TLMI_SETTINGS_COUNT ; i++) {/* Check if index is a valid setting - skip if it isn't */ if (!tlmi_priv.setting[i])
@@ -1496,12 +1504,6 @@ static int tlmi_sysfs_init(void) }/* Create authentication entries */ - tlmi_priv.authentication_kset =kset_create_and_add ("authentication" ,NULL , - &tlmi_priv.class_dev->kobj); -if (!tlmi_priv.authentication_kset) { - ret = -ENOMEM ; - goto fail_create_attr; - } tlmi_priv.pwd_admin->kobj.kset = tlmi_priv.authentication_kset; ret =kobject_add (&tlmi_priv.pwd_admin->kobj,NULL ,"%s" ,"Admin" );if (ret)
Greg Kroah-Hartman
maintainerPATCH 169/178 platform/x86: think-lmi: Fix kobject cleanup
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
commit 9110056fe10b0519529bdbbac37311a5037ea0c2 upstream.
In tlmi_analyze(), allocated structs with an embedded kobject are freed in error paths after the they were already initialized.
Fix this by first by avoiding the initialization of kobjects in tlmi_analyze() and then by correctly cleaning them up in tlmi_release_attr() using their kset's kobject list.
--- drivers/platform/x86/think-lmi.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/platform/x86/think-lmi.c +19 -16
@@ -1380,13 +1380,13 @@ static struct kobj_attribute debug_cmd =/* ---- Initialisation --------------------------------------------------------- */ static void tlmi_release_attr (void ) { +struct kobject *pos, *n;int i;/* Attribute structures */ for (i =0 ; i <TLMI_SETTINGS_COUNT ; i++) {if (tlmi_priv.setting[i]) {sysfs_remove_group (&tlmi_priv.setting[i]->kobj, &tlmi_attr_group); -kobject_put (&tlmi_priv.setting[i]->kobj); } }sysfs_remove_file (&tlmi_priv.attribute_kset->kobj, &pending_reboot.attr);
@@ -1395,6 +1395,9 @@ static void tlmi_release_attr(void)if (tlmi_priv.can_debug_cmd && debug_support)sysfs_remove_file (&tlmi_priv.attribute_kset->kobj, &debug_cmd.attr); +list_for_each_entry_safe (pos, n, &tlmi_priv.attribute_kset->list, entry) +kobject_put (pos); +kset_unregister (tlmi_priv.attribute_kset);/* Free up any saved signatures */
@@ -1403,19 +1406,17 @@ static void tlmi_release_attr(void)/* Authentication structures */ sysfs_remove_group (&tlmi_priv.pwd_admin->kobj, &auth_attr_group); -kobject_put (&tlmi_priv.pwd_admin->kobj);sysfs_remove_group (&tlmi_priv.pwd_power->kobj, &auth_attr_group); -kobject_put (&tlmi_priv.pwd_power->kobj);if (tlmi_priv.opcode_support) {sysfs_remove_group (&tlmi_priv.pwd_system->kobj, &auth_attr_group); -kobject_put (&tlmi_priv.pwd_system->kobj);sysfs_remove_group (&tlmi_priv.pwd_hdd->kobj, &auth_attr_group); -kobject_put (&tlmi_priv.pwd_hdd->kobj);sysfs_remove_group (&tlmi_priv.pwd_nvme->kobj, &auth_attr_group); -kobject_put (&tlmi_priv.pwd_nvme->kobj); } +list_for_each_entry_safe (pos, n, &tlmi_priv.authentication_kset->list, entry) +kobject_put (pos); +kset_unregister (tlmi_priv.authentication_kset); }
@@ -1479,8 +1480,8 @@ static int tlmi_sysfs_init(void)/* Build attribute */ tlmi_priv.setting[i]->kobj.kset = tlmi_priv.attribute_kset; - ret =kobject_add (&tlmi_priv.setting[i]->kobj,NULL , -"%s" , tlmi_priv.setting[i]->display_name); + ret =kobject_init_and_add (&tlmi_priv.setting[i]->kobj, &tlmi_attr_setting_ktype, +NULL ,"%s" , tlmi_priv.setting[i]->display_name);if (ret) goto fail_create_attr;
@@ -1505,7 +1506,8 @@ static int tlmi_sysfs_init(void)/* Create authentication entries */ tlmi_priv.pwd_admin->kobj.kset = tlmi_priv.authentication_kset; - ret =kobject_add (&tlmi_priv.pwd_admin->kobj,NULL ,"%s" ,"Admin" ); + ret =kobject_init_and_add (&tlmi_priv.pwd_admin->kobj, &tlmi_pwd_setting_ktype, +NULL ,"%s" ,"Admin" );if (ret) goto fail_create_attr;
@@ -1514,7 +1516,8 @@ static int tlmi_sysfs_init(void) goto fail_create_attr; tlmi_priv.pwd_power->kobj.kset = tlmi_priv.authentication_kset; - ret =kobject_add (&tlmi_priv.pwd_power->kobj,NULL ,"%s" ,"Power-on" ); + ret =kobject_init_and_add (&tlmi_priv.pwd_power->kobj, &tlmi_pwd_setting_ktype, +NULL ,"%s" ,"Power-on" );if (ret) goto fail_create_attr;
@@ -1524,7 +1527,8 @@ static int tlmi_sysfs_init(void)if (tlmi_priv.opcode_support) { tlmi_priv.pwd_system->kobj.kset = tlmi_priv.authentication_kset; - ret =kobject_add (&tlmi_priv.pwd_system->kobj,NULL ,"%s" ,"System" ); + ret =kobject_init_and_add (&tlmi_priv.pwd_system->kobj, &tlmi_pwd_setting_ktype, +NULL ,"%s" ,"System" );if (ret) goto fail_create_attr;
@@ -1533,7 +1537,8 @@ static int tlmi_sysfs_init(void) goto fail_create_attr; tlmi_priv.pwd_hdd->kobj.kset = tlmi_priv.authentication_kset; - ret =kobject_add (&tlmi_priv.pwd_hdd->kobj,NULL ,"%s" ,"HDD" ); + ret =kobject_init_and_add (&tlmi_priv.pwd_hdd->kobj, &tlmi_pwd_setting_ktype, +NULL ,"%s" ,"HDD" );if (ret) goto fail_create_attr;
@@ -1542,7 +1547,8 @@ static int tlmi_sysfs_init(void) goto fail_create_attr; tlmi_priv.pwd_nvme->kobj.kset = tlmi_priv.authentication_kset; - ret =kobject_add (&tlmi_priv.pwd_nvme->kobj,NULL ,"%s" ,"NVMe" ); + ret =kobject_init_and_add (&tlmi_priv.pwd_nvme->kobj, &tlmi_pwd_setting_ktype, +NULL ,"%s" ,"NVMe" );if (ret) goto fail_create_attr;
@@ -1579,8 +1585,6 @@ static struct tlmi_pwd_setting *tlmi_cre new_pwd->maxlen = tlmi_priv.pwdcfg.core.max_length; new_pwd->index =0 ; -kobject_init (&new_pwd->kobj, &tlmi_pwd_setting_ktype); -return new_pwd; }
@@ -1685,7 +1689,6 @@ static int tlmi_analyze(struct wmi_devicif (setting->possible_values)strreplace (setting->possible_values,',' ,';' ); -kobject_init (&setting->kobj, &tlmi_attr_setting_ktype); tlmi_priv.setting[i] = setting;kfree (item); }
Greg Kroah-Hartman
maintainerPATCH 170/178 platform/x86: think-lmi: Fix sysfs group cleanup
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
commit 4f30f946f27b7f044cf8f3f1f353dee1dcd3517a upstream.
Many error paths in tlmi_sysfs_init() lead to sysfs groups being removed when they were not even created.
Fix this by letting the kobject core manage these groups through their kobj_type's defult_groups.
--- drivers/platform/x86/think-lmi.c | 43 +++------------------------------------ 1 file changed, 4 insertions(+), 39 deletions(-)
drivers/platform/x86/think-lmi.c +4 -39
@@ -973,6 +973,7 @@ static const struct attribute_group auth .is_visible = auth_attr_is_visible, .attrs = auth_attrs, }; +__ATTRIBUTE_GROUPS (auth_attr);/* ---- Attributes sysfs --------------------------------------------------------- */ static ssize_t display_name_show(struct kobject *kobj, struct kobj_attribute *attr,
@@ -1188,6 +1189,7 @@ static const struct attribute_group tlmi .is_visible = attr_is_visible, .attrs = tlmi_attrs, }; +__ATTRIBUTE_GROUPS (tlmi_attr);static void tlmi_attr_setting_release (struct kobject *kobj) {
@@ -1207,11 +1209,13 @@ static void tlmi_pwd_setting_release(strstatic const struct kobj_type tlmi_attr_setting_ktype = { .release = &tlmi_attr_setting_release, .sysfs_ops = &kobj_sysfs_ops, + .default_groups = tlmi_attr_groups, };static const struct kobj_type tlmi_pwd_setting_ktype = { .release = &tlmi_pwd_setting_release, .sysfs_ops = &kobj_sysfs_ops, + .default_groups = auth_attr_groups, }; static ssize_t pending_reboot_show(struct kobject *kobj, struct kobj_attribute *attr,
@@ -1381,14 +1385,8 @@ static struct kobj_attribute debug_cmd =static void tlmi_release_attr (void ) {struct kobject *pos, *n; -int i;/* Attribute structures */ -for (i =0 ; i <TLMI_SETTINGS_COUNT ; i++) { -if (tlmi_priv.setting[i]) { -sysfs_remove_group (&tlmi_priv.setting[i]->kobj, &tlmi_attr_group); - } - }sysfs_remove_file (&tlmi_priv.attribute_kset->kobj, &pending_reboot.attr);sysfs_remove_file (&tlmi_priv.attribute_kset->kobj, &save_settings.attr);
@@ -1405,15 +1403,6 @@ static void tlmi_release_attr(void)kfree (tlmi_priv.pwd_admin->save_signature);/* Authentication structures */ -sysfs_remove_group (&tlmi_priv.pwd_admin->kobj, &auth_attr_group); -sysfs_remove_group (&tlmi_priv.pwd_power->kobj, &auth_attr_group); - -if (tlmi_priv.opcode_support) { -sysfs_remove_group (&tlmi_priv.pwd_system->kobj, &auth_attr_group); -sysfs_remove_group (&tlmi_priv.pwd_hdd->kobj, &auth_attr_group); -sysfs_remove_group (&tlmi_priv.pwd_nvme->kobj, &auth_attr_group); - } -list_for_each_entry_safe (pos, n, &tlmi_priv.authentication_kset->list, entry)kobject_put (pos);
@@ -1484,10 +1473,6 @@ static int tlmi_sysfs_init(void) NULL, "%s", tlmi_priv.setting[i]->display_name);if (ret) goto fail_create_attr; - - ret =sysfs_create_group (&tlmi_priv.setting[i]->kobj, &tlmi_attr_group); -if (ret) - goto fail_create_attr; } ret =sysfs_create_file (&tlmi_priv.attribute_kset->kobj, &pending_reboot.attr);
@@ -1511,20 +1496,12 @@ static int tlmi_sysfs_init(void)if (ret) goto fail_create_attr; - ret =sysfs_create_group (&tlmi_priv.pwd_admin->kobj, &auth_attr_group); -if (ret) - goto fail_create_attr; - tlmi_priv.pwd_power->kobj.kset = tlmi_priv.authentication_kset; ret =kobject_init_and_add (&tlmi_priv.pwd_power->kobj, &tlmi_pwd_setting_ktype,NULL ,"%s" ,"Power-on" );if (ret) goto fail_create_attr; - ret =sysfs_create_group (&tlmi_priv.pwd_power->kobj, &auth_attr_group); -if (ret) - goto fail_create_attr; -if (tlmi_priv.opcode_support) { tlmi_priv.pwd_system->kobj.kset = tlmi_priv.authentication_kset; ret = kobject_init_and_add(&tlmi_priv.pwd_system->kobj, &tlmi_pwd_setting_ktype,
@@ -1532,29 +1509,17 @@ static int tlmi_sysfs_init(void)if (ret) goto fail_create_attr; - ret =sysfs_create_group (&tlmi_priv.pwd_system->kobj, &auth_attr_group); -if (ret) - goto fail_create_attr; - tlmi_priv.pwd_hdd->kobj.kset = tlmi_priv.authentication_kset; ret =kobject_init_and_add (&tlmi_priv.pwd_hdd->kobj, &tlmi_pwd_setting_ktype,NULL ,"%s" ,"HDD" );if (ret) goto fail_create_attr; - ret =sysfs_create_group (&tlmi_priv.pwd_hdd->kobj, &auth_attr_group); -if (ret) - goto fail_create_attr; - tlmi_priv.pwd_nvme->kobj.kset = tlmi_priv.authentication_kset; ret =kobject_init_and_add (&tlmi_priv.pwd_nvme->kobj, &tlmi_pwd_setting_ktype,NULL ,"%s" ,"NVMe" );if (ret) goto fail_create_attr; - - ret =sysfs_create_group (&tlmi_priv.pwd_nvme->kobj, &auth_attr_group); -if (ret) - goto fail_create_attr; }return ret;
Greg Kroah-Hartman
maintainerPATCH 171/178 usb: typec: displayport: Fix potential deadlock
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Kuchynski <[email protected]>
commit 099cf1fbb8afc3771f408109f62bdec66f85160e upstream.
The deadlock can occur due to a recursive lock acquisition of cros_typec_altmode_data::mutex.
The call chain is as follows:
1. cros_typec_altmode_work() acquires the mutex
2. typec_altmode_vdm() -> dp_altmode_vdm() ->
3. typec_altmode_exit() -> cros_typec_altmode_exit()
4. cros_typec_altmode_exit() attempts to acquire the mutex again
To prevent this, defer the typec_altmode_exit() call by scheduling it rather than calling it directly from within the mutex-protected context.
--- drivers/usb/typec/altmodes/displayport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/typec/altmodes/displayport.c +1 -2
@@ -394,8 +394,7 @@ static int dp_altmode_vdm(struct typec_acase CMDT_RSP_NAK :switch (cmd) {case DP_CMD_STATUS_UPDATE : -if (typec_altmode_exit (alt)) -dev_err (&dp->alt->dev,"Exit Mode Failed!\n" ); + dp->state =DP_STATE_EXIT ;break ;case DP_CMD_CONFIGURE : dp->data.conf =0 ;
Greg Kroah-Hartman
maintainerPATCH 172/178 mm/vmalloc: fix data race in show_numa_info()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeongjun Park <[email protected]>
commit 5c5f0468d172ddec2e333d738d2a1f85402cf0bc upstream.
The following data-race was found in show_numa_info():
==================================================================
BUG: KCSAN: data-race in vmalloc_info_show / vmalloc_info_show
read to 0xffff88800971fe30 of 4 bytes by task 8289 on cpu 0:
show_numa_info mm/vmalloc.c:4936 [inline] vmalloc_info_show+0x5a8/0x7e0 mm/vmalloc.c:5016 seq_read_iter+0x373/0xb40 fs/seq_file.c:230 proc_reg_read_iter+0x11e/0x170 fs/proc/inode.c:299
....
write to 0xffff88800971fe30 of 4 bytes by task 8287 on cpu 1:
show_numa_info mm/vmalloc.c:4934 [inline] vmalloc_info_show+0x38f/0x7e0 mm/vmalloc.c:5016 seq_read_iter+0x373/0xb40 fs/seq_file.c:230 proc_reg_read_iter+0x11e/0x170 fs/proc/inode.c:299
....
value changed: 0x0000008f -> 0x00000000
==================================================================
According to this report,there is a read/write data-race because m->private is accessible to multiple CPUs. To fix this, instead of allocating the heap in proc_vmalloc_init() and passing the heap address to m->private, vmalloc_info_show() should allocate the heap.
--- mm/vmalloc.c | 63 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 28 deletions(-)
mm/vmalloc.c +35 -28
@@ -3100,7 +3100,7 @@ static void clear_vm_uninitialized_flag(/* * Before removing VM_UNINITIALIZED, * we should make sure that vm has proper values. -* Pair with smp_rmb() in show_numa_info(). +* Pair with smp_rmb() in vread_iter() and vmalloc_info_show(). */ smp_wmb (); vm->flags &= ~VM_UNINITIALIZED ;
@@ -4934,28 +4934,29 @@ bool vmalloc_dump_obj(void *object)#endif #ifdef CONFIG_PROC_FS -static void show_numa_info (struct seq_file *m,struct vm_struct *v) -{ -if (IS_ENABLED (CONFIG_NUMA )) { -unsigned int nr, *counters = m->private; -unsigned int step =1U <<vm_area_page_order (v); -if (!counters) -return ; +/* +* Print number of pages allocated on each memory node. +* +* This function can only be called if CONFIG_NUMA is enabled +* and VM_UNINITIALIZED bit in v->flags is disabled. +*/ +static void show_numa_info (struct seq_file *m,struct vm_struct *v, +unsigned int *counters) +{ +unsigned int nr; +unsigned int step =1U <<vm_area_page_order (v); -if (v->flags &VM_UNINITIALIZED ) -return ; -/* Pair with smp_wmb() in clear_vm_uninitialized_flag() */ -smp_rmb (); +if (!counters) +return ; -memset (counters,0 , nr_node_ids *sizeof (unsigned int )); +memset (counters,0 , nr_node_ids *sizeof (unsigned int )); -for (nr =0 ; nr < v->nr_pages; nr += step) - counters[page_to_nid (v->pages[nr])] += step; -for_each_node_state (nr,N_HIGH_MEMORY ) -if (counters[nr]) -seq_printf (m," N%u=%u" , nr, counters[nr]); - } +for (nr =0 ; nr < v->nr_pages; nr += step) + counters[page_to_nid (v->pages[nr])] += step; +for_each_node_state (nr,N_HIGH_MEMORY ) +if (counters[nr]) +seq_printf (m," N%u=%u" , nr, counters[nr]); }static void show_purge_info (struct seq_file *m)
@@ -4983,6 +4984,10 @@ static int vmalloc_info_show(struct seq_struct vmap_area *va;struct vm_struct *v;int i; +unsigned int *counters; + +if (IS_ENABLED (CONFIG_NUMA )) + counters =kmalloc (nr_node_ids *sizeof (unsigned int ),GFP_KERNEL );for (i =0 ; i < nr_vmap_nodes; i++) { vn = &vmap_nodes[i];
@@ -4999,6 +5004,11 @@ static int vmalloc_info_show(struct seq_ } v = va->vm; +if (v->flags &VM_UNINITIALIZED ) +continue ; + +/* Pair with smp_wmb() in clear_vm_uninitialized_flag() */ +smp_rmb ();seq_printf (m,"0x%pK-0x%pK %7ld" , v->addr, v->addr + v->size, v->size);
@@ -5033,7 +5043,9 @@ static int vmalloc_info_show(struct seq_if (is_vmalloc_addr (v->pages))seq_puts (m," vpages" ); -show_numa_info (m, v); +if (IS_ENABLED (CONFIG_NUMA )) +show_numa_info (m, v, counters); +seq_putc (m,'\n' ); }spin_unlock (&vn->busy.lock);
@@ -5043,19 +5055,14 @@ static int vmalloc_info_show(struct seq_* As a final step, dump "unpurged" areas. */ show_purge_info (m); +if (IS_ENABLED (CONFIG_NUMA )) +kfree (counters);return 0 ; }static int __init proc_vmalloc_init (void ) { -void *priv_data =NULL ; - -if (IS_ENABLED (CONFIG_NUMA )) - priv_data =kmalloc (nr_node_ids *sizeof (unsigned int ),GFP_KERNEL ); - -proc_create_single_data ("vmallocinfo" , -0400 ,NULL , vmalloc_info_show, priv_data); - +proc_create_single ("vmallocinfo" ,0400 ,NULL , vmalloc_info_show);return 0 ; }module_init (proc_vmalloc_init);
Greg Kroah-Hartman
maintainerPATCH 173/178 x86/bugs: Rename MDS machinery to something more generic
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Borislav Petkov (AMD)" <[email protected]>
Commit f9af88a3d384c8b55beb5dc5483e5da0135fadbd upstream.
It will be used by other x86 mitigations.
No functional changes.
--- Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst | 4 - Documentation/arch/x86/mds.rst | 8 +- arch/x86/entry/entry.S | 8 +- arch/x86/include/asm/irqflags.h | 4 - arch/x86/include/asm/mwait.h | 5 + arch/x86/include/asm/nospec-branch.h | 29 +++++----- arch/x86/kernel/cpu/bugs.c | 12 ++-- arch/x86/kvm/vmx/vmx.c | 2 8 files changed, 36 insertions(+), 36 deletions(-)
Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst +1 -3
@@ -157,9 +157,7 @@ This is achieved by using the otherwise combination with a microcode update. The microcode clears the affected CPU buffers when the VERW instruction is executed. -Kernel reuses the MDS function to invoke the buffer clearing: - - mds_clear_cpu_buffers() +Kernel does the buffer clearing with x86_clear_cpu_buffers(). On MDS affected CPUs, the kernel already invokes CPU buffer clear on kernel/userspace, hypervisor/guest and C-state (idle) transitions. No
Documentation/arch/x86/mds.rst +4 -4
@@ -93,7 +93,7 @@ enters a C-state. The kernel provides a function to invoke the buffer clearing: - mds_clear_cpu_buffers() + x86_clear_cpu_buffers() Also macro CLEAR_CPU_BUFFERS can be used in ASM late in exit-to-user path. Other than CFLAGS.ZF, this macro doesn't clobber any registers.
@@ -185,9 +185,9 @@ Mitigation points idle clearing would be a window dressing exercise and is therefore not activated. - The invocation is controlled by the static key mds_idle_clear which is - switched depending on the chosen mitigation mode and the SMT state of - the system. + The invocation is controlled by the static key cpu_buf_idle_clear which is + switched depending on the chosen mitigation mode and the SMT state of the + system. The buffer clear is only invoked before entering the C-State to prevent that stale data from the idling CPU from spilling to the Hyper-Thread
arch/x86/entry/entry.S +4 -4
@@ -36,20 +36,20 @@ EXPORT_SYMBOL_GPL(write_ibpb); /* * Define the VERW operand that is disguised as entry code so that - * it can be referenced with KPTI enabled. This ensure VERW can be + * it can be referenced with KPTI enabled. This ensures VERW can be * used late in exit-to-user path after page tables are switched. */ .pushsection .entry.text, "ax" .align L1_CACHE_BYTES, 0xcc -SYM_CODE_START_NOALIGN(mds_verw_sel) +SYM_CODE_START_NOALIGN(x86_verw_sel) UNWIND_HINT_UNDEFINED ANNOTATE_NOENDBR .word __KERNEL_DS .align L1_CACHE_BYTES, 0xcc -SYM_CODE_END(mds_verw_sel); +SYM_CODE_END(x86_verw_sel); /* For KVM */ -EXPORT_SYMBOL_GPL(mds_verw_sel); +EXPORT_SYMBOL_GPL(x86_verw_sel); .popsection
arch/x86/include/asm/irqflags.h +2 -2
@@ -44,13 +44,13 @@ static __always_inline void native_irq_e static __always_inline void native_safe_halt(void) { -mds_idle_clear_cpu_buffers (); +x86_idle_clear_cpu_buffers (); asmvolatile ("sti; hlt" : : :"memory" ); } static __always_inline void native_halt(void) { -mds_idle_clear_cpu_buffers (); +x86_idle_clear_cpu_buffers (); asmvolatile ("hlt" : : :"memory" ); }
arch/x86/include/asm/mwait.h +3 -2
@@ -43,7 +43,7 @@ static __always_inline void __monitorx(c static __always_inline void __mwait(unsigned long eax, unsigned long ecx) { -mds_idle_clear_cpu_buffers (); +x86_idle_clear_cpu_buffers ();/* "mwait %eax, %ecx;" */ asm volatile(".byte 0x0f, 0x01, 0xc9;"
@@ -97,7 +97,8 @@ static __always_inline void __mwaitx(uns*/ static __always_inline void __sti_mwait(unsigned long eax, unsigned long ecx) { -mds_idle_clear_cpu_buffers (); +x86_idle_clear_cpu_buffers (); +/* "mwait %eax, %ecx;" */ asmvolatile ("sti; .byte 0x0f, 0x01, 0xc9;" ::"a" (eax),"c" (ecx));
arch/x86/include/asm/nospec-branch.h +15 -14
@@ -302,22 +302,22 @@ .endm /* - * Macro to execute VERW instruction that mitigate transient data sampling - * attacks such as MDS. On affected systems a microcode update overloaded VERW - * instruction to also clear the CPU buffers. VERW clobbers CFLAGS.ZF. - * + * Macro to execute VERW insns that mitigate transient data sampling + * attacks such as MDS or TSA. On affected systems a microcode update + * overloaded VERW insns to also clear the CPU buffers. VERW clobbers + * CFLAGS.ZF. * Note: Only the memory operand variant of VERW clears the CPU buffers. */ .macro CLEAR_CPU_BUFFERS#ifdef CONFIG_X86_64 - ALTERNATIVE "", "verw mds_verw_sel(%rip)", X86_FEATURE_CLEAR_CPU_BUF + ALTERNATIVE "", "verw x86_verw_sel(%rip)", X86_FEATURE_CLEAR_CPU_BUF#else /* * In 32bit mode, the memory operand must be a %cs reference. The data * segments may not be usable (vm86 mode), and the stack segment may not * be flat (ESPFIX32). */ -ALTERNATIVE "" ,"verw %cs:mds_verw_sel" ,X86_FEATURE_CLEAR_CPU_BUF +ALTERNATIVE "" ,"verw %cs:x86_verw_sel" ,X86_FEATURE_CLEAR_CPU_BUF #endif .endm
@@ -567,24 +567,24 @@ DECLARE_STATIC_KEY_FALSE(switch_mm_alwayDECLARE_STATIC_KEY_FALSE (switch_vcpu_ibpb); -DECLARE_STATIC_KEY_FALSE (mds_idle_clear); +DECLARE_STATIC_KEY_FALSE (cpu_buf_idle_clear);DECLARE_STATIC_KEY_FALSE (switch_mm_cond_l1d_flush);DECLARE_STATIC_KEY_FALSE (mmio_stale_data_clear); -extern u16 mds_verw_sel; +extern u16 x86_verw_sel;#include <asm/segment.h> /** -* mds_clear_cpu_buffers - Mitigation for MDS and TAA vulnerability +* x86_clear_cpu_buffers - Buffer clearing support for different x86 CPU vulns * * This uses the otherwise unused and obsolete VERW instruction in * combination with microcode which triggers a CPU buffer flush when the * instruction is executed. */ -static __always_inline void mds_clear_cpu_buffers(void) +static __always_inline void x86_clear_cpu_buffers(void) {static const u16 ds = __KERNEL_DS;
@@ -601,14 +601,15 @@ static __always_inline void mds_clear_cp }/** -* mds_idle_clear_cpu_buffers - Mitigation for MDS vulnerability +* x86_idle_clear_cpu_buffers - Buffer clearing support in idle for the MDS +* vulnerability * * Clear CPU buffers if the corresponding static key is enabled */ -static __always_inline void mds_idle_clear_cpu_buffers(void) +static __always_inline void x86_idle_clear_cpu_buffers(void) { -if (static_branch_likely (&mds_idle_clear)) -mds_clear_cpu_buffers (); +if (static_branch_likely (&cpu_buf_idle_clear)) +x86_clear_cpu_buffers (); }#endif /* __ASSEMBLER__ */
arch/x86/kernel/cpu/bugs.c +6 -6
@@ -125,9 +125,9 @@ DEFINE_STATIC_KEY_FALSE(switch_mm_alwaysDEFINE_STATIC_KEY_FALSE (switch_vcpu_ibpb);EXPORT_SYMBOL_GPL (switch_vcpu_ibpb); -/* Control MDS CPU buffer clear before idling (halt, mwait) */ -DEFINE_STATIC_KEY_FALSE (mds_idle_clear); -EXPORT_SYMBOL_GPL (mds_idle_clear); +/* Control CPU buffer clear before idling (halt, mwait) */ +DEFINE_STATIC_KEY_FALSE (cpu_buf_idle_clear); +EXPORT_SYMBOL_GPL (cpu_buf_idle_clear);/* * Controls whether l1d flush based mitigations are enabled,
@@ -469,7 +469,7 @@ static void __init mmio_select_mitigatio* is required irrespective of SMT state. */ if (!(x86_arch_cap_msr &ARCH_CAP_FBSDP_NO )) -static_branch_enable (&mds_idle_clear); +static_branch_enable (&cpu_buf_idle_clear);/* * Check if the system has the right microcode.
@@ -2063,10 +2063,10 @@ static void update_mds_branch_idle(void)return ;if (sched_smt_active ()) { -static_branch_enable (&mds_idle_clear); +static_branch_enable (&cpu_buf_idle_clear); }else if (mmio_mitigation ==MMIO_MITIGATION_OFF || (x86_arch_cap_msr &ARCH_CAP_FBSDP_NO )) { -static_branch_disable (&mds_idle_clear); +static_branch_disable (&cpu_buf_idle_clear); } }
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -7366,7 +7366,7 @@ static noinstr void vmx_vcpu_enter_exit(vmx_l1d_flush (vcpu); else if (static_branch_unlikely(&mmio_stale_data_clear) && kvm_arch_has_assigned_device(vcpu->kvm)) - mds_clear_cpu_buffers(); + x86_clear_cpu_buffers();vmx_disable_fb_clear (vmx );
Greg Kroah-Hartman
maintainerPATCH 174/178 x86/bugs: Add a Transient Scheduler Attacks mitigation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Borislav Petkov (AMD)" <[email protected]>
Commit d8010d4ba43e9f790925375a7de100604a5e2dba upstream.
Add the required features detection glue to bugs.c et all in order to support the TSA mitigation.
--- Documentation/ABI/testing/sysfs-devices-system-cpu | 1 Documentation/admin-guide/kernel-parameters.txt | 13 ++ arch/x86/Kconfig | 9 + arch/x86/include/asm/cpufeatures.h | 5 arch/x86/include/asm/mwait.h | 2 arch/x86/include/asm/nospec-branch.h | 14 +- arch/x86/kernel/cpu/amd.c | 44 +++++++ arch/x86/kernel/cpu/bugs.c | 121 +++++++++++++++++++++ arch/x86/kernel/cpu/common.c | 14 ++ arch/x86/kernel/cpu/scattered.c | 2 arch/x86/kvm/svm/vmenter.S | 6 + drivers/base/cpu.c | 3 include/linux/cpu.h | 1 13 files changed, 229 insertions(+), 6 deletions(-)
Documentation/ABI/testing/sysfs-devices-system-cpu +1 -0
@@ -523,6 +523,7 @@ What: /sys/devices/system/cpu/vulnerabi /sys/devices/system/cpu/vulnerabilities/spectre_v1 /sys/devices/system/cpu/vulnerabilities/spectre_v2 /sys/devices/system/cpu/vulnerabilities/srbds + /sys/devices/system/cpu/vulnerabilities/tsa /sys/devices/system/cpu/vulnerabilities/tsx_async_abort Date: January 2018 Contact: Linux kernel mailing list <[email protected]>
Documentation/admin-guide/kernel-parameters.txt +13 -0
@@ -7423,6 +7423,19 @@ having this key zero'ed is acceptable. E.g. in testing scenarios. + tsa= [X86] Control mitigation for Transient Scheduler + Attacks on AMD CPUs. Search the following in your + favourite search engine for more details: + + "Technical guidance for mitigating transient scheduler + attacks". + + off - disable the mitigation + on - enable the mitigation (default) + user - mitigate only user/kernel transitions + vm - mitigate only guest/host transitions + + tsc= Disable clocksource stability checks for TSC. Format: <string> [x86] reliable: mark tsc clocksource as reliable, this
arch/x86/Kconfig +9 -0
@@ -2723,6 +2723,15 @@ config MITIGATION_ITS disabled, mitigation cannot be enabled via cmdline. See <file:Documentation/admin-guide/hw-vuln/indirect-target-selection.rst> +config MITIGATION_TSA + bool "Mitigate Transient Scheduler Attacks" + depends on CPU_SUP_AMD + default y + help + Enable mitigation for Transient Scheduler Attacks. TSA is a hardware + security vulnerability on AMD CPUs which can lead to forwarding of + invalid info to subsequent instructions and thus can affect their + timing and thereby cause a leakage. endif config ARCH_HAS_ADD_PAGES
arch/x86/include/asm/cpufeatures.h +5 -0
@@ -453,6 +453,7 @@#define X86_FEATURE_NO_NESTED_DATA_BP (20*32+ 0)/* No Nested Data Breakpoints */ #define X86_FEATURE_WRMSR_XX_BASE_NS (20*32+ 1)/* WRMSR to {FS,GS,KERNEL_GS}_BASE is non-serializing */ #define X86_FEATURE_LFENCE_RDTSC (20*32+ 2)/* LFENCE always serializing / synchronizes RDTSC */ +#define X86_FEATURE_VERW_CLEAR (20*32+ 5)/* The memory form of VERW mitigates TSA */ #define X86_FEATURE_NULL_SEL_CLR_BASE (20*32+ 6)/* Null Selector Clears Base */ #define X86_FEATURE_AUTOIBRS (20*32+ 8)/* Automatic IBRS */ #define X86_FEATURE_NO_SMM_CTL_MSR (20*32+ 9)/* SMM_CTL MSR is not present */
@@ -482,6 +483,9 @@#define X86_FEATURE_AMD_WORKLOAD_CLASS (21*32 + 7)/* Workload Classification */ #define X86_FEATURE_PREFER_YMM (21*32 + 8)/* Avoid ZMM registers due to downclocking */ #define X86_FEATURE_INDIRECT_THUNK_ITS (21*32 + 9)/* Use thunk for indirect branches in lower half of cacheline */ +#define X86_FEATURE_TSA_SQ_NO (21*32+11)/* AMD CPU not vulnerable to TSA-SQ */ +#define X86_FEATURE_TSA_L1_NO (21*32+12)/* AMD CPU not vulnerable to TSA-L1 */ +#define X86_FEATURE_CLEAR_CPU_BUF_VM (21*32+13)/* Clear CPU buffers using VERW before VMRUN */ /* * BUG word(s)
@@ -536,4 +540,5 @@#define X86_BUG_SPECTRE_V2_USER X86_BUG(1*32 + 5)/* "spectre_v2_user" CPU is affected by Spectre variant 2 attack between user processes */ #define X86_BUG_ITS X86_BUG(1*32 + 6)/* "its" CPU is affected by Indirect Target Selection */ #define X86_BUG_ITS_NATIVE_ONLY X86_BUG(1*32 + 7)/* "its_native_only" CPU is affected by ITS, VMX is not affected */ +#define X86_BUG_TSA X86_BUG( 1*32+ 9)/* "tsa" CPU is affected by Transient Scheduler Attacks */ #endif /* _ASM_X86_CPUFEATURES_H */
arch/x86/include/asm/mwait.h +1 -1
@@ -79,7 +79,7 @@ static __always_inline void __mwait(unsi static __always_inline void __mwaitx(unsigned long eax, unsigned long ebx,unsigned long ecx) { -/* No MDS buffer clear as this is AMD/HYGON only */ +/* No need for TSA buffer clearing on AMD */ /* "mwaitx %eax, %ebx, %ecx;" */ asm volatile(".byte 0x0f, 0x01, 0xfb;"
arch/x86/include/asm/nospec-branch.h +10 -4
@@ -308,19 +308,25 @@* CFLAGS.ZF. * Note: Only the memory operand variant of VERW clears the CPU buffers. */ -.macro CLEAR_CPU_BUFFERS +.macro __CLEAR_CPU_BUFFERS feature#ifdef CONFIG_X86_64 - ALTERNATIVE "", "verw x86_verw_sel(%rip)", X86_FEATURE_CLEAR_CPU_BUF + ALTERNATIVE "", "verw x86_verw_sel(%rip)", \feature#else /* * In 32bit mode, the memory operand must be a %cs reference. The data * segments may not be usable (vm86 mode), and the stack segment may not * be flat (ESPFIX32). */ -ALTERNATIVE "" ,"verw %cs:x86_verw_sel" ,X86_FEATURE_CLEAR_CPU_BUF + ALTERNATIVE "", "verw %cs:x86_verw_sel", \feature #endif .endm +#define CLEAR_CPU_BUFFERS \ + __CLEAR_CPU_BUFFERS X86_FEATURE_CLEAR_CPU_BUF + +#define VM_CLEAR_CPU_BUFFERS \ + __CLEAR_CPU_BUFFERS X86_FEATURE_CLEAR_CPU_BUF_VM +#ifdef CONFIG_X86_64 .macro CLEAR_BRANCH_HISTORY ALTERNATIVE "", "call clear_bhb_loop", X86_FEATURE_CLEAR_BHB_LOOP
@@ -602,7 +608,7 @@ static __always_inline void x86_clear_cp/** * x86_idle_clear_cpu_buffers - Buffer clearing support in idle for the MDS -* vulnerability +* and TSA vulnerabilities. * * Clear CPU buffers if the corresponding static key is enabled */
arch/x86/kernel/cpu/amd.c +44 -0
56 lines not on this page · raw message
arch/x86/kernel/cpu/bugs.c +121 -0
163 lines not on this page · raw message
arch/x86/kernel/cpu/common.c +13 -1
@@ -1232,6 +1232,8 @@ static const __initconst struct x86_cpu_#define ITS BIT(8)/* CPU is affected by Indirect Target Selection, but guest-host isolation is not affected */ #define ITS_NATIVE_ONLY BIT(9) +/* CPU is affected by Transient Scheduler Attacks */ +#define TSA BIT(10)static const struct x86_cpu_id cpu_vuln_blacklist[]__initconst = {VULNBL_INTEL_STEPS (INTEL_IVYBRIDGE ,X86_STEP_MAX ,SRBDS ),
@@ -1279,7 +1281,7 @@ static const struct x86_cpu_id cpu_vuln_VULNBL_AMD (0x16 ,RETBLEED ),VULNBL_AMD (0x17 ,RETBLEED |SMT_RSB |SRSO ),VULNBL_HYGON (0x18 ,RETBLEED |SMT_RSB |SRSO ), -VULNBL_AMD (0x19 ,SRSO ), +VULNBL_AMD (0x19 ,SRSO |TSA ), VULNBL_AMD(0x1a, SRSO), {} };
@@ -1492,6 +1494,16 @@ static void __init cpu_set_bug_bits(strusetup_force_cpu_bug (X86_BUG_ITS_NATIVE_ONLY ); } +if (c->x86_vendor ==X86_VENDOR_AMD ) { +if (!cpu_has (c,X86_FEATURE_TSA_SQ_NO ) || + !cpu_has (c,X86_FEATURE_TSA_L1_NO )) { +if (cpu_matches (cpu_vuln_blacklist,TSA ) || +/* Enable bug on Zen guests to allow for live migration. */ + (cpu_has (c,X86_FEATURE_HYPERVISOR ) &&cpu_has (c,X86_FEATURE_ZEN ))) +setup_force_cpu_bug (X86_BUG_TSA ); + } + } +if (cpu_matches (cpu_vuln_whitelist,NO_MELTDOWN ))return ;
arch/x86/kernel/cpu/scattered.c +2 -0
@@ -49,6 +49,8 @@ static const struct cpuid_bit cpuid_bits { X86_FEATURE_MBA, CPUID_EBX, 6, 0x80000008, 0 }, { X86_FEATURE_SMBA, CPUID_EBX, 2, 0x80000020, 0 }, { X86_FEATURE_BMEC, CPUID_EBX, 3, 0x80000020, 0 }, + { X86_FEATURE_TSA_SQ_NO, CPUID_ECX, 1, 0x80000021, 0 }, + { X86_FEATURE_TSA_L1_NO, CPUID_ECX, 2, 0x80000021, 0 }, { X86_FEATURE_AMD_WORKLOAD_CLASS, CPUID_EAX, 22, 0x80000021, 0 }, { X86_FEATURE_PERFMON_V2, CPUID_EAX, 0, 0x80000022, 0 }, { X86_FEATURE_AMD_LBR_V2, CPUID_EAX, 1, 0x80000022, 0 },
arch/x86/kvm/svm/vmenter.S +6 -0
@@ -169,6 +169,9 @@ SYM_FUNC_START(__svm_vcpu_run) #endif mov VCPU_RDI(%_ASM_DI), %_ASM_DI + /* Clobbers EFLAGS.ZF */ + VM_CLEAR_CPU_BUFFERS + /* Enter guest mode */ 3: vmrun %_ASM_AX 4:
@@ -335,6 +338,9 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) mov SVM_current_vmcb(%rdi), %rax mov KVM_VMCB_pa(%rax), %rax + /* Clobbers EFLAGS.ZF */ + VM_CLEAR_CPU_BUFFERS + /* Enter guest mode */ 1: vmrun %rax 2:
drivers/base/cpu.c +3 -0
@@ -601,6 +601,7 @@ CPU_SHOW_VULN_FALLBACK(gds);CPU_SHOW_VULN_FALLBACK (reg_file_data_sampling);CPU_SHOW_VULN_FALLBACK (ghostwrite);CPU_SHOW_VULN_FALLBACK (indirect_target_selection); +CPU_SHOW_VULN_FALLBACK (tsa); static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL);
@@ -618,6 +619,7 @@ static DEVICE_ATTR(gather_data_sampling, static DEVICE_ATTR(reg_file_data_sampling, 0444, cpu_show_reg_file_data_sampling, NULL); static DEVICE_ATTR(ghostwrite, 0444, cpu_show_ghostwrite, NULL); static DEVICE_ATTR(indirect_target_selection, 0444, cpu_show_indirect_target_selection, NULL); +static DEVICE_ATTR(tsa, 0444, cpu_show_tsa, NULL);static struct attribute *cpu_root_vulnerabilities_attrs[] = { &dev_attr_meltdown.attr,
@@ -636,6 +638,7 @@ static struct attribute *cpu_root_vulner &dev_attr_reg_file_data_sampling.attr, &dev_attr_ghostwrite.attr, &dev_attr_indirect_target_selection.attr, + &dev_attr_tsa.attr, NULL };
include/linux/cpu.h +1 -0
@@ -80,6 +80,7 @@ extern ssize_t cpu_show_reg_file_data_saextern ssize_t cpu_show_ghostwrite (struct device *dev,struct device_attribute *attr,char *buf);extern ssize_t cpu_show_indirect_target_selection (struct device *dev,struct device_attribute *attr,char *buf); +extern ssize_t cpu_show_tsa (struct device *dev,struct device_attribute *attr,char *buf); extern __printf(4, 5) struct device *cpu_device_create(struct device *parent, void *drvdata,
Greg Kroah-Hartman
maintainerPATCH 175/178 KVM: x86: Sort CPUID_8000_0021_EAX leaf bits properly
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov <[email protected]>
Commit 49c140d5af127ef4faf19f06a89a0714edf0316f upstream.
WRMSR_XX_BASE_NS is bit 1 so put it there, add some new bits as comments only.
--- arch/x86/kvm/cpuid.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kvm/cpuid.c +4 -1
@@ -1164,6 +1164,7 @@ void kvm_set_cpu_caps(void) kvm_cpu_cap_init(CPUID_8000_0021_EAX, F(NO_NESTED_DATA_BP), + F(WRMSR_XX_BASE_NS),/* * Synthesize "LFENCE is serializing" into the AMD-defined entry * in KVM's supported CPUID, i.e. if the feature is reported as
@@ -1177,10 +1178,12 @@ void kvm_set_cpu_caps(void)SYNTHESIZED_F (LFENCE_RDTSC ),/* SmmPgCfgLock */ F (NULL_SEL_CLR_BASE ), +/* UpperAddressIgnore */ F (AUTOIBRS ),EMULATED_F (NO_SMM_CTL_MSR ),/* PrefetchCtlMsr */ -F (WRMSR_XX_BASE_NS ), +/* GpOnUserCpuid */ +/* EPSF */ SYNTHESIZED_F (SBPB ),SYNTHESIZED_F (IBPB_BRTYPE ), SYNTHESIZED_F(SRSO_NO),
Greg Kroah-Hartman
maintainerPATCH 176/178 KVM: SVM: Advertise TSA CPUID bits to guests
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Borislav Petkov (AMD)" <[email protected]>
Commit 31272abd5974b38ba312e9cf2ec2f09f9dd7dcba upstream.
Synthesize the TSA CPUID feature bits for guests. Set TSA_{SQ,L1}_NO on unaffected machines.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 10 +++++++++- arch/x86/kvm/reverse_cpuid.h | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -756,6 +756,7 @@ enum kvm_only_cpuid_leafs {CPUID_8000_0022_EAX ,CPUID_7_2_EDX ,CPUID_24_0_EBX , +CPUID_8000_0021_ECX ,NR_KVM_CPU_CAPS , NKVMCAPINTS = NR_KVM_CPU_CAPS - NCAPINTS,
arch/x86/kvm/cpuid.c +9 -1
@@ -1177,6 +1177,8 @@ void kvm_set_cpu_caps(void)*/ SYNTHESIZED_F (LFENCE_RDTSC ),/* SmmPgCfgLock */ +/* 4: Resv */ +SYNTHESIZED_F (VERW_CLEAR ),F (NULL_SEL_CLR_BASE ),/* UpperAddressIgnore */ F(AUTOIBRS),
@@ -1190,6 +1192,11 @@ void kvm_set_cpu_caps(void)F (SRSO_USER_KERNEL_NO ), ); +kvm_cpu_cap_init (CPUID_8000_0021_ECX , +SYNTHESIZED_F (TSA_SQ_NO ), + SYNTHESIZED_F(TSA_L1_NO), + ); +kvm_cpu_cap_init (CPUID_8000_0022_EAX , F(PERFMON_V2), );
@@ -1759,8 +1766,9 @@ static inline int __do_cpuid_func(struct entry->eax = entry->ebx = entry->ecx = entry->edx =0 ;break ;case 0x80000021 : - entry->ebx = entry->ecx = entry->edx =0 ; + entry->ebx = entry->edx =0 ;cpuid_entry_override (entry,CPUID_8000_0021_EAX ); +cpuid_entry_override (entry,CPUID_8000_0021_ECX );break ;/* AMD Extended Performance Monitoring and Debug */ case 0x80000022 : {
arch/x86/kvm/reverse_cpuid.h +7 -0
@@ -52,6 +52,10 @@/* CPUID level 0x80000022 (EAX) */ #define KVM_X86_FEATURE_PERFMON_V2 KVM_X86_FEATURE(CPUID_8000_0022_EAX, 0) +/* CPUID level 0x80000021 (ECX) */ +#define KVM_X86_FEATURE_TSA_SQ_NO KVM_X86_FEATURE(CPUID_8000_0021_ECX, 1) +#define KVM_X86_FEATURE_TSA_L1_NO KVM_X86_FEATURE(CPUID_8000_0021_ECX, 2) +struct cpuid_reg {u32 function;u32 index;
@@ -82,6 +86,7 @@ static const struct cpuid_reg reverse_cp [CPUID_8000_0022_EAX] = {0x80000022, 0, CPUID_EAX}, [CPUID_7_2_EDX] = { 7, 2, CPUID_EDX}, [CPUID_24_0_EBX] = { 0x24, 0, CPUID_EBX}, + [CPUID_8000_0021_ECX] = {0x80000021, 0, CPUID_ECX}, };/*
@@ -121,6 +126,8 @@ static __always_inline u32 __feature_traKVM_X86_TRANSLATE_FEATURE (PERFMON_V2 );KVM_X86_TRANSLATE_FEATURE (RRSBA_CTRL );KVM_X86_TRANSLATE_FEATURE (BHI_CTRL ); +KVM_X86_TRANSLATE_FEATURE (TSA_SQ_NO ); +KVM_X86_TRANSLATE_FEATURE (TSA_L1_NO );default :return x86_feature; }
Greg Kroah-Hartman
maintainerPATCH 177/178 x86/microcode/AMD: Add TSA microcode SHAs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Borislav Petkov (AMD)" <[email protected]>
Commit 2329f250e04d3b8e78b36a68b9880ca7750a07ef upstream.
--- arch/x86/kernel/cpu/microcode/amd_shas.c | 112 +++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+)
arch/x86/kernel/cpu/microcode/amd_shas.c +112 -0
@@ -231,6 +231,13 @@ static const struct patch_digest phashes0x0d ,0x5b ,0x65 ,0x34 ,0x69 ,0xb2 ,0x62 ,0x21 , } }, + { 0xa0011d7, { +0x35 ,0x07 ,0xcd ,0x40 ,0x94 ,0xbc ,0x81 ,0x6b , +0xfc ,0x61 ,0x56 ,0x1a ,0xe2 ,0xdb ,0x96 ,0x12 , +0x1c ,0x1c ,0x31 ,0xb1 ,0x02 ,0x6f ,0xe5 ,0xd2 , +0xfe ,0x1b ,0x04 ,0x03 ,0x2c ,0x8f ,0x4c ,0x36 , + } + }, { 0xa001223, {0xfb ,0x32 ,0x5f ,0xc6 ,0x83 ,0x4f ,0x8c ,0xb8 , 0xa4,0x05,0xf9,0x71,0x53,0x01,0x16,0xc4,
@@ -294,6 +301,13 @@ static const struct patch_digest phashes0xc0 ,0xcd ,0x33 ,0xf2 ,0x8d ,0xf9 ,0xef ,0x59 , } }, + { 0xa00123b, { +0xef ,0xa1 ,0x1e ,0x71 ,0xf1 ,0xc3 ,0x2c ,0xe2 , +0xc3 ,0xef ,0x69 ,0x41 ,0x7a ,0x54 ,0xca ,0xc3 , +0x8f ,0x62 ,0x84 ,0xee ,0xc2 ,0x39 ,0xd9 ,0x28 , +0x95 ,0xa7 ,0x12 ,0x49 ,0x1e ,0x30 ,0x71 ,0x72 , + } + }, { 0xa00820c, {0xa8 ,0x0c ,0x81 ,0xc0 ,0xa6 ,0x00 ,0xe7 ,0xf3 , 0x5f,0x65,0xd3,0xb9,0x6f,0xea,0x93,0x63,
@@ -301,6 +315,13 @@ static const struct patch_digest phashes0xe1 ,0x3b ,0x8d ,0xb2 ,0xf8 ,0x22 ,0x03 ,0xe2 , } }, + { 0xa00820d, { +0xf9 ,0x2a ,0xc0 ,0xf4 ,0x9e ,0xa4 ,0x87 ,0xa4 , +0x7d ,0x87 ,0x00 ,0xfd ,0xab ,0xda ,0x19 ,0xca , +0x26 ,0x51 ,0x32 ,0xc1 ,0x57 ,0x91 ,0xdf ,0xc1 , +0x05 ,0xeb ,0x01 ,0x7c ,0x5a ,0x95 ,0x21 ,0xb7 , + } + }, { 0xa10113e, {0x05 ,0x3c ,0x66 ,0xd7 ,0xa9 ,0x5a ,0x33 ,0x10 , 0x1b,0xf8,0x9c,0x8f,0xed,0xfc,0xa7,0xa0,
@@ -322,6 +343,13 @@ static const struct patch_digest phashes0xf1 ,0x5e ,0xb0 ,0xde ,0xb4 ,0x98 ,0xae ,0xc4 , } }, + { 0xa10114c, { +0x9e ,0xb6 ,0xa2 ,0xd9 ,0x87 ,0x38 ,0xc5 ,0x64 , +0xd8 ,0x88 ,0xfa ,0x78 ,0x98 ,0xf9 ,0x6f ,0x74 , +0x39 ,0x90 ,0x1b ,0xa5 ,0xcf ,0x5e ,0xb4 ,0x2a , +0x02 ,0xff ,0xd4 ,0x8c ,0x71 ,0x8b ,0xe2 ,0xc0 , + } + }, { 0xa10123e, {0x03 ,0xb9 ,0x2c ,0x76 ,0x48 ,0x93 ,0xc9 ,0x18 , 0xfb,0x56,0xfd,0xf7,0xe2,0x1d,0xca,0x4d,
@@ -343,6 +371,13 @@ static const struct patch_digest phashes0x1b ,0x7d ,0x64 ,0x9d ,0x4b ,0x53 ,0x13 ,0x75 , } }, + { 0xa10124c, { +0x29 ,0xea ,0xf1 ,0x2c ,0xb2 ,0xe4 ,0xef ,0x90 , +0xa4 ,0xcd ,0x1d ,0x86 ,0x97 ,0x17 ,0x61 ,0x46 , +0xfc ,0x22 ,0xcb ,0x57 ,0x75 ,0x19 ,0xc8 ,0xcc , +0x0c ,0xf5 ,0xbc ,0xac ,0x81 ,0x9d ,0x9a ,0xd2 , + } + }, { 0xa108108, {0xed ,0xc2 ,0xec ,0xa1 ,0x15 ,0xc6 ,0x65 ,0xe9 , 0xd0,0xef,0x39,0xaa,0x7f,0x55,0x06,0xc6,
@@ -350,6 +385,13 @@ static const struct patch_digest phashes0x28 ,0x1e ,0x9c ,0x59 ,0x69 ,0x99 ,0x4d ,0x16 , } }, + { 0xa108109, { +0x85 ,0xb4 ,0xbd ,0x7c ,0x49 ,0xa7 ,0xbd ,0xfa , +0x49 ,0x36 ,0x80 ,0x81 ,0xc5 ,0xb7 ,0x39 ,0x1b , +0x9a ,0xaa ,0x50 ,0xde ,0x9b ,0xe9 ,0x32 ,0x35 , +0x42 ,0x7e ,0x51 ,0x4f ,0x52 ,0x2c ,0x28 ,0x59 , + } + }, { 0xa20102d, {0xf9 ,0x6e ,0xf2 ,0x32 ,0xd3 ,0x0f ,0x5f ,0x11 , 0x59,0xa1,0xfe,0xcc,0xcd,0x9b,0x42,0x89,
@@ -357,6 +399,13 @@ static const struct patch_digest phashes0x8c ,0xe9 ,0x19 ,0x3e ,0xcc ,0x3f ,0x7b ,0xb4 , } }, + { 0xa20102e, { +0xbe ,0x1f ,0x32 ,0x04 ,0x0d ,0x3c ,0x9c ,0xdd , +0xe1 ,0xa4 ,0xbf ,0x76 ,0x3a ,0xec ,0xc2 ,0xf6 , +0x11 ,0x00 ,0xa7 ,0xaf ,0x0f ,0xe5 ,0x02 ,0xc5 , +0x54 ,0x3a ,0x1f ,0x8c ,0x16 ,0xb5 ,0xff ,0xbe , + } + }, { 0xa201210, {0xe8 ,0x6d ,0x51 ,0x6a ,0x8e ,0x72 ,0xf3 ,0xfe , 0x6e,0x16,0xbc,0x62,0x59,0x40,0x17,0xe9,
@@ -364,6 +413,13 @@ static const struct patch_digest phashes0xf7 ,0x55 ,0xf0 ,0x13 ,0xbb ,0x22 ,0xf6 ,0x41 , } }, + { 0xa201211, { +0x69 ,0xa1 ,0x17 ,0xec ,0xd0 ,0xf6 ,0x6c ,0x95 , +0xe2 ,0x1e ,0xc5 ,0x59 ,0x1a ,0x52 ,0x0a ,0x27 , +0xc4 ,0xed ,0xd5 ,0x59 ,0x1f ,0xbf ,0x00 ,0xff , +0x08 ,0x88 ,0xb5 ,0xe1 ,0x12 ,0xb6 ,0xcc ,0x27 , + } + }, { 0xa404107, {0xbb ,0x04 ,0x4e ,0x47 ,0xdd ,0x5e ,0x26 ,0x45 , 0x1a,0xc9,0x56,0x24,0xa4,0x4c,0x82,0xb0,
@@ -371,6 +427,13 @@ static const struct patch_digest phashes0x13 ,0xbc ,0xc5 ,0x25 ,0xe4 ,0xc5 ,0xc3 ,0x99 , } }, + { 0xa404108, { +0x69 ,0x67 ,0x43 ,0x06 ,0xf8 ,0x0c ,0x62 ,0xdc , +0xa4 ,0x21 ,0x30 ,0x4f ,0x0f ,0x21 ,0x2c ,0xcb , +0xcc ,0x37 ,0xf1 ,0x1c ,0xc3 ,0xf8 ,0x2f ,0x19 , +0xdf ,0x53 ,0x53 ,0x46 ,0xb1 ,0x15 ,0xea ,0x00 , + } + }, { 0xa500011, {0x23 ,0x3d ,0x70 ,0x7d ,0x03 ,0xc3 ,0xc4 ,0xf4 , 0x2b,0x82,0xc6,0x05,0xda,0x80,0x0a,0xf1,
@@ -378,6 +441,13 @@ static const struct patch_digest phashes0x11 ,0x5e ,0x96 ,0x7e ,0x71 ,0xe9 ,0xfc ,0x74 , } }, + { 0xa500012, { +0xeb ,0x74 ,0x0d ,0x47 ,0xa1 ,0x8e ,0x09 ,0xe4 , +0x93 ,0x4c ,0xad ,0x03 ,0x32 ,0x4c ,0x38 ,0x16 , +0x10 ,0x39 ,0xdd ,0x06 ,0xaa ,0xce ,0xd6 ,0x0f , +0x62 ,0x83 ,0x9d ,0x8e ,0x64 ,0x55 ,0xbe ,0x63 , + } + }, { 0xa601209, {0x66 ,0x48 ,0xd4 ,0x09 ,0x05 ,0xcb ,0x29 ,0x32 , 0x66,0xb7,0x9a,0x76,0xcd,0x11,0xf3,0x30,
@@ -385,6 +455,13 @@ static const struct patch_digest phashes0xe8 ,0x73 ,0xe2 ,0xd6 ,0xdb ,0xd2 ,0x77 ,0x1d , } }, + { 0xa60120a, { +0x0c ,0x8b ,0x3d ,0xfd ,0x52 ,0x52 ,0x85 ,0x7d , +0x20 ,0x3a ,0xe1 ,0x7e ,0xa4 ,0x21 ,0x3b ,0x7b , +0x17 ,0x86 ,0xae ,0xac ,0x13 ,0xb8 ,0x63 ,0x9d , +0x06 ,0x01 ,0xd0 ,0xa0 ,0x51 ,0x9a ,0x91 ,0x2c , + } + }, { 0xa704107, {0xf3 ,0xc6 ,0x58 ,0x26 ,0xee ,0xac ,0x3f ,0xd6 , 0xce,0xa1,0x72,0x47,0x3b,0xba,0x2b,0x93,
@@ -392,6 +469,13 @@ static const struct patch_digest phashes0x64 ,0x39 ,0x71 ,0x8c ,0xce ,0xe7 ,0x41 ,0x39 , } }, + { 0xa704108, { +0xd7 ,0x55 ,0x15 ,0x2b ,0xfe ,0xc4 ,0xbc ,0x93 , +0xec ,0x91 ,0xa0 ,0xae ,0x45 ,0xb7 ,0xc3 ,0x98 , +0x4e ,0xff ,0x61 ,0x77 ,0x88 ,0xc2 ,0x70 ,0x49 , +0xe0 ,0x3a ,0x1d ,0x84 ,0x38 ,0x52 ,0xbf ,0x5a , + } + }, { 0xa705206, {0x8d ,0xc0 ,0x76 ,0xbd ,0x58 ,0x9f ,0x8f ,0xa4 , 0x12,0x9d,0x21,0xfb,0x48,0x21,0xbc,0xe7,
@@ -399,6 +483,13 @@ static const struct patch_digest phashes0x03 ,0x35 ,0xe9 ,0xbe ,0xfb ,0x06 ,0xdf ,0xfc , } }, + { 0xa705208, { +0x30 ,0x1d ,0x55 ,0x24 ,0xbc ,0x6b ,0x5a ,0x19 , +0x0c ,0x7d ,0x1d ,0x74 ,0xaa ,0xd1 ,0xeb ,0xd2 , +0x16 ,0x62 ,0xf7 ,0x5b ,0xe1 ,0x1f ,0x18 ,0x11 , +0x5c ,0xf0 ,0x94 ,0x90 ,0x26 ,0xec ,0x69 ,0xff , + } + }, { 0xa708007, {0x6b ,0x76 ,0xcc ,0x78 ,0xc5 ,0x8a ,0xa3 ,0xe3 , 0x32,0x2d,0x79,0xe4,0xc3,0x80,0xdb,0xb2,
@@ -406,6 +497,13 @@ static const struct patch_digest phashes0xdf ,0x92 ,0x73 ,0x84 ,0x87 ,0x3c ,0x73 ,0x93 , } }, + { 0xa708008, { +0x08 ,0x6e ,0xf0 ,0x22 ,0x4b ,0x8e ,0xc4 ,0x46 , +0x58 ,0x34 ,0xe6 ,0x47 ,0xa2 ,0x28 ,0xfd ,0xab , +0x22 ,0x3d ,0xdd ,0xd8 ,0x52 ,0x9e ,0x1d ,0x16 , +0xfa ,0x01 ,0x68 ,0x14 ,0x79 ,0x3e ,0xe8 ,0x6b , + } + }, { 0xa70c005, {0x88 ,0x5d ,0xfb ,0x79 ,0x64 ,0xd8 ,0x46 ,0x3b , 0x4a,0x83,0x8e,0x77,0x7e,0xcf,0xb3,0x0f,
@@ -413,6 +511,13 @@ static const struct patch_digest phashes0xee ,0x49 ,0xac ,0xe1 ,0x8b ,0x13 ,0xc5 ,0x13 , } }, + { 0xa70c008, { +0x0f ,0xdb ,0x37 ,0xa1 ,0x10 ,0xaf ,0xd4 ,0x21 , +0x94 ,0x0d ,0xa4 ,0xa2 ,0xe9 ,0x86 ,0x6c ,0x0e , +0x85 ,0x7c ,0x36 ,0x30 ,0xa3 ,0x3a ,0x78 ,0x66 , +0x18 ,0x10 ,0x60 ,0x0d ,0x78 ,0x3d ,0x44 ,0xd0 , + } + }, { 0xaa00116, {0xe8 ,0x4c ,0x2c ,0x88 ,0xa1 ,0xac ,0x24 ,0x63 , 0x65,0xe5,0xaa,0x2d,0x16,0xa9,0xc3,0xf5,
@@ -441,4 +546,11 @@ static const struct patch_digest phashes 0x68,0x2f,0x46,0xee,0xfe,0xc6,0x6d,0xef, } }, + { 0xaa00216, { +0x79 ,0xfb ,0x5b ,0x9f ,0xb6 ,0xe6 ,0xa8 ,0xf5 , +0x4e ,0x7c ,0x4f ,0x8e ,0x1d ,0xad ,0xd0 ,0x08 , +0xc2 ,0x43 ,0x7c ,0x8b ,0xe6 ,0xdb ,0xd0 ,0xd2 , + 0xe8,0x39,0x26,0xc1,0xe5,0x5a,0x48,0xf1, + } + }, };
Greg Kroah-Hartman
maintainerPATCH 178/178 x86/process: Move the buffer clearing before MONITOR
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Borislav Petkov (AMD)" <[email protected]>
Commit 8e786a85c0a3c0fffae6244733fb576eeabd9dec upstream.
Move the VERW clearing before the MONITOR so that VERW doesn't disarm it and the machine never enters C1.
Original idea by Kim Phillips <[email protected]>.
--- arch/x86/include/asm/mwait.h | 25 +++++++++++++++---------- arch/x86/kernel/process.c | 16 ++++++++++++---- 2 files changed, 27 insertions(+), 14 deletions(-)
arch/x86/include/asm/mwait.h +15 -10
@@ -43,8 +43,6 @@ static __always_inline void __monitorx(c static __always_inline void __mwait(unsigned long eax, unsigned long ecx) { -x86_idle_clear_cpu_buffers (); -/* "mwait %eax, %ecx;" */ asmvolatile (".byte 0x0f, 0x01, 0xc9;" ::"a" (eax),"c" (ecx));
@@ -97,7 +95,6 @@ static __always_inline void __mwaitx(uns*/ static __always_inline void __sti_mwait(unsigned long eax, unsigned long ecx) { -x86_idle_clear_cpu_buffers ();/* "mwait %eax, %ecx;" */ asm volatile("sti; .byte 0x0f, 0x01, 0xc9;"
@@ -116,21 +113,29 @@ static __always_inline void __sti_mwait(*/ static __always_inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx) { +if (need_resched ()) +return ; + +x86_idle_clear_cpu_buffers (); +if (static_cpu_has_bug (X86_BUG_MONITOR ) || !current_set_polling_and_test ()) {const void *addr = ¤t_thread_info ()->flags; alternative_input("", "clflush (%[addr])", X86_BUG_CLFLUSH_MONITOR, [addr] "a" (addr));__monitor (addr,0 ,0 ); -if (!need_resched ()) { -if (ecx &1 ) { -__mwait (eax, ecx); - }else { -__sti_mwait (eax, ecx); -raw_local_irq_disable (); - } +if (need_resched ()) + goto out; + +if (ecx &1 ) { +__mwait (eax, ecx); + }else { +__sti_mwait (eax, ecx); +raw_local_irq_disable (); } } + +out:current_clr_polling (); }
arch/x86/kernel/process.c +12 -4
@@ -912,16 +912,24 @@ static __init bool prefer_mwait_c1_over_*/ static __cpuidle void mwait_idle(void) { +if (need_resched ()) +return ; + +x86_idle_clear_cpu_buffers (); +if (!current_set_polling_and_test ()) {const void *addr = ¤t_thread_info ()->flags; alternative_input("", "clflush (%[addr])", X86_BUG_CLFLUSH_MONITOR, [addr] "a" (addr));__monitor (addr,0 ,0 ); -if (!need_resched ()) { -__sti_mwait (0 ,0 ); -raw_local_irq_disable (); - } +if (need_resched ()) + goto out; + +__sti_mwait (0 ,0 ); +raw_local_irq_disable (); } + +out:__current_clr_polling (); }
Hi
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Tested rc1 against the Fedora build system (aarch64, ppc64le, s390x, x86_64), and boot tested x86_64. No regressions noted.
Hi Greg
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
6.15.6-rc1 tested.
Build successfully completed.
Boot successfully completed.
No dmesg regressions.
Video output normal.
Sound output normal.
Lenovo ThinkPad X1 Carbon Gen10(Intel i7-1260P(x86_64) arch linux)
[ 0.000000] Linux version 6.15.6-rc1rv-gb283c37b8f14
(takeshi@ThinkPadX1Gen10J0764) (gcc (GCC) 15.1.1 20250425, GNU ld (GNU Binutils) 2.44.0) #1 SMP PREEMPT_DYNAMIC Wed Jul 9 14:44:32 JST 2025
Thanks
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.15.y
6.6 passes our testing, too:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.6.y
Best regards,
Pavel
Signature · 2 lines
In cooperation with DENX Software Engineering GmbH, HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
AMD Ryzen 5 5600 6-Core Processor:
https://www.inet.se/produkt/5304697/amd-ryzen-5-5600-3-5-ghz-35mb on a
https://www.gigabyte.com/Motherboard/B550-AORUS-ELITE-V2-rev-12
https://www.inet.se/produkt/1903406/gigabyte-b550-aorus-elite-v2
motherboard :)
running Arch Linux with the testing repos enabled:
https://archlinux.org/ https://archboot.com/
https://wiki.archlinux.org/title/Arch_Testing_Team
Den tis 8 juli 2025 kl 18:23 skrev Greg Kroah-Hartman <[email protected]>:
Quoted 780 lines
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 6.15.6-rc1Borislav Petkov (AMD) <[email protected]>
x86/process: Move the buffer clearing before MONITORBorislav Petkov (AMD) <[email protected]>
x86/microcode/AMD: Add TSA microcode SHAsBorislav Petkov (AMD) <[email protected]>
KVM: SVM: Advertise TSA CPUID bits to guestsBorislav Petkov <[email protected]>
KVM: x86: Sort CPUID_8000_0021_EAX leaf bits properlyBorislav Petkov (AMD) <[email protected]>
x86/bugs: Add a Transient Scheduler Attacks mitigationBorislav Petkov (AMD) <[email protected]>
x86/bugs: Rename MDS machinery to something more genericJeongjun Park <[email protected]>
mm/vmalloc: fix data race inshow_numa_info()Andrei Kuchynski <[email protected]>
usb: typec: displayport: Fix potential deadlockKurt Borja <[email protected]>
platform/x86: think-lmi: Fix sysfs group cleanupKurt Borja <[email protected]>
platform/x86: think-lmi: Fix kobject cleanupKurt Borja <[email protected]>
platform/x86: think-lmi: Create ksets consecutivelyVivian Wang <[email protected]>
riscv:cpu_ops_sbi: Use static array forboot_dataZhang Rui <[email protected]>
powercap:intel_rapl: Do not change CLAMPING bit if ENABLE bit cannot be changedLu Baolu <[email protected]>
iommu/vt-d: Assign devtlb cache tag on ATS enablementSimon Xue <[email protected]>
iommu/rockchip: prevent iommus dead loop when two masters share one IOMMUJens Wiklander <[email protected]>
optee: ffa: fix sleep in atomic contextOliver Neukum <[email protected]>
Logitech C-270 even more brokenMichael J. Ruhl <[email protected]>
i2c/designware: Fix an initialization issueKrzysztof Kozlowski <[email protected]>
dt-bindings: i2c: realtek,rtl9301: Fix missing 'reg' constraintQasim Ijaz <[email protected]>
HID: appletb-kbd: fix slab use-after-free bug inappletb_kbd_probeChristian König <[email protected]>
dma-buf: fix timeout handling indma_resv_wait_timeoutv2Shyam Prasad N <[email protected]>
cifs: all initializations for tcon should happen intcon_info_allocPhilipp Kerling <[email protected]>
smb: client: fix readdir returning wrong type with POSIX extensionsHeikki Krogerus <[email protected]>
usb: acpi: fix device link removalXu Yang <[email protected]>
usb: chipidea: udc: disconnect/reconnect from host when do suspend/resumeSCHNEIDER Johannes <[email protected]>
usb: dwc3: gadget: Fix TRB reclaim logic for short transfers and ZLPsKuen-Han Tsai <[email protected]>
usb: dwc3: Abort suspend on soft disconnect failurePawel Laszczak <[email protected]>
usb: cdnsp: Fix issue with CV Bad Descriptor testPeter Chen <[email protected]>
usb: cdnsp: do not disable slot for disabled slotJeff LaBundy <[email protected]>
Input: iqs7222 - explicitly define number of external channelsNilton Perim Neto <[email protected]>
Input: xpad - support Acer NGR 200 ControllerQasim Ijaz <[email protected]>
HID: appletb-kbd: fix memory corruption ofinput_handler_listHongyu Xie <[email protected]>
xhci: Disable stream for xHC controller withXHCI_BROKEN_STREAMSMathias Nyman <[email protected]>
xhci: dbc: Flush queued requests before stopping dbcŁukasz Bartosik <[email protected]>
xhci: dbctty: disable ECHO flag by defaultRaju Rangoju <[email protected]>
usb: xhci: quirk for data loss in ISOC transfersRoy Luo <[email protected]>
Revert "usb: xhci: Implementxhci_handshake_check_state()helper"Roy Luo <[email protected]>
usb: xhci: Skipxhci_resetinxhci_resumeif xhci is being removedUladzislau Rezki (Sony) <[email protected]>
rcu: Return early if callback is not specifiedPablo Martin-Gomez <[email protected]>
mtd: spinand: fix memory leak of ECC engine confRafael J. Wysocki <[email protected]>
ACPICA: Refuse to evaluate a method if arguments are missingJohannes Berg <[email protected]>
wifi: ath6kl: remove WARN on bad firmware inputJohannes Berg <[email protected]>
wifi: mac80211: drop invalid source address OCB framesJustin Sanders <[email protected]>
aoe: defer rexmit timer downdev work to workqueueMaurizio Lombardi <[email protected]>
scsi: target: Fix NULL pointer dereference incore_scsi3_decode_spec_i_port()Heiko Stuebner <[email protected]>
regulator: fan53555: addenable_timesupport and soft-start timesRaven Black <[email protected]>
ASoC: amd: yc: update quirk data for HP VictusMadhavan Srinivasan <[email protected]>
powerpc: Fix struct termio related ioctl macrosGyeyoung Baek <[email protected]>
genirq/irq_sim: Initialize work context pointers properlyMario Limonciello <[email protected]>
platform/x86/amd/pmc: Add PCSpecialist Lafite Pro V 14M to 8042 quirks listGabriel Santese <[email protected]>
ASoC: amd: yc: Add quirk for MSI Bravo 17 D7VF internal micJohannes Berg <[email protected]>
ata:pata_cs5536: fix build on 32-bit UMLTasos Sahanidis <[email protected]>
ata: libata-acpi: Do not assume 40 wire cable if no devices are enabledTakashi Iwai <[email protected]>
ALSA: sb: Force to disable DMAs once when DMA mode is changedTakashi Iwai <[email protected]>
ALSA: sb: Don't allow changing the DMA mode during operationsRob Clark <[email protected]>
drm/msm: Fix another leak in the submit error pathRob Clark <[email protected]>
drm/msm: Fix a fence leak in submit error pathJake Hillion <[email protected]>
x86/platform/amd: move final timeout check to after final sleepHarry Austen <[email protected]>
drm/xe: Allow dropping kunit dependency as built-inDavid Howells <[email protected]>
netfs: Fix double put of requestPaulo Alcantara <[email protected]>
smb: client: fix native SMB symlink traversalWang Zhaolong <[email protected]>
smb: client: fix race condition in negotiate timeout by using more precise timingAntoine Tenart <[email protected]>
net: ipv4: fix stat increase when udp early demux drops the packetRaju Rangoju <[email protected]>
amd-xgbe: do not double read link statusLion Ackermann <[email protected]>
net/sched: Always pass notifications when child class becomes emptyThomas Fourier <[email protected]>
nui: Fixdma_mapping_error()checkKohei Enju <[email protected]>
rose: fix dangling neighbour pointers inrose_rt_device_down()Alok Tiwari <[email protected]>
enic: fix incorrect MTU comparison inenic_change_mtu()Raju Rangoju <[email protected]>
amd-xgbe: align CL37 AN sequence as per databookDan Carpenter <[email protected]>
lib:test_objagg: Set error message incheck_expect_hints_stats()Vinay Belgaumkar <[email protected]>
drm/xe/bmg: Update Wa_22019338487Vinay Belgaumkar <[email protected]>
drm/xe/bmg: Update Wa_14022085890Lucas De Marchi <[email protected]>
drm/xe: Splitxe_device_td_flush()Lucas De Marchi <[email protected]>
drm/xe/guc_pc: Add_lockedvariant for min/max freqJohn Harrison <[email protected]>
drm/xe/guc: Enable w/a 16026508708David Howells <[email protected]>
netfs: Fixi_sizeupdatingPaulo Alcantara <[email protected]>
smb: client: set missing retry flag incifs_writev_callback()Paulo Alcantara <[email protected]>
smb: client: set missing retry flag incifs_readv_callback()Paulo Alcantara <[email protected]>
smb: client: set missing retry flag insmb2_writev_callback()David Howells <[email protected]>
netfs: Fix ref leak on inserted extra subreq in write retryDavid Howells <[email protected]>
netfs: Fix looping in wait functionsDavid Howells <[email protected]>
netfs: Fix hang due to missing case in final DIO read result collectionJia Yao <[email protected]>
drm/xe: Fix out-of-bounds field write inMI_STORE_DATA_IMMVitaly Lifshits <[email protected]>
igc: disable L1.2 PCI-E link substate to avoid performance issueAhmed Zaki <[email protected]>
idpf: convert control queue mutex to a spinlockMichal Swiatkowski <[email protected]>
idpf: return 0 size for RSS key if not supportedGeliang Tang <[email protected]>
nvme-multipath: fix suspicious RCU usage warningJunxiao Chang <[email protected]>
drm/i915/gsc: mei interrupt top half should be in irq disabled contextJanusz Krzysztofik <[email protected]>
drm/i915/gt: Fix timeline left held on VMA alloc errorMarko Kiiskila <[email protected]>
drm/vmwgfx: Fix guests running with TDX/SEVOleksij Rempel <[email protected]>
net: usb: lan78xx: fix WARN in__netif_napi_del_lockedon disconnectPaulo Alcantara <[email protected]>
smb: client: fix warning when reconnecting channelDmitry Baryshkov <[email protected]>
drm/bridge: aux-hpd-bridge: fix assignment of theof_nodeDmitry Baryshkov <[email protected]>
drm/bridge: panel: moveprepare_prev_firsthandling todrm_panel_bridge_add_typedAlok Tiwari <[email protected]>
platform/mellanox: mlxreg-lc: Fix logic error in power state checkKurt Borja <[email protected]>
platform/x86: dell-wmi-sysman: Fix class device unregistrationKurt Borja <[email protected]>
platform/x86: think-lmi: Fix class device unregistrationKurt Borja <[email protected]>
platform/x86: hp-bioscfg: Fix class device unregistrationKurt Borja <[email protected]>
platform/x86: dell-wmi-sysman: Fix WMI data block retrieval in sysfs callbacksEugen Hristev <[email protected]>
nvme-pci: refresh visible attrs after being checkedDmitry Bogdanov <[email protected]>
nvmet: fix memory leak of bio integrityAlok Tiwari <[email protected]>
nvme: Fix incorrect cdw15 value in passthru error loggingDan Carpenter <[email protected]>
drm/i915/selftests: Changemock_request()to return error pointersJames Clark <[email protected]>
spi: spi-fsl-dspi: Clear completion counter before initiating transferGabor Juhos <[email protected]>
spi: spi-qpic-snand: reallocate BAM transactionsMarek Szyprowski <[email protected]>
drm/exynos: fimd: Guard display clock control with runtime PM callsFushuai Wang <[email protected]>
dpaa2-eth: fixxdp_rxq_infoleakThomas Fourier <[email protected]>
ethernet: atl1: Add missing DMA mapping error checks and count errorsFilipe Manana <[email protected]>
btrfs: usebtrfs_record_snapshot_destroy()during rmdirFilipe Manana <[email protected]>
btrfs: propagatelast_unlink_transearlier when doing a rmdirFilipe Manana <[email protected]>
btrfs: record new subvolume in parent dir earlier to avoid dir logging racesFilipe Manana <[email protected]>
btrfs: fix inode lookup error handling during log replayFilipe Manana <[email protected]>
btrfs: fix iteration of extrefs during log replayFilipe Manana <[email protected]>
btrfs: fix missing error handling when searching for inode refs during log replayFilipe Manana <[email protected]>
btrfs: fix failure to rebuild free space tree using multiple transactionsYang Li <[email protected]>
Bluetooth: Prevent unintended pause by checking if advertising is activeTrond Myklebust <[email protected]>
NFSv4/flexfiles: Fix handling of NFS level errors in I/OTigran Mkrtchyan <[email protected]>
flexfiles/pNFS: update stats onNFS4ERR_DELAYfor v4.1 DSesArmin Wolf <[email protected]>
platform/x86: wmi: Fix WMI event enablementAlok Tiwari <[email protected]>
platform/mellanox: nvsw-sn2201: Fix bus number in adapter error messageAlok Tiwari <[email protected]>
platform/mellanox: mlxbf-pmc: Fix duplicate event ID forCACHE_DATA1Patrisious Haddad <[email protected]>
RDMA/mlx5: Fix vport loopback for MPV devicePatrisious Haddad <[email protected]>
RDMA/mlx5: Fix CC counters query for MPVPatrisious Haddad <[email protected]>
RDMA/mlx5: Fix HW counters query for non-representor devicesOr Har-Toov <[email protected]>
IB/mlx5: Fix potential deadlock in MR deregistrationBart Van Assche <[email protected]>
scsi: ufs: core: Fix spelling of a sysfs attribute nameChristoph Hellwig <[email protected]>
scsi: core: Enforce unlimitedmax_segment_sizewhenvirt_boundary_maskis setjackysliu <[email protected]>
scsi: sd: Fix VPD page 0xb7 length checkThomas Fourier <[email protected]>
scsi: qla4xxx: Fix missing DMA mapping error inqla4xxx_alloc_pdu()Thomas Fourier <[email protected]>
scsi: qla2xxx: Fix DMA mapping test inqla24xx_get_port_database()Benjamin Coddington <[email protected]>
NFSv4/pNFS: Fix a race to wake onNFS_LAYOUT_DRAINKuniyuki Iwashima <[email protected]>
nfs: Clean up/proc/net/rpc/nfswhennfs_fs_proc_net_init()fails.Shivank Garg <[email protected]>
fs: exportanon_inode_make_secure_inode()and fix secretmem LSM bypassPeter Zijlstra <[email protected]>
module: ProvideEXPORT_SYMBOL_GPL_FOR_MODULES()helperMark Zhang <[email protected]>
RDMA/mlx5: Initialize obj_event->obj_sub_list before xa_insertOr Har-Toov <[email protected]>
RDMA/mlx5: Fix unsafe xarray access in implicit ODP handlingDavid Thompson <[email protected]>
platform/mellanox: mlxbf-tmfifo: fix vring_desc.len assignmentSven Peter <[email protected]>
arm64: dts: apple: Move touchbar mipi {address,size}-cells from dtsi to dtsSven Peter <[email protected]>
arm64: dts: apple: Drop {address,size}-cells from SPI NORJanne Grunau <[email protected]>
arm64: dts: apple: t8103: Fix PCIe BCM4377 nodenameArnd Bergmann <[email protected]>
RDMA/mlx5: reduce stack usage inmlx5_ib_ufile_hw_cleanupTudor Ambarus <[email protected]>
firmware: exynos-acpm: fix timeouts on xfers handlingViresh Kumar <[email protected]>
firmware:arm_ffa: Fix the missing entry in structffa_indirect_msg_hdrSudeep Holla <[email protected]>
firmware:arm_ffa: Replace mutex with rwlock to avoid sleep in atomic contextSudeep Holla <[email protected]>
firmware:arm_ffa: Move memory allocation outside the mutex lockingSudeep Holla <[email protected]>
firmware:arm_ffa: Fix memory leak by freeing notifier callback nodeMaíra Canal <[email protected]>
drm/v3d: Disable interrupts before resetting the GPUSergey Senozhatsky <[email protected]>
mtk-sd: reset host->mrq on prepare_data() errorMasami Hiramatsu (Google) <[email protected]>
mtk-sd: Prevent memory corruption from DMA map failureMasami Hiramatsu (Google) <[email protected]>
mtk-sd: Fix a pagefault indma_unmap_sg()for not prepared dataRD Babiera <[email protected]>
usb: typec: altmodes/displayport: do not index invalidpin_assignmentsChristian Brauner <[email protected]>
anon_inode: rework assertionsYunshui Jiang <[email protected]>
Input: cs40l50-vibra - fix potential NULL dereference incs40l50_upload_owt()Manivannan Sadhasivam <[email protected]>
regulator: gpio: Fix the out-of-bounds access todrvdata::gpiodsNicolin Chen <[email protected]>
iommufd/selftest: Fixiommufd_dirty_trackingwith large hugepage sizesChristian Eggers <[email protected]>
Bluetooth: MGMT:mesh_send: check instances prior disabling advertisingChristian Eggers <[email protected]>
Bluetooth: MGMT:set_mesh: update LE scan interval and windowChristian Eggers <[email protected]>
Bluetooth:hci_sync: revert some mesh modificationsChristian Eggers <[email protected]>
Bluetooth: HCI: Set extended advertising data synchronouslyVictor Shih <[email protected]>
mmc: core: Adjust some error messages for SD UHS-II cardsAvri Altman <[email protected]>
mmc: core: sd: ApplyBROKEN_SD_DISCARDquirk earlierVictor Shih <[email protected]>
mmc: sdhci-uhs2: Adjust some error messages and register dump for SD UHS-II cardUlf Hansson <[email protected]>
Revert "mmc: sdhci: Disable SD card clock before changing parameters"Darrick J. Wong <[email protected]>
xfs: actually use thexfs_growfs_check_rtgeomtracepointVictor Shih <[email protected]>
mmc: sdhci: Add a helper function for dump register in dynamic debug modeJiawen Wu <[email protected]>
net: libwx: fix the incorrect display of the queue numberNicolin Chen <[email protected]>
iommufd/selftest: Add asserts testing global mfdNicolin Chen <[email protected]>
iommufd/selftest: Add missing close(mfd) inmemfd_mmap()HarshaVardhana S A <[email protected]>
vsock/vmci: Clear the vmci transport packet properly when initializing itJiawen Wu <[email protected]>
net: txgbe: request MISC IRQ inndo_openKrzysztof Kozlowski <[email protected]>
dt-bindings: net: sophgo,sg2044-dwmac: Drop status from the exampleNiklas Schnelle <[email protected]>
s390/pci: Do not try re-enabling load/store if device is disabledNiklas Schnelle <[email protected]>
s390/pci: Fix stale function handles in error handlingBui Quang Minh <[email protected]>
virtio-net: ensure the received length does not exceed allocated sizeBui Quang Minh <[email protected]>
virtio-net: xsk: rx: fix the frame's length checkMateusz Jończyk <[email protected]>
rtc: cmos: usespin_lock_irqsaveincmos_interruptElena Popa <[email protected]>
rtc: pcf2127: fix SPI command byte for PCF2131Hugo Villeneuve <[email protected]>
rtc: pcf2127: add missing semicolon after statement-------------
Diffstat:
Documentation/ABI/testing/sysfs-devices-system-cpu | 1 + Documentation/ABI/testing/sysfs-driver-ufs | 2 +- .../hw-vuln/processor_mmio_stale_data.rst | 4 +- Documentation/admin-guide/kernel-parameters.txt | 13 ++ Documentation/arch/x86/mds.rst | 8 +- Documentation/core-api/symbol-namespaces.rst | 22 ++ .../bindings/i2c/realtek,rtl9301-i2c.yaml | 3 +- .../bindings/net/sophgo,sg2044-dwmac.yaml | 3 +- Makefile | 4 +- arch/arm64/boot/dts/apple/spi1-nvram.dtsi | 2 - arch/arm64/boot/dts/apple/t8103-j293.dts | 2 + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 +- arch/arm64/boot/dts/apple/t8103.dtsi | 2 - arch/arm64/boot/dts/apple/t8112-j493.dts | 2 + arch/arm64/boot/dts/apple/t8112.dtsi | 2 - arch/powerpc/include/uapi/asm/ioctls.h | 8 +- arch/riscv/kernel/cpu_ops_sbi.c | 6 +- arch/s390/pci/pci_event.c | 15 ++ arch/x86/Kconfig | 9 + arch/x86/entry/entry.S | 8 +- arch/x86/include/asm/cpufeatures.h | 5 + arch/x86/include/asm/irqflags.h | 4 +- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/mwait.h | 28 ++- arch/x86/include/asm/nospec-branch.h | 37 +-- arch/x86/kernel/cpu/amd.c | 44 ++++ arch/x86/kernel/cpu/bugs.c | 133 ++++++++++- arch/x86/kernel/cpu/common.c | 14 +- arch/x86/kernel/cpu/microcode/amd_shas.c | 112 +++++++++ arch/x86/kernel/cpu/scattered.c | 2 + arch/x86/kernel/process.c | 16 +- arch/x86/kvm/cpuid.c | 15 +- arch/x86/kvm/reverse_cpuid.h | 7 + arch/x86/kvm/svm/vmenter.S | 6 + arch/x86/kvm/vmx/vmx.c | 2 +- drivers/acpi/acpica/dsmethod.c | 7 + drivers/ata/libata-acpi.c | 24 +- drivers/ata/pata_cs5536.c | 2 +- drivers/ata/pata_via.c | 6 +- drivers/base/cpu.c | 3 + drivers/block/aoe/aoe.h | 1 + drivers/block/aoe/aoecmd.c | 8 +- drivers/block/aoe/aoedev.c | 5 +- drivers/dma-buf/dma-resv.c | 12 +- drivers/firmware/arm_ffa/driver.c | 71 +++--- drivers/firmware/samsung/exynos-acpm.c | 27 +-- drivers/gpu/drm/bridge/aux-hpd-bridge.c | 3 +- drivers/gpu/drm/bridge/panel.c | 5 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 12 + drivers/gpu/drm/i915/gt/intel_gsc.c | 2 +- drivers/gpu/drm/i915/gt/intel_ring_submission.c | 3 +- drivers/gpu/drm/i915/selftests/i915_request.c | 20 +- drivers/gpu/drm/i915/selftests/mock_request.c | 2 +- drivers/gpu/drm/msm/msm_gem_submit.c | 17 +- drivers/gpu/drm/v3d/v3d_drv.h | 8 + drivers/gpu/drm/v3d/v3d_gem.c | 2 + drivers/gpu/drm/v3d/v3d_irq.c | 37 ++- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- drivers/gpu/drm/xe/Kconfig | 3 +- drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 + drivers/gpu/drm/xe/xe_device.c | 72 +++--- drivers/gpu/drm/xe/xe_guc_ads.c | 5 + drivers/gpu/drm/xe/xe_guc_pc.c | 249 ++++++++++++++++----- drivers/gpu/drm/xe/xe_guc_pc.h | 2 + drivers/gpu/drm/xe/xe_guc_pc_types.h | 2 + drivers/gpu/drm/xe/xe_migrate.c | 18 +- drivers/gpu/drm/xe/xe_wa_oob.rules | 6 + drivers/hid/hid-appletb-kbd.c | 14 +- drivers/i2c/busses/i2c-designware-master.c | 1 + drivers/infiniband/hw/mlx5/counters.c | 4 +- drivers/infiniband/hw/mlx5/devx.c | 10 +- drivers/infiniband/hw/mlx5/main.c | 33 +++ drivers/infiniband/hw/mlx5/mr.c | 61 +++-- drivers/infiniband/hw/mlx5/odp.c | 8 +- drivers/input/joystick/xpad.c | 2 + drivers/input/misc/cs40l50-vibra.c | 2 + drivers/input/misc/iqs7222.c | 7 +- drivers/iommu/intel/cache.c | 5 +- drivers/iommu/intel/iommu.c | 11 +- drivers/iommu/intel/iommu.h | 2 + drivers/iommu/rockchip-iommu.c | 3 +- drivers/mmc/core/quirks.h | 12 +- drivers/mmc/core/sd_uhs2.c | 4 +- drivers/mmc/host/mtk-sd.c | 21 +- drivers/mmc/host/sdhci-uhs2.c | 20 +- drivers/mmc/host/sdhci.c | 9 +- drivers/mmc/host/sdhci.h | 16 ++ drivers/mtd/nand/spi/core.c | 1 + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 13 ++ drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 24 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 4 +- drivers/net/ethernet/atheros/atlx/atl1.c | 79 +++++-- drivers/net/ethernet/cisco/enic/enic_main.c | 4 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 26 ++- drivers/net/ethernet/intel/idpf/idpf_controlq.c | 23 +- .../net/ethernet/intel/idpf/idpf_controlq_api.h | 2 +- drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 4 +- drivers/net/ethernet/intel/idpf/idpf_lib.c | 12 +- drivers/net/ethernet/intel/igc/igc_main.c | 10 + drivers/net/ethernet/sun/niu.c | 31 ++- drivers/net/ethernet/sun/niu.h | 4 + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 1 + drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 2 +- drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 22 +- drivers/net/usb/lan78xx.c | 2 - drivers/net/virtio_net.c | 60 ++++- drivers/net/wireless/ath/ath6kl/bmi.c | 4 +- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/multipath.c | 3 +- drivers/nvme/host/pci.c | 6 +- drivers/nvme/target/nvmet.h | 2 + drivers/platform/mellanox/mlxbf-pmc.c | 2 +- drivers/platform/mellanox/mlxbf-tmfifo.c | 3 +- drivers/platform/mellanox/mlxreg-lc.c | 2 +- drivers/platform/mellanox/nvsw-sn2201.c | 2 +- drivers/platform/x86/amd/hsmp/hsmp.c | 6 +- drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 + .../x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 5 + .../x86/dell/dell-wmi-sysman/enum-attributes.c | 5 +- .../x86/dell/dell-wmi-sysman/int-attributes.c | 5 +- .../x86/dell/dell-wmi-sysman/passobj-attributes.c | 5 +- .../x86/dell/dell-wmi-sysman/string-attributes.c | 5 +- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 12 +- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 4 +- drivers/platform/x86/think-lmi.c | 94 +++----- drivers/platform/x86/wmi.c | 16 +- drivers/powercap/intel_rapl_common.c | 18 +- drivers/regulator/fan53555.c | 14 ++ drivers/regulator/gpio-regulator.c | 8 +- drivers/rtc/rtc-cmos.c | 10 +- drivers/rtc/rtc-pcf2127.c | 7 +- drivers/scsi/hosts.c | 18 +- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/scsi/qla4xxx/ql4_os.c | 2 + drivers/scsi/sd.c | 2 +- drivers/spi/spi-fsl-dspi.c | 11 +- drivers/spi/spi-qpic-snand.c | 16 ++ drivers/target/target_core_pr.c | 4 +- drivers/tee/optee/ffa_abi.c | 41 +++- drivers/tee/optee/optee_private.h | 2 + drivers/ufs/core/ufs-sysfs.c | 4 +- drivers/usb/cdns3/cdnsp-debug.h | 5 +- drivers/usb/cdns3/cdnsp-ep0.c | 18 +- drivers/usb/cdns3/cdnsp-gadget.h | 6 + drivers/usb/cdns3/cdnsp-ring.c | 7 +- drivers/usb/chipidea/udc.c | 7 + drivers/usb/core/hub.c | 3 + drivers/usb/core/quirks.c | 3 +- drivers/usb/core/usb-acpi.c | 4 +- drivers/usb/dwc3/core.c | 9 +- drivers/usb/dwc3/gadget.c | 24 +- drivers/usb/host/xhci-dbgcap.c | 4 + drivers/usb/host/xhci-dbgtty.c | 1 + drivers/usb/host/xhci-mem.c | 4 + drivers/usb/host/xhci-pci.c | 25 +++ drivers/usb/host/xhci-plat.c | 3 +- drivers/usb/host/xhci-ring.c | 5 +- drivers/usb/host/xhci.c | 31 +-- drivers/usb/host/xhci.h | 3 +- drivers/usb/typec/altmodes/displayport.c | 5 +- fs/anon_inodes.c | 23 +- fs/btrfs/block-group.h | 2 + fs/btrfs/free-space-tree.c | 40 ++++ fs/btrfs/inode.c | 36 +-- fs/btrfs/ioctl.c | 4 +- fs/btrfs/tree-log.c | 137 ++++++------ fs/exec.c | 9 +- fs/libfs.c | 8 +- fs/namei.c | 2 +- fs/netfs/buffered_write.c | 2 + fs/netfs/direct_write.c | 8 +- fs/netfs/misc.c | 26 ++- fs/netfs/write_retry.c | 2 +- fs/nfs/flexfilelayout/flexfilelayout.c | 120 +++++++--- fs/nfs/inode.c | 17 +- fs/nfs/pnfs.c | 4 +- fs/smb/client/cifsglob.h | 2 + fs/smb/client/cifsproto.h | 1 + fs/smb/client/cifssmb.c | 2 + fs/smb/client/connect.c | 15 +- fs/smb/client/fs_context.c | 17 +- fs/smb/client/misc.c | 6 + fs/smb/client/readdir.c | 2 +- fs/smb/client/reparse.c | 22 +- fs/smb/client/smb2pdu.c | 11 +- fs/xfs/xfs_rtalloc.c | 2 + include/linux/arm_ffa.h | 1 + include/linux/cpu.h | 1 + include/linux/export.h | 12 +- include/linux/fs.h | 2 + include/linux/libata.h | 7 +- include/linux/usb.h | 2 + include/linux/usb/typec_dp.h | 1 + include/trace/events/netfs.h | 1 + kernel/irq/irq_sim.c | 2 +- kernel/rcu/tree.c | 4 + lib/test_objagg.c | 4 +- mm/secretmem.c | 9 +- mm/vmalloc.c | 63 +++--- net/bluetooth/hci_event.c | 36 --- net/bluetooth/hci_sync.c | 227 +++++++++++-------- net/bluetooth/mgmt.c | 25 ++- net/ipv4/ip_input.c | 7 +- net/mac80211/rx.c | 4 + net/rose/rose_route.c | 15 +- net/sched/sch_api.c | 19 +- net/vmw_vsock/vmci_transport.c | 4 +- sound/isa/sb/sb16_main.c | 7 + sound/soc/amd/yc/acp6x-mach.c | 14 ++ tools/testing/selftests/iommu/iommufd.c | 32 ++- tools/testing/selftests/iommu/iommufd_utils.h | 9 +- 212 files changed, 2312 insertions(+), 986 deletions(-)
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
120 tests: 120 pass, 0 failLinux version: 6.15.6-rc1-gb283c37b8f14
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000,
tegra194-p3509-0000+p3668-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Quoted 8 lines · On Tue, 08 Jul 2025 18:20:37 +0200 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
Boot-tested under QEMU for Rust x86_64, arm64 and riscv64; built-tested for loongarch64:
Thanks!
Cheers,
Miguel
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
Hey Greg,
on the Framework Desktop I'm getting a new regression / error message within dmesg on 6.15.6-rc1 which was not present in previous versions of the stable kernel series:
$ journalctl -b-1 --dmesg | grep "PPM init"
Jul 09 14:48:44 arch-external kernel: ucsi_acpi USBC000:00: error -ETIMEDOUT: PPM init failedMaybe I can free some time to debug this tomorrow, otherwise the Framework folks are in CC of this mail.
Cheers,
Chris
Greg Kroah-Hartman
maintainerQuoted 9 lines · Christian Heusel
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
Quoted 8 lines
Hey Greg,
on the Framework Desktop I'm getting a new regression / error message within dmesg on 6.15.6-rc1 which was not present in previous versions of the stable kernel series:
$ journalctl -b-1 --dmesg | grep "PPM init" Jul 09 14:48:44 arch-external kernel: ucsi_acpi USBC000:00: error -ETIMEDOUT: PPM init failed
Is this also on 6.16-rc4?
And maybe if my Framework Desktop would ever get shipped to me, I could have debugged this ahead of time :)
Anyway, how about a 'git bisect'?
thanks,
greg k-h
Hey Greg,
Quoted 3 lines · Christian Heusel
on the Framework Desktop I'm getting a new regression / error message within dmesg on 6.15.6-rc1 which was not present in previous versions of the stable kernel series:
I debugged with Christian a little bit, turns out that particular device ("arch-external") had a PD/UCSI firmware bug (which we have fixed since). Perhaps the new kernel just exposed some more of the broken firmware behavior. It does not reproduce with newer firmware. I think we can safely ignore it for now.
Quoted 1 line · Greg Kroah-Hartman
And maybe if my Framework Desktop would ever get shipped to me, I could
have debugged this ahead of time :)
Stay tuned ;)
Sorry for the false alarm,
Alexandru M. Stan (amstan)
Greg Kroah-Hartman
maintainerQuoted 7 lines · Alexandru Stan
Hey Greg,
Quoted 3 lines · Christian Heusel
on the Framework Desktop I'm getting a new regression / error message within dmesg on 6.15.6-rc1 which was not present in previous versions of the stable kernel series:
Quoted 5 lines
I debugged with Christian a little bit, turns out that particular device ("arch-external") had a PD/UCSI firmware bug (which we have fixed since). Perhaps the new kernel just exposed some more of the broken firmware behavior. It does not reproduce with newer firmware. I think we can safely ignore it for now.
Wonderful, thanks for the update and glad it's fixed.
greg k-h
Christian Heusel
Tested-byQuoted 15 lines · Christian Heusel
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
Hey Greg,
on the Framework Desktop I'm getting a new regression / error message within dmesg on 6.15.6-rc1 which was not present in previous versions of the stable kernel series:
Quoted 5 lines
$ journalctl -b-1 --dmesg | grep "PPM init" Jul 09 14:48:44 arch-external kernel: ucsi_acpi USBC000:00: error -ETIMEDOUT: PPM init failedMaybe I can free some time to debug this tomorrow, otherwise the Framework folks are in CC of this mail.
Since we have now concluded that the above is just a red herring:
Tested on a ThinkPad E14 Gen 3 with a AMD Ryzen 5 5500U CPU and a Framework Desktop.
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 6.15.6-rc1
* git: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git commit: b283c37b8f144465ae3c78397ae2e9414ca53288
* git describe: v6.15.5-179-gb283c37b8f14
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.15.y/build/v6.15.5-179-gb283c37b8f14
## Test Regressions (compared to v6.15.4-264-gf6977c36decb)
## Metric Regressions (compared to v6.15.4-264-gf6977c36decb)
## Test Fixes (compared to v6.15.4-264-gf6977c36decb)
## Metric Fixes (compared to v6.15.4-264-gf6977c36decb)
## Test result summary
total: 339648, pass: 311820, fail: 7773, skip: 20055, xfail: 0
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 139 total, 138 passed, 1 failed
* arm64: 57 total, 54 passed, 0 failed, 3 skipped
* i386: 18 total, 17 passed, 0 failed, 1 skipped
* mips: 34 total, 26 passed, 7 failed, 1 skipped
* parisc: 4 total, 4 passed, 0 failed
* powerpc: 40 total, 39 passed, 1 failed
* riscv: 25 total, 24 passed, 0 failed, 1 skipped
* s390: 22 total, 22 passed, 0 failed
* sh: 5 total, 5 passed, 0 failed
* sparc: 4 total, 3 passed, 1 failed
* x86_64: 49 total, 49 passed, 0 failed
## Test suites summary
* boot
* commands
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-efivarfs
* kselftest-exec
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-kcmp
* kselftest-kvm
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-mincore
* kselftest-mm
* kselftest-mqueue
* kselftest-net
* kselftest-net-mptcp
* kselftest-openat2
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-rust
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-tc-testing
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user_events
* kselftest-vDSO
* kselftest-x86
* kunit
* kvm-unit-tests
* lava
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-build-clang
* log-parser-build-gcc
* log-parser-test
* ltp-capability
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-hugetlb
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* modules
* perf
* rcutorture
* rt-tests-cyclicdeadline
* rt-tests-pi-stress
* rt-tests-pmqtest
* rt-tests-rt-migrate-test
* rt-tests-signaltest
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.6 release. There are 178 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 10 Jul 2025 16:22:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah