From patchwork Fri Mar 1 22:16:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Dembicki X-Patchwork-Id: 13579182 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.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 70F1C59B7A; Fri, 1 Mar 2024 22:18:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709331482; cv=none; b=W6/g6//Vya0Sr4cvmWxhxMoxMmNEYUF2ynBwExFj71BNHUwRvvUG82FcT2SeZfiWgHxexxddf4tbNy9LUiw3yea0El+WX8X8Uy+fft9s2pPXvEyx3BSadlOOeO5cF+cLoHtM+lMde2QQ/REwjZRrCB5PF2ICRPgvSsUQKBAdwTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709331482; c=relaxed/simple; bh=qX9bMC08bJpC9TvDx/M1Rc2xJM1aKrcgzAL/tAfbyIU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B9wXYcnVuf2I4xDc7m/9dxVjTIucBt9Y5Nos2x8Lff+/UMdK4H+euqbSW/TBKwetUPGNf+gToBMo1hENNfUlTIkUcm8fsogpK2aVRzZzZ+O82UkFic5uL2V3WcfjfCzxCLLT6klciQ+sxkKmodsV411/Y8vNudVEK5uaUmokY40= 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=Zz3z4Ugx; arc=none smtp.client-ip=209.85.208.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="Zz3z4Ugx" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-566e6192da8so1376468a12.1; Fri, 01 Mar 2024 14:18:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709331478; x=1709936278; 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; bh=9U/RPAQekDfsiTLh+gi653ipzg+ntrQzlfFlL0y3WFc=; b=Zz3z4Ugxkoc3ElDXWA9ljndKjUIB7QpXl3Db3a/DhyfklmStMdyhrGs41T0MdtORtH vgmoSVE+ExBttGIaB9I2/Dw/ZygKIBEfPFwPLJ3TVNxpm9JNygGISmyRRoivER+djLKt gCce7wVpxi1ivGKOe43Y++b5C1ZPWzJmBZNpgPJyuM/PkGHem2fxaUpu7TKg/4pWJnLS 0p34gSLTQEvptDn9AAOMnb9DxYfqLiuDuPFOKUsglqEJnkljylqRnxWUpGuutsohnTGO Acnk1sj3M9uxiIgueMVMCyPfK4gHzQ5bpxquqomzLDuTeik0bpabBhlwU9eAMc7siJyN UvDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709331478; x=1709936278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9U/RPAQekDfsiTLh+gi653ipzg+ntrQzlfFlL0y3WFc=; b=gocafSEfLhMdRBuA4mvXPGZBeB+o8IDMduR6cRPV3wgfYgDc13qBO7Ez2InfUSderF bybF3oezFaPax3Oc2qGy0vXEZzOzSx0qQiQ/igrwcKQwo9+W2GA0idcX29ty95ieRFTo OdMY6d3esZbiaBk7dQCPwRgNhoXouoY6klNYNMV1yn6CY1uF0Evx9jX2J8LUkBonMgHD mtmk/3MD/UFyGlsZU0JYMhqIUjAP/jNw27CzecUNheXvoO57xJJWb2UIl1hMmwYBcxSY xlXKBT/Zftnj7QUCMoGVh0LRC1f+KXjSgQpcsyD0MzsyQ8AR44urzIQF7IgKDTo3EvVj Lcxg== X-Forwarded-Encrypted: i=1; AJvYcCV3dHJDWkq/w1xSlUT0MffyDYoXTTys9ZirlegY9pt9KVzhsWQJiHK8PI7VxGK8tHf7WTrPGCWVuFwPSDxkNdC0sGWLaiG7Cs0nf8eH X-Gm-Message-State: AOJu0YwzHB5Zq8qU7lTklS52pRTFF/qhaNSuJ0FocK4B98xD81HFT6lq aCBgZXSbHZCYsyfHIZ9q9Wx3Xdz8zyBn+3Xo78mUOD84TVzI6FlEv4NtrNkqKvM= X-Google-Smtp-Source: AGHT+IGUXX38ngAgFBU9g5ftsv0v3wX1md0ddntOcMXEwIjckPzTkUV4dhM8/Tl6eO113jXCLBDxyA== X-Received: by 2002:a17:906:f35b:b0:a44:19f2:1be1 with SMTP id hg27-20020a170906f35b00b00a4419f21be1mr2557643ejb.5.1709331478484; Fri, 01 Mar 2024 14:17:58 -0800 (PST) Received: from WBEC325.dom.lan ([185.188.71.122]) by smtp.gmail.com with ESMTPSA id g16-20020a17090613d000b00a3f480154a3sm2091122ejc.65.2024.03.01.14.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 14:17:58 -0800 (PST) From: Pawel Dembicki To: netdev@vger.kernel.org Cc: Linus Walleij , Simon Horman , Vladimir Oltean , Pawel Dembicki , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Claudiu Manoil , Alexandre Belloni , UNGLinuxDriver@microchip.com, Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v6 08/16] net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv() Date: Fri, 1 Mar 2024 23:16:30 +0100 Message-Id: <20240301221641.159542-9-paweldembicki@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301221641.159542-1-paweldembicki@gmail.com> References: <20240301221641.159542-1-paweldembicki@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Vladimir Oltean In both sja1105_rcv() and sja1110_rcv(), we may have precise source port information coming from parallel hardware mechanisms, in addition to the tag_8021q header. Only sja1105_rcv() has extra logic to not overwrite that precise info with what's present in the VLAN tag. This is because sja1110_rcv() gets by, by having a reversed set of checks when assigning skb->dev. When the source port is imprecise (vbid >=1), source_port and switch_id will be set to zeroes by dsa_8021q_rcv(), which might be problematic. But by checking for vbid >= 1 first, sja1110_rcv() fends that off. We would like to make more code common between sja1105_rcv() and sja1110_rcv(), and for that, we need to make sure that sja1110_rcv() also goes through the precise source port preservation logic. Signed-off-by: Vladimir Oltean Signed-off-by: Pawel Dembicki --- v6: - resend only v5: - add missing SoB v4: - introduced patch net/dsa/tag_8021q.c | 32 +++++++++++++++++++++++++++++--- net/dsa/tag_sja1105.c | 23 +++-------------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c index 71b26ae6db39..3cb0293793a5 100644 --- a/net/dsa/tag_8021q.c +++ b/net/dsa/tag_8021q.c @@ -497,9 +497,21 @@ struct net_device *dsa_tag_8021q_find_port_by_vbid(struct net_device *conduit, } EXPORT_SYMBOL_GPL(dsa_tag_8021q_find_port_by_vbid); +/** + * dsa_8021q_rcv - Decode source information from tag_8021q header + * @skb: RX socket buffer + * @source_port: pointer to storage for precise source port information. + * If this is known already from outside tag_8021q, the pre-initialized + * value is preserved. If not known, pass -1. + * @switch_id: similar to source_port. + * @vbid: pointer to storage for imprecise bridge ID. Must be pre-initialized + * with -1. If a positive value is returned, the source_port and switch_id + * are invalid. + */ void dsa_8021q_rcv(struct sk_buff *skb, int *source_port, int *switch_id, int *vbid) { + int tmp_source_port, tmp_switch_id, tmp_vbid; u16 vid, tci; if (skb_vlan_tag_present(skb)) { @@ -513,11 +525,25 @@ void dsa_8021q_rcv(struct sk_buff *skb, int *source_port, int *switch_id, vid = tci & VLAN_VID_MASK; - *source_port = dsa_8021q_rx_source_port(vid); - *switch_id = dsa_8021q_rx_switch_id(vid); + tmp_source_port = dsa_8021q_rx_source_port(vid); + tmp_switch_id = dsa_8021q_rx_switch_id(vid); + tmp_vbid = dsa_tag_8021q_rx_vbid(vid); + + /* Precise source port information is unknown when receiving from a + * VLAN-unaware bridging domain, and tmp_source_port and tmp_switch_id + * are zeroes in this case. + * + * Preserve the source information from hardware-specific mechanisms, + * if available. This allows us to not overwrite a valid source port + * and switch ID with less precise values. + */ + if (tmp_vbid == 0 && *source_port == -1) + *source_port = tmp_source_port; + if (tmp_vbid == 0 && *switch_id == -1) + *switch_id = tmp_switch_id; if (vbid) - *vbid = dsa_tag_8021q_rx_vbid(vid); + *vbid = tmp_vbid; skb->priority = (tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT; } diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c index 1aba1d05c27a..48886d4b7e3e 100644 --- a/net/dsa/tag_sja1105.c +++ b/net/dsa/tag_sja1105.c @@ -524,30 +524,13 @@ static struct sk_buff *sja1105_rcv(struct sk_buff *skb, /* Normal data plane traffic and link-local frames are tagged with * a tag_8021q VLAN which we have to strip */ - if (sja1105_skb_has_tag_8021q(skb)) { - int tmp_source_port = -1, tmp_switch_id = -1; - - sja1105_vlan_rcv(skb, &tmp_source_port, &tmp_switch_id, &vbid, - &vid); - /* Preserve the source information from the INCL_SRCPT option, - * if available. This allows us to not overwrite a valid source - * port and switch ID with zeroes when receiving link-local - * frames from a VLAN-unaware bridged port (non-zero vbid) or a - * VLAN-aware bridged port (non-zero vid). Furthermore, the - * tag_8021q source port information is only of trust when the - * vbid is 0 (precise port). Otherwise, tmp_source_port and - * tmp_switch_id will be zeroes. - */ - if (vbid == 0 && source_port == -1) - source_port = tmp_source_port; - if (vbid == 0 && switch_id == -1) - switch_id = tmp_switch_id; - } else if (source_port == -1 && switch_id == -1) { + if (sja1105_skb_has_tag_8021q(skb)) + sja1105_vlan_rcv(skb, &source_port, &switch_id, &vbid, &vid); + else if (source_port == -1 && switch_id == -1) /* Packets with no source information have no chance of * getting accepted, drop them straight away. */ return NULL; - } if (source_port != -1 && switch_id != -1) skb->dev = dsa_conduit_find_user(netdev, switch_id, source_port);