Skip to content
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

Jump to bottom

Linux 5.16 compat: restore FSR and FSAVE #13236

Merged
merged 1 commit into from
Mar 19, 2022
Merged

Linux 5.16 compat: restore FSR and FSAVE #13236

merged 1 commit into from
Mar 19, 2022

Conversation

behlendorf
Copy link
Contributor

Motivation and Context

Issue #13210

Description

Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel. These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

How Has This Been Tested?

This change needs to be verified on hardware which does not support XSAVE.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@behlendorf
Linux 5.16 compat: restore FSR and FSAVE
6efc134 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue openzfs#13210
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Mar 18, 2022
@behlendorf behlendorf mentioned this pull request Mar 18, 2022
Merged
13 tasks
@AttilaFueloep
Copy link
Contributor

I spun up a Nehalem VM earlier today where I could reproduce this bug, going to test the fix on it.

AttilaFueloep
AttilaFueloep approved these changes Mar 18, 2022
View reviewed changes
Copy link
Contributor

@AttilaFueloep AttilaFueloep left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Tested this on a Nehalem VM. While a mprime -t immediately failed on the original version after starting a zpool scrub it survived 5 minutes with this patch applied.

Again, really sorry for screwing this up.

@behlendorf
Copy link
Contributor Author

@AttilaFueloep while you're all setup to test this, could you verify the fsave case as well by commenting out the fsr save/restore conditionals? We all missed it! I'm still not sure how I overlooked it when reviewing the change.

@AttilaFueloep
Copy link
Contributor

Just double-checked the Intel manual and that won't work, FSAVE won't save the SIMD registers, it just saves plain FPU state, so a CPU supporting SIMD instruction will also have the FXSAVE instruction.

@behlendorf
Copy link
Contributor Author

Ah well. At least since this restores those code paths to exactly what they were before the 5.16 change it should be quite well tested already.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Mar 19, 2022
@AttilaFueloep
Copy link
Contributor

Yeah, with the caveat that, unless we use some real (x87) floating point calculations somewhere, the FSAVE code path is never used. I'd say it's only there for completeness.

@behlendorf behlendorf merged commit 6b444cb into openzfs:master Mar 19, 2022
behlendorf added a commit that referenced this pull request Mar 19, 2022
@behlendorf
Linux 5.16 compat: restore FSR and FSAVE
9e3619c 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #13210
Closes #13236
@tonyhutter tonyhutter mentioned this pull request Mar 21, 2022
Merged
13 tasks
@duramuss
Copy link

I just fall into this when upgrading an old nehalem system. Shouldn't the 2.1.3 release be marked as a "do not use" release?

@tonyhutter
Copy link
Contributor

@duramuss zfs-2.1.4 was just released with the fix:
https://github.com/openzfs/zfs/releases/zfs-2.1.4

nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@behlendorf @nicman23
Linux 5.16 compat: restore FSR and FSAVE
f3f91c9 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@behlendorf @nicman23
Linux 5.16 compat: restore FSR and FSAVE
5aece60 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Sep 2, 2022
@behlendorf @lundman
Linux 5.16 compat: restore FSR and FSAVE
2a4c2a6 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
beren12 pushed a commit to beren12/zfs that referenced this pull request Sep 19, 2022
@behlendorf @beren12
Linux 5.16 compat: restore FSR and FSAVE
bde6b81 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
7c4473b 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
3380f82 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
b281cd2 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
f878f29 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
f297f14 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
0b4644d 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
52705eb 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
7fc804d 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
01842a8 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
f3954fb 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
6e5ffe8 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
7d81092 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@behlendorf @andrewc12
Linux 5.16 compat: restore FSR and FSAVE
3073909 
Commit 3b52ccd introduced a flaw where FSR and FSAVE are not restored
when using a Linux 5.16 kernel.  These instructions are only used when
XSAVE is not supported by the processor meaning only some systems will
encounter this issue.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Attila Fülöp <attila@fueloep.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#13210
Closes openzfs#13236
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonyhutter tonyhutter tonyhutter approved these changes

@AttilaFueloep AttilaFueloep AttilaFueloep approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@behlendorf @AttilaFueloep @duramuss @tonyhutter