From nobody Sun May 24 22:35:56 2026 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 774B3372675 for ; Wed, 20 May 2026 20:36:57 +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=1779309419; cv=none; b=NhchVJaO1hkFfT1Vs0pbfULZY/NUEwaJWUAvRArmZ3tvoh9VHj4Jfk9wfEqixrGTmrjBWJYJKEwpJTJO3jmpM4UGBeZQdAaYQ57pBTz8g2ngd85WhFM3QyJKjMIwrowxjWEI5zGUh+DfhI2MtEmFsA4ZfmDaTZQWH6hpQ9hJvMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779309419; c=relaxed/simple; bh=cPsNcn0TlZf32NU1M5aejBTBxy7dprvtlGYrN6i4R2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gZ85h6QeWmTwcOmBd+Rb9+q/eHmIRNKq6TmyQeFThrJgwbA6tJedk5eJj7c2+12TwykgbkPWuMv74/yph/bsbeAcjw0ZVo4Y82xkD3jycaf4Hyd92ZNH0ZABmUEH8Y4qIXMcP+VEhj9/TZBsZ8pBXmjMNNocdwmVxO415+1pVBM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=RNuJYRYf; arc=none smtp.client-ip=209.85.216.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="RNuJYRYf" Received: by mail-pj1-f99.google.com with SMTP id 98e67ed59e1d1-36a3e47bba4so30321a91.2 for ; Wed, 20 May 2026 13:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1779309417; x=1779914217; 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=Mt7RhXa7eT0nefDTSbQhlC00V1Qqmnntp3uU/PunKOg=; b=RNuJYRYfNu2D6ohcedwOGvOzo+z5n98qma48xiKshEoEpPHOKrkl8ubeEqZ2ElDEbf 6ztKs1uuLHXfCH3QAyoLq4kv9fIU+wUH4jV2xaQ/BF4pNucZ52i1OuuCFkHaNffPPCZf GJ5afoPGagl/1aSVqPZchEtAbal/UFlZHguuZT7akC6TZzJmG2GBuIcLCIqZtyEooZGC FJgtfOh2/swcJqCX4jFS6b8ZzU1LZLEumCthwEUoPUbZmpDWYx7a183ygx5syJg+6b9m GcYlnoe+DnHiomkjkt9CqA6aOIskU5WCLZVkxJ4kyiywOBQXuJPq4MMOuuiaFntOJRyv brDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779309417; x=1779914217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Mt7RhXa7eT0nefDTSbQhlC00V1Qqmnntp3uU/PunKOg=; b=StIMWHHq0cZZltKqWsg1quBFeDyznRLtm/30/kvdbqCCJu1RxMqg3VLiRiXyjngc2v pr15XwjuG6WXq8CpKvzYFOLNKwH+FPNQGQPKwI+uN8LEYofpzMZ6F9bkL4jE1xyKxdMP 4FAsWqX28bMSu0xllAm8bcs31ewDugZYY+ctTnjDZIe10zuYjIDjJ7IvxF97dii7fsCp gpE64fLIdwBMEsPjex+O6HAki3cFCRka+NPL/eedpG2LiQ4YPjeun6UopFFQcFSd13YC y6h2yqCrV3WAnPd7HMwWH8DaMhYeQ3oI6Y3koqdZhAXwnw6d41Qn2klOqIaolrok3RYT Hddw== X-Forwarded-Encrypted: i=1; AFNElJ8pyz2Xl8Wk2HCavZyAp2tk61iJBgSj+slbKXdW3dfH1Afz1CUBaRnldixH4bAe6hDHsRegNO2z3pKgB1Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yxv2a95vOdeM+oykRRieZ7aGByT73u0E74kqFHyMd+IvsTRziMu 2L49UD9yfANtazH3HMXyfh5Ld7TzSG48IRPrevfdY5drrJsjoU8iAIhCxcAHHXNQt2DflLknuki s0/Hr6vQYYw9smCPAbX97HAdWslSTVQVS018TFxl432zKzeJSk2cD X-Gm-Gg: Acq92OGFr1gEPjhh7khhRyU9OCMmpQdoJw3W+iyT1sclMxtbsn6DgfSG8F3V/YHsy4e SkOW6TITUrWI+J78qgM9oKqCVn/U43B/dHKZy/dOvzm5l+G5FMZIpixSDhyhVUipWQgtJgFjGeO 7D7a7D0cvlafpGnvgCdT/lmM3oc5wcI7Hmb7HdTHMYnfVfde2v0AFfML7NtQwMM+ImLuWzVqIRt ioALDS6pEb56iSRS0RxHX935PGNykNSxIl3n4EbtUK3+hrB9bXJn9Mvq8UIFkqrl25yki5UER4X t6zvwChjJZ/B2Dk4uZOB7nMLEFUZDYntIOZ2/m3kMfzNZm0YQ84V/jiTKGj89aNKVKvKXoverBG BeXv+q3uYpiHEgyR968cQfpN6PE0F9zYREJ720jE= X-Received: by 2002:a05:6a21:4688:b0:3a0:b812:3a84 with SMTP id adf61e73a8af0-3b22e652c5dmr14983266637.1.1779309416598; Wed, 20 May 2026 13:36:56 -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 d2e1a72fcca58-83f1983b319sm1531149b3a.6.2026.05.20.13.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 13:36:56 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (bond0.slc5-n22m09-k8s.dev.purestorage.com [IPv6:2620:125:9025:20::a31:449]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id E382634050F; Wed, 20 May 2026 14:36:55 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id D84D8E413BB; Wed, 20 May 2026 14:36:55 -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 7.2 1/2] ublk: move ublk_req_build_flags() earlier Date: Wed, 20 May 2026 14:36:53 -0600 Message-ID: <20260520203654.1413640-2-csander@purestorage.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520203654.1413640-1-csander@purestorage.com> References: <20260520203654.1413640-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" Move ublk_req_build_flags() above its callers so it doesn't need to be forward-declared. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 63 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 4d7efc12247c..0cb29be561b5 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -357,11 +357,10 @@ static bool ublk_try_buf_match(struct ublk_device *ub= , struct request *rq, u32 *buf_idx, u32 *buf_off); static void ublk_buf_cleanup(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, u16 q_id, u16 tag, struct ublk_io *io); -static inline unsigned int ublk_req_build_flags(struct request *req); static void ublk_batch_dispatch(struct ublk_queue *ubq, const struct ublk_batch_io_data *data, struct ublk_batch_fetch_cmd *fcmd); =20 static inline bool ublk_dev_support_batch_io(const struct ublk_device *ub) @@ -469,10 +468,41 @@ static inline bool ublk_queue_is_zoned(const struct u= blk_queue *ubq) static inline bool ublk_dev_support_integrity(const struct ublk_device *ub) { return ub->dev_info.flags & UBLK_F_INTEGRITY; } =20 +static inline unsigned int ublk_req_build_flags(struct request *req) +{ + unsigned flags =3D 0; + + if (req->cmd_flags & REQ_FAILFAST_DEV) + flags |=3D UBLK_IO_F_FAILFAST_DEV; + + if (req->cmd_flags & REQ_FAILFAST_TRANSPORT) + flags |=3D UBLK_IO_F_FAILFAST_TRANSPORT; + + if (req->cmd_flags & REQ_FAILFAST_DRIVER) + flags |=3D UBLK_IO_F_FAILFAST_DRIVER; + + if (req->cmd_flags & REQ_META) + flags |=3D UBLK_IO_F_META; + + if (req->cmd_flags & REQ_FUA) + flags |=3D UBLK_IO_F_FUA; + + if (req->cmd_flags & REQ_NOUNMAP) + flags |=3D UBLK_IO_F_NOUNMAP; + + if (req->cmd_flags & REQ_SWAP) + flags |=3D UBLK_IO_F_SWAP; + + if (blk_integrity_rq(req)) + flags |=3D UBLK_IO_F_INTEGRITY; + + return flags; +} + #ifdef CONFIG_BLK_DEV_ZONED =20 struct ublk_zoned_report_desc { __u64 sector; __u32 operation; @@ -1436,41 +1466,10 @@ static unsigned int ublk_unmap_io(bool need_map, return ublk_copy_user_pages(req, 0, &iter, dir); } return rq_bytes; } =20 -static inline unsigned int ublk_req_build_flags(struct request *req) -{ - unsigned flags =3D 0; - - if (req->cmd_flags & REQ_FAILFAST_DEV) - flags |=3D UBLK_IO_F_FAILFAST_DEV; - - if (req->cmd_flags & REQ_FAILFAST_TRANSPORT) - flags |=3D UBLK_IO_F_FAILFAST_TRANSPORT; - - if (req->cmd_flags & REQ_FAILFAST_DRIVER) - flags |=3D UBLK_IO_F_FAILFAST_DRIVER; - - if (req->cmd_flags & REQ_META) - flags |=3D UBLK_IO_F_META; - - if (req->cmd_flags & REQ_FUA) - flags |=3D UBLK_IO_F_FUA; - - if (req->cmd_flags & REQ_NOUNMAP) - flags |=3D UBLK_IO_F_NOUNMAP; - - if (req->cmd_flags & REQ_SWAP) - flags |=3D UBLK_IO_F_SWAP; - - if (blk_integrity_rq(req)) - flags |=3D UBLK_IO_F_INTEGRITY; - - return flags; -} - static blk_status_t ublk_setup_iod(struct ublk_queue *ubq, struct request = *req) { struct ublksrv_io_desc *iod =3D ublk_get_iod(ubq, req->tag); struct ublk_io *io =3D &ubq->ios[req->tag]; u32 ublk_op; --=20 2.54.0 From nobody Sun May 24 22:35:56 2026 Received: from mail-yw1-f227.google.com (mail-yw1-f227.google.com [209.85.128.227]) (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 04A1637268D for ; Wed, 20 May 2026 20:36:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779309420; cv=none; b=UW70GlXZvL6NcOMTtwxsLMIPlqh+ogppYKq6bO/HhKmJMxR56iErn2xlH55eRJUXLbW31MC0wbvz6zl1WmCB4L8pO6Z29IaFV3lEJ0+1bcQjN0AhC/GSiu+7nXHd+NPILctNAHn7DHoZzRXNYV3DLPlIwsk8TfqNU1oplsmF+04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779309420; c=relaxed/simple; bh=2hbRQo7mkMARJQnyKMP2SNSnjNvSc36eDda5MF7AeAE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qmuxIyVF9Ekf7SK/ETHE6zDWIjlEA0T2NjilAPtRk5jfp8AWWoFnXy3SxlTWdwihFnilc4V1OCIP43wODj/aK9ZL/Pw3CCneX0wqLCvbCEkVqGiwRQdhaK+rY8PLgT2DSkxbwlwnPzy8vS3pEVzVNCY6fP5imEqJUmwd1rfX3Zg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=K8epy9xE; arc=none smtp.client-ip=209.85.128.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="K8epy9xE" Received: by mail-yw1-f227.google.com with SMTP id 00721157ae682-7bda6deccd2so3882857b3.3 for ; Wed, 20 May 2026 13:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1779309417; x=1779914217; 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=fpAgpwJbrwOx5gZ5eUZ47nuZhUbhppL2lbd7NNf+mb0=; b=K8epy9xEdckXt4WxWkq20AoVv8SfeK3/ZtrC0SOTTFwV5Isg1zJoL2nnYJD+39A2uN zIg+F3pk/AEcPzkxmkGs17OYGsikPM76HBixGkT37CBhk+rboOddFgAiNQHJ2rv6lWqf /5t4scOA2z98iqWMu66EY4w3Mpzjeg+FBFowt009s9MrejIaxnIOzbHPO6uTNeIp6Vc6 rGVXhhaakp/zjwZkSCm8MCvvZhsTyIml9E+cXrr+iQoTOMDHeA3ls6B00dOSh2cdN2hL Qx201RVoOuiSAfd5aU9g8PTxVyay++GC1lUS2BUUpjriCJY5Yq7WQTdOrlJifY0Aij2T H1yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779309417; x=1779914217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fpAgpwJbrwOx5gZ5eUZ47nuZhUbhppL2lbd7NNf+mb0=; b=JwiTiN/xvdTF/OF3fG0wlif8WsNyMbCz1tu+GlipMec3Tk6S1DQHpTmfYSqKZlqwT5 PBA3Liy/A02oTEJKWCLtRrmJRMSRicQkno8FibHD6WQG/nS58H5diDoEP5veBfmdO8AC qtonV/uMlDMUydvKjGxFLoeGijP/Vn1psdMS2/GI+F1ofH3ZcgLJS5MHyBhiwOcXb+L7 R4AiSF93cJAPlpyyvbxijuHcaBzW5LkAlNTbfSHiw48/UxxoKgOqCUl6eaPtzJcbQFrL MEPEpBFZBSjfJZqoeP00FisxmIFvvUUxqGeezKeI/miN5NEaJyPJp3tltXXa3rckvtGf 13bQ== X-Forwarded-Encrypted: i=1; AFNElJ9DmMihafZuc+TFYjs/YcYRAtHESv1lTD0oKd0ywMXhXqqrDmgNUPYTy55FfhmPg4KaKolZgrRRozdT4ms=@vger.kernel.org X-Gm-Message-State: AOJu0YyP+PpU8HwK8d7PZKTnvJRZHdQNT5RehRXq+f/gcFQcLRozmQEG w0TB23rXgKd6JuflYNXwTQa95+kaEE6no4rS6OrkYPrHLfgpcRYMD7ty8a176eJKniky8z9/Ean ZMuAosdP06w9dnaHcRvFhCLTpNY5wg1ACoucv0oq+eLEmaMQF68yi X-Gm-Gg: Acq92OHGoR0Fp9YW8I/sLWC020YxJ323EC5K/DdjoamGdUH/p7ZkalBH5HeSkhOT5ri SV+zn3f5vu/xYnVI8ZaWo9+p8SIHXs+K05nq5vCjF6flS0fTaf/+iyCTr9GXBBLT+wKwWgXnU2W j99czBrV9mCOAQK5zDjgiv68OBmGQTDd7jqRoEjDVk471CcFyIdBqq5m8Tei3J2tr5PNWLz6r22 j0vOvwoFs85pVD9kxeWfyXog8ZiFIr0nLe6OqHY1F12CkebDmMuPISZ+PgxnHMTTbRGNJoeansW qWZwEuRu2i9kU5/lFOQNouetUWENXyJlqyilCFn6flBU4ODe70czuR/xkrQsg8rOON0B5QLxNA4 tMIP2Zo1qAPcrFOSni88FFxtVyzD7XeQMz8ihBUk= X-Received: by 2002:a05:690c:7108:b0:79c:ff02:a03e with SMTP id 00721157ae682-7d20a6aea9cmr339647b3.2.1779309417149; Wed, 20 May 2026 13:36:57 -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-7cc9b6331easm8584207b3.19.2026.05.20.13.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 13:36:57 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.112.46.22]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 854DC3421AE; Wed, 20 May 2026 14:36:56 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 7ACA7E40A79; Wed, 20 May 2026 14:36:56 -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 7.2 2/2] ublk: factor out ublk_init_iod() helper Date: Wed, 20 May 2026 14:36:54 -0600 Message-ID: <20260520203654.1413640-3-csander@purestorage.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520203654.1413640-1-csander@purestorage.com> References: <20260520203654.1413640-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" The code for initializing struct ublksrv_io_desc on I/O dispatch is largely duplicated in 3 places. Commit 4d4a512a1f87 ("ublk: add PFN- based buffer matching in I/O path") added support to ublk_setup_iod() for matching request buffers against registered UBLK_F_SHMEM_ZC buffers, but missed adding it to ublk_setup_iod_zoned() for zoned requests. Move the duplicated logic to a new helper ublk_init_iod(). This way, zone appends can also benefit from avoiding the data copy. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 60 +++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 0cb29be561b5..49624e65fe75 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -499,10 +499,35 @@ static inline unsigned int ublk_req_build_flags(struc= t request *req) flags |=3D UBLK_IO_F_INTEGRITY; =20 return flags; } =20 +static void ublk_init_iod(struct ublk_queue *ubq, struct request *req, + uint8_t ublk_op, uint32_t nr_sectors, + uint64_t start_sector) +{ + struct ublksrv_io_desc *iod =3D ublk_get_iod(ubq, req->tag); + struct ublk_io *io =3D &ubq->ios[req->tag]; + + iod->op_flags =3D ublk_op | ublk_req_build_flags(req); + iod->nr_sectors =3D nr_sectors; + iod->start_sector =3D start_sector; + + /* Try shmem zero-copy match before setting addr */ + if (ublk_support_shmem_zc(ubq) && blk_rq_has_data(req)) { + u32 buf_idx, buf_off; + + if (ublk_try_buf_match(ubq->dev, req, &buf_idx, &buf_off)) { + iod->op_flags |=3D UBLK_IO_F_SHMEM_ZC; + iod->addr =3D ublk_shmem_zc_addr(buf_idx, buf_off); + return; + } + } + + iod->addr =3D io->buf.addr; +} + #ifdef CONFIG_BLK_DEV_ZONED =20 struct ublk_zoned_report_desc { __u64 sector; __u32 operation; @@ -680,12 +705,10 @@ static int ublk_report_zones(struct gendisk *disk, se= ctor_t sector, } =20 static blk_status_t ublk_setup_iod_zoned(struct ublk_queue *ubq, struct request *req) { - struct ublksrv_io_desc *iod =3D ublk_get_iod(ubq, req->tag); - struct ublk_io *io =3D &ubq->ios[req->tag]; struct ublk_zoned_report_desc *desc; u32 ublk_op; =20 switch (req_op(req)) { case REQ_OP_ZONE_OPEN: @@ -711,13 +734,12 @@ static blk_status_t ublk_setup_iod_zoned(struct ublk_= queue *ubq, if (!desc) return BLK_STS_IOERR; ublk_op =3D desc->operation; switch (ublk_op) { case UBLK_IO_OP_REPORT_ZONES: - iod->op_flags =3D ublk_op | ublk_req_build_flags(req); - iod->nr_zones =3D desc->nr_zones; - iod->start_sector =3D desc->sector; + ublk_init_iod(ubq, req, ublk_op, desc->nr_zones, + desc->sector); return BLK_STS_OK; default: return BLK_STS_IOERR; } case REQ_OP_DRV_OUT: @@ -725,15 +747,11 @@ static blk_status_t ublk_setup_iod_zoned(struct ublk_= queue *ubq, return BLK_STS_NOTSUPP; default: return BLK_STS_IOERR; } =20 - iod->op_flags =3D ublk_op | ublk_req_build_flags(req); - iod->nr_sectors =3D blk_rq_sectors(req); - iod->start_sector =3D blk_rq_pos(req); - iod->addr =3D io->buf.addr; - + ublk_init_iod(ubq, req, ublk_op, blk_rq_sectors(req), blk_rq_pos(req)); return BLK_STS_OK; } =20 #else =20 @@ -1468,12 +1486,10 @@ static unsigned int ublk_unmap_io(bool need_map, return rq_bytes; } =20 static blk_status_t ublk_setup_iod(struct ublk_queue *ubq, struct request = *req) { - struct ublksrv_io_desc *iod =3D ublk_get_iod(ubq, req->tag); - struct ublk_io *io =3D &ubq->ios[req->tag]; u32 ublk_op; =20 switch (req_op(req)) { case REQ_OP_READ: ublk_op =3D UBLK_IO_OP_READ; @@ -1494,29 +1510,11 @@ static blk_status_t ublk_setup_iod(struct ublk_queu= e *ubq, struct request *req) if (ublk_queue_is_zoned(ubq)) return ublk_setup_iod_zoned(ubq, req); return BLK_STS_IOERR; } =20 - /* need to translate since kernel may change */ - iod->op_flags =3D ublk_op | ublk_req_build_flags(req); - iod->nr_sectors =3D blk_rq_sectors(req); - iod->start_sector =3D blk_rq_pos(req); - - /* Try shmem zero-copy match before setting addr */ - if (ublk_support_shmem_zc(ubq) && blk_rq_has_data(req)) { - u32 buf_idx, buf_off; - - if (ublk_try_buf_match(ubq->dev, req, - &buf_idx, &buf_off)) { - iod->op_flags |=3D UBLK_IO_F_SHMEM_ZC; - iod->addr =3D ublk_shmem_zc_addr(buf_idx, buf_off); - return BLK_STS_OK; - } - } - - iod->addr =3D io->buf.addr; - + ublk_init_iod(ubq, req, ublk_op, blk_rq_sectors(req), blk_rq_pos(req)); return BLK_STS_OK; } =20 static inline struct ublk_uring_cmd_pdu *ublk_get_uring_cmd_pdu( struct io_uring_cmd *ioucmd) --=20 2.54.0