Skip to contentSkip to conversation

Replac BAG/BAG_ON with WARN/WARN_ON

PATCH In review Tomer Samara 3 participants 9 messages Aug 16, 2020 – Aug 17, 2020 Staging

lore
Share & tools
lore
#0 lore raw

cover Replac BAG/BAG_ON with WARN/WARN_ON

This series convert BUGs/BUG_ONs to WARNs/WARN_ONs

Tomer Samara (3):
staging: androind: Replace BUG_ONs with WARN_ONs
staging: androind: Add error handling to ion_page_pool_shrink
staging: androind: Convert BUG() to WARN()

 drivers/staging/android/ion/ion_page_pool.c   | 14 ++++++++++----
 drivers/staging/android/ion/ion_system_heap.c |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/3 staging: androind: Replace BUG_ONs with WARN_ONs

BUG_ON() is replaced with WARN_ON at ion_page_pool.c
Fixes the following issue:
Avoid crashing the kernel - try using WARN_ON & recovery code ratherthan BUG() or BUG_ON().

---
 drivers/staging/android/ion/ion_page_pool.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/staging/android/ion/ion_page_pool.c +8 -4
index 0198b886d906..4acc0eebf781 100644
@@ -46,11 +46,13 @@ static struct page *ion_page_pool_remove(struct ion_page_pool *pool, bool high)
 	struct page *page;
 
 	if (high) {
-		BUG_ON(!pool->high_count);
+		if (WARN_ON(!pool->high_count))
+			return NULL:
 		page = list_first_entry(&pool->high_items, struct page, lru);
 		pool->high_count--;
 	} else {
-		BUG_ON(!pool->low_count);
+		if (WARN_ON(!pool->low_count))
+			return NULL;
 		page = list_first_entry(&pool->low_items, struct page, lru);
 		pool->low_count--;
 	}
@@ -65,7 +67,8 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool)
 {
 	struct page *page = NULL;
 
-	BUG_ON(!pool);
+	if (WARN_ON(!pool))
+		return NULL;
 
 	mutex_lock(&pool->mutex);
 	if (pool->high_count)
@@ -82,7 +85,8 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool)
 
 void ion_page_pool_free(struct ion_page_pool *pool, struct page *page)
 {
-	BUG_ON(pool->order != compound_order(page));
+	if (WARN_ON(pool->order != compound_order(page)))
+		return;
 
 	ion_page_pool_add(pool, page);
 }
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH 1/3] staging: androind: Replace BUG_ONs with WARN_ONs

Thank you for the patch! Yet something to improve:

Hi Tomer,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on staging/staging-testing]
[also build test ERROR on v5.8 next-20200814]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Tomer-Samara/Replac-BAG-BAG_ON-with-WARN-WARN_ON/20200817-012333
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 86cfccb66937dd6cbf26ed619958b9e587e6a115
config: arc-allyesconfig (attached as .config)
compiler: arc-elf-gcc (GCC) 9.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arc

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

drivers/staging/android/ion/ion_page_pool.c: In function 'ion_page_pool_remove':

>> drivers/staging/android/ion/ion_page_pool.c:50:15: error: expected ';' before ':' token

50 | return NULL:
| ^

# https://github.com/0day-ci/linux/commit/71d27df2e46fe435ada18ac3dae964d6b9a74664
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Tomer-Samara/Replac-BAG-BAG_ON-with-WARN-WARN_ON/20200817-012333 git checkout 71d27df2e46fe435ada18ac3dae964d6b9a74664
vim +50 drivers/staging/android/ion/ion_page_pool.c

    43	
    44	static struct page *ion_page_pool_remove(struct ion_page_pool *pool, bool high)
    45	{
    46		struct page *page;
    47	
    48		if (high) {
    49			if (WARN_ON(!pool->high_count))
  > 50				return NULL:
    51			page = list_first_entry(&pool->high_items, struct page, lru);
    52			pool->high_count--;
    53		} else {
    54			if (WARN_ON(!pool->low_count))
    55				return NULL;
    56			page = list_first_entry(&pool->low_items, struct page, lru);
    57			pool->low_count--;
    58		}
    59	
    60		list_del(&page->lru);
    61		mod_node_page_state(page_pgdat(page), NR_KERNEL_MISC_RECLAIMABLE,
    62				    -(1 << pool->order));
    63		return page;
    64	}
    65	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#3 lore raw

Re: [PATCH 1/3] staging: androind: Replace BUG_ONs with WARN_ONs

In reply to Tomer Samara
Thank you for the patch! Yet something to improve:

