[dpdk-dev] [PATCH] ixgbe_vf: Fix getting link state

[dpdk-dev] [PATCH] ixgbe_vf: Fix getting link state

[Balazs Nemeth]

This patch fixes checking the link state of a virtual function. If the
state has already been checked, it does not need to be checked
again. Previously, get_link_status in the ixgbe_hw struct was
used to track if the information had already been updated, but this
field was always set to false.

Signed-off-by: Balazs Nemeth <balazs.nemeth@intel.com>
---
 lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h |  2 +-
 lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.c   | 14 ++++++++------
 lib/librte_pmd_ixgbe/ixgbe_ethdev.c     |  8 +++++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h
index c67d462..07bba75 100644
--- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h
+++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h
@@ -3573,7 +3573,7 @@ struct ixgbe_mac_info {
 	u32 max_rx_queues;
 	u32 orig_autoc;
 	u8  san_mac_rar_index;
-	bool get_link_status;
+	bool have_link_status;
 	u32 orig_autoc2;
 	u16 max_msix_vectors;
 	bool arc_subsystem_valid;
diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.c b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.c
index e6b6c51..6cc7d7f 100644
--- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.c
+++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.c
@@ -550,10 +550,13 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
 	UNREFERENCED_1PARAMETER(autoneg_wait_to_complete);
 
 	/* If we were hit with a reset drop the link */
-	if (!mbx->ops.check_for_rst(hw, 0) || !mbx->timeout)
-		mac->get_link_status = true;
+	if (!mbx->ops.check_for_rst(hw, 0) || !mbx->timeout) {
+		mac->have_link_status = false;
+		ret_val = -1;
+		goto out;
+	}
 
-	if (!mac->get_link_status)
+	if (mac->have_link_status)
 		goto out;
 
 	/* if link status is down no point in checking to see if pf is up */
@@ -610,10 +613,10 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
 	/* if we passed all the tests above then the link is up and we no
 	 * longer need to check for link
 	 */
-	mac->get_link_status = false;
+	mac->have_link_status = true;
 
 out:
-	*link_up = !mac->get_link_status;
+	*link_up = mac->have_link_status;
 	return ret_val;
 }
 
@@ -722,4 +725,3 @@ int ixgbevf_get_queues(struct ixgbe_hw *hw, unsigned int *num_tcs,
 
 	return err;
 }
-
diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index 9401916..8e622ee 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -2064,7 +2064,7 @@ ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 {
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct rte_eth_link link, old;
-	ixgbe_link_speed link_speed;
+	ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
 	int link_up;
 	int diag;
 
@@ -2088,6 +2088,12 @@ ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 		return 0;
 	}
 
