From patchwork Wed Jun 19 20:52:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Dembicki X-Patchwork-Id: 13704533 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 7E9B015B129; Wed, 19 Jun 2024 20:52:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718830369; cv=none; b=qKXTRq486UdFc8RcO8xG3hbNZo4RVjxjc+ayVvQIrCx8wwovnmyPXOqs1ltj4plQONU/anRjNvsKErqV+0Xs/kFyW0sa43gYf4g1mgFJ08S0Ij7tuJ0TrIxn3eOWb42CIRuUU4eGbkJAqlplIbGuekYW/XXqRNttO07d4CGfz/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718830369; c=relaxed/simple; bh=H2UaBVYKMeKhA5+esZsRC35VrdCF1+q9IHW0ZVSwTHY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TR+KZVSpzHge0aCvh2OICofqhG4zLzcRyZZ/I5zyrrELEyPw04M8NOejBQ6H+VHVwBOBhWvHwpnwfqJ9t4sXQ93f5GNGpBmjoOa9woYYchvi9VJTX9keqbW6dmImNc8sE0GXjQj3enTyTeUSwl0XHXVIO1PZlgupekp/sE9sezI= 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=C7PuqUeo; arc=none smtp.client-ip=209.85.167.41 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="C7PuqUeo" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52c82101407so308622e87.3; Wed, 19 Jun 2024 13:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718830365; x=1719435165; 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=IXFPU0jq+5PzFbwh/gEwZkFD9YGtHtZp0aNonTBr7AQ=; b=C7PuqUeoI3k3EE5AXVVPiekNdF97KZG7snWfQTdVOZkqFtHdt09fOGuyydBt8uYEKG gnp/6Sy5qvbQqXTg3NODDBC2Nz9O8ujunYLcvY7UX33jaoq2WQGVvp9QCFlsgs5/9YJU G/xPX2A4+Ujj/0qwQ058Pp288jwnYb6OcmvShe4mxm4QlSLAz2QWey4Jn5YJHuvQW3yk cXmhjaoxqacrPinirzryPFlG7D86IoUEZRtVH9nAhFv0zIbXybTRAaA29kEy4UiZp3PV 1yjlhaunb6mn7VjnNM60aJo2bQ78wj9WcBeoMejW/V0hVeOqSTu/3HIzTLkF52gpSLbb +ydg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718830365; x=1719435165; 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=IXFPU0jq+5PzFbwh/gEwZkFD9YGtHtZp0aNonTBr7AQ=; b=O88XeHRG21ft3kotxgg++9UbfCHgsv4fEINoJdWBeMvz5MyZXNZZT47yBh4WOhV3Bq RR1s9U8/xMnbXM+BEfhrGMhehcGobz878R2w293OXH8o6gCsKRVyEgxJorxcDjtBwiK9 S1vVz+69zKiFqBbvNEPauDZSfVqxESw8NrDUdpXKQllfk5dHC8+tkhgYbD22prOd4JP/ OQWFwJ24JQzbxhX0WD1A48BZcjiqP8EU9L0KYHz8SNLtksu4ot3yAP645xaf041Vrofk 3usl0+NOjIBqmBHF00udHnNcH9N5KVZJs2UcDA7aKMPGA36idAXDbjeGpVzHHTIUYNwF iMGQ== X-Forwarded-Encrypted: i=1; AJvYcCXJt8iKTBfvfneHtwbcY2T0j2ZOLraIiM8Qsuocz6Zcdpk9FNbS+348fOqllTfQDXOoDH3Bfvdpt9S3QlhwahA45Ew6GHqac5beeK0M X-Gm-Message-State: AOJu0Yz9SnlYS5qLTFjluOshxbPdjBeCTN7oXQaieGir7PZpjcx+qK7h 8WDxIxSTw07bjzhsm+Dj+CQ/8Qne13CuS5dG2KE4mxYF1sMd9zpZgFyX0J/9XNw= X-Google-Smtp-Source: AGHT+IFKtRTE/ocpsANeSYo8nxS3tUxVqCO3dc4z2VXp3e9s1FESDJB3ackzeYWl8pMmHBZ2rF+1uQ== X-Received: by 2002:a05:6512:2351:b0:52c:a20e:4da4 with SMTP id 2adb3069b0e04-52ccaa590d9mr2991578e87.57.1718830365216; Wed, 19 Jun 2024 13:52:45 -0700 (PDT) Received: from WBEC325.dom.lan ([185.188.71.122]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56db5b2fsm697329566b.47.2024.06.19.13.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 13:52:44 -0700 (PDT) From: Pawel Dembicki To: netdev@vger.kernel.org Cc: Paolo Abeni , Vladimir Oltean , Pawel Dembicki , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Claudiu Manoil , Alexandre Belloni , UNGLinuxDriver@microchip.com, Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 03/12] net: dsa: tag_sja1105: absorb logic for not overwriting precise info into dsa_8021q_rcv() Date: Wed, 19 Jun 2024 22:52:09 +0200 Message-Id: <20240619205220.965844-4-paweldembicki@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240619205220.965844-1-paweldembicki@gmail.com> References: <20240619205220.965844-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 Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- v2,v1: - resend only --- Before patch series split: https://patchwork.kernel.org/project/netdevbpf/list/?series=841034&state=%2A&archive=both v8, v7, 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);