d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow CTL device specification in bhyve virtio-scsi.

Browse Source 
There was a large refactoring done in CTL to allow multiple ioctl frontend
ports (and respective devices) to be created, particularly for bhyve.
Unfortunately, respective part of bhyve functionality got lost somehow from
the original virtio-scsi commit.  This change allows wanted device path to
be specified in either of two ways:
 -s 6,virtio-scsi,/dev/cam/ctl1.1
 -s 6,virtio-scsi,dev=/dev/cam/ctl2.3
If neither is specified, the default /dev/cam/ctl device is used.

While there, remove per-queue CTL device opening, which makes no sense at
this point.

Reported by:	wg
Reviewed by:	araujo
MFC after:	3 days
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D18504
This commit is contained in:
Alexander Motin 2018-12-11 20:47:00 +00:00
parent cc426dd319
commit 49f8782283
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/bhyve/bhyve.8
View File

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd October 24, 2018
.Dd December 11, 2018
.Dt BHYVE 8
.Os
.Sh NAME
@ -298,7 +298,16 @@ if not explicitly specified.
.Pp
SCSI devices:
.Bl -tag -width 10n
.It Pa /dev/cam/ Ns Oo , Ns Ar port and initiator_id Oc
.It Pa /dev/cam/ctl Ns Oo Ar pp . Ns Ar vp Oc Ns Oo , Ns Ar scsi-device-options Oc
.El
.Pp
The
.Ar scsi-device-options
are:
.Bl -tag -width 10n
.It Li iid= Ns Ar IID
Initiator ID to use when sending requests to specified CTL port.
The default value is 0.
.El
.Pp
TTY devices:

47
usr.sbin/bhyve/pci_virtio_scsi.c
View File

@ -105,7 +105,6 @@ struct pci_vtscsi_config {
struct pci_vtscsi_queue {
struct pci_vtscsi_softc * vsq_sc;
struct vqueue_info * vsq_vq;
int vsq_ctl_fd;
pthread_mutex_t vsq_mtx;
pthread_mutex_t vsq_qmtx;
pthread_cond_t vsq_cv;
@ -529,7 +528,7 @@ pci_vtscsi_request_handle(struct pci_vtscsi_queue *q, struct iovec *iov_in,
sbuf_delete(sb);
}
err = ioctl(q->vsq_ctl_fd, CTL_IO, io);
err = ioctl(sc->vss_ctl_fd, CTL_IO, io);
if (err != 0) {
WPRINTF(("CTL_IO: err=%d (%s)\n", errno, strerror(errno)));
cmd_wr->response = VIRTIO_SCSI_S_FAILURE;
@ -639,14 +638,8 @@ pci_vtscsi_init_queue(struct pci_vtscsi_softc *sc,
int i;
queue->vsq_sc = sc;
queue->vsq_ctl_fd = open("/dev/cam/ctl", O_RDWR);
queue->vsq_vq = &sc->vss_vq[num + 2];
if (queue->vsq_ctl_fd < 0) {
WPRINTF(("cannot open /dev/cam/ctl: %s\n", strerror(errno)));
return (-1);
}
pthread_mutex_init(&queue->vsq_mtx, NULL);
pthread_mutex_init(&queue->vsq_qmtx, NULL);
pthread_cond_init(&queue->vsq_cv, NULL);
@ -672,24 +665,34 @@ static int
pci_vtscsi_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
{
struct pci_vtscsi_softc *sc;
char *optname = NULL;
char *opt;
int i;
char *opt, *optname;
const char *devname;
int i, optidx = 0;
sc = calloc(1, sizeof(struct pci_vtscsi_softc));
sc->vss_ctl_fd = open("/dev/cam/ctl", O_RDWR);
if (sc->vss_ctl_fd < 0) {
WPRINTF(("cannot open /dev/cam/ctl: %s\n", strerror(errno)));
return (1);
devname = "/dev/cam/ctl";
while ((opt = strsep(&opts, ",")) != NULL) {
optname = strsep(&opt, "=");
if (opt == NULL && optidx == 0) {
if (optname[0] != 0)
devname = optname;
} else if (strcmp(optname, "dev") == 0 && opt != NULL) {
devname = opt;
} else if (strcmp(optname, "iid") == 0 && opt != NULL) {
sc->vss_iid = strtoul(opt, NULL, 10);
} else {
fprintf(stderr, "Invalid option %s\n", optname);
free(sc);
return (1);
}
optidx++;
}
while ((opt = strsep(&opts, ",")) != NULL) {
if ((optname = strsep(&opt, "=")) != NULL) {
if (strcmp(optname, "iid") == 0) {
sc->vss_iid = strtoul(opt, NULL, 10);
}
}
sc->vss_ctl_fd = open(devname, O_RDWR);
if (sc->vss_ctl_fd < 0) {
WPRINTF(("cannot open %s: %s\n", devname, strerror(errno)));
free(sc);
return (1);
}
vi_softc_linkup(&sc->vss_vs, &vtscsi_vi_consts, sc, pi, sc->vss_vq);