[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 9/9] virtiofsd: (work around) Comment qsort in inflight I/O t
From: |
Jiachen Zhang |
Subject: |
[RFC PATCH 9/9] virtiofsd: (work around) Comment qsort in inflight I/O tracking |
Date: |
Wed, 16 Dec 2020 00:21:19 +0800 |
This is a work around. The qsort function will malloc memory instead of use
stack memory when the resubmit_num is larger than 64 (total size larger than
1024 Bytes). This will cause seccomp kill virtiofsd, so we comment qsort.
This work around will not affect the correctness of inflight I/O tracking.
Signed-off-by: Jiachen Zhang <zhangjiachen.jaycee@bytedance.com>
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
contrib/libvhost-user/libvhost-user.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/contrib/libvhost-user/libvhost-user.c
b/contrib/libvhost-user/libvhost-user.c
index 8c97013e59..c226d5d915 100644
--- a/contrib/libvhost-user/libvhost-user.c
+++ b/contrib/libvhost-user/libvhost-user.c
@@ -1167,20 +1167,6 @@ vu_check_queue_msg_file(VuDev *dev, VhostUserMsg *vmsg)
return true;
}
-static int
-inflight_desc_compare(const void *a, const void *b)
-{
- VuVirtqInflightDesc *desc0 = (VuVirtqInflightDesc *)a,
- *desc1 = (VuVirtqInflightDesc *)b;
-
- if (desc1->counter > desc0->counter &&
- (desc1->counter - desc0->counter) < VIRTQUEUE_MAX_SIZE * 2) {
- return 1;
- }
-
- return -1;
-}
-
static int
vu_check_queue_inflights(VuDev *dev, VuVirtq *vq)
{
@@ -1236,10 +1222,6 @@ vu_check_queue_inflights(VuDev *dev, VuVirtq *vq)
}
}
- if (vq->resubmit_num > 1) {
- qsort(vq->resubmit_list, vq->resubmit_num,
- sizeof(VuVirtqInflightDesc), inflight_desc_compare);
- }
vq->counter = vq->resubmit_list[0].counter + 1;
}
--
2.20.1
- [RFC PATCH 0/9] Support for Virtio-fs daemon crash reconnection, Jiachen Zhang, 2020/12/15
- [RFC PATCH 1/9] vhost-user-fs: Add support for reconnection of vhost-user-fs backend, Jiachen Zhang, 2020/12/15
- [RFC PATCH 2/9] vhost: Add vhost-user message types for sending shared memory and file fds, Jiachen Zhang, 2020/12/15
- [RFC PATCH 3/9] vhost-user-fs: Support virtiofsd crash reconnection, Jiachen Zhang, 2020/12/15
- [RFC PATCH 4/9] libvhost-user: Add vhost-user message types for sending shared memory and file fds, Jiachen Zhang, 2020/12/15
- [RFC PATCH 5/9] virtiofsd: Convert the struct lo_map array to a more flatten layout, Jiachen Zhang, 2020/12/15
- [RFC PATCH 6/9] virtiofsd: Add two new options for crash reconnection, Jiachen Zhang, 2020/12/15
- [RFC PATCH 7/9] virtiofsd: Persist/restore lo_map and opened fds to/from QEMU, Jiachen Zhang, 2020/12/15
- [RFC PATCH 8/9] virtiofsd: Ensure crash consistency after reconnection, Jiachen Zhang, 2020/12/15
- [RFC PATCH 9/9] virtiofsd: (work around) Comment qsort in inflight I/O tracking,
Jiachen Zhang <=
- Re: [RFC PATCH 0/9] Support for Virtio-fs daemon crash reconnection, no-reply, 2020/12/15
- Re: [RFC PATCH 0/9] Support for Virtio-fs daemon crash reconnection, Marc-André Lureau, 2020/12/16