canxl: add virtual CAN network identifier support
Subsystems (2)
Oliver Hartkopp
maintainerPATCH v2 1/1 canxl: add virtual CAN network identifier support
CAN XL data frames contain an 8-bit virtual CAN network identifier (VCID). A VCID value of zero represents an 'untagged' CAN XL frame.
To receive and send these optional VCIDs via CAN_RAW sockets a new socket option CAN_RAW_XL_VCID_OPTS is introduced to define/access VCID content:
- tx: set the outgoing VCID value by the kernel (one fixed 8-bit value)
- tx: pass through VCID values from the user space (e.g. for traffic replay)
- rx: apply VCID receive filter (value/mask) to be passed to the user space
With the 'tx pass through' option CAN_RAW_XL_VCID_TX_PASS all valid VCID values can be sent, e.g. to replay full qualified CAN XL traffic.
The VCID value provided for the CAN_RAW_XL_VCID_TX_SET option will override the VCID value in the struct canxl_frame.prio defined for CAN_RAW_XL_VCID_TX_PASS when both flags are set.
With a rx_vcid_mask of zero all possible VCID values (0x00 - 0xFF) are passed to the user space when the CAN_RAW_XL_VCID_RX_FILTER flag is set. Without this flag only untagged CAN XL frames (VCID = 0x00) are delivered to the user space (default).
The 8-bit VCID is stored inside the CAN XL prio element (only in CAN XL frames!) to not interfere with other CAN content or the CAN filters provided by the CAN_RAW sockets and kernel infrastruture.
--- include/uapi/linux/can.h | 9 +++- include/uapi/linux/can/raw.h | 16 +++++++ net/can/af_can.c | 2 + net/can/raw.c | 93 ++++++++++++++++++++++++++++++++---- 4 files changed, 110 insertions(+), 10 deletions(-)
include/uapi/linux/can.h +7 -2
@@ -191,23 +191,28 @@ struct canfd_frame {* Undefined bits in canxl_frame.flags are reserved and shall be set to zero. */ #define CANXL_XLF 0x80/* mandatory CAN XL frame flag (must always be set!) */ #define CANXL_SEC 0x01/* Simple Extended Content (security/segmentation) */ +/* the 8-bit VCID is optionally placed in the canxl_frame.prio element */ +#define CANXL_VCID_OFFSET 16/* bit offset of VCID in prio element */ +#define CANXL_VCID_VAL_MASK 0xFFUL/* VCID is an 8-bit value */ +#define CANXL_VCID_MASK (CANXL_VCID_VAL_MASK << CANXL_VCID_OFFSET) +/** * struct canxl_frame - CAN with e'X'tended frame 'L'ength frame structure -* @prio: 11 bit arbitration priority with zero'ed CAN_*_FLAG flags +* @prio: 11 bit arbitration priority with zero'ed CAN_*_FLAG flags / VCID * @flags: additional flags for CAN XL * @sdt: SDU (service data unit) type * @len: frame payload length in byte (CANXL_MIN_DLEN .. CANXL_MAX_DLEN) * @af: acceptance field * @data: CAN XL frame payload (CANXL_MIN_DLEN .. CANXL_MAX_DLEN byte) * * @prio shares the same position as @can_id from struct can[fd]_frame. */ struct canxl_frame { -canid_t prio;/* 11 bit priority for arbitration (canid_t) */ +canid_t prio;/* 11 bit priority for arbitration / 8 bit VCID */ __u8 flags;/* additional flags for CAN XL */ __u8 sdt;/* SDU (service data unit) type */ __u16 len;/* frame payload length in byte */ __u32 af;/* acceptance field */ __u8 data[CANXL_MAX_DLEN ];
include/uapi/linux/can/raw.h +16 -0
@@ -63,8 +63,24 @@ enum {CAN_RAW_LOOPBACK ,/* local loopback (default:on) */ CAN_RAW_RECV_OWN_MSGS ,/* receive my own msgs (default:off) */ CAN_RAW_FD_FRAMES ,/* allow CAN FD frames (default:off) */ CAN_RAW_JOIN_FILTERS ,/* all filters must match to trigger */ CAN_RAW_XL_FRAMES ,/* allow CAN XL frames (default:off) */ + CAN_RAW_XL_VCID_OPTS, /* CAN XL VCID configuration options */ }; +/* configuration for CAN XL virtual CAN identifier (VCID) handling */ +struct can_raw_vcid_options { + +__u8 flags;/* flags for vcid (filter) behaviour */ +__u8 tx_vcid;/* VCID value set into canxl_frame.prio */ +__u8 rx_vcid;/* VCID value for VCID filter */ +__u8 rx_vcid_mask;/* VCID mask for VCID filter */ + +}; + +/* can_raw_vcid_options.flags for CAN XL virtual CAN identifier handling */ +#define CAN_RAW_XL_VCID_TX_SET 0x01 +#define CAN_RAW_XL_VCID_TX_PASS 0x02 +#define CAN_RAW_XL_VCID_RX_FILTER 0x04 +#endif /* !_UAPI_CAN_RAW_H */
net/can/af_can.c +2 -0
@@ -863,10 +863,12 @@ static __init int can_init(void)int err;/* check for correct padding to be able to use the structs similarly */ BUILD_BUG_ON (offsetof(struct can_frame , len) != offsetof(struct canfd_frame , len) || + offsetof(struct can_frame , len) != + offsetof(struct canxl_frame , flags) || offsetof(struct can_frame , data) != offsetof(struct canfd_frame , data));pr_info ("can: controller area network core\n" );
net/can/raw.c +85 -8
178 lines not on this page · raw message
Signature · 1 line
2.43.0