diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-07-14 15:19:02 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-08-29 22:09:27 -0400 |
commit | 95475e57113c66aac7583925736ed2e2d58c990d (patch) | |
tree | 933aa0ca3bffef5b1457c516fbe3e8690b4c4cb1 /include | |
parent | af1f951eb6ef27b01cbfb3f6c21b770af4368a6d (diff) |
async_tx: remove walk of tx->parent chain in dma_wait_for_async_tx
We currently walk the parent chain when waiting for a given tx to
complete however this walk may race with the driver cleanup routine.
The routines in async_raid6_recov.c may fall back to the synchronous
path at any point so we need to be prepared to call async_tx_quiesce()
(which calls dma_wait_for_async_tx). To remove the ->parent walk we
guarantee that every time a dependency is attached ->issue_pending() is
invoked, then we can simply poll the initial descriptor until
completion.
This also allows for a lighter weight 'issue pending' implementation as
there is no longer a requirement to iterate through all the channels'
->issue_pending() routines as long as operations have been submitted in
an ordered chain. async_tx_issue_pending() is added for this case.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/async_tx.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h index 3d21a2517518..12a2efcbd565 100644 --- a/include/linux/async_tx.h +++ b/include/linux/async_tx.h | |||
@@ -83,6 +83,24 @@ struct async_submit_ctl { | |||
83 | 83 | ||
84 | #ifdef CONFIG_DMA_ENGINE | 84 | #ifdef CONFIG_DMA_ENGINE |
85 | #define async_tx_issue_pending_all dma_issue_pending_all | 85 | #define async_tx_issue_pending_all dma_issue_pending_all |
86 | |||
87 | /** | ||
88 | * async_tx_issue_pending - send pending descriptor to the hardware channel | ||
89 | * @tx: descriptor handle to retrieve hardware context | ||
90 | * | ||
91 | * Note: any dependent operations will have already been issued by | ||
92 | * async_tx_channel_switch, or (in the case of no channel switch) will | ||
93 | * be already pending on this channel. | ||
94 | */ | ||
95 | static inline void async_tx_issue_pending(struct dma_async_tx_descriptor *tx) | ||
96 | { | ||
97 | if (likely(tx)) { | ||
98 | struct dma_chan *chan = tx->chan; | ||
99 | struct dma_device *dma = chan->device; | ||
100 | |||
101 | dma->device_issue_pending(chan); | ||
102 | } | ||
103 | } | ||
86 | #ifdef CONFIG_ARCH_HAS_ASYNC_TX_FIND_CHANNEL | 104 | #ifdef CONFIG_ARCH_HAS_ASYNC_TX_FIND_CHANNEL |
87 | #include <asm/async_tx.h> | 105 | #include <asm/async_tx.h> |
88 | #else | 106 | #else |
@@ -98,6 +116,11 @@ static inline void async_tx_issue_pending_all(void) | |||
98 | do { } while (0); | 116 | do { } while (0); |
99 | } | 117 | } |
100 | 118 | ||
119 | static inline void async_tx_issue_pending(struct dma_async_tx_descriptor *tx) | ||
120 | { | ||
121 | do { } while (0); | ||
122 | } | ||
123 | |||
101 | static inline struct dma_chan * | 124 | static inline struct dma_chan * |
102 | async_tx_find_channel(struct async_submit_ctl *submit, | 125 | async_tx_find_channel(struct async_submit_ctl *submit, |
103 | enum dma_transaction_type tx_type, struct page **dst, | 126 | enum dma_transaction_type tx_type, struct page **dst, |