From patchwork Sat Sep 18 18:44:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 514216 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp665731jao; Sat, 18 Sep 2021 11:47:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqXri6K+ky8cK168dcX9XjG73usqypaDb5WF+OkOmdPHMueN24mjev0uHpK6HilD+1w4t0 X-Received: by 2002:a0c:aadd:: with SMTP id g29mr17297549qvb.23.1631990877718; Sat, 18 Sep 2021 11:47:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631990877; cv=none; d=google.com; s=arc-20160816; b=j+e0Txv1Agx4C+mc8WwXw6bTQgNT8ewjdGSAqYjCCKhOqDIzYNjDoiza7MxOxrhaLf ObP+BxLZy469ygUQ3kHSn0horefiqTRWVe77Qmp5srROs3kQYG6A/DZaic3A8GHrjD8W fmZ3vSO42jBi45xzFiRja7mfxm6Rs60Sj0pCApKvIzSkvN8dpaoNdy0kigceR2g9M1Xx Jyy2wftVPeHQjOFD1PwrsNCjSxskjeRyx3KVWVa+KrMdnbxTHCkqBVVKdwX8dWSJV8YM lboaWhENeuaSV76TF+4B/OvTV0LoZLLXVQ2YLVyTt8CLC39TEY1XWTzq4vXyw1ArKpFp 2iGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MwSLIpZg3SBDOkqorWI9RwSF0cto2aAplNrO4o3oH4g=; b=V0NuNtLuPYXeoOS1+7dj1hP5uOfXNoTvTrJ7+U5JGovAF9/Jv2ouHzGKXuckwjjXQH 7BfBf1nwlXEHtm1gzrzr+31N6TkeQYP6xMB+k1pL8RRkkbbG8ElHBi3I+UPNu04aK3GP 2L4dCfr4QqGvps0FKKQqRpjk/m+8wOBygRKyGaG6Ynyz53UyM6zrsNCEpdiZ6nnx4tAq vDpwhyKjjSTKkETZFonbDZNE6YjlxLf/kLdPFAtYRQH9Tl4H9pBCH9BkH3cx5sHXfcds 4P0KD+JGpCoLtPX1rt+132hG/nA7uIss7oav0ZVydUu+FEWdK4z57PhMNyQrjIh8n0EG 2nDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OfcFIhVa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u28si5969471qtc.425.2021.09.18.11.47.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Sep 2021 11:47:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OfcFIhVa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRfNV-0004yu-6r for patch@linaro.org; Sat, 18 Sep 2021 14:47:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRfLC-0004yO-RK for qemu-devel@nongnu.org; Sat, 18 Sep 2021 14:45:34 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:36538) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRfLA-0006gV-2V for qemu-devel@nongnu.org; Sat, 18 Sep 2021 14:45:34 -0400 Received: by mail-pj1-x1035.google.com with SMTP id u13-20020a17090abb0db0290177e1d9b3f7so12336326pjr.1 for ; Sat, 18 Sep 2021 11:45:31 -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 :mime-version:content-transfer-encoding; bh=MwSLIpZg3SBDOkqorWI9RwSF0cto2aAplNrO4o3oH4g=; b=OfcFIhVaDEiEzOK/rX+3aeV5ZbEHksw7k5lRIrl80/Siq9JyTSHhmSvXnIZluCCKBu o5HB9T9YTynZqHWwmThHk3sgWmB72P9tWfiR+E/jotKGZ1xU8904lLqjZ+e6o8c58MA8 OIrnCss3CO/kbhUAkncFYf8Dmal0fuCiWOjlFkwK6quCut4B0irXv/q9KukwcX6dD6Nj 9Z4kYt9myZ9d9D9yH6qGaD3ZNLJVPZOzoCy1ywhyUu82/BbeZ7lU20TL6xKCL0kbN2AZ E6zz/jLMMR9y03KJ33pqLlo72LlxK9z4h2mgfIylYpCzq9G3s7Urim1yMyslfhOFI14/ Aznw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MwSLIpZg3SBDOkqorWI9RwSF0cto2aAplNrO4o3oH4g=; b=MoGkVLtURgss5tw5KNT0713C4AH8EH9YDfaD0m0cCk+Pa52yuYr4QFYHAELXTPL9fn GqVl434CPkGBJy+pLWq459Mwax4VLqdZsBk9UZNQo78r0YKLZeB8hPfwHd2KS7kcSXGr p1Uk7WcZuHlIEzpQ3D/Fb7GJyWKqbNoS98QEAE70eDaW82Yhhl6scVMzNczya2aaQARJ dMoWXBcnd+3jVAnKA0kXCNsJBC9+2ow2gbrwAfmbF8qrin+Kr5IH11LFvGxKY7YPj19+ kvi+rot45Eo0xu2joGz7idSUsQdhIDEODeuuzT+YDF7mMUowTJyf7t5QjYKopArU8gvh HcyA== X-Gm-Message-State: AOAM530Yr61kODscYa+5V2l7Hzkf1b4hT70Q3IOC8EoLRTpOOFkcmN/r aLWxAkUfoIfOQSBPyw+dFZCAFZbG380o7A== X-Received: by 2002:a17:90a:1d4c:: with SMTP id u12mr19050420pju.95.1631990730360; Sat, 18 Sep 2021 11:45:30 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id y26sm9555858pfe.69.2021.09.18.11.45.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Sep 2021 11:45:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 01/41] accel/tcg: Split out adjust_signal_pc Date: Sat, 18 Sep 2021 11:44:47 -0700 Message-Id: <20210918184527.408540-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210918184527.408540-1-richard.henderson@linaro.org> References: <20210918184527.408540-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Split out a function to adjust the raw signal pc into a value that could be passed to cpu_restore_state. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- v2: Adjust pc in place; return MMUAccessType. --- include/exec/exec-all.h | 10 ++++++++++ accel/tcg/user-exec.c | 41 +++++++++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 16 deletions(-) -- 2.25.1 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 9d5987ba04..e54f8e5d65 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -663,6 +663,16 @@ static inline tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, return addr; } +/** + * adjust_signal_pc: + * @pc: raw pc from the host signal ucontext_t. + * @is_write: host memory operation was write, or read-modify-write. + * + * Alter @pc as required for unwinding. Return the type of the + * guest memory access -- host reads may be for guest execution. + */ +MMUAccessType adjust_signal_pc(uintptr_t *pc, bool is_write); + /** * cpu_signal_handler * @signum: host signal number diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 8fed542622..cef025d001 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -57,18 +57,11 @@ static void QEMU_NORETURN cpu_exit_tb_from_sighandler(CPUState *cpu, cpu_loop_exit_noexc(cpu); } -/* 'pc' is the host PC at which the exception was raised. 'address' is - the effective address of the memory exception. 'is_write' is 1 if a - write caused the exception and otherwise 0'. 'old_set' is the - signal set which should be restored */ -static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info, - int is_write, sigset_t *old_set) +/* + * Adjust the pc to pass to cpu_restore_state; return the memop type. + */ +MMUAccessType adjust_signal_pc(uintptr_t *pc, bool is_write) { - CPUState *cpu = current_cpu; - CPUClass *cc; - unsigned long address = (unsigned long)info->si_addr; - MMUAccessType access_type = is_write ? MMU_DATA_STORE : MMU_DATA_LOAD; - switch (helper_retaddr) { default: /* @@ -77,7 +70,7 @@ static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info, * pointer into the generated code that will unwind to the * correct guest pc. */ - pc = helper_retaddr; + *pc = helper_retaddr; break; case 0: @@ -97,7 +90,7 @@ static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info, * Therefore, adjust to compensate for what will be done later * by cpu_restore_state_from_tb. */ - pc += GETPC_ADJ; + *pc += GETPC_ADJ; break; case 1: @@ -113,12 +106,28 @@ static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info, * * Like tb_gen_code, release the memory lock before cpu_loop_exit. */ - pc = 0; - access_type = MMU_INST_FETCH; mmap_unlock(); - break; + *pc = 0; + return MMU_INST_FETCH; } + return is_write ? MMU_DATA_STORE : MMU_DATA_LOAD; +} + +/* + * 'pc' is the host PC at which the exception was raised. + * 'address' is the effective address of the memory exception. + * 'is_write' is 1 if a write caused the exception and otherwise 0. + * 'old_set' is the signal set which should be restored. + */ +static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info, + int is_write, sigset_t *old_set) +{ + CPUState *cpu = current_cpu; + CPUClass *cc; + unsigned long address = (unsigned long)info->si_addr; + MMUAccessType access_type = adjust_signal_pc(&pc, is_write); + /* For synchronous signals we expect to be coming from the vCPU * thread (so current_cpu should be valid) and either from running * code or during translation which can fault as we cross pages.