From: Ian Campbell <Ian.Campbell@citrix.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Konrad Rzeszutek Wilk" <konrad@kernel.org>,
Jeremy Fitzhardinge <jeremy@goop.org>,
"xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>,
"Stefano Stabellini" <Stefano.Stabellini@eu.citrix.com>
Subject: Re: [Xen-devel] [PATCH 2/3] xen-pcifront: Sanity check the MSI/MSI-X values
Date: Thu, 17 Feb 2011 08:53:40 +0000 [thread overview]
Message-ID: <1297932820.16356.1317.camel@zakaz.uk.xensource.com> (raw)
In-Reply-To: <1297894638-28007-3-git-send-email-konrad.wilk@oracle.com>
On Wed, 2011-02-16 at 22:17 +0000, Konrad Rzeszutek Wilk wrote:
> Check the returned vector values for any values that are
> odd or plain incorrect (say vector value zero), and if so
> print a warning. Also fixup the return values.
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> drivers/pci/xen-pcifront.c | 17 ++++++++++++++---
> 1 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
> index 3a5a6fc..6acf6ae 100644
> --- a/drivers/pci/xen-pcifront.c
> +++ b/drivers/pci/xen-pcifront.c
> @@ -277,13 +277,20 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
> if (likely(!err)) {
> if (likely(!op.value)) {
> /* we get the result */
> - for (i = 0; i < nvec; i++)
> + for (i = 0; i < nvec; i++) {
> + if (op.msix_entries[i].vector <= 0) {
> + dev_warn(&dev->dev, "MSI-X entry %d" \
> + " is zero!\n", i);
The test says "<= 0" but the text says "== 0". Perhaps
dev_warn(&dev->dev, "MSI-X entry %d has invalid vector %d\n",
i, op.msix_entries[i].vector);
>
> + err = -EINVAL;
> + continue;
Do we need / should we set *(*vector+i) to something to indicate its
invalidness rather than leave it potentially uninitialised?
> + }
> *(*vector+i) = op.msix_entries[i].vector;
BTW does the double indirection of the vector serve a purpose?
Everywhere I can see just updates *(*vector+i), I can't see any realloc
of the array itself etc.
Removing the extra level of indirection leads to vector[i] = foo instead
which is much easier on the eye.
> - return 0;
> + }
> + return err;
> } else {
> printk(KERN_DEBUG "enable msix get value %x\n",
> op.value);
> - return op.value;
> + return err;
I think all of these "return err"s can now be pulled out to the end of
the function? makes it clearer what the return is.
> }
> } else {
> dev_err(&dev->dev, "enable msix get err %x\n", err);
> @@ -325,6 +332,10 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector)
> err = do_pci_op(pdev, &op);
> if (likely(!err)) {
> *(*vector) = op.value;
> + if (op.value <= 0) {
> + dev_warn(&dev->dev, "MSI entry is zero!\n");
Same comment re <= vs == 0.
> + err = -EINVAL;
> + }
> } else {
> dev_err(&dev->dev, "pci frontend enable msi failed for dev "
> "%x:%x\n", op.bus, op.devfn);
next prev parent reply other threads:[~2011-02-17 8:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-16 22:17 [PATCH] Xen PCI fronted fixes for 2.6.39 Konrad Rzeszutek Wilk
2011-02-16 22:17 ` [PATCH 1/3] pci/xen: Use xen_allocate_pirq_msi Konrad Rzeszutek Wilk
2011-02-17 8:41 ` [Xen-devel] " Ian Campbell
2011-02-17 14:30 ` Konrad Rzeszutek Wilk
2011-02-18 14:07 ` Konrad Rzeszutek Wilk
2011-02-18 14:11 ` Ian Campbell
2011-02-18 14:13 ` Stefano Stabellini
2011-02-17 14:52 ` Konrad Rzeszutek Wilk
2011-02-16 22:17 ` [PATCH 2/3] xen-pcifront: Sanity check the MSI/MSI-X values Konrad Rzeszutek Wilk
2011-02-17 8:53 ` Ian Campbell [this message]
2011-02-18 14:08 ` [Xen-devel] " Konrad Rzeszutek Wilk
2011-02-18 14:15 ` Ian Campbell
2011-02-18 14:20 ` Konrad Rzeszutek Wilk
2011-02-16 22:17 ` [PATCH 3/3] xen-pcifront: don't use flush_scheduled_work() Konrad Rzeszutek Wilk
2011-02-17 8:29 ` [Xen-devel] [PATCH] Xen PCI fronted fixes for 2.6.39 Ian Campbell
2011-02-17 14:28 ` Konrad Rzeszutek Wilk
2011-02-17 14:38 ` Ian Campbell
2011-02-18 14:22 ` Konrad Rzeszutek Wilk
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=1297932820.16356.1317.camel@zakaz.uk.xensource.com \
--to=ian.campbell@citrix.com \
--cc=Stefano.Stabellini@eu.citrix.com \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=konrad@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xensource.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
all inboxes | Powered by JetHome®