From patchwork Fri Apr 7 09:14:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Lei X-Patchwork-Id: 23315 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 E79D1376F; Fri, 7 Apr 2017 11:14:31 +0200 (CEST) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by dpdk.org (Postfix) with ESMTP id BB56E374C for ; Fri, 7 Apr 2017 11:14:29 +0200 (CEST) Received: by mail-pg0-f68.google.com with SMTP id o123so14254591pga.1 for ; Fri, 07 Apr 2017 02:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Imv3tnjFgEq/kmnmShEiTOciLKWjNhaa4VabdVljHto=; b=CZIeFXu+M0e8O3kX4XdpbNZWXgFxNn3sgyQzmUF1xLVz0JivNZGfHJWYFZMVZib18p yjnPsUsUkoRC0EtU+S0BHZyhY+61BXo8AnbrSr4adfGN3xvDxnhTZC7H9Heg80V47GJb tXgMtj3bGzQVmsZyZdJEEwEerX6dDm3oupMHC2j5mhnhLD+FJtaFDt+I3amazL8/GB0j zuZWG7UL8Qxr7gXAQ66BGRBPPWTW+gz/QaC52ayBdI+kznMhd64fssEfoVGWvNsp971/ bkBiPCdyt4WxDvosCQSB3juto/8FMa47+wMUSH7bRs5LBN1Uvc5fdMaEQWb9NgzHVq2A HfMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Imv3tnjFgEq/kmnmShEiTOciLKWjNhaa4VabdVljHto=; b=HqeFx5Y0NPHjEMwd1zGuBwRngG6/QUzXBHTrBiE21kd727d6fjtPLAM0R5gvcGyalK nImkL7acA3TK9bbl7TEolt8Lk/6B7sEiHd4aZ/WnDPBYApSy3oGk1HSUrGQv6/+nq9TF wOvAz4jrJrlxR4aLch/0QXMmccnZp49LC6Et/Ggbs5VDqpacclVEFclWWvYm9/7Qjf1S 7ndZGEjIGHWSw9U0TOaMTPuO+fOeMkPUx3YlRSADHqpwnMcBURlF43FFEYXLzx1/3INX ML7XoWAb46vHg2b1B3tzE0lN7h1Hq3lOJR7JdJy1kPvej9FNDt8A/z+nUJNK65oNswik LT6A== X-Gm-Message-State: AFeK/H2LKShACshM7SSKrCFg1BRxBHHO7xlUaRaLodlpITnSL+Lq1gzbzdmiOmjZiBjD6L7jaJ3PyiQ46RW4/Q== X-Received: by 10.84.254.74 with SMTP id a10mr8634476pln.185.1491556468808; Fri, 07 Apr 2017 02:14:28 -0700 (PDT) MIME-Version: 1.0 Received: by 10.100.169.198 with HTTP; Fri, 7 Apr 2017 02:14:28 -0700 (PDT) From: Zhang Lei Date: Fri, 7 Apr 2017 17:14:28 +0800 Message-ID: To: dev@dpdk.org 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" 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(+) -- 1.9.1 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: