From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.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 A6D193C1978 for ; Wed, 25 Feb 2026 13:34:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772026476; cv=none; b=iwkOABx1ahvYfdymfhrp3rqrxG0RwdaJxdRceeXa4seoecjyDitlfUfXIdRw3fFh3qsJ1JW0fJxbFTDsCjObGwsu6uuEBAkPFg+nQfGd/uz08ZHbt6LwCLkIjVYFHksb21p3dn17qQcSB8a6WGNQdz5YU9NJOwfUuxWxXUwQEuk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772026476; c=relaxed/simple; bh=W0h+Gw3i0X5fB0cIrXBdZOWGoeYvzVloh7Qvtqw2/xE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LSgbDGGC8l7NOIziGvO4SelYTtCtkfDuRNpi1WEMvH4OIxojfamOg/beRYqWlBuhF/ycZq6hE9otynYQ8YURZnoEbt9VPFqqDAs05v5VFr4FqI663ZT5Z8upyDbzPIzajVUICzU5PZGBr/A42y2hWqwNMOfzkG8SKEQ5l77mYrI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=resnulli.us; spf=none smtp.mailfrom=resnulli.us; dkim=pass (2048-bit key) header.d=resnulli-us.20230601.gappssmtp.com header.i=@resnulli-us.20230601.gappssmtp.com header.b=r54+NJnx; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=resnulli.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20230601.gappssmtp.com header.i=@resnulli-us.20230601.gappssmtp.com header.b="r54+NJnx" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4806ce0f97bso54171465e9.0 for ; Wed, 25 Feb 2026 05:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20230601.gappssmtp.com; s=20230601; t=1772026473; x=1772631273; 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=v/vYct8/33M9QQ+Vp9qSu2wuLu++aTJrTmpx2guIHLU=; b=r54+NJnxmmEwP41oNgXGB5ceLWS5/8VWvfCMhEvyXK07gR+lftuAgdG2R2mb06xQer sYJ9d1eQMJkG0WgS1+upLrLUnOjZBHYAdTY7OSjA3gGkcdsf9rr2tbLxO4+uUMbmRLTT zpfFQCMO+PBWSfy5gCG5BimmYVtWRqgnTb7JVpMyzLaG3O9R9kTFi+Q0/XWGLdSgx754 lT5rY7np2PCZPToikgIk9BA07MwBlFpw94Q5JJL/V1squS5dc0icryXCvdd22FwA/5rq oSGdXCyOH5h4SF/3o/vAKKI32hxnY0gZ0OmW28Yqb//xe3LaISBOadZ9rLIk1CoY19da Xwrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772026473; x=1772631273; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=v/vYct8/33M9QQ+Vp9qSu2wuLu++aTJrTmpx2guIHLU=; b=WaGZdH3hOzaWNxBlWEYK/hON5ZpXaojy6FMlIMuOQTbhsFOmLJ9pk3TWYnm5XsRFIQ xq2aYYNvezWPnUrfSTpQB7ElY87230tNhB+yjZHPpLCeqkXnjfhgTtcenwiGl/mzGVZV VRa4orram7Azj42QKzPgKJHNI60ZSqSkDZ5t/fBgGR/2OdQ7/beyY9Lza60mgOYRjcBV OpDA4bJ49GqFfpbmpl5XMI9b8AySyYX3dN5HQOxJuiHpZ1K6+xrYD3HXhSyx/n5U070o WPDqu+jTtKwkcenbk/SdXNGe/74YrK4+NuaBw7CS46JpAm9FY55fp4w7UJoNn3xoMQ9e /FGw== X-Gm-Message-State: AOJu0Yz0+gPmUlyLnMFirDuO0Nkhin5lfnXWDcZjuZ+wQBFxkQqFv2mD m4rCQz4AF0pk89mxZtjZrKuyUBp1HH4FSRlmL67f3Syh3NNUL+rALAEElaEn9zPk5kxYaf0a5xk +JZpA X-Gm-Gg: ATEYQzz8wQf+jEZNwg3c9AI6RUuz7gIyb+V7VFQbNuSAPGn6z2B1WnVckLs0jElnOE/ j3llbkRHCC406o2RE9yuGEYo7edMyi1sZ6CFJ0Vlxb/49T57V6tj9ibKZXogahgzCDvHy6m+geC 3WZYBVmXeSCuRZ6aKCDP1VSNER8S7kNubG02MhcM0LVjOH31AdR/GEfXJbygStkFuiruGpzsAiH S14Dfjpa6FRCEXs9sxGimM73pIkH4F/K/lZ8Neo0PaGcwQy6ZRgJN0/j2Efsghd3hXkKESZRMPr kSthibEpLQzLaeOZM+MZWyNBjzaHH+nZDk/dRh+Lozcg9vO074egBfGxrZ1/trmZhz3WJGKzL5l FHpNrZMUtfUqsZZWqE4Nt0xao69kCMehAXpd3rTBfl/0R5Y+pYwEiNif/mzsOxbhUCUfDjQOK4C J9xfHNVxXrHpk0Iw== X-Received: by 2002:a05:600c:190f:b0:477:9a28:b0a4 with SMTP id 5b1f17b1804b1-483a95574c5mr269548815e9.0.1772026472996; Wed, 25 Feb 2026 05:34:32 -0800 (PST) Received: from localhost ([85.163.81.98]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483bd733706sm68868485e9.13.2026.02.25.05.34.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Feb 2026 05:34:32 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, donald.hunter@gmail.com, corbet@lwn.net, skhan@linuxfoundation.org, saeedm@nvidia.com, leon@kernel.org, tariqt@nvidia.com, mbloch@nvidia.com, przemyslaw.kitszel@intel.com, mschmidt@redhat.com, andrew+netdev@lunn.ch, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, chuck.lever@oracle.com, matttbe@kernel.org, cjubran@nvidia.com, daniel.zahka@gmail.com, linux-doc@vger.kernel.org, linux-rdma@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH net-next v2 07/10] devlink: allow devlink instance allocation without a backing device Date: Wed, 25 Feb 2026 14:34:19 +0100 Message-ID: <20260225133422.290965-8-jiri@resnulli.us> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260225133422.290965-1-jiri@resnulli.us> References: <20260225133422.290965-1-jiri@resnulli.us> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jiri Pirko Allow devlink_alloc_ns() to be called with dev=NULL to support device-less devlink instances. When dev is NULL, the instance is identified over netlink using "devlink_index" as bus_name and the decimal index value as dev_name. Signed-off-by: Jiri Pirko --- v1->v2: - moved DEVLINK_INDEX_BUS_NAME definition to patch #5 - added comment to dev arg that it can be NULL - fixed the index sprintf for dev-less --- net/devlink/core.c | 25 +++++++++++++++++++------ net/devlink/dev.c | 11 +++++++---- net/devlink/devl_internal.h | 4 ++-- net/devlink/port.c | 14 +++++++++----- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/net/devlink/core.c b/net/devlink/core.c index 85ea5856d523..e931e66aa3a2 100644 --- a/net/devlink/core.c +++ b/net/devlink/core.c @@ -331,7 +331,10 @@ static void devlink_release(struct work_struct *work) mutex_destroy(&devlink->lock); lockdep_unregister_key(&devlink->lock_key); - put_device(devlink->dev); + if (devlink->dev) + put_device(devlink->dev); + else + kfree(devlink->dev_name); kvfree(devlink); } @@ -433,7 +436,7 @@ EXPORT_SYMBOL_GPL(devlink_unregister); * @ops: ops * @priv_size: size of user private data * @net: net namespace - * @dev: parent device + * @dev: parent device, or NULL for a device-less devlink instance * * Allocate new devlink instance resources, including devlink index * and name. @@ -446,7 +449,7 @@ struct devlink *devlink_alloc_ns(const struct devlink_ops *ops, static u32 last_id; int ret; - WARN_ON(!ops || !dev); + WARN_ON(!ops); if (!devlink_reload_actions_valid(ops)) return NULL; @@ -459,9 +462,17 @@ struct devlink *devlink_alloc_ns(const struct devlink_ops *ops, if (ret < 0) goto err_xa_alloc; - devlink->dev = get_device(dev); - devlink->bus_name = dev->bus->name; - devlink->dev_name = dev_name(dev); + if (dev) { + devlink->dev = get_device(dev); + devlink->bus_name = dev->bus->name; + devlink->dev_name = dev_name(dev); + } else { + devlink->bus_name = DEVLINK_INDEX_BUS_NAME; + devlink->dev_name = kasprintf(GFP_KERNEL, "%u", devlink->index); + if (!devlink->dev_name) + goto err_kasprintf; + } + devlink->ops = ops; xa_init_flags(&devlink->ports, XA_FLAGS_ALLOC); xa_init_flags(&devlink->params, XA_FLAGS_ALLOC); @@ -486,6 +497,8 @@ struct devlink *devlink_alloc_ns(const struct devlink_ops *ops, return devlink; +err_kasprintf: + xa_erase(&devlinks, devlink->index); err_xa_alloc: kvfree(devlink); return NULL; diff --git a/net/devlink/dev.c b/net/devlink/dev.c index e3a36de4f4ae..b63597312bbd 100644 --- a/net/devlink/dev.c +++ b/net/devlink/dev.c @@ -453,7 +453,8 @@ int devlink_reload(struct devlink *devlink, struct net *dest_net, * (e.g., PCI reset) and to close possible races between these * operations and probe/remove. */ - device_lock_assert(devlink->dev); + if (devlink->dev) + device_lock_assert(devlink->dev); memcpy(remote_reload_stats, devlink->stats.remote_reload_stats, sizeof(remote_reload_stats)); @@ -892,9 +893,11 @@ devlink_nl_info_fill(struct sk_buff *msg, struct devlink *devlink, goto err_cancel_msg; } - err = devlink_nl_driver_info_get(dev->driver, &req); - if (err) - goto err_cancel_msg; + if (dev) { + err = devlink_nl_driver_info_get(dev->driver, &req); + if (err) + goto err_cancel_msg; + } genlmsg_end(msg, hdr); return 0; diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index 67425c5d8cfc..89d08fd511cb 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -107,7 +107,7 @@ static inline bool devl_is_registered(struct devlink *devlink) static inline void devl_dev_lock(struct devlink *devlink, bool dev_lock) { - if (dev_lock) + if (dev_lock && devlink->dev) device_lock(devlink->dev); devl_lock(devlink); } @@ -115,7 +115,7 @@ static inline void devl_dev_lock(struct devlink *devlink, bool dev_lock) static inline void devl_dev_unlock(struct devlink *devlink, bool dev_lock) { devl_unlock(devlink); - if (dev_lock) + if (dev_lock && devlink->dev) device_unlock(devlink->dev); } diff --git a/net/devlink/port.c b/net/devlink/port.c index 1d4a79c6d4d3..f19b690ebe7e 100644 --- a/net/devlink/port.c +++ b/net/devlink/port.c @@ -976,7 +976,9 @@ static void devlink_port_type_warn(struct work_struct *work) struct devlink_port *port = container_of(to_delayed_work(work), struct devlink_port, type_warn_dw); - dev_warn(port->devlink->dev, "Type was not set for devlink port."); + if (port->devlink->dev) + dev_warn(port->devlink->dev, + "Type was not set for devlink port."); } static bool devlink_port_type_should_warn(struct devlink_port *devlink_port) @@ -1242,9 +1244,10 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port, */ void devlink_port_type_eth_set(struct devlink_port *devlink_port) { - dev_warn(devlink_port->devlink->dev, - "devlink port type for port %d set to Ethernet without a software interface reference, device type not supported by the kernel?\n", - devlink_port->index); + if (devlink_port->devlink->dev) + dev_warn(devlink_port->devlink->dev, + "devlink port type for port %d set to Ethernet without a software interface reference, device type not supported by the kernel?\n", + devlink_port->index); __devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_ETH, NULL); } EXPORT_SYMBOL_GPL(devlink_port_type_eth_set); @@ -1272,7 +1275,8 @@ EXPORT_SYMBOL_GPL(devlink_port_type_ib_set); */ void devlink_port_type_clear(struct devlink_port *devlink_port) { - if (devlink_port->type == DEVLINK_PORT_TYPE_ETH) + if (devlink_port->type == DEVLINK_PORT_TYPE_ETH && + devlink_port->devlink->dev) dev_warn(devlink_port->devlink->dev, "devlink port type for port %d cleared without a software interface reference, device type not supported by the kernel?\n", devlink_port->index); -- 2.51.1