Commit 69088a04 authored by Bodo Stroesser's avatar Bodo Stroesser Committed by Martin K. Petersen
Browse files

scsi: target: Make transport_flags per device 

pgr_support and alua_support device attributes show the inverted value of
the transport_flags:

 * TRANSPORT_FLAG_PASSTHROUGH_PGR
 * TRANSPORT_FLAG_PASSTHROUGH_ALUA

These attributes are per device, while the flags are per backend. Rename
the transport_flags in backend/transport to transport_flags_default and use
this value to initialize the new transport_flags field in the se_device
structure.

Now data and attribute both are per se_device.

Link: https://lore.kernel.org/r/20200427150823.15350-4-bstroesser@ts.fujitsu.com


Reviewed-by: default avatarMike Christie <mchristi@redhat.com>
Signed-off-by: default avatarBodo Stroesser <bstroesser@ts.fujitsu.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4703b625

drivers/target/target_core_alua.c

+5 −5
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ target_alua_state_check(struct se_cmd *cmd) 


	if (dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)

		return 0;

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA)

	if (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA)

		return 0;



	/*
@@ -1090,7 +1090,7 @@ int core_alua_do_port_transition( 
	struct t10_alua_tg_pt_gp *tg_pt_gp;

	int primary, valid_states, rc = 0;



	if (l_dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA)

	if (l_dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA)

		return -ENODEV;



	valid_states = l_tg_pt_gp->tg_pt_gp_alua_supported_states;
@@ -1920,7 +1920,7 @@ ssize_t core_alua_store_tg_pt_gp_info( 
	unsigned char buf[TG_PT_GROUP_NAME_BUF];

	int move = 0;



	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA ||

	if (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA ||

	    (dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE))

		return -ENODEV;
@@ -2177,7 +2177,7 @@ ssize_t core_alua_store_offline_bit( 
	unsigned long tmp;

	int ret;



	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA ||

	if (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA ||

	    (dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE))

		return -ENODEV;
@@ -2263,7 +2263,7 @@ ssize_t core_alua_store_secondary_write_metadata( 


int core_setup_alua(struct se_device *dev)

{

	if (!(dev->transport->transport_flags &

	if (!(dev->transport_flags &

	     TRANSPORT_FLAG_PASSTHROUGH_ALUA) &&

	    !(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)) {

		struct t10_alua_lu_gp_member *lu_gp_mem;

drivers/target/target_core_configfs.c

+7 −7
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ static ssize_t block_size_store(struct config_item *item, 
static ssize_t alua_support_show(struct config_item *item, char *page)

{

	struct se_dev_attrib *da = to_attrib(item);

	u8 flags = da->da_dev->transport->transport_flags;

	u8 flags = da->da_dev->transport_flags;



	return snprintf(page, PAGE_SIZE, "%d\n",

			flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA ? 0 : 1);
@@ -1108,7 +1108,7 @@ static ssize_t alua_support_show(struct config_item *item, char *page) 
static ssize_t pgr_support_show(struct config_item *item, char *page)

{

	struct se_dev_attrib *da = to_attrib(item);

	u8 flags = da->da_dev->transport->transport_flags;

	u8 flags = da->da_dev->transport_flags;



	return snprintf(page, PAGE_SIZE, "%d\n",

			flags & TRANSPORT_FLAG_PASSTHROUGH_PGR ? 0 : 1);
@@ -1654,7 +1654,7 @@ static ssize_t target_pr_res_holder_show(struct config_item *item, char *page) 
	if (!dev->dev_attrib.emulate_pr)

		return sprintf(page, "SPC_RESERVATIONS_DISABLED\n");



	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)

	if (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)

		return sprintf(page, "Passthrough\n");



	spin_lock(&dev->dev_reservation_lock);
@@ -1796,7 +1796,7 @@ static ssize_t target_pr_res_type_show(struct config_item *item, char *page) 


	if (!dev->dev_attrib.emulate_pr)

		return sprintf(page, "SPC_RESERVATIONS_DISABLED\n");

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)

	if (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)

		return sprintf(page, "SPC_PASSTHROUGH\n");

	if (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)

		return sprintf(page, "SPC2_RESERVATIONS\n");
@@ -1810,7 +1810,7 @@ static ssize_t target_pr_res_aptpl_active_show(struct config_item *item, 
	struct se_device *dev = pr_to_dev(item);



	if (!dev->dev_attrib.emulate_pr ||

	    (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))

	    (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))

		return 0;



	return sprintf(page, "APTPL Bit Status: %s\n",
@@ -1823,7 +1823,7 @@ static ssize_t target_pr_res_aptpl_metadata_show(struct config_item *item, 
	struct se_device *dev = pr_to_dev(item);



	if (!dev->dev_attrib.emulate_pr ||

	    (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))

	    (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))

		return 0;



	return sprintf(page, "Ready to process PR APTPL metadata..\n");
@@ -1870,7 +1870,7 @@ static ssize_t target_pr_res_aptpl_metadata_store(struct config_item *item, 
	u8 type = 0;



	if (!dev->dev_attrib.emulate_pr ||

	    (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))

	    (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR))

		return count;

	if (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)

		return count;

drivers/target/target_core_device.c

+2 −1
Original line number Diff line number Diff line
@@ -732,6 +732,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) 


	dev->se_hba = hba;

	dev->transport = hba->backend->ops;

	dev->transport_flags = dev->transport->transport_flags_default;

	dev->prot_length = sizeof(struct t10_pi_tuple);

	dev->hba_index = hba->hba_index;
@@ -1100,7 +1101,7 @@ passthrough_parse_cdb(struct se_cmd *cmd, 
	 * emulate the response, since tcmu does not have the information

	 * required to process these commands.

	 */

	if (!(dev->transport->transport_flags &

	if (!(dev->transport_flags &

	      TRANSPORT_FLAG_PASSTHROUGH_PGR)) {

		if (cdb[0] == PERSISTENT_RESERVE_IN) {

			cmd->execute_cmd = target_scsi3_emulate_pr_in;

drivers/target/target_core_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -4086,7 +4086,7 @@ target_check_reservation(struct se_cmd *cmd) 
		return 0;

	if (!dev->dev_attrib.emulate_pr)

		return 0;

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)

	if (dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR)

		return 0;



	spin_lock(&dev->dev_reservation_lock);

drivers/target/target_core_pscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ static void pscsi_req_done(struct request *req, blk_status_t status) 
static const struct target_backend_ops pscsi_ops = {

	.name			= "pscsi",

	.owner			= THIS_MODULE,

	.transport_flags	= TRANSPORT_FLAG_PASSTHROUGH |

	.transport_flags_default = TRANSPORT_FLAG_PASSTHROUGH |

				   TRANSPORT_FLAG_PASSTHROUGH_ALUA |

				   TRANSPORT_FLAG_PASSTHROUGH_PGR,

	.attach_hba		= pscsi_attach_hba,