Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5a16e43 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Daniel Borkmann
Browse files

xsk: Fix umem fill/completion queue mmap on 32-bit 



With gcc-4.1.2 on 32-bit:

    net/xdp/xsk.c:663: warning: integer constant is too large for ‘long’ type
    net/xdp/xsk.c:665: warning: integer constant is too large for ‘long’ type

Add the missing "ULL" suffixes to the large XDP_UMEM_PGOFF_*_RING values
to fix this.

    net/xdp/xsk.c:663: warning: comparison is always false due to limited range of data type
    net/xdp/xsk.c:665: warning: comparison is always false due to limited range of data type

"unsigned long" is 32-bit on 32-bit systems, hence the offset is
truncated, and can never be equal to any of the XDP_UMEM_PGOFF_*_RING
values.  Use loff_t (and the required cast) to fix this.

Fixes: 423f3832 ("xsk: add umem fill queue support and mmap")
Fixes: fe230832 ("xsk: add umem completion queue support and mmap")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 23316a36

include/uapi/linux/if_xdp.h

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ struct xdp_statistics { 
/* Pgoff for mmaping the rings */

#define XDP_PGOFF_RX_RING			  0

#define XDP_PGOFF_TX_RING		 0x80000000

#define XDP_UMEM_PGOFF_FILL_RING	0x100000000

#define XDP_UMEM_PGOFF_COMPLETION_RING	0x180000000

#define XDP_UMEM_PGOFF_FILL_RING	0x100000000ULL

#define XDP_UMEM_PGOFF_COMPLETION_RING	0x180000000ULL



/* Rx/Tx descriptor */

struct xdp_desc {

net/xdp/xsk.c

+1 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ static int xsk_getsockopt(struct socket *sock, int level, int optname, 
static int xsk_mmap(struct file *file, struct socket *sock,

		    struct vm_area_struct *vma)

{

	unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;

	loff_t offset = (loff_t)vma->vm_pgoff << PAGE_SHIFT;

	unsigned long size = vma->vm_end - vma->vm_start;

	struct xdp_sock *xs = xdp_sk(sock->sk);

	struct xsk_queue *q = NULL;