ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add PPPoE Plugin

Browse Source 
Supports 64K PPPoE sessions

This plugin adds three graph nodes:
1) pppoe-input for PPPoE decapsulation
2) pppoe-encap for PPPoE encapsulation
3) pppoe-tap-dispatch for control plane process

Below is the configuration to make PPPoE CP and DP work:
vim /etc/vpp/startup.conf
tuntap {
  enable
  ethernet
  name newtap
}

create pppoe tap tap-if-index 1

//Configure it after a subscriber's PPPoE discovery and PPP link establishment succeeds:
create pppoe session client-ip 100.1.2.1 session-id 1 client-mac 00:11:01:00:00:01

show pppoe fib
show pppoe session

Change-Id: I73e724b6bf7c3e4181a9914c5752da1fa72d7e60
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
This commit is contained in:
Hongjun Ni
2017-07-04 20:11:57 +08:00
committed by Neale Ranns
parent f73d0e2ea6
commit 62f9cdd82c
22 changed files with 3787 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MAINTAINERS
View File

@ -132,6 +132,11 @@ M: Hongjun Ni <hongjun.ni@intel.com>
F: src/plugins/gtpu/
F: src/plugins/gtpu.am
Plugin - PPPoE
M: Hongjun Ni <hongjun.ni@intel.com>
F: src/plugins/pppoe/
F: src/plugins/pppoe.am
Test Infrastructure
M: Klement Sekera <ksekera@cisco.com>
F: test/

1
src/configure.ac
View File

@ -167,6 +167,7 @@ PLUGIN_ENABLED(ioam)
PLUGIN_ENABLED(ixge)
PLUGIN_ENABLED(lb)
PLUGIN_ENABLED(memif)
PLUGIN_ENABLED(pppoe)
PLUGIN_ENABLED(sixrd)
PLUGIN_ENABLED(snat)

4
src/plugins/Makefile.am
View File

@ -66,6 +66,10 @@ if ENABLE_MEMIF_PLUGIN
include memif.am
endif
if ENABLE_PPPOE_PLUGIN
include pppoe.am
endif
if ENABLE_SIXRD_PLUGIN
include sixrd.am
endif

40
src/plugins/pppoe.am Normal file
View File

@ -0,0 +1,40 @@
# Copyright (c) 2017 Intel and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
vppapitestplugins_LTLIBRARIES += pppoe_test_plugin.la
vppplugins_LTLIBRARIES += pppoe_plugin.la
pppoe_plugin_la_SOURCES = \
pppoe/pppoe_decap.c \
pppoe/pppoe_encap.c \
pppoe/pppoe_tap.c \
pppoe/pppoe_tap_node.c \
pppoe/pppoe.c \
pppoe/pppoe_api.c
BUILT_SOURCES += \
pppoe/pppoe.api.h \
pppoe/pppoe.api.json
API_FILES += pppoe/pppoe.api
nobase_apiinclude_HEADERS += \
pppoe/pppoe_all_api_h.h \
pppoe/pppoe_msg_enum.h \
pppoe/pppoe.api.h
pppoe_test_plugin_la_SOURCES = \
pppoe/pppoe_test.c \
pppoe/pppoe_plugin.api.h
# vi:syntax=automake

90
src/plugins/pppoe/pppoe.api Normal file
View File

@ -0,0 +1,90 @@
/*
* Copyright (c) 2017 Intel and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/** \brief Set or delete an PPPOE session
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param is_add - add address if non-zero, else delete
@param is_ipv6 - client_ip and dst_address is ipv6 or not
@param session_id - PPPoE session ID
@param client_ip - PPPOE session's client address.
@param decap_vrf_id - the vrf index for pppoe decaped packet
@param client_mac - the client ethernet address
*/
define pppoe_add_del_session
{
u32 client_index;
u32 context;
u8 is_add;
u8 is_ipv6;
u16 session_id;
u8 client_ip[16];
u32 decap_vrf_id;
u8 client_mac[6];
};
/** \brief reply for set or delete an PPPOE session
@param context - sender context, to match reply w/ request
@param retval - return code
@param sw_if_index - software index of the interface
*/
define pppoe_add_del_session_reply
{
u32 context;
i32 retval;
u32 sw_if_index;
};
/** \brief Dump PPPOE session
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param sw_if_index - software index of the interface
*/
define pppoe_session_dump
{
u32 client_index;
u32 context;
u32 sw_if_index;
};
/** \brief dump details of an PPPOE session
@param context - sender context, to match reply w/ request
@param sw_if_index - software index of the interface
@param is_ipv6 - client_ip and dst_address is ipv6 or not
@param session_id - PPPoE session ID
@param client_ip - PPPOE session's client address.
@param encap_if_index - the index of tx interface for pppoe encaped packet
@param decap_vrf_id - the vrf index for pppoe decaped packet
@param local_mac - the local ethernet address
@param client_mac - the client ethernet address
*/
define pppoe_session_details
{
u32 context;
u32 sw_if_index;
u8 is_ipv6;
u16 session_id;
u8 client_ip[16];
u32 encap_if_index;
u32 decap_vrf_id;
u8 local_mac[6];
u8 client_mac[6];
};
/*
* Local Variables:
* eval: (c-set-style "gnu")
* End:
*/

