From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wr0-f175.google.com (mail-wr0-f175.google.com
[209.85.128.175]) by dpdk.org (Postfix) with ESMTP id 154637D9F
for <dev@dpdk.org>; Wed, 24 May 2017 17:20:31 +0200 (CEST)
Received: by mail-wr0-f175.google.com with SMTP id z52so57123481wrc.2
for <dev@dpdk.org>; Wed, 24 May 2017 08:20:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=6wind-com.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:in-reply-to:references;
bh=apXpOxP9f4jwq/R4To7j2A5ufQmg4LX7T8FGEeVpaus=;
b=ZIs51dQ87r1rR7gXJLZW3DYP4fIXf2w+xeO25HpXDBTuGoBHobhyZFRgTCS/Cry36c
TuToS1pbfJy8eydTcu0FE1NLIYM1PICZTRhrgteqTrnG5W63m+Qch3dvOHT8kEcic2A0
T68OhuA9pH6yRa2vXVBUZNZXyT+IemYTOL16GDfV43bb/MMsdJr+NYIdw/P+nNIwx4l+
iQhwZWeJXr7JJ6on/IlC9iuc68IlBtOqISLMwEL98VdzZ602RbVyonhZ7/QF7tue+muv
zcoAvGtX5netBFraZBMjf1/4dbvSgKBaUuSG85OjwaYUtDEiUW0yq5w93JiLVwVdLOB4
9gTg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:in-reply-to:references;
bh=apXpOxP9f4jwq/R4To7j2A5ufQmg4LX7T8FGEeVpaus=;
b=bLHfEENdNZ3tOZ+Me6xE1b6NDcry1Ve8iEN8MpVzy9TSGY8dEghksVL3aupznITO40
g8I/28TNWD+JD2OIs9+YR4u4G9NqqdSEadI7kx7F7dtN0KPhUU/o4GGK9jtpxe9ak/Q6
XuiG3Tp6CFPh5HDOSysO9aOtygZZIy8F/klCV0Wyg94OibyyASmf+vbFsS8IGLmva1u6
Ct99LFY468dn7lWqzh6Y8le7ND3vkBZGfftBfx3TeQB15sGL/7gMMcVksQUNypghDmqJ
ZQminlJXOVeQ7FkyRd+iYwCMCqO/qwJxWF0lM0KZQPho16H6u/kp+VP2xOKj14KzPbb7
WkQw==
X-Gm-Message-State: AODbwcD8VALx9HpOjb4c1PUrC7cpIdNLD9TzGwrSxjjUl3glZbQ/RBeY
xT+/fS3lnrTh3ROa
X-Received: by 10.223.165.94 with SMTP id j30mr22764947wrb.111.1495639231717;
Wed, 24 May 2017 08:20:31 -0700 (PDT)
Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com.
[62.23.145.78])
by smtp.gmail.com with ESMTPSA id t85sm5444271wmt.23.2017.05.24.08.20.30
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Wed, 24 May 2017 08:20:30 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Wed, 24 May 2017 17:20:08 +0200
Message-Id: <70ca3c0c21ab5746f51e9166ebacc15690b38f5f.1495634974.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <cover.1495634974.git.gaetan.rivet@6wind.com>
References: <cover.1495634974.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1495634974.git.gaetan.rivet@6wind.com>
References: <cover.1495634974.git.gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v3 10/11] net/failsafe: support link status
change event
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 24 May 2017 15:20:33 -0000
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
doc/guides/nics/features/failsafe.ini | 1 +
drivers/net/failsafe/failsafe.c | 1 +
drivers/net/failsafe/failsafe_ether.c | 15 +++++++++++++++
drivers/net/failsafe/failsafe_ops.c | 23 +++++++++++++++++++++++
drivers/net/failsafe/failsafe_private.h | 3 +++
5 files changed, 43 insertions(+)
diff --git a/doc/guides/nics/features/failsafe.ini b/doc/guides/nics/features/failsafe.ini
index 257f579..251ce55 100644
--- a/doc/guides/nics/features/failsafe.ini
+++ b/doc/guides/nics/features/failsafe.ini
@@ -5,6 +5,7 @@
;
[Features]
Link status = Y
+Link status event = Y
Queue start/stop = Y
MTU update = Y
Jumbo frame = Y
diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 4d35860..151f823 100644
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -240,6 +240,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
mac->addr_bytes[0], mac->addr_bytes[1],
mac->addr_bytes[2], mac->addr_bytes[3],
mac->addr_bytes[4], mac->addr_bytes[5]);
+ dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
return 0;
free_args:
failsafe_args_free(dev);
diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index bb6fcff..3401a18 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -384,3 +384,18 @@ failsafe_eth_rmv_event_callback(uint8_t port_id __rte_unused,
*/
sdev->remove = 1;
}
+
+void
+failsafe_eth_lsc_event_callback(uint8_t port_id __rte_unused,
+ enum rte_eth_event_type event __rte_unused,
+ void *cb_arg)
+{
+ struct rte_eth_dev *dev = cb_arg;
+ int ret;
+
+ ret = dev->dev_ops->link_update(dev, 0);
+ /* We must pass on the LSC event */
+ if (ret)
+ _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
+ NULL);
+}
diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 2e1c798..05221bc 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -207,6 +207,8 @@ fs_dev_configure(struct rte_eth_dev *dev)
}
FOREACH_SUBDEV(sdev, i, dev) {
int rmv_interrupt = 0;
+ int lsc_interrupt = 0;
+ int lsc_enabled;
if (sdev->state != DEV_PROBED)
continue;
@@ -219,6 +221,17 @@ fs_dev_configure(struct rte_eth_dev *dev)
} else {
DEBUG("sub_device %d does not support RMV event", i);
}
+ lsc_enabled = dev->data->dev_conf.intr_conf.lsc;
+ lsc_interrupt = lsc_enabled &&
+ (ETH(sdev)->data->dev_flags &
+ RTE_ETH_DEV_INTR_LSC);
+ if (lsc_interrupt) {
+ DEBUG("Enabling LSC interrupts for sub_device %d", i);
+ dev->data->dev_conf.intr_conf.lsc = 1;
+ } else if (lsc_enabled && !lsc_interrupt) {
+ DEBUG("Disabling LSC interrupts for sub_device %d", i);
+ dev->data->dev_conf.intr_conf.lsc = 0;
+ }
DEBUG("Configuring sub-device %d", i);
sdev->remove = 0;
ret = rte_eth_dev_configure(PORT_ID(sdev),
@@ -239,6 +252,16 @@ fs_dev_configure(struct rte_eth_dev *dev)
SUB_ID(sdev));
}
dev->data->dev_conf.intr_conf.rmv = 0;
+ if (lsc_interrupt) {
+ ret = rte_eth_dev_callback_register(PORT_ID(sdev),
+ RTE_ETH_EVENT_INTR_LSC,
+ failsafe_eth_lsc_event_callback,
+ dev);
+ if (ret)
+ WARN("Failed to register LSC callback for sub_device %d",
+ SUB_ID(sdev));
+ }
+ dev->data->dev_conf.intr_conf.lsc = lsc_enabled;
sdev->state = DEV_ACTIVE;
}
if (PRIV(dev)->state < DEV_ACTIVE)
diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index ca20109..66303cd 100644
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -180,6 +180,9 @@ void failsafe_dev_remove(struct rte_eth_dev *dev);
void failsafe_eth_rmv_event_callback(uint8_t port_id,
enum rte_eth_event_type type,
void *arg);
+void failsafe_eth_lsc_event_callback(uint8_t port_id,
+ enum rte_eth_event_type event,
+ void *cb_arg);
/* GLOBALS */
--
2.1.4