From patchwork Sat Dec 16 03:35:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 13495444 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 384A8C4332F for ; Sat, 16 Dec 2023 03:36:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF7B18D0162; Fri, 15 Dec 2023 22:36:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B7D1B8D015C; Fri, 15 Dec 2023 22:36:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95BC68D0162; Fri, 15 Dec 2023 22:36:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 80B478D015C for ; Fri, 15 Dec 2023 22:36:18 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4D678805F0 for ; Sat, 16 Dec 2023 03:36:18 +0000 (UTC) X-FDA: 81571268436.15.DC3805A Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) by imf11.hostedemail.com (Postfix) with ESMTP id 827CA40019 for ; Sat, 16 Dec 2023 03:36:16 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=XEtPsaHY; spf=pass (imf11.hostedemail.com: domain of kent.overstreet@linux.dev designates 95.215.58.177 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702697776; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9mNDldpW72dzzPm2XiWKIN1gnNsmgtyhmZKpYp8TNSQ=; b=OLGXtxaFcxpn0bHp5vznCWOPExHTZhgzli6qmrAlGcOZnNDNsdBsY5jZZj+qj9DwIU26K6 XKBCQ0JB/O6bAD5/nVNXRhkwPcTGANVSYAEWV2/LVc13Cvb+DYI1ReDB0+q2yFuy0AsulB kJU6nGyi9ikrXuvmCImZkDXj87umhYY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702697776; a=rsa-sha256; cv=none; b=CzjeICAVX2emuRaOV8KDld9/CLVgK5mKVekOpHZtdDqK0OsGcIRe0FoEiZAKvHI5xLN1EH zAmzYqVaK68P5kIiHjRfSlvjFCT33iDp33lYjgljsFNiM+RIEd/uU+1qFB9tMGPmd1e8O+ DK1lP4BvY/nWZ7uewZ2b9MSp7D7p8mY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=XEtPsaHY; spf=pass (imf11.hostedemail.com: domain of kent.overstreet@linux.dev designates 95.215.58.177 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1702697775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9mNDldpW72dzzPm2XiWKIN1gnNsmgtyhmZKpYp8TNSQ=; b=XEtPsaHY4Dmh0NEcxeo6xv7f2ym7o2IfV8/+qvppIKvuW8rL7syDOpqeXnCtLUbRWy3ay9 XUTcKSfr0H9Um73s8jIzA0dpG5SyaSVsv//HPpv6j5K8XxsJxUYi8LxxcHXGVIFo2kSSKH BrTDi66xvwaoqvzUoGgtuCKz5WtWL5I= From: Kent Overstreet To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: Kent Overstreet , tglx@linutronix.de, x86@kernel.org, tj@kernel.org, peterz@infradead.org, mathieu.desnoyers@efficios.com, paulmck@kernel.org, keescook@chromium.org, dave.hansen@linux.intel.com, mingo@redhat.com, will@kernel.org, longman@redhat.com, boqun.feng@gmail.com, brauner@kernel.org Subject: [PATCH 50/50] Kill sched.h dependency on rcupdate.h Date: Fri, 15 Dec 2023 22:35:51 -0500 Message-ID: <20231216033552.3553579-7-kent.overstreet@linux.dev> In-Reply-To: <20231216033552.3553579-1-kent.overstreet@linux.dev> References: <20231216024834.3510073-1-kent.overstreet@linux.dev> <20231216033552.3553579-1-kent.overstreet@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Stat-Signature: r1ntp4e1m4rciqjaftfphkq5pkfpf677 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 827CA40019 X-Rspam-User: X-HE-Tag: 1702697776-797130 X-HE-Meta: U2FsdGVkX1+VxCLJPuCIW8FoqZaUK3qX2H0nHyG6qyZ3qubxSP+czr1NnarKDsI2IlnC1ryv1xbA3ug50GB720eSa6SykvU9yHPRRlPK4MQbN4R0FfRLKXNabjYg/U0KALBHmHtA0dNPbnS8CkaR3anXc1RT/8p0Xp7qtx7oIX0Cj9Y/LNeCRwzXv5eF8n824PVmZq8KE66F1LHIIE5U1vBNbcflBG/hrp9hB8+fpOGAeFvUmKBNgd0hO8PmS10hHtDYOx6tAXLRPCGxQc9ngYm6M5XDuQm5nrsSh/O0tzz/OzNbpw8+ccHWxAb1D+y+uNxQUWFM7Vz2UkqlZp9Ann48Od3HeKP5cfJP6EJCtwLvMN0cYNit/BoRjQHlnkORxd1sKbYeQhpYYtUTZCKlSGVjfXvd9DqG0xKR/cE9WuEutjAjJU0722wlY9SgcHrdOK5trvIk72ffc2AGnZml6xWa4gCOqXT1HlpJZZCscu/fJXhmAGJ0lw8jFCES68ddomlZBVJXc7TAfuRifsbI5kxtPz34S+4BWQGYByfCR2cvUW7NiDkgSMVEXvufsATndJz+28OoU5isNAwuKGwmfElWtznUbnR7ldwv44rrkW+7yAOteGLJw8jDq4s1b5maJMGdtd96bhI4XnOk/09jEUCco7vDaLL3FDh4vSzm7kDSI0U7Hq7usgqn7wBVxPNVN+MVzNZZr7YYSSgvGG9Olu1lPcEscxFi0o+1DJsx6xklHhEHD0HYcQtYpLk145EHcfX4KeOJKXQIiLtFJ+bXSGmSJHZPfjcDrXG12nmZPWeXVDTeq47RgAbpDrRSJleZ+W+vgpFVfJtpTGXM7MPKisOd4ZT6fiVol8/X4VSWjkbiz9+JY2mWsjGLtg6KicVA/DeEHmszPqJD7/oG9jFd9Iyrb/nNEhdkTeEgjJo4PmRXVNmWesYDcxOyc9oDbSNK8nLbxkXOoyKXaamnBmv xFSA4PLw EpJvvWErth55VD09JXMz/zupS6GRRq1iagGVFyA1nkIlxUxuLoDka7Ws6rYV8jfISEksq0nCJnAxV5+SoSW37pRTi5QkAIdUk0+TVE8k5AgBhNpL7JWt8zrJX5crctBv0Tf+Y3CQqHZgdLBaOss79Mi4h2Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: by moving cond_resched_rcu() to rcupdate.h, we can kill another big sched.h dependency. Signed-off-by: Kent Overstreet Reported-by: noreply@ellerman.id.au Acked-by: Geert Uytterhoeven --- include/linux/rcupdate.h | 11 +++++++++++ include/linux/sched.h | 13 +++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index f7206b2623c9..8ebfa57e0164 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -1058,4 +1058,15 @@ extern int rcu_normal; DEFINE_LOCK_GUARD_0(rcu, rcu_read_lock(), rcu_read_unlock()) +#if defined(CONFIG_DEBUG_ATOMIC_SLEEP) || !defined(CONFIG_PREEMPT_RCU) +#define cond_resched_rcu() \ +do { \ + rcu_read_unlock(); \ + cond_resched(); \ + rcu_read_lock(); \ +} while (0) +#else +#define cond_resched_rcu() +#endif + #endif /* __LINUX_RCUPDATE_H */ diff --git a/include/linux/sched.h b/include/linux/sched.h index d528057c99e4..b781ac7e0a02 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -10,8 +10,11 @@ #include #include +#include +#include #include +#include #include #include #include @@ -22,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -2058,15 +2060,6 @@ extern int __cond_resched_rwlock_write(rwlock_t *lock); __cond_resched_rwlock_write(lock); \ }) -static inline void cond_resched_rcu(void) -{ -#if defined(CONFIG_DEBUG_ATOMIC_SLEEP) || !defined(CONFIG_PREEMPT_RCU) - rcu_read_unlock(); - cond_resched(); - rcu_read_lock(); -#endif -} - #ifdef CONFIG_PREEMPT_DYNAMIC extern bool preempt_model_none(void);