From nobody Fri Nov 14 01:03:22 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 4d6zQz1pNRz6GZ4Y; Fri, 14 Nov 2025 01:03:23 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6zQz1FRHz3k3q; Fri, 14 Nov 2025 01:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763082203; 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=ejS0muBbhWWP5omxMIUi2WfSJUapONMFpT/rAdBClAo=; b=Nh03b8PapxCOEuhGxqktHKfxPGtN5i78z88MvnfQkHcax3/EM3hFYe0yQtHLIrFa2ocxSy gTkTR50cch5Z6zNWMd+lpxnl6F/Mu5+6Yg1Uyh4GAIKC0m7S7YCukoyQJdlpMN2sfXpMCb 3ij0+Pf5YNLNrVxY2Ix7Q/bFzZz5hSOsCPLQE6LsPijDo/b0VRXIg/eJZ85QXTrdqnBmC7 QOJnTWPhe2f8zKIjXmaESkMfj+UbTlrSzb4WjXvpEndjdfFS+EMkgjBCyy6wlTtF/ww/Ff rwIMxrr4ND+H23lAwtfyt+jfhhqq8q3czSq9pGTm6id0RteYuFm35L2Da7mEhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763082203; 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=ejS0muBbhWWP5omxMIUi2WfSJUapONMFpT/rAdBClAo=; b=TPhjt+uJQxW14CASiO4PyajVC2rH0ASvaIHeEyAwAwF8Qt3woSwHIey1c+e3xAhR5EQ/YJ imeHEx6ikX9fC/xVNSVfuO6KnDqw3tnCRaChOcN948yyKHyon20OvNub1kMO2JnRCGR/VP eNFtbrXCAuY7bkBpKfCOt7ZvnX8ynPamH0cEz9dnTaSAMp6T/BZwzA6U/pkmyw6ws8pDfb tGOKDXvP/1+GYvnYOQ+kFTNLWbP2BoKHsF5SBAx7fWsnotg6nCTwGYEZSnZM4FpeJAdDGK figIrkM0EElRnW3yIT3sIo3btp14L3cxvCGLj7LccMBD/cHtidcihUBeS82JyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763082203; a=rsa-sha256; cv=none; b=eglfhBYDsrivwhcauDcdD+6T4E4NHTFvnnrfJdl8+mDmf895gaC69ByYmzK2CFwIm/GVRQ 1e7GTkI6/YD4kzK5xyg3cgZhHSOfwUA/ZDOXNQW2AkgEd0XoXD59P5zLyEa1ydHT6KnwgP Al3gXrEPgX3qykiUN4AhMuNcx/+olwSizGbopkTZjk9pNHdemZ2OpxXqZPe13u1Gp2j2KX W5ezssaTftgIZUOZvxXypje1MBi0e3Yb9GQBGtGohI3duQDa+jv0FsPTjPWuzot8OVnvOR 84hFDFrHA0E66koWvG9Dgv9o23ircIo7FRA2TlDD/9sy2jD18vySnvsHeVombA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d6zQz0cp1zlH9; Fri, 14 Nov 2025 01:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE13M1o030138; Fri, 14 Nov 2025 01:03:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE13M7e030135; Fri, 14 Nov 2025 01:03:22 GMT (envelope-from git) Date: Fri, 14 Nov 2025 01:03:22 GMT Message-Id: <202511140103.5AE13M7e030135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: f0af21824331 - main - aio: fix alignment of struct (o)aiocb32 on non-amd64 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0af21824331648a41b4e5d3323bea9216bcb7e2 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0af21824331648a41b4e5d3323bea9216bcb7e2 commit f0af21824331648a41b4e5d3323bea9216bcb7e2 Author: Robert Clausecker AuthorDate: 2025-11-14 00:55:59 +0000 Commit: Robert Clausecker CommitDate: 2025-11-14 00:56:12 +0000 aio: fix alignment of struct (o)aiocb32 on non-amd64 Only i386 has a four-byte alignment for uint64_t, others have eight-byte alignment. This causes the structure to mismatch on armv7 binaries running under aarch64, breaking the aio interface. Fixes: 3858a1f4f501d00000447309aae14029f8133946 Approved by: markj (mentor) Reported by: Mark Millard Discussed with: jrtc27 PR: 290962 MFC after: immediately (for 15.0) --- sys/kern/vfs_aio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 02d4b8426757..2a790237d30e 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2752,7 +2752,11 @@ struct __aiocb_private32 { #ifdef COMPAT_FREEBSD6 typedef struct oaiocb32 { int aio_fildes; /* File descriptor */ +#ifdef __amd64__ uint64_t aio_offset __packed; /* File offset for I/O */ +#else + uint64_t aio_offset; /* File offset for I/O */ +#endif uint32_t aio_buf; /* I/O buffer in process space */ uint32_t aio_nbytes; /* Number of bytes for I/O */ struct osigevent32 aio_sigevent; /* Signal to deliver */ @@ -2764,7 +2768,11 @@ typedef struct oaiocb32 { typedef struct aiocb32 { int32_t aio_fildes; /* File descriptor */ +#ifdef __amd64__ uint64_t aio_offset __packed; /* File offset for I/O */ +#else + uint64_t aio_offset; /* File offset for I/O*/ +#endif uint32_t aio_buf; /* I/O buffer in process space */ uint32_t aio_nbytes; /* Number of bytes for I/O */ int __spare__[2];