korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

vhost/net: use struct ubuf_info_msgzc

Browse Source 
struct ubuf_info will be changed, use ubuf_info_msgzc instead.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Pavel Begunkov 2022-09-23 17:39:03 +01:00 committed by Jakub Kicinski
parent b63ca3e822
commit dfff202be5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/vhost/net.c
View File

@ -118,7 +118,7 @@ struct vhost_net_virtqueue {
/* Number of XDP frames batched */ /* Number of XDP frames batched */
int batched_xdp; int batched_xdp;
/* an array of userspace buffers info */ /* an array of userspace buffers info */
struct ubuf_info *ubuf_info; struct ubuf_info_msgzc *ubuf_info;
/* Reference counting for outstanding ubufs. /* Reference counting for outstanding ubufs.
* Protected by vq mutex. Writers must also take device mutex. */ * Protected by vq mutex. Writers must also take device mutex. */
struct vhost_net_ubuf_ref *ubufs; struct vhost_net_ubuf_ref *ubufs;
@ -382,8 +382,9 @@ static void vhost_zerocopy_signal_used(struct vhost_net *net,
} }
static void vhost_zerocopy_callback(struct sk_buff *skb, static void vhost_zerocopy_callback(struct sk_buff *skb,
struct ubuf_info *ubuf, bool success) struct ubuf_info *ubuf_base, bool success)
{ {
struct ubuf_info_msgzc *ubuf = uarg_to_msgzc(ubuf_base);
struct vhost_net_ubuf_ref *ubufs = ubuf->ctx; struct vhost_net_ubuf_ref *ubufs = ubuf->ctx;
struct vhost_virtqueue *vq = ubufs->vq; struct vhost_virtqueue *vq = ubufs->vq;
int cnt; int cnt;
@ -871,7 +872,7 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock)
size_t len, total_len = 0; size_t len, total_len = 0;
int err; int err;
struct vhost_net_ubuf_ref *ubufs; struct vhost_net_ubuf_ref *ubufs;
struct ubuf_info *ubuf; struct ubuf_info_msgzc *ubuf;
bool zcopy_used; bool zcopy_used;
int sent_pkts = 0; int sent_pkts = 0;
@ -907,14 +908,14 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock)
ubuf = nvq->ubuf_info + nvq->upend_idx; ubuf = nvq->ubuf_info + nvq->upend_idx;
vq->heads[nvq->upend_idx].id = cpu_to_vhost32(vq, head); vq->heads[nvq->upend_idx].id = cpu_to_vhost32(vq, head);
vq->heads[nvq->upend_idx].len = VHOST_DMA_IN_PROGRESS; vq->heads[nvq->upend_idx].len = VHOST_DMA_IN_PROGRESS;
ubuf->callback = vhost_zerocopy_callback;
ubuf->ctx = nvq->ubufs; ubuf->ctx = nvq->ubufs;
ubuf->desc = nvq->upend_idx; ubuf->desc = nvq->upend_idx;
ubuf->flags = SKBFL_ZEROCOPY_FRAG; ubuf->ubuf.callback = vhost_zerocopy_callback;
refcount_set(&ubuf->refcnt, 1); ubuf->ubuf.flags = SKBFL_ZEROCOPY_FRAG;
refcount_set(&ubuf->ubuf.refcnt, 1);
msg.msg_control = &ctl; msg.msg_control = &ctl;
ctl.type = TUN_MSG_UBUF; ctl.type = TUN_MSG_UBUF;
ctl.ptr = ubuf; ctl.ptr = &ubuf->ubuf;
msg.msg_controllen = sizeof(ctl); msg.msg_controllen = sizeof(ctl);
ubufs = nvq->ubufs; ubufs = nvq->ubufs;
atomic_inc(&ubufs->refcount); atomic_inc(&ubufs->refcount);