From fde3eab7810e97b1fa7c1a18388bd6a9bf3262b0 Mon Sep 17 00:00:00 2001 From: Deepak Kumar Date: Tue, 2 Mar 2021 19:30:07 +0530 Subject: [PATCH] msm: kgsl: Correct gfp mask passed to kvcalloc Remove __GFP_NOWARN and __GFP_NORETRY gfp masks from kvcalloc calls to avoid out of memory errors because of not triggering shrinker in cases we are in low memory situations. Change-Id: I79936816f895d0f79c7620cda00114457893b349 Signed-off-by: Deepak Kumar --- drivers/gpu/msm/kgsl.c | 6 ++---- drivers/gpu/msm/kgsl_drawobj.c | 3 +-- drivers/gpu/msm/kgsl_pool.c | 3 +-- drivers/gpu/msm/kgsl_sharedmem.c | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index 77fc96856073..565ecd6e25be 100644 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -1950,8 +1950,7 @@ long kgsl_ioctl_gpu_aux_command(struct kgsl_device_private *dev_priv, if (param->flags & KGSL_GPU_AUX_COMMAND_SYNC) count++; - drawobjs = kvcalloc(count, sizeof(*drawobjs), - GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN); + drawobjs = kvcalloc(count, sizeof(*drawobjs), GFP_KERNEL); if (!drawobjs) { kgsl_context_put(context); @@ -2396,8 +2395,7 @@ static int memdesc_sg_virt(struct kgsl_memdesc *memdesc, unsigned long useraddr) if (sglen == 0 || sglen >= LONG_MAX) return -EINVAL; - pages = kvcalloc(sglen, sizeof(*pages), - GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN); + pages = kvcalloc(sglen, sizeof(*pages), GFP_KERNEL); if (pages == NULL) return -ENOMEM; diff --git a/drivers/gpu/msm/kgsl_drawobj.c b/drivers/gpu/msm/kgsl_drawobj.c index 8432bb611295..07036c393a1f 100644 --- a/drivers/gpu/msm/kgsl_drawobj.c +++ b/drivers/gpu/msm/kgsl_drawobj.c @@ -881,8 +881,7 @@ int kgsl_drawobj_add_timeline(struct kgsl_device_private *dev_priv, return -EINVAL; timelineobj->timelines = kvcalloc(cmd.count, - sizeof(*timelineobj->timelines), - GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN); + sizeof(*timelineobj->timelines), GFP_KERNEL); if (!timelineobj->timelines) return -ENOMEM; diff --git a/drivers/gpu/msm/kgsl_pool.c b/drivers/gpu/msm/kgsl_pool.c index dbff8e91bfe4..b2eb0a7205c9 100644 --- a/drivers/gpu/msm/kgsl_pool.c +++ b/drivers/gpu/msm/kgsl_pool.c @@ -443,8 +443,7 @@ int kgsl_pool_alloc_pages(u64 size, struct page ***pages, struct device *dev) { int count = 0; int npages = size >> PAGE_SHIFT; - struct page **local = kvcalloc(npages, sizeof(*local), - GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN); + struct page **local = kvcalloc(npages, sizeof(*local), GFP_KERNEL); u32 page_size, align; u64 len = size; diff --git a/drivers/gpu/msm/kgsl_sharedmem.c b/drivers/gpu/msm/kgsl_sharedmem.c index b37079604b64..8c0cbdc26d95 100644 --- a/drivers/gpu/msm/kgsl_sharedmem.c +++ b/drivers/gpu/msm/kgsl_sharedmem.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2002,2007-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2002,2007-2021, The Linux Foundation. All rights reserved. */ #include @@ -1000,7 +1000,7 @@ static int kgsl_system_alloc_pages(u64 size, struct page ***pages, struct page **local; int i, npages = size >> PAGE_SHIFT; - local = kvcalloc(npages, sizeof(*pages), GFP_KERNEL | __GFP_NORETRY); + local = kvcalloc(npages, sizeof(*pages), GFP_KERNEL); if (!local) return -ENOMEM;