Hi Tomer,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on staging/staging-testing]
[also build test ERROR on v5.8 next-20200814]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Tomer-Samara/Replac-BAG-BAG_ON-with-WARN-WARN_ON/20200817-012333
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 86cfccb66937dd6cbf26ed619958b9e587e6a115
config: x86_64-randconfig-a011-20200817 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project ab9fc8bae805c785066779e76e7846aabad5609e)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> drivers/staging/android/ion/ion_page_pool.c:50:15: error: expected ';' after return statement
                           return NULL:
                                      ^
                                      ;

1 error generated.

# https://github.com/0day-ci/linux/commit/71d27df2e46fe435ada18ac3dae964d6b9a74664
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Tomer-Samara/Replac-BAG-BAG_ON-with-WARN-WARN_ON/20200817-012333 git checkout 71d27df2e46fe435ada18ac3dae964d6b9a74664
vim +50 drivers/staging/android/ion/ion_page_pool.c

    43	
    44	static struct page *ion_page_pool_remove(struct ion_page_pool *pool, bool high)
    45	{
    46		struct page *page;
    47	
    48		if (high) {
    49			if (WARN_ON(!pool->high_count))
  > 50				return NULL:
    51			page = list_first_entry(&pool->high_items, struct page, lru);
    52			pool->high_count--;
    53		} else {
    54			if (WARN_ON(!pool->low_count))
    55				return NULL;
    56			page = list_first_entry(&pool->low_items, struct page, lru);
    57			pool->low_count--;
    58		}
    59	
    60		list_del(&page->lru);
    61		mod_node_page_state(page_pgdat(page), NR_KERNEL_MISC_RECLAIMABLE,
    62				    -(1 << pool->order));
    63		return page;
    64	}
    65	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#4 lore raw

Re: [PATCH 1/3] staging: androind: Replace BUG_ONs with WARN_ONs

In reply to Tomer Samara
Thank you for the patch! Yet something to improve:

Hi Tomer,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on staging/staging-testing]
[also build test ERROR on v5.9-rc1 next-20200814]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Tomer-Samara/Replac-BAG-BAG_ON-with-WARN-WARN_ON/20200817-012333
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 86cfccb66937dd6cbf26ed619958b9e587e6a115
config: x86_64-rhel-7.6-kselftests (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce (this is a W=1 build):
        # save the attached .config to linux build tree
        make W=1 ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

drivers/staging/android/ion/ion_page_pool.c: In function 'ion_page_pool_remove':

>> drivers/staging/android/ion/ion_page_pool.c:50:15: error: expected ';' before ':' token
      50 |    return NULL:
         |               ^
--
>> drivers/gpu/drm/vmwgfx/ttm_object.c:60: error: Cannot parse struct or union!

drivers/gpu/drm/vmwgfx/ttm_object.c:98: warning: Function parameter or member 'mem_glob' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:98: warning: Function parameter or member 'ops' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:98: warning: Function parameter or member 'dmabuf_release' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:98: warning: Function parameter or member 'dma_buf_size' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:98: warning: Function parameter or member 'idr' not described in 'ttm_object_device' drivers/gpu/drm/vmwgfx/ttm_object.c:129: warning: Function parameter or member 'rcu_head' not described in 'ttm_ref_object' drivers/gpu/drm/vmwgfx/ttm_object.c:129: warning: Function parameter or member 'tfile' not described in 'ttm_ref_object' drivers/gpu/drm/vmwgfx/ttm_object.c:583: warning: Function parameter or member 'dmabuf' not described in 'get_dma_buf_unless_doomed' drivers/gpu/drm/vmwgfx/ttm_object.c:583: warning: Excess function parameter 'dma_buf' description in 'get_dma_buf_unless_doomed'

# https://github.com/0day-ci/linux/commit/71d27df2e46fe435ada18ac3dae964d6b9a74664
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Tomer-Samara/Replac-BAG-BAG_ON-with-WARN-WARN_ON/20200817-012333 git checkout 71d27df2e46fe435ada18ac3dae964d6b9a74664
vim +50 drivers/staging/android/ion/ion_page_pool.c

    43	
    44	static struct page *ion_page_pool_remove(struct ion_page_pool *pool, bool high)
    45	{
    46		struct page *page;
    47	
    48		if (high) {
    49			if (WARN_ON(!pool->high_count))
  > 50				return NULL:
    51			page = list_first_entry(&pool->high_items, struct page, lru);
    52			pool->high_count--;
    53		} else {
    54			if (WARN_ON(!pool->low_count))
    55				return NULL;
    56			page = list_first_entry(&pool->low_items, struct page, lru);
    57			pool->low_count--;
    58		}
    59	
    60		list_del(&page->lru);
    61		mod_node_page_state(page_pgdat(page), NR_KERNEL_MISC_RECLAIMABLE,
    62				    -(1 << pool->order));
    63		return page;
    64	}
    65	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#5 lore raw

PATCH 2/3 staging: androind: Add error handling to ion_page_pool_shrink

In reply to Tomer Samara

Add error check to ion_page_pool_shrink after calling ion_page_pool_remove, due to converting BUG_ON to WARN_ON.

---
 drivers/staging/android/ion/ion_page_pool.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/android/ion/ion_page_pool.c +2 -0
index 4acc0eebf781..c61548ecf7f2 100644
@@ -128,6 +128,8 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask,
 			break;
 		}
 		mutex_unlock(&pool->mutex);
