From patchwork Fri Apr 7 09:59:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Lei X-Patchwork-Id: 23316 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 4E5045398; Fri, 7 Apr 2017 12:00:04 +0200 (CEST) Received: from mail-oi0-f67.google.com (mail-oi0-f67.google.com [209.85.218.67]) by dpdk.org (Postfix) with ESMTP id 1D3562BAE for ; Fri, 7 Apr 2017 12:00:02 +0200 (CEST) Received: by mail-oi0-f67.google.com with SMTP id b187so11271667oif.3 for ; Fri, 07 Apr 2017 03:00:01 -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; bh=PXEVBHhuiJp/97KuSt0zy+dwwNKDCl8C1ek7hSbGseQ=; b=m0m6vMG7kExLaCyEDsD/VrCKiQqGQqwqgI4L65Blvv2t3cpCw7Hk4Pk/KPw2f2+jY5 cvHShKGqTbbLTsxg8JHuTE6RfJLpSw8UQYplXBNdh0TI+0iy3zB4U66SuHdefq/+vSmx EEj/J1pgg2trKs189RzAr1V/mCWDYVjVyPZrEQOmbpNG0bIl4BFl5eYHlAf5Ezo16ZSr QF2UsaTQMwKMxdmpDlw1Yrs3uFAikYK+jbA//1j+yNkGcHOKkwqSk6b2nrHJg1iKTnlO +gNe+wS0V+CE0zDQN01UiSB1k/XLPOnpWLt8iBPWQK+SujQA8M/38L8YyLX3kcZpy9jh EksA== 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; bh=PXEVBHhuiJp/97KuSt0zy+dwwNKDCl8C1ek7hSbGseQ=; b=eV4d+9dnPgN7FvgeDQsXcrl8yJUcslgFuyLm6fmgEUA+RhkqD/cKF1AEuJqHCYLqgW i4mppvbwgw70GAZ1W1E/qwKGYmWu5mNtuwTEdQoYVQvJyTzpQKV2AfcTcBBKqQh5CNRD oE4pREMDWFNqLceIVpxO+4QyvvZ/zpHVLj6OhUqPgNYlZcYVfvFagJaB02fnR0Co8ntG nNO45tOll7sHLVoOJ+L0YhcWUkF7GLywDbbvkM9LGNubeDYhD4DXH+GT7jR4TPhLDqk3 Kahdxh02dY/QsQDXaH31cvQU1ML6TqgeaeL6j2I8XWrnOa7USfnlOaykUQBhoTiJ+AEs 6bWg== X-Gm-Message-State: AFeK/H0GqAxL0dBXApvQvcipR9l8u6AOvz6daK5eBzN4V965Iv5CcR3l88YvcJf6MCdQAA== X-Received: by 10.157.26.28 with SMTP id a28mr19207446ote.107.1491559201121; Fri, 07 Apr 2017 03:00:01 -0700 (PDT) Received: from host-1.skytap.example ([184.170.234.51]) by smtp.gmail.com with ESMTPSA id s67sm1923340ois.11.2017.04.07.03.00.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 03:00:00 -0700 (PDT) From: skytap X-Google-Original-From: skytap To: dev@dpdk.org Cc: Ray Zhang Date: Fri, 7 Apr 2017 02:59:57 -0700 Message-Id: <1491559197-3307-1-git-send-email-skytap@host-1.skytap.example> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH] net: support PPPOE in software packet type parser X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Ray Zhang Add a new RTE_PTYPE_L2_ETHER_PPPOE and its support in rte_net_get_ptype() Signed-off-by: Ray Zhang --- lib/librte_mbuf/rte_mbuf_ptype.h | 7 +++++++ lib/librte_net/rte_ether.h | 12 ++++++++++++ lib/librte_net/rte_net.c | 19 +++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/librte_mbuf/rte_mbuf_ptype.h index ff6de9d..7dd03de 100644 --- a/lib/librte_mbuf/rte_mbuf_ptype.h +++ b/lib/librte_mbuf/rte_mbuf_ptype.h @@ -150,6 +150,13 @@ */ #define RTE_PTYPE_L2_ETHER_QINQ 0x00000007 /** + * PPPOE packet type. + * + * Packet format: + * <'ether type'=[0x8864]> + */ +#define RTE_PTYPE_L2_ETHER_PPPOE 0x00000008 +/** * Mask of layer 2 packet types. * It is used for outer packet for tunneling cases. */ diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index ff3d065..d76edb3 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -323,12 +323,24 @@ struct vxlan_hdr { uint32_t vx_vni; /**< VNI (24) + Reserved (8). */ } __attribute__((__packed__)); +/** + * PPPOE protocol header + */ +struct pppoe_hdr { + uint8_t type_ver; + uint8_t code; + uint16_t sid; + uint16_t length; + uint16_t proto; +} __attribute__((packed)); + /* Ethernet frame types */ #define ETHER_TYPE_IPv4 0x0800 /**< IPv4 Protocol. */ #define ETHER_TYPE_IPv6 0x86DD /**< IPv6 Protocol. */ #define ETHER_TYPE_ARP 0x0806 /**< Arp Protocol. */ #define ETHER_TYPE_RARP 0x8035 /**< Reverse Arp Protocol. */ #define ETHER_TYPE_VLAN 0x8100 /**< IEEE 802.1Q VLAN tagging. */ +#define ETHER_TYPE_PPPOE 0x8864 /**< PPPoE Protocol */ #define ETHER_TYPE_QINQ 0x88A8 /**< IEEE 802.1ad QinQ tagging. */ #define ETHER_TYPE_1588 0x88F7 /**< IEEE 802.1AS 1588 Precise Time Protocol. */ #define ETHER_TYPE_SLOW 0x8809 /**< Slow protocols (LACP and Marker). */ diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c index a8c7aff..439c2f6 100644 --- a/lib/librte_net/rte_net.c +++ b/lib/librte_net/rte_net.c @@ -302,6 +302,25 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, off += 2 * sizeof(*vh); hdr_lens->l2_len += 2 * sizeof(*vh); proto = vh->eth_proto; + } else if (proto == rte_cpu_to_be_16(ETHER_TYPE_PPPOE)) { + const struct pppoe_hdr *ph; + struct pppoe_hdr ph_copy; + + pkt_type = RTE_PTYPE_L2_ETHER_PPPOE; + ph = rte_pktmbuf_read(m, off, sizeof(*ph), &ph_copy); + if (unlikely(ph == NULL)) + return pkt_type; + + off += sizeof(*ph); + hdr_lens->l2_len += sizeof(*ph); + if (ph->code != 0) /* Not Seesion Data */ + return pkt_type; + if (ph->proto == rte_cpu_to_be_16(0x21)) + proto = rte_cpu_to_be_16(ETHER_TYPE_IPv4); + else if (ph->proto == rte_cpu_to_be_16(0x57)) + proto = rte_cpu_to_be_16(ETHER_TYPE_IPv6); + else + return pkt_type; } l3: