From patchwork Wed Mar 9 15:27:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 550882 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 8F891C433F5 for ; Wed, 9 Mar 2022 15:27:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233869AbiCIP24 (ORCPT ); Wed, 9 Mar 2022 10:28:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232016AbiCIP2x (ORCPT ); Wed, 9 Mar 2022 10:28:53 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0F53639D; Wed, 9 Mar 2022 07:27:53 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9BE0761484; Wed, 9 Mar 2022 15:27:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 232A0C340F4; Wed, 9 Mar 2022 15:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646839672; bh=dMyKNU+Scbf5e52FtlBwSub/ypQq2YlPR+76ClMuaOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=qGYYXwoPPFA4rg/tQyuIOHGgfyu3Zh6qkActnqaf4KFRDWw3iIHCsRF6J5b7IzUbn Fvu8c3ft9ncamXs4h6BM3zMsoKhnp00AJcmZWUwxFDtA2tql6e0uYwF/cgNpOsK4R4 XqAVuORthA5ku+O17BCY8r1xGmlqS3USRdnG3/c1oTNh1Ug2H9bileMRqSPpXBEWzg ObdP9a+MGwGW2FjUwLTuHf0Gz+5TmiFVF3Af32iLP0AYHY35a2F5aC6NQDLbj3QI5J YAvnqXKsq4kCiizQs4LyzrRA7QuC/lhP2ow46gb33Is2CA2ZEnOZWvHJ/K7Ii4+dZ6 Lvb9yHi6D1kJQ== From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Clark Williams , "Luis Claudio R. Goncalves" , Tom Zanussi Cc: Al Viro Subject: [PATCH RT 1/3] eventfd: Make signal recursion protection a task bit Date: Wed, 9 Mar 2022 09:27:46 -0600 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Thomas Gleixner v5.4.182-rt71-rc1 stable review patch. If anyone has any objections, please let me know. ----------- [ Upstream commit b542e383d8c005f06a131e2b40d5889b812f19c6 ] The recursion protection for eventfd_signal() is based on a per CPU variable and relies on the !RT semantics of spin_lock_irqsave() for protecting this per CPU variable. On RT kernels spin_lock_irqsave() neither disables preemption nor interrupts which allows the spin lock held section to be preempted. If the preempting task invokes eventfd_signal() as well, then the recursion warning triggers. Paolo suggested to protect the per CPU variable with a local lock, but that's heavyweight and actually not necessary. The goal of this protection is to prevent the task stack from overflowing, which can be achieved with a per task recursion protection as well. Replace the per CPU variable with a per task bit similar to other recursion protection bits like task_struct::in_page_owner. This works on both !RT and RT kernels and removes as a side effect the extra per CPU storage. No functional change for !RT kernels. Reported-by: Daniel Bristot de Oliveira Signed-off-by: Thomas Gleixner Tested-by: Daniel Bristot de Oliveira Acked-by: Jason Wang Cc: Al Viro Link: https://lore.kernel.org/r/87wnp9idso.ffs@tglx Signed-off-by: Tom Zanussi Conflicts: fs/aio.c include/linux/sched.h --- fs/aio.c | 2 +- fs/eventfd.c | 12 +++++------- include/linux/eventfd.h | 11 +++++------ include/linux/sched.h | 12 ++++++++++++ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index fb92c32a6f1e..db21ca695781 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1767,7 +1767,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync, list_del_init(&req->wait.entry); list_del(&iocb->ki_list); iocb->ki_res.res = mangle_poll(mask); - if (iocb->ki_eventfd && eventfd_signal_count()) { + if (iocb->ki_eventfd && eventfd_signal_allowed()) { iocb = NULL; INIT_WORK(&req->work, aio_poll_put_work); schedule_work(&req->work); diff --git a/fs/eventfd.c b/fs/eventfd.c index 78e41c7c3d05..661ccc45852b 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -24,8 +24,6 @@ #include #include -DEFINE_PER_CPU(int, eventfd_wake_count); - static DEFINE_IDA(eventfd_ida); struct eventfd_ctx { @@ -66,21 +64,21 @@ __u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n) * Deadlock or stack overflow issues can happen if we recurse here * through waitqueue wakeup handlers. If the caller users potentially * nested waitqueues with custom wakeup handlers, then it should - * check eventfd_signal_count() before calling this function. If - * it returns true, the eventfd_signal() call should be deferred to a + * check eventfd_signal_allowed() before calling this function. If + * it returns false, the eventfd_signal() call should be deferred to a * safe context. */ - if (WARN_ON_ONCE(this_cpu_read(eventfd_wake_count))) + if (WARN_ON_ONCE(current->in_eventfd_signal)) return 0; spin_lock_irqsave(&ctx->wqh.lock, flags); - this_cpu_inc(eventfd_wake_count); + current->in_eventfd_signal = 1; if (ULLONG_MAX - ctx->count < n) n = ULLONG_MAX - ctx->count; ctx->count += n; if (waitqueue_active(&ctx->wqh)) wake_up_locked_poll(&ctx->wqh, EPOLLIN); - this_cpu_dec(eventfd_wake_count); + current->in_eventfd_signal = 0; spin_unlock_irqrestore(&ctx->wqh.lock, flags); return n; diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h index dc4fd8a6644d..836b4c021a0a 100644 --- a/include/linux/eventfd.h +++ b/include/linux/eventfd.h @@ -14,6 +14,7 @@ #include #include #include +#include /* * CAREFUL: Check include/uapi/asm-generic/fcntl.h when defining @@ -42,11 +43,9 @@ __u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n); int eventfd_ctx_remove_wait_queue(struct eventfd_ctx *ctx, wait_queue_entry_t *wait, __u64 *cnt); -DECLARE_PER_CPU(int, eventfd_wake_count); - -static inline bool eventfd_signal_count(void) +static inline bool eventfd_signal_allowed(void) { - return this_cpu_read(eventfd_wake_count); + return !current->in_eventfd_signal; } #else /* CONFIG_EVENTFD */ @@ -77,9 +76,9 @@ static inline int eventfd_ctx_remove_wait_queue(struct eventfd_ctx *ctx, return -ENOSYS; } -static inline bool eventfd_signal_count(void) +static inline bool eventfd_signal_allowed(void) { - return false; + return true; } #endif diff --git a/include/linux/sched.h b/include/linux/sched.h index 79e34e98f812..e1dfb01f4623 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -802,6 +802,18 @@ struct task_struct { /* to be used once the psi infrastructure lands upstream. */ unsigned use_memdelay:1; #endif +#ifdef CONFIG_PSI + /* Stalled due to lack of memory */ + unsigned in_memstall:1; +#endif +#ifdef CONFIG_PAGE_OWNER + /* Used by page_owner=on to detect recursion in page tracking. */ + unsigned in_page_owner:1; +#endif +#ifdef CONFIG_EVENTFD + /* Recursion prevention for eventfd_signal() */ + unsigned in_eventfd_signal:1; +#endif unsigned long atomic_flags; /* Flags requiring atomic access. */ From patchwork Wed Mar 9 15:27:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 550000 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 674CFC433EF for ; Wed, 9 Mar 2022 15:28:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232533AbiCIP26 (ORCPT ); Wed, 9 Mar 2022 10:28:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233866AbiCIP24 (ORCPT ); Wed, 9 Mar 2022 10:28:56 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5C386556; Wed, 9 Mar 2022 07:27:55 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 89855B81FE7; Wed, 9 Mar 2022 15:27:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44264C340F5; Wed, 9 Mar 2022 15:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646839673; bh=4LvHReCCc6esFGe4Kza+mSF7SzFddRcJJjyCrXFtHJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=epSwLNLwtyJjLol22SkzlR943GKnHKRR6V3Em2kvJv3nFt8mimUPtlTBb7cUYxGAK kJsK6m4L3+LLV2eW7ZO5k0UrM1tW5cOaRl6auQ05Pjw9IZCYasW3ToR56zm6LS02xU zfOe6ewYF1TvnZwYthj15ZEVVoher1BxmGwNQQq43s0PT7Ph0HOocuLDl79PjhM8j6 Z2Ry/yG8ExXuB0DzmE4BeBCay0HzQuEltsmdZ63AujlGGXUQ8fQD04a7iislsJ745+ rMHinIJKL93J8YGWnLPqQTgPtqpjzucpI9Gf/0BiO0XA/A3E0TQQ61wUDVSXbsStbx vpNfymm4VCzjw== From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Clark Williams , "Luis Claudio R. Goncalves" , Tom Zanussi Cc: Xie Yongji , Eric Biggers Subject: [PATCH RT 2/3] aio: Fix incorrect usage of eventfd_signal_allowed() Date: Wed, 9 Mar 2022 09:27:47 -0600 Message-Id: <5372f24b2001f02ce836cf7a1ec34e2990abc99f.1646839649.git.zanussi@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Xie Yongji v5.4.182-rt71-rc1 stable review patch. If anyone has any objections, please let me know. ----------- [ Upstream commmit 4b3749865374899e115aa8c48681709b086fe6d3 ] We should defer eventfd_signal() to the workqueue when eventfd_signal_allowed() return false rather than return true. Fixes: b542e383d8c0 ("eventfd: Make signal recursion protection a task bit") Signed-off-by: Xie Yongji Link: https://lore.kernel.org/r/20210913111928.98-1-xieyongji@bytedance.com Reviewed-by: Eric Biggers Signed-off-by: Eric Biggers Signed-off-by: Tom Zanussi --- fs/aio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/aio.c b/fs/aio.c index db21ca695781..0bb9abf39065 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1767,7 +1767,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync, list_del_init(&req->wait.entry); list_del(&iocb->ki_list); iocb->ki_res.res = mangle_poll(mask); - if (iocb->ki_eventfd && eventfd_signal_allowed()) { + if (iocb->ki_eventfd && !eventfd_signal_allowed()) { iocb = NULL; INIT_WORK(&req->work, aio_poll_put_work); schedule_work(&req->work); From patchwork Wed Mar 9 15:27:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 550881 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 E7229C433FE for ; Wed, 9 Mar 2022 15:28:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233882AbiCIP3A (ORCPT ); Wed, 9 Mar 2022 10:29:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233865AbiCIP24 (ORCPT ); Wed, 9 Mar 2022 10:28:56 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A015643F; Wed, 9 Mar 2022 07:27:55 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DB577614EF; Wed, 9 Mar 2022 15:27:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DD08C340F4; Wed, 9 Mar 2022 15:27:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646839674; bh=AWGrA2gdjK2l3jA6PIbNml5wRlr2I5vXKUiOzXqwJQs=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=ZMF7No5gmILphH9Dpsedeg+jnPC5EbU62iEuRJBm5dAFyQ/KtmjUcExSJ71JFxSbc MGauN4i5PK+Phg1VOy+UB5eUpTIpOjfWcqI413HBfvzmDpjgsWUF/i2KWPmjsQ3szX rUqXPO3IcnG4UwaXRQjjCbxruMTgJivJtCE+9xTm9Z8qXgkKeW9rODPl4gMqbLy0PI dmJEWFt4EDDEwYIhELRhKGspBbcYcne3N01GOtwDZX7suOzwjUCwpGtlS6HxfALhyY gAkK19s9LeDqxzWIDZUFk79tpKhfEZb3TwLGfJHn1FM10DaZ/0lOzC3ZedQUcQH0Wq ckgy0ctcrpDSg== From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Clark Williams , "Luis Claudio R. Goncalves" , Tom Zanussi Subject: [PATCH RT 3/3] Linux 5.4.182-rt71-rc1 Date: Wed, 9 Mar 2022 09:27:48 -0600 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Tom Zanussi v5.4.182-rt71-rc1 stable review patch. If anyone has any objections, please let me know. ----------- Signed-off-by: Tom Zanussi --- localversion-rt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localversion-rt b/localversion-rt index f36b5d418dd8..00736430c969 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt70 +-rt71-rc1