From patchwork Thu Sep 28 23:52:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 819783 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="aptUoPOu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y3BMc1xbtz9sP1 for ; Fri, 29 Sep 2017 09:53:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916AbdI1Xw5 (ORCPT ); Thu, 28 Sep 2017 19:52:57 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:51354 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751880AbdI1Xw4 (ORCPT ); Thu, 28 Sep 2017 19:52:56 -0400 Received: by mail-pf0-f169.google.com with SMTP id b70so1627051pfl.8 for ; Thu, 28 Sep 2017 16:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r7jsxPT7lfI/P2klXaJnLAkSAYXNGIO/Irljg0FscDY=; b=aptUoPOurgDiFAXAV5D0/Z8p6t1xkdRqDf8sR1AqidngUA1rcCVuaLFypobAT5K/aM URQ6URAxH5EcBG70mEY3CnunHohkPdyrfEvM70ayYHH2dC9ndEJU0Jb8/CkV1if3tKPb 80e0yKxd2WdX99FQez4nb0IFADQL7ZqO6DsM1fKjG+5xqV0KCkepHvbJhcUACwN62hSJ CsuXYNomj1AcA/id57zx7/UQjd1UcfhBXsyfXzUjjY8FEp0cogLC0J9zbw2BkXwE29dm SMMuu5KR+v36nEj7tQrjz9f9coCLZtaLrtCIT8YsuxPe3ADJQDOmRkKB6fy4k7k7wJb3 idYA== 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; bh=r7jsxPT7lfI/P2klXaJnLAkSAYXNGIO/Irljg0FscDY=; b=LwTvqHEI4Z/knYgl4pBdh9kDRu44WVf3yCMr2lAC5wVjujWBXJ39qrcfNoZ14iLkX6 8a+AZLdPZ9noLCOK7EuSbcdxcEw+/5b2LjLnbRD/EPMEhvDvgh9kdWg8sflSLrYuMby7 4YWWoVjl9ZjRczCimLXTDyA0Phr8wKTjT1TI0E4TDMeACui43VSxm1dscGtCCwWV4fcq nQMIYe+456RJ6xl2Cb2Y/bumMQYxDDYaH8T372P/8A5uDMl0sZ1gZKl/LSJ9UqJ2jVMb 4ryq8wzre2y/h8rWnwj2yoTctotbTN9Ujllj2XDTZslXto+7NWqNZM0BvwOkBoCKqFlX +Vmg== X-Gm-Message-State: AHPjjUjZbfwF7+Dq3Acb4NcNvknuJ346zdmgja0HRJv7eqSuNXpo4004 Z3dijl24pUoxz5rpsVGttWa9bw== X-Google-Smtp-Source: AOwi7QDDxZVg0VF7O4ntMidhJmwhQVrY1fNuFTmZDdnEiTevPM10ebzlRRXR+yshIiUKcrNdxPCaSA== X-Received: by 10.101.68.65 with SMTP id e1mr5768839pgq.134.1506642775979; Thu, 28 Sep 2017 16:52:55 -0700 (PDT) Received: from localhost.localdomain (67-207-98-108.static.wiline.com. [67.207.98.108]) by smtp.gmail.com with ESMTPSA id k67sm3874023pga.46.2017.09.28.16.52.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Sep 2017 16:52:54 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, rohit@quantonium.net, Tom Herbert Subject: [PATCH v4 net-next 2/8] flow_dissector: Move ETH_P_TEB processing to main switch Date: Thu, 28 Sep 2017 16:52:24 -0700 Message-Id: <20170928235230.22158-3-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170928235230.22158-1-tom@quantonium.net> References: <20170928235230.22158-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Support for processing TEB is currently in GRE flow dissection as a special case. This can be moved to be a case the main proto switch in __skb_flow_dissect. Signed-off-by: Tom Herbert --- net/core/flow_dissector.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 76f5e5bc3177..c15b41f96cbe 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -282,27 +282,8 @@ __skb_flow_dissect_gre(const struct sk_buff *skb, if (hdr->flags & GRE_SEQ) offset += sizeof(((struct pptp_gre_header *) 0)->seq); - if (gre_ver == 0) { - if (*p_proto == htons(ETH_P_TEB)) { - const struct ethhdr *eth; - struct ethhdr _eth; - - eth = __skb_header_pointer(skb, *p_nhoff + offset, - sizeof(_eth), - data, *p_hlen, &_eth); - if (!eth) - return FLOW_DISSECT_RET_OUT_BAD; - *p_proto = eth->h_proto; - offset += sizeof(*eth); - - /* Cap headers that we access via pointers at the - * end of the Ethernet header as our maximum alignment - * at that point is only 2 bytes. - */ - if (NET_IP_ALIGN) - *p_hlen = *p_nhoff + offset; - } - } else { /* version 1, must be PPTP */ + /* version 1, must be PPTP */ + if (gre_ver == 1) { u8 _ppp_hdr[PPP_HDRLEN]; u8 *ppp_hdr; @@ -595,6 +576,28 @@ bool __skb_flow_dissect(struct sk_buff *skb, break; } + case htons(ETH_P_TEB): { + const struct ethhdr *eth; + struct ethhdr _eth; + + eth = __skb_header_pointer(skb, nhoff, sizeof(_eth), + data, hlen, &_eth); + if (!eth) + goto out_bad; + + proto = eth->h_proto; + nhoff += sizeof(*eth); + + /* Cap headers that we access via pointers at the + * end of the Ethernet header as our maximum alignment + * at that point is only 2 bytes. + */ + if (NET_IP_ALIGN) + hlen = nhoff; + + fdret = FLOW_DISSECT_RET_PROTO_AGAIN; + break; + } case htons(ETH_P_8021AD): case htons(ETH_P_8021Q): { const struct vlan_hdr *vlan;