660
src/plugins/pppoe/pppoe.c Normal file
View File

File diff suppressed because it is too large Load Diff

295
src/plugins/pppoe/pppoe.h Normal file
View File

@ -0,0 +1,295 @@
/*
*------------------------------------------------------------------
* Copyright (c) 2017 Intel and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*------------------------------------------------------------------
*/
#ifndef _PPPOE_H
#define _PPPOE_H
#include <vnet/plugin/plugin.h>
#include <vppinfra/lock.h>
#include <vppinfra/error.h>
#include <vppinfra/hash.h>
#include <vnet/vnet.h>
#include <vnet/ip/ip.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/ip/ip4_packet.h>
#include <vnet/ip/ip6_packet.h>
#include <vnet/dpo/dpo.h>
#include <vnet/adj/adj_types.h>
#include <vnet/fib/fib_table.h>
#include <vlib/vlib.h>
#include <vppinfra/bihash_8_8.h>
typedef struct
{
u8 ver_type;
u8 code;
u16 session_id;
u16 length;
u16 ppp_proto;
} pppoe_header_t;
#define PPPOE_VER_TYPE 0x11
#define PPPOE_PADS 0x65
typedef struct
{
/* Rewrite string */
u8 *rewrite;
/* pppoe session_id in HOST byte order */
u16 session_id;
/* session client addresses */
ip46_address_t client_ip;
/* the index of tx interface for pppoe encaped packet */
u32 encap_if_index;
/** FIB indices - inner IP packet lookup here */
u32 decap_fib_index;
u8 local_mac[6];
u8 client_mac[6];
/* vnet intfc index */
u32 sw_if_index;
u32 hw_if_index;
} pppoe_session_t;
#define foreach_pppoe_input_next \
_(DROP, "error-drop") \
_(IP4_INPUT, "ip4-input") \
_(IP6_INPUT, "ip6-input" ) \
_(CP_INPUT, "pppoe-tap-dispatch" ) \
typedef enum
{
#define _(s,n) PPPOE_INPUT_NEXT_##s,
foreach_pppoe_input_next
#undef _
PPPOE_INPUT_N_NEXT,
} pppoe_input_next_t;
typedef enum
{
#define pppoe_error(n,s) PPPOE_ERROR_##n,
#include <pppoe/pppoe_error.def>
#undef pppoe_error
PPPOE_N_ERROR,
} pppoe_input_error_t;
#define MTU 1500
#define MTU_BUFFERS ((MTU + VLIB_BUFFER_DATA_SIZE - 1) / VLIB_BUFFER_DATA_SIZE)
#define NUM_BUFFERS_TO_ALLOC 32
/*
* The size of pppoe session table
*/
#define PPPOE_NUM_BUCKETS (128 * 1024)
#define PPPOE_MEMORY_SIZE (16<<20)
/* *INDENT-OFF* */
/*
* The PPPoE key is the mac address and session ID
*/
typedef struct
{
union
{
struct
{
u16 session_id;
u8 mac[6];
} fields;
struct
{
u32 w0;
u32 w1;
} words;
u64 raw;
};
} pppoe_entry_key_t;
/* *INDENT-ON* */
/* *INDENT-OFF* */
/*
* The PPPoE entry results
*/
typedef struct
{
union
{
struct
{
u32 sw_if_index;
u32 session_index;
} fields;
u64 raw;
};
} pppoe_entry_result_t;
/* *INDENT-ON* */
typedef struct
{
/* For DP: vector of encap session instances, */
pppoe_session_t *sessions;
/* For CP: vector of CP path */
BVT (clib_bihash) session_table;
/* Free vlib hw_if_indices */
u32 *free_pppoe_session_hw_if_indices;
/* Mapping from sw_if_index to session index */
u32 *session_index_by_sw_if_index;
/* used for pppoe cp path */
u32 tap_if_index;
/* API message ID base */
u16 msg_id_base;
/* convenience */
vlib_main_t *vlib_main;
vnet_main_t *vnet_main;
} pppoe_main_t;
extern pppoe_main_t pppoe_main;
extern vlib_node_registration_t pppoe_input_node;
extern vlib_node_registration_t pppoe_encap_node;
extern vlib_node_registration_t pppoe_tap_dispatch_node;
u8 *format_pppoe_encap_trace (u8 * s, va_list * args);
typedef struct
{
u8 is_add;
u8 is_ip6;
u16 session_id;
ip46_address_t client_ip;
u32 encap_if_index;
u32 decap_fib_index;
u8 local_mac[6];
u8 client_mac[6];
} vnet_pppoe_add_del_session_args_t;
int vnet_pppoe_add_del_session
(vnet_pppoe_add_del_session_args_t * a, u32 * sw_if_indexp);
typedef struct
{
u8 is_add;
u32 client_if_index;
u32 tap_if_index;
} vnet_pppoe_add_del_tap_args_t;
always_inline u64
pppoe_make_key (u8 * mac_address, u16 session_id)
{
u64 temp;
/*
* The mac address in memory is A:B:C:D:E:F
* The session_id in register is H:L
*/
#if CLIB_ARCH_IS_LITTLE_ENDIAN
/*
* Create the in-register key as F:E:D:C:B:A:H:L
* In memory the key is L:H:A:B:C:D:E:F
*/
temp = *((u64 *) (mac_address)) << 16;
temp = (temp & ~0xffff) | (u64) (session_id);
#else
/*
* Create the in-register key as H:L:A:B:C:D:E:F
* In memory the key is H:L:A:B:C:D:E:F
*/
temp = *((u64 *) (mac_address)) >> 16;
temp = temp | (((u64) session_id) << 48);
#endif
return temp;
}
static_always_inline void
pppoe_lookup_1 (BVT (clib_bihash) * session_table,
pppoe_entry_key_t * cached_key,
pppoe_entry_result_t * cached_result,
u8 * mac0,
u16 session_id0,
pppoe_entry_key_t * key0,
u32 * bucket0, pppoe_entry_result_t * result0)
{
/* set up key */
key0->raw = pppoe_make_key (mac0, session_id0);
*bucket0 = ~0;
if (key0->raw == cached_key->raw)
{
/* Hit in the one-entry cache */
result0->raw = cached_result->raw;
}
else
{
/* Do a regular session table lookup */
BVT (clib_bihash_kv) kv;
kv.key = key0->raw;
kv.value = ~0ULL;
BV (clib_bihash_search_inline) (session_table, &kv);
result0->raw = kv.value;
/* Update one-entry cache */
cached_key->raw = key0->raw;
cached_result->raw = result0->raw;
}
}
static_always_inline void
pppoe_update_1 (BVT (clib_bihash) * session_table,
u8 * mac0,
u16 session_id0,
pppoe_entry_key_t * key0,
u32 * bucket0, pppoe_entry_result_t * result0)
{
/* set up key */
key0->raw = pppoe_make_key (mac0, session_id0);
*bucket0 = ~0;
/* Update the entry */
BVT (clib_bihash_kv) kv;
kv.key = key0->raw;
kv.value = result0->raw;
BV (clib_bihash_add_del) (session_table, &kv, 1 /* is_add */ );
}
#endif /* _PPPOE_H */
/*
* fd.io coding-style-patch-verification: ON
*
* Local Variables:
* eval: (c-set-style "gnu")
* End:
*/

