iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] async: introduce 'async_domain' type

Browse Source 
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: Dan Williams <dan.j.williams@intel.com>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Dan Williams 2012-07-09 19:33:25 -07:00 committed by James Bottomley
parent 529f9a7655
commit 2955b47d2c
7 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/core.c
View File

@ -2744,7 +2744,7 @@ static void regulator_bulk_enable_async(void *data, async_cookie_t cookie)
int regulator_bulk_enable(int num_consumers, int regulator_bulk_enable(int num_consumers,
struct regulator_bulk_data *consumers) struct regulator_bulk_data *consumers)
{ {
LIST_HEAD(async_domain); ASYNC_DOMAIN_EXCLUSIVE(async_domain);
int i; int i;
int ret = 0; int ret = 0;

2
drivers/scsi/libsas/sas_ata.c
View File

@ -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) void sas_ata_strategy_handler(struct Scsi_Host *shost)
{ {
struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost); struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost);
LIST_HEAD(async); ASYNC_DOMAIN_EXCLUSIVE(async);
int i; int i;
/* it's ok to defer revalidation events during ata eh, these /* it's ok to defer revalidation events during ata eh, these

3
drivers/scsi/scsi.c
View File

@ -54,6 +54,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/async.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
@ -91,7 +92,7 @@ EXPORT_SYMBOL(scsi_logging_level);
#endif #endif
/* sd, scsi core and power management need to coordinate flushing async actions */ /* 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); EXPORT_SYMBOL(scsi_sd_probe_domain);
/* NB: These are exposed through /proc/scsi/scsi and form part of the ABI. /* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.

3
drivers/scsi/scsi_priv.h
View File

@ -2,6 +2,7 @@
#define _SCSI_PRIV_H #define _SCSI_PRIV_H
#include <linux/device.h> #include <linux/device.h>
#include <linux/async.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
struct request_queue; 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) {} static inline void scsi_autopm_put_host(struct Scsi_Host *h) {}
#endif /* CONFIG_PM_RUNTIME */ #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 * internal scsi timeout functions: for use by mid-layer and transport

35
include/linux/async.h
View File

@ -9,19 +9,46 @@
* as published by the Free Software Foundation; version 2 * as published by the Free Software Foundation; version 2
* of the License. * of the License.
*/ */
#ifndef __ASYNC_H__
#define __ASYNC_H__
#include <linux/types.h> #include <linux/types.h>
#include <linux/list.h> #include <linux/list.h>
typedef u64 async_cookie_t; typedef u64 async_cookie_t;
typedef void (async_func_ptr) (void *data, async_cookie_t cookie); 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(async_func_ptr *ptr, void *data);
extern async_cookie_t async_schedule_domain(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(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(async_cookie_t cookie);
extern void async_synchronize_cookie_domain(async_cookie_t cookie, extern void async_synchronize_cookie_domain(async_cookie_t cookie,
struct list_head *list); struct async_domain *domain);
#endif

35
kernel/async.c
View File

@ -62,7 +62,7 @@ static async_cookie_t next_cookie = 1;
#define MAX_WORK 32768 #define MAX_WORK 32768
static LIST_HEAD(async_pending); static LIST_HEAD(async_pending);
static LIST_HEAD(async_running); static ASYNC_DOMAIN(async_running);
static DEFINE_SPINLOCK(async_lock); static DEFINE_SPINLOCK(async_lock);
struct async_entry { struct async_entry {
@ -71,7 +71,7 @@ struct async_entry {
async_cookie_t cookie; async_cookie_t cookie;
async_func_ptr *func; async_func_ptr *func;
void *data; void *data;
struct list_head *running; struct async_domain *running;
}; };
static DECLARE_WAIT_QUEUE_HEAD(async_done); static DECLARE_WAIT_QUEUE_HEAD(async_done);
@ -82,13 +82,12 @@ static atomic_t entry_count;
/* /*
* MUST be called with the lock held! * MUST be called with the lock held!
*/ */
static async_cookie_t __lowest_in_progress(struct list_head *running) static async_cookie_t __lowest_in_progress(struct async_domain *running)
{ {
struct async_entry *entry; struct async_entry *entry;
if (!list_empty(running)) { if (!list_empty(&running->domain)) {
entry = list_first_entry(running, entry = list_first_entry(&running->domain, typeof(*entry), list);
struct async_entry, list);
return entry->cookie; return entry->cookie;
} }
@ -99,7 +98,7 @@ static async_cookie_t __lowest_in_progress(struct list_head *running)
return next_cookie; /* "infinity" value */ return next_cookie; /* "infinity" value */
} }
static async_cookie_t lowest_in_progress(struct list_head *running) static async_cookie_t lowest_in_progress(struct async_domain *running)
{ {
unsigned long flags; unsigned long flags;
async_cookie_t ret; async_cookie_t ret;
@ -119,10 +118,11 @@ static void async_run_entry_fn(struct work_struct *work)
container_of(work, struct async_entry, work); container_of(work, struct async_entry, work);
unsigned long flags; unsigned long flags;
ktime_t uninitialized_var(calltime), delta, rettime; ktime_t uninitialized_var(calltime), delta, rettime;
struct async_domain *running = entry->running;
/* 1) move self to the running queue */ /* 1) move self to the running queue */
spin_lock_irqsave(&async_lock, flags); spin_lock_irqsave(&async_lock, flags);
list_move_tail(&entry->list, entry->running); list_move_tail(&entry->list, &running->domain);
spin_unlock_irqrestore(&async_lock, flags); spin_unlock_irqrestore(&async_lock, flags);
/* 2) run (and print duration) */ /* 2) run (and print duration) */
@ -156,7 +156,7 @@ static void async_run_entry_fn(struct work_struct *work)
wake_up(&async_done); wake_up(&async_done);
} }
static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct list_head *running) static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct async_domain *running)
{ {
struct async_entry *entry; struct async_entry *entry;
unsigned long flags; unsigned long flags;
@ -223,7 +223,7 @@ EXPORT_SYMBOL_GPL(async_schedule);
* Note: This function may be called from atomic or non-atomic contexts. * Note: This function may be called from atomic or non-atomic contexts.
*/ */
async_cookie_t async_schedule_domain(async_func_ptr *ptr, void *data, async_cookie_t async_schedule_domain(async_func_ptr *ptr, void *data,
struct list_head *running) struct async_domain *running)
{ {
return __async_schedule(ptr, data, running); return __async_schedule(ptr, data, running);
} }
@ -238,20 +238,20 @@ void async_synchronize_full(void)
{ {
do { do {
async_synchronize_cookie(next_cookie); async_synchronize_cookie(next_cookie);
} while (!list_empty(&async_running) || !list_empty(&async_pending)); } while (!list_empty(&async_running.domain) || !list_empty(&async_pending));
} }
EXPORT_SYMBOL_GPL(async_synchronize_full); EXPORT_SYMBOL_GPL(async_synchronize_full);
/** /**
* async_synchronize_full_domain - synchronize all asynchronous function within a certain domain * async_synchronize_full_domain - synchronize all asynchronous function within a certain domain
* @list: running list to synchronize on * @domain: running list to synchronize on
* *
* This function waits until all asynchronous function calls for the * This function waits until all asynchronous function calls for the
* synchronization domain specified by the running list @list have been done. * synchronization domain specified by the running list @domain have been done.
*/ */
void async_synchronize_full_domain(struct list_head *list) void async_synchronize_full_domain(struct async_domain *domain)
{ {
async_synchronize_cookie_domain(next_cookie, list); async_synchronize_cookie_domain(next_cookie, domain);
} }
EXPORT_SYMBOL_GPL(async_synchronize_full_domain); EXPORT_SYMBOL_GPL(async_synchronize_full_domain);
@ -261,11 +261,10 @@ EXPORT_SYMBOL_GPL(async_synchronize_full_domain);
* @running: running list to synchronize on * @running: running list to synchronize on
* *
* This function waits until all asynchronous function calls for the * This function waits until all asynchronous function calls for the
* synchronization domain specified by the running list @list submitted * synchronization domain specified by running list @running submitted
* prior to @cookie have been done. * prior to @cookie have been done.
*/ */
void async_synchronize_cookie_domain(async_cookie_t cookie, void async_synchronize_cookie_domain(async_cookie_t cookie, struct async_domain *running)
struct list_head *running)
{ {
ktime_t uninitialized_var(starttime), delta, endtime; ktime_t uninitialized_var(starttime), delta, endtime;

2
sound/soc/soc-dapm.c
View File

@ -1545,7 +1545,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
struct snd_soc_dapm_context *d; struct snd_soc_dapm_context *d;
LIST_HEAD(up_list); LIST_HEAD(up_list);
LIST_HEAD(down_list); LIST_HEAD(down_list);
LIST_HEAD(async_domain); ASYNC_DOMAIN_EXCLUSIVE(async_domain);
enum snd_soc_bias_level bias; enum snd_soc_bias_level bias;
trace_snd_soc_dapm_start(card); trace_snd_soc_dapm_start(card);