Fix object reclaim when using large dnodes #7433
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@morphinz is testing this PR now (for his system which is exhibiting the problem) and I will be adding a test case on Monday. |
behlendorf
requested changes
Apr 13, 2018
module/zfs/dnode.c
Outdated
| @@ -676,6 +676,7 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, | |||
| ASSERT(DMU_OT_IS_VALID(bonustype)); | |||
| ASSERT3U(bonuslen, <=, | |||
| DN_BONUS_SIZE(spa_maxdnodesize(dmu_objset_spa(dn->dn_objset)))); | |||
| ASSERT3U(bonuslen, <=, DN_BONUS_SIZE(dn_slots << DNODE_SHIFT)); | |||
There was a problem hiding this comment.
With this ASSERT in place passing a dn_slots == 0 no longer makes sense. This is exactly what dmu_object_reclaim() does, it will need to be updated. The following line could also be removed since it's no longer useful.
There was a problem hiding this comment.
Will do. Apologies. I meant to make this a WIP until l had the chance to write tests for it. I should have that done on Monday.
tcaputi
force-pushed
the
dnode_reclaim_fix
branch
from
9ac1457 to
d61aa12
Compare
behlendorf
approved these changes
Apr 16, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Fixes: openzfs#7097 Signed-off-by: Tom Caputi <[email protected]>
tcaputi
force-pushed
the
dnode_reclaim_fix
branch
from
d61aa12 to
27c5713
Compare
behlendorf
approved these changes
Apr 16, 2018
Codecov Report
@@ Coverage Diff @@
## master #7433 +/- ##
==========================================
- Coverage 76.53% 76.16% -0.37%
==========================================
Files 335 330 -5
Lines 107100 104295 -2805
==========================================
- Hits 81965 79441 -2524
+ Misses 25135 24854 -281
Continue to review full report at Codecov.
|
dweeezil
pushed a commit
to dweeezil/zfs
that referenced
this pull request
Aug 27, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
dweeezil
pushed a commit
to dweeezil/zfs
that referenced
this pull request
Aug 28, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
dweeezil
pushed a commit
to dweeezil/zfs
that referenced
this pull request
Aug 28, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 28, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 28, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 30, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 30, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 30, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Sep 5, 2018
Currently, when the receive_object() code wants to reclaim an object, it always assumes that the dnode is the legacy 512 bytes, even when the incoming bonus buffer exceeds this length. This causes a buffer overflow if --enable-debug is not provided and triggers an ASSERT if it is. This patch resolves this issue and adds an ASSERT to ensure this can't happen again. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#7097 Closes openzfs#7433
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, when the receive_object() code wants to reclaim an
object, it always assumes that the dnode is the legacy 512 bytes,
even when the incoming bonus buffer exceeds this length. This
causes a buffer overflow if --enable-debug is not provided and
triggers an ASSERT if it is. This patch resolves this issue and
adds an ASSERT to ensure this can't happen again.
Fixes: #7097
Signed-off-by: Tom Caputi [email protected]
Types of changes
Checklist:
Signed-off-by.