Merge branch 'main' into mctp_add_retry_

Author: JunYe1993

.github/workflows/pr.yml

@@ -30,6 +30,7 @@ jobs:
         run: meson test -C build --verbose
 
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           name: default-meson-testlog
           path: build/meson-logs/testlog.txt
@@ -60,6 +61,7 @@ jobs:
         run: meson test -C build --verbose
 
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           name: no-libsystemd-meson-testlog
           path: build/meson-logs/testlog.txt

CHANGELOG.md

@@ -12,6 +12,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 1. Fixed `mctp-bench` compile on musl libc
 
+### Added
+
+1. `mctpd` now implements the Get Vendor Define Message Support control protocol
+   command, and allows registration of vendor-defined message types via
+   dbus.
+
 ## [2.3] - 2025-10-22
 
 ### Fixed

README.md

@@ -125,12 +125,12 @@ during development:
 
 ```sh
 cd obj
-pytest
+pytest ../tests
 ```
 
 To run without an existing dbus session:
 ```sh
-dbus-run-session env DBUS_STARTER_BUS_TYPE=user pytest
+dbus-run-session env DBUS_STARTER_BUS_TYPE=user pytest ../tests
 ```
 
 The test infrastructure depends on a few python packages, including the pytest

docs/mctpd.md

@@ -32,6 +32,7 @@ the MCTP stack, such as supported message types.
 NAME                                TYPE      SIGNATURE  RESULT/VALUE  FLAGS
 au.com.codeconstruct.MCTP1          interface -          -             -
 .RegisterTypeSupport                  method    yau        -             -
+.RegisterVDMTypeSupport               method    yvq        -             -
 ```
 
 #### `.RegisterTypeSupport`: `yau`
@@ -53,6 +54,28 @@ De-registration is automatic - the specified types (and versions) are registered
 for as long as the dbus sender remains attached to the message bus, and are
 unregistered on disconnect.
 
+#### `.RegisterVDMTypeSupport`: `yvq`
+
+This method is used to add support for MCTP Vendor Defined Message (VDM) types.
+Once called successfully, subsequent responses for Get Vendor Defined Message
+Support control commands will include this new VDM type.
+
+`RegisterVDMTypeSupport <vid format> <vendor id> <command set type>`
+
+If the VDM type is already registered, then dbus call will fail.
+
+ - `<vid format>` Vendor ID format:
+   - `0x00` - PCI/PCIe Vendor ID (16-bit)
+   - `0x01` - IANA Enterprise Number (32-bit)
+ - `<vendor id>` Vendor identifier as a variant type:
+   - For PCIe format: 16-bit unsigned integer (`q`)
+   - For IANA format: 32-bit unsigned integer (`u`)
+ - `<command set type>` Command set type (16-bit unsigned integer) as defined by the vendor
+
+De-registration is automatic - the specified VDM types are registered for as
+long as the dbus sender remains attached to the message bus, and are
+removed when the sender disconnects.
+
 Also it hosts two trees of MCTP objects:
 
  * Interfaces: Local hardware transport bindings that connect us to a MCTP bus

meson.build

@@ -92,6 +92,7 @@ if libsystemd.found()
         dependencies: [libsystemd, toml_dep],
         install: true,
         install_dir: get_option('sbindir'),
+        c_args: ['-DOPS_SD_EVENT=1'],
     )
 
     mctpd_test = executable('test-mctpd',
@@ -100,6 +101,7 @@ if libsystemd.found()
         ] + test_ops_sources + netlink_sources + util_sources,
         include_directories:  include_directories('src'),
         dependencies: [libsystemd, toml_dep],
+        c_args: ['-DOPS_SD_EVENT=1'],
     )
 endif
 

src/mctp-ops.c

@@ -74,6 +74,12 @@ const struct mctp_ops mctp_ops = {
 		.recvfrom = mctp_op_recvfrom,
 		.close = mctp_op_close,
 	},
+#if OPS_SD_EVENT
+	.sd_event = {
+		.add_time_relative = sd_event_add_time_relative,
+		.source_set_time_relative = sd_event_source_set_time_relative,
+	},
+#endif
 	.bug_warn = mctp_bug_warn,
 };
 

src/mctp-ops.h

@@ -9,6 +9,9 @@
 
 #include <sys/socket.h>
 #include <stdarg.h>
+#if OPS_SD_EVENT
+#include <systemd/sd-event.h>
+#endif
 
 #define _GNU_SOURCE
 
@@ -24,9 +27,19 @@ struct socket_ops {
 	int (*close)(int sd);
 };
 
+#if OPS_SD_EVENT
+struct sd_event_ops {
+	typeof(sd_event_add_time_relative) *add_time_relative;
+	typeof(sd_event_source_set_time_relative) *source_set_time_relative;
+};
+#endif
+
 struct mctp_ops {
 	struct socket_ops mctp;
 	struct socket_ops nl;
+#if OPS_SD_EVENT
+	struct sd_event_ops sd_event;
+#endif
 	void (*bug_warn)(const char *fmt, va_list args);
 };