Commit cf79bd44 authored by Alexander Duyck's avatar Alexander Duyck Committed by Paolo Abeni
Browse files

fbnic: Move promisc_sync out of netdev code and into RPC path 



In order for us to support the BMC possibly connecting, disconnecting, and
then reconnecting we need to be able to support entities outside of just
the NIC setting up promiscuous mode as the BMC can use a multicast
promiscuous setup.

To support that we should move the promisc_sync code out of the netdev and
into the RPC section of the driver so that it is reachable from more paths.

Signed-off-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/175623748769.2246365.2130394904175851458.stgit@ahduyck-xeon-server.home.arpa


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 84482586

drivers/net/ethernet/meta/fbnic/fbnic_netdev.c

+2 −43
Original line number Diff line number Diff line
@@ -220,49 +220,8 @@ void __fbnic_set_rx_mode(struct net_device *netdev) 
	uc_promisc |= !!(netdev->flags & IFF_PROMISC);

	mc_promisc |= !!(netdev->flags & IFF_ALLMULTI) || uc_promisc;



	/* Populate last TCAM entry with promiscuous entry and 0/1 bit mask */

	mac_addr = &fbd->mac_addr[FBNIC_RPC_TCAM_MACDA_PROMISC_IDX];

	if (uc_promisc) {

		if (!is_zero_ether_addr(mac_addr->value.addr8) ||

		    mac_addr->state != FBNIC_TCAM_S_VALID) {

			eth_zero_addr(mac_addr->value.addr8);

			eth_broadcast_addr(mac_addr->mask.addr8);

			clear_bit(FBNIC_MAC_ADDR_T_ALLMULTI,

				  mac_addr->act_tcam);

			set_bit(FBNIC_MAC_ADDR_T_PROMISC,

				mac_addr->act_tcam);

			mac_addr->state = FBNIC_TCAM_S_ADD;

		}

	} else if (mc_promisc &&

		   (!fbnic_bmc_present(fbd) || !fbd->fw_cap.all_multi)) {

		/* We have to add a special handler for multicast as the

		 * BMC may have an all-multi rule already in place. As such

		 * adding a rule ourselves won't do any good so we will have

		 * to modify the rules for the ALL MULTI below if the BMC

		 * already has the rule in place.

		 */

		if (!is_multicast_ether_addr(mac_addr->value.addr8) ||

		    mac_addr->state != FBNIC_TCAM_S_VALID) {

			eth_zero_addr(mac_addr->value.addr8);

			eth_broadcast_addr(mac_addr->mask.addr8);

			mac_addr->value.addr8[0] ^= 1;

			mac_addr->mask.addr8[0] ^= 1;

			set_bit(FBNIC_MAC_ADDR_T_ALLMULTI,

				mac_addr->act_tcam);

			clear_bit(FBNIC_MAC_ADDR_T_PROMISC,

				  mac_addr->act_tcam);

			mac_addr->state = FBNIC_TCAM_S_ADD;

		}

	} else if (mac_addr->state == FBNIC_TCAM_S_VALID) {

		if (test_bit(FBNIC_MAC_ADDR_T_BMC, mac_addr->act_tcam)) {

			clear_bit(FBNIC_MAC_ADDR_T_ALLMULTI,

				  mac_addr->act_tcam);

			clear_bit(FBNIC_MAC_ADDR_T_PROMISC,

				  mac_addr->act_tcam);

		} else {

			mac_addr->state = FBNIC_TCAM_S_DELETE;

		}

	}

	/* Update the promiscuous rules */

	fbnic_promisc_sync(fbd, uc_promisc, mc_promisc);



	/* Add rules for BMC all multicast if it is enabled */

	fbnic_bmc_rpc_all_multi_config(fbd, mc_promisc);

drivers/net/ethernet/meta/fbnic/fbnic_rpc.c

+44 −0
Original line number Diff line number Diff line
@@ -454,6 +454,50 @@ int __fbnic_xc_unsync(struct fbnic_mac_addr *mac_addr, unsigned int tcam_idx) 
	return 0;

}



void fbnic_promisc_sync(struct fbnic_dev *fbd,

			bool uc_promisc, bool mc_promisc)

{

	struct fbnic_mac_addr *mac_addr;



	/* Populate last TCAM entry with promiscuous entry and 0/1 bit mask */

	mac_addr = &fbd->mac_addr[FBNIC_RPC_TCAM_MACDA_PROMISC_IDX];

	if (uc_promisc) {

		if (!is_zero_ether_addr(mac_addr->value.addr8) ||

		    mac_addr->state != FBNIC_TCAM_S_VALID) {

			eth_zero_addr(mac_addr->value.addr8);

			eth_broadcast_addr(mac_addr->mask.addr8);

			clear_bit(FBNIC_MAC_ADDR_T_ALLMULTI,

				  mac_addr->act_tcam);

			set_bit(FBNIC_MAC_ADDR_T_PROMISC,

				mac_addr->act_tcam);

			mac_addr->state = FBNIC_TCAM_S_ADD;

		}

	} else if (mc_promisc &&

		   (!fbnic_bmc_present(fbd) || !fbd->fw_cap.all_multi)) {

		/* We have to add a special handler for multicast as the

		 * BMC may have an all-multi rule already in place. As such

		 * adding a rule ourselves won't do any good so we will have

		 * to modify the rules for the ALL MULTI below if the BMC

		 * already has the rule in place.

		 */

		if (!is_multicast_ether_addr(mac_addr->value.addr8) ||

		    mac_addr->state != FBNIC_TCAM_S_VALID) {

			eth_zero_addr(mac_addr->value.addr8);

			eth_broadcast_addr(mac_addr->mask.addr8);

			mac_addr->value.addr8[0] ^= 1;

			mac_addr->mask.addr8[0] ^= 1;

			set_bit(FBNIC_MAC_ADDR_T_ALLMULTI,

				mac_addr->act_tcam);

			clear_bit(FBNIC_MAC_ADDR_T_PROMISC,

				  mac_addr->act_tcam);

			mac_addr->state = FBNIC_TCAM_S_ADD;

		}

	} else if (mac_addr->state == FBNIC_TCAM_S_VALID) {

		__fbnic_xc_unsync(mac_addr, FBNIC_MAC_ADDR_T_ALLMULTI);

		__fbnic_xc_unsync(mac_addr, FBNIC_MAC_ADDR_T_PROMISC);

	}

}



void fbnic_sift_macda(struct fbnic_dev *fbd)

{

	int dest, src;

drivers/net/ethernet/meta/fbnic/fbnic_rpc.h

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,9 @@ struct fbnic_mac_addr *__fbnic_mc_sync(struct fbnic_dev *fbd, 
void fbnic_sift_macda(struct fbnic_dev *fbd);

void fbnic_write_macda(struct fbnic_dev *fbd);



void fbnic_promisc_sync(struct fbnic_dev *fbd,

			bool uc_promisc, bool mc_promisc);



struct fbnic_ip_addr *__fbnic_ip4_sync(struct fbnic_dev *fbd,

				       struct fbnic_ip_addr *ip_addr,

				       const struct in_addr *addr,