From: Jakub Kicinski <kuba@kernel.org>
Date: Tue, 4 Oct 2022 00:44:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.6.17~6504^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e52f7c1ddf3e47243c330923ea764e7ccfbe99f7;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/netdev/net

Merge in the left-over fixes before the net-next pull-request.

Conflicts:

drivers/net/ethernet/mediatek/mtk_ppe.c
  ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear")
  9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc")
https://lore.kernel.org/all/6cb6893b-4921-a068-4c30-1109795110bb@tessares.net/

kernel/bpf/helpers.c
  8addbfc7b308 ("bpf: Gate dynptr API behind CAP_BPF")
  5679ff2f138f ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF")
  8a67f2de9b1d ("bpf: expose bpf_strtol and bpf_strtoul to all program types")
https://lore.kernel.org/all/20221003201957.13149-1-daniel@iogearbox.net/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

e52f7c1ddf3e47243c330923ea764e7ccfbe99f7
diff --cc drivers/net/ethernet/mediatek/mtk_ppe.c
index 887f430,148ea63..ae00e57
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
@@@ -439,10 -410,9 +439,10 @@@ __mtk_foe_entry_clear(struct mtk_ppe *p
  
  	hlist_del_init(&entry->list);
  	if (entry->hash != 0xffff) {
 -		ppe->foe_table[entry->hash].ib1 &= ~MTK_FOE_IB1_STATE;
 -		ppe->foe_table[entry->hash].ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE,
 -							      MTK_FOE_STATE_INVALID);
 +		struct mtk_foe_entry *hwe = mtk_foe_get_entry(ppe, entry->hash);
 +
 +		hwe->ib1 &= ~MTK_FOE_IB1_STATE;
- 		hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_UNBIND);
++		hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
  		dma_wmb();
  	}
  	entry->hash = 0xffff;
diff --cc kernel/bpf/helpers.c
index b069517,3814b0fd..a6b04fa
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -1609,26 -1627,12 +1609,12 @@@ bpf_base_func_proto(enum bpf_func_id fu
  		return &bpf_ringbuf_discard_proto;
  	case BPF_FUNC_ringbuf_query:
  		return &bpf_ringbuf_query_proto;
- 	case BPF_FUNC_ringbuf_reserve_dynptr:
- 		return &bpf_ringbuf_reserve_dynptr_proto;
- 	case BPF_FUNC_ringbuf_submit_dynptr:
- 		return &bpf_ringbuf_submit_dynptr_proto;
- 	case BPF_FUNC_ringbuf_discard_dynptr:
- 		return &bpf_ringbuf_discard_dynptr_proto;
 -	case BPF_FUNC_for_each_map_elem:
 -		return &bpf_for_each_map_elem_proto;
 -	case BPF_FUNC_loop:
 -		return &bpf_loop_proto;
  	case BPF_FUNC_strncmp:
  		return &bpf_strncmp_proto;
 +	case BPF_FUNC_strtol:
 +		return &bpf_strtol_proto;
 +	case BPF_FUNC_strtoul:
 +		return &bpf_strtoul_proto;
- 	case BPF_FUNC_dynptr_from_mem:
- 		return &bpf_dynptr_from_mem_proto;
- 	case BPF_FUNC_dynptr_read:
- 		return &bpf_dynptr_read_proto;
- 	case BPF_FUNC_dynptr_write:
- 		return &bpf_dynptr_write_proto;
- 	case BPF_FUNC_dynptr_data:
- 		return &bpf_dynptr_data_proto;
  	default:
  		break;
  	}
@@@ -1657,12 -1661,20 +1643,26 @@@
  		return &bpf_timer_cancel_proto;
  	case BPF_FUNC_kptr_xchg:
  		return &bpf_kptr_xchg_proto;
 +	case BPF_FUNC_for_each_map_elem:
 +		return &bpf_for_each_map_elem_proto;
 +	case BPF_FUNC_loop:
 +		return &bpf_loop_proto;
 +	case BPF_FUNC_user_ringbuf_drain:
 +		return &bpf_user_ringbuf_drain_proto;
+ 	case BPF_FUNC_ringbuf_reserve_dynptr:
+ 		return &bpf_ringbuf_reserve_dynptr_proto;
+ 	case BPF_FUNC_ringbuf_submit_dynptr:
+ 		return &bpf_ringbuf_submit_dynptr_proto;
+ 	case BPF_FUNC_ringbuf_discard_dynptr:
+ 		return &bpf_ringbuf_discard_dynptr_proto;
+ 	case BPF_FUNC_dynptr_from_mem:
+ 		return &bpf_dynptr_from_mem_proto;
+ 	case BPF_FUNC_dynptr_read:
+ 		return &bpf_dynptr_read_proto;
+ 	case BPF_FUNC_dynptr_write:
+ 		return &bpf_dynptr_write_proto;
+ 	case BPF_FUNC_dynptr_data:
+ 		return &bpf_dynptr_data_proto;
  	default:
  		break;
  	}