From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 E2B072D77F6 for ; Wed, 12 Nov 2025 05:29:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762925384; cv=none; b=kzlOmQMpKP1FRk0tS82WSUFi82GN5ynd5wkQ8PqbibIaNGI2axbBRzkPn/FbGzUzes7ZuG072wHfVSwVs9vpDS0m99N4+kTrIMU9y6t1hT2zY6muaQXrCreDVBTxVQURJofEZ0yF6sJ1qvWKbl+ER47XmwTLEuUCgi78EbRm/YA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762925384; c=relaxed/simple; bh=P8GPKZYkr2ygSy+PWpN+18Z5dPMdk6QB7YMWgubPuJ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S7byZOh/THdv1a1WITt6a4f4OT45PRPw6KIlMTjRXiQcnWFx/xXED74q1F+lpYJkkyNgJXLAp1HDB5h8sbO/ChA6sO16kQ9Ydj83ocI053UMIcQ/TL51uFPFrqCwA/qtYQiC4eSC7htyBFkbR4HBKcY/CgQYH4Tq+b0yuK0NjtM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=H6xdAqMr; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="H6xdAqMr" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AC37IRB008518; Wed, 12 Nov 2025 05:29:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=RIeEnEASy94q/dkN3 bE4d+5BOCu9LWqiRCxLJDSP2LM=; b=H6xdAqMrCr79pcQVOvuq9L/iM0p22BYCO +mwM59PpLh/gpEU6ihxV/A5Uxgr+1mlBf57H9DQDBnjPNL0oeuOxu9hNLjy4mltv KEFCjHvVh+6jwoKuyGHZw4i0i1GJOLjhj3wrgt74rMb/Epv6Dvgtd40yXKaNrm8P rV7n/Cgdo/D1luTE7l0azbaS3dJJ70JfNa+SrtNMDSrTlKoF3P5TwXcrFxkY83n7 /d3+BNALnRnhJgni0rDz1MCn/qTPcVKiGTE9eshkpGuBHOM0jR/aVr9B2lkAxK8m 8KuIQUFvcYZ7mbkl+fj/oPOBW2xczmQ3XyW2I16iDe4ESkxXOkwZQ== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aa5cj7hnx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Nov 2025 05:29:27 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5AC1eDP4007313; Wed, 12 Nov 2025 05:29:26 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4aajdje9au-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Nov 2025 05:29:26 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5AC5TPVK44368320 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 12 Nov 2025 05:29:25 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ED9412004B; Wed, 12 Nov 2025 05:29:24 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B6C9320040; Wed, 12 Nov 2025 05:29:20 +0000 (GMT) Received: from li-c9696b4c-3419-11b2-a85c-f9edc3bf8a84.ibm.com.com (unknown [9.43.41.49]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 12 Nov 2025 05:29:20 +0000 (GMT) From: Nilay Shroff To: linux-block@vger.kernel.org Cc: ming.lei@redhat.com, hch@lst.de, axboe@kernel.dk, yi.zhang@redhat.com, czhong@redhat.com, yukuai@fnnas.com, gjoyce@ibm.com Subject: [PATCHv5 5/5] block: define alloc_sched_data and free_sched_data methods for kyber Date: Wed, 12 Nov 2025 10:56:06 +0530 Message-ID: <20251112052848.1433256-6-nilay@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251112052848.1433256-1-nilay@linux.ibm.com> References: <20251112052848.1433256-1-nilay@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=Ss+dKfO0 c=1 sm=1 tr=0 ts=69141b37 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=1sDiDhgU5wRd15m8xSAA:9 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA4MDA5NSBTYWx0ZWRfX0VGJGqWJoL2e SYSZf7Et8IyhYsEKQLySrcLcBmthXc5RCUOaGA90F+1/TK1LF1Ze26rZuxFGdDtLTar5G5zoOsL pgp3gZ3xQ0GI1+3GdvT/mnEHGeypdVzhZrNQtqgUDN7FbaR3yEYroNP/bK3Ug3sPYOazNb8NU2J 0MaI2Oj/gr/WKxQrxiM7BK2fwEUAR0kvdqrEOcXk0NDrhKEFeHD4ZPiaGjbcrMDGGKWNXtBjC05 CkP7oo8VOEqCWdEudupRkDzJA+di5VJ1uILoBFLYdrie7t23XbS87DROkP08S+jUZZXMHUEitqn vOF9TDLLzfewi+Us8d02qWQ0lMOs6mPVgPZy1RXFN8ENQBH71gawtA3HFdbnft4kkxMcM7TCiC7 /vR8fk1wW3AYllRd+tCQPtQiy4Wqog== X-Proofpoint-GUID: kZb3dkx-ygsBwDxeG3gosD_-AYXfFONX X-Proofpoint-ORIG-GUID: kZb3dkx-ygsBwDxeG3gosD_-AYXfFONX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-12_01,2025-11-11_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 impostorscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511080095 Currently, the Kyber elevator allocates its private data dynamically in ->init_sched and frees it in ->exit_sched. However, since ->init_sched is invoked during elevator switch after acquiring both ->freeze_lock and ->elevator_lock, it may trigger the lockdep splat [1] due to dependency on pcpu_alloc_mutex. To resolve this, move the elevator data allocation and deallocation logic from ->init_sched and ->exit_sched into the newly introduced ->alloc_sched_data and ->free_sched_data methods. These callbacks are invoked before acquiring ->freeze_lock and ->elevator_lock, ensuring that memory allocation happens safely without introducing additional locking dependencies. This change breaks the dependency chain involving pcpu_alloc_mutex and prevents the reported lockdep warning. [1] https://lore.kernel.org/all/CAGVVp+VNW4M-5DZMNoADp6o2VKFhi7KxWpTDkcnVyjO0=-D5+A@mail.gmail.com/ Reported-by: Changhui Zhong Reported-by: Yi Zhang Closes: https://lore.kernel.org/all/CAGVVp+VNW4M-5DZMNoADp6o2VKFhi7KxWpTDkcnVyjO0=-D5+A@mail.gmail.com/ Tested-by: Yi Zhang Reviewed-by: Ming Lei Signed-off-by: Nilay Shroff --- block/kyber-iosched.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index 18efd6ef2a2b..c1b36ffd19ce 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c @@ -409,30 +409,42 @@ static void kyber_depth_updated(struct request_queue *q) static int kyber_init_sched(struct request_queue *q, struct elevator_queue *eq) { - struct kyber_queue_data *kqd; - - kqd = kyber_queue_data_alloc(q); - if (IS_ERR(kqd)) - return PTR_ERR(kqd); - blk_stat_enable_accounting(q); blk_queue_flag_clear(QUEUE_FLAG_SQ_SCHED, q); - eq->elevator_data = kqd; q->elevator = eq; kyber_depth_updated(q); return 0; } +static void *kyber_alloc_sched_data(struct request_queue *q) +{ + struct kyber_queue_data *kqd; + + kqd = kyber_queue_data_alloc(q); + if (IS_ERR(kqd)) + return NULL; + + return kqd; +} + static void kyber_exit_sched(struct elevator_queue *e) { struct kyber_queue_data *kqd = e->elevator_data; - int i; timer_shutdown_sync(&kqd->timer); blk_stat_disable_accounting(kqd->q); +} + +static void kyber_free_sched_data(void *elv_data) +{ + struct kyber_queue_data *kqd = elv_data; + int i; + + if (!kqd) + return; for (i = 0; i < KYBER_NUM_DOMAINS; i++) sbitmap_queue_free(&kqd->domain_tokens[i]); @@ -1004,6 +1016,8 @@ static struct elevator_type kyber_sched = { .exit_sched = kyber_exit_sched, .init_hctx = kyber_init_hctx, .exit_hctx = kyber_exit_hctx, + .alloc_sched_data = kyber_alloc_sched_data, + .free_sched_data = kyber_free_sched_data, .limit_depth = kyber_limit_depth, .bio_merge = kyber_bio_merge, .prepare_request = kyber_prepare_request, -- 2.51.0