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: 179792 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp18150dyi; Fri, 15 Dec 2023 19:39:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IExYljzVJUBbpRi0UT0FnHYMCdu045RfFvRAAp26b9woHeFjT/oHG+KwwtGFj2nWeTVTibM X-Received: by 2002:a17:906:20dd:b0:a1f:616d:ea7a with SMTP id c29-20020a17090620dd00b00a1f616dea7amr5874381ejc.91.1702697972156; Fri, 15 Dec 2023 19:39:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702697972; cv=none; d=google.com; s=arc-20160816; b=rawSMQtXvU6V+dXfI8BTkY+ymi0LKsYFFYMua4yuCD1pM6zBJEtt72djJ69fPZQ53t ELHr8sKJ0qk3UlL7J2PWnHybbxuTJaneJpvpDCfh3XKXXhlZcYyXqwgj5g1CMy+kv5WG gDTvRES/Q3S+wflGIQ9u/le+QhJSK6d80QMRQ8exU6d3ei3ZkNY8Ww7t5uelLPLqjZi/ iF6EvLW16vRcmtNwnyBKjStLOjgRCoq56LYNgFje0cDHsWaY+YR61B1lSaVl5WYm/aa7 2xI4MR7clwXp6RVb2i7+UTSUTztMHHiHctbL+vNolEjFOvLV/oEtIgXQeoODPuteJkSc h33g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=9mNDldpW72dzzPm2XiWKIN1gnNsmgtyhmZKpYp8TNSQ=; fh=vHhjxHftTECn/hRvIWNlq1eDzDsn74Roqz0kmRcPgcE=; b=sxt8JsoQ170hbSUV0OHilssJyihnGFWKP+bAvv06VvaE/LmGUGLv/nKppcHr3Bsp17 ZUxxvUI+WMfFwY+RZsdVdV8d6j7hIYi4Qx1I+ZPRqdKCckyxilPl2w+/yB1fPu6BYkFn /gdQwB0T21P06JfunHBxhtAxdyqkIFYfLfJqteI5Q+JYdzGGeXa8r3kkNxjT7hZEsh5q eClqQLey5O7SZjTc1ypfBVfQYZqAwqhLjd7i+i/Kh1tRiR/2GKaQ2F7bXcm+Vtxnyw0M jY5DnEy80j5iCm1iLrliQo1fBEXBK/JIP7ea3aXta8Hrmt4UXuA0/MaepfT7hSYhvjqI GK6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=XEtPsaHY; spf=pass (google.com: domain of linux-kernel+bounces-2029-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2029-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id si5-20020a170906cec500b00a1e3254ef26si7748191ejb.98.2023.12.15.19.39.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 19:39:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-2029-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=XEtPsaHY; spf=pass (google.com: domain of linux-kernel+bounces-2029-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2029-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C26541F2238A for ; Sat, 16 Dec 2023 03:39:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 14A921A720; Sat, 16 Dec 2023 03:36:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="XEtPsaHY" X-Original-To: linux-kernel@vger.kernel.org Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E50AE154BA for ; Sat, 16 Dec 2023 03:36:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785408228743578203 X-GMAIL-MSGID: 1785408228743578203 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);