This adjustment was random and unnecessary. The user mode

startup code in probe_guest_base() will choose a value for

guest_base that allows the host qemu binary to not conflict

with the guest binary.

With modern distributions, this isn't even used, as the default

is PIE, which does the same job in a more portable way.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

v2: Remove mention of config-host.ld from make distclean

---

Makefile | 2 +-

configure | 47 -----------------------------------------------

2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/Makefile b/Makefile

index XXXXXXX..XXXXXXX 100644

--- a/Makefile

+++ b/Makefile

@@ -XXX,XX +XXX,XX @@ rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.js $(M

endef

distclean: clean

-    rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi

+    rm -f config-host.mak config-host.h* $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi

    rm -f tests/tcg/config-*.mak

    rm -f config-all-devices.mak config-all-disas.mak config.status

    rm -f $(SUBDIR_DEVICES_MAK)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ if test "$cpu" = "s390x" ; then

fi

fi

-# Probe for the need for relocating the user-only binary.

-if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] ) && [ "$pie" = no ]; then

- textseg_addr=

- case "$cpu" in

- arm | i386 | ppc* | s390* | sparc* | x86_64 | x32)

- # ??? Rationale for choosing this address

- textseg_addr=0x60000000

- ;;

- mips)

- # A 256M aligned address, high in the address space, with enough

- # room for the code_gen_buffer above it before the stack.

- textseg_addr=0x60000000

- ;;

- esac

- if [ -n "$textseg_addr" ]; then

- cat > $TMPC <<EOF

- int main(void) { return 0; }

-EOF

- textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"

- if ! compile_prog "" "$textseg_ldflags"; then

- # In case ld does not support -Ttext-segment, edit the default linker

- # script via sed to set the .text start addr. This is needed on FreeBSD

- # at least.

- if ! $ld --verbose >/dev/null 2>&1; then

- error_exit \

- "We need to link the QEMU user mode binaries at a" \

- "specific text address. Unfortunately your linker" \

- "doesn't support either the -Ttext-segment option or" \

- "printing the default linker script with --verbose." \

- "If you don't want the user mode binaries, pass the" \

- "--disable-user option to configure."

- fi

-

- $ld --verbose | sed \

- -e '1,/==================================================/d' \

- -e '/==================================================/,$d' \

- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \

- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld

- textseg_ldflags="-Wl,-T../config-host.ld"

- fi

- fi

-fi

-

# Check that the C++ compiler exists and works with the C compiler.

# All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to don't miss any other that could be added.

if has $cxx; then

@@ -XXX,XX +XXX,XX @@ if test "$gprof" = "yes" ; then

fi

fi

-if test "$target_linux_user" = "yes" || test "$target_bsd_user" = "yes" ; then

- ldflags="$ldflags $textseg_ldflags"

-fi

-

# Newer kernels on s390 check for an S390_PGSTE program header and

# enable the pgste page table extensions in that case. This makes

# the vm.allocate_pgste sysctl unnecessary. We enable this program

--

2.20.1

PIE is supported on many other hosts besides x86.

The default for non-x86 is now the same as x86: pie is used

if supported, and may be forced via --enable/--disable-pie.

The original commit (40d6444e91c) said:

"Non-x86 are not changed, as they require TCG changes"

but I think that's wrong -- there's nothing about PIE that

affects TCG one way or another.

Tested on aarch64 (bionic) and ppc64le (centos 7) hosts.

Tested-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

configure | 10 ----------

1 file changed, 10 deletions(-)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ if ! compile_prog "-Werror" "" ; then

    "Thread-Local Storage (TLS). Please upgrade to a version that does."

fi

-if test "$pie" = ""; then

- case "$cpu-$targetos" in

- i386-Linux|x86_64-Linux|x32-Linux|i386-OpenBSD|x86_64-OpenBSD)

- ;;

- *)

- pie="no"

- ;;

- esac

-fi

-

if test "$pie" != "no" ; then

cat > $TMPC << EOF

--

2.20.1

The CFLAGS_NOPIE and LDFLAGS_NOPIE variables are used

in pc-bios/optionrom/Makefile, which has nothing to do

with the PIE setting of the main qemu executables.

This overrides any operating system default to build

