[dpdk-dev,1/3] fm10k: Add promiscuous mode support
Commit Message
From: "Chen Jing D(Mark)" <jing.d.chen@intel.com>
Add functions to support promiscuous/allmulticast enable and
disable.
Signed-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>
---
drivers/net/fm10k/fm10k_ethdev.c | 118 +++++++++++++++++++++++++++++++++++++-
1 files changed, 117 insertions(+), 1 deletions(-)
Comments
On 2015/6/5 17:03, Chen, Jing D wrote:
> From: "Chen Jing D(Mark)" <jing.d.chen@intel.com>
>
> Add functions to support promiscuous/allmulticast enable and
> disable.
>
> Signed-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>
> ---
> drivers/net/fm10k/fm10k_ethdev.c | 118 +++++++++++++++++++++++++++++++++++++-
> 1 files changed, 117 insertions(+), 1 deletions(-)
>
...
> +
> +static void
> +fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev)
> +{
> + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> + int status;
> +
> + PMD_INIT_FUNC_TRACE();
> +
> + /* Return if it didn't acquire valid glort range */
> + if (!fm10k_glort_valid(hw))
> + return;
> +
> + fm10k_mbx_lock(hw);
> + status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
> + FM10K_XCAST_MODE_PROMISC);
> + fm10k_mbx_unlock(hw);
> +
> + if (status != FM10K_SUCCESS)
> + PMD_INIT_LOG(ERR, "Failed to enable promiscuous mode");
> +}
> +
> +static void
> +fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev)
> +{
> + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> + uint8_t mode;
> + int status;
> +
> + PMD_INIT_FUNC_TRACE();
> +
> + /* Return if it didn't acquire valid glort range */
> + if (!fm10k_glort_valid(hw))
> + return;
> +
> + if (dev->data->all_multicast == 1)
> + mode = FM10K_XCAST_MODE_ALLMULTI;
> + else
> + mode = FM10K_XCAST_MODE_NONE;
> +
> + fm10k_mbx_lock(hw);
> + status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
> + mode);
> + fm10k_mbx_unlock(hw);
> +
> + if (status != FM10K_SUCCESS)
> + PMD_INIT_LOG(ERR, "Failed to disable promiscuous mode");
> +}
> +
> +static void
> +fm10k_dev_allmulticast_enable(struct rte_eth_dev *dev)
> +{
> + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> + int status;
> +
> + PMD_INIT_FUNC_TRACE();
> +
> + /* Return if it didn't acquire valid glort range */
> + if (!fm10k_glort_valid(hw))
> + return;
> +
> + /* If promiscuous mode is enabled, it doesn't make sense to enable
> + * allmulticast and disable promiscuous since fm10k only can select
> + * one of the modes.
> + */
> + if (dev->data->promiscuous)
Would it be better to add a log here to tell user?
> + return;
> +
> + fm10k_mbx_lock(hw);
> + status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
> + FM10K_XCAST_MODE_ALLMULTI);
> + fm10k_mbx_unlock(hw);
> +
> + if (status != FM10K_SUCCESS)
> + PMD_INIT_LOG(ERR, "Failed to enable allmulticast mode");
> +}
> +
> +static void
> +fm10k_dev_allmulticast_disable(struct rte_eth_dev *dev)
> +{
> + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> + int status;
> +
> + PMD_INIT_FUNC_TRACE();
> +
> + /* Return if it didn't acquire valid glort range */
> + if (!fm10k_glort_valid(hw))
> + return;
> +
> + if (dev->data->promiscuous)
Also here?
> + return;
> +
> + fm10k_mbx_lock(hw);
> + /* Change mode to unicast mode */
> + status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
> + FM10K_XCAST_MODE_NONE);
> + fm10k_mbx_unlock(hw);
> +
> + if (status != FM10K_SUCCESS)
> + PMD_INIT_LOG(ERR, "Failed to disable allmulticast mode");
> +}
> +
> /* fls = find last set bit = 32 minus the number of leading zeros */
> #ifndef fls
> #define fls(x) (((x) == 0) ? 0 : (32 - __builtin_clz((x))))
> @@ -1654,6 +1766,10 @@ static const struct eth_dev_ops fm10k_eth_dev_ops = {
> .dev_start = fm10k_dev_start,
> .dev_stop = fm10k_dev_stop,
> .dev_close = fm10k_dev_close,
> + .promiscuous_enable = fm10k_dev_promiscuous_enable,
> + .promiscuous_disable = fm10k_dev_promiscuous_disable,
> + .allmulticast_enable = fm10k_dev_allmulticast_enable,
> + .allmulticast_disable = fm10k_dev_allmulticast_disable,
> .stats_get = fm10k_stats_get,
> .stats_reset = fm10k_stats_reset,
> .link_update = fm10k_link_update,
> @@ -1819,7 +1935,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
> * API func.
> */
> hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
> - FM10K_XCAST_MODE_MULTI);
> + FM10K_XCAST_MODE_NONE);
>
> fm10k_mbx_unlock(hw);
>
Hi, Michael,
> -----Original Message-----
> From: Qiu, Michael
> Sent: Tuesday, June 09, 2015 11:21 PM
> To: Chen, Jing D; dev@dpdk.org
> Cc: He, Shaopeng
> Subject: Re: [PATCH 1/3] fm10k: Add promiscuous mode support
>
> On 2015/6/5 17:03, Chen, Jing D wrote:
> > From: "Chen Jing D(Mark)" <jing.d.chen@intel.com>
> >
> > Add functions to support promiscuous/allmulticast enable and
> > disable.
> >
> > Signed-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>
> > ---
> > drivers/net/fm10k/fm10k_ethdev.c | 118
> +++++++++++++++++++++++++++++++++++++-
> > 1 files changed, 117 insertions(+), 1 deletions(-)
> >
>
> ...
>
> > +
> > +static void
> > +fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev)
> > +{
> > + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> > + int status;
> > +
> > + PMD_INIT_FUNC_TRACE();
> > +
> > + /* Return if it didn't acquire valid glort range */
> > + if (!fm10k_glort_valid(hw))
> > + return;
> > +
> > + fm10k_mbx_lock(hw);
> > + status = hw->mac.ops.update_xcast_mode(hw, hw-
> >mac.dglort_map,
> > + FM10K_XCAST_MODE_PROMISC);
> > + fm10k_mbx_unlock(hw);
> > +
> > + if (status != FM10K_SUCCESS)
> > + PMD_INIT_LOG(ERR, "Failed to enable promiscuous mode");
> > +}
> > +
> > +static void
> > +fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev)
> > +{
> > + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> > + uint8_t mode;
> > + int status;
> > +
> > + PMD_INIT_FUNC_TRACE();
> > +
> > + /* Return if it didn't acquire valid glort range */
> > + if (!fm10k_glort_valid(hw))
> > + return;
> > +
> > + if (dev->data->all_multicast == 1)
> > + mode = FM10K_XCAST_MODE_ALLMULTI;
> > + else
> > + mode = FM10K_XCAST_MODE_NONE;
> > +
> > + fm10k_mbx_lock(hw);
> > + status = hw->mac.ops.update_xcast_mode(hw, hw-
> >mac.dglort_map,
> > + mode);
> > + fm10k_mbx_unlock(hw);
> > +
> > + if (status != FM10K_SUCCESS)
> > + PMD_INIT_LOG(ERR, "Failed to disable promiscuous mode");
> > +}
> > +
> > +static void
> > +fm10k_dev_allmulticast_enable(struct rte_eth_dev *dev)
> > +{
> > + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> > + int status;
> > +
> > + PMD_INIT_FUNC_TRACE();
> > +
> > + /* Return if it didn't acquire valid glort range */
> > + if (!fm10k_glort_valid(hw))
> > + return;
> > +
> > + /* If promiscuous mode is enabled, it doesn't make sense to enable
> > + * allmulticast and disable promiscuous since fm10k only can select
> > + * one of the modes.
> > + */
> > + if (dev->data->promiscuous)
>
> Would it be better to add a log here to tell user?
Agree. Thanks!
>
> > + return;
> > +
> > + fm10k_mbx_lock(hw);
> > + status = hw->mac.ops.update_xcast_mode(hw, hw-
> >mac.dglort_map,
> > + FM10K_XCAST_MODE_ALLMULTI);
> > + fm10k_mbx_unlock(hw);
> > +
> > + if (status != FM10K_SUCCESS)
> > + PMD_INIT_LOG(ERR, "Failed to enable allmulticast mode");
> > +}
> > +
> > +static void
> > +fm10k_dev_allmulticast_disable(struct rte_eth_dev *dev)
> > +{
> > + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> > + int status;
> > +
> > + PMD_INIT_FUNC_TRACE();
> > +
> > + /* Return if it didn't acquire valid glort range */
> > + if (!fm10k_glort_valid(hw))
> > + return;
> > +
> > + if (dev->data->promiscuous)
>
> Also here?
Agree. Thanks!
>
> > + return;
> > +
> > + fm10k_mbx_lock(hw);
> > + /* Change mode to unicast mode */
> > + status = hw->mac.ops.update_xcast_mode(hw, hw-
> >mac.dglort_map,
> > + FM10K_XCAST_MODE_NONE);
> > + fm10k_mbx_unlock(hw);
> > +
> > + if (status != FM10K_SUCCESS)
> > + PMD_INIT_LOG(ERR, "Failed to disable allmulticast mode");
> > +}
> > +
> > /* fls = find last set bit = 32 minus the number of leading zeros */
> > #ifndef fls
> > #define fls(x) (((x) == 0) ? 0 : (32 - __builtin_clz((x))))
> > @@ -1654,6 +1766,10 @@ static const struct eth_dev_ops
> fm10k_eth_dev_ops = {
> > .dev_start = fm10k_dev_start,
> > .dev_stop = fm10k_dev_stop,
> > .dev_close = fm10k_dev_close,
> > + .promiscuous_enable = fm10k_dev_promiscuous_enable,
> > + .promiscuous_disable = fm10k_dev_promiscuous_disable,
> > + .allmulticast_enable = fm10k_dev_allmulticast_enable,
> > + .allmulticast_disable = fm10k_dev_allmulticast_disable,
> > .stats_get = fm10k_stats_get,
> > .stats_reset = fm10k_stats_reset,
> > .link_update = fm10k_link_update,
> > @@ -1819,7 +1935,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
> > * API func.
> > */
> > hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
> > - FM10K_XCAST_MODE_MULTI);
> > + FM10K_XCAST_MODE_NONE);
> >
> > fm10k_mbx_unlock(hw);
> >
From: "Chen Jing D(Mark)" <jing.d.chen@intel.com>
v2:
Add debug messages in allmulticast enable/disable functions.
The patch set add promiscuous mode configuration and 2 bug fixes.
Chen Jing D(Mark) (3):
fm10k: Add promiscuous mode support
fm10k: remove mbuf size sanity check
fm10k: Fix improper max queue number for VF
drivers/net/fm10k/fm10k_ethdev.c | 133 +++++++++++++++++++++++++++++++++++--
1 files changed, 125 insertions(+), 8 deletions(-)
On 6/12/2015 3:07 PM, Chen, Jing D wrote:
> From: "Chen Jing D(Mark)" <jing.d.chen@intel.com>
>
> v2:
> Add debug messages in allmulticast enable/disable functions.
>
> The patch set add promiscuous mode configuration and 2 bug fixes.
>
> Chen Jing D(Mark) (3):
> fm10k: Add promiscuous mode support
> fm10k: remove mbuf size sanity check
> fm10k: Fix improper max queue number for VF
>
> drivers/net/fm10k/fm10k_ethdev.c | 133 +++++++++++++++++++++++++++++++++++--
> 1 files changed, 125 insertions(+), 8 deletions(-)
>
Acked-by: Michael Qiu <michael.qiu@intel.com>
Tested-by: Michael Qiu <michael.qiu@intel.com>
- OS: Fedora20 3.11.10-301
- GCC: gcc version 4.8.3 2014911
- CPU: Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz
- NIC: Ethernet controller: Intel Corporation Device 15a4 (rev 01)
- Default x86_64-native-linuxapp-gcc configuration
Test Case: Set promiscuous mode off
Test Case: Set promiscuous mode on
On 6/12/2015 3:07 PM, Chen, Jing D wrote:
> From: "Chen Jing D(Mark)" <jing.d.chen@intel.com>
>
> v2:
> Add debug messages in allmulticast enable/disable functions.
>
> The patch set add promiscuous mode configuration and 2 bug fixes.
>
> Chen Jing D(Mark) (3):
> fm10k: Add promiscuous mode support
> fm10k: remove mbuf size sanity check
> fm10k: Fix improper max queue number for VF
>
> drivers/net/fm10k/fm10k_ethdev.c | 133 +++++++++++++++++++++++++++++++++++--
> 1 files changed, 125 insertions(+), 8 deletions(-)
>
2015-06-12 15:06, Chen Jing D:
> From: "Chen Jing D(Mark)" <jing.d.chen@intel.com>
>
> v2:
> Add debug messages in allmulticast enable/disable functions.
>
> The patch set add promiscuous mode configuration and 2 bug fixes.
>
> Chen Jing D(Mark) (3):
> fm10k: Add promiscuous mode support
> fm10k: remove mbuf size sanity check
> fm10k: Fix improper max queue number for VF
Applied, thanks
@@ -51,6 +51,11 @@
#define BIT_MASK_PER_UINT32 ((1 << CHARS_PER_UINT32) - 1)
static void fm10k_close_mbx_service(struct fm10k_hw *hw);
+static void fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static void fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev);
+static void fm10k_dev_allmulticast_enable(struct rte_eth_dev *dev);
+static void fm10k_dev_allmulticast_disable(struct rte_eth_dev *dev);
+static inline int fm10k_glort_valid(struct fm10k_hw *hw);
static void
fm10k_mbx_initlock(struct fm10k_hw *hw)
@@ -566,6 +571,113 @@ fm10k_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
return 0;
}
+static inline int fm10k_glort_valid(struct fm10k_hw *hw)
+{
+ return ((hw->mac.dglort_map & FM10K_DGLORTMAP_NONE)
+ != FM10K_DGLORTMAP_NONE);
+}
+
+static void
+fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev)
+{
+ struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ int status;
+
+ PMD_INIT_FUNC_TRACE();
+
+ /* Return if it didn't acquire valid glort range */
+ if (!fm10k_glort_valid(hw))
+ return;
+
+ fm10k_mbx_lock(hw);
+ status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
+ FM10K_XCAST_MODE_PROMISC);
+ fm10k_mbx_unlock(hw);
+
+ if (status != FM10K_SUCCESS)
+ PMD_INIT_LOG(ERR, "Failed to enable promiscuous mode");
+}
+
+static void
+fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev)
+{
+ struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ uint8_t mode;
+ int status;
+
+ PMD_INIT_FUNC_TRACE();
+
+ /* Return if it didn't acquire valid glort range */
+ if (!fm10k_glort_valid(hw))
+ return;
+
+ if (dev->data->all_multicast == 1)
+ mode = FM10K_XCAST_MODE_ALLMULTI;
+ else
+ mode = FM10K_XCAST_MODE_NONE;
+
+ fm10k_mbx_lock(hw);
+ status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
+ mode);
+ fm10k_mbx_unlock(hw);
+
+ if (status != FM10K_SUCCESS)
+ PMD_INIT_LOG(ERR, "Failed to disable promiscuous mode");
+}
+
+static void
+fm10k_dev_allmulticast_enable(struct rte_eth_dev *dev)
+{
+ struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ int status;
+
+ PMD_INIT_FUNC_TRACE();
+
+ /* Return if it didn't acquire valid glort range */
+ if (!fm10k_glort_valid(hw))
+ return;
+
+ /* If promiscuous mode is enabled, it doesn't make sense to enable
+ * allmulticast and disable promiscuous since fm10k only can select
+ * one of the modes.
+ */
+ if (dev->data->promiscuous)
+ return;
+
+ fm10k_mbx_lock(hw);
+ status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
+ FM10K_XCAST_MODE_ALLMULTI);
+ fm10k_mbx_unlock(hw);
+
+ if (status != FM10K_SUCCESS)
+ PMD_INIT_LOG(ERR, "Failed to enable allmulticast mode");
+}
+
+static void
+fm10k_dev_allmulticast_disable(struct rte_eth_dev *dev)
+{
+ struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ int status;
+
+ PMD_INIT_FUNC_TRACE();
+
+ /* Return if it didn't acquire valid glort range */
+ if (!fm10k_glort_valid(hw))
+ return;
+
+ if (dev->data->promiscuous)
+ return;
+
+ fm10k_mbx_lock(hw);
+ /* Change mode to unicast mode */
+ status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
+ FM10K_XCAST_MODE_NONE);
+ fm10k_mbx_unlock(hw);
+
+ if (status != FM10K_SUCCESS)
+ PMD_INIT_LOG(ERR, "Failed to disable allmulticast mode");
+}
+
/* fls = find last set bit = 32 minus the number of leading zeros */
#ifndef fls
#define fls(x) (((x) == 0) ? 0 : (32 - __builtin_clz((x))))
@@ -1654,6 +1766,10 @@ static const struct eth_dev_ops fm10k_eth_dev_ops = {
.dev_start = fm10k_dev_start,
.dev_stop = fm10k_dev_stop,
.dev_close = fm10k_dev_close,
+ .promiscuous_enable = fm10k_dev_promiscuous_enable,
+ .promiscuous_disable = fm10k_dev_promiscuous_disable,
+ .allmulticast_enable = fm10k_dev_allmulticast_enable,
+ .allmulticast_disable = fm10k_dev_allmulticast_disable,
.stats_get = fm10k_stats_get,
.stats_reset = fm10k_stats_reset,
.link_update = fm10k_link_update,
@@ -1819,7 +1935,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
* API func.
*/
hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
- FM10K_XCAST_MODE_MULTI);
+ FM10K_XCAST_MODE_NONE);
fm10k_mbx_unlock(hw);