From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@nvidia.com>
Cc: Greg KH <gregkh@linuxfoundation.org>,
Kees Cook <keescook@chromium.org>,
Nathan Chancellor <nathan@kernel.org>,
Adit Ranadive <aditr@vmware.com>,
Ariel Elior <aelior@marvell.com>,
Christian Benvenuti <benve@cisco.com>,
clang-built-linux@googlegroups.com,
Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>,
Devesh Sharma <devesh.sharma@broadcom.com>,
Gal Pressman <galpress@amazon.com>,
linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
Michal Kalderon <mkalderon@marvell.com>,
Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>,
Mustafa Ismail <mustafa.ismail@intel.com>,
Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>,
Nelson Escobar <neescoba@cisco.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Potnuri Bharat Teja <bharat@chelsio.com>,
Selvin Xavier <selvin.xavier@broadcom.com>,
Shiraz Saleem <shiraz.saleem@intel.com>,
VMware PV-Drivers <pv-drivers@vmware.com>,
Yishai Hadas <yishaih@nvidia.com>,
Zhu Yanjun <zyjzyj2000@gmail.com>
Subject: [PATCH rdma-next v1 14/15] RDMA/core: Allow port_groups to be used with namespaces
Date: Mon, 7 Jun 2021 11:17:39 +0300 [thread overview]
Message-ID: <a1a8a96629405ff3b2990f5f8dbd7b57a818571e.1623053078.git.leonro@nvidia.com> (raw)
In-Reply-To: <cover.1623053078.git.leonro@nvidia.com>
From: Jason Gunthorpe <jgg@nvidia.com>
Now that the port_groups data is being destroyed and managed by the core
code this restriction is no longer needed. All the ib_port_attrs are
compatible with the core's sysfs lifecycle.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
---
drivers/infiniband/core/device.c | 10 ++++------
drivers/infiniband/core/sysfs.c | 17 ++++++-----------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 2cbd77933ea5..92f224a97481 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -1698,13 +1698,11 @@ int ib_device_set_netns_put(struct sk_buff *skb,
}
/*
- * Currently supported only for those providers which support
- * disassociation and don't do port specific sysfs init. Once a
- * port_cleanup infrastructure is implemented, this limitation will be
- * removed.
+ * All the ib_clients, including uverbs, are reset when the namespace is
+ * changed and this cannot be blocked waiting for userspace to do
+ * something, so disassociation is mandatory.
*/
- if (!dev->ops.disassociate_ucontext || dev->ops.port_groups ||
- ib_devices_shared_netns) {
+ if (!dev->ops.disassociate_ucontext || ib_devices_shared_netns) {
ret = -EOPNOTSUPP;
goto ns_err;
}
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 09a2e1066df0..f42034fcf3d9 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -1236,11 +1236,9 @@ static struct ib_port *setup_port(struct ib_core_device *coredev, int port_num,
ret = sysfs_create_groups(&p->kobj, p->groups_list);
if (ret)
goto err_del;
- if (is_full_dev) {
- ret = sysfs_create_groups(&p->kobj, device->ops.port_groups);
- if (ret)
- goto err_groups;
- }
+ ret = sysfs_create_groups(&p->kobj, device->ops.port_groups);
+ if (ret)
+ goto err_groups;
list_add_tail(&p->kobj.entry, &coredev->port_list);
if (device->port_data && is_full_dev)
@@ -1257,16 +1255,13 @@ static struct ib_port *setup_port(struct ib_core_device *coredev, int port_num,
return ERR_PTR(ret);
}
-static void destroy_port(struct ib_core_device *coredev, struct ib_port *port)
+static void destroy_port(struct ib_port *port)
{
- bool is_full_dev = &port->ibdev->coredev == coredev;
-
if (port->ibdev->port_data &&
port->ibdev->port_data[port->port_num].sysfs == port)
port->ibdev->port_data[port->port_num].sysfs = NULL;
list_del(&port->kobj.entry);
- if (is_full_dev)
- sysfs_remove_groups(&port->kobj, port->ibdev->ops.port_groups);
+ sysfs_remove_groups(&port->kobj, port->ibdev->ops.port_groups);
sysfs_remove_groups(&port->kobj, port->groups_list);
kobject_del(&port->kobj);
kobject_put(&port->kobj);
@@ -1392,7 +1387,7 @@ void ib_free_port_attrs(struct ib_core_device *coredev)
struct ib_port *port = container_of(p, struct ib_port, kobj);
destroy_gid_attrs(port);
- destroy_port(coredev, port);
+ destroy_port(port);
}
kobject_put(coredev->ports_kobj);
--
2.31.1
next prev parent reply other threads:[~2021-06-07 8:19 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 8:17 [PATCH rdma-next v1 00/15] Reorganize sysfs file creation for struct ib_devices Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 01/15] RDMA: Split the alloc_hw_stats() ops to port and device variants Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 02/15] RDMA/core: Replace the ib_port_data hw_stats pointers with a ib_port pointer Leon Romanovsky
2021-06-07 10:23 ` Greg KH
2021-06-07 11:00 ` Leon Romanovsky
2021-06-07 11:23 ` Greg KH
2021-06-07 12:32 ` Jason Gunthorpe
2021-06-07 8:17 ` [PATCH rdma-next v1 03/15] RDMA/core: Split port and device counter sysfs attributes Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 04/15] RDMA/core: Split gid_attrs related sysfs from add_port() Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 05/15] RDMA/core: Simplify how the gid_attrs sysfs is created Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 06/15] RDMA/core: Simplify how the port " Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 07/15] RDMA/core: Create the device hw_counters through the normal groups mechanism Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 08/15] RDMA/core: Remove the kobject_uevent() NOP Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 09/15] RDMA/core: Expose the ib port sysfs attribute machinery Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 10/15] RDMA/cm: Use an attribute_group on the ib_port_attribute intead of kobj's Leon Romanovsky
2021-06-07 10:25 ` Greg KH
2021-06-07 10:51 ` Leon Romanovsky
2021-06-07 11:22 ` Greg KH
2021-06-07 11:37 ` Leon Romanovsky
2021-06-07 12:08 ` Greg KH
2021-06-07 12:41 ` Leon Romanovsky
2021-06-07 12:14 ` Jason Gunthorpe
2021-06-07 12:39 ` Greg KH
2021-06-07 12:50 ` Jason Gunthorpe
2021-06-11 7:25 ` Haakon Bugge
2021-06-11 8:16 ` Greg KH
2021-06-14 3:27 ` Haakon Bugge
2021-06-07 8:17 ` [PATCH rdma-next v1 11/15] RDMA/qib: Use attributes for the port sysfs Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 12/15] RDMA/hfi1: " Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 13/15] RDMA: Change ops->init_port to ops->port_groups Leon Romanovsky
2021-06-07 8:17 ` Leon Romanovsky [this message]
2021-06-07 13:29 ` [PATCH rdma-next v1 14/15] RDMA/core: Allow port_groups to be used with namespaces Parav Pandit
2021-06-07 23:32 ` Jason Gunthorpe
2021-06-08 5:29 ` Parav Pandit
2021-06-08 4:55 ` Leon Romanovsky
2021-06-08 5:32 ` Parav Pandit
2021-06-08 6:57 ` Leon Romanovsky
2021-06-07 8:17 ` [PATCH rdma-next v1 15/15] RDMA: Remove rdma_set_device_sysfs_group() Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a1a8a96629405ff3b2990f5f8dbd7b57a818571e.1623053078.git.leonro@nvidia.com \
--to=leon@kernel.org \
--cc=aditr@vmware.com \
--cc=aelior@marvell.com \
--cc=benve@cisco.com \
--cc=bharat@chelsio.com \
--cc=clang-built-linux@googlegroups.com \
--cc=dennis.dalessandro@cornelisnetworks.com \
--cc=devesh.sharma@broadcom.com \
--cc=dledford@redhat.com \
--cc=galpress@amazon.com \
--cc=gregkh@linuxfoundation.org \
--cc=jgg@nvidia.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mike.marciniszyn@cornelisnetworks.com \
--cc=mkalderon@marvell.com \
--cc=mustafa.ismail@intel.com \
--cc=nareshkumar.pbs@broadcom.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=neescoba@cisco.com \
--cc=pv-drivers@vmware.com \
--cc=selvin.xavier@broadcom.com \
--cc=shiraz.saleem@intel.com \
--cc=yishaih@nvidia.com \
--cc=zyjzyj2000@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).