From nobody Tue Feb 10 10:42:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1572004300; cv=none; d=zoho.com; s=zohoarc; b=MPZ25UX8IAaFlC024EBXTYlWW5bcMZbzcw12HtjtD+lbfIL+ROXKikUtBWguH2m3FmTRYDZeD/nHgrHjBbeqNvsoBRxCfH48m9uF7KFawAFM/sF+gkPdnC4F5VsYL3JHFNjQwjweHKMOXDcwzYoYba9hF2jX4ZKIBvViKatiGos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572004300; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Vn70UJTo0fstge9Ke9wJC+Kr4lifWc+iunKsVrVX6Oo=; b=Ifs9ISq4HerXzV6oUKeh+uDl6eU0ZHIY69A/SM6AQve8+UBQdveymQ5uH0l9QfINS8qot+LrgODzuvO7C0BNCaq8CmG5sTxYD1cLo8PhFVClsH6y0jziNTR7e6x2fr9dtZhKV1rNSaRkTh7jc/66LLV1F0jjFhjngmehqLNIgVI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572004300641713.5859008637907; Fri, 25 Oct 2019 04:51:40 -0700 (PDT) Received: from localhost ([::1]:59068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNy82-0005sY-AR for importer@patchew.org; Fri, 25 Oct 2019 07:51:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNxwV-0006qX-Um for qemu-devel@nongnu.org; Fri, 25 Oct 2019 07:39:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNxwP-0006fl-2s for qemu-devel@nongnu.org; Fri, 25 Oct 2019 07:39:41 -0400 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]:36796) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNxwO-0006eV-U6 for qemu-devel@nongnu.org; Fri, 25 Oct 2019 07:39:37 -0400 Received: by mail-qk1-x744.google.com with SMTP id y189so1414701qkc.3 for ; Fri, 25 Oct 2019 04:39:34 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-50.nyc.biz.rr.com. [172.254.253.50]) by smtp.gmail.com with ESMTPSA id x38sm1473335qtc.64.2019.10.25.04.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 04:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vn70UJTo0fstge9Ke9wJC+Kr4lifWc+iunKsVrVX6Oo=; b=bM3TJ03b9fHB0OAVP9OvNj+ONB000mTRXgCt5VoknLpNKKO78Pb7v73tIiW4g/e10B OSN50aqIQwbjR/bKhFOwnmMsrMuFu5txbbOlNuR2D/hYIl73pHSLj8heTW9WcYbUgOPI bTdlOxGIK7lwvdFH4vJDq1MbkG6EqRwQ0Hq103vUruHBO/Ga2T4kpTlJ7YivsIOs42Uu LNuk5l81wj6Q0cZZUVV4ZIZjPOcvmK362pL2Oo3mT7BNrBQfjMiyEq4PGH0jmunbUYEk 55oKxIYCJ0Qqt1spfXsbi+/RHi/wByJVu3zEGFMEuNI+Is0dgrS25Ppo9A2Zy+v+DHJ0 tKyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Vn70UJTo0fstge9Ke9wJC+Kr4lifWc+iunKsVrVX6Oo=; b=e2gcJBKJwOC2CbJrYUikseCvScu3DzB3rOfWXAU0sIPC80LE5WJqF+bAPYMJiA7u4z DDsdRawDFCRizHirZO9LvZRJs0QXlq7hZkLTYJZl+IsNpbXTIUfb4aQOyBRjpI8ksHQm wo1CnpDgHfHKkyNuMJoz+k/OnSb3xF79jEos+LKFHIy7oUpBuoBl3mMfGga7c6Z3wlgw 2IWksuOK8JovWsqqXYFP+QchfQ/MkA+/w69xbVQyLMl1YQROTdCtanh6DUftKBgrC8RL BU2L/f59BjcPScu28eD4Yi9HbA8yK+ukyZACAaFbA2nmf8K+Qw32I+z5dcOiSWRi6uv0 KAeQ== X-Gm-Message-State: APjAAAWunITzP93ypK2sMdjpKYmU3TMQC2pFER6qvaEhLkGX0MXyuMgc K6UshbwebbKtasc6rlmVFiQcqF03qL8= X-Google-Smtp-Source: APXvYqw4qOM1DESoye6OJ6RzBMSCAXxpE6qnBDSmp61NgZJTdKw9UNqYJE2cvd4baXoluMz/2vpZLA== X-Received: by 2002:a05:620a:1374:: with SMTP id d20mr2458240qkl.229.1572003573458; Fri, 25 Oct 2019 04:39:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 10/12] linux-user: Introduce cpu_clone_regs_parent Date: Fri, 25 Oct 2019 07:39:19 -0400 Message-Id: <20191025113921.9412-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191025113921.9412-1-richard.henderson@linaro.org> References: <20191025113921.9412-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::744 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We will need a target-specific hook for adjusting registers in the parent during clone. Add an empty inline function for each target, and invoke it from the proper places. Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/aarch64/target_cpu.h | 4 ++++ linux-user/alpha/target_cpu.h | 4 ++++ linux-user/arm/target_cpu.h | 4 ++++ linux-user/cris/target_cpu.h | 4 ++++ linux-user/hppa/target_cpu.h | 4 ++++ linux-user/i386/target_cpu.h | 4 ++++ linux-user/m68k/target_cpu.h | 4 ++++ linux-user/microblaze/target_cpu.h | 4 ++++ linux-user/mips/target_cpu.h | 4 ++++ linux-user/nios2/target_cpu.h | 4 ++++ linux-user/openrisc/target_cpu.h | 4 ++++ linux-user/ppc/target_cpu.h | 4 ++++ linux-user/riscv/target_cpu.h | 4 ++++ linux-user/s390x/target_cpu.h | 4 ++++ linux-user/sh4/target_cpu.h | 4 ++++ linux-user/sparc/target_cpu.h | 4 ++++ linux-user/tilegx/target_cpu.h | 4 ++++ linux-user/xtensa/target_cpu.h | 4 ++++ linux-user/syscall.c | 2 ++ 19 files changed, 74 insertions(+) diff --git a/linux-user/aarch64/target_cpu.h b/linux-user/aarch64/target_cp= u.h index cd012e0dc1..6cc02e7dcd 100644 --- a/linux-user/aarch64/target_cpu.h +++ b/linux-user/aarch64/target_cpu.h @@ -28,6 +28,10 @@ static inline void cpu_clone_regs_child(CPUARMState *env= , target_ulong newsp, env->xregs[0] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUARMState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUARMState *env, target_ulong newtls) { /* Note that AArch64 Linux keeps the TLS pointer in TPIDR; this is diff --git a/linux-user/alpha/target_cpu.h b/linux-user/alpha/target_cpu.h index 37ba00cf41..dd25e18f47 100644 --- a/linux-user/alpha/target_cpu.h +++ b/linux-user/alpha/target_cpu.h @@ -29,6 +29,10 @@ static inline void cpu_clone_regs_child(CPUAlphaState *e= nv, target_ulong newsp, env->ir[IR_A3] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUAlphaState *env, unsigned flag= s) +{ +} + static inline void cpu_set_tls(CPUAlphaState *env, target_ulong newtls) { env->unique =3D newtls; diff --git a/linux-user/arm/target_cpu.h b/linux-user/arm/target_cpu.h index 6e2ba8ad4b..2747211b24 100644 --- a/linux-user/arm/target_cpu.h +++ b/linux-user/arm/target_cpu.h @@ -50,6 +50,10 @@ static inline void cpu_clone_regs_child(CPUARMState *env= , target_ulong newsp, env->regs[0] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUARMState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUARMState *env, target_ulong newtls) { if (access_secure_reg(env)) { diff --git a/linux-user/cris/target_cpu.h b/linux-user/cris/target_cpu.h index eacc4d8d13..74ead55c81 100644 --- a/linux-user/cris/target_cpu.h +++ b/linux-user/cris/target_cpu.h @@ -29,6 +29,10 @@ static inline void cpu_clone_regs_child(CPUCRISState *en= v, target_ulong newsp, env->regs[10] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUCRISState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUCRISState *env, target_ulong newtls) { env->pregs[PR_PID] =3D (env->pregs[PR_PID] & 0xff) | newtls; diff --git a/linux-user/hppa/target_cpu.h b/linux-user/hppa/target_cpu.h index f250770790..71654b3cd4 100644 --- a/linux-user/hppa/target_cpu.h +++ b/linux-user/hppa/target_cpu.h @@ -32,6 +32,10 @@ static inline void cpu_clone_regs_child(CPUHPPAState *en= v, target_ulong newsp, env->iaoq_b =3D env->gr[31] + 4; } =20 +static inline void cpu_clone_regs_parent(CPUHPPAState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUHPPAState *env, target_ulong newtls) { env->cr[27] =3D newtls; diff --git a/linux-user/i386/target_cpu.h b/linux-user/i386/target_cpu.h index 1fadbf57c3..0b44530854 100644 --- a/linux-user/i386/target_cpu.h +++ b/linux-user/i386/target_cpu.h @@ -29,6 +29,10 @@ static inline void cpu_clone_regs_child(CPUX86State *env= , target_ulong newsp, env->regs[R_EAX] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUX86State *env, unsigned flags) +{ +} + #if defined(TARGET_ABI32) abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr); =20 diff --git a/linux-user/m68k/target_cpu.h b/linux-user/m68k/target_cpu.h index 57b647bc07..c3f288dfe8 100644 --- a/linux-user/m68k/target_cpu.h +++ b/linux-user/m68k/target_cpu.h @@ -30,6 +30,10 @@ static inline void cpu_clone_regs_child(CPUM68KState *en= v, target_ulong newsp, env->dregs[0] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUM68KState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUM68KState *env, target_ulong newtls) { CPUState *cs =3D env_cpu(env); diff --git a/linux-user/microblaze/target_cpu.h b/linux-user/microblaze/tar= get_cpu.h index e9bc0fce65..ce7b22ece7 100644 --- a/linux-user/microblaze/target_cpu.h +++ b/linux-user/microblaze/target_cpu.h @@ -28,6 +28,10 @@ static inline void cpu_clone_regs_child(CPUMBState *env,= target_ulong newsp, env->regs[3] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUMBState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUMBState *env, target_ulong newtls) { env->regs[21] =3D newtls; diff --git a/linux-user/mips/target_cpu.h b/linux-user/mips/target_cpu.h index 8601f712e0..758ae4d933 100644 --- a/linux-user/mips/target_cpu.h +++ b/linux-user/mips/target_cpu.h @@ -29,6 +29,10 @@ static inline void cpu_clone_regs_child(CPUMIPSState *en= v, target_ulong newsp, env->active_tc.gpr[2] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUMIPSState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUMIPSState *env, target_ulong newtls) { env->active_tc.CP0_UserLocal =3D newtls; diff --git a/linux-user/nios2/target_cpu.h b/linux-user/nios2/target_cpu.h index fe5de7a9e3..50f0381067 100644 --- a/linux-user/nios2/target_cpu.h +++ b/linux-user/nios2/target_cpu.h @@ -29,6 +29,10 @@ static inline void cpu_clone_regs_child(CPUNios2State *e= nv, target_ulong newsp, env->regs[R_RET0] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUNios2State *env, unsigned flag= s) +{ +} + static inline void cpu_set_tls(CPUNios2State *env, target_ulong newtls) { /* diff --git a/linux-user/openrisc/target_cpu.h b/linux-user/openrisc/target_= cpu.h index 309cf3eeb7..74370d67c4 100644 --- a/linux-user/openrisc/target_cpu.h +++ b/linux-user/openrisc/target_cpu.h @@ -30,6 +30,10 @@ static inline void cpu_clone_regs_child(CPUOpenRISCState= *env, cpu_set_gpr(env, 11, 0); } =20 +static inline void cpu_clone_regs_parent(CPUOpenRISCState *env, unsigned f= lags) +{ +} + static inline void cpu_set_tls(CPUOpenRISCState *env, target_ulong newtls) { cpu_set_gpr(env, 10, newtls); diff --git a/linux-user/ppc/target_cpu.h b/linux-user/ppc/target_cpu.h index 028b28312c..76b67d2882 100644 --- a/linux-user/ppc/target_cpu.h +++ b/linux-user/ppc/target_cpu.h @@ -28,6 +28,10 @@ static inline void cpu_clone_regs_child(CPUPPCState *env= , target_ulong newsp, env->gpr[3] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUPPCState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUPPCState *env, target_ulong newtls) { #if defined(TARGET_PPC64) diff --git a/linux-user/riscv/target_cpu.h b/linux-user/riscv/target_cpu.h index 26dcafab1c..9c642367a3 100644 --- a/linux-user/riscv/target_cpu.h +++ b/linux-user/riscv/target_cpu.h @@ -11,6 +11,10 @@ static inline void cpu_clone_regs_child(CPURISCVState *e= nv, target_ulong newsp, env->gpr[xA0] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPURISCVState *env, unsigned flag= s) +{ +} + static inline void cpu_set_tls(CPURISCVState *env, target_ulong newtls) { env->gpr[xTP] =3D newtls; diff --git a/linux-user/s390x/target_cpu.h b/linux-user/s390x/target_cpu.h index 0b19e42f75..7cd71e2dba 100644 --- a/linux-user/s390x/target_cpu.h +++ b/linux-user/s390x/target_cpu.h @@ -28,6 +28,10 @@ static inline void cpu_clone_regs_child(CPUS390XState *e= nv, target_ulong newsp, env->regs[2] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUS390XState *env, unsigned flag= s) +{ +} + static inline void cpu_set_tls(CPUS390XState *env, target_ulong newtls) { env->aregs[0] =3D newtls >> 32; diff --git a/linux-user/sh4/target_cpu.h b/linux-user/sh4/target_cpu.h index 857af43ee3..5114f19424 100644 --- a/linux-user/sh4/target_cpu.h +++ b/linux-user/sh4/target_cpu.h @@ -28,6 +28,10 @@ static inline void cpu_clone_regs_child(CPUSH4State *env= , target_ulong newsp, env->gregs[0] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUSH4State *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUSH4State *env, target_ulong newtls) { env->gbr =3D newtls; diff --git a/linux-user/sparc/target_cpu.h b/linux-user/sparc/target_cpu.h index 029b0fc547..8ff706adce 100644 --- a/linux-user/sparc/target_cpu.h +++ b/linux-user/sparc/target_cpu.h @@ -37,6 +37,10 @@ static inline void cpu_clone_regs_child(CPUSPARCState *e= nv, target_ulong newsp, #endif } =20 +static inline void cpu_clone_regs_parent(CPUSPARCState *env, unsigned flag= s) +{ +} + static inline void cpu_set_tls(CPUSPARCState *env, target_ulong newtls) { env->gregs[7] =3D newtls; diff --git a/linux-user/tilegx/target_cpu.h b/linux-user/tilegx/target_cpu.h index 0523dc414c..316b7a639c 100644 --- a/linux-user/tilegx/target_cpu.h +++ b/linux-user/tilegx/target_cpu.h @@ -28,6 +28,10 @@ static inline void cpu_clone_regs_child(CPUTLGState *env= , target_ulong newsp, env->regs[TILEGX_R_RE] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUTLGState *env, unsigned flags) +{ +} + static inline void cpu_set_tls(CPUTLGState *env, target_ulong newtls) { env->regs[TILEGX_R_TP] =3D newtls; diff --git a/linux-user/xtensa/target_cpu.h b/linux-user/xtensa/target_cpu.h index 84f67d469e..0c77bafd66 100644 --- a/linux-user/xtensa/target_cpu.h +++ b/linux-user/xtensa/target_cpu.h @@ -16,6 +16,10 @@ static inline void cpu_clone_regs_child(CPUXtensaState *= env, env->regs[2] =3D 0; } =20 +static inline void cpu_clone_regs_parent(CPUXtensaState *env, unsigned fla= gs) +{ +} + static inline void cpu_set_tls(CPUXtensaState *env, target_ulong newtls) { env->uregs[THREADPTR] =3D newtls; diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a07d4b4774..ed18bcc825 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5719,6 +5719,7 @@ static int do_fork(CPUArchState *env, unsigned int fl= ags, abi_ulong newsp, new_env =3D cpu_copy(env); /* Init regs that differ from the parent. */ cpu_clone_regs_child(new_env, newsp, flags); + cpu_clone_regs_parent(env, flags); new_cpu =3D env_cpu(new_env); new_cpu->opaque =3D ts; ts->bprm =3D parent_ts->bprm; @@ -5815,6 +5816,7 @@ static int do_fork(CPUArchState *env, unsigned int fl= ags, abi_ulong newsp, if (flags & CLONE_CHILD_CLEARTID) ts->child_tidptr =3D child_tidptr; } else { + cpu_clone_regs_parent(env, flags); fork_end(0); } } --=20 2.17.1