Changes in 4.9.335 wifi: mac80211_hwsim: fix debugfs attribute ps with rc table support audit: fix undefined behavior in bit shift for AUDIT_BIT wifi: mac80211: Fix ack frame idr leak when mesh has no route MIPS: pic32: treat port as signed integer af_key: Fix send_acquire race with pfkey_register bus: sunxi-rsb: Support atomic transfers ARM: dts: at91: sam9g20ek: enable udc vbus gpio pinctrl nfc/nci: fix race with opening and closing net: pch_gbe: fix potential memleak in pch_gbe_tx_queue() 9p/fd: fix issue of list_del corruption in p9_fd_cancel() ARM: mxs: fix memory leak in mxs_machine_init() net/mlx4: Check retval of mlx4_bitmap_init net/qla3xxx: fix potential memleak in ql3xxx_send() xfrm: Fix ignored return value in xfrm6_init() NFC: nci: fix memory leak in nci_rx_data_packet() nfc: st-nci: fix incorrect validating logic in EVT_TRANSACTION nfc: st-nci: fix memory leaks in EVT_TRANSACTION net: thunderx: Fix the ACPI memory leak s390/crashdump: fix TOD programmable field size iio: light: apds9960: fix wrong register for gesture gain iio: core: Fix entry not deleted when iio_register_sw_trigger_type() fails kconfig: display recursive dependency resolution hint just once nios2: add FORCE for vmlinuz.gz nilfs2: fix nilfs_sufile_mark_dirty() not set segment usage as dirty serial: 8250: 8250_omap: Avoid RS485 RTS glitch on ->set_termios() xen/platform-pci: add missing free_irq() in error path platform/x86: asus-wmi: add missing pci_dev_put() in asus_wmi_set_xusb2pr() tcp: configurable source port perturb table size net: usb: qmi_wwan: add Telit 0x103a composition drm/amdgpu: always register an MMU notifier for userptr iio: health: afe4403: Fix oob read in afe4403_read_raw iio: health: afe4404: Fix oob read in afe4404_[read|write]_raw hwmon: (i5500_temp) fix missing pci_disable_device() hwmon: (ibmpex) Fix possible UAF when ibmpex_register_bmc() fails net/mlx5: Fix uninitialized variable bug in outlen_write() can: sja1000_isa: sja1000_isa_probe(): add missing free_sja1000dev() can: cc770: cc770_isa_probe(): add missing free_cc770dev() qlcnic: fix sleep-in-atomic-context bugs caused by msleep net: phy: fix null-ptr-deref while probe() failed net: net_netdev: Fix error handling in ntb_netdev_init_module() net/9p: Fix a potential socket leak in p9_socket_open net: hsr: Fix potential use-after-free packet: do not set TP_STATUS_CSUM_VALID on CHECKSUM_COMPLETE net: ethernet: renesas: ravb: Fix promiscuous mode after system resumed hwmon: (coretemp) Check for null before removing sysfs attrs hwmon: (coretemp) fix pci device refcount leak in nv1a_ram_new() btrfs: qgroup: fix sleep from invalid context bug in btrfs_qgroup_inherit() tools/vm/slabinfo-gnuplot: use "grep -E" instead of "egrep" nilfs2: fix NULL pointer dereference in nilfs_palloc_commit_free_entry() arm64: Fix panic() when Spectre-v2 causes Spectre-BHB to re-allocate KVM vectors arm64: errata: Fix KVM Spectre-v2 mitigation selection for Cortex-A57/A72 ASoC: ops: Fix bounds check for _sx controls pinctrl: single: Fix potential division by zero iommu/vt-d: Fix PCI device refcount leak in dmar_dev_scope_init() tcp/udp: Fix memory leak in ipv6_renew_options(). Revert "fbdev: fb_pm2fb: Avoid potential divide by zero error" x86/tsx: Add a feature bit for TSX control MSR support x86/pm: Add enumeration check before spec MSRs save/restore setup Bluetooth: L2CAP: Fix accepting connection request for invalid SPSM x86/ioremap: Fix page aligned size calculation in __ioremap_caller() proc: avoid integer type confusion in get_proc_long proc: proc_skip_spaces() shouldn't think it is working on C strings v4l2: don't fall back to follow_pfn() if pin_user_pages_fast() fails Linux 4.9.335 Change-Id: I5a99e366191f445d4de1039f5e82812b37787842 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
137 lines
3.4 KiB
C
137 lines
3.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Intel Transactional Synchronization Extensions (TSX) control.
|
|
*
|
|
* Copyright (C) 2019 Intel Corporation
|
|
*
|
|
* Author:
|
|
* Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
|
|
*/
|
|
|
|
#include <linux/cpufeature.h>
|
|
|
|
#include <asm/cmdline.h>
|
|
|
|
#include "cpu.h"
|
|
|
|
enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED;
|
|
|
|
void tsx_disable(void)
|
|
{
|
|
u64 tsx;
|
|
|
|
rdmsrl(MSR_IA32_TSX_CTRL, tsx);
|
|
|
|
/* Force all transactions to immediately abort */
|
|
tsx |= TSX_CTRL_RTM_DISABLE;
|
|
|
|
/*
|
|
* Ensure TSX support is not enumerated in CPUID.
|
|
* This is visible to userspace and will ensure they
|
|
* do not waste resources trying TSX transactions that
|
|
* will always abort.
|
|
*/
|
|
tsx |= TSX_CTRL_CPUID_CLEAR;
|
|
|
|
wrmsrl(MSR_IA32_TSX_CTRL, tsx);
|
|
}
|
|
|
|
void tsx_enable(void)
|
|
{
|
|
u64 tsx;
|
|
|
|
rdmsrl(MSR_IA32_TSX_CTRL, tsx);
|
|
|
|
/* Enable the RTM feature in the cpu */
|
|
tsx &= ~TSX_CTRL_RTM_DISABLE;
|
|
|
|
/*
|
|
* Ensure TSX support is enumerated in CPUID.
|
|
* This is visible to userspace and will ensure they
|
|
* can enumerate and use the TSX feature.
|
|
*/
|
|
tsx &= ~TSX_CTRL_CPUID_CLEAR;
|
|
|
|
wrmsrl(MSR_IA32_TSX_CTRL, tsx);
|
|
}
|
|
|
|
static enum tsx_ctrl_states x86_get_tsx_auto_mode(void)
|
|
{
|
|
if (boot_cpu_has_bug(X86_BUG_TAA))
|
|
return TSX_CTRL_DISABLE;
|
|
|
|
return TSX_CTRL_ENABLE;
|
|
}
|
|
|
|
void __init tsx_init(void)
|
|
{
|
|
char arg[5] = {};
|
|
int ret;
|
|
|
|
/*
|
|
* TSX is controlled via MSR_IA32_TSX_CTRL. However, support for this
|
|
* MSR is enumerated by ARCH_CAP_TSX_MSR bit in MSR_IA32_ARCH_CAPABILITIES.
|
|
*
|
|
* TSX control (aka MSR_IA32_TSX_CTRL) is only available after a
|
|
* microcode update on CPUs that have their MSR_IA32_ARCH_CAPABILITIES
|
|
* bit MDS_NO=1. CPUs with MDS_NO=0 are not planned to get
|
|
* MSR_IA32_TSX_CTRL support even after a microcode update. Thus,
|
|
* tsx= cmdline requests will do nothing on CPUs without
|
|
* MSR_IA32_TSX_CTRL support.
|
|
*/
|
|
if (!(x86_read_arch_cap_msr() & ARCH_CAP_TSX_CTRL_MSR))
|
|
return;
|
|
|
|
setup_force_cpu_cap(X86_FEATURE_MSR_TSX_CTRL);
|
|
|
|
ret = cmdline_find_option(boot_command_line, "tsx", arg, sizeof(arg));
|
|
if (ret >= 0) {
|
|
if (!strcmp(arg, "on")) {
|
|
tsx_ctrl_state = TSX_CTRL_ENABLE;
|
|
} else if (!strcmp(arg, "off")) {
|
|
tsx_ctrl_state = TSX_CTRL_DISABLE;
|
|
} else if (!strcmp(arg, "auto")) {
|
|
tsx_ctrl_state = x86_get_tsx_auto_mode();
|
|
} else {
|
|
tsx_ctrl_state = TSX_CTRL_DISABLE;
|
|
pr_err("tsx: invalid option, defaulting to off\n");
|
|
}
|
|
} else {
|
|
/* tsx= not provided */
|
|
if (IS_ENABLED(CONFIG_X86_INTEL_TSX_MODE_AUTO))
|
|
tsx_ctrl_state = x86_get_tsx_auto_mode();
|
|
else if (IS_ENABLED(CONFIG_X86_INTEL_TSX_MODE_OFF))
|
|
tsx_ctrl_state = TSX_CTRL_DISABLE;
|
|
else
|
|
tsx_ctrl_state = TSX_CTRL_ENABLE;
|
|
}
|
|
|
|
if (tsx_ctrl_state == TSX_CTRL_DISABLE) {
|
|
tsx_disable();
|
|
|
|
/*
|
|
* tsx_disable() will change the state of the RTM and HLE CPUID
|
|
* bits. Clear them here since they are now expected to be not
|
|
* set.
|
|
*/
|
|
setup_clear_cpu_cap(X86_FEATURE_RTM);
|
|
setup_clear_cpu_cap(X86_FEATURE_HLE);
|
|
} else if (tsx_ctrl_state == TSX_CTRL_ENABLE) {
|
|
|
|
/*
|
|
* HW defaults TSX to be enabled at bootup.
|
|
* We may still need the TSX enable support
|
|
* during init for special cases like
|
|
* kexec after TSX is disabled.
|
|
*/
|
|
tsx_enable();
|
|
|
|
/*
|
|
* tsx_enable() will change the state of the RTM and HLE CPUID
|
|
* bits. Force them here since they are now expected to be set.
|
|
*/
|
|
setup_force_cpu_cap(X86_FEATURE_RTM);
|
|
setup_force_cpu_cap(X86_FEATURE_HLE);
|
|
}
|
|
}
|