igb: Enable nfc filters to specify MAC addresses

This allows igb_add_filter()/igb_erase_filter() to work on filters
that include MAC addresses (both source and destination).

For now, this only exposes the functionality, the next commit glues
ethtool into this. Later in this series, these APIs are used to allow
offloading of cls_flower filters.

Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index c71845a450f78435795238546031785effee2d9a..0eac1df499f8fb92599828baffb9941330c34314 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -442,6 +442,8 @@ struct hwmon_buff {
 enum igb_filter_match_flags {
        IGB_FILTER_FLAG_ETHER_TYPE = 0x1,
        IGB_FILTER_FLAG_VLAN_TCI   = 0x2,
+       IGB_FILTER_FLAG_SRC_MAC_ADDR   = 0x4,
+       IGB_FILTER_FLAG_DST_MAC_ADDR   = 0x8,
 };
 
 #define IGB_MAX_RXNFC_FILTERS 16
@@ -456,6 +458,8 @@ struct igb_nfc_input {
        u8 match_flags;
        __be16 etype;
        __be16 vlan_tci;
+       u8 src_addr[ETH_ALEN];
+       u8 dst_addr[ETH_ALEN];
 };
 
 struct igb_nfc_filter {

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 5975d432836f8d35488358f9322e6b0020c394d0..31b2960a7869dca110994eff6ee254f10972f990 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2776,6 +2776,25 @@ int igb_add_filter(struct igb_adapter *adapter, struct igb_nfc_filter *input)
                        return err;
        }
 
+       if (input->filter.match_flags & IGB_FILTER_FLAG_DST_MAC_ADDR) {
+               err = igb_add_mac_steering_filter(adapter,
+                                                 input->filter.dst_addr,
+                                                 input->action, 0);
+               err = min_t(int, err, 0);
+               if (err)
+                       return err;
+       }
+
+       if (input->filter.match_flags & IGB_FILTER_FLAG_SRC_MAC_ADDR) {
+               err = igb_add_mac_steering_filter(adapter,
+                                                 input->filter.src_addr,
+                                                 input->action,
+                                                 IGB_MAC_STATE_SRC_ADDR);
+               err = min_t(int, err, 0);
+               if (err)
+                       return err;
+       }
+
        if (input->filter.match_flags & IGB_FILTER_FLAG_VLAN_TCI)
                err = igb_rxnfc_write_vlan_prio_filter(adapter, input);
 
@@ -2824,6 +2843,15 @@ int igb_erase_filter(struct igb_adapter *adapter, struct igb_nfc_filter *input)
                igb_clear_vlan_prio_filter(adapter,
                                           ntohs(input->filter.vlan_tci));
 
+       if (input->filter.match_flags & IGB_FILTER_FLAG_SRC_MAC_ADDR)
+               igb_del_mac_steering_filter(adapter, input->filter.src_addr,
+                                           input->action,
+                                           IGB_MAC_STATE_SRC_ADDR);
+
+       if (input->filter.match_flags & IGB_FILTER_FLAG_DST_MAC_ADDR)
+               igb_del_mac_steering_filter(adapter, input->filter.dst_addr,
+                                           input->action, 0);
+
        return 0;
 }