浏览代码

async_tx/raid6: add missing dma_unmap calls to the async fail case

If we are unable to offload async_mult() or async_sum_product(), then
unmap the buffers before falling through to the synchronous path.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Dan Williams 15 年之前
父节点
当前提交
1f6672d44c
共有 1 个文件被更改,包括 13 次插入0 次删除
  1. 13 0
      crypto/async_tx/async_raid6_recov.c

+ 13 - 0
crypto/async_tx/async_raid6_recov.c

@@ -55,6 +55,13 @@ async_sum_product(struct page *dest, struct page **srcs, unsigned char *coef,
 			async_tx_submit(chan, tx, submit);
 			async_tx_submit(chan, tx, submit);
 			return tx;
 			return tx;
 		}
 		}
+
+		/* could not get a descriptor, unmap and fall through to
+		 * the synchronous path
+		 */
+		dma_unmap_page(dev, dma_dest[1], len, DMA_BIDIRECTIONAL);
+		dma_unmap_page(dev, dma_src[0], len, DMA_TO_DEVICE);
+		dma_unmap_page(dev, dma_src[1], len, DMA_TO_DEVICE);
 	}
 	}
 
 
 	/* run the operation synchronously */
 	/* run the operation synchronously */
@@ -101,6 +108,12 @@ async_mult(struct page *dest, struct page *src, u8 coef, size_t len,
 			async_tx_submit(chan, tx, submit);
 			async_tx_submit(chan, tx, submit);
 			return tx;
 			return tx;
 		}
 		}
+
+		/* could not get a descriptor, unmap and fall through to
+		 * the synchronous path
+		 */
+		dma_unmap_page(dev, dma_dest[1], len, DMA_BIDIRECTIONAL);
+		dma_unmap_page(dev, dma_src[0], len, DMA_TO_DEVICE);
 	}
 	}
 
 
 	/* no channel available, or failed to allocate a descriptor, so
 	/* no channel available, or failed to allocate a descriptor, so