From patchwork Thu Mar 2 15:46:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 21137 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 884EAF94C; Thu, 2 Mar 2017 16:49:11 +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 0FB252B9D for ; Thu, 2 Mar 2017 16:48:30 +0100 (CET) Received: from unknown [12.187.104.26] (EHLO nbfkord-smmo02.seg.att.com) by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id fce38b85.2ae02c24c940.1022338.00-2463.2821105.nbfkord-smmo02.seg.att.com (envelope-from ); Thu, 02 Mar 2017 15:48:31 +0000 (UTC) X-MXL-Hash: 58b83ecf336515e8-4c15ac6d9b801add42d642d3618702267ab68b63 Received: from unknown [12.187.104.26] by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with SMTP id cce38b85.0.1022304.00-2362.2821076.nbfkord-smmo02.seg.att.com (envelope-from ); Thu, 02 Mar 2017 15:48:29 +0000 (UTC) X-MXL-Hash: 58b83ecd739bdb09-f43d1bac382c0da332cee0b263b5f5342caa73ac 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; Thu, 2 Mar 2017 07:48:14 -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; Thu, 2 Mar 2017 07:48:14 -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 v22FmDaH032355; Thu, 2 Mar 2017 15:48:13 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 v22FmCJi002456; Thu, 2 Mar 2017 15:48:13 GMT From: Andrew Rybchenko To: CC: Ivan Malov Date: Thu, 2 Mar 2017 15:46:48 +0000 Message-ID: <1488469608-2252-7-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1488469608-2252-1-git-send-email-arybchenko@solarflare.com> References: <1488469608-2252-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=T6yKOq+Q c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==] X-AnalysisOut: [:17 a=6Iz7jQTuP9IA:10 a=pK7X0mNQAAAA:8 a=zRKbQ67AAAAA:8 a=] X-AnalysisOut: [pIvhQVt2svuq2h5lg7cA:9 a=5HA-qpC1VU4iIGLgRoNS:22 a=PA03WX8] X-AnalysisOut: [tBzeizutn5_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 6/6] net/sfc: add support for MCDI proxy 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Ivan Malov The patch is to add support for MCDI proxy which comes in useful, particularly, while running over VF: few commands will normally fail with EPERM, but in some cases the host driver (i.e. running over the corresponding PF, typically, within a hypervisor) may set itself as a proxy to conduct authorization for the commands coming from VFs; these are forwarded to the corresponding access control application which may decline or approve authorization by replying to the requests; all in all, the guest driver has to process the replies forwarded back by the firmware MC in order to give up gracefully (by setting return code which could be understood by 'libefx') or re-issue the original commands Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/efsys.h | 2 +- drivers/net/sfc/sfc.h | 2 ++ drivers/net/sfc/sfc_mcdi.c | 74 ++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 71 insertions(+), 7 deletions(-) diff --git a/drivers/net/sfc/efsys.h b/drivers/net/sfc/efsys.h index 60829be..d52552b 100644 --- a/drivers/net/sfc/efsys.h +++ b/drivers/net/sfc/efsys.h @@ -177,7 +177,7 @@ prefetch_read_once(const volatile void *addr) /* MCDI is required for SFN7xxx and SFN8xx */ #define EFSYS_OPT_MCDI 1 #define EFSYS_OPT_MCDI_LOGGING 1 -#define EFSYS_OPT_MCDI_PROXY_AUTH 0 +#define EFSYS_OPT_MCDI_PROXY_AUTH 1 #define EFSYS_OPT_MAC_STATS 1 diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index 204a054..5c633c8 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -125,6 +125,8 @@ struct sfc_mcdi { enum sfc_mcdi_state state; efx_mcdi_transport_t transport; bool logging; + uint32_t proxy_handle; + efx_rc_t proxy_result; }; struct sfc_intr { diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c index 3bed2e0..43dbf13 100644 --- a/drivers/net/sfc/sfc_mcdi.c +++ b/drivers/net/sfc/sfc_mcdi.c @@ -36,6 +36,7 @@ #include "sfc.h" #include "sfc_log.h" #include "sfc_kvargs.h" +#include "sfc_ev.h" #define SFC_MCDI_POLL_INTERVAL_MIN_US 10 /* 10us in 1us units */ #define SFC_MCDI_POLL_INTERVAL_MAX_US (US_PER_S / 10) /* 100ms in 1us units */ @@ -49,8 +50,22 @@ sfc_mcdi_timeout(struct sfc_adapter *sa) sfc_panic(sa, "MCDI timeout handling is not implemented\n"); } +static inline boolean_t +sfc_mcdi_proxy_event_available(struct sfc_adapter *sa) +{ + struct sfc_mcdi *mcdi = &sa->mcdi; + + mcdi->proxy_handle = 0; + mcdi->proxy_result = ETIMEDOUT; + sfc_ev_mgmt_qpoll(sa); + if (mcdi->proxy_result != ETIMEDOUT) + return B_TRUE; + + return B_FALSE; +} + static void -sfc_mcdi_poll(struct sfc_adapter *sa) +sfc_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy) { efx_nic_t *enp; unsigned int delay_total; @@ -62,13 +77,20 @@ sfc_mcdi_poll(struct sfc_adapter *sa) enp = sa->nic; do { - if (efx_mcdi_request_poll(enp)) + boolean_t poll_completed; + + poll_completed = (proxy) ? sfc_mcdi_proxy_event_available(sa) : + efx_mcdi_request_poll(enp); + if (poll_completed) return; if (delay_total > SFC_MCDI_WATCHDOG_INTERVAL_US) { - aborted = efx_mcdi_request_abort(enp); - SFC_ASSERT(aborted); - sfc_mcdi_timeout(sa); + if (!proxy) { + aborted = efx_mcdi_request_abort(enp); + SFC_ASSERT(aborted); + sfc_mcdi_timeout(sa); + } + return; } @@ -90,13 +112,42 @@ sfc_mcdi_execute(void *arg, efx_mcdi_req_t *emrp) { struct sfc_adapter *sa = (struct sfc_adapter *)arg; struct sfc_mcdi *mcdi = &sa->mcdi; + uint32_t proxy_handle; rte_spinlock_lock(&mcdi->lock); SFC_ASSERT(mcdi->state == SFC_MCDI_INITIALIZED); efx_mcdi_request_start(sa->nic, emrp, B_FALSE); - sfc_mcdi_poll(sa); + sfc_mcdi_poll(sa, B_FALSE); + + if (efx_mcdi_get_proxy_handle(sa->nic, emrp, &proxy_handle) == 0) { + /* + * Authorization is required for the MCDI request; + * wait for an MCDI proxy response event to bring + * a non-zero proxy handle (should be the same as + * the value obtained above) and operation status + */ + sfc_mcdi_poll(sa, B_TRUE); + + if ((mcdi->proxy_handle != 0) && + (mcdi->proxy_handle != proxy_handle)) { + sfc_err(sa, "Unexpected MCDI proxy event"); + emrp->emr_rc = EFAULT; + } else if (mcdi->proxy_result == 0) { + /* + * Authorization succeeded; re-issue the original + * request and poll for an ordinary MCDI response + */ + efx_mcdi_request_start(sa->nic, emrp, B_FALSE); + sfc_mcdi_poll(sa, B_FALSE); + } else { + emrp->emr_rc = mcdi->proxy_result; + sfc_err(sa, "MCDI proxy authorization failed " + "(handle=%08x, result=%d)", + proxy_handle, mcdi->proxy_result); + } + } rte_spinlock_unlock(&mcdi->lock); } @@ -185,6 +236,16 @@ sfc_mcdi_logger(void *arg, efx_log_msg_t type, } } +static void +sfc_mcdi_ev_proxy_response(void *arg, uint32_t handle, efx_rc_t result) +{ + struct sfc_adapter *sa = (struct sfc_adapter *)arg; + struct sfc_mcdi *mcdi = &sa->mcdi; + + mcdi->proxy_handle = handle; + mcdi->proxy_result = result; +} + int sfc_mcdi_init(struct sfc_adapter *sa) { @@ -222,6 +283,7 @@ sfc_mcdi_init(struct sfc_adapter *sa) emtp->emt_ev_cpl = sfc_mcdi_ev_cpl; emtp->emt_exception = sfc_mcdi_exception; emtp->emt_logger = sfc_mcdi_logger; + emtp->emt_ev_proxy_response = sfc_mcdi_ev_proxy_response; sfc_log_init(sa, "init MCDI"); rc = efx_mcdi_init(sa->nic, emtp);