18
src/plugins/pppoe/pppoe_all_api_h.h Normal file
View File

@ -0,0 +1,18 @@
/*
* pppoe_all_api_h.h - plug-in api #include file
*
* Copyright (c) 2017 Intel and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* Include the generated file, see BUILT_SOURCES in Makefile.am */
#include <pppoe/pppoe.api.h>

224
src/plugins/pppoe/pppoe_api.c Normal file
View File

@ -0,0 +1,224 @@
/*
*------------------------------------------------------------------
* pppoe_api.c - pppoe api
*
* Copyright (c) 2017 Intel and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*------------------------------------------------------------------
*/
#include <vnet/interface.h>
#include <vnet/api_errno.h>
#include <vnet/feature/feature.h>
#include <vnet/fib/fib_table.h>
#include <vppinfra/byte_order.h>
#include <vlibmemory/api.h>
#include <vlibsocket/api.h>
#include <pppoe/pppoe.h>
#define vl_msg_id(n,h) n,
typedef enum
{
#include <pppoe/pppoe.api.h>
/* We'll want to know how many messages IDs we need... */
VL_MSG_FIRST_AVAILABLE,
} vl_msg_id_t;
#undef vl_msg_id
/* define message structures */
#define vl_typedefs
#include <pppoe/pppoe.api.h>
#undef vl_typedefs
/* define generated endian-swappers */
#define vl_endianfun
#include <pppoe/pppoe.api.h>
#undef vl_endianfun
/* instantiate all the print functions we know about */
#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
#define vl_printfun
#include <pppoe/pppoe.api.h>
#undef vl_printfun
/* Get the API version number */
#define vl_api_version(n,v) static u32 api_version=(v);
#include <pppoe/pppoe.api.h>
#undef vl_api_version
#define vl_msg_name_crc_list
#include <pppoe/pppoe.api.h>
#undef vl_msg_name_crc_list
#define REPLY_MSG_ID_BASE pem->msg_id_base
#include <vlibapi/api_helper_macros.h>
static void
setup_message_id_table (pppoe_main_t * pem, api_main_t * am)
{
#define _(id,n,crc) \
vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + pem->msg_id_base);
foreach_vl_msg_name_crc_pppoe;
#undef _
}
#define foreach_pppoe_plugin_api_msg \
_(PPPOE_ADD_DEL_SESSION, pppoe_add_del_session) \
_(PPPOE_SESSION_DUMP, pppoe_session_dump)
static void vl_api_pppoe_add_del_session_t_handler
(vl_api_pppoe_add_del_session_t * mp)
{
vl_api_pppoe_add_del_session_reply_t *rmp;
int rv = 0;
u32 decap_fib_index;
ip4_main_t *im = &ip4_main;
pppoe_main_t *pem = &pppoe_main;
uword *p = hash_get (im->fib_index_by_table_id, ntohl (mp->decap_vrf_id));
if (!p)
{
rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
goto out;
}
decap_fib_index = p[0];
vnet_pppoe_add_del_session_args_t a = {
.is_add = mp->is_add,
.is_ip6 = mp->is_ipv6,
.decap_fib_index = decap_fib_index,
.session_id = ntohs (mp->session_id),
.client_ip = to_ip46 (mp->is_ipv6, mp->client_ip),
};
clib_memcpy (a.client_mac, mp->client_mac, 6);
u32 sw_if_index = ~0;
rv = vnet_pppoe_add_del_session (&a, &sw_if_index);
out:
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_PPPOE_ADD_DEL_SESSION_REPLY,
({
rmp->sw_if_index = ntohl (sw_if_index);
}));
/* *INDENT-ON* */
}
static void send_pppoe_session_details
(pppoe_session_t * t, unix_shared_memory_queue_t * q, u32 context)
{
vl_api_pppoe_session_details_t *rmp;
ip4_main_t *im4 = &ip4_main;
ip6_main_t *im6 = &ip6_main;
u8 is_ipv6 = !ip46_address_is_ip4 (&t->client_ip);
rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_PPPOE_SESSION_DETAILS);
if (is_ipv6)
{
memcpy (rmp->client_ip, t->client_ip.ip6.as_u8, 16);
rmp->decap_vrf_id = htonl (im6->fibs[t->decap_fib_index].ft_table_id);
}
else
{
memcpy (rmp->client_ip, t->client_ip.ip4.as_u8, 4);
rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
}
rmp->session_id = htons (t->session_id);
rmp->encap_if_index = htonl (t->encap_if_index);
clib_memcpy (rmp->local_mac, t->local_mac, 6);
clib_memcpy (rmp->client_mac, t->client_mac, 6);
rmp->sw_if_index = htonl (t->sw_if_index);
rmp->is_ipv6 = is_ipv6;
rmp->context = context;
vl_msg_api_send_shmem (q, (u8 *) & rmp);
}
static void
vl_api_pppoe_session_dump_t_handler (vl_api_pppoe_session_dump_t * mp)
{
unix_shared_memory_queue_t *q;
pppoe_main_t *pem = &pppoe_main;
pppoe_session_t *t;
u32 sw_if_index;
q = vl_api_client_index_to_input_queue (mp->client_index);
if (q == 0)
{
return;
}
sw_if_index = ntohl (mp->sw_if_index);
if (~0 == sw_if_index)
{
/* *INDENT-OFF* */
pool_foreach (t, pem->sessions,
({
send_pppoe_session_details(t, q, mp->context);
}));
/* *INDENT-ON* */
}
else
{
if ((sw_if_index >= vec_len (pem->session_index_by_sw_if_index)) ||
(~0 == pem->session_index_by_sw_if_index[sw_if_index]))
{
return;
}
t = &pem->sessions[pem->session_index_by_sw_if_index[sw_if_index]];
send_pppoe_session_details (t, q, mp->context);
}
}
static clib_error_t *
pppoe_api_hookup (vlib_main_t * vm)
{
pppoe_main_t *pem = &pppoe_main;
u8 *name = format (0, "pppoe_%08x%c", api_version, 0);
pem->msg_id_base = vl_msg_api_get_msg_ids
((char *) name, VL_MSG_FIRST_AVAILABLE);
#define _(N,n) \
vl_msg_api_set_handlers((VL_API_##N + pem->msg_id_base), \
#n, \
vl_api_##n##_t_handler, \
vl_noop_handler, \
vl_api_##n##_t_endian, \
vl_api_##n##_t_print, \
sizeof(vl_api_##n##_t), 1);
foreach_pppoe_plugin_api_msg;
#undef _
/* Add our API messages to the global name_crc hash table */
setup_message_id_table (pem, &api_main);
return 0;
}
VLIB_API_INIT_FUNCTION (pppoe_api_hookup);
/*
* fd.io coding-style-patch-verification: ON
*
* Local Variables:
* eval: (c-set-style "gnu")
* End:
*/

422
src/plugins/pppoe/pppoe_decap.c Normal file
View File

File diff suppressed because it is too large Load Diff

384
src/plugins/pppoe/pppoe_encap.c Normal file
View File

File diff suppressed because it is too large Load Diff

18
src/plugins/pppoe/pppoe_error.def Normal file
View File

@ -0,0 +1,18 @@
/*
* Copyright (c) 2017 Intel and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
pppoe_error (DECAPSULATED, "good packets decapsulated")
pppoe_error (CONTROL_PLANE, "control plane packet")
pppoe_error (NO_SUCH_SESSION, "no such sessions")
pppoe_error (BAD_VER_TYPE, "bad version and type in pppoe header")

31
src/plugins/pppoe/pppoe_msg_enum.h Normal file
View File

@ -0,0 +1,31 @@
/*
* pppoe_msg_enum.h - vpp engine plug-in message enumeration
*
* Copyright (c) 2017 Intel and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef included_pppoe_msg_enum_h
#define included_pppoe_msg_enum_h
#include <vppinfra/byte_order.h>
#define vl_msg_id(n,h) n,
typedef enum
{
#include <pppoe/pppoe_all_api_h.h>
/* We'll want to know how many messages IDs we need... */
VL_MSG_FIRST_AVAILABLE,
} vl_msg_id_t;
#undef vl_msg_id
#endif /* included_pppoe_msg_enum_h */

89
src/plugins/pppoe/pppoe_tap.c Normal file
View File

@ -0,0 +1,89 @@
/*
*------------------------------------------------------------------
* Copyright (c) 2017 Intel and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*------------------------------------------------------------------
*/
#include <pppoe/pppoe.h>
#include <vnet/unix/tapcli.h>
static clib_error_t *
pppoe_add_del_tap_command_fn (vlib_main_t * vm,
unformat_input_t * input,
vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
pppoe_main_t *pem = &pppoe_main;
u8 is_add = 1;
u8 tap_if_index_set = 0;
u32 tap_if_index = 0;
clib_error_t *error = NULL;
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "del"))
{
is_add = 0;
}
else if (unformat (line_input, "tap-if-index %d", &tap_if_index))
tap_if_index_set = 1;
else
{
error = clib_error_return (0, "parse error: '%U'",
format_unformat_error, line_input);
goto done;
}
}
if (tap_if_index_set == 0)
{
error = clib_error_return (0, "tap if index not specified");
goto done;
}
if (is_add)
{
pem->tap_if_index = tap_if_index;
}
else
{
pem->tap_if_index = ~0;
}
done:
unformat_free (line_input);
return error;
}
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (create_pppoe_tap_cmd, static) =
{
.path = "create pppoe tap",
.short_help = "create pppoe tap if-name <intfc> [del]",
.function = pppoe_add_del_tap_command_fn,
};
/* *INDENT-ON* */
/*
* fd.io coding-style-patch-verification: ON
*
* Local Variables:
* eval: (c-set-style "gnu")
* End:
*/

