Skip to content

Large Page Support for Code Issue: 16198 #21064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
suresh-srinivas wants to merge 29 commits into from
+346 −1
Closed

Large Page Support for Code Issue: 16198 #21064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0a76c7e
Initial Large Page (2M) support for node.js
suresh-srinivas Mar 23, 2018
fa0e324
Add support for checking if explicitHugePages and transparentHugePage…
suresh-srinivas Mar 26, 2018
fdb45cd
Added License headers
suresh-srinivas Mar 30, 2018
b7791c2
Get rid of waring messages & code cleanup
suresh-srinivas Mar 30, 2018
6631eea
Protect the large pages under #ifdef NODE_ENABLE_LARGE_CODE_PAGES and…
suresh-srinivas Apr 4, 2018
843089c
Added configure option to enable huge pages
uttampawar Apr 9, 2018
077bc01
Added else clause to set node_use_large_pages=false by default
uttampawar Apr 9, 2018
7bdd9fc
Merge branch 'configure_fixes' into 2M-Pages-For-Code-16198
uttampawar Apr 9, 2018
b91de5a
Finished adding checks at appropriate places to handle possible error…
uttampawar May 8, 2018
7ef956a
Changed return type for two function from void to int
uttampawar May 9, 2018
b02e7a9
Fixed lint errors.
uttampawar May 24, 2018
2af82b1
Added one more condition check for verify the start address of newly …
uttampawar May 26, 2018
cae9285
Fixed syntax error due to wring data type. int64 to int64_t
uttampawar May 30, 2018
30114b6
Removed explictHugePages code
suresh-srinivas May 30, 2018
39e1f0d
Merge branch 'add-checks' into 2M-Pages-For-Code-16198
suresh-srinivas May 30, 2018
49cd0de
Merge branch '2M-Pages-For-Code-16198' of https://github.intel.com/DS…
suresh-srinivas May 30, 2018
2dd9e8c
Added Large Page Support
suresh-srinivas May 30, 2018
51d0f02
Merge branch 'intel-large-pages' of https://github.com/suresh-sriniva…
suresh-srinivas May 31, 2018
2f672ee
Update PR based on feedback
suresh-srinivas Jun 1, 2018
31504cc
Addressing the additional PR feedback
suresh-srinivas Jun 3, 2018
f998c58
Fix the gypi style issue
suresh-srinivas Jun 3, 2018
9f15cfc
Update with stylistic changes (eg char* instead of char *, IsLargePag…
suresh-srinivas Jun 4, 2018
d6de361
Add additional guard so large pages is only under Linux and target_ar…
suresh-srinivas Jun 4, 2018
29c7d13
Style fixes according to the Node C++ Style Guide
suresh-srinivas Jun 4, 2018
9828036
Eliminate ld.script and use implicit script
suresh-srinivas Jun 7, 2018
600cf54
Add #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
suresh-srinivas Jun 7, 2018
bf259e2
Fix the test failures
suresh-srinivas Jun 7, 2018
f0a6dcb
Add detailed help message to configure --with-largepages
suresh-srinivas Jun 8, 2018
4610793
Fix style issues and created inline functions instead of macros for a…
suresh-srinivas Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Protect the large pages under #ifdef NODE_ENABLE_LARGE_CODE_PAGES and… 
… enable node_use_large_pages=true in configure and protect the node_large_page.cc and the link using node_use_large_pages
  • Loading branch information
@suresh-srinivas
suresh-srinivas committed Apr 4, 2018
commit 6631eea053a042ff3a820896fe3e95b6450075b6
3 changes: 3 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,9 @@ def configure_node(o):
else:
o['variables']['node_use_dtrace'] = 'false'

if flavor == 'linux':
o['variables']['node_use_large_pages'] = 'true'

if options.no_ifaddrs:
o['defines'] += ['SUNOS_NO_IFADDRS']

Expand Down
14 changes: 13 additions & 1 deletion node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@
'src/js_stream.cc',
'src/module_wrap.cc',
'src/node.cc',
'src/node_large_page.cc',
'src/node_api.cc',
'src/node_api.h',
'src/node_api_types.h',
Expand Down Expand Up @@ -581,6 +580,19 @@
'src/tls_wrap.h'
],
}],
[ 'node_use_large_pages=="true"', {
'defines': [ 'NODE_ENABLE_LARGE_CODE_PAGES=1' ],
# The current implementation of Large Pages is under Linux.
# Other implementations are possible but not currently supported.
#
'conditions': [
[ 'OS=="linux"', {
'sources': [
'src/node_large_page.cc'
],
}],
]
} ],
],
},
{
Expand Down
17 changes: 13 additions & 4 deletions node.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,24 @@
},
},
'conditions': [
['OS!="aix" and node_shared=="false"', {
['OS!="aix" and node_shared=="false" and node_use_large_pages=="true"', {
'ldflags': [
'-Wl,-T <(PRODUCT_DIR)/../../ld.script',
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Jun 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tested this on on other platforms than x86_64 Linux?

Copy link
Copy Markdown
Contributor Author

@suresh-srinivas suresh-srinivas Jun 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No only on x86_64 Linux, specifically Ubuntu 16.04 is what I have done most of my measurement and testing on.

Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Jun 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I figured as much. This needs an additional guard to ensure it's only activated when OS=="linux" and target_arch="x64".

Copy link
Copy Markdown
Contributor Author

@suresh-srinivas suresh-srinivas Jun 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks fixed it.

'-Wl,--whole-archive,<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)'
'uv<(STATIC_LIB_SUFFIX)',
'-Wl,--no-whole-archive',
]
}],

['OS!="aix" and node_shared=="false" and node_use_large_pages=="false"', {
'ldflags': [
'-Wl,-T <(PRODUCT_DIR)/../../ld.script',
'-Wl,--whole-archive,<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)'
'uv<(STATIC_LIB_SUFFIX)',
'-Wl,--no-whole-archive',
],

}],

],
}],
],
Expand Down Expand Up @@ -319,6 +329,5 @@
}, {
'defines': [ 'HAVE_OPENSSL=0' ]
}],

],
]
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Jun 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stylistic change, please undo.

}
9 changes: 6 additions & 3 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4485,9 +4485,12 @@ int Start(int argc, char** argv) {

CHECK_GT(argc, 0);

//#ifdef NODE_ENABLE_LARGE_CODE_PAGES
node::largepages::map_static_code_to_large_pages();
//#endif
#ifdef NODE_ENABLE_LARGE_CODE_PAGES
if (node::largepages::isLargePagesEnabled()) {
// fprintf(stderr, "Mapping static code to large pages\n");
node::largepages::map_static_code_to_large_pages();
}
#endif


Copy link
Copy Markdown
Member

@gireeshpunathil gireeshpunathil Jun 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason why we are doing it here, as opposed to the very beginning of everything, in main?

Copy link
Copy Markdown
Contributor Author

@suresh-srinivas suresh-srinivas Jun 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No particular reason. This was a place where other things were initialized like VTune support.

// Hack around with the argv pointer. Used for process.title = "blah".
Expand Down