X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_kni%2Frte_kni.h;h=d43b5b28755b79b847d2d59d81252a1ad0f2dbaa;hb=e32cb57973fc311b4b5f60ae5dac37d99e48c94d;hp=cad877b21e26029e7788a88662bfe3f7473dcca6;hpb=c738c6a644e5a07fa98ede668775c08ec5321273;p=dpdk.git diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h index cad877b21e..d43b5b2875 100644 --- a/lib/librte_kni/rte_kni.h +++ b/lib/librte_kni/rte_kni.h @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -42,12 +42,13 @@ * interfaces that may be used by the RTE application to receive/transmit * packets from/to Linux kernel net interfaces. * - * This library provide two APIs to burst receive packets from KNI interfaces, + * This library provides two APIs to burst receive packets from KNI interfaces, * and burst transmit packets to KNI interfaces. */ #include -#include +#include +#include #include @@ -56,18 +57,19 @@ extern "C" { #endif struct rte_kni; +struct rte_mbuf; /** * Structure which has the function pointers for KNI interface. */ struct rte_kni_ops { - uint8_t port_id; /* Port ID */ + uint16_t port_id; /* Port ID */ /* Pointer to function of changing MTU */ - int (*change_mtu)(uint8_t port_id, unsigned new_mtu); + int (*change_mtu)(uint16_t port_id, unsigned int new_mtu); /* Pointer to function of configuring network interface */ - int (*config_network_if)(uint8_t port_id, uint8_t if_up); + int (*config_network_if)(uint16_t port_id, uint8_t if_up); }; /** @@ -86,41 +88,39 @@ struct rte_kni_conf { struct rte_pci_addr addr; struct rte_pci_id id; + __extension__ uint8_t force_bind : 1; /* Flag to bind kernel thread */ }; /** - * Allocate KNI interface according to the port id, mbuf size, mbuf pool, - * configurations and callbacks for kernel requests.The KNI interface created - * in the kernel space is the net interface the traditional Linux application - * talking to. + * Initialize and preallocate KNI subsystem * - * @param pktmbuf_pool - * The mempool for allocting mbufs for packets. - * @param conf - * The pointer to the configurations of the KNI device. - * @param ops - * The pointer to the callbacks for the KNI kernel requests. + * This function is to be executed on the MASTER lcore only, after EAL + * initialization and before any KNI interface is attempted to be + * allocated * - * @return - * - The pointer to the context of a KNI interface. - * - NULL indicate error. + * @param max_kni_ifaces + * The maximum number of KNI interfaces that can coexist concurrently */ -extern struct rte_kni *rte_kni_alloc(struct rte_mempool *pktmbuf_pool, - const struct rte_kni_conf *conf, - struct rte_kni_ops *ops); +void rte_kni_init(unsigned int max_kni_ifaces); + /** - * It create a KNI device for specific port. + * Allocate KNI interface according to the port id, mbuf size, mbuf pool, + * configurations and callbacks for kernel requests.The KNI interface created + * in the kernel space is the net interface the traditional Linux application + * talking to. + * + * The rte_kni_alloc shall not be called before rte_kni_init() has been + * called. rte_kni_alloc is thread safe. * - * Note: It is deprecated and just for backward compatibility. + * The mempool should have capacity of more than "2 x KNI_FIFO_COUNT_MAX" + * elements for each KNI interface allocated. * - * @param port_id - * Port ID. - * @param mbuf_size - * mbuf size. * @param pktmbuf_pool - * The mempool for allocting mbufs for packets. + * The mempool for allocating mbufs for packets. + * @param conf + * The pointer to the configurations of the KNI device. * @param ops * The pointer to the callbacks for the KNI kernel requests. * @@ -128,17 +128,16 @@ extern struct rte_kni *rte_kni_alloc(struct rte_mempool *pktmbuf_pool, * - The pointer to the context of a KNI interface. * - NULL indicate error. */ -extern struct rte_kni *rte_kni_create(uint8_t port_id, - unsigned mbuf_size, - struct rte_mempool *pktmbuf_pool, - struct rte_kni_ops *ops) \ - __attribute__ ((deprecated)); +struct rte_kni *rte_kni_alloc(struct rte_mempool *pktmbuf_pool, + const struct rte_kni_conf *conf, struct rte_kni_ops *ops); /** * Release KNI interface according to the context. It will also release the * paired KNI interface in kernel space. All processing on the specific KNI * context need to be stopped before calling this interface. * + * rte_kni_release is thread safe. + * * @param kni * The pointer to the context of an existent KNI interface. * @@ -146,10 +145,10 @@ extern struct rte_kni *rte_kni_create(uint8_t port_id, * - 0 indicates success. * - negative value indicates failure. */ -extern int rte_kni_release(struct rte_kni *kni); +int rte_kni_release(struct rte_kni *kni); /** - * It is used to handle the request mbufs sent from kernel space. + * It is used to handle the request mbufs sent from kernel space. * Then analyzes it and calls the specific actions for the specific requests. * Finally constructs the response mbuf and puts it back to the resp_q. * @@ -157,16 +156,16 @@ extern int rte_kni_release(struct rte_kni *kni); * The pointer to the context of an existent KNI interface. * * @return - * - 0 + * - 0 * - negative value indicates failure. */ -extern int rte_kni_handle_request(struct rte_kni *kni); +int rte_kni_handle_request(struct rte_kni *kni); /** * Retrieve a burst of packets from a KNI interface. The retrieved packets are * stored in rte_mbuf structures whose pointers are supplied in the array of - * mbufs, and the maximum number is indicated by num. It handles the freeing of - * the mbufs in the free queue of KNI interface. + * mbufs, and the maximum number is indicated by num. It handles allocating + * the mbufs for KNI interface alloc queue. * * @param kni * The KNI interface context. @@ -178,14 +177,14 @@ extern int rte_kni_handle_request(struct rte_kni *kni); * @return * The actual number of packets retrieved. */ -extern unsigned rte_kni_rx_burst(struct rte_kni *kni, - struct rte_mbuf **mbufs, unsigned num); +unsigned rte_kni_rx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, + unsigned num); /** * Send a burst of packets to a KNI interface. The packets to be sent out are * stored in rte_mbuf structures whose pointers are supplied in the array of - * mbufs, and the maximum number is indicated by num. It handles allocating - * the mbufs for KNI interface alloc queue. + * mbufs, and the maximum number is indicated by num. It handles the freeing of + * the mbufs in the free queue of KNI interface. * * @param kni * The KNI interface context. @@ -197,23 +196,8 @@ extern unsigned rte_kni_rx_burst(struct rte_kni *kni, * @return * The actual number of packets sent. */ -extern unsigned rte_kni_tx_burst(struct rte_kni *kni, - struct rte_mbuf **mbufs, unsigned num); - -/** - * Get the port id from KNI interface. - * - * Note: It is deprecated and just for backward compatibility. - * - * @param kni - * The KNI interface context. - * - * @return - * On success: The port id. - * On failure: ~0x0 - */ -extern uint8_t rte_kni_get_port_id(struct rte_kni *kni) \ - __attribute__ ((deprecated)); +unsigned rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, + unsigned num); /** * Get the KNI context of its name. @@ -225,64 +209,52 @@ extern uint8_t rte_kni_get_port_id(struct rte_kni *kni) \ * On success: Pointer to KNI interface. * On failure: NULL. */ -extern struct rte_kni *rte_kni_get(const char *name); +struct rte_kni *rte_kni_get(const char *name); /** - * Get the KNI context of the specific port. - * - * Note: It is deprecated and just for backward compatibility. + * Get the name given to a KNI device * - * @param port_id - * the port id. - * - * @return - * On success: Pointer to KNI interface. - * On failure: NULL + * @param kni + * The KNI instance to query + * @return + * The pointer to the KNI name */ -extern struct rte_kni *rte_kni_info_get(uint8_t port_id) \ - __attribute__ ((deprecated)); +const char *rte_kni_get_name(const struct rte_kni *kni); /** * Register KNI request handling for a specified port,and it can * be called by master process or slave process. * - * @param kni - * pointer to struct rte_kni. - * @param ops - * ponter to struct rte_kni_ops. + * @param kni + * pointer to struct rte_kni. + * @param ops + * pointer to struct rte_kni_ops. * * @return * On success: 0 * On failure: -1 */ -extern int rte_kni_register_handlers(struct rte_kni *kni, - struct rte_kni_ops *ops); +int rte_kni_register_handlers(struct rte_kni *kni, struct rte_kni_ops *ops); /** * Unregister KNI request handling for a specified port. - * - * @param kni - * pointer to struct rte_kni. + * + * @param kni + * pointer to struct rte_kni. * * @return * On success: 0 * On failure: -1 */ -extern int rte_kni_unregister_handlers(struct rte_kni *kni); +int rte_kni_unregister_handlers(struct rte_kni *kni); /** - * close KNI device. - * - * @param void - * - * @return - * void + * Close KNI device. */ -extern void rte_kni_close(void); +void rte_kni_close(void); #ifdef __cplusplus } #endif #endif /* _RTE_KNI_H_ */ -