All of lore.kernel.org
 help / color / mirror / Atom feed
From: Craig Hada <craig.hada-VXdhtT5mjnY@public.gmane.org>
To: Tom Mingarelli <thomas.mingarelli-VXdhtT5mjnY@public.gmane.org>
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Shuah Khan <shuah.khan-VXdhtT5mjnY@public.gmane.org>,
	David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
Subject: Re: [PATCH v3] Prevent devices with RMRRs from being placed into SI Domain
Date: Sun, 21 Oct 2012 13:27:01 -0700	[thread overview]
Message-ID: <50845A95.1000200@hp.com> (raw)
In-Reply-To: <20121018021735.23962.51639.sendpatchset@RHEL63BL460c>

On 10/17/2012 2:17 PM, Tom Mingarelli wrote:
> This patch is to prevent devices that have RMRRs associated with them to
> not be placed into the SI Domain during init. We don't put USB devices
> into this category, however. This fixes the issue where the RMRR info
> for devices being placed in and out of the SI Domain gets lost.
>
> Signed-off-by: Thomas Mingarelli <thomas.mingarelli-VXdhtT5mjnY@public.gmane.org>
> Tested-by: Shuah Khan <shuah.khan-VXdhtT5mjnY@public.gmane.org>
> ----
> PATCH v1: https://lkml.org/lkml/2012/6/15/204
> PATCH v2: https://lkml.org/lkml/2012/9/18/354
>
>
> drivers/iommu/intel-iommu.c |   30 ++++++++++++++++++++++++++++++
>   1 files changed, 30 insertions(+), 0 deletions(-)
>
> diff -up ./drivers/iommu/intel-iommu.c.ORIG ./drivers/iommu/intel-iommu.c
> --- ./drivers/iommu/intel-iommu.c.ORIG	2012-10-16 09:34:23.148089944 -0500
> +++ ./drivers/iommu/intel-iommu.c	2012-10-17 20:41:40.509642356 -0500
> @@ -2320,8 +2320,38 @@ static int domain_add_dev_info(struct dm
>   	return 0;
>   }
>   
> +static bool device_has_rmrr(struct pci_dev *dev)
> +{
> +	struct dmar_rmrr_unit *rmrr;
> +	int i;
> +
> +	for_each_rmrr_units(rmrr) {
> +		for (i = 0; i < rmrr->devices_cnt; i++) {
> +			/*
> +			 * Here we are just concerned with checking each device
> +			 * that has an RMRR associated with it and not allow it
> +			 * to be placed into the SI Domain during startup.
> +			*/
> +			if (rmrr->devices[i] == dev)
> +				return true;
> +		}
> +	}
> +	return false;
> +}
> +
>   static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
>   {
> +
> +	/*
> +	 * This is where we will refuse any device that has an
> +	 * RMRR associated with it and is not a USB device and
> +	 * NOT allow it to be placed into the SI Domain. We don't
> +	 * need a separate bit for this because it could be ANY device.
> +	 */
> +	if (device_has_rmrr(pdev) &&
> +		(pdev->class >> 8) != PCI_CLASS_SERIAL_USB)
> +			return 0;
> +
>   	if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
>   		return 1;
>   
> _______________________________________________
> iommu mailing list
> iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
> https://lists.linuxfoundation.org/mailman/listinfo/iommu
> .
>
I applied this patch to my system and booted with IOMMU pass through 
mode enabled. Without the patch my system would panic or wedge. I also 
applied a be2net patch I'm working on and was able to get successful 
netperf runs with IOMMU pass through mode enabled.

-Craig

WARNING: multiple messages have this Message-ID (diff)
From: Craig Hada <craig.hada@hp.com>
To: Tom Mingarelli <thomas.mingarelli@hp.com>
Cc: Alex Williamson <alex.williamson@redhat.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Don Dutile <ddutile@redhat.com>,
	iommu@lists.linux-foundation.org, Shuah Khan <shuah.khan@hp.com>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] Prevent devices with RMRRs from being placed into SI Domain
