* [PATCH v2 0/2] Fuzz/x86emul and x86emul/test fixes
@ 2017-02-17 10:27 Wei Liu
2017-02-17 10:27 ` [PATCH v2 1/2] fuzz/x86emul: avoid race in link farm rune Wei Liu
2017-02-17 10:27 ` [PATCH v2 2/2] x86emul/test: " Wei Liu
0 siblings, 2 replies; 5+ messages in thread
From: Wei Liu @ 2017-02-17 10:27 UTC (permalink / raw)
To: Xen-devel; +Cc: Andrew Cooper, Ian Jackson, Wei Liu, Jan Beulich
Wei Liu (2):
fuzz/x86emul: avoid race in link farm rune
x86emul/test: avoid race in link farm rune
tools/fuzz/x86_instruction_emulator/Makefile | 13 +++++++------
tools/tests/x86_emulator/Makefile | 13 +++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] fuzz/x86emul: avoid race in link farm rune
2017-02-17 10:27 [PATCH v2 0/2] Fuzz/x86emul and x86emul/test fixes Wei Liu
@ 2017-02-17 10:27 ` Wei Liu
2017-02-17 10:46 ` Jan Beulich
2017-02-17 10:27 ` [PATCH v2 2/2] x86emul/test: " Wei Liu
1 sibling, 1 reply; 5+ messages in thread
From: Wei Liu @ 2017-02-17 10:27 UTC (permalink / raw)
To: Xen-devel; +Cc: Andrew Cooper, Ian Jackson, Wei Liu, Jan Beulich
Several `ln -sf` can race with each other and cause error like:
14:43:56 00:07:06 O: ln: cannot remove 'asm': No such file or directory
Provide dedicated targets for soft-linking directories.
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/fuzz/x86_instruction_emulator/Makefile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_instruction_emulator/Makefile
index fede7e9afd..ac9010e4a8 100644
--- a/tools/fuzz/x86_instruction_emulator/Makefile
+++ b/tools/fuzz/x86_instruction_emulator/Makefile
@@ -8,19 +8,20 @@ else
x86-instruction-emulator-fuzzer-all:
endif
-x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h:
- [ -L x86_emulate ] || ln -sf $(XEN_ROOT)/xen/arch/x86/x86_emulate .
+x86_emulate:
+ [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/arch/x86/$@ .
-asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h:
- [ -L asm ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 asm
+x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h: x86_emulate
+
+asm:
+ [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@
x86_emulate.c x86_emulate.h: %:
[ -L $* ] || ln -sf $(XEN_ROOT)/tools/tests/x86_emulator/$*
CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -I.
-x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h
-x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h $(x86.h)
+x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h asm
x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c $(x86_emulate.h)
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] fuzz/x86emul: avoid race in link farm rune
2017-02-17 10:27 ` [PATCH v2 1/2] fuzz/x86emul: avoid race in link farm rune Wei Liu
@ 2017-02-17 10:46 ` Jan Beulich
2017-02-17 11:14 ` Wei Liu
0 siblings, 1 reply; 5+ messages in thread
From: Jan Beulich @ 2017-02-17 10:46 UTC (permalink / raw)
To: Wei Liu; +Cc: Andrew Cooper, Ian Jackson, Xen-devel
>>> On 17.02.17 at 11:27, <wei.liu2@citrix.com> wrote:
> --- a/tools/fuzz/x86_instruction_emulator/Makefile
> +++ b/tools/fuzz/x86_instruction_emulator/Makefile
> @@ -8,19 +8,20 @@ else
> x86-instruction-emulator-fuzzer-all:
> endif
>
> -x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h:
> - [ -L x86_emulate ] || ln -sf $(XEN_ROOT)/xen/arch/x86/x86_emulate .
> +x86_emulate:
> + [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/arch/x86/$@ .
>
> -asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h:
> - [ -L asm ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 asm
> +x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h: x86_emulate
> +
> +asm:
> + [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@
>
> x86_emulate.c x86_emulate.h: %:
> [ -L $* ] || ln -sf $(XEN_ROOT)/tools/tests/x86_emulator/$*
>
> CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -I.
>
> -x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h
> -x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h $(x86.h)
> +x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h asm
>
> x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c $(x86_emulate.h)
This now breaks the need for re-compilation of x86_emulate.o
when any of the headers in $(x86.h) changed.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] fuzz/x86emul: avoid race in link farm rune
2017-02-17 10:46 ` Jan Beulich
@ 2017-02-17 11:14 ` Wei Liu
0 siblings, 0 replies; 5+ messages in thread
From: Wei Liu @ 2017-02-17 11:14 UTC (permalink / raw)
To: Jan Beulich; +Cc: Andrew Cooper, Wei Liu, Ian Jackson, Xen-devel
On Fri, Feb 17, 2017 at 03:46:39AM -0700, Jan Beulich wrote:
> >>> On 17.02.17 at 11:27, <wei.liu2@citrix.com> wrote:
> > --- a/tools/fuzz/x86_instruction_emulator/Makefile
> > +++ b/tools/fuzz/x86_instruction_emulator/Makefile
> > @@ -8,19 +8,20 @@ else
> > x86-instruction-emulator-fuzzer-all:
> > endif
> >
> > -x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h:
> > - [ -L x86_emulate ] || ln -sf $(XEN_ROOT)/xen/arch/x86/x86_emulate .
> > +x86_emulate:
> > + [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/arch/x86/$@ .
> >
> > -asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h:
> > - [ -L asm ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 asm
> > +x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h: x86_emulate
> > +
> > +asm:
> > + [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@
> >
> > x86_emulate.c x86_emulate.h: %:
> > [ -L $* ] || ln -sf $(XEN_ROOT)/tools/tests/x86_emulator/$*
> >
> > CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -I.
> >
> > -x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h
> > -x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h $(x86.h)
> > +x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h asm
> >
> > x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c $(x86_emulate.h)
>
> This now breaks the need for re-compilation of x86_emulate.o
> when any of the headers in $(x86.h) changed.
>
Yes, you're right. I will fix this.
> Jan
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] x86emul/test: avoid race in link farm rune
2017-02-17 10:27 [PATCH v2 0/2] Fuzz/x86emul and x86emul/test fixes Wei Liu
2017-02-17 10:27 ` [PATCH v2 1/2] fuzz/x86emul: avoid race in link farm rune Wei Liu
@ 2017-02-17 10:27 ` Wei Liu
1 sibling, 0 replies; 5+ messages in thread
From: Wei Liu @ 2017-02-17 10:27 UTC (permalink / raw)
To: Xen-devel; +Cc: Andrew Cooper, Ian Jackson, Wei Liu, Jan Beulich
Several `ln -sf` can race with each other. Provide dedicated targets
for soft-linking directories.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/tests/x86_emulator/Makefile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile
index 9bf36947c0..6fa0b6c803 100644
--- a/tools/tests/x86_emulator/Makefile
+++ b/tools/tests/x86_emulator/Makefile
@@ -40,16 +40,17 @@ distclean: clean
.PHONY: install
install:
-x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h:
- [ -L x86_emulate ] || ln -sf $(XEN_ROOT)/xen/arch/x86/x86_emulate .
+x86_emulate:
+ [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/arch/x86/$@ .
-asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h:
- [ -L asm ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 asm
+x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h: x86_emulate
+
+asm:
+ [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@
HOSTCFLAGS += $(CFLAGS_xeninclude) -I.
-x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h
-x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h $(x86.h)
+x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h asm
x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c $(x86_emulate.h)
$(HOSTCC) $(HOSTCFLAGS) -D__XEN_TOOLS__ -c -g -o $@ $<
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-17 11:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-17 10:27 [PATCH v2 0/2] Fuzz/x86emul and x86emul/test fixes Wei Liu
2017-02-17 10:27 ` [PATCH v2 1/2] fuzz/x86emul: avoid race in link farm rune Wei Liu
2017-02-17 10:46 ` Jan Beulich
2017-02-17 11:14 ` Wei Liu
2017-02-17 10:27 ` [PATCH v2 2/2] x86emul/test: " Wei Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).