On Thu, May 22, 2014 at 02:26:17AM +0000, Nicholas A. Bellinger wrote:
> From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
>
> This patch adds a virtio_scsi_cmd_req_pi header as recommened by
> Paolo that contains do_pi_niov + di_pi_niov elements used for
> signaling when protection information buffers are expected to
> preceed the data buffers.
Cc rusty.
Rusty could you please Ack merging this through Nicholas' tree
together with the vhost changes?
> Also add new VIRTIO_SCSI_F_T10_PI feature bit to be used to signal
> host support.
>
> v4 changes:
v2? Proably best to drop versioning info from commit log,
move it out to notes (after ---)
> - Use pi_bytesout + pi_bytesin instead of niovs (mst + paolo)
Right, so maybe update the commit log above to match?
It gave me pause.
> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Cc: Michael S. Tsirkin <mst@xxxxxxxxxx>
> Cc: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
> Cc: Christoph Hellwig <hch@xxxxxx>
> Cc: Hannes Reinecke <hare@xxxxxxx>
> Cc: Sagi Grimberg <sagig@xxxxxxxxxxxxxxxxxx>
> Cc: H. Peter Anvin <hpa@xxxxxxxxx>
> Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
> ---
> include/linux/virtio_scsi.h | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/virtio_scsi.h b/include/linux/virtio_scsi.h
> index 4195b97..7344906 100644
> --- a/include/linux/virtio_scsi.h
> +++ b/include/linux/virtio_scsi.h
> @@ -35,11 +35,23 @@ struct virtio_scsi_cmd_req {
> u8 lun[8]; /* Logical Unit Number */
> u64 tag; /* Command identifier */
> u8 task_attr; /* Task attribute */
> - u8 prio;
> + u8 prio; /* SAM command priority field */
> u8 crn;
> u8 cdb[VIRTIO_SCSI_CDB_SIZE];
> } __packed;
>
> +/* SCSI command request, followed by protection information */
> +struct virtio_scsi_cmd_req_pi {
> + u8 lun[8]; /* Logical Unit Number */
> + u64 tag; /* Command identifier */
> + u8 task_attr; /* Task attribute */
> + u8 prio; /* SAM command priority field */
> + u8 crn;
> + u32 pi_bytesout; /* DataOUT PI Number of bytes */
> + u32 pi_bytesin; /* DataIN PI Number of bytes */
> + u8 cdb[VIRTIO_SCSI_CDB_SIZE];
> +} __packed;
> +
> /* Response, followed by sense data and data-in */
> struct virtio_scsi_cmd_resp {
> u32 sense_len; /* Sense data length */
> @@ -97,6 +109,7 @@ struct virtio_scsi_config {
> #define VIRTIO_SCSI_F_INOUT 0
> #define VIRTIO_SCSI_F_HOTPLUG 1
> #define VIRTIO_SCSI_F_CHANGE 2
> +#define VIRTIO_SCSI_F_T10_PI 3
Could you pad this with spaces and not tabs so it aligns nicely
with stuff above it?
>
> /* Response codes */
> #define VIRTIO_SCSI_S_OK 0
> --
> 1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
