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

Bring per-port LUN enable/disable code up to date:

Browse Source 
- remove last remnants of never implemented multiple targets support;
 - implement missing support for LUN mapping in this area.

Due to existing locking constraints LUN mapping code is practically
unlocked at this point.  Hopefully it is not racy enough to live until
somebody get idea how to call sleeping fronend methods under lock also
taken by the same frontend in non-sleepable context. :(
This commit is contained in:
Alexander Motin 2015-06-20 12:43:54 +00:00
parent 2d8b28765c
commit 7834ea8891
9 changed files with 102 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
sys/cam/ctl/ctl.c
View File

@ -383,8 +383,8 @@ static int ctl_open(struct cdev *dev, int flags, int fmt, struct thread *td);
static int ctl_close(struct cdev *dev, int flags, int fmt, struct thread *td); static int ctl_close(struct cdev *dev, int flags, int fmt, struct thread *td);
static void ctl_ioctl_online(void *arg); static void ctl_ioctl_online(void *arg);
static void ctl_ioctl_offline(void *arg); static void ctl_ioctl_offline(void *arg);
static int ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id); static int ctl_ioctl_lun_enable(void *arg, int lun_id);
static int ctl_ioctl_lun_disable(void *arg, struct ctl_id targ_id, int lun_id); static int ctl_ioctl_lun_disable(void *arg, int lun_id);
static int ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio); static int ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio);
static int ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio); static int ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio);
static int ctl_ioctl_submit_wait(union ctl_io *io); static int ctl_ioctl_submit_wait(union ctl_io *io);
@ -399,7 +399,7 @@ static int ctl_ioctl_fill_ooa(struct ctl_lun *lun, uint32_t *cur_fill_num,
static int ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, static int ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
struct thread *td); struct thread *td);
static int ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *lun, static int ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *lun,
struct ctl_be_lun *be_lun, struct ctl_id target_id); struct ctl_be_lun *be_lun);
static int ctl_free_lun(struct ctl_lun *lun); static int ctl_free_lun(struct ctl_lun *lun);
static void ctl_create_lun(struct ctl_be_lun *be_lun); static void ctl_create_lun(struct ctl_be_lun *be_lun);
static struct ctl_port * ctl_io_port(struct ctl_io_hdr *io_hdr); static struct ctl_port * ctl_io_port(struct ctl_io_hdr *io_hdr);
@ -1128,13 +1128,6 @@ ctl_init(void)
softc->port_offset = (softc->ha_id - 1) * CTL_MAX_PORTS; softc->port_offset = (softc->ha_id - 1) * CTL_MAX_PORTS;
softc->persis_offset = softc->port_offset * CTL_MAX_INIT_PER_PORT; softc->persis_offset = softc->port_offset * CTL_MAX_INIT_PER_PORT;
/*
* XXX KDM need to figure out where we want to get our target ID
* and WWID. Is it different on each port?
*/
softc->target.id = 0;
softc->target.wwid[0] = 0x12345678;
softc->target.wwid[1] = 0x87654321;
STAILQ_INIT(&softc->lun_list); STAILQ_INIT(&softc->lun_list);
STAILQ_INIT(&softc->pending_lun_queue); STAILQ_INIT(&softc->pending_lun_queue);
STAILQ_INIT(&softc->fe_list); STAILQ_INIT(&softc->fe_list);
@ -1647,13 +1640,13 @@ ctl_create_iid(struct ctl_port *port, int iid, uint8_t *buf)
} }
static int static int
ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id) ctl_ioctl_lun_enable(void *arg, int lun_id)
{ {
return (0); return (0);
} }
static int static int
ctl_ioctl_lun_disable(void *arg, struct ctl_id targ_id, int lun_id) ctl_ioctl_lun_disable(void *arg, int lun_id)
{ {
return (0); return (0);
} }
@ -2478,28 +2471,9 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
mtx_unlock(&softc->ctl_lock); mtx_unlock(&softc->ctl_lock);
if (cmd == CTL_ENABLE_PORT) { if (cmd == CTL_ENABLE_PORT) {
struct ctl_lun *lun;
STAILQ_FOREACH(lun, &softc->lun_list,
links) {
port->lun_enable(port->targ_lun_arg,
lun->target,
lun->lun);
}
ctl_port_online(port); ctl_port_online(port);
} else if (cmd == CTL_DISABLE_PORT) { } else if (cmd == CTL_DISABLE_PORT) {
struct ctl_lun *lun;
ctl_port_offline(port); ctl_port_offline(port);
STAILQ_FOREACH(lun, &softc->lun_list,
links) {
port->lun_disable(
port->targ_lun_arg,
lun->target,
lun->lun);
}
} }
mtx_lock(&softc->ctl_lock); mtx_lock(&softc->ctl_lock);
@ -3560,26 +3534,22 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
mtx_unlock(&softc->ctl_lock); mtx_unlock(&softc->ctl_lock);
return (ENXIO); return (ENXIO);
} }
mtx_unlock(&softc->ctl_lock); // XXX: port_enable sleeps
if (lm->plun < CTL_MAX_LUNS) { if (lm->plun < CTL_MAX_LUNS) {
if (lm->lun == UINT32_MAX) if (lm->lun == UINT32_MAX)
retval = ctl_lun_map_unset(port, lm->plun); retval = ctl_lun_map_unset(port, lm->plun);
else if (lm->lun < CTL_MAX_LUNS && else if (lm->lun < CTL_MAX_LUNS &&
softc->ctl_luns[lm->lun] != NULL) softc->ctl_luns[lm->lun] != NULL)
retval = ctl_lun_map_set(port, lm->plun, lm->lun); retval = ctl_lun_map_set(port, lm->plun, lm->lun);
else { else
mtx_unlock(&softc->ctl_lock);
return (ENXIO); return (ENXIO);
}
} else if (lm->plun == UINT32_MAX) { } else if (lm->plun == UINT32_MAX) {
if (lm->lun == UINT32_MAX) if (lm->lun == UINT32_MAX)
retval = ctl_lun_map_deinit(port); retval = ctl_lun_map_deinit(port);
else else
retval = ctl_lun_map_init(port); retval = ctl_lun_map_init(port);
} else { } else
mtx_unlock(&softc->ctl_lock);
return (ENXIO); return (ENXIO);
}
mtx_unlock(&softc->ctl_lock);
break; break;
} }
default: { default: {
@ -3649,6 +3619,8 @@ ctl_port_idx(int port_num)
int int
ctl_lun_map_init(struct ctl_port *port) ctl_lun_map_init(struct ctl_port *port)
{ {
struct ctl_softc *softc = control_softc;
struct ctl_lun *lun;
uint32_t i; uint32_t i;
if (port->lun_map == NULL) if (port->lun_map == NULL)
@ -3658,17 +3630,27 @@ ctl_lun_map_init(struct ctl_port *port)
return (ENOMEM); return (ENOMEM);
for (i = 0; i < CTL_MAX_LUNS; i++) for (i = 0; i < CTL_MAX_LUNS; i++)
port->lun_map[i] = UINT32_MAX; port->lun_map[i] = UINT32_MAX;
if (port->status & CTL_PORT_STATUS_ONLINE) {
STAILQ_FOREACH(lun, &softc->lun_list, links)
port->lun_disable(port->targ_lun_arg, lun->lun);
}
return (0); return (0);
} }
int int
ctl_lun_map_deinit(struct ctl_port *port) ctl_lun_map_deinit(struct ctl_port *port)
{ {
struct ctl_softc *softc = control_softc;
struct ctl_lun *lun;
if (port->lun_map == NULL) if (port->lun_map == NULL)
return (0); return (0);
free(port->lun_map, M_CTL); free(port->lun_map, M_CTL);
port->lun_map = NULL; port->lun_map = NULL;
if (port->status & CTL_PORT_STATUS_ONLINE) {
STAILQ_FOREACH(lun, &softc->lun_list, links)
port->lun_enable(port->targ_lun_arg, lun->lun);
}
return (0); return (0);
} }
@ -3676,37 +3658,31 @@ int
ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun) ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun)
{ {
int status; int status;
uint32_t old;
if (port->lun_map == NULL) { if (port->lun_map == NULL) {
status = ctl_lun_map_init(port); status = ctl_lun_map_init(port);
if (status != 0) if (status != 0)
return (status); return (status);
} }
old = port->lun_map[plun];
port->lun_map[plun] = glun; port->lun_map[plun] = glun;
if ((port->status & CTL_PORT_STATUS_ONLINE) && old >= CTL_MAX_LUNS)
port->lun_enable(port->targ_lun_arg, plun);
return (0); return (0);
} }
int int
ctl_lun_map_unset(struct ctl_port *port, uint32_t plun) ctl_lun_map_unset(struct ctl_port *port, uint32_t plun)
{ {
uint32_t old;
if (port->lun_map == NULL) if (port->lun_map == NULL)
return (0); return (0);
old = port->lun_map[plun];
port->lun_map[plun] = UINT32_MAX; port->lun_map[plun] = UINT32_MAX;
return (0); if ((port->status & CTL_PORT_STATUS_ONLINE) && old < CTL_MAX_LUNS)
} port->lun_disable(port->targ_lun_arg, plun);
int
ctl_lun_map_unsetg(struct ctl_port *port, uint32_t glun)
{
int i;
if (port->lun_map == NULL)
return (0);
for (i = 0; i < CTL_MAX_LUNS; i++) {
if (port->lun_map[i] == glun)
port->lun_map[i] = UINT32_MAX;
}
return (0); return (0);
} }
@ -4532,7 +4508,7 @@ hex2bin(const char *str, uint8_t *buf, int buf_size)
*/ */
static int static int
ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun, ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
struct ctl_be_lun *const be_lun, struct ctl_id target_id) struct ctl_be_lun *const be_lun)
{ {
struct ctl_lun *nlun, *lun; struct ctl_lun *nlun, *lun;
struct scsi_vpd_id_descriptor *desc; struct scsi_vpd_id_descriptor *desc;
@ -4669,8 +4645,7 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
lun_number = ctl_ffz(ctl_softc->ctl_lun_mask, CTL_MAX_LUNS); lun_number = ctl_ffz(ctl_softc->ctl_lun_mask, CTL_MAX_LUNS);
if (lun_number == -1) { if (lun_number == -1) {
mtx_unlock(&ctl_softc->ctl_lock); mtx_unlock(&ctl_softc->ctl_lock);
printf("ctl: can't allocate LUN on target %ju, out of " printf("ctl: can't allocate LUN, out of LUNs\n");
"LUNs\n", (uintmax_t)target_id.id);
if (lun->flags & CTL_LUN_MALLOCED) if (lun->flags & CTL_LUN_MALLOCED)
free(lun, M_CTL); free(lun, M_CTL);
be_lun->lun_config_status(be_lun->be_lun, be_lun->lun_config_status(be_lun->be_lun,
@ -4681,7 +4656,6 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
ctl_set_mask(ctl_softc->ctl_lun_mask, lun_number); ctl_set_mask(ctl_softc->ctl_lun_mask, lun_number);
mtx_init(&lun->lun_lock, "CTL LUN", NULL, MTX_DEF); mtx_init(&lun->lun_lock, "CTL LUN", NULL, MTX_DEF);
lun->target = target_id;
lun->lun = lun_number; lun->lun = lun_number;
lun->be_lun = be_lun; lun->be_lun = be_lun;
/* /*
@ -4777,7 +4751,6 @@ static int
ctl_free_lun(struct ctl_lun *lun) ctl_free_lun(struct ctl_lun *lun)
{ {
struct ctl_softc *softc; struct ctl_softc *softc;
struct ctl_port *port;
struct ctl_lun *nlun; struct ctl_lun *nlun;
int i; int i;
@ -4785,9 +4758,6 @@ ctl_free_lun(struct ctl_lun *lun)
mtx_assert(&softc->ctl_lock, MA_OWNED); mtx_assert(&softc->ctl_lock, MA_OWNED);
STAILQ_FOREACH(port, &softc->port_list, links)
ctl_lun_map_unsetg(port, lun->lun);
STAILQ_REMOVE(&softc->lun_list, lun, ctl_lun, links); STAILQ_REMOVE(&softc->lun_list, lun, ctl_lun, links);
ctl_clear_mask(softc->ctl_lun_mask, lun->lun); ctl_clear_mask(softc->ctl_lun_mask, lun->lun);
@ -4835,7 +4805,7 @@ ctl_create_lun(struct ctl_be_lun *be_lun)
/* /*
* ctl_alloc_lun() should handle all potential failure cases. * ctl_alloc_lun() should handle all potential failure cases.
*/ */
ctl_alloc_lun(softc, NULL, be_lun, softc->target); ctl_alloc_lun(softc, NULL, be_lun);
} }
int int
@ -4878,6 +4848,9 @@ ctl_enable_lun(struct ctl_be_lun *be_lun)
for (port = STAILQ_FIRST(&softc->port_list); port != NULL; port = nport) { for (port = STAILQ_FIRST(&softc->port_list); port != NULL; port = nport) {
nport = STAILQ_NEXT(port, links); nport = STAILQ_NEXT(port, links);
if ((port->status & CTL_PORT_STATUS_ONLINE) == 0 ||
port->lun_map != NULL)
continue;
/* /*
* Drop the lock while we call the FETD's enable routine. * Drop the lock while we call the FETD's enable routine.
@ -4885,13 +4858,13 @@ ctl_enable_lun(struct ctl_be_lun *be_lun)
* case of the internal initiator frontend. * case of the internal initiator frontend.
*/ */
mtx_unlock(&softc->ctl_lock); mtx_unlock(&softc->ctl_lock);
retval = port->lun_enable(port->targ_lun_arg, lun->target,lun->lun); retval = port->lun_enable(port->targ_lun_arg, lun->lun);
mtx_lock(&softc->ctl_lock); mtx_lock(&softc->ctl_lock);
if (retval != 0) { if (retval != 0) {
printf("%s: FETD %s port %d returned error " printf("%s: FETD %s port %d returned error "
"%d for lun_enable on target %ju lun %jd\n", "%d for lun_enable on lun %jd\n",
__func__, port->port_name, port->targ_port, retval, __func__, port->port_name, port->targ_port,
(uintmax_t)lun->target.id, (intmax_t)lun->lun); retval, (intmax_t)lun->lun);
} }
} }
@ -4922,6 +4895,9 @@ ctl_disable_lun(struct ctl_be_lun *be_lun)
mtx_unlock(&lun->lun_lock); mtx_unlock(&lun->lun_lock);
STAILQ_FOREACH(port, &softc->port_list, links) { STAILQ_FOREACH(port, &softc->port_list, links) {
if ((port->status & CTL_PORT_STATUS_ONLINE) == 0 ||
port->lun_map != NULL)
continue;
mtx_unlock(&softc->ctl_lock); mtx_unlock(&softc->ctl_lock);
/* /*
* Drop the lock before we call the frontend's disable * Drop the lock before we call the frontend's disable
@ -4930,14 +4906,13 @@ ctl_disable_lun(struct ctl_be_lun *be_lun)
* XXX KDM what happens if the frontend list changes while * XXX KDM what happens if the frontend list changes while
* we're traversing it? It's unlikely, but should be handled. * we're traversing it? It's unlikely, but should be handled.
*/ */
retval = port->lun_disable(port->targ_lun_arg, lun->target, retval = port->lun_disable(port->targ_lun_arg, lun->lun);
lun->lun);
mtx_lock(&softc->ctl_lock); mtx_lock(&softc->ctl_lock);
if (retval != 0) { if (retval != 0) {
printf("%s: FETD %s port %d returned error " printf("%s: FETD %s port %d returned error "
"%d for lun_disable on target %ju lun %jd\n", "%d for lun_disable on lun %jd\n",
__func__, port->port_name, port->targ_port, retval, __func__, port->port_name, port->targ_port,
(uintmax_t)lun->target.id, (intmax_t)lun->lun); retval, (intmax_t)lun->lun);
} }
} }

28
sys/cam/ctl/ctl_frontend.c
View File

@ -301,6 +301,20 @@ ctl_port_set_wwns(struct ctl_port *port, int wwnn_valid, uint64_t wwnn,
void void
ctl_port_online(struct ctl_port *port) ctl_port_online(struct ctl_port *port)
{ {
struct ctl_softc *softc = control_softc;
struct ctl_lun *lun;
uint32_t l;
if (port->lun_map) {
for (l = 0; l < CTL_MAX_LUNS; l++) {
if (ctl_lun_map_from_port(port, l) >= CTL_MAX_LUNS)
continue;
port->lun_enable(port->targ_lun_arg, l);
}
} else {
STAILQ_FOREACH(lun, &softc->lun_list, links)
port->lun_enable(port->targ_lun_arg, lun->lun);
}
port->port_online(port->onoff_arg); port->port_online(port->onoff_arg);
/* XXX KDM need a lock here? */ /* XXX KDM need a lock here? */
port->status |= CTL_PORT_STATUS_ONLINE; port->status |= CTL_PORT_STATUS_ONLINE;
@ -309,7 +323,21 @@ ctl_port_online(struct ctl_port *port)
void void
ctl_port_offline(struct ctl_port *port) ctl_port_offline(struct ctl_port *port)
{ {
struct ctl_softc *softc = control_softc;
struct ctl_lun *lun;
uint32_t l;
port->port_offline(port->onoff_arg); port->port_offline(port->onoff_arg);
if (port->lun_map) {
for (l = 0; l < CTL_MAX_LUNS; l++) {
if (ctl_lun_map_from_port(port, l) >= CTL_MAX_LUNS)
continue;
port->lun_disable(port->targ_lun_arg, l);
}
} else {
STAILQ_FOREACH(lun, &softc->lun_list, links)
port->lun_disable(port->targ_lun_arg, lun->lun);
}
/* XXX KDM need a lock here? */ /* XXX KDM need a lock here? */
port->status &= ~CTL_PORT_STATUS_ONLINE; port->status &= ~CTL_PORT_STATUS_ONLINE;
} }

2
sys/cam/ctl/ctl_frontend.h
View File

@ -48,7 +48,7 @@ typedef int (*fe_init_t)(void);
typedef void (*fe_shutdown_t)(void); typedef void (*fe_shutdown_t)(void);
typedef void (*port_func_t)(void *onoff_arg); typedef void (*port_func_t)(void *onoff_arg);
typedef int (*port_info_func_t)(void *onoff_arg, struct sbuf *sb); typedef int (*port_info_func_t)(void *onoff_arg, struct sbuf *sb);
typedef int (*lun_func_t)(void *arg, struct ctl_id targ_id, int lun_id); typedef int (*lun_func_t)(void *arg, int lun_id);
typedef int (*fe_ioctl_t)(struct cdev *dev, u_long cmd, caddr_t addr, int flag, typedef int (*fe_ioctl_t)(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
struct thread *td); struct thread *td);

8
sys/cam/ctl/ctl_frontend_cam_sim.c
View File

@ -99,8 +99,8 @@ int cfcs_init(void);
static void cfcs_poll(struct cam_sim *sim); static void cfcs_poll(struct cam_sim *sim);
static void cfcs_online(void *arg); static void cfcs_online(void *arg);
static void cfcs_offline(void *arg); static void cfcs_offline(void *arg);
static int cfcs_lun_enable(void *arg, struct ctl_id target_id, int lun_id); static int cfcs_lun_enable(void *arg, int lun_id);
static int cfcs_lun_disable(void *arg, struct ctl_id target_id, int lun_id); static int cfcs_lun_disable(void *arg, int lun_id);
static void cfcs_datamove(union ctl_io *io); static void cfcs_datamove(union ctl_io *io);
static void cfcs_done(union ctl_io *io); static void cfcs_done(union ctl_io *io);
void cfcs_action(struct cam_sim *sim, union ccb *ccb); void cfcs_action(struct cam_sim *sim, union ccb *ccb);
@ -303,12 +303,12 @@ cfcs_offline(void *arg)
} }
static int static int
cfcs_lun_enable(void *arg, struct ctl_id target_id, int lun_id) cfcs_lun_enable(void *arg, int lun_id)
{ {
return (0); return (0);
} }
static int static int
cfcs_lun_disable(void *arg, struct ctl_id target_id, int lun_id) cfcs_lun_disable(void *arg, int lun_id)
{ {
return (0); return (0);
} }

24
sys/cam/ctl/ctl_frontend_internal.c
View File

@ -144,7 +144,6 @@ typedef enum {
} cfi_lun_state; } cfi_lun_state;
struct cfi_lun { struct cfi_lun {
struct ctl_id target_id;
int lun_id; int lun_id;
struct scsi_inquiry_data inq_data; struct scsi_inquiry_data inq_data;
uint64_t num_blocks; uint64_t num_blocks;
@ -192,8 +191,8 @@ int cfi_init(void);
void cfi_shutdown(void) __unused; void cfi_shutdown(void) __unused;
static void cfi_online(void *arg); static void cfi_online(void *arg);
static void cfi_offline(void *arg); static void cfi_offline(void *arg);
static int cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id); static int cfi_lun_enable(void *arg, int lun_id);
static int cfi_lun_disable(void *arg, struct ctl_id target_id, int lun_id); static int cfi_lun_disable(void *arg, int lun_id);
static void cfi_datamove(union ctl_io *io); static void cfi_datamove(union ctl_io *io);
static cfi_error_action cfi_checkcond_parse(union ctl_io *io, static cfi_error_action cfi_checkcond_parse(union ctl_io *io,
struct cfi_lun_io *lun_io); struct cfi_lun_io *lun_io);
@ -324,7 +323,7 @@ cfi_offline(void *arg)
} }
static int static int
cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id) cfi_lun_enable(void *arg, int lun_id)
{ {
struct cfi_softc *softc; struct cfi_softc *softc;
struct cfi_lun *lun; struct cfi_lun *lun;
@ -335,8 +334,7 @@ cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
found = 0; found = 0;
mtx_lock(&softc->lock); mtx_lock(&softc->lock);
STAILQ_FOREACH(lun, &softc->lun_list, links) { STAILQ_FOREACH(lun, &softc->lun_list, links) {
if ((lun->target_id.id == target_id.id) if (lun->lun_id == lun_id) {
&& (lun->lun_id == lun_id)) {
found = 1; found = 1;
break; break;
} }
@ -356,7 +354,6 @@ cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
return (1); return (1);
} }
lun->target_id = target_id;
lun->lun_id = lun_id; lun->lun_id = lun_id;
lun->cur_tag_num = 0; lun->cur_tag_num = 0;
lun->state = CFI_LUN_INQUIRY; lun->state = CFI_LUN_INQUIRY;
@ -373,7 +370,7 @@ cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
} }
static int static int
cfi_lun_disable(void *arg, struct ctl_id target_id, int lun_id) cfi_lun_disable(void *arg, int lun_id)
{ {
struct cfi_softc *softc; struct cfi_softc *softc;
struct cfi_lun *lun; struct cfi_lun *lun;
@ -391,8 +388,7 @@ cfi_lun_disable(void *arg, struct ctl_id target_id, int lun_id)
*/ */
mtx_lock(&softc->lock); mtx_lock(&softc->lock);
STAILQ_FOREACH(lun, &softc->lun_list, links) { STAILQ_FOREACH(lun, &softc->lun_list, links) {
if ((lun->target_id.id == target_id.id) if (lun->lun_id == lun_id) {
&& (lun->lun_id == lun_id)) {
found = 1; found = 1;
break; break;
} }
@ -403,8 +399,7 @@ cfi_lun_disable(void *arg, struct ctl_id target_id, int lun_id)
mtx_unlock(&softc->lock); mtx_unlock(&softc->lock);
if (found == 0) { if (found == 0) {
printf("%s: can't find target %ju lun %d\n", __func__, printf("%s: can't find lun %d\n", __func__, lun_id);
(uintmax_t)target_id.id, lun_id);
return (1); return (1);
} }
@ -700,7 +695,7 @@ cfi_init_io(union ctl_io *io, struct cfi_lun *lun,
io->io_hdr.nexus.initid.id = 7; io->io_hdr.nexus.initid.id = 7;
io->io_hdr.nexus.targ_port = lun->softc->port.targ_port; io->io_hdr.nexus.targ_port = lun->softc->port.targ_port;
io->io_hdr.nexus.targ_target.id = lun->target_id.id; io->io_hdr.nexus.targ_target.id = 0;
io->io_hdr.nexus.targ_lun = lun->lun_id; io->io_hdr.nexus.targ_lun = lun->lun_id;
io->io_hdr.retries = retries; io->io_hdr.retries = retries;
lun_io = (struct cfi_lun_io *)io->io_hdr.port_priv; lun_io = (struct cfi_lun_io *)io->io_hdr.port_priv;
@ -1008,8 +1003,7 @@ cfi_lun_probe(struct cfi_lun *lun, int have_lock)
M_CTL_CFI, M_NOWAIT); M_CTL_CFI, M_NOWAIT);
if (dataptr == NULL) { if (dataptr == NULL) {
printf("%s: unable to allocate SCSI read capacity " printf("%s: unable to allocate SCSI read capacity "
"buffer for target %ju lun %d\n", __func__, "buffer for lun %d\n", __func__, lun->lun_id);
(uintmax_t)lun->target_id.id, lun->lun_id);
return; return;
} }
if (lun->state == CFI_LUN_READCAPACITY) { if (lun->state == CFI_LUN_READCAPACITY) {

10
sys/cam/ctl/ctl_frontend_iscsi.c
View File

@ -147,10 +147,8 @@ int cfiscsi_init(void);
static void cfiscsi_online(void *arg); static void cfiscsi_online(void *arg);
static void cfiscsi_offline(void *arg); static void cfiscsi_offline(void *arg);
static int cfiscsi_info(void *arg, struct sbuf *sb); static int cfiscsi_info(void *arg, struct sbuf *sb);
static int cfiscsi_lun_enable(void *arg, static int cfiscsi_lun_enable(void *arg, int lun_id);
struct ctl_id target_id, int lun_id); static int cfiscsi_lun_disable(void *arg, int lun_id);
static int cfiscsi_lun_disable(void *arg,
struct ctl_id target_id, int lun_id);
static int cfiscsi_ioctl(struct cdev *dev, static int cfiscsi_ioctl(struct cdev *dev,
u_long cmd, caddr_t addr, int flag, struct thread *td); u_long cmd, caddr_t addr, int flag, struct thread *td);
static void cfiscsi_datamove(union ctl_io *io); static void cfiscsi_datamove(union ctl_io *io);
@ -2373,14 +2371,14 @@ cfiscsi_target_find_or_create(struct cfiscsi_softc *softc, const char *name,
} }
static int static int
cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id) cfiscsi_lun_enable(void *arg, int lun_id)
{ {
return (0); return (0);
} }
static int static int
cfiscsi_lun_disable(void *arg, struct ctl_id target_id, int lun_id) cfiscsi_lun_disable(void *arg, int lun_id)
{ {
return (0); return (0);

3
sys/cam/ctl/ctl_private.h
View File

@ -397,7 +397,6 @@ struct ctl_devid {
struct tpc_list; struct tpc_list;
struct ctl_lun { struct ctl_lun {
struct mtx lun_lock; struct mtx lun_lock;
struct ctl_id target;
uint64_t lun; uint64_t lun;
ctl_lun_flags flags; ctl_lun_flags flags;
ctl_lun_serseq serseq; ctl_lun_serseq serseq;
@ -460,7 +459,6 @@ struct ctl_softc {
struct mtx ctl_lock; struct mtx ctl_lock;
struct cdev *dev; struct cdev *dev;
int open_count; int open_count;
struct ctl_id target;
int num_disks; int num_disks;
int num_luns; int num_luns;
ctl_gen_flags flags; ctl_gen_flags flags;
@ -508,7 +506,6 @@ int ctl_lun_map_init(struct ctl_port *port);
int ctl_lun_map_deinit(struct ctl_port *port); int ctl_lun_map_deinit(struct ctl_port *port);
int ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun); int ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun);
int ctl_lun_map_unset(struct ctl_port *port, uint32_t plun); int ctl_lun_map_unset(struct ctl_port *port, uint32_t plun);
int ctl_lun_map_unsetg(struct ctl_port *port, uint32_t glun);
uint32_t ctl_lun_map_from_port(struct ctl_port *port, uint32_t plun); uint32_t ctl_lun_map_from_port(struct ctl_port *port, uint32_t plun);
uint32_t ctl_lun_map_to_port(struct ctl_port *port, uint32_t glun); uint32_t ctl_lun_map_to_port(struct ctl_port *port, uint32_t glun);
int ctl_pool_create(struct ctl_softc *ctl_softc, const char *pool_name, int ctl_pool_create(struct ctl_softc *ctl_softc, const char *pool_name,

8
sys/cam/ctl/ctl_tpc_local.c
View File

@ -69,8 +69,8 @@ static int tpcl_init(void);
static void tpcl_shutdown(void); static void tpcl_shutdown(void);
static void tpcl_online(void *arg); static void tpcl_online(void *arg);
static void tpcl_offline(void *arg); static void tpcl_offline(void *arg);
static int tpcl_lun_enable(void *arg, struct ctl_id target_id, int lun_id); static int tpcl_lun_enable(void *arg, int lun_id);
static int tpcl_lun_disable(void *arg, struct ctl_id target_id, int lun_id); static int tpcl_lun_disable(void *arg, int lun_id);
static void tpcl_datamove(union ctl_io *io); static void tpcl_datamove(union ctl_io *io);
static void tpcl_done(union ctl_io *io); static void tpcl_done(union ctl_io *io);
@ -152,14 +152,14 @@ tpcl_offline(void *arg)
} }
static int static int
tpcl_lun_enable(void *arg, struct ctl_id target_id, int lun_id) tpcl_lun_enable(void *arg, int lun_id)
{ {
return (0); return (0);
} }
static int static int
tpcl_lun_disable(void *arg, struct ctl_id target_id, int lun_id) tpcl_lun_disable(void *arg, int lun_id)
{ {
return (0); return (0);

18
sys/cam/ctl/scsi_ctl.c
View File

@ -202,10 +202,8 @@ static void ctlfedone(struct cam_periph *periph,
static void ctlfe_onoffline(void *arg, int online); static void ctlfe_onoffline(void *arg, int online);
static void ctlfe_online(void *arg); static void ctlfe_online(void *arg);
static void ctlfe_offline(void *arg); static void ctlfe_offline(void *arg);
static int ctlfe_lun_enable(void *arg, struct ctl_id targ_id, static int ctlfe_lun_enable(void *arg, int lun_id);
int lun_id); static int ctlfe_lun_disable(void *arg, int lun_id);
static int ctlfe_lun_disable(void *arg, struct ctl_id targ_id,
int lun_id);
static void ctlfe_dump_sim(struct cam_sim *sim); static void ctlfe_dump_sim(struct cam_sim *sim);
static void ctlfe_dump_queue(struct ctlfe_lun_softc *softc); static void ctlfe_dump_queue(struct ctlfe_lun_softc *softc);
static void ctlfe_datamove(union ctl_io *io); static void ctlfe_datamove(union ctl_io *io);
@ -1800,7 +1798,7 @@ ctlfe_offline(void *arg)
* CTL. So we only need to create a path/periph for this particular bus. * CTL. So we only need to create a path/periph for this particular bus.
*/ */
static int static int
ctlfe_lun_enable(void *arg, struct ctl_id targ_id, int lun_id) ctlfe_lun_enable(void *arg, int lun_id)
{ {
struct ctlfe_softc *bus_softc; struct ctlfe_softc *bus_softc;
struct ctlfe_lun_softc *softc; struct ctlfe_lun_softc *softc;
@ -1811,8 +1809,7 @@ ctlfe_lun_enable(void *arg, struct ctl_id targ_id, int lun_id)
bus_softc = (struct ctlfe_softc *)arg; bus_softc = (struct ctlfe_softc *)arg;
status = xpt_create_path(&path, /*periph*/ NULL, status = xpt_create_path(&path, /*periph*/ NULL,
bus_softc->path_id, bus_softc->path_id, 0, lun_id);
targ_id.id, lun_id);
/* XXX KDM need some way to return status to CTL here? */ /* XXX KDM need some way to return status to CTL here? */
if (status != CAM_REQ_CMP) { if (status != CAM_REQ_CMP) {
printf("%s: could not create path, status %#x\n", __func__, printf("%s: could not create path, status %#x\n", __func__,
@ -1863,7 +1860,7 @@ ctlfe_lun_enable(void *arg, struct ctl_id targ_id, int lun_id)
* on every bus that is attached to CTL. * on every bus that is attached to CTL.
*/ */
static int static int
ctlfe_lun_disable(void *arg, struct ctl_id targ_id, int lun_id) ctlfe_lun_disable(void *arg, int lun_id)
{ {
struct ctlfe_softc *softc; struct ctlfe_softc *softc;
struct ctlfe_lun_softc *lun_softc; struct ctlfe_lun_softc *lun_softc;
@ -1876,15 +1873,14 @@ ctlfe_lun_disable(void *arg, struct ctl_id targ_id, int lun_id)
path = lun_softc->periph->path; path = lun_softc->periph->path;
if ((xpt_path_target_id(path) == targ_id.id) if ((xpt_path_target_id(path) == 0)
&& (xpt_path_lun_id(path) == lun_id)) { && (xpt_path_lun_id(path) == lun_id)) {
break; break;
} }
} }
if (lun_softc == NULL) { if (lun_softc == NULL) {
mtx_unlock(&softc->lun_softc_mtx); mtx_unlock(&softc->lun_softc_mtx);
printf("%s: can't find target %d lun %d\n", __func__, printf("%s: can't find lun %d\n", __func__, lun_id);
targ_id.id, lun_id);
return (1); return (1);
} }
cam_periph_acquire(lun_softc->periph); cam_periph_acquire(lun_softc->periph);