Skip to content

Commit

Permalink
xdp: xdp_umem: fix umem pages mapping for 32bits systems
Browse files Browse the repository at this point in the history
Use kmap instead of page_address as it's not always in low memory.

Acked-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  • Loading branch information
Ivan Khoronzhuk authored and Daniel Borkmann committed Aug 9, 2019
1 parent b707659 commit d9973ce
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion net/xdp/xdp_umem.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/netdevice.h>
#include <linux/rtnetlink.h>
#include <linux/idr.h>
#include <linux/highmem.h>

#include "xdp_umem.h"
#include "xsk_queue.h"
Expand Down Expand Up @@ -164,6 +165,14 @@ void xdp_umem_clear_dev(struct xdp_umem *umem)
umem->zc = false;
}

static void xdp_umem_unmap_pages(struct xdp_umem *umem)
{
unsigned int i;

for (i = 0; i < umem->npgs; i++)
kunmap(umem->pgs[i]);
}

static void xdp_umem_unpin_pages(struct xdp_umem *umem)
{
unsigned int i;
Expand Down Expand Up @@ -207,6 +216,7 @@ static void xdp_umem_release(struct xdp_umem *umem)

xsk_reuseq_destroy(umem);

xdp_umem_unmap_pages(umem);
xdp_umem_unpin_pages(umem);

kfree(umem->pages);
Expand Down Expand Up @@ -369,7 +379,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
}

for (i = 0; i < umem->npgs; i++)
umem->pages[i].addr = page_address(umem->pgs[i]);
umem->pages[i].addr = kmap(umem->pgs[i]);

return 0;

Expand Down

0 comments on commit d9973ce

Please sign in to comment.