Received-SPF: pass (google.com: domain of linux-kernel+bounces-214606-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: John Garry <john.g.garry@oracle.com>
To: axboe@kernel.dk, paolo.valente@unimore.it
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
        jiapeng.chong@linux.alibaba.com, hch@lst.de,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH 2/3] block: Drop locking annotation for limits_lock
Date: Fri, 14 Jun 2024 09:03:44 +0000
Message-Id: <20240614090345.655716-3-john.g.garry@oracle.com>
In-Reply-To: <20240614090345.655716-1-john.g.garry@oracle.com>
References: <20240614090345.655716-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?cGAAMjuGFIN6s2A1o8W6dh9RoSiqQxtaaq5poJ/gu2nYO6Cc8pIV2bFe6FhA?=
 =?us-ascii?Q?nZAuC0y6ejpf3+zVj5Faw/Dc0BS36HApM2Ayo9TCELAvIX53oofz543Qi3RL?=
 =?us-ascii?Q?waz1pLDiwhQtdaipemtyrjrxguBPPGQAYB1WWx2cxbFYUC89MEflaISbV17t?=
 =?us-ascii?Q?xPUB9iITvAdmxnYvlaQQoiWwufPr4jS7+MvZ5fd/2qvdS+HX5JpOSO4+G49l?=
 =?us-ascii?Q?d8pzXiT+p5iwg/oEwcTowzBYUs69rE89uzJDAg+24Wp86pxMBcUHNZSp9ou+?=
 =?us-ascii?Q?9ysOdvj0kICLzWpHGSZKYXFG5lCr/9r3NGs9s7Nkdkn8UgPBcMx0Sntu9cpk?=
 =?us-ascii?Q?sqrOjcX5240Xwyki1m+CV2BO5i7BSt9DsUGdgEkd77YUqugpYeZ+Kap62dgR?=
 =?us-ascii?Q?wjG84Zbwoj/JEsYP+HeuBv19Pv9YLvbFMifq+EqlHW3wg+DbQIFs2UWE31iU?=
 =?us-ascii?Q?FibDYdI7LDB0jaz8VlSatm8n3Av9fPIm1MoVf85WVzD9MH2PZfpb/MOsPOwi?=
 =?us-ascii?Q?Sx6q0k4yEDPgxnykG2bMfinP8NmzxNaIQ+CopQs0vQxwpyuscmPwh6aDl0qH?=
 =?us-ascii?Q?wsVN7yw8WArldNiCTVB57OZFlYHb7WxbbC/yl/paN+/zjM2cKeK7wKsTmwPk?=
 =?us-ascii?Q?LnYDM0u76PVEzqEPFefqNGxY3OPOgWZoMU10S81HOXVpdYOScnHYFyRby8uv?=
 =?us-ascii?Q?g+oscGf0Y7NBklOZMOy2FAykK3dNB+O6UICtUsPGdEmBV3NI8/wP/ix0ZUdG?=
 =?us-ascii?Q?Yf4oJTWhW32xPBVmjlEspBgf5hkIdlc8WanTcI9SoSBROB9oKQNyUsLkK6fO?=
 =?us-ascii?Q?7uM6DAP2wQfB9V5C4Rgt98O++lokWc2bYo0AUUCdArGhU5eqo9tVawHcMKqf?=
 =?us-ascii?Q?gQnBOjNr97efIWe6NRIooevQCBeJCr7Z/qlkwWr96Tqi3TExecELp2/GPUJp?=
 =?us-ascii?Q?67D/mSwnygWlY8n+H0ODJuOFCnmN5FO76cpjUG28dG6NupSmIf4Gcl06Md6Q?=
 =?us-ascii?Q?/p68TdKZTTnEPVNodVd3bYaAZnfYMlqs+DagAKpVOxyYqNhYnJf2ilry/EjM?=
 =?us-ascii?Q?q35bUj+o3nzttpQslyP9aPwyxdMf3vjJGe6Vkhp9yphdQZToBMeP4ZfA14cZ?=
 =?us-ascii?Q?tkfNYj2VxqEnseLgQL90lApg3DvnYEqiJpD+oMzbTq7gubsDnWyPii4Mg7Wy?=
 =?us-ascii?Q?tkbQB4waTHCEue5OapnCFUi7H/pXFXuMUlbVW9RpDshYW2KRtPJ7OkUpoBZL?=
 =?us-ascii?Q?+ZTC0+Sq/I41KDkwbtm1iHbVWYSAiOcT7TqHOOAtHlXGI5uLMrpVma7c2ZlJ?=
 =?us-ascii?Q?ZVHgLpWeLwQM3UkqCrd6Fxf4RlogDzXQU8l6KUlemqg5wbhoybC9ZTykxIYb?=
 =?us-ascii?Q?Kkj5YJfFD7QMc3dHLLYh1XIhAPnIk2R753l3VQZ8LCb6gYedDrNOrIX5u+9d?=
 =?us-ascii?Q?2Pd+TQUODtQPgev9YklwAar7A3C1A40XYdnwXpfeqsViXx8XI9ACEpWsHglT?=
 =?us-ascii?Q?K0IqKpwBLLY17s0Ew3QHsaEasqkEFN3nozUJU0tuTnIiIzRqSBUCCkuXhHYY?=
 =?us-ascii?Q?a3Q1U4Y//3L3A9f5EW5MlATo8lFXdCzSXUTJE2S6hhU8la56GgbV5qEBb4Vo?=
 =?us-ascii?Q?Kg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	ghSQ2w3BLPW90FpsOdP6uuGLtpg8Owa7aHrwwIoYHQt0kPpNjDzz6ffdyl8T6YDaXAXeW3SytwT59mRYuiFB4fo4YmKAMXAwK5mKeRs1RguBurZpw2hz1JfytiiXul/jHuwU73i+18FvHKPTyWFoz3tgBeHOJaVWo3JdWY8Kxi+cDqfRw0adWtSn8mBDV/+p/nAqlwYqo4tGLgdMq6pmaMR8qqLHXbB1eGe559sCldfeZ5Ow1zc0FEwceIR1sCLWHihWoJaeMKvs+7ndfklBx1Lz6RrGDOLIG3WxApCWBCTy6VubWQBA30lDvqjhdUE1p8OCzKaVgbkMdjKF7efagsatkmNksR3gqFdulYvLpqsCh/euH/gOtXLeWf/qgZoivZJczoJMZj6qX9MoYwsUtExeIclvYjRjCc9qkEflQZuKF40CNF7wWIut9Pj27IcbgKlyowx0NA83xgQxLRV7dViLlhec/ct+3W29UqaNe0iQ6mKnD8prlzhBt12Y4YkWVPY9zygm594H/bscj7m1SdFeT+ubPBf/fnPiDAV/31T1EYs4EfwDmNNSJtff7iTUICT7rb61ATjpgDGYHi/iqoSBVUKZk0YwH5rauf7+4/A=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cd997cd2-ae12-48e6-38c0-08dc8c50ee08
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 09:03:59.9730
 (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: tApI+Xdj8cRmkQHNGdqumNkSD/l8IB4xqhSGvIodNacYkbLp6I4w0v2Z4IjIqaKme4HBEdz86SBkacT+r96NWw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB8105
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-13_15,2024-06-13_02,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0
 mlxlogscore=999 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2406140061
X-Proofpoint-GUID: -vd3GrfVQM8B_0_h9nMm7S67qBNuTsBo
X-Proofpoint-ORIG-GUID: -vd3GrfVQM8B_0_h9nMm7S67qBNuTsBo

Currently compiling block/blk-settings.c with C=1 gives the following
warning:
block/blk-settings.c:262:9: warning: context imbalance in 'queue_limits_commit_update' - wrong count at exit

request_queue.limits_lock is a mutex. Sparse locking annotation for
mutexes are currently not supported - see [0] - so drop that locking
annotation.

[0] https://lore.kernel.org/lkml/cover.1579893447.git.jbi.octave@gmail.com/T/#mbb8bda6c0a7ca7ce19f46df976a8e3b489745488

Fixes: d690cb8ae14bd ("block: add an API to atomically update queue limits")
Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 block/blk-settings.c   | 1 -
 include/linux/blkdev.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/block/blk-settings.c b/block/blk-settings.c
index effeb9a639bb..cdc7845260b9 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -254,7 +254,6 @@ int blk_set_default_limits(struct queue_limits *lim)
  */
 int queue_limits_commit_update(struct request_queue *q,
 		struct queue_limits *lim)
-	__releases(q->limits_lock)
 {
 	int error = blk_validate_limits(lim);
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 24c36929920b..f798c9c6eb30 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -904,7 +904,6 @@ static inline unsigned int blk_chunk_sectors_left(sector_t offset,
  */
 static inline struct queue_limits
 queue_limits_start_update(struct request_queue *q)
-	__acquires(q->limits_lock)
 {
 	mutex_lock(&q->limits_lock);
 	return q->limits;
-- 
2.31.1