From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 2F4FA4229D6 for ; Tue, 7 Jul 2026 13:59:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783432786; cv=none; b=dG5iRdl1Gahdtc8jIvATrPGU7Vh+aQmRhmIpUz6jQd5M0T5d++me9BCUgugbrmnTBnpAhDwJ0pAFKfLfgWv2i8rHgYR8biCrg+5k71vTPXKF3q72cuSt6TvFXoQKTPBOxEe6fcMKudJuaIrWmle8Gt8auXODtG8Qt7usmqTRC5Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783432786; c=relaxed/simple; bh=/iYHcgFjrHFN0Scel/m+skKEgEDhSn5WTbycrew+/lQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ngwOjISTMcmZQML24PEz3yDH9VJrjNyYxynCIJsWFyI3ZdborHzG5mPr8MSlY/gwPLixoof1x/oVmkiiA3K9sdFjeYmTbpiQ2x4wyeBuINBcHifgbGcqddfsJvlBywCXkrvzLchPQqpx3fZB6sTTSo+se2VK4z7cOPzgu0MrbY0= 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=fTOKbglF; arc=none smtp.client-ip=209.85.128.43 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="fTOKbglF" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-493bb0e2894so6534885e9.2 for ; Tue, 07 Jul 2026 06:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783432783; x=1784037583; 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=53QZ5zs8hezIVpTlLOTxFGj4/3N8vgT5mhbb0VI64UI=; b=fTOKbglFcd/zJzHoxdnjQrAS4hU4AyUasBfGNPGAIO1lHyxNeE4QxhupZqVzCNciiM 8r6bHsRZnF7Ezi21wOznYBrY53cv5AQMr9i2fFzUPD1KGJkkEOTZis4rWtfI2Yl0eidJ wVrK4yhVZc6b9p/qZ3DD4ODTCCpV5g4et63+K7LslWuMd0nfj8tAExUmGfRxWvfNTXGQ PUGLfPzXs/UVDmJXfxUPFjDeKuH4u2/85T3tO+LZKvvI1Bh7GD2U6OpI7YbG6EulRHfW +KU6lNhgvNqPwsNCjFf2MTmXLO2pqIVAul3GDvbtg6aoq3/mujB+6fS6gQr5NrS2MEbO iKMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783432783; x=1784037583; 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=53QZ5zs8hezIVpTlLOTxFGj4/3N8vgT5mhbb0VI64UI=; b=o02+xpJD+pKzybmBEn8bTFXgYO9qfmjiqTgapq5UFMldkDcwWtxj2Wd8Yc6sDpWIaK yoT6WSUaIVblzks7D5EUncBTR7zjsEWdvSGYNgIOinzWjCA+kQicCd/kmbBzRizUhjvi Roi8j5fR1Qrs8+e5JzxsIMYovhknOTIgzOxqmWiOhSIxm6sgeoahuwPq7AW3tUJlf5Hh 73Mnvb3/WAbqjFcfMrMkptIkUcCzk+/3sBXLHc02JnBv7TSZTJWm9dd97Orvvh81vZFZ OfdloW7CcBEwT15bT6eVRZLw0unXnCVBAmVP1pPgT6eSvbP42LRodmX3SO+MlQJHN7My 1zpg== X-Forwarded-Encrypted: i=1; AHgh+RqTBuLIfL8CYSuB5Gs0k47piTZCmpALyTmEhdN5Ri8fr2dwCi2cl/12dBMUfS72aO4A69UcJrzt3+nqlZ8=@vger.kernel.org X-Gm-Message-State: AOJu0YyZ+DlHyH5OJaqCVK5k2v8CU1Dnw5rTJQO0VgsWz+V/uWH+eZCF Wi+WpZyR4w7meUv7OIZDTe+ROK3UgUNHhSBHxr5rB2g2hGKdvD6kpZ3F X-Gm-Gg: AfdE7cnxoS99YUd4SElQXCG6S9Zt2tFjD0Z8EUIAqf5eW9kB/dLgQCO67yo0GhwS7i0 2yYOGO8hmQ3C1tJspcRj6cnnQXOKilKCRTYuTmoq11lxOCSfoD8Gu9wpj/gqQ5Hp1UKvphugqSx /uNf7Ix6aybTIcHTJ+SK9wzEEtYd/Xk9lw+FMBGnpWO79eXRX6aYyXRERKRYZHzxBKCPRmUvG+J Kv2wSEGWakk6kW2KXTHCgsg5zAYQpG7D2rWBxUOV+3+sto4e8UJs9r0mewRIYk8wBqInkUCC4dX Hy/qyn7b0mMggAvFnBOPPbKA2McxkFfAYS3TvSdTXj+me2x/ggxYoZKN7GMJjp3N8KZ71h+0pLk IdCLqd1GRSXId4IHKOVQWvxeXiFplwLX/o82/zpLHh9Ah8CjRzK6oTnQ4Cx3y+92TSWN1gf/bNZ lO2JLDilW/Z3Q9+Ex9zf6I4QsEjgLm5P+p0IXRB/fA6uAzdawpKHsBRbR7cK579zQWcuhByn0U7 fTZzIPhMzsmo3wKUBk/aF3QKeZejGdoUlw9PC/v3V48XNhinZI= X-Received: by 2002:a05:600c:4e42:b0:490:ec79:3046 with SMTP id 5b1f17b1804b1-493d0de371amr99534635e9.0.1783432782525; Tue, 07 Jul 2026 06:59:42 -0700 (PDT) Received: from L-022584.energy.envision.com (dynamic-077-189-165-250.77.189.pool.telefonica.de. [77.189.165.250]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493e0f40d50sm67409615e9.5.2026.07.07.06.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 06:59:41 -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 v3 2/4] net: hsr: emit RedBox-MAC TLV in PRP RedBox supervision frames Date: Tue, 7 Jul 2026 15:59:35 +0200 Message-ID: <20260707135937.18-3-xiexinet@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260707135937.18-1-xiexinet@gmail.com> References: <20260707135937.18-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..c27cfdd9ca3 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