From nobody Fri Nov 14 01:03:52 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 4d6zRX58SBz6GZNt; Fri, 14 Nov 2025 01:03:52 +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 4d6zRX4Mhsz3kdY; Fri, 14 Nov 2025 01:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763082232; 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=7uSE6FGiR6AlbF29WpSpPheMwfUesN57CxnQVWF5GN8=; b=Xpo6ZbSM8Ng5oW6TMxpDsJyUHgjRh91ecwNHvpFpiaYRFJIcdwq/eFBisZXvbCo4eZPPaQ KCtUH/CWtPFxtRIvrswS41+6kyzK4i6b/uDkMjYW2qW4yfipf8GfVbeN7afsGdcHwHqAGA q7T4oZdA0hEzmD/1e0ch2fBhgWmogQobW2eZ/nlAMbyDXIKvaaCC1i+C8/gqefWVRc4CVQ tSJy7RQQMkJ45dwtaJPf4n8gIRdCKAxtpZrlVV1T3jXu17CxRAngWfId9fyg/7CYvB/Xhh A1vsjJ7bS9+bCn/s8GrVecb5X3R+rv8VYGVmOkPWskBWg/MUcVtYq1+Rmj41Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763082232; 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=7uSE6FGiR6AlbF29WpSpPheMwfUesN57CxnQVWF5GN8=; b=ZejYLXEzB7zFf9MlrzqXldzU8hznlFcgRNtJKrdW6crxtJxUjijDIBADTFc0fRb3c45m+H fXh5RogQTVKWL98pt6c9AOEayGgxcCUYlMg+ATFrZHq2lDDSVYqMxAp2q8BsOijbviC1s6 eIbYfLPLMcHaxFTsITV6VfszRNV4WlgMmXGoiiNKeD6s0Lh419B6dhOtLuP2+b/77lvw3Z laFC9rtXvHkLq64+puz0CeFAduALpNsHIb3Ag205wAz/6icNuf5yt5bOqjW3BqUuHADNGR jDzjx3q656TeGTiMmF4NHB+xRT2IcugYrODhyWQrLISqr2ToPBtlArshA7KUuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763082232; a=rsa-sha256; cv=none; b=cjPSll9pZ1kEr2oJkZFbGFXFB8iwOGXLlNPCVXk2u6IQKnM9kc9hCNCzmNUZ+06UXx7iFd RDf/djGugMtLRB/+we4yLbMO04m/18gNNEjOAU5O4WzTRMuBCOHb8buk8llnKk5amEJG9R qBhQvXs6W6n3Y7IFjKHZY450NSTf2GKyLmPiXFTqKWq0U+ri5xolem2utIGt8qWHVEftI9 66c0AR1CZekuvKjg88KdCfXWvHDPFptKbknuX7LytOij3vW0tsdH/FNlWcvdkBIqsibN3f XHRnzHZX7fnhKPj9MaFMiJoZsSxMYhDThynvvPjFXCTJmCgJb3LzpjFPRAt57A== 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 4d6zRX3kbSzllQ; Fri, 14 Nov 2025 01:03:52 +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 5AE13qv0030430; Fri, 14 Nov 2025 01:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE13qxm030427; Fri, 14 Nov 2025 01:03:52 GMT (envelope-from git) Date: Fri, 14 Nov 2025 01:03:52 GMT Message-Id: <202511140103.5AE13qxm030427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: ea26fd52a949 - stable/15 - 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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea26fd52a949116d03f59066d364eee2af6c9f51 Auto-Submitted: auto-generated The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ea26fd52a949116d03f59066d364eee2af6c9f51 commit ea26fd52a949116d03f59066d364eee2af6c9f51 Author: Robert Clausecker AuthorDate: 2025-11-14 00:55:59 +0000 Commit: Robert Clausecker CommitDate: 2025-11-14 01:03:44 +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 60916a9fbd32..65d7ffc9b742 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];