From patchwork Mon Feb 10 19:38:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13968824 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 A57C6253327 for ; Mon, 10 Feb 2025 19:39:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739216362; cv=none; b=rTkCWoNw9XMS6ea3o/2SMu3AcJDE+lZbovlBKnpaFO98Faa3N9aXTDpGLBvhyPZGrCaK6PkMsMheENokkGwSmw2jN8OtdDq2Ex2Dpk6hCwo9hj9QPp48A6c6sgexdFom1gGw+aItLcELq6slUCuGv7Synj3C8wrA/Q2klM3epPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739216362; c=relaxed/simple; bh=fgaREE9e6jz5S5ZRiFkiZ2u/DNlIlA4sG+vDOPb2x/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=opOidtNQavO2uDXrDJmCPFPn2wBff8u0qEZn40KXyQp9urbpqc6Hmwy7Tt1wdWKhqjxKYBsSzT1fbcT0ZZvz1yHeR8IjuTAtk+uPnD7kPkOssnq1hcmpzlc7tQ/fEhXiN6giW6OgjaSkULOPqxOTsRbIGHrzwnNE51XfPYMAEm4= 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=rtVg7KYe; arc=none smtp.client-ip=209.85.216.48 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="rtVg7KYe" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2fa286ea7e8so5013251a91.2 for ; Mon, 10 Feb 2025 11:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1739216359; x=1739821159; 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=h50Y3zF4tCkc/2EOdw4zLXgmcTIrGB/eNO65/LtZobs=; b=rtVg7KYeG6rlcqUBkPEtBW/Hkz8LFtyUXm+/jr7RXNJaNf2S8Z4U7thMKtaKvEa+vE sms/VEMM7c/BDF8ZiOlNXz7myFov6JRtK91TXeAdBbRSAvB5OWlxYsgSr+g4o8HlhWE+ tVGjgxtour9kR1tRYtJcid2wI/Me9ZVV74kNo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739216359; x=1739821159; 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=h50Y3zF4tCkc/2EOdw4zLXgmcTIrGB/eNO65/LtZobs=; b=dO7+4WCggQNEvk5TvsOQJ5VPii1X6pS3XV2k72Bo3Hzoa6lFXAONgz907801GSjDsk CRGOOCvTsLg/llg1YMvi3CmLxx/s9r3kYq92cCV3tNjy4H14O2eFHKhWPwEH2nxrM22k JAQ87y7QXIVQ9aRUg/6ctw43zk4jAnWs2rXe6ahfc60MqqQgUKvXLPVxDyC3t0Zp+flU 2cmF99Tpr109Lb63vFaV5DUfS+TCCLcBcrAde8Kk48ZkAp0/FGW1WTxzZn+hV3nrwjXF 4Aq7oRWIVXlFctxzkhAC0m8wst8fTUabryVSkImOFkX4r9q9enyM66Y4ME5GaN+DUe9E zRLg== X-Gm-Message-State: AOJu0YxBT/CrhaUNpotnYRYCoQwCHCjcnOku6oc1Ia1N255b5zCVPywM wgo+3rXjcmwNWsQSw4CKQ4Jp3xB+TxKHF++8pcIpLhwqZfh1EAftxDukVdg6iUm7Ih3Q9ZOGRZN 9i4UMBTKH+OAcp9Kcpxv/2ouWSJXWTzgswvIe/FJ1OwxsRSzIV0nb//pltV2h+GYZZxtG3FdoCO nEpi9uUlumbqFp2SjKJyRMqa4irsfIx/2PjoU= X-Gm-Gg: ASbGncvgRhx0nGhGLCJIg7dRJVV742u68abkmPWgVTfkUxNHKqzVmwb9sg/sP0n0Ve1 TvcjfE5z7LEUDFVx0BhDW5FX03YdXn+dZIq9QwGpvX2OraSzyxUGqhktFyekXvS/qq15/5EZU8v 0j3QuYkXfUYp+BnE+Hv4ixJtWRkzoVnBtlvZA2xtekVSJQcDnXTdU4LzVRzN2pvq02Gym0yEgXS Ist/TpWmYa4orbQKRVERZY00mtj3vpUCpDIjOQUY9/UJfVwvNdWHcUlF81zALFCxkpxLAcdWZhr n2BqK36393DDCwcJbOM83Ow= X-Google-Smtp-Source: AGHT+IFzgpeSIAhDART2sLKxOwBNGJpSGGSROdPFQrtdZ9UrtHaaMReBtMO/Cwsrjd+WaeJliy55wg== X-Received: by 2002:a17:90b:3c4f:b0:2ee:f80c:6884 with SMTP id 98e67ed59e1d1-2fa243ebda5mr24811691a91.33.1739216358980; Mon, 10 Feb 2025 11:39:18 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fa2ecbca6dsm4226510a91.0.2025.02.10.11.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 11:39:18 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: stfomichev@gmail.com, horms@kernel.org, kuba@kernel.org, Joe Damato , "David S. Miller" , Eric Dumazet , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v6 1/3] netlink: Add nla_put_empty_nest helper Date: Mon, 10 Feb 2025 19:38:39 +0000 Message-ID: <20250210193903.16235-2-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250210193903.16235-1-jdamato@fastly.com> References: <20250210193903.16235-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 Creating empty nests is helpful when the exact attributes to be exposed in the future are not known. Encapsulate the logic in a helper. Signed-off-by: Joe Damato Suggested-by: Jakub Kicinski --- v4: - new in v4 include/net/netlink.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/net/netlink.h b/include/net/netlink.h index e015ffbed819..29e0db940382 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -118,6 +118,7 @@ * nla_nest_start(skb, type) start a nested attribute * nla_nest_end(skb, nla) finalize a nested attribute * nla_nest_cancel(skb, nla) cancel nested attribute construction + * nla_put_empty_nest(skb, type) create an empty nest * * Attribute Length Calculations: * nla_attr_size(payload) length of attribute w/o padding @@ -2240,6 +2241,20 @@ static inline void nla_nest_cancel(struct sk_buff *skb, struct nlattr *start) nlmsg_trim(skb, start); } +/** + * nla_put_empty_nest - Create an empty nest + * @skb: socket buffer the message is stored in + * @attrtype: attribute type of the container + * + * This function is a helper for creating empty nests. + * + * Returns: 0 when successful or -EMSGSIZE on failure. + */ +static inline int nla_put_empty_nest(struct sk_buff *skb, int attrtype) +{ + return nla_nest_start(skb, attrtype) ? 0 : -EMSGSIZE; +} + /** * __nla_validate_nested - Validate a stream of nested attributes * @start: container attribute From patchwork Mon Feb 10 19:38:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13968825 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 9FA67253F10 for ; Mon, 10 Feb 2025 19:39:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739216368; cv=none; b=KSHRQwlbrf6wED17tPlAEawseDhz+QYmqKLYyw6C5LDMNl7NHZeMNEicogL5AzLXm5KP5MEZAq9jpQUKSqMWYoywvuGq+67MuCYoMDo8041TAwvuAoiBzIdWB5gFsCSizjZovDDh/zyANF51r357adwSULY0+/YTEERp9ERhtH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739216368; c=relaxed/simple; bh=hMmqLC7rYBOTSWKloyLAMgjzYZ7GVSeG1WEosbA+PJ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dpmiLA6bBc41ODClhSsAIKeYGnJaBIKTouoeyPJ6TqwUL6xgUMJeP5XGdhZA/YktMqRDeBFUuzvvlLmfnkpKFYOcc47aVaxKI41v8BztY8NBSsohzHLacK+AQXnJaIXnAUX7YKEV3iPPWAXvisdOpFJWpTbG2xB/B4MMxQDhRYw= 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=abmVMmn/; arc=none smtp.client-ip=209.85.216.49 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="abmVMmn/" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2fa8ac56891so1565196a91.2 for ; Mon, 10 Feb 2025 11:39:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1739216365; x=1739821165; 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=XjSm8SciJzh3IllyDU052OHbkLq8PHE5L98omSDGOLg=; b=abmVMmn/NbJp1ZOshLZu90Vm5VGiUOixYZmY90VuYcXbs6/poT4/YqmCvutDOgC/7Q EMpg5vXqs5NQKAQ6sUSo6U/RFaFANHj12UsPs9xrvs9WV8Hx/YrAXblwYIDo4E6pjATP 3nhqri1zRRDcDBmwcjofT3DNDJMvs2Mggy6EY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739216365; x=1739821165; 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=XjSm8SciJzh3IllyDU052OHbkLq8PHE5L98omSDGOLg=; b=HpLR+SDs91iLJBcUza50P7bhFtTK/sNq69XOaZW+0msZSpqkbM/ftLpuenH8fTQYgZ 9nk17HZJolbnKXwhOCEmc5x2W8N5X3J662P2ROX2fI6Sa9mDrBM3YEUmhzeGwH1H7lj9 6lOLMfRM8uxTET0y87tmuEoES8Ak/QteVGChwHPJKxcRHRrFtusuAtLMc1hEiq62hNCg xMOaLwtSoo/G41F1pGrtwqZemTHwP+2sPz5VdSOo3tWn8vucaw/W5r0eDT4vbUYfwBIp /M81VfjrSA6MesdreUEPelqS/nw6sHNB1uhgAr1HMyAg4mTzkngif6OMyBjd6fnZ5ZQI nJyw== X-Gm-Message-State: AOJu0Yzz+wiFbmxnUur41exrPq7/E7WAmX8lAcs1nw0bukTl33Ce9Ae3 2pdy+ZKRx+8jVZ0jhuhBYbFAZT9vnnmaAaeop+z5lEirUizA2JC9VoLZF5WWVORFsSo0I+WGfXh j0HLNn7Iuokk29NkpKAM2cSDnxBHfVhoUT41eimpNRdiVXdW6T9BZS7WN1e5EHF1CfWcXytUrhd h4ombkDbskx7Yq3pCB3tiO4IsYtzc68hVdjSA= X-Gm-Gg: ASbGncvGy+jQU1+fDGsuca4Vbwd6vjlwkAYVF8c6R80X5N1rOAWlCxG1NuSsxNmhBUO Vt+HNDVOZrmQJMBlz/vZb2xcq8kX3s4GPig3UYspR2Pp1DlyEIMRKU44be9rcftMXZmRLYYdtej MPeV6BVe3UmBQB2OYLcrycVyp52YaHAAf5bqL3KhD6bDMBC7hmEidCI5t4Cm3t2/8VX0NLNIUfx B2DKETye0qvkE5hMGprF8sW6JjXucXlgKAurwIzDvU444gdjNjv/DgjDimI8jFOTheI+C4R85Cc UgnMHV6w3xdX5L0YRZMefXM= X-Google-Smtp-Source: AGHT+IH/yLGsQ5ai7U7Bkr2H+eeSCW+22PccYgnQz5Obbw7zdbZ6IeR4y1tv0W+bzubZOpOmWCy85w== X-Received: by 2002:a17:90b:4aca:b0:2ee:f80c:6889 with SMTP id 98e67ed59e1d1-2fa243ef19cmr26320757a91.33.1739216365432; Mon, 10 Feb 2025 11:39:25 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fa2ecbca6dsm4226510a91.0.2025.02.10.11.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 11:39:25 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: stfomichev@gmail.com, horms@kernel.org, kuba@kernel.org, Joe Damato , "David S. Miller" , Eric Dumazet , Paolo Abeni , Donald Hunter , Andrew Lunn , Stanislav Fomichev , Xuan Zhuo , Mina Almasry , David Wei , Amritha Nambiar , Daniel Jurgens , Martin Karsten , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v6 2/3] netdev-genl: Add an XSK attribute to queues Date: Mon, 10 Feb 2025 19:38:40 +0000 Message-ID: <20250210193903.16235-3-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250210193903.16235-1-jdamato@fastly.com> References: <20250210193903.16235-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 --- v6: - Added ifdefs to netdev_nl_queue_fill_one for CONFIG_XDP_SOCKETS. v5: - Removed unused variable, ret, from netdev_nl_queue_fill_one. v4: - Updated netdev_nl_queue_fill_one to use the empty nest helper added in patch 1. 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 | 12 ++++++++++++ tools/include/uapi/linux/netdev.h | 6 ++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Documentation/netlink/specs/netdev.yaml b/Documentation/netlink/specs/netdev.yaml index 288923e965ae..85402a2e289c 100644 --- a/Documentation/netlink/specs/netdev.yaml +++ b/Documentation/netlink/specs/netdev.yaml @@ -276,6 +276,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: @@ -294,6 +297,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 - @@ -309,7 +315,11 @@ attribute-sets: doc: io_uring memory provider information. type: nest nested-attributes: io-uring-provider-info - + - + name: xsk + doc: XSK information for this queue, if any. + type: nest + nested-attributes: xsk-info - name: qstats doc: | @@ -652,6 +662,7 @@ operations: - ifindex - dmabuf - io-uring + - xsk dump: request: attributes: diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h index 6c6ee183802d..4e82f3871473 100644 --- a/include/uapi/linux/netdev.h +++ b/include/uapi/linux/netdev.h @@ -136,6 +136,11 @@ 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, @@ -143,6 +148,7 @@ enum { NETDEV_A_QUEUE_NAPI_ID, NETDEV_A_QUEUE_DMABUF, NETDEV_A_QUEUE_IO_URING, + 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 0dcd4faefd8d..49b2b2248821 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -400,11 +400,23 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev, if (params->mp_ops && params->mp_ops->nl_fill(params->mp_priv, rsp, rxq)) goto nla_put_failure; +#ifdef CONFIG_XDP_SOCKETS + if (rxq->pool) + if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK)) + goto nla_put_failure; +#endif + break; case NETDEV_QUEUE_TYPE_TX: txq = netdev_get_tx_queue(netdev, q_idx); if (nla_put_napi_id(rsp, txq->napi)) goto nla_put_failure; +#ifdef CONFIG_XDP_SOCKETS + if (txq->pool) + if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK)) + goto nla_put_failure; +#endif + break; } genlmsg_end(rsp, hdr); diff --git a/tools/include/uapi/linux/netdev.h b/tools/include/uapi/linux/netdev.h index 6c6ee183802d..4e82f3871473 100644 --- a/tools/include/uapi/linux/netdev.h +++ b/tools/include/uapi/linux/netdev.h @@ -136,6 +136,11 @@ 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, @@ -143,6 +148,7 @@ enum { NETDEV_A_QUEUE_NAPI_ID, NETDEV_A_QUEUE_DMABUF, NETDEV_A_QUEUE_IO_URING, + NETDEV_A_QUEUE_XSK, __NETDEV_A_QUEUE_MAX, NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1) From patchwork Mon Feb 10 19:38:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13968515 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 D4C02253F39 for ; Mon, 10 Feb 2025 19:39:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739216371; cv=none; b=CUqe77KACeXbZeSc8lsXp4Mf2HO0hZNupDBXVtRJEEg5j3DvpoILYOOpOXVrnODU1gsHySVGjBGago199WFOOUcDsgKHNQ2fzpKtIrCbvHhRUMSqtN4H4unDy1IfB3HfjhHscxFn5jg2DailfC0fu3R28Q4EDj72eNlmmi5TSmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739216371; c=relaxed/simple; bh=3mBwGhUXad/Og45qgnZ3mwVZY3Bby4HklOkRxgDb1rI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z/Rzeqcx1qjrbJ2qaleSUK4ATZsholjEy78ssRpAboUdQCxAbQDh3Qq3keQ1E7c0q+liBCZhLaf5amL+WjIgF/lEJ53rxPBMmSskQ0QgtzUQwV8tGUiiKKuW7CC1WirKNrOqMGbjvRneRmUWXcIAiwhCZV5xDeopNSrF3PkgQKI= 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=Bp4TZFMu; arc=none smtp.client-ip=209.85.214.179 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="Bp4TZFMu" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21f4a4fbb35so62511135ad.0 for ; Mon, 10 Feb 2025 11:39:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1739216369; x=1739821169; 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=wZKELRK5JWUFBo3xuePgkQDjdMPTcJYc8DxkgWPd8dQ=; b=Bp4TZFMu+F1I7/AkOJsrxomBd7SZXygZl9F5zNVUJHx6ZYM5KwLEnj4qf9q7Jl+tia Zkz5qcscS+b8tXo+bRib1xaHaMPPmLmmOVdohYdKBi30xYYPxOpJvkMHqil5Rvz0olSt jAMKqGB0yxnCKjENCXVm7ZTpKJdt1xhEOSuaI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739216369; x=1739821169; 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=wZKELRK5JWUFBo3xuePgkQDjdMPTcJYc8DxkgWPd8dQ=; b=rQ2afqLGpP88kWndTsL130bUv53wNAvSCb02yfnAyE2N+6ponb0nRpBHvuYItb1iIL 0+Er94nPTl4LeCdZrb3fuvA69KxGHHizdGcs0d7pzc0p82lP+H4vhlU57PB28fP8jOyv Tj5n8iVCVBRv2lwoTV74Hjo3ii8F3yjo8eNrqzrRYoWzqAYHAYZBejrPqkk34691ahD5 qhW5PLpZnR9p623W9DSuqCEkAYYyvMNepsPRIqOb+d6K1AYsgDyZXBRTLluOkPMKKfkh S0NyVv/skCaSC4XRTpBMTxpa5s3fWbpdZNYe2K360Ckq++7bHzHfSHRbfuvqXFuAzYx9 C/Jw== X-Forwarded-Encrypted: i=1; AJvYcCVQSK+bIUXX4E+B9IqPTMyjnHkKEkjrCFFvcXVjQbJZJI/nYV3yYwOLnLL5ANlNe63RPcU=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5eEg/n/yA8mGqUDTxWkZFk+R5oBBVyaCEkkC8rfeQ1WMrtiKs 8VXWcEJT+wcu+2EaGvjIV/avmyXBqAnrmEbE4LVKoMpZP9YXEPDx4sI1q0yHuhY= X-Gm-Gg: ASbGncuC8ErTtVAso25gurFi6xJoWwoFJOa6ZGM16VdJG3EHNfWUgOdgS7a/ivGcwp7 Nehw84uXrsTHSM3eWFFEc6nQhFW3jWdfageSJ/IbV62weeKBVO8e8sJfsb+nj9hbHv6lPH3Uf2V juRGIC3aCXAvbtOm6j5oxiG90lqNkjb2ANO6+pY5B+iFw1770wyTWsbKJvocv0oX8TdDJ/ACmVp sLDJLIgM6T8gCEiTYahrA6SmxVWBL8+pDQWewEcXe6WwCwa+6AMnUprhHeXpkAjRTQXg4/4RFPV 3vLbZoydvJxVBGmJ6dHjatY= X-Google-Smtp-Source: AGHT+IG8wq/vdTSg8bdSPhMPihEXr5MAR2KwYiJand/az1LPniZrMM/fXJ+yCKMr4B1oJlU0SOae9w== X-Received: by 2002:a17:90b:288e:b0:2fa:1e56:5d82 with SMTP id 98e67ed59e1d1-2faa097a332mr866016a91.17.1739216368904; Mon, 10 Feb 2025 11:39:28 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fa2ecbca6dsm4226510a91.0.2025.02.10.11.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 11:39:28 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: stfomichev@gmail.com, horms@kernel.org, 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 v6 3/3] selftests: drv-net: Test queue xsk attribute Date: Mon, 10 Feb 2025 19:38:41 +0000 Message-ID: <20250210193903.16235-4-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250210193903.16235-1-jdamato@fastly.com> References: <20250210193903.16235-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 --- 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/selftests/drivers/net/Makefile index 28b6d47f812d..68127c449c24 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_fragmented_msg.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..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 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; +}