From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 738755A08 for ; Thu, 5 May 2016 17:38:23 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 05 May 2016 08:38:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,582,1455004800"; d="scan'208";a="799609756" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 05 May 2016 08:38:21 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u45FF68O016505; Thu, 5 May 2016 16:15:06 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id u45FF6VX010052; Thu, 5 May 2016 16:15:06 +0100 Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id u45FF6Iw010048; Thu, 5 May 2016 16:15:06 +0100 From: Bernard Iremonger To: dev@dpdk.org Cc: declan.doherty@intel.com, Bernard Iremonger Date: Thu, 5 May 2016 16:14:56 +0100 Message-Id: <1462461300-9962-2-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1462461300-9962-1-git-send-email-bernard.iremonger@intel.com> References: <1462461300-9962-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH 1/5] bonding: replace spinlock with read/write lock X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2016 15:38:24 -0000 Fixes: a45b288ef21a ("bond: support link status polling") Signed-off-by: Bernard Iremonger --- drivers/net/bonding/rte_eth_bond_api.c | 10 +++--- drivers/net/bonding/rte_eth_bond_pmd.c | 57 +++++++++++++++--------------- drivers/net/bonding/rte_eth_bond_private.h | 6 ++-- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index d3bda35..c77626d 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -227,7 +227,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id) eth_dev->data->drv_name = pmd_bond_driver_name; eth_dev->data->numa_node = socket_id; - rte_spinlock_init(&internals->lock); + rte_rwlock_init(&internals->rwlock); internals->port_id = eth_dev->data->port_id; internals->mode = BONDING_MODE_INVALID; @@ -451,11 +451,11 @@ rte_eth_bond_slave_add(uint8_t bonded_port_id, uint8_t slave_port_id) bonded_eth_dev = &rte_eth_devices[bonded_port_id]; internals = bonded_eth_dev->data->dev_private; - rte_spinlock_lock(&internals->lock); + rte_rwlock_write_lock(&internals->rwlock); retval = __eth_bond_slave_add_lock_free(bonded_port_id, slave_port_id); - rte_spinlock_unlock(&internals->lock); + rte_rwlock_write_unlock(&internals->rwlock); return retval; } @@ -553,11 +553,11 @@ rte_eth_bond_slave_remove(uint8_t bonded_port_id, uint8_t slave_port_id) bonded_eth_dev = &rte_eth_devices[bonded_port_id]; internals = bonded_eth_dev->data->dev_private; - rte_spinlock_lock(&internals->lock); + rte_rwlock_write_lock(&internals->rwlock); retval = __eth_bond_slave_remove_lock_free(bonded_port_id, slave_port_id); - rte_spinlock_unlock(&internals->lock); + rte_rwlock_write_unlock(&internals->rwlock); return retval; } diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 129f04b..ed6245b 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1750,37 +1750,36 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg) !internals->link_status_polling_enabled) return; - /* If device is currently being configured then don't check slaves link - * status, wait until next period */ - if (rte_spinlock_trylock(&internals->lock)) { - if (internals->slave_count > 0) - polling_slave_found = 0; + rte_rwlock_read_lock(&internals->rwlock); + if (internals->slave_count > 0) + polling_slave_found = 0; - for (i = 0; i < internals->slave_count; i++) { - if (!internals->slaves[i].link_status_poll_enabled) - continue; - - slave_ethdev = &rte_eth_devices[internals->slaves[i].port_id]; - polling_slave_found = 1; - - /* Update slave link status */ - (*slave_ethdev->dev_ops->link_update)(slave_ethdev, - internals->slaves[i].link_status_wait_to_complete); - - /* if link status has changed since last checked then call lsc - * event callback */ - if (slave_ethdev->data->dev_link.link_status != - internals->slaves[i].last_link_status) { - internals->slaves[i].last_link_status = - slave_ethdev->data->dev_link.link_status; - - bond_ethdev_lsc_event_callback(internals->slaves[i].port_id, - RTE_ETH_EVENT_INTR_LSC, - &bonded_ethdev->data->port_id); - } + for (i = 0; i < internals->slave_count; i++) { + if (!internals->slaves[i].link_status_poll_enabled) + continue; + + slave_ethdev = &rte_eth_devices[internals->slaves[i].port_id]; + polling_slave_found = 1; + + /* Update slave link status */ + (*slave_ethdev->dev_ops->link_update)(slave_ethdev, + internals->slaves[i].link_status_wait_to_complete); + + /* if link status has changed since last checked then call lsc + * event callback + */ + if (slave_ethdev->data->dev_link.link_status != + internals->slaves[i].last_link_status) { + internals->slaves[i].last_link_status = + slave_ethdev->data->dev_link.link_status; + + bond_ethdev_lsc_event_callback( + internals->slaves[i].port_id, + RTE_ETH_EVENT_INTR_LSC, + &bonded_ethdev->data->port_id); } - rte_spinlock_unlock(&internals->lock); } + rte_rwlock_read_unlock(&internals->rwlock); if (polling_slave_found) /* Set alarm to continue monitoring link status of slave ethdev's */ diff --git a/drivers/net/bonding/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h index 8312397..72ea679 100644 --- a/drivers/net/bonding/rte_eth_bond_private.h +++ b/drivers/net/bonding/rte_eth_bond_private.h @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ #define _RTE_ETH_BOND_PRIVATE_H_ #include -#include +#include #include "rte_eth_bond.h" #include "rte_eth_bond_8023ad_private.h" @@ -115,7 +115,7 @@ struct bond_dev_private { uint8_t port_id; /**< Port Id of Bonded Port */ uint8_t mode; /**< Link Bonding Mode */ - rte_spinlock_t lock; + rte_rwlock_t rwlock; uint8_t primary_port; /**< Primary Slave Port */ uint8_t current_primary_port; /**< Primary Slave Port */ -- 2.6.3