lib: work around nonstandard bit-fields

[dpdk.git] / lib / librte_eal / linuxapp / eal / include / exec-env / rte_kni_common.h

diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
index f2b502c..2ef0506 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -68,6 +68,8 @@
  */
 #define RTE_KNI_NAMESIZE 32
 
+#define RTE_CACHE_LINE_MIN_SIZE 64
+
 /*
  * Request id.
  */
@@ -100,7 +102,7 @@ struct rte_kni_fifo {
        volatile unsigned read;      /**< Next position to be read */
        unsigned len;                /**< Circular buffer length */
        unsigned elem_size;          /**< Pointer size - for 32/64 bit OS */
-       void * volatile buffer[0];   /**< The buffer contains mbuf pointers */
+       void *volatile buffer[];     /**< The buffer contains mbuf pointers */
 };
 
 /*
@@ -108,18 +110,22 @@ struct rte_kni_fifo {
  * Padding is necessary to assure the offsets of these fields
  */
 struct rte_kni_mbuf {
-       void *buf_addr;
+       void *buf_addr __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));
        char pad0[10];
        uint16_t data_off;      /**< Start address of data in segment buffer. */
-       char pad1[4];
-       uint16_t ol_flags;      /**< Offload features. */
-       char pad2[8];
-       uint16_t data_len;      /**< Amount of data in segment buffer. */
+       char pad1[2];
+       uint8_t nb_segs;        /**< Number of segments. */
+       char pad4[1];
+       uint64_t ol_flags;      /**< Offload features. */
+       char pad2[4];
        uint32_t pkt_len;       /**< Total pkt len: sum of all segment data_len. */
-       char pad3[8];
+       uint16_t data_len;      /**< Amount of data in segment buffer. */
+
+       /* fields on second cache line */
+       char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_MIN_SIZE)));
        void *pool;
        void *next;
-} __attribute__((__aligned__(64)));
+};
 
 /*
  * Struct used to create a KNI device. Passed to the kernel in IOCTL call
@@ -153,6 +159,7 @@ struct rte_kni_device_info {
        uint16_t group_id;            /**< Group ID */
        uint32_t core_id;             /**< core ID to bind for kernel thread */
 
+       __extension__
        uint8_t force_bind : 1;       /**< Flag for kernel thread binding */
 
        /* mbuf size */