From patchwork Mon Feb 3 18:58:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13958081 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 12F0315530C for ; Mon, 3 Feb 2025 18:58:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738609125; cv=none; b=uW21JO87bjD4mAxeg7hBy/FS+jk5MxYhEkuo8a7rFC7ue+PsMUvhRzdGjDrNGxpO7h01GpHWaRcKcdqf4jDYidmCF4jjO4ovTeN4pd0z/7rVzGBQ81OAATRd+9KIhD5ja4+chkQKF8pDPoSr8jewELOrKoZ66RY7H9/ZVrF/eHI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738609125; c=relaxed/simple; bh=YWLna/hYKjLDp7e2BU26uo0pe/VQo3Rev1AkrtIgSNI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OcygyyYwWvZrCFYhPVYA09jvbwJcE+BfIS0+tQZrPuW3LFRUfHs7aGLwzjRvxrYdpjvHdGWlUZtzdniYDFL/GsTJTjwmDjI5yl3lRojuO4Z21TbutJpGJIHY+JPwiOgYC6viUlfhDkNsvlRrRtDpY/LZvId+ZhBPCQXzjUVEW80= 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=W1nuQqVG; arc=none smtp.client-ip=209.85.214.178 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="W1nuQqVG" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-216426b0865so82264815ad.0 for ; Mon, 03 Feb 2025 10:58:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738609123; x=1739213923; 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=oFV2H1044MDUFJDVaW9wXukAW/miUUhwpjp4ACnOm8o=; b=W1nuQqVGjDmqtI6W8MrpVvYXD1rN8Yw9HdM9XJbjJCiMgmgoU2NDLHvEj0rClrdlCc tXwpNwi6Mdd0BhU/oLWXvqfw0eH6OisSxj3lQKAJv4Dk7hV/1pibnSuWrYNzfGPf9lpG GgDXFNrV8BIi6e7QQtzV3YqSZ8fMsM2M3fAcA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738609123; x=1739213923; 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=oFV2H1044MDUFJDVaW9wXukAW/miUUhwpjp4ACnOm8o=; b=Nrmk1zbhvm7JuisujB8vUKA/6fo0H0soXAlna8NsFl39nsEeC5tD3GPHGB4Q5rOIt4 +VCL8IXdE5MpG28z1POj3JucTWlftJ2jPf+l43yYEgAO/XZmrO2cE4g2Vy1Hq+aezPMW WKkeHIQIkXkvFeTSzfTFUbNQtEDrtxHl+oNFuylucDqBgAySZa/joTE4Eled1MkL6En7 i1iNl9J4QjQxw/LXg/EnGCPmSxfBVGmoA2OQg2jYim716vI+fQrJiUGjVPmU1RHYkpI2 IqRmh7vi5Rf5qslH8UYwthPq+zwSAFBNYXGA1ylD2D2Kd3o9wIImK9xrIGbdeHoyzv0r fiGA== X-Gm-Message-State: AOJu0YxHbtwcU1g7KWe24uznNsqjg/EPB+j5nbzJSCNQ8xuuT5pFYAQh CNbFr158SkiPFZ8Xen2BNeH9VH5FFDjwXjviBJiP8/BWiBsUNMOdV2VLT7pqBSnEeCgNzK9x0FU ZCuhIBoJA89m3W3zHRnaM1FHyHb21RA65PdhClinEX/REGadqACV0gJsr+PXw2QI5h9C5OOm/tA 3Ib+LYPMsswvvJn7fMmY9p3JYuVHvXNZeNJoY= X-Gm-Gg: ASbGncvdVO9O4xP5prKkl1iTXa1/JWn1+9ZE4oVZgjQOFxqtmObrXEu86F7LJBtIqBy R9EWx/yGGzMipmI/1lBFC1CS1v6B+YwIU/NYlpTQFLqvqR31b5oT9akqiV/BCJpafHbnGvu50HP pBwIXnaSL/3pmav081crDS1g3r9aPPNulW7mWmwZeEBoI3LwAQMlVJcE8eIlVce2OmBKMLTjs2C kd2R8NYEdi2TA8C0RA5tAOXe1AjM30JB3tsiLqUpMlEbi5VH4gpETZXN8v04qatD6U+5/plQ7z1 vDYv3bVJgAu5bFmoyKmtkqA= X-Google-Smtp-Source: AGHT+IErgFj1XPbmmXgg/gDjbp8GmtedVOyxQtSlr57wVEkQTED5pVfME7Sn7Hyyby02uOUYqVHkqA== X-Received: by 2002:a05:6a00:140f:b0:72d:b36a:4497 with SMTP id d2e1a72fcca58-72fd0bcd59cmr40027431b3a.3.1738609122729; Mon, 03 Feb 2025 10:58:42 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec0a666ddsm6899673a12.73.2025.02.03.10.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 10:58:42 -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 , Stanislav Fomichev , Xuan Zhuo , Mina Almasry , Daniel Jurgens , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v2 1/2] netdev-genl: Add an XSK attribute to queues Date: Mon, 3 Feb 2025 18:58:22 +0000 Message-Id: <20250203185828.19334-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250203185828.19334-1-jdamato@fastly.com> References: <20250203185828.19334-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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/netlink/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 space. + 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 = (__NETDEV_A_NAPI_MAX - 1) }; +enum { + __NETDEV_A_XSK_INFO_MAX, + NETDEV_A_XSK_INFO_MAX = (__NETDEV_A_XSK_INFO_MAX - 1) +}; + enum { NETDEV_A_QUEUE_ID = 1, NETDEV_A_QUEUE_IFINDEX, NETDEV_A_QUEUE_TYPE, NETDEV_A_QUEUE_NAPI_ID, NETDEV_A_QUEUE_DMABUF, + NETDEV_A_QUEUE_XSK, __NETDEV_A_QUEUE_MAX, NETDEV_A_QUEUE_MAX = (__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 net_device *netdev, struct net_devmem_dmabuf_binding *binding; struct netdev_rx_queue *rxq; struct netdev_queue *txq; + struct nlattr *nest; void *hdr; hdr = 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; + if (rxq->pool) { + nest = nla_nest_start(rsp, NETDEV_A_QUEUE_XSK); + nla_nest_end(rsp, nest); + } + break; case NETDEV_QUEUE_TYPE_TX: txq = 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 = nla_nest_start(rsp, NETDEV_A_QUEUE_XSK); + nla_nest_end(rsp, nest); + } } genlmsg_end(rsp, hdr); diff --git a/tools/include/uapi/linux/netdev.h b/tools/include/uapi/linux/netdev.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 = (__NETDEV_A_NAPI_MAX - 1) }; +enum { + __NETDEV_A_XSK_INFO_MAX, + NETDEV_A_XSK_INFO_MAX = (__NETDEV_A_XSK_INFO_MAX - 1) +}; + enum { NETDEV_A_QUEUE_ID = 1, NETDEV_A_QUEUE_IFINDEX, NETDEV_A_QUEUE_TYPE, NETDEV_A_QUEUE_NAPI_ID, NETDEV_A_QUEUE_DMABUF, + NETDEV_A_QUEUE_XSK, __NETDEV_A_QUEUE_MAX, NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1) From patchwork Mon Feb 3 18:58:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13958080 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 7773220E021 for ; Mon, 3 Feb 2025 18:58:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738609128; cv=none; b=eCT+5oloLRGFQXYy+HrXhQaZ2TbwU0jNe0rSIJUlh+cJujqp218QMFO39gRgMeSf/vfBNbrB3pLsbkof73k+AD1dfEfconRMoOdgpxh9xtISUKXSLC4qYQni61qQSBum4B6cNgQyOSia7NizLXL4BdbNYbBgMAWXZZxDcd8ZEIo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738609128; c=relaxed/simple; bh=SubsBxO+wPo2U2N9JqMCj8sJIfsKnaDJYSlq5P7NP9c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FYHZzEaBi6hha8RydS3j3MRlIyCmydwQUXhWx/E1XZHL11UT8oYMN4lRSjR6B9j1vElZnhKkZ+3DJ5EHJdBE8SidRjT60gCL/8vuKZS/viPg1WoIxQix8exM/IHHvhAlD3T2eDMtie7zZ/8AHkjmxJpciRS5MbRCndtuaatw9Mk= 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=CAd2IDCU; arc=none smtp.client-ip=209.85.214.181 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="CAd2IDCU" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21669fd5c7cso84272575ad.3 for ; Mon, 03 Feb 2025 10:58:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738609126; x=1739213926; 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=PSQY1DWiwqocS2rGuzYecaG3Krm/cgaXOXWiGWsi1xc=; b=CAd2IDCUG/CthTTj/qCF9h39dNZmjaIr5M4vn7arfLn+PabWiaUugUL2n3xiXV05I3 8FNTuUp+5hUQr9nHSSPiZM7cUM5jHgzUx5I4xq3+xItemDkfnS5SUJjdlDClERBF4+XM PAGEp4Em418U8QBGPyFI0iBjTMF/n+mq9BJQE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738609126; x=1739213926; 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=PSQY1DWiwqocS2rGuzYecaG3Krm/cgaXOXWiGWsi1xc=; b=PT50oLcAUdznPn/lQsH/7LTFWFvO8XtIhksKnqxf4nWPadGhxBJBFHiGwbSu9x7VKa 3EU5VY0WGumvb40D4ajqNtktN6NcHvSa2LA6NT+zl551jMShr1li0Jgo4UOF3m0pAeqY hVBWLYm5Cd3iH6mY2GHA0TNafxSO+zIDpziq/c8CgjdAoM1dqd6FmrRuycYEIM80tzjY 4HAQwb0QHI4M6qc49Jrg1UrFYEAlaTvwnYyVaA6K8N74CkmQ0VQqEpReAg+6l71xSmLK 7tZn+bQYQbDy4nIBr4r+PJD2l+qPaSXJMLAGiQZFYd25MWZ6zJUGv+hwXyd4sNc7JwhC ZzVQ== X-Forwarded-Encrypted: i=1; AJvYcCWC+jswQL9lhPEs21YnJncAdMp3TGFRcLDDnC9/3nwlyxo0JrNj+PSbe2nYSkIOhMqKq/Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyTAG5ABwvsHH8XwYA3m8aa37NFnjR0VslyVtZP186Qq3+CSGz7 y3CX/Xrwqf7FukHtGM/qqw+TMp3N5DeULRnD+svlPLs5AsKnT/NYMYbWs/DR1C8= X-Gm-Gg: ASbGncvSEBEv0Wvl4o/c55CgMYIZhCd99kG/oZScBmp/vNm4HftMSaDKOP3TxHvtFX4 EkkTR5wVxBsPe3BFpTV41zM2gdS06JVWjMSQQkMLP88kPVq4ZvTXXcBPDbKCSopzjhorgeZj0a2 puOkzLQA5BDiSX1SlSQmJEI4Lo2hAqMiAGwr9A27HHl2txKSuqTLqUqYB75csSkW5+Y/EBovS6Y hV3nCe9rczfyhb3JR/0RGbxK/fPcr7+GlmevPbKpK/XVyHbcBkMWPXJ+a5APV0Hdgi6cBFMpMSC cuntHp4AFtFdu8lfqiM6YFI= X-Google-Smtp-Source: AGHT+IEpvdvsb3TNGzzr9Af3XmaFzZlAVMaujFKYN37yRsBYeeZq+GtYuFBSkVLVRomE1QGuGNuptA== X-Received: by 2002:a05:6a00:420e:b0:728:e382:5f14 with SMTP id d2e1a72fcca58-72fd0bec75bmr31828011b3a.9.1738609125600; Mon, 03 Feb 2025 10:58:45 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec0a666ddsm6899673a12.73.2025.02.03.10.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 10:58:45 -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 v2 2/2] selftests: drv-net: Test queue xsk attribute Date: Mon, 3 Feb 2025 18:58:23 +0000 Message-Id: <20250203185828.19334-3-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250203185828.19334-1-jdamato@fastly.com> References: <20250203185828.19334-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 --- 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 | 90 +++++++++++++++++++ 4 files changed, 128 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/selftests/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 += $(KHDR_INCLUDES) TEST_INCLUDES := $(wildcard lib/py/*.py) \ $(wildcard lib/sh/*.sh) \ ../../net/net_helper.sh \ ../../net/lib.sh \ +TEST_GEN_PROGS := xdp_helper + TEST_PROGS := \ 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 def sys_get_queues(ifname, qtype='rx') -> int: folders = glob.glob(f'/sys/class/net/{ifname}/queues/{qtype}-*') @@ -21,6 +24,34 @@ def nl_get_queues(cfg, nl, qtype='rx'): return len([q for q in queues if q['type'] == qtype]) return None +def check_xdp(cfg, nl, xdp_queue_id=0) -> None: + test_dir = os.path.dirname(os.path.realpath(__file__)) + xdp = subprocess.Popen([f"{test_dir}/xdp_helper", f"{cfg.ifindex}", f"{xdp_queue_id}"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, bufsize=1, + text=True) + defer(xdp.kill) + + stdout, stderr = xdp.communicate(timeout=10) + rx = tx = False + + queues = nl.queue_get({'ifindex': cfg.ifindex}, dump=True) + if not queues: + raise KsftSkipEx("Netlink reports no queues") + + for q in queues: + if q['id'] == 0: + if q['type'] == 'rx': + rx = True + if q['type'] == 'tx': + tx = True + + ksft_eq(q['xsk'], {}) + else: + if 'xsk' in q: + _fail("Check failed: xsk attribute set.") + + ksft_eq(rx, True) + ksft_eq(tx, True) def get_queues(cfg, nl) -> None: snl = NetdevFamily(recv_size=4096) @@ -81,7 +112,7 @@ def check_down(cfg, nl) -> None: def main() -> None: with NetDrvEnv(__file__, queue_count=100) as cfg: - ksft_run([get_queues, addremove_queues, check_down], args=(cfg, NetdevFamily())) + ksft_run([get_queues, addremove_queues, check_down, check_xdp], args=(cfg, NetdevFamily())) ksft_exit() diff --git a/tools/testing/selftests/drivers/net/xdp_helper.c b/tools/testing/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 could 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 = { 0 }; + struct sockaddr_xdp sxdp = { 0 }; + int num_desc = NUM_DESC; + void *umem_area; + int ifindex; + int sock_fd; + int queue; + char byte; + + if (argc != 3) { + fprintf(stderr, "Usage: %s ifindex queue_id", argv[0]); + return 1; + } + + sock_fd = socket(AF_XDP, SOCK_RAW, 0); + if (sock_fd < 0) { + perror("socket creation failed"); + return 1; + } + + ifindex = atoi(argv[1]); + queue = atoi(argv[2]); + + umem_area = mmap(NULL, UMEM_SZ, PROT_READ | PROT_WRITE, MAP_PRIVATE | + MAP_ANONYMOUS, -1, 0); + if (umem_area == MAP_FAILED) + return -1; + + umem_reg.addr = (uintptr_t)umem_area; + umem_reg.len = UMEM_SZ; + umem_reg.chunk_size = 2048; + umem_reg.headroom = 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 = AF_XDP; + sxdp.sxdp_ifindex = ifindex; + sxdp.sxdp_queue_id = queue; + sxdp.sxdp_flags = 0; + + if (bind(sock_fd, (struct sockaddr *)&sxdp, sizeof(sxdp)) != 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; +}