diff for duplicates of <20180221191439.GM2231@dhcp22.suse.cz>
diff --git a/a/1.txt b/N1/1.txt
index 2a0a38e..4185e05 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,53 +1 @@
-OK, so here we go with the fix.
-
->From bc55c70ca2325f3305a80cfca5731f9550205589 Mon Sep 17 00:00:00 2001
-From: Michal Hocko <mhocko@suse.com>
-Date: Wed, 21 Feb 2018 19:47:33 +0100
-Subject: [PATCH] hugetlb: fix surplus pages accounting
-
-Dan Rue has noticed that libhugetlbfs test suite fails counter test:
-
-root@localhost:~# mount_point="/mnt/hugetlb/"
-root@localhost:~# echo 200 > /proc/sys/vm/nr_hugepages
-root@localhost:~# mkdir -p "${mount_point}"
-root@localhost:~# mount -t hugetlbfs hugetlbfs "${mount_point}"
-root@localhost:~# export LD_LIBRARY_PATH=/root/libhugetlbfs/libhugetlbfs-2.20/obj64
-root@localhost:~# /root/libhugetlbfs/libhugetlbfs-2.20/tests/obj64/counters
-Starting testcase "/root/libhugetlbfs/libhugetlbfs-2.20/tests/obj64/counters", pid 3319
-Base pool size: 0
-Clean...
-FAIL Line 326: Bad HugePages_Total: expected 0, actual 1
-
-The bug was bisected to 0c397daea1d4 ("mm, hugetlb: further simplify
-hugetlb allocation API"). The reason is that alloc_surplus_huge_page misaccounts
-per node surplus pages. We should increase surplus_huge_pages_node rather than
-nr_huge_pages_node which is already handled by alloc_fresh_huge_page.
-
-Fixes: 0c397daea1d4 ("mm, hugetlb: further simplify hugetlb allocation API")
-Reported-by: Dan Rue <dan.rue@linaro.org>
-Tested-by: Dan Rue <dan.rue@linaro.org>
-Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
-Signed-off-by: Michal Hocko <mhocko@suse.com>
----
- mm/hugetlb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index 7c204e3d132b..a963f2034dfc 100644
---- a/mm/hugetlb.c
-+++ b/mm/hugetlb.c
-@@ -1583,7 +1583,7 @@ static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask,
- page = NULL;
- } else {
- h->surplus_huge_pages++;
-- h->nr_huge_pages_node[page_to_nid(page)]++;
-+ h->surplus_huge_pages_node[page_to_nid(page)]++;
- }
-
- out_unlock:
---
-2.16.1
-
---
-Michal Hocko
-SUSE Labs
\ No newline at end of file
+OK, so here we go with the fix.
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index a57acca..bc8f8db 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -33,59 +33,7 @@
"b\0"
]
[
- "OK, so here we go with the fix.\n",
- "\n",
- ">From bc55c70ca2325f3305a80cfca5731f9550205589 Mon Sep 17 00:00:00 2001\n",
- "From: Michal Hocko <mhocko\@suse.com>\n",
- "Date: Wed, 21 Feb 2018 19:47:33 +0100\n",
- "Subject: [PATCH] hugetlb: fix surplus pages accounting\n",
- "\n",
- "Dan Rue has noticed that libhugetlbfs test suite fails counter test:\n",
- "\n",
- "root\@localhost:~# mount_point=\"/mnt/hugetlb/\"\n",
- "root\@localhost:~# echo 200 > /proc/sys/vm/nr_hugepages\n",
- "root\@localhost:~# mkdir -p \"\${mount_point}\"\n",
- "root\@localhost:~# mount -t hugetlbfs hugetlbfs \"\${mount_point}\"\n",
- "root\@localhost:~# export LD_LIBRARY_PATH=/root/libhugetlbfs/libhugetlbfs-2.20/obj64\n",
- "root\@localhost:~# /root/libhugetlbfs/libhugetlbfs-2.20/tests/obj64/counters\n",
- "Starting testcase \"/root/libhugetlbfs/libhugetlbfs-2.20/tests/obj64/counters\", pid 3319\n",
- "Base pool size: 0\n",
- "Clean...\n",
- "FAIL Line 326: Bad HugePages_Total: expected 0, actual 1\n",
- "\n",
- "The bug was bisected to 0c397daea1d4 (\"mm, hugetlb: further simplify\n",
- "hugetlb allocation API\"). The reason is that alloc_surplus_huge_page misaccounts\n",
- "per node surplus pages. We should increase surplus_huge_pages_node rather than\n",
- "nr_huge_pages_node which is already handled by alloc_fresh_huge_page.\n",
- "\n",
- "Fixes: 0c397daea1d4 (\"mm, hugetlb: further simplify hugetlb allocation API\")\n",
- "Reported-by: Dan Rue <dan.rue\@linaro.org>\n",
- "Tested-by: Dan Rue <dan.rue\@linaro.org>\n",
- "Reviewed-by: Mike Kravetz <mike.kravetz\@oracle.com>\n",
- "Signed-off-by: Michal Hocko <mhocko\@suse.com>\n",
- "---\n",
- " mm/hugetlb.c | 2 +-\n",
- " 1 file changed, 1 insertion(+), 1 deletion(-)\n",
- "\n",
- "diff --git a/mm/hugetlb.c b/mm/hugetlb.c\n",
- "index 7c204e3d132b..a963f2034dfc 100644\n",
- "--- a/mm/hugetlb.c\n",
- "+++ b/mm/hugetlb.c\n",
- "\@\@ -1583,7 +1583,7 \@\@ static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask,\n",
- " \t\tpage = NULL;\n",
- " \t} else {\n",
- " \t\th->surplus_huge_pages++;\n",
- "-\t\th->nr_huge_pages_node[page_to_nid(page)]++;\n",
- "+\t\th->surplus_huge_pages_node[page_to_nid(page)]++;\n",
- " \t}\n",
- " \n",
- " out_unlock:\n",
- "-- \n",
- "2.16.1\n",
- "\n",
- "-- \n",
- "Michal Hocko\n",
- "SUSE Labs"
+ "OK, so here we go with the fix."
]
-a673f2dbe8db9e8d1a88e45684af87d89dbd431e0fd7020ec5eb00c75eae5335
+9f9605c47f67c4e60f8e9503a23d72772c02fd2ce94479449e489b10a4ff5aff
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.