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

Increase maximal number of SCSI ports in CTL from 32 to 128.

Browse Source 
After I gave each iSCSI target its own port, the old limit appeared to be
not so big.  This change almost proportionally increases per-LUN memory
use, but it is still three times better then it was before r268807.

MFC after:	2 weeks
This commit is contained in:
mav 2014-07-17 21:16:52 +00:00
parent b324b7bdb5
commit c253b272de
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8208,8 +8208,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
&& lun->res_type != SPR_TYPE_EX_AC_AR)
lun->pr_res_idx = residx;
else
lun->pr_res_idx =
CTL_PR_ALL_REGISTRANTS;
lun->pr_res_idx = CTL_PR_ALL_REGISTRANTS;
persis_io.hdr.nexus = ctsio->io_hdr.nexus;
persis_io.hdr.msg_type = CTL_MSG_PERS_ACTION;

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

@ -407,7 +407,7 @@ struct ctl_pr_info {
ctl_pr_action action;
uint8_t sa_res_key[8];
uint8_t res_type;
uint16_t residx;
uint32_t residx;
};
struct ctl_ha_msg_hdr {

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

@ -70,7 +70,7 @@
/*
* Maximum number of ports registered at one time.
*/
#define CTL_MAX_PORTS 32
#define CTL_MAX_PORTS 128
/*
* Maximum number of initiators we support.

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

@ -355,8 +355,8 @@ struct ctl_per_res_info {
uint8_t registered;
};
#define CTL_PR_ALL_REGISTRANTS 0xFFFF
#define CTL_PR_NO_RESERVATION 0xFFF0
#define CTL_PR_ALL_REGISTRANTS 0xFFFFFFFF
#define CTL_PR_NO_RESERVATION 0xFFFFFFF0
struct ctl_devid {
int len;
@ -398,7 +398,7 @@ struct ctl_lun {
struct ctl_per_res_info per_res[2*CTL_MAX_INITIATORS];
unsigned int PRGeneration;
int pr_key_count;
uint16_t pr_res_idx;
uint32_t pr_res_idx;
uint8_t res_type;
uint8_t write_buffer[262144];
struct ctl_devid *lun_devid;

2
sys/cam/ctl/ctl_tpc.c
View File

@ -89,7 +89,7 @@ struct tpc_io {
struct tpc_list {
uint8_t service_action;
int init_port;
uint16_t init_idx;
uint32_t init_idx;
uint32_t list_id;
uint8_t flags;
uint8_t *params;