ehmry/genode-ehmry
ehmry/genode-ehmry
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

os: packets without playload in packet stream

Browse Source 
issue #1988
This commit is contained in:
Sebastian Sumpf 2016-05-31 18:53:57 +02:00 committed by Christian Helmuth
parent 37fb4309b3
commit 4994616346
17 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/dde_ipxe/src/drivers/nic/main.cc
View File

@ -59,7 +59,7 @@ class Ipxe_session_component : public Nic::Session_component
return false;
Packet_descriptor packet = _tx.sink()->get_packet();
if (!packet.valid()) {
if (!packet.size()) {
PWRN("Invalid tx packet");
return true;
}

6
repos/dde_linux/src/lib/usb/include/usb_nic_component.h
View File

@ -100,7 +100,7 @@ class Usb_nic::Session_component : public Nic::Session_component
unsigned char *ptr = nullptr;
/* submit received packets to lower layer */
while (((_tx.sink()->packet_avail() || save.valid()) && _tx.sink()->ready_to_ack()))
while (((_tx.sink()->packet_avail() || save.size()) && _tx.sink()->ready_to_ack()))
{
/* alloc skb */
if (!skb) {
@ -111,7 +111,7 @@ class Usb_nic::Session_component : public Nic::Session_component
work_skb.data = nullptr;
}
Packet_descriptor packet = save.valid() ? save : _tx.sink()->get_packet();
Packet_descriptor packet = save.size() ? save : _tx.sink()->get_packet();
save = Packet_descriptor();
if (!_device->skb_fill(&work_skb, ptr, packet.size(), skb->end)) {
@ -147,7 +147,7 @@ class Usb_nic::Session_component : public Nic::Session_component
return false;
Genode::Packet_descriptor packet = _tx.sink()->get_packet();
if (!packet.valid()) {
if (!packet.size()) {
PWRN("Invalid tx packet");
return true;
}

2
repos/dde_linux/src/lib/wifi/nic.cc
View File

@ -62,7 +62,7 @@ class Wifi_session_component : public Nic::Session_component
return false;
Packet_descriptor packet = _tx.sink()->get_packet();
if (!packet.valid()) {
if (!packet.size()) {
PWRN("Invalid tx packet");
return true;
}

11
repos/libports/src/lib/qemu-usb/host.cc
View File

@ -228,19 +228,10 @@ struct Usb_host_device : List<Usb_host_device>::Element
Usb::Packet_descriptor alloc_packet(int length)
{
if (!usb_raw.source()->ready_to_submit())
throw -1;
if (length <= 0) {
/*
* XXX Packets without payload are not supported by the packet stream
* currently. Therefore, we use a (small) bogus length
* here and depend on the USB driver to handle this case
* correctly.
*/
length = 4;
}
Usb::Packet_descriptor packet = usb_raw.source()->alloc_packet(length);
packet.completion = alloc_completion();
return packet;

2
repos/os/include/block/component.h
View File

@ -103,7 +103,7 @@ class Block::Session_component : public Block::Session_component_base,
_p_to_handle.succeeded(false);
/* ignore invalid packets */
if (!packet.valid() || !_range_check(_p_to_handle)) {
if (!packet.size() || !_range_check(_p_to_handle)) {
_ack_packet(_p_to_handle);
return;
}

21
repos/os/include/os/packet_stream.h
View File

@ -143,8 +143,6 @@ class Genode::Packet_descriptor
Genode::off_t offset() const { return _offset; }
Genode::size_t size() const { return _size; }
bool valid() const { return _size != 0; }
};
@ -645,12 +643,19 @@ class Genode::Packet_stream_source : private Packet_stream_base
Packet_descriptor alloc_packet(Genode::size_t size, int align = POLICY::Packet_descriptor::PACKET_ALIGNMENT)
{
void *base = 0;
if (_packet_alloc->alloc_aligned(size, &base, align).error())
if (size && _packet_alloc->alloc_aligned(size, &base, align).error())
throw Packet_alloc_failed();
return Packet_descriptor((Genode::off_t)base, size);
}
bool packet_valid(Packet_descriptor packet)
{
return (packet.offset() >= _bulk_buffer_offset
&& packet.offset() < _bulk_buffer_offset + (Genode::off_t)_bulk_buffer_size
&& packet.offset() + packet.size() <= _bulk_buffer_offset + _bulk_buffer_size);
}
/**
* Get pointer to the content of the specified packet
*
@ -658,7 +663,7 @@ class Genode::Packet_stream_source : private Packet_stream_base
*/
Content_type *packet_content(Packet_descriptor packet)
{
if (!packet.valid() || packet.size() < sizeof(Content_type))
if (!packet_valid(packet) || packet.size() < sizeof(Content_type))
return 0;
return (Content_type *)((Genode::addr_t)_ds_local_base + packet.offset());
@ -700,7 +705,8 @@ class Genode::Packet_stream_source : private Packet_stream_base
*/
void release_packet(Packet_descriptor packet)
{
_packet_alloc->free((void *)packet.offset(), packet.size());
if (packet.size())
_packet_alloc->free((void *)packet.offset(), packet.size());
}
void debug_print_buffers() {
@ -807,8 +813,7 @@ class Genode::Packet_stream_sink : private Packet_stream_base
Packet_descriptor get_packet()
{
Packet_descriptor packet;
do { _submit_receiver.rx(&packet); }
while (!packet_valid(packet));
_submit_receiver.rx(&packet);
return packet;
}
@ -829,7 +834,7 @@ class Genode::Packet_stream_sink : private Packet_stream_base
*/
Content_type *packet_content(Packet_descriptor packet)
{
if (!packet.valid() || packet.size() < sizeof(Content_type))
if (!packet_valid(packet) || packet.size() < sizeof(Content_type))
return 0;
return (Content_type *)((Genode::addr_t)_ds_local_base + packet.offset());

10
repos/os/include/usb/packet_handler.h
View File

@ -85,16 +85,6 @@ class Usb::Packet_handler
throw Usb::Session::Tx::Source::Packet_alloc_failed();
}
if (size == 0) {
/*
* XXX Packets without payload are not supported by the packet
* stream currently. Therefore, we use a (small) bogus
* length here and depend on the USB driver to handle this
* case correctly.
*/
size = 4;
}
while (true) {
try {
Packet_descriptor p = _connection.source()->alloc_packet(size);

6
repos/os/src/drivers/ahci/ata_driver.h
View File

@ -198,7 +198,7 @@ struct Ata_driver : Port_driver
unsigned find_free_cmd_slot()
{
for (unsigned slot = 0; slot < cmd_slots; slot++)
if (!pending[slot].valid())
if (!pending[slot].size())
return slot;
throw Block::Driver::Request_congestion();
@ -209,7 +209,7 @@ struct Ata_driver : Port_driver
unsigned slots = Port::read<Ci>() | Port::read<Sact>();
for (unsigned slot = 0; slot < cmd_slots; slot++) {
if ((slots & (1U << slot)) || !pending[slot].valid())
if ((slots & (1U << slot)) || !pending[slot].size())
continue;
Block::Packet_descriptor p = pending[slot];
@ -224,7 +224,7 @@ struct Ata_driver : Port_driver
Block::sector_t end = block_number + count - 1;
for (unsigned slot = 0; slot < cmd_slots; slot++) {
if (!pending[slot].valid())
if (!pending[slot].size())
continue;
Block::sector_t pending_start = pending[slot].block_number();

4
repos/os/src/drivers/ahci/atapi_driver.h
View File

@ -86,7 +86,7 @@ struct Atapi_driver : Port_driver
{
unsigned slots = Port::read<Ci>();
if (slots & 1 || !pending.valid())
if (slots & 1 || !pending.size())
return;
Block::Packet_descriptor p = pending;
@ -176,7 +176,7 @@ struct Atapi_driver : Port_driver
addr_t phys,
Block::Packet_descriptor &packet) override
{
if (pending.valid())
if (pending.size())
throw Block::Driver::Request_congestion();
sanity_check(block_number, count);

2
repos/os/src/drivers/nic/gem/cadence_gem.h
View File

@ -461,7 +461,7 @@ namespace Genode
return false;
Genode::Packet_descriptor packet = _tx.sink()->get_packet();
if (!packet.valid()) {
if (!packet.size()) {
PWRN("Invalid tx packet");
return true;
}

2
repos/os/src/drivers/nic/spec/lan9118/lan9118.h
View File

@ -199,7 +199,7 @@ class Lan9118 : public Nic::Session_component,
return false;
Genode::Packet_descriptor packet = _tx.sink()->get_packet();
if (!packet.valid()) {
if (!packet.size()) {
PWRN("Invalid tx packet");
return true;
}

2
repos/os/src/drivers/nic/spec/linux/main.cc
View File

@ -128,7 +128,7 @@ class Linux_session_component : public Nic::Session_component
return false;
Packet_descriptor packet = _tx.sink()->get_packet();
if (!packet.valid()) {
if (!packet.size()) {
PWRN("Invalid tx packet");
return true;
}

4
repos/os/src/server/blk_cache/driver.h
View File

@ -254,8 +254,8 @@ class Driver : public Block::Driver
} catch(Block::Session::Tx::Source::Packet_alloc_failed) {
throw Request_congestion();
} catch(Genode::Allocator::Out_of_memory) {
if (p_to_dev.valid()) /* clean up */
_blk.tx()->release_packet(p_to_dev);
/* clean up */
_blk.tx()->release_packet(p_to_dev);
throw Request_congestion();
}
}

2
repos/os/src/server/nic_bridge/packet_handler.cc
View File

@ -30,7 +30,7 @@ void Packet_handler::_ready_to_submit(unsigned)
/* as long as packets are available, and we can ack them */
while (sink()->packet_avail()) {
_packet = sink()->get_packet();
if (!_packet.valid()) continue;
if (!_packet.size()) continue;
handle_ethernet(sink()->packet_content(_packet), _packet.size());
if (!sink()->ready_to_ack()) {

4
repos/os/src/server/nic_loopback/main.cc
View File

@ -124,8 +124,8 @@ void Nic::Loopback_component::_handle_packet_stream()
/* obtain packet */
Packet_descriptor const packet_from_client = _tx.sink()->get_packet();
if (!packet_from_client.valid()) {
PWRN("received invalid packet");
if (!packet_from_client.size()) {
PWRN("received zero-size packet");
_rx.source()->release_packet(packet_to_client);
continue;
}

2
repos/os/src/server/part_blk/component.h
View File

@ -73,7 +73,7 @@ class Block::Session_component : public Block::Session_rpc_object,
_p_to_handle.succeeded(false);
/* ignore invalid packets */
if (!packet.valid() || !_range_check(_p_to_handle)) {
if (!packet.size() || !_range_check(_p_to_handle)) {
_ack_packet(_p_to_handle);
return;
}

2
repos/ports/src/app/openvpn/main.cc
View File

@ -110,7 +110,7 @@ class Openvpn_component : public Tuntap_device,
return false;
Packet_descriptor packet = _tx.sink()->get_packet();
if (!packet.valid()) {
if (!packet.size()) {
PWRN("Invalid tx packet");
return true;
}