From nobody Mon Oct 10 21:34:01 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 4MmXGx3n7Sz4f4Q4; Mon, 10 Oct 2022 21:34:01 +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 4MmXGx2xT9z3V9B; Mon, 10 Oct 2022 21:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665437641; 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=YYf7McxNN7kH0H4quzaaISv2JA2ER6Zrlx0z6Ke06yM=; b=MzPU6d3ZjceCl9iPm3TgQdqynI/Za0WII9rFoWMADyWjRi8WKVk6vPfwXC63TpuyBstezV jb80IjBhh7cMCxI7vG9TDAbRQZVclnJ8EDbLTsLQE4e0OTYgXYL58k8e4tsFil9nzVrA4s Tsqv+r1tAcmgEXCCokg3k2jIv3IbdDyYXlKrCq43264j2jrDTg/Ae1X6PNX8KmK7I+DFWI m2+AkCcm0ejqCdx1BevlJdnhqPVTM6fTY72gF2U0KNyYP+v7tFQQhRj6L97swTffUX6cTg MsS4ZTx89LoslBKR35IkXyNtLTShjROJ5HNooeFHwaTiyj75PryfzqLzwlSCww== 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 4MmXGx1yN7zlHP; Mon, 10 Oct 2022 21:34:01 +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 29ALY1Js084000; Mon, 10 Oct 2022 21:34:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29ALY19Q083999; Mon, 10 Oct 2022 21:34:01 GMT (envelope-from git) Date: Mon, 10 Oct 2022 21:34:01 GMT Message-Id: <202210102134.29ALY19Q083999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 273d0715f6b1 - main - amd64: remove useless addr2 variables in page range invalidation handlers 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 273d0715f6b168ab7be6e79a768d97fbdea81c8d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665437641; 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=YYf7McxNN7kH0H4quzaaISv2JA2ER6Zrlx0z6Ke06yM=; b=ebv+QOOCFoD2cWFS7nwKIz3voINsSKOiC3r4ES6qc0ybrC6ojq2mVOGu4dnN4DfW8ujvZt Z1WlRGdMPzQMYekygceXbieB3fiqglSHI5m24Dn2TfhnmGZrre0FHgVaU4NA3ftetpktjN nwxrCPmI0JWzsamne+7VL8gA/9cywtawiH4BLfMIRh9eQHnaAtLAPF9EynN4OsdVuV+EYl gEHgeLA0VDxuFDutZ1vagMEf8e9MWfLq8ZHEtpV0G5m1DgUkcZ4lapzJGIjnPpFaFDA+Gk FtPo/CvSU2kHv4r/u4pC2y82p5jJo6ETIuy2TqdQD7ixMsf0CPDwT2pfNc7+QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665437641; a=rsa-sha256; cv=none; b=sRSv9Frz3I94IuGL4HIBWGlyVGCtEMZfrKivnwbdApnJPMTt6m4jFgvYLOXRjdvw9Cpbvk yeZPQGHDZK/qnfQc/5eUD7avJWlZul1FVP2dOHzRujKf0TFahtFNw38ZwkDo/t8VJ9/hHm USd/xMmVED44meFjTlCHde+W8AKB7K6fSJ+1913g0j02OnDDbigOD9fsLJh57gFfglq4mH LbpSFZwMWlhuk8b8z/GidZrLQOOFx8yrF35bu7iJAZ8PmlVcDPCVuimGbJuNb1lQpIk5zK EAkKVDp7Ju0CmQtPWL9Qzhi8TinKFA8tgEOm6qxqc6XSgTBuMJma2InQWLTUyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=273d0715f6b168ab7be6e79a768d97fbdea81c8d commit 273d0715f6b168ab7be6e79a768d97fbdea81c8d Author: Konstantin Belousov AuthorDate: 2022-10-08 08:33:11 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-10 21:33:12 +0000 amd64: remove useless addr2 variables in page range invalidation handlers Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D36919 --- sys/amd64/amd64/mp_machdep.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 3356726b24de..2ed3a57866a2 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -903,7 +903,7 @@ invlpg_pcid_handler(pmap_t smp_tlb_pmap, vm_offset_t smp_tlb_addr1) static void invlrng_handler(vm_offset_t smp_tlb_addr1, vm_offset_t smp_tlb_addr2) { - vm_offset_t addr, addr2; + vm_offset_t addr; #ifdef COUNT_XINVLTLB_HITS xhits_rng[PCPU_GET(cpuid)]++; @@ -913,11 +913,10 @@ invlrng_handler(vm_offset_t smp_tlb_addr1, vm_offset_t smp_tlb_addr2) #endif /* COUNT_IPIS */ addr = smp_tlb_addr1; - addr2 = smp_tlb_addr2; do { invlpg(addr); addr += PAGE_SIZE; - } while (addr < addr2); + } while (addr < smp_tlb_addr2); } static void @@ -925,7 +924,7 @@ invlrng_invpcid_handler(pmap_t smp_tlb_pmap, vm_offset_t smp_tlb_addr1, vm_offset_t smp_tlb_addr2) { struct invpcid_descr d; - vm_offset_t addr, addr2; + vm_offset_t addr; #ifdef COUNT_XINVLTLB_HITS xhits_rng[PCPU_GET(cpuid)]++; @@ -935,11 +934,10 @@ invlrng_invpcid_handler(pmap_t smp_tlb_pmap, vm_offset_t smp_tlb_addr1, #endif /* COUNT_IPIS */ addr = smp_tlb_addr1; - addr2 = smp_tlb_addr2; do { invlpg(addr); addr += PAGE_SIZE; - } while (addr < addr2); + } while (addr < smp_tlb_addr2); if (smp_tlb_pmap == PCPU_GET(curpmap) && smp_tlb_pmap->pm_ucr3 != PMAP_NO_CR3 && PCPU_GET(ucr3_load_mask) == PMAP_UCR3_NOMASK) { @@ -950,7 +948,7 @@ invlrng_invpcid_handler(pmap_t smp_tlb_pmap, vm_offset_t smp_tlb_addr1, do { invpcid(&d, INVPCID_ADDR); d.addr += PAGE_SIZE; - } while (d.addr < addr2); + } while (d.addr < smp_tlb_addr2); } } @@ -958,7 +956,7 @@ static void invlrng_pcid_handler(pmap_t smp_tlb_pmap, vm_offset_t smp_tlb_addr1, vm_offset_t smp_tlb_addr2) { - vm_offset_t addr, addr2; + vm_offset_t addr; uint64_t kcr3, ucr3; uint32_t pcid; @@ -970,18 +968,17 @@ invlrng_pcid_handler(pmap_t smp_tlb_pmap, vm_offset_t smp_tlb_addr1, #endif /* COUNT_IPIS */ addr = smp_tlb_addr1; - addr2 = smp_tlb_addr2; do { invlpg(addr); addr += PAGE_SIZE; - } while (addr < addr2); + } while (addr < smp_tlb_addr2); if (smp_tlb_pmap == PCPU_GET(curpmap) && (ucr3 = smp_tlb_pmap->pm_ucr3) != PMAP_NO_CR3 && PCPU_GET(ucr3_load_mask) == PMAP_UCR3_NOMASK) { pcid = smp_tlb_pmap->pm_pcids[PCPU_GET(cpuid)].pm_pcid; kcr3 = smp_tlb_pmap->pm_cr3 | pcid | CR3_PCID_SAVE; ucr3 |= pcid | PMAP_PCID_USER_PT | CR3_PCID_SAVE; - pmap_pti_pcid_invlrng(ucr3, kcr3, smp_tlb_addr1, addr2); + pmap_pti_pcid_invlrng(ucr3, kcr3, smp_tlb_addr1, smp_tlb_addr2); } }