src: read exactly two tokens from Linux THP sysfs config · nodejs/node@00309ee · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 638
• Pull requests 758
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 00309ee

Browse filesBrowse the repository at this point in the historyBrowse files

jayaddison

authored and

targos

committed

src: read exactly two tokens from Linux THP sysfs config

There was an unexpected and hard-to-spot issue here: the /sys/kernel/mm/transparent_hugepage/enabled file contains three entries, and the std::ifstream reader was reading two values on each loop iteration, resulting in incorrect behaviour. Fixes: #37064 PR-URL: #37065 Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

1 parent 11d3e71 commit 00309ee
Copy full SHA for 00309ee

1 file changed

+3-1Lines changed: 3 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/large_pages
  • node_large_page.cc

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/large_pages/node_large_page.cc‎

Copy file name to clipboardExpand all lines: src/large_pages/node_large_page.cc

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -260,6 +260,8 @@ struct text_region FindNodeTextRegion() {
260	260	bool IsTransparentHugePagesEnabled() {
261	261	std::ifstream ifs;
262	262
	263	+ // File format reference:
	264	+ // https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/mm/huge_memory.c?id=13391c60da3308ed9980de0168f74cce6c62ac1d#n163
263	265	ifs.open("/sys/kernel/mm/transparent_hugepage/enabled");
264	266	if (!ifs) {
265	267	PrintWarning("could not open /sys/kernel/mm/transparent_hugepage/enabled");
@@ -268,7 +270,7 @@ bool IsTransparentHugePagesEnabled() {
268	270
269	271	std::string always, madvise;
270	272	if (ifs.is_open()) {
271		- while (ifs >> always >> madvise) {}
	273	+ ifs >> always >> madvise;
272	274	}
273	275	ifs.close();
274	276

0 commit comments

Comments

0 (0)