From patchwork Mon Jan 11 09:46:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eran Ben Elisha X-Patchwork-Id: 12010167 X-Patchwork-Delegate: kuba@kernel.org 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 7D9B2C433E0 for ; Mon, 11 Jan 2021 09:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 344DF22AAB for ; Mon, 11 Jan 2021 09:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728692AbhAKJs0 (ORCPT ); Mon, 11 Jan 2021 04:48:26 -0500 Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:1928 "EHLO hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728679AbhAKJs0 (ORCPT ); Mon, 11 Jan 2021 04:48:26 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Mon, 11 Jan 2021 01:47:44 -0800 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 11 Jan 2021 09:47:42 +0000 Received: from vdi.nvidia.com (172.20.145.6) by mail.nvidia.com (172.20.187.13) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Mon, 11 Jan 2021 09:47:40 +0000 From: Eran Ben Elisha To: "David S. Miller" , Jakub Kicinski CC: , Tariq Toukan , Cong Wang , Eric Dumazet , Jiri Pirko , Vladimir Oltean , Jakub Sitnicki , Guillaume Nault , Eran Ben Elisha Subject: [PATCH net-next v2 1/2] net: vlan: Add parse protocol header ops Date: Mon, 11 Jan 2021 11:46:51 +0200 Message-ID: <1610358412-25248-2-git-send-email-eranbe@nvidia.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1610358412-25248-1-git-send-email-eranbe@nvidia.com> References: <1610358412-25248-1-git-send-email-eranbe@nvidia.com> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1610358464; bh=tCYjgofZgw0uArsqzR5z4wwhD1tZyn0bJ13TuqGapCw=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type; b=X9gqZN2Wg0D5DZJ8ar1Cf3iIFnWjzrdGz0soxJf6b3bKjvIxC+iGKJniKqZAgVzCZ kt/9imEuP3o0/PPlSZIRbPB0MPJGQagVE7F+CTawgWsEkiIalkTxEKMO0oWKL7a0a9 zOdgXq3Z3wQxISgQr5C79ROzBODIfbn57cZQkpxJVpVf+k89bc/MhILujzmi/nlf5x MHM2uym0OMdbuVgEojuWm+c/0wl7u+LZY++6d6AybSpJ76KF1RZNOpYNY82IwBJ8n8 NIXOawhF2PgDUdCcKWlH9oXSOikre+7HYMRD9pKJIMd9pJSzOitJitLgNutEBBNYvE EtZHSI8ujiIXA== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Add parse protocol header ops for vlan device. Before this patch, vlan tagged packet transmitted by af_packet had skb->protocol unset. Some kernel methods (like __skb_flow_dissect()) rely on this missing information for its packet processing. Signed-off-by: Eran Ben Elisha Reviewed-by: Tariq Toukan --- net/8021q/vlan_dev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index ec8408d1638f..dc1a197792e6 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -510,9 +510,17 @@ static void vlan_dev_set_lockdep_class(struct net_device *dev) netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, NULL); } +static __be16 vlan_parse_protocol(const struct sk_buff *skb) +{ + struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); + + return __vlan_get_protocol(skb, veth->h_vlan_proto, NULL); +} + static const struct header_ops vlan_header_ops = { .create = vlan_dev_hard_header, .parse = eth_header_parse, + .parse_protocol = vlan_parse_protocol, }; static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev, @@ -532,6 +540,7 @@ static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev static const struct header_ops vlan_passthru_header_ops = { .create = vlan_passthru_hard_header, .parse = eth_header_parse, + .parse_protocol = vlan_parse_protocol, }; static struct device_type vlan_type = { From patchwork Mon Jan 11 09:46:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eran Ben Elisha X-Patchwork-Id: 12010171 X-Patchwork-Delegate: kuba@kernel.org 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 D2CDAC433DB for ; Mon, 11 Jan 2021 09:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 867EA22AB9 for ; Mon, 11 Jan 2021 09:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728700AbhAKJs3 (ORCPT ); Mon, 11 Jan 2021 04:48:29 -0500 Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:1948 "EHLO hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728679AbhAKJs3 (ORCPT ); Mon, 11 Jan 2021 04:48:29 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Mon, 11 Jan 2021 01:47:48 -0800 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 11 Jan 2021 09:47:46 +0000 Received: from vdi.nvidia.com (172.20.145.6) by mail.nvidia.com (172.20.187.13) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Mon, 11 Jan 2021 09:47:43 +0000 From: Eran Ben Elisha To: "David S. Miller" , Jakub Kicinski CC: , Tariq Toukan , Cong Wang , Eric Dumazet , Jiri Pirko , Vladimir Oltean , Jakub Sitnicki , Guillaume Nault , Eran Ben Elisha Subject: [PATCH net-next v2 2/2] net: flow_dissector: Parse PTP L2 packet header Date: Mon, 11 Jan 2021 11:46:52 +0200 Message-ID: <1610358412-25248-3-git-send-email-eranbe@nvidia.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1610358412-25248-1-git-send-email-eranbe@nvidia.com> References: <1610358412-25248-1-git-send-email-eranbe@nvidia.com> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1610358468; bh=lObJbASHXKKjOEQYPTDuANV7rlY0GCChQO5bCNMDWcI=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type; b=RNmamHkbvJaZvpZ74dIBfhd8pa5qtzGIwssvpxvKJIG0AHrDmX9zXidudDH4DNygS PT1GdJbcUQKgOeCRxoG79c+PGsffiS7dltWwpfRk3Uvt/n7y5hpdQlXMTR+A6jtT5b hnboVPyxcY4WnpuVXMsfkApuWa5g98oRk1BVvIl6EUFWhO0RVhwnwq8hWI4VnfsDlX VM6jo6pPk+28YDYUviHg5Cyx9bTCN9PKGvfhQaPsZP/iVRohuErgLkb4DrObrGGDlx 4UW1d2g0LYe1fiz5q7EeP5VgclchIOchFo6lbvfwF51BnofHrasRENsGnF4Yc2J0Sz OqoyyAukE2ciQ== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Add support for parsing PTP L2 packet header. Such packet consists of an L2 header (with ethertype of ETH_P_1588), PTP header, body and an optional suffix. Signed-off-by: Eran Ben Elisha Reviewed-by: Tariq Toukan --- net/core/flow_dissector.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 6f1adba6695f..fcaa223c7cdc 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -1251,6 +1252,21 @@ bool __skb_flow_dissect(const struct net *net, &proto, &nhoff, hlen, flags); break; + case htons(ETH_P_1588): { + struct ptp_header *hdr, _hdr; + + hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data, + hlen, &_hdr); + if (!hdr || (hlen - nhoff) < sizeof(_hdr)) { + fdret = FLOW_DISSECT_RET_OUT_BAD; + break; + } + + nhoff += ntohs(hdr->message_length); + fdret = FLOW_DISSECT_RET_OUT_GOOD; + break; + } + default: fdret = FLOW_DISSECT_RET_OUT_BAD; break;