Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions lib/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,43 @@ handle_erom_write(vfu_ctx_t *ctx, vfu_pci_config_space_t *pci,
return 0;
}

static int
handle_status_write(vfu_ctx_t *ctx UNUSED, vfu_pci_config_space_t *pci,
const char *buf)
{
vfu_pci_hdr_sts_t device_status;

assert(pci != NULL);
assert(buf != NULL);

device_status.raw = *(uint16_t *)buf;

if (device_status.dpd) {
pci->hdr.sts.dpd = 0;
}

if (device_status.sta) {
pci->hdr.sts.sta = 0;
}

if (device_status.rta) {
pci->hdr.sts.rta = 0;
}

if (device_status.rma) {
pci->hdr.sts.rma = 0;
}

if (device_status.sse) {
pci->hdr.sts.sse = 0;
}

if (device_status.dpe) {
pci->hdr.sts.dpe = 0;
}

return 0;
}
static int
pci_hdr_write(vfu_ctx_t *vfu_ctx, const char *buf, loff_t offset)
{
Expand All @@ -267,8 +304,7 @@ pci_hdr_write(vfu_ctx_t *vfu_ctx, const char *buf, loff_t offset)
ret = handle_command_write(vfu_ctx, cfg_space, buf);
break;
case PCI_STATUS:
/* FIXME ignoring write completely is wrong as some bits are RW1C */
vfu_log(vfu_ctx, LOG_INFO, "write to status ignored");
ret = handle_status_write(vfu_ctx, cfg_space, buf);
break;
/*
* According to the PCI spec, writing to read-only registers must be
Expand Down
9 changes: 9 additions & 0 deletions test/py/libvfio_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@
PCI_CFG_SPACE_SIZE = 256
PCI_CFG_SPACE_EXP_SIZE = 4096

PCI_STATUS = 0x06
PCI_STATUS_CAP_LIST = 0x0010
PCI_STATUS_DETECTED_PARITY = 0x8000
PCI_STATUS_PARITY = 0x0100
PCI_STATUS_SIG_TARGET_ABORT = 0x0800
PCI_STATUS_REC_TARGET_ABORT = 0x1000
PCI_STATUS_REC_MASTER_ABORT = 0x2000
PCI_STATUS_SIG_SYSTEM_ERROR = 0x4000

PCI_CAP_LIST_NEXT = 1

PCI_CAP_ID_PM = 0x1
Expand Down
1 change: 1 addition & 0 deletions test/py/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ python_tests = [
'test_sgl_read_write.py',
'test_vfu_create_ctx.py',
'test_vfu_realize_ctx.py',
'test_pci_status.py',
]

if get_option('shadow-ioeventfd')
Expand Down
122 changes: 122 additions & 0 deletions test/py/test_pci_status.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
#
# Copyright (c) 2021 Nutanix Inc. All rights reserved.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should have been more explicit, you don't have to add something, but if you it has to be correct. If in doubt, don't add anything.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for clarifying — I copied the copyright header from an existing test file when creating this test. Could you clarify what would be the correct header in this case? Should I remove it entirely or follow a different convention for new tests?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wrong about this, we do need the Copyright (year, company, author name) as well as the license.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You still have Nutanix as the company and John as the author.

#
# Authors: John Levon <john.levon@nutanix.com>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of Nutanix nor the names of its contributors may be
# used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
# DAMAGE.
#

from libvfio_user import *
import struct

ctx = None

def setup_function(function):
global ctx

ctx = vfu_create_ctx(flags=LIBVFIO_USER_FLAG_ATTACH_NB)
assert ctx is not None

ret = vfu_setup_device_reset_cb(ctx)
assert ret == 0

vfu_setup_device_quiesce_cb(ctx)


def teardown_function(function):
vfu_destroy_ctx(ctx)


def read_status(sock):
payload = read_region(
ctx,
sock,
VFU_PCI_DEV_CFG_REGION_IDX,
offset=PCI_STATUS,
count=2
)

return struct.unpack("<H", payload)[0]


def test_pci_status_rw1c():
Comment thread
zp78256pxd-ux marked this conversation as resolved.
"""
Verify RW1C handling of the PCI status register.

Checks that all six write-1-to-clear bits (dpd, sta, rta, rma, sse, dpe):
- are cleared when the guest writes a 1;
- are left unchanged when the guest writes a 0.

Also checks that writing to a read-only bit (Capabilities List) has no
effect.
"""
ret = vfu_pci_init(ctx, pci_type=VFU_PCI_TYPE_CONVENTIONAL)
assert ret == 0

ret = vfu_setup_region(
ctx,
index=VFU_PCI_DEV_CFG_REGION_IDX,
size=PCI_CFG_SPACE_SIZE,
flags=VFU_REGION_FLAG_RW
)
assert ret == 0

ret = vfu_realize_ctx(ctx)
assert ret == 0

client = connect_client(ctx)
rw1c_bits = [
PCI_STATUS_PARITY,
PCI_STATUS_SIG_TARGET_ABORT,
PCI_STATUS_REC_TARGET_ABORT,
PCI_STATUS_REC_MASTER_ABORT,
PCI_STATUS_SIG_SYSTEM_ERROR,
PCI_STATUS_DETECTED_PARITY,
]
all_rw1c = 0
for bit in rw1c_bits:
all_rw1c |= bit

# Seed every RW1C bit plus a read-only bit (CAP_LIST) directly.
write_pci_cfg_space(ctx, struct.pack("<H", all_rw1c | PCI_STATUS_CAP_LIST),
2, PCI_STATUS)
assert read_status(client.sock) == all_rw1c | PCI_STATUS_CAP_LIST

# Writing 0 must clear nothing.
write_region(ctx, client.sock, VFU_PCI_DEV_CFG_REGION_IDX,
offset=PCI_STATUS, count=2, data=struct.pack("<H", 0))
assert read_status(client.sock) == all_rw1c | PCI_STATUS_CAP_LIST

# Writing 1 clears that bit only; the RO CAP_LIST bit must survive.
remaining = all_rw1c
for bit in rw1c_bits:
write_region(ctx, client.sock, VFU_PCI_DEV_CFG_REGION_IDX,
offset=PCI_STATUS, count=2, data=struct.pack("<H", bit))
remaining &= ~bit
assert read_status(client.sock) == remaining | PCI_STATUS_CAP_LIST

# Writing 1 to a read-only bit must have no effect.
write_region(ctx, client.sock, VFU_PCI_DEV_CFG_REGION_IDX,
offset=PCI_STATUS, count=2, data=struct.pack("<H", PCI_STATUS_CAP_LIST))
assert read_status(client.sock) == PCI_STATUS_CAP_LIST
Loading