From patchwork Wed Feb 26 07:39:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183888 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2786052ile; Tue, 25 Feb 2020 23:39:48 -0800 (PST) X-Google-Smtp-Source: APXvYqzpMX9sRsrTv96/c7FtTB+vDa70nbfD5nAhq+yqHGrhfH3DAd6rnCrvwMB0i7d8+zgoAOQp X-Received: by 2002:ac8:5419:: with SMTP id b25mr3767830qtq.390.1582702788338; Tue, 25 Feb 2020 23:39:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582702788; cv=none; d=google.com; s=arc-20160816; b=B91GiIrkO5vsSq4lcTMigmzEj3j0FgQUrdCZLZE4vWy196gX0vkidfeblCoy8EREQp BBSydvxLdVOdlFhgE7UUl/ofJ9igdcQDQTvHC15x2wPH6OwMGZsvwzbAXGjeO6AmWC4L TGA6fjikOAQWXe6XEVa5rywxPbwddOWK8xCMnN9LtHQOmrz0ilfKOlPAMAflCPA7HKcs bYADf4vP5/nKz4g22pnS7ay3oSVZLdbNLZAgwFErdAGBftr/sBsu3iN/fbIuHkzp05vq CMIrlzDhWolg4ZFrhqR65WyiKlGQ3VWBMnExkaW6ZrdVTNgvJERvUw51VwhXb9dMtjoL nS7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=PEusqV+iSam5oPlEHJm/4+oO4jkqYDYbQ2T0jjTNlWc=; b=LHLhpADFE5zV2Uark8j3Neyk2Xb6S6h8KbtBIYSyuyoVNqOzVZtHsdEjgyR72LTv13 L0XkfUkKKXVZ7vx25tPwq62j/Z1sJLotAnZMUrGufCQOhw6kjYCZ/gwWtHbF1a19jgSS ikHL7DSgDBS4RAf4ait2uh7drRiu6qTFOsGCx3lmZT2vcEk1bp9KUMux7glE82KQzp+P 5QYCnry2U9ySi30maLgHmuRiXwZkE7C7CuRSgP1dCD5l5pSHROr7h64jxRYk7s4sG1Z1 uZQb5Bkd2nmuQgv/boGDrg/59txijuWFR4rQ3kdyam1bfcdWceb4aZ23w6tLc/K3GsoT QIaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UHSlJRZw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k37si678662qte.71.2020.02.25.23.39.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:39:48 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UHSlJRZw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIJ-0000JZ-QN for patch@linaro.org; Wed, 26 Feb 2020 02:39:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45857) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rI6-0000Hr-VI for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rI5-0002IP-Ur for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:34 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:50835) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rI5-0002CQ-NB for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:33 -0500 Received: by mail-wm1-x333.google.com with SMTP id a5so1814110wmb.0 for ; Tue, 25 Feb 2020 23:39:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PEusqV+iSam5oPlEHJm/4+oO4jkqYDYbQ2T0jjTNlWc=; b=UHSlJRZwFm811dsIW88A4qrnuIJbq9kMI5j1TQh72MfAi7u9BD28PA/1pRH90KPIrk CsZLqW162WhSw0hCsTwF+tFa9/Ss52JOjtNmy0hk//tfERsBRLhf0OhOjZh+3P1Ys9jv C4F4m9xo9wZoGCQcgsZebdx6i+cZiaaNi7EQkWdlY01BWT28YJ2Chn5ygovpZ19saNb4 RXs8YSxZywDheSIZrhCPBRXnUkAsury3iTpiL91TdKdUOf/JBq1ngiU49ILgOe+DW8vV zqfmjWZVOBltLXqbV5532LyLqMQycLl0jcV/uOgRPdJDc7/tVke/DqJZYnzqiLce2ZaC +94A== 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=PEusqV+iSam5oPlEHJm/4+oO4jkqYDYbQ2T0jjTNlWc=; b=lzfZt7LDsiXiSYwTRG1ch5ZfkJ+lKi9+RQjRIqQ4HkRamTmNhB2l+Bb3Rzn0S8vKF5 YkBmnYQHH6Cxl76kRTd4e4hWdY3+PMwzCqwdKJoAb/2/j4rDMUS2qgFMUTHr79wlIWIN WkuzUkXXqmxtvrd9E50s13H9y/3tuAe/R2Knk7MoCjhA0yIPgEjQ+vaHAPJQrrBaFTLL c2rdhTRdF0gbdgwo9P7N3yn2nIW6i7OWB6WKykebwYd8Llfbza2UgSLyvKrGOfPKvt36 +N/pj82fRTTcb5QA5WPHCG3R20kdLw2btqXR+xjRQ0xKM9ksZY9xNUeeVMP6VToXsYIR +b/A== X-Gm-Message-State: APjAAAUfAI6FsgwGf6Upk2u/tQ6cNj/MoSaYMtfS1WLBHVAZYFqNaNBh 6ycXxMTWl0iShttYsidJXUU9zQ== X-Received: by 2002:a7b:c19a:: with SMTP id y26mr4010388wmi.152.1582702771855; Tue, 25 Feb 2020 23:39:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y7sm6732756wmd.1.2020.02.25.23.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:30 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 58DD61FF8C; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/19] tests/tcg: include a skip runner for pauth3 with plugins Date: Wed, 26 Feb 2020 07:39:11 +0000 Message-Id: <20200226073929.28237-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 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: "open list:ARM TCG CPUs" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, Robert Foley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If we have plugins enabled we still need to have built the test to be able to run it. Signed-off-by: Alex Bennée Reviewed-by: Robert Foley Message-Id: <20200225124710.14152-2-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target index d2299b98b76..71f72cfbe34 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -70,4 +70,6 @@ pauth-3: $(call skip-test, "BUILD of $@", "missing compiler support") run-pauth-3: $(call skip-test, "RUN of pauth-3", "not built") +run-plugin-pauth-3-with-%: + $(call skip-test, "RUN of pauth-3 ($*)", "not built") endif From patchwork Wed Feb 26 07:39:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183890 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2787446ile; Tue, 25 Feb 2020 23:41:17 -0800 (PST) X-Google-Smtp-Source: APXvYqxyuMqfPYkX0vj9W23JToiDAu4adjeOtvoRJQ8KQVwyYeWJErbZTUIrlpvikJE92+j+GnrF X-Received: by 2002:ac8:7258:: with SMTP id l24mr3529360qtp.154.1582702877014; Tue, 25 Feb 2020 23:41:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582702877; cv=none; d=google.com; s=arc-20160816; b=Rk4UJ09cEb4Zc5gv1V0osd/R7Y1KSreCvp7qYN/psrDEoxiEabubUlKrc/HPVXSln9 1x+ssMXpmpRp3q31nuvHB84kX1OU8QvMRs3oLX6890vBMDCGvw0qb6T8fUJfhjDUsvlb ZohwuiSkyPAss7tXmFTwAqkY3yFUxPK2Zu/veV4LxerUNxD4whVFCkKEfQUrzhEmynr5 0vWV0u1Krxc/LGbX1B3ptY3rVbHHCO+QFVwtHShcBuhzO9h/xMa2VLI28KzLI8htM1J8 iPjeXgBH7lxO7d+N8YpeSEkETUTqse2bta6CUa11Nc2mI2+BA07nXbMahtd714cp+1hI DXaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RMi+1In6gKc2w24FR1knTLNeyasOeUhkZWRlN7yyp1c=; b=0zfxfEdqo5iUiicDO6o54Kx7WyPMPJWB0iDWBQdg7kdSNzuxEI18KUfz0ubdGrGZz8 0YH0b9sTO60YemMxgdRJzQNcxc342uCOKJ5z6+GLnGLNHipvo9mJ1EUDzz97dq4V8vTw AL9mzaT2WZi4L6o0URmw/ucB7Kc4MAkdmyIOMoaSfe1/P+hLg8kw+oP1eFEf1L6NExKZ Sm3n/2turkT8fMSoRnTYFEqIb7erNzQWnKwlhmapHhxSG1U29wdLDBfS0pjy8qS/zeWC xdWtBWL8/bRmPB/Pf9LV3dyOe3biQhfYerKL3PPFLN1eK/3lHmElCwVaDbrZqjomD7n1 lsXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ndssu5kA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z194si608378qkb.131.2020.02.25.23.41.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:41:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ndssu5kA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rJk-0003mJ-Hv for patch@linaro.org; Wed, 26 Feb 2020 02:41:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45871) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rI7-0000Ht-6U for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rI6-0002J9-Aw for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:35 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:38938) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rI6-0002Fn-5J for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:34 -0500 Received: by mail-wm1-x32b.google.com with SMTP id c84so1839906wme.4 for ; Tue, 25 Feb 2020 23:39:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RMi+1In6gKc2w24FR1knTLNeyasOeUhkZWRlN7yyp1c=; b=Ndssu5kA9Hn1ME6ZaR1HV3UlE0UmZPW6ra5skiyO1q2YkoiCYvIvgPFLqe9Jj1QMFt 1tF1+Phl3i1TUHJUvAIgzTVf6mL+qaTCgsmaeyyMduP+3GTt9aAsNWGGSu+EdVWNm164 UkpsLqVAHzv/O7XutsRWCOsYtfrq26GiaNSoWS8z5pp3Knym85ONqdy7LwbyHxgrIPFJ FPzbw8krXKpLhjgPLQEFmUG1jrb2SviFRvJ4fSGKkG8D8v9sBj1wWCcUjzsyTFd65XbR KXg34KqPdoDUQtUU41WkKxVEsmnq1ihhJWjjDT8wDH3m95yTzWcbGUNoB/IYgTtW/ez/ iFEQ== 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=RMi+1In6gKc2w24FR1knTLNeyasOeUhkZWRlN7yyp1c=; b=CeUWu7wztti1Gy9c6WlDk9j9kT+16JDyQYjkaEkvO24+0pdTSULR3aaBGW7GxJ3YQv EzvqqRiICUxkxL9J9HUtNiUPJLiZ9Wg0tvt2wMp8ijWmgoCh+CUaUDJK5riQoIFC5zsZ l7EOoJ2Mp8mzJ3zS3DNOfe5h7vTYi6KuqiTWnZjeNjcimBEn2FeKVyi+cuRb7wFZHjvQ /goSB9MGimfNddsUY978NBTUyf7r/fHlNYI7AjqTLiJmTAWrsXIIRgcXrGolh62eSm7U BetdFl2D3pB/EqbeOvikMCNiTrOo56HWQ+gOLpdmFvVjlCbHMw0GLE5sZEBl6p4GiDmF kG+Q== X-Gm-Message-State: APjAAAXeYKijGBSVXGLnnvCMeg2KdmZ10oVJpGm9pzEglUtE+CoWyfqX KQCHDmQuUdYkPS/Lb1R/eyD+EPlOeRU= X-Received: by 2002:a1c:e0d6:: with SMTP id x205mr2559469wmg.29.1582702773004; Tue, 25 Feb 2020 23:39:33 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 133sm1832715wme.32.2020.02.25.23.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:30 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6CE091FF8F; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/19] tests/rcutorture: update usage hint Date: Wed, 26 Feb 2020 07:39:12 +0000 Message-Id: <20200226073929.28237-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Although documented in the comments we don't display all the various invocations we can in the usage. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200225124710.14152-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/rcutorture.c b/tests/rcutorture.c index 49311c82ea4..e8b2169e7dd 100644 --- a/tests/rcutorture.c +++ b/tests/rcutorture.c @@ -413,7 +413,8 @@ static void gtest_stress_10_5(void) static void usage(int argc, char *argv[]) { - fprintf(stderr, "Usage: %s [nreaders [ perf | stress ] ]\n", argv[0]); + fprintf(stderr, "Usage: %s [nreaders [ [r|u]perf | stress [duration]]\n", + argv[0]); exit(-1); } From patchwork Wed Feb 26 07:39:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183891 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2787477ile; Tue, 25 Feb 2020 23:41:19 -0800 (PST) X-Google-Smtp-Source: APXvYqzw1l4zxzt1sdYdkm+FiKKBkt4WjtKsvN9towhImNHk80GEAwoPLWMvTIjU5tEaEIMRnTJR X-Received: by 2002:a37:4a11:: with SMTP id x17mr3818794qka.379.1582702878969; Tue, 25 Feb 2020 23:41:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582702878; cv=none; d=google.com; s=arc-20160816; b=09rf4kUNosHX7lJgHBGCg0dk/bJBfhM7AcbaRDn4wsbye6txAIvbN7PIKClHIHV8uF W4451B8cUJUFoBSaWXSk1+tm8MXav4unR5TD6p8HzPFgmajWldSyBeC0GOkBMGfy6tyO 74l3LpKgMewUpLI30Oyxpiq+AlX9Iedu9AImuE5prPS3VEJnE9c7X1zFO8rErJGpjw5M WoqdagkqzWADRQiofMLd0F6DLFhpblnv94cc5rnZsiPXDgIiIXitZeyJ3ogyL/tj1FEG JMexiqntfELHpZjrthZd0oLgRsB8hXWMCi0aaBCgg3tGAL59OVYIPfShGOxcSi3SCkPt yANg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=S8rlQzQx2BTIEiZ1sv279qV7IyK6QViRdYXPZhA7VgE=; b=h1E7rADMTR9kMFi6UB7wdyiUjWvpWJGmlOlxoKBsjMQIUiWhy8XUDvZ5bpe8Zwiu7U dXHphkNyVKtgT72eOx7puG3r8cwMgbHX2ubl1VY0pAYn7ZFRqIvYqy48h6OmsyIlL5mu FBHO9ZoBDw9jHxoX6KQ1L3Vknl8vhz6qp8StpON9y5wTedZmx5275ggVt9Elf6xUFEpc 1Ln/Kqszr/crYOwiAv/gDLxfnxG3QpQVkd4FJ+rvoe2EOWfsdLmV4sFhNcIY7csl14MW udhrcx5plpBMMYEBcc88RMkS0zh0EOob9j48itFrVZTW0OUkG7QR0fl3nzgg93rr1PIW 5t3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fSD7nClc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q10si545070qvo.107.2020.02.25.23.41.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:41:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fSD7nClc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rJm-0003tY-EP for patch@linaro.org; Wed, 26 Feb 2020 02:41:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45947) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rI9-0000KH-T7 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rI8-0002Ov-Vq for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:37 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:37115) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rI8-0002MI-Px for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:36 -0500 Received: by mail-wm1-x330.google.com with SMTP id a141so1056837wme.2 for ; Tue, 25 Feb 2020 23:39:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S8rlQzQx2BTIEiZ1sv279qV7IyK6QViRdYXPZhA7VgE=; b=fSD7nClc/i8ZjlwD0+V/q4PXpYDMaOLMmA2WeBceP9IYvx1lkocTnLtEWnvZM1LKrG WOZTss8OP1SiSiftsqR0GkAhZM0guX8eVLq6XXX2zeiZSXJNDbZ7ZJ2/AL4orJkvQNu9 B7EJV1b1q3My/IztsJXCc3RpBycyXCvUnt43phKym3uItWnIJTroA8GSX4wO9xoEiGj2 GCeTUw0O1Rzjgro0xWdwRLlrOaJohVsjA4wjBmOM84c8x+d60Cgjxog2Mxxb5gGknBIL Y7AaPJ+XUwtOvFCK47MiAJ5t3sziw+sEJTE8jH2JmCT8hag8IOY/RiJqORqy9edrVJJb 7ITQ== 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=S8rlQzQx2BTIEiZ1sv279qV7IyK6QViRdYXPZhA7VgE=; b=H4btwZ7buF2VI2fEORELc7iSYWdDn8W5nCxsjBo+fqp9s85VLFjcMhyEAyegQQr4H4 /IJpGID1quagCC3W2glqcytgzWP64k16lKNgHGXd37gtcU9qmkDKZTPfSCawAr/bQ5P5 LeZvZPS5hk7YBPfe638ZFzJS1xZtPJAh7zbE9W/hbnxMrU/HfuZjoRDojoeM39VIRo1c bRNF+nTV54Gakbel03Ph2PnIaRriCenPyIKHX9k+IKQAiaMoTxL6cNbOryIhRPi4b9sw 2SD6EHwzVBtQQ8xvVoB44E4KBx7r5TXzA8reKiAC5OM5J+qqLJE6nitagiOO/9zsoPyD l06w== X-Gm-Message-State: APjAAAVNZRh6J1JD+NomxcukodecPYVzkG4Ayh7E7kHFREAv0JdaBmkT WfRL/6CvL/qdApR4luaSLPjyZesCvkk= X-Received: by 2002:a1c:1f56:: with SMTP id f83mr3757321wmf.101.1582702775768; Tue, 25 Feb 2020 23:39:35 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 12sm1725979wmo.30.2020.02.25.23.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:31 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 827971FF90; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 03/19] tests/rcutorture: better document locking of stats Date: Wed, 26 Feb 2020 07:39:13 +0000 Message-Id: <20200226073929.28237-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is pure code motion with no functional effect. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200225124710.14152-4-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/rcutorture.c b/tests/rcutorture.c index e8b2169e7dd..256d24ed5ba 100644 --- a/tests/rcutorture.c +++ b/tests/rcutorture.c @@ -65,8 +65,6 @@ #include "qemu/rcu.h" #include "qemu/thread.h" -long long n_reads = 0LL; -long n_updates = 0L; int nthreadsrunning; #define GOFLAG_INIT 0 @@ -78,11 +76,20 @@ static volatile int goflag = GOFLAG_INIT; #define RCU_READ_RUN 1000 #define NR_THREADS 100 -static QemuMutex counts_mutex; static QemuThread threads[NR_THREADS]; static struct rcu_reader_data *data[NR_THREADS]; static int n_threads; +/* + * Statistical counts + * + * These are the sum of local counters at the end of a run. + * Updates are protected by a mutex. + */ +static QemuMutex counts_mutex; +long long n_reads = 0LL; +long n_updates = 0L; + static void create_thread(void *(*func)(void *)) { if (n_threads >= NR_THREADS) { @@ -230,8 +237,9 @@ struct rcu_stress { struct rcu_stress rcu_stress_array[RCU_STRESS_PIPE_LEN] = { { 0 } }; struct rcu_stress *rcu_stress_current; int rcu_stress_idx; - int n_mberror; + +/* Updates protected by counts_mutex */ long long rcu_stress_count[RCU_STRESS_PIPE_LEN + 1]; From patchwork Wed Feb 26 07:39:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183889 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2786270ile; Tue, 25 Feb 2020 23:40:02 -0800 (PST) X-Google-Smtp-Source: APXvYqzNmA00QVttuypIv0nS+txbBL4NAH2TqXCExcDmSwtaVj/sL9O/f7GOPHavgBYwzmAelLx4 X-Received: by 2002:a0c:c24f:: with SMTP id w15mr3686872qvh.66.1582702801955; Tue, 25 Feb 2020 23:40:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582702801; cv=none; d=google.com; s=arc-20160816; b=1G6MqVzbWYxDuOrC0wJIjHQNtc3N9rzyNzuy/VqTxAy0hjBDRFoybzKpNDKdNwZl/c 54/bb6juguIkgJBzEPMBQaoXTRDd4LjCGOrXwMpTdzbB1u/AeAXOPCU1Utg5KnwXEKU/ cuTaftnW9uCOFr/TSCqKjpaV5N6CrGDP0ZYeTDJW6E2D9/UvqvFaopxtCxz7+TIFczMn G43RxhaWzES3F9PsH0d48QFY5kr+t2I1gDMW0p091RaXpTXVdedoU2gLYpJlUSOmYHke 8HfKrn0/bCI5GEKgaPMAqRcBY+hpNjhHa12xzksE7En9VsZT9XgMDnaDJwSkAYDIuTP3 zW7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=DS6xjOKuBaYBf8IY/DbbV4aFTgu3v5e6SUEcryP0kGA=; b=V5h66aklOiZEPqOMznj+rvIFAYJLdFnL68GEznXttsLCTTZaUu+dPyI38aIUh/4g6z 3B+a7la1b/0eA43KLFKIFda9xP47od8P6Yrq3cKi0hr+enGpbqaIUV6kJU5bcuLW9zHC d/oqRbDeSnQ6yPQJTSb9YjvrpnWET+4Bi8S3ZE4lIYGWvjwviySfwYpkn+4R70nm4Fou 6eAH3lP/TwOMJ+8IgoJvRb1+IWxVy5NzrKDfCHTaBTZeyVCzoiaoanlK0M8qh7+9vFG8 hWUzGwnAy2KXF/ME1hE9rAlZqMP1mKOi05KSq2K+0jkUom4HYGhE7I8Pm24G/oCHXJ3A HjKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gLLGSDTc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a12si548256qkn.155.2020.02.25.23.40.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:40:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gLLGSDTc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIX-0000hu-DO for patch@linaro.org; Wed, 26 Feb 2020 02:40:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45991) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIC-0000TN-8W for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIB-0002SS-0f for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:40 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39713) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIA-0002QU-Q8 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:38 -0500 Received: by mail-wr1-x444.google.com with SMTP id y17so1663912wrn.6 for ; Tue, 25 Feb 2020 23:39:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DS6xjOKuBaYBf8IY/DbbV4aFTgu3v5e6SUEcryP0kGA=; b=gLLGSDTcVPsEOO9YdO14Awcr1DRUGgWkLTDsKhbNl1pDBpVlAh6CKp2IZgxgsEKn6A 5P57UXvTs1GwkZA8E8hbaO4fehiDr2a7NLHNrqk0lDCpqx8fLRSdQ8gImYU2FXxQVu7j 6u2t1kjidrT9OgpRVDafQ3ZHIFEuW06Dj+rsfP9gvPsSvu6fMk7JjOHobZvRttUoMk3t PBRIcL9dv/85UKZtS+SLZ5zh1kL1PkIaTKsLZNzZHGMe8kJV0CYqPi6wMjiwEG1UZi9S Wj3v8w66c2nPlBBBs4uTrOip0+Sp12JgURJ8vXB61QPddu8CeybUcY7pmkC4kN0Axbl1 n3Gw== 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=DS6xjOKuBaYBf8IY/DbbV4aFTgu3v5e6SUEcryP0kGA=; b=ZvgVHJNnSKdP0akvhyP3AWoVCQFKedoi/DTBdHPGJ0/Gr2fPEqV44ShbEVD8n+DuKS AqnCSDh8MhFNC2P11wVxOWbZ9jqQGRz8Tr0uMImZ9RaX96g1JcjgqN16cEVXzRwaeQmP NkBTPSM/B2awExN7AZvhpxQ2YnYtydvRpdlc5AVVxsg+Q+6j1UzzFTtRKBxKz9dr/Dzi SYnhzmrlnoLwoXr2Gs7e9ZDe1PkgI3HDhcB4p/sma2BqJx81tTG09NjSBNpEgO41fEjO sSdbbeaU7lCiV6HHZeTE5Spvauskrg6zXbOGBM43D73YQir9nT1tTM/DNny22UWM2bZY RUww== X-Gm-Message-State: APjAAAVWKQ+JVbhXUX8LINt3jJfDts6KSdQybmLJPyTdsVAhtpPC054R 4HsIDM6e3c1hO9+wpgORSYkWyzzW/eA= X-Received: by 2002:adf:eb46:: with SMTP id u6mr3860681wrn.239.1582702777780; Tue, 25 Feb 2020 23:39:37 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h128sm1795507wmh.33.2020.02.25.23.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:34 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 97F3E1FF91; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/19] tests/rcutorture: mild documenting refactor of update thread Date: Wed, 26 Feb 2020 07:39:14 +0000 Message-Id: <20200226073929.28237-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is mainly to help with reasoning what the test is trying to do. We can move rcu_stress_idx to a local variable as there is only ever one updater thread. I've also added an assert to catch the case where we end up updating the current structure to itself which is the only way I can see the mberror cases we are seeing on Travis. We shall see if the rcutorture test failures go away now. Signed-off-by: Alex Bennée Reviewed-by: Paolo Bonzini Message-Id: <20200225124710.14152-5-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/rcutorture.c b/tests/rcutorture.c index 256d24ed5ba..732f03abdaa 100644 --- a/tests/rcutorture.c +++ b/tests/rcutorture.c @@ -230,13 +230,12 @@ static void uperftest(int nupdaters, int duration) #define RCU_STRESS_PIPE_LEN 10 struct rcu_stress { - int pipe_count; + int age; /* how many update cycles while not rcu_stress_current */ int mbtest; }; struct rcu_stress rcu_stress_array[RCU_STRESS_PIPE_LEN] = { { 0 } }; struct rcu_stress *rcu_stress_current; -int rcu_stress_idx; int n_mberror; /* Updates protected by counts_mutex */ @@ -261,7 +260,7 @@ static void *rcu_read_stress_test(void *arg) while (goflag == GOFLAG_RUN) { rcu_read_lock(); p = atomic_rcu_read(&rcu_stress_current); - if (p->mbtest == 0) { + if (atomic_read(&p->mbtest) == 0) { n_mberror++; } rcu_read_lock(); @@ -269,7 +268,7 @@ static void *rcu_read_stress_test(void *arg) garbage++; } rcu_read_unlock(); - pc = p->pipe_count; + pc = atomic_read(&p->age); rcu_read_unlock(); if ((pc > RCU_STRESS_PIPE_LEN) || (pc < 0)) { pc = RCU_STRESS_PIPE_LEN; @@ -288,32 +287,52 @@ static void *rcu_read_stress_test(void *arg) return NULL; } +/* + * Stress Test Updater + * + * The updater cycles around updating rcu_stress_current to point at + * one of the rcu_stress_array_entries and resets it's age. It + * then increments the age of all the other entries. The age + * will be read under an rcu_read_lock() and distribution of values + * calculated. The final result gives an indication of how many + * previously current rcu_stress entries are in flight until the RCU + * cycle complete. + */ static void *rcu_update_stress_test(void *arg) { - int i; - struct rcu_stress *p; + int i, rcu_stress_idx = 0; + struct rcu_stress *cp = atomic_read(&rcu_stress_current); rcu_register_thread(); - *(struct rcu_reader_data **)arg = &rcu_reader; + while (goflag == GOFLAG_INIT) { g_usleep(1000); } + while (goflag == GOFLAG_RUN) { - i = rcu_stress_idx + 1; - if (i >= RCU_STRESS_PIPE_LEN) { - i = 0; + struct rcu_stress *p; + rcu_stress_idx++; + if (rcu_stress_idx >= RCU_STRESS_PIPE_LEN) { + rcu_stress_idx = 0; } - p = &rcu_stress_array[i]; - p->mbtest = 0; + p = &rcu_stress_array[rcu_stress_idx]; + /* catching up with ourselves would be a bug */ + assert(p != cp); + atomic_set(&p->mbtest, 0); smp_mb(); - p->pipe_count = 0; - p->mbtest = 1; + atomic_set(&p->age, 0); + atomic_set(&p->mbtest, 1); atomic_rcu_set(&rcu_stress_current, p); - rcu_stress_idx = i; + cp = p; + /* + * New RCU structure is now live, update pipe counts on old + * ones. + */ for (i = 0; i < RCU_STRESS_PIPE_LEN; i++) { if (i != rcu_stress_idx) { - rcu_stress_array[i].pipe_count++; + atomic_set(&rcu_stress_array[i].age, + rcu_stress_array[i].age + 1); } } synchronize_rcu(); @@ -346,7 +365,7 @@ static void stresstest(int nreaders, int duration) int i; rcu_stress_current = &rcu_stress_array[0]; - rcu_stress_current->pipe_count = 0; + rcu_stress_current->age = 0; rcu_stress_current->mbtest = 1; for (i = 0; i < nreaders; i++) { create_thread(rcu_read_stress_test); @@ -376,7 +395,7 @@ static void gtest_stress(int nreaders, int duration) int i; rcu_stress_current = &rcu_stress_array[0]; - rcu_stress_current->pipe_count = 0; + rcu_stress_current->age = 0; rcu_stress_current->mbtest = 1; for (i = 0; i < nreaders; i++) { create_thread(rcu_read_stress_test); From patchwork Wed Feb 26 07:39:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183893 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2787669ile; Tue, 25 Feb 2020 23:41:32 -0800 (PST) X-Google-Smtp-Source: APXvYqyY++TDQaR5y9+GKaEebCUNJCfZ4ukYZtJj5jChlkZCP9dEZ/Lkq+8/vTjAJSPbHZxWOabv X-Received: by 2002:a37:4a46:: with SMTP id x67mr3328754qka.160.1582702892073; Tue, 25 Feb 2020 23:41:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582702892; cv=none; d=google.com; s=arc-20160816; b=CyltxV3qrpaXm1nS4nzhfqYd8Dwd3wsnzLJQ8NrC7ETHAJ/2zLUoRmKZ1CUbpYrDpJ +N+o0A5LB5BeaLVw2yY9+J7ctdQlZz5D2P+H+NPTL0nTAqZT00Cf9k/C3z0QTN5SfJDD FIEKRdXyqhEtGoG+49+HA6pxP+arAOblgCfBs1aLADYiA4AOoYFf3M3JonxEcaeYRnGA vvP/RspDP1wlATrt0Lk22LEtFWb7YT7n9xWyhK0LolD9z9/vYMnypyS+QgWLiCu/OfqY h9G0vcbLsNZXLgeSAz3Eq6f/QvIO6CIU+4JInZ6ml62Z2dTyQZ3MMvZpH31zfOL1sa9V 1dqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=fEux3C8dPQzhl755PYr6wGLyazKhJKG1reOpV5ZGmJE=; b=06Er/41N3qkMqGUcEakKg8DOw9x+IhV2ozK2sj27bjXHlBzububTPVxsvi8e6wVs2B BMCaQbyh35T8IFi22hQm1g90QAtpkmwc8x2eenXvdHJaZGzSoocoHlHrT1FMCBjBtUSh 1ziJRmzUVr2ygI/1IGdw3t/FCC0yBjir1smyJS2LN6uOzL/4o/aLtNZggLTIVksGuIZ6 Ql7wIErqxGFDA4xDU1s/k6F5txpnSr+pvFPgBIekJtBaN6tkaHVkuOFWmPsVy/vjG+W/ 7/MwdOqGodxKleN7f3JlqBidmlZwSeiDw0m9HO5dLqe6DRXCVBIkH5Xa0X/e1LyCCiF5 rQow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JYaue9JG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h18si684823qtm.356.2020.02.25.23.41.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:41:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JYaue9JG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rJz-000456-Gw for patch@linaro.org; Wed, 26 Feb 2020 02:41:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46044) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIE-0000YM-1d for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIC-0002Z8-UK for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:41 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIC-0002Wm-N8 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:40 -0500 Received: by mail-wm1-x32b.google.com with SMTP id a141so1057021wme.2 for ; Tue, 25 Feb 2020 23:39:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fEux3C8dPQzhl755PYr6wGLyazKhJKG1reOpV5ZGmJE=; b=JYaue9JGgPvAkCai5358caVIMV96olUNvjQEZJmKUzam8yrAtOlORdXG8B+5eAXamN vN7mqUCECk1ivwtYyqRpHMqd6XUd0snb4m8PyDB6JXCq2j1UqB1HSPB6cHb1GB8d5yvE +s3ggheIcx2PjEA8OVhGadPUEtBnrqHrHQ+5v51/H5NWyYPYJduj92pReo70k4Oo9hIj uiibinNvktblB6sWqEd0vEQs8TjjBkkdaRzfhl1pwQjlpSr/XkZQz+C00/fbEKa+T5/Y tKx3PUQrj6K1o650wpb+Q8B6Ej+KyBwaY79GEPX5GXeKpwQ6c6tyX13dDqK3F3H+8xzv AICA== 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=fEux3C8dPQzhl755PYr6wGLyazKhJKG1reOpV5ZGmJE=; b=fhf/IA4zPtmR/wufZFu8rNiM5+TA20S9t72nQuuYWYjglo6rHplqFeahM0Veh/bBnX enfkC3lh679MI8REhORZUYjcpDoQJYhGAVFlQR0f29ejJlZDpCd87Xv9UyKomlCB5cBC qnLX8X3djW+U/HKzichatemBCT0qJamMi5YHjT6D4flKF99GFrACEOPPj+YLWm6dW/Xi K4lPYWxsCEopKtT8Gv7NDLAHQyh0LaJrGNv8GXFtVQCeePNf3nU0VUki+vo/k8lB2y0H BjOn0Ho4qgnW2ETxo7v6tu0fuTZbi1maIS1AfVA0oebyluJO54E5wzOX9Jsie+e3RKUo aCXA== X-Gm-Message-State: APjAAAWlVuoJqCoGohJWaj3QZovudfTJ6SVohE6sWj8pm+j4/ptHEzTG 6s4d8GTUm/t0Zqzwe7/ySX9V3w== X-Received: by 2002:a7b:c249:: with SMTP id b9mr3820878wmj.74.1582702779662; Tue, 25 Feb 2020 23:39:39 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n13sm1781751wmd.21.2020.02.25.23.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:36 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ADAD11FF92; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 05/19] travis.yml: Test the s390-ccw build, too Date: Wed, 26 Feb 2020 07:39:15 +0000 Message-Id: <20200226073929.28237-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b 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 , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Cornelia Huck , qemu-devel@nongnu.org, "open list:S390 general arch..." , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Since we can now use a s390x host on Travis, we can also build and test the s390-ccw bios images there. For this we have to make sure that roms/SLOF is checked out, too, and then move the generated *.img files to the right location before running the tests. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Acked-by: Cornelia Huck Message-Id: <20200206202543.7085-1-thuth@redhat.com> Message-Id: <20200225124710.14152-6-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 58870559515..ea13e071795 100644 --- a/.travis.yml +++ b/.travis.yml @@ -509,6 +509,16 @@ matrix: env: - TEST_CMD="make check check-tcg V=1" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" + script: + - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) + - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? + - | + if [ "$BUILD_RC" -eq 0 ] ; then + mv pc-bios/s390-ccw/*.img pc-bios/ ; + ${TEST_CMD} ; + else + $(exit $BUILD_RC); + fi # Release builds # The make-release script expect a QEMU version, so our tag must start with a 'v'. From patchwork Wed Feb 26 07:39:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183895 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2789392ile; Tue, 25 Feb 2020 23:43:20 -0800 (PST) X-Google-Smtp-Source: APXvYqxgWnjIpbARZEDYVIXNVnwhXiEbt1H1PsX8Fmc2TwhaPv/pKW5aq75gWRZLydKDSMpJAK0S X-Received: by 2002:a0c:8605:: with SMTP id p5mr3477518qva.109.1582702999965; Tue, 25 Feb 2020 23:43:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582702999; cv=none; d=google.com; s=arc-20160816; b=lAw55nXLxd0k7ZEGaPzfeTR+nV062EY3iSam82QEYtiHsd+KiozIcY/6AMbHjIOP86 SRQs11jJpD7N5gV8GaOoj8R6PuSQzd2Ibvtx6S5JNehOtI9104QeHKqJxf7KvfC42Z4t J1qOo+pbeLsyQ6AWnGhAInzEzSiTxkHAgEaNSCc7UeZKaF3UbnlB3S1ulo/b9gPXWtqf VSWLX2U9Nx2TJvLiKU04s1BXqqr7jTmzm8ieQA9eEkJu++vR/4WN6DmZPFYPywZsY8Ts u7mlgDoy93bTcI2rwIhroLiocdYaCyeuDHVgteg0Ws41muJ2eoR0SpKiWJ1aMTilwiCM kgXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7Uw4ItqtlnV6J94gWyaqnqPadiBrMi5iC4bbotP9gpw=; b=CwFWSeanh3amYEaj6mGq5VR0KwwgWP8oYwm7dIsSqb3QzgD1zPE3uJOVMm4kalf4dB RsCp5ObTxf0UMDQam+sqXqHIW7atsTCkjFUtewDmTpuxwsAeVYu8FeVWht55jIgGyn00 yt0Xie0EcvhGaYvnB4gOKGTmNtXIAOQT8pG0w3jIEoZUHlVxISz2FjIea+cCBSIb5wem xhUPk3T70x7YrJKytnIFJqnEvVq6uvpn1R7A5nj7qP9ktQoD9z5jGiucwfJ/u6DLpBGp M/dMUVsB1IhmF07hNuyskos3jaXW8Q9yDngIGzg69BT5IPDpETFEo9dwTcN8p6mrnARY RirA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PpE5mhEr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k23si653892qtf.397.2020.02.25.23.43.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:43:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PpE5mhEr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rLj-0007bd-DP for patch@linaro.org; Wed, 26 Feb 2020 02:43:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46080) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIF-0000bY-4w for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rID-0002ck-Vn for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:43 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:37262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rID-0002Zp-O0 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:41 -0500 Received: by mail-wr1-x42b.google.com with SMTP id l5so1677806wrx.4 for ; Tue, 25 Feb 2020 23:39:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7Uw4ItqtlnV6J94gWyaqnqPadiBrMi5iC4bbotP9gpw=; b=PpE5mhEr+okJGfkCG2V7hEM8z8sSwSNs07720blNDfB2HaoTS4eUsvSkdh3EKSvUEY qZ65XNpU+kgEQT03IMzaYZpnt13zS+3nIuqniqLGbgZTZp3btwYbRImtvtXVQn5dqaI1 F28QupxgttzVP6WaJobqASefhOjwirj5dkjaXm/Xbz0pOr7W4KZTTx3zhHS84bkQa80X 9Epz0D/AL50quNGRvH6wA+uZf/24AblmEYEWGlVMuslmDS/WlnKAGj0YFv4WPqVg7oZl Z8l1ARlM5Gp2l2puZWrDHie5ETh+T37M9agBUR9gCbFCJ1DpZbOtD8J7ZyPbIDKFi033 9eew== 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=7Uw4ItqtlnV6J94gWyaqnqPadiBrMi5iC4bbotP9gpw=; b=RkxoB3gEVYbgNbKuy8j2264xVDPJUb1/e05sSJdEhHf8nI4NYJcGj09uXrGEHufMib d59AFjTL7pBfXULSIxPPtebrvwDU78YCsBNzGoT6jxmUoFM1TyA124mUVew5ykTrcVf1 ILB7bwwgyKtU+tg4fg61sdkB18gTvMSfCWwwNJXiZ5INoatvo95fg24F4MDKGYhuYRmg Ptbv/J6+41vMz+vbJeE7buFmPepBJi9nOULHvFQ0TQTmcquZJ7uMYjX6D0K7JmSR1GDF t472os+Yo2MyXi5w21Uf3mMU0C4QdzfHDfrZuIhCQS7QvxGusG61vgUH+mgzItgKC7Pl 6DgQ== X-Gm-Message-State: APjAAAWZ/QyPxwjWesEFBwiASOkk3E9A1qSNCLBZpl9GrQVx5Tesr3Ix EB6lKDGxuUsjmp7GgH8DFnqXgA== X-Received: by 2002:adf:e68d:: with SMTP id r13mr3726057wrm.159.1582702780667; Tue, 25 Feb 2020 23:39:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r1sm1992149wrx.11.2020.02.25.23.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:36 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C378D1FF93; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/19] travis.yml: Fix Travis YAML configuration warnings Date: Wed, 26 Feb 2020 07:39:16 +0000 Message-Id: <20200226073929.28237-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta This fixes the following warnings Travis has detected on the YAML configuration: - 'on root: missing os, using the default "linux"' - 'on root: the key matrix is an alias for jobs, using jobs' - 'on jobs.include.python: unexpected sequence, using the first value (3.5)' - 'on jobs.include.python: unexpected sequence, using the first value (3.6)' Signed-off-by: Wainer dos Santos Moschetta Signed-off-by: Alex Bennée Message-Id: <20200207210124.141119-2-wainersm@redhat.com> Message-Id: <20200225124710.14152-7-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index ea13e071795..0612998958b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ # The current Travis default is a VM based 16.04 Xenial on GCE # Additional builds with specific requirements for a full VM need to # be added as additional matrix: entries later on +os: linux dist: xenial language: c compiler: @@ -113,7 +114,7 @@ after_script: - if command -v ccache ; then ccache --show-stats ; fi -matrix: +jobs: include: - name: "GCC static (user)" env: @@ -297,8 +298,7 @@ matrix: - CONFIG="--target-list=x86_64-softmmu" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" language: python - python: - - "3.5" + python: 3.5 - name: "GCC Python 3.6 (x86_64-softmmu)" @@ -306,8 +306,7 @@ matrix: - CONFIG="--target-list=x86_64-softmmu" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" language: python - python: - - "3.6" + python: 3.6 # Acceptance (Functional) tests From patchwork Wed Feb 26 07:39:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183897 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2789549ile; Tue, 25 Feb 2020 23:43:32 -0800 (PST) X-Google-Smtp-Source: APXvYqzA6scaW6BNeaKBxpQSLzTYYDREjcCU80ceZENA2XLR6+KOrHnjc153pWLjdkVVDTQeuw30 X-Received: by 2002:a05:620a:13e1:: with SMTP id h1mr4179607qkl.462.1582703012383; Tue, 25 Feb 2020 23:43:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703012; cv=none; d=google.com; s=arc-20160816; b=gVzgyYgrDXeAIwTCpBmn+Od6q0bbUzOFzb61JZ9nTPNi9z33bqEmVnS1D5epNkGqYq LMLSYaWAsKURooPffv9qqw9/azd5h2N46XkLZT0uJKmv2kEBmTzOWduEVQa8xWfo8qal Jc0y5Wv39Ki2CoUFKkWO/+0snZ/3ztUfsMArZBi9sdbAMKJ4D6fOYARF53qFqu3tseCG nILONVcInhlLHBclTH0+yaQcJTTYacJkn+LDIehurpsBP+VtJAG8NYwPhgMAvy3GrOiJ lE58xpCtyaGdfYE0l67VN/JaxgOAor1DePOPUzemGeRCwrbBf05ubQRM008689XbQPFA CPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=S9pktUuhm3cFsoTdKjHqI4O8qBGSk0lfZcpYg3JOvj4=; b=KJbOH4OrUjw1ntULSMXsv5wRKx5sfZFkQB3X98qTnEcGuWChvZhCDqXeHnlvkmdjuu mb4zsp/ChFsIGconh6pviSHPovsaBz2rRBA/bK/P56b3hvR1GgzmHMyvBx1vVsJ1FNBT 4Lj1rrHI1BeP1wSWaGGavmiBmYmBwe4565ALCxrUemI6hj/AYr7odlAMxZY/gu+vVDb5 LaO9+y3d5E1ADlCmvOR2UpMfunsa/n2oECDHVV8oLD036ap9geeWTPYgjaUWkDn8gbcQ XbGbumGrxc92NoRxkPCP0K3cfaD1um8DKBXJgYZ4hkuFCGAHjUNv0ifn31LtMk8ATH8O P9yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fGP9Oakb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o11si562653qkh.136.2020.02.25.23.43.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:43:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fGP9Oakb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rLv-0007TO-Qe for patch@linaro.org; Wed, 26 Feb 2020 02:43:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46101) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIF-0000eD-TT for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIE-0002g0-Sw for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:43 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:40452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIE-0002dS-Mx for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:42 -0500 Received: by mail-wm1-x331.google.com with SMTP id t14so1834875wmi.5 for ; Tue, 25 Feb 2020 23:39:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S9pktUuhm3cFsoTdKjHqI4O8qBGSk0lfZcpYg3JOvj4=; b=fGP9Oakb3FdGXUokUWecoPpeib38CtBmH2v2J7SANeKhor+zIrPULhRwJAR3TR8A3m zbSDrtOJaUejvc4on6Gphm7RJ7DeUSsQYFZuueHu38r2tanK1PUK6BxmiA1W5yPcIVYk LV+/7AmkNcN+Q7p8Ad8B8meG/hMM7bBSK/2RR+vn9mnY3jvhGwY0khY8DrGbfJtJUK6k qNm/Fw+zVlqXCHtrJFAe4LfXp+dHw5frWTjkATSbMmoTDJ7YNDIUmBrNzJCinOOEmHMW 5F6pKzskuiM+DcMYEOBCN4nhGIgqGS9tbaWqFccTWfzp7jGEtx4Q1X205Tf8O8YPjILr 6D5Q== 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=S9pktUuhm3cFsoTdKjHqI4O8qBGSk0lfZcpYg3JOvj4=; b=YLB04L/X7huDtuS4c/I9yWIk8yaLUZl9Z1yA1XDL5plooTjhuhDPqufkZk9Pz8LprW qprG+jTjrhK6N7AOb4MsTg+NqktGzu7I+mP9BJCn0g/lxUDRsCVoobVJtdg+c+Q4vYCY /UWfndrZNbu6+sllb0HhPlXNmUdB7geWHl42IpA5/yJb41DYIU4S61lSPAlXfSvJ6CLj tIkYZxEgEph6WjkRLjD/dF/wrLz0UkpzF4iu2XpEn28kmlXuHC9fLdGXUfyQK0HuV0ZK wms5u2YNqQ8ZysMfhjT+ZYERALSnCo6Bjwi+Tqll1ZDoamK02+lJO9oPM2Pw3csPUUSc h5WQ== X-Gm-Message-State: APjAAAVyuDEScXXYD7k09mFELDFOWKmCvnO7vxai9DlR52aoqsElVEtF ESOAJ7K768qGbLU33R/Bugm6WtBVCl0= X-Received: by 2002:a1c:9602:: with SMTP id y2mr3719317wmd.23.1582702781638; Tue, 25 Feb 2020 23:39:41 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j16sm2087315wru.68.2020.02.25.23.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:36 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D93F31FF96; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/19] travis.yml: single-thread build-tcg stages Date: Wed, 26 Feb 2020 07:39:17 +0000 Message-Id: <20200226073929.28237-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This still seems to be a problem for Travis. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200225124710.14152-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 0612998958b..f4020dcc6c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -400,7 +400,7 @@ jobs: - name: "GCC check-tcg (some-softmmu)" env: - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_BUILD_CMD="make -j${JOBS} build-tcg" + - TEST_BUILD_CMD="make build-tcg" - TEST_CMD="make check-tcg" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" @@ -409,7 +409,7 @@ jobs: - name: "GCC plugins check-tcg (some-softmmu)" env: - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_BUILD_CMD="make -j${JOBS} build-tcg" + - TEST_BUILD_CMD="make build-tcg" - TEST_CMD="make check-tcg" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" From patchwork Wed Feb 26 07:39:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183896 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2789463ile; Tue, 25 Feb 2020 23:43:26 -0800 (PST) X-Google-Smtp-Source: APXvYqyCt0I2PmJGr1EJD3Jc+VSELCeDxIS6nR7I+0pk1buiaGGUIjBG7E7shWjzg6NscitbFJVf X-Received: by 2002:ad4:490d:: with SMTP id bh13mr3755215qvb.180.1582703006810; Tue, 25 Feb 2020 23:43:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703006; cv=none; d=google.com; s=arc-20160816; b=uXMQNN4RFWI1eyVpGqI2stnkDYZZvaxYvaP2Nd7h/2VIubpOfS9fYSdmIr2MSx55PS BnBmKyyzCRUygBp/xQpyFBSy1DWqBEr1LKa/DmW2BKnHu1w3303GVmdzOi2WPv9zEEIB KuR8bK5fu7JSIyo+4mlx1ka8ZfZdeiEymJNABgQClLui6yExRPuX6ne5SywB0/4uAC1D keUpxUsDPWwSnNMYQ8+YzzyrZCwn1lTmP1ZTM82MNRYUqw3Ot+6SQYYsq8QhQWqryvmM o9hv79uYmapLz5C/nM+BRLhfy+XHykROpina0UF32jp22SRDnjg6LQeCTlTy96vGlaJo MHQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=I5SVyZLmK4mKEgyCR0TafKDKBPyJxm72cVAZ/22L6J0=; b=pW5n2Y/xiV6XITGGGvsbC6e7hq+yML25On6Vxc/EQRpi9ugZ2dnjvxWXRL3fDuoRXI HEV28wzaXz1bZsiho+C90foZQ5nu5fOQDZLdUX+e44wJNfHSv89f6tux22VnMxf6gCRq /vVyZK/08JkRlu6uYh9LBtarL07t8q2E641uNx9X6/u6Trxzv1gkiIz2VWJcFMpl2G6T va4h7HX/HU9gYgsaix9B43ZYTKbWZN0BMqvChGXWfPOtLJ0Sq8WNQL7vQ4fohsHhVi/u 5mm6mdLANUYi5qnkNfwqoQ3+9s22UeXDZz1eGxw4c0bSeKnzbFbbVMnGaM3KvZc6D5nj EhCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bDlR7Yvx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z45si740280qtb.37.2020.02.25.23.43.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:43:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bDlR7Yvx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rLq-0007KB-9o for patch@linaro.org; Wed, 26 Feb 2020 02:43:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46134) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIH-0000iD-80 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIG-0002ih-5e for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:45 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIF-0002gr-V8 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:44 -0500 Received: by mail-wm1-x334.google.com with SMTP id z12so1786401wmi.4 for ; Tue, 25 Feb 2020 23:39:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I5SVyZLmK4mKEgyCR0TafKDKBPyJxm72cVAZ/22L6J0=; b=bDlR7YvxGsvJMSf7oTX1D7QQi0TIF2iihLHiST4iwwdE+qjWop88yJRgCt1IQaPuvI JW62Q4nNdu6Y4G1RWFXySlk8MX+Cbdv3WR0iTeWuiJkewo5owHCbwwuQkZCkJMAWTYjl y6glFdroYmGsqNo28XgDo1z87OrHdO4g0L2tMoOXXTpLVVTAXqtWDFKgW1mocbHecf7q xos89dsCnwlZ3QCu+9M0GG/1qrtc184JtCEdhWOqhsK+ia39VDoV8wwBxbmUaFlzYw0E gW1KrKNJ59Kh6oWcbQ+vqJi7PISUWCrSctVg4SbkfBg83xTcm8KSw/4Mbp51HcaFl/37 XjHA== 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=I5SVyZLmK4mKEgyCR0TafKDKBPyJxm72cVAZ/22L6J0=; b=jKCQvZe0BDGmSdSh0rYe6AvC/JWrT1uCax8IXTiElmPQ/F4R0BRmARqoj4fbkYEOyX V+QP/pnoAfkF+6ABuC6l73zY4xPAkcLPlbhEqpXuvFqTELJO7M5rNuHZz+/9bToNwQ+O ABka7bRbfjmQbYlZ6OIsKdqQs9Pmm+iAniLHBNTFJzlkGfVmJgfne8aZIwVzr3K6zct/ Sx14fjDOSQ4NvHZS7SLZx5n+AMCkWD3PkbckcPcf1kzk6++LxGW+OiJSGG8tLvTXnMie VAHIqT4PhuJeR8WL0hGlBQ7cqtaQtWbd0I3lRhGDB8M0vzTA2ROeFGOMImMnae3dxfN6 3OzQ== X-Gm-Message-State: APjAAAXaf7fP3CXG4F4aI9SGJ46oaCM1/gCzjR1MRaCJebk5cDrmOz5B NIrX/DaVlKHpb7Glh3AfIOLTRA== X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr3776989wma.87.1582702782893; Tue, 25 Feb 2020 23:39:42 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p12sm2092249wrx.10.2020.02.25.23.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:36 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EF6321FF98; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/19] tests/iotests: be a little more forgiving on the size test Date: Wed, 26 Feb 2020 07:39:18 +0000 Message-Id: <20200226073929.28237-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 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 , Robert Foley , "open list:Block layer core" , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Max Reitz , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" At least on ZFS this was failing as 512 was less than or equal to 512. I suspect the reason is additional compression done by ZFS and however qemu-img gets the actual size. Loosen the criteria to make sure after is not bigger than before and also dump the values in the report. Signed-off-by: Alex Bennée Reviewed-by: Robert Foley Reviewed-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200225124710.14152-9-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 index 3500e0c47a2..af677d90b86 100755 --- a/tests/qemu-iotests/214 +++ b/tests/qemu-iotests/214 @@ -125,9 +125,9 @@ $QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\ sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" | sed -n '/"actual-size":/ s/[^0-9]//gp') -if [ $sizeA -le $sizeB ] +if [ $sizeA -lt $sizeB ] then - echo "Compression ERROR" + echo "Compression ERROR ($sizeA < $sizeB)" fi $QEMU_IMG check --output=json "$TEST_IMG" | From patchwork Wed Feb 26 07:39:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183894 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2789282ile; Tue, 25 Feb 2020 23:43:12 -0800 (PST) X-Google-Smtp-Source: APXvYqwlA1OAtfn8geVPR9btBl0tSKUrLNWS2cktco4c2nkA9tp6hYqqk+CJGBosHBkA9QLud0iA X-Received: by 2002:a37:b103:: with SMTP id a3mr3822980qkf.204.1582702992634; Tue, 25 Feb 2020 23:43:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582702992; cv=none; d=google.com; s=arc-20160816; b=WReDn+3qnHWYYttMTm1Nbsds2wY9qsFHO+V7luHgqq9ruXKso8vmvVCUokorYm9+3p X6e0Ei6SqpHB7raOOvjQEyeBA1jzbQVaASqqRbFWsuWiVVh0BvsH5uyPI00CE42Ng/kO wZQnRhLOy1lBXiUiAauhQ70YU46Dw11zsCYZTX8fpi2JomjcqIPp6JFUAwV7WXXwOC3X eXnTZapPsMPuGK297+Iy6agQ9pojetRRkTMnW/9YdDSEb7mazTf4nLnCYY//kTzp37c9 3QCU2bIPo3X3qwSymr8OQUv50YTxktCHDEJf+uvcDzUgVL6hPNpUiXHlmf7iJq/I1rys 22tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ITdhJtBi+hshLd/SCnxQXLHEvNRwcFRFczk6s3Q/ph4=; b=I0z7u/Bh3SM9PCjbyPc5axnta1slQFTztb1xfxVlkPK2/Bm+rt4hrnz3aeRYd1G3Q4 nrj3/zZvZfn4ibLghdjYWe3LSToTRjPqw7C8XgvE2ysFy95AMZ4EdwelfMeegTdgPqrC MEjAMoktIkAMyGFUZQ6FYt9XZCc11yzksgE85OExSiJoxl2MxV+0VmhVz8qCy5DQ8BHv LQUe/nFD23nzxbbhsBMGeYRLxg71bN5k66RokTcNmPFitwkXVLugI5skr2+TnKG8Y/2B Q0dsf9cf0cmS1lyZgwGlqVy2nrypzmftbcnt6HizA7pITulTpWSrzGhhrFAeQzlnVerK b7Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EI45H9uE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p88si122011qtd.103.2020.02.25.23.43.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:43:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EI45H9uE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rLc-0007HB-6G for patch@linaro.org; Wed, 26 Feb 2020 02:43:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46159) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rII-0000lC-8L for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIH-0002lm-7G for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:46 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:33349) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIH-0002jR-0a for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:45 -0500 Received: by mail-wm1-x331.google.com with SMTP id m10so3890602wmc.0 for ; Tue, 25 Feb 2020 23:39:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ITdhJtBi+hshLd/SCnxQXLHEvNRwcFRFczk6s3Q/ph4=; b=EI45H9uEnDgWI4S5CYtLcxE2QM/AXkWHxkgWFx4aq/kxE57BRCVgeRqX6rQgFZ3Pv3 uBefuS+zVC6yqi2uC/BswvVQejGq05MdGKmu+IT/FjwMnvNY6MX7/dHSdZKkF+exI3Xh n/M8am4TB1Bkdhrdqpwz1Q+W+Pjk0TkzD/+MyPpgw6F2aU4ouewiPOFknoonUS3ZtYkJ Ld1+POHj47IU3vEkKZVWzUvJ0/td06BoERqF2FfpycDQ6+4QziAszXl1sYSnwpqBUUMS IFdNdqe8hY4X1MXq/csp0RqxgglrKKRBtpfbRstPYC1ite75OJvca9S+k6KiRijNiZSR S3Xg== 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=ITdhJtBi+hshLd/SCnxQXLHEvNRwcFRFczk6s3Q/ph4=; b=DqJqZivx2bmpyGRxBs6KpmLhZEytsJw9Tr1UD8hqo+UKMCmiUaUurGvvsjR3KuM9/u Cf235lvknw+SJ0H7NF+vxJXqzu3vXgl601J3pKjfyKaoeY5gvF1Ev+ak/91Qcf7yvl4B Oy8I/esyQNhKDRtL/GfvDn9jB81uqJ1DB+pHJs1ztlVEi8i+DVSNp+biXQgNFL3AFmfx PuhGfbDfl54OjtaaCTrRlwpQrHS2OPmBeaekOvKK0IkvrMaSHs1HlbN2RNTYYgp5FO+o dnmGNjXdpYYu0jprgHb7N91/o77cI/pKqS2G/D8catai7tGQl8yS+hx1B5opG0q4OsDL wx3Q== X-Gm-Message-State: APjAAAWuG5Z3aQHb+oUN0zMHQOF8visoSxCFNtHO2+vww98iutiH29F4 yXyw379jn9j0dDqmfIHgA2WANA== X-Received: by 2002:a1c:f707:: with SMTP id v7mr3777116wmh.121.1582702784044; Tue, 25 Feb 2020 23:39:44 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c9sm1758147wmc.47.2020.02.25.23.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:38 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0F17E1FF99; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 09/19] tracing: only allow -trace to override -D if set Date: Wed, 26 Feb 2020 07:39:19 +0000 Message-Id: <20200226073929.28237-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 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: Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Stefan Hajnoczi , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Otherwise any -D settings the user may have made get ignored. Signed-off-by: Alex Bennée Tested-by: Laurent Vivier Reviewed-by: Robert Foley Message-Id: <20200225124710.14152-10-alex.bennee@linaro.org> -- 2.20.1 diff --git a/trace/control.c b/trace/control.c index 6c775e68eba..2ffe0008184 100644 --- a/trace/control.c +++ b/trace/control.c @@ -226,10 +226,15 @@ void trace_init_file(const char *file) #ifdef CONFIG_TRACE_SIMPLE st_set_trace_file(file); #elif defined CONFIG_TRACE_LOG - /* If both the simple and the log backends are enabled, "--trace file" - * only applies to the simple backend; use "-D" for the log backend. + /* + * If both the simple and the log backends are enabled, "--trace file" + * only applies to the simple backend; use "-D" for the log + * backend. However we should only override -D if we actually have + * something to override it with. */ - qemu_set_log_filename(file, &error_fatal); + if (file) { + qemu_set_log_filename(file, &error_fatal); + } #else if (file) { fprintf(stderr, "error: --trace file=...: " From patchwork Wed Feb 26 07:39:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183899 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2791199ile; Tue, 25 Feb 2020 23:45:25 -0800 (PST) X-Google-Smtp-Source: APXvYqyhYKEZASHozJtO2ZZyABxrkKUkMHJYwX3HFs5G3PS6G87XKpi1eEKMdEXJBmwkcJDP13YL X-Received: by 2002:a37:4a46:: with SMTP id x67mr3342491qka.160.1582703125326; Tue, 25 Feb 2020 23:45:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703125; cv=none; d=google.com; s=arc-20160816; b=zFkf7Hz1GHWv08oPimFf1vYLIOgzJJVQwGNHy2tEgkH09XXBXbyYL3yjlRjSni5LKB d7tO46Gf7zclt9vzmntVQUD9CApV0YXil6MR/iD1qlAViIm1fKHjqY0BTM6VT46ESF3p cMky/5RUg9oEHJDHOnLG4G/OUb8vD7otZ1gctwWpB0BI7FHRtj/DO1nfqW3V9l3R0PUm 2EVSUI25MYuvk92JvQj6qhdeYdP2ZzPFkMmDXAwzjyegzOAN3c6kn9HBlvl0ltss4Qb1 VHB6YwMDhYX/m1yGMEfuCfoZq+kh7iqe0+/atr1GbBzDTS7PGaBtduJBdNNhsRWmmEAJ rBaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=mn3tZc+6oKOSCrxCoePvIC2GrhQUWPNKBtpwoHXLA0s=; b=pXxFFWo1udftCLwMaEeIqAfKDlatas1/tfKLXAdbrf+Cjy3sEUQcHn2dC8y6JOfrd2 xFW2TXwxrPxLtkuJQw6rM078s3c4GUjv9vS/TOx5NZnkATuJwfKS+geZ/fospaN4jc+C /BZbo8MZbmKXGLeejn0/Dd5lXqZSJiNA4Y7L9PQGwEUF1KKGVPNt1LEaIg6NTleTXELJ MC3MjL17EYd4sPErDXW0eIwOjDBkEg9gNlQ5eAn27nHRIkjgpbicYH7o7xzrBI7za6Ob 4LdN5b4JmxRezDgoZ5kkAY4IoCBHwwJ/RvCzHLqUsc/GsDo+0pqh3pLw0tIj0nspWm3j nYdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XpREKRW0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q10si548168qvo.107.2020.02.25.23.45.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:45:25 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XpREKRW0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rNk-0002Iw-PA for patch@linaro.org; Wed, 26 Feb 2020 02:45:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46182) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIJ-0000ou-Dd for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rII-0002nJ-Dy for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:47 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:56020) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rII-0002mH-7l for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:46 -0500 Received: by mail-wm1-x333.google.com with SMTP id q9so1780394wmj.5 for ; Tue, 25 Feb 2020 23:39:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mn3tZc+6oKOSCrxCoePvIC2GrhQUWPNKBtpwoHXLA0s=; b=XpREKRW0Di0Rk/yV8URDk3aU1r91fPOfch/W/YTPH4sbpSQSMmcpzUwl3EYc9366ab HpayAecNgnu3yEn5qWNxI/NADPtl8APRhuZ7GAU1jEt+syCWZlGwpA1ZE0VCtX53GcpT 9YG4QsPo94C17IPfI9GOKP26FTMkraFqvoTGqzr6kA6eJ7QnZtz5DaJIBYrUptS3foaO lII68SQhTbWWgtkTQ2P2nLxtuN1nOYHsAB9GojL9dUgVCCOFkg2F0RWBoOzjVn6hfnI7 0jNrgVg3bdLNbeAYuQ/9tPy4Iy8+5OJt6W4swEM5ubZ8xkKXlt+qyjE8PKXlndzS55uy Kvrw== 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=mn3tZc+6oKOSCrxCoePvIC2GrhQUWPNKBtpwoHXLA0s=; b=rke4X5nTJinT74U4IjktE9BG+soE3GZCrRyYnCL77XbeQZEQNnI7Z9K//+vOmicPUE JnstvrloRARtjiDNwAFoEgEXZkuGyEDazSBpZ/hxCtoJQXlRGWFHzS7Gq9l24wCTHKWD 5F+TMrTC8cFzXxGITmyGEPQwMenuc05ltN614qAQFy76jcWIC4j2ZeJhC2qj4i/t96aq I6+dDPmBixW3k6LLRh1SisZNpJhkXH4EPJXfNHCSMpxR/JQRROcToqkU/sNDYAlhDIC9 /gXHGP1cJ4xZv1Jcv8/ZMWtDLFeVFuEyx+raUEqdvfHBpgbhRg97AhKbRvhL+2Iq55DD ffDg== X-Gm-Message-State: APjAAAUlMchar2BcWQ1JntSG7wshIGGCxVcyFiovVso5mYII/xhCSia0 T6aRfBI1+XM+8pcS1IaKjSV1uYlNMng= X-Received: by 2002:a05:600c:414f:: with SMTP id h15mr215761wmm.130.1582702785249; Tue, 25 Feb 2020 23:39:45 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w1sm1782448wmc.11.2020.02.25.23.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:38 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 254741FF9A; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/19] docs/devel: document query handle lifetimes Date: Wed, 26 Feb 2020 07:39:20 +0000 Message-Id: <20200226073929.28237-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Robert Foley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I forgot to document the lifetime of handles in the developer documentation. Do so now. Signed-off-by: Alex Bennée Reviewed-by: Robert Foley Reviewed-by: Robert Foley Message-Id: <20200225124710.14152-11-alex.bennee@linaro.org> -- 2.20.1 diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index 718eef00f22..a05990906cc 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -51,8 +51,17 @@ about how QEMU's translation works to the plugins. While there are conceptions such as translation time and translation blocks the details are opaque to plugins. The plugin is able to query select details of instructions and system configuration only through the -exported *qemu_plugin* functions. The types used to describe -instructions and events are opaque to the plugins themselves. +exported *qemu_plugin* functions. + +Query Handle Lifetime +--------------------- + +Each callback provides an opaque anonymous information handle which +can usually be further queried to find out information about a +translation, instruction or operation. The handles themselves are only +valid during the lifetime of the callback so it is important that any +information that is needed is extracted during the callback and saved +by the plugin. Usage ===== From patchwork Wed Feb 26 07:39:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183901 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2791262ile; Tue, 25 Feb 2020 23:45:30 -0800 (PST) X-Google-Smtp-Source: APXvYqwCrauhfv2qHh1f03oeJraEwSKB7pe/crlT7kbQ2bbZ7NcHH2uy20NvGCcfZF2ucbGq9IFQ X-Received: by 2002:a37:5d03:: with SMTP id r3mr4431578qkb.74.1582703130791; Tue, 25 Feb 2020 23:45:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703130; cv=none; d=google.com; s=arc-20160816; b=ZPSuH1gwJQ4aX6tFnCyhBv4WZ7rdzq3AV/r3Au90E+6Yb9rX45x+s745y75EWDDwQv MtasWpKSnSRDA3GH5+aosaFMQIsdS0A74ESzfT/LVWFl8dEdfxAF2OG8YgSOdsXy2RCM T9+9hur/HbSVR5z3ZlHZzCibofv3oADtz2sWpGDmrLW4ao6IVljm+TaKV/ZoczCrNvKE d7Qf9H2u0KjTAcDzzmc+rqSMPFbkvDwdmvN8IzidKN43yThWx18/jrrafRw25dkCkLfB 1TEJLU4GFW40XmdFBSYTGqrLhUdVID0brlHWBf0oGd4nE6COQtMWtF9OJHVhqHH5p+bY 5GXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=YUICng/XsgVIxJigIpZDRDnzqFeTq4FmjK3Sam+uM00=; b=WdxxOPiOgRXJBpCtYEhM0HHZRtWJrp0jGBJAm7LjFjC5fE64A/geDqpTlWAUp2Q2AT ZG41lIYouZY02rjsfpYL9q0DjNEwCzrNoOzMtZvcpgkLbPctBz3r2Y9+MA/TgNV4G3z0 kxjI/GWEy6tNQ7UV6t2jJyQwA06itzYB8LXd/fOykqbb4XC4MwdILLbcqM+8YdFIq5l2 emoS1OzQJYvohNM3Y1ozvNL3yS6HTFSxdSBXz6jOA2otcyTDJJQji0ydoSwEyFwA8sny t1sS3bWE+JOuoeJhkoLy8dsMu+QQKlMq/ykUU+iGLV3PTDoufCgQrEr9gljkuMX/WGlx +QIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=g4LOowcF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 194si586102qkh.63.2020.02.25.23.45.30 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:45:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=g4LOowcF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rNq-0002X2-7w for patch@linaro.org; Wed, 26 Feb 2020 02:45:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46236) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIM-0000xK-9X for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIL-0002s9-6K for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:50 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:51840) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIL-0002qP-0j for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:49 -0500 Received: by mail-wm1-x32d.google.com with SMTP id t23so1811752wmi.1 for ; Tue, 25 Feb 2020 23:39:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YUICng/XsgVIxJigIpZDRDnzqFeTq4FmjK3Sam+uM00=; b=g4LOowcF3+yx5kanbykngFbGMizZQv+IxYHK7QsVofWqlr/OqRvyNVSBKmE5CYb6dp tuXHpollutYhQ4u1YwsGpKXj4mQ9dVYAWyVm7q1CNmkHdShhY/YUaeI/tw5c/YSPxYb3 AQtxXK//w72b16MJfoaw56PWv785lmBCEyxpDmLvEX+veMsC1K9gRGbRjWnpZ1PrGq+1 F04Zt+vlg0O/6zEwsBQrg3HQwFWf8sbZPyua4cyopxiUKxu790Mmc8Hv8aPRIDmavl/c t0gm8+nixYyZGqR0Y6GCCid1OhPf5e/pHfJN6u1sPfXBN6E5ZYRjfXrFXO9Q19EYbyJY ACGg== 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=YUICng/XsgVIxJigIpZDRDnzqFeTq4FmjK3Sam+uM00=; b=RIbV+gJxdm5nU64kIeGKSqWVNTYh0JWiWIFeztyIW12ju6DCN8cj/y0B48+LomLqdo MnE+6akeiWLqaKBTtLWS1Nxwz0f+8OXnQhM3DKus2trW0Pu/rZVHZGzwDLTMe70Byq4S YuOE4X74G28sSkf7JP1JRxe2afXfqVCZuVnuW0R52OmfD48xDJ26DwCEaQraOADkzp4F pJulthnq3OzoZUr6k2VvlWq4HtbbCDbN8yO6WoEX78xE1mZMI3LlgYTkoGaQJHa+2rMf dIbmeNwhEuWRRYKuwdoS8RhkhzJZZAjOVFfKKWY2cucyK8IV17Ffn1NLyLYP3vdJgUEA HevA== X-Gm-Message-State: APjAAAVAhdFnkn8XnerFtETfV1XYx+mQF8Bh58yavTsDH9pVfpefB+kP BI6zxWJvdDf0fo1CE4sF0IQ33Q== X-Received: by 2002:a1c:4c10:: with SMTP id z16mr3770927wmf.136.1582702787983; Tue, 25 Feb 2020 23:39:47 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m3sm2048284wrs.53.2020.02.25.23.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:41 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3A6FA1FF9B; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/19] plugins/core: add missing break in cb_to_tcg_flags Date: Wed, 26 Feb 2020 07:39:21 +0000 Message-Id: <20200226073929.28237-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d 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: qemu-stable@nongnu.org, Richard Henderson , qemu-devel@nongnu.org, Robert Henry , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Emilio G. Cota" , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Fixes: 54cb65d8588 Reported-by: Robert Henry Signed-off-by: Emilio G. Cota Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200105072940.32204-1-cota@braap.org> Cc: qemu-stable@nongnu.org Message-Id: <20200225124710.14152-12-alex.bennee@linaro.org> -- 2.20.1 diff --git a/plugins/core.c b/plugins/core.c index 9e1b9e7a915..ed863011baf 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -286,6 +286,7 @@ static inline uint32_t cb_to_tcg_flags(enum qemu_plugin_cb_flags flags) switch (flags) { case QEMU_PLUGIN_CB_RW_REGS: ret = 0; + break; case QEMU_PLUGIN_CB_R_REGS: ret = TCG_CALL_NO_WG; break; From patchwork Wed Feb 26 07:39:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183898 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2790918ile; Tue, 25 Feb 2020 23:45:06 -0800 (PST) X-Google-Smtp-Source: APXvYqysMFFEEmD5Sxeb5TG4phChMm9Hn/F9+LM2wpuVInw+58RHAMD3pZuCy8KMKhbiB7+jeElC X-Received: by 2002:a37:9fd0:: with SMTP id i199mr3900239qke.60.1582703106745; Tue, 25 Feb 2020 23:45:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703106; cv=none; d=google.com; s=arc-20160816; b=X1r/hTY/bVN5PQUiAK6yZhWIU5LTGAkSMqf9gXWRLolpYlhjmczLKoNbqjzjNrf4BX pGXE6N6378FCSk7tNNwinX5o4C4CMjSd3nO8h+WZGZff4/ckQ+4czmrbO8ofBuZaUGqZ pd4VZGcnWffKg2m3rV+T4wb0pBLohjMDAQj6/s2t1O71cEoBn+WnMH6GLey00/7cIemV rYGznKTEPdOFCg1uBoBiUys0jKMHVMgWB+sW8FLkIwi25kY0kL/DI4HoGVkZSa+KMXni Edzu+8mb0NCzPxqCKHOhdIiJ20KHG6nwXwJZnoMReizJqtNJB4pe3nyiG/wjjzZPKyhA 346w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=iKkeoZq9HbTVeGuobEg9B8HnhSc+qC4HzgVEf5ivfAQ=; b=iaCwGmEd/t5RBcxv1SOMN1uhowmHXsotGG9fDMejGmxgPNoij8Q6WqLGYZAcdIx95r MimhoGprQfl1y6vkrrxZIXfGU15vR7tHpP4mZRWhvPuZcx1d8Ax15/awYWtmfuLix5QZ 9f54iHyXawUbPYeX6aLImCEgNrY3sGGyN4ce2jh4wzz7WzZyzvC0fK2JtVjE7o+HDdZ5 u2Jzvr4cLNYaLQZttVZHJXGQw7ZcxeZcYcJMPI/hmyrHnX2qdnsB8bTuu6SBXzbyiHDb Y8pwzht+7vj9NDeYn9uKq/6kW2DUmjjDhSTEnsDI4cG62Ljhgy/8gZ6SAEz+NywEJqis BHSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jWLD05JY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f7si708914qtv.166.2020.02.25.23.45.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:45:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jWLD05JY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rNS-0002GK-5V for patch@linaro.org; Wed, 26 Feb 2020 02:45:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46260) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIN-0000zV-9j for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIM-0002u0-6B for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:51 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39357) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIL-0002se-VW for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:50 -0500 Received: by mail-wm1-x342.google.com with SMTP id c84so1840644wme.4 for ; Tue, 25 Feb 2020 23:39:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iKkeoZq9HbTVeGuobEg9B8HnhSc+qC4HzgVEf5ivfAQ=; b=jWLD05JYdzjyIOMxlekctkdIfA094/bwKSVWPOv2lOrULpfDaIn3u7p6X4LCKOj/S+ 9uRGyoJ0mt6qbsbmpW9LgkRCeEqFOC0Hn3zy3RbcDkcIro3TdMnxkwX/ssZ0AJDiLUHg zU6BsWj0VOTPOdYEdEy4NR3aapGhNuZ4Wv5re2hrejJaAAOgYOEncH0EeP3SVFQJfDZi 4YFevoCSnlKtAwrm+mQt+14RcPIW7Auv4jDHWHqZzvss4riQrek6XfZfqufXaKR+ADuX mTM8dOwl+efsUqPbvOGwdHVkn5au4Svu143xTVkxu2zY0I3qt0M9DQnxZVP/XymCJ9cf vluA== 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=iKkeoZq9HbTVeGuobEg9B8HnhSc+qC4HzgVEf5ivfAQ=; b=CCAIjLun2259GEQaqkhU2mAQMJdaunrM+tuthW3M1nxG9rn8IY8UaLiOFMx6mbMFqi k8TFFNFxqmFM60ayEEo9oAzE22Ck4aDv+eNDI3/2WphEgBbxvBlTZfUF3VAdCjOrtKDO jJGthqVTLrDs08sMZ9gXrWTEYz2L3Gisi2lhrjGIlWCxGe9wPxSt2JUgOmKBjxx8hU5p tCOWnfb4b//SabgLCbNh3NcVEXHBinezWoxtfkkEJLfTCM1iqH8zlW6YdTPzXj1iqy7i ty1XVKD0CWb6iE+pCI/8lX9oat3wS5HIQrL9jHsMr+ZurE5LJk6udatsYcaScHJacRhB 6vJw== X-Gm-Message-State: APjAAAVJ/rw5YbbLHicWFqx6zaRZsefG007HfIjLPaAwRXWCCZO88KSx l+8XXTK9LcMxZz6F5pZqSFLIuQ== X-Received: by 2002:a1c:ddd6:: with SMTP id u205mr3946534wmg.151.1582702788871; Tue, 25 Feb 2020 23:39:48 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h2sm2074201wrt.45.2020.02.25.23.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:41 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 50A381FF9C; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/19] tests/plugin: prevent uninitialized warning Date: Wed, 26 Feb 2020 07:39:22 +0000 Message-Id: <20200226073929.28237-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 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: Thomas Huth , Richard Henderson , qemu-devel@nongnu.org, Euler Robot , Chen Qun , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Chen Qun According to the glibc function requirements, we need initialise the variable. Otherwise there will be compilation warnings: glib-autocleanups.h:28:3: warning: ‘out’ may be used uninitialized in this function [-Wmaybe-uninitialized] g_free (*pp); ^~~~~~~~~~~~ Reported-by: Euler Robot Signed-off-by: Chen Qun Reviewed-by: Thomas Huth Message-Id: <20200206093238.203984-1-kuhn.chenqun@huawei.com> [AJB: uses Thomas's single line allocation] Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200225124710.14152-13-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/plugin/bb.c b/tests/plugin/bb.c index f30bea08dcc..df19fd359df 100644 --- a/tests/plugin/bb.c +++ b/tests/plugin/bb.c @@ -22,9 +22,9 @@ static bool do_inline; static void plugin_exit(qemu_plugin_id_t id, void *p) { - g_autofree gchar *out; - out = g_strdup_printf("bb's: %" PRIu64", insns: %" PRIu64 "\n", - bb_count, insn_count); + g_autofree gchar *out = g_strdup_printf( + "bb's: %" PRIu64", insns: %" PRIu64 "\n", + bb_count, insn_count); qemu_plugin_outs(out); } diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index 0a8f5a0000e..a9a6e412373 100644 --- a/tests/plugin/insn.c +++ b/tests/plugin/insn.c @@ -44,8 +44,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) static void plugin_exit(qemu_plugin_id_t id, void *p) { - g_autofree gchar *out; - out = g_strdup_printf("insns: %" PRIu64 "\n", insn_count); + g_autofree gchar *out = g_strdup_printf("insns: %" PRIu64 "\n", insn_count); qemu_plugin_outs(out); } From patchwork Wed Feb 26 07:39:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183903 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2793481ile; Tue, 25 Feb 2020 23:47:55 -0800 (PST) X-Google-Smtp-Source: APXvYqz4KfiUhmMdxcnd1OHmokvMytanXSEQ29q/1OkeqzDHFiluBbtcJWcoXMX/os9E2ihqOFu6 X-Received: by 2002:ac8:76c1:: with SMTP id q1mr3808295qtr.66.1582703275274; Tue, 25 Feb 2020 23:47:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703275; cv=none; d=google.com; s=arc-20160816; b=BqkLKJaZah7bySNaUxPgNc3AjjnEf9aAQDAhOedgZL5Y4AjS4tBOGJELHW/omfQqpK nwjvoWUk3FetpO5cgZcHFD5vy6H3OgSubTFzXVIxBI4ksWtNJrZMTLyIFlLlLmcHNEsD xRKc3k/AWYSUPpx4c3IfBYVJoZogDIidGG5GSnFI6B+vAhnzVYmazsdF4HAntgCchaxu Y0GHXR73LwG4IHPbd6NrYtJArYDStBLSJ9kNZaFmQiWFJcxzN0MbunVvurWakUrgLHPy fGRfQplIevf86dq4XehkFDLWzaa52H+vUr5zmo3/2krcDXZPapke3Sv5QO+HP2kma9Gv M5XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=kDf62Cq3SJaj+O7BFzF/D+1wJBPHwNV0aNRu09HEVs4=; b=QZAFEQ9tbUCue6ZY8Z/LFMLeMXEvttYbu4crHFymYrphfQYOyv1202caBqQzw3BETW h0yrwrH/3PEUPXEYLcDY320NLh2+aX28QQ3gYfZb4MUkwvRwRMExSudM7xiGpgNaAiEE VhSwvpiLH6kqdaoxLx0EqD18oGxGfweR0yqXl1ccda6gcRFyI1bNMcvqG2iip7MNSdCL c1LaDELHI6NnBEAlivFkNZdpLMG3mJpOxs8BL9E0OonKjVR+OsMYTi8E/0VYSHLfncYM 3JF/Si+qPOIF8z3hMFSG8cTs0/QtQ3f6BZBGeGnCEbdLDGPbQzUQMLjKU2YWuursWwv2 zLzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YTiBBSkS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t12si705757qti.315.2020.02.25.23.47.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:47:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YTiBBSkS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rQA-0006DH-Pz for patch@linaro.org; Wed, 26 Feb 2020 02:47:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46293) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIO-00013L-Is for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIN-0002vm-8w for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:52 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:38944) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIN-0002uW-1U for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:51 -0500 Received: by mail-wm1-x32f.google.com with SMTP id c84so1840678wme.4 for ; Tue, 25 Feb 2020 23:39:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kDf62Cq3SJaj+O7BFzF/D+1wJBPHwNV0aNRu09HEVs4=; b=YTiBBSkS40uIrltuUklpXCQubhJo4ikWPs2XC3h2XFByKQSRBWc3c+lBlPXwZkvmQ8 np1I1ZACVy4dbQGXV5ZUjtapUW+HQsSoiWa59M2lWw7JqX04i3jlassDAad4MujawdDo IXC5ibNngxwBCkIle3HGBKvEFENwwXvb1uIs+ipfMKhcnDQYLT7Z4cDEf6LUnCg2djgN /NT6TCP2MYpG+mUTDCoWItl8wJTuZZkEdC9W3u4LIh2s6PLasRBVigVI7tW6XGTdUxWP uhsWEySBWMbLmbRyoieTZdZLZoq/a/b4b27UKevjhfBA1uXjkyJJujlUwLMlXlEFIUWk mekw== 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=kDf62Cq3SJaj+O7BFzF/D+1wJBPHwNV0aNRu09HEVs4=; b=Ootg+zETwWFRNLOVzWlSCW8sxdnfcK72/SIBKnHvGNuT1PN7c+Cx1VKDB1dcddOndI J91JtCs00ZJzfHz3vljZCqCmqj+ZyggejBy5kKclyVq9JHqam5mMbuLF1UU8LCI05Yly xIr2i8lTUi3cmxIDZcTarm5TiNYBE2fa/XhWBWrlxqZAJ0oONBNe+GKKX45EOSISWA3/ 8mqezGDa1pd+VLb4osle7r+/U3suTCtrYrEfCo91S9FqBfyOxUwt7m7C0wfTUo1mIBf2 DojqyxeDsJ4KdcgHR28BqQUwYkCpoU/ofdj/Q1Wg/KRfnEN/+RYQW2p6UHhuLeEfAb4T oOqQ== X-Gm-Message-State: APjAAAVF9qOqZOSRJCBKLuEm+yCWoptBEsfzsb+wCuzDz//qaQJr3A84 GF65MEeshqDA8MVRFDDBRfciPQ== X-Received: by 2002:a7b:c7d2:: with SMTP id z18mr3851636wmk.160.1582702789980; Tue, 25 Feb 2020 23:39:49 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d17sm1700621wmb.36.2020.02.25.23.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:45 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 678D41FF9D; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/19] qemu/bitops.h: Add extract8 and extract16 Date: Wed, 26 Feb 2020 07:39:23 +0000 Message-Id: <20200226073929.28237-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f 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_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, Yoshinori Sato Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Yoshinori Sato Signed-off-by: Yoshinori Sato Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20200212130311.127515-3-ysato@users.sourceforge.jp> Message-Id: <20200225124710.14152-14-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h index 02c1ce6a5d4..f55ce8b320b 100644 --- a/include/qemu/bitops.h +++ b/include/qemu/bitops.h @@ -301,6 +301,44 @@ static inline uint32_t extract32(uint32_t value, int start, int length) return (value >> start) & (~0U >> (32 - length)); } +/** + * extract8: + * @value: the value to extract the bit field from + * @start: the lowest bit in the bit field (numbered from 0) + * @length: the length of the bit field + * + * Extract from the 8 bit input @value the bit field specified by the + * @start and @length parameters, and return it. The bit field must + * lie entirely within the 8 bit word. It is valid to request that + * all 8 bits are returned (ie @length 8 and @start 0). + * + * Returns: the value of the bit field extracted from the input value. + */ +static inline uint8_t extract8(uint8_t value, int start, int length) +{ + assert(start >= 0 && length > 0 && length <= 8 - start); + return extract32(value, start, length); +} + +/** + * extract16: + * @value: the value to extract the bit field from + * @start: the lowest bit in the bit field (numbered from 0) + * @length: the length of the bit field + * + * Extract from the 16 bit input @value the bit field specified by the + * @start and @length parameters, and return it. The bit field must + * lie entirely within the 16 bit word. It is valid to request that + * all 16 bits are returned (ie @length 16 and @start 0). + * + * Returns: the value of the bit field extracted from the input value. + */ +static inline uint16_t extract16(uint16_t value, int start, int length) +{ + assert(start >= 0 && length > 0 && length <= 16 - start); + return extract32(value, start, length); +} + /** * extract64: * @value: the value to extract the bit field from From patchwork Wed Feb 26 07:39:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183900 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2791217ile; Tue, 25 Feb 2020 23:45:27 -0800 (PST) X-Google-Smtp-Source: APXvYqz8HJpIZo5tqF23iZUEIxPVZcK3hQCzFV5FInfeBg48SP+BMiSNOmCjvhhvf0zlCu0lbN6g X-Received: by 2002:ac8:4a02:: with SMTP id x2mr3512309qtq.388.1582703127417; Tue, 25 Feb 2020 23:45:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703127; cv=none; d=google.com; s=arc-20160816; b=yBGu8f8nYfkg6ViCmT9AgQrsGnrdysYhqIj4bSYSSY34sfpHtU9dpc1X+oaOtvePvw Ug8qgtEwCzICaYKt2Rrh8l0byUE0/m5qoIlpys1/Kf5nYQayk8kEC/38qiOFAcg6uoKb JVwpJCV+ESEj7LqGzGvIpTfTziMYMaIMLEHYYYtJSwAKseFWgh2N+diZWhjVuXpz9/io kZPtRMLj6OHR7dT8adVQQGCejbuqkkaEQWszqhh/n/hm1b1QRGx+1fQzdPHShDpT+6rP yV3jLuuS77xmvKX6VbdP1tsYVDw0Q57mauu/a0SIYHNe7iSUwfOHaDuQkIIOMD6UZJKe 6xng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=oo1uiMU4weHOj8ZrNchtQRvpbKwMX83OT5bJ28vnSC8=; b=X10c8/lrwCJmhm1DdKF1UgrXKBjZ7up93Wa58u98xN5KdvCNX3d88HdwMGmHD2u/Qr WoWAfbbwk4GPRvgvIE2UJM8bWSWpZ+lq5RqnvXpFhbAHSoqF07KISLjRU9Vo2VmLlOqj MZOGbOUQaGSwIkBhChoR5xNWdMWyLhZJ6NBxMUjzH68CdeyuO2ql8enYIqQLAfbu0j+R CEvz0cvIvSzypq7IuOktKcJ3umpRj/3MyeqG/hiE5bQTR17Q5y9v1qFnPCe422YNq+CI RbORvQ2WWBMHInWeyHticG8X1+uDReFKbnWNMzgZk699GeyuHzCqe3gMLKVcFObwOqFV gXFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KaCA/TJF"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s76si540054qka.198.2020.02.25.23.45.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:45:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KaCA/TJF"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rNm-0002NK-Sl for patch@linaro.org; Wed, 26 Feb 2020 02:45:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46331) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIP-00016c-NL for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIO-0002yX-7p for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:53 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:56012) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIO-0002wC-1L for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:52 -0500 Received: by mail-wm1-x32a.google.com with SMTP id q9so1780596wmj.5 for ; Tue, 25 Feb 2020 23:39:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oo1uiMU4weHOj8ZrNchtQRvpbKwMX83OT5bJ28vnSC8=; b=KaCA/TJFb5BAE1nwY2N8NQTOLYCCCQBHzqiIa9imCxOo3I6GbXHhTQ2GNU1YGP7L5k DUubDlkYQoiknw13ifdFJKf+zvbyRYTaPHp2I7YvJ8Omd/j1oKahhz3RGX/bZGUUfeT7 HRXqwLIhmLIXuIdjpmj5Nz+U+8R+EuigeRL7Ulj9kswnE65tCXQFmPe/e975Z7JHIrV5 Zy029S/bW9AX6YzfC+Bd5NO00MYfiNz/UtwWzEI13UYjrhuzo/FxErqf2PZ/xIcrUOvh OEhP5ocFrlSOdYvRDnKIcUsOI9VgBq/l/P6dzfkTwXFOEIE7QBc7rbcANvMtCFavsn6f 9jhQ== 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=oo1uiMU4weHOj8ZrNchtQRvpbKwMX83OT5bJ28vnSC8=; b=Y5zYINuJWo+DGIBOElCiG4R/8+OH3CYqpCvjVPxZI+UtMaQjYzIvGF9pQtUAZoUKa9 +sQooLEiX8ikHlSudkRYKJNephAoR654JG+j5QJAWmA9Xdua7caOdQSx6VqQNegcf6kv FR1yVpgfAQwdxVkyaKUidkwNgo0NV3bFQtXeV0Ayz0GCAEJx1OfKb0vqg2NNLOjFP+ft 0H6k2UgsQSa03iNeEdu+9nPPd8NPS21PlMonvy2fFFZNLGyodiBimXPKGfreW5J4uu2A 6sPchKaOCeCaw2KIeMkQvJrAJZhtGBojwxjYBHN78C6KBtE5w+LOQwE9ijUgWWU4JKyY 0z4A== X-Gm-Message-State: APjAAAVt88MDDwWHL8p4PMHAPPePF1W1zJbmKVJR7ia8zrEW1Dwxx/4e 4OTv76DA6v0+2xzZ0CsHesA1sw== X-Received: by 2002:a1c:6a15:: with SMTP id f21mr3724836wmc.126.1582702790893; Tue, 25 Feb 2020 23:39:50 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n3sm2068217wrs.8.2020.02.25.23.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:45 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7DABD1FF9E; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 14/19] target/riscv: progressively load the instruction during decode Date: Wed, 26 Feb 2020 07:39:24 +0000 Message-Id: <20200226073929.28237-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a 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: "open list:RISC-V TCG CPUs" , Robert Foley , Sagar Karandikar , Bastian Koppelmann , Richard Henderson , qemu-devel@nongnu.org, Alistair Francis , Palmer Dabbelt , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The plugin system would throw up a harmless warning when it detected that a disassembly of an instruction didn't use all it's bytes. Fix the riscv decoder to only load the instruction bytes it needs as it needs them. This drops opcode from the ctx in favour if passing the appropriately sized opcode down a few levels of the decode. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis Reviewed-by: Robert Foley Message-Id: <20200225124710.14152-15-alex.bennee@linaro.org> -- 2.20.1 diff --git a/target/riscv/instmap.h b/target/riscv/instmap.h index f8ad7d60fd5..40b6d2b64de 100644 --- a/target/riscv/instmap.h +++ b/target/riscv/instmap.h @@ -344,8 +344,8 @@ enum { #define GET_C_LW_IMM(inst) ((extract32(inst, 6, 1) << 2) \ | (extract32(inst, 10, 3) << 3) \ | (extract32(inst, 5, 1) << 6)) -#define GET_C_LD_IMM(inst) ((extract32(inst, 10, 3) << 3) \ - | (extract32(inst, 5, 2) << 6)) +#define GET_C_LD_IMM(inst) ((extract16(inst, 10, 3) << 3) \ + | (extract16(inst, 5, 2) << 6)) #define GET_C_J_IMM(inst) ((extract32(inst, 3, 3) << 1) \ | (extract32(inst, 11, 1) << 4) \ | (extract32(inst, 2, 1) << 5) \ @@ -363,7 +363,7 @@ enum { #define GET_C_RD(inst) GET_RD(inst) #define GET_C_RS1(inst) GET_RD(inst) #define GET_C_RS2(inst) extract32(inst, 2, 5) -#define GET_C_RS1S(inst) (8 + extract32(inst, 7, 3)) -#define GET_C_RS2S(inst) (8 + extract32(inst, 2, 3)) +#define GET_C_RS1S(inst) (8 + extract16(inst, 7, 3)) +#define GET_C_RS2S(inst) (8 + extract16(inst, 2, 3)) #endif diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 14dc71156be..d5de7f468a7 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -44,7 +44,6 @@ typedef struct DisasContext { /* pc_succ_insn points to the instruction following base.pc_next */ target_ulong pc_succ_insn; target_ulong priv_ver; - uint32_t opcode; uint32_t mstatus_fs; uint32_t misa; uint32_t mem_idx; @@ -492,45 +491,45 @@ static void gen_set_rm(DisasContext *ctx, int rm) tcg_temp_free_i32(t0); } -static void decode_RV32_64C0(DisasContext *ctx) +static void decode_RV32_64C0(DisasContext *ctx, uint16_t opcode) { - uint8_t funct3 = extract32(ctx->opcode, 13, 3); - uint8_t rd_rs2 = GET_C_RS2S(ctx->opcode); - uint8_t rs1s = GET_C_RS1S(ctx->opcode); + uint8_t funct3 = extract16(opcode, 13, 3); + uint8_t rd_rs2 = GET_C_RS2S(opcode); + uint8_t rs1s = GET_C_RS1S(opcode); switch (funct3) { case 3: #if defined(TARGET_RISCV64) /* C.LD(RV64/128) -> ld rd', offset[7:3](rs1')*/ gen_load_c(ctx, OPC_RISC_LD, rd_rs2, rs1s, - GET_C_LD_IMM(ctx->opcode)); + GET_C_LD_IMM(opcode)); #else /* C.FLW (RV32) -> flw rd', offset[6:2](rs1')*/ gen_fp_load(ctx, OPC_RISC_FLW, rd_rs2, rs1s, - GET_C_LW_IMM(ctx->opcode)); + GET_C_LW_IMM(opcode)); #endif break; case 7: #if defined(TARGET_RISCV64) /* C.SD (RV64/128) -> sd rs2', offset[7:3](rs1')*/ gen_store_c(ctx, OPC_RISC_SD, rs1s, rd_rs2, - GET_C_LD_IMM(ctx->opcode)); + GET_C_LD_IMM(opcode)); #else /* C.FSW (RV32) -> fsw rs2', offset[6:2](rs1')*/ gen_fp_store(ctx, OPC_RISC_FSW, rs1s, rd_rs2, - GET_C_LW_IMM(ctx->opcode)); + GET_C_LW_IMM(opcode)); #endif break; } } -static void decode_RV32_64C(DisasContext *ctx) +static void decode_RV32_64C(DisasContext *ctx, uint16_t opcode) { - uint8_t op = extract32(ctx->opcode, 0, 2); + uint8_t op = extract16(opcode, 0, 2); switch (op) { case 0: - decode_RV32_64C0(ctx); + decode_RV32_64C0(ctx, opcode); break; } } @@ -709,22 +708,25 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, /* Include the auto-generated decoder for 16 bit insn */ #include "decode_insn16.inc.c" -static void decode_opc(DisasContext *ctx) +static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode) { /* check for compressed insn */ - if (extract32(ctx->opcode, 0, 2) != 3) { + if (extract16(opcode, 0, 2) != 3) { if (!has_ext(ctx, RVC)) { gen_exception_illegal(ctx); } else { ctx->pc_succ_insn = ctx->base.pc_next + 2; - if (!decode_insn16(ctx, ctx->opcode)) { + if (!decode_insn16(ctx, opcode)) { /* fall back to old decoder */ - decode_RV32_64C(ctx); + decode_RV32_64C(ctx, opcode); } } } else { + uint32_t opcode32 = opcode; + opcode32 = deposit32(opcode32, 16, 16, + translator_lduw(env, ctx->base.pc_next + 2)); ctx->pc_succ_insn = ctx->base.pc_next + 4; - if (!decode_insn32(ctx, ctx->opcode)) { + if (!decode_insn32(ctx, opcode32)) { gen_exception_illegal(ctx); } } @@ -776,9 +778,9 @@ static void riscv_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *ctx = container_of(dcbase, DisasContext, base); CPURISCVState *env = cpu->env_ptr; + uint16_t opcode16 = translator_lduw(env, ctx->base.pc_next); - ctx->opcode = translator_ldl(env, ctx->base.pc_next); - decode_opc(ctx); + decode_opc(env, ctx, opcode16); ctx->base.pc_next = ctx->pc_succ_insn; if (ctx->base.is_jmp == DISAS_NEXT) { From patchwork Wed Feb 26 07:39:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183906 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2796437ile; Tue, 25 Feb 2020 23:51:08 -0800 (PST) X-Google-Smtp-Source: APXvYqwnOEzBUgtlTkK2jDT8jSQqIgaHv0G8e1ZGKfd9Jm5fu/hGbyadqyO9VOa0mm842QVndNmL X-Received: by 2002:a05:620a:13b5:: with SMTP id m21mr3619381qki.469.1582703468170; Tue, 25 Feb 2020 23:51:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703468; cv=none; d=google.com; s=arc-20160816; b=HMKSdOCDqpXVyySFd1crKjwRiGdZVTDdvICjXmSJC5vNpXzobVgfKyaLhKdtx8N4Xb Bh7DgeI6oCEO5wILCIhaKe0YsIWwIEaNhGIUoJXLeL6u468ES6l/X1NWuz4m0R9k9ix4 VWJkRxoihYBp8sZPrwgl7tcUjIPvS/QzK0XwpirjGDQbeYRVvPwFC+JOup3ywy63o09H J7C21acT8/EdXkevjteMuzGLmnQgrm2/UTUDEM6D0MeD8TfT4S1BDlu8k8Du9utd3IuU K+e4f78nJ4pXEfVijtlObcgnnCwPail1q6lkjOswYcGEDLyXcxbNvjLcCkzguc7BCEGD Mv1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SKIVM/nv6pvrBs0kbqjR1dcnk9jHgbZ0MPB1gDBk62c=; b=ATRci6/Jusx49uHQJbhuFmkeZLduBkl0cA2jUAyXu493eLiqC2UHcgCF1L2pM1RWll R0vnwTZajdIt1+eBEnCjm+cWMNgJq2ieqeyT7LylLydmEbq+Ni/0uos/5y37xa15gOLb pMAynRZFk/aSroTJk1TQgmjkp8Cdi8/ycZQ3k/as/D7B6rWZUoWilPk2cfTRruLQGIZ7 9fEBvT99efTrFDxR1lFtif07bAZ+QBteKY2ht5wD8iz8HAnWhyg3sQlgRUW4AjF/u4dU c1ZKtO54Cwq2X1mpB3UcKn8pu8b3FQJhviePzeJwvSDCyDz3ys3p+Wy2pO2cHqwDh8sl zcBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CtWcg8dE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x74si532494qka.199.2020.02.25.23.51.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:51:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CtWcg8dE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rTH-0001cE-LU for patch@linaro.org; Wed, 26 Feb 2020 02:51:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50456) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rO6-0003XY-4F for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rO4-0005dw-AU for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:45 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:52413) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rO3-0005a1-3N for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:43 -0500 Received: by mail-wm1-x332.google.com with SMTP id p9so1817131wmc.2 for ; Tue, 25 Feb 2020 23:45:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SKIVM/nv6pvrBs0kbqjR1dcnk9jHgbZ0MPB1gDBk62c=; b=CtWcg8dEkhnd0+Y5sXJjEWQmwy5kebfuQzeFRbn+bEcd8p4TF65H3IOBPij1UOpYms LL7R8RDnMUpym+Zy89ZHo3S/SDD921qeqxhO+7aIOrLs7F09WQbnZx6bedwWvGmKO/UC I67y8CuK0FAFAeCdiJP9OWnQzV8XPK/NlJr2yAaIfxx8cEVoe/FCwAxadz953LKd4aqD bU1nzwR/9ym+am9ptJl1SGcZvjwVTHelos/LoBZBA1BA82WgdEFszbEq0ovw/JWoXcPM kMvR6NfDTHA/y0I2ZscSS8EOdLTv+jHXgIRytf0khKDoFBc/Zop2DzxMBCxNYGjqwVGB GONQ== 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=SKIVM/nv6pvrBs0kbqjR1dcnk9jHgbZ0MPB1gDBk62c=; b=kjfrXMxwlVotB94p2R1LBKovMP1Q7akgsagDDawoE1+dzEjKgdvPnAmhy4cEeTHaJR yhQpOorxidvyoAw6hhWaAcmj1CVrCusrYTAhI922u/1O/gHEJSH0JIwo+d8vwmLmZVrZ 0xKsGWghpDIgJr4xzsCd/0cU8rFbstBdzAeMYNFiGWllK/4WLjFrktO/b81uKooN5wi5 5ujdXWjdMKpBv1Ak6ILFDFVVpXTev1iIQ+1AGzMVQjUMv47nyXtNtwu3A1mjFWpDthwq FGcUVeCSomFYv3Qz97c+0ykBqzAEIJosB1/oBEv7jZ5ci0hESIe0hkviUIPLcUn6FCTx Khkg== X-Gm-Message-State: APjAAAUJc5nYb811WLMckEz1pt+DQLfYAnnyHcCN8LHJ9e1iYSbKKxYp anIfm6l3rLi5eQoaftt7oYrV0g== X-Received: by 2002:a7b:cb97:: with SMTP id m23mr3640772wmi.37.1582703141998; Tue, 25 Feb 2020 23:45:41 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t131sm1861721wmb.13.2020.02.25.23.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:45:40 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 920C01FF9F; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 15/19] tests/plugins: make howvec clean-up after itself. Date: Wed, 26 Feb 2020 07:39:25 +0000 Message-Id: <20200226073929.28237-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 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 , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, Robert Foley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" TCG plugins are responsible for their own memory usage and although the plugin_exit is tied to the end of execution in this case it is still poor practice. Ensure we delete the hash table and related data when we are done to be a good plugin citizen. Signed-off-by: Alex Bennée Reviewed-by: Robert Foley Reviewed-by: Richard Henderson Message-Id: <20200225124710.14152-16-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/plugin/howvec.c b/tests/plugin/howvec.c index 4ca555e1239..3b9a6939f23 100644 --- a/tests/plugin/howvec.c +++ b/tests/plugin/howvec.c @@ -163,6 +163,13 @@ static gint cmp_exec_count(gconstpointer a, gconstpointer b) return ea->count > eb->count ? -1 : 1; } +static void free_record(gpointer data) +{ + InsnExecCount *rec = (InsnExecCount *) data; + g_free(rec->insn); + g_free(rec); +} + static void plugin_exit(qemu_plugin_id_t id, void *p) { g_autoptr(GString) report = g_string_new("Instruction Classes:\n"); @@ -195,30 +202,31 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) counts = g_hash_table_get_values(insns); if (counts && g_list_next(counts)) { - GList *it; - g_string_append_printf(report,"Individual Instructions:\n"); + counts = g_list_sort(counts, cmp_exec_count); - it = g_list_sort(counts, cmp_exec_count); - - for (i = 0; i < limit && it->next; i++, it = it->next) { - InsnExecCount *rec = (InsnExecCount *) it->data; - g_string_append_printf(report, "Instr: %-24s\t(%ld hits)\t(op=%#08x/%s)\n", + for (i = 0; i < limit && g_list_next(counts); + i++, counts = g_list_next(counts)) { + InsnExecCount *rec = (InsnExecCount *) counts->data; + g_string_append_printf(report, + "Instr: %-24s\t(%ld hits)\t(op=%#08x/%s)\n", rec->insn, rec->count, rec->opcode, rec->class ? rec->class->class : "un-categorised"); } - g_list_free(it); + g_list_free(counts); } + g_hash_table_destroy(insns); + qemu_plugin_outs(report->str); } static void plugin_init(void) { - insns = g_hash_table_new(NULL, g_direct_equal); + insns = g_hash_table_new_full(NULL, g_direct_equal, NULL, &free_record); } static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) From patchwork Wed Feb 26 07:39:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183907 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2797302ile; Tue, 25 Feb 2020 23:52:10 -0800 (PST) X-Google-Smtp-Source: APXvYqz2zzXLV0tGi8fvAcE1DnIdVBXXn/25LZXfUgI+zxwGMvTO9qTa+BlLv1CZfKgahHBvqgds X-Received: by 2002:a05:620a:1353:: with SMTP id c19mr3951795qkl.114.1582703530623; Tue, 25 Feb 2020 23:52:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703530; cv=none; d=google.com; s=arc-20160816; b=MiUkwcW/Bnw7IzfUwO9tgsvRU85VOU6/uOdHvQeN84DBEC/dYsWUv9mgP1dZ0Pfq/c cndtyL1fEH9dF8fNjDjbUe9LapR+2yNj3wk5vWvrG+46gzAed5M64IkG6SPPkptzLsxg PgS/SVtP3i+Fo93WoidTQxjuADL+br+q8/ZQ3jSpoxxEWMYb6TzCf2HoLMAo8GBDR3o1 ikcxZz8RN5i4WkA1ytQPYcKfEBPddYwyndaSzjWbTIcKQMBzSl4VTvHX4m10S0CQpaRH eIPWa09ygbMxCQAYYG6/KKDBRpEbI2BgeyhTaF7ZjsOxPufjLpIT9QK/n+s+832uKE3I YadA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=10nNF8qb+H2QvWDi632eKeeQj1H6sOcPu+kVZYTtYjU=; b=K3ALbX6izsJ1clc8Fvk/SpILMG5Ry4FShNDdibJWIAalQRN0CgcxAxNdLhKrprbYeV u8UREgGNDFcGp5uJGCichldyBl6h9Y1ptTyaz2jpfmyOsvlSFhOdc69VgZCZsJ/hocL8 KPgG0nm5+pRSANJ3R+PS8hEn3246KgJXdGVNSfiDIKUEUY1Qq2wUZfnrfrxuN1LD98os acsJJ3nxbFvCuZV/4tNJQo855HE94/kmYdK+P18OIJNirh563sd9HuhRVCOm+on49Z/t g0GOxAgJvOkmrPirnKz8sWFIilvEVhgdP5xG0WqQMH6H0QvH4Eb0f1pd55SwQN8semqG CR7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jjNhNOMJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i1si708794qte.195.2020.02.25.23.52.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:52:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jjNhNOMJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rUI-00030F-5f for patch@linaro.org; Wed, 26 Feb 2020 02:52:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rO8-0003Yc-5F for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rO6-0005m0-UF for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:48 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:53471) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rO6-0005jI-NU for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:46 -0500 Received: by mail-wm1-x329.google.com with SMTP id f15so1020471wml.3 for ; Tue, 25 Feb 2020 23:45:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=10nNF8qb+H2QvWDi632eKeeQj1H6sOcPu+kVZYTtYjU=; b=jjNhNOMJtieFgDDhbSUV1+MXTbOo9i4OU39xT60eMWqpPLrxnQW34N2gfBhjD1Q8wl qQBD33rPvugcmx8P5zUjZ9TdiqJ/HhHz72UNGOxjBcUDFWH0DwuEIa7PyrfkYw6xJ9Ln yIbunqIuzkeG+xySB7US0HPVphtgmCXQuyb8bUQcj4za3hphihb4EHEhv8F8nV7Dut2T P0TViTd8wkKdDMIveKsHfiTvdqjwQQjcrLMa58dxIDr45VPhVCrhnknhGIOcBU08bDj6 wY7pKTSMD8D0ZtvD+yf7BbYe6Op/rnOs1eg0xvvrgJS2PJSg42VcBxGke6vubyDIHCEG VmPA== 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=10nNF8qb+H2QvWDi632eKeeQj1H6sOcPu+kVZYTtYjU=; b=pzXwpakj9a+6HryuAqY9G8u52YTuX2K2jLTDvJaW0q5brTnjD6Mk/VxuBUq3T4oAHk 7uyTSl8C5J/JqLdeMazb/XE25NUSn0N8B7RIdFQXSuXsaQWT/Rw1zIqz1klRmeROEIbY l9ZtuyvTDThfwNfyH3aQ/A7Z8D1I0zrNbEQov4gJP7uRXRK/Ij69o6LdHu/UNa1UFwJH wTYdtE2cQCuGcXDlYjKgEKzZZL6NQ2XxusCZs/svtEnxHeRSEKz4YFh4rxNg88P8BH5Z 0rM2Mc7VgmILRW2uShJMdGUpo4NvmMCp1PTQDN65cXI/qtjl7ZZMUx+UHlGUojATValJ 588Q== X-Gm-Message-State: APjAAAXuDBEPrnZSdnHhtISCpOR/f6DDeVYcNB+dCAAp38CX1VoeBX4J b5ZV/sFrwF2qWPTgAwj3aCmc8Q== X-Received: by 2002:a1c:df45:: with SMTP id w66mr3778110wmg.171.1582703145708; Tue, 25 Feb 2020 23:45:45 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a135sm1696938wme.47.2020.02.25.23.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:45:44 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A65741FFA5; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 16/19] tests/tcg: give debug builds a little bit longer Date: Wed, 26 Feb 2020 07:39:26 +0000 Message-Id: <20200226073929.28237-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When combined with heavy plugins we occasionally hit the timeouts. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200225124710.14152-17-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 3c7421a356e..b3cff3cad1a 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -79,7 +79,7 @@ QEMU_OPTS= # If TCG debugging is enabled things are a lot slower ifeq ($(CONFIG_DEBUG_TCG),y) -TIMEOUT=45 +TIMEOUT=60 else TIMEOUT=15 endif @@ -137,7 +137,7 @@ PLUGINS=$(notdir $(wildcard $(PLUGIN_DIR)/*.so)) $(foreach p,$(PLUGINS), \ $(foreach t,$(TESTS),\ $(eval run-plugin-$(t)-with-$(p): $t $p) \ - $(eval run-plugin-$(t)-with-$(p): TIMEOUT=30) \ + $(eval run-plugin-$(t)-with-$(p): TIMEOUT=60) \ $(eval RUN_TESTS+=run-plugin-$(t)-with-$(p)))) endif From patchwork Wed Feb 26 07:39:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183905 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2794814ile; Tue, 25 Feb 2020 23:49:22 -0800 (PST) X-Google-Smtp-Source: APXvYqzK67XJlrBYOaRlTknDxPuKJwb9fJxU4n5Zn8vMGXGZ9IfaCQzAWG+r0r86lgf+276uKDZA X-Received: by 2002:a37:4a95:: with SMTP id x143mr3339185qka.23.1582703362014; Tue, 25 Feb 2020 23:49:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703362; cv=none; d=google.com; s=arc-20160816; b=rizqhw/iWGAuWnRrsolp4KKfimUwwnVoqm3meYptD0zHJjba/7qvVD4P8RZMIxKYkR eIqaKoTBnQd6BvxnBs8rvTF+etAYVu+ItgmhRrzRl5ZDXv44jKvkeupGVfh4eHn2JZhf npM8QEyBKNV65RXll8BvFdMNBUacNnC1bxRS52FwgvPDX2MiTM0JyusuKAduEGB81yw9 R/so87vtDKx3o5HagYxF0oKHXvS+Srfr2Jbo7aTBNtWGTd9tStYIUoYUnpV+Mn9n1axG BI6bJ4OWEJQBIr5iJ5sx7i1YfDtz9SbVp0vftxCdrE5qbRp0z9y1UMj/nUG7kUcKfRrQ iyCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=yA0pga7V3rNc2E3Kn75tRyKVD9rdhZJ6PsuYJbKRcmo=; b=Y+OjeyTlS9SRJIzAZUIq9iRibkibe2EZx3ziXg3scBhotUKGMiLnYxgGp97H3sD3sE kMJtcsBEMB/bXKJx4EpOIM6IyWyTzzfhCdofncMKoZ6UiFyCrEP7wL/Cu65KaYpOZiE4 1r1I3C54ZXV/cs6FSHFlH6bgim0A/wUzP5Y4qDLfwl7HEq0L0f6wfOmZpn4awXfbqa78 zpM8N9QAhtfla4wzuyDt62vkEXAvGkS5EcVJ7TmRLmtlesy/jsLQ5x0fxpp+9uqfqMtL QT2AF6tuEN+YUghIOnZLE2Zui6FuB2PoH8I+W0UxAjGtR/8UORqILr0vBBu0hCJvWYqW 0JKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vi+IjzEM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t19si690648qto.107.2020.02.25.23.49.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:49:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vi+IjzEM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rRZ-00084t-JB for patch@linaro.org; Wed, 26 Feb 2020 02:49:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46359) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIQ-00019M-NG for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIP-00031E-Fq for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:54 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:40695) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIP-0002zQ-8a for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:53 -0500 Received: by mail-wr1-x42b.google.com with SMTP id t3so1657236wru.7 for ; Tue, 25 Feb 2020 23:39:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yA0pga7V3rNc2E3Kn75tRyKVD9rdhZJ6PsuYJbKRcmo=; b=Vi+IjzEMj0mRrqQgsLvPFHxXM421sRNy+ESIcb1eIYmsIqOyUbk6MkDo2BP5ObByvu 6zm7OmVGPg/Q3BGJKCrho470SvpTS2lKaDASvrR+35zGs0+CoTcncFmGN7oEeIcgiUHH FKRQm0kd8jMmQgMDscpvW8ZuUxVl8xSp5Q2fq81hc7jzREkZFiUwMtczobEJnnINmbVv Td9Xzgqg1eX2EIeohM+bbvUoSS4TIOcta/OI+KRsgaQFyX58iUDpkWtCep1M44IpadOK /cXds15qNpOJgGeKi0oNM/AppSibpUXf++ujbnDvyf9zAD/aEZeBOtFFZcPP69h5zI8E gJhg== 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=yA0pga7V3rNc2E3Kn75tRyKVD9rdhZJ6PsuYJbKRcmo=; b=rGhsUbtD6M1UMsJ66n5rY+DI7QTrv08GUr1Zwpajf5GKjX36uYNFNYy03CwKoPePXK bN857Hyx0uG6Mi+NRfxXT52S+5Lcr3Q48lhFN3pB8in9IyzfYjHMKI1biknkVGA+STE0 k8glZWAm3xzxxIHK1eSLakjFb52H3EXc5mlp8ch1/dw3rfyuLhHOc184/ck/NkgPDirC LNOFxLCn/QDNTlSYL7WhVlo/EV92ywMqlOb8C4kPQEdZFYDkcRRUdiWKdFRiMKpqV0Am DJTTXoKJ3XxnDEsVnjC+zyjvaLIUaoUdxpcwg0jIPrafJ2rcDI+CnGbl2Bxc54hMHLBB oz+w== X-Gm-Message-State: APjAAAWQFwOXhJJAbQerPExs8U2Gj3nxKWZXk4sjHRBMecQKQpibGpNy 2u+UbP7mQTseiO/qaoyf95DSiw== X-Received: by 2002:adf:8084:: with SMTP id 4mr4040547wrl.201.1582702792233; Tue, 25 Feb 2020 23:39:52 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g7sm2064272wrq.21.2020.02.25.23.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:48 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BA1D01FFA6; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 17/19] tcg: save vaddr temp for plugin usage Date: Wed, 26 Feb 2020 07:39:27 +0000 Message-Id: <20200226073929.28237-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b 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 , qemu-devel@nongnu.org, qemu-stable@nongnu.org, "Emilio G . Cota" , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While do_gen_mem_cb does copy (via extu_tl_i64) vaddr into a new temp this won't help if the vaddr temp gets clobbered by the actual load/store op. To avoid this clobbering we explicitly copy vaddr before the op to ensure it is live my the time we do the instrumentation. Suggested-by: Richard Henderson Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Emilio G. Cota Cc: qemu-stable@nongnu.org Message-Id: <20200225124710.14152-18-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 7d782002e3f..e2e25ebf7db 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2794,13 +2794,26 @@ static void tcg_gen_req_mo(TCGBar type) } } +static inline TCGv plugin_prep_mem_callbacks(TCGv vaddr) +{ +#ifdef CONFIG_PLUGIN + if (tcg_ctx->plugin_insn != NULL) { + /* Save a copy of the vaddr for use after a load. */ + TCGv temp = tcg_temp_new(); + tcg_gen_mov_tl(temp, vaddr); + return temp; + } +#endif + return vaddr; +} + static inline void plugin_gen_mem_callbacks(TCGv vaddr, uint16_t info) { #ifdef CONFIG_PLUGIN - if (tcg_ctx->plugin_insn == NULL) { - return; + if (tcg_ctx->plugin_insn != NULL) { + plugin_gen_empty_mem_callback(vaddr, info); + tcg_temp_free(vaddr); } - plugin_gen_empty_mem_callback(vaddr, info); #endif } @@ -2822,6 +2835,7 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) } } + addr = plugin_prep_mem_callbacks(addr); gen_ldst_i32(INDEX_op_qemu_ld_i32, val, addr, memop, idx); plugin_gen_mem_callbacks(addr, info); @@ -2868,6 +2882,7 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) memop &= ~MO_BSWAP; } + addr = plugin_prep_mem_callbacks(addr); gen_ldst_i32(INDEX_op_qemu_st_i32, val, addr, memop, idx); plugin_gen_mem_callbacks(addr, info); @@ -2905,6 +2920,7 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) } } + addr = plugin_prep_mem_callbacks(addr); gen_ldst_i64(INDEX_op_qemu_ld_i64, val, addr, memop, idx); plugin_gen_mem_callbacks(addr, info); @@ -2967,6 +2983,7 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) memop &= ~MO_BSWAP; } + addr = plugin_prep_mem_callbacks(addr); gen_ldst_i64(INDEX_op_qemu_st_i64, val, addr, memop, idx); plugin_gen_mem_callbacks(addr, info); From patchwork Wed Feb 26 07:39:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183902 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2792000ile; Tue, 25 Feb 2020 23:46:15 -0800 (PST) X-Google-Smtp-Source: APXvYqy6s0cus/f61L45XGL59W+pGkUMdgoMuu1ohXnJEOaWskD+ux1snh2M3xaATjlf9e+n58gx X-Received: by 2002:a0c:ef47:: with SMTP id t7mr3372005qvs.136.1582703175397; Tue, 25 Feb 2020 23:46:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703175; cv=none; d=google.com; s=arc-20160816; b=SL3T6zjBoZ74ozb3Dq8I/PxnDJ4JD3nkWoEmXoICz2omkQsDPteQzqfXASyRACxy3i CI/KBfmaWLA0LLUqqUE0N4P69sI44w3+KKPfGp9y6hbp0BThFn3YtIXKLRMV23rlHGyv 7hSnBjUWv9bA/CP2PoOti7kzChUmZVJK/CM4YTS4ABjSnYUC0EBB7m1SpKlM6TFUTrlh mrov2DNOYX7IT27CAoLmJeRht6OXd68uVyuzQCmqITVFA1jL0Y6F0rryChaRabVhvGk5 c/XDXVC5oeI2Pv1GojoXerwzFq43pKbu8Fde11EZdXPc4TqxEh1gniTr3U3au/YU7aRA yECQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=TTSs93+2HBYN8glyvvdvMmnuBxLRlsClqFUymVWehjM=; b=y6R4K+fUrM6ydnY2TRLIM5BTA7LjEEcfUKkPw1AGEt8TRLoip0omYA3G32//7T28ex U+n+d423cJTk8Ck85mCs/G+n6ob6UR8LtFGfH6lqdSoXLwdfXVk7oV1q0HSaOesBF2Yi eUUT5gmKENst66RMMS+PNwrE06sSlubeWIX7GZ9Yb2J4SQuZGxm9ZKXN85pUKSj+Coqr 1+QdAnK9XLWRfjeZKv1TAhE2AJTjfZV5mIjoDYwQXn0osmDXMSA2w6fcoq1jXIBzhk1U qby4k6gEiRruCVNh//5QfuWMit//JidYUSbxdEiSkcpSE/4lQgyNBHlY1vh6oKwnMoO3 uX0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HmWy0kaI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w6si592512qvp.130.2020.02.25.23.46.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:46:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HmWy0kaI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rOY-0003bV-RT for patch@linaro.org; Wed, 26 Feb 2020 02:46:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50489) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rO6-0003YZ-UQ for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rO6-0005hy-0v for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:46 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42307) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rO5-0005ez-8g for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:45 -0500 Received: by mail-wr1-x433.google.com with SMTP id p18so1660321wre.9 for ; Tue, 25 Feb 2020 23:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TTSs93+2HBYN8glyvvdvMmnuBxLRlsClqFUymVWehjM=; b=HmWy0kaID/7mKwVWTFJFsVI/FHPAR198Nd1qUUCEurHwSwxr6xfF5hcyGVhzXV0y6d NNVrmZmfYk5ueew2wtt/JCEcd9LKgmo/io+dMPVU5ZMZm+UMD7kf7TTc86EGsCNh4W2d KLlraXOlepF1bY8Qn0JBa+d1KL/1KphkAhffGHCrVY/LlEhTrnQcFSgIJOH8TsmNg/v9 UQLaTPrNexjGVlOwXcVoMv3XSVaoM6G6fYmcnT+H+H9UdgqvXH7eyXoW3vdD8UM2G8Ha Mcp5cYEIe/eitKUGxOhAQKyO4dZklMThryp0z3jwkQvDqyTG0sSo6WJHDFgxL5qp9Kdz F0Ag== 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=TTSs93+2HBYN8glyvvdvMmnuBxLRlsClqFUymVWehjM=; b=FRd8aytKsauom6ZoAJxweHWcA4oBrPaKIoE4P32NVUUsFbvnw24sHTMgREz0KV7mr/ ddRfulpJX3QJVWQXQ7eW9WqSMbf5hc7W88FMD1xoXWMioIAzG+SH864PCuPs0GMiU0mC lhdC/59G2QPY9qzhPmAzXhjPiGSMjJtEAvxmuH8Kzc6tQ3jNIIQ6bZ/jSYy3bUmLfhOK SpzQ3k/PuWrIVTePisXRLWRQROKl8/5Cp15t8GO2MHHOw6NhYHPiUklJ0+UEGJNA2Hon kFDIz99QdTNXikcGaDUkFPzfshMQUgV/qyHVbbQBkyD6cvE18YGaCkjJPomjE0RTSKz2 4rQA== X-Gm-Message-State: APjAAAUbhMBX5m4wudRhByXWhzD/kADAf96I2ONAlI1XwYIQAZXSgri3 SyAXSN5DB1Th8WIsoUMdmo/xBg== X-Received: by 2002:a5d:5381:: with SMTP id d1mr3730179wrv.259.1582703144062; Tue, 25 Feb 2020 23:45:44 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z4sm2058140wrt.47.2020.02.25.23.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:45:40 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CFEA91FFA9; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 18/19] tests/tcg: fix typo in configure.sh test for v8.3 Date: Wed, 26 Feb 2020 07:39:28 +0000 Message-Id: <20200226073929.28237-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 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 , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Although most people use the docker images this can trip up on developer systems with actual valid cross-compilers! Fixes: bb516dfc5b3 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200225124710.14152-19-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 9eb6ba3b7ea..eaaaff6233a 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -228,7 +228,7 @@ for target in $target_list; do echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak fi if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=-march=armv8.3-a -o $TMPE $TMPC; then + -march=armv8.3-a -o $TMPE $TMPC; then echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak fi ;; From patchwork Wed Feb 26 07:39:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183904 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2794535ile; Tue, 25 Feb 2020 23:49:02 -0800 (PST) X-Google-Smtp-Source: APXvYqws6MZ3ihNKT1VuJEcLg9l3cWkQtY58P7wouYnG0doQlHhanY9kmvYYeyERfKo8ccLYWFYE X-Received: by 2002:a37:ad13:: with SMTP id f19mr3341436qkm.363.1582703342509; Tue, 25 Feb 2020 23:49:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703342; cv=none; d=google.com; s=arc-20160816; b=nBGefPM7Kv8qbN0FNLT+Zw6Iqe4LxxC1A1vTs/ZNWUIP9O+WZqdkWlROBrzrzcezMI ExLauyRxLH+h3xn/Pz5Y8dUPSIOuyKbocHiz+xwxlT8JMn/O+YB7zIHMQPFn6GgP4nKr mxac0CRvjQXV9Rra43cYBTniCGXpCSM6uT4tBaY9XhU1Iu0prgszj0pApgwbdPO2bXDF z6pfuKVJ8yQGQERjl5OcMGQva9Qf6muj+0kQ1uUsdy7LCmRaPqZ7NN8jSKK0SKjJ5zFB 35gzOwz0XTP9wZs6HZF+plUNYtxVHoYKLCtkAKS1hAvr/55rwYQt6TSAuIwgj4LslAm2 Y3ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=4olBGu/IQFOKY78lHg02hbFiHdwwHtqSc/rf9v7sw/0=; b=UER19tBYFmDzLJax/aMSXe0W7zWG0SsDRjKcK1DOV65dYWx35dIPgTuTmyN3V3IK3v 0I4NCYq1D/sTtY7tdEFU2HT9mlArf/KzJhF2R9KTz0nYX3RRm9jlBnWxvav6orGu6W4K ze6D2wbgv7AY65OvPaOraQLJ/39C5dvaULiU3q6pR6loBkXSeLDSGdHLUessSffKR2Gs n7cd+krMppHS9ZI07ughBRAaVUVG+SxOvkBKsDvMfgzRSgZ3TnioBQUJC3EQ6eLO8UFk tR5ium14ukMm269rZMDY3nsFE6SsJFs4ZG6eW9JnjSV+3ztDTxeitxIh5livIKZQwnnl yrbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LBVn+11j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b16si703466qtr.155.2020.02.25.23.49.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:49:02 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LBVn+11j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rRG-0007xb-2j for patch@linaro.org; Wed, 26 Feb 2020 02:49:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50457) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rO6-0003Xa-2O for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rO4-0005fz-Oa for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:45 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:38557) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rO4-0005dJ-Aq for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:45:44 -0500 Received: by mail-wm1-x336.google.com with SMTP id a9so1862962wmj.3 for ; Tue, 25 Feb 2020 23:45:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4olBGu/IQFOKY78lHg02hbFiHdwwHtqSc/rf9v7sw/0=; b=LBVn+11jSt/rgqati9jKTTkr+6S6qLVA4H5fnfVOnjokVuQZPXWAhTLO4oRm/mGfUB F9BNoEuzPV8qa26U6/sarOUpz2MOo9QljYkU6aGKhUrBOXSV/m+bmmK8oIyP9Z3wshdG Jf3Z5mOChQ6VHsRvGREYGNnXTpHaWdRl1UG/g5QIIHJ0daPtYwojuuR++55ccfQveDiI 1pJwGyx+ntpNhkRM0fjwBy4uTTgT30iasv4smU6UVuZojmKfMeaVSOYxXhN4LIhOKdjV jYx+liz3bQyU4w1svUNY2QHhH7+YQFcdV8QoSJKQFwZ4UYo/SWRgoBeiWCB+aQli48O6 q+Ag== 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=4olBGu/IQFOKY78lHg02hbFiHdwwHtqSc/rf9v7sw/0=; b=r9R1mwNSHz+xgVdY1tfFs4x8EHJqtWlMYhunQof0dNU4NfgLOH6cDJJ9yebr2LvODC c3ja5s3JIE8nCGAqIAQKmk+J9qsnwgcf5rdZdyE08B22cFmtZ5hd/vxH54VkkKIVmXHJ c3yjDXIr/c5NTKfegX0ZEIcXZDhUzWZCHZrIO8PnqymiiSC9Dt9CsxONip5aBNAVP/wu gFzIiiJBSXsCHDW4bu8Pc75rc2UQyvkWYkfwsGb8al+y5lGMAYTgzlyvivNpCPDcQJ4+ QtTgSva8CsAgwHebmMW0SYi8SOtDXOXIkNF+umwcC1fuGWjnkg1mu7CJW0gFu3rtKJ+z yh8A== X-Gm-Message-State: APjAAAUIeDRNDJywJ6MJ7o+ekBQzqPeEGwHWyWI8iKViFv5bBVS+uAq7 iW39CHt7pfW9qc3EoHD/CE6bcA== X-Received: by 2002:a7b:c3cd:: with SMTP id t13mr3824115wmj.88.1582703142994; Tue, 25 Feb 2020 23:45:42 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b21sm1797732wmd.37.2020.02.25.23.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:45:40 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E6B5C1FFAA; Wed, 26 Feb 2020 07:39:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 19/19] tests/tcg: take into account expected clashes pauth-4 Date: Wed, 26 Feb 2020 07:39:29 +0000 Message-Id: <20200226073929.28237-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Robert Foley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Pointer authentication isn't perfect so measure the percentage of failed checks. As we want to vary the pointer we work through a bunch of different addresses. Signed-off-by: Alex Bennée Reviewed-by: Robert Foley Reviewed-by: Richard Henderson Message-Id: <20200225124710.14152-20-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/tcg/aarch64/pauth-4.c b/tests/tcg/aarch64/pauth-4.c index 1040e92aec3..24a639e36ca 100644 --- a/tests/tcg/aarch64/pauth-4.c +++ b/tests/tcg/aarch64/pauth-4.c @@ -1,25 +1,45 @@ #include #include +#include +#include + +#define TESTS 1000 int main() { - uintptr_t x, y; + int i, count = 0; + float perc; + void *base = malloc(TESTS); + + for (i = 0; i < TESTS; i++) { + uintptr_t in, x, y; + + in = i + (uintptr_t) base; + + asm("mov %0, %[in]\n\t" + "pacia %0, sp\n\t" /* sigill if pauth not supported */ + "eor %0, %0, #4\n\t" /* corrupt single bit */ + "mov %1, %0\n\t" + "autia %1, sp\n\t" /* validate corrupted pointer */ + "xpaci %0\n\t" /* strip pac from corrupted pointer */ + : /* out */ "=r"(x), "=r"(y) + : /* in */ [in] "r" (in) + : /* clobbers */); - asm("mov %0, lr\n\t" - "pacia %0, sp\n\t" /* sigill if pauth not supported */ - "eor %0, %0, #4\n\t" /* corrupt single bit */ - "mov %1, %0\n\t" - "autia %1, sp\n\t" /* validate corrupted pointer */ - "xpaci %0\n\t" /* strip pac from corrupted pointer */ - : "=r"(x), "=r"(y)); + /* + * Once stripped, the corrupted pointer is of the form 0x0000...wxyz. + * We expect the autia to indicate failure, producing a pointer of the + * form 0x000e....wxyz. Use xpaci and != for the test, rather than + * extracting explicit bits from the top, because the location of the + * error code "e" depends on the configuration of virtual memory. + */ + if (x != y) { + count++; + } - /* - * Once stripped, the corrupted pointer is of the form 0x0000...wxyz. - * We expect the autia to indicate failure, producing a pointer of the - * form 0x000e....wxyz. Use xpaci and != for the test, rather than - * extracting explicit bits from the top, because the location of the - * error code "e" depends on the configuration of virtual memory. - */ - assert(x != y); - return 0; + } + perc = (float) count / (float) TESTS; + printf("Checks Passed: %0.2f%%", perc * 100.0); + assert(perc > 0.95); + return 0; }