From nobody Mon Feb 9 20:59:03 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7D371E2312 for ; Wed, 29 Jan 2025 17:24:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738171493; cv=none; b=uMxMrgNQ8JEbiC7ZatU0XwSbS0fyUPE6qQ9YAd370+1erAUGQzc6jv3XFyM2A8dGFuFFDtDqekfNoATHhO3XqmO5YwzEUEviLdbMrF6+WXbCP0pSY4ZDgvHDF3nPGou9UeeBdJ9dZl9p8pkGaKhFpfPgfGGTby/JASSlvn+k2jA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738171493; c=relaxed/simple; bh=uykqXMSlccPAcjKM9N0EQQCoYb+N/o3tTowzYUQaFlA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gDpIAxRnzaa7o+a88TtXvQRKVGokoTFrUZCNF/uNuMYaL6GiaJRP6uFIn859rDAug0vgp1VAnVFgdIj7Y1uQH9eNJlOJQCq3Ses6r3i07YHEJA5W48MTlBCnqxaLXpZJC6CZqLysjrUgqHdQaO27EHgzj3Ol99uKIF9mOQvRQsA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=lxHNm7w8; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="lxHNm7w8" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-216728b1836so120174115ad.0 for ; Wed, 29 Jan 2025 09:24:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738171488; x=1738776288; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kIJ1xscChyKe3/yp1TDRIO0yWrS/miXJHLckPibu4aI=; b=lxHNm7w8xYC7pDO9tsoP6DSpO7GhpGWeQfaZmGs+QcGj8SGiHqcz8vL7qjmwsxaJg0 fnGOflPGBZnmqMIZekgjYofIttiuQga2mfqpyqh8aag9fR7P6K4heEwU1MYvPLraxnOl WVgKBKt7z43eD/WZKwRNdaPCWt2TO97YZ8FkQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738171488; x=1738776288; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kIJ1xscChyKe3/yp1TDRIO0yWrS/miXJHLckPibu4aI=; b=ELAjRT+zXTyk7bLxXyRjxCtys8B9r8BLP0dvm3yPNEiervUvcZuGSPDO0+d4MSDlRf OCyuVuaCGxmcAX5VYP5hgMI5fV5YqHNmMMP991i3JhampzsmxIB4qpaWYuRBGlC48fym QI82upVzsQiA3OU6nHnQynBkGMMdfJwDQ3WMjbGjTRbA1QLtfw2Ri6vy0ija2oOFypZz mvLYX4UPrqOsLlF6NMgVKs/19Nvl5yvI+n+UeOcYMFSiKUZ20PuC/KoakuHZMDGRfmUh jqJiHKtOxEVE6n1FpTCT4V5KOT0ofr08TlzI5EUHMBXwCGWA9NbT8DqP2BWSzlMT3dnY QxIg== X-Forwarded-Encrypted: i=1; AJvYcCUi+sJoGDFgbiovVGfaNZj3KRL1C8ky1o3CWfAJrzexlGkAgI3ZZRFZ/44c3B8DnTZa6EPyGcj4oLzNcJg=@vger.kernel.org X-Gm-Message-State: AOJu0YxhzqQM72zAb0oQZDRJkthBfdQzhYYoL4yUbWkqJOlJhDwhO42D s1voOG9owhFpwJ6hJlx2parbTUYYOr3bdxh3wakopqhJxQCMF2Og97RYpRhmXM8= X-Gm-Gg: ASbGncvG8Mzuczr/ZJTKzjmakjBknBV09lKQbnsozhF3GfZL5gDXGSPA/t/tg2uJyoW 1HGwalZ8Zi/9ukVD94mzfUrZXgy0uyIDMf/nrKEhhoKcoKBHaKrE2UPoTX2bNMcTgdeepfMIShN n8J5wtsDegH5oWvfuv5cqKzDVoln5p/R9gG0W/fNkDPewkELVFD41jipdWNVY1zG/tBQUYsMU4U 35DM0m2siA6BY39cJqqBxpVxSAd2KnyVVDfxoybSVuYpsLgMNZ1DVzWoFK7SKmznTlQwhhnAtb9 rOXQVLK2XhpHAl6jrqj91TE= X-Google-Smtp-Source: AGHT+IGe/oRF+IwKmYQvS9DZ5Fk0mURK77saF2TL7uM8Xp2N5QXboCJz7UEH45qrt1hOoyv0K85XIg== X-Received: by 2002:a17:903:2f8c:b0:215:b9a6:5cb9 with SMTP id d9443c01a7336-21dd7c3555bmr65528075ad.5.1738171487942; Wed, 29 Jan 2025 09:24:47 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da4bc5c1fsm101147295ad.82.2025.01.29.09.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 09:24:47 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: sridhar.samudrala@intel.com, Joe Damato , Donald Hunter , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Andrew Lunn , Xuan Zhuo , Mina Almasry , Martin Karsten , Amritha Nambiar , Stanislav Fomichev , Daniel Jurgens , linux-kernel@vger.kernel.org (open list) Subject: [RFC net-next 1/2] netdev-genl: Add an XSK attribute to queues Date: Wed, 29 Jan 2025 17:24:24 +0000 Message-Id: <20250129172431.65773-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250129172431.65773-1-jdamato@fastly.com> References: <20250129172431.65773-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Expose a new per-queue attribute, xsk, which indicates that a queue is being used for AF_XDP. Update the documentation to more explicitly state which queue types are linked. Signed-off-by: Joe Damato --- Documentation/netlink/specs/netdev.yaml | 10 +++++++++- include/uapi/linux/netdev.h | 1 + net/core/netdev-genl.c | 6 ++++++ tools/include/uapi/linux/netdev.h | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Documentation/netlink/specs/netdev.yaml b/Documentation/netlin= k/specs/netdev.yaml index cbb544bd6c84..7a72788cce03 100644 --- a/Documentation/netlink/specs/netdev.yaml +++ b/Documentation/netlink/specs/netdev.yaml @@ -286,6 +286,8 @@ attribute-sets: - name: type doc: Queue type as rx, tx. Each queue type defines a separate ID s= pace. + XDP TX queues allocated in the kernel are not linked to NAPIs= and + thus not listed. AF_XDP queues have the xsk attribute set. type: u32 enum: queue-type - @@ -296,7 +298,12 @@ attribute-sets: name: dmabuf doc: ID of the dmabuf attached to this queue, if any. type: u32 - + - + name: xsk + doc: Non-zero for queues which are used for XSK (AF_XDP), 0 otherw= ise. + type: u32 + checks: + max: 1 - name: qstats doc: | @@ -637,6 +644,7 @@ operations: - napi-id - ifindex - dmabuf + - xsk dump: request: attributes: diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h index e4be227d3ad6..4d2dcf4960ec 100644 --- a/include/uapi/linux/netdev.h +++ b/include/uapi/linux/netdev.h @@ -136,6 +136,7 @@ enum { NETDEV_A_QUEUE_TYPE, NETDEV_A_QUEUE_NAPI_ID, NETDEV_A_QUEUE_DMABUF, + NETDEV_A_QUEUE_XSK, =20 __NETDEV_A_QUEUE_MAX, NETDEV_A_QUEUE_MAX =3D (__NETDEV_A_QUEUE_MAX - 1) diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c index 715f85c6b62e..964aebfcb079 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -394,12 +394,18 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct = net_device *netdev, nla_put_u32(rsp, NETDEV_A_QUEUE_DMABUF, binding->id)) goto nla_put_failure; =20 + if (nla_put_u32(rsp, NETDEV_A_QUEUE_XSK, !!rxq->pool)) + goto nla_put_failure; + break; case NETDEV_QUEUE_TYPE_TX: txq =3D netdev_get_tx_queue(netdev, q_idx); if (txq->napi && nla_put_u32(rsp, NETDEV_A_QUEUE_NAPI_ID, txq->napi->napi_id)) goto nla_put_failure; + + if (nla_put_u32(rsp, NETDEV_A_QUEUE_XSK, !!txq->pool)) + goto nla_put_failure; } =20 genlmsg_end(rsp, hdr); diff --git a/tools/include/uapi/linux/netdev.h b/tools/include/uapi/linux/n= etdev.h index e4be227d3ad6..4d2dcf4960ec 100644 --- a/tools/include/uapi/linux/netdev.h +++ b/tools/include/uapi/linux/netdev.h @@ -136,6 +136,7 @@ enum { NETDEV_A_QUEUE_TYPE, NETDEV_A_QUEUE_NAPI_ID, NETDEV_A_QUEUE_DMABUF, + NETDEV_A_QUEUE_XSK, =20 __NETDEV_A_QUEUE_MAX, NETDEV_A_QUEUE_MAX =3D (__NETDEV_A_QUEUE_MAX - 1) --=20 2.25.1 From nobody Mon Feb 9 20:59:03 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BED91E2858 for ; Wed, 29 Jan 2025 17:24:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738171497; cv=none; b=Vb539aZ4lbZjNr2AUH4+iaQPF7C2PMwcPAHssOu3kbwsTJjvwCut7grTvO3UMkzA3ZeNeeAGbUAO3flXmZpvteFtEJi2//sYpzN00BLE3U4T2KCo6FrJCXKwlolwvJFVQeGjz4s4PDAj68brgi8VKHnNoIJqJ9sCYCDohokmuSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738171497; c=relaxed/simple; bh=BozksO6LrJi91zWTtnxb5prUWQsVfI9vGsKzYHUvw/4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Hbu5W65cyxRdBqGrolQNl5XkcOxRrKQzXQoUKlbEz5Z5dJlDlKkMfbWdEqAwc2XJriNIlge32BE6P6GGAIgDZdeTAyZAZEKBH4lri0BvXUAtjYYMW4ejguWdv/b0ULFARhxmsPKwwZMfBrBlCrEAlQFjcjsiRr95ZBt2JEHY2xU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=si3kvSEw; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="si3kvSEw" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2163dc5155fso131618675ad.0 for ; Wed, 29 Jan 2025 09:24:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738171492; x=1738776292; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6IxZoTSZC8XkF6q0qbcWevoPwZ9BA7mGu7R6RBmsTJw=; b=si3kvSEwF3+vza/NrKTOGpls4Z8nEdhR6CbvO9LSC/cgdWJdvR+DCdHGO88OpleZKg 3x6HlShsnk47wM/Ign1PwPqs1bCC+Y5F6W67bqfLgGGlb7YBgvEGun2H9bLeop7AwxNm AzC7xq8GoSKgdE7YPdOik57jMssXY8wkcGG5c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738171492; x=1738776292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6IxZoTSZC8XkF6q0qbcWevoPwZ9BA7mGu7R6RBmsTJw=; b=FBY6EK5mJ6RFYQVbuAQ/j2YsuQ9g2a5UplKdlFH6NU0+pL86PJiKjaWVhotufNYTmR XfIRWdECapxEgesdYL+Y21ubxag+1bjPsCgoWCyM4mnaMXty5Kw0IMoOa/OmxxO1ryJj lrHO2ORbibo/B7YyL2nlCtgUAd8UvLXGsoy9fgOEDKaO0N+9nBuMOndx27ggz79CVm1W Xk7novtxvUWcDSSVVjYzXRspCcNlA5fbNT0gICfbACn/4lJHqqDUdij65LY31iOq7fwg f6oNbxuu1oWCQ2aQwLVWJdYgVQjbQcy+3sDHOgvZtJxkGLTQNnjgcy1TA9KZXQRXGYtJ TY1g== X-Forwarded-Encrypted: i=1; AJvYcCXyEFBPQ0Pzg9Pcb7ZEGIOlmwnETCkMMV0PyeGxNnxOjG9e7XVYvTcTX1cdTb94+ib6XMusi/MLltTj4es=@vger.kernel.org X-Gm-Message-State: AOJu0Yyjn2/HwiGT99W08nQt60SAZBD4E/vUChIbHBPCJ0U+lxzDkOmK FSKkEhWs2QzJsG7jpBwr9oTAlgGT5C+wm7Zq6iMFc5kqPGeMmv1QrAl7eGJqsX8= X-Gm-Gg: ASbGncu4T2qvcUASlWI372U7Yp+cGzhGwKidd/1O2DZ5KMyh4CgKvey/e2KoHj/mkyo QWqrXswyTL4T+35QkJZmENIkm1atbKXtna/dB2ePc+Y+L+qcYOOif/DkzjsEhfvkqzFQMClbBs9 8OuGr6tg/jyLRspmdY14jBeI/96S8fvUYf+gNecw0glaQPn1HoBPe07eTuGqO6zGal/6XsjkAyx 6o9584mxkW+62+SWZxKeGm8XR5kavP4TGZT6mIUxmapG0Pc8Cg+YDxKo3IFQBi51YSwQIdypubT OtFGwrfVLkVLQNyLYVcuzmc= X-Google-Smtp-Source: AGHT+IFqx522D4nQTHyMFazUvJWxvG0j+Zqt3odIeyZB35qDEJj8NgO23teWx1vp1NnyLXGolcBjJQ== X-Received: by 2002:a17:903:1cb:b0:21c:2f41:f4cd with SMTP id d9443c01a7336-21dd7dea7b3mr66633765ad.43.1738171491752; Wed, 29 Jan 2025 09:24:51 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da4bc5c1fsm101147295ad.82.2025.01.29.09.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 09:24:51 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: sridhar.samudrala@intel.com, Joe Damato , Shuah Khan , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , linux-kernel@vger.kernel.org (open list), linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK), bpf@vger.kernel.org (open list:XDP (eXpress Data Path):Keyword:(?:\b|_)xdp(?:\b|_)) Subject: [RFC net-next 2/2] selftests: drv-net: Test queue xsk attribute Date: Wed, 29 Jan 2025 17:24:25 +0000 Message-Id: <20250129172431.65773-3-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250129172431.65773-1-jdamato@fastly.com> References: <20250129172431.65773-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Test that queues which are used for AF_XDP have the xsk attribute set. Signed-off-by: Joe Damato --- tools/testing/selftests/drivers/.gitignore | 1 + tools/testing/selftests/drivers/net/Makefile | 3 + tools/testing/selftests/drivers/net/queues.py | 32 ++++++- .../selftests/drivers/net/xdp_helper.c | 90 +++++++++++++++++++ 4 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/xdp_helper.c diff --git a/tools/testing/selftests/drivers/.gitignore b/tools/testing/sel= ftests/drivers/.gitignore index 09e23b5afa96..3c109144f7ff 100644 --- a/tools/testing/selftests/drivers/.gitignore +++ b/tools/testing/selftests/drivers/.gitignore @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only /dma-buf/udmabuf /s390x/uvdevice/test_uvdevice +/net/xdp_helper diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/s= elftests/drivers/net/Makefile index 137470bdee0c..f6ec08680f48 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -1,10 +1,13 @@ # SPDX-License-Identifier: GPL-2.0 +CFLAGS +=3D $(KHDR_INCLUDES) =20 TEST_INCLUDES :=3D $(wildcard lib/py/*.py) \ $(wildcard lib/sh/*.sh) \ ../../net/net_helper.sh \ ../../net/lib.sh \ =20 +TEST_GEN_PROGS :=3D xdp_helper + TEST_PROGS :=3D \ netcons_basic.sh \ netcons_overflow.sh \ diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/= selftests/drivers/net/queues.py index 38303da957ee..4bd4710b1a79 100755 --- a/tools/testing/selftests/drivers/net/queues.py +++ b/tools/testing/selftests/drivers/net/queues.py @@ -8,7 +8,10 @@ from lib.py import NetDrvEnv from lib.py import cmd, defer, ip import errno import glob - +import os +import socket +import struct +import subprocess =20 def sys_get_queues(ifname, qtype=3D'rx') -> int: folders =3D glob.glob(f'/sys/class/net/{ifname}/queues/{qtype}-*') @@ -21,6 +24,31 @@ def nl_get_queues(cfg, nl, qtype=3D'rx'): return len([q for q in queues if q['type'] =3D=3D qtype]) return None =20 +def check_xdp(cfg, nl, xdp_queue_id=3D0) -> None: + test_dir =3D os.path.dirname(os.path.realpath(__file__)) + xdp =3D subprocess.Popen([f"{test_dir}/xdp_helper", f"{cfg.ifindex}", = f"{xdp_queue_id}"], + stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PI= PE, bufsize=3D1, + text=3DTrue) + + stdout, stderr =3D xdp.communicate(timeout=3D10) + rx =3D tx =3D False + + queues =3D nl.queue_get({'ifindex': cfg.ifindex}, dump=3DTrue) + if queues: + for q in queues: + if q['id'] =3D=3D 0: + if q['type'] =3D=3D 'rx': + rx =3D True + if q['type'] =3D=3D 'tx': + tx =3D True + + ksft_eq(q['xsk'], 1) + else: + ksft_eq(q['xsk'], 0) + + ksft_eq(rx, True) + ksft_eq(tx, True) + xdp.kill() =20 def get_queues(cfg, nl) -> None: snl =3D NetdevFamily(recv_size=3D4096) @@ -81,7 +109,7 @@ def check_down(cfg, nl) -> None: =20 def main() -> None: with NetDrvEnv(__file__, queue_count=3D100) as cfg: - ksft_run([get_queues, addremove_queues, check_down], args=3D(cfg, = NetdevFamily())) + ksft_run([get_queues, addremove_queues, check_down, check_xdp], ar= gs=3D(cfg, NetdevFamily())) ksft_exit() =20 =20 diff --git a/tools/testing/selftests/drivers/net/xdp_helper.c b/tools/testi= ng/selftests/drivers/net/xdp_helper.c new file mode 100644 index 000000000000..8ed5f0e7233e --- /dev/null +++ b/tools/testing/selftests/drivers/net/xdp_helper.c @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define UMEM_SZ (1U << 16) +#define NUM_DESC (UMEM_SZ / 2048) + +/** + * this is a simple helper program that creates an XDP socket and does the + * minimum necessary to get bind() to succeed. + * + * this test program is not intended to actually process packets, but coul= d be + * extended in the future if that is actually needed. + * + * it is used by queues.py to ensure the xsk netlinux attribute is set + * correctly. + */ +int main(int argc, char **argv) +{ + struct xdp_umem_reg umem_reg =3D { 0 }; + struct sockaddr_xdp sxdp =3D { 0 }; + int num_desc =3D NUM_DESC; + void *umem_area; + int ifindex; + int sock_fd; + int queue; + char byte; + + if (argc !=3D 3) { + fprintf(stderr, "Usage: %s ifindex queue_id", argv[0]); + return 1; + } + + sock_fd =3D socket(AF_XDP, SOCK_RAW, 0); + if (sock_fd < 0) { + perror("socket creation failed"); + return 1; + } + + ifindex =3D atoi(argv[1]); + queue =3D atoi(argv[2]); + + umem_area =3D mmap(NULL, UMEM_SZ, PROT_READ | PROT_WRITE, MAP_PRIVATE | + MAP_ANONYMOUS, -1, 0); + if (umem_area =3D=3D MAP_FAILED) + return -1; + + umem_reg.addr =3D (uintptr_t)umem_area; + umem_reg.len =3D UMEM_SZ; + umem_reg.chunk_size =3D 2048; + umem_reg.headroom =3D 0; + + setsockopt(sock_fd, SOL_XDP, XDP_UMEM_REG, &umem_reg, + sizeof(umem_reg)); + setsockopt(sock_fd, SOL_XDP, XDP_UMEM_FILL_RING, &num_desc, + sizeof(num_desc)); + setsockopt(sock_fd, SOL_XDP, XDP_UMEM_COMPLETION_RING, &num_desc, + sizeof(num_desc)); + setsockopt(sock_fd, SOL_XDP, XDP_RX_RING, &num_desc, sizeof(num_desc)); + + sxdp.sxdp_family =3D AF_XDP; + sxdp.sxdp_ifindex =3D ifindex; + sxdp.sxdp_queue_id =3D queue; + sxdp.sxdp_flags =3D 0; + + if (bind(sock_fd, (struct sockaddr *)&sxdp, sizeof(sxdp)) !=3D 0) { + perror("bind failed"); + close(sock_fd); + return 1; + } + + /* give the parent program some data when the socket is ready*/ + fprintf(stdout, "%d\n", sock_fd); + + /* parent program will write a byte to stdin when its ready for this + * helper to exit + */ + read(STDIN_FILENO, &byte, 1); + + close(sock_fd); + return 0; +} --=20 2.25.1