| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220709022745.21020-4-qtxuning1999@sjtu.edu.cn>
Date: Sat, 9 Jul 2022 10:27:44 +0800
From: Guo Zhi <qtxuning1999@...u.edu.cn>
To: jasowang@...hat.com, mst@...hat.com
Cc: eperezma@...hat.com, virtualization@...ts.linux-foundation.org,
linux-kernel@...r.kernel.org, sgarzare@...hat.com,
Guo Zhi <qtxuning1999@...u.edu.cn>
Subject: [PATCH v3 3/4] virtio_test: enable indirection feature
Prior implementation don't use indirection feature because there is only
one descriptor for every io event, actually prior implementation don't
support indirection because vhost can't translate and find the indirect
descriptors. This commit enable virtio_test malloc indirect descriptors
in a indirect buffer and map this buffer to vhost, thus resolve this
problem.
Signed-off-by: Guo Zhi <qtxuning1999@...u.edu.cn>
---
v3:
- use C style comment
- changed INDIRECT_TABLE name
- add comment for __kmalloc_fake
---
tools/virtio/virtio_test.c | 56 ++++++++++++++++++++++++++++++++------
1 file changed, 47 insertions(+), 9 deletions(-)
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index 1408a4a20..8f3ef3a78 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -21,8 +21,9 @@
#define RANDOM_BATCH -1
#define MAX_SG_FRAGS 8UL
+#define RINGSIZE 256
+#define INDIRECT_TABLE_SIZE (RINGSIZE * sizeof(struct vring_desc) * 8)
-/* Unused */
void *__kmalloc_fake, *__kfree_ignore_start, *__kfree_ignore_end;
struct vq_info {
@@ -44,6 +45,8 @@ struct vdev_info {
int nvqs;
void *buf;
size_t buf_size;
+ void *indirect_table;
+ size_t indirect_table_size;
struct vhost_memory *mem;
};
@@ -128,6 +131,8 @@ static void vq_info_add(struct vdev_info *dev, int num)
static void vdev_info_init(struct vdev_info* dev, unsigned long long features)
{
int r;
+ int nregions = 2;
+
memset(dev, 0, sizeof *dev);
dev->vdev.features = features;
INIT_LIST_HEAD(&dev->vdev.vqs);
@@ -135,19 +140,25 @@ static void vdev_info_init(struct vdev_info* dev, unsigned long long features)
dev->buf_size = 1024;
dev->buf = malloc(dev->buf_size);
assert(dev->buf);
- dev->control = open("/dev/vhost-test", O_RDWR);
+ dev->indirect_table_size = INDIRECT_TABLE_SIZE;
+ dev->indirect_table = malloc(dev->indirect_table_size);
+ assert(dev->indirect_table);
+ dev->control = open("/dev/vhost-test", O_RDWR);
assert(dev->control >= 0);
r = ioctl(dev->control, VHOST_SET_OWNER, NULL);
assert(r >= 0);
dev->mem = malloc(offsetof(struct vhost_memory, regions) +
- sizeof dev->mem->regions[0]);
+ (sizeof(dev->mem->regions[0])) * nregions);
assert(dev->mem);
memset(dev->mem, 0, offsetof(struct vhost_memory, regions) +
- sizeof dev->mem->regions[0]);
- dev->mem->nregions = 1;
+ (sizeof(dev->mem->regions[0])) * nregions);
+ dev->mem->nregions = nregions;
dev->mem->regions[0].guest_phys_addr = (long)dev->buf;
dev->mem->regions[0].userspace_addr = (long)dev->buf;
dev->mem->regions[0].memory_size = dev->buf_size;
+ dev->mem->regions[1].guest_phys_addr = (long)dev->indirect_table;
+ dev->mem->regions[1].userspace_addr = (long)dev->indirect_table;
+ dev->mem->regions[1].memory_size = dev->indirect_table_size;
r = ioctl(dev->control, VHOST_SET_MEM_TABLE, dev->mem);
assert(r >= 0);
}
@@ -167,6 +178,22 @@ static void wait_for_interrupt(struct vdev_info *dev)
}
}
+static int test_virtqueue_add_outbuf(struct virtqueue *vq,
+ struct scatterlist *sg, unsigned int num,
+ void *data, void *indirect_table)
+{
+ int r;
+
+ /* Allocate an indirect, force it to allocate user addr
+ * exists in vhost iotlb, otherwise vhost can't access
+ */
+ __kmalloc_fake = indirect_table;
+ r = virtqueue_add_outbuf(vq, sg, num, data,
+ GFP_ATOMIC);
+ __kmalloc_fake = NULL;
+ return r;
+}
+
static void run_test(struct vdev_info *dev, struct vq_info *vq,
bool delayed, int batch, int reset_n, int bufs)
{
@@ -178,6 +205,7 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
unsigned len;
long long spurious = 0;
const bool random_batch = batch == RANDOM_BATCH;
+ void *indirect_table;
r = ioctl(dev->control, VHOST_TEST_RUN, &test);
assert(r >= 0);
@@ -185,10 +213,15 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
next_reset = INT_MAX;
}
+ /* Don't kfree indirect_table. */
+ __kfree_ignore_start = dev->indirect_table;
+ __kfree_ignore_end = dev->indirect_table + dev->indirect_table_size;
+
for (;;) {
virtqueue_disable_cb(vq->vq);
completed_before = completed;
started_before = started;
+ indirect_table = dev->indirect_table;
do {
const bool reset = completed > next_reset;
if (random_batch)
@@ -200,9 +233,13 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
sg_init_table(sg, sg_size);
for (int i = 0; i < sg_size; ++i)
sg_set_buf(&sg[i], dev->buf + i, 0x1);
- r = virtqueue_add_outbuf(vq->vq, sg, sg_size,
- dev->buf + started,
- GFP_ATOMIC);
+
+ /* use indirect_table buffer repeatedly */
+ if (indirect_table + sg_size * sizeof(struct vring_desc) >
+ dev->indirect_table + dev->indirect_table_size)
+ indirect_table = dev->indirect_table;
+ r = test_virtqueue_add_outbuf(vq->vq, sg, sg_size,
+ dev->buf + started, indirect_table);
if (unlikely(r != 0)) {
if (r == -ENOSPC &&
started > started_before)
@@ -213,6 +250,7 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
}
++started;
+ indirect_table += sg_size * sizeof(struct vring_desc);
}
if (unlikely(!virtqueue_kick(vq->vq))) {
r = -1;
@@ -401,7 +439,7 @@ int main(int argc, char **argv)
done:
vdev_info_init(&dev, features);
- vq_info_add(&dev, 256);
+ vq_info_add(&dev, RINGSIZE);
run_test(&dev, &dev.vqs[0], delayed, batch, reset, 0x100000);
return 0;
}
--
2.17.1
Powered by blists - more mailing lists