From nobody Fri Jan 10 16:47:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YV6yp3VQpz5kcvS; Fri, 10 Jan 2025 16:47:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YV6yp1GjNz42vL; Fri, 10 Jan 2025 16:47:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id WHhot57pSIx4rWIAjtB4QM; Fri, 10 Jan 2025 16:47:45 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id WIAhtX3Q9l5eGWIAit6IC6; Fri, 10 Jan 2025 16:47:45 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=EO6l0EZC c=1 sm=1 tr=0 ts=67814f31 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=VdSt8ZQiCzkA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=JJpr4wqB_PATpTUgcekA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E602E7CC; Fri, 10 Jan 2025 08:47:42 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id B31513AF; Fri, 10 Jan 2025 08:47:42 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mark Johnston cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 6b82130e6c9a - main - clock: Add a long ticks variable, ticksl In-reply-to: <202501101600.50AG0jk6062308@gitrepo.freebsd.org> References: <202501101600.50AG0jk6062308@gitrepo.freebsd.org> Comments: In-reply-to Mark Johnston message dated "Fri, 10 Jan 2025 16:00:45 +0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 10 Jan 2025 08:47:42 -0800 Message-Id: <20250110164742.B31513AF@slippy.cwsent.com> X-CMAE-Envelope: MS4xfGBq8WCGZi78cmPqUnnGWLtz3EcXlOkift4Ss89uuZNQ5/rScJht4uxDncxwvibGr+SqOLpTeax2a3R+k+fEhAdqAicLREffkegvDlVeu4L4SWX0Gul7 Zl0CH6vFhwRYbsLR2jX0dri9P+WM33TnfgmjfHBbJZL1ZVFOnA3ET+Zgd95hh5KrSWjnfOACSY0KqwjvWbey4OL2K3K8x2ufPuQpCGP1q5OJ4oqwzCXmwlRL 68QwRtQRlxf410TGw5Qx/pYsYLs63Z0JMKtBg0I1O3JCBAZzYFDZTw2Dllrv/++YEttIb1YjtIr+7B2MpZP1YhWidRwb5OzspG9RcoF48io= X-Rspamd-Queue-Id: 4YV6yp1GjNz42vL X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message <202501101600.50AG0jk6062308@gitrepo.freebsd.org>, Mark Johnston wri tes: > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6b82130e6c9add4a8892ca897df5a0ec > 04663ea2 > > commit 6b82130e6c9add4a8892ca897df5a0ec04663ea2 > Author: Mark Johnston > AuthorDate: 2025-01-10 15:37:07 +0000 > Commit: Mark Johnston > CommitDate: 2025-01-10 15:42:59 +0000 > > clock: Add a long ticks variable, ticksl > > 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. > > 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. > > 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(-) > See last paragraph. --- 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 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 make[2]: stopped making "all" in /export/obj/opt/src/git-src/amd64.amd64/sys /BREAK make[2]: 1 error 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 make[1]: stopped making "buildkernel" in /opt/src/git-src make: stopped making "buildkernel" in /opt/src/git-src This (failing to link) only occurs with an incremental build; a clean rebuild (of /usr/obj/sys/KERNELNAME) circumvents this error. Should this be noted in UPDATING? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0