RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:37:46 +00:00
Code Issues Activity Actions

Kernel/USB: Use allocate_kernel_region in Transfer buffer allocations

Browse source 
Previously it would create a contiguous AVMO manually and pass it to
MM. This uses supervisor pages that quickly run out as they never get
returned and crash the system.

Instead, use allocate_kernel_region as we're only allocating a page so
it will be contiguous and will be returned when destroyed.

A potentially better solution would be to use a pool of transfers to
avoid all the allocations. This just prevents the system from crashing
within ~5 seconds from the continuous hub polling.
This commit is contained in:
Luke 2021-08-11 22:59:32 +01:00 • committed by Andreas Kling
parent 1ca5b6caa9
commit 14da080dcf
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Kernel/Bus/USB/USBTransfer.cpp
View file

@ -10,21 +10,21 @@
namespace Kernel::USB { namespace Kernel::USB {
RefPtr<Transfer> Transfer::try_create(Pipe& pipe, u16 len) RefPtr<Transfer> Transfer::try_create(Pipe& pipe, u16 len)
{
auto vmobject = Memory::AnonymousVMObject::try_create_physically_contiguous_with_size(PAGE_SIZE);
if (!vmobject)
return nullptr;
return AK::try_create<Transfer>(pipe, len, *vmobject);
}
Transfer::Transfer(Pipe& pipe, u16 len, Memory::AnonymousVMObject& vmobject)
: m_pipe(pipe)
, m_transfer_data_size(len)
{ {
// Initialize data buffer for transfer // Initialize data buffer for transfer
// This will definitely need to be refactored in the future, I doubt this will scale well... // This will definitely need to be refactored in the future, I doubt this will scale well...
m_data_buffer = MM.allocate_kernel_region_with_vmobject(vmobject, PAGE_SIZE, "USB Transfer Buffer", Memory::Region::Access::ReadWrite); auto data_buffer = MM.allocate_kernel_region(PAGE_SIZE, "USB Transfer Buffer", Memory::Region::Access::ReadWrite);
if (!data_buffer)
return {};
return AK::try_create<Transfer>(pipe, len, data_buffer.release_nonnull());
}
Transfer::Transfer(Pipe& pipe, u16 len, NonnullOwnPtr<Memory::Region> data_buffer)
: m_pipe(pipe)
, m_data_buffer(move(data_buffer))
, m_transfer_data_size(len)
{
} }
Transfer::~Transfer() Transfer::~Transfer()

14
Kernel/Bus/USB/USBTransfer.h
View file

@ -23,7 +23,7 @@ public:
public: public:
Transfer() = delete; Transfer() = delete;
Transfer(Pipe& pipe, u16 len, Memory::AnonymousVMObject&); Transfer(Pipe& pipe, u16 len, NonnullOwnPtr<Memory::Region>);
~Transfer(); ~Transfer();
void set_setup_packet(const USBRequestData& request); void set_setup_packet(const USBRequestData& request);
@ -41,11 +41,11 @@ public:
bool error_occurred() const { return m_error_occurred; } bool error_occurred() const { return m_error_occurred; }
private: private:
Pipe& m_pipe; // Pipe that initiated this transfer Pipe& m_pipe; // Pipe that initiated this transfer
USBRequestData m_request; // USB request USBRequestData m_request; // USB request
OwnPtr<Memory::Region> m_data_buffer; // DMA Data buffer for transaction NonnullOwnPtr<Memory::Region> m_data_buffer; // DMA Data buffer for transaction
u16 m_transfer_data_size { 0 }; // Size of the transfer's data stage u16 m_transfer_data_size { 0 }; // Size of the transfer's data stage
bool m_complete { false }; // Has this transfer been completed? bool m_complete { false }; // Has this transfer been completed?
bool m_error_occurred { false }; // Did an error occur during this transfer? bool m_error_occurred { false }; // Did an error occur during this transfer?
}; };
} }