diff mbox series

tools/libs/store: add missing USE_PTHREAD to target .o

Message ID 20240705145910.32736-3-andreistan2003@gmail.com (mailing list archive)
State New
Headers show
Series tools/libs/store: add missing USE_PTHREAD to target .o | expand

Commit Message

Andrei Stan July 5, 2024, 2:59 p.m. UTC
Currently only shared libraries build with USE_PTHREAD enabled.

This patch adds the macro also to xs.o.

Backport: 4.18+ # maybe older
Signed-off-by: Andrei Stan <andreistan2003@gmail.com>
---
 tools/libs/store/Makefile | 1 +
 1 file changed, 1 insertion(+)

Comments

Andrew Cooper July 5, 2024, 3:10 p.m. UTC | #1
On 05/07/2024 3:59 pm, Andrei Stan wrote:
> Currently only shared libraries build with USE_PTHREAD enabled.
>
> This patch adds the macro also to xs.o.
>
> Backport: 4.18+ # maybe older
> Signed-off-by: Andrei Stan <andreistan2003@gmail.com>
> ---
>  tools/libs/store/Makefile | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile
> index 0649cf8307..c6f147c72f 100644
> --- a/tools/libs/store/Makefile
> +++ b/tools/libs/store/Makefile
> @@ -20,6 +20,7 @@ CFLAGS += -include $(XEN_ROOT)/tools/config.h
>  CFLAGS += $(CFLAGS_libxentoolcore)
>  
>  xs.opic: CFLAGS += -DUSE_PTHREAD
> +xs.o: CFLAGS += -DUSE_PTHREAD
>  ifeq ($(CONFIG_Linux),y)
>  xs.opic: CFLAGS += -DUSE_DLSYM
>  endif

Funnily enough, I did wonder whether that mattered recently.  I guess it
does.

CC Oleksii for a view to 4.19.

Also, we should transform the Backport: tag into a Fixes: tag if there's
a suitable one to pick.

~Andrew
Jürgen Groß July 5, 2024, 3:22 p.m. UTC | #2
On 05.07.24 16:59, Andrei Stan wrote:
> Currently only shared libraries build with USE_PTHREAD enabled.
> 
> This patch adds the macro also to xs.o.
> 
> Backport: 4.18+ # maybe older
> Signed-off-by: Andrei Stan <andreistan2003@gmail.com>

Commit dde3e02b7068 did that explicitly, stating that phtreads are
not compatible with static linking.

Was that reasoning wrong?


Juergen

> ---
>   tools/libs/store/Makefile | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile
> index 0649cf8307..c6f147c72f 100644
> --- a/tools/libs/store/Makefile
> +++ b/tools/libs/store/Makefile
> @@ -20,6 +20,7 @@ CFLAGS += -include $(XEN_ROOT)/tools/config.h
>   CFLAGS += $(CFLAGS_libxentoolcore)
>   
>   xs.opic: CFLAGS += -DUSE_PTHREAD
> +xs.o: CFLAGS += -DUSE_PTHREAD
>   ifeq ($(CONFIG_Linux),y)
>   xs.opic: CFLAGS += -DUSE_DLSYM
>   endif
Andrei Stan July 5, 2024, 4:05 p.m. UTC | #3
On Fri, Jul 5, 2024 at 6:22 PM Jürgen Groß <jgross@suse.com> wrote:
>
> On 05.07.24 16:59, Andrei Stan wrote:
> > Currently only shared libraries build with USE_PTHREAD enabled.
> >
> > This patch adds the macro also to xs.o.
> >
> > Backport: 4.18+ # maybe older
> > Signed-off-by: Andrei Stan <andreistan2003@gmail.com>
>
> Commit dde3e02b7068 did that explicitly, stating that phtreads are
> not compatible with static linking.
>
> Was that reasoning wrong?
>
> Juergen
> ---
> > ---
> >   tools/libs/store/Makefile | 1 +
> >   1 file changed, 1 insertion(+)
> >
> > diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile
> > index 0649cf8307..c6f147c72f 100644
> > --- a/tools/libs/store/Makefile
> > +++ b/tools/libs/store/Makefile
> > @@ -20,6 +20,7 @@ CFLAGS += -include $(XEN_ROOT)/tools/config.h
> >   CFLAGS += $(CFLAGS_libxentoolcore)
> >
> >   xs.opic: CFLAGS += -DUSE_PTHREAD
> > +xs.o: CFLAGS += -DUSE_PTHREAD
> >   ifeq ($(CONFIG_Linux),y)
> >   xs.opic: CFLAGS += -DUSE_DLSYM
> >   endif

It was a pretty nasty situation, giving some context, this is for a Go based CLI
tool and some things in there are multithreaded, but i don't think
calling in the
bindings happens anywhere in parallel. Without this patch there would be
some sort of race conditions (or so I assume from the debugging i've done)
happening withing the xen/tools code, making it impossible to start a domain.

In this case there were no issues in linking pthreads statically. I was not even
aware of that being a possible issue. Is it really?

Also I am not too sure how much that code path is actually tested, probably the
majority of the testing is done with dynamic builds.

Andrei
diff mbox series

Patch

diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile
index 0649cf8307..c6f147c72f 100644
--- a/tools/libs/store/Makefile
+++ b/tools/libs/store/Makefile
@@ -20,6 +20,7 @@  CFLAGS += -include $(XEN_ROOT)/tools/config.h
 CFLAGS += $(CFLAGS_libxentoolcore)
 
 xs.opic: CFLAGS += -DUSE_PTHREAD
+xs.o: CFLAGS += -DUSE_PTHREAD
 ifeq ($(CONFIG_Linux),y)
 xs.opic: CFLAGS += -DUSE_DLSYM
 endif