[PATCH 0/3] 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(-) -- 2.25.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/3] staging: androind: Add error handling to ion_page_pool_shrink
Add error check to ion_page_pool_shrink after calling ion_page_pool_remove, due to converting BUG_ON to WARN_ON. Signed-off-by: Tomer Samara --- drivers/staging/android/ion/ion_page_pool.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c index 4acc0eebf781..c61548ecf7f2 100644 --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/ion_page_pool.c @@ -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); } -- 2.25.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/3] staging: androind: Convert BUG() to WARN()
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(). Signed-off-by: Tomer Samara --- drivers/staging/android/ion/ion_system_heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index eac0632ab4e8..37065a59ca69 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -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; } -- 2.25.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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().
Signed-off-by: Tomer Samara
---
drivers/staging/android/ion/ion_page_pool.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/android/ion/ion_page_pool.c
b/drivers/staging/android/ion/ion_page_pool.c
index 0198b886d906..4acc0eebf781 100644
--- a/drivers/staging/android/ion/ion_page_pool.c
+++ b/drivers/staging/android/ion/ion_page_pool.c
@@ -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);
}
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 3/3] staging: androind: Convert BUG() to WARN()
On 8/16/20 10:22 AM, Tomer Samara wrote: > 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(). > > Signed-off-by: Tomer Samara > --- > drivers/staging/android/ion/ion_system_heap.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/android/ion/ion_system_heap.c > b/drivers/staging/android/ion/ion_system_heap.c > index eac0632ab4e8..37065a59ca69 100644 > --- a/drivers/staging/android/ion/ion_system_heap.c > +++ b/drivers/staging/android/ion/ion_system_heap.c > @@ -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 -- ~Randy ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 3/3] staging: androind: Convert BUG() to WARN()
On Sun, Aug 16, 2020 at 10:34:50AM -0700, Randy Dunlap wrote: > On 8/16/20 10:22 AM, Tomer Samara wrote: > > 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(). > > > > Signed-off-by: Tomer Samara > > --- > > drivers/staging/android/ion/ion_system_heap.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/staging/android/ion/ion_system_heap.c > > b/drivers/staging/android/ion/ion_system_heap.c > > index eac0632ab4e8..37065a59ca69 100644 > > --- a/drivers/staging/android/ion/ion_system_heap.c > > +++ b/drivers/staging/android/ion/ion_system_heap.c > > @@ -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 > > -- > ~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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/3] staging: androind: Replace BUG_ONs with WARN_ONs
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
Reported-by: kernel test robot
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-...@lists.01.org
.config.gz
Description: application/gzip
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/4] Replace BUG/BUG_ON to WARN/WARN_ON
This series convert BUGs/BUG_ONs to WARNs/WARN_ONs Tomer Samara (4): staging: android: Replace BUG_ON with WARN_ON staging: android: Add error handling to ion_page_pool_shrink staging: android: Convert BUG to WARN staging: android: Add error handling to order_to_index callers drivers/staging/android/ion/ion_page_pool.c | 14 ++ drivers/staging/android/ion/ion_system_heap.c | 16 +--- 2 files changed, 23 insertions(+), 7 deletions(-) -- 2.25.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/3] staging: androind: Replace BUG_ONs with WARN_ONs
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
Reported-by: kernel test robot
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-...@lists.01.org
.config.gz
Description: application/gzip
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/4] staging: android: Replace BUG_ON with WARN_ON
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().
Signed-off-by: Tomer Samara
---
drivers/staging/android/ion/ion_page_pool.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/android/ion/ion_page_pool.c
b/drivers/staging/android/ion/ion_page_pool.c
index 0198b886d906..c1b9eda35c96 100644
--- a/drivers/staging/android/ion/ion_page_pool.c
+++ b/drivers/staging/android/ion/ion_page_pool.c
@@ -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);
}
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/4] staging: android: Add error handling to ion_page_pool_shrink
Add error check to ion_page_pool_shrink after calling ion_page_pool_remove, due to converting BUG_ON to WARN_ON. Signed-off-by: Tomer Samara --- drivers/staging/android/ion/ion_page_pool.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c index c1b9eda35c96..031550473000 100644 --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/ion_page_pool.c @@ -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); } -- 2.25.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/4] staging: android: Convert BUG to WARN
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(). Signed-off-by: Tomer Samara --- drivers/staging/android/ion/ion_system_heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index eac0632ab4e8..37065a59ca69 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -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; } -- 2.25.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 4/4] staging: android: Add error handling to order_to_index callers
Add error check to:
- free_buffer_page
- alloc_buffer_page
after calling order_to_index, due to converting BUG to WARN at
order_to_index.
Signed-off-by: Tomer Samara
---
drivers/staging/android/ion/ion_system_heap.c | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/android/ion/ion_system_heap.c
b/drivers/staging/android/ion/ion_system_heap.c
index 37065a59ca69..1e73bfc4 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -49,8 +49,13 @@ static struct page *alloc_buffer_page(struct ion_system_heap
*heap,
struct ion_buffer *buffer,
unsigned long order)
{
- struct ion_page_pool *pool = heap->pools[order_to_index(order)];
+ struct ion_page_pool *pool;
+ int index = order_to_index(order);
+
+ if (index < 0)
+ return NULL;
+ pool = heap->pools[index];
return ion_page_pool_alloc(pool);
}
@@ -59,6 +64,7 @@ static void free_buffer_page(struct ion_system_heap *heap,
{
struct ion_page_pool *pool;
unsigned int order = compound_order(page);
+ int index;
/* go to system */
if (buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE) {
@@ -66,8 +72,11 @@ static void free_buffer_page(struct ion_system_heap *heap,
return;
}
- pool = heap->pools[order_to_index(order)];
+ index = order_to_index(order);
+ if (index < 0)
+ return;
+ pool = heap->pools[index];
ion_page_pool_free(pool, page);
}
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/3] staging: androind: Replace BUG_ONs with WARN_ONs
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
Reported-by: kernel test robot
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-...@lists.01.org
.config.gz
Description: application/gzip
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8723bs: fix coding style
Fix coding style of core/rtw_cmd.c
Signed-off-by: Injae Kang
---
drivers/staging/rtl8723bs/core/rtw_cmd.c | 168 +++
1 file changed, 79 insertions(+), 89 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c
b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index bd18d1803e27..d496d86c8111 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -159,9 +159,9 @@ static struct cmd_hdl wlancmds[] = {
};
/*
-Caller and the rtw_cmd_thread can protect cmd_q by spin_lock.
-No irqsave is necessary.
-*/
+ * Caller and the rtw_cmd_thread can protect cmd_q by spin_lock.
+ * No irqsave is necessary.
+ */
int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
{
@@ -221,7 +221,7 @@ int rtw_init_evt_priv(struct evt_priv *pevtpriv)
void _rtw_free_evt_priv(struct evt_priv *pevtpriv)
{
- RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+_rtw_free_evt_priv\n"));
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+%s\n", __func__));
_cancel_workitem_sync(&pevtpriv->c2h_wk);
while (pevtpriv->c2h_wk_alive)
@@ -229,13 +229,13 @@ void _rtw_free_evt_priv(structevt_priv *pevtpriv)
while (!rtw_cbuf_empty(pevtpriv->c2h_queue)) {
void *c2h = rtw_cbuf_pop(pevtpriv->c2h_queue);
- if (c2h != NULL && c2h != (void *)pevtpriv) {
+
+ if (c2h != NULL && c2h != (void *)pevtpriv)
kfree(c2h);
- }
}
kfree(pevtpriv->c2h_queue);
- RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("-_rtw_free_evt_priv\n"));
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("-%s\n", __func__));
}
void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
@@ -250,14 +250,14 @@ void _rtw_free_cmd_priv(structcmd_priv *pcmdpriv)
}
/*
-Calling Context:
-
-rtw_enqueue_cmd can only be called between kernel thread,
-since only spin_lock is used.
-
-ISR/Call-Back functions can't call this sub-function.
-
-*/
+ * Calling Context:
+ *
+ * rtw_enqueue_cmd can only be called between kernel thread,
+ * since only spin_lock is used.
+ *
+ * ISR/Call-Back functions can't call this sub-function.
+ *
+ */
int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)
{
@@ -300,13 +300,13 @@ structcmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
void rtw_free_evt_priv(struct evt_priv *pevtpriv)
{
- RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_evt_priv\n"));
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s\n", __func__));
_rtw_free_evt_priv(pevtpriv);
}
void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
{
- RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_cmd_priv\n"));
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s\n", __func__));
_rtw_free_cmd_priv(pcmdpriv);
}
@@ -322,10 +322,10 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct
cmd_obj *cmd_obj)
|| atomic_read(&(pcmdpriv->cmdthd_running)) == false/*
com_thread not running */
) {
/* DBG_871X("%s:%s: drop cmdcode:%u, hw_init_completed:%u,
cmdthd_running:%u\n", caller_func, __func__, */
- /* cmd_obj->cmdcode, */
- /* pcmdpriv->padapter->hw_init_completed, */
- /* pcmdpriv->cmdthd_running */
- /* */
+ /* cmd_obj->cmdcode, */
+ /* pcmdpriv->padapter->hw_init_completed, */
+ /* pcmdpriv->cmdthd_running */
+ /* ) */
return _FAIL;
}
@@ -339,14 +339,13 @@ int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct
cmd_obj *cmd_obj)
int res = _FAIL;
struct adapter *padapter = pcmdpriv->padapter;
- if (cmd_obj == NULL) {
+ if (cmd_obj == NULL)
goto exit;
- }
cmd_obj->padapter = padapter;
res = rtw_cmd_filter(pcmdpriv, cmd_obj);
- if (_FAIL == res) {
+ if (res == _FAIL) {
rtw_free_cmd_obj(cmd_obj);
goto exit;
}
@@ -417,7 +416,7 @@ int rtw_cmd_thread(void *context)
atomic_set(&(pcmdpriv->cmdthd_running), true);
complete(&pcmdpriv->terminate_cmdthread_comp);
- RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("start r871x
rtw_cmd_thread \n"));
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("start r871x %s \n",
__func__));
while (1) {
if
(wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp)) {
@@ -462,7 +461,7 @@ int rtw_cmd_thread(void *context)
cmd_start_time = jiffies;
- if (_FAIL == rtw_cmd_filter(pcmdpriv, pcmd)) {
+ if (rtw_cmd_filter(pcmdpriv, pcmd) == _FAIL) {
pcmd->res = H2C_DROPPED;
goto post_process;
}
@@ -543,9 +542,8 @@ int rtw_cmd_thread(void *context)
if (pcmd->cmdcode == GEN_
