linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Saeed Mirzamohammadi <saeed.mirzamohammadi@oracle.com>,
	Joerg Roedel <joro@8bytes.org>, Ashok Raj <ashok.raj@intel.com>,
	Camille Lu <camille.lu@hpe.com>,
	Lu Baolu <baolu.lu@linux.intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 4.19 40/84] iommu/vt-d: Fix agaw for a supported 48 bit guest address width
Date: Tue, 24 Aug 2021 13:02:06 -0400	[thread overview]
Message-ID: <20210824170250.710392-41-sashal@kernel.org> (raw)
In-Reply-To: <20210824170250.710392-1-sashal@kernel.org>

From: Saeed Mirzamohammadi <saeed.mirzamohammadi@oracle.com>

[ Upstream commit 327d5b2fee91c404a3956c324193892cf2cc9528 ]

The IOMMU driver calculates the guest addressability for a DMA request
based on the value of the mgaw reported from the IOMMU. However, this
is a fused value and as mentioned in the spec, the guest width
should be calculated based on the minimum of supported adjusted guest
address width (SAGAW) and MGAW.

This is from specification:
"Guest addressability for a given DMA request is limited to the
minimum of the value reported through this field and the adjusted
guest address width of the corresponding page-table structure.
(Adjusted guest address widths supported by hardware are reported
through the SAGAW field)."

This causes domain initialization to fail and following
errors appear for EHCI PCI driver:

[    2.486393] ehci-pci 0000:01:00.4: EHCI Host Controller
[    2.486624] ehci-pci 0000:01:00.4: new USB bus registered, assigned bus
number 1
[    2.489127] ehci-pci 0000:01:00.4: DMAR: Allocating domain failed
[    2.489350] ehci-pci 0000:01:00.4: DMAR: 32bit DMA uses non-identity
mapping
[    2.489359] ehci-pci 0000:01:00.4: can't setup: -12
[    2.489531] ehci-pci 0000:01:00.4: USB bus 1 deregistered
[    2.490023] ehci-pci 0000:01:00.4: init 0000:01:00.4 fail, -12
[    2.490358] ehci-pci: probe of 0000:01:00.4 failed with error -12

This issue happens when the value of the sagaw corresponds to a
48-bit agaw. This fix updates the calculation of the agaw based on
the minimum of IOMMU's sagaw value and MGAW.

This issue happens on the code path of getting a private domain for a
device. A private domain was needed when the domain of an iommu group
couldn't meet the requirement of a device. The IOMMU core has been
evolved to eliminate the need for private domain, hence this code path
has alreay been removed from the upstream since commit 327d5b2fee91c
("iommu/vt-d: Allow 32bit devices to uses DMA domain"). Instead of back
porting all patches that are required for removing the private domain,
this simply fixes it in the affected stable kernel between v4.16 and v5.7.

