| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20230423062546.96880-1-xuanzhuo@linux.alibaba.com>
Date: Sun, 23 Apr 2023 14:25:45 +0800
From: Xuan Zhuo <xuanzhuo@...ux.alibaba.com>
To: netdev@...r.kernel.org
Cc: Björn Töpel <bjorn@...nel.org>,
Magnus Karlsson <magnus.karlsson@...el.com>,
Maciej Fijalkowski <maciej.fijalkowski@...el.com>,
Jonathan Lemon <jonathan.lemon@...il.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Jesper Dangaard Brouer <hawk@...nel.org>,
John Fastabend <john.fastabend@...il.com>, bpf@...r.kernel.org,
virtualization@...ts.linux-foundation.org,
Jason Wang <jasowang@...hat.com>,
"Michael S. Tsirkin" <mst@...hat.com>,
Guenter Roeck <linux@...ck-us.net>,
Gerd Hoffmann <kraxel@...hat.com>,
Christoph Hellwig <hch@...radead.org>
Subject: [PATCH net-next v1] xsk: introduce xsk_dma_cbs
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.
More is here:
https://lore.kernel.org/virtualization/1681265026.6082013-1-xuanzhuo@linux.alibaba.com/
https://lore.kernel.org/all/20230421065059.1bc78133@kernel.org
Signed-off-by: Xuan Zhuo <xuanzhuo@...ux.alibaba.com>
---
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,
+ 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);
+};
+
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))
+ dma_cbs->unmap_page(dma_map->dev, *dma, PAGE_SIZE,
+ DMA_BIDIRECTIONAL, attrs);
+ else
+ dma_unmap_page_attrs(dma_map->dev, *dma, PAGE_SIZE,
+ DMA_BIDIRECTIONAL, attrs);
*dma = 0;
}
}
@@ -362,7 +367,7 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs)
if (!refcount_dec_and_test(&dma_map->users))
return;
- __xp_dma_unmap(dma_map, attrs);
+ __xp_dma_unmap(dma_map, pool->dma_cbs, attrs);
kvfree(pool->dma_pages);
pool->dma_pages_cnt = 0;
pool->dev = NULL;
@@ -407,6 +412,7 @@ static int xp_init_dma_info(struct xsk_buff_pool *pool, struct xsk_dma_map *dma_
}
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)
{
struct xsk_dma_map *dma_map;
@@ -424,19 +430,32 @@ int xp_dma_map(struct xsk_buff_pool *pool, struct device *dev,
return 0;
}
+ pool->dma_cbs = dma_cbs;
+
dma_map = xp_create_dma_map(dev, pool->netdev, nr_pages, pool->umem);
if (!dma_map)
return -ENOMEM;
for (i = 0; i < dma_map->dma_pages_cnt; i++) {
- dma = dma_map_page_attrs(dev, pages[i], 0, PAGE_SIZE,
- DMA_BIDIRECTIONAL, attrs);
- if (dma_mapping_error(dev, dma)) {
- __xp_dma_unmap(dma_map, attrs);
- return -ENOMEM;
+ if (likely(!dma_cbs)) {
+ dma = dma_map_page_attrs(dev, pages[i], 0, PAGE_SIZE,
+ DMA_BIDIRECTIONAL, attrs);
+ if (dma_mapping_error(dev, dma)) {
+ __xp_dma_unmap(dma_map, dma_cbs, attrs);
+ return -ENOMEM;
+ }
+ if (dma_need_sync(dev, dma))
+ dma_map->dma_need_sync = true;
+ } else {
+ dma = dma_cbs->map_page(dev, pages[i], 0, PAGE_SIZE,
+ DMA_BIDIRECTIONAL, attrs);
+ if (dma_cbs->mapping_error(dev, dma)) {
+ __xp_dma_unmap(dma_map, dma_cbs, attrs);
+ return -ENOMEM;
+ }
+ if (dma_cbs->need_sync(dev, dma))
+ dma_map->dma_need_sync = true;
}
- if (dma_need_sync(dev, dma))
- dma_map->dma_need_sync = true;
dma_map->dma_pages[i] = dma;
}
@@ -445,7 +464,7 @@ int xp_dma_map(struct xsk_buff_pool *pool, struct device *dev,
err = xp_init_dma_info(pool, dma_map);
if (err) {
- __xp_dma_unmap(dma_map, attrs);
+ __xp_dma_unmap(dma_map, dma_cbs, attrs);
return err;
}
@@ -532,9 +551,14 @@ struct xdp_buff *xp_alloc(struct xsk_buff_pool *pool)
xskb->xdp.data_meta = xskb->xdp.data;
if (pool->dma_need_sync) {
- dma_sync_single_range_for_device(pool->dev, xskb->dma, 0,
- pool->frame_len,
- DMA_BIDIRECTIONAL);
+ if (unlikely(pool->dma_cbs))
+ pool->dma_cbs->sync_single_range_for_device(pool->dev, xskb->dma, 0,
+ pool->frame_len,
+ DMA_BIDIRECTIONAL);
+ else
+ dma_sync_single_range_for_device(pool->dev, xskb->dma, 0,
+ pool->frame_len,
+ DMA_BIDIRECTIONAL);
}
return &xskb->xdp;
}
@@ -670,15 +694,24 @@ EXPORT_SYMBOL(xp_raw_get_dma);
void xp_dma_sync_for_cpu_slow(struct xdp_buff_xsk *xskb)
{
- dma_sync_single_range_for_cpu(xskb->pool->dev, xskb->dma, 0,
- xskb->pool->frame_len, DMA_BIDIRECTIONAL);
+ if (unlikely(xskb->pool->dma_cbs))
+ xskb->pool->dma_cbs->sync_single_range_for_cpu(xskb->pool->dev, xskb->dma, 0,
+ xskb->pool->frame_len,
+ DMA_BIDIRECTIONAL);
+ else
+ dma_sync_single_range_for_cpu(xskb->pool->dev, xskb->dma, 0,
+ xskb->pool->frame_len, DMA_BIDIRECTIONAL);
}
EXPORT_SYMBOL(xp_dma_sync_for_cpu_slow);
void xp_dma_sync_for_device_slow(struct xsk_buff_pool *pool, dma_addr_t dma,
size_t size)
{
- dma_sync_single_range_for_device(pool->dev, dma, 0,
- size, DMA_BIDIRECTIONAL);
+ if (unlikely(pool->dma_cbs))
+ pool->dma_cbs->sync_single_range_for_device(pool->dev, dma, 0,
+ size, DMA_BIDIRECTIONAL);
+ else
+ dma_sync_single_range_for_device(pool->dev, dma, 0,
+ size, DMA_BIDIRECTIONAL);
}
EXPORT_SYMBOL(xp_dma_sync_for_device_slow);
--
2.32.0.3.g01195cf9f
Powered by blists - more mailing lists