From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 6F2F93955F4 for ; Fri, 17 Jul 2026 20:15:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784319310; cv=none; b=r6/kWVc3NfmaJOzRKlbdfDAtmlp2MuSdUl1uUOLJfkxYhiT6KHNo5rYg5WaJ+/2JQ0XU9E4VZgxaSIW0CxcnrHWmhA+aEHgxwfq5YxDx8ThrjT4sRxAEt/NOfZieVELX+/srqRYBshXotb/EJ0Etu6lUJjcWI0bcu/bqm+Xs1aw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784319310; c=relaxed/simple; bh=PMfdPP8tbxO4rGaiNWWMMR+GuufY3qRT/GwPQyy8FmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lY+H9mSVcQW2FtYxGHRAnkpR9mbbcieck9x2DixiOZ986t6rwq6vz4fLUb3tlWyLf3+Hx06yigr/Gr2242YlE+EIrVo7J3brMIKXWAwQ6kO2FhXVq0qR4FtSTQt8EMaRbgiNNAGqfYq7LU5yl7PwIeZH1cimLE4OYeByhJYA/KE= 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=rCJNaLCB; arc=none smtp.client-ip=209.85.221.45 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="rCJNaLCB" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-472c021a608so884669f8f.3 for ; Fri, 17 Jul 2026 13:15:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784319304; x=1784924104; 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=KgwWXpWZ5E6B/1xrDcK3wBAQSk4ptg7t74XAEY84UEo=; b=rCJNaLCBkqR06nCMfkwMlJgM7T0VryjOG9PRjzun3dAteZF/ziLA4hFjbzSR9ulPGE TGPpAeM/KKBo7Ql4JqdVVimDvGZNxADf2ueFwwSt0lXdEUb848npv317xSZS9JW5Q6Z3 uPx/0JiGFoDWDK5DWCkcSnDwdYdkhlkT5n2wIhblVZUcsxYLyg6XiT4ry3MfUEfhKbXo A6j9tu1B7enWeTnhMZBdQujj+1kSeMt7wGUYioRjdARiA5IDZm/Wxb2kiPKPAJjFeuAF 8AT13QIdo43Y/ijAuknr16KE/Fn9mfwEQ8VDUXv+LyXotmMU/RPSEmOr9GgpMxXLLE2S YUgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784319304; x=1784924104; 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=KgwWXpWZ5E6B/1xrDcK3wBAQSk4ptg7t74XAEY84UEo=; b=Vr6CKILBF2zjMDcgUFbsK7X9/7uad+FwdORblw6pbfh3FJD78bAUY474YeFPGZuUzM Qf7wXzqmSTkc2L8OMfEpmtGhSPWRz2Wsit0hnEVpPAZj01KjKArpAzn0WCHQ1W0KASk5 4yZZj2saVsmqBYAk7Ds6v+zLNfJTB7jZp66uro7ou86VKpx5J5yPGIOsPhHGzoj+rDnI g4NUq9gqZjELw2eW7yHMYowHz9l5q0cw0yIljxBlxrTH7D5KkXZTli6wHZR2qq5z3bxy m9i+x9TNDKImXLLTXp8dmahNKNztIMZl8ck+hS1je+BqpUHVoCfcmoxNeEevGWXOhHFr +1aw== X-Forwarded-Encrypted: i=1; AHgh+RoL1+hmn9IPXL4StkF1UEKyaJ1uCuqtOS+ZS4LCfVzDGdNCruLUrXi1gw/mjXLPZcAMwJfKH0Dmiiwcsnc=@vger.kernel.org X-Gm-Message-State: AOJu0Yyqu0jaAN4Spl1TqQR35ZDVmly7X8eKjBVbXOIikcoRfgnmHkOl bUvFvYquUSZLcqlsaP/KmtnPxwsn+rhKXSw4GnuEz8u+7yrTM6TN2gx4 X-Gm-Gg: AfdE7clmsJoB+CW79HpQrBs6+VZ54s5aLMCp+S3xjpTSZjOpt+gmxtsrjtrjllqJfxb GRfjrguLqF71J792NivlMrlXL+kzE+uoXBbI2eEXlE0SAVRuae1zcY/rtAlfwzl1Y5tv10qkswx leKv+p/fJDUyWPi/cxQIinjIbNgGzxdpdkZjstXSTMTd0h7NgkvHzFwadgVDy9scb4qB2M1HQXP prbO9DGuvyf2/TRJj94MxBqFl4yJmyJkumGqx6c9YYD3WvwOmh86X8N9Gk9jA6x1c5TjXenOy/N umewG2BOlEdKJnlqLJbVMu6HotkTGulWFTE1CKZeDfIELSBxHaPWnetVz4Ncu+v4BJx9VwM7g4R 4C1xUob5WkXV7I/8pGNpsdIOWtqQFSHr0dfuW5sv7VuutaSJaCB1iw4C15OABZgxBGKagdvDa2i 63PVGFlOizJzZ2Ui78SlgxtP5l+DgVMakYhrTf7F9850zHllTLdAX4JYvF/cvPTxmIq8qMBUS7i jTJB7VBBfgkF4joxGptQLwHcr5WKIvrG0GipLo= X-Received: by 2002:a05:600c:1c23:b0:490:846d:4edf with SMTP id 5b1f17b1804b1-4954a3ebc81mr26331675e9.1.1784319304154; Fri, 17 Jul 2026 13:15:04 -0700 (PDT) Received: from L-022584.energy.envision.com (dynamic-077-179-077-126.77.179.pool.telefonica.de. [77.179.77.126]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-495499a5847sm53179335e9.2.2026.07.17.13.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 13:15:03 -0700 (PDT) From: Xin Xie To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, wsa+renesas@sang-engineering.com, jie.luo@oss.qualcomm.com, shuah@kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, fmancera@suse.de, bigeasy@linutronix.de, fmaurer@redhat.com, luka.gejak@linux.dev, Xin Xie , Hangbin Liu Subject: [PATCH net-next v4 2/4] net: hsr: emit RedBox-MAC TLV in PRP RedBox supervision frames Date: Fri, 17 Jul 2026 22:14:55 +0200 Message-ID: <20260717201457.54-3-xiexinet@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260717201457.54-1-xiexinet@gmail.com> References: <20260717201457.54-1-xiexinet@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A PRP RedBox must announce the SANs it proxies so peers populate their proxy node tables. The proxy-announce machinery (hsr_proxy_announce(), armed via hsr->redbox) already iterates proxy_node_db under RCU and calls send_sv_frame() once per SAN, but the PRP sender emitted neither the announced SAN MAC nor the RedBox-MAC TLV that IEC 62439-3 requires. Extend send_prp_supervision_frame() so that, for a proxy-announce (identified by the interlink port, an O(1) test), the frame carries the proxied SAN MAC as MacAddressA followed by the RedBox-MAC TLV (Type 30) and an explicit End-of-TLV marker before padding. hsr_get_node() must also accept the reinjected proxy-announce: a PRP supervision frame is an untagged ETH_P_PRP frame (mac_len == ETH_HLEN, the RCT is appended only on egress) sourced from macaddress_redbox, which is never learned from data. Exempt only PRP supervision frames from the hsr_ethhdr length guard; HSR (ETH_P_HSR) supervision is front-tagged and keeps the original guard, so HSR malformed-frame filtering is unchanged. Also align macaddress_redbox so that ether_addr_copy() and ether_addr_equal() on it are safe on architectures without efficient unaligned access. Signed-off-by: Xin Xie --- net/hsr/hsr_device.c | 33 ++++++++++++++++++++++++++++++--- net/hsr/hsr_framereg.c | 13 +++++++++++-- net/hsr/hsr_main.h | 2 +- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index 5af491ed2b7..0973f9a94f4 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -372,10 +372,21 @@ static void send_prp_supervision_frame(struct hsr_port *master, { struct hsr_priv *hsr = master->hsr; struct hsr_sup_payload *hsr_sp; + struct hsr_sup_tlv *hsr_stlv; struct hsr_sup_tag *hsr_stag; struct sk_buff *skb; + bool redbox_proxy; + int extra = 0; + + redbox_proxy = hsr->redbox && master->type == HSR_PT_INTERLINK; + + /* A proxy-announce carries a RedBox-MAC TLV and an EOT marker. */ + if (redbox_proxy) + extra = sizeof(struct hsr_sup_tlv) + + sizeof(struct hsr_sup_payload) + + sizeof(struct hsr_sup_tlv); - skb = hsr_init_skb(master, 0); + skb = hsr_init_skb(master, extra); if (!skb) { netdev_warn_once(master->dev, "PRP: Could not send supervision frame\n"); return; @@ -393,9 +404,25 @@ static void send_prp_supervision_frame(struct hsr_port *master, hsr_stag->tlv.HSR_TLV_type = PRP_TLV_LIFE_CHECK_DD; hsr_stag->tlv.HSR_TLV_length = sizeof(struct hsr_sup_payload); - /* Payload: MacAddressA */ + /* Payload: MacAddressA, the announced node. */ hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload)); - ether_addr_copy(hsr_sp->macaddress_A, master->dev->dev_addr); + ether_addr_copy(hsr_sp->macaddress_A, addr); + + /* Proxy-announce: append the RedBox-MAC TLV (Type 30) and an explicit + * EOT to terminate the TLV chain before zero padding. + */ + if (redbox_proxy) { + hsr_stlv = skb_put(skb, sizeof(struct hsr_sup_tlv)); + hsr_stlv->HSR_TLV_type = PRP_TLV_REDBOX_MAC; + hsr_stlv->HSR_TLV_length = sizeof(struct hsr_sup_payload); + + hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload)); + ether_addr_copy(hsr_sp->macaddress_A, hsr->macaddress_redbox); + + hsr_stlv = skb_put(skb, sizeof(struct hsr_sup_tlv)); + hsr_stlv->HSR_TLV_type = HSR_TLV_EOT; + hsr_stlv->HSR_TLV_length = 0; + } if (skb_put_padto(skb, ETH_ZLEN)) { spin_unlock_bh(&hsr->seqnr_lock); diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 8f708b6e6c3..b3b106be692 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -293,8 +293,17 @@ struct hsr_node *hsr_get_node(struct hsr_port *port, struct list_head *node_db, */ if (ethhdr->h_proto == htons(ETH_P_PRP) || ethhdr->h_proto == htons(ETH_P_HSR)) { - /* Check if skb contains hsr_ethhdr */ - if (skb->mac_len < sizeof(struct hsr_ethhdr)) + bool prp_sup; + + /* A PRP supervision frame is an untagged ETH_P_PRP frame + * (mac_len == ETH_HLEN); its RCT is appended only on egress. + * HSR (ETH_P_HSR) supervision is front-tagged and still must + * contain a struct hsr_ethhdr. + */ + prp_sup = hsr->prot_version == PRP_V1 && + ethhdr->h_proto == htons(ETH_P_PRP) && is_sup; + + if (!prp_sup && skb->mac_len < sizeof(struct hsr_ethhdr)) return NULL; } else { rct = skb_get_PRP_rct(skb); diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index 134e4f3fff6..53e95bae0ee 100644 --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -211,7 +211,7 @@ struct hsr_priv { */ bool fwd_offloaded; /* Forwarding offloaded to HW */ bool redbox; /* Device supports HSR RedBox */ - unsigned char macaddress_redbox[ETH_ALEN]; + unsigned char macaddress_redbox[ETH_ALEN] __aligned(sizeof(u16)); unsigned char sup_multicast_addr[ETH_ALEN] __aligned(sizeof(u16)); /* Align to u16 boundary to avoid unaligned access * in ether_addr_equal -- 2.53.0