From nobody Thu Mar 5 14:44:14 2026 X-Original-To: dev-commits-src-branches@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 4fRXNt5LlGz6T7bF for ; Thu, 05 Mar 2026 14:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fRXNt4CmXz3S4k for ; Thu, 05 Mar 2026 14:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772721854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CJoB7cHHWFSYzCmpimhoQRk0BqYVIRmFuTlhyHiFS8s=; b=OLMN+u+whABB1r3b+GO92dJTa9QHasqS35dppmpG4V3OkyT3nN9ATTY8gRFNWH3VaQ7tgU IuoTCswFcrmp8kQBwaZZbriB596sUjHTtNfK2EO65iDlSk+zQYDzeOMf5xL5qjK3UKts6U WUUvhjOnp5amKlxH+NiijMBFVAYoCFw5xo1eyNW0ZN7HYqmrCRIPeBHPiWxo/rPiXTNE4h Ppn2gomL7QdD/IeVy9QKoN1GlQkDRgjaPxmBpDM4h9x9YOaSGlraDZOdYiXCkzbAxjnep9 JsI2SOeB5QIXGPRHOq5xalgL3mFD4yk/BAHRIrUO8AYzwEqvsRccu8xQdRC8nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772721854; a=rsa-sha256; cv=none; b=YdKbbFer7oO8Iw+xRGrXDCJs5U+aLADOVUeSJoNzKqD+8RRk/WQlP8qcn0mF7tKHeMLtQu eMikfXpExUMdsYAmzZjeskYzNEM0vC7D9FSlllS7GRX+pVfDkP/6iO6KtVqYvrzBKszKwN quPDY8IvIo3c3E2N21bPKntNtnaH8hO60k5bDg/QuiK4TAds1TzRxomcC7CHh3fXmNw4W+ 51qNR9G387l4HHonHQrXtnrzcp4eEXYht3Y2PxbjjmvuozJLKF+Hpri+cGHmNkGp0pbZuW fmHDPVC2N5kHy023NJ4mG3IbFtNSUmiDXfZBcedtMBrHr/4nR2wzAUWlLA0hgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772721854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CJoB7cHHWFSYzCmpimhoQRk0BqYVIRmFuTlhyHiFS8s=; b=Ycg1yJVNm97F9Ng7MTMQ94b2YLaq1oMhbhD1gl2V/gyhrKHl18gtr9kVNgdLvw14GYCFQ2 wBGyZV4NFLRwpueEWpFX02/qtLQ0gRS/akqwo8GAruQ6eyC3bBW8UZEJypCSJeVlMfWYUx wNfAJV4AktMu8FGqzhC4SjeUEVmTQ8j/JRQpBusDfdxGu5cbZ4cFGnAYVVFEI1kKpgdMB/ lqpum48g0W25A88hLiZQxuMCde8+kZKAwxLnVP/pIsajJ7YoZN21jk2f7cciNlKgiyvA1J 05ZMh6/Z79SWjKFpA8hn7jYlHDk39yS41a9/SViXfo64+1rjIputu70htD9QAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRXNt3WSczhZP for ; Thu, 05 Mar 2026 14:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25c6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 14:44:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 5a334f0455db - stable/15 - sys/compat/freebsd32: FF clock struct: Don't pack, use 'ffcounter32' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5a334f0455dbb5c7cbd50bd023a422ce67a3939b Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 14:44:14 +0000 Message-Id: <69a996be.25c6c.515c5c04@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5a334f0455dbb5c7cbd50bd023a422ce67a3939b commit 5a334f0455dbb5c7cbd50bd023a422ce67a3939b Author: Olivier Certner AuthorDate: 2026-02-13 17:03:31 +0000 Commit: Olivier Certner CommitDate: 2026-03-05 14:43:25 +0000 sys/compat/freebsd32: FF clock struct: Don't pack, use 'ffcounter32' Packing 'struct ffclock_estimate32', in absence of substitution of 'ffcounter' (some 'uint64_t') by a 32-bit compatible type, was necessary on amd64 since 'uint64_t' is 8-byte aligned, which leaves a padding gap of 4-byte between fields 'update_time' and 'update_ffcount'. This gap does not exist on i386 (or amd64 32-bit mode), as 'uint64_t' there is only 4-byte aligned. Change the type of the 'update_ffcount' and 'leapsec_next' fields to the recently introduced 'freebsd32_uint64_t', and adapt copy-in and copy-out accordingly. Using `CP()` previously worked due to the '__packed__' attribute. Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55282 (cherry picked from commit 7c2fc4419db43a8a7d1886b0b8e08aa97bfa31e4) --- sys/compat/freebsd32/freebsd32.h | 12 +++++------- sys/compat/freebsd32/freebsd32_misc.c | 8 ++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 13fe77228684..18f99df4b154 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -57,8 +57,8 @@ struct bintime32 { struct ffclock_estimate32 { struct bintime32 update_time; - ffcounter update_ffcount; - ffcounter leapsec_next; + freebsd32_uint64_t update_ffcount; + freebsd32_uint64_t leapsec_next; freebsd32_uint64_t period; uint32_t errb_abs; uint32_t errb_rate; @@ -66,11 +66,9 @@ struct ffclock_estimate32 { int16_t leapsec_total; int8_t leapsec; int8_t _pad; -} -#if defined(__amd64__) -__attribute__((packed)) -#endif -; +}; +_Static_assert(sizeof(ffcounter) == sizeof(freebsd32_uint64_t), + "'ffcounter' size discrepancy'"); #if defined(__amd64__) || defined(__i386__) _Static_assert(sizeof(struct ffclock_estimate32) == 52, "ffclock_estimate32 size"); #else diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 457e599c22d2..1064987c3abf 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4147,8 +4147,8 @@ freebsd32_ffclock_setestimate(struct thread *td, CP(cest.update_time, cest32.update_time, sec); memcpy(&cest.update_time.frac, &cest32.update_time.frac, sizeof(uint64_t)); - CP(cest, cest32, update_ffcount); - CP(cest, cest32, leapsec_next); + FU64_CP(cest, cest32, update_ffcount); + FU64_CP(cest, cest32, leapsec_next); FU64_CP(cest, cest32, period); CP(cest, cest32, errb_abs); CP(cest, cest32, errb_rate); @@ -4177,8 +4177,8 @@ freebsd32_ffclock_getestimate(struct thread *td, CP(cest32.update_time, cest.update_time, sec); memcpy(&cest32.update_time.frac, &cest.update_time.frac, sizeof(uint64_t)); - CP(cest32, cest, update_ffcount); - CP(cest32, cest, leapsec_next); + FU64_CP(cest32, cest, update_ffcount); + FU64_CP(cest32, cest, leapsec_next); FU64_CP(cest32, cest, period); CP(cest32, cest, errb_abs); CP(cest32, cest, errb_rate);