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

Commit 2955b47d authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] async: introduce 'async_domain' type 



This is in preparation for teaching async_synchronize_full() to sync all
pending async work, and not just on the async_running domain.  This
conversion is functionally equivalent, just embedding the existing list
in a new async_domain type.

The .registered attribute is used in a later patch to distinguish
between domains that want to be flushed by async_synchronize_full()
versus those that only expect async_synchronize_{full|cookie}_domain to
be used for flushing.

[jejb: add async.h to scsi_priv.h for struct async_domain]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: default avatarEldad Zack <eldad@fogrefinery.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 529f9a76

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2744,7 +2744,7 @@ static void regulator_bulk_enable_async(void *data, async_cookie_t cookie) 
int regulator_bulk_enable(int num_consumers,

			  struct regulator_bulk_data *consumers)

{

	LIST_HEAD(async_domain);

	ASYNC_DOMAIN_EXCLUSIVE(async_domain);

	int i;

	int ret = 0;

drivers/scsi/libsas/sas_ata.c

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static void async_sas_ata_eh(void *data, async_cookie_t cookie) 
void sas_ata_strategy_handler(struct Scsi_Host *shost)

{

	struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost);

	LIST_HEAD(async);

	ASYNC_DOMAIN_EXCLUSIVE(async);

	int i;



	/* it's ok to defer revalidation events during ata eh, these

drivers/scsi/scsi.c

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <linux/notifier.h>

#include <linux/cpu.h>

#include <linux/mutex.h>

#include <linux/async.h>



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>
@@ -91,7 +92,7 @@ EXPORT_SYMBOL(scsi_logging_level); 
#endif



/* sd, scsi core and power management need to coordinate flushing async actions */

LIST_HEAD(scsi_sd_probe_domain);

ASYNC_DOMAIN(scsi_sd_probe_domain);

EXPORT_SYMBOL(scsi_sd_probe_domain);



/* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.

drivers/scsi/scsi_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _SCSI_PRIV_H



#include <linux/device.h>

#include <linux/async.h>

#include <scsi/scsi_device.h>



struct request_queue;
@@ -163,7 +164,7 @@ static inline int scsi_autopm_get_host(struct Scsi_Host *h) { return 0; } 
static inline void scsi_autopm_put_host(struct Scsi_Host *h) {}

#endif /* CONFIG_PM_RUNTIME */



extern struct list_head scsi_sd_probe_domain;

extern struct async_domain scsi_sd_probe_domain;



/* 

 * internal scsi timeout functions: for use by mid-layer and transport

include/linux/async.h

+31 −4
Original line number Diff line number Diff line
@@ -9,19 +9,46 @@ 
 * as published by the Free Software Foundation; version 2

 * of the License.

 */

#ifndef __ASYNC_H__

#define __ASYNC_H__



#include <linux/types.h>

#include <linux/list.h>



typedef u64 async_cookie_t;

typedef void (async_func_ptr) (void *data, async_cookie_t cookie);

struct async_domain {

	struct list_head node;

	struct list_head domain;

	int count;

	unsigned registered:1;

};



/*

 * domain participates in global async_synchronize_full

 */

#define ASYNC_DOMAIN(_name) \

	struct async_domain _name = { .node = LIST_HEAD_INIT(_name.node), \

				      .domain = LIST_HEAD_INIT(_name.domain), \

				      .count = 0, \

				      .registered = 1 }



/*

 * domain is free to go out of scope as soon as all pending work is

 * complete, this domain does not participate in async_synchronize_full

 */

#define ASYNC_DOMAIN_EXCLUSIVE(_name) \

	struct async_domain _name = { .node = LIST_HEAD_INIT(_name.node), \

				      .domain = LIST_HEAD_INIT(_name.domain), \

				      .count = 0, \

				      .registered = 0 }



extern async_cookie_t async_schedule(async_func_ptr *ptr, void *data);

extern async_cookie_t async_schedule_domain(async_func_ptr *ptr, void *data,

					    struct list_head *list);

					    struct async_domain *domain);

extern void async_synchronize_full(void);

extern void async_synchronize_full_domain(struct list_head *list);

extern void async_synchronize_full_domain(struct async_domain *domain);

extern void async_synchronize_cookie(async_cookie_t cookie);

extern void async_synchronize_cookie_domain(async_cookie_t cookie,

					    struct list_head *list);

					    struct async_domain *domain);

#endif