From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 7B5EF4014B8 for ; Thu, 9 Jul 2026 09:55:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783590950; cv=none; b=nJlZ00RvBXziVy+L9yIBXdOe1P9NxuVBt8DBLNM9HVKuhNBbncLeUMgJtSrjly1ZXwaFHscvDCkHKIpdjXdXHRxVgnyhpG4Bb5Xc0p87NhLm5WI8FIR+uxugbuduc2cce4FKT2LTqddDJJWwz1zGCYRbESvozT9uPf0RX6JyqF8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783590950; c=relaxed/simple; bh=UOmyPPX2i4XD8ZF4yUIIGc+eEtX+Hwj+qEVNptFgX/s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e3mkbWWecBjiXGgAIRulA/9OXUyHSnEopbQyBrCQxrAtOrTakLexNkVHYD6pKflBMqQzagHeUe6dNBK5OXIBXuk4Kf/gg6qEb2UOjd4xbOrJqT9d8d3+wWHPy5byXtV+GpNRTqtvkTISZ1YLlSEUxoBW/YIvrZHP5xB4E2xHuTk= 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.20251104.gappssmtp.com header.i=@resnulli-us.20251104.gappssmtp.com header.b=kvGxKAr2; arc=none smtp.client-ip=209.85.221.42 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.20251104.gappssmtp.com header.i=@resnulli-us.20251104.gappssmtp.com header.b="kvGxKAr2" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-474560436c3so1513621f8f.0 for ; Thu, 09 Jul 2026 02:55:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20251104.gappssmtp.com; s=20251104; t=1783590946; x=1784195746; 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:content-type; bh=NX5H4G5eiUD4iywV/S41SZAWho4DOsV+7I+VrVEVH7g=; b=kvGxKAr2H2vpPBLJgBHYIA3riyaBcd44Y3oSiNYNPNxPfli/Y9eEh5+6WLHu5EIU4X MsG8fTTcGYiPBl32AwhUnPekc3Kzv0YJxoh6KS/HhLUsVqziZFeiRiqEi0bx7uZ/ddYb igNGVhfSrcB71cA04S56RiH38ZX8N1T9rHiPRRN176eAwZ2LDx/CD5PaLkG+cbfM9Vyg fclJgewe0mPljn8C4CGpx0OTNtCHwM3eFDAkICOzPk/H5Nu5n3E+Z5k5OEyLVowMrNGp JyhSRqc+3oV8drnIQMtscUvJmn8lZMsUoOuvPQLkcQnj8uldvQXlq7+iXv1HgEvOaGJH 7nOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783590946; x=1784195746; 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:content-type; bh=NX5H4G5eiUD4iywV/S41SZAWho4DOsV+7I+VrVEVH7g=; b=mc2pyNC+wotL4yUpLrRi4vvfmqn4fZE1qeafTBUExaQGEw4pfbbdFH/ONTrUqV8w9f 8DSVR1Mt73e8aOp+3TEEkowGEQ+eRdEKf0XYoJQKSdYhWH7c0u80+sHrEPGVrZ0mZgEv bJhHK4bB2gP1dJMXpeMD4cFvChgBhprRMl5v9PFnp6DljKDnC3vZdf+O/fRxdLwJWt/K I4x7oLPBNjS+RT2Q0xdt17d3NkqFu3PHVjDHgdl25+polctW9G1XvNbygLZz8nJEtV6I CfBXnsnIpFIwAHe6JL/FrrM6mkCzGMQeFMVwQWBXD+4T0kuX2PU6cOXzOIBoZOUXxzp/ 56aA== X-Forwarded-Encrypted: i=1; AHgh+Rq2st4FsWhZ/GaIBZEypjRvulw8y3NOxeowD7oELLWj+C7IrugULsptyFtwCSxQw4otyeB+gIMy3Fci@vger.kernel.org X-Gm-Message-State: AOJu0Yz50E/NEgG3FLAP4Kb5QwFjOxRRD84iYy1Hw5KdI+gWi9M4ps2F Nq05bubm3ApPbuKJzG7/5cnEjeS5xymFXSBMt0H3Swb/9RohzU8PGm2QFC9v32WYTz0= X-Gm-Gg: AfdE7ckIy6tZe38JHeScgeEVOEhb56XcOoiBxvB5ot+D1md9vzEbHd1gMGRu/fXdMKe s9/bZefoRuni17wmokCSIphKpuQ8eoSRKgH7zzxk6NSkEu/V5wV+sxVVEdKwYcJ9s0MUnSQ+8CY kXK7tEajbx5+yf2VE+NWnHW5MSfNMjlzcYUftDGdUf8VCq5DA4NoBydB+G90DykUZdHbOzmDn0s WTHRLCJcUfRvOV26wc2ZuE4qpo223lCSbkcz/qiZP5uC/g+XVQ/edxynrXAJfRSbMgRbcqOAGii 9sY9bGFG9sZ9+xrqdAGZK0S0w0/VFyuqnReWCaFz+BsV9K8Dpo3xHK7hnNIo8XxYQXZLZNdv2xs TyYPPtxurWOZg01ZUo9/aqhAw25k/hGsB0Pw4nz2LsLorT1nTOzFNn/UUi9kkcJcEW76R7pFQKb NChAY635rRkRVsJJuMZT3wiA== X-Received: by 2002:a05:6000:1842:b0:475:f0d1:eb57 with SMTP id ffacd0b85a97d-47df07b06a5mr6913594f8f.50.1783590945787; Thu, 09 Jul 2026 02:55:45 -0700 (PDT) Received: from localhost ([140.209.217.211]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47aa039b126sm49678012f8f.24.2026.07.09.02.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 02:55:45 -0700 (PDT) From: Jiri Pirko To: linux-rdma@vger.kernel.org Cc: cgroups@vger.kernel.org, netdev@vger.kernel.org, linux-s390@vger.kernel.org, linux-kselftest@vger.kernel.org, jgg@ziepe.ca, leon@kernel.org, parav@nvidia.com, mbloch@nvidia.com, cmeiohas@nvidia.com, roman.gushchin@linux.dev, bvanassche@acm.org, zyjzyj2000@gmail.com, shuah@kernel.org, tj@kernel.org, mkoutny@suse.com, hannes@cmpxchg.org, alibuda@linux.alibaba.com, dust.li@linux.alibaba.com, sidraya@linux.ibm.com, wenjia@linux.ibm.com Subject: [PATCH rdma-next 03/13] RDMA/core: Support renaming a device when changing its net namespace Date: Thu, 9 Jul 2026 11:55:22 +0200 Message-ID: <20260709095532.855647-4-jiri@resnulli.us> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260709095532.855647-1-jiri@resnulli.us> References: <20260709095532.855647-1-jiri@resnulli.us> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jiri Pirko Allow namespace moves to request a destination device name. Keep requested names on the same literal-name path as the existing RDMA rename operation, and keep teardown fallback naming on the trusted kernel-controlled path. Signed-off-by: Jiri Pirko --- drivers/infiniband/core/core_priv.h | 2 +- drivers/infiniband/core/device.c | 48 ++++++++++++++++++++--------- drivers/infiniband/core/nldev.c | 2 +- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h index 19104c542b27..3bd5bb7135a3 100644 --- a/drivers/infiniband/core/core_priv.h +++ b/drivers/infiniband/core/core_priv.h @@ -356,7 +356,7 @@ void ib_port_unregister_client_groups(struct ib_device *ibdev, u32 port_num, const struct attribute_group **groups); int ib_device_set_netns_put(struct sk_buff *skb, - struct ib_device *dev, u32 ns_fd); + struct ib_device *dev, u32 ns_fd, const char *name); int rdma_nl_net_init(struct rdma_dev_net *rnet); void rdma_nl_net_exit(struct rdma_dev_net *rnet); diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 8d169658e312..191f05898bae 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -268,7 +268,8 @@ static struct notifier_block ibdev_lsm_nb = { }; static int rdma_dev_change_netns(struct ib_device *device, struct net *cur_net, - struct net *net, const char *fallback_pattern); + struct net *net, const char *requested_name, + const char *fallback_pattern); /* Pointer to the RCU head at the start of the ib_port_data array */ struct ib_port_data_rcu { @@ -1173,7 +1174,7 @@ static void rdma_dev_exit_net(struct net *net) */ if (net_eq(net, read_pnet(&dev->coredev.rdma_net))) { ret = rdma_dev_change_netns(dev, net, &init_net, - "ibdev%d"); + NULL, "ibdev%d"); if (ret) WARN(1, "Failed to move RDMA device %s to init_net on netns exit: %d\n", @@ -1714,12 +1715,13 @@ static bool rdma_dev_name_in_netns(struct ib_device *skip, struct net *net, } /* - * Choose the name @device should use in net namespace @net: keep the current - * name when it is free, otherwise use a trusted '%d' @fallback_pattern - * (namespace teardown) to pick a free index. The caller must hold the write - * side of devices_rwsem. + * Choose the name @device should use in net namespace @net. @requested_name + * is used as a literal device name when set. Otherwise keep the current name + * when it is free, or use a trusted '%d' @fallback_pattern for teardown. The + * caller must hold the write side of devices_rwsem. */ static int rdma_dev_pick_netns_name(struct ib_device *device, struct net *net, + const char *requested_name, const char *fallback_pattern, char *buf, size_t buf_len, const char **new_name) @@ -1728,6 +1730,15 @@ static int rdma_dev_pick_netns_name(struct ib_device *device, struct net *net, lockdep_assert_held_write(&devices_rwsem); + if (requested_name) { + if (!rdma_dev_name_in_netns(device, net, requested_name)) { + *new_name = requested_name; + return 0; + } + + return -EEXIST; + } + if (!rdma_dev_name_in_netns(device, net, dev_name(&device->dev))) { *new_name = dev_name(&device->dev); return 0; @@ -1758,7 +1769,8 @@ static int rdma_dev_pick_netns_name(struct ib_device *device, struct net *net, * Naming rules are handled by rdma_dev_pick_netns_name(). */ static int rdma_dev_change_netns(struct ib_device *device, struct net *cur_net, - struct net *net, const char *fallback_pattern) + struct net *net, const char *requested_name, + const char *fallback_pattern) { char buf[IB_DEVICE_NAME_MAX]; const char *new_name; @@ -1784,8 +1796,9 @@ static int rdma_dev_change_netns(struct ib_device *device, struct net *cur_net, * down, so a doomed user move does not disable a live device. */ down_write(&devices_rwsem); - ret = rdma_dev_pick_netns_name(device, net, fallback_pattern, - buf, sizeof(buf), &new_name); + ret = rdma_dev_pick_netns_name(device, net, requested_name, + fallback_pattern, buf, + sizeof(buf), &new_name); up_write(&devices_rwsem); if (ret) goto out; @@ -1801,8 +1814,9 @@ static int rdma_dev_change_netns(struct ib_device *device, struct net *cur_net, * level. */ down_write(&devices_rwsem); - ret = rdma_dev_pick_netns_name(device, net, fallback_pattern, buf, - sizeof(buf), &new_name); + ret = rdma_dev_pick_netns_name(device, net, requested_name, + fallback_pattern, buf, sizeof(buf), + &new_name); if (ret) { if (fallback_pattern) { WARN(1, @@ -1857,7 +1871,7 @@ static int rdma_dev_change_netns(struct ib_device *device, struct net *cur_net, } int ib_device_set_netns_put(struct sk_buff *skb, - struct ib_device *dev, u32 ns_fd) + struct ib_device *dev, u32 ns_fd, const char *name) { struct net *net; int ret; @@ -1873,9 +1887,12 @@ int ib_device_set_netns_put(struct sk_buff *skb, goto ns_err; } - /* Moving a device to the namespace it already lives in is a no-op. */ + /* + * Moving a device to the namespace it already lives in is a no-op; a + * supplied name still renames it in place. + */ if (net_eq(net, read_pnet(&dev->coredev.rdma_net))) { - ret = 0; + ret = name ? ib_device_rename(dev, name) : 0; goto ns_err; } @@ -1891,7 +1908,8 @@ int ib_device_set_netns_put(struct sk_buff *skb, get_device(&dev->dev); ib_device_put(dev); - ret = rdma_dev_change_netns(dev, current->nsproxy->net_ns, net, NULL); + ret = rdma_dev_change_netns(dev, current->nsproxy->net_ns, net, name, + NULL); put_device(&dev->dev); put_net(net); diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index 3a9ec43a16f1..3540cb0b9d4f 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -1194,7 +1194,7 @@ static int nldev_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh, u32 ns_fd; ns_fd = nla_get_u32(tb[RDMA_NLDEV_NET_NS_FD]); - err = ib_device_set_netns_put(skb, device, ns_fd); + err = ib_device_set_netns_put(skb, device, ns_fd, NULL); if (err == -EEXIST) NL_SET_ERR_MSG(extack, "Device name already exists in the target net namespace"); -- 2.54.0