DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH v7 5/9] null: virtual dynamic rss configuration
@ 2015-10-30 13:56 Tomasz Kulasek
  0 siblings, 0 replies; 2+ messages in thread
From: Tomasz Kulasek @ 2015-10-30 13:56 UTC (permalink / raw)
  To: dev

Date: Fri, 30 Oct 2015 14:56:00 +0100
Message-Id: <1446213364-11856-6-git-send-email-tomaszx.kulasek@intel.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <1446213364-11856-1-git-send-email-tomaszx.kulasek@intel.com>
References: <1444989651-6236-1-git-send-email-tomaszx.kulasek@intel.com>
 <1446213364-11856-1-git-send-email-tomaszx.kulasek@intel.com>

This implementation allows to set and read RSS configuration for null

device, and is used to validate right values propagation over the slaves,

in test units for dynamic RSS configuration for bonding.



v6 changes:

 - reordered with patch 4/9

 - recreated due to the changes in patch 4/9



v5 changes:

 - replaced memcpy with rte_memcpy



Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>

Acked-by: Tetsuya Mukawa <mukawa@igel.co.jp>

---

 drivers/net/null/rte_eth_null.c |  115 +++++++++++++++++++++++++++++++++++++++

 1 file changed, 115 insertions(+)



diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c

index 236d998..64e9000 100644

--- a/drivers/net/null/rte_eth_null.c

+++ b/drivers/net/null/rte_eth_null.c

@@ -37,6 +37,7 @@

 #include <rte_memcpy.h>

 #include <rte_dev.h>

 #include <rte_kvargs.h>

+#include <rte_spinlock.h>

 

 #include "rte_eth_null.h"

 

@@ -75,6 +76,17 @@ struct pmd_internals {

 

 	struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];

 	struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];

+

+	/** Bit mask of RSS offloads, the bit offset also means flow type */

+	uint64_t flow_type_rss_offloads;

+

+	rte_spinlock_t rss_lock;

+

+	uint16_t reta_size;

+	struct rte_eth_rss_reta_entry64 reta_conf[ETH_RSS_RETA_SIZE_128 /

+			RTE_RETA_GROUP_SIZE];

+

+	uint8_t rss_key[40];                /**< 40-byte hash key. */

 };

 

 

@@ -295,6 +307,8 @@ eth_dev_info(struct rte_eth_dev *dev,

 	dev_info->max_tx_queues = RTE_DIM(internals->tx_null_queues);

 	dev_info->min_rx_bufsize = 0;

 	dev_info->pci_dev = NULL;

+	dev_info->reta_size = internals->reta_size;

+	dev_info->flow_type_rss_offloads = internals->flow_type_rss_offloads;

 }

 

 static void

@@ -375,6 +389,91 @@ static int

 eth_link_update(struct rte_eth_dev *dev __rte_unused,

 		int wait_to_complete __rte_unused) { return 0; }

 

+static int

+eth_rss_reta_update(struct rte_eth_dev *dev,

+		struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size)

+{

+	int i, j;

+	struct pmd_internals *internal = dev->data->dev_private;

+

+	if (reta_size != internal->reta_size)

+		return -EINVAL;

+

+	rte_spinlock_lock(&internal->rss_lock);

+

+	/* Copy RETA table */

+	for (i = 0; i < (internal->reta_size / RTE_RETA_GROUP_SIZE); i++) {

+		internal->reta_conf[i].mask = reta_conf[i].mask;

+		for (j = 0; j < RTE_RETA_GROUP_SIZE; j++)

+			if ((reta_conf[i].mask >> j) & 0x01)

+				internal->reta_conf[i].reta[j] = reta_conf[i].reta[j];

+	}

+

+	rte_spinlock_unlock(&internal->rss_lock);

+

+	return 0;

+}

+

+static int

+eth_rss_reta_query(struct rte_eth_dev *dev,

+		struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size)

