From nobody Tue Jan 24 22:12:34 2023 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 4P1h6W1CWMz3bfyS; Tue, 24 Jan 2023 22:12:35 +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 4P1h6W0jc8z3DRX; Tue, 24 Jan 2023 22:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598355; 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=9kvUckfE6KGzyOqUdt4QrRuD+AxTWQdqCfCTN1wx+L8=; b=OmgfvIzm8bkMCf/JlUHQyIK1yKvH3bOJ+VjbSfNGR7WaUNfl5i5PLjizuUZ0ROBkWwkSWV eT3CT6/sNb6O8vnvhHfiBGvDOGmUpO8H4hWx8nuMwXw0E8mRLLGOcQ05ZUFdJv8VmDsLvC UI8jVdKDb5uEq/KYH/3/tphwNeJPxqQNFcxPT2gM1Z4tllRrVakNqA2qFzxSt9jVTUVYAs Cpa32DDUPD+sFQc2gobRatPhPKIUIP/m8wn32I6NBKVXGRbXgpxi2DvGPkK8AVtf9FoAg+ uqmR/J1yinCWC9Z+QOzT0IJWX1IUVDCpikkhYoryRaFtKl05kQY/AulTXb6Few== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598355; 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=9kvUckfE6KGzyOqUdt4QrRuD+AxTWQdqCfCTN1wx+L8=; b=A038OSh7UNajNg6aPT6Bxc62HarunXcDPv+6Vz/Xus9rzxk3Yt1EUxLGpL3vw8kPHy3UYK zO46RFTlnG22P4mb2cWytwa8i08Fzr6FXMUVHPrqCCCTzQFnIDwjmZeIx6/l5LJsuaRACZ bLF2CX4IsdFijnWxcUEubJ/2B1WcrPakqz+tZmciAt/6/LjDGvCnYXe/mAzzWitxo/yftT sS+NonS3dERZlr9a7peY9mcfQ+hMoHsxZuXnxdHPsdmF0ETL0hIcBvUK3jQ7JKu7811aJs g2AfElvJd840dIY5UrvnVAp8PGjScRsq816kq2R0bT6Itb8B38sGJLRBfSexIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598355; a=rsa-sha256; cv=none; b=OuhDlTbEfEmdeHzwXqrsSYyYFxHN3KYJYlw5TYrTc+jxNhV7491S1RMTjoBGF15PwFugli qOzGulFufGheDGNr2ifcKOIIGMaWxs2Il/YpvVN/Y+GU3FvMPIGbeNa5t2ipBJYntLp/nH HIWB4BE1cEhoAj3DgolO8ROn7g4pHRAkGTxqL2h94dR3/lJXY9DAFxSpVH+3cvnc5Z2TZy 0m1y/xZw7QS6ap6UMtfflmrxV1CDeJloRyI7cSHPw9iuqhXUe9S0d9n1hEFbdwcMRHtU9Y BSwW2CmixkQ3LWel2mbeUkwQYmOGDhB8tTXW8nmsmVf9W052RR9kfsJHTvsdAA== 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 4P1h6V6syjzQYD; Tue, 24 Jan 2023 22:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMCYQ0087219; Tue, 24 Jan 2023 22:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCYZw087218; Tue, 24 Jan 2023 22:12:34 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:34 GMT Message-Id: <202301242212.30OMCYZw087218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9bc956361bcc - stable/13 - stand: Create MOD_ALIGN macro and use it everywhere 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9bc956361bccb51a1349f4c903bfe1462f3b16cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9bc956361bccb51a1349f4c903bfe1462f3b16cf commit 9bc956361bccb51a1349f4c903bfe1462f3b16cf Author: Warner Losh AuthorDate: 2022-09-16 15:08:37 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:34 +0000 stand: Create MOD_ALIGN macro and use it everywhere To further reduce the differences between the different MOD_xxx macros, use MOD_ALIGN to do the proper alignment for the given use. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D36570 (cherry picked from commit 8b19d28d68a396b0263e3c13a559a31f70eb3b1d) --- stand/common/metadata.c | 7 ++++--- stand/efi/loader/bootinfo.c | 9 +++++---- stand/i386/libi386/bootinfo32.c | 7 ++++--- stand/i386/libi386/bootinfo64.c | 7 ++++--- stand/userboot/userboot/bootinfo32.c | 7 ++++--- stand/userboot/userboot/bootinfo64.c | 7 ++++--- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/stand/common/metadata.c b/stand/common/metadata.c index a9c81added02..cb92537d1ce2 100644 --- a/stand/common/metadata.c +++ b/stand/common/metadata.c @@ -111,6 +111,7 @@ md_copyenv(vm_offset_t addr) static int align; +#define MOD_ALIGN(l) roundup(l, align) #define COPY32(v, a, c) { \ uint32_t x = (v); \ if (c) \ @@ -123,7 +124,7 @@ static int align; COPY32(strlen(s) + 1, a, c) \ if (c) \ archsw.arch_copyin(s, a, strlen(s) + 1);\ - a += roundup(strlen(s) + 1, align); \ + a += MOD_ALIGN(strlen(s) + 1); \ } #define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) @@ -135,7 +136,7 @@ static int align; COPY32(sizeof(s), a, c); \ if (c) \ archsw.arch_copyin(&s, a, sizeof(s)); \ - a += roundup(sizeof(s), align); \ + a += MOD_ALIGN(sizeof(s)); \ } #define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) @@ -146,7 +147,7 @@ static int align; COPY32(mm->md_size, a, c); \ if (c) \ archsw.arch_copyin(mm->md_data, a, mm->md_size);\ - a += roundup(mm->md_size, align); \ + a += MOD_ALIGN(mm->md_size); \ } #define MOD_END(a, c) { \ diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 7f1a2f840f78..542f15a471d9 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -182,6 +182,7 @@ bi_copyenv(vm_offset_t start) * MOD_SIZE sizeof(size_t) module size * MOD_METADATA (variable) type-specific metadata */ +#define MOD_ALIGN(l) roundup(l, sizeof(u_long)) #define COPY32(v, a, c) { \ uint32_t x = (v); \ if (c) \ @@ -194,7 +195,7 @@ bi_copyenv(vm_offset_t start) COPY32(strlen(s) + 1, a, c); \ if (c) \ archsw.arch_copyin(s, a, strlen(s) + 1); \ - a += roundup(strlen(s) + 1, sizeof(u_long)); \ + a += MOD_ALIGN(strlen(s) + 1); \ } #define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) @@ -206,7 +207,7 @@ bi_copyenv(vm_offset_t start) COPY32(sizeof(s), a, c); \ if (c) \ archsw.arch_copyin(&s, a, sizeof(s)); \ - a += roundup(sizeof(s), sizeof(u_long)); \ + a += MOD_ALIGN(sizeof(s)); \ } #define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) @@ -216,8 +217,8 @@ bi_copyenv(vm_offset_t start) COPY32(MODINFO_METADATA | mm->md_type, a, c); \ COPY32(mm->md_size, a, c); \ if (c) \ - archsw.arch_copyin(mm->md_data, a, mm->md_size); \ - a += roundup(mm->md_size, sizeof(u_long)); \ + archsw.arch_copyin(mm->md_data, a, mm->md_size); \ + a += MOD_ALIGN(mm->md_size); \ } #define MOD_END(a, c) { \ diff --git a/stand/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c index dd919d0fad93..207fe9a3fde8 100644 --- a/stand/i386/libi386/bootinfo32.c +++ b/stand/i386/libi386/bootinfo32.c @@ -59,6 +59,7 @@ static struct bootinfo bi; * MOD_SIZE sizeof(size_t) module size * MOD_METADATA (variable) type-specific metadata */ +#define MOD_ALIGN(l) roundup(l, sizeof(u_long)) #define COPY32(v, a, c) { \ uint32_t x = (v); \ if (c) \ @@ -71,7 +72,7 @@ static struct bootinfo bi; COPY32(strlen(s) + 1, a, c); \ if (c) \ archsw.arch_copyin(s, a, strlen(s) + 1); \ - a += roundup(strlen(s) + 1, sizeof(u_long));\ + a += MOD_ALIGN(strlen(s) + 1); \ } #define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) @@ -83,7 +84,7 @@ static struct bootinfo bi; COPY32(sizeof(s), a, c); \ if (c) \ archsw.arch_copyin(&s, a, sizeof(s)); \ - a += roundup(sizeof(s), sizeof(u_long)); \ + a += MOD_ALIGN(sizeof(s)); \ } #define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) @@ -94,7 +95,7 @@ static struct bootinfo bi; COPY32(mm->md_size, a, c); \ if (c) \ archsw.arch_copyin(mm->md_data, a, mm->md_size); \ - a += roundup(mm->md_size, sizeof(u_long));\ + a += MOD_ALIGN(mm->md_size); \ } #define MOD_END(a, c) { \ diff --git a/stand/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c index 1e06c229ec30..e088c27347be 100644 --- a/stand/i386/libi386/bootinfo64.c +++ b/stand/i386/libi386/bootinfo64.c @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); * MOD_SIZE sizeof(size_t) module size * MOD_METADATA (variable) type-specific metadata */ +#define MOD_ALIGN(l) roundup(l, sizeof(uint64_t)) #define COPY32(v, a, c) { \ uint32_t x = (v); \ if (c) \ @@ -72,7 +73,7 @@ __FBSDID("$FreeBSD$"); COPY32(strlen(s) + 1, a, c); \ if (c) \ archsw.arch_copyin(s, a, strlen(s) + 1); \ - a += roundup(strlen(s) + 1, sizeof(uint64_t));\ + a += MOD_ALIGN(strlen(s) + 1); \ } #define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) @@ -84,7 +85,7 @@ __FBSDID("$FreeBSD$"); COPY32(sizeof(s), a, c); \ if (c) \ archsw.arch_copyin(&s, a, sizeof(s)); \ - a += roundup(sizeof(s), sizeof(uint64_t)); \ + a += MOD_ALIGN(sizeof(s)); \ } #define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) @@ -95,7 +96,7 @@ __FBSDID("$FreeBSD$"); COPY32(mm->md_size, a, c); \ if (c) \ archsw.arch_copyin(mm->md_data, a, mm->md_size); \ - a += roundup(mm->md_size, sizeof(uint64_t));\ + a += MOD_ALIGN(mm->md_size); \ } #define MOD_END(a, c) { \ diff --git a/stand/userboot/userboot/bootinfo32.c b/stand/userboot/userboot/bootinfo32.c index 26376709e899..bd2729927349 100644 --- a/stand/userboot/userboot/bootinfo32.c +++ b/stand/userboot/userboot/bootinfo32.c @@ -58,6 +58,7 @@ static struct bootinfo bi; * MOD_SIZE sizeof(size_t) module size * MOD_METADATA (variable) type-specific metadata */ +#define MOD_ALIGN(l) roundup(l, sizeof(uint32_t)) #define COPY32(v, a, c) { \ uint32_t x = (v); \ if (c) \ @@ -70,7 +71,7 @@ static struct bootinfo bi; COPY32(strlen(s) + 1, a, c); \ if (c) \ archsw.arch_copyin(s, a, strlen(s) + 1);\ - a += roundup(strlen(s) + 1, sizeof(uint32_t));\ + a += MOD_ALIGN(strlen(s) + 1); \ } #define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) @@ -82,7 +83,7 @@ static struct bootinfo bi; COPY32(sizeof(s), a, c); \ if (c) \ archsw.arch_copyin(&s, a, sizeof(s)); \ - a += roundup(sizeof(s), sizeof(uint32_t)); \ + a += MOD_ALIGN(sizeof(s)); \ } #define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) @@ -93,7 +94,7 @@ static struct bootinfo bi; COPY32(mm->md_size, a, c); \ if (c) \ archsw.arch_copyin(mm->md_data, a, mm->md_size);\ - a += roundup(mm->md_size, sizeof(uint32_t));\ + a += MOD_ALIGN(mm->md_size); \ } #define MOD_END(a, c) { \ diff --git a/stand/userboot/userboot/bootinfo64.c b/stand/userboot/userboot/bootinfo64.c index f2713adf5513..5fffb04d8d75 100644 --- a/stand/userboot/userboot/bootinfo64.c +++ b/stand/userboot/userboot/bootinfo64.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); * MOD_SIZE sizeof(size_t) module size * MOD_METADATA (variable) type-specific metadata */ +#define MOD_ALIGN(l) roundup(l, sizeof(uint64_t)) #define COPY32(v, a, c) { \ uint32_t x = (v); \ if (c) \ @@ -67,7 +68,7 @@ __FBSDID("$FreeBSD$"); COPY32(strlen(s) + 1, a, c); \ if (c) \ archsw.arch_copyin(s, a, strlen(s) + 1);\ - a += roundup(strlen(s) + 1, sizeof(uint64_t));\ + a += MOD_ALIGN(strlen(s) + 1); \ } #define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) @@ -79,7 +80,7 @@ __FBSDID("$FreeBSD$"); COPY32(sizeof(s), a, c); \ if (c) \ archsw.arch_copyin(&s, a, sizeof(s)); \ - a += roundup(sizeof(s), sizeof(uint64_t)); \ + a += MOD_ALIGN(sizeof(s)); \ } #define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) @@ -90,7 +91,7 @@ __FBSDID("$FreeBSD$"); COPY32(mm->md_size, a, c); \ if (c) \ archsw.arch_copyin(mm->md_data, a, mm->md_size);\ - a += roundup(mm->md_size, sizeof(uint64_t));\ + a += MOD_ALIGN(mm->md_size); \ } #define MOD_END(a, c) { \