From nobody Wed Dec 17 10:21:46 2025 Received: from mail-pj1-f99.google.com (mail-pj1-f99.google.com [209.85.216.99]) (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 03C8E1DE3AC for ; Fri, 28 Mar 2025 18:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185119; cv=none; b=odp+F9OR+dMiCaR44UQrH0CJY+An2Pe+2koKD53fd4meL1DQ0/MXh9ftCv2bAEcmuuWRZp2rCauK7E+O/N50UpA974kM2sFV2XHKCssVCY409HeBHT3DMWaF9ygc4I4OHb8d36+4ALlpfxGIC/GKhyuTFIXgHdkCEkBJuUos2y4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185119; c=relaxed/simple; bh=rX6aI6CfqNKgjOLNzaJ1NxOuUJze/mq2YTseKrDo0O8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fIDM+9qE2YisHt/2Q1brxMnrNOk9K21EOh2LR+H+9c4qXbzbLc7wTPuo3dBcnluT2CJcLHMWWaHuOjgptQNp5YNSEzs/7Nen2C1X4WKOGHbevkhU1wIO0Ku2IhJUl1RUMLBHNo9eg6WC1E0NcoW9J+KrQ+dDWie0c85pCBvVKto= 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=JoGN+PXI; arc=none smtp.client-ip=209.85.216.99 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="JoGN+PXI" Received: by mail-pj1-f99.google.com with SMTP id 98e67ed59e1d1-2ff7255b8c6so537353a91.0 for ; Fri, 28 Mar 2025 11:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1743185116; x=1743789916; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JtpDew/eD8ba5wvcK2WBBEkoLN0/liTxOdyF+pn4Qyc=; b=JoGN+PXIi+t9V231MaIEtiilm6o9EGEaPlGVxIC2Qa4JROskcIndXGEUROycPjlqSU W3o9utUIQi8zC3/AHCN3adSJ9z+oODR9wWLqpBYsoSJaqPLZckCwS91MlJrI/kA24C6O nPmM0wqGSTFjX20YSiarCN8euJlsG7e4qgQPWw27SB2F/JnJpF7d3lrba2uPbm4FpA4a 9j97rt6yRUCWYSuHG58uxd1D9MrMOFUa4V7AAq+dvLK0jbEXKa5BNn+cQd4B862XOrpB DbbBHXu3LuQ8seVttiFG7TYupnRiwO+Z8jk2WM3x7k+0wfT56bfGM6LqAAY7S9rREFYX l24Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743185116; x=1743789916; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JtpDew/eD8ba5wvcK2WBBEkoLN0/liTxOdyF+pn4Qyc=; b=NGsaODgxUtQ7bo9alyxnL+IfcdnjeK6meRhd7HIXVI9x8EIZs2XaWR6MKMJcYsbMUc YV8plnwLkh3S9HU8UlTAtqvHAboDXoY0yvGYtvk/hG7a9I/Sm2YqSG5KKN+8PBkU1UdE tZKZcrzV97NYI2YFHVpdc0UechitWK6WvWxEeqocu/ISpKFSEAYb+nuOQtzKvnkV0djY /FMiJfT4GIIBsY8U0vM93aDuugwqhdET2joiwDH5tdyZQYjiXPwcrUW1QETafENs1W72 47dJfQdd3pgp8HcUCmmIHE8Xw4epWm/qCRDf7+HfTDYR/HPmD3fKYdetqQ+sFu9YtxoG 8P6A== X-Forwarded-Encrypted: i=1; AJvYcCV23MK70+BarMG8rf4fZgiTn723/ekNXbzzuHVyg5GeIwIGpvK6lt54cQ9MBGH0Q2qfGkWgTXa0xejmemo=@vger.kernel.org X-Gm-Message-State: AOJu0Yys80R+Wq6A37Le2LdHWC9PCxu31xtPHw47m07o9NFdEaHTWYEk vV+rQ5P8u3NWeV1gUVsd7SHzUdWYGhoCpE3MUwFd33kEiVRphQFAlyMX6U15wSNhqwdyz3SBeiT pcaRvKQrO62iy6hrYV57lNM402I6zabyKXvpkv9w4CeJnFKRd X-Gm-Gg: ASbGncvf5cNOSfMMAoCaeSFcyvaVvrBB2xQdtbQJK8U/ZRJuyhVut6k5EOZZADDEj5/ mvxeU2bU/09Dg3fwdk/c924osJH0EyjjoZoAxtHGCnHkxeDDA2J8dtUZI9Agksm/IFOniouDRtK YYekO4iGLz8tWZp5KTBqJMHJ13y2x+/45U5N99uUCTuQ22zZ8bNA0S4z3i7WPOIpjiumD5jDWho 4mhw1DUpny7l9/ok8cIAi8rOsf1xtBM+Ab575aSTJXWH0s2cAxKI31ho5rkJ5R3tpaSRcBp3pdh /7h9ZPmshNmgQlUEBL6t7Szw87Qqq7UKKQ== X-Google-Smtp-Source: AGHT+IESDjVpHJqj9O/gJwm20/6fgVGc5WGyQTfH3ybkt3onnBkmBYQ3O5YYLMDEqF4wpu1Fan9NngLOzE57 X-Received: by 2002:a17:90b:388b:b0:2ff:6ac2:c5ae with SMTP id 98e67ed59e1d1-30531f7bef6mr146827a91.1.1743185115754; Fri, 28 Mar 2025 11:05:15 -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 98e67ed59e1d1-305175cae25sm308791a91.14.2025.03.28.11.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 11:05:15 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 2FBB7340721; Fri, 28 Mar 2025 12:05:15 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 26A48E40ADA; Fri, 28 Mar 2025 12:04:45 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 1/5] ublk: remove unused cmd argument to ublk_dispatch_req() Date: Fri, 28 Mar 2025 12:04:07 -0600 Message-ID: <20250328180411.2696494-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328180411.2696494-1-csander@purestorage.com> References: <20250328180411.2696494-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ublk_dispatch_req() never uses its struct io_uring_cmd *cmd argument. Drop it so callers don't have to pass a value. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 355a59c78539..39efe443e235 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1183,11 +1183,10 @@ static inline void __ublk_abort_rq(struct ublk_queu= e *ubq, else blk_mq_end_request(rq, BLK_STS_IOERR); } =20 static void ublk_dispatch_req(struct ublk_queue *ubq, - struct io_uring_cmd *cmd, struct request *req, unsigned int issue_flags) { int tag =3D req->tag; struct ublk_io *io =3D &ubq->ios[tag]; @@ -1271,11 +1270,11 @@ static void ublk_cmd_tw_cb(struct io_uring_cmd *cmd, struct ublk_queue *ubq =3D pdu->ubq; int tag =3D pdu->tag; struct request *req =3D blk_mq_tag_to_rq( ubq->dev->tag_set.tags[ubq->q_id], tag); =20 - ublk_dispatch_req(ubq, cmd, req, issue_flags); + ublk_dispatch_req(ubq, req, issue_flags); } =20 static void ublk_queue_cmd(struct ublk_queue *ubq, struct request *rq) { struct ublk_io *io =3D &ubq->ios[rq->tag]; @@ -1290,15 +1289,13 @@ static void ublk_cmd_list_tw_cb(struct io_uring_cmd= *cmd, struct request *rq =3D pdu->req_list; struct ublk_queue *ubq =3D rq->mq_hctx->driver_data; struct request *next; =20 while (rq) { - struct ublk_io *io =3D &ubq->ios[rq->tag]; - next =3D rq->rq_next; rq->rq_next =3D NULL; - ublk_dispatch_req(ubq, io->cmd, rq, issue_flags); + ublk_dispatch_req(ubq, rq, issue_flags); rq =3D next; } } =20 static void ublk_queue_cmd_list(struct ublk_queue *ubq, struct rq_list *l) --=20 2.45.2 From nobody Wed Dec 17 10:21:46 2025 Received: from mail-qv1-f100.google.com (mail-qv1-f100.google.com [209.85.219.100]) (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 4FC80DDC5 for ; Fri, 28 Mar 2025 18:04:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185091; cv=none; b=GaAY5FF9MBnkX4Oeg2muDRm2WLBTU05B0ufr02JWAmN0ZOAKeOnNtRYayIlZOvwQ0Cl+Va5AWUd8yb9aobI9y0xWi5h6t/r7I1cDtmB3QRiXbN2fliZq0HTQ7z6xAO0xeODK9HJ8gEddyB1vgPc5+DwO/Jr/zpP6K+WV35YA/NM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185091; c=relaxed/simple; bh=gcB0C5YqFqmhQQqyd62UolXkBK1cwcSf4o9DizoUDeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rhs9Mn6EuNtWtPs/rzj3qG9VdRwHRpcxXfNhtSjuoCZo7NWLitCjQe54oRSHg8CJBfK08A2lF+bdFjDefchlWWNNh8UoVEds04oYBDndDPx3gCwHbcvUiZoPtnz6KljzyPU+sdtGwZ64UPttm5I3i9Sjio+lm9KczphAtl76Iss= 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=bpkw35Jp; arc=none smtp.client-ip=209.85.219.100 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="bpkw35Jp" Received: by mail-qv1-f100.google.com with SMTP id 6a1803df08f44-6eb2819468dso3370996d6.0 for ; Fri, 28 Mar 2025 11:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1743185087; x=1743789887; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w+QsHISAznmPuIeI6H2v/o6YzereVbQ7k5Q0Zm28d6I=; b=bpkw35JpI2ah3kX5nEIKvoQ9O9FIOQ76lvHlNCp5k1HWNyhUpI9g1dNQaIo2tMNoNd x6yuSmkYOaMKLaDdNYcrYgIygSyWr27fiwW8F9L/LI6lNU+LRpL8JPqMSU0AhdIivsO1 Ot6Blz7lis5T6FvClgksstfNCON3pmzrRZhOCWTnA3DmutbAee0avs915fBuQhaevwxE eQQgpvP2HxR7Oljz0NaQhI1oEaoQ8O9CdjpPta8JFjQhUypI/Fh+UR5Ua5vVXnmcn+4r 1uaWRR4mHhTwvD7XGCwhNWWL4eixRuaLOiIgzWEMyaHcvli1fp9R6bdnNqdPuI96f0SS KuKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743185087; x=1743789887; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w+QsHISAznmPuIeI6H2v/o6YzereVbQ7k5Q0Zm28d6I=; b=ZND3tfy5Z+CQMZukuBAwdLOGzADxUmLAnihWNLiROuzLGQmlOyNZ2F/EEA/slNm1Qm DATYNydslzoBZ14/x6o2zP20ksHO4B4wZn1WvsAJdng++g6PAwwfoJkaRyyfvntLHgN4 iJTE31KDa3dnP0v6kcbqBxc+28ZarokYddOyxDRXEON7UgD6yBeLCwwZLiN6p6Inibvs 851AN9ekP7YK4PRECtkL6/RV2W6VRdojVIWHMZ8OEgG/UZ63zyTDH1bZD7UcOITh+6jo 6hXg95t96u9UCjGKpPghprLH5dwP7oPqtVssvs3uu+XRtphS66dRkEBFBcka9hMUovvr fwYA== X-Forwarded-Encrypted: i=1; AJvYcCXfBonu+yR7bSJqNz8tHi0mSjnE5E+gwxykPMVBbH8MkT/zf7Lwg93Mc7IN/XgxOuLwMpCu+JOR75vZ510=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5Vfvjaguymz+R+Zf4ziueQqt4FmUjRDYT2tTvnt7vzxAqmo+O 7KdJeU0amieVh4Zr2rmxJC76xVui6ESWM48fpwDHHRIcoVnEDuHQ6jQfk7w8fcY4TsJeded5N4R fPKku8USgRfXZbu9Fz+oE3rCjxEpcU7sx+FaW6ShS+FZdtgT2 X-Gm-Gg: ASbGncs7dMjSrHtPoyAojncHl+fOMIPIqkBgtvomiQ74T2qTi140NDMoC757bT9jYtj 0P2HkboP4MwUTZR1OeXiEuEot5vX/Z34i1GKLj9uBhye4N1RSMhTmYzzTcytRkcwAA/GQ0wdap4 l1eqEW+ZZX8GdYJJ3JB9vc7kaeUDywXX1YyryaHgh9jtRheKgdgoA9l7Lf6M2jaYQM2eMbf/AjY k+OVICChzzidR0sR1evsIvsjoESpQyZlH3ampQk+CEGnI9ZvdQXe6eqjqoitcAV59fcy2djMqGw V9skx6JBUWkKJ9jmrf/SJP2BwNjdlRIpEA== X-Google-Smtp-Source: AGHT+IGOaSWLBAClwcBn1yitLGGVmefsbpho4O3wbV/JCh+TajmhlWtEu3LwJSrjmgGjceg3yAOfQ85VCQdK X-Received: by 2002:a05:620a:17a6:b0:7c0:bd67:7dd9 with SMTP id af79cd13be357-7c5eeafa472mr383002585a.11.1743185087021; Fri, 28 Mar 2025 11:04:47 -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 af79cd13be357-7c5f777eac7sm17958185a.3.2025.03.28.11.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 11:04:47 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id D13233403C5; Fri, 28 Mar 2025 12:04:45 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id CB90DE412FD; Fri, 28 Mar 2025 12:04:45 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 2/5] ublk: skip 1 NULL check in ublk_cmd_list_tw_cb() loop Date: Fri, 28 Mar 2025 12:04:08 -0600 Message-ID: <20250328180411.2696494-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328180411.2696494-1-csander@purestorage.com> References: <20250328180411.2696494-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ublk_cmd_list_tw_cb() is always performed on a non-empty request list. So don't check whether rq is NULL on the first iteration of the loop, just on subsequent iterations. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 39efe443e235..8b9780c0feab 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1288,16 +1288,16 @@ static void ublk_cmd_list_tw_cb(struct io_uring_cmd= *cmd, struct ublk_uring_cmd_pdu *pdu =3D ublk_get_uring_cmd_pdu(cmd); struct request *rq =3D pdu->req_list; struct ublk_queue *ubq =3D rq->mq_hctx->driver_data; struct request *next; =20 - while (rq) { + do { next =3D rq->rq_next; rq->rq_next =3D NULL; ublk_dispatch_req(ubq, rq, issue_flags); rq =3D next; - } + } while (rq); } =20 static void ublk_queue_cmd_list(struct ublk_queue *ubq, struct rq_list *l) { struct request *rq =3D rq_list_peek(l); --=20 2.45.2 From nobody Wed Dec 17 10:21:46 2025 Received: from mail-pj1-f97.google.com (mail-pj1-f97.google.com [209.85.216.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 9C7BF1ACEAD for ; Fri, 28 Mar 2025 18:04:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.97 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185090; cv=none; b=CgnNnGIAtVuPe6yUxcYY1er6r/8DnlA29ndk6mC6nmZTW13pb+5zmEtUCk8A+SB1e3momNkmSZtcVENjgy+klThdHBQiiA6P9Q/XITFA5O/kk3P2SdLCMBBiMW43Bf6E5NdbML3csHL0gVgDxqsHzfUkdKq5a/IyTh8E5E6OCZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185090; c=relaxed/simple; bh=PwwHN7IqP88DTTQV80OKz7nlEHX4zcF7Qrd9VdcrqNM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EKd8egBR3XknpTDNv36jWcatgDVjHEisKrBowNJOg6OkUUbSrT9mOWkzNoW0TClLussMlabSbp7nZOkFksBB+ZfCO4dNe3h6d3cqAk6gra2Xpj6wIrOFwJG+MwG1/y+zRUW5OW/X67hx3ioasHhrrHI/1kziJ/Kud+KRrfNf118= 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=Eu2aDNh5; arc=none smtp.client-ip=209.85.216.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="Eu2aDNh5" Received: by mail-pj1-f97.google.com with SMTP id 98e67ed59e1d1-301317939a0so518491a91.2 for ; Fri, 28 Mar 2025 11:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1743185088; x=1743789888; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Kj4J8k1qL5TaHC2pS/xYDJ3AApG411gLa2b3V6a909Y=; b=Eu2aDNh5CFS5p/3TxC9hitGPafDzMxzBbIrdVvAogeKDtld3aNqihATxzT88ZYOw0E lG2pIUiQh2/3aDfi6XZp7odpAk9J/5FR5NvHmEM1Ja+58n2OTYkbj7L6WM19nQ/nT9S2 wG9dV8n+Uzr1N9lVUx41KxPKol6+L7G7+uDDOERZPshdGAHqu0y9kCtrlcXLPLXJLTSp ODSyzx/ZuITRfp3iYw2kp9595j5CrIgzUgg0QNsDa3U2vDT8RVGz5b4ucGIx6yZpCkF6 NC48tgQcQBgiPqZqpdueETSgfdploRpxf7hYfEhaWOikx1sWmdEHwsGTOQhd3SOHOv3W /UYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743185088; x=1743789888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kj4J8k1qL5TaHC2pS/xYDJ3AApG411gLa2b3V6a909Y=; b=UukZJR9b5UA8NznrkV1rlkymJyPecMqLvomoOKdqYGraDt0GDU/VsMdakLPqfqmWBT 8JAaetSbWmp/Jjh//65DjFPiAAQ4uTSU/iuRYrR5ddkRGdZnqms+LIuZaagz+bJMlVDB dxNq+j780pTrlIf106qLIFQfLCHq9Kw5UXy60ASRPJgURYhl71E7PDVR3o6wwYJUVupL cVC/ikf+E46UQp4qoB/1uZf51Bwkik13Y9rRkQoxQIQLeBd6f8DO69N8dkdlgC25vgEv TrtMiMhNhA/c9Od/amcsohPLhXPHrFkyea5HliLzs1L15EG9aOLJM0+Md9ySiAs4MfOv H2NA== X-Forwarded-Encrypted: i=1; AJvYcCV3NLjjTMDSwiO3gKIsTiZW4O+oKO+0vzbSTfTSiHDyfKYAr2fUJa8+xpSWdJCkN4avxoHDBMKWoGc1lTU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4vJXA4mTmZhB08U8y87jx0Q2BkMDVwA6/aEz8rvVgFNYKhVkL p6gJUNz7KaQA/ixPwr0i73wVhTBfMaCaBTTfw44dcTnGavlR5H4EVPE3iZPiODDTd0Ij1JiR6Eh NqQ0cHujrlTPBN+Las3HFPE4n+TJEDayW99nJt/38Jnz9yXzh X-Gm-Gg: ASbGncv0ird/KwTDWXXmxR11qClJPfaIgpMC4YCzKP7d+YLbQbEsr4zUyIWVowl27kJ ZdDklhFZoJE23RD6h4sNGrknhkkbODbfIsll0AuFVHGhK+1ncrLIw437jwJfYUOvhAAEiin3BnN tQ0ct1IQWW0Ai51Liu+YhlhzoAEGROl4C+UQB8wuhqdieEpwSM+nxOdYbArs9cythT8s0f2FaJo 8iBHn7okd/FFlA7+bhofcEUjdniQHHk2+b6GA59+UltZL0ft2o3+AgQrT1ADCA9U0m29sFtA111 um7nV8gOrYDhKyGR2+Ll1ESNt2miBuNlRg== X-Google-Smtp-Source: AGHT+IGLq/NREs7Ar+m0I0zw96xZqeWn0sWBJj45iV6NXy9CwoEMc4w3wdUIdjPWM7sfWF+XBmbDZ/3WkwbG X-Received: by 2002:a17:90b:4c0e:b0:2ff:7b15:8138 with SMTP id 98e67ed59e1d1-30532165358mr89413a91.7.1743185087574; Fri, 28 Mar 2025 11:04:47 -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 98e67ed59e1d1-30516d57bd8sm301896a91.6.2025.03.28.11.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 11:04:47 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id D725C340721; Fri, 28 Mar 2025 12:04:46 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id D34F9E412FD; Fri, 28 Mar 2025 12:04:46 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 3/5] ublk: get ubq from pdu in ublk_cmd_list_tw_cb() Date: Fri, 28 Mar 2025 12:04:09 -0600 Message-ID: <20250328180411.2696494-4-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328180411.2696494-1-csander@purestorage.com> References: <20250328180411.2696494-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Save a few pointer dereferences by obtaining struct ublk_queue *ubq from the ublk_uring_cmd_pdu instead of the request's mq_hctx. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 8b9780c0feab..9276d1fcc100 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1285,11 +1285,11 @@ static void ublk_queue_cmd(struct ublk_queue *ubq, = struct request *rq) static void ublk_cmd_list_tw_cb(struct io_uring_cmd *cmd, unsigned int issue_flags) { struct ublk_uring_cmd_pdu *pdu =3D ublk_get_uring_cmd_pdu(cmd); struct request *rq =3D pdu->req_list; - struct ublk_queue *ubq =3D rq->mq_hctx->driver_data; + struct ublk_queue *ubq =3D pdu->ubq; struct request *next; =20 do { next =3D rq->rq_next; rq->rq_next =3D NULL; --=20 2.45.2 From nobody Wed Dec 17 10:21:46 2025 Received: from mail-pl1-f225.google.com (mail-pl1-f225.google.com [209.85.214.225]) (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 04EE81CAA86 for ; Fri, 28 Mar 2025 18:04:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185090; cv=none; b=N7xIGqEncEFnQqscjx2LqTQk4CuhFHiJyOc+S4AWROgWAothhq+GTgjXtzoBkpvA1S9KCg5eGGR6OyZxCqiNovPDszi0xyN1+iYlvcZbJaf0wNQw09WwZgCp7Mnxoh3Wrqy9qq0iIH63sB5u6X8WussV4UAtWhD7jM6yrQHyd8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185090; c=relaxed/simple; bh=fJWyd0Z+++VvMpzFxRzmAD3YIiTyE0lwLheqAemdONI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d7AwiWD7CwXneJIfDUagoZsQT534LYbjIBf8AKZ97IVjXEX34wSuIcwMmJpF+BVWU5sm6Nh0Y+0WIJrD6ZyLAvHjr16DL+jb6sTnEw8OlK0hhuuNzH3+OhWtzel8eZ9ClJ+S+qDy+DShiniqy8v6Q/Y8rB9m7hzrrRWZNyBrKfQ= 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=I64Fmm0X; arc=none smtp.client-ip=209.85.214.225 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="I64Fmm0X" Received: by mail-pl1-f225.google.com with SMTP id d9443c01a7336-223f7b10cbbso6495475ad.3 for ; Fri, 28 Mar 2025 11:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1743185088; x=1743789888; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w1Idek15brks28Nv8cZ778Xz6huRCcZJmLXYMYLMNtA=; b=I64Fmm0XjVPGf6PnWGxopZ4ymB6IOIUd+cUYwiIp2UfRY0YSWBXzEcaTDlPHZURMt/ 6KR8NO9g4qkqp6VCpe/V9J4xayHHk8hiem6jD4szqiQZMD+Gcr9dm0vysJO2rTWrjFwD nuNGqRvYdxIIqbQJuxa2ZTvCIZT4bOVWC6cFk5IqC2nMAUCTunWya+Om8j9nqYsJ2dAa e7cQ0JmtPsffVFvK81pZ8yGAfw3oFIjssfzapfHvM2YwmVzHnrx5d6VVq8CWx0km9fu3 n5vl9D4K+tISG71KrsC3HQZbVCDx7xBQpDjdk2bXKaP2jVwG+5fsOxZ/XopQ9f4Gs8kV tb1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743185088; x=1743789888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w1Idek15brks28Nv8cZ778Xz6huRCcZJmLXYMYLMNtA=; b=uUfv1gPHNRQzo56jETXt1JO1lVsUdVnlwZHFNr7TJuFu/WjisN880mZhCiFzri5BDk fi4GIr6pD2vFpwjrFEfvm2eJ6HW5wzBYqFJot5CQSrrJk7x9l7uDjvUpPTu/Ya7y56XW p/BgT1BnAjW5AZXwaPK+HYa7rd5NAeG4tQsTNpBauzN5JuBIYmUIxNEH8SQWTo/aOdZC 6PM6Q4a+OjJ9hZThIqSmlEbuM0ENYqScMlNSSaKuw6BLkkr5BGEfoSkMQ0ZPfuf/vDcu PDIPJGVCk8nIy/MSQs5vpmqorMYKUPHKX6E2knlOfVWreDmRp6emjkugPAbs6mdkiQRS TXgg== X-Forwarded-Encrypted: i=1; AJvYcCWT8bqX1QfbiE8eKSP99oD4QfnZ0xuNyl0kRrSMZTho9PEaqY3A3xfBl6SjELtZwLUrteNzZJN5Y4iIMoc=@vger.kernel.org X-Gm-Message-State: AOJu0YzFrMWV7OPwidUp48R8g8+uHXRvpaqXP9PW+FhSIDfIKnfU7GTj Nk35MYP2KvgqFDc2/JXvmxJn+VWYZ2wlpWadC1dCCqA1OZdH92MeasTDJSikarGneLXDZXk0Xkn WGIxjQYw/DeaSYvcrPb6QaK40SwYqFtXe X-Gm-Gg: ASbGncuFCrFhoJu/FgSlTcSuhQaTbRX1l7PENN8i8vzFFdXnmF8S29VVDsk5NTKajtu nnexoydTmIDBKdh3pbfdnDKoe3OZHIgBMkQXtWSi5JZUcxmNMU7nYaFYe1JqxhPjbTgJEU/ymLu AvN2IMX6j0lvgfnQqPJUHiv8QM0lmWzfPI9lflub5twJtdY8sK+k+yyFDDmrgl02tpCBR5s/yEH NdHnt+L3dgA57q7CqmvjYcHYgqJJHlR0ZJiLPorCCQPfXbyZr5zsv8KtgTDdOdTXpUNkwdqqS9b +GkD2lG6bqRByOjR/6s+RtlUdjt824Onc93xM4n8vTkWGDsq X-Google-Smtp-Source: AGHT+IFvPkRdPB0wYsU59eOlUQEOpUKJ5TxHSxxI6tIebCQXRXwkP/6DyJ5cr05mVyMMf7EOnbwS893QtR5c X-Received: by 2002:a17:903:985:b0:223:28a8:610b with SMTP id d9443c01a7336-2292fa08a32mr569845ad.14.1743185087910; Fri, 28 Mar 2025 11:04:47 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2291eec6156sm2811675ad.26.2025.03.28.11.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 11:04:47 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 522373403C5; Fri, 28 Mar 2025 12:04:47 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 50DCBE412FD; Fri, 28 Mar 2025 12:04:47 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 4/5] ublk: avoid redundant io->cmd in ublk_queue_cmd_list() Date: Fri, 28 Mar 2025 12:04:10 -0600 Message-ID: <20250328180411.2696494-5-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328180411.2696494-1-csander@purestorage.com> References: <20250328180411.2696494-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ublk_queue_cmd_list() loads io->cmd twice. The intervening stores prevent the compiler from combining the loads. Since struct ublk_io *io is only used to compute io->cmd, replace the variable with io->cmd. Signed-off-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 9276d1fcc100..23250471562a 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1299,16 +1299,16 @@ static void ublk_cmd_list_tw_cb(struct io_uring_cmd= *cmd, } =20 static void ublk_queue_cmd_list(struct ublk_queue *ubq, struct rq_list *l) { struct request *rq =3D rq_list_peek(l); - struct ublk_io *io =3D &ubq->ios[rq->tag]; - struct ublk_uring_cmd_pdu *pdu =3D ublk_get_uring_cmd_pdu(io->cmd); + struct io_uring_cmd *cmd =3D ubq->ios[rq->tag].cmd; + struct ublk_uring_cmd_pdu *pdu =3D ublk_get_uring_cmd_pdu(cmd); =20 pdu->req_list =3D rq; rq_list_init(l); - io_uring_cmd_complete_in_task(io->cmd, ublk_cmd_list_tw_cb); + io_uring_cmd_complete_in_task(cmd, ublk_cmd_list_tw_cb); } =20 static enum blk_eh_timer_return ublk_timeout(struct request *rq) { struct ublk_queue *ubq =3D rq->mq_hctx->driver_data; --=20 2.45.2 From nobody Wed Dec 17 10:21:46 2025 Received: from mail-yb1-f228.google.com (mail-yb1-f228.google.com [209.85.219.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 211DD14A0BC for ; Fri, 28 Mar 2025 18:04:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185091; cv=none; b=Rk7goA9VheKa2eX0JCalvxWye2ehpbgSeVDRaFQeXu30/Qxuzs5kPiNjPzFVXQfYOwLc0n7TSwgNiReu60P1MbBTIZ5DhQ4VBRhtOV8jUoavaEvCEKZWf3GGNzsenS98NSfGCMKKIXyowiFuon3BX2fRb8kqAEvcUoLY80TmiO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743185091; c=relaxed/simple; bh=XQMgakDIJjvP2FenQcES4/nXwydyPWmlJoZ3T4wy04c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aBRnJmJUYiryPOeIAG8BRpzIo8kKSfIVjmMYeDfCagPMSjx7dPMBATWKs5ykY5wflX8jdlHLRYeX1AHL5XgDUKtNXJmtsynkToX1TGm2xVfhBG59MUP/PawtDFqwClHYnq3fbMqyg+zrNzReK8s6IbouhyK5BpoAuk7YdhXBjX4= 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=WblRSibU; arc=none smtp.client-ip=209.85.219.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="WblRSibU" Received: by mail-yb1-f228.google.com with SMTP id 3f1490d57ef6-e6b78b80393so123859276.1 for ; Fri, 28 Mar 2025 11:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1743185089; x=1743789889; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ToMds7a1iukk8k+ynJkA30yqjBpeuxVgmALggVXwSPI=; b=WblRSibUVk9qBh14N6JVAG2nBVgmFkk4yHYlbMVAKsxWqoQj7ivQ+tGZX8daQOwE12 IgEP/wEyqMar33IhGJP9TgaUzjDuiy229P8xtGXvOteGquSTW3vFDKOUcymk+99R9/cb JxweMLcGrM+AG7Kp1y3IUC6e/xVmHfZD8aSvP+ssnjGlJjna6QMuNn2bOJRqm+KwIjcC sNM6vzNwO8qaFD9NCri5SUs17eyJG1QsCrzCLa5wWczW1Kx+mzYB+8QejFdYqqrDwZ11 GSAYVBgIjT06xKrDSxphv0dYaLYiYpagZJ+fP0vs/yUQJlwRAsq/NCVPsSFDUiR8uEd6 liCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743185089; x=1743789889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ToMds7a1iukk8k+ynJkA30yqjBpeuxVgmALggVXwSPI=; b=s3icQ2wRTCYPzX9uFiB8++Q2tp/lthy9iTf5S52sxqgvyIcW2ZWC30Se9h2AtQ9wEr cdf3sugi8ZWI9uRmcyP7rSLn8Qww1Rpm233c6T6GFS9qBerEjgVItxnpDhcQIUyzR2Eq ZmbXn51RvYJ5OK56g9dvWzWHhQNAjuCr4V1OzGl14+V5EWvw0hHiLC+BYTC1O8flO+hY uIN939AGUgW/gpe3fJxzV6IJ6GWLie/QaSGCDUzcXWu7fxoDa5f2w1XHJmN3pqUvMpBL ZFphh0tt+dHFZkdl90iL0EiLTdhZIAbuxHd3DJLN1RytnsCqqiOu10Zza4fpmu+vkk5O IvWg== X-Forwarded-Encrypted: i=1; AJvYcCVrcdKuXkgOsAcaxd2uNwuZVE95Nm28bvwRvEivIuUl+oYxCORCNWteqiiZ9b/zzAf8kefG8iW4M+F99IA=@vger.kernel.org X-Gm-Message-State: AOJu0YzTJ9SdYQaqRfWNA0ZQnQgDEi8vn7jJl0WnbgJCj3FGQyoXwi4M I/B45d6RETmXNx49FEktt15t6w99M5KAmI1BxCx1Ptlporla6viZd5w2mdI0La7HZtHF1fGe61h kvr2xytP025TvKZnTXNuXrU5ewI+BPUdT X-Gm-Gg: ASbGncsSUfGGk2hCCEnUPs5CEMkTlqdZN1ib3eluJsk17vptkNMqCsxuBrb4sxWsGdB aTaVUbDSuInLNVlvZd8XHdMSoc33zvzgoHfJhehjSAOWCez0tjAniNRdY0IH37vqGVjBhvnJBYB T4zjCrZ6Oa1trRvTvqcT7sNErHM1p4leIEPhXapC4NA0n8NZc0UVkoNhSPXaFqv43LDJXCveejR JoGgIwdrbyYWxPKoLbpR67Kgi5YQH68CSyGIdZog7ifkiiJFlhO5m/pC1M9wGQduat2mcOC/fi6 9soswP2EHKpkVnXpNsp5xwocNEzwbIIiZ2CcxZKGda69Szzg X-Google-Smtp-Source: AGHT+IEqw+lKegEraS7WeFtb+fekn2SZ9vc6rfbQB4wWCBvh3x/gk+5IVeAG0hDMfpysnVPW9CQwnFYky0Ki X-Received: by 2002:a05:690c:112:b0:6ee:b726:62cd with SMTP id 00721157ae682-7025736bbf9mr2158077b3.9.1743185088693; Fri, 28 Mar 2025 11:04:48 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-7023a95d0d2sm2932487b3.49.2025.03.28.11.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 11:04:48 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 08A8B340721; Fri, 28 Mar 2025 12:04:48 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 06FDEE412FD; Fri, 28 Mar 2025 12:04:48 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 5/5] ublk: store req in ublk_uring_cmd_pdu for ublk_cmd_tw_cb() Date: Fri, 28 Mar 2025 12:04:11 -0600 Message-ID: <20250328180411.2696494-6-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328180411.2696494-1-csander@purestorage.com> References: <20250328180411.2696494-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Pass struct request *rq to ublk_cmd_tw_cb() through ublk_uring_cmd_pdu, mirroring how it works for ublk_cmd_list_tw_cb(). This saves some pointer dereferences, as well as the bounds check in blk_mq_tag_to_rq(). Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 23250471562a..466a23b89379 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -87,11 +87,14 @@ struct ublk_uring_cmd_pdu { * * It should have been stored to request payload, but we do want * to avoid extra pre-allocation, and uring_cmd payload is always * free for us */ - struct request *req_list; + union { + struct request *req; + struct request *req_list; + }; =20 /* * The following two are valid in this cmd whole lifetime, and * setup in ublk uring_cmd handler */ @@ -1266,22 +1269,21 @@ static void ublk_dispatch_req(struct ublk_queue *ub= q, static void ublk_cmd_tw_cb(struct io_uring_cmd *cmd, unsigned int issue_flags) { struct ublk_uring_cmd_pdu *pdu =3D ublk_get_uring_cmd_pdu(cmd); struct ublk_queue *ubq =3D pdu->ubq; - int tag =3D pdu->tag; - struct request *req =3D blk_mq_tag_to_rq( - ubq->dev->tag_set.tags[ubq->q_id], tag); =20 - ublk_dispatch_req(ubq, req, issue_flags); + ublk_dispatch_req(ubq, pdu->req, issue_flags); } =20 static void ublk_queue_cmd(struct ublk_queue *ubq, struct request *rq) { - struct ublk_io *io =3D &ubq->ios[rq->tag]; + struct io_uring_cmd *cmd =3D ubq->ios[rq->tag].cmd; + struct ublk_uring_cmd_pdu *pdu =3D ublk_get_uring_cmd_pdu(cmd); =20 - io_uring_cmd_complete_in_task(io->cmd, ublk_cmd_tw_cb); + pdu->req =3D rq; + io_uring_cmd_complete_in_task(cmd, ublk_cmd_tw_cb); } =20 static void ublk_cmd_list_tw_cb(struct io_uring_cmd *cmd, unsigned int issue_flags) { --=20 2.45.2