Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Mar 2022 12:52:26 -0500
From:      Shawn Webb <shawn.webb@hardenedbsd.org>
To:        Mark Johnston <markj@freebsd.org>
Cc:        src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject:   Re: git: 84369dd52369 - main - x86: Probe the TSC frequency earlier
Message-ID:  <20220304175226.avi2r57dvjfeyr7w@mutt-hbsd>
In-Reply-To: <YiIsshB5MgS6QdU3@nuc>
References:  <202203011439.221EdtpY038505@gitrepo.freebsd.org> <20220304142447.bmo7r6syd6gsunnt@mutt-hbsd> <YiIsshB5MgS6QdU3@nuc>

index | next in thread | previous in thread | raw e-mail

[-- Attachment #1 --]
On Fri, Mar 04, 2022 at 10:13:54AM -0500, Mark Johnston wrote:
> On Fri, Mar 04, 2022 at 09:24:47AM -0500, Shawn Webb wrote:
> > On Tue, Mar 01, 2022 at 02:39:55PM +0000, Mark Johnston wrote:
> > > The branch main has been updated by markj:
> > > 
> > > URL: https://cgit.FreeBSD.org/src/commit/?id=84369dd52369cbae28970dca20a53d3de1719907
> > > 
> > > commit 84369dd52369cbae28970dca20a53d3de1719907
> > > Author:     Mark Johnston <markj@FreeBSD.org>
> > > AuthorDate: 2022-03-01 14:39:35 +0000
> > > Commit:     Mark Johnston <markj@FreeBSD.org>
> > > CommitDate: 2022-03-01 14:39:35 +0000
> > > 
> > >     x86: Probe the TSC frequency earlier
> > >     
> > >     This lets us use the TSC to implement early DELAY, limiting the use of
> > >     the sometimes-unreliable 8254 PIT.
> > >     
> > >     PR:             262155
> > >     Reviewed by:    emaste
> > >     Tested by:      emaste, mike tancsa <mike@sentex.net>, Stefan Hegnauer <stefan.hegnauer@gmx.ch>
> > >     MFC after:      1 month
> > >     Sponsored by:   The FreeBSD Foundation
> > >     Differential Revision:  https://reviews.freebsd.org/D34367
> > > ---
> > >  sys/amd64/amd64/machdep.c |  14 +++++-
> > >  sys/i386/i386/machdep.c   |  11 ++++-
> > >  sys/x86/include/clock.h   |   3 +-
> > >  sys/x86/isa/clock.c       |   4 +-
> > >  sys/x86/x86/tsc.c         | 123 +++++++++++++++++++++++++---------------------
> > >  5 files changed, 94 insertions(+), 61 deletions(-)
> > 
> > Hey Mark,
> > 
> > Something about this commit breaks booting in Hyper-V. Reverting this
> > particular commit makes Hyper-V happy again.
> 
> The patch below might be sufficient.  I'll test it in Azure but it'll
> take me some time.
> 
> diff --git a/sys/x86/x86/delay.c b/sys/x86/x86/delay.c
> index c767250954da..95b994b15f81 100644
> --- a/sys/x86/x86/delay.c
> +++ b/sys/x86/x86/delay.c
> @@ -89,7 +89,7 @@ delay_tc(int n)
>  		return (1);
>  	}
>  	tc = timecounter;
> -	if (tc->tc_quality <= 0)
> +	if (tc == NULL || tc->tc_quality <= 0)
>  		return (0);
>  	func = tc->tc_get_timecount;
>  	mask = tc->tc_counter_mask;

Great! I'll give this patch a try and report back.

-- 
Shawn Webb
Cofounder / Security Engineer
HardenedBSD

https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc

[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmIiUdoACgkQ/y5nonf4
4fpJhg/8C/OtMPVFfEZot0Yh2XLhUWhl98vBlvM+peBKlkxTWvNNH77YDaaCHtlP
t0NubjRN1+KDA9yBSWwpwyYBGZf1Loc3rg0D47yTvQK/avvxb6RLwlbqbR47b3i1
CJHkAt5TdoBmCrCdXzeX4UGH/kWwrwLhcSFag9E5IrQvwYBg7lpfYBzRgQmO9eG5
zqnHtbyw0Qc3Y9IUSyZn9VFAwMogGN/xN6NIvzw0LAqopvikxetxEh5zXIOZry9j
u/TH9tjWYzOMKtLhqFajJD02yAiYh/SxnlGSqK1W7XrRi2YYPfB80xicgbDSN1VH
+ZSTzShErgaNMflN1NqSyI9n3imkS1eCaRtsnhMcmoDKXFbvnzQWeiNWJRK5vbe9
/l+r7n2IqRBoLHlsf2uRCJbQv1ImbhS9t2Wyjcaros0IDq9hGb6RknnPi3/5l2vp
7a7GEsh8pqmP7u03DA4P9yyOYZxnM29rlh+bXYwGDVUJWu0AB/mRPRbp5fGywL2i
4PwweOIrerwzAj/c3toSw8/rok8gDgPfCTQxbjG5hSGMKb/GQFvyPZ83FXPdA8uN
CEg1tf6xTOytf5vuIzI/UBrDC7GRZQTyih9tI+qQxqTtQE36p1lBGXylZ1akwOAT
/ZcZCN2lWDD+1Uwh0GqTTWbZvO0D+Kpzf2mhJr+qUOxRjKFU0zc=
=zQtn
-----END PGP SIGNATURE-----
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220304175226.avi2r57dvjfeyr7w>