Skip to contentSkip to conversation

staging: unisys: visorhba: Convert module from IDR to XArray

PATCH Superseded Fabio M. De Francesco 3 participants 4 messages Apr 27, 2021 Staging

v4 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 staging: unisys: visorhba: Convert module from IDR to XArray

Converted visorhba from IDR to XArray. The abstract data type XArray is more memory-efficient, parallelisable and cache friendly. It takes advantage of RCU to perform lookups without locking.

---

Changes from v3: Matthew Wilcox found that the XArray was not
initialized: now it is. Changed types handles from u64 to u32 because they can't work as arguments of xa_alloc_irq() and u32 is enough large for storing XArray indexes.
Changes from v2: Some residual errors from v1 were not fixed in v2. Now they have been removed.
Changes from v1: After a first review by Matthew Wilcox, who found a series of errors and gave suggestions on how to fix them, I rewrote a larger part of the patch.

 drivers/staging/unisys/include/iochannel.h    |  4 +-
 .../staging/unisys/visorhba/visorhba_main.c   | 89 ++++++-------------
 2 files changed, 28 insertions(+), 65 deletions(-)
drivers/staging/unisys/include/iochannel.h +2 -2
index 9ef812c0bc42..fac89eac148b 100644
@@ -474,8 +474,8 @@ struct uiscmdrsp_scsitaskmgmt {
 	enum task_mgmt_types tasktype;
 	struct uisscsi_dest vdest;
 	u64 handle;
-	u64 notify_handle;
-	u64 notifyresult_handle;
+	u32 notify_handle;
+	u32 notifyresult_handle;
 	char result;
 
 #define TASK_MGMT_FAILED 0
drivers/staging/unisys/visorhba/visorhba_main.c +26 -63

187 lines not on this page · raw message

Signature · 1 line
2.31.1
#1 lore raw

drivers/staging/unisys/include/iochannel.h struct uiscmdrsp_scsitaskmgmt { · line 481

Quoted 12 lines · Fabio M. De Francesco

+++ b/drivers/staging/unisys/include/iochannel.h

drivers/staging/unisys/include/iochannel.h +2 -2
@@ -474,8 +474,8 @@ struct uiscmdrsp_scsitaskmgmt {
 	enum task_mgmt_types tasktype;
 	struct uisscsi_dest vdest;
 	u64 handle;
-	u64 notify_handle;
-	u64 notifyresult_handle;
+	u32 notify_handle;
+	u32 notifyresult_handle;
 	char result;
 
 #define TASK_MGMT_FAILED 0

I'm scared of this change. Read the top of the file:

* Everything needed for IOPart-GuestPart communication is define in
* this file. Note: Everything is OS-independent because this file is
* used by Windows, Linux and possible EFI drivers.

I don't know that you can make any changes to this file.

Quoted 5 lines
drivers/staging/unisys/visorhba/visorhba_main.c +1 -2
+static void setup_scsitaskmgmt_handles(struct xarray *xa, struct uiscmdrsp *cmdrsp,
 				       wait_queue_head_t *event, int *result)
 {
-	/* specify the event that has to be triggered when this */
-	/* cmd is complete */

drivers/staging/unisys/visorhba/visorhba_main.c static struct uiscmdrsp *get_scsipending_cmdrsp(struct visorhba_devdata *ddata, · line 203

Quoted 10 lines
drivers/staging/unisys/visorhba/visorhba_main.c +6 -4
-	cmdrsp->scsitaskmgmt.notify_handle =
-		simple_idr_get(idrtable, event, lock);
-	cmdrsp->scsitaskmgmt.notifyresult_handle =
-		simple_idr_get(idrtable, result, lock);
+	int ret;
+	u32 *id;
+
+	/* specify the event that has to be triggered when this cmd is complete */
+	id = &cmdrsp->scsitaskmgmt.notify_handle;
+	ret = xa_alloc_irq(xa, id, event, XA_LIMIT(1, INT_MAX), GFP_KERNEL);

You're still not handling the error here.

#2 lore raw
In reply to Fabio M. De Francesco

Hi Fabio,

Quoted 135 lines · Fabio M. De Francesco

Converted visorhba from IDR to XArray. The abstract data type XArray is more memory-efficient, parallelisable and cache friendly. It takes advantage of RCU to perform lookups without locking.

---

Changes from v3: Matthew Wilcox found that the XArray was not
initialized: now it is. Changed types handles from u64 to u32 because they can't work as arguments of xa_alloc_irq() and u32 is enough large for storing XArray indexes.
Changes from v2: Some residual errors from v1 were not fixed in v2. Now they have been removed.
Changes from v1: After a first review by Matthew Wilcox, who found a series of errors and gave suggestions on how to fix them, I rewrote a larger part of the patch.

 drivers/staging/unisys/include/iochannel.h    |  4 +-
 .../staging/unisys/visorhba/visorhba_main.c   | 89 ++++++-------------
 2 files changed, 28 insertions(+), 65 deletions(-)
drivers/staging/unisys/include/iochannel.h +2 -2
index 9ef812c0bc42..fac89eac148b 100644
@@ -474,8 +474,8 @@ struct uiscmdrsp_scsitaskmgmt {
 	enum task_mgmt_types tasktype;
 	struct uisscsi_dest vdest;
 	u64 handle;
-	u64 notify_handle;
-	u64 notifyresult_handle;
+	u32 notify_handle;
+	u32 notifyresult_handle;
 	char result;
 
 #define TASK_MGMT_FAILED 0
drivers/staging/unisys/visorhba/visorhba_main.c +13 -43
index 4455d26f7c96..2b6cde254f17 100644
@@ -6,10 +6,10 @@
 
 #include <linux/debugfs.h>
 #include <linux/kthread.h>
-#include <linux/idr.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
 #include <linux/visorbus.h>
+#include <linux/xarray.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
@@ -82,7 +82,7 @@ struct visorhba_devdata {
 	 * allows us to pass int handles back-and-forth between us and
 	 * iovm, instead of raw pointers
 	 */
-	struct idr idr;
+	struct xarray xa;
 
 	struct dentry *debugfs_dir;
 	struct dentry *debugfs_info;
@@ -182,71 +182,40 @@ static struct uiscmdrsp *get_scsipending_cmdrsp(struct visorhba_devdata *ddata,
 	return NULL;
 }
 
-/*
- * simple_idr_get - Associate a provided pointer with an int value
- *		    1 <= value <= INT_MAX, and return this int value;
- *		    the pointer value can be obtained later by passing
- *		    this int value to idr_find()
- * @idrtable: The data object maintaining the pointer<-->int mappings
- * @p:	      The pointer value to be remembered
- * @lock:     A spinlock used when exclusive access to idrtable is needed
- *
- * Return: The id number mapped to pointer 'p', 0 on failure
- */
-static unsigned int simple_idr_get(struct idr *idrtable, void *p,
-				   spinlock_t *lock)
-{
-	int id;
-	unsigned long flags;
-
-	idr_preload(GFP_KERNEL);
-	spin_lock_irqsave(lock, flags);
-	id = idr_alloc(idrtable, p, 1, INT_MAX, GFP_NOWAIT);
-	spin_unlock_irqrestore(lock, flags);
-	idr_preload_end();
-	/* failure */
-	if (id < 0)
-		return 0;
-	/* idr_alloc() guarantees > 0 */
-	return (unsigned int)(id);
-}
-
 /*
  * setup_scsitaskmgmt_handles - Stash the necessary handles so that the
  *				completion processing logic for a taskmgmt
  *				cmd will be able to find who to wake up
  *				and where to stash the result
- * @idrtable: The data object maintaining the pointer<-->int mappings
- * @lock:     A spinlock used when exclusive access to idrtable is needed
+ * @xa:       The data object maintaining the pointer<-->int mappings
  * @cmdrsp:   Response from the IOVM
  * @event:    The event handle to associate with an id
  * @result:   The location to place the result of the event handle into
  */
-static void setup_scsitaskmgmt_handles(struct idr *idrtable, spinlock_t *lock,
-				       struct uiscmdrsp *cmdrsp,
+static void setup_scsitaskmgmt_handles(struct xarray *xa, struct uiscmdrsp *cmdrsp,
 				       wait_queue_head_t *event, int *result)
 {
-	/* specify the event that has to be triggered when this */
-	/* cmd is complete */
-	cmdrsp->scsitaskmgmt.notify_handle =
-		simple_idr_get(idrtable, event, lock);
-	cmdrsp->scsitaskmgmt.notifyresult_handle =
-		simple_idr_get(idrtable, result, lock);
+	int ret;
+	u32 *id;
+
+	/* specify the event that has to be triggered when this cmd is complete */
+	id = &cmdrsp->scsitaskmgmt.notify_handle;
+	ret = xa_alloc_irq(xa, id, event, XA_LIMIT(1, INT_MAX), GFP_KERNEL);
+	id = &cmdrsp->scsitaskmgmt.notifyresult_handle;
+	ret = xa_alloc_irq(xa, id, result, XA_LIMIT(1, INT_MAX), GFP_KERNEL);
 }
 
 /*
  * cleanup_scsitaskmgmt_handles - Forget handles created by
  *				  setup_scsitaskmgmt_handles()
- * @idrtable: The data object maintaining the pointer<-->int mappings
+ * @xa: The data object maintaining the pointer<-->int mappings
  * @cmdrsp:   Response from the IOVM
  */
-static void cleanup_scsitaskmgmt_handles(struct idr *idrtable,

drivers/staging/unisys/visorhba/visorhba_main.c static struct uiscmdrsp *get_scsipending_cmdrsp(struct visorhba_devdata *ddata, · line 219

Quoted 10 lines
drivers/staging/unisys/visorhba/visorhba_main.c +3 -4
+static void cleanup_scsitaskmgmt_handles(struct xarray *xa,
 					 struct uiscmdrsp *cmdrsp)
 {
-	if (cmdrsp->scsitaskmgmt.notify_handle)
-		idr_remove(idrtable, cmdrsp->scsitaskmgmt.notify_handle);
-	if (cmdrsp->scsitaskmgmt.notifyresult_handle)
-		idr_remove(idrtable, cmdrsp->scsitaskmgmt.notifyresult_handle);
+	xa_erase(xa, cmdrsp->scsitaskmgmt.notify_handle);
+	xa_erase(xa, cmdrsp->scsitaskmgmt.notifyresult_handle);
 }

why were the conditions removed before each entry deletion?

drivers/staging/unisys/visorhba/visorhba_main.c static int forward_taskmgmt_command(enum task_mgmt_types tasktype, · line 248

Quoted 12 lines
drivers/staging/unisys/visorhba/visorhba_main.c +1 -2
 /*
@@ -273,8 +242,7 @@ static int forward_taskmgmt_command(enum task_mgmt_types tasktype,
 	if (devdata->serverdown || devdata->serverchangingstate)
 		return FAILED;
 
-	scsicmd_id = add_scsipending_entry(devdata, CMD_SCSITASKMGMT_TYPE,
-					   NULL);
+	scsicmd_id = add_scsipending_entry(devdata, CMD_SCSITASKMGMT_TYPE, NULL);
 	if (scsicmd_id < 0)
 		return FAILED;
 

this is a code format change, maybe this go in a separate patch?

Quoted 85 lines
drivers/staging/unisys/visorhba/visorhba_main.c +9 -14
@@ -284,8 +252,7 @@ static int forward_taskmgmt_command(enum task_mgmt_types tasktype,
 
 	/* issue TASK_MGMT_ABORT_TASK */
 	cmdrsp->cmdtype = CMD_SCSITASKMGMT_TYPE;
-	setup_scsitaskmgmt_handles(&devdata->idr, &devdata->privlock, cmdrsp,
-				   &notifyevent, &notifyresult);
+	setup_scsitaskmgmt_handles(&devdata->xa, cmdrsp, &notifyevent, &notifyresult);
 
 	/* save destination */
 	cmdrsp->scsitaskmgmt.tasktype = tasktype;
@@ -311,14 +278,14 @@ static int forward_taskmgmt_command(enum task_mgmt_types tasktype,
 	dev_dbg(&scsidev->sdev_gendev,
 		"visorhba: taskmgmt type=%d success; result=0x%x\n",
 		 tasktype, notifyresult);
-	cleanup_scsitaskmgmt_handles(&devdata->idr, cmdrsp);
+	cleanup_scsitaskmgmt_handles(&devdata->xa, cmdrsp);
 	return SUCCESS;
 
 err_del_scsipending_ent:
 	dev_dbg(&scsidev->sdev_gendev,
 		"visorhba: taskmgmt type=%d not executed\n", tasktype);
 	del_scsipending_ent(devdata, scsicmd_id);
-	cleanup_scsitaskmgmt_handles(&devdata->idr, cmdrsp);
+	cleanup_scsitaskmgmt_handles(&devdata->xa, cmdrsp);
 	return FAILED;
 }
 
@@ -654,13 +621,12 @@ DEFINE_SHOW_ATTRIBUTE(info_debugfs);
  * Service Partition returned the result of the task management
  * command. Wake up anyone waiting for it.
  */
-static void complete_taskmgmt_command(struct idr *idrtable,
-				      struct uiscmdrsp *cmdrsp, int result)
+static void complete_taskmgmt_command(struct xarray *xa, struct uiscmdrsp *cmdrsp, int result)
 {
 	wait_queue_head_t *wq =
-		idr_find(idrtable, cmdrsp->scsitaskmgmt.notify_handle);
+		xa_load(xa, cmdrsp->scsitaskmgmt.notify_handle);
 	int *scsi_result_ptr =
-		idr_find(idrtable, cmdrsp->scsitaskmgmt.notifyresult_handle);
+		xa_load(xa, cmdrsp->scsitaskmgmt.notifyresult_handle);
 	if (unlikely(!(wq && scsi_result_ptr))) {
 		pr_err("visorhba: no completion context; cmd will time out\n");
 		return;
@@ -708,8 +674,7 @@ static void visorhba_serverdown_complete(struct visorhba_devdata *devdata)
 			break;
 		case CMD_SCSITASKMGMT_TYPE:
 			cmdrsp = pendingdel->sent;
-			complete_taskmgmt_command(&devdata->idr, cmdrsp,
-						  TASK_MGMT_FAILED);
+			complete_taskmgmt_command(&devdata->xa, cmdrsp, TASK_MGMT_FAILED);
 			break;
 		default:
 			break;
@@ -905,7 +870,7 @@ static void drain_queue(struct uiscmdrsp *cmdrsp,
 			if (!del_scsipending_ent(devdata,
 						 cmdrsp->scsitaskmgmt.handle))
 				break;
-			complete_taskmgmt_command(&devdata->idr, cmdrsp,
+			complete_taskmgmt_command(&devdata->xa, cmdrsp,
 						  cmdrsp->scsitaskmgmt.result);
 		} else if (cmdrsp->cmdtype == CMD_NOTIFYGUEST_TYPE)
 			dev_err_once(&devdata->dev->device,
@@ -1053,7 +1018,7 @@ static int visorhba_probe(struct visor_device *dev)
 	if (err)
 		goto err_debugfs_info;
 
-	idr_init(&devdata->idr);
+	xa_init(&devdata->xa);
 
 	devdata->cmdrsp = kmalloc(sizeof(*devdata->cmdrsp), GFP_ATOMIC);
 	visorbus_enable_channel_interrupts(dev);
@@ -1096,8 +1061,6 @@ static void visorhba_remove(struct visor_device *dev)
 	scsi_remove_host(scsihost);
 	scsi_host_put(scsihost);
 
-	idr_destroy(&devdata->idr);
-
 	dev_set_drvdata(&dev->device, NULL);
 	debugfs_remove(devdata->debugfs_info);
 	debugfs_remove_recursive(devdata->debugfs_dir);
Signature · 1 line
2.31.1

thank you,

fabio

#3 lore raw
Quoted 20 lines · CEST Fabio Aiuto

Hi Fabio,

Quoted 17 lines · Fabio M. De Francesco

Converted visorhba from IDR to XArray. The abstract data type XArray is more memory-efficient, parallelisable and cache friendly. It takes advantage of RCU to perform lookups without locking.

---

Changes from v3: Matthew Wilcox found that the XArray was not
initialized: now it is. Changed types handles from u64 to u32 because they can't work as arguments of xa_alloc_irq() and u32 is enough large for storing XArray indexes.
Changes from v2: Some residual errors from v1 were not fixed in v2. Now they have been removed.
Changes from v1: After a first review by Matthew Wilcox, who found a series of errors and gave suggestions on how to fix them, I rewrote a larger part of the patch.

Quoted 6 lines
Quoted 6 lines
 drivers/staging/unisys/include/iochannel.h    |  4 +-
 .../staging/unisys/visorhba/visorhba_main.c   | 89 ++++++-------------
 2 files changed, 28 insertions(+), 65 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/unisys/include/iochannel.h index

9ef812c0bc42..fac89eac148b 100644

Quoted 13 lines
Quoted 13 lines
drivers/staging/unisys/include/iochannel.h +2 -2
@@ -474,8 +474,8 @@ struct uiscmdrsp_scsitaskmgmt {
 
 	enum task_mgmt_types tasktype;
 	struct uisscsi_dest vdest;
 	u64 handle;
 
-	u64 notify_handle;
-	u64 notifyresult_handle;
+	u32 notify_handle;
+	u32 notifyresult_handle;
 
Quoted 6 lines
Quoted 6 lines
drivers/staging/unisys/include/iochannel.h +0 -0
 	char result;
 
 #define TASK_MGMT_FAILED 0
(quoted diff) +0 -0

b/drivers/staging/unisys/visorhba/visorhba_main.c index

4455d26f7c96..2b6cde254f17

Quoted 26 lines
Quoted 26 lines

100644

drivers/staging/unisys/visorhba/visorhba_main.c +1 -1
@@ -6,10 +6,10 @@
 
 #include <linux/debugfs.h>
 #include <linux/kthread.h>
 
-#include <linux/idr.h>
 
 #include <linux/module.h>
 #include <linux/seq_file.h>
 #include <linux/visorbus.h>
 
+#include <linux/xarray.h>

#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>

drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
@@ -82,7 +82,7 @@ struct visorhba_devdata {
 
 	 * allows us to pass int handles back-and-forth between us and
 	 * iovm, instead of raw pointers
 	 */
 
Quoted 7 lines

drivers/staging/unisys/visorhba/visorhba_main.c static struct uiscmdrsp

Quoted 7 lines
drivers/staging/unisys/visorhba/visorhba_main.c +1 -1
-	struct idr idr;
+	struct xarray xa;
 
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
 	struct dentry *debugfs_dir;
 	struct dentry *debugfs_info;
@@ -182,71 +182,40 @@ static struct uiscmdrsp 

*get_scsipending_cmdrsp(struct

Quoted 35 lines
Quoted 35 lines

visorhba_devdata *ddata,>

drivers/staging/unisys/visorhba/visorhba_main.c +0 -29
 	return NULL;
 
 }
 
-/*
- * simple_idr_get - Associate a provided pointer with an int value
- *		    1 <= value <= INT_MAX, and return this int value;
- *		    the pointer value can be obtained later by passing
- *		    this int value to idr_find()
- * @idrtable: The data object maintaining the pointer<-->int mappings
- * @p:	      The pointer value to be remembered
- * @lock:     A spinlock used when exclusive access to idrtable is needed
- *
- * Return: The id number mapped to pointer 'p', 0 on failure
- */
-static unsigned int simple_idr_get(struct idr *idrtable, void *p,
-				   spinlock_t *lock)
-{
-	int id;
-	unsigned long flags;
-
-	idr_preload(GFP_KERNEL);
-	spin_lock_irqsave(lock, flags);
-	id = idr_alloc(idrtable, p, 1, INT_MAX, GFP_NOWAIT);
-	spin_unlock_irqrestore(lock, flags);
-	idr_preload_end();
-	/* failure */
-	if (id < 0)
-		return 0;
-	/* idr_alloc() guarantees > 0 */
-	return (unsigned int)(id);
-}
-
Quoted 4 lines
Quoted 4 lines

/*

* setup_scsitaskmgmt_handles - Stash the necessary handles so that the
* completion processing logic for

a taskmgmt

Quoted 1 line
Quoted 1 line

* cmd will be able to find who to

wake up

Quoted 6 lines
Quoted 6 lines

* and where to stash the result

- * @idrtable: The data object maintaining the pointer<-->int mappings
- * @lock: A spinlock used when exclusive access to idrtable is needed
+ * @xa: The data object maintaining the pointer<-->int mappings

Quoted 6 lines
Quoted 6 lines
  * @cmdrsp:   Response from the IOVM
  * @event:    The event handle to associate with an id
  * @result:   The location to place the result of the event handle into

*/

-static void setup_scsitaskmgmt_handles(struct idr *idrtable, spinlock_t

*lock,

Quoted 2 lines

drivers/staging/unisys/visorhba/visorhba_main.c

Quoted 2 lines
drivers/staging/unisys/visorhba/visorhba_main.c +1 -1
-				       struct uiscmdrsp *cmdrsp,
+static void setup_scsitaskmgmt_handles(struct xarray *xa, struct 

uiscmdrsp *cmdrsp,

Quoted 2 lines
Quoted 2 lines

wait_queue_head_t *event,

int *result)

Quoted 13 lines

drivers/staging/unisys/visorhba/visorhba_main.c static struct uiscmdrsp *get_scsipending_cmdrsp(struct visorhba_devdata *ddata,

Quoted 13 lines

{

drivers/staging/unisys/visorhba/visorhba_main.c +4 -6
-	/* specify the event that has to be triggered when this */
-	/* cmd is complete */
-	cmdrsp->scsitaskmgmt.notify_handle =
-		simple_idr_get(idrtable, event, lock);
-	cmdrsp->scsitaskmgmt.notifyresult_handle =
-		simple_idr_get(idrtable, result, lock);
+	int ret;
+	u32 *id;
+
+	/* specify the event that has to be triggered when this cmd is 

complete */

Quoted 2 lines

drivers/staging/unisys/visorhba/visorhba_main.c

Quoted 2 lines
drivers/staging/unisys/visorhba/visorhba_main.c +2 -0
+	id = &cmdrsp->scsitaskmgmt.notify_handle;
+	ret = xa_alloc_irq(xa, id, event, XA_LIMIT(1, INT_MAX), 

GFP_KERNEL);

Quoted 2 lines

drivers/staging/unisys/visorhba/visorhba_main.c

Quoted 2 lines
drivers/staging/unisys/visorhba/visorhba_main.c +2 -0
+	id = &cmdrsp->scsitaskmgmt.notifyresult_handle;
+	ret = xa_alloc_irq(xa, id, result, XA_LIMIT(1, INT_MAX), 

GFP_KERNEL);

Quoted 11 lines
Quoted 11 lines

}

/*

* cleanup_scsitaskmgmt_handles - Forget handles created by
* setup_scsitaskmgmt_handles()

- * @idrtable: The data object maintaining the pointer<-->int mappings
+ * @xa: The data object maintaining the pointer<-->int mappings

Quoted 7 lines

drivers/staging/unisys/visorhba/visorhba_main.c static struct uiscmdrsp *get_scsipending_cmdrsp(struct visorhba_devdata *ddata,

Quoted 7 lines

* @cmdrsp: Response from the IOVM
*/

drivers/staging/unisys/visorhba/visorhba_main.c +1 -1
-static void cleanup_scsitaskmgmt_handles(struct idr *idrtable,
+static void cleanup_scsitaskmgmt_handles(struct xarray *xa,
 
 					 struct uiscmdrsp 

*cmdrsp)

Quoted 9 lines

drivers/staging/unisys/visorhba/visorhba_main.c

Quoted 5 lines

{

drivers/staging/unisys/visorhba/visorhba_main.c +0 -2
-	if (cmdrsp->scsitaskmgmt.notify_handle)
-		idr_remove(idrtable, cmdrsp-

scsitaskmgmt.notify_handle);

drivers/staging/unisys/visorhba/visorhba_main.c

Quoted 2 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -2
-	if (cmdrsp->scsitaskmgmt.notifyresult_handle)
-		idr_remove(idrtable, cmdrsp-

scsitaskmgmt.notifyresult_handle);

Quoted 7 lines

drivers/staging/unisys/visorhba/visorhba_main.c static struct uiscmdrsp *get_scsipending_cmdrsp(struct visorhba_devdata *ddata,

Quoted 4 lines
drivers/staging/unisys/visorhba/visorhba_main.c +2 -0
+	xa_erase(xa, cmdrsp->scsitaskmgmt.notify_handle);
+	xa_erase(xa, cmdrsp->scsitaskmgmt.notifyresult_handle);
 
 }

why were the conditions removed before each entry deletion?

No reason at all. I unwittingly removed them while deleting idr_remove() calls. I'll restore them.

Quoted 4 lines

drivers/staging/unisys/visorhba/visorhba_main.c static int forward_taskmgmt_command(enum

Quoted 4 lines

/*

drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
@@ -273,8 +242,7 @@ static int forward_taskmgmt_command(enum 

task_mgmt_types tasktype,

Quoted 8 lines

drivers/staging/unisys/visorhba/visorhba_main.c static int forward_taskmgmt_command(enum task_mgmt_types tasktype,

Quoted 8 lines
drivers/staging/unisys/visorhba/visorhba_main.c +1 -2
 	if (devdata->serverdown || devdata->serverchangingstate)
 
 		return FAILED;
 
-	scsicmd_id = add_scsipending_entry(devdata, CMD_SCSITASKMGMT_TYPE,
-					   NULL);
+	scsicmd_id = add_scsipending_entry(devdata, CMD_SCSITASKMGMT_TYPE, 

NULL);

Quoted 7 lines
Quoted 4 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
 	if (scsicmd_id < 0)
 

return FAILED;

this is a code format change, maybe this go in a separate patch?

Yes, I forgot to restore the previous format. Julia also pointed it out a few days ago.

Thanks,

Fabio

Quoted 2 lines

drivers/staging/unisys/visorhba/visorhba_main.c static int forward_taskmgmt_command(enum

Quoted 2 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
@@ -284,8 +252,7 @@ static int forward_taskmgmt_command(enum 

task_mgmt_types tasktype,

Quoted 5 lines

drivers/staging/unisys/visorhba/visorhba_main.c static int forward_taskmgmt_command(enum task_mgmt_types tasktype,

Quoted 5 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -1
 	/* issue TASK_MGMT_ABORT_TASK */
 	cmdrsp->cmdtype = CMD_SCSITASKMGMT_TYPE;
 
-	setup_scsitaskmgmt_handles(&devdata->idr, &devdata->privlock, 

cmdrsp,

Quoted 2 lines

drivers/staging/unisys/visorhba/visorhba_main.c static int forward_taskmgmt_command(enum · line 255

Quoted 2 lines
drivers/staging/unisys/visorhba/visorhba_main.c +1 -1
-				   &notifyevent, &notifyresult);
+	setup_scsitaskmgmt_handles(&devdata->xa, cmdrsp, &notifyevent, 

&notifyresult);

Quoted 5 lines

drivers/staging/unisys/visorhba/visorhba_main.c static int forward_taskmgmt_command(enum

Quoted 5 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
 	/* save destination */
 	cmdrsp->scsitaskmgmt.tasktype = tasktype;
 
@@ -311,14 +278,14 @@ static int forward_taskmgmt_command(enum 

task_mgmt_types

Quoted 26 lines
Quoted 26 lines

tasktype,>

drivers/staging/unisys/visorhba/visorhba_main.c +2 -2
 	dev_dbg(&scsidev->sdev_gendev,
 
 		"visorhba: taskmgmt type=%d success; result=0x%x\n",
 
 		 tasktype, notifyresult);
 
-	cleanup_scsitaskmgmt_handles(&devdata->idr, cmdrsp);
+	cleanup_scsitaskmgmt_handles(&devdata->xa, cmdrsp);
 
 	return SUCCESS;
 
 err_del_scsipending_ent:
 	dev_dbg(&scsidev->sdev_gendev,
 
 		"visorhba: taskmgmt type=%d not executed\n", tasktype);
 
 	del_scsipending_ent(devdata, scsicmd_id);
 
-	cleanup_scsitaskmgmt_handles(&devdata->idr, cmdrsp);
+	cleanup_scsitaskmgmt_handles(&devdata->xa, cmdrsp);
 
 	return FAILED;
 
 }
Quoted 8 lines

drivers/staging/unisys/visorhba/visorhba_main.c DEFINE_SHOW_ATTRIBUTE(info_debugfs); · line 660

Quoted 8 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -2
@@ -654,13 +621,12 @@ DEFINE_SHOW_ATTRIBUTE(info_debugfs);
 
  * Service Partition returned the result of the task management
  * command. Wake up anyone waiting for it.
  */
 
-static void complete_taskmgmt_command(struct idr *idrtable,
-				      struct uiscmdrsp *cmdrsp, 

int result)

Quoted 1 line

drivers/staging/unisys/visorhba/visorhba_main.c DEFINE_SHOW_ATTRIBUTE(info_debugfs); · line 626

Quoted 1 line
drivers/staging/unisys/visorhba/visorhba_main.c +1 -0
+static void complete_taskmgmt_command(struct xarray *xa, struct uiscmdrsp 

*cmdrsp,

Quoted 10 lines
Quoted 10 lines

int result)>
{

drivers/staging/unisys/visorhba/visorhba_main.c +1 -1
 	wait_queue_head_t *wq =
 
-		idr_find(idrtable, cmdrsp->scsitaskmgmt.notify_handle);
+		xa_load(xa, cmdrsp->scsitaskmgmt.notify_handle);
 
 	int *scsi_result_ptr =
Quoted 7 lines

drivers/staging/unisys/visorhba/visorhba_main.c

Quoted 1 line
drivers/staging/unisys/visorhba/visorhba_main.c +0 -1
-		idr_find(idrtable, cmdrsp-

scsitaskmgmt.notifyresult_handle);

drivers/staging/unisys/visorhba/visorhba_main.c

Quoted 5 lines
drivers/staging/unisys/visorhba/visorhba_main.c +1 -0
+		xa_load(xa, cmdrsp->scsitaskmgmt.notifyresult_handle);
 
 	if (unlikely(!(wq && scsi_result_ptr))) {
 
 		pr_err("visorhba: no completion context; cmd will time 

out\n");

Quoted 3 lines

drivers/staging/unisys/visorhba/visorhba_main.c static void visorhba_serverdown_complete(struct

Quoted 3 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
 		return;
@@ -708,8 +674,7 @@ static void visorhba_serverdown_complete(struct 

visorhba_devdata

Quoted 7 lines

drivers/staging/unisys/visorhba/visorhba_main.c static void visorhba_serverdown_complete(struct · line 714

Quoted 7 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -1
 *devdata)> 
 			break;
 
 		case CMD_SCSITASKMGMT_TYPE:
 			cmdrsp = pendingdel->sent;
 
-			complete_taskmgmt_command(&devdata->idr, 

cmdrsp,

Quoted 1 line

drivers/staging/unisys/visorhba/visorhba_main.c static void visorhba_serverdown_complete(struct · line 715

Quoted 1 line
drivers/staging/unisys/visorhba/visorhba_main.c +0 -1
-						  

TASK_MGMT_FAILED);

Quoted 1 line

drivers/staging/unisys/visorhba/visorhba_main.c static void visorhba_serverdown_complete(struct · line 680

Quoted 1 line
drivers/staging/unisys/visorhba/visorhba_main.c +1 -0
+			complete_taskmgmt_command(&devdata->xa, 

cmdrsp, TASK_MGMT_FAILED);

Quoted 8 lines
Quoted 8 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
 			break;
 
 		default:
 			break;
@@ -905,7 +870,7 @@ static void drain_queue(struct uiscmdrsp *cmdrsp,
 
Quoted 8 lines

drivers/staging/unisys/visorhba/visorhba_main.c static void drain_queue(struct uiscmdrsp *cmdrsp, · line 873

Quoted 3 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
 			if (!del_scsipending_ent(devdata,
 
 						 cmdrsp-

scsitaskmgmt.handle))

drivers/staging/unisys/visorhba/visorhba_main.c static void drain_queue(struct uiscmdrsp *cmdrsp, · line 911

Quoted 4 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -1
 				break;
 
-			complete_taskmgmt_command(&devdata->idr, 

cmdrsp,

Quoted 1 line

drivers/staging/unisys/visorhba/visorhba_main.c static void drain_queue(struct uiscmdrsp *cmdrsp, · line 876

Quoted 1 line
drivers/staging/unisys/visorhba/visorhba_main.c +1 -0
+			complete_taskmgmt_command(&devdata->xa, 

cmdrsp,

Quoted 14 lines
Quoted 2 lines

cmdrsp-

scsitaskmgmt.result);

Quoted 11 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
 		} else if (cmdrsp->cmdtype == CMD_NOTIFYGUEST_TYPE)
 
 			dev_err_once(&devdata->dev->device,
@@ -1053,7 +1018,7 @@ static int visorhba_probe(struct visor_device *dev)
 
 	if (err)
 
 		goto err_debugfs_info;
 
Quoted 7 lines

drivers/staging/unisys/visorhba/visorhba_main.c static void visorhba_remove(struct visor_device

Quoted 7 lines
drivers/staging/unisys/visorhba/visorhba_main.c +1 -1
-	idr_init(&devdata->idr);
+	xa_init(&devdata->xa);
 
drivers/staging/unisys/visorhba/visorhba_main.c +0 -0
 	devdata->cmdrsp = kmalloc(sizeof(*devdata->cmdrsp), GFP_ATOMIC);
 	visorbus_enable_channel_interrupts(dev);
@@ -1096,8 +1061,6 @@ static void visorhba_remove(struct visor_device 

*dev)

Quoted 14 lines
Quoted 10 lines
drivers/staging/unisys/visorhba/visorhba_main.c +0 -2
 	scsi_remove_host(scsihost);
 	scsi_host_put(scsihost);
 
-	idr_destroy(&devdata->idr);
-
 
 	dev_set_drvdata(&dev->device, NULL);
 	debugfs_remove(devdata->debugfs_info);

debugfs_remove_recursive(devdata->debugfs_dir);

thank you,

fabio