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

Commit 3442097b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Eight bug fixes, one spelling update and one tracepoint addition.

  The most serious is probably the mptsas write same fix because it
  means anyone using these controllers sees errors when modern
  filesystems try to issue discards"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: target: fix crash with iscsi target and dvd
  scsi: sd_zbc: Avoid that resetting a zone fails sporadically
  scsi: sd: Defer spinning up drive while SANITIZE is in progress
  scsi: megaraid_sas: Do not log an error if FW successfully initializes.
  scsi: ufs: add trace event for ufs upiu
  scsi: core: remove reference to scsi_show_extd_sense()
  scsi: mptsas: Disable WRITE SAME
  scsi: fnic: fix spelling mistake in fnic stats "Abord" -> "Abort"
  scsi: scsi_debug: IMMED related delay adjustments
  scsi: iscsi: respond to netlink with unicast when appropriate
parents 8fba70b0 8e1ceafe

drivers/message/fusion/mptsas.c

+1 −0
Original line number Diff line number Diff line
@@ -1994,6 +1994,7 @@ static struct scsi_host_template mptsas_driver_template = { 
	.cmd_per_lun			= 7,

	.use_clustering			= ENABLE_CLUSTERING,

	.shost_attrs			= mptscsih_host_attrs,

	.no_write_same			= 1,

};



static int mptsas_get_linkerrors(struct sas_phy *phy)

drivers/scsi/fnic/fnic_trace.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ int fnic_get_stats_data(struct stats_debug_info *debug, 
		  "Number of Abort FW Timeouts: %lld\n"

		  "Number of Abort IO NOT Found: %lld\n"



		  "Abord issued times: \n"

		  "Abort issued times: \n"

		  "            < 6 sec : %lld\n"

		  "     6 sec - 20 sec : %lld\n"

		  "    20 sec - 30 sec : %lld\n"

drivers/scsi/megaraid/megaraid_sas_fusion.c

+3 −3
Original line number Diff line number Diff line
@@ -1124,12 +1124,12 @@ megasas_ioc_init_fusion(struct megasas_instance *instance) 
		goto fail_fw_init;

	}



	ret = 0;

	return 0;



fail_fw_init:

	dev_err(&instance->pdev->dev,

		"Init cmd return status %s for SCSI host %d\n",

		ret ? "FAILED" : "SUCCESS", instance->host->host_no);

		"Init cmd return status FAILED for SCSI host %d\n",

		instance->host->host_no);



	return ret;

}

drivers/scsi/scsi_debug.c

+24 −9
Original line number Diff line number Diff line
@@ -234,11 +234,13 @@ static const char *sdebug_version_date = "20180128"; 
#define F_INV_OP		0x200

#define F_FAKE_RW		0x400

#define F_M_ACCESS		0x800	/* media access */

#define F_LONG_DELAY		0x1000

#define F_SSU_DELAY		0x1000

#define F_SYNC_DELAY		0x2000



#define FF_RESPOND (F_RL_WLUN_OK | F_SKIP_UA | F_DELAY_OVERR)

#define FF_MEDIA_IO (F_M_ACCESS | F_FAKE_RW)

#define FF_SA (F_SA_HIGH | F_SA_LOW)

#define F_LONG_DELAY		(F_SSU_DELAY | F_SYNC_DELAY)



#define SDEBUG_MAX_PARTS 4
@@ -510,7 +512,7 @@ static const struct opcode_info_t release_iarr[] = { 
};



