Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 00EC63054DE for ; Tue, 14 Oct 2025 20:18:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760473104; cv=none; b=bSuHz5d1JA8BgxEal2j2O7SuW4td1LmgROij1t2nk+REhSljEhTAesDkVEpTaQSXCue0Fz22fIZ0/V0ESAT0zwQ0r52y05jxtwlrfKnxpeLz6WM1qJBbuRXucOeUzGNB1+4BxK31IWyPWRs4txJJ7vz4AQl9mvCZ/ysj1yok5mg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760473104; c=relaxed/simple; bh=bj2QzUkn/eqS/3Y1RaxXHXQ8OWb2G6xNXyw0d9mmm50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bRvdTPLNfTH9uUdK0qhB64wdW1msB8gezsr0NwHGHBb+CKcBoq+eN/3Y/VQI6aPgXjWUoFj/8Zdws2MS4DP3pj6IgDkmVxVzk9ImoOPQaDqbeJy3JJF5WI3+DV0lh7mIMLT2X2wfBQoUk3vmam8mrcf8d20270qxDMHq0lfrWcc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org; spf=pass smtp.mailfrom=acm.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b=zQQ0PHbH; arc=none smtp.client-ip=199.89.3.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=acm.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b="zQQ0PHbH" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4cmQWy0Xx4zm0yVD; Tue, 14 Oct 2025 20:18:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=acm.org; h= content-transfer-encoding:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received; s=mr01; t=1760473100; x=1763065101; bh=kb8x2 jSqTTTkQCCVkMQcldhyp1AD05T9Yo/IVCFHKwQ=; b=zQQ0PHbH3HNvFGhbjv1yN akymY4fMRHt8cBzy0MJsGQhpgcWj+v5Tu6Vcu1V4BMU4eSdxNf4+Gctu7oTmqbmm /YFXVRiXm26OPUN31fSj5AUE14Ea6bpk3f3U8bHJA/LWa0UuNxSgkHvzLKhz/Ntw SIcVpCgIrVF0XL957nqN70hdGKqh70Pyig22GdLW27HGClcfQ95h/cX/6y0YJXmH L1wWESzchYprNKPHeBbLL7nVSJFANFsgUhBwhkMaqJ3cHINrrd6oJov8+jHGkk7H GcFKmnzSfkEa0lsvNL4hb2hvIbWseperbMEgH7fW1wQz1eAWkmdrg1Hh/y1MCDDe w== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id adGVr3SBNeM2; Tue, 14 Oct 2025 20:18:20 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.180.219]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bvanassche@acm.org) by 004.mia.mailroute.net (Postfix) with ESMTPSA id 4cmQWq6HwPzm0yVJ; Tue, 14 Oct 2025 20:18:15 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Hannes Reinecke , John Garry , Ming Lei , "James E.J. Bottomley" Subject: [PATCH v6 03/28] scsi: core: Make the budget map optional Date: Tue, 14 Oct 2025 13:15:45 -0700 Message-ID: <20251014201707.3396650-4-bvanassche@acm.org> X-Mailer: git-send-email 2.51.0.788.g6d19910ace-goog In-Reply-To: <20251014201707.3396650-1-bvanassche@acm.org> References: <20251014201707.3396650-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Prepare for not allocating a budget map for pseudo SCSI devices by checking whether a budget map has been allocated before using it. Cc: Hannes Reinecke Cc: John Garry Cc: Ming Lei Signed-off-by: Bart Van Assche --- drivers/scsi/scsi.c | 5 +++++ drivers/scsi/scsi_error.c | 3 +++ drivers/scsi/scsi_lib.c | 9 +++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 9a0f467264b3..589ae28b2c8b 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -216,6 +216,9 @@ int scsi_device_max_queue_depth(struct scsi_device *s= dev) */ int scsi_change_queue_depth(struct scsi_device *sdev, int depth) { + if (!sdev->budget_map.map) + return -EINVAL; + depth =3D min_t(int, depth, scsi_device_max_queue_depth(sdev)); =20 if (depth > 0) { @@ -255,6 +258,8 @@ EXPORT_SYMBOL(scsi_change_queue_depth); */ int scsi_track_queue_full(struct scsi_device *sdev, int depth) { + if (!sdev->budget_map.map) + return 0; =20 /* * Don't let QUEUE_FULLs on the same diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 746ff6a1f309..87636068cd37 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -749,6 +749,9 @@ static void scsi_handle_queue_ramp_up(struct scsi_dev= ice *sdev) const struct scsi_host_template *sht =3D sdev->host->hostt; struct scsi_device *tmp_sdev; =20 + if (!sdev->budget_map.map) + return; + if (!sht->track_queue_depth || sdev->queue_depth >=3D sdev->max_queue_depth) return; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index d52bbbe5a357..53ff348b3a4c 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -396,7 +396,8 @@ void scsi_device_unbusy(struct scsi_device *sdev, str= uct scsi_cmnd *cmd) if (starget->can_queue > 0) atomic_dec(&starget->target_busy); =20 - sbitmap_put(&sdev->budget_map, cmd->budget_token); + if (sdev->budget_map.map) + sbitmap_put(&sdev->budget_map, cmd->budget_token); cmd->budget_token =3D -1; } =20 @@ -1360,6 +1361,9 @@ static inline int scsi_dev_queue_ready(struct reque= st_queue *q, { int token; =20 + if (!sdev->budget_map.map) + return INT_MAX; + token =3D sbitmap_get(&sdev->budget_map); if (token < 0) return -1; @@ -1749,7 +1753,8 @@ static void scsi_mq_put_budget(struct request_queue= *q, int budget_token) { struct scsi_device *sdev =3D q->queuedata; =20 - sbitmap_put(&sdev->budget_map, budget_token); + if (sdev->budget_map.map) + sbitmap_put(&sdev->budget_map, budget_token); } =20 /*