+{

+	int i, j;

+	struct pmd_internals *internal = dev->data->dev_private;

+

+	if (reta_size != internal->reta_size)

+		return -EINVAL;

+

+	rte_spinlock_lock(&internal->rss_lock);

+

+	/* Copy RETA table */

+	for (i = 0; i < (internal->reta_size / RTE_RETA_GROUP_SIZE); i++) {

+		for (j = 0; j < RTE_RETA_GROUP_SIZE; j++)

+			if ((reta_conf[i].mask >> j) & 0x01)

+				reta_conf[i].reta[j] = internal->reta_conf[i].reta[j];

+	}

+

+	rte_spinlock_unlock(&internal->rss_lock);

+

+	return 0;

+}

+

+static int

+eth_rss_hash_update(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf)

+{

+	struct pmd_internals *internal = dev->data->dev_private;

+

+	rte_spinlock_lock(&internal->rss_lock);

+

+	if ((rss_conf->rss_hf & internal->flow_type_rss_offloads) != 0)

+		dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf =

+				rss_conf->rss_hf & internal->flow_type_rss_offloads;

+

+	if (rss_conf->rss_key)

+		rte_memcpy(internal->rss_key, rss_conf->rss_key, 40);

+

+	rte_spinlock_unlock(&internal->rss_lock);

+

+	return 0;

+}

+

+static int

+eth_rss_hash_conf_get(struct rte_eth_dev *dev,

+		struct rte_eth_rss_conf *rss_conf)

+{

+	struct pmd_internals *internal = dev->data->dev_private;

+

+	rte_spinlock_lock(&internal->rss_lock);

+

+	rss_conf->rss_hf = dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf;

+	if (rss_conf->rss_key)

+		rte_memcpy(rss_conf->rss_key, internal->rss_key, 40);

+

+	rte_spinlock_unlock(&internal->rss_lock);

+

+	return 0;

+}

