netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Magnus Karlsson <magnus.karlsson@intel.com>
To: magnus.karlsson@intel.com, bjorn.topel@intel.com, ast@kernel.org,
	daniel@iogearbox.net, netdev@vger.kernel.org,
	jonathan.lemon@gmail.com, maximmi@mellanox.com
Cc: bpf@vger.kernel.org, jeffrey.t.kirsher@intel.com,
	anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com,
	maciejromanfijalkowski@gmail.com, cristian.dumitrescu@intel.com
Subject: [PATCH bpf-next v3 11/14] xsk: add shared umem support between devices
Date: Mon, 20 Jul 2020 11:18:11 +0200	[thread overview]
Message-ID: <1595236694-12749-12-git-send-email-magnus.karlsson@intel.com> (raw)
In-Reply-To: <1595236694-12749-1-git-send-email-magnus.karlsson@intel.com>

Add support to share a umem between different devices. This mode
can be invoked with the XDP_SHARED_UMEM bind flag. Previously,
sharing was only supported within the same device. Note that when
sharing a umem between devices, just as in the case of sharing a
umem between queue ids, you need to create a fill ring and a
completion ring and tie them to the socket (with two setsockopts,
one for each ring) before you do the bind with the
XDP_SHARED_UMEM flag. This so that the single-producer
single-consumer semantics of the rings can be upheld.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
---
 net/xdp/xsk.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index e897755..ec2a2df 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -701,14 +701,11 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
 			sockfd_put(sock);
 			goto out_unlock;
 		}
-		if (umem_xs->dev != dev) {
-			err = -EINVAL;
-			sockfd_put(sock);
-			goto out_unlock;
-		}
 
-		if (umem_xs->queue_id != qid) {
-			/* Share the umem with another socket on another qid */
+		if (umem_xs->queue_id != qid || umem_xs->dev != dev) {
+			/* Share the umem with another socket on another qid
+			 * and/or device.
+			 */
 			xs->pool = xp_create_and_assign_umem(xs,
 							     umem_xs->umem);
 			if (!xs->pool) {
-- 
2.7.4


  parent reply	other threads:[~2020-07-20  9:19 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-20  9:18 [PATCH bpf-next v3 00/14] xsk: support shared umems between devices and queues Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 01/14] xsk: i40e: ice: ixgbe: mlx5: pass buffer pool to driver instead of umem Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 02/14] xsk: i40e: ice: ixgbe: mlx5: rename xsk zero-copy driver interfaces Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 03/14] xsk: create and free buffer pool independently from umem Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 04/14] xsk: move fill and completion rings to buffer pool Magnus Karlsson
2020-07-20 11:45   ` kernel test robot
2020-07-20 13:23     ` Magnus Karlsson
2020-07-20 23:53   ` kernel test robot
2020-07-20  9:18 ` [PATCH bpf-next v3 05/14] xsk: move queue_id, dev and need_wakeup " Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 06/14] xsk: move xsk_tx_list and its lock " Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 07/14] xsk: move addrs from buffer pool to umem Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 08/14] xsk: enable sharing of dma mappings Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 09/14] xsk: rearrange internal structs for better performance Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 10/14] xsk: add shared umem support between queue ids Magnus Karlsson
2020-07-20  9:18 ` Magnus Karlsson [this message]
2020-07-20  9:18 ` [PATCH bpf-next v3 12/14] libbpf: support shared umems between queues and devices Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 13/14] samples/bpf: add new sample xsk_fwd.c Magnus Karlsson
2020-07-20  9:18 ` [PATCH bpf-next v3 14/14] xsk: documentation for XDP_SHARED_UMEM between queues and netdevs Magnus Karlsson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1595236694-12749-12-git-send-email-magnus.karlsson@intel.com \
    --to=magnus.karlsson@intel.com \
    --cc=anthony.l.nguyen@intel.com \
    --cc=ast@kernel.org \
    --cc=bjorn.topel@intel.com \
    --cc=bpf@vger.kernel.org \
    --cc=cristian.dumitrescu@intel.com \
    --cc=daniel@iogearbox.net \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=jonathan.lemon@gmail.com \
    --cc=maciej.fijalkowski@intel.com \
    --cc=maciejromanfijalkowski@gmail.com \
    --cc=maximmi@mellanox.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).