all executables as PIE, which is important for ROMs.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

configure | 18 ++++++++----------

1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ if ! compile_prog "-Werror" "" ; then

    "Thread-Local Storage (TLS). Please upgrade to a version that does."

fi

-if test "$pie" != "no" ; then

- cat > $TMPC << EOF

+cat > $TMPC << EOF

#ifdef __linux__

# define THREAD __thread

#else

# define THREAD

#endif

-

static THREAD int tls_var;

-

int main(void) { return tls_var; }

-

EOF

- # check we support --no-pie first...

- if compile_prog "-Werror -fno-pie" "-no-pie"; then

- CFLAGS_NOPIE="-fno-pie"

- LDFLAGS_NOPIE="-nopie"

- fi

+# Check we support --no-pie first; we will need this for building ROMs.

+if compile_prog "-Werror -fno-pie" "-no-pie"; then

+ CFLAGS_NOPIE="-fno-pie"

+ LDFLAGS_NOPIE="-no-pie"

+fi

+

+if test "$pie" != "no" ; then

if compile_prog "-fPIE -DPIE" "-pie"; then

QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"

LDFLAGS="-pie $LDFLAGS"

--

2.20.1

There is nothing about these options that is related to PIE.

Use them unconditionally.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Fangrui Song <i@maskray.me>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

v2: Do not split into two tests.

---

configure | 9 ++++++---

1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ if test "$pie" != "no" ; then

QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"

LDFLAGS="-pie $LDFLAGS"

pie="yes"

- if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then

- LDFLAGS="-Wl,-z,relro -Wl,-z,now $LDFLAGS"

- fi

else

if test "$pie" = "yes"; then

error_exit "PIE not available due to missing toolchain support"

@@ -XXX,XX +XXX,XX @@ if test "$pie" != "no" ; then

fi

fi

+# Detect support for PT_GNU_RELRO + DT_BIND_NOW.

+# The combination is known as "full relro", because .got.plt is read-only too.

+if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then

+ LDFLAGS="-Wl,-z,relro -Wl,-z,now $LDFLAGS"

+fi

+

##########################################

# __sync_fetch_and_and requires at least -march=i486. Many toolchains

# use i686 as default anyway, but for those that don't, an explicit

--

2.20.1

Some distributions, e.g. Ubuntu 19.10, enable PIE by default.

If for some reason one wishes to build a non-pie binary, we

must provide additional options to override.

At the same time, reorg the code to an elif chain.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

configure | 25 ++++++++++++-------------

1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then

LDFLAGS_NOPIE="-no-pie"

fi

-if test "$pie" != "no" ; then

- if compile_prog "-fPIE -DPIE" "-pie"; then

- QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"

- LDFLAGS="-pie $LDFLAGS"

- pie="yes"

- else

- if test "$pie" = "yes"; then

- error_exit "PIE not available due to missing toolchain support"

- else

- echo "Disabling PIE due to missing toolchain support"

- pie="no"

- fi

- fi

+if test "$pie" = "no"; then

+ QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"

+ LDFLAGS="$LDFLAGS_NOPIE $LDFLAGS"

+elif compile_prog "-fPIE -DPIE" "-pie"; then

+ QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"

+ LDFLAGS="-pie $LDFLAGS"

+ pie="yes"

+elif test "$pie" = "yes"; then

+ error_exit "PIE not available due to missing toolchain support"

+else

+ echo "Disabling PIE due to missing toolchain support"

+ pie="no"

fi

# Detect support for PT_GNU_RELRO + DT_BIND_NOW.

--

2.20.1

Recent toolchains support static and pie at the same time.

As with normal dynamic builds, allow --static to default to PIE

if supported by the toolchain. Allow --enable/--disable-pie to

override the default.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

v2: Fix --disable-pie --static

---

configure | 19 ++++++++++++-------

1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ for opt do

;;

--static)

static="yes"

- LDFLAGS="-static $LDFLAGS"

QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"

;;

--mandir=*) mandir="$optarg"

@@ -XXX,XX +XXX,XX @@ if test "$static" = "yes" ; then

if test "$modules" = "yes" ; then

error_exit "static and modules are mutually incompatible"

fi

- if test "$pie" = "yes" ; then

