Commit 2295cddf authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Minor conflicts in net/mptcp/protocol.h and
tools/testing/selftests/net/Makefile.

In both cases code was added on both sides in the same place
so just keep both.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 346e320c 2ecbc1f6

Documentation/networking/scaling.rst

+3 −3
Original line number Diff line number Diff line
@@ -465,9 +465,9 @@ XPS Configuration 
-----------------



XPS is only available if the kconfig symbol CONFIG_XPS is enabled (on by

default for SMP). The functionality remains disabled until explicitly

configured. To enable XPS, the bitmap of CPUs/receive-queues that may

use a transmit queue is configured using the sysfs file entry:

default for SMP). If compiled in, it is driver dependent whether, and

how, XPS is configured at device init. The mapping of CPUs/receive-queues

to transmit queue can be inspected and configured using sysfs:



For selection based on CPUs map::

drivers/net/can/m_can/m_can_platform.c

+0 −2
Original line number Diff line number Diff line
@@ -144,8 +144,6 @@ static int __maybe_unused m_can_runtime_suspend(struct device *dev) 
	struct net_device *ndev = dev_get_drvdata(dev);

	struct m_can_classdev *mcan_class = netdev_priv(ndev);



	m_can_class_suspend(dev);



	clk_disable_unprepare(mcan_class->cclk);

	clk_disable_unprepare(mcan_class->hclk);

drivers/net/dsa/microchip/ksz_common.c

+9 −7
Original line number Diff line number Diff line
@@ -103,14 +103,8 @@ void ksz_init_mib_timer(struct ksz_device *dev) 


	INIT_DELAYED_WORK(&dev->mib_read, ksz_mib_read_work);



	/* Read MIB counters every 30 seconds to avoid overflow. */

	dev->mib_read_interval = msecs_to_jiffies(30000);



	for (i = 0; i < dev->mib_port_cnt; i++)

		dev->dev_ops->port_init_cnt(dev, i);



	/* Start the timer 2 seconds later. */

	schedule_delayed_work(&dev->mib_read, msecs_to_jiffies(2000));

}

EXPORT_SYMBOL_GPL(ksz_init_mib_timer);
@@ -143,6 +137,8 @@ void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode, 


	/* Read all MIB counters when the link is going down. */

	p->read = true;

	/* timer started */

	if (dev->mib_read_interval)

		schedule_delayed_work(&dev->mib_read, 0);

}

EXPORT_SYMBOL_GPL(ksz_mac_link_down);
@@ -451,6 +447,12 @@ int ksz_switch_register(struct ksz_device *dev, 
		return ret;

	}



	/* Read MIB counters every 30 seconds to avoid overflow. */

	dev->mib_read_interval = msecs_to_jiffies(30000);



	/* Start the MIB timer. */

	schedule_delayed_work(&dev->mib_read, 0);



	return 0;

}

EXPORT_SYMBOL(ksz_switch_register);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+162 −13
Original line number Diff line number Diff line
@@ -60,6 +60,89 @@ static struct ch_tc_pedit_fields pedits[] = { 
	PEDIT_FIELDS(IP6_, DST_127_96, 4, nat_lip, 12),

};



static const struct cxgb4_natmode_config cxgb4_natmode_config_array[] = {

	/* Default supported NAT modes */

	{

		.chip = CHELSIO_T5,

		.flags = CXGB4_ACTION_NATMODE_NONE,

		.natmode = NAT_MODE_NONE,

	},

	{

		.chip = CHELSIO_T5,

		.flags = CXGB4_ACTION_NATMODE_DIP,

		.natmode = NAT_MODE_DIP,

	},

	{

		.chip = CHELSIO_T5,

		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT,

		.natmode = NAT_MODE_DIP_DP,

	},

	{

		.chip = CHELSIO_T5,

		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT |

			 CXGB4_ACTION_NATMODE_SIP,

		.natmode = NAT_MODE_DIP_DP_SIP,

	},

	{

		.chip = CHELSIO_T5,

		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT |

			 CXGB4_ACTION_NATMODE_SPORT,

		.natmode = NAT_MODE_DIP_DP_SP,

	},

	{

		.chip = CHELSIO_T5,

		.flags = CXGB4_ACTION_NATMODE_SIP | CXGB4_ACTION_NATMODE_SPORT,

		.natmode = NAT_MODE_SIP_SP,

	},

	{

		.chip = CHELSIO_T5,

		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP |

			 CXGB4_ACTION_NATMODE_SPORT,

		.natmode = NAT_MODE_DIP_SIP_SP,

	},

	{

		.chip = CHELSIO_T5,

		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP |

			 CXGB4_ACTION_NATMODE_DPORT |

			 CXGB4_ACTION_NATMODE_SPORT,

		.natmode = NAT_MODE_ALL,

	},

	/* T6+ can ignore L4 ports when they're disabled. */

	{

		.chip = CHELSIO_T6,

		.flags = CXGB4_ACTION_NATMODE_SIP,

		.natmode = NAT_MODE_SIP_SP,

	},

	{

		.chip = CHELSIO_T6,

		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SPORT,

		.natmode = NAT_MODE_DIP_DP_SP,

	},

	{

		.chip = CHELSIO_T6,

		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP,

		.natmode = NAT_MODE_ALL,

	},

};



static void cxgb4_action_natmode_tweak(struct ch_filter_specification *fs,

				       u8 natmode_flags)

{

	u8 i = 0;



	/* Translate the enabled NAT 4-tuple fields to one of the

	 * hardware supported NAT mode configurations. This ensures

	 * that we pick a valid combination, where the disabled fields

	 * do not get overwritten to 0.

	 */

	for (i = 0; i < ARRAY_SIZE(cxgb4_natmode_config_array); i++) {

		if (cxgb4_natmode_config_array[i].flags == natmode_flags) {

			fs->nat_mode = cxgb4_natmode_config_array[i].natmode;

			return;

		}

	}

}



static struct ch_tc_flower_entry *allocate_flower_entry(void)

{

	struct ch_tc_flower_entry *new = kzalloc(sizeof(*new), GFP_KERNEL);
@@ -289,7 +372,8 @@ static void offload_pedit(struct ch_filter_specification *fs, u32 val, u32 mask, 
}



static void process_pedit_field(struct ch_filter_specification *fs, u32 val,

				u32 mask, u32 offset, u8 htype)

				u32 mask, u32 offset, u8 htype,

				u8 *natmode_flags)

{

	switch (htype) {

	case FLOW_ACT_MANGLE_HDR_TYPE_ETH:
@@ -314,67 +398,102 @@ static void process_pedit_field(struct ch_filter_specification *fs, u32 val, 
		switch (offset) {

		case PEDIT_IP4_SRC:

			offload_pedit(fs, val, mask, IP4_SRC);

			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;

			break;

		case PEDIT_IP4_DST:

			offload_pedit(fs, val, mask, IP4_DST);

			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;

		}

		fs->nat_mode = NAT_MODE_ALL;

		break;

	case FLOW_ACT_MANGLE_HDR_TYPE_IP6:

		switch (offset) {

		case PEDIT_IP6_SRC_31_0:

			offload_pedit(fs, val, mask, IP6_SRC_31_0);

			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;

			break;

		case PEDIT_IP6_SRC_63_32:

			offload_pedit(fs, val, mask, IP6_SRC_63_32);

			*natmode_flags |=  CXGB4_ACTION_NATMODE_SIP;

			break;

		case PEDIT_IP6_SRC_95_64:

			offload_pedit(fs, val, mask, IP6_SRC_95_64);

			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;

			break;

		case PEDIT_IP6_SRC_127_96:

			offload_pedit(fs, val, mask, IP6_SRC_127_96);

			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;

			break;

		case PEDIT_IP6_DST_31_0:

			offload_pedit(fs, val, mask, IP6_DST_31_0);

			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;

			break;

		case PEDIT_IP6_DST_63_32:

			offload_pedit(fs, val, mask, IP6_DST_63_32);

			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;

			break;

		case PEDIT_IP6_DST_95_64:

			offload_pedit(fs, val, mask, IP6_DST_95_64);

			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;

			break;

		case PEDIT_IP6_DST_127_96:

			offload_pedit(fs, val, mask, IP6_DST_127_96);

			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;

		}

		fs->nat_mode = NAT_MODE_ALL;

		break;

	case FLOW_ACT_MANGLE_HDR_TYPE_TCP:

		switch (offset) {

		case PEDIT_TCP_SPORT_DPORT:

			if (~mask & PEDIT_TCP_UDP_SPORT_MASK)

			if (~mask & PEDIT_TCP_UDP_SPORT_MASK) {

				fs->nat_fport = val;

			else

				*natmode_flags |= CXGB4_ACTION_NATMODE_SPORT;

			} else {

				fs->nat_lport = val >> 16;

				*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;

			}

		}

		fs->nat_mode = NAT_MODE_ALL;

		break;

	case FLOW_ACT_MANGLE_HDR_TYPE_UDP:

		switch (offset) {

		case PEDIT_UDP_SPORT_DPORT:

			if (~mask & PEDIT_TCP_UDP_SPORT_MASK)

			if (~mask & PEDIT_TCP_UDP_SPORT_MASK) {

				fs->nat_fport = val;

			else

				*natmode_flags |= CXGB4_ACTION_NATMODE_SPORT;

			} else {

				fs->nat_lport = val >> 16;

				*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;

			}

		fs->nat_mode = NAT_MODE_ALL;

		}

		break;

	}

}



static int cxgb4_action_natmode_validate(struct adapter *adap, u8 natmode_flags,

					 struct netlink_ext_ack *extack)

{

	u8 i = 0;



	/* Extract the NAT mode to enable based on what 4-tuple fields

	 * are enabled to be overwritten. This ensures that the

	 * disabled fields don't get overwritten to 0.

	 */

	for (i = 0; i < ARRAY_SIZE(cxgb4_natmode_config_array); i++) {

		const struct cxgb4_natmode_config *c;



		c = &cxgb4_natmode_config_array[i];

		if (CHELSIO_CHIP_VERSION(adap->params.chip) >= c->chip &&

		    natmode_flags == c->flags)

			return 0;

	}

	NL_SET_ERR_MSG_MOD(extack, "Unsupported NAT mode 4-tuple combination");

	return -EOPNOTSUPP;

}



void cxgb4_process_flow_actions(struct net_device *in,

				struct flow_action *actions,

				struct ch_filter_specification *fs)

{

	struct flow_action_entry *act;

	u8 natmode_flags = 0;

	int i;



	flow_action_for_each(i, act, actions) {
@@ -426,7 +545,8 @@ void cxgb4_process_flow_actions(struct net_device *in, 
			val = act->mangle.val;

			offset = act->mangle.offset;



			process_pedit_field(fs, val, mask, offset, htype);

			process_pedit_field(fs, val, mask, offset, htype,

					    &natmode_flags);

			}

			break;

		case FLOW_ACTION_QUEUE:
@@ -438,6 +558,9 @@ void cxgb4_process_flow_actions(struct net_device *in, 
			break;

		}

	}

	if (natmode_flags)

		cxgb4_action_natmode_tweak(fs, natmode_flags);



}



static bool valid_l4_mask(u32 mask)
@@ -454,7 +577,8 @@ static bool valid_l4_mask(u32 mask) 
}



static bool valid_pedit_action(struct net_device *dev,

			       const struct flow_action_entry *act)

			       const struct flow_action_entry *act,

			       u8 *natmode_flags)

{

	u32 mask, offset;

	u8 htype;
@@ -479,7 +603,10 @@ static bool valid_pedit_action(struct net_device *dev, 
	case FLOW_ACT_MANGLE_HDR_TYPE_IP4:

		switch (offset) {

		case PEDIT_IP4_SRC:

			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;

			break;

		case PEDIT_IP4_DST:

			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;

			break;

		default:

			netdev_err(dev, "%s: Unsupported pedit field\n",
@@ -493,10 +620,13 @@ static bool valid_pedit_action(struct net_device *dev, 
		case PEDIT_IP6_SRC_63_32:

		case PEDIT_IP6_SRC_95_64:

		case PEDIT_IP6_SRC_127_96:

			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;

			break;

		case PEDIT_IP6_DST_31_0:

		case PEDIT_IP6_DST_63_32:

		case PEDIT_IP6_DST_95_64:

		case PEDIT_IP6_DST_127_96:

			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;

			break;

		default:

			netdev_err(dev, "%s: Unsupported pedit field\n",
@@ -512,6 +642,10 @@ static bool valid_pedit_action(struct net_device *dev, 
					   __func__);

				return false;

			}

			if (~mask & PEDIT_TCP_UDP_SPORT_MASK)

				*natmode_flags |= CXGB4_ACTION_NATMODE_SPORT;

			else

				*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;

			break;

		default:

			netdev_err(dev, "%s: Unsupported pedit field\n",
@@ -527,6 +661,10 @@ static bool valid_pedit_action(struct net_device *dev, 
					   __func__);

				return false;

			}

			if (~mask & PEDIT_TCP_UDP_SPORT_MASK)

				*natmode_flags |= CXGB4_ACTION_NATMODE_SPORT;

			else

				*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;

			break;

		default:

			netdev_err(dev, "%s: Unsupported pedit field\n",
@@ -546,10 +684,12 @@ int cxgb4_validate_flow_actions(struct net_device *dev, 
				struct netlink_ext_ack *extack,

				u8 matchall_filter)

{

	struct adapter *adap = netdev2adap(dev);

	struct flow_action_entry *act;

	bool act_redir = false;

	bool act_pedit = false;

	bool act_vlan = false;

	u8 natmode_flags = 0;

	int i;



	if (!flow_action_basic_hw_stats_check(actions, extack))
@@ -563,7 +703,6 @@ int cxgb4_validate_flow_actions(struct net_device *dev, 
			break;

		case FLOW_ACTION_MIRRED:

		case FLOW_ACTION_REDIRECT: {

			struct adapter *adap = netdev2adap(dev);

			struct net_device *n_dev, *target_dev;

			bool found = false;

			unsigned int i;
@@ -620,7 +759,8 @@ int cxgb4_validate_flow_actions(struct net_device *dev, 
			}

			break;

		case FLOW_ACTION_MANGLE: {

			bool pedit_valid = valid_pedit_action(dev, act);

			bool pedit_valid = valid_pedit_action(dev, act,

							      &natmode_flags);



			if (!pedit_valid)

				return -EOPNOTSUPP;
@@ -642,6 +782,15 @@ int cxgb4_validate_flow_actions(struct net_device *dev, 
		return -EINVAL;

	}



	if (act_pedit) {

		int ret;



		ret = cxgb4_action_natmode_validate(adap, natmode_flags,

						    extack);

		if (ret)

			return ret;

	}



	return 0;

}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h

+15 −0
Original line number Diff line number Diff line
@@ -108,6 +108,21 @@ struct ch_tc_pedit_fields { 
#define PEDIT_TCP_SPORT_DPORT		0x0

#define PEDIT_UDP_SPORT_DPORT		0x0



enum cxgb4_action_natmode_flags {

	CXGB4_ACTION_NATMODE_NONE = 0,

	CXGB4_ACTION_NATMODE_DIP = (1 << 0),

	CXGB4_ACTION_NATMODE_SIP = (1 << 1),

	CXGB4_ACTION_NATMODE_DPORT = (1 << 2),

	CXGB4_ACTION_NATMODE_SPORT = (1 << 3),

};



/* TC PEDIT action to NATMODE translation entry */

struct cxgb4_natmode_config {

	enum chip_type chip;

	u8 flags;

	u8 natmode;

};



void cxgb4_process_flow_actions(struct net_device *in,

				struct flow_action *actions,

				struct ch_filter_specification *fs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE