Re: git: 6b82130e6c9a - main - clock: Add a long ticks variable, ticksl

In message <E4BDED1E-F3BE-450F-B5B4-47305A21867D@freebsd.org>, Jessica 
Clarke w
rites:
> On 10 Jan 2025, at 16:47, Cy Schubert <Cy.Schubert@cschubert.com> wrote:
> >=20
> > In message <202501101600.50AG0jk6062308@gitrepo.freebsd.org>, Mark =
> Johnston=20
> > wri
> > tes:
> >> The branch main has been updated by markj:
> >>=20
> >> URL: =
> https://cgit.FreeBSD.org/src/commit/?id=3D6b82130e6c9add4a8892ca897df5a0ec=
>
> >> 04663ea2
> >>=20
> >> commit 6b82130e6c9add4a8892ca897df5a0ec04663ea2
> >> Author:     Mark Johnston <markj@FreeBSD.org>
> >> AuthorDate: 2025-01-10 15:37:07 +0000
> >> Commit:     Mark Johnston <markj@FreeBSD.org>
> >> CommitDate: 2025-01-10 15:42:59 +0000
> >>=20
> >>    clock: Add a long ticks variable, ticksl
> >>=20
> >>    For compatibility with Linux, it's useful to have a tick counter =
> of
> >>    width sizeof(long), but our tick counter is an int.  Currently the
> >>    linuxkpi tries paper over this difference, but this cannot really =
> be
> >>    done reliably, so it's desirable to have a wider tick counter.  =
> This
> >>    change introduces ticksl, keeping the existing ticks variable.
> >>=20
> >>    Follow a suggestion from kib to avoid having to maintain two =
> separate
> >>    counters and to avoid converting existing code to use ticksl: =
> change
> >>    hardclock() to update ticksl instead of ticks, and then use =
> assembler
> >>    directives to make ticks and ticksl overlap such that loading =
> ticks
> >>    gives the bottom 32 bits.  This makes it possible to use ticksl in =
> the
> >>    linuxkpi without having to convert any native code, and without =
> making
> >>    hardclock() more complicated or expensive.  Then, the linuxkpi can =
> be
> >>    modified to use ticksl instead of ticks.
> >>=20
> >>    Reviewed by:    olce, kib, emaste
> >>    MFC after:      1 month
> >>    Differential Revision:  https://reviews.freebsd.org/D48383
> >> ---
> >> sys/conf/files        |  1 +
> >> sys/kern/kern_clock.c | 26 ++++++++++++++------------
> >> sys/kern/kern_tc.c    |  4 ++--
> >> sys/kern/subr_param.c |  2 +-
> >> sys/kern/subr_ticks.s | 44 =
> ++++++++++++++++++++++++++++++++++++++++++++
> >> sys/sys/kernel.h      |  9 +++++++++
> >> sys/sys/timetc.h      |  2 +-
> >> 7 files changed, 72 insertions(+), 16 deletions(-)
> >>=20
> >=20
> > See last paragraph.
> >=20
> > --- kernel.full ---
> > linking kernel.full
> > ld: error: undefined symbol: ticks
> >>>> referenced by cam_iosched.c:1426 =
> (/opt/src/git-src/sys/cam/cam_iosched.c
> > :1426)
> >>>>              cam_iosched.o:(cam_iosched_put_back_trim)
> >>>> referenced by cam_iosched.c:1452 =
> (/opt/src/git-src/sys/cam/cam_iosched.c
> > :1452)
> >>>>              cam_iosched.o:(cam_iosched_next_trim)
> >>>> referenced by cam_iosched.c:823 =
> (/opt/src/git-src/sys/cam/cam_iosched.c:
> > 823)
> >>>>              cam_iosched.o:(cam_iosched_get_trim)
> >>>> referenced 240 more times
> >>>> did you mean: tick
> >>>> defined in: subr_param.o
> >=20
> > ld: error: undefined symbol: ticksl
> >>>> referenced by subr_param.c:200 =
> (/opt/src/git-src/sys/kern/subr_param.c:2
> > 00)
> >>>>              subr_param.o:(init_param1)
> >>>> referenced by kern_clock.c:489 =
> (/opt/src/git-src/sys/kern/kern_clock.c:4
> > 89)
> >>>>              kern_clock.o:(hardclock)
> >>>> referenced by atomic.h:184 =
> (/opt/src/git-src/sys/amd64/include/atomic.h:
> > 184)
> >>>>              kern_clock.o:(hardclock)
> >>>> referenced 1 more times
> > *** [kernel.full] Error code 1
> >=20
> > make[2]: stopped making "all" in =
> /export/obj/opt/src/git-src/amd64.amd64/sys
> > /BREAK
> > make[2]: 1 error
> >=20
> > make[2]: stopped making "all" in =
> /export/obj/opt/src/git-src/amd64.amd64/sys
> > /BREAK
> >      652.14 real      4727.77 user       227.08 sys
> >=20
> > make[1]: stopped making "buildkernel" in /opt/src/git-src
> >=20
> > make: stopped making "buildkernel" in /opt/src/git-src
> >=20
> >=20
> > This (failing to link) only occurs with an incremental build; a clean=20=
>
> > rebuild (of /usr/obj/sys/KERNELNAME) circumvents this error. Should =
> this be=20
> > noted in UPDATING?
>
> Are you building with KERNFAST / NO_KERNELCONFIG? If so, yeah, that=E2=80=99=
> s
> to be expected any time new files are added that are needed by existing
> ones. If not, I have no idea how that could possibly happen, this =
> isn=E2=80=99t
> the kind of change that depend-cleanup.sh has to care about, and this
> kind of change happens all the time.

Yeah, you're right. I didn't notice the new file. My bad.


>
> Jess


-- 
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy@nwtime.org>    Web:  https://nwtime.org

			e^(i*pi)+1=0