297
src/plugins/pppoe/pppoe_tap_node.c Normal file
View File

@ -0,0 +1,297 @@
/*
*------------------------------------------------------------------
* Copyright (c) 2017 Intel and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or pemplied.
* See the License for the specific language governing permissions and
* lpemitations under the License.
*------------------------------------------------------------------
*/
#include <vlib/vlib.h>
#include <vnet/ppp/packet.h>
#include <pppoe/pppoe.h>
vlib_node_registration_t pppoe_tap_dispatch_node;
#define foreach_pppoe_tap_next \
_(DROP, "error-drop") \
_(TUNTAP, "tuntap-tx" ) \
_(INTERFACE, "interface-output" ) \
typedef enum
{
#define _(s,n) PPPOE_TAP_NEXT_##s,
foreach_pppoe_tap_next
#undef _
PPPOE_TAP_N_NEXT,
} pppoe_tap_next_t;
typedef struct {
u32 next_index;
u32 sw_if_index;
u32 tap_if_index;
u8 pppoe_code;
u16 ppp_proto;
u32 error;
} pppoe_tap_trace_t;
static u8 * format_pppoe_tap_trace (u8 * s, va_list * args)
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
pppoe_tap_trace_t * t = va_arg (*args, pppoe_tap_trace_t *);
pppoe_main_t * pem = &pppoe_main;
if (t->sw_if_index != pem->tap_if_index)
{
s = format (s, "PPPoE dispatch from sw_if_index %d next %d error %d \n"
" pppoe_code 0x%x ppp_proto 0x%x",
t->sw_if_index, t->next_index, t->error,
t->pppoe_code, t->ppp_proto);
}
else
{
s = format (s, "PPPoE dispatch from tap_if_index %d next %d error %d \n"
" pppoe_code 0x%x ppp_proto 0x%x",
t->tap_if_index, t->next_index, t->error,
t->pppoe_code, t->ppp_proto);
}
return s;
}
/**
* Perform learning on one packet based on the mac table lookup result.
* */
static_always_inline void
pppoe_learn_process (vlib_node_runtime_t * node,
pppoe_main_t * pem,
vlib_buffer_t * b0,
u32 sw_if_index0,
pppoe_entry_key_t * key0,
pppoe_entry_key_t * cached_key,
u32 * bucket0,
pppoe_entry_result_t * result0)
{
/* Check mac table lookup result */
if (PREDICT_TRUE (result0->fields.sw_if_index == sw_if_index0))
{
/*
* The entry was in the table, and the sw_if_index matched, the normal case
*/
return;
}
else if (result0->fields.sw_if_index == ~0)
{
/* The entry was not in table, so add it */
result0->fields.sw_if_index = sw_if_index0;
result0->fields.session_index = ~0;
cached_key->raw = ~0; /* invalidate the cache */
}
else
{
/* The entry was in the table, but with the wrong sw_if_index mapping (mac move) */
result0->fields.sw_if_index = sw_if_index0;
}
/* Update the entry */
BVT (clib_bihash_kv) kv;
kv.key = key0->raw;
kv.value = result0->raw;
BV (clib_bihash_add_del) (&pem->session_table, &kv, 1 /* is_add */ );
}
static uword
pppoe_tap_dispatch (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
u32 n_left_from, next_index, * from, * to_next;
pppoe_main_t * pem = &pppoe_main;
vnet_main_t * vnm = pem->vnet_main;
vnet_interface_main_t * im = &vnm->interface_main;
u32 pkts_decapsulated = 0;
u32 thread_index = vlib_get_thread_index();
u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
pppoe_entry_key_t cached_key;
pppoe_entry_result_t cached_result;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
/* Clear the one-entry cache in case session table was updated */
cached_key.raw = ~0;
cached_result.raw = ~0; /* warning be gone */
next_index = node->cached_next_index;
stats_sw_if_index = node->runtime_data[0];
stats_n_packets = stats_n_bytes = 0;
while (n_left_from > 0)
{
u32 n_left_to_next;
vlib_get_next_frame (vm, node, next_index,
to_next, n_left_to_next);
while (n_left_from > 0 && n_left_to_next > 0)
{
u32 bi0;
vlib_buffer_t * b0;
ethernet_header_t *h0;
pppoe_header_t * pppoe0;
pppoe_entry_key_t key0;
pppoe_entry_result_t result0;
u32 bucket0;
u32 next0;
u32 error0 = 0;
u32 rx_sw_if_index0=~0, tx_sw_if_index0=~0, len0;
vnet_hw_interface_t *hi;
vnet_sw_interface_t *si;
bi0 = from[0];
to_next[0] = bi0;
from += 1;
to_next += 1;
n_left_from -= 1;
n_left_to_next -= 1;
b0 = vlib_get_buffer (vm, bi0);
/* leaves current_data pointing at the pppoe header */
pppoe0 = vlib_buffer_get_current (b0);
rx_sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
if (PREDICT_FALSE (pppoe0->ver_type != PPPOE_VER_TYPE))
{
error0 = PPPOE_ERROR_BAD_VER_TYPE;
next0 = PPPOE_INPUT_NEXT_DROP;
goto trace00;
}
vlib_buffer_reset(b0);
h0 = vlib_buffer_get_current (b0);
if(rx_sw_if_index0 == pem->tap_if_index)
{
pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
h0->dst_address, 0,
&key0, &bucket0, &result0);
tx_sw_if_index0 = result0.fields.sw_if_index;
if (PREDICT_FALSE (tx_sw_if_index0 == ~0))
{
error0 = PPPOE_ERROR_NO_SUCH_SESSION;
next0 = PPPOE_INPUT_NEXT_DROP;
goto trace00;
}
next0 = PPPOE_TAP_NEXT_INTERFACE;
vnet_buffer(b0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
/* set src mac address */
si = vnet_get_sw_interface(vnm, tx_sw_if_index0);
hi = vnet_get_hw_interface (vnm, si->hw_if_index);
clib_memcpy (vlib_buffer_get_current (b0)+6, hi->hw_address, 6);
}
else
{
pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
h0->src_address, pppoe0->session_id,
&key0, &bucket0, &result0);
tx_sw_if_index0 = result0.fields.sw_if_index;
/* learn client session */
pppoe_learn_process (node, pem, b0, rx_sw_if_index0,
&key0, &cached_key,
&bucket0, &result0);
next0 = PPPOE_TAP_NEXT_TUNTAP;
vnet_buffer(b0)->sw_if_index[VLIB_TX] = pem->tap_if_index;
}
len0 = vlib_buffer_length_in_chain (vm, b0);
pkts_decapsulated ++;
stats_n_packets += 1;
stats_n_bytes += len0;
/* Batch stats increment on the same pppoe session so counter
is not incremented per packet */
if (PREDICT_FALSE (rx_sw_if_index0 != stats_sw_if_index))
{
stats_n_packets -= 1;
stats_n_bytes -= len0;
if (stats_n_packets)
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
thread_index, stats_sw_if_index,
stats_n_packets, stats_n_bytes);
stats_n_packets = 1;
stats_n_bytes = len0;
stats_sw_if_index = rx_sw_if_index0;
}
trace00:
b0->error = error0 ? node->errors[error0] : 0;
if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
{
pppoe_tap_trace_t *tr
= vlib_add_trace (vm, node, b0, sizeof (*tr));
tr->next_index = next0;
tr->error = error0;
tr->sw_if_index = tx_sw_if_index0;
tr->tap_if_index = pem->tap_if_index;
tr->pppoe_code = pppoe0->code;
tr->ppp_proto = clib_net_to_host_u16(pppoe0->ppp_proto);
}
vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
to_next, n_left_to_next,
bi0, next0);
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
/* Do we still need this now that session tx stats is kept? */
vlib_node_increment_counter (vm, pppoe_input_node.index,
PPPOE_ERROR_DECAPSULATED,
pkts_decapsulated);
/* Increment any remaining batch stats */
if (stats_n_packets)
{
vlib_increment_combined_counter
(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
thread_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
node->runtime_data[0] = stats_sw_if_index;
}
return from_frame->n_vectors;
}
VLIB_REGISTER_NODE (pppoe_tap_dispatch_node) = {
.function = pppoe_tap_dispatch,
.name = "pppoe-tap-dispatch",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_next_nodes = PPPOE_TAP_N_NEXT,
.next_nodes = {
#define _(s,n) [PPPOE_TAP_NEXT_##s] = n,
foreach_pppoe_tap_next
#undef _
},
.format_trace = format_pppoe_tap_trace,
};
VLIB_NODE_FUNCTION_MULTIARCH (pppoe_tap_dispatch_node, pppoe_tap_dispatch)

