Re: [RFC Patch net-next v2 2/8] r8169: add support for multi irqs

[Vadim Fedorenko]

[...]

>   static int rtl_alloc_irq(struct rtl8169_private *tp)
>   {
> +	struct pci_dev *pdev = tp->pci_dev;
>   	unsigned int flags;
> +	int nvecs = 1;

nit: unneeded initialization

>   
>   	switch (tp->mac_version) {
>   	case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06:
> @@ -5402,7 +5519,15 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
>   		break;
>   	}
>   
> -	return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags);
> +	nvecs = pci_alloc_irq_vectors(pdev, tp->min_irq_nvecs, tp->max_irq_nvecs, flags);

for RTL8127 you try to allocate 30 to 32 IRQ vectors here...

> +
> +	if (nvecs < 0)
> +		nvecs = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
> +
> +	tp->irq = pdev->irq;
> +	tp->irq_nvecs = 1;

.. but completely ignores the result here. why?

> +
> +	return nvecs;
>   }
>   
>   static void rtl_read_mac_address(struct rtl8169_private *tp,
> @@ -5597,6 +5722,18 @@ static void rtl_hw_initialize(struct rtl8169_private *tp)
>   	}
>   }
>   
> +static int rtl8169_set_real_num_queue(struct rtl8169_private *tp)
> +{
> +	int retval;
> +
> +	retval = netif_set_real_num_tx_queues(tp->dev, 1);
> +	if (retval < 0)
> +		return retval;
> +
> +	retval = netif_set_real_num_rx_queues(tp->dev, tp->num_rx_rings);
> +	return retval;

simply
	return netif_set_real_num_rx_queues(tp->dev, tp->num_rx_rings);

> +}
> +
>   static int rtl_jumbo_max(struct rtl8169_private *tp)
>   {
>   	/* Non-GBit versions don't support jumbo frames */
> @@ -5657,6 +5794,19 @@ static bool rtl_aspm_is_safe(struct rtl8169_private *tp)
>   	return false;
>   }
>   
> +static void r8169_init_napi(struct rtl8169_private *tp)
> +{
> +	for (int i = 0; i < tp->irq_nvecs; i++) {
> +		struct rtl8169_napi *r8169napi = &tp->r8169napi[i];
> +		int (*poll)(struct napi_struct *napi, int budget);
> +
> +		poll = rtl8169_poll;
> +		netif_napi_add(tp->dev, &r8169napi->napi, poll);
> +		r8169napi->priv = tp;
> +		r8169napi->index = i;
> +	}
> +}
> +
>   static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>   {
>   	const struct rtl_chip_info *chip;
> @@ -5761,11 +5911,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>   
>   	rtl_hw_reset(tp);
>   
> +	rtl_software_parameter_initialize(tp);
> +
>   	rc = rtl_alloc_irq(tp);
>   	if (rc < 0)
>   		return dev_err_probe(&pdev->dev, rc, "Can't allocate interrupt\n");

positive rc value (which is the allocated irq vectors) is lost here.

>   
> -	tp->irq = pci_irq_vector(pdev, 0);
>   
>   	INIT_WORK(&tp->wk.work, rtl_task);
>   	disable_work(&tp->wk.work);
> @@ -5774,7 +5925,13 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>   
>   	dev->ethtool_ops = &rtl8169_ethtool_ops;
>   
> -	netif_napi_add(dev, &tp->napi, rtl8169_poll);
> +	if (!tp->rss_support) {
> +		netif_napi_add(dev, &tp->r8169napi[0].napi, rtl8169_poll);
> +		tp->r8169napi[0].priv = tp;
> +		tp->r8169napi[0].index = 0;
> +	} else {
> +		r8169_init_napi(tp);
> +	}
>   
>   	dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
>   			   NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
> @@ -5836,6 +5993,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>   	if (jumbo_max)
>   		dev->max_mtu = jumbo_max;
>   
> +	rc = rtl8169_set_real_num_queue(tp);
> +	if (rc < 0)
> +		return dev_err_probe(&pdev->dev, rc, "set tx/rx num failure\n");
> +
>   	rtl_set_irq_mask(tp);
>   
>   	tp->counters = dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters),