drm/vmwgfx: Remove the deprecated lower mem limit
Subsystems (3)
PATCH 1/1 drm/vmwgfx: Remove the deprecated lower mem limit
TTM during the transition to the new page allocator lost the ability to constrain the allocations via the lower_mem_limit. The code has been unused since the change:256dd44bd897 ("drm/ttm: nuke old page allocator")
and there's no reason to keep it.
Signed-off-by Zack Rusin <[email protected]>
--- drivers/gpu/drm/vmwgfx/ttm_memory.c | 99 +---------------------------- drivers/gpu/drm/vmwgfx/ttm_memory.h | 6 +- 2 files changed, 2 insertions(+), 103 deletions(-)
drivers/gpu/drm/vmwgfx/ttm_memory.c +1 -98
@@ -34,7 +34,6 @@#include <linux/mm.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/swap.h> #include <drm/drm_device.h> #include <drm/drm_file.h>
@@ -173,69 +172,7 @@ static struct kobj_type ttm_mem_zone_kobj_type = { .sysfs_ops = &ttm_mem_zone_ops, .default_attrs = ttm_mem_zone_attrs, }; - -static struct attribute ttm_mem_global_lower_mem_limit = { - .name ="lower_mem_limit" , - .mode =S_IRUGO |S_IWUSR -}; - -static ssize_t ttm_mem_global_show (struct kobject *kobj, -struct attribute *attr, -char *buffer) -{ -struct ttm_mem_global *glob = - container_of(kobj, struct ttm_mem_global, kobj); -uint64_t val =0 ; - -spin_lock (&glob->lock); - val = glob->lower_mem_limit; -spin_unlock (&glob->lock); -/* convert from number of pages to KB */ - val <<= (PAGE_SHIFT -10 ); -return snprintf (buffer,PAGE_SIZE ,"%llu\n" , - (unsigned long long ) val); -} - -static ssize_t ttm_mem_global_store (struct kobject *kobj, -struct attribute *attr, -const char *buffer, -size_t size) -{ -int chars; -uint64_t val64; -unsigned long val; -struct ttm_mem_global *glob = - container_of(kobj, struct ttm_mem_global, kobj); - - chars =sscanf (buffer,"%lu" , &val); -if (chars ==0 ) -return size; - - val64 = val; -/* convert from KB to number of pages */ - val64 >>= (PAGE_SHIFT -10 ); - -spin_lock (&glob->lock); - glob->lower_mem_limit = val64; -spin_unlock (&glob->lock); - -return size; -} - -static struct attribute *ttm_mem_global_attrs[] = { - &ttm_mem_global_lower_mem_limit, -NULL -}; - -static const struct sysfs_ops ttm_mem_global_ops = { - .show = &ttm_mem_global_show, - .store = &ttm_mem_global_store, -}; - -static struct kobj_type ttm_mem_glob_kobj_type = { - .sysfs_ops = &ttm_mem_global_ops, - .default_attrs = ttm_mem_global_attrs, -}; +static struct kobj_type ttm_mem_glob_kobj_type = {0 };static bool ttm_zones_above_swap_target (struct ttm_mem_global *glob,bool from_wq,uint64_t extra)
@@ -435,11 +372,6 @@ int ttm_mem_global_init(struct ttm_mem_global *glob, struct device *dev)si_meminfo (&si); -spin_lock (&glob->lock); -/* set it as 0 by default to keep original behavior of OOM */ - glob->lower_mem_limit =0 ; -spin_unlock (&glob->lock); - ret =ttm_mem_init_kernel_zone (glob, &si);if (unlikely (ret !=0 )) goto out_no_zone;
@@ -527,35 +459,6 @@ void ttm_mem_global_free(struct ttm_mem_global *glob, }EXPORT_SYMBOL (ttm_mem_global_free); -/* -* check if the available mem is under lower memory limit -* -* a. if no swap disk at all or free swap space is under swap_mem_limit -* but available system mem is bigger than sys_mem_limit, allow TTM -* allocation; -* -* b. if the available system mem is less than sys_mem_limit but free -* swap disk is bigger than swap_mem_limit, allow TTM allocation. -*/ -bool -ttm_check_under_lowerlimit (struct ttm_mem_global *glob, -uint64_t num_pages, -struct ttm_operation_ctx *ctx) -{ -int64_t available; - -/* We allow over commit during suspend */ -if (ctx->force_alloc) -return false; - - available =get_nr_swap_pages () +si_mem_available (); - available -= num_pages; -if (available < glob->lower_mem_limit) -return true; - -return false; -} -static int ttm_mem_global_reserve (struct ttm_mem_global *glob,struct ttm_mem_zone *single_zone,uint64_t amount,bool reserve)
drivers/gpu/drm/vmwgfx/ttm_memory.h +1 -5
@@ -50,8 +50,6 @@* @work: The workqueue callback for the shrink queue. * @lock: Lock to protect the @shrink - and the memory accounting members, * that is, essentially the whole structure with some exceptions. -* @lower_mem_limit: include lower limit of swap space and lower limit of -* system memory. * @zones: Array of pointers to accounting zones. * @num_zones: Number of populated entries in the @zones array. * @zone_kernel: Pointer to the kernel zone.
@@ -69,7 +67,6 @@ extern struct ttm_mem_global {struct workqueue_struct *swap_queue;struct work_struct work;spinlock_t lock; -uint64_t lower_mem_limit;struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES ];unsigned int num_zones;struct ttm_mem_zone *zone_kernel;
@@ -91,6 +88,5 @@ int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,void ttm_mem_global_free_page (struct ttm_mem_global *glob,struct page *page,uint64_t size);size_t ttm_round_pot (size_t size); -bool ttm_check_under_lowerlimit (struct ttm_mem_global *glob,uint64_t num_pages, -struct ttm_operation_ctx *ctx); +#endif
Signature · 1 line
2.30.2