From: Kusakabe Si <linux@kskb.eu.org>
Date: Thu, 24 Jun 2021 05:16:00 +0000 (+0800)
Subject: https://jira.fd.io/projects/GOVPP/issues/GOVPP-20
X-Git-Tag: v0.4.0~13
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=govpp.git;a=commitdiff_plain;h=91800ed117b781ede18cd45b84b80408ec31daf5

https://jira.fd.io/projects/GOVPP/issues/GOVPP-20

Signed-off-by: Kusakabe Si <linux@kskb.eu.org>
Change-Id: I14ae5071414d945a45d3d104390982085f3109ab
---

diff --git a/extras/libmemif/adapter.go b/extras/libmemif/adapter.go
index 0cee589..eb7e209 100644
--- a/extras/libmemif/adapter.go
+++ b/extras/libmemif/adapter.go
@@ -1157,6 +1157,11 @@ func pollRxQueue(memif *Memif, queueID uint8) {
 	for {
 		_, err := syscall.EpollWait(epFd, event[:], -1)
 		if err != nil {
+			errno, _ := err.(syscall.Errno)
+			//EINTR and EAGAIN should not be considered as a fatal error, try again
+			if errno == syscall.EINTR || errno == syscall.EAGAIN {
+				continue
+			}
 			log.WithField("err", err).Error("epoll_wait() failed")
 			return
 		}