Skip to content

Commit

Permalink
Avoid 128K kmem allocations in mzap_upgrade()
Browse files Browse the repository at this point in the history
As originally implemented the mzap_upgrade() function will
perform up to SPA_MAXBLOCKSIZE allocations using kmem_alloc().
These large allocations can potentially block indefinitely
if contiguous memory is not available.  Since this allocation
is done under the zap->zap_rwlock it can appear as if there is
a deadlock in zap_lockdir().  This is shown below.

The optimal fix for this would be to rework mzap_upgrade()
such that no large allocations are required.  This could be
done but it would result in us diverging further from the other
implementations.  Therefore I've opted against doing this
unless it becomes absolutely necessary.

Instead mzap_upgrade() has been updated to use zio_buf_alloc()
which can reliably provide buffers of up to SPA_MAXBLOCKSIZE.

Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Close #2580
  • Loading branch information
behlendorf committed Aug 11, 2014
1 parent 50b25b2 commit 4dd1893
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions module/zfs/zap_micro.c
Original file line number Diff line number Diff line change
Expand Up @@ -533,15 +533,15 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));

sz = zap->zap_dbuf->db_size;
mzp = kmem_alloc(sz, KM_PUSHPAGE | KM_NODEBUG);
mzp = zio_buf_alloc(sz);
bcopy(zap->zap_dbuf->db_data, mzp, sz);
nchunks = zap->zap_m.zap_num_chunks;

if (!flags) {
err = dmu_object_set_blocksize(zap->zap_objset, zap->zap_object,
1ULL << fzap_default_block_shift, 0, tx);
if (err) {
kmem_free(mzp, sz);
zio_buf_free(mzp, sz);
return (err);
}
}
Expand All @@ -567,7 +567,7 @@ mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags)
if (err)
break;
}
kmem_free(mzp, sz);
zio_buf_free(mzp, sz);
*zapp = zap;
return (err);
}
Expand Down

0 comments on commit 4dd1893

Please sign in to comment.