From patchwork Wed Feb 19 01:33:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13981414 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 93A03224D6 for ; Wed, 19 Feb 2025 01:32:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739928768; cv=none; b=G+1vL7/JtVqUyN4z2YkN/uGHz/WBe13ZyCQ9Aex9/AuOhquFaSU9WKtQ2g1O2SQWQsFTSG+Ht0y/eupCOuPCNkvGs8b4mXKWO4UT1wbJDWkQiaDx9ZKEBdbLC6pQac59hf5w/llZe4qjBSqidV1rkIGG6PJRXUvwqikjrlvAAiU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739928768; c=relaxed/simple; bh=2HZPlwIOr5lP+y3yVWdqbLFGd6GCYaroT3B/n69ZsT4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AXw6IoulmX30Ohvh9Q0uK49MhlrVZniMo+rjakfX+hmK3Q5PC5kOBIDJ71+btUeFn97E9J2uD3xT9byi1jD8xNSsayTEcLG8oyp6kbjJ2nLWucHpwPWMv8Xqf8LcWhpCZkhik/HUXmjB4ny+voQ3vOuw/kzdMqgXmoiEdTRQ10I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KzXAnWl6; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KzXAnWl6" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4398e3dfc66so20266825e9.0 for ; Tue, 18 Feb 2025 17:32:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739928764; x=1740533564; 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=G+t+NWqbKOo9YrztKAGVW57efrtLobYJWlG1VL1cnpA=; b=KzXAnWl6+tuUO73Y6LJpd387grG8zCSFPPsmUmzfR12KMNUmSnbdH5TE3NdjoKcdbj QNBUrGz5OfRFwdAMnjei9VoEkl+5uqeVSdG2IkNaw/K+NUB6SN76o+tHSenQPlnz/snl k8p7FxPx78XRSG2m8GBYTqspemmbGXlyuag8vyfFiIRsHnWoaKeyJJTrFodV2VqawKwC E5km4uvtGyWHIOPJrPvfaKZ4Fh/WmoqRyF1BA20Gj3hyoCzmv27l3nJ5b9cJVoYGRPYU 2nfVwapv/XYXM1rtOUwzuHCMYOhA4aiqrK8A+/f58dj0RY23vpoCgVtsIyyfqBBcZCbb QUtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739928764; x=1740533564; 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=G+t+NWqbKOo9YrztKAGVW57efrtLobYJWlG1VL1cnpA=; b=iefZhiRz8zl0eNGrNZF9MTOfOB0rCrQbNhb96xipBAwqcD0dJGXV+HybOSHdesLlbo plzfCX1nyQ/5+uqKjhTEOf/cVw2oz5rgbsX9pOQjl+M3bL0puLP2JsFAzmfh8D+Suu9Y Z3fTKtw/x155/ZwRLEjkM638f2R8SHhGxTyzLLa/x6B6cWwp/4nIVXwlP8ii17QlKwdj 0MryyDmMYXYGeVJd6nT+NPrUZXaibnBjQ7Lv4xIIquABubW17CHDpiWPpcLjq0w8s4tX FQl6rWDap7CDnnh5rQkCgCfbnJbWOZTaoTuzL2yaT/jyP99yOx9P3N5lsDg689HiehYj QwnQ== X-Gm-Message-State: AOJu0Yysx3JmsRu6JIOIOkwq4M9Nd/QlC5dlzSQy/nteiMhY3n9sfBrl eR1uTJiO1ICEAcVEt44D2ReOH+2jGciYlw+8keLDlgsIrEde33HrUPbyqw== X-Gm-Gg: ASbGncto0zUYtHOyO484N+3e1P+VdSWn2A55dwmZF6AuSa2oAdgnMoJfjyWlnfMURDp JyuTjqTjs1p+BPHdxIQSLwoLFbAOJ/TsBpNAkOIj3l+OVJGlTKVXJyPl6nz7hcEq1bJmmCQm+ms tG/JjJ0zkjJz3X5+bCG9hNtYSp78Bs9NcCxLQLG9zO820cUmCq/6TS0W/ZqumLWe97HRW5fF3hR Gd9WxWjytuP3t/qE4PzHqex4ilfmFAIjnp9e11fnBw0//tqNh/hxPSxjf1Xt2ak+6PYjo1gm1rQ SFxK66tifMixt6jWkZF1X9DbYDh9 X-Google-Smtp-Source: AGHT+IGhZ2hh4LwYBXvqsIf/+oujwc59lbyx6QOzA3QEMu9JR3QlEEIJDFsgmvctuStd1+8BSUvfng== X-Received: by 2002:a05:6000:178c:b0:38f:2173:b7b7 with SMTP id ffacd0b85a97d-38f5878ca87mr1453716f8f.18.1739928764403; Tue, 18 Feb 2025 17:32:44 -0800 (PST) Received: from 127.0.0.1localhost ([185.69.145.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259d8f1csm16617752f8f.69.2025.02.18.17.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 17:32:42 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, chase xd Subject: [PATCH v2 1/4] io_uring/rw: forbid multishot async reads Date: Wed, 19 Feb 2025 01:33:37 +0000 Message-ID: <7d51732c125159d17db4fe16f51ec41b936973f8.1739919038.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 At the moment we can't sanely handle queuing an async request from a multishot context, so disable them. It shouldn't matter as pollable files / socekts don't normally do async. Patching it in __io_read() is not the cleanest way, but it's simpler than other options, so let's fix it there and clean up on top. Cc: stable@vger.kernel.org Reported-by: chase xd Fixes: fc68fcda04910 ("io_uring/rw: add support for IORING_OP_READ_MULTISHOT") Signed-off-by: Pavel Begunkov --- io_uring/rw.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/io_uring/rw.c b/io_uring/rw.c index 7aa1e4c9f64a..e8efd97fdee5 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -880,7 +880,15 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags) if (unlikely(ret)) return ret; - ret = io_iter_do_read(rw, &io->iter); + if (unlikely(req->opcode == IORING_OP_READ_MULTISHOT)) { + void *cb_copy = rw->kiocb.ki_complete; + + rw->kiocb.ki_complete = NULL; + ret = io_iter_do_read(rw, &io->iter); + rw->kiocb.ki_complete = cb_copy; + } else { + ret = io_iter_do_read(rw, &io->iter); + } /* * Some file systems like to return -EOPNOTSUPP for an IOCB_NOWAIT @@ -904,7 +912,8 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags) } else if (ret == -EIOCBQUEUED) { return IOU_ISSUE_SKIP_COMPLETE; } else if (ret == req->cqe.res || ret <= 0 || !force_nonblock || - (req->flags & REQ_F_NOWAIT) || !need_complete_io(req)) { + (req->flags & REQ_F_NOWAIT) || !need_complete_io(req) || + (issue_flags & IO_URING_F_MULTISHOT)) { /* read all, failed, already did sync or don't want to retry */ goto done; } From patchwork Wed Feb 19 01:33:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13981415 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 E5D8124B34 for ; Wed, 19 Feb 2025 01:32:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739928769; cv=none; b=krya88PITI6n2/XSlLyIOFMpaqHIqu8DZqVofxV3yBXDQ+NmkGHOjdVgRHonsv/BimmBsvqhejsSd7YIhxomLsUWIVgZzuqGbYTjSDllMn4FF9xQPfTZa0XgP7EyoxQWY5um4Tha6ose5sFqe9MgUVTrM+NrIxAC7ImkmBeO24Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739928769; c=relaxed/simple; bh=HqlbBEnND6hCYgCez40VMQRjIZ4nML5T3KzoE/UdG7w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D0Pq5SNpNXFxC0ziJCvjgGdA7Z9N8pD6M72FWPz1FAon9MLpN65Bj1MlQDUYplzk0e9IKBb4NEON1wqg6SAgSLxuC0iBTE+4JD7NP1rYJYJksKBhwG/KQorjmlhelIwooNISzewboMD2AVuEUNrTLdq9IemNnXvmVnb3wfawSkA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YJfwNOcA; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YJfwNOcA" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-439946a49e1so9406405e9.0 for ; Tue, 18 Feb 2025 17:32:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739928766; x=1740533566; 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=uvNpFg8xcxJ0e+aGXz89qbRAq3d2u1lb4KH5SKxTQ7s=; b=YJfwNOcAgoIO8sIVG3TnhwsEMuTfeZIvXcUxvwTJ1h5CEPOr1CJbcyLIzUGU6LX9Wa AYYJGx+B53Nxkar1RZzHAryzO8/nOqbJi16t214D/YgBvqm9JaCxHuVzlkPcG/KrzyUB nYAmgl/W8+1C//Ti/xUknsonwiMqBrm2TKpWyZpoQBN/IK2HXMQX9IsiRnVmyIg2iEmd 4b7IVBs47nUsYi5cV8zNcMWc3euFh4l6M/ARkgWLOE1k/OE+ndpxADZRP3foePW9hZsA uIpst3aj1QIrA6/90Fq+oiRkLBstuC38J8tn8XHL52UBMYWsgjzc3tMufFEuSpOavq+I hVXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739928766; x=1740533566; 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=uvNpFg8xcxJ0e+aGXz89qbRAq3d2u1lb4KH5SKxTQ7s=; b=qf/ENe0CwO8oU9+6pZfVoK23nw+4UeWv97VYR6KiBw5L04qV0NsQHefWXav86hzZI4 hBeP9sObA/EZDT792Yn0EvK3/sqH4yXGPyZ+W+nUtq5tY6AFqFqMAqTisg3PEdgdbrTd okHtVF1DulhNqtqps1UTVVzeTyRAmL1FMNGCPHRFbrMsML3IHM8KWm3IQJhUSS2F744h JqsVJYTHeelZ2pltfQtlq10+xS85SdcPICHgThNyptkKfa9xwazWE7FMv4I8ApGetp8d fApcs5+IgvjmIYBeJqHHhCgwF/6q2oYro2r3T3f+8W99y7J7Fp/k1lJF8RPc8H9of7hA NDEw== X-Gm-Message-State: AOJu0YwCmjmnm3cHcpTrbrJzTPro9sw/NRixhRV2JHmJjAucvKWVAlcZ ICTK0EyKgJ+Fk9cjvBcfakg2ZPG6QrpXjDtzgUoJ1FspyWe2wDundusFYw== X-Gm-Gg: ASbGnctZnapRKysYGMZEliNEnJD4VsCtPwxxYL/gHAruiQH+p/HnOSq7wqguPYvwVTj 0tR93KRdbDfSRjDEbS6qNauaShrHEaBfRGL1QhzAUpplDC80+6nQeSKM8AGt6LhwtnhYjL0WcWs WYyWfPTJKFOEhnDHwvwtgsoNhHoVhHkvW+KM9dPIjtXR/1/ZuxLaTt9orU4rSwrf7GP6oop4vaw +Ex49Q8Zg8GaxU2jhwfRMgzAZq5n50CBH7kvOsPzF5rssnsk1BdZroujlkaHbCk2boCJVFJT/JU bTU9M2N2ITWXG8jZkeYc2Vd/zcL7 X-Google-Smtp-Source: AGHT+IHe5g+6HLRRiJMfW5yMdRfgXAckrXLiDPoz1a6H7jEP2TzSrHoCBcQ6ewHuLThqUIvS29XXtg== X-Received: by 2002:a05:600c:458a:b0:439:86fb:7340 with SMTP id 5b1f17b1804b1-43999ddb17cmr15833755e9.30.1739928765733; Tue, 18 Feb 2025 17:32:45 -0800 (PST) Received: from 127.0.0.1localhost ([185.69.145.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259d8f1csm16617752f8f.69.2025.02.18.17.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 17:32:45 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH v2 2/4] io_uring/rw: don't directly use ki_complete Date: Wed, 19 Feb 2025 01:33:38 +0000 Message-ID: <4eb4bdab8cbcf5bc87083f7047edc81e920ab83c.1739919038.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We want to avoid checking ->ki_complete directly in the io_uring completion path. Fortunately we have only two callback the selection of which depend on the ring constant flags, i.e. IOPOLL, so use that to infer the function. Signed-off-by: Pavel Begunkov --- io_uring/rw.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/io_uring/rw.c b/io_uring/rw.c index e8efd97fdee5..27ccc82d7843 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -563,8 +563,10 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb, long res) smp_store_release(&req->iopoll_completed, 1); } -static inline void io_rw_done(struct kiocb *kiocb, ssize_t ret) +static inline void io_rw_done(struct io_kiocb *req, ssize_t ret) { + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw); + /* IO was queued async, completion will happen later */ if (ret == -EIOCBQUEUED) return; @@ -586,8 +588,10 @@ static inline void io_rw_done(struct kiocb *kiocb, ssize_t ret) } } - INDIRECT_CALL_2(kiocb->ki_complete, io_complete_rw_iopoll, - io_complete_rw, kiocb, ret); + if (req->ctx->flags & IORING_SETUP_IOPOLL) + io_complete_rw_iopoll(&rw->kiocb, ret); + else + io_complete_rw(&rw->kiocb, ret); } static int kiocb_done(struct io_kiocb *req, ssize_t ret, @@ -598,7 +602,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret, if (ret >= 0 && req->flags & REQ_F_CUR_POS) req->file->f_pos = rw->kiocb.ki_pos; - if (ret >= 0 && (rw->kiocb.ki_complete == io_complete_rw)) { + if (ret >= 0 && !(req->ctx->flags & IORING_SETUP_IOPOLL)) { __io_complete_rw_common(req, ret); /* * Safe to call io_end from here as we're inline @@ -609,7 +613,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret, io_req_rw_cleanup(req, issue_flags); return IOU_OK; } else { - io_rw_done(&rw->kiocb, ret); + io_rw_done(req, ret); } return IOU_ISSUE_SKIP_COMPLETE; From patchwork Wed Feb 19 01:33:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13981416 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 5526C1F5E6 for ; Wed, 19 Feb 2025 01:32:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739928772; cv=none; b=BbJpuCoVYSHVTgA+ROX6sXIsa8Hok45+n1lXTFJ2ksNn7v3vdcHfr/mSDArhFo5ba+TPFGTu9O8BWPEj2F8T/O1PvP6ARicuu+Rq4w/HYAsb0pbl0QCRb/6VDelQubzKEwI0icuw0Sjg//ZzVXLwdAZ6OIUCwjO8BSryHcV7tzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739928772; c=relaxed/simple; bh=u4YnKq2nBVulrB4CGmEJts2sxbYWVkuZq9930jiQonM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lgntTFoEW321B2SRDDrKph0+ROuWYxP8Z/WxET/szME/GcrO34JH1zU7UiKc/Rwx8UgdDQv8rXJJHdQu/N3w3dXnWNcI6Vg18mH7/jxtgMMZmOyQOolGJftWetISwU70wlpbCx+QTRSALoSNqj4PVHAV63MPvOfoms3FU99rUio= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SFvL509A; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SFvL509A" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38f3913569fso185392f8f.1 for ; Tue, 18 Feb 2025 17:32:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739928768; x=1740533568; 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=vVCh1cQaB1aNgTbNHpi+13n63bvU+huLIvoPQJbECbE=; b=SFvL509AHzmM3ZvdGSwWe1en0QBWuIzt+V610O9fs7/tFlKRsWfZC3QtguDdy4uB+j nKFQQfkfQqTo0SaJWeg1WxhP0aX4PV3XoPlD+S/s+q6XRhmItBnU+JMGJk0R53fbuHPp Eo1ZmdWtvW1DDBg7pBbhQke2Ij9mcn+Ab4lQnLJvI13pCEkUL2I0bRkl49boEv0+SrWv StSagS9cUCvQ9JsZTre8Bl+vzjAkoltUqmCXo2Q966TVXoBukbrZui+pTxTA8zqINVMp 76dkQUJv1J8e4/wVtvigmiqrbGYZ3GI5fZ3dlh8PPGKXHa8jQQRrWzfQDAtuJOqvb/uJ 025Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739928768; x=1740533568; 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=vVCh1cQaB1aNgTbNHpi+13n63bvU+huLIvoPQJbECbE=; b=E3RWuIAylejZO60GBwK+7YRHtVaeUSMPvyArjeYS4IOtfVtoXbl1g4uhmf3cuJns8a oIuIMqYgHQVugB8oxhGiIp1o6D+3wd3ntQmcPmYRxw+j2kI9RqO3Sf1qi9etPyoii6y3 hiTZutytwYNjOjCeYyzE8NHWnE00UIUfI1VMdsWJ068hytLppvNA+MsKiKXA3m3MrZoZ pPJ2idrzQT+XeLk9Jvt15aWAXBIeX9/Xq3868DX68Iohcdn0fFzJ4KeNCUtOzxkJnS8p YhOpf6KZq7YgffMltX5w1OXHi/Dkx6RWlG8f9rv7cb5F7wnNgRhcY5j1YmPi/q8Ndwz4 sjzQ== X-Gm-Message-State: AOJu0YzLXuPqhLQcz8xp7N8Qs368R1mKiOZ/FLIewWkhUDrSLDDYQJdR JBxPw4jWKkbgsE8zxhmygX0CD5y9pvO0Zm5uT7P8YH9ehhuam7hMWflUXw== X-Gm-Gg: ASbGncuWYz92+ermXyD6iS7G7C9eFSq5//EJuqddl/UxGLawQopYxwBPmKfI1hwfanH A4/kfAS5pUSlvnHGhH9veFT/VQFXA6NXCu1+ivl3yPk4FnB8rMbvNxWW7Q15asxEjXzNY6n8NEu mpPMlj18N5PDIPW71yIL9VJt/oimN/wzKlnHfkTJrfSAoc2BTnL5MWWms0mStBtIIl6EYmyy615 tEdFCoBID29yXM1RY5c9O9+Irdy6B6/g7YHmF6WUXN7Y+tULrDiUk8n7Xstwrr4eE2DP9UrFrJK 4Ic6IY4l5CZuElkhbaonYthTBghV X-Google-Smtp-Source: AGHT+IFc8v7bv9guiKY1Uw37vjJT/p4p3bfvd5JrM7jyXewssZJw1U2U8ci4JanFGWmfBvPUSWSxeQ== X-Received: by 2002:a05:6000:401e:b0:38d:ba8e:7327 with SMTP id ffacd0b85a97d-38f57c086d3mr1772876f8f.8.1739928768228; Tue, 18 Feb 2025 17:32:48 -0800 (PST) Received: from 127.0.0.1localhost ([185.69.145.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259d8f1csm16617752f8f.69.2025.02.18.17.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 17:32:47 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH v2 3/4] io_uring/rw: move ki_complete init into prep Date: Wed, 19 Feb 2025 01:33:39 +0000 Message-ID: <817624086bd5f0448b08c80623399919fda82f34.1739919038.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Initialise ki_complete during request prep stage, we'll depend on it not being reset during issue in the following patch. Signed-off-by: Pavel Begunkov --- io_uring/rw.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/io_uring/rw.c b/io_uring/rw.c index 27ccc82d7843..d16256505389 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -23,6 +23,9 @@ #include "poll.h" #include "rw.h" +static void io_complete_rw(struct kiocb *kiocb, long res); +static void io_complete_rw_iopoll(struct kiocb *kiocb, long res); + struct io_rw { /* NOTE: kiocb has the file as the first member, so don't do it here */ struct kiocb kiocb; @@ -289,6 +292,11 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, rw->kiocb.dio_complete = NULL; rw->kiocb.ki_flags = 0; + if (req->ctx->flags & IORING_SETUP_IOPOLL) + rw->kiocb.ki_complete = io_complete_rw_iopoll; + else + rw->kiocb.ki_complete = io_complete_rw; + rw->addr = READ_ONCE(sqe->addr); rw->len = READ_ONCE(sqe->len); rw->flags = READ_ONCE(sqe->rw_flags); @@ -817,10 +825,8 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode, int rw_type) if (ctx->flags & IORING_SETUP_IOPOLL) { if (!(kiocb->ki_flags & IOCB_DIRECT) || !file->f_op->iopoll) return -EOPNOTSUPP; - kiocb->private = NULL; kiocb->ki_flags |= IOCB_HIPRI; - kiocb->ki_complete = io_complete_rw_iopoll; req->iopoll_completed = 0; if (ctx->flags & IORING_SETUP_HYBRID_IOPOLL) { /* make sure every req only blocks once*/ @@ -830,7 +836,6 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode, int rw_type) } else { if (kiocb->ki_flags & IOCB_HIPRI) return -EINVAL; - kiocb->ki_complete = io_complete_rw; } if (req->flags & REQ_F_HAS_METADATA) { From patchwork Wed Feb 19 01:33:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13981417 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 737321F5E6 for ; Wed, 19 Feb 2025 01:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739928775; cv=none; b=OwFxSLlOXxbEmfzNWwcR+XsLl42dhKdqrxTfP0wxawWvcqU+4JBz3BlPGRQV1JTng3CUiRXQxCGCyymUU0lBdgoJi4QdibUiYFiLzOVGl2aHKgLyHHA47HC2vnPH0xW8YLj4OAijlr2MK7zZHgrQPEXBqH/n/7OBoOrbT3mVSww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739928775; c=relaxed/simple; bh=a2BUW0yGemiuzi1y57ExoIhorgW61025RCumgsNKveg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dVk0R5ZG3JPcX6GmkXb/1FCS9pfjmgdXCxvRogCu1C8elXcz/kjy9IUatYLFRLIWJoDTXzjf9wt2t5hbKxwsujnRw/2Uu3C5bSbgqjE6Y2p35r+1xudeso053o1/Iq5QJTWY5m28Eu7ECAb4S8sUiayUMXmqxx16+W7O7fN/SrM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Iu5iX2mM; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Iu5iX2mM" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-38f488f3161so1260182f8f.3 for ; Tue, 18 Feb 2025 17:32:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739928771; x=1740533571; 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=5oM5mlez0ZqotlkCx2Jg9DzCaQKRsAad/T7OR8Vz+Uw=; b=Iu5iX2mMaDLb2+x1ApZGunZJGneiQ/ln8y9XWeCPiFiB4fk3y1dGYmJ/gK6SqeFVKO DK6KJAfrgUvhlhOAoKXARelGdIBdFVJMi51eu8oTiq6UefKuBfa9+Tk5IY0YK7eXGfUF YP308mCreihdlm5oo4gLSszP/c+qk/Szxlu4GdIBWDGQziITVdtbQOYJ5TOlVF75jxJ8 6oAUejcRCRTZfDlgWwM5Rd3F8xDsduw8bYho6gzHPWY/eI4+qicMUAbgU+OJzSJYSc1h d++I6Tmr5ZiylpT2mKMhFf7KDFyInXvSYqipw0/4ZpsbmuvQ/l8Nl++SiRIoJS0oFPnS SMgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739928771; x=1740533571; 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=5oM5mlez0ZqotlkCx2Jg9DzCaQKRsAad/T7OR8Vz+Uw=; b=IAq7sgNNTDPgmwOJ0x5+poojphPx8K15k7CXFH9mHccGo/1OU7XxBpoWfNFJ/ZIiRq POwrUdkrz2DzSbMYhUsEnCgEsSVABJXHA54PDJ+dbE4lq+WpktkUwEMbB4kJtVWU+vzK pz2m4RnzblG34f06ex05ORiKJ/BS/HDOfB8bVuwp2yeCT/foZKGEAG0jRwNkzOGEr7q8 h/73bVYfedjeJM3FqcA97AuAST/LD1k+k+qoNKfMLpD7XpFfPz1myNm07z8Ny0/8uim7 wrXgLE9GZVlAxc1i2faBn9Xu4+ZMCm521EmLiFShQuNu4LapofXYfLFqDj5pcs/nEYpA EIUQ== X-Gm-Message-State: AOJu0YzwzfSD99C8nuRCTYygvnnmUZLfBntTiWZeWeD26V4P1o2ZEkHa V8JA4MSmAsWwKwbSQvvf79gDiq89U0oqt9IwySq9hVCQveCMPW3LuGUskw== X-Gm-Gg: ASbGncuMqsRo1AC07aGkyMnFv5YAr66hcJUmya8U8567NCcDJnLiYXGGmSPYPw0RIH2 OZ/1YRXZolMtPqgDP0h3DIozBVqS00FhGNKHCNH0IP9IVguF40jlLbSHLmZkmBrMJ9qqKl2bOvu H5A4Y2jQuMCCFVf1Ix1oFHCzjVEZWO6oH+VBlyClrPoLZYmxIZUNTMz2mLcRcrOTAj8ZDunMiWw lPRkxFeGM9H7RfRPRNh0nhhOCoNzu4JV8H6bP1/ae9AQzvReo0ic3ZP4rpQA/1PUc5uOA1KWBZM FiKFAFVwZf+J6WUSzOwKwQm4T4Sq X-Google-Smtp-Source: AGHT+IHLHRTIStZVvldY0oN5U7H2rJ82+V9PBIGHl2uArUJxNoGlKDM0S1+jEpbyRV1LQkW+4XWTIw== X-Received: by 2002:a05:6000:1548:b0:38f:4808:b9f with SMTP id ffacd0b85a97d-38f48080be3mr7155399f8f.47.1739928771470; Tue, 18 Feb 2025 17:32:51 -0800 (PST) Received: from 127.0.0.1localhost ([185.69.145.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259d8f1csm16617752f8f.69.2025.02.18.17.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 17:32:49 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH v2 4/4] io_uring/rw: clean up mshot forced sync mode Date: Wed, 19 Feb 2025 01:33:40 +0000 Message-ID: <4ad7b928c776d1ad59addb9fff64ef2d1fc474d5.1739919038.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Move code forcing synchronous execution of multishot read requests out a more generic __io_read(). Signed-off-by: Pavel Begunkov --- io_uring/rw.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/io_uring/rw.c b/io_uring/rw.c index d16256505389..9edc6baebd01 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -889,15 +889,7 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags) if (unlikely(ret)) return ret; - if (unlikely(req->opcode == IORING_OP_READ_MULTISHOT)) { - void *cb_copy = rw->kiocb.ki_complete; - - rw->kiocb.ki_complete = NULL; - ret = io_iter_do_read(rw, &io->iter); - rw->kiocb.ki_complete = cb_copy; - } else { - ret = io_iter_do_read(rw, &io->iter); - } + ret = io_iter_do_read(rw, &io->iter); /* * Some file systems like to return -EOPNOTSUPP for an IOCB_NOWAIT @@ -995,6 +987,8 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags) if (!io_file_can_poll(req)) return -EBADFD; + /* make it sync, multishot doesn't support async execution */ + rw->kiocb.ki_complete = NULL; ret = __io_read(req, issue_flags); /*