From: "Michael S. Tsirkin" <mst@redhat.com>
To: Glauber Costa <glommer@redhat.com>
Cc: Carsten Otte <cotte@de.ibm.com>,
kvm@vger.kernel.org, Rusty Russell <rusty@rustcorp.com.au>,
qemu-devel@nongnu.org, virtualization@lists.linux-foundation.org,
Blue Swirl <blauwirbel@gmail.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Paul Brook <paul@codesourcery.com>, Avi Kivity <avi@redhat.com>
Subject: Re: [Qemu-devel] [PATCHv3 05/13] qemu: MSI-X support functions
Date: Wed, 10 Jun 2009 12:58:35 +0300 [thread overview]
Message-ID: <20090610095835.GF6844@redhat.com> (raw)
In-Reply-To: <20090609172627.GA19375@poweredge.glommer>
On Tue, Jun 09, 2009 at 02:26:27PM -0300, Glauber Costa wrote:
> On Fri, Jun 05, 2009 at 01:23:31PM +0300, Michael S. Tsirkin wrote:
> > Add functions implementing MSI-X support. First user will be virtio-pci.
> > Note that platform must set a flag to declare MSI supported.
> > For PC this will be set by APIC.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > Makefile.target | 2 +-
> > hw/msix.c | 423 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > hw/msix.h | 35 +++++
> > hw/pci.h | 20 +++
> > 4 files changed, 479 insertions(+), 1 deletions(-)
> > create mode 100644 hw/msix.c
> > create mode 100644 hw/msix.h
> >
> > diff --git a/Makefile.target b/Makefile.target
> > index 664a1e3..87b2859 100644
> > --- a/Makefile.target
> > +++ b/Makefile.target
> > @@ -486,7 +486,7 @@ endif #CONFIG_BSD_USER
> > ifndef CONFIG_USER_ONLY
> >
> > OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \
> > - gdbstub.o gdbstub-xml.o
> > + gdbstub.o gdbstub-xml.o msix.o
> > # virtio has to be here due to weird dependency between PCI and virtio-net.
> > # need to fix this properly
> > OBJS+=virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
> > diff --git a/hw/msix.c b/hw/msix.c
> > new file mode 100644
> > index 0000000..1b5aec8
> > --- /dev/null
> > +++ b/hw/msix.c
> > @@ -0,0 +1,423 @@
> > +/*
> > + * MSI-X device support
> > + *
> > + * This module includes support for MSI-X in pci devices.
> > + *
> > + * Author: Michael S. Tsirkin <mst@redhat.com>
> > + *
> > + * Copyright (c) 2009, Red Hat Inc, Michael S. Tsirkin (mst@redhat.com)
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2. See
> > + * the COPYING file in the top-level directory.
> > + */
> > +
> > +#include "hw.h"
> > +#include "msix.h"
> > +#include "pci.h"
> > +
> > +/* Declaration from linux/pci_regs.h */
> > +#define PCI_CAP_ID_MSIX 0x11 /* MSI-X */
> > +#define PCI_MSIX_FLAGS 2 /* Table at lower 11 bits */
> > +#define PCI_MSIX_FLAGS_QSIZE 0x7FF
> > +#define PCI_MSIX_FLAGS_ENABLE (1 << 15)
> > +#define PCI_MSIX_FLAGS_BIRMASK (7 << 0)
> > +
> > +/* MSI-X capability structure */
> > +#define MSIX_TABLE_OFFSET 4
> > +#define MSIX_PBA_OFFSET 8
> > +#define MSIX_CAP_LENGTH 12
> > +
> > +/* MSI enable bit is in byte 1 in FLAGS register */
> > +#define MSIX_ENABLE_OFFSET (PCI_MSIX_FLAGS + 1)
> > +#define MSIX_ENABLE_MASK (PCI_MSIX_FLAGS_ENABLE >> 8)
> > +
> > +/* MSI-X table format */
> > +#define MSIX_MSG_ADDR 0
> > +#define MSIX_MSG_UPPER_ADDR 4
> > +#define MSIX_MSG_DATA 8
> > +#define MSIX_VECTOR_CTRL 12
> > +#define MSIX_ENTRY_SIZE 16
> > +#define MSIX_VECTOR_MASK 0x1
> > +
> > +/* How much space does an MSIX table need. */
> > +/* The spec requires giving the table structure
> > + * a 4K aligned region all by itself. Align it to
> > + * target pages so that drivers can do passthrough
> > + * on the rest of the region. */
> > +#define MSIX_PAGE_SIZE TARGET_PAGE_ALIGN(0x1000)
> > +/* Reserve second half of the page for pending bits */
> > +#define MSIX_PAGE_PENDING (MSIX_PAGE_SIZE / 2)
> > +#define MSIX_MAX_ENTRIES 32
> > +
> > +
> > +#ifdef MSIX_DEBUG
> > +#define DEBUG(fmt, ...) \
> > + do { \
> > + fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \
> > + } while (0)
> > +#else
> > +#define DEBUG(fmt, ...) do { } while(0)
> > +#endif
> > +
> > +/* Flag to globally disable MSI-X support */
> > +int msix_disable;
> > +
> > +/* Flag for interrupt controller to declare MSI-X support */
> > +int msix_supported;
> maybe better to make it static,
It's not read-only either.
> and provide msi_state() returning -1 for disabled,
> 0 for supported, etc...
Matter of taste, I prefer a set of binary flags rather than yet another enum:
msix_disable is controlled by user, msix_supported is a safety valve
for non-PC platforms. It's easier to keep them separate IMO.
> > +
> > +/* Add MSI-X capability to the config space for the device. */
> > +/* Given a bar and its size, add MSI-X table on top of it
> > + * and fill MSI-X capability in the config space.
> > + * Original bar size must be a power of 2 or 0.
> > + * New bar size is returned. */
> > +static int msix_add_config(struct PCIDevice *pdev, unsigned short nentries,
> > + unsigned bar_nr, unsigned bar_size)
> > +{
> > + int config_offset;
> > + uint8_t *config;
> > + uint32_t new_size;
> > +
> > + if (nentries < 1 || nentries > PCI_MSIX_FLAGS_QSIZE + 1)
> > + return -EINVAL;
> > + if (bar_size > 0x80000000)
> > + return -ENOSPC;
> > +
> > + /* Add space for MSI-X structures */
> > + if (!bar_size)
> > + new_size = MSIX_PAGE_SIZE;
> > + else if (bar_size < MSIX_PAGE_SIZE) {
> > + bar_size = MSIX_PAGE_SIZE;
> > + new_size = MSIX_PAGE_SIZE * 2;
> > + } else
> > + new_size = bar_size * 2;
> > +
> > + pdev->msix_bar_size = new_size;
> > + config_offset = pci_add_capability(pdev, PCI_CAP_ID_MSIX, MSIX_CAP_LENGTH);
> > + if (config_offset < 0)
> > + return config_offset;
> > + config = pdev->config + config_offset;
> > +
> > + pci_set_word(config + PCI_MSIX_FLAGS, nentries - 1);
> > + /* Table on top of BAR */
> > + pci_set_long(config + MSIX_TABLE_OFFSET, bar_size | bar_nr);
> > + /* Pending bits on top of that */
> > + pci_set_long(config + MSIX_PBA_OFFSET, (bar_size + MSIX_PAGE_PENDING) |
> > + bar_nr);
> > + pdev->msix_cap = config_offset;
> > + /* Make flags bit writeable. */
> > + pdev->wmask[config_offset + MSIX_ENABLE_OFFSET] |= MSIX_ENABLE_MASK;
> > + return 0;
> > +}
> > +
>
> > +
> > +/* Initialize the MSI-X structures. Note: if MSI-X is supported, BAR size is
> > + * modified, it should be retrieved with msix_bar_size. */
> > +int msix_init(struct PCIDevice *dev, unsigned short nentries,
> > + unsigned bar_nr, unsigned bar_size)
> > +{
> > + int ret = -ENOMEM;
> > + /* Nothing to do if MSI is not supported by interrupt controller */
> > + if (!msix_supported)
> > + return -ENOTTY;
> > +
> > + if (nentries > MSIX_MAX_ENTRIES)
> > + return -EINVAL;
> > +
> > + dev->msix_entry_used = qemu_mallocz(MSIX_MAX_ENTRIES *
> > + sizeof *dev->msix_entry_used);
> > + if (!dev->msix_entry_used)
> > + goto err_used;
> no need to check. oom_checker will kill qemu if it fails.
>
> > +
> > + dev->msix_table_page = qemu_mallocz(MSIX_PAGE_SIZE);
> > + if (!dev->msix_table_page)
> > + goto err_page;
> ditto.
>
Good point.
--
MST
next prev parent reply other threads:[~2009-06-10 10:02 UTC|newest]
Thread overview: 184+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1244192535.git.mst@redhat.com>
2009-06-05 10:22 ` [Qemu-devel] [PATCHv3 01/13] qemu: make default_write_config use mask table Michael S. Tsirkin
2009-06-05 10:23 ` [Qemu-devel] [PATCHv3 02/13] qemu: capability bits in pci save/restore Michael S. Tsirkin
2009-06-05 10:23 ` [Qemu-devel] [PATCHv3 03/13] qemu: add routines to manage PCI capabilities Michael S. Tsirkin
2009-06-09 17:11 ` Glauber Costa
2009-06-10 9:54 ` Michael S. Tsirkin
2009-06-10 14:55 ` Glauber Costa
2009-06-10 15:01 ` Michael S. Tsirkin
2009-06-10 15:24 ` Paul Brook
2009-06-10 15:50 ` Michael S. Tsirkin
2009-06-10 17:43 ` Jamie Lokier
2009-06-10 18:22 ` Michael S. Tsirkin
2009-06-10 19:27 ` Jamie Lokier
2009-06-12 8:43 ` Configuration vs. compat hints [was Re: [Qemu-devel] [PATCHv3 03/13] qemu: add routines to manage PCI capabilities] Mark McLoughlin
2009-06-12 13:59 ` Michael S. Tsirkin
2009-06-12 14:48 ` Mark McLoughlin
2009-06-12 14:51 ` Anthony Liguori
2009-06-12 15:41 ` Mark McLoughlin
2009-06-12 16:11 ` Anthony Liguori
2009-06-12 16:48 ` Mark McLoughlin
2009-06-12 17:00 ` Anthony Liguori
2009-06-12 17:31 ` Mark McLoughlin
2009-06-12 17:44 ` Blue Swirl
2009-06-12 17:55 ` Mark McLoughlin
2009-06-16 18:38 ` Jamie Lokier
2009-06-14 9:50 ` Michael S. Tsirkin
2009-06-15 9:08 ` Mark McLoughlin
2009-06-15 9:27 ` Avi Kivity
2009-06-15 10:32 ` Michael S. Tsirkin
2009-06-15 10:44 ` Gleb Natapov
2009-06-15 10:46 ` Michael S. Tsirkin
2009-06-15 10:52 ` Gleb Natapov
2009-06-15 11:07 ` Michael S. Tsirkin
2009-06-15 11:14 ` Gleb Natapov
2009-06-15 11:34 ` Michael S. Tsirkin
2009-06-15 11:27 ` Avi Kivity
2009-06-15 11:48 ` Michael S. Tsirkin
2009-06-15 11:56 ` Avi Kivity
2009-06-15 12:41 ` Michael S. Tsirkin
2009-06-15 12:50 ` Avi Kivity
2009-06-15 12:52 ` Anthony Liguori
2009-06-15 13:09 ` Avi Kivity
2009-06-15 13:23 ` Anthony Liguori
2009-06-15 13:42 ` Avi Kivity
2009-06-15 13:51 ` Anthony Liguori
2009-06-15 14:06 ` Dor Laor
2009-06-15 14:24 ` Anthony Liguori
2009-06-15 14:37 ` Michael S. Tsirkin
2009-06-15 15:03 ` Anthony Liguori
2009-06-15 15:08 ` Daniel P. Berrange
2009-06-15 15:12 ` Dor Laor
2009-06-15 15:15 ` Avi Kivity
2009-06-16 18:32 ` Jamie Lokier
2009-06-17 6:38 ` Avi Kivity
2009-06-17 11:51 ` Jamie Lokier
2009-06-15 16:27 ` Mark McLoughlin
2009-06-15 17:13 ` Avi Kivity
2009-06-15 15:05 ` Avi Kivity
2009-06-15 15:11 ` Anthony Liguori
2009-06-15 16:27 ` Mark McLoughlin
2009-06-15 17:09 ` Avi Kivity
2009-06-15 18:12 ` Anthony Liguori
2009-06-15 18:21 ` Avi Kivity
2009-06-15 18:24 ` Anthony Liguori
2009-06-15 18:44 ` Blue Swirl
2009-06-16 8:56 ` Avi Kivity
2009-06-16 12:14 ` Mark McLoughlin
2009-06-16 12:28 ` Avi Kivity
2009-06-16 12:39 ` Mark McLoughlin
2009-06-16 12:51 ` Avi Kivity
2009-06-16 18:44 ` Jamie Lokier
2009-06-17 8:33 ` Mark McLoughlin
2009-06-17 9:03 ` Avi Kivity
2009-06-17 9:18 ` Mark McLoughlin
2009-06-17 9:26 ` Avi Kivity
2009-06-17 11:58 ` Jamie Lokier
2009-06-24 8:04 ` Dietmar Maurer
2009-07-07 11:08 ` [Qemu-devel] [PATCH 0/3] Change virtio blk/console PCI classes and introduce compat machine type [was Re: Configuration vs. compat hints] Mark McLoughlin
2009-07-07 11:09 ` [Qemu-devel] [PATCH 1/3] Change default PCI class of virtio-blk to PCI_CLASS_STORAGE_SCSI Mark McLoughlin
2009-07-07 11:09 ` [Qemu-devel] [PATCH 2/3] Change default PCI class of virtio-console to PCI_CLASS_SERIAL_OTHER Mark McLoughlin
2009-07-07 11:10 ` [Qemu-devel] [PATCH 3/3] Add a pc-0-10 machine type for compatibility with 0.10.x Mark McLoughlin
2009-07-07 12:01 ` Avi Kivity
2009-07-08 10:46 ` Mark McLoughlin
2009-07-08 10:48 ` [Qemu-devel] [PATCH 3/3 v2] " Mark McLoughlin
2009-07-08 13:00 ` Gerd Hoffmann
2009-07-08 13:44 ` Anthony Liguori
2009-07-08 14:09 ` Gerd Hoffmann
2009-07-08 15:08 ` Mark McLoughlin
2009-07-08 19:07 ` Gerd Hoffmann
2009-07-08 21:45 ` Anthony Liguori
2009-07-09 7:56 ` Gerd Hoffmann
2009-07-09 8:39 ` Mark McLoughlin
2009-07-09 8:50 ` Avi Kivity
2009-07-09 8:57 ` Mark McLoughlin
2009-07-09 9:04 ` Avi Kivity
2009-07-09 9:05 ` Gerd Hoffmann
2009-07-09 10:01 ` Gerd Hoffmann
2009-07-09 13:31 ` Mark McLoughlin
2009-07-09 13:47 ` Gerd Hoffmann
2009-07-09 13:35 ` Anthony Liguori
2009-07-09 13:55 ` Gerd Hoffmann
2009-07-09 16:09 ` Paul Brook
2009-07-09 11:51 ` Avi Kivity
2009-07-09 13:29 ` Anthony Liguori
2009-07-09 13:59 ` Avi Kivity
2009-07-09 15:00 ` Anthony Liguori
2009-07-21 14:21 ` [Qemu-devel] [PATCH 0/4] Add pc-0.11 machine type and make pc an alias to it Mark McLoughlin
2009-07-21 14:21 ` [Qemu-devel] [PATCH 1/4] Remove the pc-0-10 machine type Mark McLoughlin
2009-07-21 14:49 ` Mark McLoughlin
2009-07-22 2:14 ` Anthony Liguori
2009-07-22 8:56 ` Gerd Hoffmann
2009-07-22 9:05 ` Mark McLoughlin
2009-07-22 9:02 ` Mark McLoughlin
2009-07-22 9:02 ` [Qemu-devel] [PATCH 1/2] Add machine type aliases Mark McLoughlin
2009-07-22 9:02 ` [Qemu-devel] [PATCH 2/2] Add a pc-0.11 machine type and make the pc type an alias Mark McLoughlin
2009-07-23 13:34 ` Mark McLoughlin
2009-07-21 14:21 ` [Qemu-devel] [PATCH 2/4] Remove the virtio-{blk, console}-pci-0-10 device types Mark McLoughlin
2009-07-21 14:21 ` [Qemu-devel] [PATCH 3/4] Add machine type aliases Mark McLoughlin
2009-07-21 14:21 ` [Qemu-devel] [PATCH 4/4] Add a pc-0.11 machine type and make the pc type an alias Mark McLoughlin
2009-07-09 8:00 ` [Qemu-devel] [PATCH 3/3 v2] Add a pc-0-10 machine type for compatibility with 0.10.x Avi Kivity
2009-07-15 11:27 ` [Qemu-devel] [PATCH 2/3] Change default PCI class of virtio-console to PCI_CLASS_SERIAL_OTHER Amit Shah
2009-06-15 11:35 ` [Qemu-devel] Re: Configuration vs. compat hints Markus Armbruster
2009-06-15 11:43 ` Avi Kivity
2009-06-15 11:59 ` Stefano Stabellini
2009-06-15 12:41 ` Markus Armbruster
2009-06-15 12:50 ` Anthony Liguori
2009-06-15 14:23 ` Javier Guerra
2009-06-15 12:41 ` Configuration vs. compat hints [was Re: [Qemu-devel] [PATCHv3 03/13] qemu: add routines to manage PCI capabilities] Anthony Liguori
2009-06-15 12:55 ` Avi Kivity
2009-06-15 13:04 ` [Qemu-devel] Re: Configuration vs. compat hints Markus Armbruster
2009-06-15 9:43 ` Configuration vs. compat hints [was Re: [Qemu-devel] [PATCHv3 03/13] qemu: add routines to manage PCI capabilities] Avi Kivity
2009-06-15 10:29 ` Michael S. Tsirkin
2009-06-15 12:45 ` Anthony Liguori
2009-06-15 13:03 ` Avi Kivity
2009-06-15 13:20 ` Anthony Liguori
2009-06-15 13:35 ` Avi Kivity
2009-06-15 13:45 ` Anthony Liguori
2009-06-15 13:54 ` Avi Kivity
2009-06-15 15:07 ` Anthony Liguori
2009-06-15 15:11 ` Avi Kivity
2009-06-15 15:20 ` Anthony Liguori
2009-06-15 15:26 ` Avi Kivity
2009-06-15 13:17 ` Gerd Hoffmann
2009-06-14 7:55 ` Avi Kivity
2009-06-12 14:55 ` Anthony Liguori
2009-06-12 15:53 ` Mark McLoughlin
2009-06-12 16:12 ` Anthony Liguori
2009-06-12 16:48 ` Mark McLoughlin
2009-06-14 7:58 ` Avi Kivity
2009-06-15 5:32 ` [Qemu-devel] Re: Configuration vs. compat hints Markus Armbruster
2009-06-15 9:09 ` Configuration vs. compat hints [was Re: [Qemu-devel] [PATCHv3 03/13] qemu: add routines to manage PCI capabilities] Mark McLoughlin
2009-06-15 11:32 ` Avi Kivity
2009-06-15 12:48 ` Anthony Liguori
2009-06-15 13:12 ` Avi Kivity
2009-06-15 13:24 ` Anthony Liguori
2009-06-15 13:43 ` Avi Kivity
2009-06-15 14:00 ` Mark McLoughlin
2009-06-15 14:20 ` Anthony Liguori
2009-06-15 14:34 ` Michael S. Tsirkin
2009-06-15 15:11 ` Anthony Liguori
2009-06-14 9:34 ` Michael S. Tsirkin
2009-06-14 9:37 ` Avi Kivity
2009-06-14 9:47 ` Michael S. Tsirkin
2009-06-15 9:38 ` Avi Kivity
2009-06-15 9:02 ` Mark McLoughlin
2009-06-05 10:23 ` [Qemu-devel] [PATCHv3 04/13] qemu: helper routines for pci access Michael S. Tsirkin
2009-06-05 10:23 ` [Qemu-devel] [PATCHv3 05/13] qemu: MSI-X support functions Michael S. Tsirkin
2009-06-09 17:26 ` Glauber Costa
2009-06-10 9:58 ` Michael S. Tsirkin [this message]
2009-06-05 10:23 ` [Qemu-devel] [PATCHv3 06/13] qemu: add flag to disable MSI-X by default Michael S. Tsirkin
2009-06-05 10:23 ` [Qemu-devel] [PATCHv3 07/13] qemu: minimal MSI/MSI-X implementation for PC Michael S. Tsirkin
2009-06-09 17:33 ` Glauber Costa
2009-06-10 9:59 ` Michael S. Tsirkin
2009-06-05 10:23 ` [Qemu-devel] [PATCHv3 08/13] qemu: add support for resizing regions Michael S. Tsirkin
2009-06-09 17:36 ` Glauber Costa
2009-06-10 10:05 ` Michael S. Tsirkin
2009-06-10 10:46 ` Michael S. Tsirkin
2009-06-05 10:24 ` [Qemu-devel] [PATCHv3 09/13] qemu: virtio support for many interrupt vectors Michael S. Tsirkin
2009-06-05 10:24 ` [Qemu-devel] [PATCHv3 10/13] qemu: MSI-X support in virtio PCI Michael S. Tsirkin
2009-06-05 10:24 ` [Qemu-devel] [PATCHv3 11/13] qemu: request 3 vectors in virtio-net Michael S. Tsirkin
2009-06-05 10:24 ` [Qemu-devel] [PATCHv3 12/13] qemu: virtio save/load bindings Michael S. Tsirkin
2009-06-09 17:45 ` Glauber Costa
2009-06-10 10:11 ` Michael S. Tsirkin
2009-06-10 11:33 ` Michael S. Tsirkin
2009-06-05 10:24 ` [Qemu-devel] [PATCHv3 13/13] qemu: add pci_get/set_byte Michael S. Tsirkin
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=20090610095835.GF6844@redhat.com \
--to=mst@redhat.com \
--cc=avi@redhat.com \
--cc=blauwirbel@gmail.com \
--cc=borntraeger@de.ibm.com \
--cc=cotte@de.ibm.com \
--cc=glommer@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=paul@codesourcery.com \
--cc=qemu-devel@nongnu.org \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.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).