Skip to content

feat(virtio): support multicast #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(virtio): support multicast #592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 19 additions & 7 deletions awkernel_drivers/src/pcie/virtio/virtio_net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ use awkernel_lib::{
addr::Addr,
dma_pool::DMAPool,
interrupt::IRQ,
net::net_device::{
EtherFrameBuf, EtherFrameRef, LinkStatus, NetCapabilities, NetDevError, NetDevice, NetFlags,
net::{
multicast::MulticastAddrs,
net_device::{
EtherFrameBuf, EtherFrameRef, LinkStatus, NetCapabilities, NetDevError, NetDevice,
NetFlags,
},
},
paging::PAGESIZE,
sync::{
Expand Down Expand Up @@ -558,6 +562,7 @@ struct VirtioNetInner {
active_features: u64,
flags: NetFlags,
capabilities: NetCapabilities,
multicast_addrs: MulticastAddrs,
virtqueues: Vec<Queue>,
ctrl_vq: Option<Mutex<Virtq>>,
irq_to_type: BTreeMap<u16, IRQType>,
Expand All @@ -577,6 +582,7 @@ impl VirtioNetInner {
active_features: 0,
flags: NetFlags::empty(),
capabilities: NetCapabilities::empty(),
multicast_addrs: MulticastAddrs::new(),
virtqueues: Vec::new(),
ctrl_vq: None,
irq_to_type: BTreeMap::new(),
Expand Down Expand Up @@ -1004,7 +1010,7 @@ impl VirtioNetInner {
}

fn vio_iff(&mut self) {
self.flags.insert(NetFlags::MULTICAST);
self.flags.insert(NetFlags::ALLMULTI);
self.flags.insert(NetFlags::PROMISC);
}

Expand Down Expand Up @@ -1300,12 +1306,18 @@ impl NetDevice for VirtioNet {
None
}

fn add_multicast_addr(&self, _addr: &[u8; 6]) -> Result<(), NetDevError> {
todo!()
fn add_multicast_addr(&self, addr: &[u8; 6]) -> Result<(), NetDevError> {
let mut inner = self.inner.write();
inner.multicast_addrs.add_addr(*addr);
inner.vio_iff();
Ok(())
}

fn remove_multicast_addr(&self, _addr: &[u8; 6]) -> Result<(), NetDevError> {
todo!()
fn remove_multicast_addr(&self, addr: &[u8; 6]) -> Result<(), NetDevError> {
let mut inner = self.inner.write();
inner.multicast_addrs.remove_addr(addr);
inner.vio_iff();
Ok(())
}

fn poll_in_service(&self) -> Result<(), NetDevError> {
Expand Down