Received-SPF: pass (google.com: domain of linux-kernel+bounces-214607-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
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 3/3] block: BFQ: Refactor bfq_exit_icq() to silence sparse warning
Date: Fri, 14 Jun 2024 09:03:45 +0000
Message-Id: <20240614090345.655716-4-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?db8vgU9EnMQsGfB1aSIlqerX0179HhzPZ6G9v5y0s5GjwSaZO8i1zGgj/00p?=
 =?us-ascii?Q?D2cgRzakNJ+g61oPfhyRqacD7H3OAtj3oKsh8VYy1aCFQ0dvfi9Q5cBE82V9?=
 =?us-ascii?Q?YNiHe3wK2bhlB/5MEzdHRZr4UPzV7QkCgjWV7AWWlrIuxQ5FmQlAHPVYSi4J?=
 =?us-ascii?Q?6KbJOooHuVs9hCvPoo7Nyrt+0iTKrHt6c3/nuT7lPhsPMGlTSHTkpZzytRoR?=
 =?us-ascii?Q?1Ny9/ppxdeVnLRezw3VcTZy3XAoz4MOqVX1ZFInUhAFYTXZix+zQ/ZeBVoid?=
 =?us-ascii?Q?JYHe52T9o8G6UNgGG2e7gAbnuwI7FHcK4O9d0CybbvvIcwWosXoOJswSRahp?=
 =?us-ascii?Q?YVabpBxAKCBzuBUXpIJPxcw1d6onAF/MwRh4/Gc/olghmoc6GgsG9Ap1kIc7?=
 =?us-ascii?Q?pr8F0jWibq6O9/ms1kNFEiDaDsL8KzqoTYyFwz+R79UxlEXSQuzMPYby7rS3?=
 =?us-ascii?Q?1J2Krsn6w81sBfibus2j6RYniqHAdziJqE7qErtJbWK67pjaIMFsC7ywtFF3?=
 =?us-ascii?Q?8XkiBsgWmhJWHAicVTB+pz65dIebRxbcXuybS4WUGXWB1EcHuGnmr+/BmHfi?=
 =?us-ascii?Q?w4dBHg6Ffj25HgyTvZQA4gdSLc2VVHpVZO8R3gMsIV9j8ud+Zzb3U3Sjc1nW?=
 =?us-ascii?Q?GYof+axjRbxbmNTPRqcc9wBNW4+VM93PlwRQmCOAWz5Gsd1WsSRzbkA/+tlg?=
 =?us-ascii?Q?oRfOf/yg25SpabxCOWMPy+lW7tD13vlvMJgLBHJPWWX+c9xVOL1+qDDDVG6z?=
 =?us-ascii?Q?dXGRth+8u7rL+LDYHXSsBTWZVWmUGZFrLymJl5jKGPMKunhg+7oa5SBWuDU/?=
 =?us-ascii?Q?yubpgtsLU6MDy3Pee7NNju+PVxrKLiFEqo60YdrZL8y+n7aHTNr0geNOlSPQ?=
 =?us-ascii?Q?2LM+0Ax42vHCFGQ7IBWzGf/pcchv7MVayKz0ahg6uSBBJyNc0rlk8y4qubcp?=
 =?us-ascii?Q?P5NF0r9OD2Fet5itGeiSX1t2brOOEblelp8GeRrsxg+Z7OSQVAlb0AK5NYO3?=
 =?us-ascii?Q?QNXvuzJnLXihvIViHHTaNWGT/aB1dTtJO9ryFF0lylyEA4SNLSiPBD54lTKu?=
 =?us-ascii?Q?d1jFQ/naO2s/sDflVf/b00+MWIXObHVXJx3er/L/3nGFpzy0Kqr9ZgQmbHII?=
 =?us-ascii?Q?cj8BtJFVLxyeXGt/jV4N23FZLmfVeZ7Q1Ss+raf6yGE8gKvRx0LERZjqHAer?=
 =?us-ascii?Q?9E2RSJEjmWnnm6RZJz9ms00OcW7ORy5lNv1ItBQvQJuQo4ZAJ5k00Dp02ADq?=
 =?us-ascii?Q?weXyuHJLZHPnqpmVPwE+DgKSaduL/pSL+F1bsL3P68a5x4CsvBS07QQ0BgAL?=
 =?us-ascii?Q?dwC+bUGiyjhnQeX6oW41UNiQGW8otxQcDh5F36f0UydKniyVrBb/HNH4KG+a?=
 =?us-ascii?Q?+Iu7AEgCN4wpLdE2hknP+v7hFK33yRdXCjDoNJr178n1zU0GyDl14owqMG2C?=
 =?us-ascii?Q?IQLnFex5YVASZ253SaHhnjU+XiLyOcPAdfgNxZfNUXQQuhk1GIoM9clNjtSM?=
 =?us-ascii?Q?SPKloUyOEgF9s81pebLBuw9SiS/lCbiYbZd6lgjApjfpPugTqWtb3W58w+X6?=
 =?us-ascii?Q?nh3ucEmqVPM4b7YTS3iwM6xL6ZwrBd0WJalgPqUQ9oaiHw7KVmWaEAgDOcF/?=
 =?us-ascii?Q?nw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	lqEI1hd0DyfoYe9Khg3vPPyPNuNbPsWRIvWqpecFZ46K2515HAI9f8UaZiwT2nzappCKApNulKIJuc7ZYPYQI4whcxpkotl/FUtEaWsfNKI7BAfbFb0pg8zBnfMJINjAsQnMKj5X6M3Y4t4QBni3TO/dXrwlEN6IvdYzF6XwU/kTINPsCX/T2+9vNK3zJoD5z3z9QdMGPwmVndwDJhRg9RymVwupwnhcMODRswcp3MKkvF9HGmwMJHkVcy+EuaULvkwFN+rZK/ff1gtiGgR14VXITN4CmF1/UngpPo9z7T0dhhYcRQe2tmI0CW/bsllsC02C4aSHc9pYqIi5xWIslTnTHJDtPy1Gw7FgxY0dXOvbtJH14WXWno0f+RDrOYA8yEPGzF58h+ZmOXeyFi0sdcc90ftrhcW+Db/DAxXvteTT0wCPLvuFhgCV+YDZ8ZGBlA4q7Yi+5SvGI5X5AFNl7El8XCjEJhSpULOwz6NmfRG0Dvxm/HQeYKLh7MK8xfUwSfngy8Wur6mQvOAP9zIMG/StlJVX7uJs8vDR5PeQpdSCutPtRQD0kNBdOAUqUPiBKqDXEGTGmQ9OwJV4VAZNWo8WP8ne+E7atQbIhqVrBQ4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a83ccd39-3111-426a-4a59-08dc8c50ef75
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:04:02.3899
 (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: L4prmE9CKqJUwj6X5bf06AeLJGMR/jhGp9cPoGq6gWb/Lmyq9A66I3I05WpNqqaxpqqG0KmfQThAIjXDJNkC6w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4600
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 mlxlogscore=999 adultscore=0
 phishscore=0 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2406140061
X-Proofpoint-ORIG-GUID: 5h1Pv9gOmjZo9F_WFoCQO1LyyLBMieuV
X-Proofpoint-GUID: 5h1Pv9gOmjZo9F_WFoCQO1LyyLBMieuV

Currently building for C=1 generates the following warning:
block/bfq-iosched.c:5498:9: warning: context imbalance in 'bfq_exit_icq' - different lock contexts for basic block

Refactor bfq_exit_icq() into a core part which loops for the actuators,
and only lock calling this routine when necessary.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 block/bfq-iosched.c | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 4b88a54a9b76..36a4998c4b37 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -5463,40 +5463,42 @@ static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync,
 	}
 }
 
