From nobody Sat Apr 20 09:23:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1585207585; cv=none; d=zohomail.com; s=zohoarc; b=hru4rBdCdkN7zjcjuox2RCOR/2IU3HuKG60KVTsTU8Tldr/EGur6oQVm8lHZ5P6jZbW/kVa0/4qUr+JtswqvXje23QwKBIUUqXj1BYKfaCBdEraD6+MjLlgdStwxuF6sC/H0p5yctBkn7n/j2yjCBAfx1vOkTBjxp9+9lMselb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585207585; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VEJlfaKXDiz1U5f3j1WGEls291/jgqQaGmAFKbUEJW0=; b=gqkMqTOGhe0wpOSMCwEwcsscAOxFRwLxG0e8SHsNLsw+xEwWB/X8e0vl6feXSRLwprEgqDtVIXWLGwldYWfQcf98mKOjB8jp2c2qRpwM43lK1VZhQ2pSgK+Sber18SeoF/tUU4smedSlnEouGnbCmG3MINcAGvEBcAluSKDLF/8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585207585946236.66927135468768; Thu, 26 Mar 2020 00:26:25 -0700 (PDT) Received: from localhost ([::1]:47512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMuG-0000GI-Pv for importer@patchew.org; Thu, 26 Mar 2020 03:26:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57130) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMs5-0005K0-G4 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs4-0007si-BY for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:09 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:38897) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs4-0007sD-3O for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:08 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MFsER-1j1i5b3Vmx-00HQPR; Thu, 26 Mar 2020 08:23:57 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/6] linux-user, configure: fix (again) syscall_nr.h dependencies cleanup Date: Thu, 26 Mar 2020 08:23:47 +0100 Message-Id: <20200326072352.2056553-2-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:jd+OvPYm+kCNHyyetBI49o2wCmvezeSoNAwqDhb4dhN+/saLhiN LyyD9bLT83nAGtsW3D61EXTVYyJlDSi45hwJxHL0uSrbc33emzZ29w3MViD16WsXDKm3VH7 0p4vMah7WKVCoxMZVPMaiaX89l6D4IxeLzJzhYNI8hSTeRv+IiAQVQw0QKyRbjajd9hlDQE v8b//KH2Xngvpru8pe4Tg== X-UI-Out-Filterresults: notjunk:1;V03:K0:YQ6nJRH3Mp4=:GgGZMzynOawDE9hP8THjys 4YkTEO3bTVFWHKNsAl7IjliTzKFH5R5ekAR6CkB+MSYS9ZhQY8jhFxdKQC7Gbi3qTvz5haipC nsx62wJk+GXnsTPl593tDfg3kzdfwN9Uqpwxf/6q08o3N/65aoy1p1UW+nAGxpEqETyoZLJEP KdOQtDAHpzSoth39jnPu8nUkbc3fjD1IUu5d793p3eu+N+hY+27HI8cXNmuh5eFIMbbzOSbhV q7x9XYe7EEnHsNEsExUjcA5GBkUxYfkb8rfGTeJXZt55/W4rgyie3gMIDui7zHbgt+GKnKFmF 60v54tOjOiwzcDFTNeGy3ZJoYcf9iaNf+0YnSAF53OKmbcOdJcnIv/OcZm2tuYfGUXmyazEKl c1OJMT7pO3ubYkG/M1hsNnKe9NI1Upxzz4jsPdW1Mpvl1K6rlf4CWXDEnuR11hDDNhviHpytN 8rzTg/FIsT3lW5L3uHPhuU7hisN0B4UuVZrMn3yROqqf/tyBs92VSO9ZKWzpVkLtHZF5/LBEl Df8S+X+EKGUIcS0rnPXcF3DxVc7aWRKKm8V5Y0YJ2srvrv37drjD6UP7t8wEpMS4419Nsvmgr O0qGuNZ43Ju6FCQIWLzBrwSxlk+/xbtwTQbN+KRKtwOznWOKbiHqXPcKJQ0N1aMdkUAdZkXh+ gB5hLjqOV4/qCzh0PRA2WprKAFpqDUhuPgZs3jYjogsCMHW1voNfKYi5Vpr5LV9QmCOCcntOh iT8YdHn5SdAo1n9YfH6F4tQUf7D7O476yo6fYTi3PvIWKpKd1tT2L3birYKvNQhiH4yqlPS99 aGdq1h/MFBQmomjEAAQ1905EN8lmbwKBEM8mp3mg3W8sdtnvwWr+eyLokVTSFDZ4HyuDhwL X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fixes two problems: - it cleanups linux-user variants (for instance ppc64-linux-user and ppc64le-linux-user) - it removes the .o file when it removes the .d file, otherwise the .o file is never updated Fixes: 5f29856b852d ("linux-user, configure: improve syscall_nr.h dependenc= ies checking") Fixes: 4d6a835dea47 ("linux-user: introduce parameters to generate syscall_= nr.h") Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Message-Id: <20200325075757.1959961-1-laurent@vivier.eu> --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index da09c3589572..89fe881dd46f 100755 --- a/configure +++ b/configure @@ -1910,9 +1910,11 @@ for arch in alpha hppa m68k xtensa sh4 microblaze ar= m ppc s390x sparc sparc64 \ # remove the file if it has been generated in the source directory rm -f "${source_path}/linux-user/${arch}/syscall_nr.h" # remove the dependency files - test -d ${arch}-linux-user && find ${arch}-linux-user -type f -name "*= .d" \ - -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h" {}= \; \ - -exec rm {} \; + for target in ${arch}*-linux-user ; do + test -d "${target}" && find "${target}" -type f -name "*.d" \ + -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h= " {} \; \ + -print | while read file ; do rm "${file}" "${file%.d}.o" ; d= one + done done =20 if test -z "$python" --=20 2.25.1 From nobody Sat Apr 20 09:23:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1585207556; cv=none; d=zohomail.com; s=zohoarc; b=RMM7mT1kYL4IIDanGIRXL3RSfOzkSpUVOCxfGRtQiuIkiIMvp6ucehZLV0PiWduhcNUlxwKVxf2+c1u5iwH8G2koUZwt0a3mBb2c1Iv/u4QlSkBMFb0rovqavthfpFGxOhTVdC6kzT80EF6QVgd/89rLMnvBegKhSodAzzCAX8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585207556; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zepXS5Ctu4clbwPElZa3Q+vMPu2qLGth3bMCdfXA4m0=; b=aD6G3/AOtCsuaI6lpiTqkXdABDERy2xc+RKzGYtCOSGQZcRBVwCsSA/+i2XOA10ThCoiPtbPB3XNOhOoSkeeWV8VyXVbKYQBorq+FHJQAABhkpFvNHNWjayGLe7AvG4jYSRpRoptr8t5JuZLgtyxCetQXjFvCuh1PsagITqZBYc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585207556596637.9281244613434; Thu, 26 Mar 2020 00:25:56 -0700 (PDT) Received: from localhost ([::1]:47496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMtm-0007aj-DS for importer@patchew.org; Thu, 26 Mar 2020 03:25:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57239) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMsf-0006Hu-J1 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMse-00084a-I7 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:45 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:50619) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMse-00084D-9g for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:44 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M4alK-1jGpAZ2Cn8-001l68; Thu, 26 Mar 2020 08:23:57 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/6] target/i386: Renumber EXCP_SYSCALL Date: Thu, 26 Mar 2020 08:23:48 +0100 Message-Id: <20200326072352.2056553-3-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Lbxy7qW3EMtPMQ3XrOVl2AkDuZWMyEnCNeYhJD9bBc7JOqd4xPV Q9Yet6h5P+8YRHrCS0i8W37Wfx2OGnGdpXTRfQW4qFwc0uExv49M/rxyA+C/zTivdXJGH19 nS1zVnUlq/x8KkuvDKaVCZG74GeitDIUT+lGK3jm4my12GEx+w11rs9vTdrVbA/6ZncYim2 /IMYC4OBLChSSO6akxxXg== X-UI-Out-Filterresults: notjunk:1;V03:K0:jAeKhWV8fO8=:iqq8Ppf8a3LBs3Xr9W9OLg +B7cN1G4bv2nKVIrl5Xc9BmkkQ/Hs11a7q73HM2GjfMdW0JTfP0PmSA3IDoanX+HPO/HL6c0q RyE/6YyNyYbG06LjTPIIo2N7wOEjMCGU/nb8wgNPqKsY9hjpplGjYXqXOo+fjQm3MkR3F/BCV wQkVk1/usmk5mRNJepBjefNEx6nE2FssecvOLBuq8/drKkruif9YQ5w3woz8n7duMnA79vdqC r3knjkMkSdc10pQSP67y9Tz4qUPzs6PMi38FBSfmwwk8/O9cSQXvpzTVqcKuAjMDouHBXdxm+ QsLl5aAYaijJ3CHoUoD1WWIdwd9ljMkRrrh89Dv37r0597Sw32YjnNMum5eYiOWhxpoeO7s5Z GYt4sp+FjK56/eOSsn5qQEIGWFToCWsXAwapuhmI5GICdQrAu0URnHFEqJrPk7mJYsywj18SV priBfYrUYl+4mH+BZend5lblUY9+h4zARKYNyP4R4QlzRjK5BUtPGh8V4x4ux4cwYfpyFUmSG Wb+vp5rq7j8Ub/Pzd0TfXp0TAM1YYyQDceRpkkzfzptz0EmDMr8cZZrXZkZgxIJiKpTSUIq/o w6r6IHy1W8HAyll61hTv6ouYilydy1GZasxbzRXzEvUgI9RnBYnI1vQBqx0icAEFOuh1TWpTw oB1aT5PHbZ3YF5gRNhUIpG3sfrM3AG1M6YalvSiLepnCQ1zIJ2MSIDfY2mU95r4rdlLYronkI 3NwJgFvzyOmOEFM94bJ3Pfy54Mq4MVsFJGATCef8hwSJqRa/9bH+kf2P9SWPhHB5GhXSuwRzN cqowc1IHZENjGZqBlwQnk8fD2HEwKKm8keHdwMzDnVabGq+QwaK2H+r5DYjKC96K4K6K7S6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Riku Voipio , Richard Henderson , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We are not short of numbers for EXCP_*. There is no need to confuse things by having EXCP_VMEXIT and EXCP_SYSCALL overlap, even though the former is only used for system mode and the latter is only used for user mode. Reviewed-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-2-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- target/i386/cpu.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 60d797d5941f..49ecc23104c9 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1001,9 +1001,8 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS]; #define EXCP11_ALGN 17 #define EXCP12_MCHK 18 =20 -#define EXCP_SYSCALL 0x100 /* only happens in user only emulation - for syscall instruction */ -#define EXCP_VMEXIT 0x100 +#define EXCP_VMEXIT 0x100 /* only for system emulation */ +#define EXCP_SYSCALL 0x101 /* only for user emulation */ =20 /* i386-specific interrupt pending bits. */ #define CPU_INTERRUPT_POLL CPU_INTERRUPT_TGT_EXT_1 --=20 2.25.1 From nobody Sat Apr 20 09:23:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1585207790; cv=none; d=zohomail.com; s=zohoarc; b=OyDcYkNZkZBCii3o9aCZ5cqK/Wf3EOlAxdYuV7iJ3JwHFAZcFSDi3DAaTeiP62O8xL3F3f6fjJDJWhol1FppRgtpJBz2SEGPXFFSBrykf1BiRPTvYdQSpDWoqdpQPVMQQ7nxEmfF+jDR+Ed2R4SkXvOaxLzybjX68i0jwk97scE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585207790; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YEkw+BD3XM1DvhPhvynvQr2RL1QhFvPB4Cz5qQZtHws=; b=oHFtm7/lroMG2ZsvxjjtQAHccwc4CG02O32e7FkAHkfv7WvmPshRQtMJx04Xis3VMhqXSqUarfVwZi12sOz4dddVXQlvueSfkI5f512849n1QNSOjffFAKa8lJoLQKZ7xtd5EMrXeUcjbJL37akkokniOIe6+l3tGJUgoEuG57Q= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585207790927208.90979764961241; Thu, 26 Mar 2020 00:29:50 -0700 (PDT) Received: from localhost ([::1]:47564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMxZ-0004Yk-PH for importer@patchew.org; Thu, 26 Mar 2020 03:29:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57173) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMsA-0005RQ-K8 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs9-0007uN-6u for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:14 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:42271) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs8-0007uC-UA for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:13 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwQCb-1jYDQh0sKL-00sLgZ; Thu, 26 Mar 2020 08:23:58 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/6] linux-user/i386: Split out gen_signal Date: Thu, 26 Mar 2020 08:23:49 +0100 Message-Id: <20200326072352.2056553-4-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:EX6P3vYaK2SZb/NgMTn3mSfuNyAZ1lq6tVRtSvJB0QTSO715RBW wkw5ixuk/4UOo7QMMkFdY85iDr1VDyzS2PwogmUN9ibsHnGkq4DCekmE0eJag/NKV8/KdoY YcxOJQ6yo4VuV8bFf7FuK0hB0dewGf1E3Wmcif6fFawd1vZtx/trsuM5L83bTK2HzCpPhFG 6fenm5f7L7Hdq6Gldps4Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:UOZocdcNJgE=:M1EahAV9yHIRWoeEYRk2Sy RUoettWY3ytnqK0Ots3dsVXmSN1dMjEdp7xVGo2ShLN5Dw9wsm3krrpRPVVzMndwQoAGXwEqt 0VCqii6gjhhaW15JQaKJEfpzj+foe3NbgI+8TZU7X7ri+hvTJ/0X9VwY+nqKq5T7OcnWfFTcJ OISCvzXSOvQWo+ksBeBANkCNe4NwgsEgtM6rugFx+EU6xek8hJqNRf6v0BudyWBG/as60geKZ OPfxKOszNrSY1x0ogeXpoLIbZohZ7n1Y6FtCt60NPvo2ZYp7GwWQMxpSJo7P+wANDfnwgpGUA W0OvWyh1T5Wpk3n+qwZ0k1U4azBOWPkk7IE7WNIKAQDmuCkxgDPD4w7deOM12vh7tKzah3TuA eCNEBrh/TNaGvZroCbN/QeKrzgzakjBiIZohZ2yV6H6J7mrVVFWKD1UODoeNqCah4Kyr/yBTV QaDfEWa0VYtoyn5NaAXhCGnQCxhRuiRGI1SEVYSG/sHwU+HjRh2T/HqCYCOdGIAkBp5AkhSxA ZEj+1+gQmxO8ir2J3NF93HykguoJw0NUp1PyWy88knxOMFpplGergZniezRZ7KqH5yrHAeMo/ qn/Plxdt224sDu8YMT7xWNS2O156Aak4cEB+YvVsv42HOcnDwLKoQdoCfVOZBmeme2XXmnWLj tMs46RBwT46cw8SV8moBsEsewk8Qv//a1ORhoxtIRWVDlFAugigBajPIlC4IAsjpindMY0Ra0 y0pYDJ+j7PxKcAWRu9Ajdz1Mv/waq2kmKnnoZNJCaufK7/pOWWKRfjFs55AAN3xH03CHcxZWW T1x2JmP9g7EcXRBTfIkWOsWvdpwZmFxPmZsscjTfCv9xOjvTfUvL587SxEhYeSbxAZl2Qy0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Riku Voipio , Richard Henderson , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This is a bit tidier than open-coding the 5 lines necessary to initialize the target_siginfo_t. In addition, this zeros the remaining bytes of the target_siginfo_t, rather than passing in garbage. Reviewed-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-3-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/i386/cpu_loop.c | 93 ++++++++++++++------------------------ 1 file changed, 33 insertions(+), 60 deletions(-) diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c index 024b6f4d588c..e217cca5ee1e 100644 --- a/linux-user/i386/cpu_loop.c +++ b/linux-user/i386/cpu_loop.c @@ -81,13 +81,23 @@ static void set_idt(int n, unsigned int dpl) } #endif =20 +static void gen_signal(CPUX86State *env, int sig, int code, abi_ptr addr) +{ + target_siginfo_t info =3D { + .si_signo =3D sig, + .si_code =3D code, + ._sifields._sigfault._addr =3D addr + }; + + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); +} + void cpu_loop(CPUX86State *env) { CPUState *cs =3D env_cpu(env); int trapnr; abi_ulong pc; abi_ulong ret; - target_siginfo_t info; =20 for(;;) { cpu_exec_start(cs); @@ -134,70 +144,45 @@ void cpu_loop(CPUX86State *env) #endif case EXCP0B_NOSEG: case EXCP0C_STACK: - info.si_signo =3D TARGET_SIGBUS; - info.si_errno =3D 0; - info.si_code =3D TARGET_SI_KERNEL; - info._sifields._sigfault._addr =3D 0; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + gen_signal(env, TARGET_SIGBUS, TARGET_SI_KERNEL, 0); break; case EXCP0D_GPF: /* XXX: potential problem if ABI32 */ #ifndef TARGET_X86_64 if (env->eflags & VM_MASK) { handle_vm86_fault(env); - } else -#endif - { - info.si_signo =3D TARGET_SIGSEGV; - info.si_errno =3D 0; - info.si_code =3D TARGET_SI_KERNEL; - info._sifields._sigfault._addr =3D 0; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; } +#endif + gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0); break; case EXCP0E_PAGE: - info.si_signo =3D TARGET_SIGSEGV; - info.si_errno =3D 0; - if (!(env->error_code & 1)) - info.si_code =3D TARGET_SEGV_MAPERR; - else - info.si_code =3D TARGET_SEGV_ACCERR; - info._sifields._sigfault._addr =3D env->cr[2]; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + gen_signal(env, TARGET_SIGSEGV, + (env->error_code & 1 ? + TARGET_SEGV_ACCERR : TARGET_SEGV_MAPERR), + env->cr[2]); break; case EXCP00_DIVZ: #ifndef TARGET_X86_64 if (env->eflags & VM_MASK) { handle_vm86_trap(env, trapnr); - } else -#endif - { - /* division by zero */ - info.si_signo =3D TARGET_SIGFPE; - info.si_errno =3D 0; - info.si_code =3D TARGET_FPE_INTDIV; - info._sifields._sigfault._addr =3D env->eip; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; } +#endif + gen_signal(env, TARGET_SIGFPE, TARGET_FPE_INTDIV, env->eip); break; case EXCP01_DB: case EXCP03_INT3: #ifndef TARGET_X86_64 if (env->eflags & VM_MASK) { handle_vm86_trap(env, trapnr); - } else + break; + } #endif - { - info.si_signo =3D TARGET_SIGTRAP; - info.si_errno =3D 0; - if (trapnr =3D=3D EXCP01_DB) { - info.si_code =3D TARGET_TRAP_BRKPT; - info._sifields._sigfault._addr =3D env->eip; - } else { - info.si_code =3D TARGET_SI_KERNEL; - info._sifields._sigfault._addr =3D 0; - } - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + if (trapnr =3D=3D EXCP01_DB) { + gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->ei= p); + } else { + gen_signal(env, TARGET_SIGTRAP, TARGET_SI_KERNEL, 0); } break; case EXCP04_INTO: @@ -205,31 +190,19 @@ void cpu_loop(CPUX86State *env) #ifndef TARGET_X86_64 if (env->eflags & VM_MASK) { handle_vm86_trap(env, trapnr); - } else -#endif - { - info.si_signo =3D TARGET_SIGSEGV; - info.si_errno =3D 0; - info.si_code =3D TARGET_SI_KERNEL; - info._sifields._sigfault._addr =3D 0; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; } +#endif + gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0); break; case EXCP06_ILLOP: - info.si_signo =3D TARGET_SIGILL; - info.si_errno =3D 0; - info.si_code =3D TARGET_ILL_ILLOPN; - info._sifields._sigfault._addr =3D env->eip; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + gen_signal(env, TARGET_SIGILL, TARGET_ILL_ILLOPN, env->eip); break; case EXCP_INTERRUPT: /* just indicate that signals should be handled asap */ break; case EXCP_DEBUG: - info.si_signo =3D TARGET_SIGTRAP; - info.si_errno =3D 0; - info.si_code =3D TARGET_TRAP_BRKPT; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, 0); break; case EXCP_ATOMIC: cpu_exec_step_atomic(cs); --=20 2.25.1 From nobody Sat Apr 20 09:23:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1585207694; cv=none; d=zohomail.com; s=zohoarc; b=eiSqUN9Q7C6qR67+wKDGw3HTwvI08imI1lTlx6X6t+iMCP/pXw/8FsKRd8qJR+yjN3oLmk750uHnrWvliKA8/XRW0NYlOqMMlY+X7Wn31+FuQyb5L+ADHRT5lTXUrluOvw7Aml8wSVPFX+zIEk3BfD9W2Ssy2SNo7+JjfsjxvCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585207694; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HQcuny2i8MP7gcqKAR5NYN2iqfp4S26wayfcH9K+ABI=; b=bwO1z7dvDupO7DqRYyHRKgetOICE9RxGr1cyK7pYo4+NBhYinb/VBwJPrkGgiQWvnJ4fPkFecGOK2jOqR/+/r0AcMP3VyN5Aog3m3Y3rfHflVbCnf2gtvsbI5uUqXqkwA6B/Jh7NvwatECuAQrUfWIXAiPuQOk7+atBrwB0zzEM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585207694383336.2535191464124; Thu, 26 Mar 2020 00:28:14 -0700 (PDT) Received: from localhost ([::1]:47528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMw1-0002fJ-6v for importer@patchew.org; Thu, 26 Mar 2020 03:28:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57164) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMs9-0005Oj-Ga for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs7-0007u1-Nt for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:13 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:47463) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs7-0007ta-FQ for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:11 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MFbFW-1j1QyO3TBu-00H9IG; Thu, 26 Mar 2020 08:23:59 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/6] linux-user/i386: Emulate x86_64 vsyscalls Date: Thu, 26 Mar 2020 08:23:50 +0100 Message-Id: <20200326072352.2056553-5-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:8kglLESd+xO7sx7WNgWt/6/WUjm/2oeyBFF4FIpPn5e/BBVQCmU hrvCK4Mc3QLAT4IirjnQLpW5rKs0Ksfgt3YvulxyggNlVb0D85JVE1/EWgd+2nhCgTgvcKh znHMeq0LYoU3evLl7ZCWiZit2MbV1xKcuSzWfSsUAMG+PjBK1bhfF6C1+oUoG2TGOK5Rp7r 1kVQctb8fEKXmET3x3J+w== X-UI-Out-Filterresults: notjunk:1;V03:K0:Xak3eIMbIAE=:lmHcbR4wAdCIJKbEv6ZbWJ p+WwRKacFptBD2hlylW4tFfmGxRuLxuw2+Tu+/8DTFlaEVFHCPW39zXVBgq1JDMkgx83RSAI1 vTzmXYqsKE2PuuHH19NWKf3H67sDK/gPWoNFiDaYHr2aeWZXaET+1xJfMGq8JCdDU82n2UzDA xLu3Rf160q432YtXZ3flzvM2b418mTdf+fmjGDVOjqFpabu1XKXSeX37yAumsaSnnE1Cu6qwM ctlt9rNbqJUH/45VcGExc/Kz/ltWUZaMMm91jRdxScsMPt9Sg0+Nd4bfw5vTJae66rrhrDDyh XsnmSR+hNxDOhazg/qI1X2PDnzz0POtVoDZmozHP6isse44Ah5XNwKp6v1//3pYJVfSzr1Pt6 c//AqZ7TJjxaUh5urVDSQ45K6UcqOuUWJCJhpO8qYe6juVZSF3dHAYVTkId7eq/wjGq68tjRE RvA0HBFueRQrhQZHwztwiWrfOS2nqiT8l9P2S4CxmYK0qQ/Vs6QxO+/dhqEZ8jQKwjGg74Jg8 Y4pRvdiCEBYetNA/xDOYQK1dwELc8g6XvUbcF19uE2BH3hZbzafK0+BM/6pS4g5fCh8OcXl91 UE6KmRWJ7qaGO//AON1ggopybNDsYAMbkUZTqtupqujkv8KzLyLl13t/ActnpW/s2GPsSO2sT h9zZWcfCelJEYZWA47EtqU0cgG+Ub1gmFWIme/clk7jPt3iWuAbHTJ3f5NM8rbQ5qnOd1qFyl ZLzWeaJJj2r+nqcXPqkTseYJoL9SXt40lAV5F9oBhBhuxfRV3ko5pgQFp1ZNpwNOVxP5D5If6 E402ecTHvLHaznWAYu+VQ2vhv1i/v0R/23siC8Js0mtxuhUIeRItfnGHRfBGqSyQSceoS2W X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.131 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: Paolo Bonzini , Riku Voipio , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Richard Henderson Notice the magic page during translate, much like we already do for the arm32 commpage. At runtime, raise an exception to return cpu_loop for emulation. Reviewed-by: Paolo Bonzini Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-4-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/i386/cpu_loop.c | 108 +++++++++++++++++++++++++++++++++++++ target/i386/cpu.h | 7 +++ target/i386/translate.c | 14 ++++- 3 files changed, 128 insertions(+), 1 deletion(-) diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c index e217cca5ee1e..70cde417e605 100644 --- a/linux-user/i386/cpu_loop.c +++ b/linux-user/i386/cpu_loop.c @@ -92,6 +92,109 @@ static void gen_signal(CPUX86State *env, int sig, int c= ode, abi_ptr addr) queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); } =20 +#ifdef TARGET_X86_64 +static bool write_ok_or_segv(CPUX86State *env, abi_ptr addr, size_t len) +{ + /* + * For all the vsyscalls, NULL means "don't write anything" not + * "write it at address 0". + */ + if (addr =3D=3D 0 || access_ok(VERIFY_WRITE, addr, len)) { + return true; + } + + env->error_code =3D PG_ERROR_W_MASK | PG_ERROR_U_MASK; + gen_signal(env, TARGET_SIGSEGV, TARGET_SEGV_MAPERR, addr); + return false; +} + +/* + * Since v3.1, the kernel traps and emulates the vsyscall page. + * Entry points other than the official generate SIGSEGV. + */ +static void emulate_vsyscall(CPUX86State *env) +{ + int syscall; + abi_ulong ret; + uint64_t caller; + + /* + * Validate the entry point. We have already validated the page + * during translation to get here; now verify the offset. + */ + switch (env->eip & ~TARGET_PAGE_MASK) { + case 0x000: + syscall =3D TARGET_NR_gettimeofday; + break; + case 0x400: + syscall =3D TARGET_NR_time; + break; + case 0x800: + syscall =3D TARGET_NR_getcpu; + break; + default: + goto sigsegv; + } + + /* + * Validate the return address. + * Note that the kernel treats this the same as an invalid entry point. + */ + if (get_user_u64(caller, env->regs[R_ESP])) { + goto sigsegv; + } + + /* + * Validate the the pointer arguments. + */ + switch (syscall) { + case TARGET_NR_gettimeofday: + if (!write_ok_or_segv(env, env->regs[R_EDI], + sizeof(struct target_timeval)) || + !write_ok_or_segv(env, env->regs[R_ESI], + sizeof(struct target_timezone))) { + return; + } + break; + case TARGET_NR_time: + if (!write_ok_or_segv(env, env->regs[R_EDI], sizeof(abi_long))) { + return; + } + break; + case TARGET_NR_getcpu: + if (!write_ok_or_segv(env, env->regs[R_EDI], sizeof(uint32_t)) || + !write_ok_or_segv(env, env->regs[R_ESI], sizeof(uint32_t))) { + return; + } + break; + default: + g_assert_not_reached(); + } + + /* + * Perform the syscall. None of the vsyscalls should need restarting. + */ + ret =3D do_syscall(env, syscall, env->regs[R_EDI], env->regs[R_ESI], + env->regs[R_EDX], env->regs[10], env->regs[8], + env->regs[9], 0, 0); + g_assert(ret !=3D -TARGET_ERESTARTSYS); + g_assert(ret !=3D -TARGET_QEMU_ESIGRETURN); + if (ret =3D=3D -TARGET_EFAULT) { + goto sigsegv; + } + env->regs[R_EAX] =3D ret; + + /* Emulate a ret instruction to leave the vsyscall page. */ + env->eip =3D caller; + env->regs[R_ESP] +=3D 8; + return; + + sigsegv: + /* Like force_sig(SIGSEGV). */ + gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0); +} +#endif + void cpu_loop(CPUX86State *env) { CPUState *cs =3D env_cpu(env); @@ -141,6 +244,11 @@ void cpu_loop(CPUX86State *env) env->regs[R_EAX] =3D ret; } break; +#endif +#ifdef TARGET_X86_64 + case EXCP_VSYSCALL: + emulate_vsyscall(env); + break; #endif case EXCP0B_NOSEG: case EXCP0C_STACK: diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 49ecc23104c9..9af1b0c12e8e 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1003,6 +1003,7 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS]; =20 #define EXCP_VMEXIT 0x100 /* only for system emulation */ #define EXCP_SYSCALL 0x101 /* only for user emulation */ +#define EXCP_VSYSCALL 0x102 /* only for user emulation */ =20 /* i386-specific interrupt pending bits. */ #define CPU_INTERRUPT_POLL CPU_INTERRUPT_TGT_EXT_1 @@ -2218,4 +2219,10 @@ static inline bool hyperv_feat_enabled(X86CPU *cpu, = int feat) return !!(cpu->hyperv_features & BIT(feat)); } =20 +#if defined(TARGET_X86_64) && \ + defined(CONFIG_USER_ONLY) && \ + defined(CONFIG_LINUX) +# define TARGET_VSYSCALL_PAGE (UINT64_C(-10) << 20) +#endif + #endif /* I386_CPU_H */ diff --git a/target/i386/translate.c b/target/i386/translate.c index d9af8f4078b3..5e5dbb41b0ce 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8555,7 +8555,19 @@ static bool i386_tr_breakpoint_check(DisasContextBas= e *dcbase, CPUState *cpu, static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *dc =3D container_of(dcbase, DisasContext, base); - target_ulong pc_next =3D disas_insn(dc, cpu); + target_ulong pc_next; + +#ifdef TARGET_VSYSCALL_PAGE + /* + * Detect entry into the vsyscall page and invoke the syscall. + */ + if ((dc->base.pc_next & TARGET_PAGE_MASK) =3D=3D TARGET_VSYSCALL_PAGE)= { + gen_exception(dc, EXCP_VSYSCALL, dc->base.pc_next); + return; + } +#endif + + pc_next =3D disas_insn(dc, cpu); =20 if (dc->tf || (dc->base.tb->flags & HF_INHIBIT_IRQ_MASK)) { /* if single step mode, we generate only one instruction and --=20 2.25.1 From nobody Sat Apr 20 09:23:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1585207500; cv=none; d=zohomail.com; s=zohoarc; b=Zlf7TbZ+wkf04vT/QWfvw1eNa/Y7/jUKfxENndk+NDYN63yH9PatmImM3cGwhnII08lTI8KfG1Ipo1aia39qHHAIWU8BS+J3lGIh+/2b2lG4w3SXSEjQklkLr5IfIAn1BSJRnK/xk6mJ8T3hIC0lHPVc/1wR0F2oCaxvCd+C0UM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585207500; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mCV/6oi7njnCoIzMHyWV2UoCZd8lSLJWcIDwV87Mbcc=; b=Kk2VmUL87YWp+9dZsEVPBQ/BNGwgAz0v/d9Xz31aMp9yQH5UsLYdfWuwPhyyCBVWjMYP7XXDqQRCrL4KoDMnH4zOlZSiiDW26j42s2vMYtyiAvCwQtrm5SVGlTU+gl6lrqXrh9fIoH92LlFBVAKeWD28Y21py2A7jLlAR7PXioU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585207500033854.6693711907096; Thu, 26 Mar 2020 00:25:00 -0700 (PDT) Received: from localhost ([::1]:47484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMss-0006D8-H1 for importer@patchew.org; Thu, 26 Mar 2020 03:24:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57146) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMs7-0005LZ-A6 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs6-0007tK-9Z for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:11 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:42019) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs6-0007sv-1D for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:10 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MHXSD-1j4SiM1ZFB-00DYn9; Thu, 26 Mar 2020 08:23:59 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/6] linux-user: Add x86_64 vsyscall page to /proc/self/maps Date: Thu, 26 Mar 2020 08:23:51 +0100 Message-Id: <20200326072352.2056553-6-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:N9BloZddGoEI8aaMOWZioelpXj+OrVHQl9zigrnZcP/MsKXmp2Q bfT24knouSbYlvmSXFeyzQ4IdT2X9DEIAmFSwwAAjYSUV4N12AGO1d2yo/IxzaK4mBTwgt8 I4cMOT6+rrHZex8D6hZypm72a8zfey21qHguss0uuZVSqXu6Khc7yP2dYtpMohlt2RRrlMI +5FLf2955LFmL5mpfLLcA== X-UI-Out-Filterresults: notjunk:1;V03:K0:ZYP8560LjSM=:msR9P5Q/I1q2yMQwfo8mtW Z+DydHO9oCRc2UOW9O/G8VTjHxN4mHq7c8I86RKuP8NfdV3IwNbtY46eiwways+Vj24M7o54H WNDKzJKfRuzdxZIdvtOGCXEu1P57zLbcBhsaEtZUOWnxTYpirEAlHT1BLxHC7/W6yrcdlOOIw F+4+KM4k1CTfVXB6Wkud11fdcewTrWc2qBo7I/CJTIYqHbkXKa70FHMqbZs0LrXDNzeC3fH4x eWi4A5P8L3hGgiOtfvTIJUvwzduxtNqQZOjZ6Vpy1VFqxe4udBTzhNonHaRPVgDQPGjY0hXfI 4AodIDG0N4u0j85Vy8+V0vHN3UkMWdTfZt1tPf5ceHoMoA2Tp6Zk7VvDT1846hPhQFnHo9839 oCgKEAFTua+RlULRH4iUey9EqPPTcc7spFLiCxsM2M3JRLeUjvYlrtLU/YLW3PB8aJ8iZIvHb yDAfmD0TRSJtAwa20/rxkOnsj/WOq+9sEwO+QEJC4xMYTjYOVqlEMNJYnXO+wYVWV7z+1R5kx ws6uDQk3ZVGcsjxmeQ/EaJievGBptens6B7c+qx9pyE2gFKEyb/E+2h0WKoNJLg2WOmgiPzJY dYb2QYgFWDpANeWEq4GRaQoG+BREia+FikLHDaYfVT/lTUAAhlrEX4VzHTKwF1fu19vJhLEzk QfOj/BLs0MdHU7nsYvvXiKyFEdK2YhsEi0Lh0tYYhNonVbxWKIeotW+gr8zmbYf1QUzS9AaJy ygEXiOicbUTdAVf4z4VcnYqjFNAjx+oODq3o58L42VpZPF1aIOoJIQkIIYfNnMb3NOFDIEufN C3pPUZNJDdf0jhzsMaW/UL070+0FnFlI70P9hn00DJuwZPbHg+cbftEV3TzCVYK826JBvCy X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 space] Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 35f414666243..dbdd56e42077 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7144,6 +7144,16 @@ static int open_self_maps(void *cpu_env, int fd) } } =20 +#ifdef TARGET_VSYSCALL_PAGE + /* + * We only support execution from the vsyscall page. + * This is as if CONFIG_LEGACY_VSYSCALL_XONLY=3Dy 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); =20 --=20 2.25.1 From nobody Sat Apr 20 09:23:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1585207602; cv=none; d=zohomail.com; s=zohoarc; b=ZoE9N5ykIf7J46lvma8OUXZXpz7IpbFlDJwXvYdK4BI0uxXRNhmXJDALEtRXGVHJCgEO3YEILs8aGYmLG2niFLNY3YeeeKYEllQjdut0OVr0jfPcbxFeHDiM/rbZLDPQzP9qWdz0RQEKFSFf6qZ8Ur9Bu4U0Dv42Iyb37ImiPfs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585207602; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YkItsWsh646TTO0fzSehG+84gTKI50FwAt3l4hA2Gu0=; b=jl0iLvktpo49QJ6GC3td0cKzTrgP/Dc9J7iEahPYinybzZv50nMSEDudWEZWPKR34yyzSawTypzKFF+s4Ap9ltHdvrRfKoq9n8N01UvsT2tEdcoxEPyb/jEn1DA26x7QewJ8Vt0+5pdP30Ptw639ZmYerZRN7dxBVsXX/i+6QHo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585207602191286.6870261534318; Thu, 26 Mar 2020 00:26:42 -0700 (PDT) Received: from localhost ([::1]:47514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMuW-0000TF-TY for importer@patchew.org; Thu, 26 Mar 2020 03:26:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57148) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMs7-0005Lt-HZ for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs6-0007tS-Fu for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:11 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:36039) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs6-0007t8-75 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:10 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MLzSD-1izybm4957-00HuPH; Thu, 26 Mar 2020 08:24:00 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 6/6] linux-user: Flush out implementation of gettimeofday Date: Thu, 26 Mar 2020 08:23:52 +0100 Message-Id: <20200326072352.2056553-7-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:AyMp/m+qTp+pVhOJ5OilOky2MM/a0E7P1fmBAFPFBNqJUzH/eqf z6fa9u7kayN6my2rQDVSxgacYH9x4Hb9y4jQsFE48Mg6clu12yJqpMzp4wCXC6CN7y4749A AqVkYQ0gfEvskjMouQovGbdNF459vI3JkGDDaR5B6Qm0dIL2H1GwMzntz8rzYetNanGVMWC dw8735EZa2a+erF5N8Lkg== X-UI-Out-Filterresults: notjunk:1;V03:K0:HZRrY2G2UEM=:LhOmrJb75zcWC2H7jLNcHX nEvfvu6K/8TN+cKpRbx93xe5VyrxXQQrVBOebGrggvhnsluz5o+RC5VbfUKvB9ybOnW4PdzCJ 3iOaVjbxenF/BJKUP49Cq8dDU87hm7G9tWRXRVXliB9P/KB5SDotfi0YIZWwW8XIrH1kKHh4p PM7wCL6C04m0z08S87+JMJl7zLBqoZcRn2JyD8cJak99N6SGiDJo9iP4bhDBszGM7huTCvYxe RhoGiX9ed7rzXR0CU9kfDyHakqhQFia4ct0QEPMzGPZF3kRcFRnkdmuIHeoeeLHYNkYmuZsem klpY+ZQG3UYy2HxorEKbR7iNTSn5cxVFXSkdev7O6TkeQR0EHbVU0iZUM+zZtG9jKPU0X9JDk 7Gs7HjLVgmwP5VBC4+ivmU3QNeMFtwsyOvCBj/M33lPwz4mc1EQDkBeLe6VoEzeJmIg9lzH26 2adeTkiqZigL8i0xMuiY4mkgI0AAmXFSDKjBrR4ySqnTcTJEVnGqAS+S6h8CjcYbYzyzVrPaC mFTK99o8ulMAHU7XAsw3FxoTVU8mUlYqyXtf2KNMYrd/Np5IuT3/Zh5Q+TFzZGNWOixuMqdRG xNw2FtQva4fIK/5eLgkDFPRKEycTdlRxxq8K19/prk2rpnfk5juMm9sB3M6a8RiIQntXcE4u+ mfWR/hkmH4bY4CbT3jIxEOe3rbLld7v/lbf37vcc8ozOwxqOZWY72gD5YuvoAQr638XEENsIz e0agLsSS/dq18nAjQapBRSMIK2d7CUJPCmlzY5H/ieET1aPgY/TI9M+RcvIuSMML5INczJSgw QJChRHj/rYYsdBgpLNAeBavaNQybZ0I8c0/FG+ekSo+SVYsXIoXw8E5yn7HT1W7kGKnt0Jr X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Riku Voipio , Richard Henderson , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The first argument, timeval, is allowed to be NULL. The second argument, timezone, was missing. While its use is deprecated, it is still present in the syscall. Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-6-richard.henderson@linaro.org> [lv: add "#if defined(TARGET_NR_gettimeofday)"] Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index dbdd56e42077..49395dcea978 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1273,6 +1273,25 @@ static inline abi_long host_to_target_timespec64(abi= _ulong target_addr, return 0; } =20 +#if defined(TARGET_NR_gettimeofday) +static inline abi_long copy_to_user_timezone(abi_ulong target_tz_addr, + struct timezone *tz) +{ + struct target_timezone *target_tz; + + if (!lock_user_struct(VERIFY_WRITE, target_tz, target_tz_addr, 1)) { + return -TARGET_EFAULT; + } + + __put_user(tz->tz_minuteswest, &target_tz->tz_minuteswest); + __put_user(tz->tz_dsttime, &target_tz->tz_dsttime); + + unlock_user_struct(target_tz, target_tz_addr, 1); + + return 0; +} +#endif + #if defined(TARGET_NR_settimeofday) static inline abi_long copy_from_user_timezone(struct timezone *tz, abi_ulong target_tz_addr) @@ -8710,10 +8729,16 @@ static abi_long do_syscall1(void *cpu_env, int num,= abi_long arg1, case TARGET_NR_gettimeofday: { struct timeval tv; - ret =3D get_errno(gettimeofday(&tv, NULL)); + struct timezone tz; + + ret =3D get_errno(gettimeofday(&tv, &tz)); if (!is_error(ret)) { - if (copy_to_user_timeval(arg1, &tv)) + if (arg1 && copy_to_user_timeval(arg1, &tv)) { + return -TARGET_EFAULT; + } + if (arg2 && copy_to_user_timezone(arg2, &tz)) { return -TARGET_EFAULT; + } } } return ret; --=20 2.25.1