From patchwork Sun Feb 11 12:29:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1904896dyd; Sun, 11 Feb 2024 04:41:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IFddVfWv+r16bP/gT5oKl/T//qrdPOnvKXZi5RWTRoDR1h/FzTqIh6KBEsOSUtI0WQ6YPXi X-Received: by 2002:a92:d686:0:b0:363:7e2a:4df8 with SMTP id p6-20020a92d686000000b003637e2a4df8mr4589024iln.32.1707655269484; Sun, 11 Feb 2024 04:41:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707655269; cv=pass; d=google.com; s=arc-20160816; b=C9+5l2Ga6jAnKlFDmknx7h3qGx+bDBN/GYDucT40N/bHRtXlvVYaD575WhOtZYLShp P2RYCdp3uWa9qGBlHo4WTCgOGFlkrMz/IVIdFLVNfAEsYHb8V9HX/+NnS0pvDbF72rQb 1y8GrnjDXAyVoqLx7sMpkH5G6z2YgyolWwduvLz57+rPsog10xiH6QYazRU5VjoUI6tj ueT7KWndJubfBeoy8rsFA/SkOvHTZy87fxNJvcFuuFrRTiakItmER0OX6ntj3bag07IT RVU6tn8MRJ/h5tsFaMyPPwtoCx/FAMNlkBROGYlDBZg+w6+onVljiOM6rYclXxFmqPMz 4q6w== 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=fzcO+dUmS5gW968vy2pEzN72ujVJ1jvRhEBoy2TD4PQ=; b=lH5up9N2pphyNanmsc3aid35EVIj7fAnUx3QWLMcAXFa6XKKnv+Uqnl6ne9fEwtLes qG5nfTwsD/jxHGFtW2NIh0yP4ChH752NmTCxr2doKs3aWBSE0OfAieLTqNT9tCe5Jb/n ILhdmiYF5RY0eVo+m23FByuzm+1gNlNEmQhDlz00PaOQkHP/nqDoYi/w4CgC1lxpwbaP 8jYsaeu6X/YSJWNFFbfSxBnLRQSkXitmMfBESXTe5DvNvYDoOMErXxlEak7eK+afvslv Q3UcGCZnTPWXq8sQtPsYSwwGc3igM/RWfM9rlWFguzznKdT6V/td1iretsaWn0a0IFSB C95w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=O3jWqn6T; 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-60751-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60751-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCUDZZozpD2f4oim64Rd+2rolPDMi5bKVgkso2OurVr/wzLdhVnPBxEeuoAd3++JWYNYkWLMCyjdc7IeO8Dl1jG+GfegKg== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id e1-20020a656881000000b005d8c175f17fsi4796004pgt.405.2024.02.11.04.41.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 04:41:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60751-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=O3jWqn6T; 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-60751-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60751-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 55A0AB24625 for ; Sun, 11 Feb 2024 12:37:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E19C660891; Sun, 11 Feb 2024 12:30:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="O3jWqn6T" 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 BDB5D5EE62 for ; Sun, 11 Feb 2024 12:30:39 +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=1707654643; cv=none; b=MbzhuS4iCrPXAZlbMCYpwm6U/I3ikocQaybuKvzq0APLEa+mXZPFvLhAaGOk79cfNpmXg78u+KCB9o2L82ijYSZE3MJvaR8gTgsp8i5VU+L9GG9ibnLs7F2U7ma9tk0vQLbIvAFm22Z9IY/JIkAp58FHo2tTinEjcf5Znqz9bIY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707654643; c=relaxed/simple; bh=vnpHwrQqTGh83jGF/mOVjN3+jGO3XbGrHiR+lyiDEhI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h7Pl52OdDSBxvw+PUS+DFi3iF/2m6i9a2xlCQk9+uyaChP0PK1T5c/wCalwYgs1/WLjNdvwrKikQMoWwEHrdQYUW/JAO9UcPOpGDMQjiz8BYJiGzTn0f2PHkYQZBeP12R5E4b8DFnzirxRqhT3X0TAJS/pe8g3BgBZwX2ryJ4mo= 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=O3jWqn6T; 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-2d0e2adfeefso18218851fa.2 for ; Sun, 11 Feb 2024 04:30:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707654637; x=1708259437; 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=O3jWqn6TBhdn58vJ6+ZghSCVF9ibZf591mH/oMdH57WRG0oKMVgyVz1yr9iMtmSbkb 58AxokZQXoZvKjJ9bWQwLCMxG/7krfdu4JJ3AyLMTo/ghvHxRmKEp/ckmTjp06M0bpIl bpFh02Vfv/dtXxSzRzQt5WjU9kkWRZOJHeFOT4oHrHATmmKIzikHlnlVBWdSPECTPObH NB/9hTAodY4DYfFWN+rdfDpZ6rog72ptLwWq3SXMJSArtfrwt/C4jTG/c2o6WuXsy6tB 57eEqQyhZaJWaSME6I+LL4nXdw1HhfrGrYGr5dBIOly9ybKMu0H/NKViv5cRPqacJsKV i1eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707654637; x=1708259437; 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=VmIcIjEsleyNC+td/ci98InNaJzMW9d3AD3c0nmOBiE4bLF9RVcDRZdC/TPo03B4R2 COtVVmaX/miV/3Ss3r/4DT59/4K/v8QFD7di8Ymz+InbDurjlLP2fZos89bxAUfW1ZyT o4rGKoyxKqgQHIc9x1XvM5ltFg4gxFKOV86wI3tiWcfSQJHVgVMDI63nDd5RRSyMHVUo MHqPzS9F8nImywa0dRQhzoNyMzH2K0c4qBAbHc1n+tJQhROKVo7QKiwdDY6T4IOpuwar BKL2phcxTAqlbge8GjFMxrWBmBHAcqTYAnTTAmiK6o60o5esaLyfrKYvK7oB+04ILHQ6 jpCg== X-Gm-Message-State: AOJu0YwbbkStSR5zGxCwljM40Yfv+tcaxi7uRWdgugQeAzqXbyl1qeZQ 8gYOXtlKqyaif4Qh6FBymzU+YkPr5N6RM9+ZtSMTtKhjUOueNDsAGmbfGyPvJ0dsYWb08ZdLSGB Y X-Received: by 2002:a2e:8755:0:b0:2d0:a6ef:651d with SMTP id q21-20020a2e8755000000b002d0a6ef651dmr2389120ljj.47.1707654636837; Sun, 11 Feb 2024 04:30:36 -0800 (PST) Received: from raven.intern.cm-ag (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id fj18-20020a0564022b9200b0056187ca4120sm1024611edb.10.2024.02.11.04.30.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 04:30:36 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v3 23/35] sbitmap.h: move declarations to sbitmap_types.h Date: Sun, 11 Feb 2024 13:29:48 +0100 Message-Id: <20240211123000.3359365-24-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240211123000.3359365-1-max.kellermann@ionos.com> References: <20240211123000.3359365-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: 1790606331983491963 X-GMAIL-MSGID: 1790606331983491963 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 */