[RFC,v2,03/14] xsk: add umem fill queue support and mmap

Message ID	20180327165919.17933-4-bjorn.topel@gmail.com
State	RFC, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com> To: bjorn.topel@gmail.com, magnus.karlsson@intel.com, alexander.h.duyck@intel.com, alexander.duyck@gmail.com, john.fastabend@gmail.com, ast@fb.com, brouer@redhat.com, willemdebruijn.kernel@gmail.com, daniel@iogearbox.net, netdev@vger.kernel.org Cc: michael.lundkvist@ericsson.com, jesse.brandeburg@intel.com, anjali.singhai@intel.com, qi.z.zhang@intel.com, ravineet.singh@ericsson.com Subject: [RFC PATCH v2 03/14] xsk: add umem fill queue support and mmap Date: Tue, 27 Mar 2018 18:59:08 +0200 Message-Id: <20180327165919.17933-4-bjorn.topel@gmail.com> In-Reply-To: <20180327165919.17933-1-bjorn.topel@gmail.com> References: <20180327165919.17933-1-bjorn.topel@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	Introducing AF_XDP support \| expand [RFC,v2,00/14] Introducing AF_XDP support [RFC,v2,01/14] net: initial AF_XDP skeleton [RFC,v2,02/14] xsk: add user memory registration support sockopt [RFC,v2,03/14] xsk: add umem fill queue support and mmap [RFC,v2,04/14] xsk: add Rx queue setup and mmap support [RFC,v2,05/14] xsk: add support for bind for Rx [RFC,v2,06/14] xsk: add Rx receive functions and poll support [RFC,v2,07/14] bpf: introduce new bpf AF_XDP map type BPF_MAP_TYPE_XSKMAP [RFC,v2,08/14] xsk: wire up XDP_DRV side of AF_XDP [RFC,v2,09/14] xsk: wire up XDP_SKB side of AF_XDP [RFC,v2,10/14] xsk: add umem completion queue support and mmap [RFC,v2,11/14] xsk: add Tx queue setup and mmap support [RFC,v2,12/14] xsk: support for Tx [RFC,v2,13/14] xsk: statistics support [RFC,v2,14/14] samples/bpf: sample application for AF_XDP sockets