+	if (link_speed == IXGBE_LINK_SPEED_UNKNOWN &&
+	    hw->mac.have_link_status) {
+		memcpy(&link, &old, sizeof(link));
+		return 0;
+	}
+
 	if (link_up == 0) {
 		rte_ixgbe_dev_atomic_write_link_status(dev, &link);
 		if (link.link_status == old.link_status)
-- 
2.1.3

Re: [dpdk-dev] [PATCH] ixgbe_vf: Fix getting link state

[Thomas Monjalon]

2014-12-17 13:22, Balazs Nemeth:
> This patch fixes checking the link state of a virtual function. If the
> state has already been checked, it does not need to be checked
> again. Previously, get_link_status in the ixgbe_hw struct was
> used to track if the information had already been updated, but this
> field was always set to false.
> 
> Signed-off-by: Balazs Nemeth <balazs.nemeth@intel.com>

This is the third patch about link status fix in ixgbevf.
Please comment the other ones in the respective mailing threads:
	http://dpdk.org/dev/patchwork/patch/1079
	http://dpdk.org/dev/patchwork/patch/1224
Are they superseded by yours?

-- 
Thomas

Re: [dpdk-dev] [PATCH] ixgbe_vf: Fix getting link state

[Choonho Son]

DPDK pmd code should have the consistency with original network device
driver code.

Linux kernel driver                    ---> DPDK pmd driver
-----------------------------------------------------------------------
ixgbevf_check_mac_link_vf()    ixgbe_check_mac_link_vf()
 at ixgbevf/vf.c                            at
librte_pmd_ixgbe/ixgbe/ixgbe_vf.c

ixgbevf_get_settings()              ixgbe_dev_link_update()
 at ixgbevf/ethtool.c                    at librte_pmd_ixgbe/ixgbe_ethdev.c


In a original device driver, detection link status called by
ixgbevf_get_settings()

        hw->mac.get_link_status = 1;
        hw->mac.ops.check_link(hw, &link_speed, &link_up, false);

Changing ixgbevf_check_mac_link_vf() will break consistency with original
code.



@ {Linux kernel}/drivers/net/ethernet/intel/ixgbevf/vf.c
static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw,
                                     ixgbe_link_speed *speed,
                                     bool *link_up,
                                     bool autoneg_wait_to_complete)
{
        struct ixgbe_mbx_info *mbx = &hw->mbx;
        struct ixgbe_mac_info *mac = &hw->mac;
        s32 ret_val = 0;
        u32 links_reg;
        u32 in_msg = 0;

        /* If we were hit with a reset drop the link */
        if (!mbx->ops.check_for_rst(hw) || !mbx->timeout)
                mac->get_link_status = true;

        if (!mac->get_link_status)
                goto out;



@ {DPDK}/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.c
s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
                bool *link_up, bool autoneg_wait_to_complete)
{
    struct ixgbe_mbx_info *mbx = &hw->mbx;
    struct ixgbe_mac_info *mac = &hw->mac;
    s32 ret_val = IXGBE_SUCCESS;
    u32 links_reg;
    u32 in_msg = 0;
    UNREFERENCED_1PARAMETER(autoneg_wait_to_complete);

    /* If we were hit with a reset drop the link */
    if (!mbx->ops.check_for_rst(hw, 0) || !mbx->timeout)
        mac->get_link_status = true;

    if (!mac->get_link_status)
        goto out;



@ {Linux kernel}/drivers/net/ethernet/intel/ixgbevf/ethtool.c
static int ixgbevf_get_settings(struct net_device *netdev,
                                struct ethtool_cmd *ecmd)
{
        struct ixgbevf_adapter *adapter = netdev_priv(netdev);
        struct ixgbe_hw *hw = &adapter->hw;
        u32 link_speed = 0;
        bool link_up;

        ecmd->supported = SUPPORTED_10000baseT_Full;
        ecmd->autoneg = AUTONEG_DISABLE;
        ecmd->transceiver = XCVR_DUMMY1;
        ecmd->port = -1;

        hw->mac.get_link_status = 1;
        hw->mac.ops.check_link(hw, &link_speed, &link_up, false);

        if (link_up) {
                __u32 speed = SPEED_10000;
                switch (link_speed) {



@ {DPDK}/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
/* return 0 means link status changed, -1 means not changed */
static int
ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{
    struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
    struct rte_eth_link link, old;
    ixgbe_link_speed link_speed;
    int link_up;
    int diag;

    link.link_status = 0;
    link.link_speed = 0;
    link.link_duplex = 0;
    memset(&old, 0, sizeof(old));
    rte_ixgbe_dev_atomic_read_link_status(dev, &old);

    /* check if it needs to wait to complete, if lsc interrupt is enabled */
    if (wait_to_complete == 0 || dev->data->dev_conf.intr_conf.lsc != 0)
        diag = ixgbe_check_link(hw, &link_speed, &link_up, 0);
    else
        diag = ixgbe_check_link(hw, &link_speed, &link_up, 1);
    if (diag != 0) {
        link.link_speed = ETH_LINK_SPEED_100;
        link.link_duplex = ETH_LINK_HALF_DUPLEX;





2014-12-17 22:24 GMT+09:00 Thomas Monjalon <thomas.monjalon@6wind.com>:
>
> 2014-12-17 13:22, Balazs Nemeth:
> > This patch fixes checking the link state of a virtual function. If the
> > state has already been checked, it does not need to be checked
> > again. Previously, get_link_status in the ixgbe_hw struct was
> > used to track if the information had already been updated, but this
> > field was always set to false.
> >
> > Signed-off-by: Balazs Nemeth <balazs.nemeth@intel.com>
>
> This is the third patch about link status fix in ixgbevf.
> Please comment the other ones in the respective mailing threads:
>         http://dpdk.org/dev/patchwork/patch/1079
>         http://dpdk.org/dev/patchwork/patch/1224
> Are they superseded by yours?
>
> --
> Thomas
>

[dpdk-dev] [PATCH v2] ixgbe_vf: Fix getting link state

[Balazs Nemeth]

This patch fixes checking the link state of a virtual function. If the
state has already been checked, it does not need to be checked
again. Previously, get_link_status in the ixgbe_hw struct was used to
track if the information had already been retrieved, but this field
was always set to false (signifying that the information was
up-to-date). The problem was introduced by commit 8ef32003 which was
part of a patch set to update the ixgbe portion of the PMD. This patch
does not break consistency with the ixgbevf driver. Instead, it fixes
the problem at the level of DPDK.

Applications that rely on the reported link speed could fail without
this patch. The qos_sched example application provided with DPDK did
not run when virtual functions were used. The output for this example
application is shown below:

EAL: Error - exiting with code: 1
  Cause: Unable to config sched subport 0, err=-2

The problem and the effect of the patch can been seen by running the
l2fwd example application using the following command:

sudo ./build/l2fwd -c 0x3 -n 4 -- -p 0x3 -T 0

Before the patch has been applied (with both links up):
...
Checking link statusdone
Port 0 Link Up - speed 100 Mbps - half-duplex

Port 1 Link Up - speed 100 Mbps - half-duplex

L2FWD: entering main loop on lcore 1
...

After the patch has been applied (with both links up):
...
Checking link statusdone
Port 0 Link Up - speed 10000 Mbps - full-duplex
Port 1 Link Up - speed 10000 Mbps - full-duplex
L2FWD: entering main loop on lcore 1
...

Before the patch has been applied (with link 0 down, link 1 up):
...
Checking link statusdone
Port 0 Link Up - speed 100 Mbps - half-duplex

Port 1 Link Up - speed 100 Mbps - half-duplex

L2FWD: entering main loop on lcore 1
...

After the patch has been applied (with link 0 down, link 1 up):
...
Checking link status............................................................
..............................done
Port 0 Link Down
Port 1 Link Up - speed 10000 Mbps - full-duplex
...

Signed-off-by: Balazs Nemeth <balazs.nemeth@intel.com>
---

changes v2:
* Include more elaborate explanation of the problem in the commit message
* Fix the issue at the level of DPDK not touching ixgbe driver code

 lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index 9401916..22227e6 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -1469,6 +1469,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	if (status != 0)
 		return -1;
 	hw->mac.ops.start_hw(hw);
+	hw->mac.get_link_status = true;

 	/* configure PF module if SRIOV enabled */
 	ixgbe_pf_host_configure(dev);
@@ -2064,7 +2065,7 @@ ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 {
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct rte_eth_link link, old;
-	ixgbe_link_speed link_speed;
+	ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
 	int link_up;
 	int diag;

@@ -2088,6 +2089,12 @@ ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 		return 0;
 	}

+	if (link_speed == IXGBE_LINK_SPEED_UNKNOWN &&
+	    !hw->mac.get_link_status) {
+		memcpy(&link, &old, sizeof(link));
+		return -1;
+	}
+
 	if (link_up == 0) {
 		rte_ixgbe_dev_atomic_write_link_status(dev, &link);
 		if (link.link_status == old.link_status)
@@ -2926,6 +2933,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)
 	PMD_INIT_FUNC_TRACE();

 	hw->mac.ops.reset_hw(hw);
+	hw->mac.get_link_status = true;

 	/* negotiate mailbox API version to use with the PF. */
 	ixgbevf_negotiate_api(hw);
--
2.1.3

Re: [dpdk-dev] [PATCH v2] ixgbe_vf: Fix getting link state

[Gonzalez Monroy, Sergio]

> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Balazs Nemeth
> Sent: Thursday, December 18, 2014 5:57 PM
> To: dev@dpdk.org
> Cc: Nemeth, Balazs
> Subject: [dpdk-dev] [PATCH v2] ixgbe_vf: Fix getting link state
> 
> This patch fixes checking the link state of a virtual function. If the state has
> already been checked, it does not need to be checked again. Previously,
> get_link_status in the ixgbe_hw struct was used to track if the information
> had already been retrieved, but this field was always set to false (signifying
> that the information was up-to-date). The problem was introduced by
> commit 8ef32003 which was part of a patch set to update the ixgbe portion of
> the PMD. This patch does not break consistency with the ixgbevf driver.
> Instead, it fixes the problem at the level of DPDK.
> 
> Applications that rely on the reported link speed could fail without this patch.
> The qos_sched example application provided with DPDK did not run when
> virtual functions were used. The output for this example application is shown
> below:
> 
> EAL: Error - exiting with code: 1
>   Cause: Unable to config sched subport 0, err=-2
> 
> The problem and the effect of the patch can been seen by running the l2fwd
> example application using the following command:
> 
> sudo ./build/l2fwd -c 0x3 -n 4 -- -p 0x3 -T 0
> 
> Before the patch has been applied (with both links up):
> ...
> Checking link statusdone
> Port 0 Link Up - speed 100 Mbps - half-duplex
> 
> Port 1 Link Up - speed 100 Mbps - half-duplex
> 
> L2FWD: entering main loop on lcore 1
> ...
> 
> After the patch has been applied (with both links up):
> ...
> Checking link statusdone
> Port 0 Link Up - speed 10000 Mbps - full-duplex Port 1 Link Up - speed 10000
> Mbps - full-duplex
> L2FWD: entering main loop on lcore 1
> ...
> 
> Before the patch has been applied (with link 0 down, link 1 up):
> ...
> Checking link statusdone
> Port 0 Link Up - speed 100 Mbps - half-duplex
> 
> Port 1 Link Up - speed 100 Mbps - half-duplex
> 
> L2FWD: entering main loop on lcore 1
> ...
> 
> After the patch has been applied (with link 0 down, link 1 up):
> ...
> Checking link status............................................................
> ..............................done
> Port 0 Link Down
> Port 1 Link Up - speed 10000 Mbps - full-duplex ...
> 
> Signed-off-by: Balazs Nemeth <balazs.nemeth@intel.com>
> ---
> 
> changes v2:
> * Include more elaborate explanation of the problem in the commit message
> * Fix the issue at the level of DPDK not touching ixgbe driver code
> 
>  lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 

Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>

Re: [dpdk-dev] [PATCH v2] ixgbe_vf: Fix getting link state

[Thomas Monjalon]

> > This patch fixes checking the link state of a virtual function. If the state has
> > already been checked, it does not need to be checked again. Previously,
> > get_link_status in the ixgbe_hw struct was used to track if the information
> > had already been retrieved, but this field was always set to false (signifying
> > that the information was up-to-date). The problem was introduced by
> > commit 8ef32003 which was part of a patch set to update the ixgbe portion of
> > the PMD. This patch does not break consistency with the ixgbevf driver.
> > Instead, it fixes the problem at the level of DPDK.
> > 
> > Applications that rely on the reported link speed could fail without this patch.
> > The qos_sched example application provided with DPDK did not run when
> > virtual functions were used. The output for this example application is shown
> > below:
> > 
> > EAL: Error - exiting with code: 1
> >   Cause: Unable to config sched subport 0, err=-2
> > 
> > The problem and the effect of the patch can been seen by running the l2fwd
> > example application using the following command:
> > 
> > sudo ./build/l2fwd -c 0x3 -n 4 -- -p 0x3 -T 0
> > 
> > Before the patch has been applied (with both links up):
> > ...
> > Checking link statusdone
> > Port 0 Link Up - speed 100 Mbps - half-duplex
> > 
> > Port 1 Link Up - speed 100 Mbps - half-duplex
> > 
> > L2FWD: entering main loop on lcore 1
> > ...
> > 
> > After the patch has been applied (with both links up):
> > ...
> > Checking link statusdone
> > Port 0 Link Up - speed 10000 Mbps - full-duplex Port 1 Link Up - speed 10000
> > Mbps - full-duplex
> > L2FWD: entering main loop on lcore 1
> > ...
> > 
> > Before the patch has been applied (with link 0 down, link 1 up):
> > ...
> > Checking link statusdone
> > Port 0 Link Up - speed 100 Mbps - half-duplex
> > 
> > Port 1 Link Up - speed 100 Mbps - half-duplex
> > 
> > L2FWD: entering main loop on lcore 1
> > ...
> > 
> > After the patch has been applied (with link 0 down, link 1 up):
> > ...
> > Checking link status............................................................
> > ..............................done
> > Port 0 Link Down
> > Port 1 Link Up - speed 10000 Mbps - full-duplex ...
> > 
> > Signed-off-by: Balazs Nemeth <balazs.nemeth@intel.com>
> > ---
> > 
> > changes v2:
> > * Include more elaborate explanation of the problem in the commit message
> > * Fix the issue at the level of DPDK not touching ixgbe driver code
> > 
> >  lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 10 +++++++++-
> >  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>

Applied

Thanks
-- 
Thomas