From nobody Mon Jun 30 14:21:34 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 4bW7dB6lWjz60X2g; Mon, 30 Jun 2025 14:21:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bW7dB2F68z48jX; Mon, 30 Jun 2025 14:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751293294; 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=ivLLIaMCh2RSXl2cOGePKrwjtiV0QW2DU6Krm1zJGEI=; b=DbTUxLVUOGC9DX5h584x+6OtTDENowds1dl1h/j+nPrDUTFOw9hLo334MCMVxPb1ZnfhZv EiTYatn7tw8SPjrauOi9QimvS3XY14lAznE/lIGJy6aCw1rsuQV6whObstIPL7SSAsY42D 3ecwHjVbez9P8tagJZC2oN7opp5UIkQTQeU9UTarksMd+wcoBLq/CRb0rIGl1UVMFsQs4b lbzmsQNlPZCFweBh7giv1TASQsNbPjxoxMOSk7DRF6QmRQyF2VVZvh8DsZf/UoKUwucK3C 1a1Krfzh+QHoHITgHm3QHFuyiodE2YKoC/7KghZyeaS58sZsz1BMXpBsGhAzuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751293294; 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=ivLLIaMCh2RSXl2cOGePKrwjtiV0QW2DU6Krm1zJGEI=; b=OzOClGkvaosZtliEggxQtXRRUnheYCQdc94IetyOGUj8KfRIMf20dtbbbs3N4nfmhNBVO5 wCZ7dyIFtAfqeN7XjcUA/lsDrE2I+xF4Kq6VBqjwGoD0gQd073CEkwBwcuyzi1HVzt42+C aOAjjUz6Gp81tSUAoHRszDZoAwWjZZxDaZXnndgRXjOtXqvHFF0+MbbzQiqawwdWuXhdPJ mK7QvOYbVL1edw9zUlgrDi3HSLN5n65nPBAH+mM3ZFOQK0crBO1cIOYFVH2Qc7sMwk9tBZ VYVhE5aTTkx1anCQKHZhnoScLck9ksEV/QvQwMPtwGv4T1J75darcPJhC3akIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751293294; a=rsa-sha256; cv=none; b=NcgCD4lorwCn9By07u9u7/cjKcoXIVqYpv5VJ2hSU+jSbpqgQAxBG0nLd2lceveP1eEbFv N0OACZOunZlk3akaItoU6gjQFxqwTVg8qKBXc2Vqt7XgEi11lT5euH6x3SUmo7SLEoVyrS ab17qZ2gu9Z59D2T4D4kfgiJpxCc82tod4mtZvuy2cKabqFReZysr+aA0Ho1Vo/SgKZHSD LoVJIBQqjJTVEcQZvIkWk32VgGaiMxh2//qGJaTJuRPCIQvxyBUQI+ZwH7LA8qSqhfap3I I1DbJN0G0OXLReVYvD4uxnbMJ9mBdZjaGs+qcbMOsHfwHkfS/HuqJwCp3PLBCw== 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 4bW7dB1f7bz16dg; Mon, 30 Jun 2025 14:21:34 +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 55UELYeu076364; Mon, 30 Jun 2025 14:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UELYqo076361; Mon, 30 Jun 2025 14:21:34 GMT (envelope-from git) Date: Mon, 30 Jun 2025 14:21:34 GMT Message-Id: <202506301421.55UELYqo076361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c6e0defd489f - stable/14 - gve: Relax a static assertion 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6e0defd489fb139e753435ccb7ecb722e9ae499 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c6e0defd489fb139e753435ccb7ecb722e9ae499 commit c6e0defd489fb139e753435ccb7ecb722e9ae499 Author: Mark Johnston AuthorDate: 2025-06-14 12:17:49 +0000 Commit: Mark Johnston CommitDate: 2025-06-30 14:19:31 +0000 gve: Relax a static assertion It's okay if MCLBYTES is larger than the default receive buffer size. Fixes: 71702df61262 ("gve: Add support for 4k RX Buffers when using DQO queue formats") (cherry picked from commit 3b4bc5d70e1c2066fcb6e8535941258c88999fa2) --- sys/dev/gve/gve.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index dd432dc0eb45..64c2a0481817 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -85,7 +85,7 @@ static MALLOC_DEFINE(M_GVE, "gve", "gve allocations"); -_Static_assert(MCLBYTES == GVE_DEFAULT_RX_BUFFER_SIZE, +_Static_assert(MCLBYTES >= GVE_DEFAULT_RX_BUFFER_SIZE, "gve: bad MCLBYTES length"); _Static_assert(MJUMPAGESIZE >= GVE_4K_RX_BUFFER_SIZE_DQO, "gve: bad MJUMPAGESIZE length");