* [Qemu-devel] [PATCH v2 0/1] blockjob: leak fix, remove from txn when failing early
@ 2018-03-28 14:09 Jeff Cody
2018-03-28 14:09 ` [Qemu-devel] [PATCH v2 1/1] " Jeff Cody
0 siblings, 1 reply; 5+ messages in thread
From: Jeff Cody @ 2018-03-28 14:09 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, jsnow, marcandre.lureau, mreitz, kwolf
This is Marc-André's patch with the updated content provided by John.
To make sure I've added John's bits to it in a way that both John and
Marc-André agree is correct, I've dropped all S-o-B's until they provide
them.
Jeff Cody (1):
blockjob: leak fix, remove from txn when failing early
blockjob.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
--
2.13.6
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH v2 1/1] blockjob: leak fix, remove from txn when failing early
2018-03-28 14:09 [Qemu-devel] [PATCH v2 0/1] blockjob: leak fix, remove from txn when failing early Jeff Cody
@ 2018-03-28 14:09 ` Jeff Cody
2018-03-28 14:28 ` Marc-André Lureau
0 siblings, 1 reply; 5+ messages in thread
From: Jeff Cody @ 2018-03-28 14:09 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, jsnow, marcandre.lureau, mreitz, kwolf
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2945 bytes --]
From: Marc-André Lureau <marcandre.lureau@redhat.com>
This fixes leaks found by ASAN such as:
GTESTER tests/test-blockjob
=================================================================
==31442==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 24 byte(s) in 1 object(s) allocated from:
#0 0x7f88483cba38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38)
#1 0x7f8845e1bd77 in g_malloc0 ../glib/gmem.c:129
#2 0x7f8845e1c04b in g_malloc0_n ../glib/gmem.c:360
#3 0x5584d2732498 in block_job_txn_new /home/elmarco/src/qemu/blockjob.c:172
#4 0x5584d2739b28 in block_job_create /home/elmarco/src/qemu/blockjob.c:973
#5 0x5584d270ae31 in mk_job /home/elmarco/src/qemu/tests/test-blockjob.c:34
#6 0x5584d270b1c1 in do_test_id /home/elmarco/src/qemu/tests/test-blockjob.c:57
#7 0x5584d270b65c in test_job_ids /home/elmarco/src/qemu/tests/test-blockjob.c:118
#8 0x7f8845e40b69 in test_case_run ../glib/gtestutils.c:2255
#9 0x7f8845e40f29 in g_test_run_suite_internal ../glib/gtestutils.c:2339
#10 0x7f8845e40fd2 in g_test_run_suite_internal ../glib/gtestutils.c:2351
#11 0x7f8845e411e9 in g_test_run_suite ../glib/gtestutils.c:2426
#12 0x7f8845e3fe72 in g_test_run ../glib/gtestutils.c:1692
#13 0x5584d270d6e2 in main /home/elmarco/src/qemu/tests/test-blockjob.c:377
#14 0x7f8843641f29 in __libc_start_main (/lib64/libc.so.6+0x20f29)
Add an assert to make sure that the job doesn't have associated txn before free().
[Jeff Cody: N.B., used updated patch provided by John Snow]
---
blockjob.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index ef3ed69ff1..c510a9fde5 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -204,6 +204,15 @@ void block_job_txn_add_job(BlockJobTxn *txn, BlockJob *job)
block_job_txn_ref(txn);
}
+static void block_job_txn_del_job(BlockJob *job)
+{
+ if (job->txn) {
+ QLIST_REMOVE(job, txn_list);
+ block_job_txn_unref(job->txn);
+ job->txn = NULL;
+ }
+}
+
static void block_job_pause(BlockJob *job)
{
job->pause_count++;
@@ -232,6 +241,7 @@ void block_job_unref(BlockJob *job)
{
if (--job->refcnt == 0) {
assert(job->status == BLOCK_JOB_STATUS_NULL);
+ assert(!job->txn);
BlockDriverState *bs = blk_bs(job->blk);
QLIST_REMOVE(job, job_list);
bs->job = NULL;
@@ -392,6 +402,7 @@ static void block_job_decommission(BlockJob *job)
job->busy = false;
job->paused = false;
job->deferred_to_main_loop = true;
+ block_job_txn_del_job(job);
block_job_state_transition(job, BLOCK_JOB_STATUS_NULL);
block_job_unref(job);
}
@@ -481,8 +492,7 @@ static int block_job_finalize_single(BlockJob *job)
}
}
- QLIST_REMOVE(job, txn_list);
- block_job_txn_unref(job->txn);
+ block_job_txn_del_job(job);
block_job_conclude(job);
return 0;
}
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/1] blockjob: leak fix, remove from txn when failing early
2018-03-28 14:09 ` [Qemu-devel] [PATCH v2 1/1] " Jeff Cody
@ 2018-03-28 14:28 ` Marc-André Lureau
2018-03-28 17:16 ` John Snow
2018-03-28 18:20 ` Jeff Cody
0 siblings, 2 replies; 5+ messages in thread
From: Marc-André Lureau @ 2018-03-28 14:28 UTC (permalink / raw)
To: Jeff Cody; +Cc: qemu-devel, qemu-block, jsnow, mreitz, Wolf, Kevin
On Wed, Mar 28, 2018 at 4:09 PM, Jeff Cody <jcody@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> This fixes leaks found by ASAN such as:
> GTESTER tests/test-blockjob
> =================================================================
> ==31442==ERROR: LeakSanitizer: detected memory leaks
>
> Direct leak of 24 byte(s) in 1 object(s) allocated from:
> #0 0x7f88483cba38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38)
> #1 0x7f8845e1bd77 in g_malloc0 ../glib/gmem.c:129
> #2 0x7f8845e1c04b in g_malloc0_n ../glib/gmem.c:360
> #3 0x5584d2732498 in block_job_txn_new /home/elmarco/src/qemu/blockjob.c:172
> #4 0x5584d2739b28 in block_job_create /home/elmarco/src/qemu/blockjob.c:973
> #5 0x5584d270ae31 in mk_job /home/elmarco/src/qemu/tests/test-blockjob.c:34
> #6 0x5584d270b1c1 in do_test_id /home/elmarco/src/qemu/tests/test-blockjob.c:57
> #7 0x5584d270b65c in test_job_ids /home/elmarco/src/qemu/tests/test-blockjob.c:118
> #8 0x7f8845e40b69 in test_case_run ../glib/gtestutils.c:2255
> #9 0x7f8845e40f29 in g_test_run_suite_internal ../glib/gtestutils.c:2339
> #10 0x7f8845e40fd2 in g_test_run_suite_internal ../glib/gtestutils.c:2351
> #11 0x7f8845e411e9 in g_test_run_suite ../glib/gtestutils.c:2426
> #12 0x7f8845e3fe72 in g_test_run ../glib/gtestutils.c:1692
> #13 0x5584d270d6e2 in main /home/elmarco/src/qemu/tests/test-blockjob.c:377
> #14 0x7f8843641f29 in __libc_start_main (/lib64/libc.so.6+0x20f29)
>
> Add an assert to make sure that the job doesn't have associated txn before free().
>
> [Jeff Cody: N.B., used updated patch provided by John Snow]
Looks good to me, so :)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
thanks
>
> ---
> blockjob.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/blockjob.c b/blockjob.c
> index ef3ed69ff1..c510a9fde5 100644
> --- a/blockjob.c
> +++ b/blockjob.c
> @@ -204,6 +204,15 @@ void block_job_txn_add_job(BlockJobTxn *txn, BlockJob *job)
> block_job_txn_ref(txn);
> }
>
> +static void block_job_txn_del_job(BlockJob *job)
> +{
> + if (job->txn) {
> + QLIST_REMOVE(job, txn_list);
> + block_job_txn_unref(job->txn);
> + job->txn = NULL;
> + }
> +}
> +
> static void block_job_pause(BlockJob *job)
> {
> job->pause_count++;
> @@ -232,6 +241,7 @@ void block_job_unref(BlockJob *job)
> {
> if (--job->refcnt == 0) {
> assert(job->status == BLOCK_JOB_STATUS_NULL);
> + assert(!job->txn);
> BlockDriverState *bs = blk_bs(job->blk);
> QLIST_REMOVE(job, job_list);
> bs->job = NULL;
> @@ -392,6 +402,7 @@ static void block_job_decommission(BlockJob *job)
> job->busy = false;
> job->paused = false;
> job->deferred_to_main_loop = true;
> + block_job_txn_del_job(job);
> block_job_state_transition(job, BLOCK_JOB_STATUS_NULL);
> block_job_unref(job);
> }
> @@ -481,8 +492,7 @@ static int block_job_finalize_single(BlockJob *job)
> }
> }
>
> - QLIST_REMOVE(job, txn_list);
> - block_job_txn_unref(job->txn);
> + block_job_txn_del_job(job);
> block_job_conclude(job);
> return 0;
> }
> --
> 2.13.6
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/1] blockjob: leak fix, remove from txn when failing early
2018-03-28 14:28 ` Marc-André Lureau
@ 2018-03-28 17:16 ` John Snow
2018-03-28 18:20 ` Jeff Cody
1 sibling, 0 replies; 5+ messages in thread
From: John Snow @ 2018-03-28 17:16 UTC (permalink / raw)
To: Marc-André Lureau, Jeff Cody
Cc: qemu-devel, qemu-block, mreitz, Wolf, Kevin
On 03/28/2018 10:28 AM, Marc-André Lureau wrote:
> On Wed, Mar 28, 2018 at 4:09 PM, Jeff Cody <jcody@redhat.com> wrote:
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> This fixes leaks found by ASAN such as:
>> GTESTER tests/test-blockjob
>> =================================================================
>> ==31442==ERROR: LeakSanitizer: detected memory leaks
>>
>> Direct leak of 24 byte(s) in 1 object(s) allocated from:
>> #0 0x7f88483cba38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38)
>> #1 0x7f8845e1bd77 in g_malloc0 ../glib/gmem.c:129
>> #2 0x7f8845e1c04b in g_malloc0_n ../glib/gmem.c:360
>> #3 0x5584d2732498 in block_job_txn_new /home/elmarco/src/qemu/blockjob.c:172
>> #4 0x5584d2739b28 in block_job_create /home/elmarco/src/qemu/blockjob.c:973
>> #5 0x5584d270ae31 in mk_job /home/elmarco/src/qemu/tests/test-blockjob.c:34
>> #6 0x5584d270b1c1 in do_test_id /home/elmarco/src/qemu/tests/test-blockjob.c:57
>> #7 0x5584d270b65c in test_job_ids /home/elmarco/src/qemu/tests/test-blockjob.c:118
>> #8 0x7f8845e40b69 in test_case_run ../glib/gtestutils.c:2255
>> #9 0x7f8845e40f29 in g_test_run_suite_internal ../glib/gtestutils.c:2339
>> #10 0x7f8845e40fd2 in g_test_run_suite_internal ../glib/gtestutils.c:2351
>> #11 0x7f8845e411e9 in g_test_run_suite ../glib/gtestutils.c:2426
>> #12 0x7f8845e3fe72 in g_test_run ../glib/gtestutils.c:1692
>> #13 0x5584d270d6e2 in main /home/elmarco/src/qemu/tests/test-blockjob.c:377
>> #14 0x7f8843641f29 in __libc_start_main (/lib64/libc.so.6+0x20f29)
>>
>> Add an assert to make sure that the job doesn't have associated txn before free().
>>
>> [Jeff Cody: N.B., used updated patch provided by John Snow]
>
> Looks good to me, so :)
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> thanks
Thanks for catching it!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/1] blockjob: leak fix, remove from txn when failing early
2018-03-28 14:28 ` Marc-André Lureau
2018-03-28 17:16 ` John Snow
@ 2018-03-28 18:20 ` Jeff Cody
1 sibling, 0 replies; 5+ messages in thread
From: Jeff Cody @ 2018-03-28 18:20 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: qemu-devel, qemu-block, jsnow, mreitz, Wolf, Kevin
On Wed, Mar 28, 2018 at 04:28:05PM +0200, Marc-André Lureau wrote:
> On Wed, Mar 28, 2018 at 4:09 PM, Jeff Cody <jcody@redhat.com> wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > This fixes leaks found by ASAN such as:
> > GTESTER tests/test-blockjob
> > =================================================================
> > ==31442==ERROR: LeakSanitizer: detected memory leaks
> >
> > Direct leak of 24 byte(s) in 1 object(s) allocated from:
> > #0 0x7f88483cba38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38)
> > #1 0x7f8845e1bd77 in g_malloc0 ../glib/gmem.c:129
> > #2 0x7f8845e1c04b in g_malloc0_n ../glib/gmem.c:360
> > #3 0x5584d2732498 in block_job_txn_new /home/elmarco/src/qemu/blockjob.c:172
> > #4 0x5584d2739b28 in block_job_create /home/elmarco/src/qemu/blockjob.c:973
> > #5 0x5584d270ae31 in mk_job /home/elmarco/src/qemu/tests/test-blockjob.c:34
> > #6 0x5584d270b1c1 in do_test_id /home/elmarco/src/qemu/tests/test-blockjob.c:57
> > #7 0x5584d270b65c in test_job_ids /home/elmarco/src/qemu/tests/test-blockjob.c:118
> > #8 0x7f8845e40b69 in test_case_run ../glib/gtestutils.c:2255
> > #9 0x7f8845e40f29 in g_test_run_suite_internal ../glib/gtestutils.c:2339
> > #10 0x7f8845e40fd2 in g_test_run_suite_internal ../glib/gtestutils.c:2351
> > #11 0x7f8845e411e9 in g_test_run_suite ../glib/gtestutils.c:2426
> > #12 0x7f8845e3fe72 in g_test_run ../glib/gtestutils.c:1692
> > #13 0x5584d270d6e2 in main /home/elmarco/src/qemu/tests/test-blockjob.c:377
> > #14 0x7f8843641f29 in __libc_start_main (/lib64/libc.so.6+0x20f29)
> >
> > Add an assert to make sure that the job doesn't have associated txn before free().
> >
> > [Jeff Cody: N.B., used updated patch provided by John Snow]
>
> Looks good to me, so :)
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> thanks
Thanks,
Applied to my block branch:
git://github.com/codyprime/qemu-kvm-jtc block
-Jeff
>
> >
> > ---
> > blockjob.c | 14 ++++++++++++--
> > 1 file changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/blockjob.c b/blockjob.c
> > index ef3ed69ff1..c510a9fde5 100644
> > --- a/blockjob.c
> > +++ b/blockjob.c
> > @@ -204,6 +204,15 @@ void block_job_txn_add_job(BlockJobTxn *txn, BlockJob *job)
> > block_job_txn_ref(txn);
> > }
> >
> > +static void block_job_txn_del_job(BlockJob *job)
> > +{
> > + if (job->txn) {
> > + QLIST_REMOVE(job, txn_list);
> > + block_job_txn_unref(job->txn);
> > + job->txn = NULL;
> > + }
> > +}
> > +
> > static void block_job_pause(BlockJob *job)
> > {
> > job->pause_count++;
> > @@ -232,6 +241,7 @@ void block_job_unref(BlockJob *job)
> > {
> > if (--job->refcnt == 0) {
> > assert(job->status == BLOCK_JOB_STATUS_NULL);
> > + assert(!job->txn);
> > BlockDriverState *bs = blk_bs(job->blk);
> > QLIST_REMOVE(job, job_list);
> > bs->job = NULL;
> > @@ -392,6 +402,7 @@ static void block_job_decommission(BlockJob *job)
> > job->busy = false;
> > job->paused = false;
> > job->deferred_to_main_loop = true;
> > + block_job_txn_del_job(job);
> > block_job_state_transition(job, BLOCK_JOB_STATUS_NULL);
> > block_job_unref(job);
> > }
> > @@ -481,8 +492,7 @@ static int block_job_finalize_single(BlockJob *job)
> > }
> > }
> >
> > - QLIST_REMOVE(job, txn_list);
> > - block_job_txn_unref(job->txn);
> > + block_job_txn_del_job(job);
> > block_job_conclude(job);
> > return 0;
> > }
> > --
> > 2.13.6
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-28 18:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-28 14:09 [Qemu-devel] [PATCH v2 0/1] blockjob: leak fix, remove from txn when failing early Jeff Cody
2018-03-28 14:09 ` [Qemu-devel] [PATCH v2 1/1] " Jeff Cody
2018-03-28 14:28 ` Marc-André Lureau
2018-03-28 17:16 ` John Snow
2018-03-28 18:20 ` Jeff Cody
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.