* [PATCH] mm, swap: Remove WARN_ON_ONCE() in free_swap_slot()
@ 2017-03-20 6:26 ` Huang, Ying
0 siblings, 0 replies; 4+ messages in thread
From: Huang, Ying @ 2017-03-20 6:26 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, Dave Hansen, Shaohua Li, Rik van Riel, Huang Ying,
Tim Chen, Michal Hocko, linux-mm, linux-kernel
From: Huang Ying <ying.huang@intel.com>
Before commit 452b94b8c8c7 ("mm/swap: don't BUG_ON() due to
uninitialized swap slot cache"), the following bug is reported,
------------[ cut here ]------------
kernel BUG at mm/swap_slots.c:270!
invalid opcode: 0000 [#1] SMP
CPU: 5 PID: 1745 Comm: (sd-pam) Not tainted 4.11.0-rc1-00243-g24c534bb161b #1
Hardware name: System manufacturer System Product Name/Z170-K, BIOS
1803 05/06/2016
RIP: 0010:free_swap_slot+0xba/0xd0
Call Trace:
swap_free+0x36/0x40
do_swap_page+0x360/0x6d0
__handle_mm_fault+0x880/0x1080
handle_mm_fault+0xd0/0x240
__do_page_fault+0x232/0x4d0
do_page_fault+0x20/0x70
page_fault+0x22/0x30
---[ end trace aefc9ede53e0ab21 ]---
This is raised by the BUG_ON(!swap_slot_cache_initialized) in
free_swap_slot(). This is incorrect, because even if the swap slots
cache fails to be initialized, the swap should operate properly
without the swap slots cache. And the use_swap_slot_cache check later
in the function will protect the uninitialized swap slots cache case.
In commit 452b94b8c8c7, the BUG_ON() is replaced by WARN_ON_ONCE().
In the patch, the WARN_ON_ONCE() is removed too.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
---
mm/swap_slots.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/mm/swap_slots.c b/mm/swap_slots.c
index 7ebb23836f68..b1ccb58ad397 100644
--- a/mm/swap_slots.c
+++ b/mm/swap_slots.c
@@ -267,8 +267,6 @@ int free_swap_slot(swp_entry_t entry)
{
struct swap_slots_cache *cache;
- WARN_ON_ONCE(!swap_slot_cache_initialized);
-
cache = &get_cpu_var(swp_slots);
if (use_swap_slot_cache && cache->slots_ret) {
spin_lock_irq(&cache->free_lock);
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] mm, swap: Remove WARN_ON_ONCE() in free_swap_slot()
@ 2017-03-20 6:26 ` Huang, Ying
0 siblings, 0 replies; 4+ messages in thread
From: Huang, Ying @ 2017-03-20 6:26 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, Dave Hansen, Shaohua Li, Rik van Riel, Huang Ying,
Tim Chen, Michal Hocko, linux-mm, linux-kernel
From: Huang Ying <ying.huang@intel.com>
Before commit 452b94b8c8c7 ("mm/swap: don't BUG_ON() due to
uninitialized swap slot cache"), the following bug is reported,
------------[ cut here ]------------
kernel BUG at mm/swap_slots.c:270!
invalid opcode: 0000 [#1] SMP
CPU: 5 PID: 1745 Comm: (sd-pam) Not tainted 4.11.0-rc1-00243-g24c534bb161b #1
Hardware name: System manufacturer System Product Name/Z170-K, BIOS
1803 05/06/2016
RIP: 0010:free_swap_slot+0xba/0xd0
Call Trace:
swap_free+0x36/0x40
do_swap_page+0x360/0x6d0
__handle_mm_fault+0x880/0x1080
handle_mm_fault+0xd0/0x240
__do_page_fault+0x232/0x4d0
do_page_fault+0x20/0x70
page_fault+0x22/0x30
---[ end trace aefc9ede53e0ab21 ]---
This is raised by the BUG_ON(!swap_slot_cache_initialized) in
free_swap_slot(). This is incorrect, because even if the swap slots
cache fails to be initialized, the swap should operate properly
without the swap slots cache. And the use_swap_slot_cache check later
in the function will protect the uninitialized swap slots cache case.
In commit 452b94b8c8c7, the BUG_ON() is replaced by WARN_ON_ONCE().
In the patch, the WARN_ON_ONCE() is removed too.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
---
mm/swap_slots.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/mm/swap_slots.c b/mm/swap_slots.c
index 7ebb23836f68..b1ccb58ad397 100644
--- a/mm/swap_slots.c
+++ b/mm/swap_slots.c
@@ -267,8 +267,6 @@ int free_swap_slot(swp_entry_t entry)
{
struct swap_slots_cache *cache;
- WARN_ON_ONCE(!swap_slot_cache_initialized);
-
cache = &get_cpu_var(swp_slots);
if (use_swap_slot_cache && cache->slots_ret) {
spin_lock_irq(&cache->free_lock);
--
2.11.0
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mm, swap: Remove WARN_ON_ONCE() in free_swap_slot()
2017-03-20 6:26 ` Huang, Ying
@ 2017-03-21 20:42 ` Tim Chen
-1 siblings, 0 replies; 4+ messages in thread
From: Tim Chen @ 2017-03-21 20:42 UTC (permalink / raw)
To: Huang, Ying, Linus Torvalds
Cc: Andrew Morton, Dave Hansen, Shaohua Li, Rik van Riel,
Michal Hocko, linux-mm, linux-kernel
On Mon, 2017-03-20 at 14:26 +0800, Huang, Ying wrote:
> From: Huang Ying <ying.huang@intel.com>
>
> Before commit 452b94b8c8c7 ("mm/swap: don't BUG_ON() due to
> uninitialized swap slot cache"), the following bug is reported,
>
> ------------[ cut here ]------------
> kernel BUG at mm/swap_slots.c:270!
> invalid opcode: 0000 [#1] SMP
> CPU: 5 PID: 1745 Comm: (sd-pam) Not tainted 4.11.0-rc1-00243-g24c534bb161b #1
> Hardware name: System manufacturer System Product Name/Z170-K, BIOS
> 1803 05/06/2016
> RIP: 0010:free_swap_slot+0xba/0xd0
> Call Trace:
> swap_free+0x36/0x40
> do_swap_page+0x360/0x6d0
> __handle_mm_fault+0x880/0x1080
> handle_mm_fault+0xd0/0x240
> __do_page_fault+0x232/0x4d0
> do_page_fault+0x20/0x70
> page_fault+0x22/0x30
> ---[ end trace aefc9ede53e0ab21 ]---
>
> This is raised by the BUG_ON(!swap_slot_cache_initialized) in
> free_swap_slot(). This is incorrect, because even if the swap slots
> cache fails to be initialized, the swap should operate properly
> without the swap slots cache. And the use_swap_slot_cache check later
> in the function will protect the uninitialized swap slots cache case.
>
> In commit 452b94b8c8c7, the BUG_ON() is replaced by WARN_ON_ONCE().
> In the patch, the WARN_ON_ONCE() is removed too.
>
This replaces my previous patch to replace the BUG_ON.
Acked-by: Tim Chen <tim.c.chen@linux.intel.com>
> Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Tim Chen <tim.c.chen@linux.intel.com>
> Cc: Michal Hocko <mhocko@suse.com>
> Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
> ---
> mm/swap_slots.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/mm/swap_slots.c b/mm/swap_slots.c
> index 7ebb23836f68..b1ccb58ad397 100644
> --- a/mm/swap_slots.c
> +++ b/mm/swap_slots.c
> @@ -267,8 +267,6 @@ int free_swap_slot(swp_entry_t entry)
> {
> struct swap_slots_cache *cache;
>
> - WARN_ON_ONCE(!swap_slot_cache_initialized);
> -
> cache = &get_cpu_var(swp_slots);
> if (use_swap_slot_cache && cache->slots_ret) {
> spin_lock_irq(&cache->free_lock);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mm, swap: Remove WARN_ON_ONCE() in free_swap_slot()
@ 2017-03-21 20:42 ` Tim Chen
0 siblings, 0 replies; 4+ messages in thread
From: Tim Chen @ 2017-03-21 20:42 UTC (permalink / raw)
To: Huang, Ying, Linus Torvalds
Cc: Andrew Morton, Dave Hansen, Shaohua Li, Rik van Riel,
Michal Hocko, linux-mm, linux-kernel
On Mon, 2017-03-20 at 14:26 +0800, Huang, Ying wrote:
> From: Huang Ying <ying.huang@intel.com>
>
> Before commit 452b94b8c8c7 ("mm/swap: don't BUG_ON() due to
> uninitialized swap slot cache"), the following bug is reported,
>
> A ------------[ cut here ]------------
> A kernel BUG at mm/swap_slots.c:270!
> A invalid opcode: 0000 [#1] SMP
> A CPU: 5 PID: 1745 Comm: (sd-pam) Not tainted 4.11.0-rc1-00243-g24c534bb161b #1
> A Hardware name: System manufacturer System Product Name/Z170-K, BIOS
> 1803 05/06/2016
> A RIP: 0010:free_swap_slot+0xba/0xd0
> A Call Trace:
> A A A swap_free+0x36/0x40
> A A A do_swap_page+0x360/0x6d0
> A A A __handle_mm_fault+0x880/0x1080
> A A A handle_mm_fault+0xd0/0x240
> A A A __do_page_fault+0x232/0x4d0
> A A A do_page_fault+0x20/0x70
> A A A page_fault+0x22/0x30
> A ---[ end trace aefc9ede53e0ab21 ]---
>
> This is raised by the BUG_ON(!swap_slot_cache_initialized) in
> free_swap_slot().A A This is incorrect, because even if the swap slots
> cache fails to be initialized, the swap should operate properly
> without the swap slots cache.A A And the use_swap_slot_cache check later
> in the function will protect the uninitialized swap slots cache case.
>
> In commit 452b94b8c8c7, the BUG_ON() is replaced by WARN_ON_ONCE().
> In the patch, the WARN_ON_ONCE() is removed too.
>
This replaces my previous patch to replace the BUG_ON.
Acked-by: Tim Chen <tim.c.chen@linux.intel.com>
> Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Tim Chen <tim.c.chen@linux.intel.com>
> Cc: Michal Hocko <mhocko@suse.com>
> Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
> ---
> A mm/swap_slots.c | 2 --
> A 1 file changed, 2 deletions(-)
>
> diff --git a/mm/swap_slots.c b/mm/swap_slots.c
> index 7ebb23836f68..b1ccb58ad397 100644
> --- a/mm/swap_slots.c
> +++ b/mm/swap_slots.c
> @@ -267,8 +267,6 @@ int free_swap_slot(swp_entry_t entry)
> A {
> A struct swap_slots_cache *cache;
> A
> - WARN_ON_ONCE(!swap_slot_cache_initialized);
> -
> A cache = &get_cpu_var(swp_slots);
> A if (use_swap_slot_cache && cache->slots_ret) {
> A spin_lock_irq(&cache->free_lock);
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-21 20:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-20 6:26 [PATCH] mm, swap: Remove WARN_ON_ONCE() in free_swap_slot() Huang, Ying
2017-03-20 6:26 ` Huang, Ying
2017-03-21 20:42 ` Tim Chen
2017-03-21 20:42 ` Tim Chen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.