vhost: fixes and cleanups 3.11
This includes some fixes and cleanups for vhost net and scsi drivers. The scsi driver changes will cause a conflict with Nicholas Bellinger's scsi target changes, but the conflicting commit in my tree simply renames some variables so it's trivial to resolve. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQEcBAABAgAGBQJR2pQRAAoJECgfDbjSjVRpK1kH/0XfotDzGggmEWIhvjJd6Bur GaNbUk/kheNJTc5ecy24tr96mrdOZ0ev8lO8VEXgK1mV6k9YHuqdxH3lvXeNoG1t F0IrvDcsYJd0DF8YkX97xnXLz+NL3NUPkGdE9Vbv7r34tdFCGpYw08BpD+uDiRdQ DHKnWfLGaRVC/S1wzFeNi8URcMAQdCrQe+76JnPz7Ka6rsCuQYlVtJIQszFaiY7i S3Z355dGjI9uDLcUu16PhXMrXRdkMTwR4wQsm8lEKQBaVWXgPQv/EprKGVZcIOCn EstDPpYHxyM89AP7sBHiaYIBQMTd37fimBtobztqMk2aqwUBDdBvhx0JUpK+nV8= =Qi2H -----END PGP SIGNATURE----- Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost Pull vhost fixes and cleanups from Michael S Tsirkin: "This includes some fixes and cleanups for vhost net and scsi drivers" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vhost/test: update test after vhost cleanups vhost: Make local function static vhost: Make vhost a separate module vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd to *cmd vhost-scsi: Rename struct tcm_vhost_tpg *tv_tpg to *tpg vhost-scsi: Make func indention more consistent vhost-scsi: Rename struct vhost_scsi *s to *vs vhost-scsi: Remove unnecessary forward struct vhost_scsi declaration vhost: Simplify dev->vqs[i] access vhost-net: fix use-after-free in vhost_net_flush
This commit is contained in:
commit
8d10aae274
@ -1,6 +1,7 @@
|
||||
config VHOST_NET
|
||||
tristate "Host kernel accelerator for virtio net"
|
||||
depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP)
|
||||
select VHOST
|
||||
select VHOST_RING
|
||||
---help---
|
||||
This kernel module can be loaded in host kernel to accelerate
|
||||
@ -13,6 +14,7 @@ config VHOST_NET
|
||||
config VHOST_SCSI
|
||||
tristate "VHOST_SCSI TCM fabric driver"
|
||||
depends on TARGET_CORE && EVENTFD && m
|
||||
select VHOST
|
||||
select VHOST_RING
|
||||
default n
|
||||
---help---
|
||||
@ -24,3 +26,9 @@ config VHOST_RING
|
||||
---help---
|
||||
This option is selected by any driver which needs to access
|
||||
the host side of a virtio ring.
|
||||
|
||||
config VHOST
|
||||
tristate
|
||||
---help---
|
||||
This option is selected by any driver which needs to access
|
||||
the core of vhost.
|
||||
|
@ -1,7 +1,8 @@
|
||||
obj-$(CONFIG_VHOST_NET) += vhost_net.o
|
||||
vhost_net-y := vhost.o net.o
|
||||
vhost_net-y := net.o
|
||||
|
||||
obj-$(CONFIG_VHOST_SCSI) += vhost_scsi.o
|
||||
vhost_scsi-y := scsi.o
|
||||
|
||||
obj-$(CONFIG_VHOST_RING) += vringh.o
|
||||
obj-$(CONFIG_VHOST) += vhost.o
|
||||
|
@ -168,7 +168,7 @@ static void vhost_net_clear_ubuf_info(struct vhost_net *n)
|
||||
}
|
||||
}
|
||||
|
||||
int vhost_net_set_ubuf_info(struct vhost_net *n)
|
||||
static int vhost_net_set_ubuf_info(struct vhost_net *n)
|
||||
{
|
||||
bool zcopy;
|
||||
int i;
|
||||
@ -189,7 +189,7 @@ err:
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
void vhost_net_vq_reset(struct vhost_net *n)
|
||||
static void vhost_net_vq_reset(struct vhost_net *n)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
@ -49,7 +49,6 @@
|
||||
#include <linux/llist.h>
|
||||
#include <linux/bitmap.h>
|
||||
|
||||
#include "vhost.c"
|
||||
#include "vhost.h"
|
||||
|
||||
#define TCM_VHOST_VERSION "v0.1"
|
||||
@ -116,7 +115,6 @@ struct tcm_vhost_nacl {
|
||||
struct se_node_acl se_node_acl;
|
||||
};
|
||||
|
||||
struct vhost_scsi;
|
||||
struct tcm_vhost_tpg {
|
||||
/* Vhost port target portal group tag for TCM */
|
||||
u16 tport_tpgt;
|
||||
@ -218,7 +216,7 @@ static int iov_num_pages(struct iovec *iov)
|
||||
((unsigned long)iov->iov_base & PAGE_MASK)) >> PAGE_SHIFT;
|
||||
}
|
||||
|
||||
void tcm_vhost_done_inflight(struct kref *kref)
|
||||
static void tcm_vhost_done_inflight(struct kref *kref)
|
||||
{
|
||||
struct vhost_scsi_inflight *inflight;
|
||||
|
||||
@ -329,11 +327,12 @@ static u32 tcm_vhost_get_default_depth(struct se_portal_group *se_tpg)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static u32 tcm_vhost_get_pr_transport_id(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl,
|
||||
struct t10_pr_registration *pr_reg,
|
||||
int *format_code,
|
||||
unsigned char *buf)
|
||||
static u32
|
||||
tcm_vhost_get_pr_transport_id(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl,
|
||||
struct t10_pr_registration *pr_reg,
|
||||
int *format_code,
|
||||
unsigned char *buf)
|
||||
{
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -359,10 +358,11 @@ static u32 tcm_vhost_get_pr_transport_id(struct se_portal_group *se_tpg,
|
||||
format_code, buf);
|
||||
}
|
||||
|
||||
static u32 tcm_vhost_get_pr_transport_id_len(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl,
|
||||
struct t10_pr_registration *pr_reg,
|
||||
int *format_code)
|
||||
static u32
|
||||
tcm_vhost_get_pr_transport_id_len(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl,
|
||||
struct t10_pr_registration *pr_reg,
|
||||
int *format_code)
|
||||
{
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -388,10 +388,11 @@ static u32 tcm_vhost_get_pr_transport_id_len(struct se_portal_group *se_tpg,
|
||||
format_code);
|
||||
}
|
||||
|
||||
static char *tcm_vhost_parse_pr_out_transport_id(struct se_portal_group *se_tpg,
|
||||
const char *buf,
|
||||
u32 *out_tid_len,
|
||||
char **port_nexus_ptr)
|
||||
static char *
|
||||
tcm_vhost_parse_pr_out_transport_id(struct se_portal_group *se_tpg,
|
||||
const char *buf,
|
||||
u32 *out_tid_len,
|
||||
char **port_nexus_ptr)
|
||||
{
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -417,8 +418,8 @@ static char *tcm_vhost_parse_pr_out_transport_id(struct se_portal_group *se_tpg,
|
||||
port_nexus_ptr);
|
||||
}
|
||||
|
||||
static struct se_node_acl *tcm_vhost_alloc_fabric_acl(
|
||||
struct se_portal_group *se_tpg)
|
||||
static struct se_node_acl *
|
||||
tcm_vhost_alloc_fabric_acl(struct se_portal_group *se_tpg)
|
||||
{
|
||||
struct tcm_vhost_nacl *nacl;
|
||||
|
||||
@ -431,8 +432,9 @@ static struct se_node_acl *tcm_vhost_alloc_fabric_acl(
|
||||
return &nacl->se_node_acl;
|
||||
}
|
||||
|
||||
static void tcm_vhost_release_fabric_acl(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl)
|
||||
static void
|
||||
tcm_vhost_release_fabric_acl(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl)
|
||||
{
|
||||
struct tcm_vhost_nacl *nacl = container_of(se_nacl,
|
||||
struct tcm_vhost_nacl, se_node_acl);
|
||||
@ -491,28 +493,28 @@ static int tcm_vhost_get_cmd_state(struct se_cmd *se_cmd)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vhost_scsi_complete_cmd(struct tcm_vhost_cmd *tv_cmd)
|
||||
static void vhost_scsi_complete_cmd(struct tcm_vhost_cmd *cmd)
|
||||
{
|
||||
struct vhost_scsi *vs = tv_cmd->tvc_vhost;
|
||||
struct vhost_scsi *vs = cmd->tvc_vhost;
|
||||
|
||||
llist_add(&tv_cmd->tvc_completion_list, &vs->vs_completion_list);
|
||||
llist_add(&cmd->tvc_completion_list, &vs->vs_completion_list);
|
||||
|
||||
vhost_work_queue(&vs->dev, &vs->vs_completion_work);
|
||||
}
|
||||
|
||||
static int tcm_vhost_queue_data_in(struct se_cmd *se_cmd)
|
||||
{
|
||||
struct tcm_vhost_cmd *tv_cmd = container_of(se_cmd,
|
||||
struct tcm_vhost_cmd *cmd = container_of(se_cmd,
|
||||
struct tcm_vhost_cmd, tvc_se_cmd);
|
||||
vhost_scsi_complete_cmd(tv_cmd);
|
||||
vhost_scsi_complete_cmd(cmd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tcm_vhost_queue_status(struct se_cmd *se_cmd)
|
||||
{
|
||||
struct tcm_vhost_cmd *tv_cmd = container_of(se_cmd,
|
||||
struct tcm_vhost_cmd *cmd = container_of(se_cmd,
|
||||
struct tcm_vhost_cmd, tvc_se_cmd);
|
||||
vhost_scsi_complete_cmd(tv_cmd);
|
||||
vhost_scsi_complete_cmd(cmd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -527,8 +529,9 @@ static void tcm_vhost_free_evt(struct vhost_scsi *vs, struct tcm_vhost_evt *evt)
|
||||
kfree(evt);
|
||||
}
|
||||
|
||||
static struct tcm_vhost_evt *tcm_vhost_allocate_evt(struct vhost_scsi *vs,
|
||||
u32 event, u32 reason)
|
||||
static struct tcm_vhost_evt *
|
||||
tcm_vhost_allocate_evt(struct vhost_scsi *vs,
|
||||
u32 event, u32 reason)
|
||||
{
|
||||
struct vhost_virtqueue *vq = &vs->vqs[VHOST_SCSI_VQ_EVT].vq;
|
||||
struct tcm_vhost_evt *evt;
|
||||
@ -552,28 +555,28 @@ static struct tcm_vhost_evt *tcm_vhost_allocate_evt(struct vhost_scsi *vs,
|
||||
return evt;
|
||||
}
|
||||
|
||||
static void vhost_scsi_free_cmd(struct tcm_vhost_cmd *tv_cmd)
|
||||
static void vhost_scsi_free_cmd(struct tcm_vhost_cmd *cmd)
|
||||
{
|
||||
struct se_cmd *se_cmd = &tv_cmd->tvc_se_cmd;
|
||||
struct se_cmd *se_cmd = &cmd->tvc_se_cmd;
|
||||
|
||||
/* TODO locking against target/backend threads? */
|
||||
transport_generic_free_cmd(se_cmd, 1);
|
||||
|
||||
if (tv_cmd->tvc_sgl_count) {
|
||||
if (cmd->tvc_sgl_count) {
|
||||
u32 i;
|
||||
for (i = 0; i < tv_cmd->tvc_sgl_count; i++)
|
||||
put_page(sg_page(&tv_cmd->tvc_sgl[i]));
|
||||
for (i = 0; i < cmd->tvc_sgl_count; i++)
|
||||
put_page(sg_page(&cmd->tvc_sgl[i]));
|
||||
|
||||
kfree(tv_cmd->tvc_sgl);
|
||||
kfree(cmd->tvc_sgl);
|
||||
}
|
||||
|
||||
tcm_vhost_put_inflight(tv_cmd->inflight);
|
||||
tcm_vhost_put_inflight(cmd->inflight);
|
||||
|
||||
kfree(tv_cmd);
|
||||
kfree(cmd);
|
||||
}
|
||||
|
||||
static void tcm_vhost_do_evt_work(struct vhost_scsi *vs,
|
||||
struct tcm_vhost_evt *evt)
|
||||
static void
|
||||
tcm_vhost_do_evt_work(struct vhost_scsi *vs, struct tcm_vhost_evt *evt)
|
||||
{
|
||||
struct vhost_virtqueue *vq = &vs->vqs[VHOST_SCSI_VQ_EVT].vq;
|
||||
struct virtio_scsi_event *event = &evt->event;
|
||||
@ -652,7 +655,7 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work)
|
||||
vs_completion_work);
|
||||
DECLARE_BITMAP(signal, VHOST_SCSI_MAX_VQ);
|
||||
struct virtio_scsi_cmd_resp v_rsp;
|
||||
struct tcm_vhost_cmd *tv_cmd;
|
||||
struct tcm_vhost_cmd *cmd;
|
||||
struct llist_node *llnode;
|
||||
struct se_cmd *se_cmd;
|
||||
int ret, vq;
|
||||
@ -660,32 +663,32 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work)
|
||||
bitmap_zero(signal, VHOST_SCSI_MAX_VQ);
|
||||
llnode = llist_del_all(&vs->vs_completion_list);
|
||||
while (llnode) {
|
||||
tv_cmd = llist_entry(llnode, struct tcm_vhost_cmd,
|
||||
cmd = llist_entry(llnode, struct tcm_vhost_cmd,
|
||||
tvc_completion_list);
|
||||
llnode = llist_next(llnode);
|
||||
se_cmd = &tv_cmd->tvc_se_cmd;
|
||||
se_cmd = &cmd->tvc_se_cmd;
|
||||
|
||||
pr_debug("%s tv_cmd %p resid %u status %#02x\n", __func__,
|
||||
tv_cmd, se_cmd->residual_count, se_cmd->scsi_status);
|
||||
cmd, se_cmd->residual_count, se_cmd->scsi_status);
|
||||
|
||||
memset(&v_rsp, 0, sizeof(v_rsp));
|
||||
v_rsp.resid = se_cmd->residual_count;
|
||||
/* TODO is status_qualifier field needed? */
|
||||
v_rsp.status = se_cmd->scsi_status;
|
||||
v_rsp.sense_len = se_cmd->scsi_sense_length;
|
||||
memcpy(v_rsp.sense, tv_cmd->tvc_sense_buf,
|
||||
memcpy(v_rsp.sense, cmd->tvc_sense_buf,
|
||||
v_rsp.sense_len);
|
||||
ret = copy_to_user(tv_cmd->tvc_resp, &v_rsp, sizeof(v_rsp));
|
||||
ret = copy_to_user(cmd->tvc_resp, &v_rsp, sizeof(v_rsp));
|
||||
if (likely(ret == 0)) {
|
||||
struct vhost_scsi_virtqueue *q;
|
||||
vhost_add_used(tv_cmd->tvc_vq, tv_cmd->tvc_vq_desc, 0);
|
||||
q = container_of(tv_cmd->tvc_vq, struct vhost_scsi_virtqueue, vq);
|
||||
vhost_add_used(cmd->tvc_vq, cmd->tvc_vq_desc, 0);
|
||||
q = container_of(cmd->tvc_vq, struct vhost_scsi_virtqueue, vq);
|
||||
vq = q - vs->vqs;
|
||||
__set_bit(vq, signal);
|
||||
} else
|
||||
pr_err("Faulted on virtio_scsi_cmd_resp\n");
|
||||
|
||||
vhost_scsi_free_cmd(tv_cmd);
|
||||
vhost_scsi_free_cmd(cmd);
|
||||
}
|
||||
|
||||
vq = -1;
|
||||
@ -694,35 +697,35 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work)
|
||||
vhost_signal(&vs->dev, &vs->vqs[vq].vq);
|
||||
}
|
||||
|
||||
static struct tcm_vhost_cmd *vhost_scsi_allocate_cmd(
|
||||
struct vhost_virtqueue *vq,
|
||||
struct tcm_vhost_tpg *tv_tpg,
|
||||
struct virtio_scsi_cmd_req *v_req,
|
||||
u32 exp_data_len,
|
||||
int data_direction)
|
||||
static struct tcm_vhost_cmd *
|
||||
vhost_scsi_allocate_cmd(struct vhost_virtqueue *vq,
|
||||
struct tcm_vhost_tpg *tpg,
|
||||
struct virtio_scsi_cmd_req *v_req,
|
||||
u32 exp_data_len,
|
||||
int data_direction)
|
||||
{
|
||||
struct tcm_vhost_cmd *tv_cmd;
|
||||
struct tcm_vhost_cmd *cmd;
|
||||
struct tcm_vhost_nexus *tv_nexus;
|
||||
|
||||
tv_nexus = tv_tpg->tpg_nexus;
|
||||
tv_nexus = tpg->tpg_nexus;
|
||||
if (!tv_nexus) {
|
||||
pr_err("Unable to locate active struct tcm_vhost_nexus\n");
|
||||
return ERR_PTR(-EIO);
|
||||
}
|
||||
|
||||
tv_cmd = kzalloc(sizeof(struct tcm_vhost_cmd), GFP_ATOMIC);
|
||||
if (!tv_cmd) {
|
||||
cmd = kzalloc(sizeof(struct tcm_vhost_cmd), GFP_ATOMIC);
|
||||
if (!cmd) {
|
||||
pr_err("Unable to allocate struct tcm_vhost_cmd\n");
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
tv_cmd->tvc_tag = v_req->tag;
|
||||
tv_cmd->tvc_task_attr = v_req->task_attr;
|
||||
tv_cmd->tvc_exp_data_len = exp_data_len;
|
||||
tv_cmd->tvc_data_direction = data_direction;
|
||||
tv_cmd->tvc_nexus = tv_nexus;
|
||||
tv_cmd->inflight = tcm_vhost_get_inflight(vq);
|
||||
cmd->tvc_tag = v_req->tag;
|
||||
cmd->tvc_task_attr = v_req->task_attr;
|
||||
cmd->tvc_exp_data_len = exp_data_len;
|
||||
cmd->tvc_data_direction = data_direction;
|
||||
cmd->tvc_nexus = tv_nexus;
|
||||
cmd->inflight = tcm_vhost_get_inflight(vq);
|
||||
|
||||
return tv_cmd;
|
||||
return cmd;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -730,8 +733,11 @@ static struct tcm_vhost_cmd *vhost_scsi_allocate_cmd(
|
||||
*
|
||||
* Returns the number of scatterlist entries used or -errno on error.
|
||||
*/
|
||||
static int vhost_scsi_map_to_sgl(struct scatterlist *sgl,
|
||||
unsigned int sgl_count, struct iovec *iov, int write)
|
||||
static int
|
||||
vhost_scsi_map_to_sgl(struct scatterlist *sgl,
|
||||
unsigned int sgl_count,
|
||||
struct iovec *iov,
|
||||
int write)
|
||||
{
|
||||
unsigned int npages = 0, pages_nr, offset, nbytes;
|
||||
struct scatterlist *sg = sgl;
|
||||
@ -775,8 +781,11 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *tv_cmd,
|
||||
struct iovec *iov, unsigned int niov, int write)
|
||||
static int
|
||||
vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *cmd,
|
||||
struct iovec *iov,
|
||||
unsigned int niov,
|
||||
int write)
|
||||
{
|
||||
int ret;
|
||||
unsigned int i;
|
||||
@ -792,25 +801,25 @@ static int vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *tv_cmd,
|
||||
|
||||
/* TODO overflow checking */
|
||||
|
||||
sg = kmalloc(sizeof(tv_cmd->tvc_sgl[0]) * sgl_count, GFP_ATOMIC);
|
||||
sg = kmalloc(sizeof(cmd->tvc_sgl[0]) * sgl_count, GFP_ATOMIC);
|
||||
if (!sg)
|
||||
return -ENOMEM;
|
||||
pr_debug("%s sg %p sgl_count %u is_err %d\n", __func__,
|
||||
sg, sgl_count, !sg);
|
||||
sg_init_table(sg, sgl_count);
|
||||
|
||||
tv_cmd->tvc_sgl = sg;
|
||||
tv_cmd->tvc_sgl_count = sgl_count;
|
||||
cmd->tvc_sgl = sg;
|
||||
cmd->tvc_sgl_count = sgl_count;
|
||||
|
||||
pr_debug("Mapping %u iovecs for %u pages\n", niov, sgl_count);
|
||||
for (i = 0; i < niov; i++) {
|
||||
ret = vhost_scsi_map_to_sgl(sg, sgl_count, &iov[i], write);
|
||||
if (ret < 0) {
|
||||
for (i = 0; i < tv_cmd->tvc_sgl_count; i++)
|
||||
put_page(sg_page(&tv_cmd->tvc_sgl[i]));
|
||||
kfree(tv_cmd->tvc_sgl);
|
||||
tv_cmd->tvc_sgl = NULL;
|
||||
tv_cmd->tvc_sgl_count = 0;
|
||||
for (i = 0; i < cmd->tvc_sgl_count; i++)
|
||||
put_page(sg_page(&cmd->tvc_sgl[i]));
|
||||
kfree(cmd->tvc_sgl);
|
||||
cmd->tvc_sgl = NULL;
|
||||
cmd->tvc_sgl_count = 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -822,15 +831,15 @@ static int vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *tv_cmd,
|
||||
|
||||
static void tcm_vhost_submission_work(struct work_struct *work)
|
||||
{
|
||||
struct tcm_vhost_cmd *tv_cmd =
|
||||
struct tcm_vhost_cmd *cmd =
|
||||
container_of(work, struct tcm_vhost_cmd, work);
|
||||
struct tcm_vhost_nexus *tv_nexus;
|
||||
struct se_cmd *se_cmd = &tv_cmd->tvc_se_cmd;
|
||||
struct se_cmd *se_cmd = &cmd->tvc_se_cmd;
|
||||
struct scatterlist *sg_ptr, *sg_bidi_ptr = NULL;
|
||||
int rc, sg_no_bidi = 0;
|
||||
|
||||
if (tv_cmd->tvc_sgl_count) {
|
||||
sg_ptr = tv_cmd->tvc_sgl;
|
||||
if (cmd->tvc_sgl_count) {
|
||||
sg_ptr = cmd->tvc_sgl;
|
||||
/* FIXME: Fix BIDI operation in tcm_vhost_submission_work() */
|
||||
#if 0
|
||||
if (se_cmd->se_cmd_flags & SCF_BIDI) {
|
||||
@ -841,13 +850,13 @@ static void tcm_vhost_submission_work(struct work_struct *work)
|
||||
} else {
|
||||
sg_ptr = NULL;
|
||||
}
|
||||
tv_nexus = tv_cmd->tvc_nexus;
|
||||
tv_nexus = cmd->tvc_nexus;
|
||||
|
||||
rc = target_submit_cmd_map_sgls(se_cmd, tv_nexus->tvn_se_sess,
|
||||
tv_cmd->tvc_cdb, &tv_cmd->tvc_sense_buf[0],
|
||||
tv_cmd->tvc_lun, tv_cmd->tvc_exp_data_len,
|
||||
tv_cmd->tvc_task_attr, tv_cmd->tvc_data_direction,
|
||||
0, sg_ptr, tv_cmd->tvc_sgl_count,
|
||||
cmd->tvc_cdb, &cmd->tvc_sense_buf[0],
|
||||
cmd->tvc_lun, cmd->tvc_exp_data_len,
|
||||
cmd->tvc_task_attr, cmd->tvc_data_direction,
|
||||
0, sg_ptr, cmd->tvc_sgl_count,
|
||||
sg_bidi_ptr, sg_no_bidi);
|
||||
if (rc < 0) {
|
||||
transport_send_check_condition_and_sense(se_cmd,
|
||||
@ -856,8 +865,10 @@ static void tcm_vhost_submission_work(struct work_struct *work)
|
||||
}
|
||||
}
|
||||
|
||||
static void vhost_scsi_send_bad_target(struct vhost_scsi *vs,
|
||||
struct vhost_virtqueue *vq, int head, unsigned out)
|
||||
static void
|
||||
vhost_scsi_send_bad_target(struct vhost_scsi *vs,
|
||||
struct vhost_virtqueue *vq,
|
||||
int head, unsigned out)
|
||||
{
|
||||
struct virtio_scsi_cmd_resp __user *resp;
|
||||
struct virtio_scsi_cmd_resp rsp;
|
||||
@ -873,13 +884,13 @@ static void vhost_scsi_send_bad_target(struct vhost_scsi *vs,
|
||||
pr_err("Faulted on virtio_scsi_cmd_resp\n");
|
||||
}
|
||||
|
||||
static void vhost_scsi_handle_vq(struct vhost_scsi *vs,
|
||||
struct vhost_virtqueue *vq)
|
||||
static void
|
||||
vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)
|
||||
{
|
||||
struct tcm_vhost_tpg **vs_tpg;
|
||||
struct virtio_scsi_cmd_req v_req;
|
||||
struct tcm_vhost_tpg *tv_tpg;
|
||||
struct tcm_vhost_cmd *tv_cmd;
|
||||
struct tcm_vhost_tpg *tpg;
|
||||
struct tcm_vhost_cmd *cmd;
|
||||
u32 exp_data_len, data_first, data_num, data_direction;
|
||||
unsigned out, in, i;
|
||||
int head, ret;
|
||||
@ -964,10 +975,10 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs,
|
||||
|
||||
/* Extract the tpgt */
|
||||
target = v_req.lun[1];
|
||||
tv_tpg = ACCESS_ONCE(vs_tpg[target]);
|
||||
tpg = ACCESS_ONCE(vs_tpg[target]);
|
||||
|
||||
/* Target does not exist, fail the request */
|
||||
if (unlikely(!tv_tpg)) {
|
||||
if (unlikely(!tpg)) {
|
||||
vhost_scsi_send_bad_target(vs, vq, head, out);
|
||||
continue;
|
||||
}
|
||||
@ -976,46 +987,46 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs,
|
||||
for (i = 0; i < data_num; i++)
|
||||
exp_data_len += vq->iov[data_first + i].iov_len;
|
||||
|
||||
tv_cmd = vhost_scsi_allocate_cmd(vq, tv_tpg, &v_req,
|
||||
cmd = vhost_scsi_allocate_cmd(vq, tpg, &v_req,
|
||||
exp_data_len, data_direction);
|
||||
if (IS_ERR(tv_cmd)) {
|
||||
if (IS_ERR(cmd)) {
|
||||
vq_err(vq, "vhost_scsi_allocate_cmd failed %ld\n",
|
||||
PTR_ERR(tv_cmd));
|
||||
PTR_ERR(cmd));
|
||||
goto err_cmd;
|
||||
}
|
||||
pr_debug("Allocated tv_cmd: %p exp_data_len: %d, data_direction"
|
||||
": %d\n", tv_cmd, exp_data_len, data_direction);
|
||||
": %d\n", cmd, exp_data_len, data_direction);
|
||||
|
||||
tv_cmd->tvc_vhost = vs;
|
||||
tv_cmd->tvc_vq = vq;
|
||||
tv_cmd->tvc_resp = vq->iov[out].iov_base;
|
||||
cmd->tvc_vhost = vs;
|
||||
cmd->tvc_vq = vq;
|
||||
cmd->tvc_resp = vq->iov[out].iov_base;
|
||||
|
||||
/*
|
||||
* Copy in the recieved CDB descriptor into tv_cmd->tvc_cdb
|
||||
* Copy in the recieved CDB descriptor into cmd->tvc_cdb
|
||||
* that will be used by tcm_vhost_new_cmd_map() and down into
|
||||
* target_setup_cmd_from_cdb()
|
||||
*/
|
||||
memcpy(tv_cmd->tvc_cdb, v_req.cdb, TCM_VHOST_MAX_CDB_SIZE);
|
||||
memcpy(cmd->tvc_cdb, v_req.cdb, TCM_VHOST_MAX_CDB_SIZE);
|
||||
/*
|
||||
* Check that the recieved CDB size does not exceeded our
|
||||
* hardcoded max for tcm_vhost
|
||||
*/
|
||||
/* TODO what if cdb was too small for varlen cdb header? */
|
||||
if (unlikely(scsi_command_size(tv_cmd->tvc_cdb) >
|
||||
if (unlikely(scsi_command_size(cmd->tvc_cdb) >
|
||||
TCM_VHOST_MAX_CDB_SIZE)) {
|
||||
vq_err(vq, "Received SCSI CDB with command_size: %d that"
|
||||
" exceeds SCSI_MAX_VARLEN_CDB_SIZE: %d\n",
|
||||
scsi_command_size(tv_cmd->tvc_cdb),
|
||||
scsi_command_size(cmd->tvc_cdb),
|
||||
TCM_VHOST_MAX_CDB_SIZE);
|
||||
goto err_free;
|
||||
}
|
||||
tv_cmd->tvc_lun = ((v_req.lun[2] << 8) | v_req.lun[3]) & 0x3FFF;
|
||||
cmd->tvc_lun = ((v_req.lun[2] << 8) | v_req.lun[3]) & 0x3FFF;
|
||||
|
||||
pr_debug("vhost_scsi got command opcode: %#02x, lun: %d\n",
|
||||
tv_cmd->tvc_cdb[0], tv_cmd->tvc_lun);
|
||||
cmd->tvc_cdb[0], cmd->tvc_lun);
|
||||
|
||||
if (data_direction != DMA_NONE) {
|
||||
ret = vhost_scsi_map_iov_to_sgl(tv_cmd,
|
||||
ret = vhost_scsi_map_iov_to_sgl(cmd,
|
||||
&vq->iov[data_first], data_num,
|
||||
data_direction == DMA_TO_DEVICE);
|
||||
if (unlikely(ret)) {
|
||||
@ -1029,22 +1040,22 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs,
|
||||
* complete the virtio-scsi request in TCM callback context via
|
||||
* tcm_vhost_queue_data_in() and tcm_vhost_queue_status()
|
||||
*/
|
||||
tv_cmd->tvc_vq_desc = head;
|
||||
cmd->tvc_vq_desc = head;
|
||||
/*
|
||||
* Dispatch tv_cmd descriptor for cmwq execution in process
|
||||
* context provided by tcm_vhost_workqueue. This also ensures
|
||||
* tv_cmd is executed on the same kworker CPU as this vhost
|
||||
* thread to gain positive L2 cache locality effects..
|
||||
*/
|
||||
INIT_WORK(&tv_cmd->work, tcm_vhost_submission_work);
|
||||
queue_work(tcm_vhost_workqueue, &tv_cmd->work);
|
||||
INIT_WORK(&cmd->work, tcm_vhost_submission_work);
|
||||
queue_work(tcm_vhost_workqueue, &cmd->work);
|
||||
}
|
||||
|
||||
mutex_unlock(&vq->mutex);
|
||||
return;
|
||||
|
||||
err_free:
|
||||
vhost_scsi_free_cmd(tv_cmd);
|
||||
vhost_scsi_free_cmd(cmd);
|
||||
err_cmd:
|
||||
vhost_scsi_send_bad_target(vs, vq, head, out);
|
||||
mutex_unlock(&vq->mutex);
|
||||
@ -1055,8 +1066,12 @@ static void vhost_scsi_ctl_handle_kick(struct vhost_work *work)
|
||||
pr_debug("%s: The handling func for control queue.\n", __func__);
|
||||
}
|
||||
|
||||
static void tcm_vhost_send_evt(struct vhost_scsi *vs, struct tcm_vhost_tpg *tpg,
|
||||
struct se_lun *lun, u32 event, u32 reason)
|
||||
static void
|
||||
tcm_vhost_send_evt(struct vhost_scsi *vs,
|
||||
struct tcm_vhost_tpg *tpg,
|
||||
struct se_lun *lun,
|
||||
u32 event,
|
||||
u32 reason)
|
||||
{
|
||||
struct tcm_vhost_evt *evt;
|
||||
|
||||
@ -1146,12 +1161,12 @@ static void vhost_scsi_flush(struct vhost_scsi *vs)
|
||||
* The lock nesting rule is:
|
||||
* tcm_vhost_mutex -> vs->dev.mutex -> tpg->tv_tpg_mutex -> vq->mutex
|
||||
*/
|
||||
static int vhost_scsi_set_endpoint(
|
||||
struct vhost_scsi *vs,
|
||||
struct vhost_scsi_target *t)
|
||||
static int
|
||||
vhost_scsi_set_endpoint(struct vhost_scsi *vs,
|
||||
struct vhost_scsi_target *t)
|
||||
{
|
||||
struct tcm_vhost_tport *tv_tport;
|
||||
struct tcm_vhost_tpg *tv_tpg;
|
||||
struct tcm_vhost_tpg *tpg;
|
||||
struct tcm_vhost_tpg **vs_tpg;
|
||||
struct vhost_virtqueue *vq;
|
||||
int index, ret, i, len;
|
||||
@ -1178,32 +1193,32 @@ static int vhost_scsi_set_endpoint(
|
||||
if (vs->vs_tpg)
|
||||
memcpy(vs_tpg, vs->vs_tpg, len);
|
||||
|
||||
list_for_each_entry(tv_tpg, &tcm_vhost_list, tv_tpg_list) {
|
||||
mutex_lock(&tv_tpg->tv_tpg_mutex);
|
||||
if (!tv_tpg->tpg_nexus) {
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
list_for_each_entry(tpg, &tcm_vhost_list, tv_tpg_list) {
|
||||
mutex_lock(&tpg->tv_tpg_mutex);
|
||||
if (!tpg->tpg_nexus) {
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
continue;
|
||||
}
|
||||
if (tv_tpg->tv_tpg_vhost_count != 0) {
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
if (tpg->tv_tpg_vhost_count != 0) {
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
continue;
|
||||
}
|
||||
tv_tport = tv_tpg->tport;
|
||||
tv_tport = tpg->tport;
|
||||
|
||||
if (!strcmp(tv_tport->tport_name, t->vhost_wwpn)) {
|
||||
if (vs->vs_tpg && vs->vs_tpg[tv_tpg->tport_tpgt]) {
|
||||
if (vs->vs_tpg && vs->vs_tpg[tpg->tport_tpgt]) {
|
||||
kfree(vs_tpg);
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
ret = -EEXIST;
|
||||
goto out;
|
||||
}
|
||||
tv_tpg->tv_tpg_vhost_count++;
|
||||
tv_tpg->vhost_scsi = vs;
|
||||
vs_tpg[tv_tpg->tport_tpgt] = tv_tpg;
|
||||
tpg->tv_tpg_vhost_count++;
|
||||
tpg->vhost_scsi = vs;
|
||||
vs_tpg[tpg->tport_tpgt] = tpg;
|
||||
smp_mb__after_atomic_inc();
|
||||
match = true;
|
||||
}
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
}
|
||||
|
||||
if (match) {
|
||||
@ -1236,12 +1251,12 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vhost_scsi_clear_endpoint(
|
||||
struct vhost_scsi *vs,
|
||||
struct vhost_scsi_target *t)
|
||||
static int
|
||||
vhost_scsi_clear_endpoint(struct vhost_scsi *vs,
|
||||
struct vhost_scsi_target *t)
|
||||
{
|
||||
struct tcm_vhost_tport *tv_tport;
|
||||
struct tcm_vhost_tpg *tv_tpg;
|
||||
struct tcm_vhost_tpg *tpg;
|
||||
struct vhost_virtqueue *vq;
|
||||
bool match = false;
|
||||
int index, ret, i;
|
||||
@ -1264,30 +1279,30 @@ static int vhost_scsi_clear_endpoint(
|
||||
|
||||
for (i = 0; i < VHOST_SCSI_MAX_TARGET; i++) {
|
||||
target = i;
|
||||
tv_tpg = vs->vs_tpg[target];
|
||||
if (!tv_tpg)
|
||||
tpg = vs->vs_tpg[target];
|
||||
if (!tpg)
|
||||
continue;
|
||||
|
||||
mutex_lock(&tv_tpg->tv_tpg_mutex);
|
||||
tv_tport = tv_tpg->tport;
|
||||
mutex_lock(&tpg->tv_tpg_mutex);
|
||||
tv_tport = tpg->tport;
|
||||
if (!tv_tport) {
|
||||
ret = -ENODEV;
|
||||
goto err_tpg;
|
||||
}
|
||||
|
||||
if (strcmp(tv_tport->tport_name, t->vhost_wwpn)) {
|
||||
pr_warn("tv_tport->tport_name: %s, tv_tpg->tport_tpgt: %hu"
|
||||
pr_warn("tv_tport->tport_name: %s, tpg->tport_tpgt: %hu"
|
||||
" does not match t->vhost_wwpn: %s, t->vhost_tpgt: %hu\n",
|
||||
tv_tport->tport_name, tv_tpg->tport_tpgt,
|
||||
tv_tport->tport_name, tpg->tport_tpgt,
|
||||
t->vhost_wwpn, t->vhost_tpgt);
|
||||
ret = -EINVAL;
|
||||
goto err_tpg;
|
||||
}
|
||||
tv_tpg->tv_tpg_vhost_count--;
|
||||
tv_tpg->vhost_scsi = NULL;
|
||||
tpg->tv_tpg_vhost_count--;
|
||||
tpg->vhost_scsi = NULL;
|
||||
vs->vs_tpg[target] = NULL;
|
||||
match = true;
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
}
|
||||
if (match) {
|
||||
for (i = 0; i < VHOST_SCSI_MAX_VQ; i++) {
|
||||
@ -1311,7 +1326,7 @@ static int vhost_scsi_clear_endpoint(
|
||||
return 0;
|
||||
|
||||
err_tpg:
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
err_dev:
|
||||
mutex_unlock(&vs->dev.mutex);
|
||||
mutex_unlock(&tcm_vhost_mutex);
|
||||
@ -1338,68 +1353,70 @@ static int vhost_scsi_set_features(struct vhost_scsi *vs, u64 features)
|
||||
|
||||
static int vhost_scsi_open(struct inode *inode, struct file *f)
|
||||
{
|
||||
struct vhost_scsi *s;
|
||||
struct vhost_scsi *vs;
|
||||
struct vhost_virtqueue **vqs;
|
||||
int r, i;
|
||||
|
||||
s = kzalloc(sizeof(*s), GFP_KERNEL);
|
||||
if (!s)
|
||||
vs = kzalloc(sizeof(*vs), GFP_KERNEL);
|
||||
if (!vs)
|
||||
return -ENOMEM;
|
||||
|
||||
vqs = kmalloc(VHOST_SCSI_MAX_VQ * sizeof(*vqs), GFP_KERNEL);
|
||||
if (!vqs) {
|
||||
kfree(s);
|
||||
kfree(vs);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
vhost_work_init(&s->vs_completion_work, vhost_scsi_complete_cmd_work);
|
||||
vhost_work_init(&s->vs_event_work, tcm_vhost_evt_work);
|
||||
vhost_work_init(&vs->vs_completion_work, vhost_scsi_complete_cmd_work);
|
||||
vhost_work_init(&vs->vs_event_work, tcm_vhost_evt_work);
|
||||
|
||||
s->vs_events_nr = 0;
|
||||
s->vs_events_missed = false;
|
||||
vs->vs_events_nr = 0;
|
||||
vs->vs_events_missed = false;
|
||||
|
||||
vqs[VHOST_SCSI_VQ_CTL] = &s->vqs[VHOST_SCSI_VQ_CTL].vq;
|
||||
vqs[VHOST_SCSI_VQ_EVT] = &s->vqs[VHOST_SCSI_VQ_EVT].vq;
|
||||
s->vqs[VHOST_SCSI_VQ_CTL].vq.handle_kick = vhost_scsi_ctl_handle_kick;
|
||||
s->vqs[VHOST_SCSI_VQ_EVT].vq.handle_kick = vhost_scsi_evt_handle_kick;
|
||||
vqs[VHOST_SCSI_VQ_CTL] = &vs->vqs[VHOST_SCSI_VQ_CTL].vq;
|
||||
vqs[VHOST_SCSI_VQ_EVT] = &vs->vqs[VHOST_SCSI_VQ_EVT].vq;
|
||||
vs->vqs[VHOST_SCSI_VQ_CTL].vq.handle_kick = vhost_scsi_ctl_handle_kick;
|
||||
vs->vqs[VHOST_SCSI_VQ_EVT].vq.handle_kick = vhost_scsi_evt_handle_kick;
|
||||
for (i = VHOST_SCSI_VQ_IO; i < VHOST_SCSI_MAX_VQ; i++) {
|
||||
vqs[i] = &s->vqs[i].vq;
|
||||
s->vqs[i].vq.handle_kick = vhost_scsi_handle_kick;
|
||||
vqs[i] = &vs->vqs[i].vq;
|
||||
vs->vqs[i].vq.handle_kick = vhost_scsi_handle_kick;
|
||||
}
|
||||
r = vhost_dev_init(&s->dev, vqs, VHOST_SCSI_MAX_VQ);
|
||||
r = vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ);
|
||||
|
||||
tcm_vhost_init_inflight(s, NULL);
|
||||
tcm_vhost_init_inflight(vs, NULL);
|
||||
|
||||
if (r < 0) {
|
||||
kfree(vqs);
|
||||
kfree(s);
|
||||
kfree(vs);
|
||||
return r;
|
||||
}
|
||||
|
||||
f->private_data = s;
|
||||
f->private_data = vs;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vhost_scsi_release(struct inode *inode, struct file *f)
|
||||
{
|
||||
struct vhost_scsi *s = f->private_data;
|
||||
struct vhost_scsi *vs = f->private_data;
|
||||
struct vhost_scsi_target t;
|
||||
|
||||
mutex_lock(&s->dev.mutex);
|
||||
memcpy(t.vhost_wwpn, s->vs_vhost_wwpn, sizeof(t.vhost_wwpn));
|
||||
mutex_unlock(&s->dev.mutex);
|
||||
vhost_scsi_clear_endpoint(s, &t);
|
||||
vhost_dev_stop(&s->dev);
|
||||
vhost_dev_cleanup(&s->dev, false);
|
||||
mutex_lock(&vs->dev.mutex);
|
||||
memcpy(t.vhost_wwpn, vs->vs_vhost_wwpn, sizeof(t.vhost_wwpn));
|
||||
mutex_unlock(&vs->dev.mutex);
|
||||
vhost_scsi_clear_endpoint(vs, &t);
|
||||
vhost_dev_stop(&vs->dev);
|
||||
vhost_dev_cleanup(&vs->dev, false);
|
||||
/* Jobs can re-queue themselves in evt kick handler. Do extra flush. */
|
||||
vhost_scsi_flush(s);
|
||||
kfree(s->dev.vqs);
|
||||
kfree(s);
|
||||
vhost_scsi_flush(vs);
|
||||
kfree(vs->dev.vqs);
|
||||
kfree(vs);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static long vhost_scsi_ioctl(struct file *f, unsigned int ioctl,
|
||||
unsigned long arg)
|
||||
static long
|
||||
vhost_scsi_ioctl(struct file *f,
|
||||
unsigned int ioctl,
|
||||
unsigned long arg)
|
||||
{
|
||||
struct vhost_scsi *vs = f->private_data;
|
||||
struct vhost_scsi_target backend;
|
||||
@ -1515,8 +1532,9 @@ static char *tcm_vhost_dump_proto_id(struct tcm_vhost_tport *tport)
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
static void tcm_vhost_do_plug(struct tcm_vhost_tpg *tpg,
|
||||
struct se_lun *lun, bool plug)
|
||||
static void
|
||||
tcm_vhost_do_plug(struct tcm_vhost_tpg *tpg,
|
||||
struct se_lun *lun, bool plug)
|
||||
{
|
||||
|
||||
struct vhost_scsi *vs = tpg->vhost_scsi;
|
||||
@ -1556,18 +1574,18 @@ static void tcm_vhost_hotunplug(struct tcm_vhost_tpg *tpg, struct se_lun *lun)
|
||||
}
|
||||
|
||||
static int tcm_vhost_port_link(struct se_portal_group *se_tpg,
|
||||
struct se_lun *lun)
|
||||
struct se_lun *lun)
|
||||
{
|
||||
struct tcm_vhost_tpg *tv_tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
|
||||
mutex_lock(&tcm_vhost_mutex);
|
||||
|
||||
mutex_lock(&tv_tpg->tv_tpg_mutex);
|
||||
tv_tpg->tv_tpg_port_count++;
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_lock(&tpg->tv_tpg_mutex);
|
||||
tpg->tv_tpg_port_count++;
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
|
||||
tcm_vhost_hotplug(tv_tpg, lun);
|
||||
tcm_vhost_hotplug(tpg, lun);
|
||||
|
||||
mutex_unlock(&tcm_vhost_mutex);
|
||||
|
||||
@ -1575,26 +1593,26 @@ static int tcm_vhost_port_link(struct se_portal_group *se_tpg,
|
||||
}
|
||||
|
||||
static void tcm_vhost_port_unlink(struct se_portal_group *se_tpg,
|
||||
struct se_lun *lun)
|
||||
struct se_lun *lun)
|
||||
{
|
||||
struct tcm_vhost_tpg *tv_tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
|
||||
mutex_lock(&tcm_vhost_mutex);
|
||||
|
||||
mutex_lock(&tv_tpg->tv_tpg_mutex);
|
||||
tv_tpg->tv_tpg_port_count--;
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_lock(&tpg->tv_tpg_mutex);
|
||||
tpg->tv_tpg_port_count--;
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
|
||||
tcm_vhost_hotunplug(tv_tpg, lun);
|
||||
tcm_vhost_hotunplug(tpg, lun);
|
||||
|
||||
mutex_unlock(&tcm_vhost_mutex);
|
||||
}
|
||||
|
||||
static struct se_node_acl *tcm_vhost_make_nodeacl(
|
||||
struct se_portal_group *se_tpg,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_node_acl *
|
||||
tcm_vhost_make_nodeacl(struct se_portal_group *se_tpg,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
struct se_node_acl *se_nacl, *se_nacl_new;
|
||||
struct tcm_vhost_nacl *nacl;
|
||||
@ -1635,23 +1653,23 @@ static void tcm_vhost_drop_nodeacl(struct se_node_acl *se_acl)
|
||||
kfree(nacl);
|
||||
}
|
||||
|
||||
static int tcm_vhost_make_nexus(struct tcm_vhost_tpg *tv_tpg,
|
||||
const char *name)
|
||||
static int tcm_vhost_make_nexus(struct tcm_vhost_tpg *tpg,
|
||||
const char *name)
|
||||
{
|
||||
struct se_portal_group *se_tpg;
|
||||
struct tcm_vhost_nexus *tv_nexus;
|
||||
|
||||
mutex_lock(&tv_tpg->tv_tpg_mutex);
|
||||
if (tv_tpg->tpg_nexus) {
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
pr_debug("tv_tpg->tpg_nexus already exists\n");
|
||||
mutex_lock(&tpg->tv_tpg_mutex);
|
||||
if (tpg->tpg_nexus) {
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
pr_debug("tpg->tpg_nexus already exists\n");
|
||||
return -EEXIST;
|
||||
}
|
||||
se_tpg = &tv_tpg->se_tpg;
|
||||
se_tpg = &tpg->se_tpg;
|
||||
|
||||
tv_nexus = kzalloc(sizeof(struct tcm_vhost_nexus), GFP_KERNEL);
|
||||
if (!tv_nexus) {
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
pr_err("Unable to allocate struct tcm_vhost_nexus\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
@ -1660,7 +1678,7 @@ static int tcm_vhost_make_nexus(struct tcm_vhost_tpg *tv_tpg,
|
||||
*/
|
||||
tv_nexus->tvn_se_sess = transport_init_session();
|
||||
if (IS_ERR(tv_nexus->tvn_se_sess)) {
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
kfree(tv_nexus);
|
||||
return -ENOMEM;
|
||||
}
|
||||
@ -1672,7 +1690,7 @@ static int tcm_vhost_make_nexus(struct tcm_vhost_tpg *tv_tpg,
|
||||
tv_nexus->tvn_se_sess->se_node_acl = core_tpg_check_initiator_node_acl(
|
||||
se_tpg, (unsigned char *)name);
|
||||
if (!tv_nexus->tvn_se_sess->se_node_acl) {
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
pr_debug("core_tpg_check_initiator_node_acl() failed"
|
||||
" for %s\n", name);
|
||||
transport_free_session(tv_nexus->tvn_se_sess);
|
||||
@ -1685,9 +1703,9 @@ static int tcm_vhost_make_nexus(struct tcm_vhost_tpg *tv_tpg,
|
||||
*/
|
||||
__transport_register_session(se_tpg, tv_nexus->tvn_se_sess->se_node_acl,
|
||||
tv_nexus->tvn_se_sess, tv_nexus);
|
||||
tv_tpg->tpg_nexus = tv_nexus;
|
||||
tpg->tpg_nexus = tv_nexus;
|
||||
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1740,40 +1758,40 @@ static int tcm_vhost_drop_nexus(struct tcm_vhost_tpg *tpg)
|
||||
}
|
||||
|
||||
static ssize_t tcm_vhost_tpg_show_nexus(struct se_portal_group *se_tpg,
|
||||
char *page)
|
||||
char *page)
|
||||
{
|
||||
struct tcm_vhost_tpg *tv_tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
struct tcm_vhost_nexus *tv_nexus;
|
||||
ssize_t ret;
|
||||
|
||||
mutex_lock(&tv_tpg->tv_tpg_mutex);
|
||||
tv_nexus = tv_tpg->tpg_nexus;
|
||||
mutex_lock(&tpg->tv_tpg_mutex);
|
||||
tv_nexus = tpg->tpg_nexus;
|
||||
if (!tv_nexus) {
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
return -ENODEV;
|
||||
}
|
||||
ret = snprintf(page, PAGE_SIZE, "%s\n",
|
||||
tv_nexus->tvn_se_sess->se_node_acl->initiatorname);
|
||||
mutex_unlock(&tv_tpg->tv_tpg_mutex);
|
||||
mutex_unlock(&tpg->tv_tpg_mutex);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t tcm_vhost_tpg_store_nexus(struct se_portal_group *se_tpg,
|
||||
const char *page,
|
||||
size_t count)
|
||||
const char *page,
|
||||
size_t count)
|
||||
{
|
||||
struct tcm_vhost_tpg *tv_tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
struct tcm_vhost_tport *tport_wwn = tv_tpg->tport;
|
||||
struct tcm_vhost_tport *tport_wwn = tpg->tport;
|
||||
unsigned char i_port[TCM_VHOST_NAMELEN], *ptr, *port_ptr;
|
||||
int ret;
|
||||
/*
|
||||
* Shutdown the active I_T nexus if 'NULL' is passed..
|
||||
*/
|
||||
if (!strncmp(page, "NULL", 4)) {
|
||||
ret = tcm_vhost_drop_nexus(tv_tpg);
|
||||
ret = tcm_vhost_drop_nexus(tpg);
|
||||
return (!ret) ? count : ret;
|
||||
}
|
||||
/*
|
||||
@ -1831,7 +1849,7 @@ check_newline:
|
||||
if (i_port[strlen(i_port)-1] == '\n')
|
||||
i_port[strlen(i_port)-1] = '\0';
|
||||
|
||||
ret = tcm_vhost_make_nexus(tv_tpg, port_ptr);
|
||||
ret = tcm_vhost_make_nexus(tpg, port_ptr);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@ -1845,9 +1863,10 @@ static struct configfs_attribute *tcm_vhost_tpg_attrs[] = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static struct se_portal_group *tcm_vhost_make_tpg(struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *
|
||||
tcm_vhost_make_tpg(struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
struct tcm_vhost_tport *tport = container_of(wwn,
|
||||
struct tcm_vhost_tport, tport_wwn);
|
||||
@ -1903,9 +1922,10 @@ static void tcm_vhost_drop_tpg(struct se_portal_group *se_tpg)
|
||||
kfree(tpg);
|
||||
}
|
||||
|
||||
static struct se_wwn *tcm_vhost_make_tport(struct target_fabric_configfs *tf,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_wwn *
|
||||
tcm_vhost_make_tport(struct target_fabric_configfs *tf,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
struct tcm_vhost_tport *tport;
|
||||
char *ptr;
|
||||
@ -1975,9 +1995,9 @@ static void tcm_vhost_drop_tport(struct se_wwn *wwn)
|
||||
kfree(tport);
|
||||
}
|
||||
|
||||
static ssize_t tcm_vhost_wwn_show_attr_version(
|
||||
struct target_fabric_configfs *tf,
|
||||
char *page)
|
||||
static ssize_t
|
||||
tcm_vhost_wwn_show_attr_version(struct target_fabric_configfs *tf,
|
||||
char *page)
|
||||
{
|
||||
return sprintf(page, "TCM_VHOST fabric module %s on %s/%s"
|
||||
"on "UTS_RELEASE"\n", TCM_VHOST_VERSION, utsname()->sysname,
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include "test.h"
|
||||
#include "vhost.c"
|
||||
#include "vhost.h"
|
||||
|
||||
/* Max number of bytes transferred before requeueing the job.
|
||||
* Using this limit prevents one virtqueue from starving others. */
|
||||
@ -38,17 +38,19 @@ struct vhost_test {
|
||||
* read-size critical section for our kind of RCU. */
|
||||
static void handle_vq(struct vhost_test *n)
|
||||
{
|
||||
struct vhost_virtqueue *vq = &n->dev.vqs[VHOST_TEST_VQ];
|
||||
struct vhost_virtqueue *vq = &n->vqs[VHOST_TEST_VQ];
|
||||
unsigned out, in;
|
||||
int head;
|
||||
size_t len, total_len = 0;
|
||||
void *private;
|
||||
|
||||
private = rcu_dereference_check(vq->private_data, 1);
|
||||
if (!private)
|
||||
return;
|
||||
|
||||
mutex_lock(&vq->mutex);
|
||||
private = vq->private_data;
|
||||
if (!private) {
|
||||
mutex_unlock(&vq->mutex);
|
||||
return;
|
||||
}
|
||||
|
||||
vhost_disable_notify(&n->dev, vq);
|
||||
|
||||
for (;;) {
|
||||
@ -102,15 +104,23 @@ static int vhost_test_open(struct inode *inode, struct file *f)
|
||||
{
|
||||
struct vhost_test *n = kmalloc(sizeof *n, GFP_KERNEL);
|
||||
struct vhost_dev *dev;
|
||||
struct vhost_virtqueue **vqs;
|
||||
int r;
|
||||
|
||||
if (!n)
|
||||
return -ENOMEM;
|
||||
vqs = kmalloc(VHOST_TEST_VQ_MAX * sizeof(*vqs), GFP_KERNEL);
|
||||
if (!vqs) {
|
||||
kfree(n);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
dev = &n->dev;
|
||||
vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
|
||||
n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
|
||||
r = vhost_dev_init(dev, n->vqs, VHOST_TEST_VQ_MAX);
|
||||
r = vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
|
||||
if (r < 0) {
|
||||
kfree(vqs);
|
||||
kfree(n);
|
||||
return r;
|
||||
}
|
||||
@ -126,9 +136,8 @@ static void *vhost_test_stop_vq(struct vhost_test *n,
|
||||
void *private;
|
||||
|
||||
mutex_lock(&vq->mutex);
|
||||
private = rcu_dereference_protected(vq->private_data,
|
||||
lockdep_is_held(&vq->mutex));
|
||||
rcu_assign_pointer(vq->private_data, NULL);
|
||||
private = vq->private_data;
|
||||
vq->private_data = NULL;
|
||||
mutex_unlock(&vq->mutex);
|
||||
return private;
|
||||
}
|
||||
@ -140,7 +149,7 @@ static void vhost_test_stop(struct vhost_test *n, void **privatep)
|
||||
|
||||
static void vhost_test_flush_vq(struct vhost_test *n, int index)
|
||||
{
|
||||
vhost_poll_flush(&n->dev.vqs[index].poll);
|
||||
vhost_poll_flush(&n->vqs[index].poll);
|
||||
}
|
||||
|
||||
static void vhost_test_flush(struct vhost_test *n)
|
||||
@ -268,14 +277,14 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl,
|
||||
return -EFAULT;
|
||||
return vhost_test_run(n, test);
|
||||
case VHOST_GET_FEATURES:
|
||||
features = VHOST_NET_FEATURES;
|
||||
features = VHOST_FEATURES;
|
||||
if (copy_to_user(featurep, &features, sizeof features))
|
||||
return -EFAULT;
|
||||
return 0;
|
||||
case VHOST_SET_FEATURES:
|
||||
if (copy_from_user(&features, featurep, sizeof features))
|
||||
return -EFAULT;
|
||||
if (features & ~VHOST_NET_FEATURES)
|
||||
if (features & ~VHOST_FEATURES)
|
||||
return -EOPNOTSUPP;
|
||||
return vhost_test_set_features(n, features);
|
||||
case VHOST_RESET_OWNER:
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/cgroup.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include "vhost.h"
|
||||
|
||||
@ -66,6 +67,7 @@ void vhost_work_init(struct vhost_work *work, vhost_work_fn_t fn)
|
||||
work->flushing = 0;
|
||||
work->queue_seq = work->done_seq = 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_work_init);
|
||||
|
||||
/* Init poll structure */
|
||||
void vhost_poll_init(struct vhost_poll *poll, vhost_work_fn_t fn,
|
||||
@ -79,6 +81,7 @@ void vhost_poll_init(struct vhost_poll *poll, vhost_work_fn_t fn,
|
||||
|
||||
vhost_work_init(&poll->work, fn);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_poll_init);
|
||||
|
||||
/* Start polling a file. We add ourselves to file's wait queue. The caller must
|
||||
* keep a reference to a file until after vhost_poll_stop is called. */
|
||||
@ -101,6 +104,7 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file)
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_poll_start);
|
||||
|
||||
/* Stop polling a file. After this function returns, it becomes safe to drop the
|
||||
* file reference. You must also flush afterwards. */
|
||||
@ -111,6 +115,7 @@ void vhost_poll_stop(struct vhost_poll *poll)
|
||||
poll->wqh = NULL;
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_poll_stop);
|
||||
|
||||
static bool vhost_work_seq_done(struct vhost_dev *dev, struct vhost_work *work,
|
||||
unsigned seq)
|
||||
@ -123,7 +128,7 @@ static bool vhost_work_seq_done(struct vhost_dev *dev, struct vhost_work *work,
|
||||
return left <= 0;
|
||||
}
|
||||
|
||||
static void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work)
|
||||
void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work)
|
||||
{
|
||||
unsigned seq;
|
||||
int flushing;
|
||||
@ -138,6 +143,7 @@ static void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work)
|
||||
spin_unlock_irq(&dev->work_lock);
|
||||
BUG_ON(flushing < 0);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_work_flush);
|
||||
|
||||
/* Flush any work that has been scheduled. When calling this, don't hold any
|
||||
* locks that are also used by the callback. */
|
||||
@ -145,6 +151,7 @@ void vhost_poll_flush(struct vhost_poll *poll)
|
||||
{
|
||||
vhost_work_flush(poll->dev, &poll->work);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_poll_flush);
|
||||
|
||||
void vhost_work_queue(struct vhost_dev *dev, struct vhost_work *work)
|
||||
{
|
||||
@ -158,11 +165,13 @@ void vhost_work_queue(struct vhost_dev *dev, struct vhost_work *work)
|
||||
}
|
||||
spin_unlock_irqrestore(&dev->work_lock, flags);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_work_queue);
|
||||
|
||||
void vhost_poll_queue(struct vhost_poll *poll)
|
||||
{
|
||||
vhost_work_queue(poll->dev, &poll->work);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_poll_queue);
|
||||
|
||||
static void vhost_vq_reset(struct vhost_dev *dev,
|
||||
struct vhost_virtqueue *vq)
|
||||
@ -251,17 +260,16 @@ static void vhost_vq_free_iovecs(struct vhost_virtqueue *vq)
|
||||
/* Helper to allocate iovec buffers for all vqs. */
|
||||
static long vhost_dev_alloc_iovecs(struct vhost_dev *dev)
|
||||
{
|
||||
struct vhost_virtqueue *vq;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < dev->nvqs; ++i) {
|
||||
dev->vqs[i]->indirect = kmalloc(sizeof *dev->vqs[i]->indirect *
|
||||
UIO_MAXIOV, GFP_KERNEL);
|
||||
dev->vqs[i]->log = kmalloc(sizeof *dev->vqs[i]->log * UIO_MAXIOV,
|
||||
GFP_KERNEL);
|
||||
dev->vqs[i]->heads = kmalloc(sizeof *dev->vqs[i]->heads *
|
||||
UIO_MAXIOV, GFP_KERNEL);
|
||||
if (!dev->vqs[i]->indirect || !dev->vqs[i]->log ||
|
||||
!dev->vqs[i]->heads)
|
||||
vq = dev->vqs[i];
|
||||
vq->indirect = kmalloc(sizeof *vq->indirect * UIO_MAXIOV,
|
||||
GFP_KERNEL);
|
||||
vq->log = kmalloc(sizeof *vq->log * UIO_MAXIOV, GFP_KERNEL);
|
||||
vq->heads = kmalloc(sizeof *vq->heads * UIO_MAXIOV, GFP_KERNEL);
|
||||
if (!vq->indirect || !vq->log || !vq->heads)
|
||||
goto err_nomem;
|
||||
}
|
||||
return 0;
|
||||
@ -283,6 +291,7 @@ static void vhost_dev_free_iovecs(struct vhost_dev *dev)
|
||||
long vhost_dev_init(struct vhost_dev *dev,
|
||||
struct vhost_virtqueue **vqs, int nvqs)
|
||||
{
|
||||
struct vhost_virtqueue *vq;
|
||||
int i;
|
||||
|
||||
dev->vqs = vqs;
|
||||
@ -297,19 +306,21 @@ long vhost_dev_init(struct vhost_dev *dev,
|
||||
dev->worker = NULL;
|
||||
|
||||
for (i = 0; i < dev->nvqs; ++i) {
|
||||
dev->vqs[i]->log = NULL;
|
||||
dev->vqs[i]->indirect = NULL;
|
||||
dev->vqs[i]->heads = NULL;
|
||||
dev->vqs[i]->dev = dev;
|
||||
mutex_init(&dev->vqs[i]->mutex);
|
||||
vhost_vq_reset(dev, dev->vqs[i]);
|
||||
if (dev->vqs[i]->handle_kick)
|
||||
vhost_poll_init(&dev->vqs[i]->poll,
|
||||
dev->vqs[i]->handle_kick, POLLIN, dev);
|
||||
vq = dev->vqs[i];
|
||||
vq->log = NULL;
|
||||
vq->indirect = NULL;
|
||||
vq->heads = NULL;
|
||||
vq->dev = dev;
|
||||
mutex_init(&vq->mutex);
|
||||
vhost_vq_reset(dev, vq);
|
||||
if (vq->handle_kick)
|
||||
vhost_poll_init(&vq->poll, vq->handle_kick,
|
||||
POLLIN, dev);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_init);
|
||||
|
||||
/* Caller should have device mutex */
|
||||
long vhost_dev_check_owner(struct vhost_dev *dev)
|
||||
@ -317,6 +328,7 @@ long vhost_dev_check_owner(struct vhost_dev *dev)
|
||||
/* Are you the owner? If not, I don't think you mean to do that */
|
||||
return dev->mm == current->mm ? 0 : -EPERM;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_check_owner);
|
||||
|
||||
struct vhost_attach_cgroups_struct {
|
||||
struct vhost_work work;
|
||||
@ -348,6 +360,7 @@ bool vhost_dev_has_owner(struct vhost_dev *dev)
|
||||
{
|
||||
return dev->mm;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_has_owner);
|
||||
|
||||
/* Caller should have device mutex */
|
||||
long vhost_dev_set_owner(struct vhost_dev *dev)
|
||||
@ -391,11 +404,13 @@ err_worker:
|
||||
err_mm:
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_set_owner);
|
||||
|
||||
struct vhost_memory *vhost_dev_reset_owner_prepare(void)
|
||||
{
|
||||
return kmalloc(offsetof(struct vhost_memory, regions), GFP_KERNEL);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_reset_owner_prepare);
|
||||
|
||||
/* Caller should have device mutex */
|
||||
void vhost_dev_reset_owner(struct vhost_dev *dev, struct vhost_memory *memory)
|
||||
@ -406,6 +421,7 @@ void vhost_dev_reset_owner(struct vhost_dev *dev, struct vhost_memory *memory)
|
||||
memory->nregions = 0;
|
||||
RCU_INIT_POINTER(dev->memory, memory);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_reset_owner);
|
||||
|
||||
void vhost_dev_stop(struct vhost_dev *dev)
|
||||
{
|
||||
@ -418,6 +434,7 @@ void vhost_dev_stop(struct vhost_dev *dev)
|
||||
}
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_stop);
|
||||
|
||||
/* Caller should have device mutex if and only if locked is set */
|
||||
void vhost_dev_cleanup(struct vhost_dev *dev, bool locked)
|
||||
@ -458,6 +475,7 @@ void vhost_dev_cleanup(struct vhost_dev *dev, bool locked)
|
||||
mmput(dev->mm);
|
||||
dev->mm = NULL;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_cleanup);
|
||||
|
||||
static int log_access_ok(void __user *log_base, u64 addr, unsigned long sz)
|
||||
{
|
||||
@ -543,6 +561,7 @@ int vhost_log_access_ok(struct vhost_dev *dev)
|
||||
lockdep_is_held(&dev->mutex));
|
||||
return memory_access_ok(dev, mp, 1);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_log_access_ok);
|
||||
|
||||
/* Verify access for write logging. */
|
||||
/* Caller should have vq mutex and device mutex */
|
||||
@ -568,6 +587,7 @@ int vhost_vq_access_ok(struct vhost_virtqueue *vq)
|
||||
return vq_access_ok(vq->dev, vq->num, vq->desc, vq->avail, vq->used) &&
|
||||
vq_log_access_ok(vq->dev, vq, vq->log_base);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_vq_access_ok);
|
||||
|
||||
static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
|
||||
{
|
||||
@ -797,6 +817,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp)
|
||||
vhost_poll_flush(&vq->poll);
|
||||
return r;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_vring_ioctl);
|
||||
|
||||
/* Caller must have device mutex */
|
||||
long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
|
||||
@ -877,6 +898,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
|
||||
done:
|
||||
return r;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_dev_ioctl);
|
||||
|
||||
static const struct vhost_memory_region *find_region(struct vhost_memory *mem,
|
||||
__u64 addr, __u32 len)
|
||||
@ -968,6 +990,7 @@ int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log,
|
||||
BUG();
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_log_write);
|
||||
|
||||
static int vhost_update_used_flags(struct vhost_virtqueue *vq)
|
||||
{
|
||||
@ -1019,6 +1042,7 @@ int vhost_init_used(struct vhost_virtqueue *vq)
|
||||
vq->signalled_used_valid = false;
|
||||
return get_user(vq->last_used_idx, &vq->used->idx);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_init_used);
|
||||
|
||||
static int translate_desc(struct vhost_dev *dev, u64 addr, u32 len,
|
||||
struct iovec iov[], int iov_size)
|
||||
@ -1295,12 +1319,14 @@ int vhost_get_vq_desc(struct vhost_dev *dev, struct vhost_virtqueue *vq,
|
||||
BUG_ON(!(vq->used_flags & VRING_USED_F_NO_NOTIFY));
|
||||
return head;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_get_vq_desc);
|
||||
|
||||
/* Reverse the effect of vhost_get_vq_desc. Useful for error handling. */
|
||||
void vhost_discard_vq_desc(struct vhost_virtqueue *vq, int n)
|
||||
{
|
||||
vq->last_avail_idx -= n;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_discard_vq_desc);
|
||||
|
||||
/* After we've used one of their buffers, we tell them about it. We'll then
|
||||
* want to notify the guest, using eventfd. */
|
||||
@ -1349,6 +1375,7 @@ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len)
|
||||
vq->signalled_used_valid = false;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_add_used);
|
||||
|
||||
static int __vhost_add_used_n(struct vhost_virtqueue *vq,
|
||||
struct vring_used_elem *heads,
|
||||
@ -1418,6 +1445,7 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads,
|
||||
}
|
||||
return r;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_add_used_n);
|
||||
|
||||
static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq)
|
||||
{
|
||||
@ -1462,6 +1490,7 @@ void vhost_signal(struct vhost_dev *dev, struct vhost_virtqueue *vq)
|
||||
if (vq->call_ctx && vhost_notify(dev, vq))
|
||||
eventfd_signal(vq->call_ctx, 1);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_signal);
|
||||
|
||||
/* And here's the combo meal deal. Supersize me! */
|
||||
void vhost_add_used_and_signal(struct vhost_dev *dev,
|
||||
@ -1471,6 +1500,7 @@ void vhost_add_used_and_signal(struct vhost_dev *dev,
|
||||
vhost_add_used(vq, head, len);
|
||||
vhost_signal(dev, vq);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_add_used_and_signal);
|
||||
|
||||
/* multi-buffer version of vhost_add_used_and_signal */
|
||||
void vhost_add_used_and_signal_n(struct vhost_dev *dev,
|
||||
@ -1480,6 +1510,7 @@ void vhost_add_used_and_signal_n(struct vhost_dev *dev,
|
||||
vhost_add_used_n(vq, heads, count);
|
||||
vhost_signal(dev, vq);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_add_used_and_signal_n);
|
||||
|
||||
/* OK, now we need to know about added descriptors. */
|
||||
bool vhost_enable_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq)
|
||||
@ -1517,6 +1548,7 @@ bool vhost_enable_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq)
|
||||
|
||||
return avail_idx != vq->avail_idx;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_enable_notify);
|
||||
|
||||
/* We don't need to be notified again. */
|
||||
void vhost_disable_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq)
|
||||
@ -1533,3 +1565,21 @@ void vhost_disable_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq)
|
||||
&vq->used->flags, r);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vhost_disable_notify);
|
||||
|
||||
static int __init vhost_init(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit vhost_exit(void)
|
||||
{
|
||||
}
|
||||
|
||||
module_init(vhost_init);
|
||||
module_exit(vhost_exit);
|
||||
|
||||
MODULE_VERSION("0.0.1");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_AUTHOR("Michael S. Tsirkin");
|
||||
MODULE_DESCRIPTION("Host kernel accelerator for virtio");
|
||||
|
@ -46,6 +46,8 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file);
|
||||
void vhost_poll_stop(struct vhost_poll *poll);
|
||||
void vhost_poll_flush(struct vhost_poll *poll);
|
||||
void vhost_poll_queue(struct vhost_poll *poll);
|
||||
void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work);
|
||||
long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp);
|
||||
|
||||
struct vhost_log {
|
||||
u64 addr;
|
||||
|
Loading…
Reference in New Issue
Block a user