From patchwork Mon Nov 21 15:00:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 17145 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id BEAFFD5DE; Mon, 21 Nov 2016 16:03:34 +0100 (CET) Received: from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com [209.65.160.78]) by dpdk.org (Postfix) with ESMTP id 755D0376D for ; Mon, 21 Nov 2016 16:01:41 +0100 (CET) Received: from unknown [12.187.104.26] by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with SMTP id 45c03385.0.1541303.00-2389.3424247.nbfkord-smmo02.seg.att.com (envelope-from ); Mon, 21 Nov 2016 15:01:41 +0000 (UTC) X-MXL-Hash: 58330c553aaa0c5d-78b4c4c83107bb7e82ee3f86773c9b9b1a9b2a3f Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Mon, 21 Nov 2016 07:01:22 -0800 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25 via Frontend Transport; Mon, 21 Nov 2016 07:01:22 -0800 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id uALF1Kda007216 for ; Mon, 21 Nov 2016 15:01:20 GMT Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id uALF1J3V006765 for ; Mon, 21 Nov 2016 15:01:20 GMT From: Andrew Rybchenko To: Date: Mon, 21 Nov 2016 15:00:54 +0000 Message-ID: <1479740470-6723-41-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1479740470-6723-1-git-send-email-arybchenko@solarflare.com> References: <1479740470-6723-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=UI/baXry c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==] X-AnalysisOut: [:17 a=L24OOQBejmoA:10 a=zRKbQ67AAAAA:8 a=MObbI1fcmjedsUPTp] X-AnalysisOut: [rEA:9 a=PA03WX8tBzeizutn5_OT:22] X-Spam: [F=0.2000000000; CM=0.500; S=0.200(2015072901)] X-MAIL-FROM: X-SOURCE-IP: [12.187.104.26] Subject: [dpdk-dev] [PATCH 40/56] net/sfc: maintain management event queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The event queue is required for device level events (e.g. link status change) and flush events. Provide thread-safe function to poll the event queue since it may be really done from different contexts. Reviewed-by: Andy Moreton Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/efx/sfc.h | 1 + drivers/net/sfc/efx/sfc_ev.c | 50 ++++++++++++++++++++++++++++++++++++++++---- drivers/net/sfc/efx/sfc_ev.h | 2 ++ 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/drivers/net/sfc/efx/sfc.h b/drivers/net/sfc/efx/sfc.h index eb8c071..39f15b1 100644 --- a/drivers/net/sfc/efx/sfc.h +++ b/drivers/net/sfc/efx/sfc.h @@ -144,6 +144,7 @@ struct sfc_adapter { struct sfc_evq_info *evq_info; unsigned int mgmt_evq_index; + rte_spinlock_t mgmt_evq_lock; }; /* diff --git a/drivers/net/sfc/efx/sfc_ev.c b/drivers/net/sfc/efx/sfc_ev.c index aa04b34..1734b1e 100644 --- a/drivers/net/sfc/efx/sfc_ev.c +++ b/drivers/net/sfc/efx/sfc_ev.c @@ -213,6 +213,19 @@ sfc_ev_qpoll(struct sfc_evq *evq) /* Poll-mode driver does not re-prime the event queue for interrupts */ } +void +sfc_ev_mgmt_qpoll(struct sfc_adapter *sa) +{ + if (rte_spinlock_trylock(&sa->mgmt_evq_lock)) { + struct sfc_evq *mgmt_evq = sa->evq_info[sa->mgmt_evq_index].evq; + + if (mgmt_evq->init_state == SFC_EVQ_STARTED) + sfc_ev_qpoll(mgmt_evq); + + rte_spinlock_unlock(&sa->mgmt_evq_lock); + } +} + int sfc_ev_qprime(struct sfc_evq *evq) { @@ -324,13 +337,26 @@ sfc_ev_start(struct sfc_adapter *sa) if (rc != 0) goto fail_ev_init; + /* Start management EVQ used for global events */ + rte_spinlock_lock(&sa->mgmt_evq_lock); + + rc = sfc_ev_qstart(sa, sa->mgmt_evq_index); + if (rc != 0) + goto fail_mgmt_evq_start; + + rte_spinlock_unlock(&sa->mgmt_evq_lock); + /* - * Rx/Tx event queues are started/stopped when corresponding queue - * is started/stopped. + * Rx/Tx event queues are started/stopped when corresponding + * Rx/Tx queue is started/stopped. */ return 0; +fail_mgmt_evq_start: + rte_spinlock_unlock(&sa->mgmt_evq_lock); + efx_ev_fini(sa->nic); + fail_ev_init: sfc_log_init(sa, "failed %d", rc); return rc; @@ -345,8 +371,17 @@ sfc_ev_stop(struct sfc_adapter *sa) /* Make sure that all event queues are stopped */ sw_index = sa->evq_count; - while (--sw_index >= 0) - sfc_ev_qstop(sa, sw_index); + while (--sw_index >= 0) { + if (sw_index == sa->mgmt_evq_index) { + /* Locks are required for the management EVQ */ + rte_spinlock_lock(&sa->mgmt_evq_lock); + sfc_ev_qstop(sa, sa->mgmt_evq_index); + rte_spinlock_unlock(&sa->mgmt_evq_lock); + } else { + sfc_ev_qstop(sa, sw_index); + } + } + efx_ev_fini(sa->nic); } @@ -444,6 +479,7 @@ sfc_ev_init(struct sfc_adapter *sa) sa->evq_count = sfc_ev_qcount(sa); sa->mgmt_evq_index = 0; + rte_spinlock_init(&sa->mgmt_evq_lock); /* Allocate EVQ info array */ rc = ENOMEM; @@ -459,6 +495,11 @@ sfc_ev_init(struct sfc_adapter *sa) goto fail_ev_qinit_info; } + rc = sfc_ev_qinit(sa, sa->mgmt_evq_index, SFC_MGMT_EVQ_ENTRIES, + sa->socket_id); + if (rc != 0) + goto fail_mgmt_evq_init; + /* * Rx/Tx event queues are created/destroyed when corresponding * Rx/Tx queue is created/destroyed. @@ -466,6 +507,7 @@ sfc_ev_init(struct sfc_adapter *sa) return 0; +fail_mgmt_evq_init: fail_ev_qinit_info: while (sw_index-- > 0) sfc_ev_qfini_info(sa, sw_index); diff --git a/drivers/net/sfc/efx/sfc_ev.h b/drivers/net/sfc/efx/sfc_ev.h index 140a436..f7bcf01 100644 --- a/drivers/net/sfc/efx/sfc_ev.h +++ b/drivers/net/sfc/efx/sfc_ev.h @@ -132,6 +132,8 @@ void sfc_ev_qstop(struct sfc_adapter *sa, unsigned int sw_index); int sfc_ev_qprime(struct sfc_evq *evq); void sfc_ev_qpoll(struct sfc_evq *evq); +void sfc_ev_mgmt_qpoll(struct sfc_adapter *sa); + #ifdef __cplusplus } #endif