From nobody Mon Feb 7 09:16:35 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 D5DF219AAA95; Mon, 7 Feb 2022 09:16:35 +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 4JsgW74yPGz3KhJ; Mon, 7 Feb 2022 09:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644225395; 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=ecfuhJEUxJbaeuKh45HwIcHstgYpIak4+LLVNrSAflU=; b=nvjXM5o93fHq0hNbqcNvjgWWlghMl7LPM1QSJiAnTwwlTUPpoNsq73RmMVuV2Os3QCydMY Cd75c8oCTI2eMxMfw4qYo1yXCxIv3KeVk3kj14u5bbcsZjBrbl7NnwgMfHkC8xAGbHecdx k5rC8Fxdtyns9EO3DWMpA36WppO3xiHwsxOVkIwhtFAcsh9fmcccw2zCUX0VC6xl5Bk2e0 ibddnJtGptH8sR+FnDVqHLZGnfILkybBp9y2aP+O5L6sSDwYd6g+vFx+WcQs3zkykPKbYN 0Q1fa8boWye3LXzr2Z4ApqpzYT1iX0TleAWy5HuCSufSHSULadLru+rFooGseg== 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 8B5E222F61; Mon, 7 Feb 2022 09:16:35 +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 2179GZgN009930; Mon, 7 Feb 2022 09:16:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2179GZQZ009929; Mon, 7 Feb 2022 09:16:35 GMT (envelope-from git) Date: Mon, 7 Feb 2022 09:16:35 GMT Message-Id: <202202070916.2179GZQZ009929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: 759ae58c0049 - main - xen/grant-table: remove explicit linear mapping additions 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 759ae58c004985f99f7110837b9ac9fc88d51351 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644225395; 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=ecfuhJEUxJbaeuKh45HwIcHstgYpIak4+LLVNrSAflU=; b=xgPyTh0Us0n73Va/xNATC3+rbyTfAYbVZjhZaAEWaU5MRbVG11vlHA2QdvtspaQcHoB77k j0lHovMPAb52bg+jFYLp+A0l2278w95M/ipBauzi/LZlvMUsWCVfsPG66WyI3utR7o2uOl jzyNpHF2YBU05Eyji3x5vsrwf2b4YK1NAmTlwVZPCLYfCPK78ew4/URYkDYFvmYPU8G7vS 4SlS48yafyDin5KamXFv+AusbRqnAsqwpdMUBl26RnDg5iWADz52Lm+ZLWrCc4y5llI4V3 FeucLres3k5wYYyoXq0nJh38v88RTKXzs4JGzyvyks7VDgjiY6ekTF/0iUktfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644225395; a=rsa-sha256; cv=none; b=gibq9FRkkU2cA1g0qoixNNDhSCn9ztm1K+2OJsiGOg/b+JSdc5SMYspY8f2egSK3nRssIQ Tz35m8G4f615IAzP/ttQJSPLONRoTTwOwGlHi527TUz3Jh89TWEA98L8U1IQSJ/8ICo2KJ el+j3qcTBl0FLtr46GcsEse90H573F4lwBPgUO0h3SYntTJclcPGacjnKspVpSAFvyyXIj 4uaM67dLF/LEruLRpgbVlrVheJdgd3p9snBAmsGMHqHPLOnZujw4dcAnz38EOnr29rUDDl UQoKeIGmMpJYaeZey9PqdW/y0gxj5MnX0eqzPtTndxr0UBEZVSGKFlD9oR7nRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=759ae58c004985f99f7110837b9ac9fc88d51351 commit 759ae58c004985f99f7110837b9ac9fc88d51351 Author: Roger Pau Monné AuthorDate: 2021-04-06 11:01:01 +0000 Commit: Roger Pau Monné CommitDate: 2022-02-07 09:06:27 +0000 xen/grant-table: remove explicit linear mapping additions There's no need to explicitly add linear mappings for the grant table area, as the memory is allocated using xenmem_alloc and it should already have a linear mapping that can be obtained using rman_get_virtual. While there also remove the return value of gnttab_map, since there's no return value anymore. Sponsored by: Citrix Systems R&D Reviewed by: Elliott Mitchell Differential revision: https://reviews.freebsd.org/D29602 --- sys/dev/xen/grant_table/grant_table.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/sys/dev/xen/grant_table/grant_table.c b/sys/dev/xen/grant_table/grant_table.c index 6dc11cac1bc4..a3f9f449e4a3 100644 --- a/sys/dev/xen/grant_table/grant_table.c +++ b/sys/dev/xen/grant_table/grant_table.c @@ -503,7 +503,7 @@ unmap_pte_fn(pte_t *pte, struct page *pmd_page, static vm_paddr_t resume_frames; -static int +static void gnttab_map(unsigned int start_idx, unsigned int end_idx) { struct xen_add_to_physmap xatp; @@ -521,21 +521,6 @@ gnttab_map(unsigned int start_idx, unsigned int end_idx) if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp)) panic("HYPERVISOR_memory_op failed to map gnttab"); } while (i-- > start_idx); - - if (shared == NULL) { - vm_offset_t area; - - area = kva_alloc(PAGE_SIZE * max_nr_grant_frames()); - KASSERT(area, ("can't allocate VM space for grant table")); - shared = (grant_entry_t *)area; - } - - for (i = start_idx; i <= end_idx; i++) { - pmap_kenter((vm_offset_t) shared + i * PAGE_SIZE, - resume_frames + i * PAGE_SIZE); - } - - return (0); } int @@ -557,15 +542,16 @@ gnttab_resume(device_t dev) if (gnttab_pseudo_phys_res == NULL) panic("Unable to reserve physical memory for gnttab"); resume_frames = rman_get_start(gnttab_pseudo_phys_res); + shared = rman_get_virtual(gnttab_pseudo_phys_res); } + gnttab_map(0, nr_gframes - 1); - return (gnttab_map(0, nr_gframes - 1)); + return (0); } static int gnttab_expand(unsigned int req_entries) { - int error; unsigned int cur, extra; cur = nr_grant_frames; @@ -573,11 +559,9 @@ gnttab_expand(unsigned int req_entries) if (cur + extra > max_nr_grant_frames()) return (ENOSPC); - error = gnttab_map(cur, cur + extra - 1); - if (!error) - error = grow_gnttab_list(extra); + gnttab_map(cur, cur + extra - 1); - return (error); + return (grow_gnttab_list(extra)); } MTX_SYSINIT(gnttab, &gnttab_list_lock, "GNTTAB LOCK", MTX_DEF | MTX_RECURSE);