From nobody Wed Feb 19 20:48:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YypPh4Ffdz5nfrN; Wed, 19 Feb 2025 20:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YypPg2Yn6z3GNL; Wed, 19 Feb 2025 20:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739998087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/1F82RyqPyI8b9UfudcWupStyT7xAMR4K+FKZO/BSc=; b=gnEHtMz8eFVJ2VMjAUE70duq9EAk/Bd8+TklGJl8whJxWmIzFwUe5qrjGSJ9L/MPrf0oj3 Q+gU8Kme3MAh2KfDO+pCQrqaxhdJwyL+PyH4eANxfXMuGLNe4eUJOTkeHgX47knHyDvRUJ 8aoUOieCbMv+XDFmj5y1EseYUodmFBOU/M68fqXpXs8nqVvBUxhxjUNYGJShDtg2MPf5Cv f0DaMJhXLuSVgKViES7lGlm4yGOg2KcddggxbC3vLjhwrbcLqBnBYGKEQX7L23z1pMD8/k J0mkVnzdL3xs3O91Xk3WcYWemIV9vgZ32YCZubOuvKsRjxgZRax/B6eUpB5WKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739998087; a=rsa-sha256; cv=none; b=Pc5KDEvBriQExZhewy2uK3U+TdPCMq/ObUsZn80X4Q8nA05I0pkPp317twcMQVwco3ET75 VU5vmsYPgTmaS+eXle5bB7aod77pvJtxjXXJQq/ai/ZjXz6shEisDJ2BCJMQYMzy9DLy75 rpCa5tcVtFoett9eFDgcWV6gUZGzDxjr5EZcw4ir/gg2aXXewqflAryiqTkalCMHiATAZ8 wy689TfKxtRHFfYyJyieuivI336xe8hN1IkpI7ODZ5ZehtDw7wiFu5PSLPftS7mSGP1FrO wu4dDvXvdec57NK8tGszjbX3MO0zXZVJMu9ZqI4qCHkub/hMRH6WgVER64hIfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739998087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/1F82RyqPyI8b9UfudcWupStyT7xAMR4K+FKZO/BSc=; b=cyeFmatR+VSqmDP7ElcTYOKsDkWsK9/yqFDzYgJqtZT6rtL9w/KvHL6eaViVKPA2CkREI9 OTOR/4DGWhDDiuZkpW38csc9exyahBaK6+b2DTzFhswS0lzodpnytZ5GTFcusSBFedJDix UYefRXzYnNNm/y5Vun4AvSuEY2haQxzR2VnCxdhqfUh9/c0B7ZuklpbJP3Ng8kY+OaVVQR NP4GmReCPjnu1GiahPL2Ox/jyP8MOS0jxHomg6pxm83HX1Iii3bgr+QrlgePAyebhNe9ST 6xEiGjD20+IlhcF1jRolgFL6nJelyn2allwlPeel6CRMCMR7vhlVjCL57EpoBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YypPg21q5z69V; Wed, 19 Feb 2025 20:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51JKm7hI072127; Wed, 19 Feb 2025 20:48:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JKm7Ts072124; Wed, 19 Feb 2025 20:48:07 GMT (envelope-from git) Date: Wed, 19 Feb 2025 20:48:07 GMT Message-Id: <202502192048.51JKm7Ts072124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: 05dfaadde4ae - main - linuxkpi: Add `shrinker_alloc()` and `shrinker_free()` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05dfaadde4ae0f5d823836d5d849e3ba5ebdbf17 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=05dfaadde4ae0f5d823836d5d849e3ba5ebdbf17 commit 05dfaadde4ae0f5d823836d5d849e3ba5ebdbf17 Author: Jean-Sébastien Pédron AuthorDate: 2024-12-22 18:10:23 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-02-19 20:39:46 +0000 linuxkpi: Add `shrinker_alloc()` and `shrinker_free()` They are used by the DRM drivers in Linux 6.7. Bump `FreeBSD_version` because external drivers that use `struct shrinker` will have to be recompiled. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48747 --- .../linuxkpi/common/include/linux/shrinker.h | 16 +++++++++++++ sys/compat/linuxkpi/common/src/linux_shrinker.c | 28 ++++++++++++++++++++++ sys/sys/param.h | 2 +- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/shrinker.h b/sys/compat/linuxkpi/common/include/linux/shrinker.h index 88cbca2dcf60..eb95dafb83ce 100644 --- a/sys/compat/linuxkpi/common/include/linux/shrinker.h +++ b/sys/compat/linuxkpi/common/include/linux/shrinker.h @@ -27,6 +27,8 @@ #define _LINUXKPI_LINUX_SHRINKER_H_ #include + +#include #include struct shrink_control { @@ -39,6 +41,7 @@ struct shrinker { unsigned long (*count_objects)(struct shrinker *, struct shrink_control *); unsigned long (*scan_objects)(struct shrinker *, struct shrink_control *); int seeks; + unsigned int flags; void * private_data; long batch; TAILQ_ENTRY(shrinker) next; @@ -48,10 +51,23 @@ struct shrinker { #define DEFAULT_SEEKS 2 +#define SHRINKER_REGISTERED BIT(0) +#define SHRINKER_ALLOCATED BIT(1) + +struct shrinker *linuxkpi_shrinker_alloc( + unsigned int flags, const char *fmt, ...); int linuxkpi_register_shrinker(struct shrinker *s); void linuxkpi_unregister_shrinker(struct shrinker *s); +void linuxkpi_shrinker_free(struct shrinker *shrinker); void linuxkpi_synchronize_shrinkers(void); +#define shrinker_alloc(flags, fmt, ...) \ + linuxkpi_shrinker_alloc(flags, fmt __VA_OPT__(,) __VA_ARGS__) +#define shrinker_register(shrinker) \ + linuxkpi_register_shrinker(shrinker) +#define shrinker_free(shrinker) \ + linuxkpi_shrinker_free(shrinker) + #if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60000 #define register_shrinker(s, ...) linuxkpi_register_shrinker(s) #else diff --git a/sys/compat/linuxkpi/common/src/linux_shrinker.c b/sys/compat/linuxkpi/common/src/linux_shrinker.c index 52a0472348d8..18200fa0bc01 100644 --- a/sys/compat/linuxkpi/common/src/linux_shrinker.c +++ b/sys/compat/linuxkpi/common/src/linux_shrinker.c @@ -32,10 +32,26 @@ #include #include +#include TAILQ_HEAD(, shrinker) lkpi_shrinkers = TAILQ_HEAD_INITIALIZER(lkpi_shrinkers); static struct sx sx_shrinker; +struct shrinker * +linuxkpi_shrinker_alloc(unsigned int flags, const char *fmt, ...) +{ + struct shrinker *shrinker; + + shrinker = kzalloc(sizeof(*shrinker), GFP_KERNEL); + if (shrinker == NULL) + return (NULL); + + shrinker->flags = flags | SHRINKER_ALLOCATED; + shrinker->seeks = DEFAULT_SEEKS; + + return (shrinker); +} + int linuxkpi_register_shrinker(struct shrinker *s) { @@ -44,6 +60,7 @@ linuxkpi_register_shrinker(struct shrinker *s) KASSERT(s->count_objects != NULL, ("NULL shrinker")); KASSERT(s->scan_objects != NULL, ("NULL shrinker")); sx_xlock(&sx_shrinker); + s->flags |= SHRINKER_REGISTERED; TAILQ_INSERT_TAIL(&lkpi_shrinkers, s, next); sx_xunlock(&sx_shrinker); return (0); @@ -55,9 +72,20 @@ linuxkpi_unregister_shrinker(struct shrinker *s) sx_xlock(&sx_shrinker); TAILQ_REMOVE(&lkpi_shrinkers, s, next); + s->flags &= ~SHRINKER_REGISTERED; sx_xunlock(&sx_shrinker); } +void +linuxkpi_shrinker_free(struct shrinker *shrinker) +{ + + if (shrinker->flags & SHRINKER_REGISTERED) + unregister_shrinker(shrinker); + + kfree(shrinker); +} + void linuxkpi_synchronize_shrinkers(void) { diff --git a/sys/sys/param.h b/sys/sys/param.h index d3344c41562a..6645130e2614 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500032 +#define __FreeBSD_version 1500033 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,