5.15.187-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 143/160 dpaa2-eth: Update dpni_get_single_step_cfg command
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Radu Bulie <[email protected]>
[ Upstream commit 9572594ecf027a2b1828e42c26fb55cbd3219708 ]
dpni_get_single_step_cfg is an MC firmware command used for retrieving the contents of SINGLE_STEP 1588 register available in a DPMAC.
This patch adds a new version of this command that returns as an extra argument the physical base address of the aforementioned register. The address will be used to directly modify the contents of the SINGLE_STEP register instead of invoking the MC command dpni_set_single_step_cgf. The former approach introduced huge delays on the TX datapath when one step PTP events were transmitted. This led to low throughput and high latencies observed in the PTP correction field.
Stable-dep-of: 2def09ead4ad ("dpaa2-eth: fix xdp_rxq_info leak")
--- drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 6 +++++- drivers/net/ethernet/freescale/dpaa2/dpni.c | 2 ++ drivers/net/ethernet/freescale/dpaa2/dpni.h | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h +5 -1
@@ -98,7 +98,7 @@#define DPNI_CMDID_GET_LINK_CFG DPNI_CMD(0x278)#define DPNI_CMDID_SET_SINGLE_STEP_CFG DPNI_CMD(0x279) -#define DPNI_CMDID_GET_SINGLE_STEP_CFG DPNI_CMD(0x27a) +#define DPNI_CMDID_GET_SINGLE_STEP_CFG DPNI_CMD_V2(0x27a)/* Macros for accessing command fields smaller than 1byte */ #define DPNI_MASK (field) \
@@ -658,12 +658,16 @@ struct dpni_cmd_single_step_cfg {__le16 flags;__le16 offset;__le32 peer_delay; +__le32 ptp_onestep_reg_base; +__le32 pad0; };struct dpni_rsp_single_step_cfg {__le16 flags;__le16 offset;__le32 peer_delay; +__le32 ptp_onestep_reg_base; +__le32 pad0; };struct dpni_cmd_enable_vlan_filter {
drivers/net/ethernet/freescale/dpaa2/dpni.c +2 -0
@@ -2136,6 +2136,8 @@ int dpni_get_single_step_cfg(struct fsl_mc_io *mc_io, ptp_cfg->ch_update =dpni_get_field (le16_to_cpu (rsp_params->flags),PTP_CH_UPDATE ) ?1 :0 ; ptp_cfg->peer_delay =le32_to_cpu (rsp_params->peer_delay); + ptp_cfg->ptp_onestep_reg_base = +le32_to_cpu (rsp_params->ptp_onestep_reg_base);return err; }
drivers/net/ethernet/freescale/dpaa2/dpni.h +6 -0
@@ -1074,12 +1074,18 @@ int dpni_set_tx_shaping(struct fsl_mc_io *mc_io,* @peer_delay: For peer-to-peer transparent clocks add this value to the * correction field in addition to the transient time update. * The value expresses nanoseconds. +* @ptp_onestep_reg_base: 1588 SINGLE_STEP register base address. This address +* is used to update directly the register contents. +* User has to create an address mapping for it. +* +* */ struct dpni_single_step_cfg {u8 en;u8 ch_update;u16 offset;u32 peer_delay; +u32 ptp_onestep_reg_base; }; int dpni_set_single_step_cfg(struct fsl_mc_io *mc_io,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 144/160 dpaa2-eth: Update SINGLE_STEP register access
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Radu Bulie <[email protected]>
[ Upstream commit c4680c978567328a696fd2400bbf58a36cff95d1 ]
DPAA2 MAC supports 1588 one step timestamping.
If this option is enabled then for each transmitted PTP event packet, the 1588 SINGLE_STEP register is accessed to modify the following fields:
-offset of the correction field inside the PTP packet -UDP checksum update bit, in case the PTP event packet has
UDP encapsulation
These values can change any time, because there may be multiple PTP clients connected, that receive various 1588 frame types:
- L2 only frame
- UDP / Ipv4
- UDP / Ipv6
- other
The current implementation uses dpni_set_single_step_cfg to update the SINLGE_STEP register.
Using an MC command on the Tx datapath for each transmitted 1588 message introduces high delays, leading to low throughput and consequently to a small number of supported PTP clients. Besides these, the nanosecond correction field from the PTP packet will contain the high delay from the driver which together with the originTimestamp will render timestamp values that are unacceptable in a GM clock implementation.
This patch updates the Tx datapath for 1588 messages when single step timestamp is enabled and provides direct access to SINGLE_STEP register, eliminating the overhead caused by the dpni_set_single_step_cfg MC command. MC version >= 10.32 implements this functionality. If the MC version does not have support for returning the single step register base address, the driver will use dpni_set_single_step_cfg command for updates operations.
All the delay introduced by dpni_set_single_step_cfg function will be eliminated (if MC version has support for returning the base address of the single step register), improving the egress driver performance for PTP packets when single step timestamping is enabled.
Before these changes the maximum throughput for 1588 messages with single step hardware timestamp enabled was around 2000pps. After the updates the throughput increased up to 32.82 Mbps / 46631.02 pps.
Stable-dep-of: 2def09ead4ad ("dpaa2-eth: fix xdp_rxq_info leak")
--- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 89 +++++++++++++++++-- .../net/ethernet/freescale/dpaa2/dpaa2-eth.h | 14 ++- 2 files changed, 93 insertions(+), 10 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +81 -8
@@ -34,6 +34,75 @@ MODULE_DESCRIPTION("Freescale DPAA2 Ethernet Driver");struct ptp_qoriq *dpaa2_ptp;EXPORT_SYMBOL (dpaa2_ptp); +static void dpaa2_eth_detect_features (struct dpaa2_eth_priv *priv) +{ + priv->features =0 ; + +if (dpaa2_eth_cmp_dpni_ver (priv,DPNI_PTP_ONESTEP_VER_MAJOR , +DPNI_PTP_ONESTEP_VER_MINOR ) >=0 ) + priv->features |=DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT ; +} + +static void dpaa2_update_ptp_onestep_indirect (struct dpaa2_eth_priv *priv, +u32 offset,u8 udp) +{ +struct dpni_single_step_cfg cfg; + + cfg.en =1 ; + cfg.ch_update = udp; + cfg.offset = offset; + cfg.peer_delay =0 ; + +if (dpni_set_single_step_cfg (priv->mc_io,0 , priv->mc_token, &cfg)) +WARN_ONCE (1 ,"Failed to set single step register" ); +} + +static void dpaa2_update_ptp_onestep_direct (struct dpaa2_eth_priv *priv, +u32 offset,u8 udp) +{ +u32 val =0 ; + + val =DPAA2_PTP_SINGLE_STEP_ENABLE | +DPAA2_PTP_SINGLE_CORRECTION_OFF (offset); + +if (udp) + val |=DPAA2_PTP_SINGLE_STEP_CH ; + +if (priv->onestep_reg_base) +writel (val, priv->onestep_reg_base); +} + +static void dpaa2_ptp_onestep_reg_update_method (struct dpaa2_eth_priv *priv) +{ +struct device *dev = priv->net_dev->dev.parent; +struct dpni_single_step_cfg ptp_cfg; + + priv->dpaa2_set_onestep_params_cb = dpaa2_update_ptp_onestep_indirect; + +if (!(priv->features &DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT )) +return ; + +if (dpni_get_single_step_cfg (priv->mc_io,0 , + priv->mc_token, &ptp_cfg)) { +dev_err (dev,"dpni_get_single_step_cfg cannot retrieve onestep reg, falling back to indirect update\n" ); +return ; + } + +if (!ptp_cfg.ptp_onestep_reg_base) { +dev_err (dev,"1588 onestep reg not available, falling back to indirect update\n" ); +return ; + } + + priv->onestep_reg_base =ioremap (ptp_cfg.ptp_onestep_reg_base, +sizeof (u32)); +if (!priv->onestep_reg_base) { +dev_err (dev,"1588 onestep reg cannot be mapped, falling back to indirect update\n" ); +return ; + } + + priv->dpaa2_set_onestep_params_cb = dpaa2_update_ptp_onestep_direct; +} +static void *dpaa2_iova_to_virt (struct iommu_domain *domain,dma_addr_t iova_addr) {
@@ -693,7 +762,6 @@ static void dpaa2_eth_enable_tx_tstamp(struct dpaa2_eth_priv *priv, struct sk_buff *skb) {struct ptp_tstamp origin_timestamp; -struct dpni_single_step_cfg cfg;u8 msgtype, twostep, udp;struct dpaa2_faead *faead;struct dpaa2_fas *fas;
@@ -747,14 +815,12 @@ static void dpaa2_eth_enable_tx_tstamp(struct dpaa2_eth_priv *priv,htonl (origin_timestamp.sec_lsb); *(__be32 *)(data + offset2 +6 ) =htonl (origin_timestamp.nsec); - cfg.en =1 ; - cfg.ch_update = udp; - cfg.offset = offset1; - cfg.peer_delay =0 ; +if (priv->ptp_correction_off == offset1) +return ; + + priv->dpaa2_set_onestep_params_cb (priv, offset1, udp); + priv->ptp_correction_off = offset1; -if (dpni_set_single_step_cfg (priv->mc_io,0 , priv->mc_token, - &cfg)) -WARN_ONCE (1 ,"Failed to set single step register" ); } }
@@ -2199,6 +2265,9 @@ static int dpaa2_eth_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) config.rx_filter =HWTSTAMP_FILTER_ALL ; } +if (priv->tx_tstamp_type ==HWTSTAMP_TX_ONESTEP_SYNC ) +dpaa2_ptp_onestep_reg_update_method (priv); +return copy_to_user (rq->ifr_data, &config,sizeof (config)) ? -EFAULT :0 ; }
@@ -4096,6 +4165,8 @@ static int dpaa2_eth_netdev_init(struct net_device *net_dev)return err; } +dpaa2_eth_detect_features (priv); +/* Capabilities listing */ supported |=IFF_LIVE_ADDR_CHANGE ;
@@ -4542,6 +4613,8 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)dpaa2_eth_free_dpbp (priv);dpaa2_eth_free_dpio (priv);dpaa2_eth_free_dpni (priv); +if (priv->onestep_reg_base) +iounmap (priv->onestep_reg_base);fsl_mc_portal_free (priv->mc_io);
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +12 -2
@@ -506,12 +506,15 @@ struct dpaa2_eth_priv {u8 num_channels;struct dpaa2_eth_channel *channel[DPAA2_ETH_MAX_DPCONS ];struct dpaa2_eth_sgt_cache __percpu *sgt_cache; - +unsigned long features;struct dpni_attr dpni_attrs;u16 dpni_ver_major;u16 dpni_ver_minor;u16 tx_data_offset; - +void __iomem *onestep_reg_base; +u8 ptp_correction_off; +void (*dpaa2_set_onestep_params_cb)(struct dpaa2_eth_priv *priv, +u32 offset,u8 udp);struct fsl_mc_device *dpbp_dev;u16 rx_buf_size;u16 bpid;
@@ -651,6 +654,13 @@ enum dpaa2_eth_rx_dist {#define DPAA2_ETH_DIST_L4DST BIT(8)#define DPAA2_ETH_DIST_ALL (~0ULL) +#define DPNI_PTP_ONESTEP_VER_MAJOR 8 +#define DPNI_PTP_ONESTEP_VER_MINOR 2 +#define DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT BIT(0) +#define DPAA2_PTP_SINGLE_STEP_ENABLE BIT(31) +#define DPAA2_PTP_SINGLE_STEP_CH BIT(7) +#define DPAA2_PTP_SINGLE_CORRECTION_OFF (v) ((v) << 8) +#define DPNI_PAUSE_VER_MAJOR 7#define DPNI_PAUSE_VER_MINOR 13#define dpaa2_eth_has_pause_support (priv) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 145/160 net: dpaa2-eth: rearrange variable in dpaa2_eth_get_ethtool_stats
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ioana Ciornei <[email protected]>
[ Upstream commit 3313206827678f6f036eca601a51f6c4524b559a ]
Rearrange the variables in the dpaa2_eth_get_ethtool_stats() function so that we adhere to the reverse Christmas tree rule.
Also, in the next patch we are adding more variables and I didn't know where to place them with the current ordering.
Stable-dep-of: 2def09ead4ad ("dpaa2-eth: fix xdp_rxq_info leak")
--- .../ethernet/freescale/dpaa2/dpaa2-ethtool.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c +8 -10
@@ -225,17 +225,8 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,struct ethtool_stats *stats, u64 *data) { - int i = 0; -int j, k, err; -int num_cnt; -union dpni_statistics dpni_stats; -u32 fcnt, bcnt; -u32 fcnt_rx_total =0 , fcnt_tx_total =0 ; -u32 bcnt_rx_total =0 , bcnt_tx_total =0 ; -u32 buf_cnt; struct dpaa2_eth_priv *priv = netdev_priv(net_dev); -struct dpaa2_eth_drv_stats *extras; -struct dpaa2_eth_ch_stats *ch_stats; +union dpni_statistics dpni_stats; int dpni_stats_page_size[DPNI_STATISTICS_CNT] = { sizeof(dpni_stats.page_0), sizeof(dpni_stats.page_1),
@@ -245,6 +236,13 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,sizeof (dpni_stats.page_5), sizeof(dpni_stats.page_6), }; +u32 fcnt_rx_total =0 , fcnt_tx_total =0 ; +u32 bcnt_rx_total =0 , bcnt_tx_total =0 ; +struct dpaa2_eth_ch_stats *ch_stats; +struct dpaa2_eth_drv_stats *extras; +int j, k, err, num_cnt, i =0 ; +u32 fcnt, bcnt; +u32 buf_cnt;memset (data,0 ,sizeof (u64) * (DPAA2_ETH_NUM_STATS +DPAA2_ETH_NUM_EXTRA_STATS ));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 146/160 dpaa2-eth: fix xdp_rxq_info leak
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fushuai Wang <[email protected]>
[ Upstream commit 2def09ead4ad5907988b655d1e1454003aaf8297 ]
The driver registered xdp_rxq_info structures via xdp_rxq_info_reg() but failed to properly unregister them in error paths and during removal.
--- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +24 -2
@@ -3512,6 +3512,7 @@ static int dpaa2_eth_setup_rx_flow(struct dpaa2_eth_priv *priv, MEM_TYPE_PAGE_ORDER0, NULL);if (err) {dev_err (dev,"xdp_rxq_info_reg_mem_model failed\n" ); +xdp_rxq_info_unreg (&fq->channel->xdp_rxq);return err; }
@@ -4004,17 +4005,25 @@ static int dpaa2_eth_bind_dpni(struct dpaa2_eth_priv *priv)return -EINVAL ; }if (err) -return err; + goto out; } err =dpni_get_qdid (priv->mc_io,0 , priv->mc_token,DPNI_QUEUE_TX , &priv->tx_qdid);if (err) {dev_err (dev,"dpni_get_qdid() failed\n" ); -return err; + goto out; }return 0 ; + +out: +while (i--) { +if (priv->fq[i].type ==DPAA2_RX_FQ && +xdp_rxq_info_is_reg (&priv->fq[i].channel->xdp_rxq)) +xdp_rxq_info_unreg (&priv->fq[i].channel->xdp_rxq); + } +return err; }/* Allocate rings for storing incoming frame descriptors */
@@ -4371,6 +4380,17 @@ static void dpaa2_eth_del_ch_napi(struct dpaa2_eth_priv *priv) } } +static void dpaa2_eth_free_rx_xdp_rxq (struct dpaa2_eth_priv *priv) +{ +int i; + +for (i =0 ; i < priv->num_fqs; i++) { +if (priv->fq[i].type ==DPAA2_RX_FQ && +xdp_rxq_info_is_reg (&priv->fq[i].channel->xdp_rxq)) +xdp_rxq_info_unreg (&priv->fq[i].channel->xdp_rxq); + } +} +static int dpaa2_eth_probe (struct fsl_mc_device *dpni_dev) {struct device *dev;
@@ -4559,6 +4579,7 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)free_percpu (priv->percpu_stats); err_alloc_percpu_stats:dpaa2_eth_del_ch_napi (priv); +dpaa2_eth_free_rx_xdp_rxq (priv); err_bind:dpaa2_eth_free_dpbp (priv); err_dpbp_setup:
@@ -4610,6 +4631,7 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)free_percpu (priv->percpu_extras);dpaa2_eth_del_ch_napi (priv); +dpaa2_eth_free_rx_xdp_rxq (priv);dpaa2_eth_free_dpbp (priv);dpaa2_eth_free_dpio (priv);dpaa2_eth_free_dpni (priv);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 147/160 platform/x86: think-lmi: Fix class device unregistration
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
[ Upstream commit 5ff1fbb3059730700b4823f43999fc1315984632 ]
Devices under the firmware_attributes_class do not have unique a dev_t. Therefore, device_unregister() should be used instead of device_destroy(), since the latter may match any device with a given dev_t.
--- drivers/platform/x86/think-lmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/think-lmi.c +2 -2
@@ -892,7 +892,7 @@ static int tlmi_sysfs_init(void) fail_create_attr:tlmi_release_attr (); fail_device_created: -device_destroy (fw_attr_class,MKDEV (0 ,0 )); +device_unregister (tlmi_priv.class_dev); fail_class_created:fw_attributes_class_put ();return ret;
@@ -1055,7 +1055,7 @@ static int tlmi_analyze(void)static void tlmi_remove (struct wmi_device *wdev) {tlmi_release_attr (); -device_destroy (fw_attr_class,MKDEV (0 ,0 )); +device_unregister (tlmi_priv.class_dev);fw_attributes_class_put (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 148/160 platform/x86: dell-wmi-sysman: Fix class device unregistration
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
[ Upstream commit 314e5ad4782d08858b3abc325c0487bd2abc23a1 ]
Devices under the firmware_attributes_class do not have unique a dev_t. Therefore, device_unregister() should be used instead of device_destroy(), since the latter may match any device with a given dev_t.
--- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +2 -2
@@ -605,7 +605,7 @@ static int __init sysman_init(void)release_attributes_data (); err_destroy_classdev: -device_destroy (fw_attr_class,MKDEV (0 ,0 )); +device_unregister (wmi_priv.class_dev); err_unregister_class:fw_attributes_class_put ();
@@ -622,7 +622,7 @@ static int __init sysman_init(void) static void __exit sysman_exit(void) {release_attributes_data (); -device_destroy (fw_attr_class,MKDEV (0 ,0 )); +device_unregister (wmi_priv.class_dev);fw_attributes_class_put ();exit_bios_attr_set_interface ();exit_bios_attr_pass_interface ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 149/160 xhci: dbctty: disable ECHO flag by default
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Łukasz Bartosik <[email protected]>
commit 2b857d69a5e116150639a0c6c39c86cc329939ee upstream.
When /dev/ttyDBC0 device is created then by default ECHO flag is set for the terminal device. However if data arrives from a peer before application using /dev/ttyDBC0 applies its set of terminal flags then the arriving data will be echoed which might not be desired behavior.
--- drivers/usb/host/xhci-dbgtty.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci-dbgtty.c +1 -0
@@ -537,6 +537,7 @@ static int dbc_tty_init(void) dbc_tty_driver->type =TTY_DRIVER_TYPE_SERIAL ; dbc_tty_driver->subtype =SERIAL_TYPE_NORMAL ; dbc_tty_driver->init_termios = tty_std_termios; + dbc_tty_driver->init_termios.c_lflag &= ~ECHO ; dbc_tty_driver->init_termios.c_cflag =B9600 |CS8 |CREAD |HUPCL |CLOCAL ; dbc_tty_driver->init_termios.c_ispeed =9600 ;
Greg Kroah-Hartman
maintainerPATCH 150/160 xhci: dbc: Flush queued requests before stopping dbc
In reply to Greg Kroah-Hartman5.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
@@ -639,6 +639,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 151/160 usb: cdnsp: do not disable slot for disabled slot
In reply to Greg Kroah-Hartman5.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 152/160 i2c/designware: Fix an initialization issue
In reply to Greg Kroah-Hartman5.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
@@ -298,6 +298,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);i2c_dw_disable_int (dev);
Greg Kroah-Hartman
maintainerPATCH 153/160 Logitech C-270 even more broken
In reply to Greg Kroah-Hartman5.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
@@ -224,7 +224,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 154/160 platform/x86: think-lmi: Create ksets consecutively
In reply to Greg Kroah-Hartman5.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
@@ -827,6 +827,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])
@@ -863,12 +871,6 @@ static int tlmi_sysfs_init(void) goto fail_create_attr; }/* 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 155/160 usb: typec: displayport: Fix potential deadlock
In reply to Greg Kroah-Hartman5.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
@@ -299,8 +299,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 156/160 x86/bugs: Rename MDS machinery to something more generic
In reply to Greg Kroah-Hartman5.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 - 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 7 files changed, 32 insertions(+), 32 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
arch/x86/entry/entry.S +4 -4
@@ -31,20 +31,20 @@ EXPORT_SYMBOL_GPL(entry_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_EMPTY 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
@@ -47,13 +47,13 @@ static __always_inline void native_irq_e static inline __cpuidle void native_safe_halt(void) { -mds_idle_clear_cpu_buffers (); +x86_idle_clear_cpu_buffers (); asmvolatile ("sti; hlt" : : :"memory" ); } static inline __cpuidle 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 inline void __monitorx(const voidstatic 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;"
@@ -88,7 +88,8 @@ static inline void __mwaitx(unsigned lonstatic 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
@@ -202,23 +202,23 @@ .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 ALTERNATIVE "jmp .Lskip_verw_\@", "", X86_FEATURE_CLEAR_CPU_BUF#ifdef CONFIG_X86_64 - verw mds_verw_sel(%rip) + verw x86_verw_sel(%rip)#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). */ - verw %cs:mds_verw_sel + verw %cs:x86_verw_sel #endif .Lskip_verw_\@: .endm
@@ -429,24 +429,24 @@ DECLARE_STATIC_KEY_FALSE(switch_to_cond_DECLARE_STATIC_KEY_FALSE (switch_mm_cond_ibpb);DECLARE_STATIC_KEY_FALSE (switch_mm_always_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;
@@ -463,14 +463,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 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 /* __ASSEMBLY__ */
arch/x86/kernel/cpu/bugs.c +6 -6
@@ -121,9 +121,9 @@ DEFINE_STATIC_KEY_FALSE(switch_mm_cond_i/* Control unconditional IBPB in switch_mm() */ DEFINE_STATIC_KEY_FALSE (switch_mm_always_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,
@@ -451,7 +451,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.
@@ -2028,10 +2028,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
@@ -6771,7 +6771,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 157/160 x86/bugs: Add a Transient Scheduler Attacks mitigation
In reply to Greg Kroah-Hartman5.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/cpu.h | 13 ++ arch/x86/include/asm/cpufeatures.h | 6 + arch/x86/include/asm/mwait.h | 2 arch/x86/include/asm/nospec-branch.h | 12 +- arch/x86/kernel/cpu/amd.c | 58 ++++++++++ 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 | 2 include/linux/cpu.h | 1 14 files changed, 255 insertions(+), 5 deletions(-)
Documentation/ABI/testing/sysfs-devices-system-cpu +1 -0
@@ -524,6 +524,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
@@ -5990,6 +5990,19 @@ If not specified, "default" is used. In this case, the RNG's choice is left to each individual trust source. + 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
@@ -2528,6 +2528,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/cpu.h +13 -0
@@ -72,4 +72,17 @@ void init_ia32_feat_ctl(struct cpuinfo_x#else static inline void init_ia32_feat_ctl (struct cpuinfo_x86 *c) {}#endif + +union zen_patch_rev { +struct { +__u32 rev :8 , + stepping :4 , + model :4 , + __reserved :4 , + ext_model :4 , + ext_fam :8 ; + }; +__u32 ucode_rev; +}; +#endif /* _ASM_X86_CPU_H */
arch/x86/include/asm/cpufeatures.h +6 -0
@@ -419,6 +419,7 @@#define X86_FEATURE_SME_COHERENT (19*32+10)/* "" AMD hardware-enforced cache coherency */ #define X86_FEATURE_AUTOIBRS (20*32+ 8)/* "" Automatic IBRS */ +#define X86_FEATURE_VERW_CLEAR (20*32+ 10)/* "" The memory form of VERW mitigates TSA */ #define X86_FEATURE_SBPB (20*32+27)/* "" Selective Branch Prediction Barrier */ #define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */ #define X86_FEATURE_SRSO_NO (20*32+29)/* "" CPU is not affected by SRSO */
@@ -435,6 +436,10 @@#define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4)/* "" Clear branch history at vmexit using SW loop */ #define X86_FEATURE_INDIRECT_THUNK_ITS (21*32 + 5)/* "" 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) */
@@ -486,4 +491,5 @@#define X86_BUG_IBPB_NO_RET X86_BUG(1*32 + 4)/* "ibpb_no_ret" IBPB omits return target predictions */ #define X86_BUG_ITS X86_BUG(1*32 + 5)/* CPU is affected by Indirect Target Selection */ #define X86_BUG_ITS_NATIVE_ONLY X86_BUG(1*32 + 6)/* 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 inline void __mwait(unsigned longstatic 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 +9 -3
@@ -208,8 +208,8 @@* CFLAGS.ZF. * Note: Only the memory operand variant of VERW clears the CPU buffers. */ -.macro CLEAR_CPU_BUFFERS - ALTERNATIVE "jmp .Lskip_verw_\@", "", X86_FEATURE_CLEAR_CPU_BUF +.macro __CLEAR_CPU_BUFFERS feature + ALTERNATIVE "jmp .Lskip_verw_\@", "", \feature#ifdef CONFIG_X86_64 verw x86_verw_sel(%rip)#else
@@ -223,6 +223,12 @@ .Lskip_verw_\@: .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
@@ -464,7 +470,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 +58 -0
70 lines not on this page · raw message
arch/x86/kernel/cpu/bugs.c +121 -0
161 lines not on this page · raw message
arch/x86/kernel/cpu/common.c +13 -1
@@ -1146,6 +1146,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_STEPPINGS (IVYBRIDGE ,X86_STEPPING_ANY ,SRBDS ),
@@ -1193,7 +1195,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), {} };
@@ -1398,6 +1400,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
@@ -44,6 +44,8 @@ static const struct cpuid_bit cpuid_bits { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 }, { X86_FEATURE_MBA, CPUID_EBX, 6, 0x80000008, 0 }, + { X86_FEATURE_TSA_SQ_NO, CPUID_ECX, 1, 0x80000021, 0 }, + { X86_FEATURE_TSA_L1_NO, CPUID_ECX, 2, 0x80000021, 0 }, { 0, 0, 0, 0, 0 } };
arch/x86/kvm/svm/vmenter.S +6 -0
@@ -77,6 +77,9 @@ SYM_FUNC_START(__svm_vcpu_run) /* "POP" @vmcb to RAX. */ pop %_ASM_AX + /* Clobbers EFLAGS.ZF */ + VM_CLEAR_CPU_BUFFERS + /* Enter guest mode */ sti
@@ -190,6 +193,9 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) /* Move @vmcb to RAX. */ mov %_ASM_ARG1, %_ASM_AX + /* Clobbers EFLAGS.ZF */ + VM_CLEAR_CPU_BUFFERS + /* Enter guest mode */ sti
drivers/base/cpu.c +2 -0
@@ -616,6 +616,7 @@ static DEVICE_ATTR(gather_data_sampling, static DEVICE_ATTR(spec_rstack_overflow, 0444, cpu_show_spec_rstack_overflow, NULL); static DEVICE_ATTR(reg_file_data_sampling, 0444, cpu_show_reg_file_data_sampling, 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,
@@ -633,6 +634,7 @@ static struct attribute *cpu_root_vulner &dev_attr_spec_rstack_overflow.attr, &dev_attr_reg_file_data_sampling.attr, &dev_attr_indirect_target_selection.attr, + &dev_attr_tsa.attr, NULL };
include/linux/cpu.h +1 -0
@@ -78,6 +78,7 @@ extern ssize_t cpu_show_reg_file_data_sa 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 158/160 KVM: x86: add support for CPUID leaf 0x80000021
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Bonzini <[email protected]>
Commit 58b3d12c0a860cda34ed9d2378078ea5134e6812 upstream.
CPUID leaf 0x80000021 defines some features (or lack of bugs) of AMD processors. Expose the ones that make sense via KVM_GET_SUPPORTED_CPUID.
--- arch/x86/kvm/cpuid.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
arch/x86/kvm/cpuid.c +18 -1
@@ -915,7 +915,7 @@ static inline int __do_cpuid_func(struct entry->edx =0 ;break ;case 0x80000000 : - entry->eax =min (entry->eax,0x8000001f ); + entry->eax =min (entry->eax,0x80000021 );break ;case 0x80000001 : entry->ebx &= ~GENMASK (27 ,16 );
@@ -995,6 +995,23 @@ static inline int __do_cpuid_func(struct entry->ebx &= ~GENMASK (11 ,6 ); }break ; +case 0x80000020 : + entry->eax = entry->ebx = entry->ecx = entry->edx =0 ; +break ; +case 0x80000021 : + entry->ebx = entry->ecx = entry->edx =0 ; +/* +* Pass down these bits: +* EAX 0 NNDBP, Processor ignores nested data breakpoints +* EAX 2 LAS, LFENCE always serializing +* EAX 6 NSCB, Null selector clear base +* +* Other defined bits are for MSRs that KVM does not expose: +* EAX 3 SPCL, SMM page configuration lock +* EAX 13 PCMSR, Prefetch control MSR +*/ + entry->eax &=BIT (0 ) |BIT (2 ) |BIT (6 ); +break ;/*Add support for Centaur's CPUID instruction*/ case 0xC0000000 :/*Just support up to 0xC0000004 now*/
Greg Kroah-Hartman
maintainerPATCH 159/160 KVM: SVM: Advertise TSA CPUID bits to guests
In reply to Greg Kroah-Hartman5.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/kvm/cpuid.c | 6 ++++++ arch/x86/kvm/reverse_cpuid.h | 8 ++++++++ 2 files changed, 14 insertions(+)
arch/x86/kvm/cpuid.c +6 -0
@@ -553,6 +553,12 @@ void kvm_set_cpu_caps(void)if (cpu_feature_enabled (X86_FEATURE_SRSO_NO ))kvm_cpu_cap_set (X86_FEATURE_SRSO_NO ); +kvm_cpu_cap_mask (CPUID_8000_0021_EAX ,F (VERW_CLEAR )); + +kvm_cpu_cap_init_kvm_defined (CPUID_8000_0021_ECX , +F (TSA_SQ_NO ) |F (TSA_L1_NO ) + ); +/* * Hide RDTSCP and RDPID if either feature is reported as supported but * probing MSR_TSC_AUX failed. This is purely a sanity check and
arch/x86/kvm/reverse_cpuid.h +8 -0
@@ -14,6 +14,7 @@enum kvm_only_cpuid_leafs {CPUID_12_EAX =NCAPINTS ,CPUID_7_2_EDX , +CPUID_8000_0021_ECX ,NR_KVM_CPU_CAPS ,NKVMCAPINTS =NR_KVM_CPU_CAPS -NCAPINTS ,
@@ -45,6 +46,10 @@ enum kvm_only_cpuid_leafs {#define KVM_X86_FEATURE_BHI_CTRL KVM_X86_FEATURE(CPUID_7_2_EDX, 4)#define X86_FEATURE_MCDT_NO KVM_X86_FEATURE(CPUID_7_2_EDX, 5) +/* 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;
@@ -71,6 +76,7 @@ static const struct cpuid_reg reverse_cp [CPUID_8000_001F_EAX] = {0x8000001f, 0, CPUID_EAX}, [CPUID_8000_0021_EAX] = {0x80000021, 0, CPUID_EAX}, [CPUID_7_2_EDX] = { 7, 2, CPUID_EDX}, + [CPUID_8000_0021_ECX] = {0x80000021, 0, CPUID_ECX}, };/*
@@ -107,6 +113,8 @@ static __always_inline u32 __feature_traKVM_X86_TRANSLATE_FEATURE (SGX2 );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 160/160 x86/process: Move the buffer clearing before MONITOR
In reply to Greg Kroah-Hartman5.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 | 16 +++++++++++----- arch/x86/kernel/process.c | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-)
arch/x86/include/asm/mwait.h +11 -5
@@ -43,8 +43,6 @@ static inline void __monitorx(const voidstatic 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));
@@ -88,7 +86,6 @@ static inline void __mwaitx(unsigned lonstatic 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;"
@@ -107,6 +104,11 @@ static inline void __sti_mwait(unsigned*/ static 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 ()) {if (static_cpu_has_bug (X86_BUG_CLFLUSH_MONITOR )) {mb ();
@@ -115,9 +117,13 @@ static inline void mwait_idle_with_hints }__monitor ((void *)¤t_thread_info ()->flags,0 ,0 ); -if (!need_resched ()) -__mwait (eax, ecx); +if (need_resched ()) + goto out; + +__mwait (eax, ecx); } + +out:current_clr_polling (); }
arch/x86/kernel/process.c +12 -3
@@ -836,6 +836,11 @@ static int prefer_mwait_c1_over_halt(con*/ static __cpuidle void mwait_idle(void) { +if (need_resched ()) +return ; + +x86_idle_clear_cpu_buffers (); +if (!current_set_polling_and_test ()) {if (this_cpu_has (X86_BUG_CLFLUSH_MONITOR )) {mb ();/* quirk */
@@ -844,13 +849,17 @@ static __cpuidle void mwait_idle(void) }__monitor ((void *)¤t_thread_info ()->flags,0 ,0 ); -if (!need_resched ()) -__sti_mwait (0 ,0 ); -else +if (need_resched ()) {raw_local_irq_enable (); + goto out; + } + +__sti_mwait (0 ,0 ); }else {raw_local_irq_enable (); } + +out:__current_clr_polling (); }
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.187 release. There are 160 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/v5.x/stable-review/patch-5.15.187-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
The ARM 32-bit kernel fails to build with:
/local/users/fainelli/buildroot/output/arm/host/bin/arm-linux-ld: drivers/base/cpu.o: in function `.LANCHOR2':
cpu.c:(.data+0xbc): undefined reference to `cpu_show_tsa'
host-make[2]: *** [Makefile:1246: vmlinux] Error 1
This is caused by:
commit 5799df885785024821d09c334612c00992aa4c4b
Author: Borislav Petkov (AMD) <[email protected]> Date: Wed Sep 11 10:53:08 2024 +0200
x86/bugs: Add a Transient Scheduler Attacks mitigation
Commit d8010d4ba43e9f790925375a7de100604a5e2dba upstream.
Add the required features detection glue to bugs.c et all in order to support the TSA mitigation.
I don't see this in Linus' tree but it's not clear yet why that is not happening there.
Signature · 1 line
Florian
Quoted 1 line · Florian Fainelli
The ARM 32-bit kernel fails to build with:
Can you give .config pls?
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 5 lines · Borislav Petkov
Quoted 1 line · Florian Fainelli
The ARM 32-bit kernel fails to build with:
Can you give .config pls?
Sure, here it is:
https://gist.github.com/ffainelli/2319e6857247796f0a9bd99c5fe6e211
FWIW, I also have the same build failure on 6.1.
Signature · 1 line
Florian
Quoted 4 lines · Florian Fainelli
Quoted 3 lines · Borislav Petkov
Quoted 1 line · Florian Fainelli
The ARM 32-bit kernel fails to build with:
Quoted 8 lines
Quoted 2 lines
Can you give .config pls?
Sure, here it is:
https://gist.github.com/ffainelli/2319e6857247796f0a9bd99c5fe6e211
FWIW, I also have the same build failure on 6.1.
Right, it needs the __weak functions - this is solved differently on newer kernels. Lemme send updated patches.
---
drivers/base/cpu.c +5 -0
@@ -601,6 +601,11 @@ ssize_t __weak cpu_show_indirect_target_selection(struct device *dev,return sysfs_emit (buf,"Not affected\n" ); } +ssize_t __weak cpu_show_tsa (struct device *dev,struct device_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"Not affected\n" ); +} + static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL); static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL);
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteBorislav Petkov
Reviewed-by Pawan GuptaQuoted 2 lines · Borislav Petkov
Right, it needs the
__weakfunctions - this is solved differently on newer kernels. Lemme send updated patches.
Greg, here's an updated 5.15 patch:
From: "Borislav Petkov (AMD)" <[email protected]>
Date: Wed, 11 Sep 2024 10:53:08 +0200
Subject: [PATCH] x86/bugs: Add a Transient Scheduler Attacks mitigation
Commit d8010d4ba43e9f790925375a7de100604a5e2dba upstream.
Add the required features detection glue to bugs.c et all in order to support the TSA mitigation.
--- .../ABI/testing/sysfs-devices-system-cpu | 1 + .../admin-guide/kernel-parameters.txt | 13 ++ arch/x86/Kconfig | 9 ++ arch/x86/include/asm/cpu.h | 13 ++ arch/x86/include/asm/cpufeatures.h | 6 + arch/x86/include/asm/mwait.h | 2 +- arch/x86/include/asm/nospec-branch.h | 12 +- arch/x86/kernel/cpu/amd.c | 58 +++++++++ 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 | 7 + include/linux/cpu.h | 1 + 14 files changed, 260 insertions(+), 5 deletions(-)
Documentation/ABI/testing/sysfs-devices-system-cpu +1 -0
@@ -524,6 +524,7 @@ What: /sys/devices/system/cpu/vulnerabilities /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
@@ -5990,6 +5990,19 @@ If not specified, "default" is used. In this case, the RNG's choice is left to each individual trust source. + 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
@@ -2528,6 +2528,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/cpu.h +13 -0
@@ -72,4 +72,17 @@ void init_ia32_feat_ctl(struct cpuinfo_x86 *c);#else static inline void init_ia32_feat_ctl (struct cpuinfo_x86 *c) {}#endif + +union zen_patch_rev { +struct { +__u32 rev :8 , + stepping :4 , + model :4 , + __reserved :4 , + ext_model :4 , + ext_fam :8 ; + }; +__u32 ucode_rev; +}; +#endif /* _ASM_X86_CPU_H */
arch/x86/include/asm/cpufeatures.h +6 -0
@@ -419,6 +419,7 @@#define X86_FEATURE_SME_COHERENT (19*32+10)/* "" AMD hardware-enforced cache coherency */ #define X86_FEATURE_AUTOIBRS (20*32+ 8)/* "" Automatic IBRS */ +#define X86_FEATURE_VERW_CLEAR (20*32+ 10)/* "" The memory form of VERW mitigates TSA */ #define X86_FEATURE_SBPB (20*32+27)/* "" Selective Branch Prediction Barrier */ #define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */ #define X86_FEATURE_SRSO_NO (20*32+29)/* "" CPU is not affected by SRSO */
@@ -435,6 +436,10 @@#define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4)/* "" Clear branch history at vmexit using SW loop */ #define X86_FEATURE_INDIRECT_THUNK_ITS (21*32 + 5)/* "" 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) */
@@ -486,4 +491,5 @@#define X86_BUG_IBPB_NO_RET X86_BUG(1*32 + 4)/* "ibpb_no_ret" IBPB omits return target predictions */ #define X86_BUG_ITS X86_BUG(1*32 + 5)/* CPU is affected by Indirect Target Selection */ #define X86_BUG_ITS_NATIVE_ONLY X86_BUG(1*32 + 6)/* 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 inline void __mwait(unsigned long eax, unsigned long ecx)static 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 +9 -3
@@ -208,8 +208,8 @@* CFLAGS.ZF. * Note: Only the memory operand variant of VERW clears the CPU buffers. */ -.macro CLEAR_CPU_BUFFERS - ALTERNATIVE "jmp .Lskip_verw_\@", "", X86_FEATURE_CLEAR_CPU_BUF +.macro __CLEAR_CPU_BUFFERS feature + ALTERNATIVE "jmp .Lskip_verw_\@", "", \feature#ifdef CONFIG_X86_64 verw x86_verw_sel(%rip)#else
@@ -223,6 +223,12 @@ .Lskip_verw_\@: .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
@@ -464,7 +470,7 @@ static __always_inline void x86_clear_cpu_buffers(void)/** * 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 +58 -0
70 lines not on this page · raw message
arch/x86/kernel/cpu/bugs.c +121 -0
161 lines not on this page · raw message
arch/x86/kernel/cpu/common.c +13 -1
@@ -1146,6 +1146,8 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {#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_STEPPINGS (IVYBRIDGE ,X86_STEPPING_ANY ,SRBDS ),
@@ -1193,7 +1195,7 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {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), {} };
@@ -1398,6 +1400,16 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)setup_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
@@ -44,6 +44,8 @@ static const struct cpuid_bit cpuid_bits[] = { { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 }, { X86_FEATURE_MBA, CPUID_EBX, 6, 0x80000008, 0 }, + { X86_FEATURE_TSA_SQ_NO, CPUID_ECX, 1, 0x80000021, 0 }, + { X86_FEATURE_TSA_L1_NO, CPUID_ECX, 2, 0x80000021, 0 }, { 0, 0, 0, 0, 0 } };
arch/x86/kvm/svm/vmenter.S +6 -0
@@ -77,6 +77,9 @@ SYM_FUNC_START(__svm_vcpu_run) /* "POP" @vmcb to RAX. */ pop %_ASM_AX + /* Clobbers EFLAGS.ZF */ + VM_CLEAR_CPU_BUFFERS + /* Enter guest mode */ sti
@@ -190,6 +193,9 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) /* Move @vmcb to RAX. */ mov %_ASM_ARG1, %_ASM_AX + /* Clobbers EFLAGS.ZF */ + VM_CLEAR_CPU_BUFFERS + /* Enter guest mode */ sti
drivers/base/cpu.c +7 -0
@@ -601,6 +601,11 @@ ssize_t __weak cpu_show_indirect_target_selection(struct device *dev,return sysfs_emit (buf,"Not affected\n" ); } +ssize_t __weak cpu_show_tsa (struct device *dev,struct device_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"Not affected\n" ); +} + static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL); static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL);
@@ -616,6 +621,7 @@ static DEVICE_ATTR(gather_data_sampling, 0444, cpu_show_gds, NULL); static DEVICE_ATTR(spec_rstack_overflow, 0444, cpu_show_spec_rstack_overflow, NULL); static DEVICE_ATTR(reg_file_data_sampling, 0444, cpu_show_reg_file_data_sampling, 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,
@@ -633,6 +639,7 @@ static struct attribute *cpu_root_vulnerabilities_attrs[] = { &dev_attr_spec_rstack_overflow.attr, &dev_attr_reg_file_data_sampling.attr, &dev_attr_indirect_target_selection.attr, + &dev_attr_tsa.attr, NULL };
include/linux/cpu.h +1 -0
@@ -78,6 +78,7 @@ extern ssize_t cpu_show_reg_file_data_sampling(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,
Signature · 7 lines
2.43.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteGreg Kroah-Hartman
maintainerQuoted 5 lines · Borislav Petkov
Quoted 2 lines · Borislav Petkov
Right, it needs the
__weakfunctions - this is solved differently on newer kernels. Lemme send updated patches.Greg, here's an updated 5.15 patch:
Now updated, thanks.
greg k-h
Borislav Petkov
Reviewed-by Pawan GuptaQuoted 2 lines · Borislav Petkov
Right, it needs the
__weakfunctions - this is solved differently on newer kernels. Lemme send updated patches.
...and 6.1:
Thanks Florian!
---
From 69fdd5ec45b0adfe91432c2288302b124ffc7d6a Mon Sep 17 00:00:00 2001
From: "Borislav Petkov (AMD)" <[email protected]>
Date: Wed, 11 Sep 2024 10:53:08 +0200
Subject: [PATCH] x86/bugs: Add a Transient Scheduler Attacks mitigation
Commit d8010d4ba43e9f790925375a7de100604a5e2dba upstream.
Add the required features detection glue to bugs.c et all in order to support the TSA mitigation.
--- .../ABI/testing/sysfs-devices-system-cpu | 1 + .../admin-guide/kernel-parameters.txt | 13 ++ arch/x86/Kconfig | 9 ++ arch/x86/include/asm/cpu.h | 12 ++ arch/x86/include/asm/cpufeatures.h | 6 + arch/x86/include/asm/mwait.h | 2 +- arch/x86/include/asm/nospec-branch.h | 12 +- arch/x86/kernel/cpu/amd.c | 58 +++++++++ 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 | 7 + include/linux/cpu.h | 1 + 14 files changed, 259 insertions(+), 5 deletions(-)
Documentation/ABI/testing/sysfs-devices-system-cpu +1 -0
@@ -526,6 +526,7 @@ What: /sys/devices/system/cpu/vulnerabilities /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
@@ -6400,6 +6400,19 @@ If not specified, "default" is used. In this case, the RNG's choice is left to each individual trust source. + 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
@@ -2586,6 +2586,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/cpu.h +12 -0
@@ -98,4 +98,16 @@ extern u64 x86_read_arch_cap_msr(void);extern struct cpumask cpus_stop_mask; +union zen_patch_rev { +struct { +__u32 rev :8 , + stepping :4 , + model :4 , + __reserved :4 , + ext_model :4 , + ext_fam :8 ; + }; +__u32 ucode_rev; +}; +#endif /* _ASM_X86_CPU_H */
arch/x86/include/asm/cpufeatures.h +6 -0
@@ -430,6 +430,7 @@#define X86_FEATURE_SME_COHERENT (19*32+10)/* "" AMD hardware-enforced cache coherency */ #define X86_FEATURE_AUTOIBRS (20*32+ 8)/* "" Automatic IBRS */ +#define X86_FEATURE_VERW_CLEAR (20*32+ 10)/* "" The memory form of VERW mitigates TSA */ #define X86_FEATURE_SBPB (20*32+27)/* "" Selective Branch Prediction Barrier */ #define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */ #define X86_FEATURE_SRSO_NO (20*32+29)/* "" CPU is not affected by SRSO */
@@ -447,6 +448,10 @@#define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4)/* "" Clear branch history at vmexit using SW loop */ #define X86_FEATURE_INDIRECT_THUNK_ITS (21*32 + 5)/* "" 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) */
@@ -498,4 +503,5 @@#define X86_BUG_IBPB_NO_RET X86_BUG(1*32 + 4)/* "ibpb_no_ret" IBPB omits return target predictions */ #define X86_BUG_ITS X86_BUG(1*32 + 5)/* CPU is affected by Indirect Target Selection */ #define X86_BUG_ITS_NATIVE_ONLY X86_BUG(1*32 + 6)/* 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
@@ -80,7 +80,7 @@ static inline void __mwait(unsigned long eax, unsigned long ecx)static 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 +9 -3
@@ -208,8 +208,8 @@* CFLAGS.ZF. * Note: Only the memory operand variant of VERW clears the CPU buffers. */ -.macro CLEAR_CPU_BUFFERS - ALTERNATIVE "jmp .Lskip_verw_\@", "", X86_FEATURE_CLEAR_CPU_BUF +.macro __CLEAR_CPU_BUFFERS feature + ALTERNATIVE "jmp .Lskip_verw_\@", "", \feature#ifdef CONFIG_X86_64 verw x86_verw_sel(%rip)#else
@@ -223,6 +223,12 @@ .Lskip_verw_\@: .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
@@ -462,7 +468,7 @@ static __always_inline void x86_clear_cpu_buffers(void)/** * 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 +58 -0
70 lines not on this page · raw message
arch/x86/kernel/cpu/bugs.c +121 -0
161 lines not on this page · raw message
arch/x86/kernel/cpu/common.c +13 -1
@@ -1256,6 +1256,8 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {#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_STEPPINGS (IVYBRIDGE ,X86_STEPPING_ANY ,SRBDS ),
@@ -1303,7 +1305,7 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {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), {} };
@@ -1508,6 +1510,16 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)setup_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
@@ -45,6 +45,8 @@ static const struct cpuid_bit cpuid_bits[] = { { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 }, { X86_FEATURE_MBA, CPUID_EBX, 6, 0x80000008, 0 }, + { X86_FEATURE_TSA_SQ_NO, CPUID_ECX, 1, 0x80000021, 0 }, + { X86_FEATURE_TSA_L1_NO, CPUID_ECX, 2, 0x80000021, 0 }, { X86_FEATURE_PERFMON_V2, CPUID_EAX, 0, 0x80000022, 0 }, { X86_FEATURE_AMD_LBR_V2, CPUID_EAX, 1, 0x80000022, 0 }, { X86_FEATURE_AMD_LBR_PMC_FREEZE, CPUID_EAX, 2, 0x80000022, 0 },
arch/x86/kvm/svm/vmenter.S +6 -0
@@ -166,6 +166,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 */ sti
@@ -336,6 +339,9 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) mov SVM_current_vmcb(%_ASM_DI), %_ASM_AX mov KVM_VMCB_pa(%_ASM_AX), %_ASM_AX + /* Clobbers EFLAGS.ZF */ + VM_CLEAR_CPU_BUFFERS + /* Enter guest mode */ sti
drivers/base/cpu.c +7 -0
@@ -601,6 +601,11 @@ ssize_t __weak cpu_show_indirect_target_selection(struct device *dev,return sysfs_emit (buf,"Not affected\n" ); } +ssize_t __weak cpu_show_tsa (struct device *dev,struct device_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"Not affected\n" ); +} + static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL); static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL);
@@ -616,6 +621,7 @@ static DEVICE_ATTR(gather_data_sampling, 0444, cpu_show_gds, NULL); static DEVICE_ATTR(spec_rstack_overflow, 0444, cpu_show_spec_rstack_overflow, NULL); static DEVICE_ATTR(reg_file_data_sampling, 0444, cpu_show_reg_file_data_sampling, 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,
@@ -633,6 +639,7 @@ static struct attribute *cpu_root_vulnerabilities_attrs[] = { &dev_attr_spec_rstack_overflow.attr, &dev_attr_reg_file_data_sampling.attr, &dev_attr_indirect_target_selection.attr, + &dev_attr_tsa.attr, NULL };
include/linux/cpu.h +1 -0
@@ -78,6 +78,7 @@ extern ssize_t cpu_show_reg_file_data_sampling(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,
Signature · 7 lines
2.43.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteGreg Kroah-Hartman
maintainerQuoted 5 lines · Borislav Petkov
Quoted 2 lines · Borislav Petkov
Right, it needs the
__weakfunctions - this is solved differently on newer kernels. Lemme send updated patches....and 6.1:
Now applied, thanks!
I'll push out -rc2 versions of both of these now.
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
Quoted 5 lines · Borislav Petkov
Quoted 2 lines · Borislav Petkov
Right, it needs the
__weakfunctions - this is solved differently on newer kernels. Lemme send updated patches....and 6.1:
Now applied, thanks!
I'll push out -rc2 versions of both of these now.
Thank you both for the prompt reply!
Signature · 1 line
Florian
Greg Kroah-Hartman
maintainerQuoted 39 lines · Florian Fainelli
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.187 release. There are 160 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/v5.x/stable-review/patch-5.15.187-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
The ARM 32-bit kernel fails to build with:
/local/users/fainelli/buildroot/output/arm/host/bin/arm-linux-ld:
drivers/base/cpu.o: in function `.LANCHOR2':
cpu.c:(.data+0xbc): undefined reference to `cpu_show_tsa' host-make[2]: *** [Makefile:1246: vmlinux] Error 1This is caused by:
commit
5799df885785024821d09c334612c00992aa4c4bAuthor: Borislav Petkov (AMD) <[email protected]> Date: Wed Sep 11 10:53:08 2024 +0200x86/bugs: Add a Transient Scheduler Attacks mitigation
Commit
d8010d4ba43e9f790925375a7de100604a5e2dbaupstream.Add the required features detection glue to
bugs.cet all in order to support the TSA mitigation.
Quoted 8 lines
Co-developed-by Kim Phillips <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Borislav Petkov (AMD) <[email protected]>Reviewed-by Pawan Gupta <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>I don't see this in Linus' tree but it's not clear yet why that is not happening there.
I see it in Linus's tree, you might want to do a sync :)
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.187 release. There are 160 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/v5.x/stable-review/patch-5.15.187-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.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