From patchwork Sun Feb 11 23:15:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199539 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2143261dyd; Sun, 11 Feb 2024 15:21:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IH8NBKq97RwbLVIFHZuJKPd5EG9m2GiTYYCiUaBi+Xb7i+3CBZT7sQc8hyiKOlPmnTmxjQ+ X-Received: by 2002:a05:6a20:d48f:b0:19c:aba2:69e5 with SMTP id im15-20020a056a20d48f00b0019caba269e5mr8597183pzb.45.1707693699778; Sun, 11 Feb 2024 15:21:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707693699; cv=pass; d=google.com; s=arc-20160816; b=WeZrcyO65xA72hitd0J9nFGgcxkvE+gaz6/kbMbBndddvthOZeH/iik//grBvg2opO chSx3uKyQEFsk7BFuEM7qT+jxYh4VmTrUgWU81GcNYzxfJ9g1rU8a1dzYeV1nFP+pbrL iTHCp09toCu0XJESeHCOn4W/rrKUoNH4VswAXK2EFPO6lMw11bGgO9A1GCvS3sq+QIz7 jzqAlmtTeC/5otkVCqXZ0nWeN3Cgwu/t/3d3opVeYl2sLc3qsFtWNAGlSPntrQVucfJS 4WYfp7m2NtfcMV2DYXJZ/nJkusCOyQ86xC0SkelUflxWIhgSr6FhL80t9Cnp7TRtWbbL IZNQ== 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=g2+Iouf2UVGvs4mCNtCFcBfpV0dyvUFr5y+VeLzPrck=; fh=xuC5OpQbqDnzcVoYsLpW496K7+m78gS8MI07CI8NK6M=; b=ZlY3brXGzQcO7n+Sh8iuJn0/B9Wublg/1i6/fwl6p6fwWe7lmb+B/7QQAfpWOWUJxw ajuDoLrSS7AusL8Kpk6b/iDu72EctEzxycdiuAbOR32XcccWHWlUBklasn9pfoFjhCvL 84JApfP8Mg1+wYtyHoaucp2hg6JVIxHSCFHGEsRubBnWhowqCGUQGe0t3B4pcESEocDb 0TKBnhSPMvluXm5i7jxvNsDa4BoNatJT3OiYAbRR9YlbnM7nU/nXmPOoZDlPe7oAZ6he yBsvoyAdOSF4Ydxn2I2w1sOvCQPmWfm6OmA7SyUEVRKRbZf3PYdf8CIlKYeupI2XjoiQ 4qbA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=C4EMfS6i; 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-61003-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61003-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCUdVpF3c3TJpFgMB+NCNvSiNxMcw08JseWCFIgktGU86SK7WksPxYQfD4esOo2x9tyFEfr5oxuRRcZFmX2g2lSGG6YpZQ== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id h191-20020a6383c8000000b005d7afbb31b3si5219452pge.352.2024.02.11.15.21.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:21:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-61003-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=C4EMfS6i; 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-61003-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61003-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 83858280D01 for ; Sun, 11 Feb 2024 23:21:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E5C3171A5; Sun, 11 Feb 2024 23:16:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="C4EMfS6i" Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 DB5D41A29F for ; Sun, 11 Feb 2024 23:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693360; cv=none; b=Ag4GqDql+QtRKaUtWRI2DWUgoqKfe2Tl53sBc+0s008v5PtOQjD03a3/NK7YAe586N6NhXKgTSAFzRZMCjSZcM40/vqZFAbL1qPLD3sNQfC5KgdntICb+KqUfq9aoYp7dNs8AM9UJuPFHZUoQgcEpbqA6l84xP8ILm+E43f7XDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693360; c=relaxed/simple; bh=Bin3DNZnSCUMXH5aICZHgBTErX76nCGHVd62Jfb1blU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fEltpHDkVMzaDQVdlkCCipCh/VIm6gN8dlfLbFNOZVuJaPSriIXHsS8+ux21/qCQ8liOYPVLI9KIdIQ4vfNWgBSDNJWlFlRvenryMnDauy9RBbHrLz1zh3zQhMr5GzOKPJqLeJD/iRVvGeadWI+L2gipTgegEqNRl+QltGtr9Bk= 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=C4EMfS6i; arc=none smtp.client-ip=209.85.208.48 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-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-55f50cf2021so3414748a12.1 for ; Sun, 11 Feb 2024 15:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707693353; x=1708298153; 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=g2+Iouf2UVGvs4mCNtCFcBfpV0dyvUFr5y+VeLzPrck=; b=C4EMfS6i8QUhIfY1TVBOHSRe8hiztVtkFODNN2QRDLaZk1Fqf0cbMBK0MOo+CP7lcO BclQ3V/MCuN6xzFyjtG+wAe2jfIAGrmggKKYx+oLNT56yJT46V0xMpk5ZbDLIcyT+XN7 OiYc8AOEUzduG7W4wCQm9XG2LYuYCxswb+XUGTyAwmC35I1EaGAi/gc0aZjEXlCNP30P +rpmFKADdTpDUN5m3K4v/PVz3Ty4Wf9vi3zGPLei6oRl2VhQmpj+EKGEtZpE66yG7/wJ 6oM6hqcFh7Z5PvhbIT8EfQX1DPn6wZFS8gI8lELA2SgQKosWZZHzPhv1Py4krQ2KW1TR 8U1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707693353; x=1708298153; 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=g2+Iouf2UVGvs4mCNtCFcBfpV0dyvUFr5y+VeLzPrck=; b=LLAoI3IN+oM4UUNYYJelRIha5rFyux3XynaQJ03mDJzulVwt4gGBJ0LNwFLx/f6qI8 9ljB0Rt66HVNkcrQszp7/5R9r8G/dRqzeI5IER0Nh2Gj2BqqkttcNMsGnrdyAYE0YOMM WZNR5Tx69WLzLifhmzqbnKB1lqioEeCvsouxu8e3+1SAfUMaQDps3J5af3V1LRZDBfmi Sps8Ty9KZYgCH8umbKTYhQ8WNnjrimvFIJPEKvg0oFqI/Ph4rvrtrSbtsmSxAVxTugRA gf3hTc/kebQ+1bR60D9AILP7Az0ZZrQfjE3PxtEGau5wOFiDqzbcdhkPkfJ8wrG3mwga ECfA== X-Gm-Message-State: AOJu0Yx2e3Cfz1jH5lmhUWueLsHDT09tvs/5H3mbGlqdvv9GZCO5zRv/ tEnIp+hmDo8AsxexWaCYS8pSni2y1pVK+dGj2YNh/oKM7UJ3wRwuovMdhy+bUAeqZytu3k9iJWn b X-Received: by 2002:a50:ee16:0:b0:560:c0da:43be with SMTP id g22-20020a50ee16000000b00560c0da43bemr2976241eds.11.1707693352995; Sun, 11 Feb 2024 15:15:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:15:51 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v4 21/35] percpu-refcount.h: move declarations to percpu-refcount_types.h Date: Mon, 12 Feb 2024 00:15:04 +0100 Message-Id: <20240211231518.349442-22-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: 1790646628758397085 X-GMAIL-MSGID: 1790646628758397085 By providing declarations in a lean header, we can reduce header dependencies. Signed-off-by: Max Kellermann --- drivers/target/target_core_pr.c | 1 + drivers/target/target_core_xcopy.c | 1 + include/linux/blkdev.h | 2 +- include/linux/bpf-cgroup-defs.h | 2 +- include/linux/bpf.h | 2 +- include/linux/cgroup-defs.h | 2 +- include/linux/cgroup.h | 1 + include/linux/percpu-refcount.h | 64 +----------------------- include/linux/percpu-refcount_types.h | 71 +++++++++++++++++++++++++++ include/linux/slab.h | 1 - include/target/target_core_base.h | 2 +- 11 files changed, 80 insertions(+), 69 deletions(-) create mode 100644 include/linux/percpu-refcount_types.h diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 6ed604a164f8..0ee29c16a161 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c index df06ec0f75fe..37d306570f8a 100644 --- a/drivers/target/target_core_xcopy.c +++ b/drivers/target/target_core_xcopy.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 6747965c3580..5cd0edada09d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include // for iov_iter_is_aligned() diff --git a/include/linux/bpf-cgroup-defs.h b/include/linux/bpf-cgroup-defs.h index f3b400858129..70b79fd81fee 100644 --- a/include/linux/bpf-cgroup-defs.h +++ b/include/linux/bpf-cgroup-defs.h @@ -5,7 +5,7 @@ #ifdef CONFIG_CGROUP_BPF #include -#include +#include #include struct bpf_prog_array; diff --git a/include/linux/bpf.h b/include/linux/bpf.h index c5c435d04460..e28c74dd67ab 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 99e24f3034df..878deefba0e1 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 24dcff53bd05..19a5e801f77d 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h index dd2f19ea08bd..ded13def0acd 100644 --- a/include/linux/percpu-refcount.h +++ b/include/linux/percpu-refcount.h @@ -50,74 +50,12 @@ #ifndef _LINUX_PERCPU_REFCOUNT_H #define _LINUX_PERCPU_REFCOUNT_H -#include +#include #include #include #include #include -struct percpu_ref; -typedef void (percpu_ref_func_t)(struct percpu_ref *); - -/* flags set in the lower bits of percpu_ref->percpu_count_ptr */ -enum { - __PERCPU_REF_ATOMIC = 1LU << 0, /* operating in atomic mode */ - __PERCPU_REF_DEAD = 1LU << 1, /* (being) killed */ - __PERCPU_REF_ATOMIC_DEAD = __PERCPU_REF_ATOMIC | __PERCPU_REF_DEAD, - - __PERCPU_REF_FLAG_BITS = 2, -}; - -/* @flags for percpu_ref_init() */ -enum { - /* - * Start w/ ref == 1 in atomic mode. Can be switched to percpu - * operation using percpu_ref_switch_to_percpu(). If initialized - * with this flag, the ref will stay in atomic mode until - * percpu_ref_switch_to_percpu() is invoked on it. - * Implies ALLOW_REINIT. - */ - PERCPU_REF_INIT_ATOMIC = 1 << 0, - - /* - * Start dead w/ ref == 0 in atomic mode. Must be revived with - * percpu_ref_reinit() before used. Implies INIT_ATOMIC and - * ALLOW_REINIT. - */ - PERCPU_REF_INIT_DEAD = 1 << 1, - - /* - * Allow switching from atomic mode to percpu mode. - */ - PERCPU_REF_ALLOW_REINIT = 1 << 2, -}; - -struct percpu_ref_data { - atomic_long_t count; - percpu_ref_func_t *release; - percpu_ref_func_t *confirm_switch; - bool force_atomic:1; - bool allow_reinit:1; - struct rcu_head rcu; - struct percpu_ref *ref; -}; - -struct percpu_ref { - /* - * The low bit of the pointer indicates whether the ref is in percpu - * mode; if set, then get/put will manipulate the atomic_t. - */ - unsigned long percpu_count_ptr; - - /* - * 'percpu_ref' is often embedded into user structure, and only - * 'percpu_count_ptr' is required in fast path, move other fields - * into 'percpu_ref_data', so we can reduce memory footprint in - * fast path. - */ - struct percpu_ref_data *data; -}; - int __must_check percpu_ref_init(struct percpu_ref *ref, percpu_ref_func_t *release, unsigned int flags, gfp_t gfp); diff --git a/include/linux/percpu-refcount_types.h b/include/linux/percpu-refcount_types.h new file mode 100644 index 000000000000..9f4f93e8faaf --- /dev/null +++ b/include/linux/percpu-refcount_types.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_PERCPU_REFCOUNT_TYPES_H +#define _LINUX_PERCPU_REFCOUNT_TYPES_H + +#include +#include + +struct percpu_ref; +typedef void (percpu_ref_func_t)(struct percpu_ref *); + +/* flags set in the lower bits of percpu_ref->percpu_count_ptr */ +enum { + __PERCPU_REF_ATOMIC = 1LU << 0, /* operating in atomic mode */ + __PERCPU_REF_DEAD = 1LU << 1, /* (being) killed */ + __PERCPU_REF_ATOMIC_DEAD = __PERCPU_REF_ATOMIC | __PERCPU_REF_DEAD, + + __PERCPU_REF_FLAG_BITS = 2, +}; + +/* @flags for percpu_ref_init() */ +enum { + /* + * Start w/ ref == 1 in atomic mode. Can be switched to percpu + * operation using percpu_ref_switch_to_percpu(). If initialized + * with this flag, the ref will stay in atomic mode until + * percpu_ref_switch_to_percpu() is invoked on it. + * Implies ALLOW_REINIT. + */ + PERCPU_REF_INIT_ATOMIC = 1 << 0, + + /* + * Start dead w/ ref == 0 in atomic mode. Must be revived with + * percpu_ref_reinit() before used. Implies INIT_ATOMIC and + * ALLOW_REINIT. + */ + PERCPU_REF_INIT_DEAD = 1 << 1, + + /* + * Allow switching from atomic mode to percpu mode. + */ + PERCPU_REF_ALLOW_REINIT = 1 << 2, +}; + +struct percpu_ref_data { + atomic_long_t count; + percpu_ref_func_t *release; + percpu_ref_func_t *confirm_switch; + bool force_atomic:1; + bool allow_reinit:1; + struct rcu_head rcu; + struct percpu_ref *ref; +}; + +struct percpu_ref { + /* + * The low bit of the pointer indicates whether the ref is in percpu + * mode; if set, then get/put will manipulate the atomic_t. + */ + unsigned long percpu_count_ptr; + + /* + * 'percpu_ref' is often embedded into user structure, and only + * 'percpu_count_ptr' is required in fast path, move other fields + * into 'percpu_ref_data', so we can reduce memory footprint in + * fast path. + */ + struct percpu_ref_data *data; +}; + +#endif diff --git a/include/linux/slab.h b/include/linux/slab.h index a7ee429c0535..df92bb41affb 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 5b9156adceca..1598a4062398 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -5,7 +5,7 @@ #include /* struct config_group */ #include /* enum dma_data_direction */ #include -#include +#include #include /* struct semaphore */ #include