From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 61323A0C53; Tue, 10 Aug 2021 09:11:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6E9440E6E; Tue, 10 Aug 2021 09:11:16 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 3B2DB4068E for ; Tue, 10 Aug 2021 09:11:15 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10070"; a="212992622" X-IronPort-AV: E=Sophos;i="5.84,309,1620716400"; d="scan'208";a="212992622" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2021 00:11:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,309,1620716400"; d="scan'208";a="638712853" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga005.jf.intel.com with ESMTP; 10 Aug 2021 00:11:01 -0700 Received: from shsmsx604.ccr.corp.intel.com (10.109.6.214) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Tue, 10 Aug 2021 00:11:01 -0700 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by SHSMSX604.ccr.corp.intel.com (10.109.6.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Tue, 10 Aug 2021 15:10:59 +0800 Received: from shsmsx601.ccr.corp.intel.com ([10.109.6.141]) by SHSMSX601.ccr.corp.intel.com ([10.109.6.141]) with mapi id 15.01.2242.010; Tue, 10 Aug 2021 15:10:59 +0800 From: "Zhang, Qi Z" To: "Zhang, RobinX" , "dev@dpdk.org" CC: "Wu, Jingjing" , "Xing, Beilei" , "Guo, Junfeng" , "Yang, SteveX" Thread-Topic: [PATCH] net/iavf: remove interrupt handler Thread-Index: AQHXf5imWYMl/4W9vEWYIWDimQq/4qtsSk2Q Date: Tue, 10 Aug 2021 07:10:59 +0000 Message-ID: <7c4686116bee456e8c18da1e8957ed65@intel.com> References: <20210723074630.193200-1-robinx.zhang@intel.com> In-Reply-To: <20210723074630.193200-1-robinx.zhang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] net/iavf: remove interrupt handler X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" > -----Original Message----- > From: Zhang, RobinX > Sent: Friday, July 23, 2021 3:47 PM > To: dev@dpdk.org > Cc: Wu, Jingjing ; Xing, Beilei ; > Zhang, Qi Z ; Guo, Junfeng ; > Yang, SteveX ; Zhang, RobinX > > Subject: [PATCH] net/iavf: remove interrupt handler As you are not going to remove interrupt handler for all the cases, the tit= le is misleading Better replace it with "enable interrupt polling" >=20 > For VF hosted by Intel 700 series NICs, internal rx interrupt and adminq > interrupt share the same source, that cause a lot cpu cycles be wasted on > interrupt handler on rx path. >=20 > The patch disable pci interrupt and remove the interrupt handler, replace= it > with a low frequency(50ms) interrupt polling daemon which is implemtented= by > registering an alarm callback periodly. >=20 > The virtual channel capability bit VIRTCHNL_VF_OFFLOAD_WB_ON_ITR can be > used to negotiate if iavf PMD needs to enable background alarm or not, so > ideally this change will not impact the case hosted by Intel 800 series N= ICS. >=20 > Suggested-by: Jingjing Wu > Signed-off-by: Qi Zhang No need to add me as the author for this patch but, you can add a reference= to the original i40e commit to explain you implement the same logic. > Signed-off-by: Robin Zhang > --- > drivers/net/iavf/iavf.h | 3 +++ > drivers/net/iavf/iavf_ethdev.c | 37 ++++++++++++++-------------------- > drivers/net/iavf/iavf_vchnl.c | 11 ++++------ > 3 files changed, 22 insertions(+), 29 deletions(-) >=20 > diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index > b3bd078111..771f3b79d7 100644 > --- a/drivers/net/iavf/iavf.h > +++ b/drivers/net/iavf/iavf.h > @@ -69,6 +69,8 @@ > #define IAVF_QUEUE_ITR_INTERVAL_DEFAULT 32 /* 32 us */ > #define IAVF_QUEUE_ITR_INTERVAL_MAX 8160 /* 8160 us */ >=20 > +#define IAVF_ALARM_INTERVAL 50000 /* us */ > + > /* The overhead from MTU to max frame size. > * Considering QinQ packet, the VLAN tag needs to be counted twice. > */ > @@ -372,6 +374,7 @@ int iavf_config_irq_map_lv(struct iavf_adapter > *adapter, uint16_t num, void iavf_add_del_all_mac_addr(struct iavf_adapt= er > *adapter, bool add); int iavf_dev_link_update(struct rte_eth_dev *dev, > __rte_unused int wait_to_complete); > +void iavf_dev_alarm_handler(void *param); > int iavf_query_stats(struct iavf_adapter *adapter, > struct virtchnl_eth_stats **pstats); int > iavf_config_promisc(struct iavf_adapter *adapter, bool enable_unicast, di= ff > --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c i= ndex > 41382c6d66..bbe5b3ddb1 100644 > --- a/drivers/net/iavf/iavf_ethdev.c > +++ b/drivers/net/iavf/iavf_ethdev.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -692,9 +693,9 @@ static int iavf_config_rx_queues_irqs(struct > rte_eth_dev *dev, > */ > vf->msix_base =3D IAVF_MISC_VEC_ID; >=20 > - /* set ITR to max */ > + /* set ITR to default */ > interval =3D iavf_calc_itr_interval( > - IAVF_QUEUE_ITR_INTERVAL_MAX); > + IAVF_QUEUE_ITR_INTERVAL_DEFAULT); > IAVF_WRITE_REG(hw, IAVF_VFINT_DYN_CTL01, > IAVF_VFINT_DYN_CTL01_INTENA_MASK | > (IAVF_ITR_INDEX_DEFAULT << > @@ -853,9 +854,8 @@ iavf_dev_start(struct rte_eth_dev *dev) > PMD_DRV_LOG(ERR, "configure irq failed"); > goto err_queue; > } > - /* re-enable intr again, because efd assign may change */ > + /* only enable interrupt in rx interrupt mode */ > if (dev->data->dev_conf.intr_conf.rxq !=3D 0) { > - rte_intr_disable(intr_handle); > rte_intr_enable(intr_handle); > } >=20 > @@ -889,6 +889,9 @@ iavf_dev_stop(struct rte_eth_dev *dev) >=20 > PMD_INIT_FUNC_TRACE(); >=20 > + if (dev->data->dev_conf.intr_conf.rxq !=3D 0) > + rte_intr_disable(intr_handle); > + > if (adapter->stopped =3D=3D 1) > return 0; >=20 > @@ -1669,8 +1672,6 @@ iavf_dev_rx_queue_intr_enable(struct rte_eth_dev > *dev, uint16_t queue_id) >=20 > IAVF_WRITE_FLUSH(hw); >=20 > - rte_intr_ack(&pci_dev->intr_handle); > - > return 0; > } >=20 > @@ -2201,8 +2202,8 @@ iavf_disable_irq0(struct iavf_hw *hw) > IAVF_WRITE_FLUSH(hw); > } >=20 > -static void > -iavf_dev_interrupt_handler(void *param) > +void > +iavf_dev_alarm_handler(void *param) > { > struct rte_eth_dev *dev =3D (struct rte_eth_dev *)param; > struct iavf_hw *hw =3D > IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private); > @@ -2212,6 +2213,9 @@ iavf_dev_interrupt_handler(void *param) > iavf_handle_virtchnl_msg(dev); >=20 > iavf_enable_irq0(hw); > + > + rte_eal_alarm_set(IAVF_ALARM_INTERVAL, > + iavf_dev_alarm_handler, dev); > } >=20 > static int > @@ -2314,13 +2318,8 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) > rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.addr, > ð_dev->data->mac_addrs[0]); >=20 > - /* register callback func to eal lib */ > - rte_intr_callback_register(&pci_dev->intr_handle, > - iavf_dev_interrupt_handler, > - (void *)eth_dev); > - > - /* enable uio intr after callback register */ > - rte_intr_enable(&pci_dev->intr_handle); > + rte_eal_alarm_set(IAVF_ALARM_INTERVAL, > + iavf_dev_alarm_handler, eth_dev); >=20 > /* configure and enable device interrupt */ > iavf_enable_irq0(hw); > @@ -2341,7 +2340,6 @@ iavf_dev_close(struct rte_eth_dev *dev) { > struct iavf_hw *hw =3D > IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private); > struct rte_pci_device *pci_dev =3D RTE_ETH_DEV_TO_PCI(dev); > - struct rte_intr_handle *intr_handle =3D &pci_dev->intr_handle; > struct iavf_adapter *adapter =3D > IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); > struct iavf_info *vf =3D > IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); > @@ -2364,12 +2362,7 @@ iavf_dev_close(struct rte_eth_dev *dev) > iavf_config_promisc(adapter, false, false); >=20 > iavf_shutdown_adminq(hw); > - /* disable uio intr before callback unregister */ > - rte_intr_disable(intr_handle); > - > - /* unregister callback func from eal lib */ > - rte_intr_callback_unregister(intr_handle, > - iavf_dev_interrupt_handler, dev); > + rte_eal_alarm_cancel(iavf_dev_alarm_handler, dev); > iavf_disable_irq0(hw); >=20 > if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_QOS) diff --git > a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index > 06dc663947..af19dd6412 100644 > --- a/drivers/net/iavf/iavf_vchnl.c > +++ b/drivers/net/iavf/iavf_vchnl.c > @@ -13,6 +13,7 @@ > #include >=20 > #include > +#include > #include > #include > #include > @@ -1663,7 +1664,6 @@ iavf_request_queues(struct iavf_adapter *adapter, > uint16_t num) { > struct rte_eth_dev *dev =3D adapter->eth_dev; > struct iavf_info *vf =3D IAVF_DEV_PRIVATE_TO_VF(adapter); > - struct rte_pci_device *pci_dev =3D RTE_ETH_DEV_TO_PCI(dev); > struct virtchnl_vf_res_request vfres; > struct iavf_cmd_info args; > uint16_t num_queue_pairs; > @@ -1687,13 +1687,10 @@ iavf_request_queues(struct iavf_adapter > *adapter, uint16_t num) > args.out_buffer =3D vf->aq_resp; > args.out_size =3D IAVF_AQ_BUF_SZ; >=20 > - /* > - * disable interrupt to avoid the admin queue message to be read > - * before iavf_read_msg_from_pf. > - */ > - rte_intr_disable(&pci_dev->intr_handle); > + rte_eal_alarm_cancel(iavf_dev_alarm_handler, dev); > err =3D iavf_execute_vf_cmd(adapter, &args); > - rte_intr_enable(&pci_dev->intr_handle); > + rte_eal_alarm_set(IAVF_ALARM_INTERVAL, > + iavf_dev_alarm_handler, dev); > if (err) { > PMD_DRV_LOG(ERR, "fail to execute command > OP_REQUEST_QUEUES"); > return err; > -- > 2.25.1