From: Ido Barnea <ibarnea@cisco.com>
Date: Wed, 16 Mar 2016 18:08:57 +0000 (+0200)
Subject: e1000 patch to reduce log level of reading from file descriptor... error
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=7b1d18627b1fa9f76938dac291befbba0367bac2;p=trex.git

e1000 patch to reduce log level of reading from file descriptor... error
---

diff --git a/src/dpdk22/drivers/net/e1000/base/e1000_api.c b/src/dpdk22/drivers/net/e1000/base/e1000_api.c
index bbfcae88..22b96fd1 100644
--- a/src/dpdk22/drivers/net/e1000/base/e1000_api.c
+++ b/src/dpdk22/drivers/net/e1000/base/e1000_api.c
@@ -632,6 +632,8 @@ s32 e1000_reset_hw(struct e1000_hw *hw)
 	return -E1000_ERR_CONFIG;
 }
 
+//TREX_PATCH
+extern int eal_err_read_from_file_is_error;
 /**
  *  e1000_init_hw - Initialize hardware
  *  @hw: pointer to the HW structure
@@ -641,6 +643,9 @@ s32 e1000_reset_hw(struct e1000_hw *hw)
  **/
 s32 e1000_init_hw(struct e1000_hw *hw)
 {
+    //TREX_PATCH
+    eal_err_read_from_file_is_error = 0;
+
 	if (hw->mac.ops.init_hw)
 		return hw->mac.ops.init_hw(hw);
 
diff --git a/src/dpdk22/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/src/dpdk22/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index 06b26a9e..5d3128e3 100644
--- a/src/dpdk22/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/src/dpdk22/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -75,6 +75,9 @@
 
 static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */
 
+// TREX_PATCH
+int eal_err_read_from_file_is_error = 1;
+
 /**
  * union for pipe fds.
  */
@@ -711,10 +714,19 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
 				if (errno == EINTR || errno == EWOULDBLOCK)
 					continue;
 
-				RTE_LOG(ERR, EAL, "Error reading from file "
-					"descriptor %d: %s\n",
-					events[n].data.fd,
-					strerror(errno));
+                // TREX_PATCH. Because of issues with e1000, we want this message to
+                // have lower priority only if running on e1000 card
+                if (eal_err_read_from_file_is_error) {
+                    RTE_LOG(ERR, EAL, "Error reading from file "
+                            "descriptor %d: %s\n",
+                            events[n].data.fd,
+                            strerror(errno));
+                } else {
+                    RTE_LOG(INFO, EAL, "Error reading from file "
+                            "descriptor %d: %s\n",
+                            events[n].data.fd,
+                            strerror(errno));
+                }
 			} else if (bytes_read == 0)
 				RTE_LOG(ERR, EAL, "Read nothing from file "
 					"descriptor %d\n", events[n].data.fd);