From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 CE2BF328243; Wed, 6 May 2026 09:04:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778058290; cv=none; b=eFnp1XJkjS+pCWJmzy0yfr7F0gHy1moNt23uytOnZ5tVJL+O80BSBfRzF7iG0Xtuw+JpWq4mZV60NrOjZl6XBNDZUNfkmLWJqsMwu4bZoJ5O934sdhqTCo3WmhbHz8uMRBiz8SSr3w23J+HboZTpMVVfB2B5HhEkaFbLBQpaKVs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778058290; c=relaxed/simple; bh=gIPiLyzvkCimISkjxiTv8tC+1/5WUILhKNCmRBva46I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=lDWvPMqSJCOBySFLFg8LujWezIgCjIF1bqUthEe6r/ijrgtsWf73rI220klIoSVqSvBFHnw7iR1IrGboKQkIVWRVNK/ZKl4YkrOyVF2SuVPTms5aHjJGWPYpfpqwWBPZkIhRgMA6SwytRzIBsAsxMAcoOQE/wdl+lcthbtgXjNE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: 9d7af5c2492a11f1aa26b74ffac11d73-20260506 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NO_NAME, HR_CTE_8B, HR_CTT_TXT HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME, HR_SJ_DIGIT_LEN HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM, HR_SJ_PHRASE HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT, HR_TO_NO_NAME IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_EXISTED, SN_EXISTED SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_GOOD_SPF, GTI_FG_BS GTI_RG_INFO, GTI_C_BU, AMN_GOOD, ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:dabb9f43-839c-4592-8144-23fafb84ff51,IP:10, URL:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-5 X-CID-INFO: VERSION:1.3.12,REQID:dabb9f43-839c-4592-8144-23fafb84ff51,IP:10,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:e7bac3a,CLOUDID:995d4eb785a2556e923e7b6c198be648,BulkI D:260506170441HOP1KWDG,BulkQuantity:0,Recheck:0,SF:10|66|78|81|82|101|102| 127|850|898,TC:nil,Content:0|15|50,EDM:-3,IP:-2,URL:0,File:nil,RT:nil,Bulk :nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0, BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 9d7af5c2492a11f1aa26b74ffac11d73-20260506 X-User: yanlonglong@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 822434755; Wed, 06 May 2026 17:04:40 +0800 From: yanlonglong To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yanlonglong@kylinos.cn, yukuai@fnnas.com Subject: [PATCH v2] block: add NULL checks for bic in bfq_bfqq_save_state function Date: Wed, 6 May 2026 17:04:09 +0800 Message-Id: <20260506090409.49648-1-yanlonglong@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the `bic` variable is null, referencing `bfqq_data` through `bic` will cause the program to crash. Therefore, the null check for `bic` should be moved to the beginning of the function to prevent referencing a null pointer. Fixed:fd571df0ac5b289af8（"block, bfq: turn bfqq_data into an array in bfq_io_cq"） Signed-off-by: yanlonglong --- block/bfq-iosched.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 141c602d5e85..e952e4ea2dd4 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3035,9 +3035,8 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, static void bfq_bfqq_save_state(struct bfq_queue *bfqq) { struct bfq_io_cq *bic = bfqq->bic; - unsigned int a_idx = bfqq->actuator_idx; - struct bfq_iocq_bfqq_data *bfqq_data = &bic->bfqq_data[a_idx]; - + unsigned int a_idx = 0; + struct bfq_iocq_bfqq_data *bfqq_data = NULL; /* * If !bfqq->bic, the queue is already shared or its requests * have already been redirected to a shared queue; both idle window @@ -3046,6 +3045,9 @@ static void bfq_bfqq_save_state(struct bfq_queue *bfqq) if (!bic) return; + a_idx = bfqq->actuator_idx; + bfqq_data = &bic->bfqq_data[a_idx]; + bfqq_data->saved_last_serv_time_ns = bfqq->last_serv_time_ns; bfqq_data->saved_inject_limit = bfqq->inject_limit; bfqq_data->saved_decrease_time_jif = bfqq->decrease_time_jif; -- 2.43.0