diff --git a/include/uapi/linux/if_xdp.h b/include/uapi/linux/if_xdp.h index 69ccb3b0a3f2..0de1bbf2c5c7 100644 --- a/include/uapi/linux/if_xdp.h +++ b/include/uapi/linux/if_xdp.h @@ -22,6 +22,7 @@ /* XDP socket options */ #define XDP_UMEM_REG 3 +#define XDP_UMEM_FILL_QUEUE 4 struct xdp_umem_reg { __u64 addr; /* Start of packet data area */ @@ -30,4 +31,18 @@ struct xdp_umem_reg { __u32 frame_headroom; /* Frame head room */ }; +/* Pgoff for mmaping the rings */ +#define XDP_UMEM_PGOFF_FILL_QUEUE 0x100000000 + +struct xdp_queue { + __u32 head_idx __attribute__((aligned(64))); + __u32 tail_idx __attribute__((aligned(64))); +}; + +/* Used for the fill and completion queues for buffers */ +struct xdp_umem_queue { + struct xdp_queue ptrs; + __u32 desc[0] __attribute__((aligned(64))); +}; + #endif /* _LINUX_IF_XDP_H */ diff --git a/net/xdp/Makefile b/net/xdp/Makefile index a5d736640a0f..074fb2b2d51c 100644 --- a/net/xdp/Makefile +++ b/net/xdp/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_XDP_SOCKETS) += xsk.o xdp_umem.o +obj-$(CONFIG_XDP_SOCKETS) += xsk.o xdp_umem.o xsk_queue.o diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 8f768a7887da..f2c0768ca63e 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -66,6 +66,11 @@ static void xdp_umem_release(struct xdp_umem *umem) struct mm_struct *mm; unsigned long diff; + if (umem->fq) { + xskq_destroy(umem->fq); + umem->fq = NULL; + } + if (umem->pgs) { xdp_umem_unpin_pages(umem); diff --git a/net/xdp/xdp_umem.h b/net/xdp/xdp_umem.h index d9bbbb880088..b3538dd2118c 100644 --- a/net/xdp/xdp_umem.h +++ b/net/xdp/xdp_umem.h @@ -18,9 +18,11 @@ #include <linux/mm.h> #include <linux/if_xdp.h> +#include "xsk_queue.h" #include "xdp_umem_props.h" struct xdp_umem { + struct xsk_queue *fq; struct pid *pid; struct page **pgs; unsigned long address; diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index cc0f26e17baf..6ff1d1f3322f 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -32,6 +32,7 @@ #include <linux/netdevice.h> #include <net/sock.h> +#include "xsk_queue.h" #include "xdp_umem.h" struct xdp_sock { @@ -47,6 +48,21 @@ static struct xdp_sock *xdp_sk(struct sock *sk) return (struct xdp_sock *)sk; } +static int xsk_init_queue(u32 entries, struct xsk_queue **queue) +{ + struct xsk_queue *q; + + if (entries == 0 || *queue || !is_power_of_2(entries)) + return -EINVAL; + + q = xskq_create(entries); + if (!q) + return -ENOMEM; + + *queue = q; + return 0; +} + static int xsk_release(struct socket *sock) { struct sock *sk = sock->sk; @@ -109,6 +125,23 @@ static int xsk_setsockopt(struct socket *sock, int level, int optname, mutex_unlock(&xs->mutex); return 0; } + case XDP_UMEM_FILL_QUEUE: + { + struct xsk_queue **q; + int entries; + + if (!xs->umem) + return -EINVAL; + + if (copy_from_user(&entries, optval, sizeof(entries))) + return -EFAULT; + + mutex_lock(&xs->mutex); + q = &xs->umem->fq; + err = xsk_init_queue(entries, q); + mutex_unlock(&xs->mutex); + return err; + } default: break; } @@ -116,6 +149,36 @@ static int xsk_setsockopt(struct socket *sock, int level, int optname, return -ENOPROTOOPT; } +static int xsk_mmap(struct file *file, struct socket *sock, + struct vm_area_struct *vma) +{ + unsigned long offset = 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; + unsigned long pfn; + struct page *qpg; + int err; + + if (!xs->umem) + return -EINVAL; + + if (offset == XDP_UMEM_PGOFF_FILL_QUEUE) + q = xs->umem->fq; + else + return -EINVAL; + + qpg = virt_to_head_page(q->ring); + if (size > (PAGE_SIZE << compound_order(qpg))) + return -EINVAL; + + pfn = virt_to_phys(q->ring) >> PAGE_SHIFT; + err = remap_pfn_range(vma, vma->vm_start, pfn, + size, vma->vm_page_prot); + + return err; +} + static struct proto xsk_proto = { .name = "XDP", .owner = THIS_MODULE, @@ -139,7 +202,7 @@ static const struct proto_ops xsk_proto_ops = { .getsockopt = sock_no_getsockopt, .sendmsg = sock_no_sendmsg, .recvmsg = sock_no_recvmsg, - .mmap = sock_no_mmap, + .mmap = xsk_mmap, .sendpage = sock_no_sendpage, }; diff --git a/net/xdp/xsk_queue.c b/net/xdp/xsk_queue.c new file mode 100644 index 000000000000..fd4bb06aa112 --- /dev/null +++ b/net/xdp/xsk_queue.c @@ -0,0 +1,54 @@ +/* + * XDP user-space ring structure + * Copyright(c) 2018 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include <linux/slab.h> + +#include "xsk_queue.h" + +struct xsk_queue *xskq_create(u32 nentries) +{ + struct xsk_queue *q; + gfp_t gfp_flags; + size_t size; + + q = kzalloc(sizeof(*q), GFP_KERNEL); + if (!q) + return NULL; + + q->nentries = nentries; + q->ring_mask = nentries - 1; + + gfp_flags = GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN | + __GFP_COMP | __GFP_NORETRY; + size = xskq_umem_get_ring_size(q); + q->validation = XSK_VALIDATION_RX; + + q->ring = (struct xdp_queue *)__get_free_pages(gfp_flags, + get_order(size)); + if (!q->ring) { + kfree(q); + return NULL; + } + + return q; +} + +void xskq_destroy(struct xsk_queue *q) +{ + if (!q) + return; + + page_frag_free(q->ring); + kfree(q); +} diff --git a/net/xdp/xsk_queue.h b/net/xdp/xsk_queue.h new file mode 100644 index 000000000000..fe845a20c153 --- /dev/null +++ b/net/xdp/xsk_queue.h @@ -0,0 +1,49 @@ +/* + * XDP user-space ring structure + * Copyright(c) 2018 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#ifndef _LINUX_XDP_QUEUE_H +#define _LINUX_XDP_QUEUE_H + +#include <linux/types.h> +#include <linux/if_xdp.h> + +#include "xdp_umem_props.h" + +enum xsk_validation { + XSK_VALIDATION_RX, /* Only address to packet buffer validated */ +}; + +struct xsk_queue { + enum xsk_validation validation; + struct xdp_umem_props *umem_props; + u32 ring_mask; + u32 nentries; + u32 iter_head_idx; + u32 cached_head; + u32 cached_tail; + struct xdp_queue *ring; + u64 invalid_descs; +}; + +/* Functions operating on UMEM queues only */ + +static inline u32 xskq_umem_get_ring_size(struct xsk_queue *q) +{ + return sizeof(struct xdp_umem_queue) + q->nentries * sizeof(u32); +} + +struct xsk_queue *xskq_create(u32 nentries); +void xskq_destroy(struct xsk_queue *q_ops); + +#endif /* _LINUX_XDP_QUEUE_H */

[RFC,v2,03/14] xsk: add umem fill queue support and mmap

Commit Message

Comments

Patch