All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joerg Roedel <jroedel@suse.de>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, David Woodhouse <dwmw2@infradead.org>,
	iommu@lists.linux-foundation.org,
	Gregor Dick <gdick@solarflare.com>
Subject: Re: [PATCH v2 08/11] PCI: Clean up ATS error handling
Date: Mon, 27 Jul 2015 14:56:32 +0200	[thread overview]
Message-ID: <20150727125632.GD27614@suse.de> (raw)
In-Reply-To: <20150721001454.28145.35617.stgit@bhelgaas-glaptop2.roam.corp.google.com>

On Mon, Jul 20, 2015 at 07:14:54PM -0500, Bjorn Helgaas wrote:
> There's no need to BUG() if we enable ATS when it's already enabled.  We
> don't need to BUG() when disabling ATS on a device that doesn't support ATS
> or if it's already disabled.  If ATS is enabled, certainly we found an ATS
> capability in the past, so it should still be there now.
> 
> Clean up these error paths.
> 
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
>  drivers/pci/ats.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
> index 0b5b0ed..67524a7 100644
> --- a/drivers/pci/ats.c
> +++ b/drivers/pci/ats.c
> @@ -44,11 +44,12 @@ int pci_enable_ats(struct pci_dev *dev, int ps)
>  	u16 ctrl;
>  	struct pci_dev *pdev;
>  
> -	BUG_ON(dev->ats_cap && dev->ats_enabled);
> -
>  	if (!dev->ats_cap)
>  		return -EINVAL;
>  
> +	if (pci_ats_enabled(dev))
> +		return -EINVAL;
> +

Better return -EBUSY here? It would be good to find out if we are trying
to enable ATS while it is already enabled. A WARN_ON around this would
also be good, so that we spot bugs in the iommu drivers early when they
use this interface.



	Joerg

  reply	other threads:[~2015-07-27 12:56 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-21  0:13 [PATCH v2 00/11] PCI: Fix ATS deadlock Bjorn Helgaas
2015-07-21  0:13 ` [PATCH v2 01/11] iommu/vt-d: Cache PCI ATS state and Invalidate Queue Depth Bjorn Helgaas
     [not found]   ` <20150721001357.28145.83631.stgit-1RhO1Y9PlrlHTL0Zs8A6p/gx64E7kk8eUsxypvmhUTTZJqsBc5GL+g@public.gmane.org>
2015-07-27 13:08     ` Joerg Roedel
2015-07-27 13:08       ` Joerg Roedel
2015-07-27 22:54       ` Bjorn Helgaas
     [not found]         ` <20150727225453.GB24401-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2015-07-28  7:14           ` Joerg Roedel
2015-07-28  7:14             ` Joerg Roedel
2015-07-21  0:14 ` [PATCH v2 02/11] PCI: Allocate ATS struct during enumeration Bjorn Helgaas
2015-07-27 12:40   ` Joerg Roedel
2015-07-21  0:14 ` [PATCH v2 03/11] PCI: Embed ATS info directly into struct pci_dev Bjorn Helgaas
     [not found]   ` <20150721001413.28145.38246.stgit-1RhO1Y9PlrlHTL0Zs8A6p/gx64E7kk8eUsxypvmhUTTZJqsBc5GL+g@public.gmane.org>
2015-07-27 12:45     ` Joerg Roedel
2015-07-27 12:45       ` Joerg Roedel
     [not found] ` <20150721001243.28145.81610.stgit-1RhO1Y9PlrlHTL0Zs8A6p/gx64E7kk8eUsxypvmhUTTZJqsBc5GL+g@public.gmane.org>
2015-07-21  0:14   ` [PATCH v2 04/11] PCI: Reduce size of ATS structure elements Bjorn Helgaas
2015-07-21  0:14     ` Bjorn Helgaas
2015-07-21  0:14   ` [PATCH v2 07/11] PCI: Use pci_physfn() rather than looking up physfn by hand Bjorn Helgaas
2015-07-21  0:14     ` Bjorn Helgaas
2015-07-21  0:14   ` [PATCH v2 08/11] PCI: Clean up ATS error handling Bjorn Helgaas
2015-07-21  0:14     ` Bjorn Helgaas
2015-07-27 12:56     ` Joerg Roedel [this message]
2015-07-29 16:07   ` [PATCH v2 00/11] PCI: Fix ATS deadlock Bjorn Helgaas
2015-07-29 16:07     ` Bjorn Helgaas
2015-08-06 16:03     ` Yinghai Lu
2015-08-07  1:06       ` Yinghai Lu
2015-08-10 17:33         ` Bjorn Helgaas
2015-08-10 22:54           ` Yinghai Lu
2015-07-21  0:14 ` [PATCH v2 05/11] PCI: Rationalize pci_ats_queue_depth() error checking Bjorn Helgaas
2015-07-21  0:14 ` [PATCH v2 06/11] PCI: Inline the ATS setup code into pci_ats_init() Bjorn Helgaas
2015-07-21  0:15 ` [PATCH v2 09/11] PCI: Move ATS declarations to linux/pci.h so they're all together Bjorn Helgaas
2015-07-21  0:15 ` [PATCH v2 10/11] PCI: Stop caching ATS Invalidate Queue Depth Bjorn Helgaas
2015-07-27 12:57   ` Joerg Roedel
2015-07-27 14:00   ` Don Dutile
2015-07-27 22:27     ` Bjorn Helgaas
2015-07-27 23:13       ` Don Dutile
2015-07-21  0:15 ` [PATCH v2 11/11] PCI: Remove pci_ats_enabled() Bjorn Helgaas
     [not found]   ` <20150721001519.28145.73458.stgit-1RhO1Y9PlrlHTL0Zs8A6p/gx64E7kk8eUsxypvmhUTTZJqsBc5GL+g@public.gmane.org>
2015-07-27 12:58     ` Joerg Roedel
2015-07-27 12:58       ` Joerg Roedel
2015-07-28 15:16 ` [PATCH v2 00/11] PCI: Fix ATS deadlock Joerg Roedel

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=20150727125632.GD27614@suse.de \
    --to=jroedel@suse.de \
    --cc=bhelgaas@google.com \
    --cc=dwmw2@infradead.org \
    --cc=gdick@solarflare.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=linux-pci@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 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.