From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372513; cv=none; d=zohomail.com; s=zohoarc; b=YdmmY5jZ/U1l86lF5Ex+++X2dH7//yyfwbY7UgvnKDfctfUxu7RX5CKJFO1XlaTbzZ9RI1RogqiseSI4fAQbLSNRiu4/V32fp6RvwcWxumrv/sE5eCjQHRJTbJ5JF3XmoZ7L9ZI7aoOPzWo6N9TS5aNYkrdAnaGEbBW4NzQ+Msg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372513; 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=tRdpUcQhIJndhkGIh7lOShh9mZ16AUqZ+rVZ66b8A6w=; b=Fx0FbJsMTN3dLZ8KGQ4LofTiCe9EohmNdDUUaiIn/ITyC3UTlXcm7sriN3cJXpLGO2tYGtvQ+mmC6sW+AIps9mIag5EmLqH5xB0brWiMSK00vY7nS0P1BdA3K+lLCNWuzOpW+zzn5apoLsxJYOGSTo2OZSYtYJTrc9mXszguZZ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372513879292.58948423064646; Fri, 5 Jun 2020 08:55:13 -0700 (PDT) Received: from localhost ([::1]:37944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEga-0003PU-EJ for importer@patchew.org; Fri, 05 Jun 2020 11:55:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbD-0003W6-GY for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:39 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:39478) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbC-0004JS-Lo for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:39 -0400 Received: by mail-wm1-x32f.google.com with SMTP id k26so9608291wmi.4 for ; Fri, 05 Jun 2020 08:49:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m129sm12591419wmf.2.2020.06.05.08.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 340F41FF87; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=tRdpUcQhIJndhkGIh7lOShh9mZ16AUqZ+rVZ66b8A6w=; b=b0xa3+dIGMNHm9VVf930wKq8TQXVrRkmUSsINv+R3c/F3b896oial8BKM1fvq4xkL2 xOzO4sf1ox35yE/v78kxCCtJpKHOO7RyPjtyy4kRPAe5w5CMyxDN6jjYm38eJ4k8lclN /U+UK7z7a3w5BLwR4DhNV4I9033OwCjQq++nAqcznNHLWv34WvFbB+BA7d6BRzEWRSxP EPZhI89D/iKNoab4fBTF9fLzEoMsaYw//ECwsAHq4na8qykv4Mgs2H1ij0+TSGY59BkT sx5bSor1kwx/3K/2/Xrq8Hc9L3TLdq7pZDTjnnUIaVpSjQFZXE3GlVd3fOtHyYY7lneV YMvw== 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:mime-version:content-transfer-encoding; bh=tRdpUcQhIJndhkGIh7lOShh9mZ16AUqZ+rVZ66b8A6w=; b=cfDE2wXHfML0mhz6dSPQ34yzcG/OExYXstNnNtoCAHlt2bKZLllP5MMEVqeEAEB/oR bAdSDbb6th5KtTOwt28aCY1S9oMkIWIKpfpnl0gnJ8K1kqTw4g1G1/TOITb+MZhyEuB0 I/yQtb9Lu7NAVbnfVvRO64B8sh+OcwEpEfXAMJ8kaN/9pp7upaOY3TMuWvWuzen7/SH1 dhYHFVKEWE6sXkq+vIOmE2c/NBdvnjUQkAyKs/YAANAiQDOvCkLDmmWVbA1jb1oGV7VE DZ/10OXrMr5MZV7LQdkP2Otfw9YnvfjQbSH+XqvEetu5+TKdlaySOrxhMm+zx6Krcpah IoJw== X-Gm-Message-State: AOAM533G75F0A9ENLEHfus3Nc8ELdEJ3UkkRsP7oMzP6MPjwsO4G8IQb TJ+9Zelqk/QTaEQk7ZD0PupdjK7L9g8= X-Google-Smtp-Source: ABdhPJw0STcqxjjNfVO2jzA7mxO4DebpN94MN8KnmnVlyoeIKD0Y4Fzng/GIbQoYi2lBFzHY04pbag== X-Received: by 2002:a1c:7305:: with SMTP id d5mr3423664wmb.85.1591372177268; Fri, 05 Jun 2020 08:49:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/14] qemu-plugin.h: add missing include to define size_t Date: Fri, 5 Jun 2020 16:49:16 +0100 Message-Id: <20200605154929.26910-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: "Emilio G. Cota" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: "Emilio G. Cota" Signed-off-by: Emilio G. Cota Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200524202427.951784-1-cota@braap.org> --- include/qemu/qemu-plugin.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index 89ed579f559..bab8b0d4b3a 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -12,6 +12,7 @@ =20 #include #include +#include =20 /* * For best performance, build the plugin with -fvisibility=3Dhidden so th= at --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372392; cv=none; d=zohomail.com; s=zohoarc; b=aQDMM07Vlfq0Y/ihUSI9vSbxINZpe0dpKm+nPH5qSirKyUTdhFfqTH4KQqRCcu4X+IkjuhljWKiZ9QAyksrcA6XAFDeq6cAd7cxpqzLb00sQhlwWvnFN1e7pTpxiEvGu4Zz4w20/3cjWU7H+CLDDEZgE4Igq+H4WA2UEt16Q4Wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372392; 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=QSCo20FpmcSa9pqRC9AwXDY8+utkLNtj0/ksS5sWNSA=; b=G+TxC+L/asEkVF7EWivmFw30HHRkaZzg4wglaO30tL+DwFbCAhAlFb4LdLmi2jwU459+IdgnnDT1avCUYlYI544IAZcArji/4korR+yPm4Ob/zGwSWmGYlPSYHSoN8OQsrGcYr/E2MT5EPXxKlTCcw6ckTiT5gZ79oAdb72zYW0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372392784872.4321454055672; Fri, 5 Jun 2020 08:53:12 -0700 (PDT) Received: from localhost ([::1]:59128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEed-0000L8-H0 for importer@patchew.org; Fri, 05 Jun 2020 11:53:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbC-0003TK-Nh for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:38 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42758) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbB-0004JM-Qz for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:38 -0400 Received: by mail-wr1-x443.google.com with SMTP id p5so10241487wrw.9 for ; Fri, 05 Jun 2020 08:49:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g82sm11775933wmf.1.2020.06.05.08.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 484381FF8C; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=QSCo20FpmcSa9pqRC9AwXDY8+utkLNtj0/ksS5sWNSA=; b=MzzTtGZ5RIJ6uclgh5F6NE/NN/hB7pyA8R7Y9LOOM7zTj4AjDPn6WuyEx7nWfhArOu 0v/+cwLQ9rTw0ypXJc5esWkG9VsKPa8neHZ11XpSN1oRIpGUx8ptAqIpS7mw5QyhoTZo PmqLdZ45HHRg7Nad2Cl1dwniFikL+/DUL5xrv68JnTeLrUdxeEiGo8o+u4MDtky98+Hj 0hW/SLNIOmbgJjnuuh8N4SjXH4+xRTX1o47yvuRPedGJP35ddF3V9K25BtEXhVFcWYNL TEyDDaOC09F+R0Wyg+O2PgMlobWOGWGPkyvJV9hJww2Ze0GEnnaG7LEvjanhM6/3x5P+ TlOg== 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:mime-version:content-transfer-encoding; bh=QSCo20FpmcSa9pqRC9AwXDY8+utkLNtj0/ksS5sWNSA=; b=GGzfDiq+wcyU1nCeLVoL+UUdW27B6/67UFlI0yg77EZhXFKI6rJfTj60CJTyTwhlx0 QRgIl9MoUbYAZkf1SPfV/nr6Yt7Knh4ooGE3P0Pwfae12HfrUQREXgppRxF54qQWeReu yguCtlkQxlGxU8Wxml0OzP2PorAuFaI5E5B+HVZGn0ORwUXyI/Vu5eVdKnfBVK3aLSGs s94TmtpKIWW9bkUJIVdtkIqnRkHKEyKayd8ecs/GxU+3PlisEgMLXShm+r0w2MpyjsnS hWhBuN6LC1PXkjye7KwlXAP/0ned3ElVb0ll7IKEX1q8dTT9sX9kKtPwJZG5Pb8wri37 gVmw== X-Gm-Message-State: AOAM532TbWG/c9M/IA53yS0Eq1x05LFW9fjsD6PnedHX+vs1AO+nuIgG lxTioS5AwVektXAg5SSm0JMq2J0bzMI= X-Google-Smtp-Source: ABdhPJwXDlhWsBNTA/82kQxOsKDK6ekrYWWoZdBln1fsp4q6VHrMi/Wmj/J8QyofGj0olVVYiUI6OQ== X-Received: by 2002:adf:e744:: with SMTP id c4mr11056827wrn.71.1591372176294; Fri, 05 Jun 2020 08:49:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/14] scripts/clean-includes: Mark 'qemu/qemu-plugin.h' as special header Date: Fri, 5 Jun 2020 16:49:17 +0100 Message-Id: <20200605154929.26910-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: "Emilio G . Cota" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 "qemu/qemu-plugin.h" isn't meant to be include by QEMU codebase, but by 3rd party plugins that QEMU can use. These plugins can be built out of QEMU and don't include "qemu/osdep.h". Mark "qemu/qemu-plugin.h" as a special header that doesn't need to be cleaned for "qemu/osdep.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Emilio G. Cota Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200524215654.13256-1-f4bug@amsat.org> --- scripts/clean-includes | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/clean-includes b/scripts/clean-includes index dd938daa3ec..795b3bea318 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -123,6 +123,7 @@ for f in "$@"; do ;; *include/qemu/osdep.h | \ *include/qemu/compiler.h | \ + *include/qemu/qemu-plugin.h | \ *include/glib-compat.h | \ *include/sysemu/os-posix.h | \ *include/sysemu/os-win32.h | \ --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372656; cv=none; d=zohomail.com; s=zohoarc; b=bIpR0f5dsE+G/38gMg3eywaNm0pLNVyWo8U6uKM4hpqlOs9/etxldYq7vY6/DXcAow7QbHvKO6LC6pz376iDQT0r4E/A/xyb0b4MiO4dDVTPqFFQO2hz1UUAkVCtECTKGwz5r8Wh+F9piLGI9hzkePqcRDWgB3jRC3yr8Aj6KQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372656; 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=LK/4Qo6f+ZFTpUODCPrnJnwtXwRUNzbilhvZ9R6yVoU=; b=UDWeh+8/0cNtgNk0yHYnqnRysuKO52rLGOCkUVoLJcLwWy2nvhBwqVG0/MhVRP9kwZW0xy0tYLJJdEJOzZIT80rMAnV4rONxEUcj+Pw3Ug632r64KgaT1SMgu0KmySNzW0a+xW1kaFP0ghgSRBLThZC+9Nd3Xw8UXBz96R3+ups= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372656913219.97034259846032; Fri, 5 Jun 2020 08:57:36 -0700 (PDT) Received: from localhost ([::1]:46874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEir-0008IF-W6 for importer@patchew.org; Fri, 05 Jun 2020 11:57:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbI-0003gb-0e for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:44 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbH-0004LB-5n for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:43 -0400 Received: by mail-wr1-x441.google.com with SMTP id p5so10241813wrw.9 for ; Fri, 05 Jun 2020 08:49:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l17sm11102401wmi.3.2020.06.05.08.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6116D1FF8F; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=LK/4Qo6f+ZFTpUODCPrnJnwtXwRUNzbilhvZ9R6yVoU=; b=W4ADJJc6X3xO/DvyxxtK30S8n9f2uUs5I0jtmImRRBfLw7FrX1MfEZSd/OSDJG7SBP Xgtgm9pW4isLrerSZXJgUiCutstvU2pzTC5vqvtrTP/R6j0Fc48C9whGKA4yANIfT7tZ j1a+depkvkHAJOKVTpiWPKAQr8/YlVu5GWIV3xGBn6S2HARCjoLHpjzwJCBXlxmodGEp CKRjoxtpIooETibHPD9LuGqy0KxS9n6q2gM/6wgfCpBECUC1jcsXMLTQuW75uH96yPCC RFO5xNvPKvBZGmpefQmDAWDegY0VKcef306/1iwmXSQf69+JvCnSfaWp4583Vd2aDlnF +y3A== 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:mime-version:content-transfer-encoding; bh=LK/4Qo6f+ZFTpUODCPrnJnwtXwRUNzbilhvZ9R6yVoU=; b=LocbOtNylol/jVwEJBhccYimzCNy8WXn26M9osgy9vKB1/doL16OMSPkkr6mhrnTwJ eBoT7T9xGE4c/78PJhJyr+gdMBWS2JgGDBP1eMozJNTxjw9T6JSS7Y5hegS6AXsrmlWV ecsRGGf7csbA9VVXJI0FDbExy+hP3nSscQbd7af33dDjNYevwDoy2WHonzTWCGBLMoa4 LQ1fSiHl8FU5pl3Ao7RFipCWiTLRgYMEq4wQHgJkhNYmUYwh2U3RpJworamoSAQDZ9cJ oYX+Yi7mKLOjnPZFxPjk5T8fZd+ilYCIFjpEUhN8r/KRuZ+h5Ueg8cLu20Tf3S0C7EOa b72g== X-Gm-Message-State: AOAM532+/eOXbU/FNlZdX0osr5ouZm/bcJ8IC/axtER9PawGaHPbtO69 iNztfiu8/SgEz3/oVDR9GVweBVD3N7w= X-Google-Smtp-Source: ABdhPJwUiJOXXwDi8auQozjNS+TnpDKXrDGTFCu5wKbmH/d0s/1ARucN8DWicMkEsWdZYlSjKukhUA== X-Received: by 2002:adf:ca0e:: with SMTP id o14mr10974316wrh.254.1591372181861; Fri, 05 Jun 2020 08:49:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/14] tests/plugin: correctly honour io_count Date: Fri, 5 Jun 2020 16:49:18 +0100 Message-Id: <20200605154929.26910-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/plugin/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugin/mem.c b/tests/plugin/mem.c index 878abf09d19..4725bd851d8 100644 --- a/tests/plugin/mem.c +++ b/tests/plugin/mem.c @@ -28,7 +28,7 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) =20 g_string_printf(out, "mem accesses: %" PRIu64 "\n", mem_count); if (do_haddr) { - g_string_append_printf(out, "io accesses: %" PRIu64 "\n", mem_coun= t); + g_string_append_printf(out, "io accesses: %" PRIu64 "\n", io_count= ); } qemu_plugin_outs(out->str); } --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372261; cv=none; d=zohomail.com; s=zohoarc; b=Zjv8Nrgq0d6t2LpnGQEQSC8euuinKaxXNKiZTZZ8zviCoSoYgU4PZYrdYEhZwOyeXR8nINQwCydcVpIV8RtZMKTzVI4f2OwTnbIoeoDPTUpEz6UhnzPMPdQlXgFHXPM5u3ri+ILs6xAI31r929POBube8wkotVd8alPBXtyGkG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372261; 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=phvNC/3twlj1z+FSK0lUDFiax2fRGfdSfNFp/IJDVTk=; b=f7ZwqVdwi7AaZMVbfin9LKGLrVuD0RAM+FgT2qrWlElxAnQ8GrluV04YTZp71eiqwuJrQGUMSeRovfAQZLT9QcUAQB76yeExLmhHz3hqkmRFtmdRaku1NvBDSRLXkYQcLgfBTbHQNfDgbnPpGPfLNqDlo2VAQEbW2rURA+cG+uM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372261131650.4166937560882; Fri, 5 Jun 2020 08:51:01 -0700 (PDT) Received: from localhost ([::1]:50684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEcV-0005BC-P2 for importer@patchew.org; Fri, 05 Jun 2020 11:50:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbA-0003Ph-RL for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:36 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:35425) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEb9-0004Is-8S for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:35 -0400 Received: by mail-wm1-x341.google.com with SMTP id q25so9620786wmj.0 for ; Fri, 05 Jun 2020 08:49:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o10sm12731793wrj.37.2020.06.05.08.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 74F761FF90; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=phvNC/3twlj1z+FSK0lUDFiax2fRGfdSfNFp/IJDVTk=; b=mCTl1mvCxnnPcuLi0xBxmz6EH2VTEyybz5fZVgREAcDoQWmRObW5N+U6sEouCoe8LU v0S1AJAie0ZtTLa3ijetOQ8GF1OQVmEbsWTf2EKCIiwp+zAuSYgt4BRtHIR7Zgsfqv6q L1YcdeJVHGQo83svTl/ih6BFGqak3EmZSa36WNwVxcbDXs7GGNhaCJEqRmDsZ8cCYxXF 9pSCA2QsXwSb356Tb5H93jDHFy7YTQayBKgRTnBzWI25nv9Vk7adWq38eIIf+NMnnwIA DBMD8LLER5Lxddka2vqDzNY5Cx90fVqePAY7CpHTxK/lLCzIPb6Ji/9N94hF+xdcaiCm MIug== 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:mime-version:content-transfer-encoding; bh=phvNC/3twlj1z+FSK0lUDFiax2fRGfdSfNFp/IJDVTk=; b=Z0p7EqmF3cUAiLlXAQqEz6g6ytYDnfkPcqz3zl5dbIWjP3Y598hwGKHIlxFJ+gKPOI FVKkHWTjUPdWwP0ek1n8RkctKN9Vl9khDr0cDIDOEsR/ktptok7ZcGhq2WaYzngS6n4f 6Vwn7Mh/JsJ3i9sq9op9Fnh0jXD5BMFrrGp68QodhhK/jwboah/iwsQ9e+QcG/OMvNFS WCPVOFxm2u9WKdJC3YbiI6e3gzGQejG+j8x8mAd2VoLElhBWybqrpqiff1DsD03gzoE+ 19zEJxxzd+IqWP1Kd3vgA2+kotlJBQLCVgbNRz7KP06Tx834Ld4uWIMD6e/QzFj2haU7 kLtA== X-Gm-Message-State: AOAM530Vj/fniw+heC8HlvQW9v45K6MGjbsAPIJe15drf/H9B5NToNBM MQw057jeSxx75OPkdmrP7LrH/A== X-Google-Smtp-Source: ABdhPJw7H3CVv9zcPxZY1Qqx0SDFbtTnSe+Qu+M/AAbgaSAmLJY1QSVEG/30Hat1m/xmtNFL9Tkvag== X-Received: by 2002:a05:600c:4102:: with SMTP id j2mr1165177wmi.48.1591372173529; Fri, 05 Jun 2020 08:49:33 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/14] exec: flush the whole TLB if a watchpoint crosses a page boundary Date: Fri, 5 Jun 2020 16:49:19 +0100 Message-Id: <20200605154929.26910-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Alexander Bulekov , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There is no particular reason why you can't have a watchpoint in TCG that covers a large chunk of the address space. We could be clever about it but these cases are pretty rare and we can assume the user will expect a little performance degradation. NB: In my testing gdb will silently squash a watchpoint like: watch (char[0x7fffffffff]) *0x0 to a 4 byte watchpoint. Practically it will limit the maximum size based on max-value-size. However given enough of a tweak the sky is the limit. Reported-by: Alexander Bulekov Signed-off-by: Alex Benn=C3=A9e --- v2 - use cleaner in_page =3D -(addr | TARGET_PAGE_MASK) logic per rth --- exec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/exec.c b/exec.c index 3d4c94a9dc3..7cd45e94fce 100644 --- a/exec.c +++ b/exec.c @@ -1036,6 +1036,7 @@ int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, = vaddr len, int flags, CPUWatchpoint **watchpoint) { CPUWatchpoint *wp; + vaddr in_page; =20 /* forbid ranges which are empty or run off the end of the address spa= ce */ if (len =3D=3D 0 || (addr + len - 1) < addr) { @@ -1056,7 +1057,12 @@ int cpu_watchpoint_insert(CPUState *cpu, vaddr addr,= vaddr len, QTAILQ_INSERT_TAIL(&cpu->watchpoints, wp, entry); } =20 - tlb_flush_page(cpu, addr); + in_page =3D -(addr | TARGET_PAGE_MASK); + if (len <=3D in_page) { + tlb_flush_page(cpu, addr); + } else { + tlb_flush(cpu); + } =20 if (watchpoint) *watchpoint =3D wp; --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372306; cv=none; d=zohomail.com; s=zohoarc; b=GwZc2nVVetUCsaS8CrRa2KqKt+LsJh+mZjqJZjhaplch4SfsYEpAKnGhelM59fGR5dhxvKO5bVpdyyHJ1IoMPgHq020+DFR/jfuGb1dVB22D5LayYaX2YWn3Nu1Ci3twN/lbPV9wQFRXwtnp1YVpnOHBUIBtx6sUUKekg5ZfsBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372306; 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=SBVEeYPoldaG/TiWA5+kJpoxCO4a8QJPKMV9RJr0Iiw=; b=eDfvxrz9IMBgz+xHZEmTN8LUa13oB52wvcVLOkyTRsHD8Ogjz/2Y9tJizvSC/psF8qzED+x8+7B3P4gkecfD9jcqWuNJ5GmTZIPEBKRnvb8Rc4yp/a5bvVpAsF+gjE0+y2vNWPWwUe+rvaBi/RpPcZeKFGdBO4a+6lqIfHzH9+g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372306448727.6931916744728; Fri, 5 Jun 2020 08:51:46 -0700 (PDT) Received: from localhost ([::1]:53600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEdD-0006Tl-RI for importer@patchew.org; Fri, 05 Jun 2020 11:51:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbG-0003dV-SE for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:42 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbF-0004L2-Uw for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:42 -0400 Received: by mail-wr1-x442.google.com with SMTP id h5so10258911wrc.7 for ; Fri, 05 Jun 2020 08:49:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 40sm13226948wrc.15.2020.06.05.08.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8A3661FF91; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=SBVEeYPoldaG/TiWA5+kJpoxCO4a8QJPKMV9RJr0Iiw=; b=vsZrDVTPsML+JdLwdRQe6UKs6PwFAdy9bXFGvKnat1v6RItY9uYbkpK/c7WkfOYr0Z OKSrsy3ZN6RR4jFiqzRG6PqMpMq4Lp5jpB59z1WRUvDGhMv+bTbkuikUC60+j9YT+Wfe NrEdTbbsoO+T3AYLj9hA7cBglT0p9AM2GLIrzjHPuo5cUxBkNzSnR5y6FXWfSZdLviYG AajPNz7QY9QPXXVrD7g4nH3RLfyJB0Jun8yAwygLlYDlH2uynhKHYDRwrhpHqEIDiPYC gCMZtxOGih8VKhXJ/X6DNmmdvGIZzN+IXTyHeOCv/khHV57O6dwnW0WiJdc0reVUz7HG TBnA== 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:mime-version:content-transfer-encoding; bh=SBVEeYPoldaG/TiWA5+kJpoxCO4a8QJPKMV9RJr0Iiw=; b=BrbVnTwU2dwJSjyWRn+AZv0APB27HFDqbYqwgaHYyMm2ZT+6jGwfj0Z6h84MMuhcrf I8AGJpHE0dX7/Ln6k6cwo3Ze/pgbfJB2liMpI9A7TvAA3/SBzwnrNzl4qoY452yZDNfJ bpOZDO7AoT2y+AQZu3WBJ/ZHgeLmoDYNXfr/Xmlr4sfV9P6Ps3QPvtWIdLdejHda0nEp DdQdEE81xlsFfvJc+evSW+iWR9ifh5VN9QyxrAA2pXvyjujxVVE6WnIdSTMWtIf16EVc +DWLkrr3NGrR78nmGhX/bWvOaVfbpwIWJdvMYXMbskYFkr+hK1jDHUHYkKtDqK8MTXtA 0uyA== X-Gm-Message-State: AOAM532ZNTMHUje9P8Lay/m+VNB6w83kQwRWgg4yAgizXqVYHfTPloW9 HFmhCPOx8EJ0R7FQOL8/e2NVdA== X-Google-Smtp-Source: ABdhPJyB/HoW5PPycQWRNIFxsYs+6Wih//k2vMP1yBjcue8HqexaLHymLHcHogkQg5H9QBSy8AAg0A== X-Received: by 2002:a5d:69ca:: with SMTP id s10mr10492564wrw.203.1591372180565; Fri, 05 Jun 2020 08:49:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/14] .travis.yml: allow failure for unreliable hosts Date: Fri, 5 Jun 2020 16:49:20 +0100 Message-Id: <20200605154929.26910-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) They will still run but they won't get in the way of the result. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 564be50a3c1..ec6367af1f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -429,6 +429,7 @@ jobs: env: - TEST_CMD=3D"make check check-tcg V=3D1" - CONFIG=3D"--disable-containers --target-list=3D${MAIN_SOFTMMU_TA= RGETS}" + - UNRELIABLE=3Dtrue =20 - name: "[ppc64] GCC check-tcg" arch: ppc64le @@ -493,6 +494,7 @@ jobs: env: - TEST_CMD=3D"make check check-tcg V=3D1" - CONFIG=3D"--disable-containers --target-list=3D${MAIN_SOFTMMU_TA= RGETS},s390x-linux-user" + - UNRELIABLE=3Dtrue script: - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) - BUILD_RC=3D0 && make -j${JOBS} || BUILD_RC=3D$? @@ -535,6 +537,7 @@ jobs: - TEST_CMD=3D"make check-unit" - CONFIG=3D"--disable-containers --disable-tcg --enable-kvm --disable-tools --host-cc=3Dclang --cxx=3Dclang++" + - UNRELIABLE=3Dtrue =20 # Release builds # The make-release script expect a QEMU version, so our tag must start= with a 'v'. @@ -556,3 +559,5 @@ jobs: - mkdir -p release-build && cd release-build - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exi= t 1; } - make install + allow_failures: + - env: UNRELIABLE=3Dtrue --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372533; cv=none; d=zohomail.com; s=zohoarc; b=YxcNkAgq6aF07NXaLfRaHhCIYxP45+e+kxTCQAhrKPcd+DJYGQcgPVo4UWrYWATp3CTEx7CetoYPPzSO8vplH7Y3dI59JPl+sZiaPT7NRDQtK+Q3uT/eWc9CX/2nDy18RdaunZQjmNzCz6MBcUPel30ikUCE5KhE12iVyQdXqBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372533; 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=4Pg7eHIFFR7duliWOM5u/d7WwTMjFuTuB8JB6dQTfeM=; b=CYYvlJ10rMbHnficHUNNsD3/LBd6k6AZUDeSdmw9vdKsdXwT+qyES6Wjlk8JuI5ae+WerxFZ+023bybyVdjvJBe1CW4IAYeh9p/vdRiIKaHJqrdBG0dCs1g+eSVMDIjegkI3z5XJ7EmmsQqWUSv5y6jZin2441GQnUTnS2UWdjo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372533445584.6126008774788; Fri, 5 Jun 2020 08:55:33 -0700 (PDT) Received: from localhost ([::1]:40092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEgu-0004W0-6O for importer@patchew.org; Fri, 05 Jun 2020 11:55:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbK-0003mi-9F for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:46 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:55020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbJ-0004LZ-EK for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:45 -0400 Received: by mail-wm1-x344.google.com with SMTP id g10so8878318wmh.4 for ; Fri, 05 Jun 2020 08:49:44 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t13sm12300394wrn.64.2020.06.05.08.49.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9F5191FF92; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=4Pg7eHIFFR7duliWOM5u/d7WwTMjFuTuB8JB6dQTfeM=; b=arwY1f4IdKCebi4O8DulvVwQoPU+85sydRs+WtUzKPXUmJdKR6qytEDW4xA1wZ7yDG iMFL+JzL/VkFF0Skb2VTp6ER8SqKbY4MNnCBx9pdVZ2ekPVHA/JecHFarr4v6QULKkdK wbG3nbCpNV8lG6dBmhOmISctpVTkY+GJOsKML59oswJ+we5rXzscKoYnjM99sl+30fQ2 SfaSsSZhJujHUNMhyAUptx3uM4psikFfygQh2FrZmO3c4cfQ4x+4sVifT9X7aMF2tPbR n8QkFvRF/eY2HwNE1CmSPnrqrCpQVH42a1WWEZMsRDNfSKHmVQBdt1AqK4Ec7XGqwX9O dsZA== 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:mime-version:content-transfer-encoding; bh=4Pg7eHIFFR7duliWOM5u/d7WwTMjFuTuB8JB6dQTfeM=; b=ATa04XMInZjsTgdMRTZFexAYuXSpOcwm9799PIRLbioAFsi1gB+ZOAhk9JTqGWb4DO lS0tHeTjffE8sNN9Wa/WSInwpQgUCX9OG1hJdpw4UJI/pBPQ6eEmA2KrEwjFj/bVBRfv 60mrs/F7kC1evgwrnKHGJ4DbQ+p00Q/isV/TdKk4lq7S+tv7MvKmG2n4yiCPblHXVsy8 6cJGGuxSC/BH7lD3m5E/ZL0/951SaAgDUKPZ/vAfxIs8EHGxOuPbwD5wBahF+K43Q/+u OoqtT49VW4NQF5zqHRf3a2zDe2wR32kcFr+g29WU/dPhUs8UQ+RRLY8K1Pkwd+QxiIs0 0PRQ== X-Gm-Message-State: AOAM531MzRwETcJYGr24qjgblsw/LnnL2kYDC34XJX8Qrzz4Ibe9NFwu rqq3kboqKUf/AQP14JAg3VzPeCAZHFo= X-Google-Smtp-Source: ABdhPJzgB1DJhxgqwNgE1u07FZt03sMy8irByl1H4uz59gPeRx+0EdaTGR7ijsK3h4pYOVKUGIXLwg== X-Received: by 2002:a1c:7dd5:: with SMTP id y204mr3152341wmc.182.1591372184050; Fri, 05 Jun 2020 08:49:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/14] .shippable: temporaily disable some cross builds Date: Fri, 5 Jun 2020 16:49:21 +0100 Message-Id: <20200605154929.26910-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) These currently fail due to Debian bug #960271 as the linux-libc-library has a user-space build breaking symbol in it. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- .shippable.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.shippable.yml b/.shippable.yml index 2cce7b56890..10cf219bff4 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -5,8 +5,8 @@ env: global: - LC_ALL=3DC matrix: - - IMAGE=3Ddebian-amd64 - TARGET_LIST=3Dx86_64-softmmu,x86_64-linux-user + # - IMAGE=3Ddebian-amd64 + # TARGET_LIST=3Dx86_64-softmmu,x86_64-linux-user - IMAGE=3Ddebian-win32-cross TARGET_LIST=3Darm-softmmu,i386-softmmu,lm32-softmmu - IMAGE=3Ddebian-win64-cross @@ -19,10 +19,10 @@ env: TARGET_LIST=3Daarch64-softmmu,aarch64-linux-user - IMAGE=3Ddebian-s390x-cross TARGET_LIST=3Ds390x-softmmu,s390x-linux-user - - IMAGE=3Ddebian-mips-cross - TARGET_LIST=3Dmips-softmmu,mipsel-linux-user - - IMAGE=3Ddebian-mips64el-cross - TARGET_LIST=3Dmips64el-softmmu,mips64el-linux-user + # - IMAGE=3Ddebian-mips-cross + # TARGET_LIST=3Dmips-softmmu,mipsel-linux-user + # - IMAGE=3Ddebian-mips64el-cross + # TARGET_LIST=3Dmips64el-softmmu,mips64el-linux-user - IMAGE=3Ddebian-ppc64el-cross TARGET_LIST=3Dppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user build: --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372937; cv=none; d=zohomail.com; s=zohoarc; b=IuxfhiqzxQ5CeeSjZ4u63Cui9HZ7ULYLENX/Qy1FF8X2++ctCPmV2C25UshI3KgHLEE4NNofpGT5h9S/9nHlxiuOqelRj5/5P1Cr7c5M8zsmsj61R0pZxfJjWpMV+LtzjZ1oLKf2/q9aC5C47aOKowpKzUuxj/F1mYuT+10fW94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372937; 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=tLxHap7xM5B8vl55s/tokESX8SHGpSJI34kzmwiZhNU=; b=btcXonkwbsGkStDbj1HXSyzuLy1hgMPc1v8QrMl6JhCN701EFG07tvJOa3cLeABCVWkcbiXRHdqEI3L1Sxx6YfiI+ZNcUCC/BeNT8KuvLHwwSVxKAVFzUIpO47l3ahshd+NcTY3iLlIjoGeYpfP2/nub2Fclp2VWOEQ7eFyeDAE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372937941811.6196201483947; Fri, 5 Jun 2020 09:02:17 -0700 (PDT) Received: from localhost ([::1]:34234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEnQ-0007Eq-IU for importer@patchew.org; Fri, 05 Jun 2020 12:02:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbT-0004DA-W4 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:56 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:46948) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbS-0004Mu-R6 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:55 -0400 Received: by mail-wr1-x42a.google.com with SMTP id x6so10204776wrm.13 for ; Fri, 05 Jun 2020 08:49:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j5sm12397481wrq.39.2020.06.05.08.49.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B67EE1FF93; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=tLxHap7xM5B8vl55s/tokESX8SHGpSJI34kzmwiZhNU=; b=LOYNYH9I2iKw6nNgNjysiPqxByYjJnVAklQZ6pniu5QtKxa6nNkZmnGf66FP97i7/7 zcyIfKAaGXy0QCyPeVbqOyv3yAlf6ah4lP1nUiVeR73dJ+akwuBds+mtDqu4OQt916ff 9dCEZi+qsed2c+acVXEP3gaC2BVWNFBNuI6K9hxBdp8hc+G022G7tNNmNCJPjH5a68Sq J5yWMu/QuC7LYhDukiQfUZ6Rpej6HNEhwkuQUWCRbnMOgMIObG6IVtOVtMnT1ccJG2lr yowDlWU9PKagobQ84hypwcT6cPLxnDrR+bUEpNqB77Ci+HQny/XETFqOZx8z0pLJNSib 9Csw== 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:mime-version:content-transfer-encoding; bh=tLxHap7xM5B8vl55s/tokESX8SHGpSJI34kzmwiZhNU=; b=cYmlC0n4dY7G/zzxFufO5gKwEmKwufPgsurq6guTox9DHlyIUNz1ckrR5ET4zf8B5h bsjnMd08955zYZ8041ZB8JvTstbGvCA9mKRUMJSepSt84vN+JaaxauAQAJMhFb1X//cV 1Ran0IEMsgewGcahzMhM6GND0rZzQdjQq4uWaPiO/0cuaEwLgAztrQr+ct22tXW8wmsW 3DCP5sUGcG/sinMK/CFeE9F9+8khTGIPA+bq8PmiZwRvm117nXKoen73PP7Nr1EPdug2 wV1Qd8ijqAuF/CdIeFBjmRM/W4RqmmM793O+eM+mchA22RBVymn/v94mFKfrIUvCOn9u 1Adg== X-Gm-Message-State: AOAM530V8THt0ehM3+HhRbXceF60nKtipxcc5uCC9QU/L6Ob7ODGEPON 3IbgILaxZwJrVa4lsMhrIBAy0A== X-Google-Smtp-Source: ABdhPJxQZCsCHdPLUTntlu4UTpWg13bfaN2mpV37smMuocOB9/N49k0wfq/mNNc5z+7kdAMeTQzDtw== X-Received: by 2002:adf:fe07:: with SMTP id n7mr9911921wrr.240.1591372193368; Fri, 05 Jun 2020 08:49:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/14] iotests: 194: wait migration completion on target too Date: Fri, 5 Jun 2020 16:49:22 +0100 Message-Id: <20200605154929.26910-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Kevin Wolf , Thomas Huth , Vladimir Sementsov-Ogievskiy , "open list:Block layer core" , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Vladimir Sementsov-Ogievskiy It is possible, that shutdown on target occurs earlier than migration finish. In this case we crash in bdrv_release_dirty_bitmap_locked() on assertion "assert(!bdrv_dirty_bitmap_busy(bitmap));" as we do have busy bitmap, as bitmap migration is ongoing. We'll fix bitmap migration to gracefully cancel on early shutdown soon. Now let's fix iotest 194 to wait migration completion before shutdown. Note that in this test dest_vm.shutdown() is called implicitly, as vms used as context-providers, see __exit__() method of QEMUMachine class. Actually, not waiting migration finish is a wrong thing, but the test started to crash after commit ae00aa239847682 "iotests: 194: test also migration of dirty bitmap", which added dirty bitmaps here. So, Fixes: tag won't hurt. Fixes: ae00aa2398476824f0eca80461da215e7cdc1c3b Reported-by: Thomas Huth Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Thomas Huth Reviewed-by: Eric Blake Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200604083341.26978-1-vsementsov@virtuozzo.com> --- tests/qemu-iotests/194 | 10 ++++++++++ tests/qemu-iotests/194.out | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index 3fad7c6c1ab..6dc2bc94d7e 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -87,4 +87,14 @@ with iotests.FilePath('source.img') as source_img_path, \ iotests.log(dest_vm.qmp('nbd-server-stop')) break =20 + iotests.log('Wait migration completion on target...') + migr_events =3D (('MIGRATION', {'data': {'status': 'completed'}}), + ('MIGRATION', {'data': {'status': 'failed'}})) + event =3D dest_vm.events_wait(migr_events) + iotests.log(event, filters=3D[iotests.filter_qmp_event]) + + iotests.log('Check bitmaps on source:') iotests.log(source_vm.qmp('query-block')['return'][0]['dirty-bitmaps']) + + iotests.log('Check bitmaps on target:') + iotests.log(dest_vm.qmp('query-block')['return'][0]['dirty-bitmaps']) diff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out index dd60dcc14f1..f70cf7610e0 100644 --- a/tests/qemu-iotests/194.out +++ b/tests/qemu-iotests/194.out @@ -21,4 +21,9 @@ Gracefully ending the `drive-mirror` job on source... {"data": {"device": "mirror-job0", "len": 1073741824, "offset": 1073741824= , "speed": 0, "type": "mirror"}, "event": "BLOCK_JOB_COMPLETED", "timestamp= ": {"microseconds": "USECS", "seconds": "SECS"}} Stopping the NBD server on destination... {"return": {}} +Wait migration completion on target... +{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"mic= roseconds": "USECS", "seconds": "SECS"}} +Check bitmaps on source: +[{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "per= sistent": false, "recording": true, "status": "active"}] +Check bitmaps on target: [{"busy": false, "count": 0, "granularity": 65536, "name": "bitmap0", "per= sistent": false, "recording": true, "status": "active"}] --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372411; cv=none; d=zohomail.com; s=zohoarc; b=kXZ9MxvXp6TM7Yh+icAM0WKxsjmQ0uM0k/NQ5/WPdJZvM2Qs2jECXnRjVmNqSOGpAtGzx8KxznImiDr8B4Ao4ht+S2CG1u55DCnUtoMcSF/Ttr6VIAxKKJOQPEblmOwg5GWTedwApGcz2vuJ/qSFs2EW5LXMX/vyO/ZZUbmj+y4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372411; 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=RbfN3UAKOxV1a7MN3ugZcRLG3PinsC5XFsde1PoDV3g=; b=HQiquuD4gxvTYAa0lRTyUaS9isSVblhJFq/t6DmsmAfyconRnTVAdsXodbKhcchoNJM/3Q9kn7ErFkdGFpk89kzKc8/MBswVjKFhR0uYgZDZYC9x0duETWBXVhDhksGUuFdfv8NmdPtELA8NQV09ebBfN2bXjpex7jwwgCfmW+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372411234720.8629373544068; Fri, 5 Jun 2020 08:53:31 -0700 (PDT) Received: from localhost ([::1]:60738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEew-00010P-2P for importer@patchew.org; Fri, 05 Jun 2020 11:53:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbJ-0003kW-Du for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:45 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:46957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbI-0004LO-Df for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:45 -0400 Received: by mail-wr1-x435.google.com with SMTP id x6so10204210wrm.13 for ; Fri, 05 Jun 2020 08:49:44 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n1sm12446584wrp.10.2020.06.05.08.49.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CB0DB1FF96; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=RbfN3UAKOxV1a7MN3ugZcRLG3PinsC5XFsde1PoDV3g=; b=OKDNOhyObI6MafLc/Ew6BWrO3gWnH1n555mwTa9BmMyx2C9GIIBQmQ9ot/DdbU82Up I6zqfMje3jKHE3GTxRGm/DMqRX3Jyfkky0EE8MInWbn9U7I86rCmjAOLYwq3+ePtsZoh ER3QKetQscL79R7DtiJzlYnJ2JupyLbawZPdopNkA4XUdM0vaiVwstYkTlsc7++VItbI DwkaNBOV8cQjYyaPrj5s1YXJmfIJfXWOTIPxNMc+NsT2jlX0sQo5qdmF3sUSfsUHRtQX ZjjEg6Qogz+zg7n+E4M9FIdMPl4IhckI6UriNj9y6ILfhLlQpGWrh3AgadqzWYJ2vmEw j/kA== 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:mime-version:content-transfer-encoding; bh=RbfN3UAKOxV1a7MN3ugZcRLG3PinsC5XFsde1PoDV3g=; b=Gsb/zH7bSiyg0mQf4P6D5w2ufUodT/m4X/SWO4wiu1omyp7a5G6FkczhaawDAjXIcZ Qozm4GxE25GKQLO1ZvgvqXKtTL2GzZJ4TpJcFlJHHaPwN87/r16/4FeHLkpO9wrzFr1R 5f6jDO/f0UTa/59Hw6mE3sgw9NahsTv7fcMjNpZxSxz1MbuQYVxPDam3WDAu9AqazSHe SwerLDmEb7BDuq1BEaeK3fMkgqu28uy3tjjLChJdS7ScKJCrWsxyn72nG7SU7L73clkc ijhCT/w/y7W7x1sh/fPz1UJSsxLUKdah8ofpvZDZyfeIlCE8z9j5W0CeD1BFOgraDn8o PsPA== X-Gm-Message-State: AOAM532Ti5eTe7l0K6uXa/jhXsPzcsH+xGj2OD031qSDq1o3BMPNr7sX sezVlUUyBAFup/x22ipEBCK03w== X-Google-Smtp-Source: ABdhPJz3k8tDQcfQUzbhIZa+UXu+A/k/5nzbIOtPCy9L2uMKyuS138ftq4N0cnava1FOdRTWNcbOdg== X-Received: by 2002:adf:fd4b:: with SMTP id h11mr9932711wrs.209.1591372183004; Fri, 05 Jun 2020 08:49:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/14] tests/docker: fix pre-requisite for debian-tricore-cross Date: Fri, 5 Jun 2020 16:49:23 +0100 Message-Id: <20200605154929.26910-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Fam Zheng , Bastian Koppelmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Reported-by: Bastian Koppelmann Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ed46bd98eb5..981b7fcf2a5 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -130,7 +130,7 @@ docker-image-debian-sparc64-cross: docker-image-debian10 docker-image-travis: NOUSER=3D1 =20 # Specialist build images, sometimes very limited tools -docker-image-tricore-cross: docker-image-debian9 +docker-image-debian-tricore-cross: docker-image-debian9 docker-image-debian-arm64-test-cross: docker-image-debian11 =20 # These images may be good enough for building tests but not for test buil= ds --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372769; cv=none; d=zohomail.com; s=zohoarc; b=blp641HbEdyP8xcFq88Gx0+fM3QIDrVufTBf8TEpo24vatt6yV3JOMqwmxsjchSoUqb+mQVHV36HPlPr2d4ZiltdyznGPyGz26hDYsMGMRdoDf8/5eo1g55iBSdn6/6dvVWWjsb4nQ3ET+cEpIYP0L3v1YTfG9Oo6nl/gFnc8j0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372769; 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=GtPq8cQhyMMwLxaXu6V+chzcq9rrr5zHEfE0zhJ53RM=; b=GWwSd0h6wxPmbLA1DKt6ED5GXXsQiKdVJPMdNg1DBj48tjwxPiO55LfDEEJHfZ9rTe5sw+RPktvPnkhCEld3IxnTgWnftetul9jJHrJVGGvCypp+4GsPJ5k19hVE+Zz/ygct7Iahm52geLJXupmhK+ENd5BqwLE+WZzkW4l2CHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372769330365.5988500313546; Fri, 5 Jun 2020 08:59:29 -0700 (PDT) Received: from localhost ([::1]:55128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEkh-0003rn-2y for importer@patchew.org; Fri, 05 Jun 2020 11:59:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbM-0003td-Fl for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:48 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:33512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbL-0004Lv-IL for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:48 -0400 Received: by mail-wr1-x42f.google.com with SMTP id l11so10279163wru.0 for ; Fri, 05 Jun 2020 08:49:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t189sm11816646wma.4.2020.06.05.08.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E0BF11FF98; Fri, 5 Jun 2020 16:49:29 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=GtPq8cQhyMMwLxaXu6V+chzcq9rrr5zHEfE0zhJ53RM=; b=s6SV0l2KdZ/w9FHB7X1rf0kNJ/VJS2q8uEUC723M1EVqHGNXNxR1xZ7ISBqJ2SzlA1 aVAFutRHrK7fx6rabLPofhaHlH1JzisiTvxLiFwaw4r9UDfEMOCEEiJxL9N37EK6mkAw 0kaf3xsJZywhZlVdKoNJXP5wDWhIF0B2ZztjISsqEg9V/Ojnr1tq4u8nOdBCli7HDP5a iaYEEi7Nr9H2ZbFle6KLl09KrsSZ6y14bLK4C7+3KyqcQdMfqiu3EZiH6jUCBtwmZ95N LWVk9ymKCw2z2vIPgLPiGA847HoX4VbdtOoIOCYMBRXHOyDEnYAhVhAs3iRW40SuHCxL 3hvw== 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:mime-version:content-transfer-encoding; bh=GtPq8cQhyMMwLxaXu6V+chzcq9rrr5zHEfE0zhJ53RM=; b=EnCcptItLP5g4V5CfLd4/dEnGckSZo9oyZNgipcm+pJe37XrAGtZ8J7+3CcV1sBD5C 0HUgqFaIUgRgQJm1OIRkNaqXgQEuM2wu7aWqUgQHGeZYn+TxKJkpgjoltsCOTsnjuqSW VXXYtEZKCgnCOPtdeigauS/3dMj/T1zFd9TQLN687RUIiimUe9vpUGrSGn6wwiMCJkwV O+Z9BG/HcgdZ6ppSWWts34+ipsA3DJlNv1mJ9rKsWSIgGMYf1vdQkBShiMx0zwTCMDBC 1cVl1eW2BsYiK8PSMrlvHDfK1SLRR9EPcb3nJQBEKD8565uMHmUm3cvST2cr0FQeIHFc 6jnA== X-Gm-Message-State: AOAM5319Zk1Gmcvi0YSr/b+IZoCTrOZcNOKS+mKyX5iDWXJN4bFxK5sC xbUUG5fgN8GJZ7r9StUYALNNaQ== X-Google-Smtp-Source: ABdhPJzJMSnvM51NTQr8CSjTib4DM3bSWFfh3cm0pLnZqXwrwSHiOF/02iNOQjGR2b1B4WgFoXTUaQ== X-Received: by 2002:adf:e590:: with SMTP id l16mr9823406wrm.383.1591372186163; Fri, 05 Jun 2020 08:49:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/14] docker: update Ubuntu to 20.04 Date: Fri, 5 Jun 2020 16:49:24 +0100 Message-Id: <20200605154929.26910-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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?= , Paolo Bonzini , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Paolo Bonzini Signed-off-by: Paolo Bonzini Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200604231716.11354-1-pbonzini@redhat.com> --- tests/docker/dockerfiles/ubuntu.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/ubuntu.docker index eeb3b22bf20..43872417dec 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -9,7 +9,7 @@ # system won't pick up that it has changed. # =20 -FROM ubuntu:19.04 +FROM ubuntu:20.04 ENV PACKAGES flex bison \ ccache \ clang \ --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372391; cv=none; d=zohomail.com; s=zohoarc; b=jIBdZQ+3kzUe3NYwMomk9gUTTVKIUFmg5XN5/q7wEUBGY+Zkkon+YHi6C571BwTf0DQ2udYlXO0nDW1NNl1t3vcdOxyKtXpUBsavHBCehG3AO0zo0T6Jo6cB96SqiMBS8FlSnUpM92wrQXEGfL3pSPmpNfyOhvQS/FBzbulcaq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372391; 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=NV7x1nwKQefefjiR50/F9HWNP0Eyv5YxWPD+mxgxVTQ=; b=ginwsCst6u8rG6b3NkTlytSui2ze8NPf0dKbiIrSF18qn5IIPSF2xkoDGNha9OWpmLM0oKt5CSWc1PcAor11J49P7cfFx27wT0ahh6v7jEmgWh68C9IWdJC6RYBx30LE4hwJJU7FrX91WeDNc+y1qqZvVvDc2vEwihEfraNvzw4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372391659449.90309107016753; Fri, 5 Jun 2020 08:53:11 -0700 (PDT) Received: from localhost ([::1]:58996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEec-0000HN-CI for importer@patchew.org; Fri, 05 Jun 2020 11:53:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbN-0003xE-Sn for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:49 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:36933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbM-0004M3-PC for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:49 -0400 Received: by mail-wm1-x344.google.com with SMTP id y20so1872668wmi.2 for ; Fri, 05 Jun 2020 08:49:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y14sm1500181wma.25.2020.06.05.08.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0527C1FF99; Fri, 5 Jun 2020 16:49:30 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=NV7x1nwKQefefjiR50/F9HWNP0Eyv5YxWPD+mxgxVTQ=; b=U3kC0Ix0oRJ2nnyFMFHHeP1CIl891xjAR/JIaT3hyCD/Z5/bsRndwDKaKQNKLyN6F0 L3ELgba1oVBAMrNDeUGkL4b2Q9x6G5XOZmycNMmbIYYTzVAOKRz4FkASdqCNGjLhrPIU cLfcHKbX1i98kCcmIGsdvgpVhyUIeT0Jc4Sb2CKfxJc+fM5Vlxk8mH1PEI1MEJ7M1uCc wucp9mJJPH9t6IkT/zNY/Vdtee8ALdcf9xguOwqbWKzDQFnfOaEgOMPXZrMsgAFP+R4q aKozoy2oojxoq1Ave8GIhxeL93ocoA9/CF9JIc+dISZztDhJHeCBYkE+nW6evSbc+7EI cWYg== 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:mime-version:content-transfer-encoding; bh=NV7x1nwKQefefjiR50/F9HWNP0Eyv5YxWPD+mxgxVTQ=; b=XoFk29+3I3jRZB/iH+0r3takpYRhGJQ9Vw/FcmLzVyp1Gph5VB48z2XFunlq4i/f/a zy1igVrJK0fjjqLXWXnsMgVINfZxyYykpJ4ID64pSNNYCRj1n6kcxYMqAvaNmIG0sd7z uNZYoJqYmzH5ZAV9SVjDLM4BxbTTkQA68RTRsncGaKDsUZEVGgde1cY39DTxXOZgxCTf kTRL3QmT6+R6QaZOIlzAHWp/6MUy7JjRbYN9c9Pwku/6+nNkNfJkKjIdLV3MLTCgf7Vn Fl0nk/Z8rrlPwJremMiZhGm+caSS+5NOFEkIcFnKjTim6z2RLNq0RfFxJugOyqSpgGHP p9Kg== X-Gm-Message-State: AOAM532q5Ewztyfeequ3mgz+QvxkEsBB+Biutcg+gm+LDstkTrWeRhWW 8NVpw/DJ+EEo3K2AoVD6c/DBtw== X-Google-Smtp-Source: ABdhPJwOMlKf3X1qd4u7cuMfAiw+CwgsSxjdQOheSu63ap3Bbs+x4biX8FW4PjQfUroOF0I6HDSiEw== X-Received: by 2002:a7b:c201:: with SMTP id x1mr3296678wmi.58.1591372187361; Fri, 05 Jun 2020 08:49:47 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/14] hw/virtio/vhost: re-factor vhost-section and allow DIRTY_MEMORY_CODE Date: Fri, 5 Jun 2020 16:49:25 +0100 Message-Id: <20200605154929.26910-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: "Michael S . Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Dr . David Alan Gilbert" , Stefan Hajnoczi , Fabiano Rosas Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The purpose of vhost_section is to identify RAM regions that need to be made available to a vhost client. However when running under TCG all RAM sections have DIRTY_MEMORY_CODE set which leads to problems down the line. Re-factor the code so: - steps are clearer to follow - reason for rejection is recorded in the trace point - we allow DIRTY_MEMORY_CODE We expand the comment to explain that kernel based vhost has specific support for migration tracking. Signed-off-by: Alex Benn=C3=A9e Tested-by: Fabiano Rosas Cc: Michael S. Tsirkin Cc: Dr. David Alan Gilbert Cc: Stefan Hajnoczi Message-Id: <20200604134022.10564-1-alex.bennee@linaro.org> --- v3 - more tweaks to comments - merge the flag setting into one line --- hw/virtio/vhost.c | 57 ++++++++++++++++++++++++++++++------------ hw/virtio/trace-events | 3 ++- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index aff98a0ede5..e3e21812905 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -27,6 +27,7 @@ #include "migration/blocker.h" #include "migration/qemu-file-types.h" #include "sysemu/dma.h" +#include "sysemu/tcg.h" #include "trace.h" =20 /* enabled until disconnected backend stabilizes */ @@ -403,26 +404,50 @@ static int vhost_verify_ring_mappings(struct vhost_de= v *dev, return r; } =20 +/* + * vhost_section: identify sections needed for vhost access + * + * We only care about RAM sections here (where virtqueue and guest + * internals accessed by virtio might live). If we find one we still + * allow the backend to potentially filter it out of our list. + */ static bool vhost_section(struct vhost_dev *dev, MemoryRegionSection *sect= ion) { - bool result; - bool log_dirty =3D memory_region_get_dirty_log_mask(section->mr) & - ~(1 << DIRTY_MEMORY_MIGRATION); - result =3D memory_region_is_ram(section->mr) && - !memory_region_is_rom(section->mr); - - /* Vhost doesn't handle any block which is doing dirty-tracking other - * than migration; this typically fires on VGA areas. - */ - result &=3D !log_dirty; + MemoryRegion *mr =3D section->mr; + + if (memory_region_is_ram(mr) && !memory_region_is_rom(mr)) { + uint8_t dirty_mask =3D memory_region_get_dirty_log_mask(mr); + uint8_t handled_dirty; + + /* + * Kernel based vhost doesn't handle any block which is doing + * dirty-tracking other than migration for which it has + * specific logging support. However for TCG the kernel never + * gets involved anyway so we can also ignore it's + * self-modiying code detection flags. However a vhost-user + * client could still confuse a TCG guest if it re-writes + * executable memory that has already been translated. + */ + handled_dirty =3D (1 << DIRTY_MEMORY_MIGRATION) | + (1 << DIRTY_MEMORY_CODE); =20 - if (result && dev->vhost_ops->vhost_backend_mem_section_filter) { - result &=3D - dev->vhost_ops->vhost_backend_mem_section_filter(dev, section); - } + if (dirty_mask & ~handled_dirty) { + trace_vhost_reject_section(mr->name, 1); + return false; + } + + if (dev->vhost_ops->vhost_backend_mem_section_filter && + !dev->vhost_ops->vhost_backend_mem_section_filter(dev, section= )) { + trace_vhost_reject_section(mr->name, 2); + return false; + } =20 - trace_vhost_section(section->mr->name, result); - return result; + trace_vhost_section(mr->name); + return true; + } else { + trace_vhost_reject_section(mr->name, 3); + return false; + } } =20 static void vhost_begin(MemoryListener *listener) diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index e83500bee92..6427a0047df 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -5,7 +5,8 @@ vhost_commit(bool started, bool changed) "Started: %d Chang= ed: %d" vhost_region_add_section(const char *name, uint64_t gpa, uint64_t size, ui= nt64_t host) "%s: 0x%"PRIx64"+0x%"PRIx64" @ 0x%"PRIx64 vhost_region_add_section_merge(const char *name, uint64_t new_size, uint64= _t gpa, uint64_t owr) "%s: size: 0x%"PRIx64 " gpa: 0x%"PRIx64 " owr: 0x%"PR= Ix64 vhost_region_add_section_aligned(const char *name, uint64_t gpa, uint64_t = size, uint64_t host) "%s: 0x%"PRIx64"+0x%"PRIx64" @ 0x%"PRIx64 -vhost_section(const char *name, int r) "%s:%d" +vhost_section(const char *name) "%s" +vhost_reject_section(const char *name, int d) "%s:%d" vhost_iotlb_miss(void *dev, int step) "%p step %d" =20 # vhost-user.c --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372695; cv=none; d=zohomail.com; s=zohoarc; b=JGkKFpaeNpM3ufmISejAPth09RCm5dT39bhykBKU1Be3Qff/oI8k0e3lE+u/tgx/ysblTIGhtn+STLH73G2SXko/e6bqZSjY5bT4NL9m6mVOA/onVGLpPCWsBgQT0+DSG7Q0qsxRQrZfNI/YmeG52atiySDdHtnTlJ9fR3hzUZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372695; 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=xoCfRO676iJlXHa8f30XQ+Y59nBqkcCwu8Qlid/6iiw=; b=O78MB0njjkhdppLUH12RrTXLiNvuaWkLH5rm/Sdvmjr1DQDBvWqwPj0KVid6dcJmLnSLrQndHofwE+976xB8tLWcWW9YPmOILJv3oiQW/y4Z6uLKHici62EZOQNGIy/4RnFbSHwAGv3sngu5staEAsJVAOfVxO4NLsyCIKgeamg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372695224180.16475904420895; Fri, 5 Jun 2020 08:58:15 -0700 (PDT) Received: from localhost ([::1]:49830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEjV-0001gY-U6 for importer@patchew.org; Fri, 05 Jun 2020 11:58:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbV-0004Gy-FF for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:57 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:53290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbU-0004NJ-Gu for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:57 -0400 Received: by mail-wm1-x344.google.com with SMTP id l26so8874635wme.3 for ; Fri, 05 Jun 2020 08:49:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t14sm13744176wrb.94.2020.06.05.08.49.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A0DB1FF9A; Fri, 5 Jun 2020 16:49:30 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=xoCfRO676iJlXHa8f30XQ+Y59nBqkcCwu8Qlid/6iiw=; b=j/8crOjbAYJvF8if18cVLtGYCN3EUH/i6YTemPmQOZdQ2FkOyflW1jywul1VMw54bv 8r5rbsZ7pvG80D5hAVYNZ8wvQ/EClZkZukUm2x2TBvntAjqhxu6jTYZW9D4C4Yd8jIl7 gXJaZtyYltxSYMtXHmwHY4FYE7HSZdRelth7/EEUCtQZEF0AkocIoZEoToosKj6Njqb/ uJJzC2sTsnZjTJl6ws/WMbcOEdaNbVU7OqmzIauJovJStfNbwykEvyG6LGaeDsiAS86l CQOLoUlZf7JV0w2LgUArkpZnKK+ewLJRa8YtHSgTMOIkL3LhHGM925nGfOfn1sSaFbM8 gjDA== 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:mime-version:content-transfer-encoding; bh=xoCfRO676iJlXHa8f30XQ+Y59nBqkcCwu8Qlid/6iiw=; b=Hrl+dbez12CNGyBQkxRA8gLjTD5IVXHNoiIggNkLPkYL19x6+qYZBqRkLSNJx7lYW2 MGabbugVTjfqncjqBDNOku/G/7b2Y/IP0Gfg+mKQ1xNXfsOr6mY8vHAumf8jm8Tbyvk1 OaFf2np9s3ddIRwRyrlqvCX+JUUQNJK42tc3Zgd0AwtwYbmNx/HrfMaxK/QtXopM/Muo zwnQxAP+NCllzYFaDeQ9hOKleiJNIVS0B3ConMe5ZuyugYAG3595FHfJhUpT0xDO9h48 h0xcX6hZHWRSQHcWyxmGe2tl/5RuK/knorp4atLHTWriquDCUHClecdd3u+oDh64Cjhi 9X2g== X-Gm-Message-State: AOAM530tc+fp4Yab7fHOx3hgo6JRKBEfAGkQ299debY7SPqdDkQGCjAD 5W2ZuXL5410djau54qSEcm2yiA== X-Google-Smtp-Source: ABdhPJw682UDpFSNvoQUWK+sWFBr2n6zdQ//fRQ+RJoHm0t2GfI/6HJOTVsdegibjtDndo+ayKoH5A== X-Received: by 2002:a1c:7717:: with SMTP id t23mr3311934wmi.175.1591372195100; Fri, 05 Jun 2020 08:49:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 11/14] linux-user: provide fallback pgd_find_hole for bare chroots Date: Fri, 5 Jun 2020 16:49:26 +0100 Message-Id: <20200605154929.26910-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Peter Maydell , Riku Voipio , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When running QEMU out of a chroot environment we may not have access to /proc/self/maps. As there is no other "official" way to introspect our memory map we need to fall back to the original technique of repeatedly trying to mmap an address range until we find one that works. Fortunately it's not quite as ugly as the original code given we already re-factored the complications of dealing with the ARM_COMMPAGE. We do make an attempt to skip over brk() which is about the only concrete piece of information we have about the address map at this moment. Fixes: ee9474303 Reported-by: Peter Maydell Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200527100546.29297-2-alex.bennee@linaro.org> --- v3 - skip to brk if we get there - round up early --- linux-user/elfload.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index ebc663ea0b3..475d243f3bd 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2101,6 +2101,50 @@ static void pgb_have_guest_base(const char *image_na= me, abi_ulong guest_loaddr, } } =20 +/** + * pgd_find_hole_fallback: potential mmap address + * @guest_size: size of available space + * @brk: location of break + * @align: memory alignment + * + * This is a fallback method for finding a hole in the host address + * space if we don't have the benefit of being able to access + * /proc/self/map. It can potentially take a very long time as we can + * only dumbly iterate up the host address space seeing if the + * allocation would work. + */ +static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t br= k, long align) +{ + uintptr_t base; + + /* Start (aligned) at the bottom and work our way up */ + base =3D ROUND_UP(mmap_min_addr, align); + + while (true) { + uintptr_t align_start, end; + align_start =3D ROUND_UP(base, align); + end =3D align_start + guest_size; + + /* if brk is anywhere in the range give ourselves some room to gro= w. */ + if (align_start <=3D brk && brk < end) { + base =3D brk + (16 * MiB); + continue; + } else if (align_start + guest_size < align_start) { + /* we have run out of space */ + return -1; + } else { + int flags =3D MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE | MA= P_FIXED; + void * mmap_start =3D mmap((void *) align_start, guest_size, + PROT_NONE, flags, -1, 0); + if (mmap_start !=3D MAP_FAILED) { + munmap((void *) align_start, guest_size); + return (uintptr_t) mmap_start; + } + base +=3D qemu_host_page_size; + } + } +} + /* Return value for guest_base, or -1 if no hole found. */ static uintptr_t pgb_find_hole(uintptr_t guest_loaddr, uintptr_t guest_siz= e, long align) @@ -2116,6 +2160,10 @@ static uintptr_t pgb_find_hole(uintptr_t guest_loadd= r, uintptr_t guest_size, /* Read brk after we've read the maps, which will malloc. */ brk =3D (uintptr_t)sbrk(0); =20 + if (!maps) { + return pgd_find_hole_fallback(guest_size, brk, align); + } + /* The first hole is before the first map entry. */ this_start =3D mmap_min_addr; =20 --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372683; cv=none; d=zohomail.com; s=zohoarc; b=BC2hK/+vGmWa1VRhaiS6lZEYSzpNp0Ev4PT+qNK4ss5yb+HKgv9tZHqj8qFdmNMmgCZcevpk2N5xpTi65dwyPZOR3uLAwc7uK8VMxrloQzNa5/R4g1Q9FFOsJabIvfFBpYTZ4lcPGYiqXdvniITmp2oJc+4D7YQU4aqWONpzh+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372683; 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=Ou/1yLdNR/Td2p6rgjvxI8THzHHOh+I9GsvdOs07AMM=; b=N05fR95VNOnT7EwgjuJ9yJhvK8shd6WxS8zKJzfozoBIotrjcCxuHFReACE0s5EgRt5E5Occ4QqSxxEvM9N/04n3LFcG+5uApuEmMMKSF9HZq3bSQlL3ta/zvaSA4goLPGN5IKMEpYRWFPRZEg5znMOxs03qRliXKEUMOWEBttw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372683133709.0980170075235; Fri, 5 Jun 2020 08:58:03 -0700 (PDT) Received: from localhost ([::1]:48852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEjJ-0001HY-QE for importer@patchew.org; Fri, 05 Jun 2020 11:58:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbP-00041v-LB for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:51 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbO-0004MD-Fh for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:51 -0400 Received: by mail-wm1-x341.google.com with SMTP id r9so8877048wmh.2 for ; Fri, 05 Jun 2020 08:49:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j190sm11823001wmb.33.2020.06.05.08.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3129C1FF9B; Fri, 5 Jun 2020 16:49:30 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=Ou/1yLdNR/Td2p6rgjvxI8THzHHOh+I9GsvdOs07AMM=; b=uFjeECQGJhmpjJSX9xWl6GS9H2uG1KOKVQOLtLl4pfL9X7sUjGgOCwmhrJercWMRy3 9fBcZiROldGuVlirunkq9GJFB1FEuABDY1XTBucjKvYOTJqneANe3dJfAJPbLBDu/4aX DxbuAp4gHkCIr+lIA6eUqVYwX4t0xOgQqBNjtgzMMmbHN5jeicvyCbFA90UlztrFNIPb v7Ohe2TY4GOq+7atqQ2daTiRmIMpbAMvasB34l6KRFtD3dC3Z3MrltdoITo/zsxei/NO ayO58UN/r0qHjSQPwSmRohYrYTTn7IamxQHGBO7PGreZYZn+Fbkc2Xqy7wS2xBjH+gzX Fu2g== 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:mime-version:content-transfer-encoding; bh=Ou/1yLdNR/Td2p6rgjvxI8THzHHOh+I9GsvdOs07AMM=; b=lgSJsXwg8yAZZ7s9TAEr9YPJUUX4F8eic2WCZ3O/PjORMvSU6wHuP2sFAvUFwTmp+E uWhUexrY1lgQgN3BbMH6HvQkuoOqmAZ0BY+ZlmmP/lNenoM8FxWdbDBTFgsl5ZJauxD7 89kjg8/MHu0sB5fxGYA9bJObvHDREFb3UAvMiJ9S94ldEjEn1qFRJID4fl3/1pRx5HDQ fRKfpn6A2TRuRaGN794WKHpWkio0lw6+QdTSljWdOlWgy7FFB53JhMqq2ufY1Emy6Mdy QYfPetwcnKLqDeUFI2NPayB3xxb6nR5rzo+frmaNLydyebr6GSRuA71mnAXauymYnWBw l2sQ== X-Gm-Message-State: AOAM530nqP0GEYHiZT7UpOleqPdVGD/oNwhOCNgvlxMOeP49OIc/p8fZ F3RLQOLiKKkjhwSO11HSe9GbNg== X-Google-Smtp-Source: ABdhPJzjJysKDY3Jcd/Cdqp85W47q9lx7lR6kZdTsdKOGXx3dZANCe5i6fCLGG0FS/UWizphnexE/w== X-Received: by 2002:a1c:9ec4:: with SMTP id h187mr3266598wme.27.1591372189031; Fri, 05 Jun 2020 08:49:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 12/14] linux-user: deal with address wrap for ARM_COMMPAGE on 32 bit Date: Fri, 5 Jun 2020 16:49:27 +0100 Message-Id: <20200605154929.26910-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Peter Maydell , Bug 1880225 <1880225@bugs.launchpad.net>, Riku Voipio , Richard Henderson , Laurent Vivier , Aleksandar Markovic , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We rely on the pointer to wrap when accessing the high address of the COMMPAGE so it lands somewhere reasonable. However on 32 bit hosts we cannot afford just to map the entire 4gb address range. The old mmap trial and error code handled this by just checking we could map both the guest_base and the computed COMMPAGE address. We can't just manipulate loadaddr to get what we want so we introduce an offset which pgb_find_hole can apply when looking for a gap for guest_base that ensures there is space left to map the COMMPAGE afterwards. This is arguably a little inefficient for the one 32 bit value (kuser_helper_version) we need to keep there given all the actual code entries are picked up during the translation phase. Fixes: ee94743034b Bug: https://bugs.launchpad.net/qemu/+bug/1880225 Cc: Bug 1880225 <1880225@bugs.launchpad.net> Signed-off-by: Alex Benn=C3=A9e Tested-by: Aleksandar Markovic Cc: Richard Henderson Cc: Peter Maydell Message-Id: <20200527100546.29297-3-alex.bennee@linaro.org> --- v3 - base offset on ARM_COMMPAGE - ensure we MAP_FIXED the commpage - support offset in pgd_find_hole_fallback --- linux-user/elfload.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 475d243f3bd..b5cb21384a1 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -389,7 +389,7 @@ static bool init_guest_commpage(void) { void *want =3D g2h(ARM_COMMPAGE & -qemu_host_page_size); void *addr =3D mmap(want, qemu_host_page_size, PROT_READ | PROT_WRITE, - MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0); =20 if (addr =3D=3D MAP_FAILED) { perror("Allocating guest commpage"); @@ -2113,7 +2113,8 @@ static void pgb_have_guest_base(const char *image_nam= e, abi_ulong guest_loaddr, * only dumbly iterate up the host address space seeing if the * allocation would work. */ -static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t br= k, long align) +static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t br= k, + long align, uintptr_t offset) { uintptr_t base; =20 @@ -2123,7 +2124,7 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t gue= st_size, uintptr_t brk, lon while (true) { uintptr_t align_start, end; align_start =3D ROUND_UP(base, align); - end =3D align_start + guest_size; + end =3D align_start + guest_size + offset; =20 /* if brk is anywhere in the range give ourselves some room to gro= w. */ if (align_start <=3D brk && brk < end) { @@ -2138,7 +2139,7 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t gue= st_size, uintptr_t brk, lon PROT_NONE, flags, -1, 0); if (mmap_start !=3D MAP_FAILED) { munmap((void *) align_start, guest_size); - return (uintptr_t) mmap_start; + return (uintptr_t) mmap_start + offset; } base +=3D qemu_host_page_size; } @@ -2147,7 +2148,7 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t gue= st_size, uintptr_t brk, lon =20 /* Return value for guest_base, or -1 if no hole found. */ static uintptr_t pgb_find_hole(uintptr_t guest_loaddr, uintptr_t guest_siz= e, - long align) + long align, uintptr_t offset) { GSList *maps, *iter; uintptr_t this_start, this_end, next_start, brk; @@ -2161,7 +2162,7 @@ static uintptr_t pgb_find_hole(uintptr_t guest_loaddr= , uintptr_t guest_size, brk =3D (uintptr_t)sbrk(0); =20 if (!maps) { - return pgd_find_hole_fallback(guest_size, brk, align); + return pgd_find_hole_fallback(guest_size, brk, align, offset); } =20 /* The first hole is before the first map entry. */ @@ -2173,7 +2174,7 @@ static uintptr_t pgb_find_hole(uintptr_t guest_loaddr= , uintptr_t guest_size, =20 this_end =3D ((MapInfo *)iter->data)->start; next_start =3D ((MapInfo *)iter->data)->end; - align_start =3D ROUND_UP(this_start, align); + align_start =3D ROUND_UP(this_start + offset, align); =20 /* Skip holes that are too small. */ if (align_start >=3D this_end) { @@ -2223,6 +2224,7 @@ static void pgb_static(const char *image_name, abi_ul= ong orig_loaddr, { uintptr_t loaddr =3D orig_loaddr; uintptr_t hiaddr =3D orig_hiaddr; + uintptr_t offset =3D 0; uintptr_t addr; =20 if (hiaddr !=3D orig_hiaddr) { @@ -2236,18 +2238,19 @@ static void pgb_static(const char *image_name, abi_= ulong orig_loaddr, if (ARM_COMMPAGE) { /* * Extend the allocation to include the commpage. - * For a 64-bit host, this is just 4GiB; for a 32-bit host, - * the address arithmetic will wrap around, but the difference - * will produce the correct allocation size. + * For a 64-bit host, this is just 4GiB; for a 32-bit host we + * need to ensure there is space bellow the guest_base so we + * can map the commpage in the place needed when the address + * arithmetic wraps around. */ if (sizeof(uintptr_t) =3D=3D 8 || loaddr >=3D 0x80000000u) { - hiaddr =3D (uintptr_t)4 << 30; + hiaddr =3D (uintptr_t) 4 << 30; } else { - loaddr =3D ARM_COMMPAGE & -align; + offset =3D -(ARM_COMMPAGE & -align); } } =20 - addr =3D pgb_find_hole(loaddr, hiaddr - loaddr, align); + addr =3D pgb_find_hole(loaddr, hiaddr - loaddr, align, offset); if (addr =3D=3D -1) { /* * If ARM_COMMPAGE, there *might* be a non-consecutive allocation @@ -2282,7 +2285,7 @@ static void pgb_dynamic(const char *image_name, long = align) * just above that, and maximises the positive guest addresses. */ commpage =3D ARM_COMMPAGE & -align; - addr =3D pgb_find_hole(commpage, -commpage, align); + addr =3D pgb_find_hole(commpage, -commpage, align, 0); assert(addr !=3D -1); guest_base =3D addr; } --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372513; cv=none; d=zohomail.com; s=zohoarc; b=Q6QSy4xrgTvbIELlqElGaqJiPVqapA/LGFtI8dqSoXvPOJMcJyNpamyxEvQltr49/ywVfnhqOpEMJBUL+uwxIKP5bySH9jir4o+k9ijy3a6j0tiCI4iCXHOXvazEUUYn3sD7aXIqPWqtT66hbbWL7/nKYLP4YplfFWKfMyVeKD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372513; 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=o205Gy4dIq94JtyORDq4ueHvgsS7WKPATaza+gEBGrc=; b=bNKU1UaIPKwDzfGxT7F4Whe3FVJ+XDKj07DIYhmJX3PO8C/pqqW0YLxGsVrcpdx4ccNMm1W/e6HyjJjC5i/R32rwZ26ClmDzY1sNETq8zNlZoLK9xyv2r1/39ZDmyUPF+KldLyRiqJH04VNJWusloVz4fUJ76wBKX8ZNST3V8gM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372512906566.0356538814065; Fri, 5 Jun 2020 08:55:12 -0700 (PDT) Received: from localhost ([::1]:37848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEgZ-0003MK-BX for importer@patchew.org; Fri, 05 Jun 2020 11:55:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbS-00049n-N2 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:54 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbR-0004MZ-MU for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:54 -0400 Received: by mail-wr1-x442.google.com with SMTP id p5so10242363wrw.9 for ; Fri, 05 Jun 2020 08:49:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k17sm11284426wmj.15.2020.06.05.08.49.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 483E71FF9C; Fri, 5 Jun 2020 16:49:30 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=o205Gy4dIq94JtyORDq4ueHvgsS7WKPATaza+gEBGrc=; b=Dwe/XF/StfZvDDrtiiBItgKpQT9C9bsDkFPMkSYUGKNAy3jRPnEP1VbG3RhC/NWVav 8hAVExW4vcccya0D7NaxfD1vmvcFK/QTx33/RlN/U63w1Y8+AOoR4d9ET5G+oZc3Fqc7 3L1B6suRV0o2r5TchQQr4i/8ES22SUgph082cihOOPMi+sbqoG9aKHtWbhHXXhgXiW10 9bnYWoKQZSIaG7ph6w6KHiM9CZmR6+fMmloiat3hzkFdyGdlhhoorw9cemuZ28qr8Fuw S/O1tkRAVnXEiuIPramsLxUY9KzaawPK6bZFDQVCWVeGV3diNw2f7K1ytsR0mHTfMbqB PuPA== 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:mime-version:content-transfer-encoding; bh=o205Gy4dIq94JtyORDq4ueHvgsS7WKPATaza+gEBGrc=; b=YV0ImS7w5oIBwtzp5GcvV19v75qn3+iPt+4+H8U4M2ak2wviAOJaYTF81qN1O34Xbn 7XbaQaZJQ+WiEgLkThE30wXR032aUTw/rBYH89oU1Q/JyqdQOp8v193Rf7qak9beyQXW Ntl5BApXhWOv+QfSSJ84k/AekmGEPgtxVuJuRD41983TPDefO79YOZ71RwAz0gjELVlg w9jhf0MA56qDT1FNUgShlpIndJW7Ya67zfW3vSWlg93bhycAl7fwOHisqb4gqJXjVih3 d6U+rAjSO3gKFmWSaNi7A+x20Ml8bWjN2U+xgC8vCQbpwrcHPg+tcgInUHFE9VZwsiq1 FnMg== X-Gm-Message-State: AOAM531W8R0kJHk2jjo3OvjOkcxxHOuQ1dXt7l+fD0z0tobAu+GyzqIw b9M+k5bN1eZMNnoIGr6RajQjOQ== X-Google-Smtp-Source: ABdhPJz5WtfsM8XCA8XZXxmlqxDM4J1ooBn7EUOMyXz6RSV67z8sWyCXg/OqNjuVyIBBq1hDR4IpHw== X-Received: by 2002:a5d:484b:: with SMTP id n11mr10390298wrs.356.1591372192284; Fri, 05 Jun 2020 08:49:52 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/14] tests/tcg: add simple commpage test case Date: Fri, 5 Jun 2020 16:49:28 +0100 Message-Id: <20200605154929.26910-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Richard Henderson , "open list:ARM TCG CPUs" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The COMMPAGE are a number of kernel provided user-space routines for 32 bit ARM systems. Add a basic series of smoke tests to ensure it is working as it should. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20200527100546.29297-4-alex.bennee@linaro.org> --- tests/tcg/arm/commpage.c | 61 +++++++++++++++++++++++++++++++++++ tests/tcg/arm/Makefile.target | 2 ++ 2 files changed, 63 insertions(+) create mode 100644 tests/tcg/arm/commpage.c diff --git a/tests/tcg/arm/commpage.c b/tests/tcg/arm/commpage.c new file mode 100644 index 00000000000..c76e70cb8bd --- /dev/null +++ b/tests/tcg/arm/commpage.c @@ -0,0 +1,61 @@ +/* + * Verify the COMMPAGE emulation + * + * The ARM commpage is a set of user space helper functions provided + * by the kernel in an effort to ease portability of user space code + * between different CPUs with potentially different capabilities. It + * is a 32 bit invention and similar to the vdso segment in many ways. + * + * The ABI is documented in the Linux kernel: + * Documentation/arm/kernel_userspace_helpers.rst + * + * Copyright (c) 2020 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include + +#define ARM_COMMPAGE (0xffff0f00u) +#define ARM_KUSER_VERSION (*(int32_t *)(ARM_COMMPAGE + 0xfc)) +typedef void * (get_tls_fn)(void); +#define ARM_KUSER_GET_TLS (*(get_tls_fn *)(ARM_COMMPAGE + 0xe0)) +typedef int (cmpxchg_fn)(int oldval, int newval, volatile int *ptr); +#define ARM_KUSER_CMPXCHG (*(cmpxchg_fn *)(ARM_COMMPAGE + 0xc0)) +typedef void (dmb_fn)(void); +#define ARM_KUSER_DMB (*(dmb_fn *)(ARM_COMMPAGE + 0xa0)) +typedef int (cmpxchg64_fn)(const int64_t *oldval, + const int64_t *newval, + volatile int64_t *ptr); +#define ARM_KUSER_CMPXCHG64 (*(cmpxchg64_fn *)(ARM_COMMPAGE + 0x60)) + +#define fail_unless(x) \ + do { \ + if (!(x)) { \ + fprintf(stderr, "FAILED at %s:%d\n", __FILE__, __LINE__); \ + exit(EXIT_FAILURE); \ + } \ + } while (0) + + +int main(int argc, char *argv[argc]) +{ + void *kuser_tls; + int val =3D 1; + const int64_t oldval =3D 1, newval =3D 2; + int64_t val64 =3D 1; + + fail_unless(ARM_KUSER_VERSION =3D=3D 0x5); + kuser_tls =3D ARM_KUSER_GET_TLS(); + printf("TLS =3D %p\n", kuser_tls); + fail_unless(kuser_tls !=3D 0); + fail_unless(ARM_KUSER_CMPXCHG(1, 2, &val) =3D=3D 0); + printf("val =3D %d\n", val); + /* this is a crash test, not checking an actual barrier occurs */ + ARM_KUSER_DMB(); + fail_unless(ARM_KUSER_CMPXCHG64(&oldval, &newval, &val64) =3D=3D 0); + printf("val64 =3D %lld\n", val64); + return 0; +} diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index 11c39c601ea..3da09a38be7 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -68,6 +68,8 @@ run-semiconsole-arm: semiconsole-arm run-plugin-semiconsole-arm-with-%: $(call skip-test, $<, "MANUAL ONLY") =20 +ARM_TESTS +=3D commpage + TESTS +=3D $(ARM_TESTS) =20 # On ARM Linux only supports 4k pages --=20 2.20.1 From nobody Fri May 17 14:12:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591372798; cv=none; d=zohomail.com; s=zohoarc; b=BYo26Sif1EjLuXl9jWoKczMC0e3Gby9nhn0/BBGlApxc59BC9wlVvZf9g9QyOEbFqK5bWa60GLf2NG87QbdahTe/grG8YCdwet3yHTWQLUq8Ad1bsUrVfUexR135z5sHL64RU5t6+P0dloSzuAD6l3MqXBVNabhPbmtKl/BuVSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591372798; 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=pky+yimT92Xz7KJNz6g2LcHXO4hPPJkZ2uiDnLp8dpE=; b=ZbN+kmCbWuVTxOtGkxqJcCsQX1doPLP8Mlf9yFp4hUPJzdRFev90xqPQViQI+ak5SnyaOWvUf4L/RLHcVH9JxVNNYBiq0Ie6veM9g6pTzaZjXvwi2MHpiRqFRrQ5zZHgOUegznafKb/OUDfIOJObCrdxywN+9OntKWPtu7Cr2i8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591372798175219.21252013948242; Fri, 5 Jun 2020 08:59:58 -0700 (PDT) Received: from localhost ([::1]:56688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEl8-0004Zn-0d for importer@patchew.org; Fri, 05 Jun 2020 11:59:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEbR-00046C-B2 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:53 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:40411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEbQ-0004MS-DE for qemu-devel@nongnu.org; Fri, 05 Jun 2020 11:49:52 -0400 Received: by mail-wm1-x342.google.com with SMTP id r15so9584116wmh.5 for ; Fri, 05 Jun 2020 08:49:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k12sm12583836wrn.42.2020.06.05.08.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 08:49:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 621D31FF9D; Fri, 5 Jun 2020 16:49:30 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=pky+yimT92Xz7KJNz6g2LcHXO4hPPJkZ2uiDnLp8dpE=; b=F42v3kl098ZKeiXj15ucvofj8I2hTIbiyujfDKvRUhoR1jvuS6Mdm9fdqX+V4MW8vN 1EmfoVCp4TfRaZqW1E3qD/UGg91yL3NVaq5hz/nJ6w99hRgCANGaXuaN5Z94ml53jvQ9 EliQJINRgIc8nZElmH6nOqXE4KouIwPWS7VgZvJ18L5jgfVaEPGnBuRm4ihjuf6bK4VJ ZVmCrWsIKyq3+1JbSwSqoMIywoJxk2t0ITwXgGAExi3r86ETGubt4xmX83d1YuHGnOaB MpMae/XpG1HnYaTU8LKwOpfR6PS0fpyLg8yAGRbep9284bo96bNY6vmPtpCJhiLfSGvY inSQ== 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:mime-version:content-transfer-encoding; bh=pky+yimT92Xz7KJNz6g2LcHXO4hPPJkZ2uiDnLp8dpE=; b=UCpRi5zFUWL2uzdiiOmFseUx+7o8kVRorCHLRJsfMrq+xdr0bNlWzk3RYOyZAHtNJu hCXm0Ah6xvg2M8sfVRhXz9RZeYz3LiXgj6ATFjDI6yz1cTEZSDuOexeo2jzAVV+bOO4T B5OeDxVu8PdDsaCbbwziYyDBuNN27+p0RsgBwCEAC50qvbW1QhNdsgRqNUhYGE5u3rkK 8T+r/lz9tRPyqGP3hSR4kLE64Mv1oS1gIqAQ00ebjFUYUbFb0Zt43r49nH55LjPq7DMY OpOzIZETSp8fPtyMWYxZoUxqidg4HAD1OP1y4xoK9IK+Bxh8QtwV8/TclVfwzsQbhEiA hB6g== X-Gm-Message-State: AOAM530vMeT/+2aAqpmL8urN2+h3HOcm8bjAr4/GLcr1nq2FYpTTsSH5 i9f7uqLWi+t+EN4yEWpVHOe5/A== X-Google-Smtp-Source: ABdhPJzTqpabZLG6eKC9VOXHXFmIIVQQkKEjszCmJ9xHjXUdZ1kOtUP+DQaItTnOSg7KBdx/EXiQmA== X-Received: by 2002:a1c:df57:: with SMTP id w84mr3581446wmg.52.1591372191049; Fri, 05 Jun 2020 08:49:51 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 14/14] linux-user: detect overflow of MAP_FIXED mmap Date: Fri, 5 Jun 2020 16:49:29 +0100 Message-Id: <20200605154929.26910-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605154929.26910-1-alex.bennee@linaro.org> References: <20200605154929.26910-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Relaxing the restrictions on 64 bit guests leads to the user being able to attempt to map right at the edge of addressable memory. This in turn lead to address overflow tripping the assert in page_set_flags when the end address wrapped around. Detect the wrap earlier and correctly -ENOMEM the guest (in the reported case LTP mmap15). Fixes: 7d8cbbabcb Signed-off-by: Alex Benn=C3=A9e Reported-by: Laurent Vivier --- linux-user/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index e3780337974..2e05bd499e6 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -467,7 +467,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, in= t prot, * It can fail only on 64-bit host with 32-bit target. * On any other target/host host mmap() handles this error correct= ly. */ - if (!guest_range_valid(start, len)) { + if (end < start || !guest_range_valid(start, len)) { errno =3D ENOMEM; goto fail; } --=20 2.20.1