On Sun, Apr 23, 2023 at 02:25:45PM +0800, Xuan Zhuo wrote: > The purpose of this patch is to allow driver pass the own dma callbacks > to xsk. > > This is to cope with the scene of virtio-net. If virtio does not have > VIRTIO_F_ACCESS_PLATFORM, then virtio cannot use DMA API. In this case, > xsk cannot use DMA API directly to achieve DMA address. Based on this > scene, we must let xsk support driver to use the driver's dma callbacks. Why does virtio need to use dma? That seems to go against the overall goal of virtio's new security restrictions that are being proposed (where they do NOT want it to use dma as it is not secure). And why is virtio special here? If you have access to a device, it should have all of the needed dma hooks already set up based on the bus it is on. Or is the issue you don't have a real bus set up? If so, why not fix that? > More is here: > https://lore.kernel.org/virtualization/1681265026.6082013-1-xuanzhuo@xxxxxxxxxxxxxxxxx/ > https://lore.kernel.org/all/20230421065059.1bc78133@xxxxxxxxxx Am I missing the user of this new api? Don't you need to submit that at the same time so we can at least see if this new api works properly? > Signed-off-by: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx> > --- > include/net/xdp_sock_drv.h | 20 ++++++++++- > include/net/xsk_buff_pool.h | 19 ++++++++++ > net/xdp/xsk_buff_pool.c | 71 +++++++++++++++++++++++++++---------- > 3 files changed, 90 insertions(+), 20 deletions(-) > > diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h > index 9c0d860609ba..8b5284b272e4 100644 > --- a/include/net/xdp_sock_drv.h > +++ b/include/net/xdp_sock_drv.h > @@ -67,7 +67,17 @@ static inline int xsk_pool_dma_map(struct xsk_buff_pool *pool, > { > struct xdp_umem *umem = pool->umem; > > - return xp_dma_map(pool, dev, attrs, umem->pgs, umem->npgs); > + return xp_dma_map(pool, dev, NULL, attrs, umem->pgs, umem->npgs); > +} > + > +static inline int xsk_pool_dma_map_with_cbs(struct xsk_buff_pool *pool, > + struct device *dev, > + struct xsk_dma_cbs *dma_cbs, > + unsigned long attrs) > +{ > + struct xdp_umem *umem = pool->umem; > + > + return xp_dma_map(pool, dev, dma_cbs, attrs, umem->pgs, umem->npgs); > } > > static inline dma_addr_t xsk_buff_xdp_get_dma(struct xdp_buff *xdp) > @@ -226,6 +236,14 @@ static inline int xsk_pool_dma_map(struct xsk_buff_pool *pool, > return 0; > } > > +static inline int xsk_pool_dma_map_with_cbs(struct xsk_buff_pool *pool, > + struct device *dev, > + struct xsk_dma_cbs *dma_cbs, > + unsigned long attrs) > +{ > + return 0; > +} > + > static inline dma_addr_t xsk_buff_xdp_get_dma(struct xdp_buff *xdp) > { > return 0; > diff --git a/include/net/xsk_buff_pool.h b/include/net/xsk_buff_pool.h > index 3e952e569418..2de88be9188b 100644 > --- a/include/net/xsk_buff_pool.h > +++ b/include/net/xsk_buff_pool.h > @@ -43,6 +43,23 @@ struct xsk_dma_map { > bool dma_need_sync; > }; > > +struct xsk_dma_cbs { > + dma_addr_t (*map_page)(struct device *dev, struct page *page, Why are you working on a "raw" struct device here and everywhere else? Are you sure that is ok? What is it needed for? > + size_t offset, size_t size, > + enum dma_data_direction dir, unsigned long attrs); > + void (*unmap_page)(struct device *dev, dma_addr_t addr, > + size_t size, enum dma_data_direction dir, > + unsigned long attrs); > + int (*mapping_error)(struct device *dev, dma_addr_t addr); > + bool (*need_sync)(struct device *dev, dma_addr_t addr); > + void (*sync_single_range_for_cpu)(struct device *dev, dma_addr_t addr, > + size_t offset, size_t size, > + enum dma_data_direction dir); > + void (*sync_single_range_for_device)(struct device *dev, dma_addr_t addr, > + size_t offset, size_t size, > + enum dma_data_direction dir); > +}; No documentation for any of these callbacks? Please use kerneldoc so we at least have a clue as to what they should be doing. > + > struct xsk_buff_pool { > /* Members only used in the control path first. */ > struct device *dev; > @@ -85,6 +102,7 @@ struct xsk_buff_pool { > * sockets share a single cq when the same netdev and queue id is shared. > */ > spinlock_t cq_lock; > + struct xsk_dma_cbs *dma_cbs; > struct xdp_buff_xsk *free_heads[]; > }; > > @@ -131,6 +149,7 @@ static inline void xp_init_xskb_dma(struct xdp_buff_xsk *xskb, struct xsk_buff_p > /* AF_XDP ZC drivers, via xdp_sock_buff.h */ > void xp_set_rxq_info(struct xsk_buff_pool *pool, struct xdp_rxq_info *rxq); > int xp_dma_map(struct xsk_buff_pool *pool, struct device *dev, > + struct xsk_dma_cbs *dma_cbs, > unsigned long attrs, struct page **pages, u32 nr_pages); > void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs); > struct xdp_buff *xp_alloc(struct xsk_buff_pool *pool); > diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c > index b2df1e0f8153..e7e6c91f6e51 100644 > --- a/net/xdp/xsk_buff_pool.c > +++ b/net/xdp/xsk_buff_pool.c > @@ -328,7 +328,8 @@ static void xp_destroy_dma_map(struct xsk_dma_map *dma_map) > kfree(dma_map); > } > > -static void __xp_dma_unmap(struct xsk_dma_map *dma_map, unsigned long attrs) > +static void __xp_dma_unmap(struct xsk_dma_map *dma_map, > + struct xsk_dma_cbs *dma_cbs, unsigned long attrs) > { > dma_addr_t *dma; > u32 i; > @@ -337,8 +338,12 @@ static void __xp_dma_unmap(struct xsk_dma_map *dma_map, unsigned long attrs) > dma = &dma_map->dma_pages[i]; > if (*dma) { > *dma &= ~XSK_NEXT_PG_CONTIG_MASK; > - dma_unmap_page_attrs(dma_map->dev, *dma, PAGE_SIZE, > - DMA_BIDIRECTIONAL, attrs); > + if (unlikely(dma_cbs)) If you can not measure the use of likely/unlikely in a benchmark, then you should never use it as the compiler and CPU will work better without it (and will work better over time as hardware and compiler change). thanks, greg k-h
