[HACK] Testing Laguna evalboard with CN9130

test: Multi-Port Network Namespaces

board/aarch64/cn9130-laguna/linux_defconfig

@@ -0,0 +1,558 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_PREEMPT=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_USER_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_PROFILING=y
+CONFIG_ARCH_SPARX5=y
+CONFIG_ARCH_LAN969X=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_SCHED_MC=y
+CONFIG_NR_CPUS=64
+CONFIG_COMPAT=y
+# CONFIG_SUSPEND is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_CPUFREQ_DT=y
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
+CONFIG_ARM_ARMADA_8K_CPUFREQ=y
+CONFIG_ACPI=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_GCC_PLUGINS is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NETFILTER_NETLINK_QUEUE=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_TABLES=y
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_CT=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BPFILTER=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_NET_DSA=y
+CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_MQPRIO=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_BPF=y
+CONFIG_NET_CLS_FLOWER=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
+CONFIG_NET_ACT_MIRRED=y
+CONFIG_NET_ACT_SKBEDIT=y
+CONFIG_DCB=y
+CONFIG_NETLINK_DIAG=y
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_PKTGEN=y
+# CONFIG_WIRELESS is not set
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_LWTUNNEL=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_AARDVARK=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_CFG_SYSFS=y
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLOCK2MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_MTD_NAND_MARVELL=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_OF_OVERLAY=y
+CONFIG_BLK_DEV_NULL_BLK=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_SRAM=y
+CONFIG_EEPROM_AT24=y
+# CONFIG_SCSI_PROC_FS is not set
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_MVEBU=y
+CONFIG_PATA_OF_PLATFORM=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_INIT=y
+CONFIG_DM_VERITY=y
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=y
+CONFIG_NLMON=y
+CONFIG_NET_VRF=y
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_GOOGLE is not set
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+CONFIG_MVNETA=m
+CONFIG_MVPP2=m
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+CONFIG_LAN969X_SWITCH=y
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_PENSANDO is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+CONFIG_8139CP=y
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_SFP=y
+CONFIG_AX88796B_PHY=y
+CONFIG_MARVELL_PHY=y
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MICREL_PHY=y
+CONFIG_MICROCHIP_PHY=y
+CONFIG_MICROCHIP_T1_PHY=y
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MDIO_BITBANG=y
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=y
+CONFIG_MDIO_BUS_MUX_MMIOREG=y
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDC_EEM=m
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_WLAN is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_AMBAKMI=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_XILINX_PS_UART=y
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_GPIO=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_MUX_PINCTRL=y
+CONFIG_I2C_AT91=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_MV64XXX=y
+CONFIG_I2C_SLAVE=y
+CONFIG_SPI=y
+CONFIG_SPI_ARMADA_3700=y
+CONFIG_SPI_ORION=y
+CONFIG_SPI_PL022=y
+CONFIG_SPI_MUX=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPMI=y
+CONFIG_PINCTRL_MCP23S08=y
+CONFIG_PINCTRL_MICROCHIP_SGPIO=y
+CONFIG_PINCTRL_OCELOT=y
+CONFIG_GPIO_DWAPB=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCF857X=y
+CONFIG_GPIO_MAX77620=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_BATTERY_BQ27XXX=y
+CONFIG_CHARGER_GPIO=y
+CONFIG_SENSORS_SPARX5=y
+CONFIG_SENSORS_JC42=y
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_CPU_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+CONFIG_ARMADA_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_SOFT_WATCHDOG=y
+CONFIG_GPIO_WATCHDOG=y
+CONFIG_ARMADA_37XX_WATCHDOG=y
+CONFIG_I6300ESB_WDT=y
+CONFIG_MFD_ATMEL_FLEXCOM=y
+CONFIG_MFD_MAX77620=y
+CONFIG_MFD_LAN966X_PCI=y
+CONFIG_MFD_LAN969X_PCI=y
+CONFIG_MFD_SEC_CORE=y
+CONFIG_MFD_ROHM_BD718XX=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_BD718XX=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_MAX77620=y
+CONFIG_REGULATOR_PCA9450=y
+CONFIG_REGULATOR_QCOM_SPMI=y
+CONFIG_REGULATOR_S2MPS11=y
+# CONFIG_HID_GENERIC is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+CONFIG_USB_ULPI_BUS=y
+CONFIG_USB=m
+CONFIG_USB_OTG=y
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=y
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_SNP_UDC_PLAT=y
+CONFIG_TYPEC=y
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_MMC_ARMMMCI=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_SPARX5=y
+CONFIG_MMC_SPI=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_EXYNOS=y
+CONFIG_MMC_DW_K3=y
+CONFIG_MMC_SDHCI_XENON=y
+CONFIG_SCSI_UFSHCD=y
+CONFIG_SCSI_UFSHCD_PLATFORM=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_NETDEV=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_PCF8523=y
+CONFIG_RTC_DRV_S5M=y
+CONFIG_RTC_DRV_DS3232=y
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_ARMADA38X=y
+CONFIG_DMADEVICES=y
+CONFIG_MV_XOR=y
+CONFIG_MV_XOR_V2=y
+CONFIG_PL330_DMA=y
+CONFIG_UIO=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+# CONFIG_SURFACE_PLATFORMS is not set
+CONFIG_COMMON_CLK_CS2000_CP=y
+CONFIG_COMMON_CLK_S2MPS11=y
+CONFIG_COMMON_CLK_XGENE=y
+CONFIG_COMMON_CLK_BD718XX=y
+CONFIG_MAILBOX=y
+CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_V3=y
+CONFIG_EXTCON_USB_GPIO=y
+CONFIG_IIO=y
+CONFIG_TI_ADC081C=y
+CONFIG_PWM=y
+CONFIG_PHY_MVEBU_CP110_COMPHY=y
+CONFIG_PHY_MVEBU_CP110_UTMI=y
+CONFIG_PHY_SAMSUNG_USB2=y
+CONFIG_NVMEM_LAYOUT_ONIE_TLV=y
+CONFIG_MUX_MMIO=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_FUSE_FS=y
+CONFIG_VIRTIO_FS=y
+CONFIG_OVERLAY_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_EXFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_9P_FS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_SECURITY=y
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=0
+CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_TIMEOUT=20
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_WQ_WATCHDOG=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_RCU_CPU_STALL_CPUTIME=y
+CONFIG_FUNCTION_TRACER=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_MEMTEST=y

board/aarch64/dts/marvell/cn9130-crb-A.dts

@@ -34,6 +34,8 @@
 	iommu-map-mask = <0x031f>;
 };
 
