stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Wei Huang <wei.huang2@amd.com>,
	Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
	Joerg Roedel <jroedel@suse.de>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.14 047/100] iommu/amd: Relocate GAMSup check to early_enable_iommus
Date: Fri, 24 Sep 2021 14:43:56 +0200	[thread overview]
Message-ID: <20210924124343.022637791@linuxfoundation.org> (raw)
In-Reply-To: <20210924124341.214446495@linuxfoundation.org>

From: Wei Huang <wei.huang2@amd.com>

[ Upstream commit c3811a50addd23b9bb5a36278609ee1638debcf6 ]

Currently, iommu_init_ga() checks and disables IOMMU VAPIC support
(i.e. AMD AVIC support in IOMMU) when GAMSup feature bit is not set.
However it forgets to clear IRQ_POSTING_CAP from the previously set
amd_iommu_irq_ops.capability.

This triggers an invalid page fault bug during guest VM warm reboot
if AVIC is enabled since the irq_remapping_cap(IRQ_POSTING_CAP) is
incorrectly set, and crash the system with the following kernel trace.

    BUG: unable to handle page fault for address: 0000000000400dd8
    RIP: 0010:amd_iommu_deactivate_guest_mode+0x19/0xbc
    Call Trace:
     svm_set_pi_irte_mode+0x8a/0xc0 [kvm_amd]
     ? kvm_make_all_cpus_request_except+0x50/0x70 [kvm]
     kvm_request_apicv_update+0x10c/0x150 [kvm]
     svm_toggle_avic_for_irq_window+0x52/0x90 [kvm_amd]
     svm_enable_irq_window+0x26/0xa0 [kvm_amd]
     vcpu_enter_guest+0xbbe/0x1560 [kvm]
     ? avic_vcpu_load+0xd5/0x120 [kvm_amd]
     ? kvm_arch_vcpu_load+0x76/0x240 [kvm]
     ? svm_get_segment_base+0xa/0x10 [kvm_amd]
     kvm_arch_vcpu_ioctl_run+0x103/0x590 [kvm]
     kvm_vcpu_ioctl+0x22a/0x5d0 [kvm]
     __x64_sys_ioctl+0x84/0xc0
     do_syscall_64+0x33/0x40
     entry_SYSCALL_64_after_hwframe+0x44/0xae

Fixes by moving the initializing of AMD IOMMU interrupt remapping mode
(amd_iommu_guest_ir) earlier before setting up the
amd_iommu_irq_ops.capability with appropriate IRQ_POSTING_CAP flag.

[joro:	Squashed the two patches and limited
	check_features_on_all_iommus() to CONFIG_IRQ_REMAP
	to fix a compile warning.]

Signed-off-by: Wei Huang <wei.huang2@amd.com>
Co-developed-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Link: https://lore.kernel.org/r/20210820202957.187572-2-suravee.suthikulpanit@amd.com
Link: https://lore.kernel.org/r/20210820202957.187572-3-suravee.suthikulpanit@amd.com
Fixes: 8bda0cfbdc1a ("iommu/amd: Detect and initialize guest vAPIC log")
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/iommu/amd/init.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 46280e6e1535..5c21f1ee5098 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -298,6 +298,22 @@ int amd_iommu_get_num_iommus(void)
 	return amd_iommus_present;
 }
 
+#ifdef CONFIG_IRQ_REMAP
+static bool check_feature_on_all_iommus(u64 mask)
+{
+	bool ret = false;
+	struct amd_iommu *iommu;
+
+	for_each_iommu(iommu) {
+		ret = iommu_feature(iommu, mask);
+		if (!ret)
+			return false;
+	}
+
+	return true;
+}
+#endif
+
 /*
  * For IVHD type 0x11/0x40, EFR is also available via IVHD.
  * Default to IVHD EFR since it is available sooner
@@ -854,13 +870,6 @@ static int iommu_init_ga(struct amd_iommu *iommu)
 	int ret = 0;
 
 #ifdef CONFIG_IRQ_REMAP
-	/* Note: We have already checked GASup from IVRS table.
-	 *       Now, we need to make sure that GAMSup is set.
-	 */
-	if (AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) &&
-	    !iommu_feature(iommu, FEATURE_GAM_VAPIC))
-		amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY_GA;
-
 	ret = iommu_init_ga_log(iommu);
 #endif /* CONFIG_IRQ_REMAP */
 
@@ -2477,6 +2486,14 @@ static void early_enable_iommus(void)
 	}
 
 #ifdef CONFIG_IRQ_REMAP
+	/*
+	 * Note: We have already checked GASup from IVRS table.
+	 *       Now, we need to make sure that GAMSup is set.
+	 */
+	if (AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) &&
+	    !check_feature_on_all_iommus(FEATURE_GAM_VAPIC))
+		amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY_GA;
+
 	if (AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))
 		amd_iommu_irq_ops.capability |= (1 << IRQ_POSTING_CAP);
 #endif
-- 
2.33.0




  parent reply	other threads:[~2021-09-24 13:00 UTC|newest]

Thread overview: 107+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-24 12:43 [PATCH 5.14 000/100] 5.14.8-rc1 review Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 001/100] PCI: pci-bridge-emul: Add PCIe Root Capabilities Register Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 002/100] PCI: aardvark: Fix reporting CRS value Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 003/100] console: consume APC, DM, DCS Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 004/100] staging: rtl8192u: Fix bitwise vs logical operator in TranslateRxSignalStuff819xUsb() Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 005/100] um: fix stub location calculation Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 006/100] coredump: fix memleak in dump_vma_snapshot() Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 007/100] um: virtio_uml: fix memory leak on init failures Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 008/100] RDMA/hns: Enable stash feature of HIP09 Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 009/100] RDMA/mlx5: Fix xlt_chunk_align calculation Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 010/100] dmaengine: acpi: Avoid comparison GSI with Linux vIRQ Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 011/100] perf test: Fix bpf test sample mismatch reporting Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 012/100] perf symbol: Look for ImageBase in PE file to compute .text offset Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 013/100] perf tools: Allow build-id with trailing zeros Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 014/100] staging: rtl8723bs: fix wpa_set_auth_algs() function Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 015/100] n64cart: fix return value check in n64cart_probe() Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 016/100] thermal/drivers/exynos: Fix an error code in exynos_tmu_probe() Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 017/100] 9p/trans_virtio: Remove sysfs file on probe failure Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 018/100] pwm: ab8500: Fix register offset calculation to not depend on probe order Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 019/100] prctl: allow to setup brk for et_dyn executables Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 020/100] nilfs2: use refcount_dec_and_lock() to fix potential UAF Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 021/100] profiling: fix shift-out-of-bounds bugs Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 022/100] PM: sleep: core: Avoid setting power.must_resume to false Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 023/100] thermal/drivers/qcom/spmi-adc-tm5: Dont abort probing if a sensor is not used Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 024/100] ceph: cancel delayed work instead of flushing on mdsc teardown Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 025/100] pwm: lpc32xx: Dont modify HW state in .probe() after the PWM chip was registered Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 026/100] pwm: mxs: " Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 027/100] dmanegine: idxd: cleanup all device related bits after disabling device Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 028/100] dmaengine: idxd: have command status always set Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 029/100] dmaengine: idxd: fix wq slot allocation index check Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 030/100] dmaengine: idxd: fix abort status check Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 031/100] dmaengine: idxd: clear block on fault flag when clear wq Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 032/100] platform/chrome: sensorhub: Add trace events for sample Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 033/100] platform/chrome: cros_ec_trace: Fix format warnings Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 034/100] s390/entry: make oklabel within CHKSTG macro local Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 035/100] SUNRPC: dont pause on incomplete allocation Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 036/100] math: RATIONAL_KUNIT_TEST should depend on RATIONAL instead of selecting it Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 037/100] init: move usermodehelper_enable() to populate_rootfs() Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 038/100] Kconfig.debug: drop selecting non-existing HARDLOCKUP_DETECTOR_ARCH Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 039/100] tools/bootconfig: Fix tracing_on option checking in ftrace2bconf.sh Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 040/100] tracing/boot: Fix to loop on only subkeys Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 041/100] thermal/core: Fix thermal_cooling_device_register() prototype Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 042/100] drm/amdgpu: Disable PCIE_DPM on Intel RKL Platform Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 043/100] drivers: base: cacheinfo: Get rid of DEFINE_SMP_CALL_CACHE_FUNCTION() Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 044/100] dma-buf: DMABUF_MOVE_NOTIFY should depend on DMA_SHARED_BUFFER Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 045/100] dma-buf: DMABUF_DEBUG " Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 046/100] parisc: Move pci_dev_is_behind_card_dino to where it is used Greg Kroah-Hartman
2021-09-24 12:43 ` Greg Kroah-Hartman [this message]
2021-09-24 12:43 ` [PATCH 5.14 048/100] iommu/vt-d: Fix PASID leak in intel_svm_unbind_mm() Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 049/100] iommu/vt-d: Fix a deadlock in intel_svm_drain_prq() Greg Kroah-Hartman
2021-09-24 12:43 ` [PATCH 5.14 050/100] arm64: mm: limit linear region to 51 bits for KVM in nVHE mode Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 051/100] drm/ttm: Fix a deadlock if the target BO is not idle during swap Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 052/100] of: property: Disable fw_devlink DT support for X86 Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 053/100] riscv: dts: microchip: mpfs-icicle: Fix serial console Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 054/100] perf tools: Fix hybrid config terms list corruption Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 055/100] dmaengine: idxd: depends on !UML Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 056/100] dmaengine: sprd: Add missing MODULE_DEVICE_TABLE Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 057/100] cxl: Move cxl_core to new directory Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 058/100] cxl/pci: Introduce cdevm_file_operations Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 059/100] dmaengine: ioat: depends on !UML Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 060/100] dmaengine: xilinx_dma: Set DMA mask for coherent APIs Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 061/100] s390: add kmemleak annotation in stack_alloc() Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 062/100] ASoC: audio-graph: respawn Platform Support Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 063/100] ACPI: PM: s2idle: Run both AMD and Microsoft methods if both are supported Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 064/100] ceph: fix memory leak on decode error in ceph_handle_caps Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 065/100] ceph: request Fw caps before updating the mtime in ceph_write_iter Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 066/100] ceph: remove the capsnaps when removing caps Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 067/100] ceph: lockdep annotations for try_nonblocking_invalidate Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 068/100] s390/unwind: use current_frame_address() to unwind current task Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 069/100] btrfs: update the bdev time directly when closing Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 070/100] btrfs: delay blkdev_put until after the device remove Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 071/100] btrfs: fix lockdep warning while mounting sprout fs Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 072/100] nilfs2: fix memory leak in nilfs_sysfs_create_device_group Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 073/100] nilfs2: fix NULL pointer in nilfs_##name##_attr_release Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 074/100] nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 075/100] nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 076/100] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 077/100] nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 078/100] thermal/drivers/rcar_gen3_thermal: Store TSC id as unsigned int Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 079/100] habanalabs: fix nullifying of destroyed mmu pgt pool Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 080/100] habanalabs: fix race between soft reset and heartbeat Greg Kroah-Hartman
2021-09-25 11:53   ` Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 081/100] drm/amdgpu: Fixes to returning VBIOS RAS EEPROM address Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 082/100] drm/amd/display: Fix memory leak reported by coverity Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 083/100] drm/amdgpu: fix fdinfo race with process exit Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 084/100] habanalabs: add validity check for event ID received from F/W Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 085/100] habanalabs: fix mmu node address resolution in debugfs Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 086/100] habanalabs: add "in device creation" status Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 087/100] habanalabs: cannot sleep while holding spinlock Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 088/100] pwm: img: Dont modify HW state in .remove() callback Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 089/100] pwm: rockchip: " Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 090/100] pwm: stm32-lp: " Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 091/100] nvmet: fixup buffer overrun in nvmet_subsys_attr_serial() Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 092/100] block: genhd: dont call blkdev_show() with major_names_lock held Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 093/100] blk-throttle: fix UAF by deleteing timer in blk_throtl_exit() Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 094/100] blk-mq: allow 4x BLK_MAX_REQUEST_COUNT at blk_plug for multiple_queues Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 095/100] rtc: rx8010: select REGMAP_I2C Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 096/100] sched/idle: Make the idle timer expire in hard interrupt context Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 097/100] cifs: properly invalidate cached root handle when closing it Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 098/100] io_uring: fix off-by-one in BUILD_BUG_ON check of __REQ_F_LAST_BIT Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 099/100] selinux,smack: fix subjective/objective credential use mixups Greg Kroah-Hartman
2021-09-24 12:44 ` [PATCH 5.14 100/100] drm/nouveau/nvkm: Replace -ENOSYS with -ENODEV Greg Kroah-Hartman
2021-09-24 14:21 ` [PATCH 5.14 000/100] 5.14.8-rc1 review Daniel Díaz
2021-09-25 11:50   ` Greg Kroah-Hartman
2021-09-24 17:59 ` Jon Hunter
2021-09-24 20:10 ` Fox Chen
2021-09-24 21:52 ` Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210924124343.022637791@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=jroedel@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=wei.huang2@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).