From nobody Sat Aug 13 22:28:41 2022 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 4M4wDn5vLHz4Yt26; Sat, 13 Aug 2022 22:28:41 +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 4M4wDn5Nx7z3D3b; Sat, 13 Aug 2022 22:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660429721; 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=oTUalW9lWaeE8XRlzSps3L4bC1Qx7Y37xAxsrW1Nyiw=; b=cev7TPNs1fwRuPkP8VS+ruGte8tUYql3JAcEEqD5bwYGkad8TsNwnvzvy84TFlTeLi0YdJ vG4Wg5BWKnpI7acvRWh/a4MIpOEXzGHpTn2DQRKseBFToJZIR1CCpt7oOuruOxzXrbaAOq gCP4+jyd9ST3BtaxNLHzZgJra0GO7Ep4WEslLSeKSM6/AfYHMpNDo0d1YTNDmRYo9sUKX9 0/8UFW93p4jPfEEQDaLQdrxPe86KcjR2pIOO7gocHFQ0sFri/MgJMFyoSTc4wFEN/7Ddnk pqTHia4ADRuM3fawKFXMrPDFrVVHrkc+iRJD4/oFZiK3bMJpDwAp9VIKKKxELg== 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 4M4wDn4RTYzS9w; Sat, 13 Aug 2022 22:28:41 +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 27DMSfV5070813; Sat, 13 Aug 2022 22:28:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DMSfwL070812; Sat, 13 Aug 2022 22:28:41 GMT (envelope-from git) Date: Sat, 13 Aug 2022 22:28:41 GMT Message-Id: <202208132228.27DMSfwL070812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 02ab915ae014 - main - lapic_init: Reduce LOOPS 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02ab915ae014a07da8243120d231919eb5633c95 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660429721; 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=oTUalW9lWaeE8XRlzSps3L4bC1Qx7Y37xAxsrW1Nyiw=; b=Tgxlh1SuOSPsV+CVBpklShcnJdwJOjQNjjUZGMq0cX+rsau/62VgwEwgtD3OPtQSoJs7+v OhxtRNwYacejORIA51RuglR2IXGPbkVHGoDw9CI4HoYLEEAdSnenuKBlfoW+5AFBycQ4wu 1BYM59hyBqUK2uXLWYK7ai0pFL1TMNHP0QglWhSadpzrxfmTO4lkEg5yRIIwV7BdSWICTu W46XuvPwzIByLfeKkX+mc+6GFss2fJgE3NDQPAU/dBUaZ2zm/2KBq+0r68JLdyrqpHphC0 Fi2Zv01XqWZN1R3gQoZFkRglDhZQV0HSn6qdVZ1HQE0aLHVw9+C7z9LlycZh0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660429721; a=rsa-sha256; cv=none; b=Gm9NcRe9i4wi7A0l7uvVcIU24gKocr6Rt8e+ZtvA7u0Uv7ZA6KWGWPXHfk0NVuf1vnvUWb vFkbXJSrqZXWwjshUPP5G694LUwQYiMXsQDGHFWkBcoRulBNhwZGpiJ7o1VEbtDvkVgqyX fMYTi+HJt/eOLzA3Ea90VWFWz4CfzCCEaLGHfOJYFNQDf2+195hZli3pGfmcMHjD3jbB/Y 53t17nR7e+2qh5UtYcGa7ByFuNi5ZnMDuBmro3JZNXKOlmViDzyB3yJMINGktVQLhX1o/6 WyAqVKO48JcVECQjVVuLiIiSAO6mgKhgPG3AqvNG1TCnCWNUqgJyv88kZ+fi5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=02ab915ae014a07da8243120d231919eb5633c95 commit 02ab915ae014a07da8243120d231919eb5633c95 Author: Colin Percival AuthorDate: 2022-08-12 23:51:34 +0000 Commit: Colin Percival CommitDate: 2022-08-13 22:28:09 +0000 lapic_init: Reduce LOOPS While I'm here, instrument lapic_init with TSLOG so it shows up (or typically not, after this change) on flamecharts. Reviewed by: kib Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D36186 --- sys/x86/x86/local_apic.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index ec4f821f99ed..42a5a9fd4c8c 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -434,6 +434,8 @@ lapic_init(vm_paddr_t addr) int i; bool arat; + TSENTER(); + /* * Enable x2APIC mode if possible. Map the local APIC * registers page. @@ -531,7 +533,7 @@ lapic_init(vm_paddr_t addr) } #ifdef SMP -#define LOOPS 100000 +#define LOOPS 1000 /* * Calibrate the busy loop waiting for IPI ack in xAPIC mode. * lapic_ipi_wait_mult contains the number of iterations which @@ -563,6 +565,8 @@ lapic_init(vm_paddr_t addr) } #undef LOOPS #endif /* SMP */ + + TSEXIT(); } /*