Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1670324pxj; Wed, 19 May 2021 11:05:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztegsPglKoOsgLhFXmNBzCKYE1QWxq8Q5ZE1qhnW7CyiB8AyONBl5pu0wdbB+njV1uW6i/ X-Received: by 2002:a17:906:dc4c:: with SMTP id yz12mr398258ejb.364.1621447517826; Wed, 19 May 2021 11:05:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621447517; cv=none; d=google.com; s=arc-20160816; b=V05WvxUww+kaDLE9x+p507agp7C324ZfTDUbYdh2h4guMa294yH5+sfrGUTZbSIuta RJIxUIPJhXThWlTeZQuJzqH8hpH3P54w1TgJ7kHxt8tg1ovCXv33U9HxI1hgQWNq/6uW nAKT2XL9ZML4224Nx757F9t9wY+/Mgi31NEv6pTjwiJsgESRjfsBVaGn7qsFcnE7SwUj C3QYRLA2x6uakG1x1Cys6Hj8jiiZEcMCORrMFVxQzMt9fDIU3Yl2PNchOvd8xyf0qFGO ajeBJAsP0rxbEqdZ0ntvwdulDqBj9jxg6O3WxyMHqF2472qd3ndbTORx+W6ETon1d71t GnBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=soOUzbLJHd79dLzXUneFH08UM8yTlNutja4acLt0+qU=; b=s6LhkD/6XJ418evUALLzuGgL8GuUIvVi4k6/CsV0W/pJWvxLK1CZknmzdLD6gxqlvL r46LTdQ+GfTn3fhl3yC2evyVFe4A52Ml8WW3qbA3SkdSE+XT6X3bd59f/aLtkB0tpK6G yo1ppjOTw5Lf4MzvlLaYOozb0Rb2rdLGGdRMjh+s3Q0TBHccozzNmSbvQH0Q2sz7Xmz8 QgBctJuoy/oSbdUp0vjn4nPh5Vbx0yqm2pl1kk7JIGQcuU5hTOxjv38sj9DZGE0Wyjr0 WOzXub4IBOWRIxqH0i/szOiW7Md/PphjeCPNTE8jvOB4fHmNx3IZVdXgU+DSeffsYFwh 6fYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hIdVLuZb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j26si3208590edq.225.2021.05.19.11.04.46; Wed, 19 May 2021 11:05:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hIdVLuZb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244664AbhERMD2 (ORCPT + 99 others); Tue, 18 May 2021 08:03:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348997AbhERMDC (ORCPT ); Tue, 18 May 2021 08:03:02 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E400C061761; Tue, 18 May 2021 05:01:44 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id b13so3477992pfv.4; Tue, 18 May 2021 05:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=soOUzbLJHd79dLzXUneFH08UM8yTlNutja4acLt0+qU=; b=hIdVLuZbbk0swz4hpVBO5hP1ydSkuNP4SwlXYVJ4f2xrIqZy7KGaH9grl6v6LlNJLY bDirjnkwMnbG96k6JaFACCjjPV3taK7feKB/DCqVY8eq4jpnFPXi3V5pOs3ZevSSzdaj qXSii3s1GknciQzSYzAYHIsP951Uzqo6egApt9F8IVg0MfgNjio+FwycWiJSDO7nCHOv 08n40f/UU7WaAZY5IPClwkxtiRyiFD4z2Mh3id4MXy4nuKcyMZIqm0jl1uMxa4uYv0p1 ljY1NyOs1CbzGigFkjqB2GHMVfqaiPTF8oB7984LCCzOTS/8795Ug1xMRoddTNoyU2BW K+Kg== 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; bh=soOUzbLJHd79dLzXUneFH08UM8yTlNutja4acLt0+qU=; b=ncurSObIRNDrVewa6ONUlxk1LzWx1mCvkmL6Opcn9ytT/LM3eUi7WJCW3/lnBlnHz5 uMf5BRmw/a+FjG45hFa4gb06RoabrO1yM/FLGHEbafSyV+YkUN0LVEVxS4J3nW4xxdPc Opq3lCK+Lpsf9imhArM6mSEUAlzr/LgWhMu/7h3XJmQ1Fze+bGnqkaCHaY5diD2usIHA l7ojQ120r+Y5jUMN029Rn4PmPAsIrktN/SA5lOKQ2NLBuC0lMM+WABKFL8oUNm/P3E1I z0KYAZPjhvcUPghWhidaVhJQobSZvN/GXbpZWKvTOrKi0H1GBV7pEzzr5WB8uVDRWBFH YQMQ== X-Gm-Message-State: AOAM533lD7Rec7V1kmH4RXBlvIPz5AYZWGkMufDTgfiXRdusPkLUOxIW uNlHJwburaF8y3sY3oBLabvkjfGc0tw= X-Received: by 2002:a63:d744:: with SMTP id w4mr4791316pgi.76.1621339303764; Tue, 18 May 2021 05:01:43 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.53]) by smtp.googlemail.com with ESMTPSA id l20sm12757394pjq.38.2021.05.18.05.01.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 May 2021 05:01:43 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel Subject: [PATCH v4 5/5] KVM: LAPIC: Narrow the timer latency between wait_lapic_expire and world switch Date: Tue, 18 May 2021 05:00:35 -0700 Message-Id: <1621339235-11131-5-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1621339235-11131-1-git-send-email-wanpengli@tencent.com> References: <1621339235-11131-1-git-send-email-wanpengli@tencent.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wanpeng Li Let's treat lapic_timer_advance_ns automatic tuning logic as hypervisor overhead, move it before wait_lapic_expire instead of between wait_lapic_expire and the world switch, the wait duration should be calculated by the up-to-date guest_tsc after the overhead of automatic tuning logic. This patch reduces ~30+ cycles for kvm-unit-tests/tscdeadline-latency when testing busy waits. Signed-off-by: Wanpeng Li --- v3 -> v4: * consider automatic tuning is disabled and timer did not arrive early * add a code comment arch/x86/kvm/lapic.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index c0ebef560bd1..5d91f2367c31 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1598,11 +1598,19 @@ static void __kvm_wait_lapic_expire(struct kvm_vcpu *vcpu) guest_tsc = kvm_read_l1_tsc(vcpu, rdtsc()); apic->lapic_timer.advance_expire_delta = guest_tsc - tsc_deadline; + if (lapic_timer_advance_dynamic) { + adjust_lapic_timer_advance(vcpu, apic->lapic_timer.advance_expire_delta); + /* + * If the timer fired early, reread the TSC to account for the + * overhead of the above adjustment to avoid waiting longer + * than is necessary. + */ + if (guest_tsc < tsc_deadline) + guest_tsc = kvm_read_l1_tsc(vcpu, rdtsc()); + } + if (guest_tsc < tsc_deadline) __wait_lapic_expire(vcpu, tsc_deadline - guest_tsc); - - if (lapic_timer_advance_dynamic) - adjust_lapic_timer_advance(vcpu, apic->lapic_timer.advance_expire_delta); } void kvm_wait_lapic_expire(struct kvm_vcpu *vcpu) -- 2.25.1