Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi: target: core: Unify NAA identifier generation

Browse Source 
Both the INQUIRY handling and the XCOPY implementation provide functions to
generate an NAA designator. In addition, these functions are poorly named:

 - spc_parse_naa_6h_vendor_specific()
 - target_xcopy_gen_naa_ieee()

Introduce a common NAA 6 designator generation function,
spc_gen_naa_6h_vendor_specific().

Link: https://lore.kernel.org/r/20210420185920.42431-2-s.samoylenko@yadro.com
Signed-off-by: Sergey Samoylenko <s.samoylenko@yadro.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Sergey Samoylenko 2021-04-20 21:59:19 +03:00 committed by Martin K. Petersen
parent f8a78e9118
commit 17f947b8b0
3 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/target/target_core_pr.h
View File

@ -52,7 +52,7 @@
/* /*
* Function defined in target_core_spc.c * Function defined in target_core_spc.c
*/ */
void spc_parse_naa_6h_vendor_specific(struct se_device *, unsigned char *); void spc_gen_naa_6h_vendor_specific(struct se_device *, unsigned char *);
extern struct kmem_cache *t10_pr_reg_cache; extern struct kmem_cache *t10_pr_reg_cache;

47
drivers/target/target_core_spc.c
View File

@ -129,13 +129,28 @@ spc_emulate_evpd_80(struct se_cmd *cmd, unsigned char *buf)
return 0; return 0;
} }
void spc_parse_naa_6h_vendor_specific(struct se_device *dev, /*
unsigned char *buf) * Generate NAA IEEE Registered Extended designator
*/
void spc_gen_naa_6h_vendor_specific(struct se_device *dev,
unsigned char *buf)
{ {
unsigned char *p = &dev->t10_wwn.unit_serial[0]; unsigned char *p = &dev->t10_wwn.unit_serial[0];
int cnt; int cnt, off = 0;
bool next = true; bool next = true;
/*
* Start NAA IEEE Registered Extended Identifier/Designator
*/
buf[off++] = 0x6 << 4;
/*
* Use OpenFabrics IEEE Company ID: 00 14 05
*/
buf[off++] = 0x01;
buf[off++] = 0x40;
buf[off] = (0x5 << 4);
/* /*
* Generate up to 36 bits of VENDOR SPECIFIC IDENTIFIER starting on * Generate up to 36 bits of VENDOR SPECIFIC IDENTIFIER starting on
* byte 3 bit 3-0 for NAA IEEE Registered Extended DESIGNATOR field * byte 3 bit 3-0 for NAA IEEE Registered Extended DESIGNATOR field
@ -144,7 +159,7 @@ void spc_parse_naa_6h_vendor_specific(struct se_device *dev,
* NUMBER set via vpd_unit_serial in target_core_configfs.c to ensure * NUMBER set via vpd_unit_serial in target_core_configfs.c to ensure
* per device uniqeness. * per device uniqeness.
*/ */
for (cnt = 0; *p && cnt < 13; p++) { for (cnt = off + 13; *p && off < cnt; p++) {
int val = hex_to_bin(*p); int val = hex_to_bin(*p);
if (val < 0) if (val < 0)
@ -152,10 +167,10 @@ void spc_parse_naa_6h_vendor_specific(struct se_device *dev,
if (next) { if (next) {
next = false; next = false;
buf[cnt++] |= val; buf[off++] |= val;
} else { } else {
next = true; next = true;
buf[cnt] = val << 4; buf[off] = val << 4;
} }
} }
} }
@ -203,24 +218,8 @@ spc_emulate_evpd_83(struct se_cmd *cmd, unsigned char *buf)
/* Identifier/Designator length */ /* Identifier/Designator length */
buf[off++] = 0x10; buf[off++] = 0x10;
/* /* NAA IEEE Registered Extended designator */
* Start NAA IEEE Registered Extended Identifier/Designator spc_gen_naa_6h_vendor_specific(dev, &buf[off]);
*/
buf[off++] = (0x6 << 4);
/*
* Use OpenFabrics IEEE Company ID: 00 14 05
*/
buf[off++] = 0x01;
buf[off++] = 0x40;
buf[off] = (0x5 << 4);
/*
* Return ConfigFS Unit Serial Number information for
* VENDOR_SPECIFIC_IDENTIFIER and
* VENDOR_SPECIFIC_IDENTIFIER_EXTENTION
*/
spc_parse_naa_6h_vendor_specific(dev, &buf[off]);
len = 20; len = 20;
off = (len + 4); off = (len + 4);

17
drivers/target/target_core_xcopy.c
View File

@ -33,19 +33,6 @@ static struct workqueue_struct *xcopy_wq = NULL;
static sense_reason_t target_parse_xcopy_cmd(struct xcopy_op *xop); static sense_reason_t target_parse_xcopy_cmd(struct xcopy_op *xop);
static int target_xcopy_gen_naa_ieee(struct se_device *dev, unsigned char *buf)
{
int off = 0;
buf[off++] = (0x6 << 4);
buf[off++] = 0x01;
buf[off++] = 0x40;
buf[off] = (0x5 << 4);
spc_parse_naa_6h_vendor_specific(dev, &buf[off]);
return 0;
}
/** /**
* target_xcopy_locate_se_dev_e4_iter - compare XCOPY NAA device identifiers * target_xcopy_locate_se_dev_e4_iter - compare XCOPY NAA device identifiers
* *
@ -65,7 +52,7 @@ static int target_xcopy_locate_se_dev_e4_iter(struct se_device *se_dev,
} }
memset(&tmp_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN); memset(&tmp_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN);
target_xcopy_gen_naa_ieee(se_dev, &tmp_dev_wwn[0]); spc_gen_naa_6h_vendor_specific(se_dev, &tmp_dev_wwn[0]);
rc = memcmp(&tmp_dev_wwn[0], dev_wwn, XCOPY_NAA_IEEE_REGEX_LEN); rc = memcmp(&tmp_dev_wwn[0], dev_wwn, XCOPY_NAA_IEEE_REGEX_LEN);
if (rc != 0) { if (rc != 0) {
@ -241,7 +228,7 @@ static int target_xcopy_parse_target_descriptors(struct se_cmd *se_cmd,
* se_device the XCOPY was received upon.. * se_device the XCOPY was received upon..
*/ */
memset(&xop->local_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN); memset(&xop->local_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN);
target_xcopy_gen_naa_ieee(local_dev, &xop->local_dev_wwn[0]); spc_gen_naa_6h_vendor_specific(local_dev, &xop->local_dev_wwn[0]);
while (start < tdll) { while (start < tdll) {
/* /*