occheung
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drtio-mgmt: remove custom payload size

This commit is contained in:
occheung 2024-08-23 11:37:55 +08:00
parent 006981306f
commit 1683572838
5 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libboard_artiq/src/drtioaux_proto.rs
View File

@ -8,11 +8,6 @@ const MAX_PACKET: usize = 1024;
pub const SAT_PAYLOAD_MAX_SIZE: usize = /*max size*/MAX_PACKET - /*CRC*/4 - /*packet ID*/1 - /*last*/1 - /*length*/2; pub const SAT_PAYLOAD_MAX_SIZE: usize = /*max size*/MAX_PACKET - /*CRC*/4 - /*packet ID*/1 - /*last*/1 - /*length*/2;
// used by DDMA, subkernel program data (need to provide extra ID and destination) // used by DDMA, subkernel program data (need to provide extra ID and destination)
pub const MASTER_PAYLOAD_MAX_SIZE: usize = SAT_PAYLOAD_MAX_SIZE - /*source*/1 - /*destination*/1 - /*ID*/4; pub const MASTER_PAYLOAD_MAX_SIZE: usize = SAT_PAYLOAD_MAX_SIZE - /*source*/1 - /*destination*/1 - /*ID*/4;
// used by core device management, core_mgmt packet
// FIXME: packet size
pub const CORE_MGMT_PAYLOAD_MAX_SIZE: usize = MASTER_PAYLOAD_MAX_SIZE;
// pub const CORE_MGMT_CONFIG_MAX_SIZE: usize = /*max size*/MAX_PACKET - /*destination*/1 - /*last*/1 - /*length*/2;
pub const CORE_MGMT_CONFIG_MAX_SIZE: usize = MASTER_PAYLOAD_MAX_SIZE;
#[derive(Debug)] #[derive(Debug)]
pub enum Error { pub enum Error {
@ -311,7 +306,7 @@ pub enum Packet {
CoreMgmtConfigReadRequest { CoreMgmtConfigReadRequest {
destination: u8, destination: u8,
length: u16, length: u16,
key: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE], key: [u8; MASTER_PAYLOAD_MAX_SIZE],
}, },
CoreMgmtConfigReadContinue { CoreMgmtConfigReadContinue {
destination: u8, destination: u8,
@ -320,12 +315,12 @@ pub enum Packet {
destination: u8, destination: u8,
length: u16, length: u16,
last: bool, last: bool,
data: [u8; CORE_MGMT_CONFIG_MAX_SIZE], data: [u8; MASTER_PAYLOAD_MAX_SIZE],
}, },
CoreMgmtConfigRemoveRequest { CoreMgmtConfigRemoveRequest {
destination: u8, destination: u8,
length: u16, length: u16,
key: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE], key: [u8; MASTER_PAYLOAD_MAX_SIZE],
}, },
CoreMgmtConfigEraseRequest { CoreMgmtConfigEraseRequest {
destination: u8, destination: u8,
@ -339,12 +334,12 @@ pub enum Packet {
CoreMgmtGetLogReply { CoreMgmtGetLogReply {
last: bool, last: bool,
length: u16, length: u16,
data: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE], data: [u8; SAT_PAYLOAD_MAX_SIZE],
}, },
CoreMgmtConfigReadReply { CoreMgmtConfigReadReply {
length: u16, length: u16,
last: bool, last: bool,
value: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE], value: [u8; SAT_PAYLOAD_MAX_SIZE],
}, },
CoreMgmtAck, CoreMgmtAck,
CoreMgmtNack, CoreMgmtNack,
@ -642,7 +637,7 @@ impl Packet {
0xd4 => { 0xd4 => {
let destination = reader.read_u8()?; let destination = reader.read_u8()?;
let length = reader.read_u16()?; let length = reader.read_u16()?;
let mut key: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE] = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut key: [u8; MASTER_PAYLOAD_MAX_SIZE] = [0; MASTER_PAYLOAD_MAX_SIZE];
reader.read_exact(&mut key[0..length as usize])?; reader.read_exact(&mut key[0..length as usize])?;
Packet::CoreMgmtConfigReadRequest { Packet::CoreMgmtConfigReadRequest {
destination: destination, destination: destination,
@ -657,7 +652,7 @@ impl Packet {
let destination = reader.read_u8()?; let destination = reader.read_u8()?;
let length = reader.read_u16()?; let length = reader.read_u16()?;
let last = reader.read_bool()?; let last = reader.read_bool()?;
let mut data: [u8; CORE_MGMT_CONFIG_MAX_SIZE] = [0; CORE_MGMT_CONFIG_MAX_SIZE]; let mut data: [u8; MASTER_PAYLOAD_MAX_SIZE] = [0; MASTER_PAYLOAD_MAX_SIZE];
reader.read_exact(&mut data[0..length as usize])?; reader.read_exact(&mut data[0..length as usize])?;
Packet::CoreMgmtConfigWriteRequest { Packet::CoreMgmtConfigWriteRequest {
destination: destination, destination: destination,
@ -669,7 +664,7 @@ impl Packet {
0xd7 => { 0xd7 => {
let destination = reader.read_u8()?; let destination = reader.read_u8()?;
let length = reader.read_u16()?; let length = reader.read_u16()?;
let mut key: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE] = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut key: [u8; MASTER_PAYLOAD_MAX_SIZE] = [0; MASTER_PAYLOAD_MAX_SIZE];
reader.read_exact(&mut key[0..length as usize])?; reader.read_exact(&mut key[0..length as usize])?;
Packet::CoreMgmtConfigRemoveRequest { Packet::CoreMgmtConfigRemoveRequest {
destination: destination, destination: destination,
@ -689,7 +684,7 @@ impl Packet {
0xdb => { 0xdb => {
let last = reader.read_bool()?; let last = reader.read_bool()?;
let length = reader.read_u16()?; let length = reader.read_u16()?;
let mut data: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE] = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut data: [u8; SAT_PAYLOAD_MAX_SIZE] = [0; SAT_PAYLOAD_MAX_SIZE];
reader.read_exact(&mut data[0..length as usize])?; reader.read_exact(&mut data[0..length as usize])?;
Packet::CoreMgmtGetLogReply { Packet::CoreMgmtGetLogReply {
last: last, last: last,
@ -700,7 +695,7 @@ impl Packet {
0xdc => { 0xdc => {
let length = reader.read_u16()?; let length = reader.read_u16()?;
let last = reader.read_bool()?; let last = reader.read_bool()?;
let mut value: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE] = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut value: [u8; SAT_PAYLOAD_MAX_SIZE] = [0; SAT_PAYLOAD_MAX_SIZE];
reader.read_exact(&mut value[0..length as usize])?; reader.read_exact(&mut value[0..length as usize])?;
Packet::CoreMgmtConfigReadReply { Packet::CoreMgmtConfigReadReply {
length: length, length: length,

6
src/runtime/src/mgmt.rs
View File

@ -139,7 +139,7 @@ async fn read_key(stream: &mut TcpStream) -> Result<String> {
#[cfg(has_drtio)] #[cfg(has_drtio)]
mod remote_coremgmt { mod remote_coremgmt {
use io::{Cursor, ProtoWrite}; use io::{Cursor, ProtoWrite};
use libboard_artiq::drtioaux_proto::{Packet, CORE_MGMT_PAYLOAD_MAX_SIZE}; use libboard_artiq::drtioaux_proto::{MASTER_PAYLOAD_MAX_SIZE, Packet};
use super::*; use super::*;
use crate::rtio_mgt::drtio; use crate::rtio_mgt::drtio;
@ -331,7 +331,7 @@ mod remote_coremgmt {
_cfg: &Rc<Config>, _cfg: &Rc<Config>,
key: &String, key: &String,
) -> Result<()> { ) -> Result<()> {
let mut config_key: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE] = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut config_key: [u8; MASTER_PAYLOAD_MAX_SIZE] = [0; MASTER_PAYLOAD_MAX_SIZE];
let len = key.len(); let len = key.len();
config_key[..len].clone_from_slice(key.as_bytes()); config_key[..len].clone_from_slice(key.as_bytes());
@ -442,7 +442,7 @@ mod remote_coremgmt {
_cfg: &Rc<Config>, _cfg: &Rc<Config>,
key: &String, key: &String,
) -> Result<()> { ) -> Result<()> {
let mut config_key: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE] = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut config_key: [u8; MASTER_PAYLOAD_MAX_SIZE] = [0; MASTER_PAYLOAD_MAX_SIZE];
let len = key.len(); let len = key.len();
config_key[..len].clone_from_slice(key.as_bytes()); config_key[..len].clone_from_slice(key.as_bytes());

15
src/satman/src/main.rs
View File

@ -36,7 +36,7 @@ use libboard_artiq::si5324;
#[cfg(has_si549)] #[cfg(has_si549)]
use libboard_artiq::si549; use libboard_artiq::si549;
use libboard_artiq::{drtio_routing, drtioaux, use libboard_artiq::{drtio_routing, drtioaux,
drtioaux_proto::{CORE_MGMT_PAYLOAD_MAX_SIZE, MASTER_PAYLOAD_MAX_SIZE, SAT_PAYLOAD_MAX_SIZE}, drtioaux_proto::{MASTER_PAYLOAD_MAX_SIZE, SAT_PAYLOAD_MAX_SIZE},
identifier_read, logger, identifier_read, logger,
pl::csr}; pl::csr};
#[cfg(feature = "target_kasli_soc")] #[cfg(feature = "target_kasli_soc")]
@ -1030,7 +1030,7 @@ fn process_aux_packet(
&packet, &packet,
timer timer
); );
let mut data_slice: [u8; CORE_MGMT_PAYLOAD_MAX_SIZE] = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut data_slice = [0; SAT_PAYLOAD_MAX_SIZE];
let meta = core_manager.log_get_slice(&mut data_slice); let meta = core_manager.log_get_slice(&mut data_slice);
if clear && meta.status.is_first() { if clear && meta.status.is_first() {
mgmt::clear_log(); mgmt::clear_log();
@ -1127,7 +1127,7 @@ fn process_aux_packet(
timer timer
); );
let mut value_slice = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut value_slice = [0; SAT_PAYLOAD_MAX_SIZE];
let key_slice = &key[..length as usize]; let key_slice = &key[..length as usize];
if !key_slice.is_ascii() { if !key_slice.is_ascii() {
@ -1170,7 +1170,7 @@ fn process_aux_packet(
timer timer
); );
let mut value_slice = [0; CORE_MGMT_PAYLOAD_MAX_SIZE]; let mut value_slice = [0; SAT_PAYLOAD_MAX_SIZE];
let meta = core_manager.get_config_value_slice(&mut value_slice); let meta = core_manager.get_config_value_slice(&mut value_slice);
drtioaux::send( drtioaux::send(
0, 0,
@ -1234,8 +1234,11 @@ fn process_aux_packet(
drtioaux::send(0, &drtioaux::Packet::CoreMgmtNack) drtioaux::send(0, &drtioaux::Packet::CoreMgmtNack)
} else { } else {
let key = core::str::from_utf8(key_slice).unwrap(); let key = core::str::from_utf8(key_slice).unwrap();
let succeeded = core_manager.remove_config(key).is_ok(); if core_manager.remove_config(key).is_ok() {
drtioaux::send(0, &drtioaux::Packet::CoreMgmtAck) drtioaux::send(0, &drtioaux::Packet::CoreMgmtAck)
} else {
drtioaux::send(0, &drtioaux::Packet::CoreMgmtNack)
}
} }
} }
drtioaux::Packet::CoreMgmtConfigEraseRequest { drtioaux::Packet::CoreMgmtConfigEraseRequest {

10
src/satman/src/mgmt.rs
View File

@ -1,7 +1,7 @@
use alloc::vec::Vec; use alloc::vec::Vec;
use io::{Cursor, ProtoRead, ProtoWrite}; use io::{Cursor, ProtoRead, ProtoWrite};
use libboard_artiq::{drtioaux_proto::CORE_MGMT_PAYLOAD_MAX_SIZE, use libboard_artiq::{drtioaux_proto::SAT_PAYLOAD_MAX_SIZE,
logger::{BufferLogger, LogBufferRef}}; logger::{BufferLogger, LogBufferRef}};
use libconfig::Config; use libconfig::Config;
use log::{self, debug, error, info, warn, LevelFilter}; use log::{self, debug, error, info, warn, LevelFilter};
@ -60,13 +60,13 @@ impl<'a> Manager<'_> {
} }
} }
pub fn log_get_slice(&mut self, data_slice: &mut [u8; CORE_MGMT_PAYLOAD_MAX_SIZE]) -> SliceMeta { pub fn log_get_slice(&mut self, data_slice: &mut [u8; SAT_PAYLOAD_MAX_SIZE]) -> SliceMeta {
// Populate buffer if depleted // Populate buffer if depleted
if self.last_log.at_end() { if self.last_log.at_end() {
self.last_log.extend(get_logger_buffer().extract().as_bytes()); self.last_log.extend(get_logger_buffer().extract().as_bytes());
} }
self.last_log.get_slice_core_mgmt(data_slice) self.last_log.get_slice_satellite(data_slice)
} }
pub fn fetch_config_value(&mut self, key: &str) -> Result<()> { pub fn fetch_config_value(&mut self, key: &str) -> Result<()> {
@ -79,8 +79,8 @@ impl<'a> Manager<'_> {
.map_err(|_| warn!("read error: no such key")) .map_err(|_| warn!("read error: no such key"))
} }
pub fn get_config_value_slice(&mut self, data_slice: &mut [u8; CORE_MGMT_PAYLOAD_MAX_SIZE]) -> SliceMeta { pub fn get_config_value_slice(&mut self, data_slice: &mut [u8; SAT_PAYLOAD_MAX_SIZE]) -> SliceMeta {
self.last_value.get_slice_core_mgmt(data_slice) self.last_value.get_slice_satellite(data_slice)
} }
pub fn add_data(&mut self, data: &[u8], data_len: usize) { pub fn add_data(&mut self, data: &[u8], data_len: usize) {

4
src/satman/src/routing.rs
View File

@ -4,7 +4,7 @@ use core::cmp::min;
#[cfg(has_drtio_routing)] #[cfg(has_drtio_routing)]
use libboard_artiq::pl::csr; use libboard_artiq::pl::csr;
use libboard_artiq::{drtio_routing, drtioaux, use libboard_artiq::{drtio_routing, drtioaux,
drtioaux_proto::{PayloadStatus, CORE_MGMT_PAYLOAD_MAX_SIZE, MASTER_PAYLOAD_MAX_SIZE}}; drtioaux_proto::{PayloadStatus, SAT_PAYLOAD_MAX_SIZE, MASTER_PAYLOAD_MAX_SIZE}};
pub struct SliceMeta { pub struct SliceMeta {
pub destination: u8, pub destination: u8,
@ -58,7 +58,7 @@ impl Sliceable {
} }
get_slice_fn!(get_slice_master, MASTER_PAYLOAD_MAX_SIZE); get_slice_fn!(get_slice_master, MASTER_PAYLOAD_MAX_SIZE);
get_slice_fn!(get_slice_core_mgmt, CORE_MGMT_PAYLOAD_MAX_SIZE); get_slice_fn!(get_slice_satellite, SAT_PAYLOAD_MAX_SIZE);
} }
// Packets from downstream (further satellites) are received and routed appropriately. // Packets from downstream (further satellites) are received and routed appropriately.