Commit d7e78951 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.11-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Paolo Abeni:
 "Including fixes from netfilter.

  Notably this includes fixes for a s390 build breakage.

  Current release - new code bugs:

   - eth: fbnic: fix s390 build

   - eth: airoha: fix NULL pointer dereference in
     airoha_qdma_cleanup_rx_queue()

  Previous releases - regressions:

   - flow_dissector: use DEBUG_NET_WARN_ON_ONCE

   - ipv4: fix incorrect TOS in route get reply

   - dsa: fix chip-wide frame size config in some drivers

  Previous releases - always broken:

   - netfilter: nf_set_pipapo: fix initial map fill

   - eth: gve: fix XDP TX completion handling when counters overflow"

* tag 'net-6.11-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net:
  eth: fbnic: don't build the driver when skb has more than 21 frags
  net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
  net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
  net: airoha: Fix NULL pointer dereference in airoha_qdma_cleanup_rx_queue()
  net: wwan: t7xx: add support for Dell DW5933e
  ipv4: Fix incorrect TOS in fibmatch route get reply
  ipv4: Fix incorrect TOS in route get reply
  net: flow_dissector: use DEBUG_NET_WARN_ON_ONCE
  driver core: auxiliary bus: Fix documentation of auxiliary_device
  net: airoha: fix error branch in airoha_dev_xmit and airoha_set_gdm_ports
  gve: Fix XDP TX completion handling when counters overflow
  ipvs: properly dereference pe in ip_vs_add_service
  selftests: netfilter: add test case for recent mismatch bug
  netfilter: nf_set_pipapo: fix initial map fill
  netfilter: ctnetlink: use helper function to calculate expect ID
  eth: fbnic: fix s390 build.
parents 53a5182c 43598361

drivers/net/dsa/b53/b53_common.c

+3 −0
Original line number Diff line number Diff line
@@ -2256,6 +2256,9 @@ static int b53_change_mtu(struct dsa_switch *ds, int port, int mtu) 
	if (is5325(dev) || is5365(dev))

		return -EOPNOTSUPP;



	if (!dsa_is_cpu_port(ds, port))

		return 0;



	enable_jumbo = (mtu >= JMS_MIN_SIZE);

	allow_10_100 = (dev->chip_id == BCM583XX_DEVICE_ID);

drivers/net/dsa/mv88e6xxx/chip.c

+2 −1
Original line number Diff line number Diff line
@@ -3626,7 +3626,8 @@ static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu) 
	mv88e6xxx_reg_lock(chip);

	if (chip->info->ops->port_set_jumbo_size)

		ret = chip->info->ops->port_set_jumbo_size(chip, port, new_mtu);

	else if (chip->info->ops->set_max_frame_size)

	else if (chip->info->ops->set_max_frame_size &&

		 dsa_is_cpu_port(ds, port))

		ret = chip->info->ops->set_max_frame_size(chip, new_mtu);

	mv88e6xxx_reg_unlock(chip);

drivers/net/ethernet/google/gve/gve_tx.c

+3 −2
Original line number Diff line number Diff line
@@ -158,15 +158,16 @@ static int gve_clean_xdp_done(struct gve_priv *priv, struct gve_tx_ring *tx, 
			      u32 to_do)

{

	struct gve_tx_buffer_state *info;

	u32 clean_end = tx->done + to_do;

	u64 pkts = 0, bytes = 0;

	size_t space_freed = 0;

	u32 xsk_complete = 0;

	u32 idx;

	int i;



	for (; tx->done < clean_end; tx->done++) {

	for (i = 0; i < to_do; i++) {

		idx = tx->done & tx->mask;

		info = &tx->info[idx];

		tx->done++;



		if (unlikely(!info->xdp.size))

			continue;

drivers/net/ethernet/mediatek/airoha_eth.c

+7 −6
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ static int airoha_set_gdm_ports(struct airoha_eth *eth, bool enable) 
	return 0;



error:

	for (i--; i >= 0; i++)

	for (i--; i >= 0; i--)

		airoha_set_gdm_port(eth, port_list[i], false);



	return err;
@@ -1585,7 +1585,6 @@ static int airoha_qdma_init_rx_queue(struct airoha_eth *eth, 


static void airoha_qdma_cleanup_rx_queue(struct airoha_queue *q)

{

	enum dma_data_direction dir = page_pool_get_dma_dir(q->page_pool);

	struct airoha_eth *eth = q->eth;



	while (q->queued) {
@@ -1593,7 +1592,7 @@ static void airoha_qdma_cleanup_rx_queue(struct airoha_queue *q) 
		struct page *page = virt_to_head_page(e->buf);



		dma_sync_single_for_cpu(eth->dev, e->dma_addr, e->dma_len,

					dir);

					page_pool_get_dma_dir(q->page_pool));

		page_pool_put_full_page(q->page_pool, page, false);

		q->tail = (q->tail + 1) % q->ndesc;

		q->queued--;
@@ -2431,9 +2430,11 @@ static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;



error_unmap:

	for (i--; i >= 0; i++)

		dma_unmap_single(dev->dev.parent, q->entry[i].dma_addr,

				 q->entry[i].dma_len, DMA_TO_DEVICE);

	for (i--; i >= 0; i--) {

		index = (q->head + i) % q->ndesc;

		dma_unmap_single(dev->dev.parent, q->entry[index].dma_addr,

				 q->entry[index].dma_len, DMA_TO_DEVICE);

	}



	spin_unlock_bh(&q->lock);

error:

drivers/net/ethernet/meta/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ if NET_VENDOR_META 
config FBNIC

	tristate "Meta Platforms Host Network Interface"

	depends on X86_64 || COMPILE_TEST

	depends on S390=n

	depends on MAX_SKB_FRAGS < 22

	depends on PCI_MSI

	select PHYLINK

	help