qemu: always define unknown_lock_type
PATCH 1/1 qemu: always define unknown_lock_type
From: Mingli Yu <[email protected]>
When use gcc 10.1.0 and debug build is enabled, there comes
below build failure:
| /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: /mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:25: undefined reference to `unknown_lock_type'
| /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: ../fsdev/qemu-fsdev-throttle.o: in function `fsdev_co_throttle_request': | /mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:103: undefined reference to `unknown_lock_type' | /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: ../fsdev/qemu-fsdev-throttle.o:/mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:103: more undefined references to `unknown_lock_type' follow | collect2: error: ld returned 1 exit status
So always define unknown_lock_type to fix the above error.
--- meta/recipes-devtools/qemu/qemu.inc | 1 + ...le.h-always-define-unknown_lock_type.patch | 48 +++++++++++++++++++ meta/recipes-devtools/qemu/qemu_5.1.0.bb | 5 -- 3 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-lockable.h-always-define-unknown_lock_type.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -30,6 +30,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0001-Add-enable-disable-udev.patch \ file://0001-qemu-Do-not-include-file-if-not-exists.patch \ file://find_datadir.patch \ + file://0001-lockable.h-always-define-unknown_lock_type.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/0001-lockable.h-always-define-unknown_lock_type.patch new file +48 -0
48 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu_5.1.0.bb +0 -5
@@ -10,11 +10,6 @@ DEPENDS = "glib-2.0 zlib pixman bison-native" RDEPENDS_${PN}_class-target += "bash" -# Does not compile for -Og because that level does not clean up dead-code. -# See lockable.h. -# -DEBUG_BUILD = "0" - EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}" EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
Signature · 1 line
2.26.2
Quoted 1 line · Mingli
+Upstream-Status: Submitted [qemu-devel mailing list]
https://lists.nongnu.org/archive/cgi-bin/namazu.cgi?query=unknown_lock_type&submit=Search%21&idxname=qemu-devel&max=20&result=normal&sort=score
doesn't find this patch, can you link to it please?
Ross
Quoted 6 lines · Ross Burton
Quoted 1 line · Mingli
+Upstream-Status: Submitted [qemu-devel mailing list]
https://lists.nongnu.org/archive/cgi-bin/namazu.cgi?query=unknown_lock_type&submit=Search%21&idxname=qemu-devel&max=20&result=normal&sort=score
doesn't find this patch, can you link to it please?
Hi Ross,
The link is https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html, will include the link in V2.
Thanks,
Quoted 2 lines
Ross
Quoted 8 lines · Mingli
Quoted 5 lines · Ross Burton
Quoted 1 line · Mingli
+Upstream-Status: Submitted [qemu-devel mailing list]
Quoted 8 lines
Quoted 2 lines
doesn't find this patch, can you link to it please?
Hi Ross,
The link is
https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html,
will include the link in V2.
are you compiling without __OPTIMIZE__ defined ? qemu may not work without it.
Quoted 8 lines
Thanks,
Quoted 2 lines
Ross
Quoted 14 lines · Khem Raj
Quoted 11 lines · Mingli
Quoted 7 lines · Ross Burton
Quoted 1 line · Mingli
+Upstream-Status: Submitted [qemu-devel mailing list]
doesn't find this patch, can you link to it please?
Quoted 7 lines
Quoted 5 lines
Hi Ross,
The link is
https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html,
will include the link in V2.are you compiling without
__OPTIMIZE__defined ? qemu may not work
Hi Khem,
I didn't especially customize something for __OPTIMIZE__, could you help guide where to define it?
Thanks,
Quoted 10 lines
without it.
Quoted 8 lines
Thanks,
Quoted 2 lines
Ross
Quoted 25 lines · Mingli
Quoted 22 lines · Khem Raj
Quoted 18 lines · Mingli
Quoted 9 lines · Ross Burton
Quoted 1 line · Mingli
+Upstream-Status: Submitted [qemu-devel mailing list]
doesn't find this patch, can you link to it please?
Hi Ross,
The link is
https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html,
will include the link in V2.
Quoted 6 lines
Quoted 1 line
are you compiling without
__OPTIMIZE__defined ? qemu may not workHi Khem,
I didn't especially customize something for __OPTIMIZE__, could you help guide where to define it?
perhaps you are not using one of -O<n> option ?
Quoted 13 lines
Thanks,
Quoted 10 lines
without it.
Quoted 8 lines
Thanks,
Quoted 2 lines
Ross
Quoted 28 lines · Khem Raj
Quoted 25 lines · Mingli
Quoted 22 lines · Khem Raj
Quoted 18 lines · Mingli
Quoted 9 lines · Ross Burton
Quoted 1 line · Mingli
+Upstream-Status: Submitted [qemu-devel mailing list]
doesn't find this patch, can you link to it please?
Hi Ross,
The link is
https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html,
will include the link in V2.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
are you compiling without
__OPTIMIZE__defined ? qemu may not workHi Khem,
I didn't especially customize something for __OPTIMIZE__, could you help guide where to define it?
perhaps you are not using one of -O<n> option ?
-Og passed to the compiler as DEBUG_BUILD = "1" defined in local.conf.
Thanks,
Quoted 14 lines
Quoted 14 lines
Thanks,
Quoted 10 lines
without it.
Quoted 8 lines
Thanks,
Quoted 2 lines
Ross
Quoted 34 lines · Mingli
Quoted 30 lines · Khem Raj
Quoted 27 lines · Mingli
Quoted 23 lines · Khem Raj
Quoted 10 lines · Mingli
Quoted 7 lines · Ross Burton
Quoted 1 line · Mingli
+Upstream-Status: Submitted [qemu-devel mailing list]
Quoted 8 lines
Quoted 2 lines
doesn't find this patch, can you link to it please?
Hi Ross,
The link is
https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html,
will include the link in V2.are you compiling without
__OPTIMIZE__defined ? qemu may not work
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Hi Khem,
I didn't especially customize something for
__OPTIMIZE__, could you help guide where to define it?perhaps you are not using one of -O<n> option ?
-Og passed to the compiler as
DEBUG_BUILD= "1" defined in local.conf.
Does qemu work when built with -Og
Your patch makes the error always occur at run time. We can preserve the intent of producing an error at link time with the attached patch which was NOT accepted upstream. I think they do not like the name QLNULL. In any event, it does work for all optimizations and applies to the latest master branch of qemu.
Joe
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Khem Raj
Sent: Monday, September 14, 2020 8:23 AM
To: Yu, Mingli <[email protected]>
Cc: Ross Burton <[email protected]>; OE-core <[email protected]>
Subject: Re: [OE-core] [PATCH] qemu: always define unknown_lock_type
Quoted 38 lines · Mingli
Quoted 34 lines · Khem Raj
Quoted 31 lines · Mingli
Quoted 27 lines · Khem Raj
Quoted 16 lines · Mingli
Quoted 12 lines · Ross Burton
Quoted 1 line · Mingli
+Upstream-Status: Submitted [qemu-devel mailing list]
https://lists.nongnu.org/archive/cgi-bin/namazu.cgi?query=unknow
n_lock_type&submit=Search%21&idxname=qemu-devel&max=20&result=no rmal&sort=scoredoesn't find this patch, can you link to it please?
Quoted 6 lines
Hi Ross,
The link is
https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873
.html,
will include the link in V2.are you compiling without
__OPTIMIZE__defined ? qemu may not work
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Hi Khem,
I didn't especially customize something for
__OPTIMIZE__, could you help guide where to define it?perhaps you are not using one of -O<n> option ?
-Og passed to the compiler as
DEBUG_BUILD= "1" defined in local.conf.
Does qemu work when built with -Og
From b85299fc301440b661bfc4805f366073fc1dda62 Mon Sep 17 00:00:00 2001
From: Joe Slater <[email protected]>
Date: Wed, 3 Jun 2020 11:37:03 -0700
Subject: [oe-core][PATCH 1/1] lockable: use QLNULL for a null lockable
Allows us to build with -Og and optimizations that do not clean up dead-code.
If we use QLNULL for null lockables, we can always use referencing unknown_lock_type as a link time error indicator.
--- block/block-backend.c | 4 ++-- block/block-copy.c | 2 +- block/mirror.c | 4 ++-- fsdev/qemu-fsdev-throttle.c | 6 +++--- hw/9pfs/9p.c | 2 +- include/qemu/lockable.h | 20 ++++++++------------ util/qemu-co-shared-resource.c | 2 +- 7 files changed, 18 insertions(+), 22 deletions(-)
block/block-backend.c +2 -2
@@ -1176,7 +1176,7 @@ static void coroutine_fn blk_wait_while_drained(BlockBackend *blk)if (blk->quiesce_counter && !blk->disable_request_queuing) {blk_dec_in_flight (blk); -qemu_co_queue_wait (&blk->queued_requests,NULL ); +qemu_co_queue_wait (&blk->queued_requests,QLNULL );blk_inc_in_flight (blk); } }
@@ -2380,7 +2380,7 @@ static void blk_root_drained_end(BdrvChild *child, int *drained_end_counter)if (blk->dev_ops && blk->dev_ops->drained_end) { blk->dev_ops->drained_end (blk->dev_opaque); } -while (qemu_co_enter_next (&blk->queued_requests,NULL )) { +while (qemu_co_enter_next (&blk->queued_requests,QLNULL )) {/* Resume all queued requests */ } }
block/block-copy.c +1 -1
@@ -120,7 +120,7 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t offset,return false; } -qemu_co_queue_wait (&task->wait_queue,NULL ); +qemu_co_queue_wait (&task->wait_queue,QLNULL );return true; }
block/mirror.c +2 -2
@@ -158,7 +158,7 @@ static void coroutine_fn mirror_wait_on_conflicts(MirrorOp *self,if (ranges_overlap (self_start_chunk, self_nb_chunks, op_start_chunk, op_nb_chunks)) { -qemu_co_queue_wait (&op->waiting_requests,NULL ); +qemu_co_queue_wait (&op->waiting_requests,QLNULL );break ; } }
@@ -298,7 +298,7 @@ mirror_wait_for_any_operation(MirrorBlockJob *s, bool active)if (!op->is_pseudo_op && op->is_in_flight && op->is_active_write == active) { -qemu_co_queue_wait (&op->waiting_requests,NULL ); +qemu_co_queue_wait (&op->waiting_requests,QLNULL );return ; } }
fsdev/qemu-fsdev-throttle.c +3 -3
@@ -22,13 +22,13 @@static void fsdev_throttle_read_timer_cb (void *opaque) {FsThrottle *fst = opaque; -qemu_co_enter_next (&fst->throttled_reqs[false],NULL ); +qemu_co_enter_next (&fst->throttled_reqs[false],QLNULL ); }static void fsdev_throttle_write_timer_cb (void *opaque) {FsThrottle *fst = opaque; -qemu_co_enter_next (&fst->throttled_reqs[true],NULL ); +qemu_co_enter_next (&fst->throttled_reqs[true],QLNULL ); }int fsdev_throttle_parse_opts (QemuOpts *opts,FsThrottle *fst,Error **errp)
@@ -100,7 +100,7 @@ void coroutine_fn fsdev_co_throttle_request(FsThrottle *fst, bool is_write,if (throttle_enabled (&fst->cfg)) {if (throttle_schedule_timer (&fst->ts, &fst->tt, is_write) || !qemu_co_queue_empty (&fst->throttled_reqs[is_write])) { -qemu_co_queue_wait (&fst->throttled_reqs[is_write],NULL ); +qemu_co_queue_wait (&fst->throttled_reqs[is_write],QLNULL ); }throttle_account (&fst->ts, is_write,iov_size (iov, iovcnt));
hw/9pfs/9p.c +1 -1
@@ -2891,7 +2891,7 @@ static void coroutine_fn v9fs_flush(void *opaque)/* * Wait for pdu to complete. */ -qemu_co_queue_wait (&cancel_pdu->complete,NULL ); +qemu_co_queue_wait (&cancel_pdu->complete,QLNULL );if (!qemu_co_queue_next (&cancel_pdu->complete)) { cancel_pdu->cancelled =0 ;pdu_free (cancel_pdu);
include/qemu/lockable.h +8 -12
@@ -24,18 +24,14 @@ struct QemuLockable {QemuLockUnlockFunc *unlock; }; -/* This function gives an error if an invalid, non-NULL pointer type is passed -* to QEMU_MAKE_LOCKABLE. For optimized builds, we can rely on dead-code elimination -* from the compiler, and give the errors already at link time. +/* +* If unknown_lock_type() is referenced, it means we have tried to passed something +* not recognized as lockable to the macros below. Use QLNULL to intentionally pass +* a null lockable. Using NULL will cause (unused) references to unknown_lock_type() +* which may or may not be eliminated by optimization. */ -#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) +#define QLNULL ((QemuLockable *)NULL)void unknown_lock_type (void *); -#else -static inline void unknown_lock_type (void *unused) -{ -abort (); -} -#endif static inline __attribute__((__always_inline__))QemuLockable *qemu_make_lockable (void *x,QemuLockable *lockable)
@@ -46,7 +42,7 @@ qemu_make_lockable(void *x, QemuLockable *lockable)return x ? lockable :NULL ; } -/* Auxiliary macros to simplify QEMU_MAKE_LOCABLE. */ +/* Auxiliary macros to simplify QEMU_MAKE_LOCKABLE. */ #define QEMU_LOCK_FUNC (x) ((QemuLockUnlockFunc *) \ QEMU_GENERIC(x, \ (QemuMutex *, qemu_mutex_lock), \
@@ -79,7 +75,7 @@ qemu_make_lockable(void *x, QemuLockable *lockable)* * Returns a QemuLockable object that can be passed around * to a function that can operate with locks of any kind, or -* NULL if @x is %NULL. +* NULL if @x is %QLNULL. */ #define QEMU_MAKE_LOCKABLE (x) \ QEMU_GENERIC(x, \
util/qemu-co-shared-resource.c +1 -1
@@ -64,7 +64,7 @@ void coroutine_fn co_get_from_shres(SharedResource *s, uint64_t n) {assert (n <= s->total);while (!co_try_get_from_shres (s, n)) { -qemu_co_queue_wait (&s->queue,NULL ); +qemu_co_queue_wait (&s->queue,QLNULL ); } }
Signature · 1 line
2.17.1
Quoted 5 lines · Khem Raj
Quoted 3 lines
Quoted 1 line
perhaps you are not using one of -O<n> option ?
-Og passed to the compiler as
DEBUG_BUILD= "1" defined in local.conf.Does qemu work when built with -Og
This is the pertinent question. If qemu doesn't run after un-upstreamable patches when built with -Og, what's the point? Debuggable code that you can't execute serves no purpose.
If qemu *needs* to be optimised to actually execute then override DEBUG_BUILD to optimise at the lowest usable level.
Ross
Quoted 6 lines · Ross Burton
Quoted 4 lines · Khem Raj
Quoted 3 lines
Quoted 1 line
perhaps you are not using one of -O<n> option ?
-Og passed to the compiler as
DEBUG_BUILD= "1" defined in local.conf.
Quoted 8 lines
Quoted 1 line
Does qemu work when built with -Og
This is the pertinent question. If qemu doesn't run after un-upstreamable patches when built with -Og, what's the point? Debuggable code that you can't execute serves no purpose.
If qemu *needs* to be optimised to actually execute then override
DEBUG_BUILDto optimise at the lowest usable level.
Thanks! Will sent a patch to override DEBUG_BUILD for qemu.
Quoted 6 lines
Ross