From nobody Sun Dec 14 13:49:51 2025 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 67B97219A97 for ; Tue, 4 Feb 2025 19:11:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738696281; cv=none; b=KUL7YUDVZE4dHTQ4BQx5FRAbRJUtaHcSdJSWrDaFZ+XiulYExMujQ0VEAk6ok57W1vyRSDgbO5dkASf+GwJyk3DLB+NkkoY/P+SVntxX5s/g3UzOQipvW/kc7SPcWOO3HqeE2IAqS8liu5AzBJkR0xyKHZ41GRkKu/gSG8aTU1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738696281; c=relaxed/simple; bh=fgvav/VSEIHUhdT3806VLJC6JLGbBXBOxRebuhnQQjI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=udCiNiSPvNCjZoWsNPIPXyw05QOnmgM96Fk0g/DeZCDxvYsPUWLwS01BCSO7CStgyTLaMhyU8wv4V51WBaMJqvHAUEtRR4Rg5exjsh8C9kfVaRlxK3/kGtCgrva8yqA1kAMkJRl6mJ+ALm49KTq+93A7fp1wt5/7S2aRFkVJgJE= 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=OQWImNpN; arc=none smtp.client-ip=209.85.214.180 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="OQWImNpN" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21654fdd5daso104710225ad.1 for ; Tue, 04 Feb 2025 11:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738696279; x=1739301079; 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=Ei3U9MNfcrzrg5+3o/MWatj/iskGcRz4y7XoQJ1XwqM=; b=OQWImNpNhViTmOEBUaszmLwtXp5zOCoHastSl5nYsGF+bA+9jEgqXOb5g+eSe1OL4S +rr8MWb73du0gRKwU+2kr/h/3td1m4SM1YwNIjZr34G8IjdJ/tvRDznjQQFGcOq6W32D ECS+9WxWfO8NJbeTbShHDIQ9RsmvXI48iBmWk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738696279; x=1739301079; 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=Ei3U9MNfcrzrg5+3o/MWatj/iskGcRz4y7XoQJ1XwqM=; b=JEwTteSShmgXRGbBLzOgHJ4KZ0Q1FAmIK8uGs4jCuUuXiXO7sNUkLp4TxQRG/yrF3L sHOJhU+3ArGyjRejyo3S9UJueIXd5TyXQx/DXiMNWGNjCjNsstkV0VXMiYwXamf52nBM 53Hm3/nQmdSkmHAlCaW1s5II54D3medxoYP/4RyE9ZYDDQ0fQ3OJsVbMeV/EEGg4kIBh C3IAKctXfZt3h3MkbxMw/NWF7XT9whql64WSQY4bhV2Gz5ZY9idJ4kF7kZ1X72+YAGpg rvk3+G39lMo+XZm6YoAGKwKQ+ll3ijN/KC/f++rEliueCDdvMJJoPyuxnwYu2pw71fp9 hQLg== X-Forwarded-Encrypted: i=1; AJvYcCWILYSHGbEs2egd/8k4113k7uQkmHk/UPMCZ5GvZP6Dfc3Ub5L5ckI8H/YgLxFidbVj9tiUxnMrR/DTRbc=@vger.kernel.org X-Gm-Message-State: AOJu0YzJqHffCS4WM2JXJFUJpexBETtq5JrISAY1Zkbi4lxNeQNF+4VC bQq9Et1DHejwW286huGvAG0HpDIzM+/U5r1CtD8/huqIYMuNhRaqBPqBFkfQn60= X-Gm-Gg: ASbGncsN/zhJCxkRbgbho3PsiANEdI6+SKnGeX91PBYIOK4V9ciHDlwY7BojOR+O25P TAikObpwv5wDEXsBJTpksNgzlGpurX3B1qIevN+/XuY1+jgWeEqsPeuADfkmm/R7Y2wY3w0z7YF 9RrSDdl9xirvKa4Ooh7tCs88ZgxY4miGTz4lfTH+hlcKuOUBURzqQeVrJuIraAYbMcbn6TfRTo1 woshV6Mc0DBrRKE9S44BWJ6w0gCfEx8T/FjXBAZKZOaC1lJRaNnO0koOrUa/dqtth8w7g5cnsXA USd+vKRmcXPj3h3UxkdvOiY= X-Google-Smtp-Source: AGHT+IFDh9gs6Xfs+/RVL/J/t2NGVsuVNJafDRrtG3U1S6uJvHYeab0nLFKvV5EhsD7qlxJ2kf73GA== X-Received: by 2002:a17:902:cecd:b0:21e:ff31:531 with SMTP id d9443c01a7336-21eff31073fmr77506595ad.22.1738696278887; Tue, 04 Feb 2025 11:11:18 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21de32ea5f1sm100749785ad.130.2025.02.04.11.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 11:11:18 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, Joe Damato , Donald Hunter , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Andrew Lunn , Xuan Zhuo , Stanislav Fomichev , Mina Almasry , Daniel Jurgens , Martin Karsten , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v3 1/2] netdev-genl: Add an XSK attribute to queues Date: Tue, 4 Feb 2025 19:10:47 +0000 Message-ID: <20250204191108.161046-2-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250204191108.161046-1-jdamato@fastly.com> References: <20250204191108.161046-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 nest attribute, xsk, which will be present for queues that are being used for AF_XDP. If the queue is not being used for AF_XDP, the nest will not be present. In the future, this attribute can be extended to include more data about XSK as it is needed. Signed-off-by: Joe Damato Suggested-by: Jakub Kicinski --- v2: - Patch adjusted to include an attribute, xsk, which is an empty nest and exposed for queues which have a pool. Documentation/netlink/specs/netdev.yaml | 13 ++++++++++++- include/uapi/linux/netdev.h | 6 ++++++ net/core/netdev-genl.c | 11 +++++++++++ tools/include/uapi/linux/netdev.h | 6 ++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Documentation/netlink/specs/netdev.yaml b/Documentation/netlin= k/specs/netdev.yaml index cbb544bd6c84..4c3eda5ba754 100644 --- a/Documentation/netlink/specs/netdev.yaml +++ b/Documentation/netlink/specs/netdev.yaml @@ -268,6 +268,9 @@ attribute-sets: doc: The timeout, in nanoseconds, of how long to suspend irq processing, if event polling finds events type: uint + - + name: xsk-info + attributes: [] - name: queue attributes: @@ -286,6 +289,9 @@ 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 will have more information set= in + the xsk attribute. type: u32 enum: queue-type - @@ -296,7 +302,11 @@ attribute-sets: name: dmabuf doc: ID of the dmabuf attached to this queue, if any. type: u32 - + - + name: xsk + doc: XSK information for this queue, if any. + type: nest + nested-attributes: xsk-info - name: qstats doc: | @@ -637,6 +647,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..46bdb0b67a39 100644 --- a/include/uapi/linux/netdev.h +++ b/include/uapi/linux/netdev.h @@ -130,12 +130,18 @@ enum { NETDEV_A_NAPI_MAX =3D (__NETDEV_A_NAPI_MAX - 1) }; =20 +enum { + __NETDEV_A_XSK_INFO_MAX, + NETDEV_A_XSK_INFO_MAX =3D (__NETDEV_A_XSK_INFO_MAX - 1) +}; + enum { NETDEV_A_QUEUE_ID =3D 1, NETDEV_A_QUEUE_IFINDEX, 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..efaccfb6438e 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -371,6 +371,7 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct ne= t_device *netdev, struct net_devmem_dmabuf_binding *binding; struct netdev_rx_queue *rxq; struct netdev_queue *txq; + struct nlattr *nest; void *hdr; =20 hdr =3D genlmsg_iput(rsp, info); @@ -394,12 +395,22 @@ 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 (rxq->pool) { + nest =3D nla_nest_start(rsp, NETDEV_A_QUEUE_XSK); + nla_nest_end(rsp, nest); + } + 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 (txq->pool) { + nest =3D nla_nest_start(rsp, NETDEV_A_QUEUE_XSK); + nla_nest_end(rsp, nest); + } } =20 genlmsg_end(rsp, hdr); diff --git a/tools/include/uapi/linux/netdev.h b/tools/include/uapi/linux/n= etdev.h index e4be227d3ad6..46bdb0b67a39 100644 --- a/tools/include/uapi/linux/netdev.h +++ b/tools/include/uapi/linux/netdev.h @@ -130,12 +130,18 @@ enum { NETDEV_A_NAPI_MAX =3D (__NETDEV_A_NAPI_MAX - 1) }; =20 +enum { + __NETDEV_A_XSK_INFO_MAX, + NETDEV_A_XSK_INFO_MAX =3D (__NETDEV_A_XSK_INFO_MAX - 1) +}; + enum { NETDEV_A_QUEUE_ID =3D 1, NETDEV_A_QUEUE_IFINDEX, 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.43.0 From nobody Sun Dec 14 13:49:51 2025 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 0126B218E9B for ; Tue, 4 Feb 2025 19:11:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738696284; cv=none; b=WGZeU+2YtujFCvEY73I8+NwievBlLfHyAsqt7Z6j2wy9onH8zD7jCOj47795VQ3LyJ2KoDfcbm23XvzqcLFRlAl97nUMFih8rExQ4G44lWBzbk8pefEFwDEY6Bo07yLOD3bRt+t6lByQ9oIHMS18Ec8Ax98j1aCIqiYrYqxF2pw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738696284; c=relaxed/simple; bh=bYYjg7d9qN/DD+W8ShQxohpoNa08V7gQHkvh2N+qd10=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T28z1I1xAxUz68P55ryXmJ+8jH2xYnfEGSDetVg7rhcI5GvYGxdNX4Tu7NicZP2qW3B9cywFJlHeHJK3P/tMoXy4R/0GuaJSZcPh2/EID/NkmPs16lawZBdF62HpdWDOquHyQxkrRMAqdsGDdtUMeG7VLFES+4BP0nNtMl0Ge7I= 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=CbGRX6lr; arc=none smtp.client-ip=209.85.216.46 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="CbGRX6lr" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2ef72924e53so10417238a91.3 for ; Tue, 04 Feb 2025 11:11:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738696282; x=1739301082; 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=aFOiMjg7PXIIN05OHT1LbZo8p0N7HvJ6NT6kMG2Y/FA=; b=CbGRX6lrYfpvZ5cjo5OyI4PgwoLmLXzxTolLSC5I+RH0mRXaJq//w6YFaO0VgVitQU uHGwG+QmB0Hkg2v7GICi6HHAhXohRnR34cKADnkvTw4X5yeHsWVMAt+BKm2LgfpyOKVp Qlw81oVCEkb92g6rjUkaBnmejh65bd09Fl338= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738696282; x=1739301082; 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=aFOiMjg7PXIIN05OHT1LbZo8p0N7HvJ6NT6kMG2Y/FA=; b=lLT4iOeewd772bxiJCFpFoT0b6JEFIGks3FNMU25yLIiC57nYAOXfro2YQuSBak3qI mhTznkOSOJ6ARTv2zQ8izY+uj/3zhksbidR2rQn3omYFt93oNXAihZEC/f6oBXtozbEN KSWh9Oy95lJeQ9FAXuchEz0fHsy8yareVL6iEgBKUGc/dKbe8zbkzggKMNu8sD6qcm/s jd2JF/OxqnYsNm9TBOruCY1t01oXlPcBRgeDN4dUwweQgFHmv1K9BRi5nk66J2xD5tg7 Iq/3x11BFUokiOUYMFKDFj+e1lI3D00NZd3n7SMqyubUyt8KLLIl6OML0b/DJQqXz4IG Rajg== X-Forwarded-Encrypted: i=1; AJvYcCWbm5zJKViGm/1K7/hJYKqWbz6xv0MqSDK1MVd+/pzTxrcbSmNE59tKKNg+gJVB8hzvLZPYGDHX31ZZv5c=@vger.kernel.org X-Gm-Message-State: AOJu0YxUjpIOdDnQdcuZ6tj0zjsj72SqRHOZQSV54lo6a4CaooMdyLMr 6jGaVqyPKiShRGaZoxsJ17M4FjhGl/tR9HjI0s6xwrGHEe9Z+ViFT8UAm+Vqv6Y= X-Gm-Gg: ASbGncsC57dYfbsaE9tFjA5bWSEi6N4i5DcHYC/9GTABxid0EHX4hF+hUQCaDpMQzla ixpjEVZ+w+3JpJeNPTDSKsU0B2o8fDy9W53HiRCrB7ncXwyCJqAqvzXx/kdjPAj1JQTW75H2cuo UL4e4NpkbFNpZheWSsdSQJ+/g7w2qMx6Y2/hlSJITosoE0UvB2C0d2OwWLilQPrwjRIo2uZBeA8 FCHzN6+2mFUPQAVr8EZ6mICVli53B6srSyVCBoFcP1YfcGEHP6WfriO45+TvKyJGOLOVujkDRsr isVwcTowSPmxyzJUTPm71Jg= X-Google-Smtp-Source: AGHT+IEpjianC0AHZ1rNHL0t9jx7XsDrLsqSgCFmgK7H6tu+yNLQgFiDBSZAMy1u0ny3UShqlFg9Jg== X-Received: by 2002:a17:90b:1f82:b0:2ef:2f49:7d7f with SMTP id 98e67ed59e1d1-2f83ac00c94mr45359126a91.18.1738696282192; Tue, 04 Feb 2025 11:11:22 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21de32ea5f1sm100749785ad.130.2025.02.04.11.11.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 11:11:21 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Shuah Khan , 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: [PATCH net-next v3 2/2] selftests: drv-net: Test queue xsk attribute Date: Tue, 4 Feb 2025 19:10:48 +0000 Message-ID: <20250204191108.161046-3-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250204191108.161046-1-jdamato@fastly.com> References: <20250204191108.161046-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 nest attribute. The attribute is currently empty, but its existence means the AF_XDP is being used for the queue. Signed-off-by: Joe Damato Suggested-by: Jakub Kicinski --- v3: - Change comment style of helper C program to avoid kdoc warnings as suggested by Jakub. No other changes. v2: - Updated the Python test after changes to patch 1 which expose an empty nest - Updated Python test with general Python coding feedback .../testing/selftests/drivers/net/.gitignore | 2 + tools/testing/selftests/drivers/net/Makefile | 3 + tools/testing/selftests/drivers/net/queues.py | 35 +++++++- .../selftests/drivers/net/xdp_helper.c | 89 +++++++++++++++++++ 4 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/.gitignore create mode 100644 tools/testing/selftests/drivers/net/xdp_helper.c diff --git a/tools/testing/selftests/drivers/net/.gitignore b/tools/testing= /selftests/drivers/net/.gitignore new file mode 100644 index 000000000000..ec746f374e85 --- /dev/null +++ b/tools/testing/selftests/drivers/net/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +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..55c2b296ad3c 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,34 @@ 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) + defer(xdp.kill) + + stdout, stderr =3D xdp.communicate(timeout=3D10) + rx =3D tx =3D False + + queues =3D nl.queue_get({'ifindex': cfg.ifindex}, dump=3DTrue) + if not queues: + raise KsftSkipEx("Netlink reports no 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'], {}) + else: + if 'xsk' in q: + _fail("Check failed: xsk attribute set.") + + ksft_eq(rx, True) + ksft_eq(tx, True) =20 def get_queues(cfg, nl) -> None: snl =3D NetdevFamily(recv_size=3D4096) @@ -81,7 +112,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..b04d4e0ea30a --- /dev/null +++ b/tools/testing/selftests/drivers/net/xdp_helper.c @@ -0,0 +1,89 @@ +// 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.43.0