From patchwork Tue Jan 12 19:07:12 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: 362686 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, 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 937DAC433E0 for ; Tue, 12 Jan 2021 19:08:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4560D23107 for ; Tue, 12 Jan 2021 19:08:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392995AbhALTId (ORCPT ); Tue, 12 Jan 2021 14:08:33 -0500 Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:18472 "EHLO hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392985AbhALTId (ORCPT ); Tue, 12 Jan 2021 14:08:33 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Tue, 12 Jan 2021 11:07:52 -0800 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 12 Jan 2021 19:07:37 +0000 Received: from vdi.nvidia.com (172.20.145.6) by mail.nvidia.com (172.20.187.12) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Tue, 12 Jan 2021 19:07:33 +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 , Richard Cochran , Andrew Lunn , Alexei Starovoitov , Ariel Levkovich , Andrii Nakryiko , "Gustavo A. R. Silva" , "Eran Ben Elisha" Subject: [PATCH net-next v4 1/2] net: vlan: Add parse protocol header ops Date: Tue, 12 Jan 2021 21:07:12 +0200 Message-ID: <1610478433-7606-2-git-send-email-eranbe@nvidia.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1610478433-7606-1-git-send-email-eranbe@nvidia.com> References: <1610478433-7606-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=1610478472; bh=tCYjgofZgw0uArsqzR5z4wwhD1tZyn0bJ13TuqGapCw=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type; b=i8lbnWyJs5v6P6/sJKe2c2jstdEEgtbKH3/X4BkBvwbGnqvU4twugYyueJJO6u6F3 S5k7xwqRG24JTJGsvo7GXwMdsLCHbGOyIYbkeRCVuKrr0D17nGg9ZceQOjaUj/0dZF UGISnvUAso90++gwuoIh+43rUzt1XmkQH65b/2mU+ra//hvAJbBTLSZhBm/+TuCpAm XqSckJC232d/6rmdA5SVddA6ziQjDHqIR9w4Ta0CPQ1c6drCa7xV3kW21ZWNHEjeqy h4aLP74SHdj15seqYtZNhts/EF7N3Nvysr4f/Fz5RNLhz9R7CvZqMt19ecPt59dQwp LFwYnlG2vzQgQ== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.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 = {