From patchwork Sat Dec 16 03:29:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 13495405 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 EB527C4332F for ; Sat, 16 Dec 2023 03:30:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC6638D014F; Fri, 15 Dec 2023 22:30:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D78498D0143; Fri, 15 Dec 2023 22:30:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF0938D014F; Fri, 15 Dec 2023 22:30:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9442C8D0143 for ; Fri, 15 Dec 2023 22:30:24 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 785C31C0B4C for ; Sat, 16 Dec 2023 03:30:24 +0000 (UTC) X-FDA: 81571253568.09.E52EDE8 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) by imf30.hostedemail.com (Postfix) with ESMTP id C8D6A80016 for ; Sat, 16 Dec 2023 03:30:22 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DIBy7Flv; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf30.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.188 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702697423; 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=e3tHutfa1QYCHwlZxSH9tW2HuBfPypl6d7654MXKb2g=; b=DpZbyiPQRaqoykr8lvtZrEtkQ2+uU+hsIXj5ycCJvBynFjPDAbf5vc5xc/rFeM/iZXbQNg c2+Y24t8AtoiwEqzaFHdhmPOjmjkGgumZ04jTF6scVQov2j8cQ60P3qqoXe0sXvMQdfI90 bN67JsWAc8GJKZrqpUkmWOVMnL8HTuo= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DIBy7Flv; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf30.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.188 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702697423; a=rsa-sha256; cv=none; b=y8ZxYpPA8ODUSthHjcO5MV/vC+SWg7aU/dz0owYIUQxF71/dN/1sqMcOxiY6exgizJeBEr f9TGVwak52yqVY2ujuHY0YNYtSUKws4k16PZ9d4YjRKieiBUguibcjBCc37nCzC+82gllf KiQD+afsQcGVMcGuugYQoQ0GJNEdydA= 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=1702697421; 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=e3tHutfa1QYCHwlZxSH9tW2HuBfPypl6d7654MXKb2g=; b=DIBy7FlvM36CDQz6G9CvyRS/y6yB/RIfDL9XUiKR3uJjZeJyzz0po37EicZLkGQZfyOCk/ RZy/4d9+FjbJjPZlHN6cLBuDNbK6LrXNJiOSa7D9LnxUMWDGdIexD4mbwZS63uAzP1Z+7V /MlED5Q/UU9DEmdTz8RuXczptTDFTdU= 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 30/50] workqueue: Split out workqueue_types.h Date: Fri, 15 Dec 2023 22:29:36 -0500 Message-ID: <20231216032957.3553313-9-kent.overstreet@linux.dev> In-Reply-To: <20231216032957.3553313-1-kent.overstreet@linux.dev> References: <20231216024834.3510073-1-kent.overstreet@linux.dev> <20231216032957.3553313-1-kent.overstreet@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: C8D6A80016 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ohys8k4dfjxfhtspwez6hugghp64emn7 X-HE-Tag: 1702697422-101058 X-HE-Meta: U2FsdGVkX19V/lnr54sHPpufSSr5RNiBpnOinHNQcy1y2sxsUBajABGGyPoFbm/R9u/vV2ANmDHus4av4NH+MVl6Ppca4sdsbHS/ajcMybonE7zGXpPsgfgytIu7Gw6FyHfGLbw78gG2pifNmMql0+CME3ksQAwJXvJw1TkrAYsUkN3hoG+tmUKbRde+YT/jY0ft6Mor3LmZfZLqMMO06QXjoSyj45KnlpYv0VqsG9n7WIJ1DcQUL8ikBqr7kS2OVgBlld6doz+P3ZVrkUp+Gut+nb9ax+lxShRob19c1DwrR2uUoKg5PlITW0oojZJ5KgnJbQqJwkZB6Z6eXTbDh4GiBiEkgQsZYvKpD+3BkFxklBpBZOnhloxa2zxHzlmX47mULuxNPgBZT4kWq9+vnMcrkfPQVOamEBZIvE9c4eDtCI0EdcJeaUjy7LGHe0vRiBbKUzTtCDV7/vQjIk//juvGrVs2nv4iQd3HLr9JL5gVaJSMbup4+RnwDbX+3oHC9Y77+2aXxDEpHJQM+OtNOPeygLgef6QWnqSNToYY3qPm/A3Pv+JuD25O4QAnDGeRRf52hP6s+XYpEBBCPXg9M60Lpl+qOCy8IJzkqcNQ98dJ6xymEiBjGB0iH1beAtncx+whHTyTIE7948ZzuTbcp+82oKdWaToFH7cm6A/t1ybAQNvCsYMAnkhC2Nfm/GjVhHOcC+1nLfnxJZnUS31sDmcwRdmT7uXpnt0Z7kH9mpVyx5ltum+N87UxA7CtY4P3G5+0z68fEYmy5yOe2ATCLRmFd8do4RUvd2kFSY+DEziCEFBWx4U47OQFOU+oNhrumm95Zy2OO+k4u9f31J8pfICZRy24ck5vRcMowjscn7zcq+BLHnXQG0YdRM6RqrBqX7iLeDGQF7FVZCK+Gq0Ut2IVqxBnCvcRBTImea4h1I0w6obKbh2k7KEYz0yKAQb2DB+2/az/2LpjpqhGyXW /WeWomBz 1U/WC2E/UPbP5FsqHdv5EE0rtb6t9SRU3Fr8lkUbsBcGSVVOceD5Fx5PwrGemHUt1XkaNeK2dQnGAn+Q2udWJLxBiu7ooqzIbGxHuFYhtErSpNfeDdfB4WcU4QbbPsEUZCQl8BJQK9s52wjBbGTbqFZggUKGnyFwyHHaJJSu1wgYF+dzrvyfzwqxcOx4Y8H+fJzuxn7NKA3VtED8= 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: More sched.h dependency culling - this lets us kill a rhashtable-types.h dependency on workqueue.h. Signed-off-by: Kent Overstreet --- include/linux/dma-fence.h | 1 + include/linux/rhashtable-types.h | 2 +- include/linux/timekeeping.h | 1 + include/linux/workqueue.h | 16 +--------------- include/linux/workqueue_types.h | 25 +++++++++++++++++++++++++ 5 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 include/linux/workqueue_types.h diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index b3772edca2e6..e06bad467f55 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -21,6 +21,7 @@ #include #include #include +#include struct dma_fence; struct dma_fence_ops; diff --git a/include/linux/rhashtable-types.h b/include/linux/rhashtable-types.h index 57467cbf4c5b..b6f3797277ff 100644 --- a/include/linux/rhashtable-types.h +++ b/include/linux/rhashtable-types.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include struct rhash_head { struct rhash_head __rcu *next; diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index fe1e467ba046..7c43e98cf211 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -4,6 +4,7 @@ #include #include +#include /* Included from linux/ktime.h */ diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 24b1e5070f4d..f1bb2e35301f 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -14,12 +14,7 @@ #include #include #include - -struct workqueue_struct; - -struct work_struct; -typedef void (*work_func_t)(struct work_struct *work); -void delayed_work_timer_fn(struct timer_list *t); +#include /* * The first word is the work queue pointer and the flags rolled into @@ -95,15 +90,6 @@ enum { #define WORK_STRUCT_FLAG_MASK ((1ul << WORK_STRUCT_FLAG_BITS) - 1) #define WORK_STRUCT_WQ_DATA_MASK (~WORK_STRUCT_FLAG_MASK) -struct work_struct { - atomic_long_t data; - struct list_head entry; - work_func_t func; -#ifdef CONFIG_LOCKDEP - struct lockdep_map lockdep_map; -#endif -}; - #define WORK_DATA_INIT() ATOMIC_LONG_INIT((unsigned long)WORK_STRUCT_NO_POOL) #define WORK_DATA_STATIC_INIT() \ ATOMIC_LONG_INIT((unsigned long)(WORK_STRUCT_NO_POOL | WORK_STRUCT_STATIC)) diff --git a/include/linux/workqueue_types.h b/include/linux/workqueue_types.h new file mode 100644 index 000000000000..4c38824f3ab4 --- /dev/null +++ b/include/linux/workqueue_types.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_WORKQUEUE_TYPES_H +#define _LINUX_WORKQUEUE_TYPES_H + +#include +#include +#include +#include + +struct workqueue_struct; + +struct work_struct; +typedef void (*work_func_t)(struct work_struct *work); +void delayed_work_timer_fn(struct timer_list *t); + +struct work_struct { + atomic_long_t data; + struct list_head entry; + work_func_t func; +#ifdef CONFIG_LOCKDEP + struct lockdep_map lockdep_map; +#endif +}; + +#endif /* _LINUX_WORKQUEUE_TYPES_H */