Skip to contentSkip to conversation

migration/rdma: clang compilation fix

PATCH Superseded Marcel Apfelbaum 3 participants 5 messages Mar 4, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 migration/rdma: clang compilation fix

Configuring QEMU with:

        ../configure --cc=clang --enable-rdma

Leads to compilation error:

CC migration/rdma.o
CC migration/block.o
qemu/migration/rdma.c:3615:58: error: taking address of packed member 'rkey' of class or structure

      'RDMARegisterResult' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
                            (uintptr_t)host_addr, NULL, &reg_result->rkey,
                                                         ^~~~~~~~~~~~~~~~

This is a false warning; even if RDMARegisterResult is "packed", rkey is the first field so is guaranteed to be aligned.

Fix it by disabling the warning only for this instance.

---
 migration/rdma.c | 3 +++
 1 file changed, 3 insertions(+)
migration/rdma.c +3 -0
index 54a3c11540..e0f66a4717 100644
@@ -3611,6 +3611,8 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
                 }
                 chunk_start = ram_chunk_start(block, chunk);
                 chunk_end = ram_chunk_end(block, chunk + reg->chunks);
+                #pragma clang diagnostic push
+                #pragma clang diagnostic ignored "-Waddress-of-packed-member"
                 if (qemu_rdma_register_and_get_keys(rdma, block,
                             (uintptr_t)host_addr, NULL, &reg_result->rkey,
                             chunk, chunk_start, chunk_end)) {
@@ -3618,6 +3620,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
                     ret = -EINVAL;
                     goto out;
                 }
+                #pragma clang diagnostic pop
 
                 reg_result->host_addr = (uintptr_t)block->local_host_addr;
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 8 lines · Marcel Apfelbaum

Configuring QEMU with:

         ../configure --cc=clang --enable-rdma

Leads to compilation error:

CC migration/rdma.o
CC migration/block.o
qemu/migration/rdma.c:3615:58: error: taking address of packed member 'rkey' of class or structure

Quoted 6 lines
       'RDMARegisterResult' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
                             (uintptr_t)host_addr, NULL, &reg_result->rkey,
                                                          ^~~~~~~~~~~~~~~~

This is a false warning; even if RDMARegisterResult is "packed", rkey is the first field so is guaranteed to be aligned.

Not so. If you packed struct, gcc is free to abut that struct next to some other unaligned field in a larger struct:

https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg06743.html

Quoted 2 lines

Fix it by disabling the warning only for this instance.

Ignoring the bug is not the same as fixing the bug. You need to rework this, as the compiler warning is not a false negative.

Quoted 5 lines
---
  migration/rdma.c | 3 +++
  1 file changed, 3 insertions(+)
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#2 lore raw
Quoted 19 lines · * Eric Blake ([email protected]) wrote:
Quoted 8 lines · Marcel Apfelbaum

Configuring QEMU with:

         ../configure --cc=clang --enable-rdma

Leads to compilation error:

CC migration/rdma.o
CC migration/block.o
qemu/migration/rdma.c:3615:58: error: taking address of packed member 'rkey' of class or structure

Quoted 6 lines
       'RDMARegisterResult' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
                             (uintptr_t)host_addr, NULL, &reg_result->rkey,
                                                          ^~~~~~~~~~~~~~~~

This is a false warning; even if RDMARegisterResult is "packed", rkey is the first field so is guaranteed to be aligned.

Not so. If you packed struct, gcc is free to abut that struct next to some other unaligned field in a larger struct:

Quoted 7 lines

https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg06743.html

Quoted 2 lines

Fix it by disabling the warning only for this instance.

Ignoring the bug is not the same as fixing the bug. You need to rework this, as the compiler warning is not a false negative.

In this case it is, however, I think it's easy enough to work around; all we need is something like:

  uint23_t tmp_rkey;
                  if (qemu_rdma_register_and_get_keys(rdma, block,
                            (uintptr_t)host_addr, NULL, &tmp_rkey,
                            chunk, chunk_start, chunk_end)) {
                    error_report("cannot get rkey");
                    ret = -EINVAL;
                    goto out;
                  }
                  reg_result->rkey = tmp_rkey

Note that I think the structure pointed to by reg_result is visible over the wire, so we can't change it's (unfortunate) layout.

Dave

Quoted 9 lines
Quoted 5 lines
---
  migration/rdma.c | 3 +++
  1 file changed, 3 insertions(+)
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#3 lore raw

Hi David,

Quoted 27 lines · Dr. David Alan Gilbert
Quoted 15 lines · * Eric Blake ([email protected]) wrote:
Quoted 12 lines · Marcel Apfelbaum

Configuring QEMU with:

          ../configure --cc=clang --enable-rdma

Leads to compilation error:

CC migration/rdma.o
CC migration/block.o
qemu/migration/rdma.c:3615:58: error: taking address of packed member 'rkey' of class or structure
'RDMARegisterResult' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
(uintptr_t)host_addr, NULL, &reg_result->rkey,
^~~~~~~~~~~~~~~~

Quoted 2 lines

This is a false warning; even if RDMARegisterResult is "packed", rkey is the first field so is guaranteed to be aligned.

Quoted 8 lines

Not so. If you packed struct, gcc is free to abut that struct next to some other unaligned field in a larger struct:

https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg06743.html

Quoted 1 line

Fix it by disabling the warning only for this instance.

Ignoring the bug is not the same as fixing the bug. You need to rework this, as the compiler warning is not a false negative.

In this case it is, however, I think it's easy enough to work around; all we need is something like:

Quoted 9 lines
   uint23_t tmp_rkey;
                   if (qemu_rdma_register_and_get_keys(rdma, block,
                             (uintptr_t)host_addr, NULL, &tmp_rkey,
                             chunk, chunk_start, chunk_end)) {
                     error_report("cannot get rkey");
                     ret = -EINVAL;
                     goto out;
                   }
                   reg_result->rkey = tmp_rkey

Thanks for the suggestion, looks OK for me, I will re-spin.

Thanks,
Marcel

Quoted 15 lines

Note that I think the structure pointed to by reg_result is visible over the wire, so we can't change it's (unfortunate) layout.

Dave

Quoted 8 lines
Quoted 4 lines
---
   migration/rdma.c | 3 +++
   1 file changed, 3 insertions(+)
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#4 lore raw
In reply to Eric Blake
Quoted 13 lines · Eric Blake
Quoted 12 lines · Marcel Apfelbaum

Configuring QEMU with:
         ../configure --cc=clang --enable-rdma

Leads to compilation error:

   CC      migration/rdma.o
   CC      migration/block.o
   qemu/migration/rdma.c:3615:58: error: taking address of packed member 'rkey' of class or structure 'RDMARegisterResult' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] (uintptr_t)host_addr, NULL, &reg_result->rkey, ^~~~~~~~~~~~~~~~

Quoted 7 lines
Quoted 2 lines

This is a false warning; even if RDMARegisterResult is "packed", rkey is the first field so is guaranteed to be aligned.

Not so. If you packed struct, gcc is free to abut that struct next to some other unaligned field in a larger struct:

https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg06743.html

I wasn't referring to general case, but to this specific case. Actually gcc does not complain, only clang.

Anyway, Dave's suggestion is clean and works for me.

Thanks,
Marcel

Quoted 10 lines
Quoted 2 lines

Fix it by disabling the warning only for this instance.

Ignoring the bug is not the same as fixing the bug.  You need to rework this, as the compiler warning is not a false negative.

Quoted 5 lines

---
  migration/rdma.c | 3 +++

  1 file changed, 3 insertions(+)