- error_exit "static and pie are mutually incompatible"

- else

- pie="no"

- fi

fi

# Unconditional check for compiler __thread support

@@ -XXX,XX +XXX,XX @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then

LDFLAGS_NOPIE="-no-pie"

fi

-if test "$pie" = "no"; then

+if test "$static" = "yes"; then

+ if test "$pie" != "no" && compile_prog "-fPIE -DPIE" "-static-pie"; then

+ QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"

+ LDFLAGS="-static-pie $LDFLAGS"

+ pie="yes"

+ elif test "$pie" = "yes"; then

+ error_exit "-static-pie not available due to missing toolchain support"

+ else

+ LDFLAGS="-static $LDFLAGS"

+ pie="no"

+ fi

+elif test "$pie" = "no"; then

QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"

LDFLAGS="$LDFLAGS_NOPIE $LDFLAGS"

elif compile_prog "-fPIE -DPIE" "-pie"; then

--

2.20.1

We don't actually need the result of the read, only to probe that the

memory mapping exists. This is exactly what probe_access does.

This is also the only user of any cpu_ld*_code_ra function.

Removing this allows the interface to be removed shortly.

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Acked-by: Max Filippov <jcmvbkbc@gmail.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

target/xtensa/mmu_helper.c | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c

index XXXXXXX..XXXXXXX 100644

--- a/target/xtensa/mmu_helper.c

+++ b/target/xtensa/mmu_helper.c

@@ -XXX,XX +XXX,XX @@

void HELPER(itlb_hit_test)(CPUXtensaState *env, uint32_t vaddr)

{

/*

- * Attempt the memory load; we don't care about the result but

+ * Probe the memory; we don't care about the result but

* only the side-effects (ie any MMU or other exception)

*/

- cpu_ldub_code_ra(env, vaddr, GETPC());

+ probe_access(env, vaddr, 1, MMU_INST_FETCH,

+ cpu_mmu_index(env, true), GETPC());

}

void HELPER(wsr_rasid)(CPUXtensaState *env, uint32_t v)

--

2.20.1

In the cpu_ldst templates, we already require a MemOp, and it

is cleaner and clearer to pass that instead of 3 separate

arguments describing the memory operation.

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

include/exec/cpu_ldst_template.h | 22 +++++++++++-----------

include/exec/cpu_ldst_useronly_template.h | 12 ++++++------

2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/exec/cpu_ldst_template.h b/include/exec/cpu_ldst_template.h

index XXXXXXX..XXXXXXX 100644

--- a/include/exec/cpu_ldst_template.h

+++ b/include/exec/cpu_ldst_template.h

@@ -XXX,XX +XXX,XX @@ glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,

RES_TYPE res;

target_ulong addr;

int mmu_idx = CPU_MMU_INDEX;

- TCGMemOpIdx oi;

+ MemOp op = MO_TE | SHIFT;

#if !defined(SOFTMMU_CODE_ACCESS)

- uint16_t meminfo = trace_mem_build_info(SHIFT, false, MO_TE, false, mmu_idx);

+ uint16_t meminfo = trace_mem_get_info(op, mmu_idx, false);

trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);

#endif

@@ -XXX,XX +XXX,XX @@ glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,

entry = tlb_entry(env, mmu_idx, addr);

