From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 9D4BB8D8B for ; Thu, 19 Apr 2018 19:27:18 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 33685406F97B; Thu, 19 Apr 2018 17:27:18 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-2.ams2.redhat.com [10.36.117.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2172510FFE6A; Thu, 19 Apr 2018 17:27:15 +0000 (UTC) To: Arnon Warshavsky , thomas@monjalon.net, anatoly.burakov@intel.com, wenzhuo.lu@intel.com, declan.doherty@intel.com, jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, ferruh.yigit@intel.com Cc: dev@dpdk.org References: <1524117669-25729-1-git-send-email-arnon@qwilt.com> <1524117669-25729-9-git-send-email-arnon@qwilt.com> From: Kevin Traynor Organization: Red Hat Message-ID: Date: Thu, 19 Apr 2018 18:27:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 MIME-Version: 1.0 In-Reply-To: <1524117669-25729-9-git-send-email-arnon@qwilt.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 19 Apr 2018 17:27:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 19 Apr 2018 17:27:18 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ktraynor@redhat.com' RCPT:'' Subject: Re: [dpdk-dev] [PATCH v4 08/11] eal: replace rte_panic instances in interrupts thread X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Apr 2018 17:27:18 -0000 On 04/19/2018 07:01 AM, Arnon Warshavsky wrote: > replace panic calls with log and retrun value. > Thread function removes the noretrun attribute. > > Signed-off-by: Arnon Warshavsky > --- > lib/librte_eal/linuxapp/eal/eal_interrupts.c | 27 ++++++++++++++++++++------- > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c > index 58e9328..8b8650a 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c > +++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c > @@ -785,7 +785,7 @@ struct rte_intr_source { > * @return > * never return; > */ > -static __attribute__((noreturn)) void * > +static void * > eal_intr_thread_main(__rte_unused void *arg) > { > struct epoll_event ev; > @@ -803,8 +803,11 @@ static __attribute__((noreturn)) void * > > /* create epoll fd */ > int pfd = epoll_create(1); > - if (pfd < 0) > - rte_panic("Cannot create epoll instance\n"); > + if (pfd < 0) { > + RTE_LOG(CRIT, EAL, "%s(): Cannot create epoll instance\n", > + __func__); > + return NULL; > + } > > pipe_event.data.fd = intr_pipe.readfd; > /** > @@ -813,8 +816,11 @@ static __attribute__((noreturn)) void * > */ > if (epoll_ctl(pfd, EPOLL_CTL_ADD, intr_pipe.readfd, > &pipe_event) < 0) { > - rte_panic("Error adding fd to %d epoll_ctl, %s\n", > + RTE_LOG(CRIT, EAL, "%s(): Error adding fd to %d " > + "epoll_ctl, %s\n", > + __func__, > intr_pipe.readfd, strerror(errno)); > + return NULL; > } > numfds++; > > @@ -831,9 +837,14 @@ static __attribute__((noreturn)) void * > * into wait list. > */ > if (epoll_ctl(pfd, EPOLL_CTL_ADD, > - src->intr_handle.fd, &ev) < 0){ > - rte_panic("Error adding fd %d epoll_ctl, %s\n", > - src->intr_handle.fd, strerror(errno)); > + src->intr_handle.fd, &ev) < 0) { The alignment changed here, not sure if it was deliberate > + RTE_LOG(CRIT, EAL, > + "%s(): Error adding fd %d " > + "epoll_ctl, %s\n", > + __func__, > + src->intr_handle.fd, > + strerror(errno)); > + return NULL; > } > else > numfds++; > @@ -848,6 +859,8 @@ static __attribute__((noreturn)) void * > */ > close(pfd); > } > + > + return NULL; > } > > int >