From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 00BAF25B671 for ; Mon, 10 Feb 2025 18:03:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739210605; cv=none; b=mrf6ZEocj7vRL2hF1utc5eVa/8+DAQsSwPn1H4LyCnKquAXn4o0nVWSs/FcSJnFBtyej1g7HJXzIZbWV0/R369JLGFbFUhzPZk2i4m+l0+au/reQ/mpJ6MUYwzCs+kVHtqTbJhdevKL8GVraUPqA/yQYFlqcBn+4A1fyMpKmJqs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739210605; c=relaxed/simple; bh=p6KSjYsGfmpN4uaNswBoAqfX2n84u2MhXIvKb0re0U8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=vD5xVz6PLCg4V9fjkiONAJGsfRf17zFZ5CfwVjEO0OIHZ1g8Ed7eH0MOPeY6AlOuZndF7wWsinHGu9ZKtVJ/B8gcLM6vRNccnHtUIbz5HcJKf9MDh9LcBrH2dJIKz8qwR+pThDCHWaJ0zBKe+EptPasKxvzfCKtIrSeifGfrd2g= 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=qHmr8G/C; arc=none smtp.client-ip=209.85.214.170 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="qHmr8G/C" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21f48ab13d5so75277455ad.0 for ; Mon, 10 Feb 2025 10:03:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1739210603; x=1739815403; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:from:to:cc:subject:date:message-id:reply-to; bh=q0ColAFAZi4Tngf2Yhd/Mj5SSDQPz6saNuJ+0XCUfiw=; b=qHmr8G/CJw7j9WoZexAb75s0tE67BWWnf+n53G2j1ng29BSiBVBZMhMgg35HD+UO0v kuenZDluhGlFnXnw7CvAgsTeV3IkWhPmEC8jeyPasOw8rtQ/8dhN6PFoHwWxL+m6r27H 2QknvMcjwMvT9/CfOHH76SxqSHwStrB8VRym4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739210603; x=1739815403; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=q0ColAFAZi4Tngf2Yhd/Mj5SSDQPz6saNuJ+0XCUfiw=; b=qrqA74DnqOkqADw2nhWlbteAjAIp//4G2XvOlQPFAkKMd9jKGthNEz2VOY3Ci4q8zx mK65RqBkHe/30xnwZDqx/sTupOo5+uxAJWbV/olMWMX51VpArXoJuAxVa5StKnFuNvFh CaoA63yWxoY24tNMuE5k4e4PHS3zVWhwbg8vfzkfls1f5x5w3i6De15+uVthpWrgwNAQ 7AAY3aADcGBb0dbEiRBeG2xiE8SGk01gm5MBva1NL5eoDpcZBAS3kX4DmVw2BDRIPYIR 0j4QNyd/czGygeM45nuZcx94p4QQ3BwjzrcJsFETPNeDmrGhgIoZrniwf192H55Afxxc gfnA== X-Gm-Message-State: AOJu0Yxc5DcAX3H0EnAL6JlhK33j7MUPWt4hONQ91gYgPQTyR1tPOA8o hlG+YZHTY01fmxA01mX1IJMHQJG/jHOEbX2vaGY754r/WB4GWx5gpnHN0tdIuJs= X-Gm-Gg: ASbGncuszO5fMldBb1sfvUcnZ2f0HVfXJUnJR1KDGYl9mdMLvdxSpxDJX98BnZ0ENtL zBeW5l86qleyZk5Aa7vlTCg7X7JRgKCsWpgwHjPQ7y/mF8Mv6d/JHQs6M1BRfJbfTGfj7QjaWnT GYpgm/ZHiWfS4tZnOCd1Dz9bNAzXpCPnToQ3ttFynaA1Y62p9ynijOYUygyNXgy7zmm7GbNW8lK 1Hn+igrHNeFxGQljrWj4H4st+BJveJsIg/34wqjPEi05K9xrybGb2knt6TD0KIjBa5MaJkw4wcR ljQ7pHMlvjWZFCwM7ug4o4hNQPDyQIe7LJonJGCRndswyI81kH64OFMglw== X-Google-Smtp-Source: AGHT+IE5iidFomxHkIy+VYqWBmgoUJnNmg2a1BiELKxmTrveZa2Z19C3u7qiwVfucLVEQXEENuF22w== X-Received: by 2002:a05:6a21:202:b0:1ee:321b:313b with SMTP id adf61e73a8af0-1ee321b32f8mr8307599637.41.1739210603202; Mon, 10 Feb 2025 10:03:23 -0800 (PST) Received: from LQ3V64L9R2 (c-24-6-151-244.hsd1.ca.comcast.net. [24.6.151.244]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730767fe44asm4411507b3a.4.2025.02.10.10.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 10:03:22 -0800 (PST) Date: Mon, 10 Feb 2025 10:03:20 -0800 From: Joe Damato To: Stanislav Fomichev Cc: netdev@vger.kernel.org, horms@kernel.org, kuba@kernel.org, "David S. Miller" , Eric Dumazet , Paolo Abeni , Donald Hunter , Andrew Lunn , Xuan Zhuo , Stanislav Fomichev , Mina Almasry , Martin Karsten , Sridhar Samudrala , David Wei , open list Subject: Re: [PATCH net-next v5 2/3] netdev-genl: Add an XSK attribute to queues Message-ID: Mail-Followup-To: Joe Damato , Stanislav Fomichev , netdev@vger.kernel.org, horms@kernel.org, kuba@kernel.org, "David S. Miller" , Eric Dumazet , Paolo Abeni , Donald Hunter , Andrew Lunn , Xuan Zhuo , Stanislav Fomichev , Mina Almasry , Martin Karsten , Sridhar Samudrala , David Wei , open list References: <20250208041248.111118-1-jdamato@fastly.com> <20250208041248.111118-3-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Sat, Feb 08, 2025 at 05:43:47PM -0800, Stanislav Fomichev wrote: > On 02/08, Joe Damato wrote: > > 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 > > --- > > 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 | 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 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..b5a93a449af9 100644 > > --- a/net/core/netdev-genl.c > > +++ b/net/core/netdev-genl.c > > @@ -400,11 +400,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; > > Needs to be guarded by ifdef CONFIG_XDP_SOCKETS? > > > net/core/netdev-genl.c: In function `netdev_nl_queue_fill_oneŽ: > net/core/netdev-genl.c:404:24: error: `struct netdev_rx_queueŽ has no member named `poolŽ > 404 | if (rxq->pool) > | ^~ > net/core/netdev-genl.c:414:24: error: `struct netdev_queueŽ has no member named `poolŽ > 414 | if (txq->pool) > | ^~ Ah, thanks. I'm trying to decide if it'll look better factored out into helpers vs just dropping the #ifdefs in netdev_nl_queue_fill_one. Open to opinions so that hopefully v6 will be the last one ;)