if (unlikely(entry->ADDR_READ !=

(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {

- oi = make_memop_idx(SHIFT, mmu_idx);

+ TCGMemOpIdx oi = make_memop_idx(op, mmu_idx);

res = glue(glue(helper_ret_ld, URETSUFFIX), MMUSUFFIX)(env, addr,

- oi, retaddr);

+ oi, retaddr);

} else {

uintptr_t hostaddr = addr + entry->addend;

res = glue(glue(ld, USUFFIX), _p)((uint8_t *)hostaddr);

@@ -XXX,XX +XXX,XX @@ glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,

int res;

target_ulong addr;

int mmu_idx = CPU_MMU_INDEX;

- TCGMemOpIdx oi;

-#if !defined(SOFTMMU_CODE_ACCESS)

- uint16_t meminfo = trace_mem_build_info(SHIFT, true, MO_TE, false, mmu_idx);

+ MemOp op = MO_TE | MO_SIGN | SHIFT;

+#ifndef SOFTMMU_CODE_ACCESS

+ uint16_t meminfo = trace_mem_get_info(op, mmu_idx, false);

trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);

#endif

@@ -XXX,XX +XXX,XX @@ glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,

entry = tlb_entry(env, mmu_idx, addr);

if (unlikely(entry->ADDR_READ !=

(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {

- oi = make_memop_idx(SHIFT, mmu_idx);

+ TCGMemOpIdx oi = make_memop_idx(op & ~MO_SIGN, mmu_idx);

res = (DATA_STYPE)glue(glue(helper_ret_ld, SRETSUFFIX),

MMUSUFFIX)(env, addr, oi, retaddr);

} else {

@@ -XXX,XX +XXX,XX @@ glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,

CPUTLBEntry *entry;

target_ulong addr;

int mmu_idx = CPU_MMU_INDEX;

- TCGMemOpIdx oi;

+ MemOp op = MO_TE | SHIFT;

#if !defined(SOFTMMU_CODE_ACCESS)

- uint16_t meminfo = trace_mem_build_info(SHIFT, false, MO_TE, true, mmu_idx);

+ uint16_t meminfo = trace_mem_get_info(op, mmu_idx, true);

trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);

#endif

@@ -XXX,XX +XXX,XX @@ glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,

entry = tlb_entry(env, mmu_idx, addr);

if (unlikely(tlb_addr_write(entry) !=

(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {

- oi = make_memop_idx(SHIFT, mmu_idx);

+ TCGMemOpIdx oi = make_memop_idx(op, mmu_idx);

glue(glue(helper_ret_st, SUFFIX), MMUSUFFIX)(env, addr, v, oi,

retaddr);

} else {

diff --git a/include/exec/cpu_ldst_useronly_template.h b/include/exec/cpu_ldst_useronly_template.h

index XXXXXXX..XXXXXXX 100644

--- a/include/exec/cpu_ldst_useronly_template.h

+++ b/include/exec/cpu_ldst_useronly_template.h

@@ -XXX,XX +XXX,XX @@ glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr)

ret = glue(glue(ld, USUFFIX), _p)(g2h(ptr));

clear_helper_retaddr();

#else

- uint16_t meminfo = trace_mem_build_info(SHIFT, false, MO_TE, false,

- MMU_USER_IDX);

+ MemOp op = MO_TE | SHIFT;

+ uint16_t meminfo = trace_mem_get_info(op, MMU_USER_IDX, false);

trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);

ret = glue(glue(ld, USUFFIX), _p)(g2h(ptr));

#endif

@@ -XXX,XX +XXX,XX @@ glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr)

ret = glue(glue(lds, SUFFIX), _p)(g2h(ptr));

clear_helper_retaddr();

#else

- uint16_t meminfo = trace_mem_build_info(SHIFT, true, MO_TE, false,

- MMU_USER_IDX);

+ MemOp op = MO_TE | MO_SIGN | SHIFT;

+ uint16_t meminfo = trace_mem_get_info(op, MMU_USER_IDX, false);

trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);

ret = glue(glue(lds, SUFFIX), _p)(g2h(ptr));

qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo);

@@ -XXX,XX +XXX,XX @@ static inline void

glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr,

RES_TYPE v)

{

- uint16_t meminfo = trace_mem_build_info(SHIFT, false, MO_TE, true,

- MMU_USER_IDX);

+ MemOp op = MO_TE | SHIFT;

+ uint16_t meminfo = trace_mem_get_info(op, MMU_USER_IDX, true);

trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);

glue(glue(st, SUFFIX), _p)(g2h(ptr), v);

qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo);

--

2.20.1

It is easy for the atomic helpers to use trace_mem_build_info

directly, without resorting to symbol pasting. For this usage,

we cannot use trace_mem_get_info, because the MemOp does not

support 16-byte accesses.

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

accel/tcg/atomic_template.h | 67 +++++++++++++------------------------

trace/mem-internal.h | 17 ----------

2 files changed, 24 insertions(+), 60 deletions(-)

diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h

index XXXXXXX..XXXXXXX 100644

--- a/accel/tcg/atomic_template.h

+++ b/accel/tcg/atomic_template.h