From patchwork Sat Oct 31 00:49:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xie He X-Patchwork-Id: 315935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00D3DC388F9 for ; Sat, 31 Oct 2020 00:49:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B3F4822267 for ; Sat, 31 Oct 2020 00:49:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BKu1c5cI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726160AbgJaAtc (ORCPT ); Fri, 30 Oct 2020 20:49:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725536AbgJaAt3 (ORCPT ); Fri, 30 Oct 2020 20:49:29 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B94DBC0613D5; Fri, 30 Oct 2020 17:49:29 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id r10so6544032pgb.10; Fri, 30 Oct 2020 17:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8h2JMek6rlGihOwl8Mu+I5wUSstGoce0/ReWhGN5UM8=; b=BKu1c5cIW9EuvKvwr5Y/rbF/W2POVUViwHkgxC7Eq4wZTPuR8IslzkcQZ2ngJbxRK3 V9Hds6Wb8nQXeXTdzVfz8QiFErbJVB54Io9r+nqJAKwApNcLstzNLqoS0LVfCAuLXK1j MHQEYtkYfvP152BygLQ+uDSucAv8Sl9zGSINtWQTs0sZ1ZlibE4drMnNd8wZvucfEokZ iZ/YwkLG7j5cRY4suoHK/k6EmI7shg1H7wPDI9FY3YLVhQh0JpF67K0Ms2kmZedt4CQg EJDYhvAZa/PlJMTp3tmxSlo0V5q5cxpbF50r+rr/ZGaJWmQzgcB/n05ZpY8WEU5QvG10 o1GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8h2JMek6rlGihOwl8Mu+I5wUSstGoce0/ReWhGN5UM8=; b=Vy0mkDl49AxVHyY/Si+RPu6c8NMcoA73DRGFKLcULIwbCE+5qFgCGOP9M4Tf/2MhfT sGxcdC6gNE9ojsbbh27uMeUxp5Pb17Gn0zbqIh+MByCoBiUW0NS65eflHp7+LuIs/53c x9jDDgzBdG9RNwrE8t3XgC0FvBdiC3nSZGod00GVjOVEeJ1qxHztigujc0nTO6WdaIgX gbFMVxJXhyCM0CUUxVUw9LNTt5pbNQQ10h4BbBGLds5pBgKIrm6SIm9h0pUVmS94ejzw fx3zHOXxq+mPrAtZnqL3a4Qs3aik2T/3l/jVw132RejzlOdvV4MbMjMZhsGjeTT9lWmg Dwjg== X-Gm-Message-State: AOAM533FSPBpUdR9H2lJ/DXsG5iSfLMk+b+f1jVqgWh4GC7eWRavYnPW T51QJYt1w3lGvZZmcYKJ2mE= X-Google-Smtp-Source: ABdhPJxtM1hB9X3ucPtskYDOfBDugcsbkk8yPwdJYh9ftsBXJ4AGP+RUfmc95q2CLRpv9f4Oe/q9uw== X-Received: by 2002:a63:af4c:: with SMTP id s12mr4142660pgo.395.1604105369309; Fri, 30 Oct 2020 17:49:29 -0700 (PDT) Received: from shane-XPS-13-9380.hsd1.ca.comcast.net ([2601:646:8800:1c00:48fd:1408:262f:a64b]) by smtp.gmail.com with ESMTPSA id w10sm4466634pjy.57.2020.10.30.17.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 17:49:28 -0700 (PDT) From: Xie He To: Jakub Kicinski , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Willem de Bruijn , Krzysztof Halasa Cc: Xie He Subject: [PATCH net-next v6 2/5] net: hdlc_fr: Change the use of "dev" in fr_rx to make the code cleaner Date: Fri, 30 Oct 2020 17:49:15 -0700 Message-Id: <20201031004918.463475-3-xie.he.0141@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201031004918.463475-1-xie.he.0141@gmail.com> References: <20201031004918.463475-1-xie.he.0141@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The eth_type_trans function is called when we receive frames carrying Ethernet frames. This function expects a non-NULL pointer as an argument, and assigns it directly to skb->dev. However, the code handling other types of frames first assigns the pointer to "dev", and then at the end checks whether the value is NULL, and if it is not NULL, assigns it to skb->dev. The two flows are different. Mixing them in this function makes the code messy. It's better that we convert the second flow to align with how eth_type_trans does things. So this patch changes the code to: first make sure the pointer is not NULL, then assign it directly to skb->dev. "dev" is no longer needed until the end where we use it to update stats. Cc: Willem de Bruijn Cc: Krzysztof Halasa Signed-off-by: Xie He --- drivers/net/wan/hdlc_fr.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index 4db0e01b96a9..71ee9b60d91b 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c @@ -880,7 +880,7 @@ static int fr_rx(struct sk_buff *skb) u8 *data = skb->data; u16 dlci; struct pvc_device *pvc; - struct net_device *dev = NULL; + struct net_device *dev; if (skb->len <= 4 || fh->ea1 || data[2] != FR_UI) goto rx_error; @@ -930,13 +930,17 @@ static int fr_rx(struct sk_buff *skb) } if (data[3] == NLPID_IP) { + if (!pvc->main) + goto rx_drop; skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */ - dev = pvc->main; + skb->dev = pvc->main; skb->protocol = htons(ETH_P_IP); } else if (data[3] == NLPID_IPV6) { + if (!pvc->main) + goto rx_drop; skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */ - dev = pvc->main; + skb->dev = pvc->main; skb->protocol = htons(ETH_P_IPV6); } else if (skb->len > 10 && data[3] == FR_PAD && @@ -950,13 +954,16 @@ static int fr_rx(struct sk_buff *skb) case ETH_P_IPX: case ETH_P_IP: /* a long variant */ case ETH_P_IPV6: - dev = pvc->main; + if (!pvc->main) + goto rx_drop; + skb->dev = pvc->main; skb->protocol = htons(pid); break; case 0x80C20007: /* bridged Ethernet frame */ - if ((dev = pvc->ether) != NULL) - skb->protocol = eth_type_trans(skb, dev); + if (!pvc->ether) + goto rx_drop; + skb->protocol = eth_type_trans(skb, pvc->ether); break; default: @@ -970,17 +977,13 @@ static int fr_rx(struct sk_buff *skb) goto rx_drop; } - if (dev) { - dev->stats.rx_packets++; /* PVC traffic */ - dev->stats.rx_bytes += skb->len; - if (pvc->state.becn) - dev->stats.rx_compressed++; - skb->dev = dev; - netif_rx(skb); - return NET_RX_SUCCESS; - } else { - goto rx_drop; - } + dev = skb->dev; + dev->stats.rx_packets++; /* PVC traffic */ + dev->stats.rx_bytes += skb->len; + if (pvc->state.becn) + dev->stats.rx_compressed++; + netif_rx(skb); + return NET_RX_SUCCESS; rx_error: frad->stats.rx_errors++; /* Mark error */ From patchwork Sat Oct 31 00:49:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xie He X-Patchwork-Id: 315934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2B2FC00A89 for ; Sat, 31 Oct 2020 00:49:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5167022259 for ; Sat, 31 Oct 2020 00:49:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JECAtufr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726234AbgJaAth (ORCPT ); Fri, 30 Oct 2020 20:49:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726159AbgJaAtc (ORCPT ); Fri, 30 Oct 2020 20:49:32 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37133C0613D5; Fri, 30 Oct 2020 17:49:32 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id i7so4625175pgh.6; Fri, 30 Oct 2020 17:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JN/b5liJNkCYHBYSnEufh73PPTqkvt+38op/HGk1BXE=; b=JECAtufreVaCdx9L/TIcWPLKWw4PhHbLCNcVhNZqm6f3LNten2zwoD5qw0//F1tOxd 3SJjxm9Vv9/QWYUcBuedZ05Y6WonPyBN70oF5phSbD2IqI+tYTQtnvvpSrNPTwQgNKmP Ciqz9Yaugf9qknrthU2urDmZrqBToQJt7pR/OPIlJzxtVULs3jN7aQLL1dEins16jq9I ZFPN1q2L5SksUr/yzo5qpFFytvU9kLSdR0eF5uNAu0G2zVMwQU9FmNiaoudBHUYBcfTv 35bGZw6lTA2Y7DqKLvFcKz+uEQCergT/C0Lj0lCzc5KAb9LdB6CSfMVtH/ZNJZNotq4m uWmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JN/b5liJNkCYHBYSnEufh73PPTqkvt+38op/HGk1BXE=; b=eQ6JyTEdYlbSDAshmH7zQPR3FJvCENy5Atkt0s+vtmhiq/mfutlkSsjsHU9MDSRlp3 608KaKtkfKGJ78ErSpNMEya9DMG1LW418odVTozpNMEou3Otcj9Qe+nVgMlaWWiFOiiw RtN0dN47spw/LMjCNfAWZBoD0/o+Joqn6yfmv5wEbX26h+4IGr1ADqiCahuOJxAnDK2r pmnPqg8zIZzpP9cUqVQRSn5+J3aN2iq64EDlIMiUARaalckQKOS0oFqVaRResSbSLWwg ZVT2Lt2Giix5+xwvgSBJHE4zpYDZk56n0UvwvVs7Kqd8OGRy8kAPAt4M7M443/tgR1iM YG+g== X-Gm-Message-State: AOAM531ha537ViiDQq3h/qtsbAuHom8Oy75bQwMEiuOz4UVOt08li0tb tNf20C2xBsOyo8mUkAtKWZI= X-Google-Smtp-Source: ABdhPJwS44rbr0Vdyyxty1C2KpckuYhFDd+jQv/Jpq53RqOzuzBLOqgwlQIui5cnBrizx8HZ6qpe9A== X-Received: by 2002:a63:cd48:: with SMTP id a8mr4045216pgj.83.1604105371879; Fri, 30 Oct 2020 17:49:31 -0700 (PDT) Received: from shane-XPS-13-9380.hsd1.ca.comcast.net ([2601:646:8800:1c00:48fd:1408:262f:a64b]) by smtp.gmail.com with ESMTPSA id w10sm4466634pjy.57.2020.10.30.17.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 17:49:31 -0700 (PDT) From: Xie He To: Jakub Kicinski , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Willem de Bruijn , Krzysztof Halasa Cc: Xie He , Willem de Bruijn Subject: [PATCH net-next v6 3/5] net: hdlc_fr: Do skb_reset_mac_header for skbs received on normal PVC devices Date: Fri, 30 Oct 2020 17:49:16 -0700 Message-Id: <20201031004918.463475-4-xie.he.0141@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201031004918.463475-1-xie.he.0141@gmail.com> References: <20201031004918.463475-1-xie.he.0141@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When an skb is received on a normal (non-Ethernet-emulating) PVC device, call skb_reset_mac_header before we pass it to upper layers. This is because normal PVC devices don't have header_ops, so any header we have would not be visible to upper layer code when sending, so the header shouldn't be visible to upper layer code when receiving, either. Cc: Willem de Bruijn Cc: Krzysztof Halasa Acked-by: Willem de Bruijn Signed-off-by: Xie He --- drivers/net/wan/hdlc_fr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index 71ee9b60d91b..eb83116aa9df 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c @@ -935,6 +935,7 @@ static int fr_rx(struct sk_buff *skb) skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */ skb->dev = pvc->main; skb->protocol = htons(ETH_P_IP); + skb_reset_mac_header(skb); } else if (data[3] == NLPID_IPV6) { if (!pvc->main) @@ -942,6 +943,7 @@ static int fr_rx(struct sk_buff *skb) skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */ skb->dev = pvc->main; skb->protocol = htons(ETH_P_IPV6); + skb_reset_mac_header(skb); } else if (skb->len > 10 && data[3] == FR_PAD && data[4] == NLPID_SNAP && data[5] == FR_PAD) { @@ -958,6 +960,7 @@ static int fr_rx(struct sk_buff *skb) goto rx_drop; skb->dev = pvc->main; skb->protocol = htons(pid); + skb_reset_mac_header(skb); break; case 0x80C20007: /* bridged Ethernet frame */