2018-01-30 18:19:53 +07:00
|
|
|
/*
|
|
|
|
* Copyright(c) 2011-2017 Intel Corporation. All rights reserved.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
* SOFTWARE.
|
|
|
|
*/
|
|
|
|
#include "i915_drv.h"
|
|
|
|
#include "gvt.h"
|
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_vgpu_find_page_track - find page track rcord of guest page
|
|
|
|
* @vgpu: a vGPU
|
|
|
|
* @gfn: the gfn of guest page
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* A pointer to struct intel_vgpu_page_track if found, else NULL returned.
|
|
|
|
*/
|
|
|
|
struct intel_vgpu_page_track *intel_vgpu_find_page_track(
|
|
|
|
struct intel_vgpu *vgpu, unsigned long gfn)
|
|
|
|
{
|
|
|
|
return radix_tree_lookup(&vgpu->page_track_tree, gfn);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_vgpu_register_page_track - register a guest page to be tacked
|
|
|
|
* @vgpu: a vGPU
|
|
|
|
* @gfn: the gfn of guest page
|
2018-07-31 10:02:12 +07:00
|
|
|
* @handler: page track handler
|
|
|
|
* @priv: tracker private
|
2018-01-30 18:19:53 +07:00
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* zero on success, negative error code if failed.
|
|
|
|
*/
|
|
|
|
int intel_vgpu_register_page_track(struct intel_vgpu *vgpu, unsigned long gfn,
|
|
|
|
gvt_page_track_handler_t handler, void *priv)
|
|
|
|
{
|
|
|
|
struct intel_vgpu_page_track *track;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
track = intel_vgpu_find_page_track(vgpu, gfn);
|
|
|
|
if (track)
|
|
|
|
return -EEXIST;
|
|
|
|
|
|
|
|
track = kzalloc(sizeof(*track), GFP_KERNEL);
|
|
|
|
if (!track)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
track->handler = handler;
|
|
|
|
track->priv_data = priv;
|
|
|
|
|
|
|
|
ret = radix_tree_insert(&vgpu->page_track_tree, gfn, track);
|
|
|
|
if (ret) {
|
|
|
|
kfree(track);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_vgpu_unregister_page_track - unregister the tracked guest page
|
|
|
|
* @vgpu: a vGPU
|
|
|
|
* @gfn: the gfn of guest page
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void intel_vgpu_unregister_page_track(struct intel_vgpu *vgpu,
|
|
|
|
unsigned long gfn)
|
|
|
|
{
|
|
|
|
struct intel_vgpu_page_track *track;
|
|
|
|
|
|
|
|
track = radix_tree_delete(&vgpu->page_track_tree, gfn);
|
|
|
|
if (track) {
|
|
|
|
if (track->tracked)
|
|
|
|
intel_gvt_hypervisor_disable_page_track(vgpu, gfn);
|
|
|
|
kfree(track);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_vgpu_enable_page_track - set write-protection on guest page
|
|
|
|
* @vgpu: a vGPU
|
|
|
|
* @gfn: the gfn of guest page
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* zero on success, negative error code if failed.
|
|
|
|
*/
|
|
|
|
int intel_vgpu_enable_page_track(struct intel_vgpu *vgpu, unsigned long gfn)
|
|
|
|
{
|
|
|
|
struct intel_vgpu_page_track *track;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
track = intel_vgpu_find_page_track(vgpu, gfn);
|
|
|
|
if (!track)
|
|
|
|
return -ENXIO;
|
|
|
|
|
|
|
|
if (track->tracked)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = intel_gvt_hypervisor_enable_page_track(vgpu, gfn);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
track->tracked = true;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_vgpu_enable_page_track - cancel write-protection on guest page
|
|
|
|
* @vgpu: a vGPU
|
|
|
|
* @gfn: the gfn of guest page
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* zero on success, negative error code if failed.
|
|
|
|
*/
|
|
|
|
int intel_vgpu_disable_page_track(struct intel_vgpu *vgpu, unsigned long gfn)
|
|
|
|
{
|
|
|
|
struct intel_vgpu_page_track *track;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
track = intel_vgpu_find_page_track(vgpu, gfn);
|
|
|
|
if (!track)
|
|
|
|
return -ENXIO;
|
|
|
|
|
|
|
|
if (!track->tracked)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = intel_gvt_hypervisor_disable_page_track(vgpu, gfn);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
track->tracked = false;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_vgpu_page_track_handler - called when write to write-protected page
|
|
|
|
* @vgpu: a vGPU
|
|
|
|
* @gpa: the gpa of this write
|
|
|
|
* @data: the writed data
|
|
|
|
* @bytes: the length of this write
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* zero on success, negative error code if failed.
|
|
|
|
*/
|
|
|
|
int intel_vgpu_page_track_handler(struct intel_vgpu *vgpu, u64 gpa,
|
|
|
|
void *data, unsigned int bytes)
|
|
|
|
{
|
|
|
|
struct intel_vgpu_page_track *page_track;
|
|
|
|
int ret = 0;
|
|
|
|
|
drm/i915/gvt: Use vgpu_lock to protect per vgpu access
The patch set splits out 2 small locks from the original big gvt lock:
- vgpu_lock protects per-vGPU data and logic, especially the vGPU
trap emulation path.
- sched_lock protects gvt scheudler structure, context schedule logic
and vGPU's schedule data.
Use vgpu_lock to replace the gvt big lock. By doing this, the
mmio read/write trap path, vgpu virtual event emulation and other
vgpu related process, would be protected under per vgpu_lock.
v9:
- Change commit author since the patches are improved a lot compared
with original version.
Original author: Pei Zhang <pei.zhang@intel.com>
- Rebase to latest gvt-staging.
v8:
- Correct coding and comment style.
- Rebase to latest gvt-staging.
v7:
- Remove gtt_lock since already proteced by gvt_lock and vgpu_lock.
- Fix a typo in intel_gvt_deactivate_vgpu, unlock the wrong lock.
v6:
- Rebase to latest gvt-staging.
v5:
- Rebase to latest gvt-staging.
- intel_vgpu_page_track_handler should use vgpu_lock.
v4:
- Rebase to latest gvt-staging.
- Protect vgpu->active access with vgpu_lock.
- Do not wait gpu idle in vgpu_lock.
v3: update to latest code base
v2: add gvt->lock in function gvt_check_vblank_emulation
Performance comparison on Kabylake platform.
- Configuration:
Host: Ubuntu 16.04.
Guest 1 & 2: Ubuntu 16.04.
glmark2 score comparison:
- Configuration:
Host: glxgears.
Guests: glmark2.
+--------------------------------+-----------------+
| Setup | glmark2 score |
+--------------------------------+-----------------+
| unified lock, iommu=on | 58~62 (avg. 60) |
+--------------------------------+-----------------+
| unified lock, iommu=igfx_off | 57~61 (avg. 59) |
+--------------------------------+-----------------+
| per-logic lock, iommu=on | 60~68 (avg. 64) |
+--------------------------------+-----------------+
| per-logic lock, iommu=igfx_off | 61~67 (avg. 64) |
+--------------------------------+-----------------+
lock_stat comparison:
- Configuration:
Stop lock stat immediately after boot up.
Boot 2 VM Guests.
Run glmark2 in guests.
Start perf lock_stat for 20 seconds and stop again.
- Legend: c - contentions; w - waittime-avg
+------------+-----------------+-----------+---------------+------------+
| | gvt_lock |sched_lock | vgpu_lock | gtt_lock |
+ lock type; +-----------------+-----------+---------------+------------+
| iommu set | c | w | c | w | c | w | c | w |
+------------+-------+---------+----+------+------+--------+-----+------+
| unified; | 20697 | 839 |N/A | N/A | N/A | N/A | N/A | N/A |
| on | | | | | | | | |
+------------+-------+---------+----+------+------+--------+-----+------+
| unified; | 21838 | 658.15 |N/A | N/A | N/A | N/A | N/A | N/A |
| igfx_off | | | | | | | | |
+------------+-------+---------+----+------+------+--------+-----+------+
| per-logic; | 1553 | 1599.96 |9458|429.97| 5846 | 274.33 | 0 | 0.00 |
| on | | | | | | | | |
+------------+-------+---------+----+------+------+--------+-----+------+
| per-logic; | 1911 | 1678.32 |8335|445.16| 5451 | 244.80 | 0 | 0.00 |
| igfx_off | | | | | | | | |
+------------+-------+---------+----+------+------+--------+-----+------+
Signed-off-by: Pei Zhang <pei.zhang@intel.com>
Signed-off-by: Colin Xu <colin.xu@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2018-05-19 11:28:54 +07:00
|
|
|
mutex_lock(&vgpu->vgpu_lock);
|
2018-01-30 18:19:53 +07:00
|
|
|
|
|
|
|
page_track = intel_vgpu_find_page_track(vgpu, gpa >> PAGE_SHIFT);
|
2018-03-06 05:07:28 +07:00
|
|
|
if (!page_track) {
|
|
|
|
ret = -ENXIO;
|
2018-03-06 05:07:27 +07:00
|
|
|
goto out;
|
2018-03-06 05:07:28 +07:00
|
|
|
}
|
2018-01-30 18:19:53 +07:00
|
|
|
|
|
|
|
if (unlikely(vgpu->failsafe)) {
|
|
|
|
/* Remove write protection to prevent furture traps. */
|
|
|
|
intel_vgpu_disable_page_track(vgpu, gpa >> PAGE_SHIFT);
|
|
|
|
} else {
|
|
|
|
ret = page_track->handler(page_track, gpa, data, bytes);
|
|
|
|
if (ret)
|
|
|
|
gvt_err("guest page write error, gpa %llx\n", gpa);
|
|
|
|
}
|
|
|
|
|
2018-03-06 05:07:27 +07:00
|
|
|
out:
|
drm/i915/gvt: Use vgpu_lock to protect per vgpu access
The patch set splits out 2 small locks from the original big gvt lock:
- vgpu_lock protects per-vGPU data and logic, especially the vGPU
trap emulation path.
- sched_lock protects gvt scheudler structure, context schedule logic
and vGPU's schedule data.
Use vgpu_lock to replace the gvt big lock. By doing this, the
mmio read/write trap path, vgpu virtual event emulation and other
vgpu related process, would be protected under per vgpu_lock.
v9:
- Change commit author since the patches are improved a lot compared
with original version.
Original author: Pei Zhang <pei.zhang@intel.com>
- Rebase to latest gvt-staging.
v8:
- Correct coding and comment style.
- Rebase to latest gvt-staging.
v7:
- Remove gtt_lock since already proteced by gvt_lock and vgpu_lock.
- Fix a typo in intel_gvt_deactivate_vgpu, unlock the wrong lock.
v6:
- Rebase to latest gvt-staging.
v5:
- Rebase to latest gvt-staging.
- intel_vgpu_page_track_handler should use vgpu_lock.
v4:
- Rebase to latest gvt-staging.
- Protect vgpu->active access with vgpu_lock.
- Do not wait gpu idle in vgpu_lock.
v3: update to latest code base
v2: add gvt->lock in function gvt_check_vblank_emulation
Performance comparison on Kabylake platform.
- Configuration:
Host: Ubuntu 16.04.
Guest 1 & 2: Ubuntu 16.04.
glmark2 score comparison:
- Configuration:
Host: glxgears.
Guests: glmark2.
+--------------------------------+-----------------+
| Setup | glmark2 score |
+--------------------------------+-----------------+
| unified lock, iommu=on | 58~62 (avg. 60) |
+--------------------------------+-----------------+
| unified lock, iommu=igfx_off | 57~61 (avg. 59) |
+--------------------------------+-----------------+
| per-logic lock, iommu=on | 60~68 (avg. 64) |
+--------------------------------+-----------------+
| per-logic lock, iommu=igfx_off | 61~67 (avg. 64) |
+--------------------------------+-----------------+
lock_stat comparison:
- Configuration:
Stop lock stat immediately after boot up.
Boot 2 VM Guests.
Run glmark2 in guests.
Start perf lock_stat for 20 seconds and stop again.
- Legend: c - contentions; w - waittime-avg
+------------+-----------------+-----------+---------------+------------+
| | gvt_lock |sched_lock | vgpu_lock | gtt_lock |
+ lock type; +-----------------+-----------+---------------+------------+
| iommu set | c | w | c | w | c | w | c | w |
+------------+-------+---------+----+------+------+--------+-----+------+
| unified; | 20697 | 839 |N/A | N/A | N/A | N/A | N/A | N/A |
| on | | | | | | | | |
+------------+-------+---------+----+------+------+--------+-----+------+
| unified; | 21838 | 658.15 |N/A | N/A | N/A | N/A | N/A | N/A |
| igfx_off | | | | | | | | |
+------------+-------+---------+----+------+------+--------+-----+------+
| per-logic; | 1553 | 1599.96 |9458|429.97| 5846 | 274.33 | 0 | 0.00 |
| on | | | | | | | | |
+------------+-------+---------+----+------+------+--------+-----+------+
| per-logic; | 1911 | 1678.32 |8335|445.16| 5451 | 244.80 | 0 | 0.00 |
| igfx_off | | | | | | | | |
+------------+-------+---------+----+------+------+--------+-----+------+
Signed-off-by: Pei Zhang <pei.zhang@intel.com>
Signed-off-by: Colin Xu <colin.xu@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2018-05-19 11:28:54 +07:00
|
|
|
mutex_unlock(&vgpu->vgpu_lock);
|
2018-01-30 18:19:53 +07:00
|
|
|
return ret;
|
|
|
|
}
|