From nobody Tue Oct 24 04:47:16 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 4SF00P1bvPz4xVNX; Tue, 24 Oct 2023 04:47: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 4SF00P156Dz3Kq4; Tue, 24 Oct 2023 04:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122837; 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=/eByzz7P8ve0Y4fvnAS0PDGh8T0PIbGHDXmYCxltTj4=; b=rFzsojDgNo9u+yRz/W6UflywmIgIpFIZp49AyHlUcF1YjKmefUT9Hsst0HQlFlrtBKhud3 j2boDjGurDrSr6pEOn9oF8bxX1avI7bSEja5R8UMjHrY7ciDOO+LGgA0yW3kwDbPDcitaM tkWwnyZqPE4m3dLY/58Pi4rSkJbIzwmJn5LrrSJEQLMDh2KVD9l7ZkZVM+C+vdnGGUYYsP 0so3UHGja+Tmh/fhFB3Xnunly3lRUb0p1KBt5SKIvTLihlf2o920n1ovy1ZlnEwd6rWtxC zaYN4xW/lBE0oXI5DQSJgE/nWxr3mhU33gJI9pLCaP2CrG4/4cYSHTsclvjvlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122837; a=rsa-sha256; cv=none; b=thDTOPAZqm6JsY5mxO02VJ/HXm9a6WkwTHjgNUdANp9Q9Dw7VLu8TQHPQzblMgZ3t7FYyK UGf6gq5rjLrwqoGEEeCXojS1NUNcPuWnA3WP467+nmDNegMOYcvLbToAUK2lxSVqiXWrd8 BSMl83Oqi4pb+sqDAeiw0Ps07w+T+7NeFE3+xNEZeoSVTkMsGzTzlRBHHUU2I6cPykjZ9v IeHopv1N1dV+kBsuzWIbW5PDMtyZNqxz2LxeOekd1D41b/navbLqEfSCrjG8jYN3H2r1g2 4aerLXGwOl+lVMwM4pa6s5z9OQijzZb7hmcbEwA0NQOXhG7m+mXp8TJkKxwhtw== 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=1698122837; 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=/eByzz7P8ve0Y4fvnAS0PDGh8T0PIbGHDXmYCxltTj4=; b=XvSIUCuS363ixAmVODu3Ka+HKz87zCg0DEvVsw7VqrS4ntIMEm80eTAab0aWKhBz9B4/Xc dZwCX5eLfThuEoj34VwGXXwY+d/keYj1myEaD7sQsZ7BaJkftLcu7pHZPP4s9F4iftudE/ cfValhwvAiyF2pmTTjh+YuLEYyV7QO+sf/85R0hsJlCJwvAQ+BvMN3H6gpq2tF13fEVhEa NLENzcP5OfU4O3nB/w4z53DKhghKtqconOAUd9qJw2jZW0QoLSZaZ32V8rVF5vz4MCEHMZ 5Hh1USRh35AkYVezK/fOX0wQsvGhwLHSG0QQIK8vDY9ha81w4GpUbK4mNXPiVA== 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 4SF00N72qHz17sp; Tue, 24 Oct 2023 04:47:16 +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 39O4lGj9005669; Tue, 24 Oct 2023 04:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4lGBx005666; Tue, 24 Oct 2023 04:47:16 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:47:16 GMT Message-Id: <202310240447.39O4lGBx005666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 71f147c60771 - stable/12 - x86: Prefer consistent naming for loader tunables 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 71f147c60771fb4d6cbab2833c1206e007305044 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=71f147c60771fb4d6cbab2833c1206e007305044 commit 71f147c60771fb4d6cbab2833c1206e007305044 Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:46:31 +0000 x86: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with inconsistent naming. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to maintain. 1. hw.dmar.timeout -> hw.iommu.dmar.timeout 2. hw.lapic_eoi_suppression -> hw.apic.eoi_suppression 3. hw.lapic_tsc_deadline -> hw.apic.timer_tsc_deadline 4. hw.x2apic_enable -> hw.apic.x2apic_mode Those tunables are for field debugging, no need to keep old names for compatibility. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42248 (cherry picked from commit 12cce5994b92f8235f379d660ccb28da8e69f55b) (cherry picked from commit 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76) (cherry picked from commit 8ca5539ae1e693709553729edd7e34b90d734a85) --- sys/x86/acpica/madt.c | 2 +- sys/x86/iommu/intel_drv.c | 2 +- sys/x86/x86/local_apic.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 5c1e5b9f8848..33ba0cf8af20 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -203,7 +203,7 @@ madt_setup_local(void) else if (bootverbose) printf("x2APIC available but disabled %s\n", reason); user_x2apic = x2apic_mode; - TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic); + TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic); if (user_x2apic != x2apic_mode) { if (bios_x2apic && !user_x2apic) printf("x2APIC disabled by tunable and " diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 02daa05b0cad..cab3e4882433 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -433,7 +433,7 @@ dmar_attach(device_t dev) dmar_quirks_post_ident(unit); timeout = dmar_get_timeout(); - TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout); + TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); for (i = 0; i < DMAR_INTR_TOTAL; i++) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 759c1ae8625a..99c7299bd3b9 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -556,7 +556,7 @@ native_lapic_init(vm_paddr_t addr) (cpu_feature2 & CPUID2_TSCDLT) != 0 && tsc_is_invariant && tsc_freq != 0) { lapic_timer_tsc_deadline = 1; - TUNABLE_INT_FETCH("hw.lapic_tsc_deadline", + TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline", &lapic_timer_tsc_deadline); } @@ -589,7 +589,7 @@ native_lapic_init(vm_paddr_t addr) "KVM -- disabling lapic eoi suppression\n"); lapic_eoi_suppression = 0; } - TUNABLE_INT_FETCH("hw.lapic_eoi_suppression", + TUNABLE_INT_FETCH("hw.apic.eoi_suppression", &lapic_eoi_suppression); }