From patchwork Thu Apr 14 05:11:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12812911 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85F80C433F5 for ; Thu, 14 Apr 2022 05:12:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239835AbiDNFOk (ORCPT ); Thu, 14 Apr 2022 01:14:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231905AbiDNFOg (ORCPT ); Thu, 14 Apr 2022 01:14:36 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2086.outbound.protection.outlook.com [40.107.92.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7041E1F60E; Wed, 13 Apr 2022 22:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R79G6clEWdMWot1l7aH+IulULJyS2S2AbCXYR7AbpOmJBTUh3Xibc8OWT+OO7tOi7IUl9UWKpeK7cEC54zl9B7O7wYfKniGP0Ds54FBBWq6DaGh9IaZlgWTJlc5ptYwtVEFG2bLSI+oc9U/jpn4nI12b1WpSF5vm0ByCN2f+lAsLV2XfN3qKAz0xt2xY0if5sVMBZeMTBcO/waiPEKhzVXL/n+74uaqqoafbLoJyLIVUubgir3YlIbvQMQua0749OS8LlYIjoYDCFoyeL7cNm/b2PwleBW5OQU71hhUsS33Av+ly3/Ac1B6VRuuwoe2edQonYfblMux4tV9W44vZnw== 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=lLSsYGn6y0bFiHoejhHo6Iu1yjge2PUTymWV9fs1kX0=; b=LdeZ2pGtItV35DzHbnfi1Z7fPw9lfHbIYRjF/7oyF9HVeyLyVpiRAOMIeZ7SIlZ0Ws5EjwT2k+LYwGwI6aSbg2+tShdGSvV9NCc5Q3Z239UONIVlMwctcH9vkjWu+6J2JFw6xxET6TmBBBIU+86Ero6xt1w3OVVS0TAg8JL8BVV1OPrZPbH+wO/jQK/8JemmGpHeoitH4L7LgU6dgETUnZH5d1szLHXNlBYNoRXhm+jQ36gGWTEeEUyqkvZegNvxwA740L9RxIHdmmFq1YqMMlTx++bC9YRQWkrSwoiLSDToB0b9oRVoAbzL5kK/ufMULL5cWo7I7g87KrZYuTvSjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lLSsYGn6y0bFiHoejhHo6Iu1yjge2PUTymWV9fs1kX0=; b=gdsbWo92XtTcB+w0IzpeiPv1VhvLrfBS0Xfb79xqxrORcurQP7UEJApm03GAWe3bsaLnSyNBKKYmF9QR91BSG2pEIexu+fMPjmSHjC+RFYgFtqJav76u2MwotVKeLRZw0TClywSALcwSfUH7i2EM0QVVIMmQWCixDNnT24rcYag= Received: from MW3PR06CA0022.namprd06.prod.outlook.com (2603:10b6:303:2a::27) by PH7PR12MB5853.namprd12.prod.outlook.com (2603:10b6:510:1d4::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Thu, 14 Apr 2022 05:12:10 +0000 Received: from CO1NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2a:cafe::25) by MW3PR06CA0022.outlook.office365.com (2603:10b6:303:2a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.26 via Frontend Transport; Thu, 14 Apr 2022 05:12:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT051.mail.protection.outlook.com (10.13.174.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5164.19 via Frontend Transport; Thu, 14 Apr 2022 05:12:09 +0000 Received: from sp5-759chost.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 14 Apr 2022 00:12:06 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH 1/2] KVM: SVM: Introduce avic_kick_target_vcpus_fast() Date: Thu, 14 Apr 2022 00:11:50 -0500 Message-ID: <20220414051151.77710-2-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220414051151.77710-1-suravee.suthikulpanit@amd.com> References: <20220414051151.77710-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76db8781-5ea8-4262-8f7e-08da1dd55392 X-MS-TrafficTypeDiagnostic: PH7PR12MB5853:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OWOnGacNzipLmvmShSWpI7PHOOHgEStTJTYhIKkKHNfT4LovCcKVDfiwF/Z3wIwwq8jqrpd89zwnXZiBVsEdYe7ddgDLHU3wl4wesg55lG7cENftACCb4qgMn/41Ma9RvnsDa1JvR3TFbKJJw+YTkpPiPe7WF+i3Kez/aUH9YCQlmmRxKl4QMjz1Pw5dntl+Fkcus1LMuZJJU4mixvwo2cW3qPMRcMK7UajqcqeF7qCr5zkWyaFFaJnIv8+oYn/8MOzH77Uf0LHvDYnvc94q4D4IhK3unuQsrndhruxu8BA75mAGgownKLhaYGs9X20zQtl6f8Xc5wnkPHsphiE4NrgYr7hAGZzskoFFHJnU9Mt4EJ6FcBupyfwomu1L/y1WQ5uuZQ69uiGh6QdGm0aUqsjwJ7V+eYGmyj38sP5vkjaFUwLszqcfSk56qUqu4rfb1/6RXJMQ9Axiti4o0HOQ3/2TZZwqgALvmJe25/ogLXA6tGQDYRFT6Y0qxbVCB1iIjXjxTxSElULa5GOLac0rltaPZFmB7i1kZCUxZRzc/kZweZr2GkQSm8XzRgmcCubUsCCzc8PDhtwfWW3RkVd1TEsSet6+t3MEMwyLUNLGvhPLE5lqqKQWbDbo4ZAk3OV5Za3piy/sqqo8cTuLiNNVyNgI1CBIog+/v16D5sk8eMMnJi6bCCg+habbyRGDVXEYaA8MCR3irLTji5+mm4PxGQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(2616005)(82310400005)(40460700003)(1076003)(70206006)(8676002)(110136005)(336012)(7696005)(316002)(6666004)(36860700001)(36756003)(2906002)(86362001)(426003)(16526019)(508600001)(186003)(5660300002)(54906003)(26005)(83380400001)(8936002)(47076005)(81166007)(356005)(44832011)(4326008)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2022 05:12:09.1825 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76db8781-5ea8-4262-8f7e-08da1dd55392 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5853 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Currently, an AVIC-enabled VM suffers from performance bottleneck when scaling to large number of vCPUs for I/O intensive workloads. In such case, a vCPU often executes halt instruction to get into idle state waiting for interrupts, in which KVM would de-schedule the vCPU from physical CPU. When AVIC HW tries to deliver interrupt to the halting vCPU, it would result in AVIC incomplete IPI #vmexit to notify KVM to reschedule the target vCPU into running state. Investigation has shown the main hotspot is in the kvm_apic_match_dest() in the following call stack where it tries to find target vCPUs corresponded to the information in the ICRH/ICRL registers. - handle_exit - svm_invoke_exit_handler - avic_incomplete_ipi_interception - kvm_apic_match_dest However, AVIC provides hints in the #vmexit info, which can be used to retrieve the destination guest physical APIC ID. In addition, since QEMU defines guest physical APIC ID to be the same as vCPU ID, it can be used to quickly identify the target vCPU to deliver IPI, and avoid the overhead from searching through all vCPUs to match the target vCPU. Signed-off-by: Suravee Suthikulpanit Reviewed-by: Maxim Levitsky --- arch/x86/kvm/svm/avic.c | 91 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index abcf761c0c53..92d8e0de1fb4 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -351,11 +351,94 @@ void avic_ring_doorbell(struct kvm_vcpu *vcpu) put_cpu(); } -static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, - u32 icrl, u32 icrh) +/* + * A fast-path version of avic_kick_target_vcpus(), which attempts to match + * destination APIC ID to vCPU without looping through all vCPUs. + */ +static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source, + u32 icrl, u32 icrh, u32 index) { + u32 dest, apic_id; struct kvm_vcpu *vcpu; + int dest_mode = icrl & APIC_DEST_MASK; + int shorthand = icrl & APIC_SHORT_MASK; + struct kvm_svm *kvm_svm = to_kvm_svm(kvm); + u32 *avic_logical_id_table = page_address(kvm_svm->avic_logical_id_table_page); + + if (shorthand != APIC_DEST_NOSHORT) + return -EINVAL; + + /* + * The AVIC incomplete IPI #vmexit info provides index into + * the physical APIC ID table, which can be used to derive + * guest physical APIC ID. + */ + if (dest_mode == APIC_DEST_PHYSICAL) { + apic_id = index; + } else { + if (!apic_x2apic_mode(source)) { + /* For xAPIC logical mode, the index is for logical APIC table. */ + apic_id = avic_logical_id_table[index] & 0x1ff; + } else { + /* For x2APIC logical mode, cannot leverage the index. + * Instead, calculate physical ID from logical ID in ICRH. + */ + int apic; + int first = ffs(icrh & 0xffff); + int last = fls(icrh & 0xffff); + int cluster = (icrh & 0xffff0000) >> 16; + + /* + * If the x2APIC logical ID sub-field (i.e. icrh[15:0]) contains zero + * or more than 1 bits, we cannot match just one vcpu to kick for + * fast path. + */ + if (!first || (first != last)) + return -EINVAL; + + apic = first - 1; + if ((apic < 0) || (apic > 15) || (cluster >= 0xfffff)) + return -EINVAL; + apic_id = (cluster << 4) + apic; + } + } + + /* + * Assuming vcpu ID is the same as physical apic ID, + * and use it to retrieve the target vCPU. + */ + vcpu = kvm_get_vcpu_by_id(kvm, apic_id); + if (!vcpu) + return -EINVAL; + + if (apic_x2apic_mode(vcpu->arch.apic)) + dest = icrh; + else + dest = GET_XAPIC_DEST_FIELD(icrh); + + /* + * Try matching the destination APIC ID with the vCPU. + */ + if (kvm_apic_match_dest(vcpu, source, shorthand, dest, dest_mode)) { + vcpu->arch.apic->irr_pending = true; + svm_complete_interrupt_delivery(vcpu, + icrl & APIC_MODE_MASK, + icrl & APIC_INT_LEVELTRIG, + icrl & APIC_VECTOR_MASK); + return 0; + } + + return -EINVAL; +} + +static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, + u32 icrl, u32 icrh, u32 index) +{ unsigned long i; + struct kvm_vcpu *vcpu; + + if (!avic_kick_target_vcpus_fast(kvm, source, icrl, icrh, index)) + return; /* * Wake any target vCPUs that are blocking, i.e. waiting for a wake @@ -388,7 +471,7 @@ int avic_incomplete_ipi_interception(struct kvm_vcpu *vcpu) u32 icrh = svm->vmcb->control.exit_info_1 >> 32; u32 icrl = svm->vmcb->control.exit_info_1; u32 id = svm->vmcb->control.exit_info_2 >> 32; - u32 index = svm->vmcb->control.exit_info_2 & 0xFF; + u32 index = svm->vmcb->control.exit_info_2 & 0x1FF; struct kvm_lapic *apic = vcpu->arch.apic; trace_kvm_avic_incomplete_ipi(vcpu->vcpu_id, icrh, icrl, id, index); @@ -415,7 +498,7 @@ int avic_incomplete_ipi_interception(struct kvm_vcpu *vcpu) * set the appropriate IRR bits on the valid target * vcpus. So, we just need to kick the appropriate vcpu. */ - avic_kick_target_vcpus(vcpu->kvm, apic, icrl, icrh); + avic_kick_target_vcpus(vcpu->kvm, apic, icrl, icrh, index); break; case AVIC_IPI_FAILURE_INVALID_TARGET: break; From patchwork Thu Apr 14 05:11:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12812912 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01FD0C433FE for ; Thu, 14 Apr 2022 05:12:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239842AbiDNFOm (ORCPT ); Thu, 14 Apr 2022 01:14:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232651AbiDNFOh (ORCPT ); Thu, 14 Apr 2022 01:14:37 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2072.outbound.protection.outlook.com [40.107.92.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D9F0C0B; Wed, 13 Apr 2022 22:12:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RJqQfa9+Hc7PqgoK9RfhautsA+ait2TUWq8GgXsCgc/rsl/d7/rnvlArGxj3eZ6/8lUj3jhvaBcpPi+gp5+m1iyCyrwriUj5hOmkkduHx/j8e/TdzXMcUPP2wNsfClFdXIJlZGtVijEn0W38DfS3L021f4AqwqfHXAVNz1tfP6EJlYwd6+nhDacXZT7Fh8+eLKKsbO9cs7E3neey+FiLoK11K7ajQQLuEcsA5uk3GPL4bWtVYxsnanNodXNeNXUfPBvIvqdA5z5zl/aSENlPuUVcvAEsFnVphYV3xUh6Tvf0MwrQejQflZrJYQu3Qv+/8Vp8II2PybpVwTQUvgaG2A== 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=yWHEc1MqybQg+6/vo1n3OGs7U81LPhawi6vD8mT1icc=; b=DmEpzTsOL279KiDiImvYipKWxJkj42OIM5HN32yvva5p86lkbQJTuDEh1MPm08rnGuSdl1eDPyrwy+cnK3UZ2KSwcfm6opsuA+289EFWn+DiMXKrlbkk+uVNGyZk8BjTf09W8cGzR3lEMAf1aU4QvjdUOaHeMJlrV8sZGIxW+eNM/RJZgzjj0kh3E/PABpgi+cznoyNE67JTdcK1/rBAB7jrucKPRd21JbHEBgxXqszDWYPUGvA/FDTBqdtzDqoK4U61agUnexp0c4EFrcQX4VrsExiRdqJBoWps/1aK1vrKHGuLZ51jXwOJ9V3etvH2dvGhGsdlaD2eXv2IYdpXww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yWHEc1MqybQg+6/vo1n3OGs7U81LPhawi6vD8mT1icc=; b=IsANWC5oGxDfiUKjdGEGX1BOqjO15jAZyhzcvCqXw4CYvNY2luGE2uqbjqdNbze/7ozZHjs125dAIYGT+Bls9OWwLjTD2UeEnjJu4BsJvcWUsXuvkwXps0gF6ykBXj96lbUdtFStbDCyzdiDYOoBKWY8h2mvBfgxkuQhmhTRQ58= Received: from MW3PR06CA0016.namprd06.prod.outlook.com (2603:10b6:303:2a::21) by DM6PR12MB4106.namprd12.prod.outlook.com (2603:10b6:5:221::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Thu, 14 Apr 2022 05:12:11 +0000 Received: from CO1NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2a:cafe::c5) by MW3PR06CA0016.outlook.office365.com (2603:10b6:303:2a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.26 via Frontend Transport; Thu, 14 Apr 2022 05:12:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT051.mail.protection.outlook.com (10.13.174.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5164.19 via Frontend Transport; Thu, 14 Apr 2022 05:12:10 +0000 Received: from sp5-759chost.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 14 Apr 2022 00:12:07 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH 2/2] KVM: SVM: Introduce trace point for the slow-path of avic_kic_target_vcpus Date: Thu, 14 Apr 2022 00:11:51 -0500 Message-ID: <20220414051151.77710-3-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220414051151.77710-1-suravee.suthikulpanit@amd.com> References: <20220414051151.77710-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d54e262a-cee5-454a-0d82-08da1dd55456 X-MS-TrafficTypeDiagnostic: DM6PR12MB4106:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8WfdtbcT3a1xRxYwTn5XdC3E1c6K2m1TWup8UCjj+UMl5EZ1yA3lvqwS5+m9xJ0Se6sozx3FxjvzIRxb2hxv9rblAmCIQfHy+MO45k0sj0NlKeFU4OZ18u2EPZhT1CkyQ9FQiY0DkQNDjGvZB2m67QSQJDV9XJExGbK7EloxW7jeyJpsoVf7oKjhzOwvFkt35LimuVXhiD84o6dxMIHeEbXrjosXOncjW4Y8oE4tkZI+TsLaqjin/2geAQ7a1vLDrUyxF5U0yIJriYWELtkCzeYXM+Vju0naWOc8yl+rKjMSBInZYfOn8czDbne5S53IpzqZ3smH2714gm1s1QVATNxS40Tv8mQPBRjy+DQx51NWv0pEQf6f/J1gcnxaGWaDCL5/212j/g11P55cDWP35PqC13QExq5Gi/EtqJ+25Z/GPYczwNphYOq3soQvk/g4n5kDjUiVQlF9eNW+F9FUowtoO2zyN1B1IUCxhgJHhgbWCXBsT522/FOnHJAmTowCz482qcbz9sKx76AkL/pTYfJSREtJOCR6//Tpdu0fAFKO+RiJ3/VVbP3jlql/BPS6yhETlu3s2gZQxkcpL3P77pVfJCotp69BaIcb4pxB+54T9NX/6JvzbEJZZjPzSEJCviVdfkrJ65lqlf7Dn+nFnWsUYmQeIFWzsV+ERrwgeVWW92EGaWxjA6CQLavl1/CcpW8ECNmdA/zssG4ErH8u4A== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(47076005)(82310400005)(8676002)(2616005)(6666004)(1076003)(5660300002)(8936002)(16526019)(186003)(83380400001)(70586007)(70206006)(36860700001)(36756003)(26005)(44832011)(4326008)(336012)(426003)(356005)(81166007)(54906003)(2906002)(7696005)(110136005)(40460700003)(86362001)(316002)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2022 05:12:10.4480 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d54e262a-cee5-454a-0d82-08da1dd55456 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4106 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This can help identify potential performance issues when handles AVIC incomplete IPI due vCPU not running. Signed-off-by: Suravee Suthikulpanit Reviewed-by: Maxim Levitsky --- arch/x86/kvm/svm/avic.c | 2 ++ arch/x86/kvm/trace.h | 20 ++++++++++++++++++++ arch/x86/kvm/x86.c | 1 + 3 files changed, 23 insertions(+) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 92d8e0de1fb4..e5fb4931a2f1 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -440,6 +440,8 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, if (!avic_kick_target_vcpus_fast(kvm, source, icrl, icrh, index)) return; + trace_kvm_avic_kick_vcpu_slowpath(icrh, icrl, index); + /* * Wake any target vCPUs that are blocking, i.e. waiting for a wake * event. There's no need to signal doorbells, as hardware has handled diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index e3a24b8f04be..de4762517569 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -1459,6 +1459,26 @@ TRACE_EVENT(kvm_avic_ga_log, __entry->vmid, __entry->vcpuid) ); +TRACE_EVENT(kvm_avic_kick_vcpu_slowpath, + TP_PROTO(u32 icrh, u32 icrl, u32 index), + TP_ARGS(icrh, icrl, index), + + TP_STRUCT__entry( + __field(u32, icrh) + __field(u32, icrl) + __field(u32, index) + ), + + TP_fast_assign( + __entry->icrh = icrh; + __entry->icrl = icrl; + __entry->index = index; + ), + + TP_printk("icrh:icrl=%#08x:%08x, index=%u", + __entry->icrh, __entry->icrl, __entry->index) +); + TRACE_EVENT(kvm_hv_timer_state, TP_PROTO(unsigned int vcpu_id, unsigned int hv_timer_in_use), TP_ARGS(vcpu_id, hv_timer_in_use), diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index d0fac57e9996..c2da6c7516b0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12978,6 +12978,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_pi_irte_update); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_unaccelerated_access); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_incomplete_ipi); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_ga_log); +EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_kick_vcpu_slowpath); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_apicv_accept_irq); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_exit);