From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80EF82E645 for ; Tue, 10 Jun 2025 01:22:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749518562; cv=none; b=hWv0MtfCJ62WRiZ9UD2QThg5vWTudigJlCNlxF2aJbB6bPwCQyGyAmbHUcSNm3WXhCfk9JyrzVvvAejHMMJkEHyQzXCLJ3G6r4u8MwBin5iyT0AdvH/7GzFNj+j/q8xEqfvQyRpMSwLyYi/hSBdQdhvyCmkRR1m3Umex9qB5WSY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749518562; c=relaxed/simple; bh=5liZ59DvRw/Gbe8xJin4dpLuFknhZ8pAq6rUpW0imfM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=CWhWO2tFTQp+ZCw1vz78UAvoA5UzzNLidfUYOX5qbwE1I0ytngJVudbIS9dHAQx3RecSFFS/gVZZry9WlA92pb9r1S2ZxqUKWmNEylE33g/UjwNI3WevxXCcPlAnc8XL3nfBsBIydmEaYEF97AqbPjmZnhrBKgJU/YwFYHhQGNY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XMP1maFD; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XMP1maFD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749518559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oPUCWHafQpDnV5VTulOrc4d6LtFHeuVNGtjt2r0WqZo=; b=XMP1maFD7GmWwVAj6uG4y5707vzBWvQBe94rutRzWt6i8H19LOTV0C1iuQy8ujwM/Yo5G1 YUHMK8jKwGkV6nteNF76BK+eTYmgAUwyu9u7Nb2Mek+6ucWcLJj+B9tFwjUlRD81ioNC4o vH4B/Tp3Pmy3zkMHILy+U7fKgFoUGEY= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-3gWRcu9CPu2frrweVTjQkA-1; Mon, 09 Jun 2025 21:22:36 -0400 X-MC-Unique: 3gWRcu9CPu2frrweVTjQkA-1 X-Mimecast-MFC-AGG-ID: 3gWRcu9CPu2frrweVTjQkA_1749518555 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AB53419560B0; Tue, 10 Jun 2025 01:22:35 +0000 (UTC) Received: from fedora (unknown [10.72.116.15]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 54A1B180035C; Tue, 10 Jun 2025 01:22:32 +0000 (UTC) Date: Tue, 10 Jun 2025 09:22:28 +0800 From: Ming Lei To: Caleb Sander Mateos Cc: Uday Shankar , linux-block@vger.kernel.org Subject: Re: [PATCH 7/8] ublk: optimize UBLK_IO_REGISTER_IO_BUF on daemon task Message-ID: References: <20250606214011.2576398-1-csander@purestorage.com> <20250606214011.2576398-8-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 On Mon, Jun 09, 2025 at 10:14:21AM -0700, Caleb Sander Mateos wrote: > On Mon, Jun 9, 2025 at 2:02 AM Ming Lei wrote: > > > > On Fri, Jun 06, 2025 at 03:40:10PM -0600, Caleb Sander Mateos wrote: > > > ublk_register_io_buf() performs an expensive atomic refcount increment, > > > as well as a lot of pointer chasing to look up the struct request. > > > > > > Create a separate ublk_daemon_register_io_buf() for the daemon task to > > > call. Initialize ublk_rq_data's reference count to a large number, count > > > the number of buffers registered on the daemon task nonatomically, and > > > atomically subtract the large number minus the number of registered > > > buffers in ublk_commit_and_fetch(). > > > > > > Also obtain the struct request directly from ublk_io's req field instead > > > of looking it up on the tagset. > > > > > > Signed-off-by: Caleb Sander Mateos > > > --- > > > drivers/block/ublk_drv.c | 59 ++++++++++++++++++++++++++++++++++------ > > > 1 file changed, 50 insertions(+), 9 deletions(-) > > > > > > diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c > > > index 2084bbdd2cbb..ec9e0fd21b0e 100644 > > > --- a/drivers/block/ublk_drv.c > > > +++ b/drivers/block/ublk_drv.c > > > @@ -81,12 +81,20 @@ > > > #define UBLK_PARAM_TYPE_ALL \ > > > (UBLK_PARAM_TYPE_BASIC | UBLK_PARAM_TYPE_DISCARD | \ > > > UBLK_PARAM_TYPE_DEVT | UBLK_PARAM_TYPE_ZONED | \ > > > UBLK_PARAM_TYPE_DMA_ALIGN | UBLK_PARAM_TYPE_SEGMENT) > > > > > > +/* > > > + * Initialize refcount to a large number to include any registered buffers. > > > + * UBLK_IO_COMMIT_AND_FETCH_REQ will release these references minus those for > > > + * any buffers registered on the io daemon task. > > > + */ > > > +#define UBLK_REFCOUNT_INIT (REFCOUNT_MAX / 2) > > > + > > > struct ublk_rq_data { > > > refcount_t ref; > > > + unsigned buffers_registered; > > > > > > /* for auto-unregister buffer in case of UBLK_F_AUTO_BUF_REG */ > > > u16 buf_index; > > > void *buf_ctx_handle; > > > }; > > > @@ -677,11 +685,12 @@ static inline void ublk_init_req_ref(const struct ublk_queue *ubq, > > > struct request *req) > > > { > > > if (ublk_need_req_ref(ubq)) { > > > struct ublk_rq_data *data = blk_mq_rq_to_pdu(req); > > > > > > - refcount_set(&data->ref, 1); > > > + refcount_set(&data->ref, UBLK_REFCOUNT_INIT); > > > + data->buffers_registered = 0; > > > } > > > } > > > > > > static inline bool ublk_get_req_ref(const struct ublk_queue *ubq, > > > struct request *req) > > > @@ -706,10 +715,19 @@ static inline void ublk_put_req_ref(const struct ublk_queue *ubq, > > > } else { > > > __ublk_complete_rq(req); > > > } > > > } > > > > > > +static inline void ublk_sub_req_ref(struct request *req) > > > +{ > > > + struct ublk_rq_data *data = blk_mq_rq_to_pdu(req); > > > + unsigned sub_refs = UBLK_REFCOUNT_INIT - data->buffers_registered; > > > + > > > + if (refcount_sub_and_test(sub_refs, &data->ref)) > > > + __ublk_complete_rq(req); > > > +} > > > + > > > static inline bool ublk_need_get_data(const struct ublk_queue *ubq) > > > { > > > return ubq->flags & UBLK_F_NEED_GET_DATA; > > > } > > > > > > @@ -1184,14 +1202,12 @@ static inline void __ublk_abort_rq(struct ublk_queue *ubq, > > > > > > static void ublk_auto_buf_reg_fallback(struct request *req) > > > { > > > const struct ublk_queue *ubq = req->mq_hctx->driver_data; > > > struct ublksrv_io_desc *iod = ublk_get_iod(ubq, req->tag); > > > - struct ublk_rq_data *data = blk_mq_rq_to_pdu(req); > > > > > > iod->op_flags |= UBLK_IO_F_NEED_REG_BUF; > > > - refcount_set(&data->ref, 1); > > > } > > > > > > static bool ublk_auto_buf_reg(struct request *req, struct ublk_io *io, > > > unsigned int issue_flags) > > > { > > > @@ -1207,13 +1223,12 @@ static bool ublk_auto_buf_reg(struct request *req, struct ublk_io *io, > > > return true; > > > } > > > blk_mq_end_request(req, BLK_STS_IOERR); > > > return false; > > > } > > > - /* one extra reference is dropped by ublk_io_release */ > > > - refcount_set(&data->ref, 2); > > > > > > + data->buffers_registered = 1; > > > data->buf_ctx_handle = io_uring_cmd_ctx_handle(io->cmd); > > > /* store buffer index in request payload */ > > > data->buf_index = pdu->buf.index; > > > io->flags |= UBLK_IO_FLAG_AUTO_BUF_REG; > > > return true; > > > @@ -1221,14 +1236,14 @@ static bool ublk_auto_buf_reg(struct request *req, struct ublk_io *io, > > > > > > static bool ublk_prep_auto_buf_reg(struct ublk_queue *ubq, > > > struct request *req, struct ublk_io *io, > > > unsigned int issue_flags) > > > { > > > + ublk_init_req_ref(ubq, req); > > > if (ublk_support_auto_buf_reg(ubq) && ublk_rq_has_data(req)) > > > return ublk_auto_buf_reg(req, io, issue_flags); > > > > > > - ublk_init_req_ref(ubq, req); > > > return true; > > > } > > > > > > static bool ublk_start_io(const struct ublk_queue *ubq, struct request *req, > > > struct ublk_io *io) > > > @@ -2019,10 +2034,31 @@ static int ublk_register_io_buf(struct io_uring_cmd *cmd, > > > } > > > > > > return 0; > > > } > > > > > > +static int ublk_daemon_register_io_buf(struct io_uring_cmd *cmd, > > > + const struct ublk_queue *ubq, > > > + const struct ublk_io *io, > > > + unsigned index, unsigned issue_flags) > > > +{ > > > + struct request *req = io->req; > > > + struct ublk_rq_data *data = blk_mq_rq_to_pdu(req); > > > + int ret; > > > + > > > + if (!ublk_support_zero_copy(ubq) || !ublk_rq_has_data(req)) > > > + return -EINVAL; > > > + > > > + ret = io_buffer_register_bvec(cmd, req, ublk_io_release, index, > > > + issue_flags); > > > + if (ret) > > > + return ret; > > > + > > > + data->buffers_registered++; > > > > This optimization replaces one ublk_get_req_ref()/refcount_inc_not_zero() > > with data->buffers_registered++ in case of registering io buffer from > > daemon context. > > > > And in typical implementation, the unregistering io buffer should be done > > in daemon context too, then I am wondering if any user-visible improvement > > can be observed in this more complicated & fragile way: > > Yes, generally I would expect the unregister to happen on the daemon > task too. But it's possible (with patch "ublk: allow > UBLK_IO_(UN)REGISTER_IO_BUF on any task") for the > UBLK_IO_UNREGISTER_IO_BUF to be issued on another task. And even if > the unregister happens on the daemon task, it's up to the io_uring > layer to actually call ublk_io_release() once all requests using the > registered buffer have completed. Assuming only the daemon task issues > io_uring requests using the buffer, I believe ublk_io_release() will > always currently be called on that task. But I'd rather not make > assumptions about the io_uring layer. It's also possible in principle > for ublk_io_release() whether it's called on the daemon task and have > a fast path in that case (similar to UBLK_IO_REGISTER_IO_BUF). Yes, my point is that optimization should focus on common case. > But I'm not sure it's worth the cost of an additional ubq/io lookup. > > > > > - __ublk_check_and_get_req() is bypassed. > > > > - buggy application may overflow ->buffers_registered > > Isn't it already possible in principle for a ublk server to overflow > ublk_rq_data's refcount_t by registering the same ublk request with > lots of buffers? But sure, if you're concerned about this overflow, I > can easily add a check for it. At least refcount_inc_not_zero() will warn if it happens. > > > > > So can you share any data about this optimization on workload with local > > registering & remote un-registering io buffer? Also is this usage > > really one common case? > > Sure, I can provide some performance measurements for this > optimization. From looking at CPU profiles in the past, the reference > counting and request lookup accounted for around 2% of the ublk server > CPU time. To be clear, in our use case, both the register and > unregister happen on the daemon task. I just haven't bothered > optimizing the reference-counting for the unregister yet because it > doesn't appear nearly as expensive. If you are talking about per-io-task, I guess it may not make a difference from user viewpoint from both iops and cpu utilization since the counter is basically per-task variable, and atomic cost shouldn't mean something for us. Thanks, Ming