From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 284F925A343 for ; Wed, 26 Feb 2025 03:35:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.189 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740540948; cv=none; b=J+JVYH1JMFKdFCK4NH63THm8R92lfc70O0sgtG4Xd2KwbZaYc4wbEYXBq9NKOKIemp5kggPVtALHh2sIeQlBj1NKatnISrRjwefZgTRK4zOR45LQbHi7LSZS6fakdoan7CbphsRF1Rz7/8E0E23FpHejXFdLP6zo4DK2+4SNKQM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740540948; c=relaxed/simple; bh=5Zi8aCuYqoBMpMJoAQuFe9XXnBo6JhN7c628hykREwI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WaLaQKtKzcw3FuKVs8UKiOZ0QgZBx386OetVSH9+ejV1/cdx2yV3Wl+B41JS7/8Zxs9rDaktUjqmcO++ZgGtr3r2K9rhlSNrJunE7TqdMXr1jJX/PmVlJI2tpL0Gfbf6ryIhvKuTqI7/QF1Gr6LqhyILIUXyHXxHb9myha5P8Kg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Lpr8h+Wn; arc=none smtp.client-ip=95.215.58.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Lpr8h+Wn" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1740540935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=aMgncgwo54ntG1eJYN0oZGDokP7lPxw8+ChbEuj9iIM=; b=Lpr8h+WnNYDIG4HdnllKV3E0lgpbpQs1aW/OXWe15MAsng5FIUrz3w723U9Fk01CehEygC 8j5xGq8uqTMPjSILNMSR6Sd3Q/ZvpUxSvsj8oXm9O4uTG7Z6mh5SxQ5zL7JPMpIcxpz9dA LS9UFkc48QJpbe3liCp9EQ0pfLsGLGc= From: Roman Gushchin To: Jason Gunthorpe Cc: Roman Gushchin , Leon Romanovsky , Maher Sanalla , Parav Pandit , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] net: RDMA: explicitly enumerate ib_device attribute groups Date: Wed, 26 Feb 2025 03:35:25 +0000 Message-ID: <20250226033526.2769817-1-roman.gushchin@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Explicitly enumerate ib_device's attribute groups. Signed-off-by: Roman Gushchin Cc: Jason Gunthorpe Cc: Leon Romanovsky Cc: Maher Sanalla Cc: Parav Pandit Cc: linux-rdma@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/infiniband/core/device.c | 4 ++-- include/rdma/ib_verbs.h | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 0ded91f056f3..8dea307addf1 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -1404,8 +1404,8 @@ int ib_register_device(struct ib_device *device, const char *name, return ret; } - device->groups[0] = &ib_dev_attr_group; - device->groups[1] = device->ops.device_group; + device->groups[IB_ATTR_GROUP_DEV_ATTR] = &ib_dev_attr_group; + device->groups[IB_ATTR_GROUP_DRIVER_ATTR] = device->ops.device_group; ret = ib_setup_device_attrs(device); if (ret) goto cache_cleanup; diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index b59bf30de430..9c4c4238e6fc 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2728,6 +2728,13 @@ struct ib_core_device { struct ib_device *owner; /* reach back to owner ib_device */ }; +enum ib_device_attr_group { + IB_ATTR_GROUP_DEV_ATTR = 0, /* Device attributes */ + IB_ATTR_GROUP_DRIVER_ATTR = 1, /* Driver-provided attributes */ + IB_ATTR_GROUP_HW_STATS = 2, /* hw_stats */ + IB_ATTR_GROUP_LAST, /* NULL pointer terminating array */ +}; + struct rdma_restrack_root; struct ib_device { /* Do not access @dma_device directly from ULP nor from HW drivers. */ @@ -2761,12 +2768,7 @@ struct ib_device { struct ib_core_device coredev; }; - /* First group is for device attributes, - * Second group is for driver provided attributes (optional). - * Third group is for the hw_stats - * It is a NULL terminated array. - */ - const struct attribute_group *groups[4]; + const struct attribute_group *groups[IB_ATTR_GROUP_LAST + 1]; u64 uverbs_cmd_mask; -- 2.48.1.658.g4767266eb4-goog