ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

VirtIO notify asserts - take notify_off into account

Browse source
This commit is contained in:
Ernest Wong 2018-05-19 23:11:22 +12:00 committed by Fabian
parent 792a62e27b
commit 590ae36343
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/9p.js
View file

@ -73,8 +73,8 @@ function Virtio9p(filesystem, cpu, bus) {
queues:
[
{
size: 32,
notify_off: 0,
size_supported: 32,
notify_offset: 0,
}
],
features:
@ -84,7 +84,7 @@ function Virtio9p(filesystem, cpu, bus) {
notification:
{
initial_port: 0xA900,
share_handler: false,
single_handler: false,
handlers:
[
//on_notify.bind(this),

30
src/virtio.js
View file

@ -135,7 +135,7 @@ var VirtIO_CommonCapabilityOptions;
* @typedef {
* {
* initial_port: number,
* share_handler: boolean,
* single_handler: boolean,
* handlers: !Array<function()>,
* }}
*/
@ -303,6 +303,22 @@ function VirtIO(cpu, options)
capabilities.push(this.create_common_capability(options.common));
if(options.notification)
{
if(DEBUG)
{
var offsets = new Set();
for(var offset of this.queues.map(q => q.notify_offset))
{
offset.add(offset);
offset *= options.notification.single_handler ? 0 : 1;
dbg_assert(options.notification.handlers[offset],
"VirtIO device<" + this.name + "> every queue's notifier must exist");
}
options.notification.handlers.forEach((handler, index) =>
{
dbg_assert(!handler || offsets.has(index),
"VirtIO device<" + this.name +"> no defined notify handler should be unused");
});
}
capabilities.push(this.create_notification_capability(options.notification));
}
if(options.isr_status)
@ -573,20 +589,16 @@ VirtIO.prototype.create_notification_capability = function(options)
var notify_struct = [];
var notify_off_multiplier;
if(options.share_handler)
if(options.single_handler)
{
dbg_assert(options.handlers.length === 1,
"VirtIO device<" + this.name + "> too many notify handlers specified: expected single handler");
// All queues use the same address for notifying.
// Forces all queues use the same address for notifying.
notify_off_multiplier = 0;
}
else
{
dbg_assert(options.handlers.length === this.queues.length,
"Virtio device<" + this.name + "> each queue has exactly one notify handler");
// Each queue uses its own 2 bytes for notifying.
notify_off_multiplier = 2;
}
@ -596,8 +608,8 @@ VirtIO.prototype.create_notification_capability = function(options)
{
bytes: 2,
name: "notify" + i,
read: () => 0xFFFF, // Write only? TODO
write: options.handlers[i],
read: () => 0xFFFF,
write: options.handlers[i] || (data => {}),
});
}