mark nic as trusted
PATCH v2 1/1 mark nic as trusted
This patch allows to mark specific nic as trusted by adding special PCI capability. "Trusted" means that it is used for communication between host and guest and no malicious entity can inject traffic to the nic.
Signed-off-by Gleb Natapov <[email protected]>
hw/e1000.c +4 -0
@@ -1045,6 +1045,10 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn) pci_conf[0x3d ] =1 ;// interrupt pin 0 +if (nd->secure_cookie[0 ]) +pci_add_capability (&d->dev,PCI_CAP_ID_SECURE ,TRUSTED_CAP_OFFSET , + nd->secure_cookie,sizeof (nd->secure_cookie)); + d->mmio_index =cpu_register_io_memory (0 , e1000_mmio_read, e1000_mmio_write, d);
hw/eepro100.c +4 -0
@@ -1754,6 +1754,10 @@ static void nic_init(PCIBus * bus, NICInfo * nd,pci_reset (s); +if (nd->secure_cookie[0 ]) +pci_add_capability (&d->dev,PCI_CAP_ID_SECURE ,TRUSTED_CAP_OFFSET , + nd->secure_cookie,sizeof (nd->secure_cookie)); +/* Add 64 * 2 EEPROM. i82557 and i82558 support a 64 word EEPROM, * i82559 and later support 64 or 256 word EEPROM. */ s->eeprom =eeprom93xx_new (EEPROM_SIZE );
hw/ne2000.c +5 -0
@@ -806,6 +806,11 @@ void pci_ne2000_init(PCIBus *bus, NICInfo *nd, int devfn)pci_register_io_region (&d->dev,0 ,0x100 ,PCI_ADDRESS_SPACE_IO , ne2000_map); + +if (nd->secure_cookie[0 ]) +pci_add_capability (&d->dev,PCI_CAP_ID_SECURE ,TRUSTED_CAP_OFFSET , + nd->secure_cookie,sizeof (nd->secure_cookie)); + s = &d->ne2000; s->irq = d->dev.irq[0 ]; s->pci_dev = (PCIDevice *)d;
hw/pci.c +17 -0
@@ -536,6 +536,23 @@ static void pci_set_irq(void *opaque, int irq_num, int level) bus->set_irq (bus->irq_opaque, irq_num, bus->irq_count[irq_num] !=0 ); } +int pci_add_capability (PCIDevice *d,uint8_t cap_id,uint8_t off,uint8_t *buf, +int len) +{ +uint16_t status =le16_to_cpu (*(uint16_t *)(d->config +0x06 )); + +if (off + len +2 >0x100 || off <0x40 ) +return -1 ; + + d->config[0x06 ] =cpu_to_le16 (status |0x10 ); + d->config[off] = cap_id; + d->config[off +1 ] = d->config[0x34 ]; + d->config[0x34 ] = off; +memcpy (d->config + off +2 , buf, len); + +return 0 ; +} +/***********************************************************/ /* monitor info on PCI */
hw/pci.h +4 -0
@@ -74,6 +74,8 @@ typedef struct PCIIORegion {#define PCI_COMMAND_RESERVED_MASK_HI (PCI_COMMAND_RESERVED >> 8) +#define PCI_CAP_ID_SECURE 0x0f +struct PCIDevice {/* PCI config space */ uint8_t config[256 ];
@@ -117,6 +119,8 @@ typedef void (*pci_set_irq_fn)(qemu_irq *pic, int irq_num, int level);typedef int (*pci_map_irq_fn )(PCIDevice *pci_dev,int irq_num);PCIBus *pci_register_bus (pci_set_irq_fn set_irq,pci_map_irq_fn map_irq,qemu_irq *pic,int devfn_min,int nirq); +int pci_add_capability (PCIDevice *d,uint8_t cap_id,uint8_t off,uint8_t *buf, +int len);void pci_nic_init (PCIBus *bus,NICInfo *nd,int devfn);void pci_data_write (void *opaque,uint32_t addr,uint32_t val,int len);
hw/pcnet.c +4 -0
@@ -2024,6 +2024,10 @@ void pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn) pci_conf[0x3e ] =0x06 ; pci_conf[0x3f ] =0xff ; +if (nd->secure_cookie[0 ]) +pci_add_capability (&d->dev,PCI_CAP_ID_SECURE ,TRUSTED_CAP_OFFSET , + nd->secure_cookie,sizeof (nd->secure_cookie)); +/* Handler for memory-mapped I/O */ d->mmio_index =cpu_register_io_memory (0 , pcnet_mmio_read, pcnet_mmio_write, d);
hw/rtl8139.c +4 -0
@@ -3423,6 +3423,10 @@ void pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn) pci_conf[0x3d ] =1 ;/* interrupt pin 0 */ pci_conf[0x34 ] =0xdc ; +if (nd->secure_cookie[0 ]) +pci_add_capability (&d->dev,PCI_CAP_ID_SECURE ,TRUSTED_CAP_OFFSET , + nd->secure_cookie,sizeof (nd->secure_cookie)); + s = &d->rtl8139;/* I/O handler for memory-mapped I/O */
hw/virtio-net.c +5 -0
@@ -309,6 +309,11 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)if (!n)return NULL ; +if (nd->secure_cookie[0 ]) +pci_add_capability (&n->vdev.pci_dev,PCI_CAP_ID_SECURE , +TRUSTED_CAP_OFFSET , nd->secure_cookie, +sizeof (nd->secure_cookie)); + n->vdev.get_config = virtio_net_update_config; n->vdev.get_features = virtio_net_get_features; n->vdev.set_features = virtio_net_set_features;
net.c +3 -0
@@ -1474,6 +1474,9 @@ int net_client_init(const char *device, const char *p)if (get_param_value (buf,sizeof (buf),"model" , p)) { nd->model =strdup (buf); } +if (get_param_value (buf,sizeof (buf),"trusted" , p)) { +strncpy (nd->secure_cookie, buf,sizeof (nd->secure_cookie)); + } nd->vlan = vlan; nb_nics++; vlan->nb_guest_devs++;
net.h +3 -0
@@ -50,6 +50,7 @@ struct NICInfo {uint8_t macaddr[6 ];const char *model;VLANState *vlan; +uint8_t secure_cookie[14 ]; };extern int nb_nics;
@@ -93,4 +94,6 @@ void net_client_check(void);#define SMBD_COMMAND "/usr/sbin/smbd"#endif +#define TRUSTED_CAP_OFFSET 0xf0 +#endif
--
Gleb.