From patchwork Fri Mar 28 23:11:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 14032494 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.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 BFDE155E69 for ; Fri, 28 Mar 2025 23:11:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743203473; cv=none; b=U+u02YqsAM/UKR3ioIovRzx5xOP6IZv4cOaFyUObFHfFyEG62hIvAOU8WWeKwkax/kUOdXiRBpkTTwWkqmGCYbcc+7J5v3MsBnZLo9P/JAa2ttrt8IEHsNBqc6PQXbqCcmdGqKLfeDezIoBNqoVWSnksW17qcxYMOY/B5O8jErs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743203473; c=relaxed/simple; bh=D7krbmuYve0DsUzSGJuy4gGE+xr8UsknmSyBE4k9xNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T4a0nVu9PP1U91MwF6IkisZRzhMLbBTP1eEym7cCfugSBkR0AjEV3Ub3Q+OXITUvXTsYtyfkdwgJHlckS8iI9YgLuktTafXsn1H3GgwdO85OFHrkwy6u5G6GWII5OQzt+zVuSyB8nm4Qaea9+cdZ1lF7Rt2XWiG8+1C60Q//mUI= 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=lO46vkl8; arc=none smtp.client-ip=209.85.218.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="lO46vkl8" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-ac2963dc379so424533166b.2 for ; Fri, 28 Mar 2025 16:11:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743203469; x=1743808269; 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=SsfRn4RUHJtUdIBF40MRyCJyqwoeBE4HQI/IKJFFVyU=; b=lO46vkl8QPJNX6rWZy60Y8yny91gqB43XspmJYRBkX6NF11Vn/x5g6vQQFNosBm0jB XC+SUetsKSLQtJ0p1RKqfcRhdIzT1aMiX7ht2xrvbArX0xjrscQ0fq2fHq4WsSYXE6+0 WVmhVn7h9dvwn2dMP0iyKQk7RXsglOoDGtbr45B6mEQ5ZTV3ppzu1i9iJeXCix56wibM 1fDmRIz6xPTkHuoD16sVpnTbnnhc+ERGO2eiFuqYQ9eiZHZLt9PH7mdePpIp5nM3Ginp yolcKN1s6/8WNoDjPbMWN/fW6BUZdPBDhqvQ28La8EkivgCXmdlCCFf0FyF0iDYFg2Ap mohA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743203469; x=1743808269; 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=SsfRn4RUHJtUdIBF40MRyCJyqwoeBE4HQI/IKJFFVyU=; b=qMy53ktXs2q+TDmKyjeC5+Q6FnwCaZltkNdiaIfHy+nJ2rAEuX8WAR5+WH1Cdfc+BY N0GMo1c2q8QE4eZPpT3AXvbfbnDnT3wRgKQqfH4J0vHKdOTDi8hf6zOHsj9Yrl5CUFyc cCjhl3ldnBxUrlJlt6X+baek09x1S/uCVUBdMcBW/A2Z4wfQFlAoh7ZuT56NFUmOIbDL R9yXBJmUPYefygVanfoBphtapR6u3/gFKe6tUHd3eNYl9ryXcdyPO1k2ztjB+Nvg6Sr0 YC333jKWOpLLB4cawx36Rh3PiUxqnNK/wNzNGvHSgHbMlyLvN1shlRGtw09IgAAAuZhJ 0UEg== X-Gm-Message-State: AOJu0YzORwsHdn8k9oIXISgo3f/Fc8wcXkeNvGER652hPTyT3wMhm1/l 4A8c004pkGousf/JoDZPcTsx7HvoNXvr5Xj0B2yHbjVyOfZHO8kkEB2x3g== X-Gm-Gg: ASbGncspiKQLyrMWpHFRjmNmbTNzYpiZdcGqf+ErVpT6jOyvlL07RV5uw0i5URyfpGl EshD22dd+SxJCfGj1YXNps81Pu+YuXYDGHf8tCDSwacLe0EKX2aAQyBFhQAe83Ka3v7zWKBNU0l /PiScmz2t+nc3nhlfwf34ojzFocv+RYUgF4uMu5JlpLjgOW9b3NDR3ZREY29f59RJPC/ILX05b9 fpLTysGKHEFGzN/DcgpYP0o1vUzDXf4rnv6nzbjhDuXfWFVIdetCafDDumdKuAJ+AEfNEcB9StC /dkKyna+MurRchk9ijlx4af2pOFaslikCTFbjlPaiH8CkvPmkNY7ee0i+12WoBQj9xPnPQ== X-Google-Smtp-Source: AGHT+IE5Utxl2xhLFx2wlRVD3+gsADjjAiL8Q7tCdrasiJg1kUqOOkhMM/cf85YBLEGHDVlg6AwUgw== X-Received: by 2002:a17:907:a08a:b0:ac7:1ba8:d2ce with SMTP id a640c23a62f3a-ac738a5a614mr79842866b.32.1743203469394; Fri, 28 Mar 2025 16:11:09 -0700 (PDT) Received: from 127.0.0.1localhost ([148.252.129.232]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac71966df80sm222838166b.125.2025.03.28.16.11.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 16:11:08 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH 1/3] io_uring/msg: rename io_double_lock_ctx() Date: Fri, 28 Mar 2025 23:11:49 +0000 Message-ID: <9e5defa000efd9b0f5e169cbb6bad4994d46ec5c.1743190078.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 io_double_lock_ctx() doesn't lock both rings. Rename it to prevent any future confusion. Signed-off-by: Pavel Begunkov --- io_uring/msg_ring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c index 0bbcbbcdebfd..bea5a96587b7 100644 --- a/io_uring/msg_ring.c +++ b/io_uring/msg_ring.c @@ -38,8 +38,8 @@ static void io_double_unlock_ctx(struct io_ring_ctx *octx) mutex_unlock(&octx->uring_lock); } -static int io_double_lock_ctx(struct io_ring_ctx *octx, - unsigned int issue_flags) +static int io_lock_external_ctx(struct io_ring_ctx *octx, + unsigned int issue_flags) { /* * To ensure proper ordering between the two ctxs, we can only @@ -154,7 +154,7 @@ static int __io_msg_ring_data(struct io_ring_ctx *target_ctx, ret = -EOVERFLOW; if (target_ctx->flags & IORING_SETUP_IOPOLL) { - if (unlikely(io_double_lock_ctx(target_ctx, issue_flags))) + if (unlikely(io_lock_external_ctx(target_ctx, issue_flags))) return -EAGAIN; } if (io_post_aux_cqe(target_ctx, msg->user_data, msg->len, flags)) @@ -199,7 +199,7 @@ static int io_msg_install_complete(struct io_kiocb *req, unsigned int issue_flag struct file *src_file = msg->src_file; int ret; - if (unlikely(io_double_lock_ctx(target_ctx, issue_flags))) + if (unlikely(io_lock_external_ctx(target_ctx, issue_flags))) return -EAGAIN; ret = __io_fixed_fd_install(target_ctx, src_file, msg->dst_fd); From patchwork Fri Mar 28 23:11:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 14032495 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.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 1D86484E1C for ; Fri, 28 Mar 2025 23:11:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743203474; cv=none; b=tyJ/oD09u8FYGUIv8PGiVfipCsU60ufO2wZtA97zzqowh1Hh87XYm4HvKOi2J33rpXTOC/7gKuAv7r50W+RYM/asNo4Q1KaxJzXTDJVc29TF7N2BrNgQtIzSXzR5WRHW1ct6+lpzzk8YS008xD3ZS/v3nek5HsrdOG+YaQzxcaA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743203474; c=relaxed/simple; bh=6A391A2zVYhu14feL8eJ9B3PBE1N8dQf3MgJyL5MPBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lq8L8t+iPIb1ntj1Q2FCwXCiMkpWFJxyFTQTnnLxwGWtxWR/mC3MqToSaz9iBATJNWB7vYMRhq7FT3t/QO65DT5VRPpkbm+BjQnUI7sAeTw1x0GUhy1sg1hWAQNNq5vgSiE/23ctJTvoQ6mwetfjokxTns0Alcy9Pl7k2CLm92o= 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=jrQBL2Pz; arc=none smtp.client-ip=209.85.218.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="jrQBL2Pz" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-ac339f53df9so478887766b.1 for ; Fri, 28 Mar 2025 16:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743203471; x=1743808271; 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=2ggMPyMt4mfMAXmAoFhBhwwVIiBMXB9TD7sYvt2+c8k=; b=jrQBL2PzNT8zpD4b5DBz2f9/gOSF401vnl8uOxXvKQjmx2f7taBCakSS/26Da59/LW QxgUNr9HDtwztIkPf+i/B8uln+FxxctA1Pa/T8m86QEkfgTs7RRZ8hPw5JeGTU1ZTtLe u4hziziihrt1Tpv9uQ8M4oYLLdY3VYLWuZh2Ye7dnE7Jlyj1fm1ecyqLmlRnMg4+JERW 27VLMQMw8RLWpKBjYInX6psDWm1CtPTv7BIWadvR6p2oHeCje3jZ+JdJisIMimJJp5HW iXlAd1orvkh6V+EfgiXoBAXr8NB/fXWMzJGWgOfQwx8+6QJLkDAUprMz3/XLry4+ttGW sfOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743203471; x=1743808271; 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=2ggMPyMt4mfMAXmAoFhBhwwVIiBMXB9TD7sYvt2+c8k=; b=Y98lPWIMg4u555lS51SoOtsW6ft3+iCMx4lWdfqihtfE2lQTn+YC2ahzFWn3WCHeqP KFNIZ+Dc241bzIcopqpyn9h5zwHD4rdIEhzRXbj+eawvRG9zgkmwMAvgAML0uA7ieYor ODrd+L2lzSkZ7cTIiJup7zUcIfkxcfEbf3QfstPXEkgbF0jkN9u/tHIKVKh/RjMqN42b GP82A5rML50GklkOhjd/dE+cgiQh3w7/JXGsLvH8x1V8fBJBsNzHTOvnn5kiobEq5pC+ 6kDRUnJRdVKogFjRDsgfumxO/C9YyTlEVtHwuUheB0t+3FEUR6NLXH5Kv2G6b/Mdgej8 xsdg== X-Gm-Message-State: AOJu0YzsdnmXI5nMwAuzghj7/MRdsEs4CP6jexbBjbPVpL/32szqP7R0 7O1NvZ/lIxGnJiYQNgwuoTsUunHtjv7hqrnMs7nCs0OP3N/lgkI4drmBJg== X-Gm-Gg: ASbGnctA/HQAXQ0WzUmTWpp/QYqNgTc9JPSJyz+phYO95Pk0Fq/RnZcZ1vLVAfmMUcZ MRWXW956T3flW8m1I4znJndu1xTSqD6b9Nds7WKQyWc4VJFYMuu324OmALhEcZ9xlIIcVjmpdFm v3T7q19WwA9gQZ9+yf+SqcjgAHmQI4GsjiYdYgaYTib1FYhTPjd/YjiuGmH9q341wCFWNUyG49L clXB7wNTz5e7w0sem2+WFlCNtoSsAnJ6eZu/jyOW2WUQtpFfxU8Tny86g6hwWiQV4DkLabwi4iN LeChwCCwq5MoN0EJLTPKL+lkHsCK8JdDtGEqzWn1yZiRfQEjx/KKg80WRSM58w6lLGuIUA== X-Google-Smtp-Source: AGHT+IHUcRWHvb55lloPkoOK1+UV/ptwkqtuzfEQfSGkjLdV7bUa8oDb1RjdWDO05VDRx4pnr/8Xow== X-Received: by 2002:a17:906:7955:b0:ac3:b372:6d10 with SMTP id a640c23a62f3a-ac738975daamr103952466b.4.1743203470903; Fri, 28 Mar 2025 16:11:10 -0700 (PDT) Received: from 127.0.0.1localhost ([148.252.129.232]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac71966df80sm222838166b.125.2025.03.28.16.11.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 16:11:10 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH 2/3] io_uring/msg: initialise msg request opcode Date: Fri, 28 Mar 2025 23:11:50 +0000 Message-ID: <9afe650fcb348414a4529d89f52eb8969ba06efd.1743190078.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 It's risky to have msg request opcode set to garbage, so at least initialise it to nop. Later we might want to add a user inaccessible opcode for such cases. Signed-off-by: Pavel Begunkov --- io_uring/msg_ring.c | 1 + 1 file changed, 1 insertion(+) diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c index bea5a96587b7..6c51b942d020 100644 --- a/io_uring/msg_ring.c +++ b/io_uring/msg_ring.c @@ -93,6 +93,7 @@ static int io_msg_remote_post(struct io_ring_ctx *ctx, struct io_kiocb *req, kmem_cache_free(req_cachep, req); return -EOWNERDEAD; } + req->opcode = IORING_OP_NOP; req->cqe.user_data = user_data; io_req_set_res(req, res, cflags); percpu_ref_get(&ctx->refs); From patchwork Fri Mar 28 23:11:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 14032496 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.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 7CEC755E69 for ; Fri, 28 Mar 2025 23:11:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743203476; cv=none; b=KJBM5ILIVxOnUXqb7VZIWL/i9uJeaHwCAqd3fvBCK2FmWuKMSzF/imWVav3zLemtGNXC5Lm2AFvG92PaffglM71NaH6q1Wuf3c5lA0zsMhcw1b0HmcQ2dUKMKbCirXfISBoRZQoaKUexi/Rpkowaj85km0aSGJZvyAciq7rmyL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743203476; c=relaxed/simple; bh=zzNtkvUrfeOOBoNxfSUZYr7UG8fRHlF70F71wLKfzG0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lqvCwNArC+RgaYbK8VY9LWhywLftDmqjpRjEd4lWpHyr5abD0GrgNUj57DwfcLw1EM2KHnOhtQEvebb37PaXN127VcHnt422+oHkYOrDSkRmqkTlw85Y/IUgxV5B4L7A7jrkuJnYVrAyPXQcaNlR4A5lnnG6shoQOMLfazdj/OA= 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=gds2eB6M; arc=none smtp.client-ip=209.85.218.54 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="gds2eB6M" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ac2963dc379so424535266b.2 for ; Fri, 28 Mar 2025 16:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743203472; x=1743808272; 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=rrg9HKTbnVX3X/GC5vKkjmMwZeokcH5kbmWyen5l6Pw=; b=gds2eB6MUOmlroTo7HXuGStiYRs1lzYfNMvHrwa1l6uwj/5zxNuTMy8KfNlzq71KFf UmueHiLrSipdPhNXJo9BoHmmTl2lr1yldBo7Y8xU/ZuWjbu/5HyHfjYn1Pw/sg3jNsAG AGhKkJrDCwL1wz7GH1pJ1XqiVfEAi2oyhHzxP80FUr0qT3VWe4KbeI7P9lrRHhVRPovq uWQsgo9CFMxETS7b1oarmPCORBYLIQSOQSIarKYPRYd0OgGGlz57NtrXScN7cAXGck2A QVN3/AAUk0yJh+5WMxwzvmwbU1zGv71dqvdqcQxCnv8IB3SUZ+lVppJrwEwIkinCpAyi YPkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743203472; x=1743808272; 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=rrg9HKTbnVX3X/GC5vKkjmMwZeokcH5kbmWyen5l6Pw=; b=sh5W7qlUidaXV571W2FUYota6gom60GSIHLqVnBp89mRZIk9jJkEuXXK9Le9D0pKzl 7igUYk9W48otJtht/iJOZhtO1TuC6Q57L5BIIQfcCEGcSSEfsR/LBkGViNU9kEhvmXst gzDv1Itgf9eX+gFEB6BCqs3/qeS5aD0F3/fIXZCUaqFQPVkgy2PMjxLZmSuTwbhmSkra KiAKAslkl21+vBMMXUKSMKa3M+H0z/QzZnAgoa2/JKeLlhRjLRJI5R4wiHLVsg2XHFE/ HY4Q9zwFFmyV3cEsqC8BYrRhxjf1yZJ6jL9DLUxdyCPek+SuixzVO3f7fX+p88Ay+A21 4Oxg== X-Gm-Message-State: AOJu0YzPdoMVzx1GED07bbbe+KRBLLZ49eCKy4ofBmXgeTpHBayja6UF l7aCs1FURVJ6auuA672LkGLezjGD0ae8VJe3wuAg8AeY2rN6XZxTWZgL1g== X-Gm-Gg: ASbGnctMbx6ZM88q17xmNJPfhcybaIkLVDOWLVuYHJwvOQm1f7iHCj1jpjl3ON4w6EJ 8D0rD9B2L2HVSD+WP2dpuroPvFnDtqEQ2zTWZ+yH+3WBPUYvyoE2EA1xJOqgA13tSFZGxQjThHO GQN091sP47xprR6Rni8UBXXy4iN9t5COf4mHKXvIO8yYGSmPqseeeCEch//bBG4ccKm2z6yU2ez KGe46tM+gblF63zGG+mS5vUPcDPDz/4DoUGt4HZSYcOIDK2YnDrIedgMWTcEKqrGVn9MgVEWCL3 fMd1RuHOTbXT1zAGDM9sO6tVcwuJavlwLAqAvz6aMaJKs8XvTp56o71LG6g598izFeE5tg== X-Google-Smtp-Source: AGHT+IE3pYEPeiTblj/i8Srzv2hVCRdjuJRytgjc83rYhjQJ58zHp9yeIrjHKzuHMMXbBh8W9t741A== X-Received: by 2002:a17:907:7f22:b0:ac6:f6f4:adad with SMTP id a640c23a62f3a-ac738b5160fmr80344666b.45.1743203472276; Fri, 28 Mar 2025 16:11:12 -0700 (PDT) Received: from 127.0.0.1localhost ([148.252.129.232]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac71966df80sm222838166b.125.2025.03.28.16.11.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 16:11:11 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com Subject: [PATCH 3/3] io_uring: don't pass ctx to tw add remote helper Date: Fri, 28 Mar 2025 23:11:51 +0000 Message-ID: <721f51cf34996d98b48f0bfd24ad40aa2730167e.1743190078.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 Unlike earlier versions, io_msg_remote_post() creates a valid request with a proper context, so don't pass a context to io_req_task_work_add_remote() explicitly but derive it from the request. Signed-off-by: Pavel Begunkov --- io_uring/io_uring.c | 14 ++++++-------- io_uring/io_uring.h | 3 +-- io_uring/msg_ring.c | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 4e362c8542a7..cb17deffd6ca 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1141,10 +1141,9 @@ void tctx_task_work(struct callback_head *cb) WARN_ON_ONCE(ret); } -static inline void io_req_local_work_add(struct io_kiocb *req, - struct io_ring_ctx *ctx, - unsigned flags) +static void io_req_local_work_add(struct io_kiocb *req, unsigned flags) { + struct io_ring_ctx *ctx = req->ctx; unsigned nr_wait, nr_tw, nr_tw_prev; struct llist_node *head; @@ -1239,17 +1238,16 @@ static void io_req_normal_work_add(struct io_kiocb *req) void __io_req_task_work_add(struct io_kiocb *req, unsigned flags) { if (req->ctx->flags & IORING_SETUP_DEFER_TASKRUN) - io_req_local_work_add(req, req->ctx, flags); + io_req_local_work_add(req, flags); else io_req_normal_work_add(req); } -void io_req_task_work_add_remote(struct io_kiocb *req, struct io_ring_ctx *ctx, - unsigned flags) +void io_req_task_work_add_remote(struct io_kiocb *req, unsigned flags) { - if (WARN_ON_ONCE(!(ctx->flags & IORING_SETUP_DEFER_TASKRUN))) + if (WARN_ON_ONCE(!(req->ctx->flags & IORING_SETUP_DEFER_TASKRUN))) return; - io_req_local_work_add(req, ctx, flags); + __io_req_task_work_add(req, flags); } static void __cold io_move_task_work_from_local(struct io_ring_ctx *ctx) diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 2308f39ed915..861f4fcb1398 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -89,8 +89,7 @@ struct file *io_file_get_fixed(struct io_kiocb *req, int fd, unsigned issue_flags); void __io_req_task_work_add(struct io_kiocb *req, unsigned flags); -void io_req_task_work_add_remote(struct io_kiocb *req, struct io_ring_ctx *ctx, - unsigned flags); +void io_req_task_work_add_remote(struct io_kiocb *req, unsigned flags); bool io_alloc_async_data(struct io_kiocb *req); void io_req_task_queue(struct io_kiocb *req); void io_req_task_complete(struct io_kiocb *req, io_tw_token_t tw); diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c index 6c51b942d020..50a958e9c921 100644 --- a/io_uring/msg_ring.c +++ b/io_uring/msg_ring.c @@ -100,7 +100,7 @@ static int io_msg_remote_post(struct io_ring_ctx *ctx, struct io_kiocb *req, req->ctx = ctx; req->tctx = NULL; req->io_task_work.func = io_msg_tw_complete; - io_req_task_work_add_remote(req, ctx, IOU_F_TWQ_LAZY_WAKE); + io_req_task_work_add_remote(req, IOU_F_TWQ_LAZY_WAKE); return 0; }