330
src/plugins/pppoe/pppoe_test.c Normal file
View File

File diff suppressed because it is too large Load Diff

20
src/vpp-api/java/Makefile.am
View File

@ -148,6 +148,26 @@ jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h: $(jvpp_registry_ok) $(jvpp_gtpu_js
$(call japigen,gtpu,JVppGtpuImpl)
endif
#
# PPPOE Plugin
#
if ENABLE_PPPOE_PLUGIN
noinst_LTLIBRARIES += libjvpp_pppoe.la
libjvpp_pppoe_la_SOURCES = jvpp-pppoe/jvpp_pppoe.c
libjvpp_pppoe_la_CPPFLAGS = -Ijvpp-pppoe
libjvpp_pppoe_la_LIBADD = $(JVPP_LIBS)
libjvpp_pppoe_la_DEPENDENCIES = libjvpp_common.la
BUILT_SOURCES += jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h
JAR_FILES += jvpp-pppoe-$(PACKAGE_VERSION).jar
CLEANDIRS += jvpp-pppoe/target
jvpp_pppoe_json_files = @top_builddir@/plugins/pppoe/pppoe.api.json
jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h: $(jvpp_registry_ok) $(jvpp_pppoe_json_files)
$(call japigen,pppoe,JVppPppoeImpl)
endif
#
# SNAT Plugin
#

107
src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c Normal file
View File

@ -0,0 +1,107 @@
/*
* Copyright (c) 2016 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <vnet/vnet.h>
#include <pppoe/pppoe_msg_enum.h>
#define vl_typedefs /* define message structures */
#include <pppoe/pppoe_all_api_h.h>
#undef vl_typedefs
#include <vnet/api_errno.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#if VPPJNI_DEBUG == 1
#define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
#else
#define DEBUG_LOG(...)
#endif
#include <jvpp-common/jvpp_common.h>
#include "jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h"
#include "jvpp_pppoe.h"
#include "jvpp-pppoe/jvpp_pppoe_gen.h"
/*
* Class: io_fd_vpp_jvpp_pppoe_JVpppppoeImpl
* Method: init0
* Signature: (JI)V
*/
JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0
(JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
pppoe_main_t * plugin_main = &pppoe_main;
clib_warning ("Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0");
plugin_main->my_client_index = my_client_index;
plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
// verify API has not changed since jar generation
#define _(N) \
get_message_id(env, #N); \
foreach_supported_api_message;
#undef _
#define _(N,n) \
vl_msg_api_set_handlers(get_message_id(env, #N), #n, \
vl_api_##n##_t_handler, \
vl_noop_handler, \
vl_noop_handler, \
vl_noop_handler, \
sizeof(vl_api_##n##_t), 1);
foreach_api_reply_handler;
#undef _
}
JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_close0
(JNIEnv *env, jclass clazz) {
pppoe_main_t * plugin_main = &pppoe_main;
// cleanup:
(*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
(*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
plugin_main->callbackClass = NULL;
plugin_main->callbackObject = NULL;
}
/* Attach thread to JVM and cache class references when initiating JVPP ACL */
jint JNI_OnLoad(JavaVM *vm, void *reserved) {
JNIEnv* env;
if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
return JNI_EVERSION;
}
if (cache_class_references(env) != 0) {
clib_warning ("Failed to cache class references\n");
return JNI_ERR;
}
return JNI_VERSION_1_8;
}
/* Clean up cached references when disposing JVPP ACL */
void JNI_OnUnload(JavaVM *vm, void *reserved) {
JNIEnv* env;
if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
return;
}
delete_class_references(env);
}

42
src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h Normal file
View File

@ -0,0 +1,42 @@
/*
* Copyright (c) 2016 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef __included_jvpp_pppoe_h__
#define __included_jvpp_pppoe_h__
#include <vnet/vnet.h>
#include <vnet/ip/ip.h>
#include <vnet/api_errno.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#include <jni.h>
/* Global state for JVPP-pppoe */
typedef struct {
/* Pointer to shared memory queue */
unix_shared_memory_queue_t * vl_input_queue;
/* VPP api client index */
u32 my_client_index;
/* Callback object and class references enabling asynchronous Java calls */
jobject callbackObject;
jclass callbackClass;
} pppoe_main_t;
pppoe_main_t pppoe_main __attribute__((aligned (64)));
#endif /* __included_jvpp_pppoe_h__ */

605
test/test_pppoe.py Normal file
View File

File diff suppressed because it is too large Load Diff

26
test/vpp_papi_provider.py
View File

@ -2087,3 +2087,29 @@ class VppPapiProvider(object):
'decap_vrf_id': decap_vrf_id,
'protocol': protocol,
'vni': vni})
def pppoe_add_del_session(
self,
client_ip,
client_mac,
session_id=0,
is_add=1,
is_ipv6=0,
decap_vrf_id=0):
"""
:param is_add: (Default value = 1)
:param is_ipv6: (Default value = 0)
:param client_ip:
:param session_id: (Default value = 0)
:param client_mac:
:param decap_vrf_id: (Default value = 0)
"""
return self.api(self.papi.pppoe_add_del_session,
{'is_add': is_add,
'is_ipv6': is_ipv6,
'session_id': session_id,
'client_ip': client_ip,
'decap_vrf_id': decap_vrf_id,
'client_mac': client_mac})

79
test/vpp_pppoe_interface.py Normal file
View File

@ -0,0 +1,79 @@
from vpp_interface import VppInterface
import socket
from util import ppp, ppc, mactobinary
class VppPppoeInterface(VppInterface):
"""
VPP Pppoe interface
"""
def __init__(self, test, client_ip, client_mac,
session_id, decap_vrf_id=0):
""" Create VPP PPPoE4 interface """
self._sw_if_index = 0
super(VppPppoeInterface, self).__init__(test)
self._test = test
self.client_ip = client_ip
self.client_mac = client_mac
self.session_id = session_id
self.decap_vrf_id = decap_vrf_id
def add_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET, self.client_ip)
cmac = mactobinary(self.client_mac)
r = self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id)
self._sw_if_index = r.sw_if_index
self.generate_remote_hosts()
def remove_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET, self.client_ip)
cmac = mactobinary(self.client_mac)
self.unconfig()
r = self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,
is_add=0)
class VppPppoe6Interface(VppInterface):
"""
VPP Pppoe IPv6 interface
"""
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
""" Create VPP PPPoE6 interface """
self._sw_if_index = 0
super(VppPppoe6Interface, self).__init__(test)
self._test = test
self.client_ip = client_ip
self.client_mac = client_mac
self.session_id = session_id
self.decap_vrf_id = decap_vrf_id
def add_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET6, self.client_ip)
cmac = mactobinary(self.client_mac)
r = self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,
is_ip6=1)
self._sw_if_index = r.sw_if_index
self.generate_remote_hosts()
def remove_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET6, self.client_ip)
cmac = mactobinary(self.client_mac)
self.unconfig()
r = self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,
is_add=0,
is_ip6=1)