static const struct opcode_info_t sync_cache_iarr[] = {

	{0, 0x91, 0, F_LONG_DELAY | F_M_ACCESS, resp_sync_cache, NULL,

	{0, 0x91, 0, F_SYNC_DELAY | F_M_ACCESS, resp_sync_cache, NULL,

	    {16,  0x6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,

	     0xff, 0xff, 0xff, 0xff, 0x3f, 0xc7} },	/* SYNC_CACHE (16) */

};
@@ -553,7 +555,7 @@ static const struct opcode_info_t opcode_info_arr[SDEB_I_LAST_ELEMENT + 1] = { 
	    resp_write_dt0, write_iarr,			/* WRITE(16) */

		{16,  0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,

		 0xff, 0xff, 0xff, 0xff, 0xff, 0xc7} },

	{0, 0x1b, 0, F_LONG_DELAY, resp_start_stop, NULL,/* START STOP UNIT */

	{0, 0x1b, 0, F_SSU_DELAY, resp_start_stop, NULL,/* START STOP UNIT */

	    {6,  0x1, 0, 0xf, 0xf7, 0xc7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} },

	{ARRAY_SIZE(sa_in_16_iarr), 0x9e, 0x10, F_SA_LOW | F_D_IN,

	    resp_readcap16, sa_in_16_iarr, /* SA_IN(16), READ CAPACITY(16) */
@@ -606,7 +608,7 @@ static const struct opcode_info_t opcode_info_arr[SDEB_I_LAST_ELEMENT + 1] = { 
	    resp_write_same_10, write_same_iarr,	/* WRITE SAME(10) */

		{10,  0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xc7, 0,

		 0, 0, 0, 0, 0} },

	{ARRAY_SIZE(sync_cache_iarr), 0x35, 0, F_LONG_DELAY | F_M_ACCESS,

	{ARRAY_SIZE(sync_cache_iarr), 0x35, 0, F_SYNC_DELAY | F_M_ACCESS,

	    resp_sync_cache, sync_cache_iarr,

	    {10,  0x7, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xc7, 0, 0,

	     0, 0, 0, 0} },			/* SYNC_CACHE (10) */
@@ -667,6 +669,7 @@ static bool sdebug_strict = DEF_STRICT; 
static bool sdebug_any_injecting_opt;

static bool sdebug_verbose;

static bool have_dif_prot;

static bool write_since_sync;

static bool sdebug_statistics = DEF_STATISTICS;



static unsigned int sdebug_store_sectors;
@@ -1607,6 +1610,7 @@ static int resp_start_stop(struct scsi_cmnd *scp, 
{

	unsigned char *cmd = scp->cmnd;

	int power_cond, stop;

	bool changing;



	power_cond = (cmd[4] & 0xf0) >> 4;

	if (power_cond) {
@@ -1614,8 +1618,12 @@ static int resp_start_stop(struct scsi_cmnd *scp, 
		return check_condition_result;

	}

	stop = !(cmd[4] & 1);

	changing = atomic_read(&devip->stopped) == !stop;

	atomic_xchg(&devip->stopped, stop);

	return (cmd[1] & 0x1) ? SDEG_RES_IMMED_MASK : 0; /* check IMMED bit */

	if (!changing || cmd[1] & 0x1)  /* state unchanged or IMMED set */

		return SDEG_RES_IMMED_MASK;

	else

		return 0;

}



static sector_t get_sdebug_capacity(void)
@@ -2473,6 +2481,7 @@ static int do_device_access(struct scsi_cmnd *scmd, u32 sg_skip, u64 lba, 
	if (do_write) {

		sdb = scsi_out(scmd);

		dir = DMA_TO_DEVICE;

		write_since_sync = true;

	} else {

		sdb = scsi_in(scmd);

		dir = DMA_FROM_DEVICE;
@@ -3583,6 +3592,7 @@ static int resp_get_lba_status(struct scsi_cmnd *scp, 
static int resp_sync_cache(struct scsi_cmnd *scp,

			   struct sdebug_dev_info *devip)

{

	int res = 0;

	u64 lba;

	u32 num_blocks;

	u8 *cmd = scp->cmnd;
@@ -3598,7 +3608,11 @@ static int resp_sync_cache(struct scsi_cmnd *scp, 
		mk_sense_buffer(scp, ILLEGAL_REQUEST, LBA_OUT_OF_RANGE, 0);

		return check_condition_result;

	}

	return (cmd[1] & 0x2) ? SDEG_RES_IMMED_MASK : 0; /* check IMMED bit */

	if (!write_since_sync || cmd[1] & 0x2)

		res = SDEG_RES_IMMED_MASK;

	else		/* delay if write_since_sync and IMMED clear */

		write_since_sync = false;

	return res;

}



#define RL_BUCKET_ELEMS 8
@@ -5777,13 +5791,14 @@ static int scsi_debug_queuecommand(struct Scsi_Host *shost, 
		return schedule_resp(scp, devip, errsts, pfp, 0, 0);

	else if ((sdebug_jdelay || sdebug_ndelay) && (flags & F_LONG_DELAY)) {

		/*

		 * If any delay is active, want F_LONG_DELAY to be at least 1

		 * If any delay is active, for F_SSU_DELAY want at least 1

		 * second and if sdebug_jdelay>0 want a long delay of that

		 * many seconds.

		 * many seconds; for F_SYNC_DELAY want 1/20 of that.

		 */

		int jdelay = (sdebug_jdelay < 2) ? 1 : sdebug_jdelay;

		int denom = (flags & F_SYNC_DELAY) ? 20 : 1;



		jdelay = mult_frac(USER_HZ * jdelay, HZ, USER_HZ);

		jdelay = mult_frac(USER_HZ * jdelay, HZ, denom * USER_HZ);

		return schedule_resp(scp, devip, errsts, pfp, jdelay, 0);

	} else

		return schedule_resp(scp, devip, errsts, pfp, sdebug_jdelay,

drivers/scsi/scsi_transport_iscsi.c

+18 −11
Original line number Diff line number Diff line
@@ -2322,6 +2322,12 @@ iscsi_multicast_skb(struct sk_buff *skb, uint32_t group, gfp_t gfp) 
	return nlmsg_multicast(nls, skb, 0, group, gfp);

}



static int

iscsi_unicast_skb(struct sk_buff *skb, u32 portid)

{

	return nlmsg_unicast(nls, skb, portid);

}



int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,

		   char *data, uint32_t data_size)

{
@@ -2524,14 +2530,11 @@ void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_transport *transport, 
EXPORT_SYMBOL_GPL(iscsi_ping_comp_event);



static int

iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi,

		    void *payload, int size)

iscsi_if_send_reply(u32 portid, int type, void *payload, int size)

{

	struct sk_buff	*skb;

	struct nlmsghdr	*nlh;

	int len = nlmsg_total_size(size);

	int flags = multi ? NLM_F_MULTI : 0;

	int t = done ? NLMSG_DONE : type;



	skb = alloc_skb(len, GFP_ATOMIC);

	if (!skb) {
@@ -2539,10 +2542,9 @@ iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi, 
		return -ENOMEM;

	}



	nlh = __nlmsg_put(skb, 0, 0, t, (len - sizeof(*nlh)), 0);

	nlh->nlmsg_flags = flags;

	nlh = __nlmsg_put(skb, 0, 0, type, (len - sizeof(*nlh)), 0);

	memcpy(nlmsg_data(nlh), payload, size);

	return iscsi_multicast_skb(skb, group, GFP_ATOMIC);

	return iscsi_unicast_skb(skb, portid);

}



static int
@@ -3470,6 +3472,7 @@ static int 
iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)

{

	int err = 0;

	u32 portid;

	struct iscsi_uevent *ev = nlmsg_data(nlh);

	struct iscsi_transport *transport = NULL;

	struct iscsi_internal *priv;
@@ -3490,10 +3493,12 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) 
	if (!try_module_get(transport->owner))

		return -EINVAL;



	portid = NETLINK_CB(skb).portid;



	switch (nlh->nlmsg_type) {

	case ISCSI_UEVENT_CREATE_SESSION:

		err = iscsi_if_create_session(priv, ep, ev,

					      NETLINK_CB(skb).portid,

					      portid,

					      ev->u.c_session.initial_cmdsn,

					      ev->u.c_session.cmds_max,

					      ev->u.c_session.queue_depth);
@@ -3506,7 +3511,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) 
		}



		err = iscsi_if_create_session(priv, ep, ev,

					NETLINK_CB(skb).portid,

					portid,

					ev->u.c_bound_session.initial_cmdsn,

					ev->u.c_bound_session.cmds_max,

					ev->u.c_bound_session.queue_depth);
@@ -3664,6 +3669,8 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) 
static void

iscsi_if_rx(struct sk_buff *skb)

{

	u32 portid = NETLINK_CB(skb).portid;



	mutex_lock(&rx_queue_mutex);

	while (skb->len >= NLMSG_HDRLEN) {

		int err;
@@ -3699,8 +3706,8 @@ iscsi_if_rx(struct sk_buff *skb) 
				break;

			if (ev->type == ISCSI_UEVENT_GET_CHAP && !err)

				break;

			err = iscsi_if_send_reply(group, nlh->nlmsg_seq,

				nlh->nlmsg_type, 0, 0, ev, sizeof(*ev));

			err = iscsi_if_send_reply(portid, nlh->nlmsg_type,

						  ev, sizeof(*ev));

		} while (err < 0 && err != -ECONNREFUSED && err != -ESRCH);

		skb_pull(skb, rlen);

	}