Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 27 Jun 2023 13:59:07 +0200
From:   Simon Horman <simon.horman@corigine.com>
To:     Vladimir Oltean <olteanv@gmail.com>
Cc:     Vladimir Oltean <vladimir.oltean@nxp.com>, netdev@vger.kernel.org,
        Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net 2/2] net: dsa: tag_sja1105: always prefer source port
 information from INCL_SRCPT
Message-ID: <ZJrPC7dqsGPZ5b1C@corigine.com>
References: <20230626155112.3155993-1-vladimir.oltean@nxp.com>
 <20230626155112.3155993-3-vladimir.oltean@nxp.com>
 <ZJnU6WntVQW2AgvZ@corigine.com>
 <20230626221828.qzjeo6dedjnyme6k@skbuf>
 <ZJrEtw15g3a7nyLN@corigine.com>
 <20230627114148.lpyopy6ttuvvciww@skbuf>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230627114148.lpyopy6ttuvvciww@skbuf>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o1kNs7mLp7hifV6oj8CIULprSJ9Kn+lWYOzGuuvt3IvapxPyTYwxNbKraL/S?=
 =?us-ascii?Q?DijH67IaZqBhjaIVSccDmPPON92HhkTCbs1NIDMhMajFDtFRll7V1242zTWv?=
 =?us-ascii?Q?cJfl+r38bDZ1XbJJ59a95D2UYy1GwbdA33m9YvTkfDzPDOVsXjf4KM3w/1VD?=
 =?us-ascii?Q?gdMXTInu2h1rw1w8ACM5926KFldTg0G576UOHFMIpnp1+k5jm6mcqvwgyRNj?=
 =?us-ascii?Q?uIFVFHTK9ReX2ZB3+XVlyfPkcip2G6AdChsgvdcJErl7ILZP1o8Kis1bRDoN?=
 =?us-ascii?Q?wBscx70gp6SpxCfzstSlBTa20HiK1d0n055lvPXHoOti3NqysdiZ47lpu0DE?=
 =?us-ascii?Q?y6n50ZRdPl3bQTEJT+pO34yxj0u9KTV24OHD5HVYJuIepAvMvbttup30FDRy?=
 =?us-ascii?Q?mNs47qD4/ClQCtdgBNj+PdW3yp7jl8m14Yj6UCEtlaLHHImiLWahMpgU6OMQ?=
 =?us-ascii?Q?0Nn13m+pbJ27B99h8s9nxmqEtszV6FtsW2+iN+D25SH0/5imH/efbYuEFiO5?=
 =?us-ascii?Q?H4ISnhYZJmELp2MjWAcJi77WLrLfTPYfSW1pILs73SjbsUqO0joJzKg5/t7n?=
 =?us-ascii?Q?1JvDLu7wS5XdzT4YxZRbY/XG8q7NmZeP6OMf7hN2pYVZ4l9SyQPC00w5INu0?=
 =?us-ascii?Q?fVhL/evSRL52bhuSwPLGpP1Uzo0M/se1Tr18BzZYnUVxsgRs6VfoRkYNQT6M?=
 =?us-ascii?Q?OjYSnWkDQe9o1c2t0qTz11n11xGA8dwstmO+tkQy8Bpy7T7wX76VlLxvzHbD?=
 =?us-ascii?Q?IcYF2/a/ggFl2yYDRNYDL0D0CMbpNpugWUExNsqfuiCUxr/eZN4bT7rO/6f2?=
 =?us-ascii?Q?h4ctJuu/OYTPko8DsMSK1Rn4j1Sh3E3XTq6S6vREK+WMkCS/1KleGyjxdTWQ?=
 =?us-ascii?Q?ZlcxAg7HTXeOHu8G8i03TJMi3FFEprdTjBol/ZXvd4FIxYWMx6EBS42/tOzs?=
 =?us-ascii?Q?EkAlS08GV0yVxZPaNSVTqy/c1K9biyxZ1oFF0cKrxFLW9vUQpNOE9fEi6Mmj?=
 =?us-ascii?Q?KaM5g5FIfxCIiOYsGuleG5LpSP9cZFtO0BDGTU0agHRzrOeA6ypLNuR+PUpT?=
 =?us-ascii?Q?E8acYYRS99yOwbM2MImsvxXRXpk/Vds+vl161UozUzESqgoee+/Gv/WHWF5M?=
 =?us-ascii?Q?SM+yxRrpob9Z3XA+lKxMcmGNhYTrVgz27Rdzoz8OfNLmCnyR9rzzDc0FUVrx?=
 =?us-ascii?Q?SIRGH9zlAW1u5YIrFtVY7vhHHb9FGznlvZa+sojRk82tlIQBQK5ZC9Wo9cGe?=
 =?us-ascii?Q?lT50KQP7kby2rCTNhBDpl7JOWlgh7siSTRwvGAvSelLVZTK9J8m6LSFztt3D?=
 =?us-ascii?Q?X93rlWNS/y2RP4eO4HpEprnbu5ONS/+z50OiLtZK1/60XSNvztHT1EWNQsG1?=
 =?us-ascii?Q?9gwamozrgjhWeIb3KiHZLm/q+coWrpSKW45xWnnGi4kSBzZG3G2hyZade3PK?=
 =?us-ascii?Q?IBij9zI2I6D/4rAgmGnPOOLe/xhTgrRAPIoDD8x18RfsAmgxEU3ZaomhtIKh?=
 =?us-ascii?Q?jdm4CvREnJQTbQK92CyEMu23aUtdTccaFEol3SBRrz85jqqPe1jn99lXMJSO?=
 =?us-ascii?Q?+Tlzc5lRFh4dtBeGEYodS9bkesBlUFmtow9YoJYVOxUcxqWOzSpWO0f6fIUu?=
 =?us-ascii?Q?xoACjwx4bzZf1OnQwt3R0S15AEu/FFXeADGO6QBQT0Dj2JLaqWEbnm3fQVpM?=
 =?us-ascii?Q?5s0qlA=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 80789c40-5655-4d64-a7a8-08db7705ecc8
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 11:59:13.5256
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: raZVLHQHQxWdiE/2M7FDbvqgAAqA1qzbPU+66F31vRe59pj8bvUBXcqn6Lh7OJdjqxJyCu0f8jd5hLSRdx33XNJCaswniyxFdQk+XqJbLQo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB3824
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Jun 27, 2023 at 02:41:48PM +0300, Vladimir Oltean wrote:
> On Tue, Jun 27, 2023 at 01:15:03PM +0200, Simon Horman wrote:
> > On Tue, Jun 27, 2023 at 01:18:28AM +0300, Vladimir Oltean wrote:
> > > Hi Simon,
> > > 
> > > On Mon, Jun 26, 2023 at 08:11:53PM +0200, Simon Horman wrote:
> > > > Hi Vladimir,
> > > > 
> > > > A similar comment to that made for [1], though the code is somewhat
> > > > different to that case: are you sure vid is initialised here?
> > > > GCC 12 and Smatch seem unsure about it.
> > > > 
> > > > [1] Re: [PATCH net-next v2 4/7] net: dsa: vsc73xx: Add dsa tagging based on 8021q
> > > >     https://lore.kernel.org/all/ZJg2M+Qvg3Fv73CH@corigine.com/
> > > 
> > > "vid" can be uninitialized if the tagger is fed a junk packet (a
> > > non-link-local, non-meta packet that also has no tag_8021q header).
> > > 
> > > The immediate answer that comes to mind is: it depends on how the driver
> > > configures the hardware to send packets to the CPU (and it will never
> > > configure the switch in that way).
> > > 
> > > But, between the sja1105 driver configuring the switch in a certain way
> > > and the tag_sja1105 driver seeing the results of that, there's also the
> > > DSA master driver (can be any net_device) which can alter the packet in
> > > a nonsensical way, like remove the VLAN header for some reason.
> > > 
> > > Considering the fact that the DSA master can have tc rules on its
> > > ingress path which do just that, it would probably be wise to be
> > > defensive about this. So I can probably add:
> > > 
> > > 	if (sja1105_skb_has_tag_8021q(skb)) {
> > > 		... // existing call to sja1105_vlan_rcv() here
> > > 	} 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;
> > > 	}
> > > 
> > > This "else if" block should ensure that when "vid" is uninitialized,
> > > either "source_port" and "switch_id", or "vbid", always have valid values.
> > 
> > This is kind of complex :)
> > 
> > Can I clarify that either:
> > 
> > 1. Both source_port and switch_id are -1; or
> > 2. Neither source_port nor switch_id are -1
> > 
> > If so, I agree with your proposal.
> 
> They are integers assigned from the same code blocks in all cases,
> starting with -1 and later being assigned rvalues either from u64 fields
> limited to 0-255 (meta->source_port, meta->switch_id) or from unsigned
> char fields (hdr->h_dest[3], hdr->h_dest[4]), or from
> dsa_8021q_rx_source_port() and dsa_8021q_rx_switch_id() which return
> limited-size positive integers due to their implementation.

Thanks, in that case I think we are good.