From nobody Tue Jun 13 12:46:58 2023 X-Original-To: dev-commits-src-main@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 4QgSxG6dd0z4dJx9; Tue, 13 Jun 2023 12:46:58 +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 4QgSxG6Cnnz3m18; Tue, 13 Jun 2023 12:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686660418; 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=QCNXC4qw4wkzfylfYhwsUCyqNTnZMUUU6IvXQEfCYbM=; b=qr28cZ2VTl/J45QAFnHvLOZS/7W4+PuXuI941/22N2iD9L9DN3Sxdp+7+IW+kcAvGlRTAI JUMowI/rNncQfGiLvIg/a2GPl1FgnraauQIsUVXuIYZL5HMdQ5V782BaE1SHrNKwzg/Uty 1/FujH98kdG1/fptvjnzCzp6aiyFrBidah5UffmlQYFY0VpJn9qj0rKGbv4IsZdy1ljDHd 5aINleQ3UUo7B5BYc6HvQNfa60U/Do+oNiwpuraDY/AFptWsKrvWlueso99BCZhhKeOVzU dji43xqgKLt0Jx44CfzC9hvR27pebB1yQ2AWchX+rCNWY93BI6VdPfIBYEToVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686660418; 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=QCNXC4qw4wkzfylfYhwsUCyqNTnZMUUU6IvXQEfCYbM=; b=ngyhBN04AHvF4EnX3lBNCosZyASo1qEi8OKY1OUpnHel3z5QOeX4r4sjXrXDK66GQqB9AY TMtsp0Z0YFOgErXpLKgADYFbhPGnKaXmV1nRlBJOu8jJa5padXYY9mGNnC/T8Xhs7axgj3 JFgUJM0hYDPfq2/kfymKaWqtm0lNGFURqPD7IVIVW5WIkGaVvLN7E50v5S/1R5T2YGkcyJ THTVehEyWBMdfiPGVDJGkHDdoCxqn0bdOCh85wdL3JXbsQx/QbTTyvMd6oUHTI/6QM5bsI Yw4/W42r8EroFO6nCoiVw+ATieNBVkLncai/LnexpmZYxs3qdQFlrvUIQLavkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686660418; a=rsa-sha256; cv=none; b=kaOeONSYZfh6f6DuE7bI8BED7DRvf+tegEA8DH1HOtO3p6ZS5E9TPbDr2v7mPIc3cNgYbI xUqb9E5Gem0jSnhyzUpzyKhNPCGqn66nVKBuYhIjAKJ8b94BF7WrAvihlna1O83Pg/kvTP FGL4M5c+A9TaLfyC8eqXfBf9y5FHgVLL/7LMHXVKysRahxhfBARdGuPWACnKes7vnFaBtw TKFC71x2saEAiwVp5GlwrONTgxX9YtR5hz6JAKxfkDV7ljFHxua2Q/lLDoQ06xa+zaNHmd atmDN4p7VfOggq7Pvq0cAX0HFuTBTgEeWCdgZN+/5UZ0c215JHa0c2nbHO3EDQ== 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 4QgSxG5KKCzN9v; Tue, 13 Jun 2023 12:46:58 +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 35DCkwnj058774; Tue, 13 Jun 2023 12:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35DCkwS7058773; Tue, 13 Jun 2023 12:46:58 GMT (envelope-from git) Date: Tue, 13 Jun 2023 12:46:58 GMT Message-Id: <202306131246.35DCkwS7058773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 333731274fa3 - main - kinst: hide KINST_TRAMPCHUNK_SIZE from ISA-specific headers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 333731274fa3e0856c66fd3509dea7113ddaa983 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=333731274fa3e0856c66fd3509dea7113ddaa983 commit 333731274fa3e0856c66fd3509dea7113ddaa983 Author: Christos Margiolis AuthorDate: 2023-06-13 12:46:33 +0000 Commit: Christos Margiolis CommitDate: 2023-06-13 12:46:33 +0000 kinst: hide KINST_TRAMPCHUNK_SIZE from ISA-specific headers Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40505 --- sys/cddl/dev/kinst/amd64/kinst_isa.h | 1 - sys/cddl/dev/kinst/trampoline.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cddl/dev/kinst/amd64/kinst_isa.h b/sys/cddl/dev/kinst/amd64/kinst_isa.h index 6e8eb10fb71c..4e5873628b75 100644 --- a/sys/cddl/dev/kinst/amd64/kinst_isa.h +++ b/sys/cddl/dev/kinst/amd64/kinst_isa.h @@ -18,7 +18,6 @@ * to 16 bytes, 32 bytes is enough to cover even the worst case scenario. */ #define KINST_TRAMP_SIZE 32 -#define KINST_TRAMPCHUNK_SIZE PAGE_SIZE typedef uint8_t kinst_patchval_t; diff --git a/sys/cddl/dev/kinst/trampoline.c b/sys/cddl/dev/kinst/trampoline.c index 5c8c27343201..93eca6b7e6c8 100644 --- a/sys/cddl/dev/kinst/trampoline.c +++ b/sys/cddl/dev/kinst/trampoline.c @@ -31,6 +31,7 @@ #define KINST_TRAMP_FILL_PATTERN ((kinst_patchval_t []){KINST_PATCHVAL}) #define KINST_TRAMP_FILL_SIZE sizeof(kinst_patchval_t) +#define KINST_TRAMPCHUNK_SIZE PAGE_SIZE #define KINST_TRAMPS_PER_CHUNK (KINST_TRAMPCHUNK_SIZE / KINST_TRAMP_SIZE) struct trampchunk {