From: "john.liuli" <john.liuli@huawei.com> To: <linux-kernel@vger.kernel.org> Cc: <qemu-devel@nongnu.org>, <peter.huangpeng@huawei.com>, <rusty@rustcorp.com.au>, <mst@redhat.com>, <virtualization@lists.linux-foundation.org>, <n.nikolaev@virtualopensystems.com>, <yingshiuan.pan@gmail.com>, <remy.gauguey@cea.fr>, <joel.schopp@amd.com>, Li Liu <john.liuli@huawei.com> Subject: [RFC PATCH 2/2] Assign a new irq handler while irqfd enabled Date: Sat, 25 Oct 2014 16:24:54 +0800 [thread overview] Message-ID: <1414225494-2208-3-git-send-email-john.liuli@huawei.com> (raw) In-Reply-To: <1414225494-2208-1-git-send-email-john.liuli@huawei.com> From: Li Liu <john.liuli@huawei.com> This irq handler will get the interrupt reason from a shared memory. And will be assigned only while irqfd enabled. Signed-off-by: Li Liu <john.liuli@huawei.com> --- drivers/virtio/virtio_mmio.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 28ddb55..7229605 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -259,7 +259,31 @@ static irqreturn_t vm_interrupt(int irq, void *opaque) return ret; } +/* Notify all virtqueues on an interrupt. */ +static irqreturn_t vm_interrupt_irqfd(int irq, void *opaque) +{ + struct virtio_mmio_device *vm_dev = opaque; + struct virtio_mmio_vq_info *info; + unsigned long status; + unsigned long flags; + irqreturn_t ret = IRQ_NONE; + /* Read the interrupt reason and reset it */ + status = *vm_dev->isr_mem; + *vm_dev->isr_mem = 0x0; + + if (unlikely(status & VIRTIO_MMIO_INT_CONFIG)) { + virtio_config_changed(&vm_dev->vdev); + ret = IRQ_HANDLED; + } + + spin_lock_irqsave(&vm_dev->lock, flags); + list_for_each_entry(info, &vm_dev->virtqueues, node) + ret |= vring_interrupt(irq, info->vq); + spin_unlock_irqrestore(&vm_dev->lock, flags); + + return ret; +} static void vm_del_vq(struct virtqueue *vq) { @@ -391,6 +415,7 @@ error_available: return ERR_PTR(err); } +#define VIRTIO_MMIO_F_IRQFD (1 << 7) static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs, struct virtqueue *vqs[], vq_callback_t *callbacks[], @@ -400,8 +425,13 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs, unsigned int irq = platform_get_irq(vm_dev->pdev, 0); int i, err; - err = request_irq(irq, vm_interrupt, IRQF_SHARED, - dev_name(&vdev->dev), vm_dev); + if (*vm_dev->isr_mem & VIRTIO_MMIO_F_IRQFD) { + err = request_irq(irq, vm_interrupt_irqfd, IRQF_SHARED, + dev_name(&vdev->dev), vm_dev); + } else { + err = request_irq(irq, vm_interrupt, IRQF_SHARED, + dev_name(&vdev->dev), vm_dev); + } if (err) return err; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: "john.liuli" <john.liuli@huawei.com> To: linux-kernel@vger.kernel.org Cc: joel.schopp@amd.com, yingshiuan.pan@gmail.com, mst@redhat.com, Li Liu <john.liuli@huawei.com>, remy.gauguey@cea.fr, rusty@rustcorp.com.au, qemu-devel@nongnu.org, n.nikolaev@virtualopensystems.com, virtualization@lists.linux-foundation.org, peter.huangpeng@huawei.com Subject: [Qemu-devel] [RFC PATCH 2/2] Assign a new irq handler while irqfd enabled Date: Sat, 25 Oct 2014 16:24:54 +0800 [thread overview] Message-ID: <1414225494-2208-3-git-send-email-john.liuli@huawei.com> (raw) In-Reply-To: <1414225494-2208-1-git-send-email-john.liuli@huawei.com> From: Li Liu <john.liuli@huawei.com> This irq handler will get the interrupt reason from a shared memory. And will be assigned only while irqfd enabled. Signed-off-by: Li Liu <john.liuli@huawei.com> --- drivers/virtio/virtio_mmio.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 28ddb55..7229605 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -259,7 +259,31 @@ static irqreturn_t vm_interrupt(int irq, void *opaque) return ret; } +/* Notify all virtqueues on an interrupt. */ +static irqreturn_t vm_interrupt_irqfd(int irq, void *opaque) +{ + struct virtio_mmio_device *vm_dev = opaque; + struct virtio_mmio_vq_info *info; + unsigned long status; + unsigned long flags; + irqreturn_t ret = IRQ_NONE; + /* Read the interrupt reason and reset it */ + status = *vm_dev->isr_mem; + *vm_dev->isr_mem = 0x0; + + if (unlikely(status & VIRTIO_MMIO_INT_CONFIG)) { + virtio_config_changed(&vm_dev->vdev); + ret = IRQ_HANDLED; + } + + spin_lock_irqsave(&vm_dev->lock, flags); + list_for_each_entry(info, &vm_dev->virtqueues, node) + ret |= vring_interrupt(irq, info->vq); + spin_unlock_irqrestore(&vm_dev->lock, flags); + + return ret; +} static void vm_del_vq(struct virtqueue *vq) { @@ -391,6 +415,7 @@ error_available: return ERR_PTR(err); } +#define VIRTIO_MMIO_F_IRQFD (1 << 7) static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs, struct virtqueue *vqs[], vq_callback_t *callbacks[], @@ -400,8 +425,13 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs, unsigned int irq = platform_get_irq(vm_dev->pdev, 0); int i, err; - err = request_irq(irq, vm_interrupt, IRQF_SHARED, - dev_name(&vdev->dev), vm_dev); + if (*vm_dev->isr_mem & VIRTIO_MMIO_F_IRQFD) { + err = request_irq(irq, vm_interrupt_irqfd, IRQF_SHARED, + dev_name(&vdev->dev), vm_dev); + } else { + err = request_irq(irq, vm_interrupt, IRQF_SHARED, + dev_name(&vdev->dev), vm_dev); + } if (err) return err; -- 1.7.9.5
next prev parent reply other threads:[~2014-10-25 18:33 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-10-25 8:24 [RFC PATCH 0/2] virtio-mmio: add irqfd support for vhost-net based on virtio-mmio john.liuli 2014-10-25 8:24 ` [Qemu-devel] " john.liuli 2014-10-25 8:24 ` [RFC PATCH 1/2] Add a new register offset let interrupt reason available john.liuli 2014-10-25 8:24 ` [Qemu-devel] " john.liuli 2014-10-26 12:01 ` Michael S. Tsirkin 2014-10-26 12:01 ` Michael S. Tsirkin 2014-10-26 12:01 ` [Qemu-devel] " Michael S. Tsirkin 2014-10-25 8:24 ` john.liuli 2014-10-25 8:24 ` john.liuli [this message] 2014-10-25 8:24 ` [Qemu-devel] [RFC PATCH 2/2] Assign a new irq handler while irqfd enabled john.liuli 2014-10-26 11:56 ` Michael S. Tsirkin 2014-10-26 11:56 ` Michael S. Tsirkin 2014-10-26 11:56 ` [Qemu-devel] " Michael S. Tsirkin 2014-10-27 11:04 ` Li Liu 2014-10-27 11:04 ` Li Liu 2014-10-27 11:04 ` [Qemu-devel] " Li Liu 2014-10-27 12:03 ` Michael S. Tsirkin 2014-10-27 12:03 ` Michael S. Tsirkin 2014-10-27 12:03 ` [Qemu-devel] " Michael S. Tsirkin 2014-10-25 8:24 ` john.liuli 2014-10-26 11:52 ` [RFC PATCH 0/2] virtio-mmio: add irqfd support for vhost-net based on virtio-mmio Michael S. Tsirkin 2014-10-26 11:52 ` Michael S. Tsirkin 2014-10-26 11:52 ` [Qemu-devel] " Michael S. Tsirkin 2014-10-27 9:19 ` Li Liu 2014-10-27 9:19 ` [Qemu-devel] " Li Liu 2014-10-27 10:48 ` Michael S. Tsirkin 2014-10-27 10:48 ` Michael S. Tsirkin 2014-10-27 10:48 ` [Qemu-devel] " Michael S. Tsirkin 2014-10-27 9:19 ` Li Liu 2014-10-27 9:37 ` [Qemu-devel] " Peter Maydell 2014-10-27 9:37 ` Peter Maydell 2014-10-27 9:37 ` Peter Maydell 2014-10-27 11:23 ` Li Liu 2014-10-27 11:23 ` Li Liu 2014-10-27 11:23 ` Li Liu 2014-10-27 11:58 ` Peter Maydell 2014-10-27 11:58 ` Peter Maydell 2014-10-27 11:58 ` Peter Maydell 2014-11-05 9:30 ` Christoffer Dall 2014-11-05 9:30 ` Christoffer Dall 2014-11-05 9:30 ` Christoffer Dall 2014-11-05 8:43 ` Eric Auger 2014-11-05 8:43 ` Eric Auger 2014-11-06 1:59 ` Shannon Zhao 2014-11-06 1:59 ` Shannon Zhao 2014-11-06 9:24 ` Li Liu 2014-11-06 9:24 ` Li Liu 2014-11-06 9:24 ` Li Liu 2014-11-06 1:59 ` Shannon Zhao 2014-11-05 8:43 ` Eric Auger
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=1414225494-2208-3-git-send-email-john.liuli@huawei.com \ --to=john.liuli@huawei.com \ --cc=joel.schopp@amd.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mst@redhat.com \ --cc=n.nikolaev@virtualopensystems.com \ --cc=peter.huangpeng@huawei.com \ --cc=qemu-devel@nongnu.org \ --cc=remy.gauguey@cea.fr \ --cc=rusty@rustcorp.com.au \ --cc=virtualization@lists.linux-foundation.org \ --cc=yingshiuan.pan@gmail.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: linkBe 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.