From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 19715C7EE2A for ; Tue, 6 Jun 2023 15:00:21 +0000 (UTC) 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=18zQ0YKxKN0Ome5ATTGWDwDRb/mPoNDNEaWIDGfebUw=; b=VCx4wLVtV8720d UhvC1mElJ8k7wawc3/+y0cg6sPnltMf7+plNkJxCe9oJN8XvtApL2SAaydnS6Jj5wxvpb1C21+PCx 2Gpdiw2r+DOgVwvgo3fVvwotaEdyosAz58deeP/qdky+z8Q6oiwi9DPE8wvGvNWxlXIGn66NAU4x7 fbpjpQgdSLbW6NGX8kVxSv/E3//F5CZkqdqQR7HJ3PUBB0APmBLFiv1NwUyKc1TQJtWCbJCn4G5LH lZrb2k+QHdvDwOBjcUW0b47TVk2NHkho1kNTO3qISEaMHQfk32tRseCUFmaZyXwx02B16KWJvZxQd HAcylVq1c4H0mGRrkwqw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6YA8-0028yI-0f; Tue, 06 Jun 2023 14:59:56 +0000 Received: from mail-he1eur04on062a.outbound.protection.outlook.com ([2a01:111:f400:fe0d::62a] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6Y9t-0028iP-2c for linux-arm-kernel@lists.infradead.org; Tue, 06 Jun 2023 14:59:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uRT/s2Fek48PYgNizKO+SYzishvJusSE54BLf3qCzlc=; b=sfYRPcTmQNDlWD16yc9UfVup0MJ8th8T7Xpbyjnn2SLKDfUhDNP4dUe4AvF5RTPswTIRcs1rgRmVDedrZsbSHbsQbm7pzQmlIqSJXcvvvz8HL9ZBNSj9K+nK3rbiYCILkYB3dK01m1/oaBIODzq+3DchW20dVW31fg3GHEPO9AI= Received: from DUZPR01CA0296.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b7::25) by DU0PR08MB7833.eurprd08.prod.outlook.com (2603:10a6:10:3b6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.32; Tue, 6 Jun 2023 14:59:28 +0000 Received: from DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:4b7:cafe::8c) by DUZPR01CA0296.outlook.office365.com (2603:10a6:10:4b7::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33 via Frontend Transport; Tue, 6 Jun 2023 14:59:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT009.mail.protection.outlook.com (100.127.143.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.19 via Frontend Transport; Tue, 6 Jun 2023 14:59:28 +0000 Received: ("Tessian outbound 3570909035da:v136"); Tue, 06 Jun 2023 14:59:28 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ee7a8d3568276ff4 X-CR-MTA-TID: 64aa7808 Received: from 7724bce6ce7b.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 90A36384-5366-40B4-982F-E473F715DB54.1; Tue, 06 Jun 2023 14:59:21 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7724bce6ce7b.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 06 Jun 2023 14:59:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aqS6WpdzjsE2LqJDehy1EE6GecfEByFcdMDIiRxjkSzVM+kV9pjsJgLzJTDbHkmpfhg7dIrCeLRaTqumw3E7DPeoakJG3q+PB3laHXCiVGfS7CtDAMlnm4OPLzo5yK2OXEWI7JaTLydygEY040wzkdwvDEl89p0S9anfeix/BfjQaYRZwoYR0wlfvdVkUZgjZkbsgfX/T45GhnBPM7l4SMwVThgbLxIdAr2K287O90naX56Pb9hPnvFbTN+m+wSSgyWVRDrCT+3PAxeNVNNasQHkztPnTncsfMAiWTQNq5wAbNwVCvSRz1ojbPfDbEjYRo4uZ2IK4bLSsyYWMCNVTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uRT/s2Fek48PYgNizKO+SYzishvJusSE54BLf3qCzlc=; b=Yiq8Uji9npDWfwStwYYjz/DOpKR2i+iT9TMW9a8Rq9uMU89iJZsREbbj7HDNjGB/9ysPQGHoDca+AVkSgazxv0+FtfZXsTRkgSAI6ONsPFM6hLyg7KCYmhjXy2A7I7Zh2aAFd/9vpNwTlccXQY8KOuwrK22uY5gb7EDS9z9YWMX513mpLX2XEENTUDFr6N8FbSey/OZadNQE1Kt+gnfC+CmNdPlo00P5yz2AFFv+lzvDy356GEjum00BQQct6tX14pTWTRMAzuFa3G+6R6a0mJH5isyoG9t42/eULV0WRlHoZUtR9Gr8FblUa963g1W79MiLt/B4JSMMOq/FETICJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uRT/s2Fek48PYgNizKO+SYzishvJusSE54BLf3qCzlc=; b=sfYRPcTmQNDlWD16yc9UfVup0MJ8th8T7Xpbyjnn2SLKDfUhDNP4dUe4AvF5RTPswTIRcs1rgRmVDedrZsbSHbsQbm7pzQmlIqSJXcvvvz8HL9ZBNSj9K+nK3rbiYCILkYB3dK01m1/oaBIODzq+3DchW20dVW31fg3GHEPO9AI= Received: from AS8PR04CA0179.eurprd04.prod.outlook.com (2603:10a6:20b:331::34) by AM7PR08MB5431.eurprd08.prod.outlook.com (2603:10a6:20b:10c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.32; Tue, 6 Jun 2023 14:59:20 +0000 Received: from AM7EUR03FT015.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:331:cafe::9f) by AS8PR04CA0179.outlook.office365.com (2603:10a6:20b:331::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.32 via Frontend Transport; Tue, 6 Jun 2023 14:59:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by AM7EUR03FT015.mail.protection.outlook.com (100.127.140.173) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6477.19 via Frontend Transport; Tue, 6 Jun 2023 14:59:19 +0000 Received: from AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 6 Jun 2023 14:59:11 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 6 Jun 2023 14:59:11 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Tue, 6 Jun 2023 14:59:10 +0000 From: Joey Gouly To: CC: , , , , , , , , , , , Subject: [PATCH v4 19/20] KVM: selftests: get-reg-list: support ID register features Date: Tue, 6 Jun 2023 15:58:58 +0100 Message-ID: <20230606145859.697944-20-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230606145859.697944-1-joey.gouly@arm.com> References: <20230606145859.697944-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT015:EE_|AM7PR08MB5431:EE_|DBAEUR03FT009:EE_|DU0PR08MB7833:EE_ X-MS-Office365-Filtering-Correlation-Id: bb6ee98f-b3eb-4618-09ba-08db669ea0a0 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Er2E8b8EEiXCyy8vyHJehyXkMTb0/4JNqUCZPLzxAELXQCPMFPLV3vVHgzDFqUpdEdFzaMk8y9AtjavcLAmSh3Ki8QvuB0XLl+p8rtBFAOIsMx0senv6gVVVVrdYl4GqSBiTxDIcmSSsPEbmIWGf7KhRrldiFN7CWSMaCOYvw5Hu90oai+os3ywagx08tZj7g2thG9wpLZCIvkmBK4M5GqtKxIr3dKkZ3loXpECOO0JWlPBXNai6cPhLb0Y5dOMmEHNa0/sbQmhR1xw3+QT5hSF88MhD++UvbzhoITJ09xloUc4aTwmGKD/22Ul5tEWHNEWSrOnA4+WC5QTaaPGQpsCSQk15iBUILRXgZMPffH0hBFaqPcIWg95jmg+VMe/dwBJcYYOfudkZGqO969U5rxA17nRkAO1TJC0uUAEGBFB/724Nt0tOlYDQaL5Kfdcq1xcD0JppH/7SUoF9snZVBCFu1gBxIJiYP8AT7OwVcdSYfKl2NAa2d93QTqwBwqmw//ChWb4K/9XTUP/Kabbzfd5melWlX9mBScR7tgizf49aWTSIPdDG1aU93ZLPPmP8AYIi8HwwRH3tajwKbn9q/MrfHaFDTjULj0Wlz6/7s15RidG8KTdA8+gDSLTQ+Y0TaVRZSp3SFkslbYRDba7hYB62YX55zpWGjUjXJOX1XUwJ/AITUrqHuOeVxONaSi5BZvZicvpYzT7JVDJCKe5SnuCxBwzPxwqoIDGYcZKXQfknbMf48bVO6p2K/JJTvNQW X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(39860400002)(346002)(396003)(451199021)(36840700001)(46966006)(70206006)(70586007)(2906002)(478600001)(4326008)(316002)(8936002)(6916009)(8676002)(41300700001)(54906003)(44832011)(6666004)(5660300002)(7696005)(1076003)(26005)(82310400005)(356005)(82740400003)(186003)(2616005)(40480700001)(336012)(426003)(83380400001)(47076005)(36860700001)(81166007)(36756003)(86362001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5431 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 526a70f0-0139-42f7-ff25-08db669e9b57 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y1aN+5cMtwqOF4zGJIah5bcRW6KyV81NmOfoxBCC1T9igt+ByP0CVaTN1dffxPL7pc8aBxj0kiWp3t6r2GmvEcAnsx04u7UPgnVzkLT/MG7bgINe931jG4umdReIPFd9E/fkbzHkbU5a4FINNTAxLcBDOe311aKFxC3jUHDQh3xIgO+JwW6+ly2J2X7c87t/bcaKC5eCH2tDlJJU8I7sEet5zdP3fZCMRngPgFyFciLK3o554B/OAVa7sstc+NYRuwlZaLczrohFTdCTL6Jkgg3ov5x64owZphiwmT8naScoD863gCHCcrMmxLP9bIoJVkGD6NCeX4M8r/w3wiPleRM79i/OmRIZMDZQ1Q0vglh+O0EOufEQr1LjTSCVGayiBtIEWd6RfMDEbMzCGE/jO8tQjaQ2eBk9ctMVZ6wH/nHVgdu7V7Zm3EmR8CLVUbsO/ZTtRvoKmklEKPEpW+ocgvNrMfsEFsdwmSCSUf3JY7smDrprH/QkjwsMstfVqIpLpew3Q/ceW2SSPv6QlVXBf6m0NfkyUWMAOTI+NXl3dck9WuEsDu9yxnJqc0na8tV4t+cQ3oDKYH5wFeHMOjHOF8uHyOdHuqMn47v3WeD+3rwzO3WZbEyK5Hf8hZ+sVzh/02xfQMTpaSuGFDau9WUNRHi+Q5a9fQkmnlgKxufLO1N5UOrBCLE+PbU/yOQdyqWAQol8yjnBy9lgfzUwDxPSTvhYTlCed4IsOnG/jQlZa04k8+3cbFLbYnpIeTdKUPIp X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230028)(4636009)(346002)(136003)(39860400002)(376002)(396003)(451199021)(36840700001)(40470700004)(46966006)(54906003)(82740400003)(40460700003)(40480700001)(478600001)(8936002)(5660300002)(44832011)(8676002)(36756003)(86362001)(2906002)(4326008)(6916009)(316002)(81166007)(82310400005)(70586007)(70206006)(41300700001)(2616005)(107886003)(1076003)(36860700001)(26005)(47076005)(83380400001)(186003)(7696005)(6666004)(336012)(426003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2023 14:59:28.8765 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb6ee98f-b3eb-4618-09ba-08db669ea0a0 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7833 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230606_075941_908916_216F383C X-CRM114-Status: GOOD ( 13.90 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This stops the test complaining about missing registers, when running on an older kernel that does not support newer features. Signed-off-by: Joey Gouly Cc: Marc Zyngier Cc: Oliver Upton Cc: Mark Brown Cc: Shuah Khan --- .../selftests/kvm/aarch64/get-reg-list.c | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/aarch64/get-reg-list.c b/tools/testing/selftests/kvm/aarch64/get-reg-list.c index d4e1f4af29d6..3ab236ceb6fc 100644 --- a/tools/testing/selftests/kvm/aarch64/get-reg-list.c +++ b/tools/testing/selftests/kvm/aarch64/get-reg-list.c @@ -48,6 +48,16 @@ struct reg_sublist { __u64 rejects_set_n; }; +struct feature_id_reg { + __u64 reg; + __u64 id_reg; + __u64 feat_shift; + __u64 feat_min; +}; + +static struct feature_id_reg feat_id_regs[] = { +}; + struct vcpu_config { char *name; struct reg_sublist sublists[]; @@ -68,7 +78,8 @@ static int vcpu_configs_n; #define for_each_missing_reg(i) \ for ((i) = 0; (i) < blessed_n; ++(i)) \ - if (!find_reg(reg_list->reg, reg_list->n, blessed_reg[i])) + if (!find_reg(reg_list->reg, reg_list->n, blessed_reg[i])) \ + if (check_supported_feat_reg(vcpu, blessed_reg[i])) #define for_each_new_reg(i) \ for_each_reg_filtered(i) \ @@ -132,6 +143,25 @@ static bool find_reg(__u64 regs[], __u64 nr_regs, __u64 reg) return false; } +static bool check_supported_feat_reg(struct kvm_vcpu *vcpu, __u64 reg) +{ + int i, ret; + __u64 data, feat_val; + + for (i = 0; i < ARRAY_SIZE(feat_id_regs); i++) { + if (feat_id_regs[i].reg == reg) { + ret = __vcpu_get_reg(vcpu, feat_id_regs[i].id_reg, &data); + if (ret < 0) + return false; + + feat_val = ((data >> feat_id_regs[i].feat_shift) & 0xf); + return feat_val >= feat_id_regs[i].feat_min; + } + } + + return true; +} + static const char *str_with_index(const char *template, __u64 index) { char *str, *p; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel