From patchwork Tue Apr 5 15:08:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Kumar X-Patchwork-Id: 89893 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E412CB6F90 for ; Wed, 6 Apr 2011 01:09:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754114Ab1DEPIr (ORCPT ); Tue, 5 Apr 2011 11:08:47 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:40694 "EHLO e23smtp01.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753150Ab1DEPIp (ORCPT ); Tue, 5 Apr 2011 11:08:45 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp01.au.ibm.com (8.14.4/8.13.1) with ESMTP id p35F4ntK016434; Wed, 6 Apr 2011 01:04:49 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p35F8iPT2134146; Wed, 6 Apr 2011 01:08:44 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p35F8gMm018792; Wed, 6 Apr 2011 01:08:43 +1000 Received: from krkumar2.in.ibm.com ([9.79.181.128]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p35F8dsk018755; Wed, 6 Apr 2011 01:08:40 +1000 From: Krishna Kumar To: rusty@rustcorp.com.au, davem@davemloft.net, mst@redhat.com Cc: eric.dumazet@gmail.com, arnd@arndb.de, netdev@vger.kernel.org, horms@verge.net.au, avi@redhat.com, anthony@codemonkey.ws, kvm@vger.kernel.org, Krishna Kumar Date: Tue, 05 Apr 2011 20:38:39 +0530 Message-Id: <20110405150839.20501.35344.sendpatchset@krkumar2.in.ibm.com> In-Reply-To: <20110405150826.20501.39679.sendpatchset@krkumar2.in.ibm.com> References: <20110405150826.20501.39679.sendpatchset@krkumar2.in.ibm.com> Subject: [PATCH 1/4] [RFC rev2] Change virtqueue structure Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move queue_index from virtio_pci_vq_info to virtqueue. This allows callback handlers to figure out the queue number for the vq that needs attention. Signed-off-by: Krishna Kumar --- drivers/virtio/virtio_pci.c | 10 +++------- include/linux/virtio.h | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -ruNp org/include/linux/virtio.h new/include/linux/virtio.h --- org/include/linux/virtio.h 2011-04-05 14:15:18.000000000 +0530 +++ new/include/linux/virtio.h 2011-04-05 14:15:18.000000000 +0530 @@ -22,6 +22,7 @@ struct virtqueue { void (*callback)(struct virtqueue *vq); const char *name; struct virtio_device *vdev; + int queue_index; /* the index of the queue */ void *priv; }; diff -ruNp org/drivers/virtio/virtio_pci.c new/drivers/virtio/virtio_pci.c --- org/drivers/virtio/virtio_pci.c 2011-04-05 14:15:18.000000000 +0530 +++ new/drivers/virtio/virtio_pci.c 2011-04-05 14:15:18.000000000 +0530 @@ -75,9 +75,6 @@ struct virtio_pci_vq_info /* the number of entries in the queue */ int num; - /* the index of the queue */ - int queue_index; - /* the virtual address of the ring queue */ void *queue; @@ -180,11 +177,10 @@ static void vp_reset(struct virtio_devic static void vp_notify(struct virtqueue *vq) { struct virtio_pci_device *vp_dev = to_vp_device(vq->vdev); - struct virtio_pci_vq_info *info = vq->priv; /* we write the queue's selector into the notification register to * signal the other end */ - iowrite16(info->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_NOTIFY); + iowrite16(vq->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_NOTIFY); } /* Handle a configuration change: Tell driver if it wants to know. */ @@ -380,7 +376,6 @@ static struct virtqueue *setup_vq(struct if (!info) return ERR_PTR(-ENOMEM); - info->queue_index = index; info->num = num; info->msix_vector = msix_vec; @@ -403,6 +398,7 @@ static struct virtqueue *setup_vq(struct goto out_activate_queue; } + vq->queue_index = index; vq->priv = info; info->vq = vq; @@ -441,7 +437,7 @@ static void vp_del_vq(struct virtqueue * list_del(&info->node); spin_unlock_irqrestore(&vp_dev->lock, flags); - iowrite16(info->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_SEL); + iowrite16(vq->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_SEL); if (vp_dev->msix_enabled) { iowrite16(VIRTIO_MSI_NO_VECTOR,