-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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.
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
8312014: [s390x] TestSigInfoInHsErrFile.java Failure #14888
Conversation
👋 Welcome back sid8606! A progress list of the required criteria for merging this PR into |
Webrevs
|
@@ -207,7 +207,7 @@ class VMError : public AllStatic { | |||
DEBUG_ONLY(static void controlled_crash(int how);) | |||
|
|||
// Non-null address guaranteed to generate a SEGV mapping error on read, for test purposes. | |||
static constexpr intptr_t segfault_address = AIX_ONLY(-1) NOT_AIX(1 * K); | |||
static constexpr intptr_t segfault_address = AIX_ONLY(-1) NOT_AIX(4 * K); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we sure ARM & RISC-V will be happy with these changes, Maybe using S390_ONLY
will be appropriate(?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. And before we start cascading ifdefs here, please spread this definition out into the respective platform files. For the s390 version, could you please add a clear comment describing the reasoning? Do all s390 linux variants using 4K pages - is it valid to hardcode that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the reviews @tstuefe and @offamitkumar . The all linux variants on s390x uses 4K page setting.
I am making changes to move segfault_address to platform files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the reviews @tstuefe and @offamitkumar . The all linux variants on s390x uses 4K page setting.
I am making changes to move segfault_address to platform files.
Thank you @sid8606 .
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm surprised that not much more breaks. We rely a lot on si_addr. Are we sure this is not a kernel bug on s390? Any chance to get this behavior changed on the kernel level?
@@ -207,7 +207,7 @@ class VMError : public AllStatic { | |||
DEBUG_ONLY(static void controlled_crash(int how);) | |||
|
|||
// Non-null address guaranteed to generate a SEGV mapping error on read, for test purposes. | |||
static constexpr intptr_t segfault_address = AIX_ONLY(-1) NOT_AIX(1 * K); | |||
static constexpr intptr_t segfault_address = AIX_ONLY(-1) NOT_AIX(4 * K); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. And before we start cascading ifdefs here, please spread this definition out into the respective platform files. For the s390 version, could you please add a clear comment describing the reasoning? Do all s390 linux variants using 4K pages - is it valid to hardcode that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this looks good.
Cheers, Thomas
@sid8606 This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 61 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@tstuefe, @offamitkumar, @backwaterred) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
String crashAddress = Platform.isAix() ? "0xffffffffffffffff" : "0x0*400"; | ||
//All faults on s390x give the address only on page granularity. | ||
//Hence fault address is first page address. | ||
String crashAddress = Platform.isAix() ? "0xffffffffffffffff" : Platform.isS390x() ? "0x0*1000" : "0x0*400"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably we can create a if-else ladder here and move this comment inside that if/else block ? something like this:
if (AIX) {
crashAddress for AIX
} else if (S390) {
// your comment
crashAddress for S390
} else {
crashAddress for other archs
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have adapted this.
//All faults on s390x give the address only on page granularity. | ||
//Set Pdsegfault_address to minumum one page address. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
//All faults on s390x give the address only on page granularity. | |
//Set Pdsegfault_address to minumum one page address. | |
// All faults on s390x give the address only on page granularity. | |
// Set pd_segfault_address to minimum one page address. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed, Thanks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you need to commit these changes, They are not reflected as of now here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ahh, I missed that. Fixed.
@RealFYang and @backwaterred, your approval would be highly appreciated for this PR :-) |
@@ -30,6 +30,10 @@ | |||
|
|||
const int StackAlignmentInBytes = 16; | |||
|
|||
// All faults on s390x give the address only on page granularity. | |||
// Set Pdsegfault_address to miniumum one page address. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
// Set Pdsegfault_address to miniumum one page address. | |
// Set Pdsegfault_address to minimum one page address. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
Seems that this will only make a difference to zero and s390 (I am not familar with s390). And I see the test will fail with zero build on linux-aarch64 platform. So you might want to distinguish s390 for zero too. I think it will be safer to set |
Now with this commit test should pass on architectures than s390x. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Sid,
LGTM
Also note that the original |
Thank you for all the reviews which made this PR more mature. Tier1 tests are passing on fastdebug and slowdebug builds. Let's integrate this. |
/integrate |
const size_t pd_segfault_address = -1; | ||
#elif defined(S390) | ||
const size_t pd_segfault_address = 4096; | ||
#else | ||
const size_t pd_segfault_address = 1024; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Format police! I find it's a bit more readable to indent the non-macro lines.
#if defined(AIX)
const size_t pd_segfault_address = -1;
#elif ...
Ran it on AIX just to be sure, and the test still passes. I have noted one cosmetic suggestion. LGTM 😄 |
Ha. I guess I should have refreshed the page before sending my review & comment. /sponsor |
Going to push as commit 6f66213.
Your commit was automatically rebased without conflicts. |
@backwaterred @sid8606 Pushed as commit 6f66213. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
/backport jdk21u-dev |
@offamitkumar the backport was successfully created on the branch backport-offamitkumar-6f662130 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link: The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:
|
All faults on s390x give the address only on page granularity.
e.g. if you use 0x123456 as fail address you get si_addr = 0x123000
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14888/head:pull/14888
$ git checkout pull/14888
Update a local copy of the PR:
$ git checkout pull/14888
$ git pull https://git.openjdk.org/jdk.git pull/14888/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 14888
View PR using the GUI difftool:
$ git pr show -t 14888
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14888.diff
Webrev
Link to Webrev Comment