From patchwork Sat May 21 00:03:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 574928 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1f0e:0:0:0:0 with SMTP id hs14csp2673690mab; Fri, 20 May 2022 17:39:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1r0Oc7HdmKt0InfWZdG4L4KYZvaxhU3x2LWDsMBFYhBCX0kpzJQ1xwOOERdBvgfraphqO X-Received: by 2002:a05:6214:c49:b0:461:dace:171f with SMTP id r9-20020a0562140c4900b00461dace171fmr10041458qvj.98.1653093547213; Fri, 20 May 2022 17:39:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653093547; cv=none; d=google.com; s=arc-20160816; b=f9topHlDP1qiSx0zZI8/coAsZz+fiISznSb2cfoCE72xI+O0++cZQwItfXFBdpTvR5 AD3zIvxjP0lXMAMV/sdA31CobbHcfeU3OthKhjT0tzTU7/BWX30BWJZNhjsBVes5PJSp TSL+JJHu+Mo+I3xBhA+S4xrKy+wi1MVOsP7lw4OJKvoCzNhGfIC0rMoVTboccIjxDFqF aVsdqe04ANXjJdNbjuVpWgA8uzQ6bnY0E1fuVT++XX2vNF/xAtITrLrBFkOnuSm6Y1Xe TXUZUcb8n5wjy+YublOmusYXjg3j6P+vLGqxyG9SgicqJLhEO7JB5DWKq45UIbaqhC8E iexg== 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=7Ent/aGrN0lvBHhuu6zgeU6QjQbHaFQoY2hP0wODKxw=; b=HIv9b7zYBlR5ggsdKO0KtbBFTkF63yVLSh+0KiOd4Fm4zMSBAcFqOZ5Z7LoH4FYTRT 6guCPeNvmkKD+/SDReG6jrzoTELyPCDkEGP9lRjPafAgOSKNevFHRk8sgpRhP8oZcLCG cKbeJ6olseccFSF5PT/5qc5VLNsUJj7RwIxlysOhb/o3bkroD53OBqZQqMsa11O+w2w+ KiBCf4omsOcTuKheUErgPk3LwCk2Bz89UnawzHP2+IY4RS7d5A1U/K5oRgDFhx7IxRFg BlfxUJSiD2FYxiHyJa40FepjYqRUHb2Z4oYbLQHkXK+OAT0XVggcYPlsxTBw5Jz+VVeX HCEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CzQvSZ+B; 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 s21-20020a05620a0bd500b0069c41fad5d0si440310qki.290.2022.05.20.17.39.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 May 2022 17:39:07 -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=CzQvSZ+B; 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]:44068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsD98-0001R6-Rd for patch@linaro.org; Fri, 20 May 2022 20:39:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsCbw-0008Bf-6K for qemu-devel@nongnu.org; Fri, 20 May 2022 20:04:57 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:35563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nsCbf-00041H-DZ for qemu-devel@nongnu.org; Fri, 20 May 2022 20:04:45 -0400 Received: by mail-pg1-x52a.google.com with SMTP id c22so8996744pgu.2 for ; Fri, 20 May 2022 17:04: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=7Ent/aGrN0lvBHhuu6zgeU6QjQbHaFQoY2hP0wODKxw=; b=CzQvSZ+B6ttbnIcVRnOJTxfxWy7nxbtBLyYH2JAXZB40nNQ0paBc+V1je1fyJuC54L ukf+XXT4WNPbncgKcUfyEdjRVemfcAL7x0cq6zK0h662LMHroP6TTf4i2BGm0Af562x7 WC39T4152Ob+NtLT2mleZH2ko+D1klJNzEjKM7g6ynZYpvRlFeDMEDF1LF96yqTmFDgU hb+IXTSxip/mjJrG0WvQ6nZEgJtLh5CS9TDZXZjvEyIFBuSLLg3rYcKjzY6QSp5ybWOn 9IvJH7uSAHhrkEXeUCoLkw2sQwJpxYh3XAzzTL30pA6Yx4SuCDCnZtgTeBYhckeRGnR0 05yw== 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=7Ent/aGrN0lvBHhuu6zgeU6QjQbHaFQoY2hP0wODKxw=; b=GLFrmGta97m39pb55FU6psQyEipg9D5YCyZBBCEzKCFv/a+3DLuOXaGWHN3kbf3DaN S2VG6JINv2puE9q3M5aD7ZItw6LEYTiSkTWA4A5dRdkEvRoFDVSIqjfxgeuhXvRz0pvF oJpKjjQ+96cbw8cYeg0t9OOj1RxdY4dK19X63dPT3CjxXeC256zZHCDrtorZMeWPUmNV jsLVL+y7kS9QHZiGXsS+R+y9OFr15afFEYnwmV8s6VJkbb9hbTPokFKelV9kKHWAPPRc VzepcDIWzM0GAKMgSAjo1oLviMJIpCy1cmmGqNlruA+Iem9hzPjC0gnZ+nkE6VHGF1tH yPKA== X-Gm-Message-State: AOAM531NI30Oodcv7WIdxMeyFPreQf8pSRyCXWEBRPiw9QpTrVC2x23F ehxIa02mHMXEm9ko8GKEUxztUXan5y672Q== X-Received: by 2002:a63:dd09:0:b0:3f2:804a:cf11 with SMTP id t9-20020a63dd09000000b003f2804acf11mr10517982pgg.621.1653091469891; Fri, 20 May 2022 17:04:29 -0700 (PDT) Received: from stoup.. ([71.212.142.129]) by smtp.gmail.com with ESMTPSA id h8-20020a654808000000b003f9d1c020cbsm306369pgs.51.2022.05.20.17.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 17:04:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, alex.bennee@linaro.org Subject: [PATCH v3 24/49] semihosting: Split out semihost_sys_close Date: Fri, 20 May 2022 17:03:35 -0700 Message-Id: <20220521000400.454525-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220521000400.454525-1-richard.henderson@linaro.org> References: <20220521000400.454525-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52a.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" Split out the non-ARM specific portions of SYS_CLOSE to a reusable function. This handles all GuestFD. Note that gdb_do_syscall %x reads target_ulong, not int. Signed-off-by: Richard Henderson --- include/semihosting/syscalls.h | 3 +++ semihosting/arm-compat-semi.c | 41 +---------------------------- semihosting/guestfd.c | 7 ++++- semihosting/syscalls.c | 47 ++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 41 deletions(-) diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h index 991658bf79..00e718f11d 100644 --- a/include/semihosting/syscalls.h +++ b/include/semihosting/syscalls.h @@ -22,4 +22,7 @@ void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete, target_ulong fname, target_ulong fname_len, int gdb_flags, int mode); +void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, + int fd); + #endif /* SEMIHOSTING_SYSCALLS_H */ diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index cc008d0338..9bb80c3286 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -276,7 +276,6 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err) * do the work and return the required return value to the guest * via common_semi_cb. */ -typedef void sys_closefn(CPUState *cs, GuestFD *gf); typedef void sys_writefn(CPUState *cs, GuestFD *gf, target_ulong buf, uint32_t len); typedef void sys_readfn(CPUState *cs, GuestFD *gf, @@ -285,23 +284,6 @@ typedef void sys_isattyfn(CPUState *cs, GuestFD *gf); typedef void sys_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset); typedef void sys_flenfn(CPUState *cs, GuestFD *gf); -static void host_closefn(CPUState *cs, GuestFD *gf) -{ - int ret; - /* - * Only close the underlying host fd if it's one we opened on behalf - * of the guest in SYS_OPEN. - */ - if (gf->hostfd == STDIN_FILENO || - gf->hostfd == STDOUT_FILENO || - gf->hostfd == STDERR_FILENO) { - ret = 0; - } else { - ret = close(gf->hostfd); - } - common_semi_cb(cs, ret, ret ? errno : 0); -} - static void host_writefn(CPUState *cs, GuestFD *gf, target_ulong buf, uint32_t len) { @@ -362,11 +344,6 @@ static void host_flenfn(CPUState *cs, GuestFD *gf) } } -static void gdb_closefn(CPUState *cs, GuestFD *gf) -{ - gdb_do_syscall(common_semi_cb, "close,%x", gf->hostfd); -} - static void gdb_writefn(CPUState *cs, GuestFD *gf, target_ulong buf, uint32_t len) { @@ -414,12 +391,6 @@ static const uint8_t featurefile_data[] = { SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */ }; -static void staticfile_closefn(CPUState *cs, GuestFD *gf) -{ - /* Nothing to do */ - common_semi_cb(cs, 0, 0); -} - static void staticfile_writefn(CPUState *cs, GuestFD *gf, target_ulong buf, uint32_t len) { @@ -468,7 +439,6 @@ static void staticfile_flenfn(CPUState *cs, GuestFD *gf) } typedef struct GuestFDFunctions { - sys_closefn *closefn; sys_writefn *writefn; sys_readfn *readfn; sys_isattyfn *isattyfn; @@ -478,7 +448,6 @@ typedef struct GuestFDFunctions { static const GuestFDFunctions guestfd_fns[] = { [GuestFDHost] = { - .closefn = host_closefn, .writefn = host_writefn, .readfn = host_readfn, .isattyfn = host_isattyfn, @@ -486,7 +455,6 @@ static const GuestFDFunctions guestfd_fns[] = { .flenfn = host_flenfn, }, [GuestFDGDB] = { - .closefn = gdb_closefn, .writefn = gdb_writefn, .readfn = gdb_readfn, .isattyfn = gdb_isattyfn, @@ -494,7 +462,6 @@ static const GuestFDFunctions guestfd_fns[] = { .flenfn = gdb_flenfn, }, [GuestFDStatic] = { - .closefn = staticfile_closefn, .writefn = staticfile_writefn, .readfn = staticfile_readfn, .isattyfn = staticfile_isattyfn, @@ -585,13 +552,7 @@ void do_common_semihosting(CPUState *cs) case TARGET_SYS_CLOSE: GET_ARG(0); - - gf = get_guestfd(arg0); - if (!gf) { - goto do_badf; - } - guestfd_fns[gf->type].closefn(cs, gf); - dealloc_guestfd(arg0); + semihost_sys_close(cs, common_semi_cb, arg0); break; case TARGET_SYS_WRITEC: diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c index 7ac2e147a8..e3122ebba9 100644 --- a/semihosting/guestfd.c +++ b/semihosting/guestfd.c @@ -49,6 +49,11 @@ int alloc_guestfd(void) return i; } +static void do_dealloc_guestfd(GuestFD *gf) +{ + gf->type = GuestFDUnused; +} + /* * Look up the guestfd in the data structure; return NULL * for out of bounds, but don't check whether the slot is unused. @@ -119,5 +124,5 @@ void dealloc_guestfd(int guestfd) GuestFD *gf = do_get_guestfd(guestfd); assert(gf); - gf->type = GuestFDUnused; + do_dealloc_guestfd(gf); } diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c index a44d5cbae2..9c4b635317 100644 --- a/semihosting/syscalls.c +++ b/semihosting/syscalls.c @@ -124,6 +124,12 @@ static void gdb_open(CPUState *cs, gdb_syscall_complete_cb complete, fname, len, (target_ulong)gdb_flags, (target_ulong)mode); } +static void gdb_close(CPUState *cs, gdb_syscall_complete_cb complete, + GuestFD *gf) +{ + gdb_do_syscall(complete, "close,%x", (target_ulong)gf->hostfd); +} + /* * Host semihosting syscall implementations. */ @@ -170,6 +176,23 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, unlock_user(p, fname, 0); } +static void host_close(CPUState *cs, gdb_syscall_complete_cb complete, + GuestFD *gf) +{ + /* + * Only close the underlying host fd if it's one we opened on behalf + * of the guest in SYS_OPEN. + */ + if (gf->hostfd != STDIN_FILENO && + gf->hostfd != STDOUT_FILENO && + gf->hostfd != STDERR_FILENO && + close(gf->hostfd) < 0) { + complete(cs, -1, errno_for_gdb()); + } else { + complete(cs, 0, 0); + } +} + /* * Syscall entry points. */ @@ -184,3 +207,27 @@ void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete, host_open(cs, complete, fname, fname_len, gdb_flags, mode); } } + +void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd) +{ + GuestFD *gf = get_guestfd(fd); + + if (!gf) { + complete(cs, -1, GDB_EBADF); + return; + } + switch (gf->type) { + case GuestFDGDB: + gdb_close(cs, complete, gf); + break; + case GuestFDHost: + host_close(cs, complete, gf); + break; + case GuestFDStatic: + complete(cs, 0, 0); + break; + default: + g_assert_not_reached(); + } + dealloc_guestfd(fd); +}