From patchwork Fri Feb 7 03:08:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13964277 X-Patchwork-Delegate: kuba@kernel.org 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 65A4E14D43D for ; Fri, 7 Feb 2025 03:09:40 +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=1738897781; cv=none; b=pPNHs/Ywl22lz5BWQQ7jZPIf6u4fabdrIcL8vYCzzOEntgyAmBPLvjprwBARFeN5YmAbQ2mZrCuGaecbkWRjZv679tAEHuVbK7JGvqwZrPfW/nTR2UTeKBUEfYXhVmBrTLC/gqsCBcAJx4VOvS4MsASgBQlMdA23nQQsgDjiUEM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738897781; c=relaxed/simple; bh=fgaREE9e6jz5S5ZRiFkiZ2u/DNlIlA4sG+vDOPb2x/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hlfEOp6c34NlCmIX2LaVGZ8SORPopz0smnld2jyLjuyKTBkpeMRTSerrc+i2qPRTwZ4nit0bHRHewTlap9WAXsB0kKySZoMsOAD1iY5Z1ro9LuspAfiYsOm6BMlHnURN2w1HwBh6x7Nx1RjKFFWPPTBC7IAeofPMVsAlrKyPerg= 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=APga8b4f; 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="APga8b4f" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-216728b1836so26432275ad.0 for ; Thu, 06 Feb 2025 19:09:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738897779; x=1739502579; 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=APga8b4fbzgEXKOFmm5MmkAFi0jZh+FJAOrfHHXUAcN9sW+vSWJJNhuGZhh7iTWdu6 S4+aY5eeemqo1htVA96fbwaalzjjfVaFUKO1D0j4OGTi6iQpIlFSjYRsG+kR28fhLC6r fsFhE1X4UOgvx/ydE308PRnrUidf59NaRCCgs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738897779; x=1739502579; 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=hiZDxuntNcwAg4gbhhidkPpg7TXrEvxdKBxHfBDO7ytJhvogXqeoqoQ3liDOPetHIz ZAVeaudXdNdSen+4NZZDpFG1MfAhzJXnFbq9xyBj+hQPCABgw8gR7sVzI0ZNWQIIX7ku ZuTOzSFy9JuUpYzcIidn7FRpu26UbBJtWuAlNRcCGe2gJC51AA47a65S+98q1BRj+Nwo zLAD00200QNPRK3egDvtpH2Ous6ayIDs7mI3yYSHAPKsZXPWtckMg/PGyV+Zbs2nBhUj 5lSTaXajBKy/e/OK5Zo6FMNh1f/hGooeFRar8mneRsXgXVEkNmDOp4XWyB6FUxobkbJD E4MA== X-Gm-Message-State: AOJu0YwhhZeVghjGfwJBqcS8tluFrF23MIWC2e5PbjAsGVAF2cuyjkZI YUTDNJ3hkSzOiqwUmK4W4SV205qO2GHv4FAiXfGJB107IE2woP1zarbW6S1Db9anbEEmHsTFpSm vgA5m8kviat3qqIVuySO2pRWreDiGQu5yv0bqPJgGTLWIjOSdMgtVpS63Sjm6EQYBBLOAAB/SSK Osm7R6xhId4YkJYtWImF8LDavuj34AIot1HzE= X-Gm-Gg: ASbGnctsHD7Or4cu8PgAA3cCvQO/2tyMxQCoP31P1leLAAU50hOTiHNcCo98lfYT5hv Ekvmn41LPxF4eswjIGvAzLiuBEuqgF0kLGisIyrN1CeQumzD2nqMvHNwQ6CKShwe1WCMPSMPU0a bAWOb9OAYRzwHzXPnVdQwRLbkcPpsdwaM3MwXqTqgzs/Ui2LVfV+VxNM0Ix7LET9WJKp1Xstppe PvkK9CdPFi6151/fcjwLL7Pk92ISbtfFxKtKKCWsTTCOufhzujVS/FmPMr5jBdvqYH3/6Qr/50z ZB2S5mgisFojxxNhHnQK+A4= X-Google-Smtp-Source: AGHT+IEsXqluB5whpo0nI6jITa0t39sjBeWFPYnCLTBer2jrngUDZ7kId3P8c0MJsNOUiKHKh1jCvQ== X-Received: by 2002:a17:902:f60d:b0:21a:8dec:e59f with SMTP id d9443c01a7336-21f4e7637d1mr22711705ad.39.1738897779089; Thu, 06 Feb 2025 19:09:39 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f368ab196sm20348955ad.222.2025.02.06.19.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 19:09:38 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: pabeni@redhat.com, edumazet@google.com, sridhar.samudrala@intel.com, Joe Damato , Jakub Kicinski , "David S. Miller" , Simon Horman , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v4 1/3] netlink: Add nla_put_empty_nest helper Date: Fri, 7 Feb 2025 03:08:53 +0000 Message-ID: <20250207030916.32751-2-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250207030916.32751-1-jdamato@fastly.com> References: <20250207030916.32751-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 Fri Feb 7 03:08:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13964278 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 F3B8D156236 for ; Fri, 7 Feb 2025 03:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738897789; cv=none; b=N2G+D5wfOzg5DZClaP6ffcLls8u9tl/kYbPF3hU2QJOyhQXNB9OWRTm4sUioHhFW9bGWm1EVwq61VkrpG3acIelqoGj1hhYl7YadOhD10LrF0/tFoRvQ/urFac8jSK8PyPsicPiuqsdx81b9L2oW/++5UgSdmkcu5g6l/p4o7f8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738897789; c=relaxed/simple; bh=t2bdWXIhCRgtjCrRvBiAo9wr6E1Q0gMByrBMpkptx1k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LXy62e3+6D26/RfLDzs9SUe7IY1rhsLxmPg9v5QGsN84tdNHS34jpv1pUelxFoaAZLRYFNtbsbhVsQLGG/a7AJqrnf+uemTj59YFfpPOI/w/VLDNml1Tpc+kfq1zVFw6o/+77YPdWvUD/j3tYbyI55iRorczmCdfUTCBG/i27vQ= 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=sM9k2lNd; arc=none smtp.client-ip=209.85.216.53 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="sM9k2lNd" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2f9cd9601b8so2850798a91.3 for ; Thu, 06 Feb 2025 19:09:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738897785; x=1739502585; 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=bvN5IEuSm1GAFZydLhqU2iZKnjJwS5x3mE7p0JmTwi4=; b=sM9k2lNdHYMkyZ0xvtGYwtcJTcA/JUCWZxTT4IhUx85n1yg2Dqe2HQWNa767ORoIUq 1t+U7wxIpLSBGYW5gNSe6DMY+eWhUI62ROjQO2Zv+PA1Y3QRsWgvJpont40UEFFRx/SF Jdc4jltJtMuvBJpCQvptA/GWd00n3gXvZBd44= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738897785; x=1739502585; 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=bvN5IEuSm1GAFZydLhqU2iZKnjJwS5x3mE7p0JmTwi4=; b=f6zEu3K6ApLi2olRYzvvzxjowkTWPTC2uX+K5fysiBXn0PjUS6ns6QgcK23ZV87c2W 9mrc/ArevLThhoTrBKd8NpEJ/6DfxTWZ0CC9pBs7pxFnmQkBRonRSHdZECbnMFh+Pva7 06Y67fW6i+8AcZbytNXrTaf0xiY0xqYawvq07pcmjBLrE+7f2Ja78XPfDgZb7aTHpxgC hfSerazdOceHtvL1vciyqOGMFttrz86VQ2cKtE0BcvBqN/1H9DxcHpgIO44Q+RfvNjuw xYGRTizH871XqU1erWtElGCO2u9va6sxJfwEnVCdq1amU8cUWa2DMiSzF1wwlhIjZk5k MYyw== X-Gm-Message-State: AOJu0Yx6LGY71mfQFSemN5vzPpBneUl0iy8wnGklaMWagV/aYH54/7Lm nc4QzYu4OZMI44KPrEPQdG/TrV6QaZb5G138lAVCYeq7tkqWkBqRO2MywzlP+sMa8oJQgMdrXbk LQNT+/h9weD00tmmXnVyzRfd+YjabNTHnrF0+CaWw9ImWp/WTJ1mQ+A/kDU3aubatXlBAVl/Jjk h6fTErsIE+VxYgjcVZLnHnKL6LJPiSLR5Mea8= X-Gm-Gg: ASbGnctKtyxVuDJU59j4bDolxhCbNdIVxjEhAsibLZEILSA3ugtl8XVvCzr1AjUpo14 ZaRFrqTl0t54AZiZ03adUkrvNxUwrI3iMI84mt0CLZu5PNNNP3sQvugZgPvI0s21PkhH8qq9TMC BlloR56BDvawPnKXZI2BOcPGj0fz8oo4eTWQx7uusXDQXTwnLgIZfqKlTkzr6Fi8s3w+Gue13yD 40ulIGULtshATYtz/ynp/wlimnKum0vgIxur/1qPwKsMskiuIYkIXb5kLqw73ZqRY9/Kd/Olcwt VESb0fJE1RAEliH4qe+BSac= X-Google-Smtp-Source: AGHT+IGNhUT+Jhkp7Cdh5BBlscWIQjRyb/gjVd9oZk2GyDRuojRmIDKCiibURXvJHpU9HUPT4RJIwA== X-Received: by 2002:a17:90b:23cb:b0:2ee:d63f:d77 with SMTP id 98e67ed59e1d1-2fa24063c18mr2555688a91.9.1738897785457; Thu, 06 Feb 2025 19:09:45 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f368ab196sm20348955ad.222.2025.02.06.19.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 19:09:45 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: pabeni@redhat.com, edumazet@google.com, sridhar.samudrala@intel.com, Joe Damato , Jakub Kicinski , Donald Hunter , "David S. Miller" , Simon Horman , Andrew Lunn , Stanislav Fomichev , Xuan Zhuo , Mina Almasry , Daniel Jurgens , Amritha Nambiar , David Wei , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v4 2/3] netdev-genl: Add an XSK attribute to queues Date: Fri, 7 Feb 2025 03:08:54 +0000 Message-ID: <20250207030916.32751-3-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250207030916.32751-1-jdamato@fastly.com> References: <20250207030916.32751-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 --- 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..75ca111aa591 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -380,6 +380,7 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev, struct netdev_rx_queue *rxq; struct netdev_queue *txq; void *hdr; + int ret; hdr = genlmsg_iput(rsp, info); if (!hdr) @@ -400,11 +401,22 @@ 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; + + if (rxq->pool) + if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK)) + goto nla_put_failure; + 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; + + if (txq->pool) + if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK)) + goto nla_put_failure; + + 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 Fri Feb 7 03:08:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13964276 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 93EA818BBB0 for ; Fri, 7 Feb 2025 03:09:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738897791; cv=none; b=YGh/gM8d9iW+jn3wBhEdHJmqOCzHUQLMXXtaRLo1pgQ30GcbQnfWMPIK+gGr0F+vYMnjbuZij2ibMJfEPDPRO7Wt47eBBvq7Xz9cv/iUG9wlplJNiTbcqoBTACD55tLL1j/bqqScKH7JxOocxO9cGkKNU7CFMZFH2Wfs9Jb4+0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738897791; c=relaxed/simple; bh=TmFrieKafs0y9qgWW4DLzVPuAlNlJxW158B1qIqoulU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uQiWGFd5N4zexfqIrUXdICoquPKX5rKQdAPZCWh+uBm8W28k1kgn5zcXH0IFAww4wykFY1Ip9ivRHSWrpIzuYQ5Wwrd6R/8rSbqAcnAfMJ/arzAKf9uACWdSnRcpMhC0oOiBYuCCwK5dEd9VUXE73AbDhrvspQDVoZ4eyEY9zcw= 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=ro0LhLYG; arc=none smtp.client-ip=209.85.216.44 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="ro0LhLYG" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2fa286ea7e8so218333a91.2 for ; Thu, 06 Feb 2025 19:09:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1738897789; x=1739502589; 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=r7RUZIqHwLPt1JPkc0hYqOZYvl0G8thAspfJu2yEGWI=; b=ro0LhLYGYhuzHAu/hNKV84xL1bFap2uUJXzsNfNRVLTFYRZwarmHfbdLqqXMt/E0YS Uf81+eq8lqLvIUOlf5yQ69S0TQiNyOx7UQBq3w/7Oc6VyNpV2TW0RhZr2+FoTmpUbev0 DO2hVT7JH5LIjT2lHGD3CbpO9vCipb/DlUsQs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738897789; x=1739502589; 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=r7RUZIqHwLPt1JPkc0hYqOZYvl0G8thAspfJu2yEGWI=; b=OPjI677Cl56/4BsyjFtHmHzvfjke5ULHrPXsJN7q+9TaKaDw4lTueZX4nhO0Xp589P XpnjRCTMLclQtG6ExX8NOTe/jcEPNhcjU0aYhyAcDWykheAeeeQTtefDyLF9gJvZF45P wXhc1kcAS9t3++gado9AKvlT8HUxNMxYwRddAC3aIa6Ex3v37MKGbJkTghW9r5vYmwP0 p4C3n8mLg5vx8kPWFW5iS5VchxZyDkZddrDg8/j7SbylFdKDW2avrruhzzoEkTam6znn 2cuD7rzG5YDLu4HHO64iP2nLjErLhLkdEOTkcTUDpBeewJD4cq6nNfikPvP9k0XNkC9y doWw== X-Forwarded-Encrypted: i=1; AJvYcCXGX6326NhFgz96MUNVcJKgwUcety+KFsKW3MEPuXMgpvhUuN7b5Q4zQVb4N+qMcQwFV6U=@vger.kernel.org X-Gm-Message-State: AOJu0YzYxTJJUcieTXrf0dgdZ+PlpCPnB6Z+B8+sYWSZP3fYlV9StBVT soCwmy272J/NEkkyC1pTLSRFk35uvIkTtg8aFZz0BegIxDlOMHxkhQ7DNav4KuQ= X-Gm-Gg: ASbGncsUi32mrj2AtwlTbA/y5H+zx09VNEaMY56W1VI593UsLB9ctWBwUAqaKNCN9XB ud8dkyydRa5eBX8LkqV+yfHSaXnKrjeFCu5cjWWpaLq1oXylLoGBFxr+wSuX/FGN/2j0dNjZPfT VbvlF3bEZKZi/voCYaj2z0rmg1IchjaqbikHeXXObjuKpqJKX5BMpMMmYNR+gnl31icUWzElCQn W9SYDP3yQrAQd6hTlWhr0QzLXL93OXMYtelGXX4FKBkOGhqtgPtUKRhBbadbIjgDutuvqDFtpto pXTia1wZ98fAnYcRTklegiY= X-Google-Smtp-Source: AGHT+IE/mTf+RgI6SASTcTKQhP0AQNPSWXueq68RE7gGuzT1ocUjhsKBGM/Nermff6/ehihz9yHN/g== X-Received: by 2002:a17:90b:234e:b0:2f4:4500:bb4d with SMTP id 98e67ed59e1d1-2fa24175d44mr2496123a91.20.1738897788831; Thu, 06 Feb 2025 19:09:48 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f368ab196sm20348955ad.222.2025.02.06.19.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 19:09:48 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: pabeni@redhat.com, edumazet@google.com, sridhar.samudrala@intel.com, Joe Damato , Jakub Kicinski , Andrew Lunn , "David S. Miller" , 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 v4 3/3] selftests: drv-net: Test queue xsk attribute Date: Fri, 7 Feb 2025 03:08:55 +0000 Message-ID: <20250207030916.32751-4-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250207030916.32751-1-jdamato@fastly.com> References: <20250207030916.32751-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 c7f1c443f2af..81961c6e059d 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; +}