From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 922BB370D5C for ; Mon, 6 Jul 2026 13:41:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783345296; cv=none; b=Zu0/AFtXksd5Q3mFtsy0Me11KD9kuTOFh6qbA+JoNd+lR0BQRwEMWND7OZ+ajw/q6dE87PbM/+ji/wsC/oH8CCSFLsPwrXjvcdjzJXwah0n/4H4cYJiIDEkk4JXhMGkrb7ZF05iu6f/11TvTXEr0hI3PEDrNA4GW82QVTv+rano= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783345296; c=relaxed/simple; bh=DcinLXJkZhEimlfXPZqljt/KeF0J4CwScC9uvOz+V3g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d53g0uSDyQF2fiCIuCFU1qDthxtkzZuOwn1BKa3lqTsktf8zFkL75+bo9DGb/ALWgVYMqsEliROXO1GwE4mAx0HR5H+JOfLDUpBLao78no+UE8VKBibemwNmjTunJdBPwaozEhBZbqjf7Uzz+U7HWxSpr+Eaus5xXA6ZsxvY10c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=osOKbdFt; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="osOKbdFt" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-493c1efb503so4856165e9.2 for ; Mon, 06 Jul 2026 06:41:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783345293; x=1783950093; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XRId4DvGOQ2rNFx3qYCNQcXGs6GHkZEpPtpwnp5Y1wM=; b=osOKbdFtTia/FPkcMnltfT5HRL21Uj/OG9kVfBZ3s8IpAwQg+RUDmdfVoMvbApDFLI hg6EL6Ua3hg0h9jxvYlvgeHIBIfN35uQTgHuCbBX0L0djQ+/ETv0FTDLCbZDlw0AEjHH LUijdLBLQHGSReC85SORlpe+Sk2FZTSQ93reG4jd/i8uWzLe7zfKhicGIHhtJ+RMkwvA bFnkbYE651igYDylnaJFxIlwvjWuiMclZC6nH8j9vfGs8GFkb3zzS8z16Q9d3FEy0Adp vFOyPNkIWvrLtTSBWgZDLAxorlv5L0zmMCNaW1S962KGyvmhgexgEbuRD4IuCMcoUcvB lxLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783345293; x=1783950093; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=XRId4DvGOQ2rNFx3qYCNQcXGs6GHkZEpPtpwnp5Y1wM=; b=XG67M1/cV7wjJwxkOnBKLjIv2UzxcfBhEuSoqlqEG3fgMAfOqZoid7+0ylljyGLZ7Y H9q6mI6eDJR15YHD6mXjNy781d81WzIBZSD1EIr1BK+7l8Kx6hzx59F8moH44Z+L22G+ NLYmQRSYM+iG8NVvQmdEwL7heBGqaiQd8mXgia3DTiAu0n+um6WkXENI7OsljoH7j68M 4gKPVW8UiKvfFHZfBLr7vvJX4hyn/Wg4wLyvmwiE2Nu8hkhdyTYbuW76EMMf0jmqXt8F B0VoF25CB+YSDSWcXbD48obs6bXIFIMurve5y9JcqFoUXn3OLgzh0xkh8PP0G0dEdvdD 7OeA== X-Forwarded-Encrypted: i=1; AHgh+Rpb4Xq/kOPM+ugLykN2HrwpNUC/H2KZal5C0pXuvt4FwLye0HCDscxYd1qfDNcEFn1YJB1kwJyoKwbQpm1Tvcc=@vger.kernel.org X-Gm-Message-State: AOJu0YxGHaV4KfYEbYPRfia7duH0X06X3WmMm3bGST2dQsCvMG15+hF1 aSaVSzzyvwj8FArOmqDgZTviZDmn5jC/Bh4zm6lh0a9jL9ZeKmzJ6BIc X-Gm-Gg: AfdE7cmchu+HobpYi1+A5oQphqjReNXs2+T2ZEYpUrbbgC/UItKJosaMU3qF0/0l4pv Rkccs3thuI8ADEBzjpfn9Qay3Wm5DkBz3zR9OSthxLCEwB0CkGpM1nem7NolUKC0H1/Ep6cL2ds 5/3mjOYydiEisUf/sk5k4ev/qE5HQ+2aP+SVKau4lJ2W8IHF+yzlQT9fL9+57LwNyzr+E26uqzJ yyTRQUzQSNsU4PtAcLxPyxY14Oc/ZPj8YOoBytY/qduUPlGdZ0ZqneDV8x3A0pCIk7287vfrOih gJ3HVFmePd2CLMySaFVq3Hx3yiy6J5Sn+rR52M+mmT73j8DlPsbvdW25Q3ESX5aKfL2Hhd9iKIw +EBrw7++YYJcIclB4zky5XDAQsXU66ZkyivRN9S7h/l+YkLUezr3nIZtnHq8GQevpjmYffB0GKD o3uBwWkSNFMJJWJIV575MKV5xi/yIaNd/W96+rd+UQ5R9rsTzN2Qr2R0YHH7pMZdnQQvMNMlYPQ JEvOGXbbLBunl+VKa7252VECUsRL4MPhkY8/4SYDg2pf1CKJ0o= X-Received: by 2002:a05:600c:4691:b0:492:6e72:eee with SMTP id 5b1f17b1804b1-493d0f361c6mr70762245e9.3.1783345292673; Mon, 06 Jul 2026 06:41:32 -0700 (PDT) Received: from hpubt (dynamic-2a02-3100-5b6d-48fc-6651-06ff-fed8-72a4.310.pool.telefonica.de. [2a02:3100:5b6d:48fc:6651:6ff:fed8:72a4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47aa039ae44sm23960881f8f.23.2026.07.06.06.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 06:41:32 -0700 (PDT) From: Xin Xie To: netdev@vger.kernel.org Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Sebastian Andrzej Siewior , Felix Maurer , Luka Gejak , Fernando Fernandez Mancera , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Xin Xie Subject: [PATCH net-next v2 0/4] net: hsr: PRP RedBox (PRP-SAN) support Date: Mon, 6 Jul 2026 13:41:27 +0000 Message-ID: <20260706134131.61659-1-xiexinet@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260704234704.4297-1-xiexinet@gmail.com> References: <20260704234704.4297-1-xiexinet@gmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This series adds PRP RedBox support to the hsr driver: a PRP node that proxies one or more SANs sitting behind an interlink port (IEC 62439-3, PRP-SAN). HSR-SAN has been supported since commit 5055cccfc2d1 ("net: hsr: Provide RedBox support (HSR-SAN)"); this extends the equivalent capability to PRP, reusing the existing protocol-neutral proxy machinery (proxy_node_db, hsr_proxy_announce(), hsr_prune_proxy_nodes()). A SAN behind the interlink does bidirectional unicast with peers on the PRP network, its source MAC is preserved on the wire, the PRP RCT is correct, and the RedBox announces each proxied SAN with the RedBox-MAC TLV (Type 30) in its supervision frames. The series is bisect-safe: the datapath, duplicate discard and supervision support are added first; the rtnetlink rejection of "type hsr ... interlink proto 1" is removed only in patch 3, once the feature is complete. Design notes: - prp_drop_frame() does not walk the node tables. The destination classification (PRP-network node vs proxied SAN) is resolved once per frame in fill_frame_info() and cached in struct hsr_frame_info, so the per egress-port drop decision is O(1) in the softIRQ path. The classification is gated on PRP RedBox devices (prot_version == PRP_V1 && hsr->redbox), so HSR RedBox traffic is not affected. - The LAN A/B duplicate test is factored into prp_is_lan_dup() so the new PRP interlink rules in prp_drop_frame() do not change hsr_drop_frame() behaviour, including the NETIF_F_HW_HSR_FWD path. This is software PRP RedBox only; it adds no new hardware-offload contract. - The supervision emitter uses pre-reserved tailroom (hsr_init_skb() + skb_put()) on the existing GFP_ATOMIC path; no skb_linearize() or pskb_expand_head(). The RedBox-MAC TLV is followed by an explicit EOT (Type 0, Length 0); padding via skb_put_padto(ETH_ZLEN) and the 6-byte PRP RCT remain at the absolute tail of the egress frame. - The hsr_get_node() hsr_ethhdr length guard is relaxed only for PRP supervision frames (prot_version == PRP_V1 && ETH_P_PRP && is_sup), which are untagged with mac_len == ETH_HLEN. HSR (ETH_P_HSR) supervision is front-tagged and keeps the original length requirement, so HSR malformed-frame filtering is unchanged. Testing (on a net-next v7.2-rc1 kernel built from this base, x86-64): - checkpatch.pl --strict: patches 1-3 clean; patch 4 reports only the expected "added file(s), does MAINTAINERS need updating?" note, which is ignorable here -- MAINTAINERS already lists tools/testing/selftests/net/hsr/ under HSR NETWORK PROTOCOL. - git diff --check clean; the series git-am's onto the base commit. - tools/testing/selftests/net/hsr/hsr_prp_redbox.sh: PASS on the patched kernel (bidirectional unicast, SAN MAC preservation, RedBox-MAC TLV + EOT in the proxy-announce). - HSR regression on the same kernel: hsr_redbox.sh (HSR-SAN/RedBox), hsr_ping.sh and prp_ping.sh all PASS, confirming the PRP changes do not regress the existing HSR/PRP paths. - netns checks: peer<->SAN 0% loss with no duplicates and a valid PRP RCT on the wire; a silent SAN is pruned from the announce; zero driver WARN/BUG/Oops/RCU-stall during the run. Beyond the in-tree selftest, this exact series (applied to this base and running as the net-next kernel on x86-64 hardware) was also validated with an out-of-tree IEC 62439-3 conformance harness (supervision TLV chain, duplicate discard, cross-LAN rejection, seqnr rollover, VLAN/multicast/GOOSE frame types with the RCT verified at the absolute frame tail), and interoperability-tested against a commercial PRP RedBox (Siemens SCALANCE X204RNA) over 100 Mbit/s Fast Ethernet with NIC hardware (PTP) timestamping: a mid-stream single-LAN outage of ~2 s at 10 kpps was bridged with zero lost and zero duplicate frames (seamless PRP failover), and the duplicate-discard window held zero lost / zero duplicates under netem asymmetric delay up to 100 ms (~1000 sequence numbers in flight), 25% reorder, and 5% single-LAN loss. The failover and impairment matrix was additionally repeated on a KASAN + lockdep + kmemleak instrumented build of this kernel, including a 72-carrier-event link flap-storm with deliberate double-LAN cuts: zero KASAN, lockdep, or kmemleak findings. This out-of-tree testing is supplementary and not required to evaluate the series. v1 -> v2: - publish the RedBox state before lower RX handlers can learn nodes: fixes an initialization-ordering race where a node learned during device setup got a single-port sequence block, breaking interlink duplicate discard and letting the supervision merge read beyond the source node's allocated sequence bitmap (reported by the NIPA Sashiko review) - harden the supervision sequence-block merge against mismatched seq_port_cnt - align macaddress_redbox for ether_addr_copy() on strict-alignment architectures - selftest: kill the background ping by exact PID and wrap an overlong line Xin Xie (4): net: hsr: add PRP interlink (RedBox) datapath and duplicate discard net: hsr: emit RedBox-MAC TLV in PRP RedBox supervision frames net: hsr: allow PRP RedBox (interlink) creation selftests: net: hsr: add PRP RedBox test net/hsr/hsr_device.c | 44 ++++++++- net/hsr/hsr_forward.c | 49 +++++++-- net/hsr/hsr_framereg.c | 27 +++-- net/hsr/hsr_framereg.h | 2 + net/hsr/hsr_main.h | 2 +- net/hsr/hsr_netlink.c | 8 +- tools/testing/selftests/net/hsr/Makefile | 1 + .../selftests/net/hsr/hsr_prp_redbox.sh | 99 +++++++++++++++++++ 8 files changed, 207 insertions(+), 25 deletions(-) create mode 100755 tools/testing/selftests/net/hsr/hsr_prp_redbox.sh base-commit: b73bc9ca3686b78b642fb35dcc1fdf874ecb74a1 -- 2.53.0