From patchwork Tue Jun 28 04:53:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 585500 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp447381mab; Mon, 27 Jun 2022 22:45:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tbQildiqvofK/zZYJaGmr8GhrXUMYdR1HscqWZh/ed/KjtCTgOUk8SnMcgQ/5gWe3s00yX X-Received: by 2002:a05:622a:148c:b0:31b:d8c6:8cbe with SMTP id t12-20020a05622a148c00b0031bd8c68cbemr3216868qtx.678.1656395100463; Mon, 27 Jun 2022 22:45:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656395100; cv=none; d=google.com; s=arc-20160816; b=UA+KSjh7nrXmX2r03c+3Y9g4cyWoNdRLkrsX0v7UgLiF4S4XeRoKHqi5HI3LYWWbyK 0VwUB2Zab6BxWRsOup2g3ypq2GWOzJ3f3Xdk09poc8XbRB9KAu4bcX8HLa1m5mcLd5f4 waQiuRal7uJt88LgQU/3ObMTRRsUvboLR9mDYiPa0C/jdr7f0Z2fynRGAC+lUu4Y8CV+ Gi5M6zmOhU/P4sVCarSDoS+KrUIqZ2f1e7xh0XjoRxKA+5zbNGEe2LvUKuRfvv20Xv8w RZ0BZCOqCI8ZwdWNqe+Qo0lg2qOw5hWxYhYYzUja+oCw+QdlYCHsRwyGI//kCrpmn7Nv PfzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=XykDNb8AiF5XqooTWDspyQ6eumaI59tyN1vSYpnaRMw=; b=ACEWsKUyi1geIhoJARDoleed3Aeiv2/DqqaU212kUlEcHI7zSfyxfelgzSthH2OFkW HPjOV+ySCwW02n4obTefn7X7NX77FiMrmVwxfAWfHEzNhTkxqsDQsHMuT7hooRqxpje1 qcHO2oWCHT5Niw3tgw1dxVfnHhJZVjUPWj4po9YkTqmwSYzlkuW5emtEdZ0CKSS6TgIU bcFfJkv3/87Z/H8pz+w2TuoZzCeIi4B9jvhVxJNSqt06F2u8eaWzyEAt2h6yihjfYKZT Xx3RslQ7jNfN3hFGU0CkTVbV0Sm2TMiY0f4hBe+EE2GyYvTHGvr1/hyoKTw+MrwP7P7+ 9Eqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xjeuGB2B; 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 f9-20020ac840c9000000b00304ecce6d99si6984350qtm.173.2022.06.27.22.45.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 22:45:00 -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=xjeuGB2B; 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]:51010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o641z-00022z-Mq for patch@linaro.org; Tue, 28 Jun 2022 01:45:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o63Eu-0002BA-9Z for qemu-devel@nongnu.org; Tue, 28 Jun 2022 00:54:19 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:42660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o63Es-0008G4-Hw for qemu-devel@nongnu.org; Tue, 28 Jun 2022 00:54:16 -0400 Received: by mail-pf1-x432.google.com with SMTP id d17so10917841pfq.9 for ; Mon, 27 Jun 2022 21:54:14 -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=XykDNb8AiF5XqooTWDspyQ6eumaI59tyN1vSYpnaRMw=; b=xjeuGB2Bf7LQdol2RCndLQeLg+HAxOAMtMwAn6KTfZKlCSG1bY13ntZLO2zeMZ67Ce VWEmFmEjVXdIpaPWjn4+I5cb24CUQpfNoF67HlgV/iUEcfFbP5/z41QNq+U0yDsU+OS6 hyt9nYbx+qpctUEnQwllojZYoy3HKPglZRUnbomJMrSF/AGib029zfFyjDHkNDjwxSuH euZNEdJM6g6BknqQ8pnsJbArVRZ93a2ydmyj5mfm56yUC3QbxAXKOHWZFumQnkPlIBZ1 uYkwN9vWlzyVhu9aezh6HAM3fyXefqE1xW+/xgAVTh+0Lh9d3S6WfLQVN/FnTsotQwsE m/kA== 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=XykDNb8AiF5XqooTWDspyQ6eumaI59tyN1vSYpnaRMw=; b=ZdQ8tHAyZg3/Ml7Tw4hgH9WG0HgFrptKHaNSY5BVh9nzwF3BazJQjOM0VAsBx5R0Ce 8CASogPfO/l5ojYGbOHPuRh8Mq2AM/j0zgJ7ZozynUUCnoLvbheyJS5Zvrz7Tk6wfWR5 Iu3B/i5SVWUs2+DxNTPXXtvN8i+6rPo1ZKhBK5qFgqevhUIzMvVYjSikEqn3hguBQzln nf0WW7DdSas06/dgdfd3qArKcHS8ipRVj0e20IVnyzjo9x7Cs5adnIu3wEaAQ/0QBNQ/ iZjeBddd+Mvw9B1v5wudubBQbqCTWipHNkHWKWa1nkkHzDfx3zMfDbYjbJaaQX8c8tx8 sJ+Q== X-Gm-Message-State: AJIora98TXiPudngGfEhB+hVnKYoeB9PMrhrq1gt+Df7tmxNnisD8k3U m7fp5LCEuUDjXtBhjgPB/oWStDgxUU17Bg== X-Received: by 2002:a05:6a00:14c7:b0:525:89c1:35fb with SMTP id w7-20020a056a0014c700b0052589c135fbmr2755157pfu.36.1656392053235; Mon, 27 Jun 2022 21:54:13 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id w8-20020a1709026f0800b00168c523032fsm8073735plk.269.2022.06.27.21.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 21:54:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 02/60] semihosting: Return failure from softmmu-uaccess.h functions Date: Tue, 28 Jun 2022 10:23:05 +0530 Message-Id: <20220628045403.508716-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220628045403.508716-1-richard.henderson@linaro.org> References: <20220628045403.508716-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We were reporting unconditional success for these functions; pass on any failure from cpu_memory_rw_debug. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- include/semihosting/softmmu-uaccess.h | 91 ++++++++++++--------------- 1 file changed, 39 insertions(+), 52 deletions(-) diff --git a/include/semihosting/softmmu-uaccess.h b/include/semihosting/softmmu-uaccess.h index e69e3c8548..5246a91570 100644 --- a/include/semihosting/softmmu-uaccess.h +++ b/include/semihosting/softmmu-uaccess.h @@ -12,82 +12,69 @@ #include "cpu.h" -static inline uint64_t softmmu_tget64(CPUArchState *env, target_ulong addr) -{ - uint64_t val; +#define get_user_u64(val, addr) \ + ({ uint64_t val_ = 0; \ + int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \ + &val_, sizeof(val_), 0); \ + (val) = tswap64(val_); ret_; }) - cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 8, 0); - return tswap64(val); -} +#define get_user_u32(val, addr) \ + ({ uint32_t val_ = 0; \ + int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \ + &val_, sizeof(val_), 0); \ + (val) = tswap32(val_); ret_; }) -static inline uint32_t softmmu_tget32(CPUArchState *env, target_ulong addr) -{ - uint32_t val; +#define get_user_u8(val, addr) \ + ({ uint8_t val_ = 0; \ + int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \ + &val_, sizeof(val_), 0); \ + (val) = val_; ret_; }) - cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 4, 0); - return tswap32(val); -} - -static inline uint32_t softmmu_tget8(CPUArchState *env, target_ulong addr) -{ - uint8_t val; - - cpu_memory_rw_debug(env_cpu(env), addr, &val, 1, 0); - return val; -} - -#define get_user_u64(arg, p) ({ arg = softmmu_tget64(env, p); 0; }) -#define get_user_u32(arg, p) ({ arg = softmmu_tget32(env, p) ; 0; }) -#define get_user_u8(arg, p) ({ arg = softmmu_tget8(env, p) ; 0; }) #define get_user_ual(arg, p) get_user_u32(arg, p) -static inline void softmmu_tput64(CPUArchState *env, - target_ulong addr, uint64_t val) -{ - val = tswap64(val); - cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 8, 1); -} +#define put_user_u64(val, addr) \ + ({ uint64_t val_ = tswap64(val); \ + cpu_memory_rw_debug(env_cpu(env), (addr), &val_, sizeof(val_), 1); }) + +#define put_user_u32(val, addr) \ + ({ uint32_t val_ = tswap32(val); \ + cpu_memory_rw_debug(env_cpu(env), (addr), &val_, sizeof(val_), 1); }) -static inline void softmmu_tput32(CPUArchState *env, - target_ulong addr, uint32_t val) -{ - val = tswap32(val); - cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 4, 1); -} -#define put_user_u64(arg, p) ({ softmmu_tput64(env, p, arg) ; 0; }) -#define put_user_u32(arg, p) ({ softmmu_tput32(env, p, arg) ; 0; }) #define put_user_ual(arg, p) put_user_u32(arg, p) -static void *softmmu_lock_user(CPUArchState *env, - target_ulong addr, target_ulong len, int copy) +static void *softmmu_lock_user(CPUArchState *env, target_ulong addr, + target_ulong len, bool copy) { - uint8_t *p; - /* TODO: Make this something that isn't fixed size. */ - p = malloc(len); + void *p = malloc(len); if (p && copy) { - cpu_memory_rw_debug(env_cpu(env), addr, p, len, 0); + if (cpu_memory_rw_debug(env_cpu(env), addr, p, len, 0)) { + free(p); + p = NULL; + } } return p; } #define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy) + static char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr) { - char *p; - char *s; - uint8_t c; /* TODO: Make this something that isn't fixed size. */ - s = p = malloc(1024); + char *s = malloc(1024); + size_t len = 0; + if (!s) { return NULL; } do { - cpu_memory_rw_debug(env_cpu(env), addr, &c, 1, 0); - addr++; - *(p++) = c; - } while (c); + if (cpu_memory_rw_debug(env_cpu(env), addr++, s + len, 1, 0)) { + free(s); + return NULL; + } + } while (s[len++]); return s; } #define lock_user_string(p) softmmu_lock_user_string(env, p) + static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr, target_ulong len) {