From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f98.google.com (mail-qv1-f98.google.com [209.85.219.98]) (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 E975B22A4F8 for ; Wed, 30 Apr 2025 22:52:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.98 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746053569; cv=none; b=h7B9w6c1UFyVCKc4iHCZYcrKbEnFcNVduelp932vefqFO10Mduz0mS/5VyDnvLK9gfCImhM/uGIQNuAafEako3MmP6sIoJ8t//I+b1Rzzipav0wNiq6aw8vl9iM0q9cKqI33BacerqdMeMUbgS4UQMFZrsKqjdrdwjKOVGzvJ+o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746053569; c=relaxed/simple; bh=feVv8f7d0KgVnnhw1uFkQnOAw5OAMYzup6QnL1O24ec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M5DyebArreOtCm2WvSZry1eosh6Y6OK7A6A/TwY/oIOrO55TgVFqypJEVh1UP5+TMTSmWw7ZkmTaLSlqT2ZJV7XK12fgwXtErTRuWwJ4yiM1UDhYWgnR4NAGmiM0veewz78ZQRtkAlANzT1qkUbjKKqXk4/sbB31qtSFHpFF0Cs= 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=L8gfYkoF; arc=none smtp.client-ip=209.85.219.98 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="L8gfYkoF" Received: by mail-qv1-f98.google.com with SMTP id 6a1803df08f44-6ed0d921c6aso521486d6.1 for ; Wed, 30 Apr 2025 15:52:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1746053565; x=1746658365; 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=Kb0AiFPk4f9Yg8x1AOb62HbUM9uzpcieXEg0cQHgsk4=; b=L8gfYkoFGZ+FQVFn8J62bfM27dr7Su+Ia22XDJmwQ51/OHwMTRypiezTPPPwToh2au KZyC7C3uUrh/gGs58IRoT6krnxhmlh2bVFzcGABXZDrBQw2TNPvngF41kINpjKinuWiV fZy+d8NnGkKB2idTHtMhqDvynUney2o7pgA360QaJAYDmwl7EPOoz3WD4YuhAcL9E29Q wbEIcKLE19novtqRZ7WF/59OD830VoJiZku/wacWxh4Q++DzjtSEr99Ghu0ce5QBiHYZ y6p2AGh5iG0K0DTnjbRTTbo/4Ck+ucjkef9Y666raxA/ZYquirgi6eW4kSooW2tCWl4X Mvfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746053565; x=1746658365; 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=Kb0AiFPk4f9Yg8x1AOb62HbUM9uzpcieXEg0cQHgsk4=; b=g9tAcgegnh8o2RYzWBwkyaex60mZv6QhgpRWxtKTwBMHHfVHNAyFWGpHYKpEvMs2gJ JKHRZkeabCUrJVI6MTMaOlJR0NbQ0DEZBCXiM4OOR0aeZ5l374JjjhFOf6dqnPvhA3Bp Sb1svNO5U9ehaQEZ1uuR3BaLhN3NOdEB94dQCFwY3gCSYkU4PAdN5u06tWgPtaof7I7K K8gbiaPwMkpjlujJnGUQzXBN2ccVdIuruFjvx3pCkZxhUUR4Y+g7aaEHgBEHXzZCDoAe T7UjNwwHDYRuf97wI04+kBUW7S3t6SsZaWzNbMvpGlZA6K6cb0TkndiXUeHjCa23GT7U 244Q== X-Forwarded-Encrypted: i=1; AJvYcCV+ScTBgHXT7HlWOnfvxqxspo8h7IfdkpeaCT09HacKFqXsssDyh2toQfcwm4gE9CForAACdOD0XuwEGQ==@vger.kernel.org X-Gm-Message-State: AOJu0YzVJjnqvKo4FgXV/PhR8KungFhmf95jysvuhvIvdy35WQcllM8w yZ7XuY/Cntw6N51mr3ovcRCIyljlJ+3u21L3hPhm+DPMvR25fTOqoYOszNprKJHfDOLf3F/9Uid y/HOZH0foXiIBiwTa7QcqZ+iFoqXM0uvmGLIt9DETDxbY1dKK X-Gm-Gg: ASbGncuPJl3iLTQZG4nxZfXeofH0YJSECJls1a2GyyXXnK/OJX4eDY+XcJel6L1+m+b HrX6dt4M9ez5S3MGsiDA/YnvxHnK/BdEMcHm5XX9apSROYrbP+j9gjg2x7KQ6MPDHD3zHGRkWwu 1J41jeritKa1rFT/sqpyLQqcpvEcoCmyOpEuoPBYXEBA9AaH4n5hznE/UZNUHqJSWh9JL46vLtT CasdQpzevPW8oPQnTkhwkHrbzyOtzN3FMwc4fkJCA7krQVmW3BK6NeohTyXfavoAQwE0t8pAeva qtMvw2V6fX8wNBLZovcvjY47h7GioA== X-Google-Smtp-Source: AGHT+IGj4pUNY527LNbrQYpNEH5IuUSjm8Ld9l2T6zD8Q/PzI+Wm7Jp3b1JOVJB4XF+D8vVf9wlO/OuBOs7f X-Received: by 2002:a05:6214:400d:b0:6f4:c603:588c with SMTP id 6a1803df08f44-6f4ff5f60cfmr21770926d6.7.1746053565642; Wed, 30 Apr 2025 15:52:45 -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 6a1803df08f44-6f4fe82291bsm1233686d6.69.2025.04.30.15.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 15:52:45 -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 06CE8340199; Wed, 30 Apr 2025 16:52:45 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 05136E41CC0; Wed, 30 Apr 2025 16:52:45 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: Uday Shankar , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 6/9] ublk: factor out ublk_start_io() helper Date: Wed, 30 Apr 2025 16:52:31 -0600 Message-ID: <20250430225234.2676781-7-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250430225234.2676781-1-csander@purestorage.com> References: <20250430225234.2676781-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In preparation for calling it from outside ublk_dispatch_req(), factor out the code responsible for setting up an incoming ublk I/O request. Signed-off-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 54 +++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index dcde38b39a82..b4c64779c4fd 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1150,17 +1150,45 @@ static inline void __ublk_abort_rq(struct ublk_queue *ubq, blk_mq_requeue_request(rq, false); else blk_mq_end_request(rq, BLK_STS_IOERR); } +static bool ublk_start_io(const struct ublk_queue *ubq, struct request *req, + struct ublk_io *io) +{ + unsigned mapped_bytes = ublk_map_io(ubq, req, io); + + /* partially mapped, update io descriptor */ + if (unlikely(mapped_bytes != blk_rq_bytes(req))) { + /* + * Nothing mapped, retry until we succeed. + * + * We may never succeed in mapping any bytes here because + * of OOM. TODO: reserve one buffer with single page pinned + * for providing forward progress guarantee. + */ + if (unlikely(!mapped_bytes)) { + blk_mq_requeue_request(req, false); + blk_mq_delay_kick_requeue_list(req->q, + UBLK_REQUEUE_DELAY_MS); + return false; + } + + ublk_get_iod(ubq, req->tag)->nr_sectors = + mapped_bytes >> 9; + } + + ublk_init_req_ref(ubq, req); + return true; +} + static void ublk_dispatch_req(struct ublk_queue *ubq, struct request *req, unsigned int issue_flags) { int tag = req->tag; struct ublk_io *io = &ubq->ios[tag]; - unsigned int mapped_bytes; pr_devel("%s: complete: qid %d tag %d io_flags %x addr %llx\n", __func__, ubq->q_id, req->tag, io->flags, ublk_get_iod(ubq, req->tag)->addr); @@ -1203,33 +1231,13 @@ static void ublk_dispatch_req(struct ublk_queue *ubq, pr_devel("%s: update iod->addr: qid %d tag %d io_flags %x addr %llx\n", __func__, ubq->q_id, req->tag, io->flags, ublk_get_iod(ubq, req->tag)->addr); } - mapped_bytes = ublk_map_io(ubq, req, io); - - /* partially mapped, update io descriptor */ - if (unlikely(mapped_bytes != blk_rq_bytes(req))) { - /* - * Nothing mapped, retry until we succeed. - * - * We may never succeed in mapping any bytes here because - * of OOM. TODO: reserve one buffer with single page pinned - * for providing forward progress guarantee. - */ - if (unlikely(!mapped_bytes)) { - blk_mq_requeue_request(req, false); - blk_mq_delay_kick_requeue_list(req->q, - UBLK_REQUEUE_DELAY_MS); - return; - } - - ublk_get_iod(ubq, req->tag)->nr_sectors = - mapped_bytes >> 9; - } + if (!ublk_start_io(ubq, req, io)) + return; - ublk_init_req_ref(ubq, req); ublk_complete_io_cmd(io, UBLK_IO_RES_OK, issue_flags); } static void ublk_cmd_tw_cb(struct io_uring_cmd *cmd, unsigned int issue_flags) -- 2.45.2