[baolu: The orignal patch could be found here
 https://lore.kernel.org/linux-iommu/20210412202736.70765-1-saeed.mirzamohammadi@oracle.com/.
 I added commit message according to Greg's comments at
 https://lore.kernel.org/linux-iommu/YHZ%2FT9x7Xjf1r6fI@kroah.com/.]

Cc: Joerg Roedel <joro@8bytes.org>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: stable@vger.kernel.org #v4.16+
Signed-off-by: Saeed Mirzamohammadi <saeed.mirzamohammadi@oracle.com>
Tested-by: Camille Lu <camille.lu@hpe.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/iommu/intel-iommu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index d2166dfc8b3f..dcb865d19309 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1928,7 +1928,7 @@ static inline int guestwidth_to_adjustwidth(int gaw)
 static int domain_init(struct dmar_domain *domain, struct intel_iommu *iommu,
 		       int guest_width)
 {
-	int adjust_width, agaw;
+	int adjust_width, agaw, cap_width;
 	unsigned long sagaw;
 	int err;
 
@@ -1942,8 +1942,9 @@ static int domain_init(struct dmar_domain *domain, struct intel_iommu *iommu,
 	domain_reserve_special_ranges(domain);
 
 	/* calculate AGAW */
-	if (guest_width > cap_mgaw(iommu->cap))
-		guest_width = cap_mgaw(iommu->cap);
+	cap_width = min_t(int, cap_mgaw(iommu->cap), agaw_to_width(iommu->agaw));
+	if (guest_width > cap_width)
+		guest_width = cap_width;
 	domain->gaw = guest_width;
 	adjust_width = guestwidth_to_adjustwidth(guest_width);
 	agaw = width_to_agaw(adjust_width);
-- 
2.30.2


  parent reply	other threads:[~2021-08-24 17:24 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-24 17:01 [PATCH 4.19 00/84] 4.19.205-rc1 review Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 01/84] iio: humidity: hdc100x: Add margin to the conversion time Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 02/84] iio: adc: Fix incorrect exit of for-loop Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 03/84] ASoC: intel: atom: Fix reference to PCM buffer address Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 04/84] i2c: dev: zero out array used for i2c reads from userspace Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 05/84] ACPI: NFIT: Fix support for virtual SPA ranges Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 06/84] ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 07/84] ieee802154: hwsim: fix GPF in hwsim_new_edge_nl Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 08/84] ASoC: cs42l42: Correct definition of ADC Volume control Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 09/84] ASoC: cs42l42: Don't allow SND_SOC_DAIFMT_LEFT_J Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 10/84] ASoC: cs42l42: Fix inversion of ADC Notch Switch control Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 11/84] ASoC: cs42l42: Remove duplicate control for WNF filter frequency Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 12/84] ASoC: cs42l42: Fix LRCLK frame start edge Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 13/84] net: dsa: mt7530: add the missing RxUnicast MIB counter Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 14/84] ppp: Fix generating ifname when empty IFLA_IFNAME is specified Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 15/84] psample: Add a fwd declaration for skbuff Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 16/84] net: Fix memory leak in ieee802154_raw_deliver Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 17/84] net: igmp: fix data-race in igmp_ifc_timer_expire() Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 18/84] net: dsa: lan9303: fix broken backpressure in .port_fdb_dump Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 19/84] net: bridge: fix memleak in br_add_if() Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 20/84] tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 21/84] net: igmp: increase size of mr_ifc_count Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 22/84] xen/events: Fix race in set_evtchn_to_irq Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 23/84] vsock/virtio: avoid potential deadlock when vsock device remove Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 24/84] powerpc/kprobes: Fix kprobe Oops happens in booke Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 25/84] x86/tools: Fix objdump version check again Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 26/84] genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 27/84] x86/msi: Force affinity setup before startup Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 28/84] x86/ioapic: " Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 29/84] x86/resctrl: Fix default monitoring groups reporting Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 30/84] genirq/msi: Ensure deactivation on teardown Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 31/84] PCI/MSI: Enable and mask MSI-X early Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 32/84] PCI/MSI: Do not set invalid bits in MSI mask Sasha Levin
