From patchwork Fri Jan 18 21:31:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 156093 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3758427jaa; Fri, 18 Jan 2019 14:13:17 -0800 (PST) X-Google-Smtp-Source: ALg8bN52WWuab/4F3a5PHAaR9CzD0Eky5AuUlo2gDm3CJ5X5GYZgonsma/dN3R4FuPM+ZZjp9aNe X-Received: by 2002:a05:6000:10d1:: with SMTP id b17mr18194193wrx.306.1547849597342; Fri, 18 Jan 2019 14:13:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547849597; cv=none; d=google.com; s=arc-20160816; b=UZg5c3uwQJEQWA/hdrLBjFDoh4K5a6z26thlNJKYlqQ8H5FdquzkxyXtZH0216rPym LzxWEOiZ9geZP7RY0UuaVA2vOmpIpcYbThBGnEHNKhL6rPP5mv58xNmizmzVkAdtF05D 8hU2WnadJtF4iJ3EmsKEcQGR9NHVuWaw0M+41w6udkpFOSk94f69WlQ7JuYzXObKMVJs cKOEeYyKvHebKULCbLhiMH1MqWt2Idao69oN1zqBgZ6CiEhYOh7Y7nJNkfYhxOYu9wsV i8RzmSonGP2hcKoJBsZ6vfsAyXnjR9Ck00bFl4esj4G/52QOB1A+z0HYpirrQkeB2+hQ fg+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=W3z+QQSMQZhI4Cw/AlBaCLLQDlmHhIuHBH2JUURMgp8=; b=W1WgIMTqOTkqHf5et1Fc8pr1fQgnszP8eX08Z6ZQzyhy+peHl8WRqeXEe3Gr0ezoLN maEzq8Nd8KMe3eocmz6EZHkuKuuizikudFbdotwxA+volZlQcug92r4huhuV5M3DuQ+S yfGuXUemfkKu5lyVCNZ1RkDdH2mPFJd6KhYs0tNbegavojGTOFISqKNPAAmQummwNcSh 39ORURv22dmruRZQZ+yddhlD6FcgEA7DEIt7m+rsOPzK+5M1fHeH2GzHciNZD8TmRBdG gazQIaBezD5C/6SG34NCRx0//nDI4osJxQj4+LUQhJVHM9MU7p9AlMFt059Fk/mGZa/4 Vgew== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SIId+idr; 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 a8si59612339wrx.222.2019.01.18.14.13.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 Jan 2019 14:13:17 -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=SIId+idr; 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]:48008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkcO4-0004hA-3O for patch@linaro.org; Fri, 18 Jan 2019 17:13:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkbkz-0005as-6y for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:32:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkbkx-0005BV-96 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:32:53 -0500 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:40625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkbkt-00056n-Dp for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:32:49 -0500 Received: by mail-pg1-x544.google.com with SMTP id z10so6647489pgp.7 for ; Fri, 18 Jan 2019 13:32:45 -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=W3z+QQSMQZhI4Cw/AlBaCLLQDlmHhIuHBH2JUURMgp8=; b=SIId+idruHvBIAhdOff6FAP3JCFTX7a577jNn71K8SgsOxNo8D0UXFMY1pEZstMuM7 kn+y7POITeDSbMNgfKi64x+6qZwTF4NDNxDfoC8Xlbgyl2KeuHmAvI4fqoLTglP8bZJP d6EN3Xea5IrjowkHbZ6HjxTx7el/3JLoB9ess= 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=W3z+QQSMQZhI4Cw/AlBaCLLQDlmHhIuHBH2JUURMgp8=; b=kGhXbVMzr6r+EPASFM/am/WaaaB6Bg25NkpuVppsw1G9cu7NjBjnt2eRRCvw6Vtr47 y7Ar8lg9EX/WNAnJtRlIhhoBFJfaFwGH8L3V9Zl/IQIekA0ggFPOgvTpfzlqqkPcenWv 117Q7xF/gYogvfJpUTpGXjZgKUJC03e8zoREte76EkQGhdIMHr/nKPrxoSyX+6jk/DBw jInaI2YTfR18zrPTDGxgdBJoC6b7ZOfxxqcIYpjv1v2YA5/2pdFCySIrnlvvnUBYoQ8+ 8X0H8fAimu8jEeHm4mEoe3c5HRMi7eMrcsenC5AhD6zZj070hNdO2FgShK8yyArWCXNB 7VOw== X-Gm-Message-State: AJcUukfdkWe4AFchLZm0CpWoMphaM7HuSBeYRZbshdawsfhbdG5YB8uO d4pn/59pO5Rhr/Tw8oNEwd2hXjNzKFU= X-Received: by 2002:a65:5bc4:: with SMTP id o4mr19553567pgr.426.1547847164257; Fri, 18 Jan 2019 13:32:44 -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.32.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Jan 2019 13:32:43 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 19 Jan 2019 08:31:06 +1100 Message-Id: <20190118213122.22865-33-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::544 Subject: [Qemu-devel] [PATCH v6 33/49] linux-user: Split out umount, umount2 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" Note that umount2 is unconditionally available. Signed-off-by: Richard Henderson --- linux-user/syscall-defs.h | 4 ++++ linux-user/syscall.h | 1 + linux-user/strace.c | 30 ++++-------------------------- linux-user/syscall-file.inc.c | 25 +++++++++++++++++++++++++ linux-user/syscall.c | 16 ---------------- linux-user/strace.list | 6 ------ 6 files changed, 34 insertions(+), 48 deletions(-) -- 2.17.2 diff --git a/linux-user/syscall-defs.h b/linux-user/syscall-defs.h index 2b331c6a6d..0d8da0c6d6 100644 --- a/linux-user/syscall-defs.h +++ b/linux-user/syscall-defs.h @@ -155,6 +155,10 @@ SYSCALL_DEF(shmget, ARG_DEC, ARG_DEC, ARG_HEX); #ifdef TARGET_NR_time SYSCALL_DEF(time, ARG_PTR); #endif +#ifdef TARGET_NR_umount +SYSCALL_DEF(umount, ARG_STR); +#endif +SYSCALL_DEF(umount2, ARG_STR, ARG_UMOUNTFLAG); #ifdef TARGET_NR_unlink SYSCALL_DEF(unlink, ARG_STR); #endif diff --git a/linux-user/syscall.h b/linux-user/syscall.h index 35dd3e5fa3..3c936b648a 100644 --- a/linux-user/syscall.h +++ b/linux-user/syscall.h @@ -64,6 +64,7 @@ typedef enum { ARG_MODEFLAG, ARG_MOUNTFLAG, ARG_OPENFLAG, + ARG_UMOUNTFLAG, ARG_UNLINKATFLAG, ARG_LSEEKWHENCE, diff --git a/linux-user/strace.c b/linux-user/strace.c index eb02430eba..78781b8817 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -733,7 +733,7 @@ static struct flags const mount_flags[] = { FLAG_END, }; -UNUSED static struct flags umount2_flags[] = { +static struct flags const umount2_flags[] = { #ifdef MNT_FORCE FLAG_GENERIC(MNT_FORCE), #endif @@ -2003,31 +2003,6 @@ print_symlinkat(const struct syscallname *name, } #endif -#ifdef TARGET_NR_umount -static void -print_umount(const struct syscallname *name, - abi_long arg0, abi_long arg1, abi_long arg2, - abi_long arg3, abi_long arg4, abi_long arg5) -{ - print_syscall_prologue(name); - print_string(arg0, 1); - print_syscall_epilogue(name); -} -#endif - -#ifdef TARGET_NR_umount2 -static void -print_umount2(const struct syscallname *name, - abi_long arg0, abi_long arg1, abi_long arg2, - abi_long arg3, abi_long arg4, abi_long arg5) -{ - print_syscall_prologue(name); - print_string(arg0, 0); - print_flags(umount2_flags, arg1, 1); - print_syscall_epilogue(name); -} -#endif - #ifdef TARGET_NR_utime static void print_utime(const struct syscallname *name, @@ -2293,6 +2268,9 @@ static void print_syscall_def1(const SyscallDef *def, int64_t args[6]) case ARG_OPENFLAG: len = add_open_flags(b, rest, arg); break; + case ARG_UMOUNTFLAG: + len = add_flags(b, rest, umount2_flags, arg, false); + break; case ARG_UNLINKATFLAG: len = add_flags(b, rest, unlinkat_flags, arg, true); break; diff --git a/linux-user/syscall-file.inc.c b/linux-user/syscall-file.inc.c index d7eb72cc31..7ec1c26347 100644 --- a/linux-user/syscall-file.inc.c +++ b/linux-user/syscall-file.inc.c @@ -810,6 +810,31 @@ SYSCALL_IMPL(readlinkat) } #endif +static abi_long do_umount2(abi_ulong target_path, int flags) +{ + char *p = lock_user_string(target_path); + abi_long ret; + + if (!p) { + return -TARGET_EFAULT; + } + ret = get_errno(umount2(p, flags)); + unlock_user(p, target_path, 0); + return ret; +} + +#ifdef TARGET_NR_umount +SYSCALL_IMPL(umount) +{ + return do_umount2(arg1, 0); +} +#endif + +SYSCALL_IMPL(umount2) +{ + return do_umount2(arg1, arg2); +} + static abi_long do_unlinkat(int dirfd, abi_ulong target_path, int flags) { char *p = lock_user_string(target_path); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 39e749a985..b35d84794f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5327,14 +5327,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, void *p; switch(num) { -#ifdef TARGET_NR_umount - case TARGET_NR_umount: - if (!(p = lock_user_string(arg1))) - return -TARGET_EFAULT; - ret = get_errno(umount(p)); - unlock_user(p, arg1, 0); - return ret; -#endif #ifdef TARGET_NR_stime /* not on alpha */ case TARGET_NR_stime: { @@ -5555,14 +5547,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, unlock_user(p, arg1, 0); } return ret; -#ifdef TARGET_NR_umount2 - case TARGET_NR_umount2: - if (!(p = lock_user_string(arg1))) - return -TARGET_EFAULT; - ret = get_errno(umount2(p, arg2)); - unlock_user(p, arg1, 0); - return ret; -#endif case TARGET_NR_ioctl: return do_ioctl(arg1, arg2, arg3); #ifdef TARGET_NR_fcntl diff --git a/linux-user/strace.list b/linux-user/strace.list index 5f07e0e23d..0f32c456cd 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1368,12 +1368,6 @@ #ifdef TARGET_NR_umask { TARGET_NR_umask, "umask" , "%s(%#o)", NULL, NULL }, #endif -#ifdef TARGET_NR_umount -{ TARGET_NR_umount, "umount" , NULL, print_umount, NULL }, -#endif -#ifdef TARGET_NR_umount2 -{ TARGET_NR_umount2, "umount2" , NULL, print_umount2, NULL }, -#endif #ifdef TARGET_NR_uname { TARGET_NR_uname, "uname" , "%s(%p)", NULL, NULL }, #endif