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.129.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 1DE021DDC07 for ; Wed, 2 Jul 2025 04:04:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751429069; cv=none; b=JWT2weNzg03WURSasSrjxSbGeptMU77d8cTp56Pi3LPea9Tub5d4IFBpZvOiVO4RYVBIPA/Jd69gwZzI39W0jdww2vK5OWmh0KqQOFfpKgAMshT0JVeNiIdcNSwHRC8mQ6gv2R6ILbbXqRwHaintcu+gFNCi75VackxaQC7ThSs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751429069; c=relaxed/simple; bh=gnHpqj3Jcrh14GwREsIUyqApQgxmBAiyNlDUrgo+Afw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SRY2gHg12D0ossFfRzj7QmY/LDgnrT9if11wG971dkMj2FJDdDmzH0Htf5p8dO118mcU1uMYVpqd7N/T6U8LFEegHZUAFBXoHGvrojUdPW1+hPjLZdZPcz+tYEyHxsnGt8WPW6wNc8J6p1dtN5Y+gTwJ8d4T4honmLnQiskqdAQ= 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=FOR5pOt7; arc=none smtp.client-ip=170.10.129.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="FOR5pOt7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751429067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jJcjPnCo3tSJc+JhNYa97haf5LtWYimsSqCRgV1+b0E=; b=FOR5pOt7efUybtD7JxikIiyKUfnydVHgNLXcVVNCRiRFVc4/erWAtjQ1700BXlafE9YYXT 2e4gefm9MhO9lw2qPLS0eeKHCxOVO0+TEAMR0kJy2ymEsxLI/FKcAM8f7Oyp2gQH8//OBW TosijWcJAgcSdfZEsGcEnBJaN4xrkOc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-bYczy3_SOQKDcey9FdTrYA-1; Wed, 02 Jul 2025 00:04:23 -0400 X-MC-Unique: bYczy3_SOQKDcey9FdTrYA-1 X-Mimecast-MFC-AGG-ID: bYczy3_SOQKDcey9FdTrYA_1751429062 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E39681809C80; Wed, 2 Jul 2025 04:04:21 +0000 (UTC) Received: from localhost (unknown [10.72.116.27]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0FF641956087; Wed, 2 Jul 2025 04:04:20 +0000 (UTC) From: Ming Lei To: Jens Axboe , linux-block@vger.kernel.org Cc: Uday Shankar , Caleb Sander Mateos , Ming Lei Subject: [PATCH 06/16] ublk: store auto buffer register data into `struct ublk_io` Date: Wed, 2 Jul 2025 12:03:30 +0800 Message-ID: <20250702040344.1544077-7-ming.lei@redhat.com> In-Reply-To: <20250702040344.1544077-1-ming.lei@redhat.com> References: <20250702040344.1544077-1-ming.lei@redhat.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 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 We can share space of `io->addr` for storing auto buffer register data and user space buffer address. So store auto buffer register data into `struct ublk_io`. Prepare for supporting batch IO in which many ublk IOs share single uring_cmd, so we can't store auto buffer register data into uring_cmd pdu. Signed-off-by: Ming Lei --- drivers/block/ublk_drv.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index ba1b2672e7a8..6d3aa08eef22 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -105,8 +105,6 @@ struct ublk_uring_cmd_pdu { */ struct ublk_queue *ubq; - struct ublk_auto_buf_reg buf; - u16 tag; }; @@ -159,7 +157,10 @@ struct ublk_uring_cmd_pdu { struct ublk_io { /* userspace buffer address from io cmd */ - __u64 addr; + union { + __u64 addr; + struct ublk_auto_buf_reg buf; + }; unsigned int flags; int res; @@ -187,8 +188,6 @@ struct ublk_io { /* Count of buffers registered on task and not yet unregistered */ unsigned task_registered_buffers; - /* auto-registered buffer, valid if UBLK_IO_FLAG_AUTO_BUF_REG is set */ - u16 buf_index; void *buf_ctx_handle; } ____cacheline_aligned_in_smp; @@ -1214,13 +1213,12 @@ ublk_auto_buf_reg_fallback(const struct ublk_queue *ubq, struct ublk_io *io) static bool ublk_auto_buf_reg(const struct ublk_queue *ubq, struct request *req, struct ublk_io *io, unsigned int issue_flags) { - struct ublk_uring_cmd_pdu *pdu = ublk_get_uring_cmd_pdu(io->cmd); int ret; ret = io_buffer_register_bvec(io->cmd, req, ublk_io_release, - pdu->buf.index, issue_flags); + io->buf.index, issue_flags); if (ret) { - if (pdu->buf.flags & UBLK_AUTO_BUF_REG_FALLBACK) { + if (io->buf.flags & UBLK_AUTO_BUF_REG_FALLBACK) { ublk_auto_buf_reg_fallback(ubq, io); return true; } @@ -1230,8 +1228,6 @@ static bool ublk_auto_buf_reg(const struct ublk_queue *ubq, struct request *req, io->task_registered_buffers = 1; io->buf_ctx_handle = io_uring_cmd_ctx_handle(io->cmd); - /* store buffer index in request payload */ - io->buf_index = pdu->buf.index; io->flags |= UBLK_IO_FLAG_AUTO_BUF_REG; return true; } @@ -1985,16 +1981,14 @@ static inline int ublk_check_cmd_op(u32 cmd_op) return 0; } -static inline int ublk_set_auto_buf_reg(struct io_uring_cmd *cmd) +static inline int ublk_set_auto_buf_reg(struct ublk_io *io, struct io_uring_cmd *cmd) { - struct ublk_uring_cmd_pdu *pdu = ublk_get_uring_cmd_pdu(cmd); - - pdu->buf = ublk_sqe_addr_to_auto_buf_reg(READ_ONCE(cmd->sqe->addr)); + io->buf = ublk_sqe_addr_to_auto_buf_reg(READ_ONCE(cmd->sqe->addr)); - if (pdu->buf.reserved0 || pdu->buf.reserved1) + if (io->buf.reserved0 || io->buf.reserved1) return -EINVAL; - if (pdu->buf.flags & ~UBLK_AUTO_BUF_REG_F_MASK) + if (io->buf.flags & ~UBLK_AUTO_BUF_REG_F_MASK) return -EINVAL; return 0; } @@ -2018,10 +2012,10 @@ static int ublk_handle_auto_buf_reg(struct ublk_io *io, */ if (io->buf_ctx_handle == io_uring_cmd_ctx_handle(cmd) && buf_idx) - *buf_idx = io->buf_index; + *buf_idx = io->buf.index; } - return ublk_set_auto_buf_reg(cmd); + return ublk_set_auto_buf_reg(io, cmd); } /* Once we return, `io->req` can't be used any more */ -- 2.47.0