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: 12279703 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 012BFC47084 for ; Tue, 25 May 2021 17:26:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9C24610CE for ; Tue, 25 May 2021 17:26:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233994AbhEYR2M (ORCPT ); Tue, 25 May 2021 13:28:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233967AbhEYR2H (ORCPT ); Tue, 25 May 2021 13:28:07 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98019C061574 for ; Tue, 25 May 2021 10:26:37 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id u4-20020a05600c00c4b02901774b80945cso13958572wmm.3 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=qdIHHDPtvGbfL7Kc8w89TnCInfUN4n5FTpnNX+HAxtBaoV3Iy6PkSIFfL85uL9g7Z3 U5UCXem1LvlgHvHMW+7ULO5wOrRUTlraGU63CEOPKUkmNRt3BPmXezEQym1xO3x8fEdS YfQqazaoTa+8G0CVqGQ297+w3YmZgyS95NSKo33Kc4iyuuPLkDiXXcIRlCs40UT2F/OM M/bMQ4R8ZywIHMlK9/fRUmNI6WkB9CW0yiijsKZ02jFPHWEl51U1rQlA/lbl3KdCGWGl gQmYQaicdQO7Nku5Fb3OLepz6z0dMj6Qs3EJsUFEENOnybOSv0ieEaPH8mH/8RFTJzhn rZbg== X-Gm-Message-State: AOAM533KG+z4BGiPWwI/ECQq/F4Tf88HWM4m9FawOr0/9RwYHNlpD60n XPoAsJshc+famaNuQHrTP2b7iQ== 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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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: 12279699 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 0604EC47086 for ; Tue, 25 May 2021 17:26:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAEF961378 for ; Tue, 25 May 2021 17:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234006AbhEYR2K (ORCPT ); Tue, 25 May 2021 13:28:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229955AbhEYR2F (ORCPT ); Tue, 25 May 2021 13:28:05 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05265C06138B for ; Tue, 25 May 2021 10:26:34 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id v12so33088214wrq.6 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=Yob7DpR9/kSMk1NG0UoGaDgH467KXwm3pntu3YsBlROpT+r6MMBciLJJbRPLROh7Pl 6EjDIRF7TeFMSSKCQaqhY7R92c+91BQOi25Ss8YQWgJ6PvOaMRW+D2yFJaaZA5MrzXnV BZkEwD8T9MemB61sza8oYFIaJ6BKK2+BjIOF33orzO1eK/u51k8XWd0yqdde+b39slGY ThOzLA2E5hQOkPR37Z0SZem5LMU07UZkOonAVdlszvpPJ4el0MeGiacf6dwRbWiluX5E i/rIyNdJJqYL4oNIFxyxZy0QrQe29vObDG3C4ymV0/cKfYJhtCRRMQgUWTz1x7kdPal2 uMog== X-Gm-Message-State: AOAM532t6dfQ7BIYYO6i56NQ6YAW1NHO0PAaBPFjoG5ApUBfQLfJBuiZ +CFI2cUjq9BDNvX4Q7pmjRk02g== 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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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: 12279697 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 223FDC47085 for ; Tue, 25 May 2021 17:26:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03CA96142C for ; Tue, 25 May 2021 17:26:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233991AbhEYR2J (ORCPT ); Tue, 25 May 2021 13:28:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233896AbhEYR2E (ORCPT ); Tue, 25 May 2021 13:28:04 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C09E8C061574 for ; Tue, 25 May 2021 10:26:32 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id z19-20020a7bc7d30000b029017521c1fb75so3957939wmk.0 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=EdNcI+b9UkGfjmvn08e2TSmQ0rmY8znhk9+bvOygALbnJ/VKdhdJMLSFSqUNTqAN7N HNA6y6hUUg4Pav2jjULScHoedHlSNjSyXgp9ArOM82ipF9YAS8XeDvkNjBxNDM4Ay9QF brLmHXpIuAunXhm3H/xV2QeEXEVOTcGLEB+BhezjvKvOE4HuPu5VxNgEPHv0kfKZaTSa C/DIjcg0m9rXsuZh/CWcEb/nCIkaf0t3eVV4SzP5K4RWYOlqm7ujWTzBD+rh4cUt1ff4 uqGD4yXmVVO8wtXs0BaH7xilKgmgjyzttZWrXPACEy+EaOITLbLtEbsI24q0oxUYEw91 iaTQ== X-Gm-Message-State: AOAM532/OvQ0D7+bJNbpo5EAFm15evNPyhRDX5iujb3tdTx7DN9uebBG 5uQRqD9znm4lcvCkbgH2IWmT1g== 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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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: 12279701 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 11B59C2B9F8 for ; Tue, 25 May 2021 17:26:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E9B26610CE for ; Tue, 25 May 2021 17:26:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234003AbhEYR2L (ORCPT ); Tue, 25 May 2021 13:28:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233933AbhEYR2F (ORCPT ); Tue, 25 May 2021 13:28:05 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC2E6C06138A for ; Tue, 25 May 2021 10:26:35 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id o127so17190329wmo.4 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=HYX7Sy7PjYl8SRoXJEBquz3bVcrBt3BWhmEYHzb8RmVjwycitwph9tBLuJw6CJu9Wt f0IV/b3esTIaO6o7EkGTyYhx4CixIgjAfAvMHBhkPPbGodNk2k/pc9z7Ori5eT+nZ9nS 86RfmdqZ0FCtjd7V9l9eKCAa+fAVW0nYxxvsPLeSbC6DyjpNyLZSu1MNpBmTnWWThXYF E7NpmIiLf25UBk4FeSB7sUV83ToEILrTg8T6IhfQd2FTzXYZxlMEGHDZ2A1rPQAw6evt MPyk95nbN4RcEIqvNTIBOFBfeTSQqFG7c937z4XsZzKNdf9ACQnSTt7Xs1Fn1e6UXgM7 JlpA== X-Gm-Message-State: AOAM532JJZIJGJM7LtzSygqkK5w0XdNogfU0nZo8UclYDThx/KQiS+qO 8FSN4gOEeTelMb+mkep/ydlHUQ== 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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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