From nobody Thu Mar 5 11:13:23 2026 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 4fRRjc3qSFz6SqnC for ; Thu, 05 Mar 2026 11:13:24 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fRRjc09pJz40BR for ; Thu, 05 Mar 2026 11:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772709204; 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=p/xz7zJ0d/aGQnUBFaGJhtKvmDaeMZZtbTSkoTk5nm0=; b=x1Mtw2CYvbcEaa7n6/oB7SciZffiKyoaiId8J1QK9zbxkaDudxm1JhijpdTq4ke/nSNXGb 4v9aGewi+1WjIFAnAfaKmehrT3eiXfYDjnj+gZq67pbKedSWz3aFXJZFOgXkigCk5R5m47 tp1h+xdHFXbiccjw5ld4o0PAHFff2Krnub2NBrYDlJVkZtZwM0Rbsjtdvqr1HOYuidRV3N nRcqDBp5SVVb5ZbJ5eHDD45PFaDpi90OsmBNB8rCd5340tlsCeUVWf6tw4ZXwexJGmEzyA W+F0bYT896aqlaWWhZBqAQwb+ctKUBSEtmd+zSc0qBtkoKhMNN8Ozz9/J7WgAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772709204; a=rsa-sha256; cv=none; b=kkVKA2wKH0S8mVNvBxf0M4rET7YYqkb/jaBdXzgQxk7nsbdys52mSu87glIQxDjMJQVRHn UyU8h46WEkt/wEbUmYUITPX6wb7d/HcYCtjvke/ldf5NuXZGlzdaDL3zvx5AmAXuIPw4p9 rTV7+jYFj4ZXUy4OZqkiG5DtNKAZVqs5oBm04lqnPV5JmouJxP0lXLw2pHjFPy7dFa1gYw JNz4/ESyk31MlZ43EfwgOJWUwCYe8ZdWBZLD9PC56/Y+oBQrYsm2hqCRugBBknpRe9tJGh MOADTvQGQKVdXRgiIMlZwHV1INUjgj8SPzap4wdEdUvgj/rI82TjFsjEWUGRhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772709204; 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=p/xz7zJ0d/aGQnUBFaGJhtKvmDaeMZZtbTSkoTk5nm0=; b=pVuKo3yA8wTaKiEZXlUd+oOy94SFRyYQLrAFfNQmk/L8In0GOKUsi5N9Ix7cnh+a9ys+3b lCLsze30Mljzb+rx7kM3yZp8QzJ5YcEQ/mT7zLU6Mu0HR74rBdBzYoGcsHs/yY1ht6GcKv drwdiAAAPi1xamXCz0W9YtAiiUJWhr7mbLDHCJySjJMcuBR3e3ke43K71rzrfdjbNcAH8z S6gBY275ZeFijS/eDHaGJ94CxgwKhs2dUEQCVuZMuFkUxKwFTqAzXIgnnC318ASj5NM5w4 Ku+lstLhjXOyrMs80TNyJ41y1LbnDieKgHM/Q1igYcaaSn/Lu1dVe4LqOAXb4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRRjb6GD1zbRH for ; Thu, 05 Mar 2026 11:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40486 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 11:13:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ec22c4022ddb - stable/13 - vnet: Ensure the space allocated by vnet_data_alloc() is sufficent aligned 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ec22c4022ddbc62be17b2bc65fe8b6113c8d76e7 Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 11:13:23 +0000 Message-Id: <69a96553.40486.7911acc4@gitrepo.freebsd.org> The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ec22c4022ddbc62be17b2bc65fe8b6113c8d76e7 commit ec22c4022ddbc62be17b2bc65fe8b6113c8d76e7 Author: Zhenlei Huang AuthorDate: 2026-02-28 11:35:42 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-05 11:12:41 +0000 vnet: Ensure the space allocated by vnet_data_alloc() is sufficent aligned Some 32-bit architectures, e.g., armv7, require strict 8-byte alignment while doing atomic 64-bit access. Hence aligning to the pointer type (4-byte alignment) does not meet the requirement on those architectures. Make the space allocated by vnet_data_alloc() sufficent aligned to avoid unaligned access. PR: 265639 Diagnosed by: markj Reviewed by: jhb, markj Co-authored-by: jhb MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55560 (cherry picked from commit 32beb3ae71cb320dbe4190a01c036943d99083b3) (cherry picked from commit 973d607b284ba68e63f0386af44c28bfde15add2) (cherry picked from commit baee504b868b9417c815c0de6474a0d6e5d6b4ac) --- sys/net/vnet.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index da5fc5b52a72..a55fd49cb5da 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -172,11 +172,17 @@ static MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET data"); #define VNET_MODMIN (8 * PAGE_SIZE) #define VNET_SIZE roundup2(VNET_BYTES, PAGE_SIZE) +/* + * Ensure space allocated by vnet_data_alloc() is suitably aligned for any + * object. + */ +#define VNET_DATAALIGN _Alignof(__max_align_t) + /* * Space to store virtualized global variables from loadable kernel modules, * and the free list to manage it. */ -VNET_DEFINE_STATIC(char, modspace[VNET_MODMIN] __aligned(__alignof(void *))); +VNET_DEFINE_STATIC(char, modspace[VNET_MODMIN] __aligned(VNET_DATAALIGN)); /* * Global lists of subsystem constructor and destructors for vnets. They are @@ -381,7 +387,7 @@ vnet_data_alloc(int size) void *s; s = NULL; - size = roundup2(size, sizeof(void *)); + size = roundup2(size, VNET_DATAALIGN); sx_xlock(&vnet_data_free_lock); TAILQ_FOREACH(df, &vnet_data_free_head, vnd_link) { if (df->vnd_len < size) @@ -399,6 +405,8 @@ vnet_data_alloc(int size) } sx_xunlock(&vnet_data_free_lock); + KASSERT(((uintptr_t)s & (VNET_DATAALIGN - 1)) == 0, + ("unaligned vnet alloc %p", s)); return (s); } @@ -413,7 +421,7 @@ vnet_data_free(void *start_arg, int size) uintptr_t start; uintptr_t end; - size = roundup2(size, sizeof(void *)); + size = roundup2(size, VNET_DATAALIGN); start = (uintptr_t)start_arg; end = start + size; /*