Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Anand Khoje <anand.a.khoje@oracle.com>
To:     linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     dledford@redhat.com, jgg@ziepe.ca, haakon.bugge@oracle.com,
        leon@kernel.org
Subject: [PATCH v7 for-next 2/3] IB/core: Shifting initialization of device->cache_lock.
Date:   Wed, 30 Jun 2021 15:16:14 +0530
Message-Id: <20210630094615.808-3-anand.a.khoje@oracle.com>
In-Reply-To: <20210630094615.808-1-anand.a.khoje@oracle.com>
References: <20210630094615.808-1-anand.a.khoje@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from AAKHOJE-T480.in.oracle.com (49.36.45.114) by TYAPR01CA0007.jpnprd01.prod.outlook.com (2603:1096:404::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Wed, 30 Jun 2021 09:46:34 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 203465ce-2058-4a73-e06a-08d93babf422
X-MS-TrafficTypeDiagnostic: CY4PR10MB1557:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <CY4PR10MB155711D1660D92C3F6152FE6C5019@CY4PR10MB1557.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:3631;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: zoKM41vpEG0nWLaDH/XXUIlwmZDkvyaXKtDxOFRmNRFiOVq6Pj8Pb0+zu0e96rLwVTDytDXX4EtjegCsxpDZP6RFrA+lV/yDB9RGEI0mtoj3jK9ASmdGGREkl9nLjfrUJPV8DruzTZDKDTGbWQWnamPDlsoslHoA/cPOsr8oJpmhwZRfTKJnsydXai3urxWGE2rC2qdRD1IwF6htvtMlcLD4Zzi7HevCfjIqNvqr0u1RqI6dOxMx5eASrNRQQ/sYfV7J06kHvtMuzou3V4dETwNA8F/CxXMq5kWpYyT8Y8ADX6WtM5t9S1ug+wi6C4J8xZJFgWsVdrGXB/0lDi+PRi5aZ5GXYDzfLkOreUmOT3JKS9YJcnsPVKUoGg+O3agsCvdVUWgjqwVQ9VRQFURn7P846qgT4KklNRgTiigLQUtpuFsw42gducWF4+5wZNSGIClFFiOrslSPEQr1GM9iHnb4wx8KD/qYrS4S09tCHATh2O8ZETsHN+nBxBYG/0/NBGXVYkL7w7AXeRBrVTDvBawEMv43qbvepOB2AyxAPIYGOK6FpiXBSMVGf6ygnC+zEaS5ry9tgQxMKBNCTF+Le1YMUU+k3bfmKIGTRbaxboYiMEEV4B7J/5DM7dBU2ejVSnm2KYal0kwILRAnOYti6nCO1Ne88VME+sYIy2xWwEPgqB3om3yZosT5P6Y1NllbVVv0ZvPYWVd6c6EC0bsdyg==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR1001MB2086.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(396003)(366004)(136003)(376002)(346002)(66946007)(66556008)(66476007)(1076003)(16526019)(186003)(1006002)(6486002)(6666004)(36756003)(83380400001)(26005)(8936002)(8676002)(52116002)(478600001)(38100700002)(38350700002)(5660300002)(103116003)(2906002)(4326008)(86362001)(956004)(2616005)(7696005)(316002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eJZfMdLpMgYkuJs5vjH/v5HX/gtb/4XuWO2aQWt/t2gVR0PhN2EJXoUiMS5Y?=
 =?us-ascii?Q?02D9uRHjnJiFBm5/M9XtqU99i5kktPCre3XeAhcIYRp1logkPN4K+wTIBxnP?=
 =?us-ascii?Q?ifNpH6xZhfQcdeZ3/A2SjU7yMSt3bQJ6f3cxMEGs3g0+w7vjOatrT3hyxZTV?=
 =?us-ascii?Q?FsKoemPBFkExXs83oJefNdtWjadj9oeV7B/RMwW56wxgcNjU9Gcx3J2N2qD8?=
 =?us-ascii?Q?2k8yMdjZNstxhNMt4tSydRomMelRKpz6AsNG4YAUy5x4GbNeVoK9dlPCEx07?=
 =?us-ascii?Q?7GrtsqSporTkc58oViu5CmpQ5aUTuG4SVgcQG3bzuq+ErrvwjTwERQNFCQ5l?=
 =?us-ascii?Q?5vnS6vUTu5Z0Us54iSaunrVUp4qiGW0X7LJ+501Wx1HX5Fu8iXCTqGpyZI99?=
 =?us-ascii?Q?gXTelH4WUChUTkAucuaamB8CS87i3TB5oS0kqXza16MQFThuAJyLIYjfDUWJ?=
 =?us-ascii?Q?ZPQTT9mW3cTbDJJtyBsM5thWAQMXNj+l9SpFIi/0OAj+R1v7/gtnM7tK41Ij?=
 =?us-ascii?Q?e+X32pxkCUlCgK07FTD8c/eQzNkpJsPF0bhP+QchkoXNEUAlVP1400vuPnvn?=
 =?us-ascii?Q?70qprfIAbAjDaAroiSxRUujb1FGZfmChb6jA++Hf4hUuyCD/wRQUPmfMnsk8?=
 =?us-ascii?Q?Tb/BetkbO8efwSopJRViddtbdgvtKV44Vxjl5GtNkfgLi7qwr+RbRWGxMdk7?=
 =?us-ascii?Q?ClrCPDKlqidsZK49TvlmCZH1otF0jWATDYfhVVUghqEr4Awbd3oAEqxfVo2C?=
 =?us-ascii?Q?RB7YAKrnN2l1VP+jh2vZEt7MQc8Wp6l5PwRf0dSdyw6HatqgqzyFazywBrAt?=
 =?us-ascii?Q?JK4nXcCKzzfspXS5D1Sr4tVk9O2irkdwxWNeDc1K8dXYl1DkTCNkthW/6IHj?=
 =?us-ascii?Q?0Tp+7ISFtlCdjCQLRcKBHTnTmns62hVsj7KnMWcxqpFqhcVFJiTdaibL6X5o?=
 =?us-ascii?Q?zewv4wLr4AsTQlDo0j2M7dddFdDphRJhTMZVJWfyj4d8/uY/qD/3akfGJdKk?=
 =?us-ascii?Q?Ap5NEvS77zDeXjM/MXQycJqXJI3EctPd+os/cR7OjYpaLfGTpDCotvhwPFLB?=
 =?us-ascii?Q?Q4UHm5z1nwQfr7cgA4DQhEhpR0nbGYcpAQWJrfvDS66LhtfTDXyIul0mYyqD?=
 =?us-ascii?Q?pn2kTfITFyUvtKViTw92QwuLtOpZCWIeR6MZM2i1n1AQwuv42zTAtZvEqarP?=
 =?us-ascii?Q?MgtooqMtp7IwSCjz6tamQAxMcVIHH+Iyc2c5RApk446CRqFEt3CXHiRYne8Y?=
 =?us-ascii?Q?MsNCgLddH/CRS3uD+paB5MNxMWNJTO9KSF1edvU5KVmIIUmCA2rKoMhcZpqX?=
 =?us-ascii?Q?VsIE9AzHHZUBLVmlmUacfD4J?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 203465ce-2058-4a73-e06a-08d93babf422
X-MS-Exchange-CrossTenant-AuthSource: CY4PR1001MB2086.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 09:46:37.5376
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: vcmF63CJWMn3NdMXTmnM/9cFRD5D2IcoFvBkpp99FPAkZI3QvEeOL0FCok7QjN/QPWB33QDWBnhuYvOO7RYW5j3XInzPbZaHGt8PYOh2JmY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR10MB1557
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10030 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 spamscore=0
 suspectscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000
 definitions=main-2106300063
X-Proofpoint-ORIG-GUID: Pq4LlqN6mSkcWFDqdxhtS5UXL3wJ8n0o
X-Proofpoint-GUID: Pq4LlqN6mSkcWFDqdxhtS5UXL3wJ8n0o
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The lock cache_lock of struct ib_device is initialized in function
ib_cache_setup_one(). This is much later than the device initialization
in _ib_alloc_device().

This change shifts initialization of cache_lock in _ib_alloc_device().

Suggested-by: Haakon Bugge <haakon.bugge@oracle.com>
Signed-off-by: Anand Khoje <anand.a.khoje@oracle.com>
---
 drivers/infiniband/core/cache.c  | 2 --
 drivers/infiniband/core/device.c | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 929399e..0c98dd3 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -1621,8 +1621,6 @@ int ib_cache_setup_one(struct ib_device *device)
 	u32 p;
 	int err;
 
-	rwlock_init(&device->cache_lock);
-
 	err = gid_table_setup_one(device);
 	if (err)
 		return err;
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index fa20b18..ba0ad72 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -607,6 +607,8 @@ struct ib_device *_ib_alloc_device(size_t size)
 	for (i = 0; i < ARRAY_SIZE(device->cq_pools); i++)
 		INIT_LIST_HEAD(&device->cq_pools[i]);
 
+	rwlock_init(&device->cache_lock);
+
 	device->uverbs_cmd_mask =
 		BIT_ULL(IB_USER_VERBS_CMD_ALLOC_MW) |
 		BIT_ULL(IB_USER_VERBS_CMD_ALLOC_PD) |
-- 
1.8.3.1