From nobody Mon Jun 29 19:43:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60D57C433EF for ; Thu, 3 Feb 2022 16:45:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352207AbiBCQpM (ORCPT ); Thu, 3 Feb 2022 11:45:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233807AbiBCQpI (ORCPT ); Thu, 3 Feb 2022 11:45:08 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14570C06173D for ; Thu, 3 Feb 2022 08:45:08 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id v13so6140381wrv.10 for ; Thu, 03 Feb 2022 08:45:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m/kvsV2Fw6mBqvpDjxp3WYmDCchAjKBAAZ5SIZ3OfkM=; b=TpJ71uRiEcpohrFxrNmCbljUwaOTD+Kmc+G+3Nzu3r2xGhvjUYCKulLZGZx2QnaJo5 mdeK1bKmrPd5RwgLPK5qMM1PlgFV/wmJAPWzxQjZm/TDfCn4vVJLJp0gylfTFRr8QBSW ApHNp90a1BIz24xD2lLuwtO8p1u3VCle46xvXffAy5YDAkFwCGTt0vaXJMaAE/KaPoaw i9d2ITJfkD4Sn42ob8o0b1l7w+xCKuryTd83VRZbcRnx9LnT1iU32kalQYqHwI58taMw 4aDBQBaE77SNtDCawE6ftrLI7nQ6/w6akHpU+aNbOB+1gfy4nTI5gC2OJRujQowcGDvP VUyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m/kvsV2Fw6mBqvpDjxp3WYmDCchAjKBAAZ5SIZ3OfkM=; b=BLfGqcTHtua4+Dh4EeXnbjf/hugxvO0tGmjPP1cePmtn+pJTcmFrwb2FxXDoY/ETFV nMFOQF/dCwO396S5cZs5Et5eBZQ7Rz+FJ81ue1ClS9mZVAR6ZWtYFtksmMlKAluKOTOR DCX2H8E12w3jvDDGmIXr4ZS0uwzdKUJFUXo1CuRskXbDwzLmmecCyt9GiXW8+d0gs9Mm qF6Z1B7bnX+ayctoy6dNRIdczEt+/VSMWHjBKjqMy6DdUCbNi8+InbiA6GQOAgQPrrWT FpvAXgY3oAtOBvkWwHiNE0KkT66QeCtI9fK82azZKljntzZ1AngISAZq2R0Osa9WnkqZ dimA== X-Gm-Message-State: AOAM5319DpSbBBF0gO9bjfv3Wio3c/W2Hd9S1ykImXbtYwy/Y8Xo61Xp g+oPwPKNKzZFVunIIAyl7cq47AeCsWHkLg== X-Google-Smtp-Source: ABdhPJyrgX5d0YA9/YSpggnjjJrDZRSzSNvZW9tVt0J0vgBrvCTUYxETA6MH9IEyJyb4HAPYYP+YKA== X-Received: by 2002:a5d:6d03:: with SMTP id e3mr29538181wrq.41.1643906706737; Thu, 03 Feb 2022 08:45:06 -0800 (PST) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6d:f804:0:28c2:5854:c832:e580]) by smtp.gmail.com with ESMTPSA id n14sm21412831wri.80.2022.02.03.08.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 08:45:06 -0800 (PST) From: Usama Arif To: io-uring@vger.kernel.org, axboe@kernel.dk, asml.silence@gmail.com, linux-kernel@vger.kernel.org Cc: fam.zheng@bytedance.com, Usama Arif Subject: [PATCH v2 1/3] io_uring: remove trace for eventfd Date: Thu, 3 Feb 2022 16:45:01 +0000 Message-Id: <20220203164503.641574-2-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220203164503.641574-1-usama.arif@bytedance.com> References: <20220203164503.641574-1-usama.arif@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The information on whether eventfd is registered is not very useful and would result in the tracepoint being enclosed in an rcu_readlock in a later patch that tries to avoid ring quiesce for registering eventfd. Suggested-by: Jens Axboe Signed-off-by: Usama Arif --- fs/io_uring.c | 3 +-- include/trace/events/io_uring.h | 13 +++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 2e04f718319d..21531609a9c6 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -11171,8 +11171,7 @@ SYSCALL_DEFINE4(io_uring_register, unsigned int, fd= , unsigned int, opcode, mutex_lock(&ctx->uring_lock); ret =3D __io_uring_register(ctx, opcode, arg, nr_args); mutex_unlock(&ctx->uring_lock); - trace_io_uring_register(ctx, opcode, ctx->nr_user_files, ctx->nr_user_buf= s, - ctx->cq_ev_fd !=3D NULL, ret); + trace_io_uring_register(ctx, opcode, ctx->nr_user_files, ctx->nr_user_buf= s, ret); out_fput: fdput(f); return ret; diff --git a/include/trace/events/io_uring.h b/include/trace/events/io_urin= g.h index 7346f0164cf4..098beda7601a 100644 --- a/include/trace/events/io_uring.h +++ b/include/trace/events/io_uring.h @@ -57,10 +57,9 @@ TRACE_EVENT(io_uring_create, * @opcode: describes which operation to perform * @nr_user_files: number of registered files * @nr_user_bufs: number of registered buffers - * @cq_ev_fd: whether eventfs registered or not * @ret: return code * - * Allows to trace fixed files/buffers/eventfds, that could be registered = to + * Allows to trace fixed files/buffers, that could be registered to * avoid an overhead of getting references to them for every operation. Th= is * event, together with io_uring_file_get, can provide a full picture of h= ow * much overhead one can reduce via fixing. @@ -68,16 +67,15 @@ TRACE_EVENT(io_uring_create, TRACE_EVENT(io_uring_register, =20 TP_PROTO(void *ctx, unsigned opcode, unsigned nr_files, - unsigned nr_bufs, bool eventfd, long ret), + unsigned nr_bufs, long ret), =20 - TP_ARGS(ctx, opcode, nr_files, nr_bufs, eventfd, ret), + TP_ARGS(ctx, opcode, nr_files, nr_bufs, ret), =20 TP_STRUCT__entry ( __field( void *, ctx ) __field( unsigned, opcode ) __field( unsigned, nr_files ) __field( unsigned, nr_bufs ) - __field( bool, eventfd ) __field( long, ret ) ), =20 @@ -86,14 +84,13 @@ TRACE_EVENT(io_uring_register, __entry->opcode =3D opcode; __entry->nr_files =3D nr_files; __entry->nr_bufs =3D nr_bufs; - __entry->eventfd =3D eventfd; __entry->ret =3D ret; ), =20 TP_printk("ring %p, opcode %d, nr_user_files %d, nr_user_bufs %d, " - "eventfd %d, ret %ld", + "ret %ld", __entry->ctx, __entry->opcode, __entry->nr_files, - __entry->nr_bufs, __entry->eventfd, __entry->ret) + __entry->nr_bufs, __entry->ret) ); =20 /** --=20 2.25.1 From nobody Mon Jun 29 19:43:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46BF1C433FE for ; Thu, 3 Feb 2022 16:45:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352420AbiBCQpO (ORCPT ); Thu, 3 Feb 2022 11:45:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352331AbiBCQpK (ORCPT ); Thu, 3 Feb 2022 11:45:10 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF777C061714 for ; Thu, 3 Feb 2022 08:45:09 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id s18so6169716wrv.7 for ; Thu, 03 Feb 2022 08:45:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C9mIY/v+zXjxY0tgTdXLZhI6S/iPKepRF9wzbP02Aw8=; b=XTp6wHBAH/Bkqz0EVF6ZXR7xKXAJM6lxtu3McG9gqz2aPKxDxpUktw5bzUoImyF+Tw aQBz/ck0DAEOeAbN0EPTU33fl1lgu4gyAzTp3VCv1rPL6ArvVyC84EiWhP7/AzcFIp+2 w7TQRvslligngTkpNpDE3g68WL5mhs+CTRlZoUs7KRSOxpX0es2dMYVEtZSd3vd/XAch 0P+AfE8wELCWcNqG8hSBv6ynWgdaCbla9JJOfBGC0hEx1CHg6VcRm1jOyHjAFADj9ZZ7 xyO5uelqwf/9UPbeLiIqPyuVFaZ/I/AQa2Lo0gGDykvS2UTdCeKeAGOeOLbyFcUTQN/u McbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C9mIY/v+zXjxY0tgTdXLZhI6S/iPKepRF9wzbP02Aw8=; b=FrV+4vImEBgj+rpHfx7lLDauvis8jNgjLHUfPS0caj76U0VHSY31oocmxPNG6z/41y tuX0XtMAP0Z4jTfL4L702IPADY7Wy4eZ6MPTHSr+3duujXmcIY7aFAvos6Jq3vz1+89Y mON7E/GSHMjZADqu7R9uKp7ZPjlm/3ar8o6yglF70hbD7XpTP24GAhQsZRKKKUO+Cqn3 YNxRdiJNEg83CKaWLjYcwr5hsRhQaSVRBs5w1DM5J8L4w30Gq3uO2xaUgsmc9Lg1uo3a e46ufAnXoMNfrr1Kq35dqTaC4ybvEo9O9sMxq3+bT/MYn8hLVVLFsB0PWT9omhBnM1Qv XuCw== X-Gm-Message-State: AOAM531WaINskcc99tOuC+OFWhwUZ9WJZfC3OZ6LbBobhYnkRrerLgEx AZZNKq0OatVdoL3feOKuqB+DTA== X-Google-Smtp-Source: ABdhPJwRXTqdk0s96s9hMwSTMBf1dEEU2Q99XE3Kr/CNNkbSmKUxbK27yqmV9q1ySEVbn3xlKJbsVg== X-Received: by 2002:a05:6000:1107:: with SMTP id z7mr29850872wrw.189.1643906708362; Thu, 03 Feb 2022 08:45:08 -0800 (PST) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6d:f804:0:28c2:5854:c832:e580]) by smtp.gmail.com with ESMTPSA id n14sm21412831wri.80.2022.02.03.08.45.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 08:45:08 -0800 (PST) From: Usama Arif To: io-uring@vger.kernel.org, axboe@kernel.dk, asml.silence@gmail.com, linux-kernel@vger.kernel.org Cc: fam.zheng@bytedance.com, Usama Arif Subject: [PATCH v2 2/3] io_uring: avoid ring quiesce while registering/unregistering eventfd Date: Thu, 3 Feb 2022 16:45:02 +0000 Message-Id: <20220203164503.641574-3-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220203164503.641574-1-usama.arif@bytedance.com> References: <20220203164503.641574-1-usama.arif@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This is done by creating a new RCU data structure (io_ev_fd) as part of io_ring_ctx that holds the eventfd_ctx. The function io_eventfd_signal is executed under rcu_read_lock with a single rcu_dereference to io_ev_fd so that if another thread unregisters the eventfd while io_eventfd_signal is still being executed, the eventfd_signal for which io_eventfd_signal was called completes successfully. The process of registering/unregistering eventfd is done under a lock so multiple threads don't enter a race condition while registering/unregistering eventfd. With the above approach ring quiesce can be avoided which is much more expensive then using RCU lock. On the system tested, io_uring_reigster with IORING_REGISTER_EVENTFD takes less than 1ms with RCU lock, compared to 15ms before with ring quiesce. Signed-off-by: Usama Arif --- fs/io_uring.c | 101 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 76 insertions(+), 25 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 21531609a9c6..9b6ee3b8b9f2 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -326,6 +326,12 @@ struct io_submit_state { struct blk_plug plug; }; =20 +struct io_ev_fd { + struct eventfd_ctx *cq_ev_fd; + struct io_ring_ctx *ctx; + struct rcu_head rcu; +}; + struct io_ring_ctx { /* const or read-mostly hot data */ struct { @@ -399,7 +405,8 @@ struct io_ring_ctx { struct { unsigned cached_cq_tail; unsigned cq_entries; - struct eventfd_ctx *cq_ev_fd; + struct io_ev_fd __rcu *io_ev_fd; + struct mutex ev_fd_lock; struct wait_queue_head cq_wait; unsigned cq_extra; atomic_t cq_timeouts; @@ -1448,6 +1455,7 @@ static __cold struct io_ring_ctx *io_ring_ctx_alloc(s= truct io_uring_params *p) xa_init_flags(&ctx->io_buffers, XA_FLAGS_ALLOC1); xa_init_flags(&ctx->personalities, XA_FLAGS_ALLOC1); mutex_init(&ctx->uring_lock); + mutex_init(&ctx->ev_fd_lock); init_waitqueue_head(&ctx->cq_wait); spin_lock_init(&ctx->completion_lock); spin_lock_init(&ctx->timeout_lock); @@ -1726,13 +1734,24 @@ static inline struct io_uring_cqe *io_get_cqe(struc= t io_ring_ctx *ctx) return &rings->cqes[tail & mask]; } =20 -static inline bool io_should_trigger_evfd(struct io_ring_ctx *ctx) +static void io_eventfd_signal(struct io_ring_ctx *ctx) { - if (likely(!ctx->cq_ev_fd)) - return false; + struct io_ev_fd *ev_fd; + + rcu_read_lock(); + /* rcu_dereference ctx->io_ev_fd once and use it for both for checking an= d eventfd_signal */ + ev_fd =3D rcu_dereference(ctx->io_ev_fd); + + if (likely(!ev_fd)) + goto out; if (READ_ONCE(ctx->rings->cq_flags) & IORING_CQ_EVENTFD_DISABLED) - return false; - return !ctx->eventfd_async || io_wq_current_is_worker(); + goto out; + + if (!ctx->eventfd_async || io_wq_current_is_worker()) + eventfd_signal(ev_fd->cq_ev_fd, 1); + +out: + rcu_read_unlock(); } =20 /* @@ -1751,8 +1770,7 @@ static void io_cqring_ev_posted(struct io_ring_ctx *c= tx) */ if (wq_has_sleeper(&ctx->cq_wait)) wake_up_all(&ctx->cq_wait); - if (io_should_trigger_evfd(ctx)) - eventfd_signal(ctx->cq_ev_fd, 1); + io_eventfd_signal(ctx); } =20 static void io_cqring_ev_posted_iopoll(struct io_ring_ctx *ctx) @@ -1764,8 +1782,7 @@ static void io_cqring_ev_posted_iopoll(struct io_ring= _ctx *ctx) if (waitqueue_active(&ctx->cq_wait)) wake_up_all(&ctx->cq_wait); } - if (io_should_trigger_evfd(ctx)) - eventfd_signal(ctx->cq_ev_fd, 1); + io_eventfd_signal(ctx); } =20 /* Returns true if there are no backlogged entries after the flush */ @@ -9353,35 +9370,67 @@ static int __io_sqe_buffers_update(struct io_ring_c= tx *ctx, =20 static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg) { + struct io_ev_fd *ev_fd; __s32 __user *fds =3D arg; - int fd; + int fd, ret; =20 - if (ctx->cq_ev_fd) - return -EBUSY; + mutex_lock(&ctx->ev_fd_lock); + ret =3D -EBUSY; + if (rcu_dereference_protected(ctx->io_ev_fd, lockdep_is_held(&ctx->ev_fd_= lock))) + goto out; =20 + ret =3D -EFAULT; if (copy_from_user(&fd, fds, sizeof(*fds))) - return -EFAULT; + goto out; =20 - ctx->cq_ev_fd =3D eventfd_ctx_fdget(fd); - if (IS_ERR(ctx->cq_ev_fd)) { - int ret =3D PTR_ERR(ctx->cq_ev_fd); + ret =3D -ENOMEM; + ev_fd =3D kmalloc(sizeof(*ev_fd), GFP_KERNEL); + if (!ev_fd) + goto out; =20 - ctx->cq_ev_fd =3D NULL; - return ret; + ev_fd->cq_ev_fd =3D eventfd_ctx_fdget(fd); + if (IS_ERR(ev_fd->cq_ev_fd)) { + ret =3D PTR_ERR(ev_fd->cq_ev_fd); + kfree(ev_fd); + goto out; } + ev_fd->ctx =3D ctx; =20 - return 0; + rcu_assign_pointer(ctx->io_ev_fd, ev_fd); + ret =3D 0; + +out: + mutex_unlock(&ctx->ev_fd_lock); + return ret; +} + +static void io_eventfd_put(struct rcu_head *rcu) +{ + struct io_ev_fd *ev_fd =3D container_of(rcu, struct io_ev_fd, rcu); + struct io_ring_ctx *ctx =3D ev_fd->ctx; + + eventfd_ctx_put(ev_fd->cq_ev_fd); + kfree(ev_fd); + rcu_assign_pointer(ctx->io_ev_fd, NULL); } =20 static int io_eventfd_unregister(struct io_ring_ctx *ctx) { - if (ctx->cq_ev_fd) { - eventfd_ctx_put(ctx->cq_ev_fd); - ctx->cq_ev_fd =3D NULL; - return 0; + struct io_ev_fd *ev_fd; + int ret; + + mutex_lock(&ctx->ev_fd_lock); + ev_fd =3D rcu_dereference_protected(ctx->io_ev_fd, lockdep_is_held(&ctx->= ev_fd_lock)); + if (ev_fd) { + call_rcu(&ev_fd->rcu, io_eventfd_put); + ret =3D 0; + goto out; } + ret =3D -ENXIO; =20 - return -ENXIO; +out: + mutex_unlock(&ctx->ev_fd_lock); + return ret; } =20 static void io_destroy_buffers(struct io_ring_ctx *ctx) @@ -10960,6 +11009,8 @@ static bool io_register_op_must_quiesce(int op) case IORING_REGISTER_FILES: case IORING_UNREGISTER_FILES: case IORING_REGISTER_FILES_UPDATE: + case IORING_REGISTER_EVENTFD: + case IORING_UNREGISTER_EVENTFD: case IORING_REGISTER_PROBE: case IORING_REGISTER_PERSONALITY: case IORING_UNREGISTER_PERSONALITY: --=20 2.25.1 From nobody Mon Jun 29 19:43:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 335A9C433F5 for ; Thu, 3 Feb 2022 16:45:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352439AbiBCQpQ (ORCPT ); Thu, 3 Feb 2022 11:45:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352257AbiBCQpL (ORCPT ); Thu, 3 Feb 2022 11:45:11 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9F8CC061714 for ; Thu, 3 Feb 2022 08:45:10 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id l35-20020a05600c1d2300b0034d477271c1so2164376wms.3 for ; Thu, 03 Feb 2022 08:45:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y6U7YdQVGA2YDGwsgkTnmQr3nQCNLxRAeMrGbxyU310=; b=0XuF/JGS5W8qkzma5i9WGPf31yOnDg4Ylqo4ISkoU/IijIll9Ymf3Td8QgD0+DmH0o sDoOH2il8HeN4WYLZlb1Plj59s9x6fvPOvbtozwkPU2aYwpEyhjezsrbj8kA0i3hoOGx tylG7ndZx1hzx6AXXef+3kj1EPL2RRxgL0sk4s6685tNFccloCAwQzWKjzw+1uBxhXsO Cwq7N1VZTwYZWHEKkRsSpCf+fWiZ5bNAWhC0FAaVXKztuVhg2l4izMROTTfQr5ZTl6JO C3PDQNGL2HWl3Gf+0mmccAwgzkf7N1T45DFS0awEToUo5CcWF2+SAghMZYLB+LUHJI1V aGxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y6U7YdQVGA2YDGwsgkTnmQr3nQCNLxRAeMrGbxyU310=; b=AzGjhLwocNpnBdOWM5b8SB7WiqamhStlU1lXoKE5nYoHg/lXscWPobfkFCyt5yqSYh e1CKEltVQueFhRF4SoToCqm6XR6piZtCiuSvSAiFSxwMAL4ZAFCUIY5qgP8Jy8hXKmMK x5DRMi2rgjc3Kn2TOiHFwKC7QJ0Xe0HtDcYBd9uXcjqLDONZuIPRWFlYSCKZsFJ/UZxt 3/7SFhaOkrXcpUv/VXZIiZ7J9oQcVz1NGF16nCogveZs/RqeVim6tIobnkJ75eExMCL5 zGJKI32bDqQEGvesAE08TgQ6yGgtMuJFoZ3qF8/VFDKqA5DUr/p+wt8qj1DXk+Q0BMM8 6M2Q== X-Gm-Message-State: AOAM53188KTNiVjVuqEXaz/VCETOKb/zQ1FlrOdXMh7pCsEQOHFNT+7x K6alfYbiiV2VSyLZtmHzcrphjw== X-Google-Smtp-Source: ABdhPJyhbFlaAl5r8+IIntVrV4V0/fEuqNg0yeotDlykZSJOMt2gxlgKbxy4VqszArLK1r8LlHt2Pw== X-Received: by 2002:a05:600c:2154:: with SMTP id v20mr10891990wml.34.1643906709375; Thu, 03 Feb 2022 08:45:09 -0800 (PST) Received: from usaari01.cust.communityfibre.co.uk ([2a02:6b6d:f804:0:28c2:5854:c832:e580]) by smtp.gmail.com with ESMTPSA id n14sm21412831wri.80.2022.02.03.08.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 08:45:09 -0800 (PST) From: Usama Arif To: io-uring@vger.kernel.org, axboe@kernel.dk, asml.silence@gmail.com, linux-kernel@vger.kernel.org Cc: fam.zheng@bytedance.com, Usama Arif Subject: [PATCH v2 3/3] io_uring: avoid ring quiesce for IORING_REGISTER_EVENTFD_ASYNC Date: Thu, 3 Feb 2022 16:45:03 +0000 Message-Id: <20220203164503.641574-4-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220203164503.641574-1-usama.arif@bytedance.com> References: <20220203164503.641574-1-usama.arif@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This is done using the RCU data structure (io_ev_fd). eventfd_async is moved from io_ring_ctx to io_ev_fd which is RCU protected hence avoiding ring quiesce which is much more expensive than an RCU lock. Signed-off-by: Usama Arif --- fs/io_uring.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 9b6ee3b8b9f2..05fd059b3f1e 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -329,6 +329,7 @@ struct io_submit_state { struct io_ev_fd { struct eventfd_ctx *cq_ev_fd; struct io_ring_ctx *ctx; + unsigned int eventfd_async: 1; struct rcu_head rcu; }; =20 @@ -341,7 +342,6 @@ struct io_ring_ctx { unsigned int flags; unsigned int compat: 1; unsigned int drain_next: 1; - unsigned int eventfd_async: 1; unsigned int restricted: 1; unsigned int off_timeout_used: 1; unsigned int drain_active: 1; @@ -1747,7 +1747,7 @@ static void io_eventfd_signal(struct io_ring_ctx *ctx) if (READ_ONCE(ctx->rings->cq_flags) & IORING_CQ_EVENTFD_DISABLED) goto out; =20 - if (!ctx->eventfd_async || io_wq_current_is_worker()) + if (!ev_fd->eventfd_async || io_wq_current_is_worker()) eventfd_signal(ev_fd->cq_ev_fd, 1); =20 out: @@ -9368,7 +9368,8 @@ static int __io_sqe_buffers_update(struct io_ring_ctx= *ctx, return done ? done : err; } =20 -static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg) +static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg, + unsigned int eventfd_async) { struct io_ev_fd *ev_fd; __s32 __user *fds =3D arg; @@ -9395,6 +9396,7 @@ static int io_eventfd_register(struct io_ring_ctx *ct= x, void __user *arg) goto out; } ev_fd->ctx =3D ctx; + ev_fd->eventfd_async =3D eventfd_async; =20 rcu_assign_pointer(ctx->io_ev_fd, ev_fd); ret =3D 0; @@ -11010,6 +11012,7 @@ static bool io_register_op_must_quiesce(int op) case IORING_UNREGISTER_FILES: case IORING_REGISTER_FILES_UPDATE: case IORING_REGISTER_EVENTFD: + case IORING_REGISTER_EVENTFD_ASYNC: case IORING_UNREGISTER_EVENTFD: case IORING_REGISTER_PROBE: case IORING_REGISTER_PERSONALITY: @@ -11110,17 +11113,16 @@ static int __io_uring_register(struct io_ring_ctx= *ctx, unsigned opcode, ret =3D io_register_files_update(ctx, arg, nr_args); break; case IORING_REGISTER_EVENTFD: - case IORING_REGISTER_EVENTFD_ASYNC: ret =3D -EINVAL; if (nr_args !=3D 1) break; - ret =3D io_eventfd_register(ctx, arg); - if (ret) + ret =3D io_eventfd_register(ctx, arg, 0); + break; + case IORING_REGISTER_EVENTFD_ASYNC: + ret =3D -EINVAL; + if (nr_args !=3D 1) break; - if (opcode =3D=3D IORING_REGISTER_EVENTFD_ASYNC) - ctx->eventfd_async =3D 1; - else - ctx->eventfd_async =3D 0; + ret =3D io_eventfd_register(ctx, arg, 1); break; case IORING_UNREGISTER_EVENTFD: ret =3D -EINVAL; --=20 2.25.1