+static void _bfq_exit_icq(struct bfq_io_cq *bic, unsigned int num_actuators)
+{
+	struct bfq_iocq_bfqq_data *bfqq_data = bic->bfqq_data;
+	unsigned int act_idx;
+
+	for (act_idx = 0; act_idx < num_actuators; act_idx++) {
+		if (bfqq_data[act_idx].stable_merge_bfqq)
+			bfq_put_stable_ref(bfqq_data[act_idx].stable_merge_bfqq);
+
+		bfq_exit_icq_bfqq(bic, true, act_idx);
+		bfq_exit_icq_bfqq(bic, false, act_idx);
+	}
+}
+
 static void bfq_exit_icq(struct io_cq *icq)
 {
 	struct bfq_io_cq *bic = icq_to_bic(icq);
 	struct bfq_data *bfqd = bic_to_bfqd(bic);
 	unsigned long flags;
-	unsigned int act_idx;
+
 	/*
 	 * If bfqd and thus bfqd->num_actuators is not available any
 	 * longer, then cycle over all possible per-actuator bfqqs in
 	 * next loop. We rely on bic being zeroed on creation, and
 	 * therefore on its unused per-actuator fields being NULL.
-	 */
-	unsigned int num_actuators = BFQ_MAX_ACTUATORS;
-	struct bfq_iocq_bfqq_data *bfqq_data = bic->bfqq_data;
-
-	/*
+	 *
 	 * bfqd is NULL if scheduler already exited, and in that case
 	 * this is the last time these queues are accessed.
 	 */
 	if (bfqd) {
 		spin_lock_irqsave(&bfqd->lock, flags);
-		num_actuators = bfqd->num_actuators;
-	}
-
-	for (act_idx = 0; act_idx < num_actuators; act_idx++) {
-		if (bfqq_data[act_idx].stable_merge_bfqq)
-			bfq_put_stable_ref(bfqq_data[act_idx].stable_merge_bfqq);
-
-		bfq_exit_icq_bfqq(bic, true, act_idx);
-		bfq_exit_icq_bfqq(bic, false, act_idx);
-	}
-
-	if (bfqd)
+		_bfq_exit_icq(bic, bfqd->num_actuators);
 		spin_unlock_irqrestore(&bfqd->lock, flags);
+	} else {
+		_bfq_exit_icq(bic, BFQ_MAX_ACTUATORS);
+	}
 }
 
 /*
-- 
2.31.1