Commit 9c707ba9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Pull BPF fixes from Daniel Borkmann:

 - Fix inlining of bpf_get_smp_processor_id helper for !CONFIG_SMP
   systems (Andrea Righi)

 - Fix BPF USDT selftests helper code to use asm constraint "m" for
   LoongArch (Tiezhu Yang)

 - Fix BPF selftest compilation error in get_uprobe_offset when
   PROCMAP_QUERY is not defined (Jerome Marchand)

 - Fix BPF bpf_skb_change_tail helper when used in context of BPF
   sockmap to handle negative skb header offsets (Cong Wang)

 - Several fixes to BPF sockmap code, among others, in the area of
   socket buffer accounting (Levi Zim, Zijian Zhang, Cong Wang)

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  selftests/bpf: Test bpf_skb_change_tail() in TC ingress
  selftests/bpf: Introduce socket_helpers.h for TC tests
  selftests/bpf: Add a BPF selftest for bpf_skb_change_tail()
  bpf: Check negative offsets in __bpf_skb_min_len()
  tcp_bpf: Fix copied value in tcp_bpf_sendmsg
  skmsg: Return copied bytes in sk_msg_memcopy_from_iter
  tcp_bpf: Add sk_rmem_alloc related logic for tcp_bpf ingress redirection
  tcp_bpf: Charge receive socket buffer in bpf_tcp_ingress()
  selftests/bpf: Fix compilation error in get_uprobe_offset()
  selftests/bpf: Use asm constraint "m" for LoongArch
  bpf: Fix bpf_get_smp_processor_id() on !CONFIG_SMP
parents 876685ce 4a58963d

include/linux/skmsg.h

+8 −3
Original line number Diff line number Diff line
@@ -317,17 +317,22 @@ static inline void sock_drop(struct sock *sk, struct sk_buff *skb) 
	kfree_skb(skb);

}



static inline void sk_psock_queue_msg(struct sk_psock *psock,

static inline bool sk_psock_queue_msg(struct sk_psock *psock,

				      struct sk_msg *msg)

{

	bool ret;



	spin_lock_bh(&psock->ingress_lock);

	if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))

	if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) {

		list_add_tail(&msg->list, &psock->ingress_msg);

	else {

		ret = true;

	} else {

		sk_msg_free(psock->sk, msg);

		kfree(msg);

		ret = false;

	}

	spin_unlock_bh(&psock->ingress_lock);

	return ret;

}



static inline struct sk_msg *sk_psock_dequeue_msg(struct sk_psock *psock)

include/net/sock.h

+8 −2
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ static inline bool sk_wmem_schedule(struct sock *sk, int size) 
}



static inline bool

sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size)

__sk_rmem_schedule(struct sock *sk, int size, bool pfmemalloc)

{

	int delta;
@@ -1535,7 +1535,13 @@ sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size) 
		return true;

	delta = size - sk->sk_forward_alloc;

	return delta <= 0 || __sk_mem_schedule(sk, delta, SK_MEM_RECV) ||

		skb_pfmemalloc(skb);

	       pfmemalloc;

}



static inline bool

sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size)

{

	return __sk_rmem_schedule(sk, size, skb_pfmemalloc(skb));

}



static inline int sk_unused_reserved_mem(const struct sock *sk)

kernel/bpf/verifier.c

+5 −1
Original line number Diff line number Diff line
@@ -21281,11 +21281,15 @@ static int do_misc_fixups(struct bpf_verifier_env *env) 
			 * changed in some incompatible and hard to support

			 * way, it's fine to back out this inlining logic

			 */

#ifdef CONFIG_SMP

			insn_buf[0] = BPF_MOV32_IMM(BPF_REG_0, (u32)(unsigned long)&pcpu_hot.cpu_number);

			insn_buf[1] = BPF_MOV64_PERCPU_REG(BPF_REG_0, BPF_REG_0);

			insn_buf[2] = BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_0, 0);

			cnt = 3;









#else









			insn_buf[0] = BPF_ALU32_REG(BPF_XOR, BPF_REG_0, BPF_REG_0);









			cnt = 1;









#endif









			new_prog = bpf_patch_insn_data(env, i + delta, insn_buf, cnt);









			if (!new_prog)









				return -ENOMEM;

























net/core/filter.c



+15
−6






























Original line number
Diff line number
Diff line







@@ -3734,13 +3734,22 @@ static const struct bpf_func_proto bpf_skb_adjust_room_proto = {

















static u32 __bpf_skb_min_len(const struct sk_buff *skb)









{









	u32 min_len = skb_network_offset(skb);









	int offset = skb_network_offset(skb);









	u32 min_len = 0;



















	if (skb_transport_header_was_set(skb))









		min_len = skb_transport_offset(skb);









	if (skb->ip_summed == CHECKSUM_PARTIAL)









		min_len = skb_checksum_start_offset(skb) +









	if (offset > 0)









		min_len = offset;









	if (skb_transport_header_was_set(skb)) {









		offset = skb_transport_offset(skb);









		if (offset > 0)









			min_len = offset;









	}









	if (skb->ip_summed == CHECKSUM_PARTIAL) {









		offset = skb_checksum_start_offset(skb) +









			 skb->csum_offset + sizeof(__sum16);









		if (offset > 0)









			min_len = offset;









	}









	return min_len;









}










































net/core/skmsg.c



+8
−3






























Original line number
Diff line number
Diff line







@@ -369,8 +369,8 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,







			     struct sk_msg *msg, u32 bytes)









{









	int ret = -ENOSPC, i = msg->sg.curr;









	u32 copy, buf_size, copied = 0;









	struct scatterlist *sge;









	u32 copy, buf_size;









	void *to;



















	do {








@@ -397,6 +397,7 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,







			goto out;









		}









		bytes -= copy;









		copied += copy;









		if (!bytes)









			break;









		msg->sg.copybreak = 0;








@@ -404,7 +405,7 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,







	} while (i != msg->sg.end);









out:









	msg->sg.curr = i;









	return ret;









	return (ret < 0) ? ret : copied;









}









EXPORT_SYMBOL_GPL(sk_msg_memcopy_from_iter);


















@@ -445,8 +446,10 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,







			if (likely(!peek)) {









				sge->offset += copy;









				sge->length -= copy;









				if (!msg_rx->skb)









				if (!msg_rx->skb) {









					sk_mem_uncharge(sk, copy);









					atomic_sub(copy, &sk->sk_rmem_alloc);









				}









				msg_rx->sg.size -= copy;



















				if (!sge->length) {








@@ -772,6 +775,8 @@ static void __sk_psock_purge_ingress_msg(struct sk_psock *psock)

















	list_for_each_entry_safe(msg, tmp, &psock->ingress_msg, list) {









		list_del(&msg->list);









		if (!msg->skb)









			atomic_sub(msg->sg.size, &psock->sk->sk_rmem_alloc);









		sk_msg_free(psock->sk, msg);









		kfree(msg);









	}