+

 static const struct eth_dev_ops ops = {

 	.dev_start = eth_dev_start,

 	.dev_stop = eth_dev_stop,

@@ -387,6 +486,10 @@ static const struct eth_dev_ops ops = {

 	.link_update = eth_link_update,

 	.stats_get = eth_stats_get,

 	.stats_reset = eth_stats_reset,

+	.reta_update = eth_rss_reta_update,

+	.reta_query = eth_rss_reta_query,

+	.rss_hash_update = eth_rss_hash_update,

+	.rss_hash_conf_get = eth_rss_hash_conf_get

 };

 

 int

@@ -402,6 +505,13 @@ eth_dev_null_create(const char *name,

 	struct pmd_internals *internals = NULL;

 	struct rte_eth_dev *eth_dev = NULL;

 

+	static const uint8_t default_rss_key[40] = {

+		0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2, 0x41, 0x67, 0x25, 0x3D,

+		0x43, 0xA3, 0x8F, 0xB0, 0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4,

+		0x77, 0xCB, 0x2D, 0xA3, 0x80, 0x30, 0xF2, 0x0C, 0x6A, 0x42, 0xB7, 0x3B,

+		0xBE, 0xAC, 0x01, 0xFA

+	};

+

 	if (name == NULL)

 		return -EINVAL;

 

@@ -443,6 +553,11 @@ eth_dev_null_create(const char *name,

 	internals->packet_copy = packet_copy;

 	internals->numa_node = numa_node;

 

+	internals->flow_type_rss_offloads =  ETH_RSS_PROTO_MASK;

+	internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_RETA_GROUP_SIZE;

+

+	rte_memcpy(internals->rss_key, default_rss_key, 40);

+

 	pci_dev->numa_node = numa_node;

 	pci_dev->driver = &rte_null_pmd.pci_drv;

 

-- 

1.7.9.5

^ permalink raw reply	[flat|nested] 2+ messages in thread
* [dpdk-dev] [PATCH v6 0/9] Dynamic RSS Configuration for Bonding
@ 2015-10-16 10:00 Tomasz Kulasek
  2015-10-30 14:25 ` [dpdk-dev] [PATCH v7 " Tomasz Kulasek
  0 siblings, 1 reply; 2+ messages in thread
From: Tomasz Kulasek @ 2015-10-16 10:00 UTC (permalink / raw)
  To: dev

OVERVIEW
--------
1) Setting .rxmode.mq_mode for bonding device to ETH_MQ_RX_RSS makes bonding
device fully RSS-capable, so all slaves are synchronized with its configuration.
This mode is intended to provide RSS configuration as known from "dynamic RSS
configuration for one port" and made slaves transparent for client application
implementation.

2) If .rxmode.mq_mode for bonding device isn't ETH_MQ_RX_RSS, slaves are not
synchronized. That provides an ability to configure them manually. This mode may
be useful when application wants to manage RSS in an unusual way and the
consistency of RSS configuration for slaves isn't required.

Turning on/off RSS mode for slaves when bonding is started is not possible.
Other RSS configuration is propagated over slaves, when bonding device API is
used to do it.

v6 changes:
 - patchset reordered
 - fixed forward dependency between patch 4/9 and 5/9

v5 changes:
 - updated to DPDK 2.2
 - removed copyright change from null device source
 - removed queue_stats_mapping_set from eth_dev_ops of bonding device
 - null pmd cleanups (removed unnecessary malloc, replaced memcpy with
   rte_memcpy)
 - fixed queues number configuration in null pmd

v4 changes:
 - fixed copy-paste error,
 - removed example application as too complex and introducing a new
   dependency,
 - addapted null pmd to be used as testing device for dynamic RSS configuration,
 - addapted test units to use null pmd instead of ring pmd,
 - ring pmd is not used and changed in this patchset

v3 changes:
 - checkpatch cleanups

v2 changes:
 - added support for keys other than 40 bytes long,
 - now, if RSS key is not set for bonding, it is not set also for slaves,
 - fix - full initial RSS configuration before any slave is added was not
   possible due to the initially zeroed flow_type_rss_offloads for bonding,
 - fix - changed error to warning when slave is synchronizing due to the
   bonding's initial configuration (to allow use slaves' drivers not supporting
   dynamic RSS configuration in bonding),
 - some code cleanups,
 - updated documentation,

Tomasz Kulasek (9):
  bonding: rss dynamic configuration
  null: fix segfault when null_pmd added to bonding
  null: extend number of virtual queues
  null: export eth_dev_null_create
  null: virtual dynamic rss configuration
  test: dynamic rss configuration
  bonding: per queue stats
  doc: fixed spellings and typos
  doc: dynamic rss configuration for bonding

 app/test/Makefile                                  |    8 +
 app/test/test_link_bonding_rssconf.c               |  679 ++++++++++++++++++++
 .../prog_guide/link_bonding_poll_mode_drv_lib.rst  |   42 +-
 drivers/net/bonding/rte_eth_bond_api.c             |   28 +
 drivers/net/bonding/rte_eth_bond_pmd.c             |  216 ++++++-
 drivers/net/bonding/rte_eth_bond_private.h         |   12 +
 drivers/net/null/Makefile                          |    2 +-
 drivers/net/null/rte_eth_null.c                    |  149 ++++-
 drivers/net/null/rte_eth_null.h                    |   40 ++
 drivers/net/null/rte_pmd_null_version.map          |    7 +
 10 files changed, 1151 insertions(+), 32 deletions(-)
 create mode 100644 app/test/test_link_bonding_rssconf.c
 create mode 100644 drivers/net/null/rte_eth_null.h

-- 
1.7.9.5

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-30 14:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-30 13:56 [dpdk-dev] [PATCH v7 5/9] null: virtual dynamic rss configuration Tomasz Kulasek
  -- strict thread matches above, loose matches on Subject: below --
2015-10-16 10:00 [dpdk-dev] [PATCH v6 0/9] Dynamic RSS Configuration for Bonding Tomasz Kulasek
2015-10-30 14:25 ` [dpdk-dev] [PATCH v7 " Tomasz Kulasek
2015-10-30 14:25   ` [dpdk-dev] [PATCH v7 5/9] null: virtual dynamic rss configuration Tomasz Kulasek

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).