Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg] Fix the order of structures to adapt to the linu kernel #384

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

FrankXie05
Copy link

@FrankXie05 FrankXie05 commented May 22, 2024

Hi, all. I am the maintainer of vcpkg.

Recently we received a build error regarding gloo. microsoft/vcpkg#38852

Reproduce:

git clone https://github.com/microsoft/vcpkg
cd vcpkg/
./vcpkg install gloo:x64-linux

Error:

FAILED: gloo/CMakeFiles/gloo.dir/common/linux.cc.o 
/usr/bin/c++  -I/mnt/c/Kiko/Tools/vcpkg/buildtrees/gloo/src/4842d821e2-a23aea63a5.clean -I/mnt/c/Kiko/Tools/vcpkg/buildtrees/gloo/x64-linux-dbg -fPIC -std=c++11 -fPIC -g -MD -MT gloo/CMakeFiles/gloo.dir/common/linux.cc.o -MF gloo/CMakeFiles/gloo.dir/common/linux.cc.o.d -o gloo/CMakeFiles/gloo.dir/common/linux.cc.o -c /mnt/c/Kiko/Tools/vcpkg/buildtrees/gloo/src/4842d821e2-a23aea63a5.clean/gloo/common/linux.cc
In file included from /mnt/c/Kiko/Tools/vcpkg/buildtrees/gloo/src/4842d821e2-a23aea63a5.clean/gloo/common/linux.cc:15:
/usr/include/linux/ethtool.h: In function ‘int gloo::getInterfaceSpeedGLinkSettings(int, ifreq*)’:
/usr/include/linux/ethtool.h:2214:17: error: flexible array member ‘ethtool_link_settings::link_mode_masks’ not at end of ‘struct gloo::getInterfaceSpeedGLinkSettings(int, ifreq*)::<unnamed>’
 2214 |         __u32   link_mode_masks[];
      |                 ^~~~~~~~~~~~~~~
/mnt/c/Kiko/Tools/vcpkg/buildtrees/gloo/src/4842d821e2-a23aea63a5.clean/gloo/common/linux.cc:192:11: note: next member ‘__u32 gloo::getInterfaceSpeedGLinkSettings(int, ifreq*)::<unnamed struct>::link_mode_data [381]’ declared here
  192 |     __u32 link_mode_data[link_mode_data_nwords];
      |           ^~~~~~~~~~~~~~
/mnt/c/Kiko/Tools/vcpkg/buildtrees/gloo/src/4842d821e2-a23aea63a5.clean/gloo/common/linux.cc:190:10: note: in the definition of ‘struct gloo::getInterfaceSpeedGLinkSettings(int, ifreq*)::<unnamed>’
  190 |   struct {
      |          ^

Solution:
I think the flexible array member link_mode_masks should be at the end of the structure, otherwise it is illegal in C++.

And this structure requires dynamic allocation of memory to ensure that the flexible array members have enough space to store the required data.

I reorganized the structure and used malloc for dynamic allocation of memory.
I will get your help as soon as possible. :)

@facebook-github-bot
Copy link

Hi @FrankXie05!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at [email protected]. Thanks!

@FrankXie05
Copy link
Author

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Done.

@facebook-github-bot
Copy link

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@FrankXie05
Copy link
Author

@malfet

Copy link

@dg0yt dg0yt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fairly invasive PR, changing structs and adding dynamic memory allocations.
And the actual changes blured by changes of indent. Can you please change the indents to the original ones?

My first impression is that the original cause is a compiler bug.
And there might be much less invasive workarounds.
But this is hard to comment with the current formatting.

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
constexpr auto link_mode_data_nwords = 3 * 127;
struct {
__u32 link_mode_data[link_mode_data_nwords];
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIU this is not a "flexible array". link_mode_data_nwords is constexpr, so it is very much the same as a literal 381.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants