[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ae135a39-4190-041b-93dd-be2610125631@redhat.com>
Date: Wed, 10 Aug 2022 14:19:12 +0200
From: Paolo Bonzini <pbonzini@...hat.com>
To: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
Cc: Gavin Shan <gshan@...hat.com>, Florian Weimer <fweimer@...hat.com>,
kvmarm <kvmarm@...ts.cs.columbia.edu>,
KVM list <kvm@...r.kernel.org>,
linux-kselftest <linux-kselftest@...r.kernel.org>,
linux-kernel <linux-kernel@...r.kernel.org>,
maz <maz@...nel.org>, oliver upton <oliver.upton@...ux.dev>,
andrew jones <andrew.jones@...ux.dev>,
Sean Christopherson <seanjc@...gle.com>,
yihyu <yihyu@...hat.com>, shan gavin <shan.gavin@...il.com>
Subject: Re: [PATCH 1/2] KVM: selftests: Make rseq compatible with glibc-2.35
On 8/10/22 14:17, Mathieu Desnoyers wrote:
> Indeed, this hack seems to be a good approach to immediately fix things without
> moving around all source files and headers. In the longer term, I'd prefer Sean's
> proposal to move rseq.c to tools/lib/ (and to move rseq headers to tools/include/rseq/).
> This can be done in a follow up phase though. I'll put a note on my todo list
> for after I come back from vacation.
Great, Gavin, are you going to repost using librseq?
>> Yeah, rseq_test should reuse librseq code. The simplest way,
>> if slightly hackish, is to do something like
>>
>> diff --git a/tools/testing/selftests/kvm/Makefile
>> b/tools/testing/selftests/kvm/Makefile
>> index 690b499c3471..6c192b0ec304 100644
>> --- a/tools/testing/selftests/kvm/Makefile
>> +++ b/tools/testing/selftests/kvm/Makefile
>> @@ -37,6 +37,7 @@ ifeq ($(ARCH),riscv)
>> UNAME_M := riscv
>> endif
>>
>> LIBKVM += lib/assert.c
>> LIBKVM += lib/elf.c
>> LIBKVM += lib/guest_modes.c
>> @@ -198,7 +199,7 @@ endif
>> CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \
>> -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \
>> -I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \
>> - -I$(<D) -Iinclude/$(UNAME_M) -I.. $(EXTRA_CFLAGS) $(KHDR_INCLUDES)
>> + -I$(<D) -Iinclude/$(UNAME_M) -I.. $(EXTRA_CFLAGS) $(KHDR_INCLUDES) -I../rseq
>>
>> no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \
>> $(CC) -Werror -no-pie -x c - -o "$$TMP", -no-pie)
>>
>>
>> and just #include "../rseq/rseq.c" in rseq_test.c.
Paolo
Powered by blists - more mailing lists