Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
MIME-Version: 1.0
References: <20231006011255.4163884-1-vannapurve@google.com> <2d952c6b-2357-208b-e816-bca19c2a7ca6@intel.com>
In-Reply-To: <2d952c6b-2357-208b-e816-bca19c2a7ca6@intel.com>
From:   Vishal Annapurve <vannapurve@google.com>
Date:   Fri, 6 Oct 2023 08:27:19 -0700
Message-ID: <CAGtprH-_C28G1WEPqmgdpHJpo3_esqOnOYad6YiKQ6g4Z+s9wg@mail.gmail.com>
Subject: Re: [PATCH] x86/tdx: Override the tsc calibration for TDX VMs
To:     Dave Hansen <dave.hansen@intel.com>
Cc:     "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Jun Nakajima <jun.nakajima@intel.com>,
        Isaku Yamahata <isaku.yamahata@intel.com>,
        Erdem Aktas <erdemaktas@google.com>,
        Sagi Shahar <sagis@google.com>,
        Sean Christopherson <seanjc@google.com>,
        Nikolay Borisov <nik.borisov@suse.com>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Kuppuswamy Sathyanarayanan 
        <sathyanarayanan.kuppuswamy@linux.intel.com>,
        "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Oct 6, 2023 at 7:03=E2=80=AFAM Dave Hansen <dave.hansen@intel.com> =
wrote:
>
> On 10/5/23 18:12, Vishal Annapurve wrote:
> > +/**
> > + * Determine TSC frequency via CPUID, else return 0.
> > + */
> > +static unsigned long tdx_calibrate_tsc(void)
> > +{
> > +     unsigned int eax_denominator =3D 0, ebx_numerator =3D 0, ecx_hz =
=3D 0, edx =3D 0;
> > +     unsigned int crystal_khz;
> > +
> > +     /* CPUID 15H TSC/Crystal ratio, plus optionally Crystal Hz */
> > +     cpuid(0x15, &eax_denominator, &ebx_numerator, &ecx_hz, &edx);
> > +
> > +     if (ebx_numerator =3D=3D 0 || eax_denominator =3D=3D 0)
> > +             return 0;
> > +
> > +     crystal_khz =3D ecx_hz / 1000;
> > +
> > +     /*
> > +      * TSC frequency reported directly by CPUID is a "hardware report=
ed"
> > +      * frequency and is the most accurate one so far we have. This
> > +      * is considered a known frequency.
> > +      */
> > +     if (crystal_khz !=3D 0)
> > +             setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);
> > +
> > +     return crystal_khz * ebx_numerator / eax_denominator;
> > +}
> > +
>
> Would it be possible to do this by refactoring the existing code and
> calling it directly instead of copying and pasting so much?

One option is to call native_calibrate_tsc from tdx_calibrate_tsc and
undo the lapic_timer_period configuration after the call. Does that
sound reasonable?