From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: Re: [net-next RFC V5 2/5] virtio_ring: move queue_index to vring_virtqueue Date: Thu, 05 Jul 2012 13:40:54 +0200 Message-ID: <1341488454.18786.15.camel@lappy> References: <1341484194-8108-1-git-send-email-jasowang@redhat.com> <1341484194-8108-3-git-send-email-jasowang@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1341484194-8108-3-git-send-email-jasowang@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Jason Wang Cc: krkumar2@in.ibm.com, habanero@linux.vnet.ibm.com, mashirle@us.ibm.com, kvm@vger.kernel.org, mst@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, edumazet@google.com, tahm@linux.vnet.ibm.com, jwhan@filewood.snu.ac.kr, davem@davemloft.net, sri@us.ibm.com List-Id: virtualization@lists.linuxfoundation.org T24gVGh1LCAyMDEyLTA3LTA1IGF0IDE4OjI5ICswODAwLCBKYXNvbiBXYW5nIHdyb3RlOgo+IElu c3RlYWQgb2Ygc3RvcmluZyB0aGUgcXVldWUgaW5kZXggaW4gdmlydGlvIGluZm9zLCB0aGlzIHBh dGNoIG1vdmVzIHRoZW0gdG8KPiB2cmluZ192aXJ0cXVldWUgYW5kIGludHJvZHVjZXMgaGVscGVy cyB0byBzZXQgYW5kIGdldCB0aGUgdmFsdWUuIFRoaXMgd291bGQKPiBzaW1wbGlmeSB0aGUgbWFu YWdlbWVudCBhbmQgdHJhY2luZy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBKYXNvbiBXYW5nIDxqYXNv d2FuZ0ByZWRoYXQuY29tPgoKVGhpcyBwYXRjaCBhY3R1YWxseSBmYWlscyB0byBjb21waWxlOgoK ZHJpdmVycy92aXJ0aW8vdmlydGlvX21taW8uYzogSW4gZnVuY3Rpb24g4oCYdm1fbm90aWZ54oCZ Ogpkcml2ZXJzL3ZpcnRpby92aXJ0aW9fbW1pby5jOjIyOToxMzogZXJyb3I6IOKAmHN0cnVjdCB2 aXJ0aW9fbW1pb192cV9pbmZv4oCZIGhhcyBubyBtZW1iZXIgbmFtZWQg4oCYcXVldWVfaW5kZXji gJkKZHJpdmVycy92aXJ0aW8vdmlydGlvX21taW8uYzogSW4gZnVuY3Rpb24g4oCYdm1fZGVsX3Zx 4oCZOgpkcml2ZXJzL3ZpcnRpby92aXJ0aW9fbW1pby5jOjI3ODoxMzogZXJyb3I6IOKAmHN0cnVj dCB2aXJ0aW9fbW1pb192cV9pbmZv4oCZIGhhcyBubyBtZW1iZXIgbmFtZWQg4oCYcXVldWVfaW5k ZXjigJkKbWFrZVsyXTogKioqIFtkcml2ZXJzL3ZpcnRpby92aXJ0aW9fbW1pby5vXSBFcnJvciAx CgpJdCBwcm9iYWJseSBtaXNzZXMgdGhlIGZvbGxvd2luZyBodW5rczoKCmRpZmYgLS1naXQgYS9k cml2ZXJzL3ZpcnRpby92aXJ0aW9fbW1pby5jIGIvZHJpdmVycy92aXJ0aW8vdmlydGlvX21taW8u YwppbmRleCBmNTQzMmI2Li4xMmI2MTgwIDEwMDY0NAotLS0gYS9kcml2ZXJzL3ZpcnRpby92aXJ0 aW9fbW1pby5jCisrKyBiL2RyaXZlcnMvdmlydGlvL3ZpcnRpb19tbWlvLmMKQEAgLTIyMiwxMSAr MjIyLDEwIEBAIHN0YXRpYyB2b2lkIHZtX3Jlc2V0KHN0cnVjdCB2aXJ0aW9fZGV2aWNlICp2ZGV2 KQogc3RhdGljIHZvaWQgdm1fbm90aWZ5KHN0cnVjdCB2aXJ0cXVldWUgKnZxKQogewogICAgICAg IHN0cnVjdCB2aXJ0aW9fbW1pb19kZXZpY2UgKnZtX2RldiA9IHRvX3ZpcnRpb19tbWlvX2Rldmlj ZSh2cS0+dmRldik7Ci0gICAgICAgc3RydWN0IHZpcnRpb19tbWlvX3ZxX2luZm8gKmluZm8gPSB2 cS0+cHJpdjsKIAogICAgICAgIC8qIFdlIHdyaXRlIHRoZSBxdWV1ZSdzIHNlbGVjdG9yIGludG8g dGhlIG5vdGlmaWNhdGlvbiByZWdpc3RlciB0bwogICAgICAgICAqIHNpZ25hbCB0aGUgb3RoZXIg ZW5kICovCi0gICAgICAgd3JpdGVsKGluZm8tPnF1ZXVlX2luZGV4LCB2bV9kZXYtPmJhc2UgKyBW SVJUSU9fTU1JT19RVUVVRV9OT1RJRlkpOworICAgICAgIHdyaXRlbCh2aXJ0cXVldWVfZ2V0X3F1 ZXVlX2luZGV4KHZxKSwgdm1fZGV2LT5iYXNlICsgVklSVElPX01NSU9fUVVFVUVfTk9USUZZKTsK IH0KIAogLyogTm90aWZ5IGFsbCB2aXJ0cXVldWVzIG9uIGFuIGludGVycnVwdC4gKi8KQEAgLTI3 NSw3ICsyNzQsNyBAQCBzdGF0aWMgdm9pZCB2bV9kZWxfdnEoc3RydWN0IHZpcnRxdWV1ZSAqdnEp CiAgICAgICAgdnJpbmdfZGVsX3ZpcnRxdWV1ZSh2cSk7CiAKICAgICAgICAvKiBTZWxlY3QgYW5k IGRlYWN0aXZhdGUgdGhlIHF1ZXVlICovCi0gICAgICAgd3JpdGVsKGluZm8tPnF1ZXVlX2luZGV4 LCB2bV9kZXYtPmJhc2UgKyBWSVJUSU9fTU1JT19RVUVVRV9TRUwpOworICAgICAgIHdyaXRlbCh2 aXJ0cXVldWVfZ2V0X3F1ZXVlX2luZGV4KHZxKSwgdm1fZGV2LT5iYXNlICsgVklSVElPX01NSU9f UVVFVUVfU0VMKTsKICAgICAgICB3cml0ZWwoMCwgdm1fZGV2LT5iYXNlICsgVklSVElPX01NSU9f UVVFVUVfUEZOKTsKIAogICAgICAgIHNpemUgPSBQQUdFX0FMSUdOKHZyaW5nX3NpemUoaW5mby0+ bnVtLCBWSVJUSU9fTU1JT19WUklOR19BTElHTikpOwoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KVmlydHVhbGl6YXRpb24gbWFpbGluZyBsaXN0ClZpcnR1 YWxpemF0aW9uQGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXhm b3VuZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3ZpcnR1YWxpemF0aW9u From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755889Ab2GELkM (ORCPT ); Thu, 5 Jul 2012 07:40:12 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:47364 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755676Ab2GELkJ (ORCPT ); Thu, 5 Jul 2012 07:40:09 -0400 Message-ID: <1341488454.18786.15.camel@lappy> Subject: Re: [net-next RFC V5 2/5] virtio_ring: move queue_index to vring_virtqueue From: Sasha Levin To: Jason Wang Cc: mst@redhat.com, mashirle@us.ibm.com, krkumar2@in.ibm.com, habanero@linux.vnet.ibm.com, rusty@rustcorp.com.au, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, edumazet@google.com, tahm@linux.vnet.ibm.com, jwhan@filewood.snu.ac.kr, davem@davemloft.net, akong@redhat.com, kvm@vger.kernel.org, sri@us.ibm.com Date: Thu, 05 Jul 2012 13:40:54 +0200 In-Reply-To: <1341484194-8108-3-git-send-email-jasowang@redhat.com> References: <1341484194-8108-1-git-send-email-jasowang@redhat.com> <1341484194-8108-3-git-send-email-jasowang@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3 Content-Transfer-Encoding: 8bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2012-07-05 at 18:29 +0800, Jason Wang wrote: > Instead of storing the queue index in virtio infos, this patch moves them to > vring_virtqueue and introduces helpers to set and get the value. This would > simplify the management and tracing. > > Signed-off-by: Jason Wang This patch actually fails to compile: drivers/virtio/virtio_mmio.c: In function ‘vm_notify’: drivers/virtio/virtio_mmio.c:229:13: error: ‘struct virtio_mmio_vq_info’ has no member named ‘queue_index’ drivers/virtio/virtio_mmio.c: In function ‘vm_del_vq’: drivers/virtio/virtio_mmio.c:278:13: error: ‘struct virtio_mmio_vq_info’ has no member named ‘queue_index’ make[2]: *** [drivers/virtio/virtio_mmio.o] Error 1 It probably misses the following hunks: diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index f5432b6..12b6180 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -222,11 +222,10 @@ static void vm_reset(struct virtio_device *vdev) static void vm_notify(struct virtqueue *vq) { struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vq->vdev); - struct virtio_mmio_vq_info *info = vq->priv; /* We write the queue's selector into the notification register to * signal the other end */ - writel(info->queue_index, vm_dev->base + VIRTIO_MMIO_QUEUE_NOTIFY); + writel(virtqueue_get_queue_index(vq), vm_dev->base + VIRTIO_MMIO_QUEUE_NOTIFY); } /* Notify all virtqueues on an interrupt. */ @@ -275,7 +274,7 @@ static void vm_del_vq(struct virtqueue *vq) vring_del_virtqueue(vq); /* Select and deactivate the queue */ - writel(info->queue_index, vm_dev->base + VIRTIO_MMIO_QUEUE_SEL); + writel(virtqueue_get_queue_index(vq), vm_dev->base + VIRTIO_MMIO_QUEUE_SEL); writel(0, vm_dev->base + VIRTIO_MMIO_QUEUE_PFN); size = PAGE_ALIGN(vring_size(info->num, VIRTIO_MMIO_VRING_ALIGN));