From patchwork Sun Feb 11 23:15:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2143416dyd; Sun, 11 Feb 2024 15:22:16 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVRXst/lTKNbYttwVT+vQZIqvN83OyVm8aaYpQGrTAKRbCo2WmTTqIUKpfBNxQSTSXnuUT/udVPKj8WmR6JZQTJ9AufpQ== X-Google-Smtp-Source: AGHT+IE/u2NgKCNJ9bmGTcp/hLRTTJ6Jw1/KEs8Swn9zItGFTCq0OdXxIImcb+7j4QIiyViZEEad X-Received: by 2002:a05:6a21:1508:b0:19e:ba42:4edf with SMTP id nq8-20020a056a21150800b0019eba424edfmr8236377pzb.7.1707693736642; Sun, 11 Feb 2024 15:22:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707693736; cv=pass; d=google.com; s=arc-20160816; b=nWoF8scc/RExjEJx5vD67mpAmLXD9bB0v/AYMRraU1mT7T+Vft3kcKl82W4m/3EpZI qg6Oz+MhoH+URIdJ8sPU2erflGVzPt3lfl5rBRPVEu9FJ0oHd/7hpaPppRSfjQOWw5ZS pt8HvlaASXnSs4aNFDUZwe6nPQSddr3CLDkBzPTOhkrbLJS5sz2Ab1m0Abck7MwEbB6h YDdg7AjfUBgPLvtVXqqsKSESNeitHWUPcfNkPkBImcCNjdhMeuK51Isj3f1IJLIsbwd0 gXI7k7Qdi6G4JTcZ3lbCmaUh9aHEhjK+w9x6xWUeuwS9WDrPV7P0PPtmNV4pAMs10E3w QV5A== ARC-Message-Signature: i=2; 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=1wz2gqR1nPObBws/2+IzSMmJxUoIVsWcR8/Agl6zU7c=; fh=SckhnVwFK25UfGZbJKimPTeaG9SejUd9/l7a57W+IHE=; b=FetTrvlJEjN70pPgUE9u7htEq/Mw4FjO0XZ8wCvyRVrwDNIkjRhINP5bhifDRlEE+F F88c7DEE+EWzuxO34h36EMMH0M/sBb27ZEVHdKoN1XPEh/qXzMlCjzMuRRWomcl+I09h l+r8c3mrpqYnKgkc3672wl20Ksb4HsxKulgUDCgBk0lhkdQ5Bhw9nQrReXVc7o5gUUex KN7f4ixLP42T8WYoyKyEJMycquDgjDLYjzqUwr+38Bc7Qv6sLv1n4fOPeUHbxAOOMcPU XF11uH4Flanreqdw8dw6qxoC9wpT/qLcn9icrJUfVbG5xomkjpH9NRIkqSFz7P4444mW C0QQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=TVYQICHi; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-61004-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61004-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCUeefnTrmXgqfWD0fHn3ececZ7jv+gCHqI+GUJgr0x5OqaUnxQFAVPiWre1umG/YPtwOvaop9dHqq0Co/ewmfe1AxAfhQ== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w66-20020a636245000000b00589fcc39ef1si5367664pgb.365.2024.02.11.15.22.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:22:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-61004-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=TVYQICHi; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-61004-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61004-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 666CF28167E for ; Sun, 11 Feb 2024 23:22:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2F0BD179B7; Sun, 11 Feb 2024 23:16:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="TVYQICHi" Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8499A1EA73 for ; Sun, 11 Feb 2024 23:15:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693360; cv=none; b=iNQdi+dssn0tT9fT4XG/PN0+Z64wvnl9ki/HanYZxBEA5i4GGo/djJaq900XKIsneMIrXw0wNVo6R3g18/4Mp0R/zaX7G+Wl8Mwtlyn/c1435D5ZCXdUXOq974SJol44batOUY767mO02aMRHgaR9TUk0kdykWFFGJbHSXu175E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693360; c=relaxed/simple; bh=vnpHwrQqTGh83jGF/mOVjN3+jGO3XbGrHiR+lyiDEhI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mlZTAbwMRYQAve+LMjlLRYvBiYD+DTK6nSvHi0nhGFHzTKTGxpPK9jZu8Cqz7+IAjNvN3QjIoiTE/ohDJhjlZULcY2aXabxv+92kPD7JodV5QNJxOimyN6/Lw3BiqR0PJyMpQL6sQdBF44xdrJ/RYBOLqczfm0UWQAHWKHqtHHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=TVYQICHi; arc=none smtp.client-ip=209.85.208.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2d094bc2244so32571281fa.1 for ; Sun, 11 Feb 2024 15:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707693354; x=1708298154; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1wz2gqR1nPObBws/2+IzSMmJxUoIVsWcR8/Agl6zU7c=; b=TVYQICHize5gfJvxkwAVqf0T9BYSxjboJI0WG5WeamEqE73YWKYm4Bq4XOh2Qvzw0S 84cjop6KtdeH9c32CtprI4423exWOpa79jgtCU2WxAIwOkhDLdSIYgPiKgC0ZguMfxJL BPNXMZkzJPWt7Cu4u6uIPsoIkYZr0NfReX4p09XbBfPuWfYpJnA97re1jVYStkOhoUHr ul9OO54UYaO4WWPPdeypa5ht/heAQPNsXDAo+WQUP8IEBPLUAOJ6egFCyJyGoOhOoU75 9MKle/YF2x8Ogz8Q6/FBEubu6YCi3t4t7b6Q4BWwW4Cj4seoNPf4IRzKKLiTtnXdA0bm TkJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707693354; x=1708298154; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1wz2gqR1nPObBws/2+IzSMmJxUoIVsWcR8/Agl6zU7c=; b=Y/8qY/Zb0X3aNiJV5WwH7dFQyYu24W++HP6VdUNT/aKIbfgNN5M1cZcMmPjrkvZOmD gBqVM4A09qFaVlwq3n6YmW9Hr33QdhsqxrmoKNO33z1AvQkoZDtwEuZc3OpC2T3PhLT5 8+kIizPbYwMLRl+e6vOqyyl7xzsJf+4JDqe4aMSVBfvRQaXYAjE6IkZlllFpSW3GaBqo L65L3NPvlDF5vsJqOO4tzqzEfGihttQjpeO2S76j0ZHP6HHOYFfrKmAJx0XLMAbkF2p6 +eDfAZb8MfYGsxyiYq4UwKzkehySIY3LChy9i/hvkYL/3CfNyy+zmDbL4/jZDjz3eUeg loBA== X-Gm-Message-State: AOJu0Yz1cgT7FrthPrs+pHgQXVNZkUzoou/zhifHPcX/atZdMuH78+u4 EN3ho33VzdWULbkydY9uOXLv9vZViuCmn+CmGwJsnDduowZY/3Ck5fltWp5UlUMjDuwoyLOC6U1 C X-Received: by 2002:a2e:a4ae:0:b0:2d0:e35a:3ba3 with SMTP id g14-20020a2ea4ae000000b002d0e35a3ba3mr2900653ljm.49.1707693354417; Sun, 11 Feb 2024 15:15:54 -0800 (PST) Received: from raven.blarg.de (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id et13-20020a056402378d00b0055d19c9daf2sm2170180edb.15.2024.02.11.15.15.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:15:54 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v4 23/35] sbitmap.h: move declarations to sbitmap_types.h Date: Mon, 12 Feb 2024 00:15:06 +0100 Message-Id: <20240211231518.349442-24-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240211231518.349442-1-max.kellermann@ionos.com> References: <20240211231518.349442-1-max.kellermann@ionos.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790646667488565347 X-GMAIL-MSGID: 1790646667488565347 By providing declarations in a lean header, we can reduce header dependencies. Signed-off-by: Max Kellermann --- block/blk-mq.h | 1 + include/linux/blk-mq.h | 2 +- include/linux/sbitmap.h | 124 +------------------------------- include/linux/sbitmap_types.h | 129 ++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 124 deletions(-) create mode 100644 include/linux/sbitmap_types.h diff --git a/block/blk-mq.h b/block/blk-mq.h index f75a9ecfebde..cc8e690171db 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -3,6 +3,7 @@ #define INT_BLK_MQ_H #include +#include #include "blk-stat.h" struct blk_mq_tag_set; diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index ed3760b04baa..201ee354a3d5 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h index f7279f7632fe..c43d1c0eafbb 100644 --- a/include/linux/sbitmap.h +++ b/include/linux/sbitmap.h @@ -9,142 +9,20 @@ #ifndef __LINUX_SCALE_BITMAP_H #define __LINUX_SCALE_BITMAP_H +#include #include #include -#include #include #include #include #include #include -#include -#include struct seq_file; -/** - * struct sbitmap_word - Word in a &struct sbitmap. - */ -struct sbitmap_word { - /** - * @word: word holding free bits - */ - unsigned long word; - - /** - * @cleared: word holding cleared bits - */ - unsigned long cleared ____cacheline_aligned_in_smp; -} ____cacheline_aligned_in_smp; - -/** - * struct sbitmap - Scalable bitmap. - * - * A &struct sbitmap is spread over multiple cachelines to avoid ping-pong. This - * trades off higher memory usage for better scalability. - */ -struct sbitmap { - /** - * @depth: Number of bits used in the whole bitmap. - */ - unsigned int depth; - - /** - * @shift: log2(number of bits used per word) - */ - unsigned int shift; - - /** - * @map_nr: Number of words (cachelines) being used for the bitmap. - */ - unsigned int map_nr; - - /** - * @round_robin: Allocate bits in strict round-robin order. - */ - bool round_robin; - - /** - * @map: Allocated bitmap. - */ - struct sbitmap_word *map; - - /* - * @alloc_hint: Cache of last successfully allocated or freed bit. - * - * This is per-cpu, which allows multiple users to stick to different - * cachelines until the map is exhausted. - */ - unsigned int __percpu *alloc_hint; -}; - #define SBQ_WAIT_QUEUES 8 #define SBQ_WAKE_BATCH 8 -/** - * struct sbq_wait_state - Wait queue in a &struct sbitmap_queue. - */ -struct sbq_wait_state { - /** - * @wait: Wait queue. - */ - wait_queue_head_t wait; -} ____cacheline_aligned_in_smp; - -/** - * struct sbitmap_queue - Scalable bitmap with the added ability to wait on free - * bits. - * - * A &struct sbitmap_queue uses multiple wait queues and rolling wakeups to - * avoid contention on the wait queue spinlock. This ensures that we don't hit a - * scalability wall when we run out of free bits and have to start putting tasks - * to sleep. - */ -struct sbitmap_queue { - /** - * @sb: Scalable bitmap. - */ - struct sbitmap sb; - - /** - * @wake_batch: Number of bits which must be freed before we wake up any - * waiters. - */ - unsigned int wake_batch; - - /** - * @wake_index: Next wait queue in @ws to wake up. - */ - atomic_t wake_index; - - /** - * @ws: Wait queues. - */ - struct sbq_wait_state *ws; - - /* - * @ws_active: count of currently active ws waitqueues - */ - atomic_t ws_active; - - /** - * @min_shallow_depth: The minimum shallow depth which may be passed to - * sbitmap_queue_get_shallow() - */ - unsigned int min_shallow_depth; - - /** - * @completion_cnt: Number of bits cleared passed to the - * wakeup function. - */ - atomic_t completion_cnt; - - /** - * @wakeup_cnt: Number of thread wake ups issued. - */ - atomic_t wakeup_cnt; -}; - /** * sbitmap_init_node() - Initialize a &struct sbitmap on a specific memory node. * @sb: Bitmap to initialize. diff --git a/include/linux/sbitmap_types.h b/include/linux/sbitmap_types.h new file mode 100644 index 000000000000..078c7859905c --- /dev/null +++ b/include/linux/sbitmap_types.h @@ -0,0 +1,129 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __LINUX_SCALE_BITMAP_TYPES_H +#define __LINUX_SCALE_BITMAP_TYPES_H + +#include +#include +#include + +/** + * struct sbitmap_word - Word in a &struct sbitmap. + */ +struct sbitmap_word { + /** + * @word: word holding free bits + */ + unsigned long word; + + /** + * @cleared: word holding cleared bits + */ + unsigned long cleared ____cacheline_aligned_in_smp; +} ____cacheline_aligned_in_smp; + +/** + * struct sbitmap - Scalable bitmap. + * + * A &struct sbitmap is spread over multiple cachelines to avoid ping-pong. This + * trades off higher memory usage for better scalability. + */ +struct sbitmap { + /** + * @depth: Number of bits used in the whole bitmap. + */ + unsigned int depth; + + /** + * @shift: log2(number of bits used per word) + */ + unsigned int shift; + + /** + * @map_nr: Number of words (cachelines) being used for the bitmap. + */ + unsigned int map_nr; + + /** + * @round_robin: Allocate bits in strict round-robin order. + */ + bool round_robin; + + /** + * @map: Allocated bitmap. + */ + struct sbitmap_word *map; + + /* + * @alloc_hint: Cache of last successfully allocated or freed bit. + * + * This is per-cpu, which allows multiple users to stick to different + * cachelines until the map is exhausted. + */ + unsigned int __percpu *alloc_hint; +}; + +/** + * struct sbq_wait_state - Wait queue in a &struct sbitmap_queue. + */ +struct sbq_wait_state { + /** + * @wait: Wait queue. + */ + wait_queue_head_t wait; +} ____cacheline_aligned_in_smp; + +/** + * struct sbitmap_queue - Scalable bitmap with the added ability to wait on free + * bits. + * + * A &struct sbitmap_queue uses multiple wait queues and rolling wakeups to + * avoid contention on the wait queue spinlock. This ensures that we don't hit a + * scalability wall when we run out of free bits and have to start putting tasks + * to sleep. + */ +struct sbitmap_queue { + /** + * @sb: Scalable bitmap. + */ + struct sbitmap sb; + + /** + * @wake_batch: Number of bits which must be freed before we wake up any + * waiters. + */ + unsigned int wake_batch; + + /** + * @wake_index: Next wait queue in @ws to wake up. + */ + atomic_t wake_index; + + /** + * @ws: Wait queues. + */ + struct sbq_wait_state *ws; + + /* + * @ws_active: count of currently active ws waitqueues + */ + atomic_t ws_active; + + /** + * @min_shallow_depth: The minimum shallow depth which may be passed to + * sbitmap_queue_get_shallow() + */ + unsigned int min_shallow_depth; + + /** + * @completion_cnt: Number of bits cleared passed to the + * wakeup function. + */ + atomic_t completion_cnt; + + /** + * @wakeup_cnt: Number of thread wake ups issued. + */ + atomic_t wakeup_cnt; +}; + +#endif /* __LINUX_SCALE_BITMAP_TYPES_H */