From patchwork Tue Mar 17 15:50:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184629 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4321407ile; Tue, 17 Mar 2020 09:08:10 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsXX7mpmAkckz7ceKcC5tRHE5Zqmsa+lcRoA53hcLTouyUlgG3L3HrM7IIKPaNIFhkgVyt1 X-Received: by 2002:a05:6214:a63:: with SMTP id ef3mr5704914qvb.119.1584461290549; Tue, 17 Mar 2020 09:08:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584461290; cv=none; d=google.com; s=arc-20160816; b=p7x19HeUwwQGmAgVWaxuq85BW5vEi9cp6RPZSi3ecARMk0edy0oXIvFQxnI2PuhlYa M3Yr5ou64XO/XnpB7MFC6poCFQkPoJ8k3tRWZJADsT79h/nhl6/n7rodK38VPKriGW9A G5X8RlIV2Ruz0Xbjlt+8jopxfxpKcdIfUtMS5HMYtsrsGRaNnvEu5TELP95NPr3FDH0b 67LW4ThthNDBvmQWj+MfFC0L5r/d04d8VYPkROB2sHse5upmRHvpdVpN85MSabsMgRr3 7uMh8nY+uWqii6LcxMgLKhmbm499Uz+6/ir1U/MxDT2iSzck8vBqpSLayBJSBNQKSJ2Y WQ1Q== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=/ZvV49OFsjmxWSbOxxoXySr5fzZgNd9AeTlb1UBAj0g=; b=W58gaYPcyAViaNZ/Iu+eVgDMT0YmY9OQ/UVvVnA6sCApXTTyLxDKE031JjMkW0JpIU CNJ0XG0Sd+BEdT0RAIqXus/cfrCnh17gcwRr/xNRplwt+bt8HPif7LlMo1hU4oIpjJfD eiNAsVjpZfrAzZN+2W41Kskvs8Dt+C9i2F5LW6iQZeapS2ZYlQnEJNgywTn9BwF5NCey hdven1Wi80Xns4hHT3ojkLRcyBlF3NyIL0TzF1NAd3wKizw7kchTjsAw7FuI6MOkP7I0 jgSdyYCluQDASVH+1XSMflQMb/yBxjxuIYJNjGdpxe1zIBIGPh9uGAqvFQlKeW8qNpiC lPMA== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x195si2381364qkb.100.2020.03.17.09.08.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Mar 2020 09:08:10 -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; 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" Received: from localhost ([::1]:35606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEElG-0000D0-1H for patch@linaro.org; Tue, 17 Mar 2020 12:08:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36963) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEEVK-0004lo-4l for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:51:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEEVI-0007CP-Rl for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:51:42 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:58391) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEEVI-00074f-IW for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:51:40 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MfYHW-1jl5Gw1Xjs-00g3GW; Tue, 17 Mar 2020 16:51:26 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 04/37] linux-user: Add x86_64 vsyscall page to /proc/self/maps Date: Tue, 17 Mar 2020 16:50:43 +0100 Message-Id: <20200317155116.1227513-5-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200317155116.1227513-1-laurent@vivier.eu> References: <20200317155116.1227513-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:obArXG41tvjaxxflB7jXPHCdM0J/9xxp6czqD9oDJq1UMtUan+v asnZX+TAJAOVCAl1ZqGGg5gCgxkRoGhTsMY3mal05Gkfsh7SXZkx4CAA1BGrfjH6FBeBc/t a/5dAoM1MK2Z0YuC6CvdTVnDzp64Iv0gR7pibiHX8eqrwMbDPubEGcUQnTqQsF4hC6dFE0H drRtmsLYY5GhPQ4u1hYsA== X-UI-Out-Filterresults: notjunk:1; V03:K0:s6QCS2Xc3Ck=:FYEG4lEN3r35VJclh/mPh1 j+9HTb4dWE8BIiDv74oiMxSgMad09TNNbWZ5RVziG8wTXQdgOkXKPyxBCZUDVzPX4nCiQb91E qgE22cm+pTSW36O97m+kUavAPKQuzIaTXGHrLT7E75tP59bo/UknXNkwkgpMz+7YD1BPkeAaN IuNnRjvoluNdWEcXFJdYS4IIWqZG5aKUKDH8JKQfb3hrCz+CVbGoHhMURjzupq9ffgQ+v/kpT UJTkQA6xeIFaLYY42rjajAcbDF3Hvj0SLnCHr52hZEvhTTe/Jg5S34CVriM3HEOWJ5wNyl1yY whGVrM0BOjq1lM7bHxmMmxWLnpJCpzopuG7FwTDQSMA5cqbX9l7wQ4t7Ehp/2URVoqE7rC9IV QfDugDsZwzoZ4/8eRC4yAnaI1XB8rkpGKAewKgGWLOU7MWv2PAMlBXq1p0G6YvBIlhYkIZb+P jg/Lh50sv5nQAB7hBnRixccZ10sj4KIk/M8bBlmgdEP/V2tCw1tZ7oASwhf+DvLo61dENKz6c bia+l91Wvc2k9MAzBxpyFDrQgR8bAQ0aYw3uAsizQ5KiY3c+wH6lzVv3YOsPaFMMw2feMc9OU ugsdvBWii26l/hn07pnFwiUx3rqJVZz5+MjBUi8Oxi3UKp4XQm1BY0FyLFnTpaWfa7GWnt/ol zE9wtqC3Z0NhT7TfMAeMzmapi2kDeUNAmFvplTAxcTNm6N68LwoQW71VhTvFb4qpe1AeV5N0h w167rruVzt3csP0fwVqtYSiTPy7SEJqo3dR1wY99wOzbF8/xY4Y5Fkn4Drv78dPs4ncnBYr8T GU5waJ0Q1Te1HBlsK01H+bkxfH+incVoXHDlueSDlN9IOW6VANtJS//3ORbWkeKySb2HpD6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The page isn't (necessarily) present in the host /proc/self/maps, and even if it might be it isn't present in page_flags, and even if it was it might not have the same set of page permissions. The easiest thing to do, particularly when it comes to the "[vsyscall]" note at the end of line, is to special case it. Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-5-richard.henderson@linaro.org> [lv: remove trailing whitespace] Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.24.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8d27d1080752..5479d67a10be 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7079,6 +7079,16 @@ static int open_self_maps(void *cpu_env, int fd) } } +#ifdef TARGET_VSYSCALL_PAGE + /* + * We only support execution from the vsyscall page. + * This is as if CONFIG_LEGACY_VSYSCALL_XONLY=y from v5.3. + */ + dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx + " --xp 00000000 00:00 0 [vsyscall]\n", + TARGET_VSYSCALL_PAGE, TARGET_VSYSCALL_PAGE + TARGET_PAGE_SIZE); +#endif + free(line); fclose(fp);