Date: Sun, 21 Oct 2012 13:27:01 -0700	[thread overview]
Message-ID: <50845A95.1000200@hp.com> (raw)
In-Reply-To: <20121018021735.23962.51639.sendpatchset@RHEL63BL460c>

On 10/17/2012 2:17 PM, Tom Mingarelli wrote:
> This patch is to prevent devices that have RMRRs associated with them to
> not be placed into the SI Domain during init. We don't put USB devices
> into this category, however. This fixes the issue where the RMRR info
> for devices being placed in and out of the SI Domain gets lost.
>
> Signed-off-by: Thomas Mingarelli <thomas.mingarelli@hp.com>
> Tested-by: Shuah Khan <shuah.khan@hp.com>
> ----
> PATCH v1: https://lkml.org/lkml/2012/6/15/204
> PATCH v2: https://lkml.org/lkml/2012/9/18/354
>
>
> drivers/iommu/intel-iommu.c |   30 ++++++++++++++++++++++++++++++
>   1 files changed, 30 insertions(+), 0 deletions(-)
>
> diff -up ./drivers/iommu/intel-iommu.c.ORIG ./drivers/iommu/intel-iommu.c
> --- ./drivers/iommu/intel-iommu.c.ORIG	2012-10-16 09:34:23.148089944 -0500
> +++ ./drivers/iommu/intel-iommu.c	2012-10-17 20:41:40.509642356 -0500
> @@ -2320,8 +2320,38 @@ static int domain_add_dev_info(struct dm
>   	return 0;
>   }
>   
> +static bool device_has_rmrr(struct pci_dev *dev)
> +{
> +	struct dmar_rmrr_unit *rmrr;
> +	int i;
> +
> +	for_each_rmrr_units(rmrr) {
> +		for (i = 0; i < rmrr->devices_cnt; i++) {
> +			/*
> +			 * Here we are just concerned with checking each device
> +			 * that has an RMRR associated with it and not allow it
> +			 * to be placed into the SI Domain during startup.
> +			*/
> +			if (rmrr->devices[i] == dev)
> +				return true;
> +		}
> +	}
> +	return false;
> +}
> +
>   static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
>   {
> +
> +	/*
> +	 * This is where we will refuse any device that has an
> +	 * RMRR associated with it and is not a USB device and
> +	 * NOT allow it to be placed into the SI Domain. We don't
> +	 * need a separate bit for this because it could be ANY device.
> +	 */
> +	if (device_has_rmrr(pdev) &&
> +		(pdev->class >> 8) != PCI_CLASS_SERIAL_USB)
> +			return 0;
> +
>   	if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
>   		return 1;
>   
> _______________________________________________
> iommu mailing list
> iommu@lists.linux-foundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/iommu
> .
>
I applied this patch to my system and booted with IOMMU pass through 
mode enabled. Without the patch my system would panic or wedge. I also 
applied a be2net patch I'm working on and was able to get successful 
netperf runs with IOMMU pass through mode enabled.

-Craig

  parent reply	other threads:[~2012-10-21 20:27 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-17 21:17 [PATCH v3] Prevent devices with RMRRs from being placed into SI Domain Tom Mingarelli
2012-10-17 21:17 ` Tom Mingarelli
2012-10-17 21:19 ` Mingarelli, Thomas
2012-10-17 21:19   ` Mingarelli, Thomas
2012-10-21 20:27 ` Craig Hada [this message]
2012-10-21 20:27   ` Craig Hada

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=50845A95.1000200@hp.com \
    --to=craig.hada-vxdhtt5mjny@public.gmane.org \
    --cc=dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=shuah.khan-VXdhtT5mjnY@public.gmane.org \
    --cc=thomas.mingarelli-VXdhtT5mjnY@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.