From nobody Fri Aug 18 12:41:17 2023 X-Original-To: dev-commits-src-all@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 4RS1hF62Gdz4qSmc; Fri, 18 Aug 2023 12:41:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS1hF5TTwz4Ncv; Fri, 18 Aug 2023 12:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692362477; 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=FfUoGNuvkozaCESijGNDbZVu//s89Y1bGSuIOthw+To=; b=JV7iNXDMewWyNhwYYrlkVefI/rYrmnGuBPKhtK8zbgE278ecbxXqSbm4D8h5zk5GKrBy6z WLviH63QwBWBOwXPulSqfI54DbEAqhReA74OmkazM+fy24hcFcR3SmHjV34bESpv9TLI28 QMMthPjNRKNbWVnlKdM/6jOsKBfxfQGgPJD6Jrjr2kjqDT7YM1gL2dL8Yedx6oLhsEFQA/ iFaMb1Hgpvnhhj8L77sbwN17i2uEYPNyGVKHWgj8FY72WHf6ENG/kXASNhIvf50K5S+A7l tElNSeU2Sv7E0FSkM8b2MSF3N4tP5LGM95OgEMxoJPh1ab/sh/8o6/YsfFbpGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692362477; 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=FfUoGNuvkozaCESijGNDbZVu//s89Y1bGSuIOthw+To=; b=Cj2EZxz1q2C+sW4s5dW2limaItu/eju2qh1nvDGCsYCj2wq3sf7A39fspKQJdN3sI0kYkT tTujfngYlQ63I71DFYF75ctLguYyalxqYcB96uPjWrRTCmpTJN4pvPIrL1qvgYFa8qKd9j 0zje9fR1ZqJfluQQXbAFR6yptHW64LV+XID/LyA6UCMJPbC/BpFOfh7qyvirGy2kGmZ+jv v5QE3RRhf/Ja28cFlVhDbTup4VnBUz+CITJvHCotIS3GCbTdQv7wBGu7K1qUhfEWV+CZrk /sLtul83hrNdFc2HvNSWbsCHLywTNNAZ9sLbdL8kmiNqus+Xcw9fh6iIyxuNJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692362477; a=rsa-sha256; cv=none; b=NLj6CYG9eEwb8N1kh8ry3x95gk778zluD80n7TT3b91/keAinZ7oMi50XAENe0Y2ihNzU0 x2nWcu6li+OyBaL1z+AUm5KbS1bWN+o01jk/k1u/CLF9+nCfAhAS1BPzjlOrACA40hUvn3 rd/rx1geMlTS1XxmR7HVmgsshHX4AqpndRuHHgvINgFzwCb3oLUB/TapL2xu9i1UqBKt4A auyighhspr6J+Ye+Q0JU+1SRuB1bdlprHJ+6ovwX0XyEhZDduL9ytnGKegWTWtHKXu3wZu E4nWex+c7PwrftTChU8EtemznrR5jt7GHV3AB7yQEfJGpAL0Eb3rEt2S3NlbqQ== 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 4RS1hF4XD0z1qX; Fri, 18 Aug 2023 12:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ICfHr8064250; Fri, 18 Aug 2023 12:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ICfHtX064247; Fri, 18 Aug 2023 12:41:17 GMT (envelope-from git) Date: Fri, 18 Aug 2023 12:41:17 GMT Message-Id: <202308181241.37ICfHtX064247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 55b79ced0048 - stable/12 - md driver compat32: fix structure padding for arm, powerpc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 55b79ced0048e9015053ccfd96cf7f38be49ecbf Auto-Submitted: auto-generated The branch stable/12 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=55b79ced0048e9015053ccfd96cf7f38be49ecbf commit 55b79ced0048e9015053ccfd96cf7f38be49ecbf Author: Mike Karels AuthorDate: 2023-08-08 14:09:03 +0000 Commit: Mike Karels CommitDate: 2023-08-18 12:41:06 +0000 md driver compat32: fix structure padding for arm, powerpc Because the 32-bit md_ioctl structure contains 64-bit members, arm and powerpc add padding to a multiple of 8. i386 doesn't do this. The md_ioctl32 definition was correct for amd64/i386 without padding, but wrong for arm64 and powerpc64. Make __packed__ conditional on __amd64__, and test for the expected size on non-amd64. Note that mdconfig is used in the ATF test suite. Note, I verified the structure size for powerpc, but was unable to test. Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D41339 Discussed with: jhibbits (cherry picked from commit 58a46cfd751ac726ddca8544bf73a290b0154a57) --- sys/dev/md/md.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 641dff4f45d3..73e3bf578019 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -145,8 +145,16 @@ struct md_ioctl32 { int md_fwsectors; uint32_t md_label; int md_pad[MDNPAD]; -} __attribute__((__packed__)); +} +#ifdef __amd64__ +__attribute__((__packed__)) +#endif +; +#ifndef __amd64__ +CTASSERT((sizeof(struct md_ioctl32)) == 440); +#else CTASSERT((sizeof(struct md_ioctl32)) == 436); +#endif #define MDIOCATTACH_32 _IOC_NEWTYPE(MDIOCATTACH, struct md_ioctl32) #define MDIOCDETACH_32 _IOC_NEWTYPE(MDIOCDETACH, struct md_ioctl32)