From patchwork Wed Feb 12 13:42:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13971608 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 97D8F20F076 for ; Wed, 12 Feb 2025 13:42:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739367724; cv=none; b=ZNXZmAAgYpEV82p+YHu8TOrIYZpLG/I+jDB0mlMM8Ie2pX7Uk3mAnaeD+RSBxfCZCTPe4PQ43zxlFVllc0j8cLLslbg7zGVyEiNu2x8gQ9DYO4/ih0FBRUK/C8CKpoeqoC/l10iiz67fK7CqOuQEPW22hbB/COWGjUh1ZP6g+tU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739367724; c=relaxed/simple; bh=7h6nbFnzFOLt+RWCH5AbtMdfobMx6uMJQ+/GW3rjNHQ=; h=From:In-Reply-To:References:MIME-Version:Date:Message-ID:Subject: To:Cc:Content-Type; b=HC9z3N4uu8TwjCFvAYc015foLoZi+Yb7xmGKltMcqY0dm/GB3vdyBDsZH3I9LFBmy1BUHP71QQmXvTm5tPXPgoVlfTU141/JMZG+so70Ik5ri7qAO1QsHY5VDMcT6BvvqG+LLEwftoeh1j5L1EA3aWbI98b1WNUEXFnZw725GpA= 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=tf0qqWKO; arc=none smtp.client-ip=209.85.218.54 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="tf0qqWKO" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ab7cb1154abso399975666b.0 for ; Wed, 12 Feb 2025 05:42:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1739367720; x=1739972520; darn=vger.kernel.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=CiPPwWHAckmQZTxpa+xmoPK+TKz+hzKWUS2Ki/RrKBY=; b=tf0qqWKOCPdHFeTouhdCNfqMdXM62rqIIVelxnjxAPdmmhzshZs38aLfAZtN85B0sG dgLWvuXg90S53hSVVIlmCGwmovdaqjSrXPXrfkF4pAE+3287z1h21K6D5a++9KpNwLon V+WBPKihByguP+Yl99d++KU1WRA+qcLbweZlI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739367720; x=1739972520; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CiPPwWHAckmQZTxpa+xmoPK+TKz+hzKWUS2Ki/RrKBY=; b=A/TI5PwQ+3lac9Ese1dXl6FoptzdGmDWBMyQVDJiUQx7p/0wcFIyigVBqcF8Ip87W5 Tp1kqNvfMFupGfFON/HJyfnnvGnJ01aP+FMFI+JuxatwKzRyzdw0uhXwlIKq7UOWjeph SUoOOAzgBUtk6zyRXjHlKbI4ni/dg8xRxdm9PYh/hFN34P8K5M/wYwH9HEVTZVzefGLx cLIhMGUNqX0xHo3AansarUhPeFPPqjtgHu8GsahoRiQY3wMO3Z66WuwCjMm9eR+sdR4S zAWsBOaq5r9OUoMh0NPbOr0K2pTrdxFogY/CC/NAK5KY+WieLPI/TSpYaG7cglqh+2SA YSqg== X-Gm-Message-State: AOJu0YwWSrhGZSXbizUHQC5pRVs8oXSHRQ3CiQvaYqBEGNifa7x8Q+Rs f7+t+2bqYJ3px5ZkvvtsN1J7wbU+r5K3EkqAqtcdtggU7kv6v6wv7HTyEK9QKfVPGJRCPQuQWgA x2L0mLL3cCCZgdwf1IiBUvs3A3zPIg7uFmHvHb1F/PZ14HBqtItc= X-Gm-Gg: ASbGnctg8BBTaBCs5ClpTWXSW/E17tOMtIBxbhYt5Q94Qh5trdoXw9aZ2vajnYJDMUP DFUEDgWe6EfxTzrc6vn6hfgmQloCLt/cQSoor+vFBhgKUxN8jVNLs8tveYJqFQxrrLf0LSbwXGV lBCzJN5oUpnviAzH06v84EmqnV X-Google-Smtp-Source: AGHT+IEdAA4vYWE4f6Jqe5kfoXPBf8sLR14CrtIsQmKMdovKf9+A7oyaNsjV1HVscFoUluPDJ6oVMDtmO0huBxs8zNA= X-Received: by 2002:a05:6402:2088:b0:5de:aa54:dc22 with SMTP id 4fb4d7f45d1cf-5deadddd507mr6946407a12.20.1739367720462; Wed, 12 Feb 2025 05:42:00 -0800 (PST) Received: from 155257052529 named unknown by gmailapi.google.com with HTTPREST; Wed, 12 Feb 2025 05:42:00 -0800 From: Joe Damato X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250212134148.388017-1-jdamato@fastly.com> References: <20250212134148.388017-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Wed, 12 Feb 2025 05:42:00 -0800 X-Gm-Features: AWEUYZnEliqL8EWyyXri7CgDbBmA6yJKuyWcDbYIfwZ4SEiiHdkwBqv8IjRtz70 Message-ID: Subject: [PATCH net-next v7 1/3] netlink: Add nla_put_empty_nest helper To: netdev@vger.kernel.org Cc: pabeni@redhat.com, stfomichev@gmail.com, horms@kernel.org, kuba@kernel.org, Joe Damato , "David S. Miller" , Eric Dumazet , open list 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(+) * @start: container attribute 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 From patchwork Wed Feb 12 13:42:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13971609 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 54BA321E0BA for ; Wed, 12 Feb 2025 13:42:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739367730; cv=none; b=cQRs6t5//8QmdisrIJstIUIEbUFAYI9x/3XDI22ysy+znmfnmQ0257mwmvRmT3a31K4QND0x4JeB4CkkCF6Z9B7TgOOWg3H8FQOndRxWm4NMipxATOa97uY5n/XEcQhufuNznnok53G4JXEbADwjF9BabxzNlWh1PhObgUzrVls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739367730; c=relaxed/simple; bh=TV/csn2MeuCyr9NpkdQjzCj+Hi5ItYyxW+2FTOAo7ag=; h=From:In-Reply-To:References:MIME-Version:Date:Message-ID:Subject: To:Cc:Content-Type; b=P5yEil/o1fK/9b3GyHsqmTaq/OAd+7uOHBIoo49QrtJtSwjVbG40n6zaML3ZN8jnUoOu9GwT194wcCtsp62rWlG4gACb7Bw4CsxaNUoYPxvHG38yPOBpW5uC6JhNeeASsXuSWBnzWfKAvXUx1UNhybnSNSvQQ2QCaGNjNgqmkg8= 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=Psn+i1jE; arc=none smtp.client-ip=209.85.208.51 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="Psn+i1jE" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5de64873d18so7480198a12.2 for ; Wed, 12 Feb 2025 05:42:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1739367726; x=1739972526; darn=vger.kernel.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=+hJNHXVdFzI/PjG9+nE/x/pwz5kjQzwUzjrVXRDNdk4=; b=Psn+i1jEqNn8hGMuLxLLHZgyuqCvPYNgKoQzbcw7YuaFwYs/0CzTfxJmavOE5ZX3g+ eyMumXlmsu1cMRACDyTcUKQH2yyujY2K8lePkM++hqgbAEqzP804GOOoNtgw2jfF0Cjz u+LGNtkleVG/5/GCcTS9aZcJVRnTmUX9LdU70= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739367726; x=1739972526; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+hJNHXVdFzI/PjG9+nE/x/pwz5kjQzwUzjrVXRDNdk4=; b=uKVc1RbQxQwhGxR1cLeRnbx9qOBMlUlGdQA5euk/6kSoyOKMt/fMl5iwRwGKp/13Ov YT2hNgTqM4JRB00QE1TAtU5+3z8FLHQMyltHOW4f+WgpbnaEpNM+eNsuHNqemPH0HNvL jR1j5D/bFoTjhmo9kOUZc0z/qOxApV6rSrOxJEycHl7m/ZfdRnAkwa5TCYDJOp9Cwh1+ 4jxaGEcM4dss82kkwNc07L2Hbg4/FbMMmQpBFo4+hEl73YUNI/qA9AtpMzk7ndkEleCD LbGs5bdpOj61yYSqENWWVpWcjSlMPF/tpWTB4JPeJuowbiYebJOfh4ucG2UlN9307VUN SpDQ== X-Gm-Message-State: AOJu0YxU038/LCen8Y05w3y8N6PNAOzadtDAvWB6t/+JCD0k3XtX5lAN 2OWiyJOlnfOJysqcyACObWBbI3tY5bw83EMHHoQyxQuryJWkKGxrEUMA/8Qw3vJ8+NknPoe44lQ kHAOChbP4L+Yy6viliNtEIRmkvI6lKyCiz1ds2JyuZnKDRm/V1Co= X-Gm-Gg: ASbGncujJY6+GCAHfY7wbBsGJ72ZVlsaw8QZW+NA4a16u6jIxMBM8oDSz1FpNvXV3gw AiWFJxSrhBXBLi70kBHaQdgE0LYhyFTyD+gFLxbCI2COeVuA8O2yQN6T+P7F2Hmf2t8rSd/+iZP i0J95+qnWrYCNhdgf1ke2HXkGl X-Google-Smtp-Source: AGHT+IHKB30+TzYECFLvw4UW4QXtX7+Ra4ihraMnLZsD4teEZZYZi71gLqZDwPC2TABhZhs8RUcrHUzDAItnTqUeYlo= X-Received: by 2002:a05:6402:34c7:b0:5dc:1f35:56a with SMTP id 4fb4d7f45d1cf-5deadd7b8demr2864231a12.5.1739367726306; Wed, 12 Feb 2025 05:42:06 -0800 (PST) Received: from 155257052529 named unknown by gmailapi.google.com with HTTPREST; Wed, 12 Feb 2025 13:42:05 +0000 From: Joe Damato X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250212134148.388017-1-jdamato@fastly.com> References: <20250212134148.388017-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Wed, 12 Feb 2025 13:42:05 +0000 X-Gm-Features: AWEUYZmNVcSIQGW9iq-Cs6PnCjWJlzSOCN6Ng4591Xu9dzdyrBAFRcC8rP7-8oA Message-ID: Subject: [PATCH net-next v7 2/3] netdev-genl: Add an XSK attribute to queues To: netdev@vger.kernel.org Cc: pabeni@redhat.com, stfomichev@gmail.com, horms@kernel.org, kuba@kernel.org, Joe Damato , "David S. Miller" , Eric Dumazet , Donald Hunter , Andrew Lunn , Xuan Zhuo , Stanislav Fomichev , Mina Almasry , Martin Karsten , David Wei , Daniel Jurgens , open list 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 Wed Feb 12 13:42:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13971442 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.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 23FA722068B for ; Wed, 12 Feb 2025 13:42:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739367733; cv=none; b=qOs2h1UsaDH7sFLkO9uoXITpmTFYUFY5jwLt4rdx3PlTKl3w/zoBpJ+TH5sUyPd9Q24DpsmaL8ZJGhMPChZ46OqA+bN1HsjEJZIIz/R3PxUY1gHq00AU+WUXWaUkoEAdczJk1P92V2qS6zBtXNyRaXDl54GQmOuaBuh1UCruY8k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739367733; c=relaxed/simple; bh=B/bkdcPECmOVVcvnmIyV3GZdC0bKkk+lmx8zg/q5iJ0=; h=From:In-Reply-To:References:MIME-Version:Date:Message-ID:Subject: To:Cc:Content-Type; b=rv8Dcw6RkoxoC9k0STQJ8nDReMP+zAfPZKOg2wwy8KzniCgOjNCvEUYort9Nf468nlEfM4DPE4hdyCX9vMLZFXy62Qqx7t5IIQEFg7EZeZ6VK4jrv7QiUex9TI8ZkD7CQ2uXd7hduTBGwYGEn83KshxgtGu/t+CsnEgIo+cZjK4= 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=AkBlLJSS; arc=none smtp.client-ip=209.85.208.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="AkBlLJSS" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5deb1266031so1167792a12.2 for ; Wed, 12 Feb 2025 05:42:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1739367728; x=1739972528; darn=vger.kernel.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=KT2qa2gDnH5KuN6tVrB0wVz27ZkqW61x9pQBjG+eFG0=; b=AkBlLJSSnuaC+IR7xIfwmbKKPFbRjSTXUfVNrdNSoVVHpKGfqwGhO3w+m2Q3Z1g45z eL78m7ZsFIzjhGkAGd7/DKO0BNSwTMdNgXCTNyunr3gO2dhdSkjclpFbSj3bl91DyTmy uTU/0NrG5+YSgVgu7OO45twfbF4w9q6aBjvpw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739367728; x=1739972528; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KT2qa2gDnH5KuN6tVrB0wVz27ZkqW61x9pQBjG+eFG0=; b=i+o7bkUXm65sKmQIIjhqZpOQAWFn+g/mYJiU7tnEOGWWZm34xF2lC3CQ2dbz+fTQmO PWbYJYsoVWupdgXBj2EkIw3maSKKFskVdR7s7yT+6wG2+U2bt+z9wMzNEaoqlndvc3Yu fjac28VKzRCfoDDkqdgRFC7DbF3Veaq+MdeoVymHvVO7KHtckaaT3byrAxo1z26+6LIj B7m9qesmo103FE72cgpnWk68cdyhL8NnSi1dXNW3eIyh+QRsOk08gRp1/rtljzLjwvjW Bps6a0fqe2+aHKgQkXfnvDjVgpjxK8pMbAMvMaXt8LZy/x0E7fCFC6+pJyGHzL1uaLZz ihpw== X-Forwarded-Encrypted: i=1; AJvYcCUdB6opztbXoDb3qVQqSS5jmfEMrw2t2qgh5zYsjJxfYZ0wrJVE0Obd+fd0bed2J7zbsNA=@vger.kernel.org X-Gm-Message-State: AOJu0YxILi+ouMpDzvYz04Nc0fn9c9E0Wk6rXSYzVAJ6uYBQUAn03bgq 2MnBMjkmzmZKPkmrjGf6hpYiAzwxkcCzd4Aqjjpqq/3uzb5QnXzhpr+soIDwwaZxBwyo/4bL5K1 YmEa80ut11FXJui60swN7pXAnAHSvbLCAnSP6DQ== X-Gm-Gg: ASbGncvPqQ8zJ2Zssmry8IAoik+keOp4KN8JQaoswS31jmYcilBdSpZvewni5qpeGHp vVZ4S0UbBohPdsb5gs986lM/7wttbCpb5IHS8o2NsCrYWpqcIZauIyzBkq0MYt5mBU/VdCw/Dz7 NZiQX9r4/zjQdtl/mJ7QlDiBvN X-Google-Smtp-Source: AGHT+IGcoiTyC9NI+8g0zyxi1UmfPM3Bz4dg0MpmtDqpzepmOwmidA0CtfUy6XiKLngxQeySMMt41F8C2mERBcXGBdY= X-Received: by 2002:a17:907:2ce3:b0:ab7:c6a2:7a43 with SMTP id a640c23a62f3a-ab7f33d5286mr346061166b.31.1739367728435; Wed, 12 Feb 2025 05:42:08 -0800 (PST) Received: from 155257052529 named unknown by gmailapi.google.com with HTTPREST; Wed, 12 Feb 2025 13:42:08 +0000 From: Joe Damato X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250212134148.388017-1-jdamato@fastly.com> References: <20250212134148.388017-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Wed, 12 Feb 2025 13:42:08 +0000 X-Gm-Features: AWEUYZlqLxnwzEvRUqnqijaR1s2qFB9SsPKuvj9xu0tqP7TJOdq69dB2yI1SHVU Message-ID: Subject: [PATCH net-next v7 3/3] selftests: drv-net: Test queue xsk attribute To: netdev@vger.kernel.org Cc: pabeni@redhat.com, stfomichev@gmail.com, horms@kernel.org, kuba@kernel.org, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Shuah Khan , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , open list , "open list:KERNEL SELFTEST FRAMEWORK" , "open list:XDP (eXpress Data Path):Keyword:(?:b|_)xdp(?:b|_)" 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. Enable CONFIG_XDP_SOCKETS for selftests/drivers/net tests, as well. Signed-off-by: Joe Damato Suggested-by: Jakub Kicinski --- v7: - Added CONFIG_XDP_SOCKETS=y to selftests/drivers/net/config. - Updated xdp_helper to return -1 on AF_XDP non-existence, 1 for other failures. - Updated queues.py to skip if AF_XDP does not not exist, fail otherwise. 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/config | 1 + tools/testing/selftests/drivers/net/queues.py | 42 +++++++- .../selftests/drivers/net/xdp_helper.c | 98 +++++++++++++++++++ 5 files changed, 143 insertions(+), 3 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/config b/tools/testing/selftests/drivers/net/config index a2d8af60876d..f27172ddee0a 100644 --- a/tools/testing/selftests/drivers/net/config +++ b/tools/testing/selftests/drivers/net/config @@ -4,3 +4,4 @@ CONFIG_CONFIGFS_FS=y CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_EXTENDED_LOG=y +CONFIG_XDP_SOCKETS=y diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py index 38303da957ee..5fdfebc6415f 100755 --- a/tools/testing/selftests/drivers/net/queues.py +++ b/tools/testing/selftests/drivers/net/queues.py @@ -2,13 +2,16 @@ # SPDX-License-Identifier: GPL-2.0 from lib.py import ksft_disruptive, ksft_exit, ksft_run -from lib.py import ksft_eq, ksft_raises, KsftSkipEx +from lib.py import ksft_eq, ksft_raises, KsftSkipEx, KsftFailEx from lib.py import EthtoolFamily, NetdevFamily, NlError 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,39 @@ 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 + + if xdp.returncode == 255: + raise KsftSkipEx('AF_XDP unsupported') + elif xdp.returncode > 0: + raise KsftFailEx('unable to create AF_XDP socket') + + 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 +117,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..2a40cc35d800 --- /dev/null +++ b/tools/testing/selftests/drivers/net/xdp_helper.c @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#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"); + /* if the kernel doesnt support AF_XDP, let the test program + * know with -1. All other error paths return 1. + */ + if (errno == EAFNOSUPPORT) + return -1; + 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) { + perror("mmap 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) { + munmap(umem_area, UMEM_SZ); + 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; +}