mm, swap, frontswap: Fix THP swap if frontswap enabled
Subsystems (4)
PATCH 1/1 mm, swap, frontswap: Fix THP swap if frontswap enabled
From: Huang Ying <[email protected]>
It was reported by Sergey Senozhatsky that if THP (Transparent Huge Page) and frontswap (via zswap) are both enabled, when memory goes low so that swap is triggered, segfault and memory corruption will occur in random user space applications as follow,
kernel: urxvt[338]: segfault at 20 ip 00007fc08889ae0d sp 00007ffc73a7fc40 error 6 in libc-2.26.so[7fc08881a000+1ae000]
#0 0x00007fc08889ae0d _int_malloc (libc.so.6) #1 0x00007fc08889c2f3 malloc (libc.so.6) #2 0x0000560e6004bff7 _Z14rxvt_wcstoutf8PKwi (urxvt) #3 0x0000560e6005e75c n/a (urxvt) #4 0x0000560e6007d9f1 _ZN16rxvt_perl_interp6invokeEP9rxvt_term9hook_typez (urxvt) #5 0x0000560e6003d988 _ZN9rxvt_term9cmd_parseEv (urxvt) #6 0x0000560e60042804 _ZN9rxvt_term6pty_cbERN2ev2ioEi (urxvt) #7 0x0000560e6005c10f _Z17ev_invoke_pendingv (urxvt) #8 0x0000560e6005cb55 ev_run (urxvt) #9 0x0000560e6003b9b9 main (urxvt)
#10 0x00007fc08883af4a __libc_start_main (libc.so.6) #11 0x0000560e6003f9da _start (urxvt)
After bisection, it was found the first bad commit is bd4c82c22c367e068 ("mm, THP, swap: delay splitting THP after swapped out").
The root cause is as follow.
When the pages are written to swap device during swapping out in swap_writepage(), zswap (fontswap) is tried to compress the pages instead to improve the performance. But zswap (frontswap) will treat THP as normal page, so only the head page is saved. After swapping in, tail pages will not be restored to its original contents, so cause the memory corruption in the applications.
This is fixed via rejecting to save page in frontswap store functions if the page is a THP. So that the THP will be swapped out to swap device.
Another choice is to split THP if frontswap is enabled. But it is found that the frontswap enabling isn't flexible. For example, if CONFIG_ZSWAP=y (cannot be module), frontswap will be enabled even if zswap itself isn't enabled.
Frontswap has multiple backends, to make it easy for one backend to enable THP support, the THP checking is put in backend frontswap store functions instead of the general interfaces.
Changelog:
v3:
- Fix via checking THP in frontswap backend as suggested by Minchan.
v2:
- Move frontswap check into swapfile.c to avoid to make vmscan.c depends on frontswap as suggested by Minchan.
--- drivers/xen/tmem.c | 4 ++++ mm/zswap.c | 6 ++++++ 2 files changed, 10 insertions(+)
drivers/xen/tmem.c +4 -0
@@ -284,6 +284,10 @@ static int tmem_frontswap_store(unsigned type, pgoff_t offset,int pool = tmem_frontswap_poolid;int ret; +/* THP isn't supported */ +if (PageTransHuge (page)) +return -1 ; +if (pool <0 )return -1 ;if (ind64 != ind)
mm/zswap.c +6 -0
@@ -1007,6 +1007,12 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,u8 *src, *dst;struct zswap_header zhdr = { .swpentry =swp_entry (type, offset) }; +/* THP isn't supported */ +if (PageTransHuge (page)) { + ret = -EINVAL ; + goto reject; + } +if (!zswap_enabled || !tree) { ret = -ENODEV ; goto reject;
Signature · 7 lines
2.15.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Andrew Morton
maintainerQuoted 43 lines · Ying
From: Huang Ying <[email protected]>
It was reported by Sergey Senozhatsky that if THP (Transparent Huge Page) and frontswap (via zswap) are both enabled, when memory goes low so that swap is triggered, segfault and memory corruption will occur in random user space applications as follow,
kernel: urxvt[338]: segfault at 20 ip
00007fc08889ae0dsp00007ffc73a7fc40error 6 in libc-2.26.so[7fc08881a000+1ae000]#0 0x00007fc08889ae0d _int_malloc (libc.so.6) #1 0x00007fc08889c2f3 malloc (libc.so.6) #2 0x0000560e6004bff7 _Z14rxvt_wcstoutf8PKwi (urxvt) #3 0x0000560e6005e75c n/a (urxvt) #4 0x0000560e6007d9f1 _ZN16rxvt_perl_interp6invokeEP9rxvt_term9hook_typez (urxvt) #5 0x0000560e6003d988 _ZN9rxvt_term9cmd_parseEv (urxvt) #6 0x0000560e60042804 _ZN9rxvt_term6pty_cbERN2ev2ioEi (urxvt) #7 0x0000560e6005c10f _Z17ev_invoke_pendingv (urxvt) #8 0x0000560e6005cb55 ev_run (urxvt) #9 0x0000560e6003b9b9 main (urxvt)#10
0x00007fc08883af4a__libc_start_main(libc.so.6) #110x0000560e6003f9da_start(urxvt)After bisection, it was found the first bad commit is
bd4c82c22c367e068("mm, THP, swap: delay splitting THP after swapped out").The root cause is as follow.
When the pages are written to swap device during swapping out in
swap_writepage(), zswap (fontswap) is tried to compress the pages instead to improve the performance. But zswap (frontswap) will treat THP as normal page, so only the head page is saved. After swapping in, tail pages will not be restored to its original contents, so cause the memory corruption in the applications.This is fixed via rejecting to save page in frontswap store functions if the page is a THP. So that the THP will be swapped out to swap device.
Another choice is to split THP if frontswap is enabled. But it is found that the frontswap enabling isn't flexible. For example, if
CONFIG_ZSWAP=y(cannot be module), frontswap will be enabled even if zswap itself isn't enabled.
Quoted 7 lines
Frontswap has multiple backends, to make it easy for one backend to enable THP support, the THP checking is put in backend frontswap store functions instead of the general interfaces.
Fixes bd4c82c22c367e068 ("mm, THP, swap: delay splitting THP after swapped out")Reported-by Sergey Senozhatsky <[email protected]>Tested-by Sergey Senozhatsky <[email protected]>
I don't think Sergey has tested this version and I suspect this is a holdover from the earlier patch, so I'll remove this line.
Quoted 6 lines
Signed-off-by "Huang, Ying" <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Dan Streetman <[email protected]>Cc Seth Jennings <[email protected]>Cc Tetsuo Handa <[email protected]>
Quoted 8 lines
Cc Shaohua Li <[email protected]>Cc Michal Hocko <[email protected]>Cc Johannes Weiner <[email protected]>Cc Mel Gorman <[email protected]>Cc Shakeel Butt <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc Juergen Gross <[email protected]>Cc [email protected] # 4.14
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Sergey Senozhatsky
Tested-byHello,
On (02/09/18 13:03), Andrew Morton wrote:
[..]
Quoted 10 lines
Quoted 7 lines
Frontswap has multiple backends, to make it easy for one backend to enable THP support, the THP checking is put in backend frontswap store functions instead of the general interfaces.
Fixes bd4c82c22c367e068 ("mm, THP, swap: delay splitting THP after swapped out")Reported-by Sergey Senozhatsky <[email protected]>Tested-by Sergey Senozhatsky <[email protected]>I don't think Sergey has tested this version and I suspect this is a holdover from the earlier patch, so I'll remove this line.
Just tested it (v3) with FRONTSWAP enabled (didn't test XEN tmem). Works fine.
FWIW
-ss
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>