c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-31 12:24:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: remove HAVE_PERCPU_COUNTER_INIT_WITH_GFP

Browse Source 
Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16479
This commit is contained in:
Rob Norris 2024-08-03 14:01:15 +10:00 committed by Tony Hutter
parent b2802da49e
commit 339b126bac
7 changed files with 1 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config/kernel-percpu.m4
View File

@ -1,30 +1,3 @@
dnl #
dnl # 3.18 API change,
dnl # The function percpu_counter_init now must be passed a GFP mask.
dnl #
AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_INIT], [
ZFS_LINUX_TEST_SRC([percpu_counter_init_with_gfp], [
#include <linux/gfp.h>
#include <linux/percpu_counter.h>
],[
struct percpu_counter counter;
int error;
error = percpu_counter_init(&counter, 0, GFP_KERNEL);
])
])
AC_DEFUN([ZFS_AC_KERNEL_PERCPU_COUNTER_INIT], [
AC_MSG_CHECKING([whether percpu_counter_init() wants gfp_t])
ZFS_LINUX_TEST_RESULT([percpu_counter_init_with_gfp], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PERCPU_COUNTER_INIT_WITH_GFP, 1,
[percpu_counter_init() wants gfp_t])
],[
AC_MSG_RESULT(no)
])
])
dnl # dnl #
dnl # 4.13 API change, dnl # 4.13 API change,
dnl # __percpu_counter_add() was renamed to percpu_counter_add_batch(). dnl # __percpu_counter_add() was renamed to percpu_counter_add_batch().
@ -75,13 +48,11 @@ AC_DEFUN([ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA], [
]) ])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU], [ AC_DEFUN([ZFS_AC_KERNEL_SRC_PERCPU], [
ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_INIT
ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_ADD_BATCH ZFS_AC_KERNEL_SRC_PERCPU_COUNTER_ADD_BATCH
ZFS_AC_KERNEL_SRC_PERCPU_REF_COUNT_IN_DATA ZFS_AC_KERNEL_SRC_PERCPU_REF_COUNT_IN_DATA
]) ])
AC_DEFUN([ZFS_AC_KERNEL_PERCPU], [ AC_DEFUN([ZFS_AC_KERNEL_PERCPU], [
ZFS_AC_KERNEL_PERCPU_COUNTER_INIT
ZFS_AC_KERNEL_PERCPU_COUNTER_ADD_BATCH ZFS_AC_KERNEL_PERCPU_COUNTER_ADD_BATCH
ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA ZFS_AC_KERNEL_PERCPU_REF_COUNT_IN_DATA
]) ])

1
include/os/linux/Makefile.am
View File

@ -8,7 +8,6 @@ kernel_linux_HEADERS = \
%D%/kernel/linux/mm_compat.h \ %D%/kernel/linux/mm_compat.h \
%D%/kernel/linux/mod_compat.h \ %D%/kernel/linux/mod_compat.h \
%D%/kernel/linux/page_compat.h \ %D%/kernel/linux/page_compat.h \
%D%/kernel/linux/percpu_compat.h \
%D%/kernel/linux/simd.h \ %D%/kernel/linux/simd.h \
%D%/kernel/linux/simd_aarch64.h \ %D%/kernel/linux/simd_aarch64.h \
%D%/kernel/linux/simd_arm.h \ %D%/kernel/linux/simd_arm.h \

44
include/os/linux/kernel/linux/percpu_compat.h
View File

@ -1,44 +0,0 @@
/*
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
* Common Development and Distribution License (the "License").
* You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or https://opensource.org/licenses/CDDL-1.0.
* See the License for the specific language governing permissions
* and limitations under the License.
*
* When distributing Covered Code, include this CDDL HEADER in each
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
* If applicable, add the following below this CDDL HEADER, with the
* fields enclosed by brackets "[]" replaced with your own identifying
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*/
/*
* Copyright (c) 2020 by Delphix. All rights reserved.
*/
#ifndef _ZFS_PERCPU_H
#define _ZFS_PERCPU_H
#include <linux/percpu_counter.h>
/*
* 3.18 API change,
* percpu_counter_init() now must be passed a gfp mask which will be
* used for the dynamic allocation of the actual counter.
*/
#ifdef HAVE_PERCPU_COUNTER_INIT_WITH_GFP
#define percpu_counter_init_common(counter, n, gfp) \
percpu_counter_init(counter, n, gfp)
#else
#define percpu_counter_init_common(counter, n, gfp) \
percpu_counter_init(counter, n)
#endif
#endif /* _ZFS_PERCPU_H */

5
include/os/linux/spl/sys/wmsum.h
View File

@ -36,12 +36,7 @@ typedef struct percpu_counter wmsum_t;
static inline void static inline void
wmsum_init(wmsum_t *ws, uint64_t value) wmsum_init(wmsum_t *ws, uint64_t value)
{ {
#ifdef HAVE_PERCPU_COUNTER_INIT_WITH_GFP
percpu_counter_init(ws, value, GFP_KERNEL); percpu_counter_init(ws, value, GFP_KERNEL);
#else
percpu_counter_init(ws, value);
#endif
} }
static inline void static inline void

4
module/os/linux/spl/spl-kmem-cache.c
View File

@ -23,7 +23,6 @@
#define SPL_KMEM_CACHE_IMPLEMENTING #define SPL_KMEM_CACHE_IMPLEMENTING
#include <linux/percpu_compat.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <sys/kmem_cache.h> #include <sys/kmem_cache.h>
#include <sys/taskq.h> #include <sys/taskq.h>
@ -728,8 +727,7 @@ spl_kmem_cache_create(const char *name, size_t size, size_t align,
skc->skc_obj_emergency = 0; skc->skc_obj_emergency = 0;
skc->skc_obj_emergency_max = 0; skc->skc_obj_emergency_max = 0;
rc = percpu_counter_init_common(&skc->skc_linux_alloc, 0, rc = percpu_counter_init(&skc->skc_linux_alloc, 0, GFP_KERNEL);
GFP_KERNEL);
if (rc != 0) { if (rc != 0) {
kfree(skc); kfree(skc);
return (NULL); return (NULL);

1
module/os/linux/spl/spl-vmem.c
View File

@ -21,7 +21,6 @@
* with the SPL. If not, see <http://www.gnu.org/licenses/>. * with the SPL. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <linux/percpu_compat.h>
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/vmem.h> #include <sys/vmem.h>
#include <sys/kmem_cache.h> #include <sys/kmem_cache.h>

1
module/os/linux/spl/spl-zlib.c
View File

@ -53,7 +53,6 @@
*/ */
#include <linux/percpu_compat.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <sys/kmem_cache.h> #include <sys/kmem_cache.h>
#include <sys/zmod.h> #include <sys/zmod.h>