From patchwork Tue May 25 17:26:25 2021 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: 12279713 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 360F4C2B9F8 for ; Tue, 25 May 2021 17:31:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EFFA5610CE for ; Tue, 25 May 2021 17:30:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFFA5610CE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V+ryIw3QxQCxyXh6PAGFGzBB8nIgX5gkRKGGgV79Gl0=; b=ighwfgFR12ctMh bLU2iZnbQ2nBWd9xW7Ni1zD7i5yh7Au1674YPdj812V2PUa7ytWgb3vsPbm8ssd51MR5Y16BvnmmT 7juPQTRQkPbuA7DqNDO0uncUPSE4S56BwjWvCWDoC4fh5etNO1mcg8i99kJU9uwQVqYf3/jaLYVq7 FwNiQt+b0590+2F+kNx1Rz/hgndUktSxakr5fnh2bdqKWzTlK59z1cCejwCwopVwUVYKrPv/9ZStp A51dADVFoU3xkgrODSCjDf/ky0iaQoJk1v9yk0Sl+wukgzkdkd89fxhAbGNsxmkXsE0FyNXAQQS3O //kP6syfr9SWNhQvPc3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llarb-006sQW-Jq; Tue, 25 May 2021 17:29:08 +0000 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llapB-006rDJ-Kg for linux-arm-kernel@lists.infradead.org; Tue, 25 May 2021 17:26:39 +0000 Received: by mail-wm1-x334.google.com with SMTP id n17-20020a7bc5d10000b0290169edfadac9so4129467wmk.1 for ; Tue, 25 May 2021 10:26:37 -0700 (PDT) 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=67YF8LAkTfMHmF/4xYtvDZYwRzZrAqbRd318422rBrs=; b=hAnPW/aujGCGTiMaO633MECpr3iVHFpZ74vutulN+WOw6UBGyXz1GAaCqDy11v/83w JuVngu6+qj9Su7GGBaw9lzZT2V+jnbrmRIQ2QPqfC74LIPdh6NoSQift2znc8TncYSJ/ 5WIrp8G4eEpd3baVNrwwPG3T7qYR29ETlcLmvHvNXZIG4TWI6uQZ/WRe4XqQzzUQSazm 6IBPpj5SyPDcxOHUZ27Kiq7khCjkeEfbJeUbA6BT0DdnPSSHSScNYlJbZsLKWy7Veuaf LYpI1sjWu2KxELfeHYiNKrz44tAd7ChLYpR64Wbw9meArxZ0YZxcQqRWkEjFPuAkrWuR oK7w== 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=67YF8LAkTfMHmF/4xYtvDZYwRzZrAqbRd318422rBrs=; b=eNLxfhPdM7514ok2+qhD8IWesWtGq8ircvO/J7wwzEXRk0R1vm6TH+iNlvRrJeMXyF MULDb0xgIj58GmqRbtP6J8g69qy6BBxSIuOVAceSzVZ3xLIObGLlDOEJChycu4p+5iKJ xtywMokL5jHewqBE/1px18GAdkX8TIU2BE2/YzcUfZ9RNr28ypfor5Arzch9bB8cLs1D VaYVqQmIsFKyqhlcaQGV7aOihxFfnxiwHLwO+IePKK9hIsJ8Mw4UGXtYdHONVdcS9Euj mudFPUsAKZSGDL+3XfTqN0cNA0ciiKeytlGaaPk1Y7pSK84SpVUKO4xw/bzMBuwrSn9p 0Ckw== X-Gm-Message-State: AOAM532l9PMjSetHe7Pe+Qs/Ahix7z6bMnt2cRNteoUfVvQG4geE+X0I Xw7pQb/bwF3XUUuFq4lVlKfEZw== X-Google-Smtp-Source: ABdhPJyJYp7TsGzqNrotyZGIGuywGHZ+6MdxUnOEr81W2n3xaTYmNh+EG/ECQ+nN4DEwKaeEZHRcUw== X-Received: by 2002:a7b:cf09:: with SMTP id l9mr25588294wmg.184.1621963596208; Tue, 25 May 2021 10:26:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z131sm3621434wmb.30.2021.05.25.10.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 10:26:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EE4C1FF87; Tue, 25 May 2021 18:26:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com, eric.auger@redhat.com, qemu-arm@nongnu.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com, maz@kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH v2 1/4] arm64: remove invalid check from its-trigger test Date: Tue, 25 May 2021 18:26:25 +0100 Message-Id: <20210525172628.2088-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525172628.2088-1-alex.bennee@linaro.org> References: <20210525172628.2088-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210525_102637_735254_0A3D0B90 X-CRM114-Status: GOOD ( 16.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org While an IRQ is not "guaranteed to be visible until an appropriate invalidation" it doesn't stop the actual implementation delivering it earlier if it wants to. This is the case for QEMU's TCG and as tests should only be checking architectural compliance this check is invalid. Signed-off-by: Alex Bennée Cc: Shashi Mallela Reviewed-by: Eric Auger --- arm/gic.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/arm/gic.c b/arm/gic.c index 98135ef..bef061a 100644 --- a/arm/gic.c +++ b/arm/gic.c @@ -732,21 +732,19 @@ static void test_its_trigger(void) "dev2/eventid=20 does not trigger any LPI"); /* - * re-enable the LPI but willingly do not call invall - * so the change in config is not taken into account. - * The LPI should not hit + * re-enable the LPI but willingly do not call invall so the + * change in config is not taken into account. While "A change + * to the LPI configuration is not guaranteed to be visible + * until an appropriate invalidation operation has completed" + * hardware that doesn't implement caches may have delivered + * the event at any point after the enabling. */ gicv3_lpi_set_config(8195, LPI_PROP_DEFAULT); stats_reset(); cpumask_clear(&mask); its_send_int(dev2, 20); - wait_for_interrupts(&mask); - report(check_acked(&mask, -1, -1), - "dev2/eventid=20 still does not trigger any LPI"); /* Now call the invall and check the LPI hits */ - stats_reset(); - cpumask_clear(&mask); cpumask_set_cpu(3, &mask); its_send_invall(col3); wait_for_interrupts(&mask); From patchwork Tue May 25 17:26:26 2021 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: 12279709 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0911C2B9F8 for ; Tue, 25 May 2021 17:29:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B17561059 for ; Tue, 25 May 2021 17:29:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B17561059 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IBrFUi7ZyrLa3iK7RmmkukyHcfs2RqzmnfTwy3b5Gpg=; b=OvnQvCU86z8vaz uTcJ7drY6saGIzwHrhRGeo6uD/uG7rLrCXSoCXlNJBsyBcQtgid6aTwIIz0wiTiobDU0PbsqiFski Vtum0Cf8zapu2ADC0+DGj70Z3PztAtJvnzRZGtTZLdBIxe6HkxAGw2PPYltpzuRKyQq0LOHJFR5bW U1vTDPgUjbM3NiJtYcVs1F5TXfJC/9kfdqptmAVs3KdIqC9+AeMyWgm34clr1ifTEZ+qKrz9MZgfS PDaInnB++dNlpViXDczdxH0lg8k0DGQo6E7Ro3qi9uS7Ix/4ez7zDBMXejTQZqtw+Xcajg3/NjJEi pdkiVX9hE4LrrwhkAIdg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llaqQ-006rnm-Gy; Tue, 25 May 2021 17:27:55 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llap8-006rBS-TU for linux-arm-kernel@lists.infradead.org; Tue, 25 May 2021 17:26:36 +0000 Received: by mail-wr1-x429.google.com with SMTP id p7so29353570wru.10 for ; Tue, 25 May 2021 10:26:34 -0700 (PDT) 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=bomimE0My6Mrc6nvo4jcRDAsXmDo+wwewZnyFoFd9Qs=; b=FMU3n4mKiMC3eE6glB9HkdZs5xGVasuZxHEKqdM/ZsUo9pAs9YMC0neSuF+Ad4JaQu O88qdfYxChF9eRWfVQZw64sa8ZI9BKW7CWCRiAqRdStismovf1xTxHSSWqqdGD6xj7+q rr/tfKCh76T+FN2hk5qG8+FdqSF4lkjcAziSPkgHUhRHGdO303tRrJG5RI72coSG9k5a qbl7GD+uFYxxlnYBCk5Sfu7AvYCvVY+1X2Q5F7syHfgO+DZYxycLf0HOBNP0HI7iktF4 AHSeVjT1IVoMj3glEHdhLhRY7LBmHGht6jWbh50NnddoxvwHtiqKvlNzgUOzfUCyYvEU K2nw== 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=bomimE0My6Mrc6nvo4jcRDAsXmDo+wwewZnyFoFd9Qs=; b=sTLIlWUckfV3DqKdZg8/xZVKedHhhr/1JdLlktOdFHpiT6b1Nx7X6NPUv7La9b/J/I txCiWRG3YSWcn/hhrouoT3rJ5KEjL4nUNSkFJ7OwuWZZM8waDMstHCKNt+IGz9ANueLS 7ACciLHbCbShg90IbjftIj6qs7r7KHYiHGpPNllnF/x7VUyihazyceV8LCqvPG4uZr5t RiVozxEltwTsstTcabGGip6VND2ES3DgW9O2ROYGczCcdsnWWC+1qImQz9xRQyANDAY7 WD0fAtXWKcwrDjtwTONutLfOF8mfIxydSj73mVdLamDqgfyRkvbNKFdwUeVT9eA+dv0E jiMQ== X-Gm-Message-State: AOAM530WoJuRl0I/UVYgHea20NlqMTpRqg3/udqaeUNqoBDaVn+n71hJ SHYMQ7LBkLvxHE+6ox9sI2cwzg== X-Google-Smtp-Source: ABdhPJxOcc28Mui0TDrzYURL2X6tyH8HpOBr8o1aIEP2vFUWuQdcnhbd2edMaLArv+UiTrSyKo6ekA== X-Received: by 2002:a5d:6910:: with SMTP id t16mr28171481wru.416.1621963593368; Tue, 25 May 2021 10:26:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r17sm3575630wmh.25.2021.05.25.10.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 10:26:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8AE6C1FF8C; Tue, 25 May 2021 18:26:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com, eric.auger@redhat.com, qemu-arm@nongnu.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com, maz@kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH v2 2/4] scripts/arch-run: don't use deprecated server/nowait options Date: Tue, 25 May 2021 18:26:26 +0100 Message-Id: <20210525172628.2088-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525172628.2088-1-alex.bennee@linaro.org> References: <20210525172628.2088-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210525_102634_989056_04C08F1A X-CRM114-Status: GOOD ( 13.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The very fact that QEMU drops the deprecation warning while running is enough to confuse the its-migration test into failing. The boolean options server and wait have accepted the long form options for a long time. Signed-off-by: Alex Bennée Cc: Shashi Mallela Tested-by: Zenghui Yu Reviewed-by: Eric Auger Reviewed-by: Andrew Jones --- scripts/arch-run.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash index 5997e38..70693f2 100644 --- a/scripts/arch-run.bash +++ b/scripts/arch-run.bash @@ -122,14 +122,14 @@ run_migration () trap 'kill 0; exit 2' INT TERM trap 'rm -f ${migout1} ${migsock} ${qmp1} ${qmp2} ${fifo}' RETURN EXIT - eval "$@" -chardev socket,id=mon1,path=${qmp1},server,nowait \ + eval "$@" -chardev socket,id=mon1,path=${qmp1},server=on,wait=off \ -mon chardev=mon1,mode=control | tee ${migout1} & # We have to use cat to open the named FIFO, because named FIFO's, unlike # pipes, will block on open() until the other end is also opened, and that # totally breaks QEMU... mkfifo ${fifo} - eval "$@" -chardev socket,id=mon2,path=${qmp2},server,nowait \ + eval "$@" -chardev socket,id=mon2,path=${qmp2},server=on,wait=off \ -mon chardev=mon2,mode=control -incoming unix:${migsock} < <(cat ${fifo}) & incoming_pid=`jobs -l %+ | awk '{print$2}'` From patchwork Tue May 25 17:26:27 2021 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: 12279705 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 181F9C2B9F8 for ; Tue, 25 May 2021 17:28:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3206610CE for ; Tue, 25 May 2021 17:28:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3206610CE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ooMi3RaVG7cwEhydlASWWt2dwHVsUlznCP3MuY5U240=; b=wXYW9GQt0ptWSL PeCTIwpkCeHPEqGJpYQck+8+rNdOyFMQ86PDvoSRqyhirhnID3lcyNblDwZLbAyATCOfmFKmrcJLM ikWxNPuwU2pBiIT0c33NYS9JZR3w9yBEBqR9yXzf5+COlZidhM9U/cMmfjRQQiaUZsnpnXCj3wX4J 8At1+TpxMg+sJT2P8RQ0Z2AI7VDxZqf96MDC8RK4HoBkWGS8hAfUstofx5ltQcwCV7LP7gMvxJlyT VfHH8DUKJS5Vx8ceg7Cw3qtc+JI8Cg+e50nUkxANCBcB60/oLrHrePWzicYTUz2atvpFPXdLFzsrb G/B5iSRJ9GgPsW1S/0zg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llapG-006rD6-MC; Tue, 25 May 2021 17:26:44 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llap6-006rA8-Rd for linux-arm-kernel@lists.infradead.org; Tue, 25 May 2021 17:26:34 +0000 Received: by mail-wm1-x332.google.com with SMTP id s5-20020a7bc0c50000b0290147d0c21c51so13280714wmh.4 for ; Tue, 25 May 2021 10:26:32 -0700 (PDT) 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=kXRo+YB1GVPx3XHHAG0hUMJe4NWtnjWLeQgYeSAHJxA=; b=fo46SNxQ9jXF57/LLsGQwmPBq998FOLgxXImtPzwjSv5PhYgCPlHc1Q5qu+x7mR2az vn211zLTZ2VgKYgYqldEHEjX99dW4IF9YkS1cymW/a07x23jOQtXuKq5f2ToD6ZVxTLH I/1t5tlD4sEFRhf7fVe/R9xfiIFQXTeLL50B72cbHkcwzWDYpsqsgEWbUMrcUWvco6Y0 5pHuoh3pGs+v6jI414e2f0MTGut8gci+2Kzec0K6/q1qdhwgxP5N4y2iNZUafp3XiVzp 6GFCTvkRLNcb+lIlSmsoFttxDc/QzKyADnycty46hjwHPlXltbrXid7ttt2DVp2JYlvP iJ/w== 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=kXRo+YB1GVPx3XHHAG0hUMJe4NWtnjWLeQgYeSAHJxA=; b=H2GoKxgjwKp7OHtn3AhXANbnXgVCiaZDl+K1VqjJdZ7dozZT4tIndARSYvo9SvLxvn 0PXheCvGNAaMb7LOurcpP86bGR5+dA56/xWudlbBfI9SeR4LVZ23tRofLt/+ecpimV52 ihQcjKiaMVbzjdGgHZByglvke6Ysmwvno0jxRkq7ih6Uu4Z9ysh720Vp627Kmg2rkkmV 2+/6SA4e6Gj8fBdmtYvhkBw3GLvSIeg/FXRhs9lQoThdTG3IPhlHOrcJ9Tl/XcFuYSAI sJ7FlApUpP/64AjuoEs+CfKtKNCZb0T5+D+/YFyK7Vm+PCVDFI3k881KhcrJA1xYPgqI nMQw== X-Gm-Message-State: AOAM532hNsuJKygx64B8aY6FQX0VVNxBsCA2xzdvBr3BxFhpJz9N5taK cEvZ33PwGfRUm5czql1sSzlTBA== X-Google-Smtp-Source: ABdhPJzmGcXaLaloKoNuJvzV+Eso7SMQocRGBo9MMkwzzvUBiIigiYsDrY0W6M1IX6yPpG166F6kwg== X-Received: by 2002:a1c:4043:: with SMTP id n64mr25571555wma.9.1621963591341; Tue, 25 May 2021 10:26:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z9sm11615062wmi.17.2021.05.25.10.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 10:26:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9809D1FF8F; Tue, 25 May 2021 18:26:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com, eric.auger@redhat.com, qemu-arm@nongnu.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com, maz@kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH v2 3/4] arm64: enable its-migration tests for TCG Date: Tue, 25 May 2021 18:26:27 +0100 Message-Id: <20210525172628.2088-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525172628.2088-1-alex.bennee@linaro.org> References: <20210525172628.2088-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210525_102632_944102_5F29C090 X-CRM114-Status: GOOD ( 10.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org With the support for TCG emulated GIC we can also test these now. Signed-off-by: Alex Bennée Cc: Shashi Mallela Reviewed-by: Eric Auger Reviewed-by: Andrew Jones --- arm/unittests.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/arm/unittests.cfg b/arm/unittests.cfg index f776b66..1a39428 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -194,7 +194,6 @@ arch = arm64 [its-migration] file = gic.flat smp = $MAX_SMP -accel = kvm extra_params = -machine gic-version=3 -append 'its-migration' groups = its migration arch = arm64 @@ -202,7 +201,6 @@ arch = arm64 [its-pending-migration] file = gic.flat smp = $MAX_SMP -accel = kvm extra_params = -machine gic-version=3 -append 'its-pending-migration' groups = its migration arch = arm64 From patchwork Tue May 25 17:26:28 2021 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: 12279711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70154C2B9F8 for ; Tue, 25 May 2021 17:30:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C12D61059 for ; Tue, 25 May 2021 17:30:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C12D61059 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ugd3cntAcwJfVnjO+ic5MxdRJW9R7y76S71HJQcOoSQ=; b=i/AymIXLF9eOj/ WdfXsfv0plyVyy/sg14OIOZ146o8aERfnM+hFtP/46NL+zrtmQQgI0uP0z+hSE3t3w0f06jgjOUs7 j7o1tgvWNSvDVyhPvbYk2Ivecw9PZboiGN7+C3NSy2qD2wxmr++4LZ3so1D7qD9JXNYssA4M1hEmi uLDCGSMb2YaCCuz5RnpARIKXoctEJjOJEH9L6lpWs0EWPSm59WbTWQy7MeCn0SId4vh8vEa/Ecmsy FnPmnUNMeJX0edMhll3bt1I3ZD7AN3Kuh2Wffhnj/Mc8mX9tlusVsatxcAn/UTCY7MN4da4u3H7Ev 8svHuJv9ZbWxe8aPYhzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llaqz-006s6I-CK; Tue, 25 May 2021 17:28:29 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llap9-006rBz-Pp for linux-arm-kernel@lists.infradead.org; Tue, 25 May 2021 17:26:37 +0000 Received: by mail-wm1-x32f.google.com with SMTP id z130so17196615wmg.2 for ; Tue, 25 May 2021 10:26:35 -0700 (PDT) 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=8vhxbSb0kOGC8+nQM9S+UwSASWSZTJvJYDcePLw1qik=; b=DvkmYHVn3HaRgZzPceU2GhR2wTdg+bNlZ8zWdNizKPR5jm/SkWQSY1j8trE6BlsdDQ OBsU5vB5YZDLMDteDH80B5XFp14rtd//uQrxUV8pD6J3FPQv2ruiqlq+m/ySrzTYNCK4 v3XUJkSWiUQikJioCoUPTH58TJV4co8CCV/V/n7xbCMLd611nyRR6FWkN01WytKVXR61 waIDp54ysmCOksR1TNsGmp2n2Td+0vL+VhAq+LSI0Jt8Kfi2ysCW3/B0yIzF62CS/0wh eKc6SeUh8Lv+brC/Ubivypvjpu0AKAYIeSqmmI9wJw2o8iFdKTKoo1K3rwu3lVoRVp2k GyZg== 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=8vhxbSb0kOGC8+nQM9S+UwSASWSZTJvJYDcePLw1qik=; b=HaSui8c5ZRgeFCx4eskd8iJQBrvrW4taX/BGNDx3LkbvTVe8FTDRxEiWIzUyo1IJlG EA6IinrPhgYsUMf81w8u5TwhHHyP0puyppinlWfHcA+bBClAmp6ixMl9aQLZxUJWTLvw N1MiEv9INF8v6aDWS3AXArOIKxk3K0BtiZfSf+f6y9vqL2fSNquqjmiLWXlrNW4PAWDZ 4SDv2ESTxy1FowTOLIm6JDxJGmsUrThwgXp5iZbIdMwXiX3iUtNUp996Paottk5RrNhG KRuERd1LeH0ZyN0ElOOl8ZCfRDuqEH2DpuTEiE5iJPMpU+/SOzYt1NDnypIkZvKkyEl7 WOjA== X-Gm-Message-State: AOAM532ILqu7Z1mIZf3nxYZimp2CfQfx1ByQpERS8McQrI6mwIK64t4i C0pFCHnybUAvSZdN7D2gkdkD1A== X-Google-Smtp-Source: ABdhPJwJcS6ubLrQtKSjUB+dF+9hCxd+Me0VaOsHNU0DUOoeSkOw+4jNx+Dkf/HE7m6wlUQVP4fjaw== X-Received: by 2002:a7b:c849:: with SMTP id c9mr4950802wml.84.1621963594304; Tue, 25 May 2021 10:26:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k132sm3533580wma.34.2021.05.25.10.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 10:26:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4E181FF90; Tue, 25 May 2021 18:26:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com, eric.auger@redhat.com, qemu-arm@nongnu.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com, maz@kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH v2 4/4] arm64: split its-migrate-unmapped-collection into KVM and TCG variants Date: Tue, 25 May 2021 18:26:28 +0100 Message-Id: <20210525172628.2088-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525172628.2088-1-alex.bennee@linaro.org> References: <20210525172628.2088-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210525_102635_863979_2A783DD1 X-CRM114-Status: GOOD ( 15.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When running the test in TCG we are basically running on bare metal so don't rely on having a particular kernel errata applied. You might wonder why we handle this with a totally new test name instead of adjusting the append to take an extra parameter? Well the run_migration shell script uses eval "$@" which unwraps the -append leading to any second parameter being split and leaving QEMU very confused and the test hanging. This seemed simpler than re-writing all the test running logic in something sane ;-) Signed-off-by: Alex Bennée Cc: Shashi Mallela Reviewed-by: Eric Auger --- arm/gic.c | 8 +++++++- arm/unittests.cfg | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arm/gic.c b/arm/gic.c index bef061a..0fce2a4 100644 --- a/arm/gic.c +++ b/arm/gic.c @@ -36,6 +36,7 @@ static struct gic *gic; static int acked[NR_CPUS], spurious[NR_CPUS]; static int irq_sender[NR_CPUS], irq_number[NR_CPUS]; static cpumask_t ready; +static bool under_tcg; static void nr_cpu_check(int nr) { @@ -834,7 +835,7 @@ static void test_migrate_unmapped_collection(void) goto do_migrate; } - if (!errata(ERRATA_UNMAPPED_COLLECTIONS)) { + if (!errata(ERRATA_UNMAPPED_COLLECTIONS) && !under_tcg) { report_skip("Skipping test, as this test hangs without the fix. " "Set %s=y to enable.", ERRATA_UNMAPPED_COLLECTIONS); test_skipped = true; @@ -1005,6 +1006,11 @@ int main(int argc, char **argv) report_prefix_push(argv[1]); test_migrate_unmapped_collection(); report_prefix_pop(); + } else if (!strcmp(argv[1], "its-migrate-unmapped-collection-tcg")) { + under_tcg = true; + report_prefix_push(argv[1]); + test_migrate_unmapped_collection(); + report_prefix_pop(); } else if (strcmp(argv[1], "its-introspection") == 0) { report_prefix_push(argv[1]); test_its_introspection(); diff --git a/arm/unittests.cfg b/arm/unittests.cfg index 1a39428..adc1bbf 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -205,7 +205,7 @@ extra_params = -machine gic-version=3 -append 'its-pending-migration' groups = its migration arch = arm64 -[its-migrate-unmapped-collection] +[its-migrate-unmapped-collection-kvm] file = gic.flat smp = $MAX_SMP accel = kvm @@ -213,6 +213,14 @@ extra_params = -machine gic-version=3 -append 'its-migrate-unmapped-collection' groups = its migration arch = arm64 +[its-migrate-unmapped-collection-tcg] +file = gic.flat +smp = $MAX_SMP +accel = tcg +extra_params = -machine gic-version=3 -append 'its-migrate-unmapped-collection-tcg' +groups = its migration +arch = arm64 + # Test PSCI emulation [psci] file = psci.flat