From patchwork Sat Aug 24 15:43:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13776432 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (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 1577729CEB for ; Sat, 24 Aug 2024 15:46:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724514365; cv=none; b=ZEa884hjFmArYFrW9EiKNWnzcp1cq24HZjO6WkIOlqJOTWxBIUYhpEce4K6jDb2zqj4dfayH+Uo37mIxNosSBpyzOQd5q9F04whZhkZjOo+NtjeB3gVqj7eJEVJTnvAT/dZwcyfScG+0RKujDgpokS5yCFPVeEWqsfVMRsklvUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724514365; c=relaxed/simple; bh=S4vGWTfy4BnpV4s+s0ZfEUKuJbSzm3xvA6tvTUOFk7s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oyCptsjj8cZeg2eGUF/VKi6QHxJ0eXZ74bOSscHebvfZ9bvnxUFmCoVuyqtstDs7QZ2nlHIlfS04QFU9dp+7C1xvGOeUEEYefaIM1e+EiCU5SeHP5W96UP7Jgp6+mTDYddYVa+jpEc2gLBr+YJazZp7+8iWfkIFkpZ+hWbQWOC0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=ck0HSYzO; arc=none smtp.client-ip=209.85.215.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="ck0HSYzO" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7cf5e179b68so751349a12.1 for ; Sat, 24 Aug 2024 08:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1724514362; x=1725119162; 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=IpXZSAiEflQrGxhh6J+qkCCS28mzL/xqe1qvT/saV5A=; b=ck0HSYzOJqfApAtTUsuXgoiemQmpB4do3FT3aL5C5FOf2/ItsfBE4896pibdHhbwgL a+oC2J9zb4QdT7dZcyl/aTXzP+3TLBfy1YUafEYNLFzjrGxNFs/vyAOZgVdqtrA71779 2wpz+Z4s1OS9vxvLjgrhn4shHgvfLUyJFP/hsg2qG4nPQFCYkNGwwp5YEaCfUUx/Djlh 2YzGVCPp6ePNiBmyi7sEI08AyRf6sczDUcvvupvRBgZoDLKmvm0D25H2Qc7A7SrAYZlN LYKW0PM+Ugo3Cke5m9qgiyHfNfdRNyhu4pzzX8sEtdP0A84SGMMAvgcleFJpaRvpR4Hm 8ECg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724514362; x=1725119162; 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=IpXZSAiEflQrGxhh6J+qkCCS28mzL/xqe1qvT/saV5A=; b=rG4hr4kF7BFlECOUll6Qixh9e/q34dd/Aqa/77E8L/HSN9IcTNfxThwK8ArDy5Oyv+ NBAug9HO0h5hB03jzahBSQDfJqz+995xslHNnBecZfLI0gl2TrtQVH4mIpArHKJzQIrR mAmtvWFPoQfNcpnRFFyNJbh7JoZtuvMfbSzspcPeX20IATGsPL7zyTgNBQ6B2uz8HmcC ecFjngnri86gXWcy9CyMRutE7mnBrY2UzaigaQuf+e7rkX8IHU4DMvmy+1jAtsNI5wUF WI3qZ8lxOsgIySxz4od4IgtLCZcWEbAOF34gZ95WIS3eREmuohZbzR1sM9QNTFIh08RE zbrQ== X-Gm-Message-State: AOJu0Yyl2NNaB5PAQqJpEy+q7axYLL+o3at69IJ0DCN0Bp2wmGtojHeF Cv06NCmuPy9FPRZo21366vL5NwF6E0fHOypDPEXXqUiWv3uCCesMMMw9jRAwDxgq1C/vct/DBOU l X-Google-Smtp-Source: AGHT+IEjbyFVXnWaMUd/1K0fFmwkxAeCKS5/QlcBVqu8sug1kfDs2hzpa5HDkGX1YFjfuxksY4V+mQ== X-Received: by 2002:a17:90a:d508:b0:2c8:4250:66a7 with SMTP id 98e67ed59e1d1-2d644778207mr9227848a91.1.1724514361803; Sat, 24 Aug 2024 08:46:01 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d5eb9049b0sm8596939a91.17.2024.08.24.08.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2024 08:46:00 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 1/4] io_uring/kbuf: add io_kbuf_commit() helper Date: Sat, 24 Aug 2024 09:43:54 -0600 Message-ID: <20240824154555.110170-2-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240824154555.110170-1-axboe@kernel.dk> References: <20240824154555.110170-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Committing the selected ring buffer is currently done in three different spots, combine it into a helper and just call that. Signed-off-by: Jens Axboe --- io_uring/kbuf.c | 7 +++---- io_uring/kbuf.h | 14 ++++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c index a4bde998f50d..c69f69807885 100644 --- a/io_uring/kbuf.c +++ b/io_uring/kbuf.c @@ -171,9 +171,8 @@ static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len, * the transfer completes (or if we get -EAGAIN and must poll of * retry). */ - req->flags &= ~REQ_F_BUFFERS_COMMIT; + io_kbuf_commit(req, bl, 1); req->buf_list = NULL; - bl->head++; } return u64_to_user_ptr(buf->addr); } @@ -297,8 +296,8 @@ int io_buffers_select(struct io_kiocb *req, struct buf_sel_arg *arg, * committed them, they cannot be put back in the queue. */ if (ret > 0) { - req->flags |= REQ_F_BL_NO_RECYCLE; - bl->head += ret; + req->flags |= REQ_F_BUFFERS_COMMIT | REQ_F_BL_NO_RECYCLE; + io_kbuf_commit(req, bl, ret); } } else { ret = io_provided_buffers_select(req, &arg->out_len, bl, arg->iovs); diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h index ab30aa13fb5e..43c7b18244b3 100644 --- a/io_uring/kbuf.h +++ b/io_uring/kbuf.h @@ -121,15 +121,21 @@ static inline bool io_kbuf_recycle(struct io_kiocb *req, unsigned issue_flags) return false; } +static inline void io_kbuf_commit(struct io_kiocb *req, + struct io_buffer_list *bl, int nr) +{ + if (unlikely(!(req->flags & REQ_F_BUFFERS_COMMIT))) + return; + bl->head += nr; + req->flags &= ~REQ_F_BUFFERS_COMMIT; +} + static inline void __io_put_kbuf_ring(struct io_kiocb *req, int nr) { struct io_buffer_list *bl = req->buf_list; if (bl) { - if (req->flags & REQ_F_BUFFERS_COMMIT) { - bl->head += nr; - req->flags &= ~REQ_F_BUFFERS_COMMIT; - } + io_kbuf_commit(req, bl, nr); req->buf_index = bl->bgid; } req->flags &= ~REQ_F_BUFFER_RING; From patchwork Sat Aug 24 15:43:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13776433 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 B47BB1EA80 for ; Sat, 24 Aug 2024 15:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724514367; cv=none; b=nnrv358VdjMzljzY+Uar9r++iH/EyDQDFnB1vIdhKtNrh6gaK3GiFgElL34/xHZlBg5OpVanqaggXWZjaoJJaZQOo7RS+NoUNxyRutwuXdTYCQfbmqsG2xXG9wPjpZSdHC/QAofoXc46H8X52FAGVfKZlAehoar8Knrl7efkr2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724514367; c=relaxed/simple; bh=Wcv6w+BIn8JWKraCksQKIpkC+br4o1NF2DF3lqGr2/c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fm9oIHrZAox4L4qNTa/JDuWVNAWSmXZ2ymm2ZMgohNpoOZv6uBQ/w9a7RcXsUQeUlnrxzRQQTEqxblhR41nl12306Dpo3QiJkzCaTQFElON9/V3JYv1A96lK0Y1SLoefitdEqI0h53MFApZcNv06xCdBWk/eg46QUgXA6+jRi/U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=CbNLXPZ4; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="CbNLXPZ4" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2d3c396787cso2407453a91.1 for ; Sat, 24 Aug 2024 08:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1724514363; x=1725119163; 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=QYBi4XLMwDLtdov1Ccq79qgk5GT+Q1dHBt7qkDvz7i0=; b=CbNLXPZ4TwIKbwjXHhiOlzn/YmYE3EJtd53UE8qgwc90KeQxCgfQls6C/ErNZRB59t sj5Rn7qmJH5BBg6UTSITEr5PBhKkDSA2jOuR2EX/1Bl3fdVy/dFbHU0s39S6Twzc0Mq/ icoVePgmgUyWXdypFuTiZY1d6baG/yx6MOcR6RliOWzr6hOTiLSKgCKlyEWQ4t/RWUco /ALTwu6CclthFmypylYccu57oU8fgtWjtJUkjxIcbu9zIL3CW28hBLMhM8DfUWqac/yM /R5r8M4vskZKTt2iJ16y4R0aA0wCslMCaK8/Uxf3H3MvMu3bejWHUrAx5V+MopObYEBR GtPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724514363; x=1725119163; 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=QYBi4XLMwDLtdov1Ccq79qgk5GT+Q1dHBt7qkDvz7i0=; b=FWlAjkkbZVGhHJTi8vIyoJhrU490V4i2HOU9o/1C7yaxdcRSXSbcu3pYldrKqx/Kgo iboGf5KYwZ5hCu7PMX48d+PLX/dPiy3CKGFzZIREA0PdmgjD2Ft2KFpYQ0kEYSjTX93G ZoTBtqwfF+G0xU/8fWXdYGFy+AWaLTUGgQOVHIOFHgJFT/ZvmJA+mgPCbId8Dd0t3rMK wdR1o4YYyGGKJ0KKm2AXpsbiREi4nPRQYgWuP6WTQIOZQd6UOHWwlGjSP4UcruoO2fFR tmRlvCJIwGhHcdRDo8RjFG/jGtBFK7r1OrCgDo93nFh5qmaOLiQJpdsjdQu9rdlCHPD2 E0og== X-Gm-Message-State: AOJu0YyszJAcP9SWb017yGHMjlJ+0UqguSHAKuxYdLmuAhzF8DIsrI75 9TgALDwz5L38EugK4GmVLDxqIwdmoOByvACoMI6z6xtZeMFX5yc/0bZcw8JchnM4mOUF1AMkRSM b X-Google-Smtp-Source: AGHT+IHEwNVXZEMSZmAk7mJJ7J93XmSIxqR+2jN/Jldp2TOMaqjLrmrtm2qao0v39TaRMlc2LlWD/w== X-Received: by 2002:a17:90a:600c:b0:2d3:c2a0:a0f5 with SMTP id 98e67ed59e1d1-2d646bc144fmr5236594a91.11.1724514363529; Sat, 24 Aug 2024 08:46:03 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d5eb9049b0sm8596939a91.17.2024.08.24.08.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2024 08:46:02 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 2/4] io_uring/kbuf: move io_ring_head_to_buf() to kbuf.h Date: Sat, 24 Aug 2024 09:43:55 -0600 Message-ID: <20240824154555.110170-3-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240824154555.110170-1-axboe@kernel.dk> References: <20240824154555.110170-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In preparation for using this helper in kbuf.h as well, move it there and turn it into a macro. Signed-off-by: Jens Axboe --- io_uring/kbuf.c | 6 ------ io_uring/kbuf.h | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c index c69f69807885..297c1d2c3c27 100644 --- a/io_uring/kbuf.c +++ b/io_uring/kbuf.c @@ -132,12 +132,6 @@ static int io_provided_buffers_select(struct io_kiocb *req, size_t *len, return 0; } -static struct io_uring_buf *io_ring_head_to_buf(struct io_uring_buf_ring *br, - __u16 head, __u16 mask) -{ - return &br->bufs[head & mask]; -} - static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len, struct io_buffer_list *bl, unsigned int issue_flags) diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h index 43c7b18244b3..4c34ff3144b9 100644 --- a/io_uring/kbuf.h +++ b/io_uring/kbuf.h @@ -121,6 +121,9 @@ static inline bool io_kbuf_recycle(struct io_kiocb *req, unsigned issue_flags) return false; } +/* Mapped buffer ring, return io_uring_buf from head */ +#define io_ring_head_to_buf(br, head, mask) &(br)->bufs[(head) & (mask)] + static inline void io_kbuf_commit(struct io_kiocb *req, struct io_buffer_list *bl, int nr) { From patchwork Sat Aug 24 15:43:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13776434 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (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 3CBFC29CEB for ; Sat, 24 Aug 2024 15:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724514368; cv=none; b=jDx9zQ4PD8Ncoyd7g49NIZD/i3S0afeMqQzRhKCpiIZo0dxXXzoTnl+ybMs/2QfI/N/rz/xGQIwjn2Ic9/kO0ThdjrYCaBktiOoYCrwEwfnZK1kzcGrGhPCOzJX5PScqzkDAms4OsVLgBOM9/lTkcU1HAGJMxXKv8jEdCikF1so= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724514368; c=relaxed/simple; bh=4eZS4mdX540H0maC/bvPRFHywgITJ7MiqVHUpXsLliM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H+NUxD6hoCNdccGAdT6ooMD1DVEzuQW2LPj8nZX5HVE5wBf/vnneGLKm93FKBvhjtc533LnIjXp1Tg6kfiBiokRIQ38+guaLnmwvIvcI59FqWrw0dk0LmIhXz2IR3nmLuzHsPUU7AaGljzRLYaR4Vuu/BWZPFN/mK4qbTbRR/4Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=JyH89Tc5; arc=none smtp.client-ip=209.85.215.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="JyH89Tc5" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-7cd967d8234so1845815a12.2 for ; Sat, 24 Aug 2024 08:46:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1724514365; x=1725119165; 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=13ZYkOezJuvE61Ji1KvE094MwNJk0Fd40sBkhiKcDII=; b=JyH89Tc5GqUADXsH4A2qqO2hlR8ISwt9riLY9el9O2lhUgUg4ciL/LfNDMbg4JNRAc NmVQCG67jHBboaYy80HRu8541Vm4hg0VMDROl2eeYDNLy4qtTeTlEtHe6+wacaIM0MtO DZTJzdACRTqlO1Z7dKF+Cd3+aImFWsfihoOkVgr8PfeRCu9Ow2x6QiKZb4MO1ooHAzvl 9f5W689QVOV/wtQuXEG1cO0PWnEN5w0LgQkkryrBFS4O/2XsKtGCzipyutkUU7cedExc mYC5225wapvBQBWdpFsLOdY59utGh2whsDSQPUq0gVXWT+a7lGzTjR9FW5HZxp89Stld ZWDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724514365; x=1725119165; 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=13ZYkOezJuvE61Ji1KvE094MwNJk0Fd40sBkhiKcDII=; b=i8Xkj264NayeZ0HO0nYLNsTzsKUL7BXe/9x74S6fWj6KThPj7FYLkOOAop4QGsllYP BKHAlGm8Wtom2H+THqSpkXQTwzsOzvtegu9GHoynoKHKgG/b0KKadjTAmUwv3tXng7gf CRsOzJKQvL5a9n63F3kweWXJNMm8m5lN9Dj5749Zy6BpDZW5eklmnQoxxit2n+rYjP3B iYnArZbXuNWChbY3mYKHiFjhEKQXGpl2G1oUQX/DaVYsc/fKY86zT+i+CYoAVNjVNLEM r4fKad66AXVYJQDwg0vnk6uhRWfZ7bR5vqjr7X2PKFYTBnNR9kr/LnHFnjSJlO1WSV3b 1WbA== X-Gm-Message-State: AOJu0YydMhEQjLThdcmabN9KuDtRnpYjQX+AJ8py51JiHpXzj0h5gXIN 6MfwbHG5SbMX8ospgDWurFwCkIW/UTfTcKnyLCEy+ISGxMGyex8KlasVMB8NAfv54REjj1tx6rt f X-Google-Smtp-Source: AGHT+IGlWElnzksMgcPhZ4ze0CUfmw/DnRIHH/mxU0ezw6xv5D3CGhO4XyBuIJxn14OP6WYN8QVdOA== X-Received: by 2002:a17:90a:39c2:b0:2cf:cbc7:91f8 with SMTP id 98e67ed59e1d1-2d646bdcc74mr5006577a91.19.1724514365074; Sat, 24 Aug 2024 08:46:05 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d5eb9049b0sm8596939a91.17.2024.08.24.08.46.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2024 08:46:04 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 3/4] Revert "io_uring: Require zeroed sqe->len on provided-buffers send" Date: Sat, 24 Aug 2024 09:43:56 -0600 Message-ID: <20240824154555.110170-4-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240824154555.110170-1-axboe@kernel.dk> References: <20240824154555.110170-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This reverts commit 79996b45f7b28c0e3e08a95bab80119e95317e28. Revert the change that restricts a send provided buffer to be zero, so it will always consume the whole buffer. This is strictly needed for partial consumption, as the send may very well be a subset of the current buffer. In fact, that's the intended use case. For non-incremental provided buffer rings, an application should set sqe->len carefully to avoid the potential issue described in the reverted commit. It is recommended that '0' still be set for len for that case, if the application is set on maintaining more than 1 send inflight for the same socket. This is somewhat of a nonsensical thing to do. Signed-off-by: Jens Axboe --- io_uring/net.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/io_uring/net.c b/io_uring/net.c index dc83a35b8af4..cc81bcacdc1b 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -434,8 +434,6 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) sr->buf_group = req->buf_index; req->buf_list = NULL; } - if (req->flags & REQ_F_BUFFER_SELECT && sr->len) - return -EINVAL; #ifdef CONFIG_COMPAT if (req->ctx->compat) @@ -599,7 +597,7 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags) if (io_do_buffer_select(req)) { struct buf_sel_arg arg = { .iovs = &kmsg->fast_iov, - .max_len = INT_MAX, + .max_len = min_not_zero(sr->len, INT_MAX), .nr_iovs = 1, }; From patchwork Sat Aug 24 15:43:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13776435 Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (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 370C61EA80 for ; Sat, 24 Aug 2024 15:46:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724514370; cv=none; b=BdWTUnabmhFtA4Z89VaqYgm0QtEqbbMde2Q6U+nXjUqzBqNlweo8+gkL+UQZZYHuFb27WEGhFl2d2GG6w0FUMXCz8ZOB+4IhtommvMKP3Uko5McRj2ZTxJCkLQLGlyAas8lpFS5QiFJ3XglhjgB291Rl/NPEqWY2dMlUU70bJw8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724514370; c=relaxed/simple; bh=HBi4SFnEkmnl9JZBNY1CrHmxzI3oHMRVhhTFE4a9Bvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nChuhK6Lz+AN2qEEhz0nFhQ051zakZSfflVE0/40klfIDeTuvfNp61qJwLyLZVA/ifBZEGZxGYDKXYHZCWhbO4E0HhBsk2R1AWrv2HH5rtGQe21Q1W1ScoyW2snyNoqCBuBdkZiWcaA3HI6HQ+zk3nJYJ6Nyvklhf4CtDJ/OrUw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=MFutbme2; arc=none smtp.client-ip=209.85.210.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="MFutbme2" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-70945a007f0so2488803a34.2 for ; Sat, 24 Aug 2024 08:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1724514367; x=1725119167; 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=DOmDGGOOks7tbUqgRV9eMbpBELFovB/L9auTF23luFM=; b=MFutbme2Jt9FBcv/rovgBYJqM8+Wxq4seASFiFZay6+LplfgS6QXMDaFztr/nms/oo ZtCavadyYt2+s7mVant70onLyzOHfT8SUb8rsFFjxrkuze6bmj8MHiCkZEv+o0EKAIPK rwzb0f3NFBPMbrYWNtYcv2D47SR5LLTu0sMitrM/MJW4x7BFBmbKESbWvviTYI797x4I zqUm5+WhGXDc1KZKiD4AJ8mG6PHqJhVjnxJJHb74qO2YpnQssNcYVje77C9A5n7w4XIt +bN/DJ/zE6NXzp1wM5hsg8OM/bidanR57BxHh7VSSpCnzob3fUqMT451Off5YauwRpEV X5HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724514367; x=1725119167; 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=DOmDGGOOks7tbUqgRV9eMbpBELFovB/L9auTF23luFM=; b=Wjz9Xvuygeyqd9NiHKn5CLWVtQu0qBSq3nk8IjBsZxdhGekm+xFOO/nNgXNu6Eg83Y NBfSeeo+sFO+bs6QourWwdJ+k8XiipJzGVvUJcNBT1dIdpxyrr4OF7KnVO+G5Wonk202 4MyZmIUjL7ycge4LiKg9HHD8SB4WlIOQdwWl++pGoCj6u9OBtpuiUya8HEjqLv1PAqjY 8slNdRLDHLpLiaPkdkzg4D8jWR6cBFrvc/Gxc3YTsSrQGWf3/U33ruwHW4vj617U8I+u 033xj6hpwd/ZGEBeKqJawy3lO4zUbm2Hup+Bv07+vnHqNiUZfcZZW41+AOpCLA1Xmz+b LV4g== X-Gm-Message-State: AOJu0YwWQqpqU0b8w1VSYZLfdDwNyMrdkl0Gpa16x8I6Im7c8YlE70A2 o77XF84UvUKHFvUCKoqMGnlka+Hd5LIHkSp4c2DniblIYjfa+R+PuaL0R0ykyzaKG8WjXuV3PYV H X-Google-Smtp-Source: AGHT+IHzhElibd1NHJ4H6j6vsIoHeIMbfqFfuWVxysMjZhOOnTZXGUhDaA6U2BTskEPGN4/BdmKgRg== X-Received: by 2002:a05:6830:641b:b0:709:396c:c455 with SMTP id 46e09a7af769-70e0ebfc476mr6632803a34.24.1724514366551; Sat, 24 Aug 2024 08:46:06 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d5eb9049b0sm8596939a91.17.2024.08.24.08.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2024 08:46:05 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 4/4] io_uring/kbuf: add support for incremental buffer consumption Date: Sat, 24 Aug 2024 09:43:57 -0600 Message-ID: <20240824154555.110170-5-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240824154555.110170-1-axboe@kernel.dk> References: <20240824154555.110170-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 By default, any recv/read operation that uses provided buffers will consume at least 1 buffer fully (and maybe more, in case of bundles). This adds support for incremental consumption, meaning that an application may add large buffers, and each read/recv will just consume the part of the buffer that it needs. For example, let's say an application registers 1MB buffers in a provided buffer ring, for streaming receives. If it gets a short recv, then the full 1MB buffer will be consumed and passed back to the application. With incremental consumption, only the part that was actually used is consumed, and the buffer remains the current one. This means that both the application and the kernel needs to keep track of what the current receive point is. Each recv will still pass back a buffer ID and the size consumed, the only difference is that before the next receive would always be the next buffer in the ring. Now the same buffer ID may return multiple receives, each at an offset into that buffer from where the previous receive left off. Example: Application registers a provided buffer ring, and adds two 32K buffers to the ring. Buffer1 address: 0x1000000 (buffer ID 0) Buffer2 address: 0x2000000 (buffer ID 1) A recv completion is received with the following values: cqe->res 0x1000 (4k bytes received) cqe->flags 0x11 (CQE_F_BUFFER|CQE_F_BUF_MORE set, buffer ID 0) and the application now knows that 4096b of data is available at 0x1000000, the start of that buffer, and that more data from this buffer will be coming. Now the next receive comes in: cqe->res 0x2010 (8k bytes received) cqe->flags 0x11 (CQE_F_BUFFER|CQE_F_BUF_MORE set, buffer ID 0) which tells the application that 8k is available where the last completion left off, at 0x1001000. Next completion is: cqe->res 0x5000 (20k bytes received) cqe->flags 0x1 (CQE_F_BUFFER set, buffer ID 0) and the application now knows that 20k of data is available at 0x1003000, which is where the previous receive ended. CQE_F_BUF_MORE isn't set, as no more data is available in this buffer ID. The next completion is then: cqe->res 0x1000 (4k bytes received) cqe->flags 0x10001 (CQE_F_BUFFER|CQE_F_BUF_MORE set, buffer ID 1) which tells the application that buffer ID 1 is now the current one, hence there's 4k of valid data at 0x2000000. 0x2001000 will be the next receive point for this buffer ID. When a buffer will be reused by future CQE completions, IORING_CQE_BUF_MORE will be set in cqe->flags. This tells the application that the kernel isn't done with the buffer yet, and that it should expect more completions for this buffer ID. Will only be set by provided buffer rings setup with IOU_PBUF_RING INC, as that's the only type of buffer that will see multiple consecutive completions for the same buffer ID. For any other provided buffer type, any completion that passes back a buffer to the application is final. Once a buffer has been fully consumed, the buffer ring head is incremented and the next receive will indicate the next buffer ID in the CQE cflags. On the send side, the application can manage how much data is sent from an existing buffer by setting sqe->len to the desired send length. An application can request incremental consumption by setting IOU_PBUF_RING_INC in the provided buffer ring registration. Outside of that, any provided buffer ring setup and buffer additions is done like before, no changes there. The only change is in how an application may see multiple completions for the same buffer ID, hence needing to know where the next receive will happen. Note that like existing provided buffer rings, this should not be used with IOSQE_ASYNC, as both really require the ring to remain locked over the duration of the buffer selection and the operation completion. It will consume a buffer otherwise regardless of the size of the IO done. Signed-off-by: Jens Axboe --- include/uapi/linux/io_uring.h | 18 +++++++++++ io_uring/io_uring.c | 2 +- io_uring/kbuf.c | 46 ++++++++++++++++++-------- io_uring/kbuf.h | 61 +++++++++++++++++++++++++---------- io_uring/net.c | 8 ++--- io_uring/rw.c | 8 ++--- 6 files changed, 103 insertions(+), 40 deletions(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 042eab793e26..a275f91d2ac0 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -440,11 +440,21 @@ struct io_uring_cqe { * IORING_CQE_F_SOCK_NONEMPTY If set, more data to read after socket recv * IORING_CQE_F_NOTIF Set for notification CQEs. Can be used to distinct * them from sends. + * IORING_CQE_F_BUF_MORE If set, the buffer ID set in the completion will get + * more completions. In other words, the buffer is being + * partially consumed, and will be used by the kernel for + * more completions. This is only set for buffers used via + * the incremental buffer consumption, as provided by + * a ring buffer setup with IOU_PBUF_RING_INC. For any + * other provided buffer type, all completions with a + * buffer passed back is automatically returned to the + * application. */ #define IORING_CQE_F_BUFFER (1U << 0) #define IORING_CQE_F_MORE (1U << 1) #define IORING_CQE_F_SOCK_NONEMPTY (1U << 2) #define IORING_CQE_F_NOTIF (1U << 3) +#define IORING_CQE_F_BUF_MORE (1U << 4) #define IORING_CQE_BUFFER_SHIFT 16 @@ -716,9 +726,17 @@ struct io_uring_buf_ring { * mmap(2) with the offset set as: * IORING_OFF_PBUF_RING | (bgid << IORING_OFF_PBUF_SHIFT) * to get a virtual mapping for the ring. + * IOU_PBUF_RING_INC: If set, buffers consumed from this buffer ring can be + * consumed incrementally. Normally one (or more) buffers + * are fully consumed. With incremental consumptions, it's + * feasible to register big ranges of buffers, and each + * use of it will consume only as much as it needs. This + * requires that both the kernel and application keep + * track of where the current read/recv index is at. */ enum io_uring_register_pbuf_ring_flags { IOU_PBUF_RING_MMAP = 1, + IOU_PBUF_RING_INC = 2, }; /* argument for IORING_(UN)REGISTER_PBUF_RING */ diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 80bb6e2374e9..1aca501efaf6 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -904,7 +904,7 @@ void io_req_defer_failed(struct io_kiocb *req, s32 res) lockdep_assert_held(&req->ctx->uring_lock); req_set_fail(req); - io_req_set_res(req, res, io_put_kbuf(req, IO_URING_F_UNLOCKED)); + io_req_set_res(req, res, io_put_kbuf(req, res, IO_URING_F_UNLOCKED)); if (def->fail) def->fail(req); io_req_complete_defer(req); diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c index 297c1d2c3c27..b20eee984b97 100644 --- a/io_uring/kbuf.c +++ b/io_uring/kbuf.c @@ -165,7 +165,7 @@ static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len, * the transfer completes (or if we get -EAGAIN and must poll of * retry). */ - io_kbuf_commit(req, bl, 1); + io_kbuf_commit(req, bl, *len, 1); req->buf_list = NULL; } return u64_to_user_ptr(buf->addr); @@ -212,14 +212,25 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg, buf = io_ring_head_to_buf(br, head, bl->mask); if (arg->max_len) { u32 len = READ_ONCE(buf->len); - size_t needed; if (unlikely(!len)) return -ENOBUFS; - needed = (arg->max_len + len - 1) / len; - needed = min_not_zero(needed, (size_t) PEEK_MAX_IMPORT); - if (nr_avail > needed) - nr_avail = needed; + /* + * Limit incremental buffers to 1 segment. No point trying + * to peek ahead and map more than we need, when the buffers + * themselves should be large when setup with + * IOU_PBUF_RING_INC. + */ + if (bl->flags & IOBL_INC) { + nr_avail = 1; + } else { + size_t needed; + + needed = (arg->max_len + len - 1) / len; + needed = min_not_zero(needed, (size_t) PEEK_MAX_IMPORT); + if (nr_avail > needed) + nr_avail = needed; + } } /* @@ -244,16 +255,21 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg, req->buf_index = buf->bid; do { - /* truncate end piece, if needed */ - if (buf->len > arg->max_len) - buf->len = arg->max_len; + u32 len = buf->len; + + /* truncate end piece, if needed, for non partial buffers */ + if (len > arg->max_len) { + len = arg->max_len; + if (!(bl->flags & IOBL_INC)) + buf->len = len; + } iov->iov_base = u64_to_user_ptr(buf->addr); - iov->iov_len = buf->len; + iov->iov_len = len; iov++; - arg->out_len += buf->len; - arg->max_len -= buf->len; + arg->out_len += len; + arg->max_len -= len; if (!arg->max_len) break; @@ -291,7 +307,7 @@ int io_buffers_select(struct io_kiocb *req, struct buf_sel_arg *arg, */ if (ret > 0) { req->flags |= REQ_F_BUFFERS_COMMIT | REQ_F_BL_NO_RECYCLE; - io_kbuf_commit(req, bl, ret); + io_kbuf_commit(req, bl, arg->out_len, ret); } } else { ret = io_provided_buffers_select(req, &arg->out_len, bl, arg->iovs); @@ -675,7 +691,7 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) if (reg.resv[0] || reg.resv[1] || reg.resv[2]) return -EINVAL; - if (reg.flags & ~IOU_PBUF_RING_MMAP) + if (reg.flags & ~(IOU_PBUF_RING_MMAP | IOU_PBUF_RING_INC)) return -EINVAL; if (!(reg.flags & IOU_PBUF_RING_MMAP)) { if (!reg.ring_addr) @@ -713,6 +729,8 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) if (!ret) { bl->nr_entries = reg.ring_entries; bl->mask = reg.ring_entries - 1; + if (reg.flags & IOU_PBUF_RING_INC) + bl->flags |= IOBL_INC; io_buffer_add_list(ctx, bl, reg.bgid); return 0; diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h index 4c34ff3144b9..a8fbe2e3b73a 100644 --- a/io_uring/kbuf.h +++ b/io_uring/kbuf.h @@ -9,6 +9,9 @@ enum { IOBL_BUF_RING = 1, /* ring mapped provided buffers, but mmap'ed by application */ IOBL_MMAP = 2, + /* buffers are consumed incrementally rather than always fully */ + IOBL_INC = 4, + }; struct io_buffer_list { @@ -124,31 +127,53 @@ static inline bool io_kbuf_recycle(struct io_kiocb *req, unsigned issue_flags) /* Mapped buffer ring, return io_uring_buf from head */ #define io_ring_head_to_buf(br, head, mask) &(br)->bufs[(head) & (mask)] -static inline void io_kbuf_commit(struct io_kiocb *req, - struct io_buffer_list *bl, int nr) +/* returns false if more completions will be done from the current bid */ +static inline bool io_kbuf_commit(struct io_kiocb *req, + struct io_buffer_list *bl, int len, int nr) { if (unlikely(!(req->flags & REQ_F_BUFFERS_COMMIT))) - return; - bl->head += nr; + return true; + req->flags &= ~REQ_F_BUFFERS_COMMIT; + + if (unlikely(len < 0)) + return true; + + if (bl->flags & IOBL_INC) { + struct io_uring_buf *buf; + + buf = io_ring_head_to_buf(bl->buf_ring, bl->head, bl->mask); + if (WARN_ON_ONCE(len > buf->len)) + len = buf->len; + buf->len -= len; + if (buf->len) { + buf->addr += len; + return false; + } + } + + bl->head += nr; + return true; } -static inline void __io_put_kbuf_ring(struct io_kiocb *req, int nr) +static inline bool __io_put_kbuf_ring(struct io_kiocb *req, int len, int nr) { struct io_buffer_list *bl = req->buf_list; + bool ret = true; if (bl) { - io_kbuf_commit(req, bl, nr); + ret = io_kbuf_commit(req, bl, len, nr); req->buf_index = bl->bgid; } req->flags &= ~REQ_F_BUFFER_RING; + return ret; } static inline void __io_put_kbuf_list(struct io_kiocb *req, struct list_head *list) { if (req->flags & REQ_F_BUFFER_RING) { - __io_put_kbuf_ring(req, 1); + __io_put_kbuf_ring(req, 0, 1); } else { req->buf_index = req->kbuf->bgid; list_add(&req->kbuf->list, list); @@ -166,8 +191,8 @@ static inline void io_kbuf_drop(struct io_kiocb *req) __io_put_kbuf_list(req, &req->ctx->io_buffers_comp); } -static inline unsigned int __io_put_kbufs(struct io_kiocb *req, int nbufs, - unsigned issue_flags) +static inline unsigned int __io_put_kbufs(struct io_kiocb *req, int len, + int nbufs, unsigned issue_flags) { unsigned int ret; @@ -175,22 +200,24 @@ static inline unsigned int __io_put_kbufs(struct io_kiocb *req, int nbufs, return 0; ret = IORING_CQE_F_BUFFER | (req->buf_index << IORING_CQE_BUFFER_SHIFT); - if (req->flags & REQ_F_BUFFER_RING) - __io_put_kbuf_ring(req, nbufs); - else + if (req->flags & REQ_F_BUFFER_RING) { + if (!__io_put_kbuf_ring(req, len, nbufs)) + ret |= IORING_CQE_F_BUF_MORE; + } else { __io_put_kbuf(req, issue_flags); + } return ret; } -static inline unsigned int io_put_kbuf(struct io_kiocb *req, +static inline unsigned int io_put_kbuf(struct io_kiocb *req, int len, unsigned issue_flags) { - return __io_put_kbufs(req, 1, issue_flags); + return __io_put_kbufs(req, len, 1, issue_flags); } -static inline unsigned int io_put_kbufs(struct io_kiocb *req, int nbufs, - unsigned issue_flags) +static inline unsigned int io_put_kbufs(struct io_kiocb *req, int len, + int nbufs, unsigned issue_flags) { - return __io_put_kbufs(req, nbufs, issue_flags); + return __io_put_kbufs(req, len, nbufs, issue_flags); } #endif diff --git a/io_uring/net.c b/io_uring/net.c index cc81bcacdc1b..f10f5a22d66a 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -497,11 +497,11 @@ static inline bool io_send_finish(struct io_kiocb *req, int *ret, unsigned int cflags; if (!(sr->flags & IORING_RECVSEND_BUNDLE)) { - cflags = io_put_kbuf(req, issue_flags); + cflags = io_put_kbuf(req, *ret, issue_flags); goto finish; } - cflags = io_put_kbufs(req, io_bundle_nbufs(kmsg, *ret), issue_flags); + cflags = io_put_kbufs(req, *ret, io_bundle_nbufs(kmsg, *ret), issue_flags); if (bundle_finished || req->flags & REQ_F_BL_EMPTY) goto finish; @@ -842,13 +842,13 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret, cflags |= IORING_CQE_F_SOCK_NONEMPTY; if (sr->flags & IORING_RECVSEND_BUNDLE) { - cflags |= io_put_kbufs(req, io_bundle_nbufs(kmsg, *ret), + cflags |= io_put_kbufs(req, *ret, io_bundle_nbufs(kmsg, *ret), issue_flags); /* bundle with no more immediate buffers, we're done */ if (req->flags & REQ_F_BL_EMPTY) goto finish; } else { - cflags |= io_put_kbuf(req, issue_flags); + cflags |= io_put_kbuf(req, *ret, issue_flags); } /* diff --git a/io_uring/rw.c b/io_uring/rw.c index c004d21e2f12..f5e0694538b9 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -511,7 +511,7 @@ void io_req_rw_complete(struct io_kiocb *req, struct io_tw_state *ts) io_req_io_end(req); if (req->flags & (REQ_F_BUFFER_SELECTED|REQ_F_BUFFER_RING)) - req->cqe.flags |= io_put_kbuf(req, 0); + req->cqe.flags |= io_put_kbuf(req, req->cqe.res, 0); io_req_rw_cleanup(req, 0); io_req_task_complete(req, ts); @@ -593,7 +593,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret, */ io_req_io_end(req); io_req_set_res(req, final_ret, - io_put_kbuf(req, issue_flags)); + io_put_kbuf(req, ret, issue_flags)); io_req_rw_cleanup(req, issue_flags); return IOU_OK; } @@ -975,7 +975,7 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags) * Put our buffer and post a CQE. If we fail to post a CQE, then * jump to the termination path. This request is then done. */ - cflags = io_put_kbuf(req, issue_flags); + cflags = io_put_kbuf(req, ret, issue_flags); rw->len = 0; /* similarly to above, reset len to 0 */ if (io_req_post_cqe(req, ret, cflags | IORING_CQE_F_MORE)) { @@ -1167,7 +1167,7 @@ int io_do_iopoll(struct io_ring_ctx *ctx, bool force_nonspin) if (!smp_load_acquire(&req->iopoll_completed)) break; nr_events++; - req->cqe.flags = io_put_kbuf(req, 0); + req->cqe.flags = io_put_kbuf(req, req->cqe.res, 0); if (req->opcode != IORING_OP_URING_CMD) io_req_rw_cleanup(req, 0); }