swap: choose swap device according to numa node
Subsystems (3)
PATCH 1/1 swap: choose swap device according to numa node
If the system has more than one swap device and swap device has the node information, we can make use of this information to decide which swap device to use in get_swap_pages() to get better performance.
The current code uses a priority based list, swap_avail_list, to decide which swap device to use and if multiple swap devices share the same priority, they are used round robin. This patch changes the previous single global swap_avail_list into a per-numa-node list, i.e. for each numa node, it sees its own priority based list of available swap devices. Swap device's priority can be promoted on its matching node's swap_avail_list.
The current swap device's priority is set as: user can set a >=0 value, or the system will pick one starting from -1 then downwards. The priority value in the swap_avail_list is the negated value of the swap device's due to plist being sorted from low to high. The new policy doesn't change the semantics for priority >=0 cases, the previous starting from -1 then downwards now becomes starting from -2 then downwards and -1 is reserved as the promoted value.
Take 4-node EX machine as an example, suppose 4 swap devices are available, each sit on a different node:
swapA on node 0
swapB on node 1
swapC on node 2
swapD on node 3
After they are all swapped on in the sequence of ABCD.
Current behaviour:
their priorities will be:
swapA: -1
swapB: -2
swapC: -3
swapD: -4
And their position in the global swap_avail_list will be:
swapA -> swapB -> swapC -> swapD
prio:1 prio:2 prio:3 prio:4
New behaviour:
their priorities will be(note that -1 is skipped):
swapA: -2
swapB: -3
swapC: -4
swapD: -5
And their positions in the 4 swap_avail_lists[nid] will be:
swap_avail_lists[0]: /* node 0's available swap device list */
swapA -> swapB -> swapC -> swapD
prio:1 prio:3 prio:4 prio:5
swap_avali_lists[1]: /* node 1's available swap device list */
swapB -> swapA -> swapC -> swapD
prio:1 prio:2 prio:4 prio:5
swap_avail_lists[2]: /* node 2's available swap device list */
swapC -> swapA -> swapB -> swapD
prio:1 prio:2 prio:3 prio:5
swap_avail_lists[3]: /* node 3's available swap device list */
swapD -> swapA -> swapB -> swapC
prio:1 prio:2 prio:3 prio:4
To see the effect of the patch, a test that starts N process, each mmap a region of anonymous memory and then continually write to it at random position to trigger both swap in and out is used.
On a 2 node Skylake EP machine with 64GiB memory, two 170GB SSD drives are used as swap devices with each attached to a different node, the result is:
runtime=30m/processes=32/total test size=128G/each process mmap region=4G
kernel throughput vanilla 13306 auto-binding 15169 +14%
runtime=30m/processes=64/total test size=128G/each process mmap region=2G
kernel throughput vanilla 11885 auto-binding 14879 25%
---
A previous version was sent without catching much attention:
https://lkml.org/lkml/2016/7/4/633
I'm sending again with some minor modifications and after test showed performance gains for SSD.
Documentation/vm/swap_numa.txt | 18 +++++++ include/linux/swap.h | 2 +- mm/swapfile.c | 113 +++++++++++++++++++++++++++++++---------- 3 files changed, 106 insertions(+), 27 deletions(-) create mode 100644 Documentation/vm/swap_numa.txt
Documentation/vm/swap_numa.txt new file +18 -0
@@ -0,0 +1,18 @@ +If the system has more than one swap device and swap device has the node +information, we can make use of this information to decide which swap +device to use in get_swap_pages() to get better performance. + +The current code uses a priority based list, swap_avail_list, to decide +which swap device to use and if multiple swap devices share the same +priority, they are used round robin. This change here replaces the single +global swap_avail_list with a per-numa-node list, i.e. for each numa node, +it sees its own priority based list of available swap devices. Swap +device's priority can be promoted on its matching node's swap_avail_list. + +The current swap device's priority is set as: user can set a >=0 value, +or the system will pick one starting from -1 then downwards. The priority +value in the swap_avail_list is the negated value of the swap device's +due to plist being sorted from low to high. The new policy doesn't change +the semantics for priority >=0 cases, the previous starting from -1 then +downwards now becomes starting from -2 then downwards and -1 is reserved +as the promoted value.
include/linux/swap.h +1 -1
@@ -211,7 +211,7 @@ struct swap_info_struct {unsigned long flags;/* SWP_USED etc: see above */ signed short prio;/* swap priority of this type */ struct plist_node list;/* entry in swap_active_head */ -struct plist_node avail_list;/* entry in swap_avail_head */ +struct plist_node avail_lists[MAX_NUMNODES ];/* entry in swap_avail_heads */ signed char type;/* strange name for an index */ unsigned int max;/* extent of the swap_map */ unsigned char *swap_map;/* vmalloc'ed array of usage counts */
mm/swapfile.c +87 -26
225 lines not on this page · raw message
Signature · 7 lines
2.13.4 -- 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 26 lines · On Mon, 14 Aug 2017 13:31:30 +0800 Aaron Lu <[email protected]> wrote:
If the system has more than one swap device and swap device has the node information, we can make use of this information to decide which swap device to use in
get_swap_pages()to get better performance.The current code uses a priority based list,
swap_avail_list, to decide which swap device to use and if multiple swap devices share the same priority, they are used round robin. This patch changes the previous single globalswap_avail_listinto a per-numa-node list, i.e. for each numa node, it sees its own priority based list of available swap devices. Swap device's priority can be promoted on its matching node'sswap_avail_list.The current swap device's priority is set as: user can set a >=0 value, or the system will pick one starting from -1 then downwards. The priority value in the
swap_avail_listis the negated value of the swap device's due to plist being sorted from low to high. The new policy doesn't change the semantics for priority >=0 cases, the previous starting from -1 then downwards now becomes starting from -2 then downwards and -1 is reserved as the promoted value....
On a 2 node Skylake EP machine with 64GiB memory, two 170GB SSD drives are used as swap devices with each attached to a different node, the result is:
runtime=30m/processes=32/total test size=128G/each process mmap region=4G
Quoted 9 lines
kernel throughput vanilla 13306 auto-binding 15169 +14%runtime=30m/processes=64/total test size=128G/each process mmap region=2G
kernel throughput vanilla 11885 auto-binding 14879 25%
Sounds nice.
Quoted 13 lines
...
Documentation/vm/swap_numa.txt new file +8
-0@@ -0,0 +1,18 @@ +If the system has more than one swap device and swap device has the node +information, we can make use of this information to decide which swap +device to use in get_swap_pages() to get better performance. + +The current code uses a priority based list, swap_avail_list, to decide +which swap device to use and if multiple swap devices share the same +priority, they are used round robin. This change here replaces the single +global swap_avail_list with a per-numa-node list, i.e. for each numa node,
Documentation/vm/swap_numa.txt line 18
Quoted 10 lines
Documentation/vm/swap_numa.txt new file +10
-0+it sees its own priority based list of available swap devices. Swap +device's priority can be promoted on its matching node's swap_avail_list. + +The current swap device's priority is set as: user can set a >=0 value, +or the system will pick one starting from -1 then downwards. The priority +value in the swap_avail_list is the negated value of the swap device's +due to plist being sorted from low to high. The new policy doesn't change +the semantics for priority >=0 cases, the previous starting from -1 then +downwards now becomes starting from -2 then downwards and -1 is reserved +as the promoted value.
Could we please add a little "user guide" here? Tell people how to set up their system to exploit this? Sample /etc/fstab entries, perhaps?
Documentation/vm/swap_numa.txt
Quoted 10 lines
...
Documentation/vm/swap_numa.txt new file +7
-0+static int __init swapfile_init(void) +{ + int nid; + + swap_avail_heads = kmalloc(nr_node_ids * sizeof(struct plist_head), GFP_KERNEL); + if (!swap_avail_heads) + return -ENOMEM;
Well, a kmalloc failure at __init time is generally considered "can't happen", but if it _does_ happen, the system will later oops, I think. Can we do something nicer here?
Quoted 6 lines
Documentation/vm/swap_numa.txt new file +6
-0+ for_each_node(nid) + plist_head_init(&swap_avail_heads[nid]); + + return 0; +} +subsys_initcall(swapfile_init);
Quoted 18 lines · Andrew Morton
Quoted 16 lines · On Mon, 14 Aug 2017 13:31:30 +0800 Aaron Lu <[email protected]> wrote:
Documentation/vm/swap_numa.txt new file +13
-0@@ -0,0 +1,18 @@ +If the system has more than one swap device and swap device has the node +information, we can make use of this information to decide which swap +device to use in get_swap_pages() to get better performance. + +The current code uses a priority based list, swap_avail_list, to decide +which swap device to use and if multiple swap devices share the same +priority, they are used round robin. This change here replaces the single +global swap_avail_list with a per-numa-node list, i.e. for each numa node, +it sees its own priority based list of available swap devices. Swap +device's priority can be promoted on its matching node's swap_avail_list. + +The current swap device's priority is set as: user can set a >=0 value, +or the system will pick one starting from -1 then downwards. The priority
Quoted 8 lines
Documentation/vm/swap_numa.txt line 18
Quoted 5 lines
Documentation/vm/swap_numa.txt new file +5
-0+value in the swap_avail_list is the negated value of the swap device's +due to plist being sorted from low to high. The new policy doesn't change +the semantics for priority >=0 cases, the previous starting from -1 then +downwards now becomes starting from -2 then downwards and -1 is reserved +as the promoted value.Could we please add a little "user guide" here? Tell people how to set up their system to exploit this? Sample
/etc/fstabentries, perhaps?
That's a good idea.
How about this:
Automatically bind swap device to numa node
-------------------------------------------
If the system has more than one swap device and swap device has the node information, we can make use of this information to decide which swap device to use in get_swap_pages() to get better performance.
How to use this feature
-----------------------
Swap device has priority and that decides the order of it to be used. To make use of automatically binding, there is no need to manipulate priority settings for swap devices. e.g. on a 2 node machine, assume 2 swap devices swapA and swapB, with swapA attached to node 0 and swapB attached to node 1, are going to be swapped on. Simply swapping them on by doing:
# swapon /dev/swapA # swapon /dev/swapB
Then node 0 will use the two swap devices in the order of swapA then swapB and node 1 will use the two swap devices in the order of swapB then swapA. Note that the order of them being swapped on doesn't matter.
A more complex example on a 4 node machine. Assume 6 swap devices are going to be swapped on: swapA and swapB are attached to node 0, swapC is attached to node 1, swapD and swapE are attached to node 2 and swapF is attached to node3. The way to swap them on is the same as above:
# swapon /dev/swapA # swapon /dev/swapB # swapon /dev/swapC # swapon /dev/swapD # swapon /dev/swapE # swapon /dev/swapF
Then node 0 will use them in the order of:
swapA/swapB -> swapC -> swapD -> swapE -> swapF
swapA and swapB will be used in a round robin mode before any other swap device.
node 1 will use them in the order of:
swapC -> swapA -> swapB -> swapD -> swapE -> swapF
node 2 will use them in the order of:
swapD/swapE -> swapA -> swapB -> swapC -> swapF
Similaly, swapD and swapE will be used in a round robin mode before any other swap devices.
node 3 will use them in the order of:
swapF -> swapA -> swapB -> swapC -> swapD -> swapE
Implementation details
----------------------
The current code uses a priority based list, swap_avail_list, to decide which swap device to use and if multiple swap devices share the same priority, they are used round robin. This change here replaces the single global swap_avail_list with a per-numa-node list, i.e. for each numa node, it sees its own priority based list of available swap devices. Swap device's priority can be promoted on its matching node's swap_avail_list.
The current swap device's priority is set as: user can set a >=0 value, or the system will pick one starting from -1 then downwards. The priority value in the swap_avail_list is the negated value of the swap device's due to plist being sorted from low to high. The new policy doesn't change the semantics for priority >=0 cases, the previous starting from -1 then downwards now becomes starting from -2 then downwards and -1 is reserved as the promoted value. So if multiple swap devices are attached to the same node, they will all be promoted to priority -1 on that node's plist and will be used round robin before any other swap devices.
Quoted 4 lines
Quoted 4 lines
...
Quoted 10 lines
Documentation/vm/swap_numa.txt
Quoted 7 lines
Documentation/vm/swap_numa.txt new file +7
-0+static int __init swapfile_init(void) +{ + int nid; + + swap_avail_heads = kmalloc(nr_node_ids * sizeof(struct plist_head), GFP_KERNEL); + if (!swap_avail_heads) + return -ENOMEM;Well, a kmalloc failure at
__inittime is generally considered "can't happen", but if it _does_ happen, the system will later oops, I think.
Agree.
Quoted 1 line
Can we do something nicer here?
I'm not sure what to do...any hint?
Adding a pr_err() perhaps?
Quoted 6 lines
Quoted 6 lines
Documentation/vm/swap_numa.txt new file +6
-0+ for_each_node(nid) + plist_head_init(&swap_avail_heads[nid]); + + return 0; +} +subsys_initcall(swapfile_init);
Andrew Morton
maintainerQuoted 28 lines · On Tue, 15 Aug 2017 13:49:45 +0800 Aaron Lu <[email protected]> wrote:
Quoted 18 lines · Andrew Morton
Quoted 16 lines · On Mon, 14 Aug 2017 13:31:30 +0800 Aaron Lu <[email protected]> wrote:
Documentation/vm/swap_numa.txt new file +13
-0@@ -0,0 +1,18 @@ +If the system has more than one swap device and swap device has the node +information, we can make use of this information to decide which swap +device to use in get_swap_pages() to get better performance. + +The current code uses a priority based list, swap_avail_list, to decide +which swap device to use and if multiple swap devices share the same +priority, they are used round robin. This change here replaces the single +global swap_avail_list with a per-numa-node list, i.e. for each numa node, +it sees its own priority based list of available swap devices. Swap +device's priority can be promoted on its matching node's swap_avail_list. + +The current swap device's priority is set as: user can set a >=0 value, +or the system will pick one starting from -1 then downwards. The priorityQuoted 8 lines
Documentation/vm/swap_numa.txt line 18
Quoted 5 lines
Documentation/vm/swap_numa.txt new file +5
-0+value in the swap_avail_list is the negated value of the swap device's +due to plist being sorted from low to high. The new policy doesn't change +the semantics for priority >=0 cases, the previous starting from -1 then +downwards now becomes starting from -2 then downwards and -1 is reserved +as the promoted value.Could we please add a little "user guide" here? Tell people how to set up their system to exploit this? Sample
/etc/fstabentries, perhaps?
Quoted 6 lines
That's a good idea.
How about this:
...
Looks good. Please send it along as a patch some time?
Quoted 3 lines
I'm not sure what to do...any hint?
Adding apr_err()perhaps?
pr_emerg(), probably. Would it make sense to disable all swapon()s after this?
PATCH v2 1/1 swap: choose swap device according to numa node
Quoted 7 lines · Andrew Morton
Quoted 3 lines · On Tue, 15 Aug 2017 13:49:45 +0800 Aaron Lu <[email protected]> wrote:
I'm not sure what to do...any hint?
Adding apr_err()perhaps?
pr_emerg(), probably. Would it make sense to disable all swapon()s after this?
Right!
I should have added a check for swap_avail_heads during swap on time :)
-------------------------------------------------------------------
From: Aaron Lu <[email protected]>
Subject: [PATCH v2] swap: choose swap device according to numa node
If the system has more than one swap device and swap device has the node information, we can make use of this information to decide which swap device to use in get_swap_pages() to get better performance.
The current code uses a priority based list, swap_avail_list, to decide which swap device to use and if multiple swap devices share the same priority, they are used round robin. This patch changes the previous single global swap_avail_list into a per-numa-node list, i.e. for each numa node, it sees its own priority based list of available swap devices. Swap device's priority can be promoted on its matching node's swap_avail_list.
The current swap device's priority is set as: user can set a >=0 value, or the system will pick one starting from -1 then downwards. The priority value in the swap_avail_list is the negated value of the swap device's due to plist being sorted from low to high. The new policy doesn't change the semantics for priority >=0 cases, the previous starting from -1 then downwards now becomes starting from -2 then downwards and -1 is reserved as the promoted value.
Take 4-node EX machine as an example, suppose 4 swap devices are available, each sit on a different node:
swapA on node 0
swapB on node 1
swapC on node 2
swapD on node 3
After they are all swapped on in the sequence of ABCD.
Current behaviour:
their priorities will be:
swapA: -1
swapB: -2
swapC: -3
swapD: -4
And their position in the global swap_avail_list will be:
swapA -> swapB -> swapC -> swapD
prio:1 prio:2 prio:3 prio:4
New behaviour:
their priorities will be(note that -1 is skipped):
swapA: -2
swapB: -3
swapC: -4
swapD: -5
And their positions in the 4 swap_avail_lists[nid] will be:
swap_avail_lists[0]: /* node 0's available swap device list */
swapA -> swapB -> swapC -> swapD
prio:1 prio:3 prio:4 prio:5
swap_avali_lists[1]: /* node 1's available swap device list */
swapB -> swapA -> swapC -> swapD
prio:1 prio:2 prio:4 prio:5
swap_avail_lists[2]: /* node 2's available swap device list */
swapC -> swapA -> swapB -> swapD
prio:1 prio:2 prio:3 prio:5
swap_avail_lists[3]: /* node 3's available swap device list */
swapD -> swapA -> swapB -> swapC
prio:1 prio:2 prio:3 prio:4
To see the effect of the patch, a test that starts N process, each mmap a region of anonymous memory and then continually write to it at random position to trigger both swap in and out is used.
On a 2 node Skylake EP machine with 64GiB memory, two 170GB SSD drives are used as swap devices with each attached to a different node, the result is:
runtime=30m/processes=32/total test size=128G/each process mmap region=4G
kernel throughput vanilla 13306 auto-binding 15169 +14%
runtime=30m/processes=64/total test size=128G/each process mmap region=2G
kernel throughput vanilla 11885 auto-binding 14879 +25%
---
v2: added pr_emrg in swapfile_init() for -ENOMEM case and check for
swap_avail_heads during swap on time as suggested by Andrew Morton;
Documentation update as suggested by Andrew Morton;
style fix by adding a blank line in __del_from_avail_list().Documentation/vm/swap_numa.txt | 69 ++++++++++++++++++++++++ include/linux/swap.h | 2 +- mm/swapfile.c | 119 ++++++++++++++++++++++++++++++++--------- 3 files changed, 163 insertions(+), 27 deletions(-) create mode 100644 Documentation/vm/swap_numa.txt
Documentation/vm/swap_numa.txt new file +69 -0
@@ -0,0 +1,69 @@ +Automatically bind swap device to numa node +------------------------------------------- + +If the system has more than one swap device and swap device has the node +information, we can make use of this information to decide which swap +device to use in get_swap_pages() to get better performance. + + +How to use this feature +----------------------- + +Swap device has priority and that decides the order of it to be used. To make +use of automatically binding, there is no need to manipulate priority settings +for swap devices. e.g. on a 2 node machine, assume 2 swap devices swapA and +swapB, with swapA attached to node 0 and swapB attached to node 1, are going +to be swapped on. Simply swapping them on by doing: +# swapon /dev/swapA +# swapon /dev/swapB + +Then node 0 will use the two swap devices in the order of swapA then swapB and +node 1 will use the two swap devices in the order of swapB then swapA. Note +that the order of them being swapped on doesn't matter. + +A more complex example on a 4 node machine. Assume 6 swap devices are going to +be swapped on: swapA and swapB are attached to node 0, swapC is attached to +node 1, swapD and swapE are attached to node 2 and swapF is attached to node3. +The way to swap them on is the same as above: +# swapon /dev/swapA +# swapon /dev/swapB +# swapon /dev/swapC +# swapon /dev/swapD +# swapon /dev/swapE +# swapon /dev/swapF + +Then node 0 will use them in the order of: +swapA/swapB -> swapC -> swapD -> swapE -> swapF +swapA and swapB will be used in a round robin mode before any other swap device. + +node 1 will use them in the order of: +swapC -> swapA -> swapB -> swapD -> swapE -> swapF + +node 2 will use them in the order of: +swapD/swapE -> swapA -> swapB -> swapC -> swapF +Similaly, swapD and swapE will be used in a round robin mode before any +other swap devices. + +node 3 will use them in the order of: +swapF -> swapA -> swapB -> swapC -> swapD -> swapE + + +Implementation details +---------------------- + +The current code uses a priority based list, swap_avail_list, to decide +which swap device to use and if multiple swap devices share the same +priority, they are used round robin. This change here replaces the single +global swap_avail_list with a per-numa-node list, i.e. for each numa node, +it sees its own priority based list of available swap devices. Swap +device's priority can be promoted on its matching node's swap_avail_list. + +The current swap device's priority is set as: user can set a >=0 value, +or the system will pick one starting from -1 then downwards. The priority +value in the swap_avail_list is the negated value of the swap device's +due to plist being sorted from low to high. The new policy doesn't change +the semantics for priority >=0 cases, the previous starting from -1 then +downwards now becomes starting from -2 then downwards and -1 is reserved +as the promoted value. So if multiple swap devices are attached to the same +node, they will all be promoted to priority -1 on that node's plist and will +be used round robin before any other swap devices.
include/linux/swap.h +1 -1
@@ -211,7 +211,7 @@ struct swap_info_struct {unsigned long flags;/* SWP_USED etc: see above */ signed short prio;/* swap priority of this type */ struct plist_node list;/* entry in swap_active_head */ -struct plist_node avail_list;/* entry in swap_avail_head */ +struct plist_node avail_lists[MAX_NUMNODES ];/* entry in swap_avail_heads */ signed char type;/* strange name for an index */ unsigned int max;/* extent of the swap_map */ unsigned char *swap_map;/* vmalloc'ed array of usage counts */
mm/swapfile.c +93 -26
237 lines not on this page · raw message
Signature · 7 lines
2.13.5 -- 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 23 lines · On Wed, 16 Aug 2017 10:44:40 +0800 Aaron Lu <[email protected]> wrote:
If the system has more than one swap device and swap device has the node information, we can make use of this information to decide which swap device to use in
get_swap_pages()to get better performance.The current code uses a priority based list,
swap_avail_list, to decide which swap device to use and if multiple swap devices share the same priority, they are used round robin. This patch changes the previous single globalswap_avail_listinto a per-numa-node list, i.e. for each numa node, it sees its own priority based list of available swap devices. Swap device's priority can be promoted on its matching node'sswap_avail_list.The current swap device's priority is set as: user can set a >=0 value, or the system will pick one starting from -1 then downwards. The priority value in the
swap_avail_listis the negated value of the swap device's due to plist being sorted from low to high. The new policy doesn't change the semantics for priority >=0 cases, the previous starting from -1 then downwards now becomes starting from -2 then downwards and -1 is reserved as the promoted value....
Review
Quoted 5 lines
(quoted diff) +5
-0+static int __init swapfile_init(void) +{ + int nid; + + swap_avail_heads = kmalloc(nr_node_ids * sizeof(struct plist_head), GFP_KERNEL);
I suppose we should use kmalloc_array(), as someone wrote it for us.
mm/swapfile.c renamed from mm/swapfile.c~swap-choose-swap-device-according-to-numa-node-v2-fix +2 -1
@@ -3700,7 +3700,8 @@ static int __init swapfile_init(void) {int nid; - swap_avail_heads =kmalloc (nr_node_ids *sizeof (struct plist_head ),GFP_KERNEL ); + swap_avail_heads =kmalloc_array (nr_node_ids,sizeof (struct plist_head ), +GFP_KERNEL );if (!swap_avail_heads) {pr_emerg ("Not enough memory for swap heads, swap is disabled\n" );return -ENOMEM ;
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (!swap_avail_heads) { + pr_emerg("Not enough memory for swap heads, swap is disabled\n");
checkpatch tells us that the "Not enough memory" is a bit redundant, as the memory allocator would have already warned. So it's sufficient to additionally say only "swap is disabled" here. But it's hardly worth changing.
Quoted 9 lines
(quoted diff) +9
-0+ return -ENOMEM; + } + + for_each_node(nid) + plist_head_init(&swap_avail_heads[nid]); + + return 0; +} +subsys_initcall(swapfile_init);
Quoted 24 lines · Andrew Morton
Review
Quoted 7 lines · On Wed, 16 Aug 2017 10:44:40 +0800 Aaron Lu <[email protected]> wrote:
...
(quoted diff) +5
-0+static int __init swapfile_init(void) +{ + int nid; + + swap_avail_heads = kmalloc(nr_node_ids * sizeof(struct plist_head), GFP_KERNEL);I suppose we should use
kmalloc_array(), as someone wrote it for us.mm/swapfile.c renamed from mm/swapfile.c~swap-choose-swap-device-according-to-numa-node-v2-fix +2
-1@@ -3700,7 +3700,8 @@ static int __init swapfile_init(void) {int nid; - swap_avail_heads =kmalloc (nr_node_ids *sizeof (struct plist_head ),GFP_KERNEL ); + swap_avail_heads =kmalloc_array (nr_node_ids,sizeof (struct plist_head ), +GFP_KERNEL );if (!swap_avail_heads) {pr_emerg ("Not enough memory for swap heads, swap is disabled\n" );return -ENOMEM ;
Quoted 7 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (!swap_avail_heads) { + pr_emerg("Not enough memory for swap heads, swap is disabled\n");checkpatch tells us that the "Not enough memory" is a bit redundant, as the memory allocator would have already warned. So it's sufficient to additionally say only "swap is disabled" here. But it's hardly worth changing.
Thanks Andrew for taking care of this.