From: Tiwei Bie <tiwei.bie@intel.com>
To: mst@redhat.com, jasowang@redhat.com,
virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
virtio-dev@lists.oasis-open.org
Cc: wexu@redhat.com, jfreimann@redhat.com, tiwei.bie@intel.com
Subject: [PATCH net-next v2 5/5] virtio_ring: enable packed ring
Date: Wed, 11 Jul 2018 10:27:11 +0800 [thread overview]
Message-ID: <20180711022711.7090-6-tiwei.bie@intel.com> (raw)
In-Reply-To: <20180711022711.7090-1-tiwei.bie@intel.com>
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
drivers/s390/virtio/virtio_ccw.c | 14 ++++++++++++++
drivers/virtio/virtio_ring.c | 2 ++
2 files changed, 16 insertions(+)
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index 8f5c1d7f751a..8654f3a94635 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -765,6 +765,17 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev)
return rc;
}
+static void ccw_transport_features(struct virtio_device *vdev)
+{
+ /*
+ * Packed ring isn't enabled on virtio_ccw for now,
+ * because virtio_ccw uses some legacy accessors,
+ * e.g. virtqueue_get_avail() and virtqueue_get_used()
+ * which aren't available in packed ring currently.
+ */
+ __virtio_clear_bit(vdev, VIRTIO_F_RING_PACKED);
+}
+
static int virtio_ccw_finalize_features(struct virtio_device *vdev)
{
struct virtio_ccw_device *vcdev = to_vc_device(vdev);
@@ -791,6 +802,9 @@ static int virtio_ccw_finalize_features(struct virtio_device *vdev)
/* Give virtio_ring a chance to accept features. */
vring_transport_features(vdev);
+ /* Give virtio_ccw a chance to accept features. */
+ ccw_transport_features(vdev);
+
features->index = 0;
features->features = cpu_to_le32((u32)vdev->features);
/* Write the first half of the feature bits to the host. */
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index f79a1e17f7d1..807ed4b362c5 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1968,6 +1968,8 @@ void vring_transport_features(struct virtio_device *vdev)
break;
case VIRTIO_F_IOMMU_PLATFORM:
break;
+ case VIRTIO_F_RING_PACKED:
+ break;
default:
/* We don't understand this bit. */
__virtio_clear_bit(vdev, i);
--
2.18.0
next prev parent reply other threads:[~2018-07-11 2:27 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 2:27 [PATCH net-next v2 0/5] virtio: support packed ring Tiwei Bie
2018-07-11 2:27 ` [PATCH net-next v2 1/5] virtio: add packed ring definitions Tiwei Bie
2018-09-07 13:51 ` Michael S. Tsirkin
2018-09-10 2:13 ` Tiwei Bie
2018-09-12 12:53 ` Michael S. Tsirkin
2018-07-11 2:27 ` [PATCH net-next v2 2/5] virtio_ring: support creating packed ring Tiwei Bie
2018-09-07 14:03 ` Michael S. Tsirkin
2018-09-10 2:28 ` Tiwei Bie
2018-09-12 7:51 ` Tiwei Bie
2018-09-12 16:12 ` Michael S. Tsirkin
2018-09-12 12:45 ` Michael S. Tsirkin
2018-07-11 2:27 ` [PATCH net-next v2 3/5] virtio_ring: add packed ring support Tiwei Bie
2018-09-07 13:49 ` Michael S. Tsirkin
2018-09-10 2:03 ` Tiwei Bie
2018-09-12 16:22 ` Michael S. Tsirkin
2018-11-07 17:48 ` Michael S. Tsirkin
2018-11-08 1:38 ` Tiwei Bie
2018-11-08 8:18 ` Jason Wang
2018-11-08 11:51 ` Tiwei Bie
2018-11-08 15:56 ` Michael S. Tsirkin
2018-11-09 1:50 ` Tiwei Bie
2018-11-09 2:30 ` Jason Wang
2018-11-09 4:00 ` Michael S. Tsirkin
2018-11-09 10:05 ` Jason Wang
2018-11-08 14:14 ` Michael S. Tsirkin
2018-11-09 2:25 ` Jason Wang
2018-11-09 3:58 ` Michael S. Tsirkin
2018-11-09 10:04 ` Jason Wang
2018-07-11 2:27 ` [PATCH net-next v2 4/5] virtio_ring: add event idx support in packed ring Tiwei Bie
2018-09-07 14:10 ` Michael S. Tsirkin
2018-09-10 2:35 ` [virtio-dev] " Tiwei Bie
2018-07-11 2:27 ` Tiwei Bie [this message]
2018-07-11 2:52 ` [PATCH net-next v2 0/5] virtio: support " Jason Wang
2018-07-12 21:44 ` David Miller
2018-07-13 0:52 ` Jason Wang
2018-07-13 3:26 ` Michael S. Tsirkin
2018-08-27 14:00 ` Michael S. Tsirkin
2018-08-28 5:51 ` [virtio-dev] " Jens Freimann
2018-09-07 1:22 ` Tiwei Bie
2018-09-07 13:00 ` Michael S. Tsirkin
2018-09-10 3:00 ` Tiwei Bie
2018-09-10 3:33 ` Jason Wang
2018-09-11 5:37 ` Tiwei Bie
2018-09-12 16:16 ` Michael S. Tsirkin
2018-09-13 8:59 ` Tiwei Bie
2018-09-13 9:47 ` Jason Wang
2018-10-10 14:36 ` Michael S. Tsirkin
2018-10-11 12:12 ` Tiwei Bie
2018-10-11 13:48 ` Michael S. Tsirkin
2018-10-11 14:13 ` Tiwei Bie
2018-10-11 14:17 ` Michael S. Tsirkin
2018-10-11 14:34 ` Tiwei Bie
2018-09-12 13:06 ` 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=20180711022711.7090-6-tiwei.bie@intel.com \
--to=tiwei.bie@intel.com \
--cc=jasowang@redhat.com \
--cc=jfreimann@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtio-dev@lists.oasis-open.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=wexu@redhat.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;
as well as URLs for NNTP newsgroup(s).