c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

dmu_zfetch: fix memory leak

Browse Source 
The last change caused the read completion callback to not be called
if the IO was still in progress. This change restores allocation
of the arc buf callback, but in the callback path checks the new
acb_nobuf field to know to skip buffer allocation.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #11324
This commit is contained in:
Matthew Macy 2020-12-12 16:00:00 -08:00 committed by GitHub
parent c76a40bfda
commit 923d730329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/arc_impl.h
View File

@ -99,6 +99,7 @@ struct arc_callback {
boolean_t acb_encrypted; boolean_t acb_encrypted;
boolean_t acb_compressed; boolean_t acb_compressed;
boolean_t acb_noauth; boolean_t acb_noauth;
boolean_t acb_nobuf;
zbookmark_phys_t acb_zb; zbookmark_phys_t acb_zb;
zio_t *acb_zio_dummy; zio_t *acb_zio_dummy;
zio_t *acb_zio_head; zio_t *acb_zio_head;

7
module/zfs/arc.c
View File

@ -5759,7 +5759,7 @@ arc_read_done(zio_t *zio)
*/ */
int callback_cnt = 0; int callback_cnt = 0;
for (acb = callback_list; acb != NULL; acb = acb->acb_next) { for (acb = callback_list; acb != NULL; acb = acb->acb_next) {
if (!acb->acb_done) if (!acb->acb_done || acb->acb_nobuf)
continue; continue;
callback_cnt++; callback_cnt++;
@ -5999,7 +5999,7 @@ top:
} }
ASSERT(*arc_flags & ARC_FLAG_NOWAIT); ASSERT(*arc_flags & ARC_FLAG_NOWAIT);
if (done && !no_buf) { if (done) {
arc_callback_t *acb = NULL; arc_callback_t *acb = NULL;
acb = kmem_zalloc(sizeof (arc_callback_t), acb = kmem_zalloc(sizeof (arc_callback_t),
@ -6009,6 +6009,7 @@ top:
acb->acb_compressed = compressed_read; acb->acb_compressed = compressed_read;
acb->acb_encrypted = encrypted_read; acb->acb_encrypted = encrypted_read;
acb->acb_noauth = noauth_read; acb->acb_noauth = noauth_read;
acb->acb_nobuf = no_buf;
acb->acb_zb = *zb; acb->acb_zb = *zb;
if (pio != NULL) if (pio != NULL)
acb->acb_zio_dummy = zio_null(pio, acb->acb_zio_dummy = zio_null(pio,
@ -6018,8 +6019,6 @@ top:
acb->acb_zio_head = head_zio; acb->acb_zio_head = head_zio;
acb->acb_next = hdr->b_l1hdr.b_acb; acb->acb_next = hdr->b_l1hdr.b_acb;
hdr->b_l1hdr.b_acb = acb; hdr->b_l1hdr.b_acb = acb;
mutex_exit(hash_lock);
goto out;
} }
mutex_exit(hash_lock); mutex_exit(hash_lock);
goto out; goto out;