2023-07-24 09:50:22

by Qi Zheng

Subject: [PATCH v2 04/47] kvm: mmu: dynamically allocate the x86-mmu shrinker

Use new APIs to dynamically allocate the x86-mmu shrinker.

Signed-off-by: Qi Zheng <[email protected]>
---
arch/x86/kvm/mmu/mmu.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index ec169f5c7dce..ab405e0a8954 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -6847,11 +6847,7 @@ static unsigned long mmu_shrink_count(struct shrinker *shrink,
return percpu_counter_read_positive(&kvm_total_used_mmu_pages);
}

-static struct shrinker mmu_shrinker = {
- .count_objects = mmu_shrink_count,
- .scan_objects = mmu_shrink_scan,
- .seeks = DEFAULT_SEEKS * 10,
-};
+static struct shrinker *mmu_shrinker;

static void mmu_destroy_caches(void)
{
@@ -6984,10 +6980,16 @@ int kvm_mmu_vendor_module_init(void)
if (percpu_counter_init(&kvm_total_used_mmu_pages, 0, GFP_KERNEL))
goto out;

- ret = register_shrinker(&mmu_shrinker, "x86-mmu");
- if (ret)
+ mmu_shrinker = shrinker_alloc(0, "x86-mmu");
+ if (!mmu_shrinker)
goto out_shrinker;

+ mmu_shrinker->count_objects = mmu_shrink_count;
+ mmu_shrinker->scan_objects = mmu_shrink_scan;
+ mmu_shrinker->seeks = DEFAULT_SEEKS * 10;
+
+ shrinker_register(mmu_shrinker);
+
return 0;

out_shrinker:
@@ -7009,7 +7011,7 @@ void kvm_mmu_vendor_module_exit(void)
{
mmu_destroy_caches();
percpu_counter_destroy(&kvm_total_used_mmu_pages);
- unregister_shrinker(&mmu_shrinker);
+ shrinker_unregister(mmu_shrinker);
}

/*
--
2.30.2

2023-07-25 09:28:09

by Muchun Song

Subject: Re: [PATCH v2 04/47] kvm: mmu: dynamically allocate the x86-mmu shrinker

> On Jul 24, 2023, at 17:43, Qi Zheng <[email protected]> wrote:
>
> Use new APIs to dynamically allocate the x86-mmu shrinker.
>
> Signed-off-by: Qi Zheng <[email protected]>

Reviewed-by: Muchun Song <[email protected]>

Thanks.