linux: update for 6.12 compatibility

Update ipt_netmap driver to be resilient from kernel upgrades, along
with dsa shortcut being updated with new struct member name. Also
regenerate the mvpp2 patch for the 6.12 kernel.

Author: aryansrivastava-atl

…nal-patches/vanilla--mvpp2--40406--99999 …nal-patches/vanilla--mvpp2--40406--60b0bLINUX/final-patches/vanilla--mvpp2--40406--99999 renamed to LINUX/final-patches/vanilla--mvpp2--40406--60b0b LINUX/final-patches/vanilla--mvpp2--40406--99999 renamed to LINUX/final-patches/vanilla--mvpp2--40406--60b0b

@@ -0,0 +1,110 @@
+diff --git a/mvpp2/mvpp2_main.c b/mvpp2/mvpp2_main.c
+index 3880dcc0418b..3ea0c4928921 100644
+--- a/mvpp2/mvpp2_main.c
++++ b/mvpp2/mvpp2_main.c
+@@ -43,6 +43,10 @@
+ #include "mvpp2_prs.h"
+ #include "mvpp2_cls.h"
+ 
++#if defined(CONFIG_NETMAP) || defined(CONFIG_NETMAP_MODULE)
++#include <mvpp2_netmap.h>
++#endif
++
+ enum mvpp2_bm_pool_log_num {
+ 	MVPP2_BM_SHORT,
+ 	MVPP2_BM_LONG,
+@@ -687,7 +691,7 @@ static int mvpp2_bm_init(struct device *dev, struct mvpp2 *priv)
+ 	}
+ 
+ 	/* Allocate and initialize BM pools */
+-	priv->bm_pools = devm_kcalloc(dev, poolnum,
++	priv->bm_pools = devm_kcalloc(dev, MVPP2_BM_MAX_POOLS,
+ 				      sizeof(*priv->bm_pools), GFP_KERNEL);
+ 	if (!priv->bm_pools)
+ 		return -ENOMEM;
+@@ -1460,7 +1464,11 @@ static void mvpp2_interrupts_unmask(void *arg)
+ 
+ 	val = MVPP2_CAUSE_MISC_SUM_MASK |
+ 		MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK(port->priv->hw_version);
++#ifdef CONFIG_NETMAP
++	if (port->has_tx_irqs && !nm_netmap_on(NA(port->dev)))
++#else
+ 	if (port->has_tx_irqs)
++#endif
+ 		val |= MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_MASK;
+ 
+ 	mvpp2_thread_write(port->priv, thread,
+@@ -2987,7 +2995,11 @@ static int mvpp2_rxq_init(struct mvpp2_port *port,
+ 	put_cpu();
+ 
+ 	/* Set Offset */
++#ifdef CONFIG_NETMAP
++	mvpp2_netmap_rxq_offset_set(port, rxq->id);
++#else
+ 	mvpp2_rxq_offset_set(port, rxq->id, MVPP2_SKB_HEADROOM);
++#endif
+ 
+ 	/* Set coalescing pkts and time */
+ 	mvpp2_rx_pkts_coal_set(port, rxq);
+@@ -3377,6 +3389,11 @@ static irqreturn_t mvpp2_isr(int irq, void *dev_id)
+ {
+ 	struct mvpp2_queue_vector *qv = dev_id;
+ 
++#ifdef CONFIG_NETMAP
++	if (mvpp2_netmap_rx_irq(qv))
++		return IRQ_HANDLED;
++#endif /* DEV_NETMAP */
++
+ 	mvpp2_qvec_interrupt_disable(qv);
+ 
+ 	napi_schedule(&qv->napi);
+@@ -4394,6 +4411,12 @@ static netdev_tx_t mvpp2_tx(struct sk_buff *skb, struct net_device *dev)
+ 	}
+ 	frags = skb_shinfo(skb)->nr_frags + 1;
+ 
++#ifdef CONFIG_NETMAP
++	/* Process all TX queues on this port for this thread/core */
++	if (port->has_tx_irqs && nm_netmap_on(NA(dev))) {
++		mvpp2_tx_done(port, ((1 << port->ntxqs) - 1), thread);
++	}
++#endif
+ 	/* Check number of available descriptors */
+ 	if (mvpp2_aggr_desc_num_check(port, aggr_txq, frags) ||
+ 	    mvpp2_txq_reserved_desc_num_proc(port, txq, txq_pcpu, frags)) {
+@@ -5778,7 +5801,11 @@ static const struct net_device_ops mvpp2_netdev_ops = {
+ 	.ndo_start_xmit		= mvpp2_tx,
+ 	.ndo_set_rx_mode	= mvpp2_set_rx_mode,
+ 	.ndo_set_mac_address	= mvpp2_set_mac_address,
++#ifdef CONFIG_NETMAP
++	.ndo_change_mtu		= mvpp2_netmap_change_mtu,
++#else
+ 	.ndo_change_mtu		= mvpp2_change_mtu,
++#endif
+ 	.ndo_get_stats64	= mvpp2_get_stats64,
+ 	.ndo_eth_ioctl		= mvpp2_ioctl,
+ 	.ndo_vlan_rx_add_vid	= mvpp2_vlan_rx_add_vid,
+@@ -7088,6 +7115,9 @@ static void mvpp2_port_remove(struct mvpp2_port *port)
+ {
+ 	int i;
+ 
++#ifdef CONFIG_NETMAP
++	mvpp2_netmap_detach(port);
++#endif /* CONFIG_NETMAP */
+ 	unregister_netdev(port->dev);
+ 	if (port->phylink)
+ 		phylink_destroy(port->phylink);
+@@ -7691,6 +7721,14 @@ static int mvpp2_probe(struct platform_device *pdev)
+ 	mvpp2_dbgfs_init(priv, pdev->name);
+ 
+ 	platform_set_drvdata(pdev, priv);
++#ifdef CONFIG_NETMAP
++	i = 0;
++	device_for_each_child_node_scoped(&pdev->dev, port_fwnode) {
++		if (priv->port_list[i])
++			mvpp2_netmap_attach(priv->port_list[i]);
++		i++;
++	}
++#endif /* CONFIG_NETMAP */
+ 	return 0;
+ 
+ err_port_probe:

LINUX/final-patches/vanilla--mvpp2--60c00--99999

@@ -29,6 +29,11 @@
 #endif
 #include "ipt_netmap.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
+#include <net/hotdata.h>
+#define netdev_max_backlog net_hotdata.max_backlog
+#endif
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Sheena Mira-ato");
 MODULE_DESCRIPTION("A loadable kernel module that adds an NMRING target for iptables");
@@ -133,7 +138,11 @@ static bool ipt_ipv4_route(struct net *net, struct sk_buff *skb)
 
 #ifdef CONFIG_XFRM
 	if (!(IPCB(skb)->flags & IPSKB_XFRM_TRANSFORMED) &&
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)
+	    xfrm_decode_session(net, skb, flowi4_to_flowi(&fl4), AF_INET) == 0) {
+#else
 	    xfrm_decode_session(skb, flowi4_to_flowi(&fl4), AF_INET) == 0) {
+#endif
 		struct dst_entry *dst = skb_dst(skb);
 		skb_dst_set(skb, NULL);
 		dst = xfrm_lookup(net, dst, flowi4_to_flowi(&fl4), skb->sk, 0);
@@ -171,7 +180,11 @@ static bool ipt_ipv6_route(struct net *net, struct sk_buff *skb)
 
 #ifdef CONFIG_XFRM
 	if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)
+	    xfrm_decode_session(net, skb, flowi6_to_flowi(&fl6), AF_INET6) == 0) {
+#else
 	    xfrm_decode_session(skb, flowi6_to_flowi(&fl6), AF_INET6) == 0) {
+#endif
 		skb_dst_set(skb, NULL);
 		dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), skb->sk, 0);
 		if (IS_ERR(dst))
@@ -885,7 +898,9 @@ static unsigned int nmring_tg6(struct sk_buff *skb,
 		return NF_STOLEN;
 	}
 	else if ((skb->len > mtu)||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,7,0)
 			(skb_dst(skb) && dst_allfrag(skb_dst(skb))) ||
+#endif
 			(IP6CB(skb)->frag_max_size &&
 					skb->len > IP6CB(skb)->frag_max_size)) {
 		if (skb_dst(skb)) {
@@ -1032,7 +1047,7 @@ static struct pernet_operations ipt_netmap_net_ops = {
 	.pre_exit	= ipt_netmap_net_exit,
 #endif
 	.id	= &ipt_netmap_net_id,
-	.size	= 0,
+	.size	= sizeof(struct ipt_netmap_priv),
 };
 
 static int __init nmring_tg_init(void)

LINUX/ipt_netmap/ipt_netmap.c

@@ -39,6 +39,7 @@
 #ifdef ATL_CHANGE
 #include <uapi/linux/if_arp.h>
 #include <net/dsa.h>
+#include <linux/version.h>
 #endif
 #include <net/pkt_sched.h>
 #include <net/sch_generic.h>
@@ -490,7 +491,11 @@ nm_os_send_up(struct ifnet *ifp, struct mbuf *m, struct mbuf *prev)
 				skb_pull_rcsum(m, 4);
 				memmove(m->data - ETH_HLEN, m->data - ETH_HLEN - 4, 2 * ETH_ALEN);
 				skb_push(m, ETH_HLEN);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)
+				m->dev = dp->user;
+#else
 				m->dev = dp->slave;
+#endif
 				m->pkt_type = PACKET_HOST;
 				m->protocol = eth_type_trans(m, m->dev);
 				skb_set_l2_port_ifindex(m, m->dev->ifindex);