From patchwork Fri Jan 18 21:30:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 156059 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3733888jaa; Fri, 18 Jan 2019 13:41:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN7U8ff5taFfe79d48bOo/EeT8b7mOFQT7rzbWpCi1gc2zrPompd/lkqJnYoy/UwAaTgZt86 X-Received: by 2002:adf:ed92:: with SMTP id c18mr18607433wro.194.1547847660912; Fri, 18 Jan 2019 13:41:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547847660; cv=none; d=google.com; s=arc-20160816; b=PpdQ8UEllwJ1Etl8BQRhdpWK8yAw8OAFCKiT1y0er8lehXnb6L2KVcceMOO9ruAAaI aC5St8kRbI5MHGQDXiZ/XEPTQWsEWMrVk81YUMm4LiqgGVbVaaW/z8w5sgIj2jeoGHfG O4Bs1BVbUbO8en0P5UEMl9Bt5scPYIzVNpKUMvjN/6sMbYdTmbzQ0JCDwWmDxV8B8Pq/ bVvFwWL+qWhHG4/Gun+q6d80KA3kWZ8ODJzNZmTSM1LkzU+EfuHt2G7CrhyHVkUgHrI8 cNN9k6jNsthRtWrzNcClLIv3qQHrnwcF/cjQvGgaova1WI5iFykMH8l9gLqzE2fnbjwY oY+w== 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; bh=WbkFzNdw4ZUaUkoqoS/QfvrwzkBXiBnsY3U3DGJDqiI=; b=EsnJa36wnmaezO420VV85OgxeiOALyXfhAisIx4sa+nSSPEzDo732lNn8DeYbmLff9 UvdLAoekEhV923dbaXAJ8TwTb/NNKMib8Z0FJ+AO5HRkXh95h9LX8R1fSI//1oevxDsA BYTPtwl5AzC+zhde+q5jNrhm5PBfEwfSScgh8UiEF30/Cvh5nqb7/Ft6bPoMWB9LavU+ io0EvJX3Tb4REKqBGeacMcHmS50h4uYm3YCS2sfcFpvnGyNyONoo6cNUsk2aCbPY1pRY eOfDW31FXBvhJQu+Dl1iG2FgYJ7ZTpHt7qpGtV1u7pleygF1iSD2kOC8G8BwlY6p0lm2 rC/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Q4MrDzxa; 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=fail (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 d10si62247369wra.444.2019.01.18.13.41.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 Jan 2019 13:41:00 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=Q4MrDzxa; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:47480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkbsp-0002uy-Pc for patch@linaro.org; Fri, 18 Jan 2019 16:40:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkbk0-0004nP-Vb for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:31:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkbk0-0004Aa-2w for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:31:52 -0500 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:47054) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkbjz-00049F-Su for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:31:52 -0500 Received: by mail-pl1-x644.google.com with SMTP id t13so6870017ply.13 for ; Fri, 18 Jan 2019 13:31:51 -0800 (PST) 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=WbkFzNdw4ZUaUkoqoS/QfvrwzkBXiBnsY3U3DGJDqiI=; b=Q4MrDzxaswTU1rPbVVZPCWexH6i0DJQQTVv/PkJkG8/y0XKnPJCLEVHJKeVosDOOtA 1FsAvL6UOZioRjmuSu4fYtT5geK9pdhaFJJLA2efBP4+qEFAEA+DsdC1dtJUhhGS2B8t iqb/qbxXvoR/tk4FFlUgfPPi32Do5fc+S7xo8= 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=WbkFzNdw4ZUaUkoqoS/QfvrwzkBXiBnsY3U3DGJDqiI=; b=S2aU0tTeJa056evNBUvjXqHATKNmnuCqLA2o6uOIb3ogVoll5FVj4ypPwTXmTKs8GW 1l0aS8bAO8sXeyKUFfTqmFI0eDlQ2TZuAPtSgggntqVdysSsXh3AqJ1z8tCZEIDRH0+m Ax3TC7jqlh3zMnXIr+ZJJYctU5++rhrQLFqlX/N/LC3aGqCxgt+WZfTDTrCcQjQ4UhMv LpiAGs0dYEwmxznIZWVe2hAmcNicg6/x0sMCi6Uirv2iUBIggfeDzPwx3C2jEMYFUwlq E09TGTclUJVwfYPgtCdCOHaWrLHFkJbLSi0Jq2oakPXbDKMcV+5P8T25caMk9RgeUAnr pefQ== X-Gm-Message-State: AJcUukdBt/6sZa4jJ7DKHgRXRyrsqjuja4qHjChK8LziAXz2So4KIqzF QDi9xB7dri3Ffw0ehPqAWuEZLQo0MKA= X-Received: by 2002:a17:902:c05:: with SMTP id 5mr20826248pls.155.1547847110624; Fri, 18 Jan 2019 13:31:50 -0800 (PST) Received: from cloudburst.twiddle.net ([2001:8000:10e0:a000:c673:a6b6:fdef:1933]) by smtp.gmail.com with ESMTPSA id v12sm5833667pgg.41.2019.01.18.13.31.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Jan 2019 13:31:50 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 19 Jan 2019 08:30:43 +1100 Message-Id: <20190118213122.22865-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190118213122.22865-1-richard.henderson@linaro.org> References: <20190118213122.22865-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::644 Subject: [Qemu-devel] [PATCH v6 10/49] linux-user: Split out readv, writev 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" Signed-off-by: Richard Henderson --- linux-user/syscall-defs.h | 2 ++ linux-user/syscall-file.inc.c | 34 ++++++++++++++++++++++++++++++++++ linux-user/syscall.c | 22 ---------------------- linux-user/strace.list | 6 ------ 4 files changed, 36 insertions(+), 28 deletions(-) -- 2.17.2 diff --git a/linux-user/syscall-defs.h b/linux-user/syscall-defs.h index b031de1375..130ba7e344 100644 --- a/linux-user/syscall-defs.h +++ b/linux-user/syscall-defs.h @@ -28,4 +28,6 @@ SYSCALL_DEF(readlink, ARG_STR, ARG_PTR, ARG_DEC); #ifdef TARGET_NR_readlinkat SYSCALL_DEF(readlinkat, ARG_ATDIRFD, ARG_STR, ARG_PTR, ARG_DEC); #endif +SYSCALL_DEF(readv, ARG_DEC, ARG_PTR, ARG_DEC); SYSCALL_DEF(write, ARG_DEC, ARG_PTR, ARG_DEC); +SYSCALL_DEF(writev, ARG_DEC, ARG_PTR, ARG_DEC); diff --git a/linux-user/syscall-file.inc.c b/linux-user/syscall-file.inc.c index 9c8025b252..9bd21ac5cd 100644 --- a/linux-user/syscall-file.inc.c +++ b/linux-user/syscall-file.inc.c @@ -343,6 +343,23 @@ SYSCALL_IMPL(read) return ret; } +SYSCALL_IMPL(readv) +{ + int fd = arg1; + abi_ulong target_vec = arg2; + int count = arg3; + struct iovec *vec = lock_iovec(VERIFY_WRITE, target_vec, count, 0); + abi_long ret; + + if (vec != NULL) { + ret = get_errno(safe_readv(fd, vec, count)); + unlock_iovec(vec, target_vec, count, 1); + } else { + ret = -host_to_target_errno(errno); + } + return ret; +} + static abi_long do_readlinkat(int dirfd, abi_ulong target_path, abi_ulong target_buf, abi_ulong bufsiz) { @@ -419,3 +436,20 @@ SYSCALL_IMPL(write) unlock_user(p, target_p, 0); return ret; } + +SYSCALL_IMPL(writev) +{ + int fd = arg1; + abi_ulong target_vec = arg2; + int count = arg3; + struct iovec *vec = lock_iovec(VERIFY_READ, target_vec, count, 1); + abi_long ret; + + if (vec != NULL) { + ret = get_errno(safe_writev(fd, vec, count)); + unlock_iovec(vec, target_vec, count, 0); + } else { + ret = -host_to_target_errno(errno); + } + return ret; +} diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c236a80437..df47ee106e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8949,28 +8949,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, /* NOTE: the flock constant seems to be the same for every Linux platform */ return get_errno(safe_flock(arg1, arg2)); - case TARGET_NR_readv: - { - struct iovec *vec = lock_iovec(VERIFY_WRITE, arg2, arg3, 0); - if (vec != NULL) { - ret = get_errno(safe_readv(arg1, vec, arg3)); - unlock_iovec(vec, arg2, arg3, 1); - } else { - ret = -host_to_target_errno(errno); - } - } - return ret; - case TARGET_NR_writev: - { - struct iovec *vec = lock_iovec(VERIFY_READ, arg2, arg3, 1); - if (vec != NULL) { - ret = get_errno(safe_writev(arg1, vec, arg3)); - unlock_iovec(vec, arg2, arg3, 0); - } else { - ret = -host_to_target_errno(errno); - } - } - return ret; #if defined(TARGET_NR_preadv) case TARGET_NR_preadv: { diff --git a/linux-user/strace.list b/linux-user/strace.list index f3a1b0fe31..e02a854cea 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1073,9 +1073,6 @@ #ifdef TARGET_NR_readdir { TARGET_NR_readdir, "readdir" , NULL, NULL, NULL }, #endif -#ifdef TARGET_NR_readv -{ TARGET_NR_readv, "readv" , NULL, NULL, NULL }, -#endif #ifdef TARGET_NR_reboot { TARGET_NR_reboot, "reboot" , NULL, NULL, NULL }, #endif @@ -1608,9 +1605,6 @@ #ifdef TARGET_NR_waitpid { TARGET_NR_waitpid, "waitpid" , "%s(%d,%p,%#x)", NULL, NULL }, #endif -#ifdef TARGET_NR_writev -{ TARGET_NR_writev, "writev" , "%s(%d,%p,%#x)", NULL, NULL }, -#endif #ifdef TARGET_NR_utimensat { TARGET_NR_utimensat, "utimensat", NULL, print_utimensat, NULL }, #endif