2021-08-24 17:01 ` [PATCH 4.19 33/84] PCI/MSI: Correct misleading comments Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 34/84] PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 35/84] PCI/MSI: Protect msi_desc::masked for multi-MSI Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 36/84] PCI/MSI: Mask all unused MSI-X entries Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 37/84] PCI/MSI: Enforce that MSI-X table entry is masked for update Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 38/84] PCI/MSI: Enforce MSI[X] entry updates to be visible Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 39/84] vmlinux.lds.h: Handle clang's module.{c,d}tor sections Sasha Levin
2021-08-24 17:02 ` Sasha Levin [this message]
2021-08-24 17:02 ` [PATCH 4.19 41/84] mac80211: drop data frames without key on encrypted links Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 42/84] KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656) Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 43/84] KVM: nSVM: avoid picking up unsupported bits from L2 in int_ctl (CVE-2021-3653) Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 44/84] x86/fpu: Make init_fpstate correct with optimized XSAVE Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 45/84] ath: Use safer key clearing with key cache entries Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 46/84] ath9k: Clear key cache explicitly on disabling hardware Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 47/84] ath: Export ath_hw_keysetmac() Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 48/84] ath: Modify ath_key_delete() to not need full key entry Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 49/84] ath9k: Postpone key cache entry deletion for TXQ frames reference it Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 50/84] dmaengine: xilinx_dma: Fix read-after-free bug when terminating transfers Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 51/84] dmaengine: usb-dmac: Fix PM reference leak in usb_dmac_probe() Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 52/84] ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218 Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 53/84] dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller is not yet available Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 54/84] scsi: megaraid_mm: Fix end of loop tests for list_for_each_entry() Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 55/84] scsi: scsi_dh_rdac: Avoid crash during rdac_bus_attach() Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 56/84] scsi: core: Avoid printing an error if target_alloc() returns -ENXIO Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 57/84] ARM: dts: nomadik: Fix up interrupt controller node names Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 58/84] net: usb: lan78xx: don't modify phy_device state concurrently Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 59/84] Bluetooth: hidp: use correct wait queue when removing ctrl_wait Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 60/84] cpufreq: armada-37xx: forbid cpufreq for 1.2 GHz variant Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 61/84] dccp: add do-while-0 stubs for dccp_pr_debug macros Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 62/84] vhost: Fix the calculation in vhost_overflow() Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 63/84] bnxt: don't lock the tx queue from napi poll Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 64/84] bnxt: disable napi before canceling DIM Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 65/84] net: 6pack: fix slab-out-of-bounds in decode_data Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 66/84] ptp_pch: Restore dependency on PCI Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 67/84] net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32 Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 68/84] net: mdio-mux: Don't ignore memory allocation errors Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 69/84] net: mdio-mux: Handle -EPROBE_DEFER correctly Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 70/84] mmc: dw_mmc: Fix hang on data CRC error Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 71/84] ALSA: hda - fix the 'Capture Switch' value change notifications Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 72/84] tracing / histogram: Fix NULL pointer dereference on strcmp() on NULL event name Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 73/84] slimbus: messaging: start transaction ids from 1 instead of zero Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 74/84] slimbus: messaging: check for valid transaction id Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 75/84] slimbus: ngd: reset dma setup during runtime pm Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 76/84] ipack: tpci200: fix many double free issues in tpci200_pci_probe Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 77/84] ipack: tpci200: fix memory leak in the tpci200_register Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 78/84] btrfs: prevent rename2 from exchanging a subvol with a directory from different parents Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 79/84] PCI: Increase D3 delay for AMD Renoir/Cezanne XHCI Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 80/84] ASoC: intel: atom: Fix breakage for PCM buffer address setup Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 81/84] locks: print a warning when mount fails due to lack of "mand" support Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 82/84] fs: warn about impending deprecation of mandatory locks Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 83/84] netfilter: nft_exthdr: fix endianness of tcp option cast Sasha Levin
2021-08-24 17:02 ` [PATCH 4.19 84/84] Linux 4.19.205-rc1 Sasha Levin
2021-08-25  7:34 ` [PATCH 4.19 00/84] 4.19.205-rc1 review Pavel Machek
2021-08-25 12:57 ` Sudip Mukherjee
2021-08-25 20:25 ` Guenter Roeck
2021-08-25 21:01 ` Daniel Díaz
2021-08-25 22:36 ` Shuah Khan
2021-08-26  1:01 ` Samuel Zou

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=20210824170250.710392-41-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=ashok.raj@intel.com \
    --cc=baolu.lu@linux.intel.com \
    --cc=camille.lu@hpe.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=saeed.mirzamohammadi@oracle.com \
    --cc=stable@vger.kernel.org \
    /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).