[SCSI] lpfc 8.3.25: T10 DIF Fixes
T10 DIF Fixes - Fix the case where the SCSI Host supplies the CRC and driver to controller protection is on. - Only support T10 DIF type 1. LBA always goes in ref tag and app tag is not checked. - Change the format of the sense data passed up to the SCSI layer to match the Descriptor Format Sense Data found in SPC-4 sections 4.5.2.1 and 4.5.2.2. - Fix Slip PDE implementation. - Remove BUG() in else casein lpfc_sc_to_bg_opcodes. Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com> Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
James Smart
James Bottomley
Родитель
154fbf0648
Коммит
7c56b9fd3b
|
|
@ -3678,7 +3678,9 @@ LPFC_ATTR_R(enable_bg, 0, 0, 1, "Enable BlockGuard Support");
|
|||
# - Default will result in registering capabilities for all profiles.
|
||||
#
|
||||
*/
|
||||
unsigned int lpfc_prot_mask = SHOST_DIF_TYPE1_PROTECTION;
|
||||
unsigned int lpfc_prot_mask = SHOST_DIF_TYPE1_PROTECTION |
|
||||
SHOST_DIX_TYPE0_PROTECTION |
|
||||
SHOST_DIX_TYPE1_PROTECTION;
|
||||
|
||||
module_param(lpfc_prot_mask, uint, S_IRUGO);
|
||||
MODULE_PARM_DESC(lpfc_prot_mask, "host protection mask");
|
||||
|
|
|
|||
|
|
@ -1302,13 +1302,13 @@ lpfc_sc_to_bg_opcodes(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
case SCSI_PROT_NORMAL:
|
||||
default:
|
||||
lpfc_printf_log(phba, KERN_ERR, LOG_BG,
|
||||
"9063 BLKGRD: Bad op/guard:%d/%d combination\n",
|
||||
scsi_get_prot_op(sc), guard_type);
|
||||
"9063 BLKGRD: Bad op/guard:%d/IP combination\n",
|
||||
scsi_get_prot_op(sc));
|
||||
ret = 1;
|
||||
break;
|
||||
|
||||
}
|
||||
} else if (guard_type == SHOST_DIX_GUARD_CRC) {
|
||||
} else {
|
||||
switch (scsi_get_prot_op(sc)) {
|
||||
case SCSI_PROT_READ_STRIP:
|
||||
case SCSI_PROT_WRITE_INSERT:
|
||||
|
|
@ -1324,17 +1324,18 @@ lpfc_sc_to_bg_opcodes(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
|
||||
case SCSI_PROT_READ_INSERT:
|
||||
case SCSI_PROT_WRITE_STRIP:
|
||||
*txop = BG_OP_IN_CRC_OUT_NODIF;
|
||||
*rxop = BG_OP_IN_NODIF_OUT_CRC;
|
||||
break;
|
||||
|
||||
case SCSI_PROT_NORMAL:
|
||||
default:
|
||||
lpfc_printf_log(phba, KERN_ERR, LOG_BG,
|
||||
"9075 BLKGRD: Bad op/guard:%d/%d combination\n",
|
||||
scsi_get_prot_op(sc), guard_type);
|
||||
"9075 BLKGRD: Bad op/guard:%d/CRC combination\n",
|
||||
scsi_get_prot_op(sc));
|
||||
ret = 1;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
/* unsupported format */
|
||||
BUG();
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
@ -1352,45 +1353,6 @@ lpfc_cmd_blksize(struct scsi_cmnd *sc)
|
|||
return sc->device->sector_size;
|
||||
}
|
||||
|
||||
/**
|
||||
* lpfc_get_cmd_dif_parms - Extract DIF parameters from SCSI command
|
||||
* @sc: in: SCSI command
|
||||
* @apptagmask: out: app tag mask
|
||||
* @apptagval: out: app tag value
|
||||
* @reftag: out: ref tag (reference tag)
|
||||
*
|
||||
* Description:
|
||||
* Extract DIF parameters from the command if possible. Otherwise,
|
||||
* use default parameters.
|
||||
*
|
||||
**/
|
||||
static inline void
|
||||
lpfc_get_cmd_dif_parms(struct scsi_cmnd *sc, uint16_t *apptagmask,
|
||||
uint16_t *apptagval, uint32_t *reftag)
|
||||
{
|
||||
struct scsi_dif_tuple *spt;
|
||||
unsigned char op = scsi_get_prot_op(sc);
|
||||
unsigned int protcnt = scsi_prot_sg_count(sc);
|
||||
static int cnt;
|
||||
|
||||
if (protcnt && (op == SCSI_PROT_WRITE_STRIP ||
|
||||
op == SCSI_PROT_WRITE_PASS)) {
|
||||
|
||||
cnt++;
|
||||
spt = page_address(sg_page(scsi_prot_sglist(sc))) +
|
||||
scsi_prot_sglist(sc)[0].offset;
|
||||
*apptagmask = 0;
|
||||
*apptagval = 0;
|
||||
*reftag = cpu_to_be32(spt->ref_tag);
|
||||
|
||||
} else {
|
||||
/* SBC defines ref tag to be lower 32bits of LBA */
|
||||
*reftag = (uint32_t) (0xffffffff & scsi_get_lba(sc));
|
||||
*apptagmask = 0;
|
||||
*apptagval = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* This function sets up buffer list for protection groups of
|
||||
* type LPFC_PG_TYPE_NO_DIF
|
||||
|
|
@ -1427,9 +1389,8 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
dma_addr_t physaddr;
|
||||
int i = 0, num_bde = 0, status;
|
||||
int datadir = sc->sc_data_direction;
|
||||
unsigned blksize;
|
||||
uint32_t reftag;
|
||||
uint16_t apptagmask, apptagval;
|
||||
unsigned blksize;
|
||||
uint8_t txop, rxop;
|
||||
|
||||
status = lpfc_sc_to_bg_opcodes(phba, sc, &txop, &rxop);
|
||||
|
|
@ -1438,17 +1399,16 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
|
||||
/* extract some info from the scsi command for pde*/
|
||||
blksize = lpfc_cmd_blksize(sc);
|
||||
lpfc_get_cmd_dif_parms(sc, &apptagmask, &apptagval, &reftag);
|
||||
reftag = scsi_get_lba(sc) & 0xffffffff;
|
||||
|
||||
/* setup PDE5 with what we have */
|
||||
pde5 = (struct lpfc_pde5 *) bpl;
|
||||
memset(pde5, 0, sizeof(struct lpfc_pde5));
|
||||
bf_set(pde5_type, pde5, LPFC_PDE5_DESCRIPTOR);
|
||||
pde5->reftag = reftag;
|
||||
|
||||
/* Endianness conversion if necessary for PDE5 */
|
||||
pde5->word0 = cpu_to_le32(pde5->word0);
|
||||
pde5->reftag = cpu_to_le32(pde5->reftag);
|
||||
pde5->reftag = cpu_to_le32(reftag);
|
||||
|
||||
/* advance bpl and increment bde count */
|
||||
num_bde++;
|
||||
|
|
@ -1463,10 +1423,10 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
if (datadir == DMA_FROM_DEVICE) {
|
||||
bf_set(pde6_ce, pde6, 1);
|
||||
bf_set(pde6_re, pde6, 1);
|
||||
bf_set(pde6_ae, pde6, 1);
|
||||
}
|
||||
bf_set(pde6_ai, pde6, 1);
|
||||
bf_set(pde6_apptagval, pde6, apptagval);
|
||||
bf_set(pde6_ae, pde6, 0);
|
||||
bf_set(pde6_apptagval, pde6, 0);
|
||||
|
||||
/* Endianness conversion if necessary for PDE6 */
|
||||
pde6->word0 = cpu_to_le32(pde6->word0);
|
||||
|
|
@ -1551,7 +1511,6 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
unsigned char pgdone = 0, alldone = 0;
|
||||
unsigned blksize;
|
||||
uint32_t reftag;
|
||||
uint16_t apptagmask, apptagval;
|
||||
uint8_t txop, rxop;
|
||||
int num_bde = 0;
|
||||
|
||||
|
|
@ -1571,7 +1530,7 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
|
||||
/* extract some info from the scsi command */
|
||||
blksize = lpfc_cmd_blksize(sc);
|
||||
lpfc_get_cmd_dif_parms(sc, &apptagmask, &apptagval, &reftag);
|
||||
reftag = scsi_get_lba(sc) & 0xffffffff;
|
||||
|
||||
split_offset = 0;
|
||||
do {
|
||||
|
|
@ -1579,11 +1538,10 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
pde5 = (struct lpfc_pde5 *) bpl;
|
||||
memset(pde5, 0, sizeof(struct lpfc_pde5));
|
||||
bf_set(pde5_type, pde5, LPFC_PDE5_DESCRIPTOR);
|
||||
pde5->reftag = reftag;
|
||||
|
||||
/* Endianness conversion if necessary for PDE5 */
|
||||
pde5->word0 = cpu_to_le32(pde5->word0);
|
||||
pde5->reftag = cpu_to_le32(pde5->reftag);
|
||||
pde5->reftag = cpu_to_le32(reftag);
|
||||
|
||||
/* advance bpl and increment bde count */
|
||||
num_bde++;
|
||||
|
|
@ -1597,9 +1555,9 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
bf_set(pde6_oprx, pde6, rxop);
|
||||
bf_set(pde6_ce, pde6, 1);
|
||||
bf_set(pde6_re, pde6, 1);
|
||||
bf_set(pde6_ae, pde6, 1);
|
||||
bf_set(pde6_ai, pde6, 1);
|
||||
bf_set(pde6_apptagval, pde6, apptagval);
|
||||
bf_set(pde6_ae, pde6, 0);
|
||||
bf_set(pde6_apptagval, pde6, 0);
|
||||
|
||||
/* Endianness conversion if necessary for PDE6 */
|
||||
pde6->word0 = cpu_to_le32(pde6->word0);
|
||||
|
|
@ -1621,8 +1579,8 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
memset(pde7, 0, sizeof(struct lpfc_pde7));
|
||||
bf_set(pde7_type, pde7, LPFC_PDE7_DESCRIPTOR);
|
||||
|
||||
pde7->addrHigh = le32_to_cpu(putPaddrLow(protphysaddr));
|
||||
pde7->addrLow = le32_to_cpu(putPaddrHigh(protphysaddr));
|
||||
pde7->addrHigh = le32_to_cpu(putPaddrHigh(protphysaddr));
|
||||
pde7->addrLow = le32_to_cpu(putPaddrLow(protphysaddr));
|
||||
|
||||
protgrp_blks = protgroup_len / 8;
|
||||
protgrp_bytes = protgrp_blks * blksize;
|
||||
|
|
@ -1632,7 +1590,7 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
|
|||
protgroup_remainder = 0x1000 - (pde7->addrLow & 0xfff);
|
||||
protgroup_offset += protgroup_remainder;
|
||||
protgrp_blks = protgroup_remainder / 8;
|
||||
protgrp_bytes = protgroup_remainder * blksize;
|
||||
protgrp_bytes = protgrp_blks * blksize;
|
||||
} else {
|
||||
protgroup_offset = 0;
|
||||
curr_prot++;
|
||||
|
|
@ -2006,16 +1964,21 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,
|
|||
if (lpfc_bgs_get_hi_water_mark_present(bgstat)) {
|
||||
/*
|
||||
* setup sense data descriptor 0 per SPC-4 as an information
|
||||
* field, and put the failing LBA in it
|
||||
* field, and put the failing LBA in it.
|
||||
* This code assumes there was also a guard/app/ref tag error
|
||||
* indication.
|
||||
*/
|
||||
cmd->sense_buffer[8] = 0; /* Information */
|
||||
cmd->sense_buffer[9] = 0xa; /* Add. length */
|
||||
cmd->sense_buffer[7] = 0xc; /* Additional sense length */
|
||||
cmd->sense_buffer[8] = 0; /* Information descriptor type */
|
||||
cmd->sense_buffer[9] = 0xa; /* Additional descriptor length */
|
||||
cmd->sense_buffer[10] = 0x80; /* Validity bit */
|
||||
bghm /= cmd->device->sector_size;
|
||||
|
||||
failing_sector = scsi_get_lba(cmd);
|
||||
failing_sector += bghm;
|
||||
|
||||
put_unaligned_be64(failing_sector, &cmd->sense_buffer[10]);
|
||||
/* Descriptor Information */
|
||||
put_unaligned_be64(failing_sector, &cmd->sense_buffer[12]);
|
||||
}
|
||||
|
||||
if (!ret) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче