From patchwork Sun Jun 10 03:00:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 138079 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp2575482lji; Sat, 9 Jun 2018 20:05:50 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK6DO3oDb1TFX495qVKxAR+2FtoTvIHz8oI5KjNn6iUdKIl5DeBVaIy+JhjJroeLKSV+OLn X-Received: by 2002:aed:3c27:: with SMTP id t36-v6mr11216112qte.398.1528599950820; Sat, 09 Jun 2018 20:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528599950; cv=none; d=google.com; s=arc-20160816; b=PwqshAPKwJVIqlm7J6sFc391xYTunE2bkrVWBxu+VkF+SjV7nlCu5R3T6aJt7ZbgOV AHvECvRoy/ynhv5pWMj6UtCGa7P06E7WD/F6stExIhRu9Vle1FNmjj/aEj0zhMKPWKMR ZGcrYB13gWIpdZd+HBpBoc+vjYMobyQs3L63jikrrzFMeKdZfdJHGILf7Nt8CqqOZ0xO QZR57/00FWUmghhDW1m02dt77bfVstah9gnWvd4TyrhLro3LaeXKRwfbibRcXt/Bx4X/ Hp+LRswnWRPhPjrmv1uJIdJCc4uApD3BDv6wBLwaHOdQ2b0rLkusw7JnfKuavFx2hMTq EiMw== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=aZhX4crw3nZleV9x/cupabZl+g+1NR+rOFu8N2TUSEM=; b=kDX8Xd4818aEEmnK6zJFbdU0c/Fl2wvDqQaDvwwcOQhRmheyixXH6lKAmuiNCgaWcW yKStcpB1Fvjn2b0t8jnrcz1gGRR+t/TCBE2jg6j4hxQq+qT+7bO00aWTFdAHmHonwyXL 1k6DjW6mkqzXNEFRhiqY/WzWx4t1T/7oxh0j2dqGT3UpcaDQhWGk3A3z/GvWMHzjKK3P IbgGKjYD2Q2ZIr+hLaGyjn8gPKLUtSBp2yohMQrB6l7nac1AVpoXpuo7MJ5z5C0qidhO nnGcNO21b+1KSFxP5gj94bHkIL3ddmySjjc38DmkzsVqD8jz2pHmdIIV7Y4ajxISofT0 6TNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X0Hb1JZH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g4-v6si6429483qtp.109.2018.06.09.20.05.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 09 Jun 2018 20:05:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X0Hb1JZH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRqfu-00046B-8F for patch@linaro.org; Sat, 09 Jun 2018 23:05:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRqcj-0001VV-1I for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:02:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRqch-00036T-OP for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:02:33 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:41349) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRqch-00036D-IH for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:02:31 -0400 Received: by mail-pg0-x242.google.com with SMTP id l65-v6so8131785pgl.8 for ; Sat, 09 Jun 2018 20:02: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; bh=aZhX4crw3nZleV9x/cupabZl+g+1NR+rOFu8N2TUSEM=; b=X0Hb1JZHWwpbzofYBnr71xsE2MXhAc78z923kvXObE4Iqd7LyapgLoqvxuI3NG1rY/ JyyLaCoq374TIF02RRu5mzoqtpd5Mpco1ShnfUPqTPqVYpkBIYD08R0rwcG4jYu82lqy RZwRNER/o4NEDTzfTj8SEVKy0aHqsBzR6ebIY= 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=aZhX4crw3nZleV9x/cupabZl+g+1NR+rOFu8N2TUSEM=; b=E4BY7YlbwvLlvDPI/mb96fzr65/oOLKPTRwwOXsf7ln6R+GsK6M4N+95ps3/GcY1n+ hCsRf8+ExobK/wpY4Em4SUHe2sajGjkSWPxAqrGZjyb2GRcYq6flKOS9BnDKf7vULUjD 2X3L2YxXa/qemr23MRjkYxKRk6Lg+gO1G4f5VTCIzyesLBBcS6C8YRwV8l8PzLdtHd9W vib0wlHXjyHdZJJ4BdWIOFVhDyPOYvpOGJ5NxNsuUIicgRaoIDhv5uzl6M7+En2e7j05 BjplMcl6AeMVqYLAT0aXampjqGxUNxbMbAbeMb/B5aYbGM+SuJmYniut/o22VVPR30t0 SzJg== X-Gm-Message-State: APt69E0F8AA36tdnaBVl0Wqx8ydvq07HU295BPOQFsFK4jd/L7cl1Ezf mD2TBICuuh2eDpHJk4LOUufgpi2d1Fc= X-Received: by 2002:a63:6742:: with SMTP id b63-v6mr10419554pgc.54.1528599750219; Sat, 09 Jun 2018 20:02:30 -0700 (PDT) Received: from cloudburst.twiddle.net (rrcs-173-198-77-219.west.biz.rr.com. [173.198.77.219]) by smtp.gmail.com with ESMTPSA id y17-v6sm31712718pfe.33.2018.06.09.20.02.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Jun 2018 20:02:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 9 Jun 2018 17:00:34 -1000 Message-Id: <20180610030220.3777-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180610030220.3777-1-richard.henderson@linaro.org> References: <20180610030220.3777-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH v2 002/108] linux-user: Split out do_syscall1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There was supposed to be a single point of return for do_syscall so that tracing works properly. However, there are a few bugs in that area. It is significantly simpler to simply split out an inner function to enforce this. Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson --- linux-user/syscall.c | 77 +++++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 29 deletions(-) -- 2.17.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c212149245..ec3bc1cbe5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7947,13 +7947,15 @@ static int host_to_target_cpu_mask(const unsigned long *host_mask, return 0; } -/* do_syscall() should always have a single exit point at the end so - that actions, such as logging of syscall results, can be performed. - All errnos that do_syscall() returns must be -TARGET_. */ -abi_long do_syscall(void *cpu_env, int num, abi_long arg1, - abi_long arg2, abi_long arg3, abi_long arg4, - abi_long arg5, abi_long arg6, abi_long arg7, - abi_long arg8) +/* This is an internal helper for do_syscall so that it is easier + * to have a single return point, so that actions, such as logging + * of syscall results, can be performed. + * All errnos that do_syscall() returns must be -TARGET_. + */ +static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, + abi_long arg2, abi_long arg3, abi_long arg4, + abi_long arg5, abi_long arg6, abi_long arg7, + abi_long arg8) { CPUState *cpu = ENV_GET_CPU(cpu_env); abi_long ret; @@ -7961,25 +7963,6 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, struct statfs stfs; void *p; -#if defined(DEBUG_ERESTARTSYS) - /* Debug-only code for exercising the syscall-restart code paths - * in the per-architecture cpu main loops: restart every syscall - * the guest makes once before letting it through. - */ - { - static int flag; - - flag = !flag; - if (flag) { - return -TARGET_ERESTARTSYS; - } - } -#endif - - trace_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); - if(do_strace) - print_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6); - switch(num) { case TARGET_NR_exit: /* In old applications this may be used to implement _exit(2). @@ -12765,11 +12748,47 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; } fail: - if(do_strace) - print_syscall_ret(num, ret); - trace_guest_user_syscall_ret(cpu, num, ret); return ret; efault: ret = -TARGET_EFAULT; goto fail; } + +abi_long do_syscall(void *cpu_env, int num, abi_long arg1, + abi_long arg2, abi_long arg3, abi_long arg4, + abi_long arg5, abi_long arg6, abi_long arg7, + abi_long arg8) +{ + CPUState *cpu = ENV_GET_CPU(cpu_env); + abi_long ret; + +#ifdef DEBUG_ERESTARTSYS + /* Debug-only code for exercising the syscall-restart code paths + * in the per-architecture cpu main loops: restart every syscall + * the guest makes once before letting it through. + */ + { + static bool flag; + flag = !flag; + if (flag) { + return -TARGET_ERESTARTSYS; + } + } +#endif + + trace_guest_user_syscall(cpu, num, arg1, arg2, arg3, arg4, + arg5, arg6, arg7, arg8); + + if (unlikely(do_strace)) { + print_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6); + ret = do_syscall1(cpu_env, num, arg1, arg2, arg3, arg4, + arg5, arg6, arg7, arg8); + print_syscall_ret(num, ret); + } else { + ret = do_syscall1(cpu_env, num, arg1, arg2, arg3, arg4, + arg5, arg6, arg7, arg8); + } + + trace_guest_user_syscall_ret(cpu, num, ret); + return ret; +}