Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Disable interrupts while appending packet in E1000

Browse Source 
This avoids getting rescheduled and having other packets waiting to get
sent because of that
This commit is contained in:
Bananymous
2026-06-28 01:01:04 +03:00
parent 6339044e4c
commit aedd53b3e0
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/include/kernel/Networking/E1000/E1000.h
View File

@@ -74,8 +74,8 @@ namespace Kernel
BAN::UniqPtr<DMARegion> m_rx_descriptor_region; BAN::UniqPtr<DMARegion> m_rx_descriptor_region;
BAN::UniqPtr<DMARegion> m_tx_descriptor_region; BAN::UniqPtr<DMARegion> m_tx_descriptor_region;
BAN::Atomic<uint32_t> m_tx_head1 { 0 }; BAN::Atomic<uint32_t> m_tx_head { 0 };
BAN::Atomic<uint32_t> m_tx_head2 { 0 }; BAN::Atomic<uint32_t> m_tx_commit { 0 };
SpinLock m_rx_lock; SpinLock m_rx_lock;
ThreadBlocker m_rx_blocker; ThreadBlocker m_rx_blocker;

14
kernel/kernel/Networking/E1000/E1000.cpp
View File

@@ -281,7 +281,11 @@ namespace Kernel
BAN::ErrorOr<void> E1000::send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan> payload) BAN::ErrorOr<void> E1000::send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan> payload)
{ {
const uint32_t tx_current = m_tx_head1.fetch_add(1) % E1000_TX_DESCRIPTOR_COUNT; const auto interrupt_state = Processor::get_interrupt_state();
Processor::set_interrupt_state(InterruptState::Disabled);
const uint32_t tx_current_nowrap = m_tx_head.fetch_add(1);
const uint32_t tx_current = tx_current_nowrap % E1000_TX_DESCRIPTOR_COUNT;
auto& descriptor = reinterpret_cast<volatile e1000_tx_desc*>(m_tx_descriptor_region->vaddr())[tx_current]; auto& descriptor = reinterpret_cast<volatile e1000_tx_desc*>(m_tx_descriptor_region->vaddr())[tx_current];
while (descriptor.status == 0) while (descriptor.status == 0)
@@ -306,8 +310,12 @@ namespace Kernel
descriptor.status = 0; descriptor.status = 0;
descriptor.cmd = CMD_EOP | CMD_IFCS | CMD_RS; descriptor.cmd = CMD_EOP | CMD_IFCS | CMD_RS;
if (tx_current == m_tx_head2.fetch_add(1) % E1000_TX_DESCRIPTOR_COUNT) while (tx_current_nowrap != m_tx_commit.load())
write32(REG_TDT, (tx_current + 1) % E1000_TX_DESCRIPTOR_COUNT); Processor::pause();
write32(REG_TDT, (tx_current + 1) % E1000_TX_DESCRIPTOR_COUNT);
m_tx_commit.add_fetch(1);
Processor::set_interrupt_state(interrupt_state);
dprintln_if(DEBUG_E1000, "sent {} bytes", packet_size); dprintln_if(DEBUG_E1000, "sent {} bytes", packet_size);