@@ -39,27 +39,29 @@ static int page_pool_init(struct page_pool *pool,
if (ring_qsize > 32768)
return -E2BIG;
- /* DMA direction is either DMA_FROM_DEVICE or DMA_BIDIRECTIONAL.
- * DMA_BIDIRECTIONAL is for allowing page used for DMA sending,
- * which is the XDP_TX use-case.
- */
- if ((pool->p.dma_dir != DMA_FROM_DEVICE) &&
- (pool->p.dma_dir != DMA_BIDIRECTIONAL))
- return -EINVAL;
-
- if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) {
- /* In order to request DMA-sync-for-device the page
- * needs to be mapped
+ if (pool->p.flags) {
+ /* DMA direction is either DMA_FROM_DEVICE or DMA_BIDIRECTIONAL.
+ * DMA_BIDIRECTIONAL is for allowing page used for DMA sending,
+ * which is the XDP_TX use-case.
*/
- if (!(pool->p.flags & PP_FLAG_DMA_MAP))
+ if ((pool->p.dma_dir != DMA_FROM_DEVICE) &&
+ (pool->p.dma_dir != DMA_BIDIRECTIONAL))
return -EINVAL;
- if (!pool->p.max_len)
- return -EINVAL;
+ if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) {
+ /* In order to request DMA-sync-for-device the page
+ * needs to be mapped
+ */
+ if (!(pool->p.flags & PP_FLAG_DMA_MAP))
+ return -EINVAL;
- /* pool->p.offset has to be set according to the address
- * offset used by the DMA engine to start copying rx data
- */
+ if (!pool->p.max_len)
+ return -EINVAL;
+
+ /* pool->p.offset has to be set according to the address
+ * offset used by the DMA engine to start copying rx data
+ */
+ }
}
if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0)
page pool API can be useful for non-DMA cases like xen-netfront driver so let's allow to pass zero flags to page pool flags. Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> --- net/core/page_pool.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)