From: Kevin Traynor <ktraynor@redhat.com>
To: "Zhang, Qi Z" <qi.z.zhang@intel.com>,
"Zhao1, Wei" <wei.zhao1@intel.com>,
"Player, Timmons" <Timmons.Player@spirent.com>,
"stable@dpdk.org" <stable@dpdk.org>
Cc: "dev@dpdk.org" <dev@dpdk.org>, "Lu, Wenzhuo" <wenzhuo.lu@intel.com>
Subject: Re: [dpdk-dev] [PATCH v2] net/igb: fix LSC interrupt when using MSI-X
Date: Fri, 14 Dec 2018 17:04:21 +0000 [thread overview]
Message-ID: <6d757bc2-b00e-c3ce-556c-d799caa58f7d@redhat.com> (raw)
In-Reply-To: <039ED4275CED7440929022BC67E70611532E87A4@SHSMSX103.ccr.corp.intel.com>
On 11/20/2018 04:16 AM, Zhang, Qi Z wrote:
>
>
>> -----Original Message-----
>> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhao1, Wei
>> Sent: Monday, November 19, 2018 7:29 PM
>> To: Player, Timmons <Timmons.Player@spirent.com>
>> Cc: dev@dpdk.org; Lu, Wenzhuo <wenzhuo.lu@intel.com>
>> Subject: Re: [dpdk-dev] [PATCH v2] net/igb: fix LSC interrupt when using MSI-X
>>
>> Acked-by: Wei Zhao <wei.zhao1@intel.com>
>
> Applied to dpdk-next-net-intel.
>
This has stable tag and but no Fixes tag. Which stable branch is it
relevant for?
> Thanks
> Qi
>>
>>> -----Original Message-----
>>> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Player, Timmons
>>> Sent: Monday, November 19, 2018 10:49 PM
>>> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>
>>> Cc: dev@dpdk.org; Player, Timmons <Timmons.Player@spirent.com>
>>> Subject: [dpdk-dev] [PATCH v2] net/igb: fix LSC interrupt when using
>>> MSI-X
>>>
>>> Take the 'other interrupt' into account when setting up MSI-X
>>> interrupts and use the proper mask when enabling it.
>>> Also, rearm the MSI-X vector after the LSC interrupt fires.
>>>
>>> This change allows both LSC and RXQ interrupts to work at the same
>>> time when using MSI-X interrupts.
>>>
>>> Signed-off-by: Timmons C. Player <timmons.player@spirent.com>
>>> ---
>>> v2:
>>> * Update igb_intr_{enable,disable} to only touch the 'other interrupt'
>>> when it is explicitly enabled.
>>>
>>> drivers/net/e1000/igb_ethdev.c | 43 +++++++++++++++++++++++++++++-
>>> ----
>>> 1 file changed, 37 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/net/e1000/igb_ethdev.c
>>> b/drivers/net/e1000/igb_ethdev.c index d9d29d22f..87c9aedf2 100644
>>> --- a/drivers/net/e1000/igb_ethdev.c
>>> +++ b/drivers/net/e1000/igb_ethdev.c
>>> @@ -68,6 +68,9 @@
>>> #define E1000_VET_VET_EXT 0xFFFF0000
>>> #define E1000_VET_VET_EXT_SHIFT 16
>>>
>>> +/* MSI-X other interrupt vector */
>>> +#define IGB_MSIX_OTHER_INTR_VEC 0
>>> +
>>> static int eth_igb_configure(struct rte_eth_dev *dev); static int
>>> eth_igb_start(struct rte_eth_dev *dev); static void
>>> eth_igb_stop(struct rte_eth_dev *dev); @@ -138,7 +141,7 @@ static void
>>> igb_vlan_hw_extend_disable(struct rte_eth_dev *dev); static int
>>> eth_igb_led_on(struct rte_eth_dev *dev); static int
>>> eth_igb_led_off(struct rte_eth_dev *dev);
>>>
>>> -static void igb_intr_disable(struct e1000_hw *hw);
>>> +static void igb_intr_disable(struct rte_eth_dev *dev);
>>> static int igb_get_rx_buffer_size(struct e1000_hw *hw); static int
>>> eth_igb_rar_set(struct rte_eth_dev *dev,
>>> struct ether_addr *mac_addr,
>>> @@ -538,14 +541,31 @@ igb_intr_enable(struct rte_eth_dev *dev)
>>> E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
>>> struct e1000_hw *hw =
>>> E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
>>> + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
>>> + struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
>>> +
>>> + if (rte_intr_allow_others(intr_handle) &&
>>> + dev->data->dev_conf.intr_conf.lsc != 0) {
>>> + E1000_WRITE_REG(hw, E1000_EIMS, 1 <<
>>> IGB_MSIX_OTHER_INTR_VEC);
>>> + }
>>>
>>> E1000_WRITE_REG(hw, E1000_IMS, intr->mask);
>>> E1000_WRITE_FLUSH(hw);
>>> }
>>>
>>> static void
>>> -igb_intr_disable(struct e1000_hw *hw)
>>> +igb_intr_disable(struct rte_eth_dev *dev)
>>> {
>>> + struct e1000_hw *hw =
>>> + E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
>>> + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
>>> + struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
>>> +
>>> + if (rte_intr_allow_others(intr_handle) &&
>>> + dev->data->dev_conf.intr_conf.lsc != 0) {
>>> + E1000_WRITE_REG(hw, E1000_EIMC, 1 <<
>>> IGB_MSIX_OTHER_INTR_VEC);
>>> + }
>>> +
>>> E1000_WRITE_REG(hw, E1000_IMC, ~0);
>>> E1000_WRITE_FLUSH(hw);
>>> }
>>> @@ -1486,7 +1506,7 @@ eth_igb_stop(struct rte_eth_dev *dev)
>>>
>>> eth_igb_rxtx_control(dev, false);
>>>
>>> - igb_intr_disable(hw);
>>> + igb_intr_disable(dev);
>>>
>>> /* disable intr eventfd mapping */
>>> rte_intr_disable(intr_handle);
>>> @@ -2768,12 +2788,15 @@ static int eth_igb_rxq_interrupt_setup(struct
>>> rte_eth_dev *dev)
>>> uint32_t mask, regval;
>>> struct e1000_hw *hw =
>>> E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
>>> + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
>>> + struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
>>> + int misc_shift = rte_intr_allow_others(intr_handle) ? 1 : 0;
>>> struct rte_eth_dev_info dev_info;
>>>
>>> memset(&dev_info, 0, sizeof(dev_info));
>>> eth_igb_infos_get(dev, &dev_info);
>>>
>>> - mask = 0xFFFFFFFF >> (32 - dev_info.max_rx_queues);
>>> + mask = (0xFFFFFFFF >> (32 - dev_info.max_rx_queues)) <<
>>> misc_shift;
>>> regval = E1000_READ_REG(hw, E1000_EIMS);
>>> E1000_WRITE_REG(hw, E1000_EIMS, regval | mask);
>>>
>>> @@ -2800,7 +2823,7 @@ eth_igb_interrupt_get_status(struct rte_eth_dev
>>> *dev)
>>> struct e1000_interrupt *intr =
>>> E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
>>>
>>> - igb_intr_disable(hw);
>>> + igb_intr_disable(dev);
>>>
>>> /* read-on-clear nic registers here */
>>> icr = E1000_READ_REG(hw, E1000_ICR); @@ -5583,13 +5606,17 @@
>>> eth_igb_configure_msix_intr(struct rte_eth_dev
>>> *dev)
>>> E1000_GPIE_NSICR);
>>> intr_mask = RTE_LEN2MASK(intr_handle->nb_efd, uint32_t) <<
>>> misc_shift;
>>> +
>>> + if (dev->data->dev_conf.intr_conf.lsc != 0)
>>> + intr_mask |= (1 << IGB_MSIX_OTHER_INTR_VEC);
>>> +
>>> regval = E1000_READ_REG(hw, E1000_EIAC);
>>> E1000_WRITE_REG(hw, E1000_EIAC, regval | intr_mask);
>>>
>>> /* enable msix_other interrupt */
>>> regval = E1000_READ_REG(hw, E1000_EIMS);
>>> E1000_WRITE_REG(hw, E1000_EIMS, regval | intr_mask);
>>> - tmpval = (dev->data->nb_rx_queues | E1000_IVAR_VALID)
>>> << 8;
>>> + tmpval = (IGB_MSIX_OTHER_INTR_VEC | E1000_IVAR_VALID)
>>> << 8;
>>> E1000_WRITE_REG(hw, E1000_IVAR_MISC, tmpval);
>>> }
>>>
>>> @@ -5598,6 +5625,10 @@ eth_igb_configure_msix_intr(struct rte_eth_dev
>>> *dev)
>>> */
>>> intr_mask = RTE_LEN2MASK(intr_handle->nb_efd, uint32_t) <<
>>> misc_shift;
>>> +
>>> + if (dev->data->dev_conf.intr_conf.lsc != 0)
>>> + intr_mask |= (1 << IGB_MSIX_OTHER_INTR_VEC);
>>> +
>>> regval = E1000_READ_REG(hw, E1000_EIAM);
>>> E1000_WRITE_REG(hw, E1000_EIAM, regval | intr_mask);
>>>
>>> --
>>> 2.17.1
>
prev parent reply other threads:[~2018-12-14 17:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-19 14:48 Player, Timmons
2018-11-20 3:29 ` Zhao1, Wei
2018-11-20 4:16 ` Zhang, Qi Z
2018-12-14 17:04 ` Kevin Traynor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6d757bc2-b00e-c3ce-556c-d799caa58f7d@redhat.com \
--to=ktraynor@redhat.com \
--cc=Timmons.Player@spirent.com \
--cc=dev@dpdk.org \
--cc=qi.z.zhang@intel.com \
--cc=stable@dpdk.org \
--cc=wei.zhao1@intel.com \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).