Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15d10b61 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

bsg: add SCSI transport-level request support 



This enables bsg to handle SCSI transport-level request like SAS
management protocol (SMP).

- add BSG_SUB_PROTOCOL_{SCSI_CMD, SCSI_TMF, SCSI_TRANSPORT} definitions.
- SCSI transport-level requests skip blk_verify_command().

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 2c9ecdf4

block/bsg.c

+21 −6
Original line number Diff line number Diff line
@@ -208,8 +208,12 @@ static int blk_fill_sgv4_hdr_rq(request_queue_t *q, struct request *rq, 
	if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request,

			   hdr->request_len))

		return -EFAULT;



	if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {

		if (blk_verify_command(rq->cmd, has_write_perm))

			return -EPERM;

	} else if (!capable(CAP_SYS_RAWIO))

		return -EPERM;



	/*

	 * fill in request structure
@@ -232,6 +236,8 @@ static int blk_fill_sgv4_hdr_rq(request_queue_t *q, struct request *rq, 
static int

bsg_validate_sgv4_hdr(request_queue_t *q, struct sg_io_v4 *hdr, int *rw)

{

	int ret = 0;



	if (hdr->guard != 'Q')

		return -EINVAL;

	if (hdr->request_len > BLK_MAX_CDB)
@@ -240,13 +246,22 @@ bsg_validate_sgv4_hdr(request_queue_t *q, struct sg_io_v4 *hdr, int *rw) 
	    hdr->din_xfer_len > (q->max_sectors << 9))

		return -EIO;



	/* not supported currently */

	if (hdr->protocol || hdr->subprotocol)

		return -EINVAL;

	switch (hdr->protocol) {

	case BSG_PROTOCOL_SCSI:

		switch (hdr->subprotocol) {

		case BSG_SUB_PROTOCOL_SCSI_CMD:

		case BSG_SUB_PROTOCOL_SCSI_TRANSPORT:

			break;

		default:

			ret = -EINVAL;

		}

		break;

	default:

		ret = -EINVAL;

	}



	*rw = hdr->dout_xfer_len ? WRITE : READ;



	return 0;

	return ret;

}



/*

include/linux/bsg.h

+6 −0
Original line number Diff line number Diff line 
#ifndef BSG_H

#define BSG_H



#define BSG_PROTOCOL_SCSI		0



#define BSG_SUB_PROTOCOL_SCSI_CMD	0

#define BSG_SUB_PROTOCOL_SCSI_TMF	1

#define BSG_SUB_PROTOCOL_SCSI_TRANSPORT	2



struct sg_io_v4 {

	__s32 guard;		/* [i] 'Q' to differentiate from v3 */

	__u32 protocol;		/* [i] 0 -> SCSI , .... */