+#include "lan969x-pcie.dtsi"
+
 &cp0_usb3_0 {
 	status = "okay";
 	usb-phy = <&cp0_usb3_0_phy0>;

board/aarch64/dts/marvell/lan969x-pcie.dtsi

@@ -0,0 +1,428 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <dt-bindings/mfd/atmel-flexcom.h>
+#include <dt-bindings/clock/microchip,lan966x.h>
+
+&cp0_pcie0 {
+	pci@0,0 {
+		#address-cells = <3>;
+		#size-cells = <2>;
+		device_type = "pci";
+
+		reg = <0 0 0 0 0>;
+		ranges = <0x02000000 0x0 0xc0000000 0x02000000 0x0 0xc0000000 0x0 0x40000000>;
+
+		lan969x: ep_lan969x@0,0 {
+			compatible = "pci1055,9690";
+
+			reg = <0 0 0 0 0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ranges = <0xe2000000 0x02000000 0x0 0xc0000000 0x02000000>,
+			         <0xe0000000 0x02000000 0x0 0xc2000000 0x01000000>;
+
+			#interrupt-cells = <2>;
+			interrupt-controller;
+			interrupt-parent = <&lan969x>;
+
+			clocks {
+				fx100_clk: fx100-clk {
+					compatible = "fixed-clock";
+					#clock-cells = <0>;
+					clock-frequency = <320000000>;
+				};
+
+				fabric_clk: fabric-clk {
+					compatible = "fixed-clock";
+					#clock-cells = <0>;
+					clock-frequency = <250000000>;
+				};
+			};
+
+			cpu_ctrl: syscon@e00c0000 {
+				compatible = "microchip,lan966x-cpu-syscon", "syscon";
+				reg = <0xe00c0000 0x350>;
+			};
+
+			lan969x_gpio: pinctrl@e20100d4 {
+				compatible = "microchip,lan969x-pinctrl";
+				reg = <0xe20100d4 0xd4>,
+				      <0xe2010370 0xa8>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				gpio-ranges = <&lan969x_gpio 0 0 66>;
+				interrupt-controller;
+				interrupts = <15 IRQ_TYPE_LEVEL_HIGH>;
+				#interrupt-cells = <2>;
+				#address-cells = <1>;
+			};
+
+			mdio0: mdio@e20101a8 {
+				compatible = "mscc,ocelot-miim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xe20101a8 0x24>;
+				clocks = <&fx100_clk>;
+				status = "disabled";
+			};
+
+			sgpio: gpio@e2010230 {
+				compatible = "microchip,sparx5-sgpio";
+				reg = <0xe2010230 0x118>;
+				clocks = <&fx100_clk>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+
+				sgpio_in: gpio@0 {
+					compatible = "microchip,sparx5-sgpio-bank";
+					reg = <0>;
+					gpio-controller;
+					#gpio-cells = <3>;
+					interrupts = <16 IRQ_TYPE_LEVEL_HIGH>;
+					interrupt-controller;
+					#interrupt-cells = <3>;
+					#adress-cells = <0>;
+				};
+
+				sgpio_out: gpio@1 {
+					compatible = "microchip,sparx5-sgpio-bank";
+					reg = <1>;
+					gpio-controller;
+					#gpio-cells = <3>;
+				};
+			};
+
+			lan969x_flx3: flexcom@e0064000 {
+				compatible = "atmel,sama5d2-flexcom";
+				reg = <0xe0064000 0x100>;
+				clocks = <&fabric_clk>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges = <0x0 0xe0064000 0x800>;
+
+				atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
+				status = "okay";
+
+				lan969x_i2c3: i2c@600 {
+					compatible = "microchip,sam9x60-i2c";
+					reg = <0x600 0x200>;
+					interrupts = <49 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&fabric_clk>;
+					#address-cells = <1>;
+					#size-cells = <0>;
+					pinctrl-0 = <&fc3_pins>;
+					pinctrl-names = "default";
+					i2c-analog-filter;
+					i2c-digital-filter;
+					i2c-digital-filter-width-ns = <35>;
+					i2c-sda-hold-time-ns = <1500>;
+					status = "okay";
+				};
+			};
+
+			i2c-mux {
+				compatible = "i2c-mux-gpio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				i2c-parent = <&lan969x_i2c3>;
+
+				mux-gpios = <&sgpio_out 0 1 GPIO_ACTIVE_HIGH
+					     &sgpio_out 0 2 GPIO_ACTIVE_HIGH
+					     &sgpio_out 0 3 GPIO_ACTIVE_HIGH>;
+				idle-state = <0x8>;
+
+				i2c_sfp0: i2c-sfp0 {
+					reg = <0x0>;
+				};
+
+				i2c_sfp1: i2c-sfp1 {
+					reg = <0x1>;
+				};
+
+				i2c_sfp2: i2c-sfp2 {
+					reg = <0x2>;
+				};
+
+				i2c_sfp3: i2c-sfp3 {
+					reg = <0x3>;
+				};
+			};
+
+			sfp0: sfp0 {
+				compatible = "sff,sfp";
+				i2c-bus = <&i2c_sfp0>;
+				tx-disable-gpios = <&sgpio_out 6 2 GPIO_ACTIVE_HIGH>;
+				los-gpios = <&sgpio_in 6 0 GPIO_ACTIVE_HIGH>;
+				mod-def0-gpios = <&sgpio_in 6 1 GPIO_ACTIVE_LOW>;
+				tx-fault-gpios = <&sgpio_in 6 2 GPIO_ACTIVE_HIGH>;
+			};
+
+			sfp1: sfp1 {
+				compatible = "sff,sfp";
+				i2c-bus = <&i2c_sfp1>;
+				tx-disable-gpios = <&sgpio_out 7 2 GPIO_ACTIVE_HIGH>;
+				los-gpios = <&sgpio_in 7 0 GPIO_ACTIVE_HIGH>;
+				mod-def0-gpios = <&sgpio_in 7 1 GPIO_ACTIVE_LOW>;
+				tx-fault-gpios = <&sgpio_in 7 2 GPIO_ACTIVE_HIGH>;
+			};
+
+			sfp2: sfp2 {
+				compatible = "sff,sfp";
+				i2c-bus = <&i2c_sfp2>;
+				tx-disable-gpios = <&sgpio_out 8 2 GPIO_ACTIVE_HIGH>;
+				los-gpios = <&sgpio_in 8 0 GPIO_ACTIVE_HIGH>;
+				mod-def0-gpios = <&sgpio_in 8 1 GPIO_ACTIVE_LOW>;
+				tx-fault-gpios = <&sgpio_in 8 2 GPIO_ACTIVE_HIGH>;
+			};
+
+			sfp3: sfp3 {
+				compatible = "sff,sfp";
+				i2c-bus = <&i2c_sfp3>;
+				tx-disable-gpios = <&sgpio_out 9 2 GPIO_ACTIVE_HIGH>;
+				los-gpios = <&sgpio_in 9 0 GPIO_ACTIVE_HIGH>;
+				mod-def0-gpios = <&sgpio_in 9 1 GPIO_ACTIVE_LOW>;
+				tx-fault-gpios = <&sgpio_in 9 2 GPIO_ACTIVE_HIGH>;
+			};
+
+			lan969x_switch: switch@e0000000 {
+				compatible = "microchip,lan969x-switch";
+				reg = <0xe00c0000 0x800000>,
+				      <0xe2010000 0x1410000>;
+				reg-names = "cpu", "dev";
+				interrupt-names = "xtr", "fdma", "ptp", "ptp-ext";
+				interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,
+					     <88 IRQ_TYPE_LEVEL_HIGH>,
+					     <9 IRQ_TYPE_LEVEL_HIGH>,
+					     <8 IRQ_TYPE_LEVEL_HIGH>;
+			};
+
+			serdes: serdes@e3410000 {
+				compatible = "microchip,lan969x-serdes";
+				#phy-cells = <1>;
+				clocks = <&fabric_clk>;
+				reg = <0xe3410000 0x150000>;
+			};
+
+			leds {
+				compatible = "gpio-leds";
+
+				led-s6-green {
+					label = "s6:green";
+					gpios = <&sgpio_out 6 0 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s6-yellow {
+					label = "s6:yellow";
+					gpios = <&sgpio_out 6 1 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s7-green {
+					label = "s7:green";
+					gpios = <&sgpio_out 7 0 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s7-yellow {
+					label = "s7:yellow";
+					gpios = <&sgpio_out 7 1 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s8-green {
+					label = "s8:green";
+					gpios = <&sgpio_out 8 0 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s8-yellow {
+					label = "s8:yellow";
+					gpios = <&sgpio_out 8 1 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s9-green {
+					label = "s9:green";
+					gpios = <&sgpio_out 9 0 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s9-yellow {
+					label = "s9:yellow";
+					gpios = <&sgpio_out 9 1 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+			};
+		};
+	};
+};
+
+&lan969x_gpio {
+	emmc_sd_pins: emmc-sd-pins {
+		/* eMMC_SD - CMD, CLK, D0, D1, D2, D3, D4, D5, D6, D7, RSTN */
+		pins = "GPIO_14", "GPIO_15", "GPIO_16", "GPIO_17",
+		       "GPIO_18", "GPIO_19", "GPIO_20", "GPIO_21",
+		       "GPIO_22", "GPIO_23", "GPIO_24";
+		function = "emmc_sd";
+	};
+
+	fc0_pins: fc0-pins {
+		pins = "GPIO_3", "GPIO_4";
+		function = "fc";
+	};
+
+	fc2_pins: fc2-pins {
+		pins = "GPIO_64", "GPIO_65", "GPIO_66";
+		function = "fc";
+	};
+
+	fc3_pins: fc3-pins {
+		pins = "GPIO_55", "GPIO_56";
+		function = "fc";
+	};
+
+	mdio_pins: mdio-pins {
+		pins = "GPIO_9", "GPIO_10";
+		function = "miim";
+	};
+
+	mdio_irq_pins: mdio-irq-pins {
+		pins = "GPIO_11";
+		function = "miim_irq";
+	};
+
+	sgpio_pins: sgpio-pins {
+		/* SCK, D0, D1, LD */
+		pins = "GPIO_5", "GPIO_6", "GPIO_7", "GPIO_8";
+		function = "sgpio_a";
+	};
+
+	usb_ulpi_pins: usb-ulpi-pins {
+		pins = "GPIO_30", "GPIO_31", "GPIO_32", "GPIO_33",
+		"GPIO_34", "GPIO_35", "GPIO_36", "GPIO_37",
+		"GPIO_38", "GPIO_39", "GPIO_40", "GPIO_41";
+		function = "usb_ulpi";
+	};
+
+	usb_rst_pins: usb-rst-pins {
+		pins = "GPIO_12";
+		function = "usb2phy_rst";
+	};
+
+	usb_over_pins: usb-over-pins {
+		pins = "GPIO_13";
+		function = "usb_over_detect";
+	};
+
+	usb_power_pins: usb-power-pins {
+		pins = "GPIO_1";
+		function = "usb_power";
+	};
+
+	ptp_out_pins: ptp-out-pins {
+		pins = "GPIO_58";
+		function = "ptpsync_4";
+	};
+
+	ptp_ext_pins: ptp-ext-pins {
+		pins = "GPIO_59";
+		function = "ptpsync_5";
+	};
+};
+
+&mdio0 {
+	pinctrl-0 = <&mdio_pins>, <&mdio_irq_pins>;
+	pinctrl-names = "default";
+	reset-gpios = <&lan969x_gpio 62 GPIO_ACTIVE_LOW>;
+	status = "okay";
+
+#define CU_PHY(_reg) \
+	phy@_reg { \
+		reg = <_reg>; \
+		interrupts = <11 IRQ_TYPE_LEVEL_LOW>; \
+		interrupt-parent = <&lan969x_gpio>; \
+	}
+
+	phy3:  CU_PHY( 3);
+
+	phy4:  CU_PHY( 4); phy5:  CU_PHY( 5); phy6:  CU_PHY( 6); phy7:  CU_PHY( 7);
+	phy8:  CU_PHY( 8); phy9:  CU_PHY( 9); phy10: CU_PHY(10); phy11: CU_PHY(11);
+	phy12: CU_PHY(12); phy13: CU_PHY(13); phy14: CU_PHY(14); phy15: CU_PHY(15);
+
+	phy16: CU_PHY(16); phy17: CU_PHY(17); phy18: CU_PHY(18); phy19: CU_PHY(19);
+	phy20: CU_PHY(20); phy21: CU_PHY(21); phy22: CU_PHY(22); phy23: CU_PHY(23);
+	phy24: CU_PHY(24); phy25: CU_PHY(25); phy26: CU_PHY(26); phy27: CU_PHY(27);
+};
+
+&sgpio {
+	pinctrl-0 = <&sgpio_pins>;
+	pinctrl-names = "default";
+
+	microchip,sgpio-port-ranges = <0 1>, <6 9>;
+	status = "okay";
+
+	gpio@0 {
+		ngpios = <128>;
+	};
+	gpio@1 {
+		ngpios = <128>;
+	};
+};
+
+&serdes {
+	status = "okay";
+};
+
+&lan969x_switch {
+	pinctrl-0 = <&ptp_out_pins>, <&ptp_ext_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+	ethernet-ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+#define CU_SWP(_reg, _phy) \
+		port@_reg { \
+			reg = <_reg>; \
+			microchip,bandwidth = <1000>; \
+			phy-handle = <_phy>; \
+			phy-mode = "qsgmii"; \
+			phys = <&serdes (_reg / 4)>; \
+		}
+
+		CU_SWP( 0,  &phy4); CU_SWP( 1,  &phy5); CU_SWP( 2,  &phy6); CU_SWP( 3,  &phy7);
+		CU_SWP( 4,  &phy8); CU_SWP( 5,  &phy9); CU_SWP( 6, &phy10); CU_SWP( 7, &phy11);
+		CU_SWP( 8, &phy12); CU_SWP( 9, &phy13); CU_SWP(10, &phy14); CU_SWP(11, &phy15);
+
+		CU_SWP(12, &phy16); CU_SWP(13, &phy17); CU_SWP(14, &phy18); CU_SWP(15, &phy19);
+		CU_SWP(16, &phy20); CU_SWP(17, &phy21); CU_SWP(18, &phy22); CU_SWP(19, &phy23);
+		CU_SWP(20, &phy24); CU_SWP(21, &phy25); CU_SWP(22, &phy26); CU_SWP(23, &phy27);
+
+#define SERDES_SWP(_reg, _lane, _sfp, _gpio) \
+		port@_reg { \
+			reg = <_reg>; \
+			microchip,bandwidth = <10000>; \
+			phys = <&serdes _lane>; \
+			phy-mode = "10gbase-r"; \
+			sfp = <_sfp>; \
+			microchip,sd-sgpio = <_gpio>; \
+			managed = "in-band-status"; \
+		}
+
+		SERDES_SWP(24, 6, &sfp0, 365);
+		SERDES_SWP(25, 7, &sfp1, 369);
+		SERDES_SWP(26, 8, &sfp2, 373);
+		SERDES_SWP(27, 9, &sfp3, 377);
+
+		port@29 {
+			reg = <29>;
+			microchip,bandwidth = <1000>;
+			phy-handle = <&phy3>;
+			phy-mode = "rgmii";
+		};
+	};
+};

package/skeleton-init-finit/skeleton-init-finit.mk

@@ -204,14 +204,6 @@ endif
 
 endif # BR2_PACKAGE_QUAGGA
 
-ifeq ($(BR2_PACKAGE_RNG_TOOLS),y)
-define SKELETON_INIT_FINIT_SET_RNGD
-	cp $(SKELETON_INIT_FINIT_AVAILABLE)/rngd.conf $(FINIT_D)/available/
-	ln -sf ../available/rngd.conf $(FINIT_D)/enabled/rngd.conf
-endef
-SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_RNGD
-endif
-
 ifeq ($(BR2_PACKAGE_SMCROUTE),y)
 define SKELETON_INIT_FINIT_SET_SMCROUTE
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/smcroute.conf $(FINIT_D)/available/

package/skeleton-init-finit/skeleton/etc/finit.d/available/rngd.conf

@@ -1 +0,0 @@
-service [S12345789] log rngd -f -- Entropy gathering daemon (rngd)

test/case/ietf_interfaces/vlan_ping/Readme.adoc

@@ -16,10 +16,12 @@ endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
 . Set up topology and attach to target DUT
+. Set up VLAN interface on host:data with IP 10.0.0.1
 . Configure VLAN 10 interface on target:data with IP 10.0.0.2
-. Waiting for links to come up
-. Ping 10.0.0.2 from VLAN 10 on host:data with IP 10.0.0.1
-. Remove VLAN interface from target:data, and test again (should not be able to ping)
+. Wait for links to come up
+. Verify that host:data can reach 10.0.0.2
+. Remove VLAN interface from target:data
+. Verify that host:data can no longer reach 10.0.0.2
 
 
 <<<

test/case/ietf_interfaces/vlan_ping/test.py

@@ -10,31 +10,21 @@ import infamy.iface as iface
 
 from infamy import until
 
-def test_ping(hport, should_pass):
-    with infamy.IsolatedMacVlan(hport) as ns:
-        try:
-            ns.runsh("""
-                  set -ex
-                  ip link set iface up
-                  ip link add dev vlan10 link iface up type vlan id 10
-                  ip addr add 10.0.0.1/24 dev vlan10
-                  """)
-
-            if should_pass:
-                ns.must_reach("10.0.0.2")
-            else:
-                ns.must_not_reach("10.0.0.2")
-
-        except Exception as e:
-            print(f"An error occurred during the VLAN setup or ping test: {e}")
-            raise
-
 with infamy.Test() as test:
       with test.step("Set up topology and attach to target DUT"):
             env = infamy.Env()
             target = env.attach("target", "mgmt")
             _, tport = env.ltop.xlate("target", "data")
 
+      with test.step("Set up VLAN interface on host:data with IP 10.0.0.1"):
+            _, hport = env.ltop.xlate("host", "data")
+            datanet = infamy.IsolatedMacVlan(hport).start()
+            datanet.runsh("""
+                  set -ex
+                  ip link set iface up
+                  ip link add dev vlan10 link iface up type vlan id 10
+                  ip addr add 10.0.0.1/24 dev vlan10
+                  """)
 
       with test.step("Configure VLAN 10 interface on target:data with IP 10.0.0.2"):
             target.put_config_dict("ietf-interfaces", {
@@ -64,16 +54,18 @@ with infamy.Test() as test:
                   }
             })
 
-      with test.step("Waiting for links to come up"):
+      with test.step("Wait for links to come up"):
             until(lambda: iface.get_param(target, tport, "oper-status") == "up")
 
-      with test.step("Ping 10.0.0.2 from VLAN 10 on host:data with IP 10.0.0.1"):
+      with test.step("Verify that host:data can reach 10.0.0.2"):
             _, hport = env.ltop.xlate("host", "data")
-            test_ping(hport,True)
+            datanet.must_reach("10.0.0.2")
 
-      with test.step("Remove VLAN interface from target:data, and test again (should not be able to ping)"):
+      with test.step("Remove VLAN interface from target:data"):
             target.delete_xpath(f"/ietf-interfaces:interfaces/interface[name='{tport}.10']")
+
+      with test.step("Verify that host:data can no longer reach 10.0.0.2"):
             _, hport = env.ltop.xlate("host", "data")
-            test_ping(hport,False)
+            datanet.must_not_reach("10.0.0.2")
 
       test.succeed()

test/case/ietf_routing/Readme.adoc

@@ -11,3 +11,5 @@ include::ospf_basic/Readme.adoc[]
 include::ospf_unnumbered_interface/Readme.adoc[]
 
 include::ospf_multiarea/Readme.adoc[]
+
+include::ospf_bfd/Readme.adoc[]

test/case/ietf_routing/ietf_routing.yaml

@@ -10,3 +10,6 @@
 
 - name: ospf_multiarea
   case: ospf_multiarea/test.py
+
+- name: ospf_bfd
+  case: ospf_bfd/test.py

test/case/ietf_routing/ospf_bfd/Readme.adoc

@@ -0,0 +1,35 @@
+=== OSPF BFD
+==== Description
+Verify that a router running OSPF, with Bidirectional Forwarding
+Detection (BFD) enabled, will detect link faults even when the
+physical layer is still operational.
+
+This can typically happen when one logical link, from OSPF's
+perspective, is made up of multiple physical links containing media
+converters without link fault forwarding.
+
+==== Topology
+ifdef::topdoc[]
+image::../../test/case/ietf_routing/ospf_bfd/topology.svg[OSPF BFD topology]
+endif::topdoc[]
+ifndef::topdoc[]
+ifdef::testgroup[]
+image::ospf_bfd/topology.svg[OSPF BFD topology]
+endif::testgroup[]
+ifndef::testgroup[]
+image::topology.svg[OSPF BFD topology]
+endif::testgroup[]
+endif::topdoc[]
+==== Test sequence
+. Set up topology and attach to target DUTs
+. Setup TPMR between R1fast and R2fast
+. Configure R1 and R2
+. Setup IP addresses and default routes on h1 and h2
+. Wait for R1 and R2 to peer
+. Verify connectivity from PC:src to PC:dst via fast link
+. Disable forwarding between R1fast and R2fast to trigger fail-over
+. Verify connectivity from PC:src to PC:dst via slow link
+
+
+<<<
+

test/case/ietf_routing/ospf_bfd/test.py

@@ -0,0 +1,183 @@
+#!/usr/bin/env python3
+
+"""
+OSPF BFD
+
+Verify that a router running OSPF, with Bidirectional Forwarding
+Detection (BFD) enabled, will detect link faults even when the
+physical layer is still operational.
+
+This can typically happen when one logical link, from OSPF's
+perspective, is made up of multiple physical links containing media
+converters without link fault forwarding.
+"""
+
+import time
+
+import infamy
+import infamy.route as route
+from infamy.netns import TPMR
+from infamy.util import until, parallel
+
+def config(target, params):
+    name = params["name"]
+    dif, fif, sif = \
+        params["link"]["data"], \
+        params["link"]["fast"], \
+        params["link"]["slow"]
+    rid, daddr, faddr, saddr = \
+        params["addr"]["rid"], \
+        params["addr"]["data"], \
+        params["addr"]["fast"], \
+        params["addr"]["slow"]
+
+    def ifconfig(name, addr, plen):
+        return {
+            "name": name,
+            "enabled": True,
+            "ipv4": {
+                "forwarding": True,
+                "address": [{
+                    "ip": addr,
+                    "prefix-length": plen,
+                }]}
+        }
+
+    target.put_config_dict("ietf-interfaces", {
+            "interfaces": {
+                "interface": [
+                    ifconfig("lo", rid, 32),
+
+                    ifconfig(dif, daddr, 24),
+                    ifconfig(fif, faddr, 30),
+                    ifconfig(sif, saddr, 30),
+                ]
+            }
+    })
+
+    target.put_config_dict("ietf-system", {
+        "system": {
+            "hostname": name,
+        }
+    })
+
+    target.put_config_dict("ietf-routing", {
+        "routing": {
+            "control-plane-protocols": {
+                "control-plane-protocol": [{
+                    "type": "infix-routing:ospfv2",
+                    "name": "default",
+                    "ospf": {
+                        "areas": {
+                            "area": [{
+                                "area-id": "0.0.0.0",
+                                "interfaces":
+                                {
+                                    "interface": [{
+                                        "bfd": {
+                                            "enabled": True
+                                        },
+                                        "name": fif,
+                                        "hello-interval": 1,
+                                        "dead-interval": 10,
+                                        "cost": 100,
+                                    },
+                                    {
+                                        "bfd": {
+                                            "enabled": True
+                                        },
+                                        "name": sif,
+                                        "hello-interval": 1,
+                                        "dead-interval": 10,
+                                        "cost": 200,
+                                    }, {
+                                        "name": dif,
+                                        "passive": True,
+                                    }]
+                                },
+                            }]
+                        }
+                    }
+                }]
+            }
+        }
+    })
+
+with infamy.Test() as test:
+    with test.step("Set up topology and attach to target DUTs"):
+        env = infamy.Env()
+        R1 = env.attach("R1", "mgmt")
+        R2 = env.attach("R2", "mgmt")
+
+    with test.step("Setup TPMR between R1fast and R2fast"):
+        breaker = TPMR(env.ltop.xlate("PC", "R1fast")[1],
+                       env.ltop.xlate("PC", "R2fast")[1]).start()
+
+    with test.step("Configure R1 and R2"):
+        r1cfg = {
+            "name": "R1",
+            "addr": {
+                "rid": "192.168.1.1",
+
+                "data": "192.168.10.1",
+                "fast": "192.168.100.1",
+                "slow": "192.168.200.1",
+            },
+            "link": {
+                "data": env.ltop.xlate("R1", "h1")[1],
+                "fast": env.ltop.xlate("R1", "fast")[1],
+                "slow": env.ltop.xlate("R1", "slow")[1],
+            }
+        }
+        r2cfg = {
+            "name": "R2",
+            "addr": {
+                "rid": "192.168.1.2",
+
+                "data": "192.168.20.1",
+                "fast": "192.168.100.2",
+                "slow": "192.168.200.2",
+            },
+            "link": {
+                "data": env.ltop.xlate("R2", "h2")[1],
+                "fast": env.ltop.xlate("R2", "fast")[1],
+                "slow": env.ltop.xlate("R2", "slow")[1],
+            }
+        }
+
+        parallel(config(R1, r1cfg), config(R2, r2cfg))
+
+    with test.step("Setup IP addresses and default routes on h1 and h2"):
+        _, h1 = env.ltop.xlate("PC", "h1")
+        _, h2 = env.ltop.xlate("PC", "h2")
+
+        h1net = infamy.IsolatedMacVlan(h1).start()
+        h1net.addip("192.168.10.2")
+        h1net.addroute("default", "192.168.10.1")
+
+        h2net = infamy.IsolatedMacVlan(h2).start()
+        h2net.addip("192.168.20.2")
+        h2net.addroute("default", "192.168.20.1")
+
+    with test.step("Wait for R1 and R2 to peer"):
+        print("Waiting for R1 and R2 to peer")
+        until(lambda: route.ipv4_route_exist(R1, "192.168.20.0/24", proto="ietf-ospf:ospfv2"), attempts=200)
+        until(lambda: route.ipv4_route_exist(R2, "192.168.10.0/24", proto="ietf-ospf:ospfv2"), attempts=200)
+
+    with test.step("Verify connectivity from PC:src to PC:dst via fast link"):
+        h1net.must_reach("192.168.20.2")
+        hops = [row[1] for row in h1net.traceroute("192.168.20.2")]
+        assert "192.168.100.2" in hops, f"Path to h2 ({repr(hops)}), does not use fast link"
+
+    with test.step("Disable forwarding between R1fast and R2fast to trigger fail-over"):
+        breaker.block()
+        print("Give BFD some time to detect the bad link, " +
+              "but not enough for the OSPF dead interval expire")
+        time.sleep(1)
+
+    with test.step("Verify connectivity from PC:src to PC:dst via slow link"):
+        h1net.must_reach("192.168.20.2")
+        hops = [row[1] for row in h1net.traceroute("192.168.20.2")]
+        assert "192.168.200.2" in hops, f"Path to h2 ({repr(hops)}), does not use slow link"
+
+    test.succeed()

test/case/ietf_routing/ospf_bfd/topology.dot

@@ -0,0 +1,39 @@
+graph "ospf-bfd" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+	size=10
+
+        node [shape=record, fontname="DejaVu Sans Mono, Book"];
+	edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"];
+
+        R1 [
+	    label=" { { R1 | <slow> slow } | { <mgmt> mgmt | <h1> h1 | <fast> fast } }",
+	    pos="0,6!",
+
+	    kind="infix",
+	];
+	R2 [
+	    label="{ { <slow> slow | R2 } | { <fast> fast | <h2> h2 | <mgmt> mgmt  } }",
+	    pos="18,6!",
+
+	    kind="infix",
+	];
+
+	PC [
+	    label="{ { <R1mgmt> R1mgmt | <h1> h1 | <R1fast> R1fast | <R2fast> R2fast | <h2> h2 | <R2mgmt> R2mgmt } | PC }",
+	    pos="9,0!",
+	    kind="controller",
+	];
+
+	PC:R1mgmt -- R1:mgmt [kind=mgmt, color="lightgray"]
+        PC:R2mgmt -- R2:mgmt [kind=mgmt, color="lightgray"]
+
+	PC:h1 -- R1:h1
+	PC:h2 -- R2:h2
+
+	R1:fast -- PC:R1fast [color="lightgreen", taillabel="Cost: 100"]
+	R2:fast -- PC:R2fast [color="lightgreen"]
+
+	R1:slow -- R2:slow [color="crimson", taillabel="Cost: 200"]
+}

test/case/ietf_routing/ospf_bfd/topology.svg

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- Title: ospf&#45;bfd Pages: 1 -->
+<svg width="432pt" height="156pt"
+ viewBox="0.00 0.00 432.03 155.51" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 151.51)">
+<title>ospf&#45;bfd</title>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-151.51 428.03,-151.51 428.03,4 -4,4"/>
+<!-- R1 -->
+<g id="node1" class="node">
+<title>R1</title>
+<polygon fill="none" stroke="black" points="0,-97.51 0,-143.51 133,-143.51 133,-97.51 0,-97.51"/>
+<text text-anchor="middle" x="29" y="-128.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">R1</text>
+<polyline fill="none" stroke="black" points="58,-120.51 58,-143.51 "/>
+<text text-anchor="middle" x="95.5" y="-128.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">slow</text>
+<polyline fill="none" stroke="black" points="0,-120.51 133,-120.51 "/>
+<text text-anchor="middle" x="25" y="-105.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">mgmt</text>
+<polyline fill="none" stroke="black" points="50,-97.51 50,-120.51 "/>
+<text text-anchor="middle" x="66.5" y="-105.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">h1</text>
+<polyline fill="none" stroke="black" points="83,-97.51 83,-120.51 "/>
+<text text-anchor="middle" x="108" y="-105.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">fast</text>
+</g>
+<!-- R2 -->
+<g id="node2" class="node">
+<title>R2</title>
+<polygon fill="none" stroke="black" points="291.03,-97.51 291.03,-143.51 424.03,-143.51 424.03,-97.51 291.03,-97.51"/>
+<text text-anchor="middle" x="328.53" y="-128.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">slow</text>
+<polyline fill="none" stroke="black" points="366.03,-120.51 366.03,-143.51 "/>
+<text text-anchor="middle" x="395.03" y="-128.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">R2</text>
+<polyline fill="none" stroke="black" points="291.03,-120.51 424.03,-120.51 "/>
+<text text-anchor="middle" x="316.03" y="-105.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">fast</text>
+<polyline fill="none" stroke="black" points="341.03,-97.51 341.03,-120.51 "/>
+<text text-anchor="middle" x="357.53" y="-105.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">h2</text>
+<polyline fill="none" stroke="black" points="374.03,-97.51 374.03,-120.51 "/>
+<text text-anchor="middle" x="399.03" y="-105.31" font-family="DejaVu Sans Mono, Book" font-size="14.00">mgmt</text>
+</g>
+<!-- R1&#45;&#45;R2 -->
+<g id="edge7" class="edge">
+<title>R1:slow&#45;&#45;R2:slow</title>
+<path fill="none" stroke="crimson" stroke-width="2" d="M133.5,-132.51C133.5,-132.51 290.53,-132.51 290.53,-132.51"/>
+<text text-anchor="middle" x="168" y="-136.31" font-family="DejaVu Serif, Book" font-size="14.00">Cost: 200</text>
+</g>
+<!-- PC -->
+<g id="node3" class="node">
+<title>PC</title>
+<polygon fill="none" stroke="black" points="47.01,-0.5 47.01,-46.5 377.01,-46.5 377.01,-0.5 47.01,-0.5"/>
+<text text-anchor="middle" x="80.01" y="-31.3" font-family="DejaVu Sans Mono, Book" font-size="14.00">R1mgmt</text>
+<polyline fill="none" stroke="black" points="113.01,-23.5 113.01,-46.5 "/>
+<text text-anchor="middle" x="129.51" y="-31.3" font-family="DejaVu Sans Mono, Book" font-size="14.00">h1</text>
+<polyline fill="none" stroke="black" points="146.01,-23.5 146.01,-46.5 "/>
+<text text-anchor="middle" x="179.01" y="-31.3" font-family="DejaVu Sans Mono, Book" font-size="14.00">R1fast</text>
+<polyline fill="none" stroke="black" points="212.01,-23.5 212.01,-46.5 "/>
+<text text-anchor="middle" x="245.01" y="-31.3" font-family="DejaVu Sans Mono, Book" font-size="14.00">R2fast</text>
+<polyline fill="none" stroke="black" points="278.01,-23.5 278.01,-46.5 "/>
+<text text-anchor="middle" x="294.51" y="-31.3" font-family="DejaVu Sans Mono, Book" font-size="14.00">h2</text>
+<polyline fill="none" stroke="black" points="311.01,-23.5 311.01,-46.5 "/>
+<text text-anchor="middle" x="344.01" y="-31.3" font-family="DejaVu Sans Mono, Book" font-size="14.00">R2mgmt</text>
+<polyline fill="none" stroke="black" points="47.01,-23.5 377.01,-23.5 "/>
+<text text-anchor="middle" x="212.01" y="-8.3" font-family="DejaVu Sans Mono, Book" font-size="14.00">PC</text>
+</g>
+<!-- R1&#45;&#45;PC -->
+<g id="edge5" class="edge">
+<title>R1:fast&#45;&#45;PC:R1fast</title>
+<path fill="none" stroke="lightgreen" stroke-width="2" d="M133.5,-108.51C133.5,-108.51 179.01,-46.5 179.01,-46.5"/>
+<text text-anchor="middle" x="168" y="-112.31" font-family="DejaVu Serif, Book" font-size="14.00">Cost: 100</text>
+</g>
+<!-- R2&#45;&#45;PC -->
+<g id="edge6" class="edge">
+<title>R2:fast&#45;&#45;PC:R2fast</title>
+<path fill="none" stroke="lightgreen" stroke-width="2" d="M290.53,-108.51C290.53,-108.51 245.01,-46.5 245.01,-46.5"/>
+</g>
+<!-- PC&#45;&#45;R1 -->
+<g id="edge1" class="edge">
+<title>PC:R1mgmt&#45;&#45;R1:mgmt</title>
+<path fill="none" stroke="lightgray" stroke-width="2" d="M80.01,-46.5C80.01,-46.5 24.5,-97.51 24.5,-97.51"/>
+</g>
+<!-- PC&#45;&#45;R1 -->
+<g id="edge3" class="edge">
+<title>PC:h1&#45;&#45;R1:h1</title>
+<path fill="none" stroke="cornflowerblue" stroke-width="2" d="M129.01,-46.5C129.01,-46.5 66.5,-97.51 66.5,-97.51"/>
+</g>
+<!-- PC&#45;&#45;R2 -->
+<g id="edge2" class="edge">
+<title>PC:R2mgmt&#45;&#45;R2:mgmt</title>
+<path fill="none" stroke="lightgray" stroke-width="2" d="M344.01,-46.5C344.01,-46.5 399.53,-97.51 399.53,-97.51"/>
+</g>
+<!-- PC&#45;&#45;R2 -->
+<g id="edge4" class="edge">
+<title>PC:h2&#45;&#45;R2:h2</title>
+<path fill="none" stroke="cornflowerblue" stroke-width="2" d="M295.01,-46.5C295.01,-46.5 357.53,-97.51 357.53,-97.51"/>
+</g>
+</g>
+</svg>

test/infamy/netns.py

@@ -1,4 +1,5 @@
 import ctypes
+import json
 import multiprocessing
 import os
 import random
@@ -18,31 +19,58 @@ def setns(fd, nstype):
     __NR_setns = 308
     __libc.syscall(__NR_setns, fd, nstype)
 
-class IsolatedMacVlan:
-    """Create an isolated interface on top of a PC interface."""
-    def __init__(self, parent, ifname="iface", lo=True):
+class IsolatedMacVlans:
+    """A network namespace containing a multiple MACVLANs
+
+    Stacks a MACVLAN on top of each specificed controller interface,
+    and moves those interfaces to a separate namespace, isolating it
+    from all others.
+
+    NOTE: For the simple case when only one interface needs to be
+    mapped, see IsolatedMacVlan below.
+
+    Example:
+
+    netns = IsolatedMacVlans({ "eth2": "a", "eth3": "b" })
+
+             netns:
+             .--------.
+             | a    b | (MACVLANs)
+             '-+----+-'
+               |    |
+    eth0 eth1 eth2 eth3
+
+    """
+
+    Instances = []
+    def Cleanup():
+        for ns in list(IsolatedMacVlans.Instances):
+            ns.stop()
+
+    def __init__(self, ifmap, lo=True):
         self.sleeper = None
-        self.parent, self.ifname, self.lo = parent, ifname, lo
+        self.ifmap, self.lo = ifmap, lo
         self.ping_timeout = env.ENV.attr("ping_timeout", 5)
 
-    def __enter__(self):
+    def start(self):
         self.sleeper = subprocess.Popen(["unshare", "-r", "-n", "sh", "-c",
                                          "echo && exec sleep infinity"],
                                         stdout=subprocess.PIPE)
         self.sleeper.stdout.readline()
 
         try:
-            subprocess.run(["ip", "link", "add",
-                            "dev", self.ifname,
-                            "link", self.parent,
-                            "address", self._stable_mac(),
-                            "netns", str(self.sleeper.pid),
-                            "type", "macvlan"], check=True)
-            self.runsh(f"""
-            while ! ip link show dev {self.ifname}; do
-                sleep 0.1
-            done
-            """)
+            for parent, ifname in self.ifmap.items():
+                subprocess.run(["ip", "link", "add",
+                                "dev", ifname,
+                                "link", parent,
+                                "address", self._stable_mac(parent),
+                                "netns", str(self.sleeper.pid),
+                                "type", "macvlan", "mode", "passthru"], check=True)
+                self.runsh(f"""
+                while ! ip link show dev {ifname}; do
+                    sleep 0.1
+                done
+                """)
         except Exception as e:
             self.__exit__(None, None, None)
             raise e
@@ -54,14 +82,43 @@ class IsolatedMacVlan:
                 self.__exit__(None, None, None)
                 raise e
 
+        self.Instances.append(self)
         return self
 
-    def __exit__(self, val, typ, tb):
+    def stop(self):
         self.sleeper.kill()
         self.sleeper.wait()
-        time.sleep(0.5)
 
-    def _stable_mac(self):
+        for n in range(100):
+            promisc = False
+            for parent in self.ifmap.keys():
+                iplink = subprocess.run(f"ip -d -j link show dev {parent}".split(),
+                                        stdout=subprocess.PIPE, check=True)
+                link = json.loads(iplink.stdout)[0]
+                if link["promiscuity"]:
+                    # Use promisc as a substitute for an indicator
+                    # of whether the kernel has actually removed
+                    # the passthru MACVLAN yet or not
+                    promisc = True
+                    break
+
+            if not promisc:
+                break
+
+            time.sleep(.1)
+        else:
+            raise TimeoutError("Lingering MACVLAN")
+
+        if self in self.Instances:
+            self.Instances.remove(self)
+
+    def __enter__(self):
+        return self.start()
+
+    def __exit__(self, val, typ, tb):
+        return self.stop()
+
+    def _stable_mac(self, parent):
         """Generate address for MACVLAN
 
         By default, the kernel will assign a random address. This
@@ -75,7 +132,7 @@ class IsolatedMacVlan:
         the resource exhaustion issue.
 
         """
-        random.seed(self.parent)
+        random.seed(parent)
         a = list(random.randbytes(6))
         a[0] |= 0x02
         a[0] &= ~0x01
@@ -146,13 +203,13 @@ class IsolatedMacVlan:
             ip -{p} route add {subnet}{prefix_length} via {nexthop}
             """, check=True)
 
-    def addip(self, addr, prefix_length=24, proto="ipv4"):
+    def addip(self, ifname, addr, prefix_length=24, proto="ipv4"):
         p=proto[3]
 
         self.runsh(f"""
             set -ex
             ip link set iface up
-            ip -{p} addr add {addr}/{prefix_length} dev iface
+            ip -{p} addr add {addr}/{prefix_length} dev {ifname}
             """, check=True)
 
 
@@ -188,8 +245,7 @@ class IsolatedMacVlan:
 
         raise Exception(res)
 
-    def must_receive(self, expr, timeout=None, ifname=None, must=True):
-        ifname = ifname if ifname else self.ifname
+    def must_receive(self, expr, ifname, timeout=None, must=True):
         timeout = timeout if timeout else self.ping_timeout
 
         tshark = self.run(["tshark", "-nl", f"-i{ifname}",
@@ -207,10 +263,43 @@ class IsolatedMacVlan:
     def must_not_receive(self, *args, **kwargs):
         self.must_receive(*args, **kwargs, must=False)
 
-    def pcap(self, expr, ifname=None):
-        ifname = ifname if ifname else self.ifname
+    def pcap(self, expr, ifname):
         return Pcap(self, ifname, expr)
 
+class IsolatedMacVlan(IsolatedMacVlans):
+    """A network namespace containing a single MACVLAN
+
+    Stacks a MACVLAN on top of an interface on the controller, and
+    moves that interface to a separate namespace, isolating it from
+    all other interfaces.
+
+    Example:
+
+    netns = IsolatedMacVlan("eth3")
+
+                netns:
+                .-------.
+                | iface | (MACVLAN)
+                '---+---'
+                    |
+    eth0 eth1 eth2 eth3
+
+    """
+    def __init__(self, parent, ifname="iface", lo=True):
+        self._ifname = ifname
+        return super().__init__(ifmap={ parent: ifname }, lo=lo)
+
+    def addip(self, addr, prefix_length=24, proto="ipv4"):
+        return super().addip(ifname=self._ifname, addr=addr, prefix_length=prefix_length, proto=proto)
+
+    def must_receive(self, expr, timeout=None, ifname=None, must=True):
+        ifname = ifname if ifname else self._ifname
+        return super().must_receive(expr=expr, ifname=ifname, timeout=timeout, must=must)
+
+    def pcap(self, expr, ifname=None):
+        ifname = ifname if ifname else self._ifname
+        return super().pcap(expr=expr, ifname=ifname)
+
 class Pcap:
     def __init__(self, netns, ifname, expr):
         self.netns, self.ifname, self.expr = netns, ifname, expr
@@ -253,7 +342,6 @@ class Pcap:
             # terminating the capture.
             time.sleep(sleep)
 
-        self.proc.send_signal(signal.SIGUSR2)
         self.proc.terminate()
         try:
             _, stderr = self.proc.communicate(5)
@@ -272,3 +360,52 @@ class Pcap:
                                  stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
                                  text=True, check=True)
         return tcpdump.stdout
+
+class TPMR(IsolatedMacVlans):
+    """Two-Port MAC Relay
+
+    Creates a network namespace containing two controller interfaces
+    (`a` and `b`). By default, tc rules are setup to copy all frames
+    ingressing on `a` to egress on `b`, and vice versa.
+
+    These rules can be removed and reinserted dynamically using the
+    `block()` and `forward()` methods, respectively.
+
+    This is useful to verify the correctness of fail-over behavior in
+    various protocols. See ospf_bfd for a usage example.
+    """
+
+    def __init__(self, a, b):
+        super().__init__(ifmap={ a: "a", b: "b" }, lo=False)
+
+    def start(self, forward=True):
+        ret = super().start()
+
+        for dev in ("a", "b"):
+            self.run(f"ip link set dev {dev} promisc on up".split())
+            self.run(f"tc qdisc add dev {dev} clsact".split())
+
+        if forward:
+            self.forward()
+
+        return ret
+
+    def _clear_ingress(self, iface):
+        return self.run(f"tc filter del dev {iface} ingress".split())
+
+    def _add_redir(self, frm, to):
+        cmd = \
+            "tc filter add dev".split() \
+            + [frm] \
+            + "ingress matchall action mirred egress redirect dev".split() \
+            + [to]
+        return self.run(cmd)
+
+    def forward(self):
+        for iface in ("a", "b"):
+            self._clear_ingress(iface)
+            self._add_redir(iface, "a" if iface == "b" else "b")
+
+    def block(self):
+        for iface in ("a", "b"):
+            self._clear_ingress(iface)

test/infamy/tap.py

@@ -4,6 +4,8 @@ import subprocess
 import sys
 import traceback
 
+import infamy.netns
+
 class Test:
     def __init__(self, output=sys.stdout):
         self.out = output
@@ -24,6 +26,8 @@ class Test:
         self.out.write(f"# Exiting ({now})\n")
         self.out.flush()
 
+        infamy.netns.IsolatedMacVlans.Cleanup()
+
         if not e:
             self._not_ok("Missing explicit test result\n")
         else: