From: roprabhu <roprabhu@cisco.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Subject: Re: [net-next-2.6 PATCH] enic: Add ndo_set_rx_mode support for enic vnics
Date: Wed, 08 Dec 2010 15:16:28 -0800 [thread overview]
Message-ID: <C92551CC.1ACB4%roprabhu@cisco.com> (raw)
In-Reply-To: <20101208230148.24021.32576.stgit@savbu-pc100.cisco.com>
Please ignore. Will update Signed-off list and re-spin. Thanks.
On 12/8/10 3:01 PM, "Roopa Prabhu" <roprabhu@cisco.com> wrote:
> From: Roopa Prabhu <roprabhu@cisco.com>
>
> Add ndo_set_rx_mode support to register unicast and multicast
> address filters for enic devices
>
> Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
> Signed-off-by: David Wang <dwang2@cisco.com>
> Signed-off-by: Christian Benvenuti <benve@cisco.com>
> ---
> drivers/net/enic/enic.h | 4 +
> drivers/net/enic/enic_main.c | 121
> ++++++++++++++++++++++++++++++++++--------
> drivers/net/enic/enic_res.h | 1
> 3 files changed, 102 insertions(+), 24 deletions(-)
>
>
> diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
> index 7067254..8f374c1 100644
> --- a/drivers/net/enic/enic.h
> +++ b/drivers/net/enic/enic.h
> @@ -32,7 +32,7 @@
>
> #define DRV_NAME "enic"
> #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
> -#define DRV_VERSION "1.4.1.7"
> +#define DRV_VERSION "1.4.1.8"
> #define DRV_COPYRIGHT "Copyright 2008-2010 Cisco Systems, Inc"
>
> #define ENIC_BARS_MAX 6
> @@ -78,8 +78,10 @@ struct enic {
> spinlock_t devcmd_lock;
> u8 mac_addr[ETH_ALEN];
> u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
> + u8 uc_addr[ENIC_UNICAST_PERFECT_FILTERS][ETH_ALEN];
> unsigned int flags;
> unsigned int mc_count;
> + unsigned int uc_count;
> int csum_rx_enabled;
> u32 port_mtu;
> u32 rx_coalesce_usecs;
> diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
> index 9f293fa..1931f15 100644
> --- a/drivers/net/enic/enic_main.c
> +++ b/drivers/net/enic/enic_main.c
> @@ -1002,7 +1002,7 @@ static int enic_dev_packet_filter(struct enic *enic, int
> directed,
> return err;
> }
>
> -static int enic_dev_add_multicast_addr(struct enic *enic, u8 *addr)
> +static int enic_dev_add_addr(struct enic *enic, u8 *addr)
> {
> int err;
>
> @@ -1013,7 +1013,7 @@ static int enic_dev_add_multicast_addr(struct enic
> *enic, u8 *addr)
> return err;
> }
>
> -static int enic_dev_del_multicast_addr(struct enic *enic, u8 *addr)
> +static int enic_dev_del_addr(struct enic *enic, u8 *addr)
> {
> int err;
>
> @@ -1024,29 +1024,19 @@ static int enic_dev_del_multicast_addr(struct enic
> *enic, u8 *addr)
> return err;
> }
>
> -/* netif_tx_lock held, BHs disabled */
> -static void enic_set_multicast_list(struct net_device *netdev)
> +static void enic_add_multicast_addr_list(struct enic *enic)
> {
> - struct enic *enic = netdev_priv(netdev);
> + struct net_device *netdev = enic->netdev;
> struct netdev_hw_addr *ha;
> - int directed = 1;
> - int multicast = (netdev->flags & IFF_MULTICAST) ? 1 : 0;
> - int broadcast = (netdev->flags & IFF_BROADCAST) ? 1 : 0;
> - int promisc = (netdev->flags & IFF_PROMISC) ? 1 : 0;
> unsigned int mc_count = netdev_mc_count(netdev);
> - int allmulti = (netdev->flags & IFF_ALLMULTI) ||
> - mc_count > ENIC_MULTICAST_PERFECT_FILTERS;
> - unsigned int flags = netdev->flags | (allmulti ? IFF_ALLMULTI : 0);
> u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
> unsigned int i, j;
>
> - if (mc_count > ENIC_MULTICAST_PERFECT_FILTERS)
> + if (mc_count > ENIC_MULTICAST_PERFECT_FILTERS) {
> + netdev_warn(netdev, "Registering only %d out of %d "
> + "multicast addresses\n",
> + ENIC_MULTICAST_PERFECT_FILTERS, mc_count);
> mc_count = ENIC_MULTICAST_PERFECT_FILTERS;
> -
> - if (enic->flags != flags) {
> - enic->flags = flags;
> - enic_dev_packet_filter(enic, directed,
> - multicast, broadcast, promisc, allmulti);
> }
>
> /* Is there an easier way? Trying to minimize to
> @@ -1068,7 +1058,7 @@ static void enic_set_multicast_list(struct net_device
> *netdev)
> mc_addr[j]) == 0)
> break;
> if (j == mc_count)
> - enic_dev_del_multicast_addr(enic, enic->mc_addr[i]);
> + enic_dev_del_addr(enic, enic->mc_addr[i]);
> }
>
> for (i = 0; i < mc_count; i++) {
> @@ -1077,7 +1067,7 @@ static void enic_set_multicast_list(struct net_device
> *netdev)
> enic->mc_addr[j]) == 0)
> break;
> if (j == enic->mc_count)
> - enic_dev_add_multicast_addr(enic, mc_addr[i]);
> + enic_dev_add_addr(enic, mc_addr[i]);
> }
>
> /* Save the list to compare against next time
> @@ -1089,6 +1079,89 @@ static void enic_set_multicast_list(struct net_device
> *netdev)
> enic->mc_count = mc_count;
> }
>
> +static void enic_add_unicast_addr_list(struct enic *enic)
> +{
> + struct net_device *netdev = enic->netdev;
> + struct netdev_hw_addr *ha;
> + unsigned int uc_count = netdev_uc_count(netdev);
> + u8 uc_addr[ENIC_UNICAST_PERFECT_FILTERS][ETH_ALEN];
> + unsigned int i, j;
> +
> + if (uc_count > ENIC_UNICAST_PERFECT_FILTERS) {
> + netdev_warn(netdev, "Registering only %d out of %d "
> + "unicast addresses\n",
> + ENIC_UNICAST_PERFECT_FILTERS, uc_count);
> + uc_count = ENIC_UNICAST_PERFECT_FILTERS;
> + }
> +
> + /* Is there an easier way? Trying to minimize to
> + * calls to add/del unicast addrs. We keep the
> + * addrs from the last call in enic->uc_addr and
> + * look for changes to add/del.
> + */
> +
> + i = 0;
> + netdev_for_each_uc_addr(ha, netdev) {
> + if (i == uc_count)
> + break;
> + memcpy(uc_addr[i++], ha->addr, ETH_ALEN);
> + }
> +
> + for (i = 0; i < enic->uc_count; i++) {
> + for (j = 0; j < uc_count; j++)
> + if (compare_ether_addr(enic->uc_addr[i],
> + uc_addr[j]) == 0)
> + break;
> + if (j == uc_count)
> + enic_dev_del_addr(enic, enic->uc_addr[i]);
> + }
> +
> + for (i = 0; i < uc_count; i++) {
> + for (j = 0; j < enic->uc_count; j++)
> + if (compare_ether_addr(uc_addr[i],
> + enic->uc_addr[j]) == 0)
> + break;
> + if (j == enic->uc_count)
> + enic_dev_add_addr(enic, uc_addr[i]);
> + }
> +
> + /* Save the list to compare against next time
> + */
> +
> + for (i = 0; i < uc_count; i++)
> + memcpy(enic->uc_addr[i], uc_addr[i], ETH_ALEN);
> +
> + enic->uc_count = uc_count;
> +}
> +
> +/* netif_tx_lock held, BHs disabled */
> +static void enic_set_rx_mode(struct net_device *netdev)
> +{
> + struct enic *enic = netdev_priv(netdev);
> + int directed = 1;
> + int multicast = (netdev->flags & IFF_MULTICAST) ? 1 : 0;
> + int broadcast = (netdev->flags & IFF_BROADCAST) ? 1 : 0;
> + int promisc = (netdev->flags & IFF_PROMISC) ||
> + netdev_uc_count(netdev) > ENIC_UNICAST_PERFECT_FILTERS;
> + int allmulti = (netdev->flags & IFF_ALLMULTI) ||
> + netdev_mc_count(netdev) > ENIC_MULTICAST_PERFECT_FILTERS;
> + unsigned int flags = netdev->flags |
> + (allmulti ? IFF_ALLMULTI : 0) |
> + (promisc ? IFF_PROMISC : 0);
> +
> + if (enic->flags != flags) {
> + enic->flags = flags;
> + enic_dev_packet_filter(enic, directed,
> + multicast, broadcast, promisc, allmulti);
> + }
> +
> + if (!promisc) {
> + enic_add_unicast_addr_list(enic);
> + if (!allmulti)
> + enic_add_multicast_addr_list(enic);
> + }
> +}
> +
> /* rtnl lock is held */
> static void enic_vlan_rx_register(struct net_device *netdev,
> struct vlan_group *vlan_group)
> @@ -1852,7 +1925,7 @@ static int enic_open(struct net_device *netdev)
> vnic_rq_enable(&enic->rq[i]);
>
> enic_dev_add_station_addr(enic);
> - enic_set_multicast_list(netdev);
> + enic_set_rx_mode(netdev);
>
> netif_wake_queue(netdev);
>
> @@ -2328,7 +2401,8 @@ static const struct net_device_ops
> enic_netdev_dynamic_ops = {
> .ndo_start_xmit = enic_hard_start_xmit,
> .ndo_get_stats = enic_get_stats,
> .ndo_validate_addr = eth_validate_addr,
> - .ndo_set_multicast_list = enic_set_multicast_list,
> + .ndo_set_rx_mode = enic_set_rx_mode,
> + .ndo_set_multicast_list = enic_set_rx_mode,
> .ndo_set_mac_address = enic_set_mac_address_dynamic,
> .ndo_change_mtu = enic_change_mtu,
> .ndo_vlan_rx_register = enic_vlan_rx_register,
> @@ -2349,7 +2423,8 @@ static const struct net_device_ops enic_netdev_ops = {
> .ndo_get_stats = enic_get_stats,
> .ndo_validate_addr = eth_validate_addr,
> .ndo_set_mac_address = enic_set_mac_address,
> - .ndo_set_multicast_list = enic_set_multicast_list,
> + .ndo_set_rx_mode = enic_set_rx_mode,
> + .ndo_set_multicast_list = enic_set_rx_mode,
> .ndo_change_mtu = enic_change_mtu,
> .ndo_vlan_rx_register = enic_vlan_rx_register,
> .ndo_vlan_rx_add_vid = enic_vlan_rx_add_vid,
> diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h
> index 9a103d9..25be273 100644
> --- a/drivers/net/enic/enic_res.h
> +++ b/drivers/net/enic/enic_res.h
> @@ -34,6 +34,7 @@
> #define ENIC_MAX_MTU 9000
>
> #define ENIC_MULTICAST_PERFECT_FILTERS 32
> +#define ENIC_UNICAST_PERFECT_FILTERS 32
>
> #define ENIC_NON_TSO_MAX_DESC 16
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2010-12-08 23:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-08 23:01 [net-next-2.6 PATCH] enic: Add ndo_set_rx_mode support for enic vnics Roopa Prabhu
2010-12-08 23:16 ` roprabhu [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-12-08 23:19 Roopa Prabhu
2010-12-10 23:39 ` David Miller
2010-12-05 6:23 Roopa Prabhu
2010-12-08 18:02 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=C92551CC.1ACB4%roprabhu@cisco.com \
--to=roprabhu@cisco.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).