From nobody Sun Feb 8 21:38:05 2026 Received: from mail-yw1-f226.google.com (mail-yw1-f226.google.com [209.85.128.226]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7CFD1EB1B4 for ; Mon, 21 Apr 2025 23:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745279204; cv=none; b=GoNYr4rH76GXnPGSIiYnbJBUts8D8epC4FfKB/UDKXwJx2XDa4xhXZzsoUVDREu00akQIDg6Qx/d3941bCSKbbMqJwNJ/Ee5+2xVFRhn8Fk4Af2H9pGALGchdRoYadrbuk4DiCJEiSG+yah6QeP92P76GSumH4BKQnYs5aC5pCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745279204; c=relaxed/simple; bh=9wYTE2oUOZnepQcf2ivxa7wZGzMC5FJ5XGr4yhpuPBg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jhDRznBTBF9N4JcHU46kEFZMwUfF7Z6qT/GzgIj21UpRcIUdIopWLYy54WPfZSN8OKVPK+ngnmmPIcU51vSssCSWhf27kPDNIdODhqLwgDBZTt2WNZ97K4K0pTN4GCOF9J1MzXff1c/Her8Ewv+vB+xh+bzTe2XGuyJr9DX2rI4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=YfD+5mqj; arc=none smtp.client-ip=209.85.128.226 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="YfD+5mqj" Received: by mail-yw1-f226.google.com with SMTP id 00721157ae682-70427fb838cso33693997b3.2 for ; Mon, 21 Apr 2025 16:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745279201; x=1745884001; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=S334cfNZ8ng81OQZat982Z13jweFHj6DzVSGbLAV/C0=; b=YfD+5mqjGmtw1FimGDdBi26EycM0u/es7JgOiEWX7SEGHidzvx2ugEGs6bLRv9qzI7 bpPL+9MYHjhxGAEI8np1NYd72JMScg2f1NDaMBIiwr3bmeWVei1pjAYe+x7az/oiqC1q Z6mdNeHVQZ0HPGV4lgQkR5M3MaKqx2AlK+KkJ3YZzUl0gJB0YJGIPSHcISAJwpxQegYf SPVim2wtlPt62UUtb5OnDoLkW8OPfhACekmFbMU22AP/fRJfas7q9iXgMievAXz4UfUX MHYbud/ySpSr+H66zNJ1lyuSms9KoGyVWx8pAccMKuJn8BxL+9mS5EdBF/Q0hPvelCke sKPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745279201; x=1745884001; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S334cfNZ8ng81OQZat982Z13jweFHj6DzVSGbLAV/C0=; b=Dp9oiee6voLGSXBc64cgY8gy9xBy4i7gHXBQwz7qd5Bf1+D7/DTup5rPtmoKUk+D71 82GoQYO4fIQl7cCSKRbiBAzqFfFQF55jvPEEUv9vYhz2NJO2U4hueBsqMvUqu4CrUmqV 9VVnxVuuWZtbh5WlXtcP9kaDwhme4FSJRjMeOoqxkdPc+1z0iskD2U2M3ndV7D5F8jhV OKqe3U2l0wZ+elG4nu1ofWnqD5MIrHyiRznO41NzRhxTmxi02vp4vYeqoYT1DZtiiX+I zbb4NqgExyqO9lnIzIRG+/N6X64W4eQo5CqDJkwUxZ9S0lRaHMlykDnLbUqoJGGpSgiZ wIBw== X-Forwarded-Encrypted: i=1; AJvYcCV+0iPv+uER2P7PxUSHCShDlsquSWOoU0ljnTQz3xgMDr+dFtkCxjcrUGNuPSXEqLNE1EIZKSQIA95vpvc=@vger.kernel.org X-Gm-Message-State: AOJu0YxD8vZR5KITMC2WPhL6Re9tpA/JfrVV3QwxYmAgokc9dthLSNw9 gJPQ806/hJ9Mwsvsx52MSl7tf1HpDdSaHm6qKVcJ7W5t27R9sK7seiofm3vofN8Ex94B7K6+tlP AKiXLI5E8PaDxeof3ku8oLNcTVY3YRn3vDdSEIsKfop0JTbYx X-Gm-Gg: ASbGncvs2Gx+ArcqUDDDXcDS6CeVrTtqsfJL6/bV1NqehmOiAogSi9vFgSywepcrD8m fcYyE8w8tdSHt2slFa2WzZ42PyV5nvI7v8+P2dTiUgbdX/icq0lYyIaSuomgloOId5IBoJWaZ0+ MOWMfN/QqOWH3Ka3+6E5OMGGKcvQ5O6F7dpG51NWLpCFhm5A6kpb0yOrcGs4P69IjhUvxYrh8hZ TUAUpeADSv4WUaAG0aVzRm5ifv0khXqLqYXBsPacT4YFTKvOj2AUe5o7Dym/n+gEzyePbVr X-Google-Smtp-Source: AGHT+IGE70iqEkSb2dbHKBgNbWem7kWn1HTfbtQyVZARzXMhUmFeRE9Z47t00fcIecFXCZ0XaQt/m3JWgTTO X-Received: by 2002:a05:690c:4989:b0:703:b5ae:a3da with SMTP id 00721157ae682-706cce10199mr203124197b3.32.1745279201573; Mon, 21 Apr 2025 16:46:41 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-706ca5ba988sm2644947b3.45.2025.04.21.16.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 16:46:41 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [10.7.70.36]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id EA6A93405BC; Mon, 21 Apr 2025 17:46:40 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id DBC8EE40371; Mon, 21 Apr 2025 17:46:40 -0600 (MDT) From: Uday Shankar Date: Mon, 21 Apr 2025 17:46:40 -0600 Subject: [PATCH 1/4] ublk: factor out ublk_commit_and_fetch Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250421-ublk_constify-v1-1-3371f9e9f73c@purestorage.com> References: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com> In-Reply-To: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com> To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar , Caleb Sander Mateos X-Mailer: b4 0.14.2 Move the logic for the UBLK_IO_COMMIT_AND_FETCH_REQ opcode into its own function. This also allows us to mark ublk_queue pointers as const for that operation, which can help prevent data races since we may allow concurrent operation on one ublk_queue in the future. Also open code ublk_commit_completion in ublk_commit_and_fetch to reduce the number of parameters/avoid a redundant lookup. Suggested-by: Ming Lei Signed-off-by: Uday Shankar Reviewed-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 91 +++++++++++++++++++++++---------------------= ---- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 03653bd7a1dfd69f5545a580dbc74de9d850c0ae..57b8625ae64232a750d4f94e76a= af119c28f9450 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1589,30 +1589,6 @@ static int ublk_ch_mmap(struct file *filp, struct vm= _area_struct *vma) return remap_pfn_range(vma, vma->vm_start, pfn, sz, vma->vm_page_prot); } =20 -static void ublk_commit_completion(struct ublk_device *ub, - const struct ublksrv_io_cmd *ub_cmd) -{ - u32 qid =3D ub_cmd->q_id, tag =3D ub_cmd->tag; - struct ublk_queue *ubq =3D ublk_get_queue(ub, qid); - struct ublk_io *io =3D &ubq->ios[tag]; - struct request *req; - - /* now this cmd slot is owned by nbd driver */ - io->flags &=3D ~UBLK_IO_FLAG_OWNED_BY_SRV; - io->res =3D ub_cmd->result; - - /* find the io request and complete */ - req =3D blk_mq_tag_to_rq(ub->tag_set.tags[qid], tag); - if (WARN_ON_ONCE(unlikely(!req))) - return; - - if (req_op(req) =3D=3D REQ_OP_ZONE_APPEND) - req->__sector =3D ub_cmd->zone_append_lba; - - if (likely(!blk_should_fake_timeout(req->q))) - ublk_put_req_ref(ubq, req); -} - static void __ublk_fail_req(struct ublk_queue *ubq, struct ublk_io *io, struct request *req) { @@ -2015,6 +1991,47 @@ static int ublk_fetch(struct io_uring_cmd *cmd, stru= ct ublk_queue *ubq, return ret; } =20 +static int ublk_commit_and_fetch(const struct ublk_queue *ubq, + struct ublk_io *io, struct io_uring_cmd *cmd, + const struct ublksrv_io_cmd *ub_cmd) +{ + struct blk_mq_tags *tags =3D ubq->dev->tag_set.tags[ub_cmd->q_id]; + struct request *req =3D blk_mq_tag_to_rq(tags, ub_cmd->tag); + + if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) + return -EINVAL; + + if (ublk_need_map_io(ubq)) { + /* + * COMMIT_AND_FETCH_REQ has to provide IO buffer if + * NEED GET DATA is not enabled or it is Read IO. + */ + if (!ub_cmd->addr && (!ublk_need_get_data(ubq) || + req_op(req) =3D=3D REQ_OP_READ)) + return -EINVAL; + } else if (req_op(req) !=3D REQ_OP_ZONE_APPEND && ub_cmd->addr) { + /* + * User copy requires addr to be unset when command is + * not zone append + */ + return -EINVAL; + } + + ublk_fill_io_cmd(io, cmd, ub_cmd->addr); + + /* now this cmd slot is owned by ublk driver */ + io->flags &=3D ~UBLK_IO_FLAG_OWNED_BY_SRV; + io->res =3D ub_cmd->result; + + if (req_op(req) =3D=3D REQ_OP_ZONE_APPEND) + req->__sector =3D ub_cmd->zone_append_lba; + + if (likely(!blk_should_fake_timeout(req->q))) + ublk_put_req_ref(ubq, req); + + return 0; +} + static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags, const struct ublksrv_io_cmd *ub_cmd) @@ -2025,7 +2042,6 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *c= md, u32 cmd_op =3D cmd->cmd_op; unsigned tag =3D ub_cmd->tag; int ret =3D -EINVAL; - struct request *req; =20 pr_devel("%s: received: cmd op %d queue %d tag %d result %d\n", __func__, cmd->cmd_op, ub_cmd->q_id, tag, @@ -2076,30 +2092,9 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *= cmd, goto out; break; case UBLK_IO_COMMIT_AND_FETCH_REQ: - req =3D blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag); - - if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) - goto out; - - if (ublk_need_map_io(ubq)) { - /* - * COMMIT_AND_FETCH_REQ has to provide IO buffer if - * NEED GET DATA is not enabled or it is Read IO. - */ - if (!ub_cmd->addr && (!ublk_need_get_data(ubq) || - req_op(req) =3D=3D REQ_OP_READ)) - goto out; - } else if (req_op(req) !=3D REQ_OP_ZONE_APPEND && ub_cmd->addr) { - /* - * User copy requires addr to be unset when command is - * not zone append - */ - ret =3D -EINVAL; + ret =3D ublk_commit_and_fetch(ubq, io, cmd, ub_cmd); + if (ret) goto out; - } - - ublk_fill_io_cmd(io, cmd, ub_cmd->addr); - ublk_commit_completion(ub, ub_cmd); break; case UBLK_IO_NEED_GET_DATA: if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) --=20 2.34.1 From nobody Sun Feb 8 21:38:05 2026 Received: from mail-yw1-f228.google.com (mail-yw1-f228.google.com [209.85.128.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7DAA20297B for ; Mon, 21 Apr 2025 23:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745279205; cv=none; b=FtTxajWkiFhVw1xJpo3EwJYOiXAiMZ2smZKCtUc5hJWRRl0XEai+TmAkM827SVaiBLNHj13hrI4AFzWJ72vOeruxhdILc+vHg26cOat2CVGPhxUWMORcqOlAPrrhHVQoB3GSJft7Fv6WgiyW9qQYM4yAvnugtt1VRM9J9ym7RMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745279205; c=relaxed/simple; bh=rlM5Puc742ThpcgQ067dYu6MUOsHaKZ5wRazdAOJ7Vc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LTvoPfYALsNEn8jwXFeguXCZWrTHublQnkB+DP2wPRxJkXULOQfZVsl041aX4E9kDUfdkcsgUniymotz9iq3ixCCFXf7KftpSRCBRC2S5H44h9VS80UVwgitHJnCu7Oc2yGEo6uXayBIB/+iFG4WlJZStKtgXMGZHje6rCh6cPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=fpkIYJ8F; arc=none smtp.client-ip=209.85.128.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="fpkIYJ8F" Received: by mail-yw1-f228.google.com with SMTP id 00721157ae682-7023843e467so36604507b3.2 for ; Mon, 21 Apr 2025 16:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745279201; x=1745884001; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dixiQ7kYDqakidw0Gdvn1/XcoLDGmQ+tbTNuOpmWRKU=; b=fpkIYJ8FhBh21KrfNybmlB8wyqccjr2Pr2mG+AVjVZTzOoX7F5B0rr6nzg1Dn/xtXj m3mQMV/E4+VTtOa3fD0s+agtk18tHps5a/04bwGSmDNHEsma6Uv8tUswxzdd3k5Xnsxo YEnrOUGozPSFMimp2SQbYHpwXd4pZJdEf56yuBIOq8NYxdA4Zx0RuwF0jaVHs3frmkBx 7hfd5Zoj++z2OFDGnthx8406gwOLCgSSSsu85qO1/PcJTJigiTwz7Uf0hGTL18infDHZ 66TAKB/70JnBhD1AYM+2VWBqcZpYGdROVQwsYs1MydeMrMFd1BGcl0zy0sLupgsIphKZ akIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745279201; x=1745884001; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dixiQ7kYDqakidw0Gdvn1/XcoLDGmQ+tbTNuOpmWRKU=; b=hjqTivBjxeqvtcrUm1vlJGU4GjYX/KwjWfHgre5EqRombxI1w3ErZ/2eG7+86o5idh 5S8fopani2zksZ6t0epNKwgB6PpHnf/3UNn3FBEUecQ64OKKhJPc0oOKsP7RoDTPajQE 0eaxzvLI8ymgdcgLFVc0PXu5g9y6G+11HdKnCauWiH0J4jdjjJv8znAhdNnooiIZd3oD dBaX2vqKxWZcfHrVR+Vs5By7Uk07TcjrAVXgrNZTnvdCHv8we9V/jDQHQYy01UtXFSnx 9zjwhXurDJOy40N5lb8d3d1HnyKKR2mCdTFOzUOXQkDjdoMdU495HCp9hyHKkO2YjF1j sIww== X-Forwarded-Encrypted: i=1; AJvYcCVDcEfbUidIvqWxy9WtbibDw/rn/5iUHFXQvlwTAm4SxLYQjaCA3adJPhTFBmG+J6+bsRs/4TrLjHP7KUc=@vger.kernel.org X-Gm-Message-State: AOJu0YxdZCrNk2NFua81kroUpQMZaxz70i8FIGCBSzUJb4hHuloqPk7C syUVg/g564WFhiDG+OClH3URz0TCpEORZrzqHcPR1ynq9/IwYUgJ6WngE7Jz/MqEsv3ijxau1dZ WkEzALv5/oDy9Jjuf1f1SttoyUn0vvEHiL1dv+eh9blf/To0S X-Gm-Gg: ASbGnctz6Eq0eDOcGEA2E/BgL1FcbPE5FqSKppklvxjJJqh9A1vjslJ1JG8cHU7wqtr PlGt7x7/tQtrIfdxM7JvoZfXFomGy+FSGHXsTaey+BNmxvel/WB7rMaKcWQZlYbty0NHTZzRVSe bGaar0V+Q+ZVG/9Ut1FpzOmbKVACUiofDM0j22boLdM7SMfSyTbS3YMjJAfkgdEIvmGaLbnDFhY MVNUqKN6U7k6TiiXt33oSNGsWOMYYh0B6Km/PO3nV+FYFGXtfszB0VSHAOtu7azJNUePJJC X-Google-Smtp-Source: AGHT+IH/+2sl4eo/naMKs4X1CL86m5auDGUTr33kZ4p/FOCGe/jmKGV6fWxG9h3Xm6BheqPBSpO492YMAHHh X-Received: by 2002:a05:6902:240a:b0:e58:3209:bdb6 with SMTP id 3f1490d57ef6-e7297db64aamr17178307276.16.1745279201577; Mon, 21 Apr 2025 16:46:41 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 3f1490d57ef6-e7295877fd8sm206033276.13.2025.04.21.16.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 16:46:41 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [10.7.70.36]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id EA3983404CA; Mon, 21 Apr 2025 17:46:40 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id E44CDE4055F; Mon, 21 Apr 2025 17:46:40 -0600 (MDT) From: Uday Shankar Date: Mon, 21 Apr 2025 17:46:41 -0600 Subject: [PATCH 2/4] ublk: mark ublk_queue as const for ublk_register_io_buf Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250421-ublk_constify-v1-2-3371f9e9f73c@purestorage.com> References: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com> In-Reply-To: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com> To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar , Caleb Sander Mateos X-Mailer: b4 0.14.2 In the future, we may allow multiple tasks to operate on one ublk_queue concurrently. Any writes to ublk_queue in ublk_register_io_buf, which has no synchronization, would then become data races. Try to ensure that such writes do not exist by marking ublk_queue pointers as const in ublk_register_io_buf. Suggested-by: Ming Lei Signed-off-by: Uday Shankar Reviewed-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 57b8625ae64232a750d4f94e76aaf119c28f9450..a617ffde412936d3c37a3ded08a= 79e3557f4f56f 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -203,7 +203,7 @@ struct ublk_params_header { static void ublk_stop_dev_unlocked(struct ublk_device *ub); static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ub= q); static inline struct request *__ublk_check_and_get_req(struct ublk_device = *ub, - struct ublk_queue *ubq, int tag, size_t offset); + const struct ublk_queue *ubq, int tag, size_t offset); static inline unsigned int ublk_req_build_flags(struct request *req); static inline struct ublksrv_io_desc *ublk_get_iod(struct ublk_queue *ubq, int tag); @@ -1918,7 +1918,7 @@ static void ublk_io_release(void *priv) } =20 static int ublk_register_io_buf(struct io_uring_cmd *cmd, - struct ublk_queue *ubq, unsigned int tag, + const struct ublk_queue *ubq, unsigned int tag, unsigned int index, unsigned int issue_flags) { struct ublk_device *ub =3D cmd->file->private_data; @@ -2115,7 +2115,7 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *c= md, } =20 static inline struct request *__ublk_check_and_get_req(struct ublk_device = *ub, - struct ublk_queue *ubq, int tag, size_t offset) + const struct ublk_queue *ubq, int tag, size_t offset) { struct request *req; =20 --=20 2.34.1 From nobody Sun Feb 8 21:38:05 2026 Received: from mail-pl1-f226.google.com (mail-pl1-f226.google.com [209.85.214.226]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B7101C5F27 for ; Mon, 21 Apr 2025 23:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745279205; cv=none; b=FPwi7ng8B2qdenC1OGW8V4txTG4N5Zxksl7lUBruHCmwCSJbLNMlaAWxvMxlgDk/7OAejbZ9j1Q+2jSKFurb8O8ORtH4MUXtKoPnIUHFctJKDR9/mrHAms2WK4hsTiDLSaTPVKxHOEaNRfcEXZEAVwv7q9AVkUhKrMOzdmTqnRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745279205; c=relaxed/simple; bh=q5mjSTIJWpmEc9qqwXdalHq7CRhz2UnhwrElR9uav0g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rFAI9jPCxVrSZQ6x0+iFDVZzUzYI0K5NRQsgphT8uKFbB6QAKDTmgjD+tdn2xA0Owt2IkZiPrdvSofgorDg2YUP9NPU1GUN+2btzpQSL95OGX9nSBk2dR0eNb7m67ssBlq0ydklWXzRfUW1rXaul42XhLl/F+rORVuimtZ0xTlI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=TcmQQAWX; arc=none smtp.client-ip=209.85.214.226 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="TcmQQAWX" Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-22c33e4fdb8so46319235ad.2 for ; Mon, 21 Apr 2025 16:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745279201; x=1745884001; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/4GUkXOvvMryrdPEMzkdmHqVlgNQDZjj0ozZX+g8EDM=; b=TcmQQAWXSKWQbWiK6t+FVZiC41B1sDDcgEMv+NOtdjlT2hvPVIZNcGLKLgsE4OoMIC NMCR+7c3fzZ9EzzlJA8ZTFvP0cmCWRpSj6c/V7a4fDhwAIyRPeshlR+SnO+DyBVqPNib TVaaO15EvBZSOnBgMCpP9LAu6AhXOh46zxvzni4Hf2Wby3XXCw7RzqllHCH4XYO1f/tD hEimnwPT0dasVhoEZPPBSS4eoCNFsTO3W0YhmY5pG+CPZNa25O+bfxSVJx8nKn0fXJJo fSSYOwYTDYKsiq/gyv0O7yiKCnWzzaFwJTQkQzyzBRnMbv3tObbgw72V+cyxDaaA1O1w conA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745279201; x=1745884001; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/4GUkXOvvMryrdPEMzkdmHqVlgNQDZjj0ozZX+g8EDM=; b=mqdKxBv/j+DHvk+t7wXcZcO5UulLv9aUGEAYvhZK4M2gqIQ+BSmy+8oaExvqdIIiNU uY8MRrDPvI6hMiOnG5KCpQBH+y/vsPJ9T8xrByzjBpuNkkoXDCKxLo+0R+NJWvvONmjQ Tmnb9NneX4s+2KxLQook6DKMBhv3CO56ZMcZqLnWm56XhWlrLsu0nmRhrkMT9SZAPePn e1Mn4v9PvnUyqZwK2eEmOHSGC5x4FAAo17nft3pPHOLdvF3Nar+9lSr+cMpkrn5sz+yQ sV7Skcy0WbV0K42sHBVWEIiNX+Ivz1z3Ktc3PNFf2ayUMS3SF1L3Yuhg06lEDa18kK5j COlQ== X-Forwarded-Encrypted: i=1; AJvYcCUha9xk0VHGBN9n+yqtHUWTZJC0dR40B8cgIe1i0vVW9UdHmkQg9AhEKi74/yyUTKCBH3wZwy8wC7XGJBM=@vger.kernel.org X-Gm-Message-State: AOJu0YzG273hliulC35YjSDX2LHVbn5t3QGWQTU/YPvQDGwM9RXrNMQo 6rIBMQ3IiCIFXYzeKE6eFTGOyvUGWGtXJN4lGUPzDT5F89Ykw+9f9FzGiThZdcL0GzFBMGWR1YW 1JQa6mHKjFA1Pq0LCL9vB7g63NE/wK40j X-Gm-Gg: ASbGncv7p1HKg6H4nx6fke8JVJoLPMnYK3aNw27jOd0RC8IRaaceYusxRwLFd6iLGGg Jkn8wNe0bzAlPEJI9hFcnJrUKu0UhZg48bxGlx9SUx5vD6CkGBRAAcwBwCMhDfXs7i484OdSqUV GQXRJw7tc6qqy/ki9XkEAv5myzbbY1prQ4pK90O+wXioypk6Livly+UmHUKOLovam95J6bhczGq 1/SBP00mFiu8QBRu+skcrnchrzd4gIR+022prMux2NVZI2D+xuVg4iLeiX7v76G8wjm9xau1Mi2 oJXK/h1dhRI= X-Google-Smtp-Source: AGHT+IEjreakm61T+7xrh1VhMYjV3lcdyEoVMupNRN3tj8cOZ1VRhh+pFqFyOv2HR/V3r7iIFgzg3cC/svHj X-Received: by 2002:a17:902:ce11:b0:223:5ca1:3b0b with SMTP id d9443c01a7336-22c5361105amr228202925ad.40.1745279201593; Mon, 21 Apr 2025 16:46:41 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-22c50bed629sm4303475ad.43.2025.04.21.16.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 16:46:41 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [10.7.70.36]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id F2E8E340644; Mon, 21 Apr 2025 17:46:40 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id EC02CE4055F; Mon, 21 Apr 2025 17:46:40 -0600 (MDT) From: Uday Shankar Date: Mon, 21 Apr 2025 17:46:42 -0600 Subject: [PATCH 3/4] ublk: factor out ublk_get_data Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250421-ublk_constify-v1-3-3371f9e9f73c@purestorage.com> References: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com> In-Reply-To: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com> To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar , Caleb Sander Mateos X-Mailer: b4 0.14.2 Move all the logic for the UBLK_IO_NEED_GET_DATA opcode into its own function. This also allows us to mark ublk_queue pointers as const for that operation, which can help prevent data races since we may allow concurrent operation on one ublk_queue in the future. Suggested-by: Ming Lei Signed-off-by: Uday Shankar Reviewed-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index a617ffde412936d3c37a3ded08a79e3557f4f56f..f5d4593d5941931efa7bc7d2106= 830cd2981f4bd 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1241,7 +1241,7 @@ static void ublk_cmd_tw_cb(struct io_uring_cmd *cmd, ublk_dispatch_req(ubq, pdu->req, issue_flags); } =20 -static void ublk_queue_cmd(struct ublk_queue *ubq, struct request *rq) +static void ublk_queue_cmd(const struct ublk_queue *ubq, struct request *r= q) { struct io_uring_cmd *cmd =3D ubq->ios[rq->tag].cmd; struct ublk_uring_cmd_pdu *pdu =3D ublk_get_uring_cmd_pdu(cmd); @@ -1864,15 +1864,6 @@ static void ublk_mark_io_ready(struct ublk_device *u= b, struct ublk_queue *ubq) } } =20 -static void ublk_handle_need_get_data(struct ublk_device *ub, int q_id, - int tag) -{ - struct ublk_queue *ubq =3D ublk_get_queue(ub, q_id); - struct request *req =3D blk_mq_tag_to_rq(ub->tag_set.tags[q_id], tag); - - ublk_queue_cmd(ubq, req); -} - static inline int ublk_check_cmd_op(u32 cmd_op) { u32 ioc_type =3D _IOC_TYPE(cmd_op); @@ -2032,6 +2023,22 @@ static int ublk_commit_and_fetch(const struct ublk_q= ueue *ubq, return 0; } =20 +static int ublk_get_data(const struct ublk_queue *ubq, struct ublk_io *io, + struct io_uring_cmd *cmd, + const struct ublksrv_io_cmd *ub_cmd) +{ + struct blk_mq_tags *tags =3D ubq->dev->tag_set.tags[ub_cmd->q_id]; + struct request *req =3D blk_mq_tag_to_rq(tags, ub_cmd->tag); + + if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) + return -EINVAL; + + ublk_fill_io_cmd(io, cmd, ub_cmd->addr); + ublk_queue_cmd(ubq, req); + + return 0; +} + static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags, const struct ublksrv_io_cmd *ub_cmd) @@ -2097,10 +2104,9 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *= cmd, goto out; break; case UBLK_IO_NEED_GET_DATA: - if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) + ret =3D ublk_get_data(ubq, io, cmd, ub_cmd); + if (ret) goto out; - ublk_fill_io_cmd(io, cmd, ub_cmd->addr); - ublk_handle_need_get_data(ub, ub_cmd->q_id, ub_cmd->tag); break; default: goto out; --=20 2.34.1 From nobody Sun Feb 8 21:38:05 2026 Received: from mail-io1-f97.google.com (mail-io1-f97.google.com [209.85.166.97]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62DAB218ABC for ; Mon, 21 Apr 2025 23:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.97 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745279206; cv=none; b=XwM3Lm5vrEYPnsQ1ibOaU1PbVxaRV8gailqO0yIlaW8pTSSU/RdhGo/MYizeQ0f+A3fTzhYTwE4qGZ83/FmFMOxVE1cd2WBXg07zeqeDvnekhp2oVptwvdu4h7QBisxhhMa3wqb+wmXAOsWy2MIElRMaOsdCpleKMUNblswuXEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745279206; c=relaxed/simple; bh=mcgOA6RJ6YcO2wxxjMR3tXWhG6Ehq/v0rWuRIp/xytA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EhYu4BmYx+FjPw5iTj+VDULQLatEmVmQceFF4Y731N01Tl3wflMBOAhJ20IGsjF4BjrrqflyEhbwBS4yJKW+JgsuDEp/Y28NH6PX0f2Ax/wEvqMN2uUvuoOKyNhR9fou61fpKzLLj87QWsD0heglp9XKo15RaEsZfjizALwmCIs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=V4SW4bgt; arc=none smtp.client-ip=209.85.166.97 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="V4SW4bgt" Received: by mail-io1-f97.google.com with SMTP id ca18e2360f4ac-86135ac9542so142637239f.1 for ; Mon, 21 Apr 2025 16:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745279202; x=1745884002; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=g8OfCdyPLDsCsG60ZcCmWO2IkmLngYrZyR838vN7s8U=; b=V4SW4bgt/w75J4mM/WOTvKvHz6HDgakGecW+kiuDh7WIoo6bzGJGr7pnnau9Qn/ueU JmQYIqjEKMSuUtbjA9vr6FjUm624DTf0v/F/4c0K1ejwoVgPY/F+aOWGkTV9WNhMrRvm z1dU4T8G3VZV0YPsOuROLqm+Qu8yMv2cCI8zH81rNxFPnT/IZyxG/Tv6Bf9ydPp79pKa SQ+axSv+qde91mUwx9OZyvS33Zgyx04nT3LkjUhN98Br2azO4RSiTPe4weuYxJ9fK6U0 /TFNo7f88kzMsx/YFPwWM5Sw61OZPLD2Bn8oIK4ou2togYwkDHv7G/Yd1/tsB4ISmBXI Q7BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745279202; x=1745884002; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g8OfCdyPLDsCsG60ZcCmWO2IkmLngYrZyR838vN7s8U=; b=mSzJadj5rzcYL/OMkL1bZqE0Zuat5TtwOe7G4KpkGvxt55JioCobrkj03Jtf+r2f0U Z0xSRx3V3WY6o7Uk/HbCjU6uz9PgViwYtGH0EKj6MCTjp7e4PpU+cma6yDaMeHjIJou0 FPKAov0Wggm77oiIs4XR+WogWigooZXeonZACY68O7XWKjBOBR7eKaObO2WKZ5ksH7vY YNm00yChEadwQZagwBZXICkUWU0IbbdAY71YUrNOMf5FGfFFE2gYuvb/qsKtkb2V7Nx+ Ti1RrjHXOEVPqN+ONSj62M8br8PcklQhlM1NnE+cfwWcmaqQbAW7fhjuDy+T13VaCl3G 5rVQ== X-Forwarded-Encrypted: i=1; AJvYcCXs8i3Sv9P+ZQ3CGhfcL5zGNgv1XXf7h1Unz9lpqzTAQC/06hGdQVremQSYIjdHtmmGvkRD2tfKUPsD+ps=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8DcUrgwa+0fuejDxn0aV0nEgTBYTKWgMz/gsEaWfZhGgrKK7y mqTqFYGSxZ7gFfS38AGq+Me69EBMxof57Q2kxgmZAG07TKTYnf/OOKLJCFULdFYJB50b6pwg0jA 9Zjze7YYJbqtzuMPBswTd9YWUiw3DHBlWtnlC7Qa9tJ0alp3G X-Gm-Gg: ASbGncvPSpOYuai/EEvBWVgjnY95WKrtO0hhJ6D6roGOsG/vDlKTgpyED7XbK7qJIte UDRGAyiNG83J5evV9gbktq3eybHxhMAYJ3RJvo48MTYB1O/Qw0Wv+om4wDBWXDXJuW4RfZUvUla scqENV6Q56UOpCX8FznmAmLQUtJXT7Eac1dxikEOAxkwKlZz6SEIqsVtAaOlx+FNnR77xNjQLke lB/p85/SFMErgPUhoyvag0wGJRAmnoseyTSND++WGBoBI+/69nMIuZlMQTcwmM+2DkJ6S0p X-Google-Smtp-Source: AGHT+IGNBKWm/sabUXkKBKqJtCQdg8fOpkWpAHWVtDPSNSz+vx6YbANCTyDZ3Puj8hONyu743OFhLRKS7ciF X-Received: by 2002:a6b:4e0b:0:b0:858:7b72:ec89 with SMTP id ca18e2360f4ac-861d89f12d9mr1244904639f.5.1745279202358; Mon, 21 Apr 2025 16:46:42 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id ca18e2360f4ac-861d963ba38sm30747839f.13.2025.04.21.16.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 16:46:42 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [10.7.70.36]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 0157C340776; Mon, 21 Apr 2025 17:46:41 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id F3579E40835; Mon, 21 Apr 2025 17:46:40 -0600 (MDT) From: Uday Shankar Date: Mon, 21 Apr 2025 17:46:43 -0600 Subject: [PATCH 4/4] ublk: factor out error handling in __ublk_ch_uring_cmd Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250421-ublk_constify-v1-4-3371f9e9f73c@purestorage.com> References: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com> In-Reply-To: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com> To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar X-Mailer: b4 0.14.2 There is a tiny bit of error handling code in __ublk_ch_uring_cmd which is repeated thrice. Factor it out of the switch statement. Signed-off-by: Uday Shankar Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index f5d4593d5941931efa7bc7d2106830cd2981f4bd..31ebfdf52a8986e879c136ea546= 755a2fbe15315 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -2095,22 +2095,18 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd = *cmd, return ublk_unregister_io_buf(cmd, ub_cmd->addr, issue_flags); case UBLK_IO_FETCH_REQ: ret =3D ublk_fetch(cmd, ubq, io, ub_cmd->addr); - if (ret) - goto out; break; case UBLK_IO_COMMIT_AND_FETCH_REQ: ret =3D ublk_commit_and_fetch(ubq, io, cmd, ub_cmd); - if (ret) - goto out; break; case UBLK_IO_NEED_GET_DATA: ret =3D ublk_get_data(ubq, io, cmd, ub_cmd); - if (ret) - goto out; break; default: goto out; } + if (ret) + goto out; ublk_prep_cancel(cmd, issue_flags, ubq, tag); return -EIOCBQUEUED; =20 --=20 2.34.1