From nobody Fri Nov 14 02:30:10 2025 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 4d71M70gkbz6Ghj5; Fri, 14 Nov 2025 02:30:11 +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 4d71M674S3z3sX3; Fri, 14 Nov 2025 02:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087411; 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=qNBeP4vd1eTvl7ke3UIIs50oM7z1yuRgl/MhdRImf4Y=; b=IB9gAblK5ypw1iBO7nSspg3s/4sIsYx527VK31KF7oVXGA/tjiGlGXCzyoHs0Ud6lYX6Tq U7SDTpngTICntuUElB9Yl1HOSpjpX3TRqfqEBhV5MOGeABYF+XWkPrRb53LKzyxWWelTYW zJqom0TCtWa211b6Mr9GqUgHesXOZ4a0FQ24WU3NKJMftmcm6wuQvRz5MyEhORMX+t0ynl nSMyJT1hGAegFWCqqdFh0lb0z92mX41JLOmtlnYaWvpmRFvHB+MRLBMySdbZ9LtdDXXhKx SJXvRuIKiQXZBMiteksoY5VfJuOYOs3Bq7BEDF3QHaRPi4gZZHOOoRAPeJ0bRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087411; 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=qNBeP4vd1eTvl7ke3UIIs50oM7z1yuRgl/MhdRImf4Y=; b=L1LdRhi1hqTOUkng908UYKTOoRC9O/J7MLFvlSXD6F8drB1kmZuZUVQd/Vy0av8V3cy2Yx 4fZEvpXhMSMJLrOrkPJMkt6wellRP/b6wJMt2K1G6bDLcG/V8cBcbOUZCJGA7t9hNm4OLj YJdK7aQwi+qweUaxUB1lQlTDiPJpvCEEr8PmMhWXaZG5+owjGx/PBveDmq9g5CSh9lH9aS DufCr/vfRko+/lJ5M0QHfq11RvlL6xv+KZWYjhxDmIGBoqPurgIrfZ5tsT6kxhgNI82666 7IyT9+TdFPlZlD3miVJxNE/mHWoXObai78rNSjDes69u10NJf96QZ+KifSe1vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087411; a=rsa-sha256; cv=none; b=qjOaIWTAC1+Ig1Mq24w9W1DXM1OcAxu0+vSbADkgyJ0c1kOkklJluKSF/n4/2/ZIXbGrGC Zm67zt2fe8xJmm0OdaOzj/bqDcUMMSgdQVFCFAHzTVqoQ901URroeznFVCUcYNsSsOG6yA cf5t7VP7JhRZRgkAMA97Jcxpr88n6xtBT1o4xTrgCr+bonC4dzwOz5fUutaTyvVNToNqlI szne3ywK8904CcHygfolJbNI3Fg8qw1gnqDlRyzMLMjMA2gkJWPzD0DZKvgqXeIh8bnIW2 oW2qvpq2HmEANZFXzsuJWQ/bDxYCMut+Vxcl1rIgaLwCvH2nrIQO7B3hSiSYOw== 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 4d71M66Ttjznb4; Fri, 14 Nov 2025 02:30:10 +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 5AE2UAGZ086417; Fri, 14 Nov 2025 02:30:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2UA1e086408; Fri, 14 Nov 2025 02:30:10 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:30:10 GMT Message-Id: <202511140230.5AE2UA1e086408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: cb9075718bc6 - releng/15.0 - aio: fix alignment of struct (o)aiocb32 on non-amd64 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: cb9075718bc66844c6d25fed1df18de61af5267b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cb9075718bc66844c6d25fed1df18de61af5267b commit cb9075718bc66844c6d25fed1df18de61af5267b Author: Robert Clausecker AuthorDate: 2025-11-14 00:55:59 +0000 Commit: Colin Percival CommitDate: 2025-11-14 02:27:28 +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. Approved by: re (cperciva) Fixes: 3858a1f4f501d00000447309aae14029f8133946 Approved by: markj (mentor) Reported by: Mark Millard Discussed with: jrtc27 PR: 290962 MFC after: immediately (for 15.0) (cherry picked from commit ea26fd52a949116d03f59066d364eee2af6c9f51) --- 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 e63fa4c01434..a81aafb2ecc4 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2750,7 +2750,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 */ @@ -2762,7 +2766,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];