+		if (!page)
+			break;
 		ion_page_pool_free_pages(pool, page);
 		freed += (1 << pool->order);
 	}
Signature · 1 line
2.25.1
#6 lore raw

PATCH 3/3 staging: androind: Convert BUG() to WARN()

In reply to Tomer Samara

replace BUG() with WARN() at ion_sytem_heap.c, this fix the following checkpatch issue:
Avoid crashing the kernel - try using WARN_ON & recovery code ratherthan BUG() or BUG_ON().

---
 drivers/staging/android/ion/ion_system_heap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/android/ion/ion_system_heap.c +2 -1
index eac0632ab4e8..37065a59ca69 100644
@@ -30,7 +30,8 @@ static int order_to_index(unsigned int order)
 	for (i = 0; i < NUM_ORDERS; i++)
 		if (order == orders[i])
 			return i;
-	BUG();
+
+	WARN(1, "%s: Did not found index to order %d", __FUNCTION__, order);
 	return -1;
 }
 
Signature · 1 line
2.25.1
#7 lore raw

Re: [PATCH 3/3] staging: androind: Convert BUG() to WARN()

Quoted 15 lines · Tomer Samara

replace BUG() with WARN() at ion_sytem_heap.c, this fix the following checkpatch issue:
Avoid crashing the kernel - try using WARN_ON & recovery code ratherthan BUG() or BUG_ON().

---
 drivers/staging/android/ion/ion_system_heap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/android/ion/ion_system_heap.c +0 -0
index eac0632ab4e8..37065a59ca69 100644

drivers/staging/android/ion/ion_system_heap.c static int order_to_index(unsigned int order) · line 36

Quoted 8 lines
drivers/staging/android/ion/ion_system_heap.c +2 -1
@@ -30,7 +30,8 @@ static int order_to_index(unsigned int order)
 	for (i = 0; i < NUM_ORDERS; i++)
 		if (order == orders[i])
 			return i;
-	BUG();
+
+	WARN(1, "%s: Did not found index to order %d", __FUNCTION__, order);
 	return -1;
 }

Hi,
Did you look at what happens when order_to_index() returns -1 to its callers?

Also: fix spelling in Subjects: android and BUG/BUG_ON

Signature · 1 line
~Randy
#8 lore raw

Re: [PATCH 3/3] staging: androind: Convert BUG() to WARN()

Quoted 30 lines · Randy Dunlap
Quoted 15 lines · Tomer Samara

replace BUG() with WARN() at ion_sytem_heap.c, this fix the following checkpatch issue:
Avoid crashing the kernel - try using WARN_ON & recovery code ratherthan BUG() or BUG_ON().

---
 drivers/staging/android/ion/ion_system_heap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/android/ion/ion_system_heap.c +0 -0
index eac0632ab4e8..37065a59ca69 100644

drivers/staging/android/ion/ion_system_heap.c static int order_to_index(unsigned int order) · line 36

Quoted 8 lines
drivers/staging/android/ion/ion_system_heap.c +2 -1
@@ -30,7 +30,8 @@ static int order_to_index(unsigned int order)
 	for (i = 0; i < NUM_ORDERS; i++)
 		if (order == orders[i])
 			return i;
-	BUG();
+
+	WARN(1, "%s: Did not found index to order %d", __FUNCTION__, order);
 	return -1;
 }

Hi,
Did you look at what happens when order_to_index() returns -1 to its callers?

Quoted 5 lines

Also: fix spelling in Subjects: android and BUG/BUG_ON

Signature · 1 line
~Randy

Hi,
yes I've made a patch for that too but it seems I forgot to include him in the patch set.
I will send new version for this patch set soon.

Thanks