Unverified Commit f377abcb authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13175 bpf: Use raw_spinlock_t in ringbuf 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiaomeng Zhang <zhangxiaomeng13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OSEZV5QOMYVL5BXCTJLMEZIGU5A3D2IX/ 
 
https://gitee.com/openeuler/kernel/issues/IB3I26 
 
Link:https://gitee.com/openeuler/kernel/pulls/13175

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 7999493e 30122b11

kernel/bpf/ringbuf.c

+6 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct bpf_ringbuf { 
	u64 mask;

	struct page **pages;

	int nr_pages;

	spinlock_t spinlock ____cacheline_aligned_in_smp;

	raw_spinlock_t spinlock ____cacheline_aligned_in_smp;

	/* Consumer and producer counters are put into separate pages to allow

	 * mapping consumer page as r/w, but restrict producer page to r/o.

	 * This protects producer position from being modified by user-space
@@ -139,7 +139,7 @@ static struct bpf_ringbuf *bpf_ringbuf_alloc(size_t data_sz, int numa_node) 
	if (!rb)

		return ERR_PTR(-ENOMEM);



	spin_lock_init(&rb->spinlock);

	raw_spin_lock_init(&rb->spinlock);

	init_waitqueue_head(&rb->waitq);

	init_irq_work(&rb->work, bpf_ringbuf_notify);
@@ -339,10 +339,10 @@ static void *__bpf_ringbuf_reserve(struct bpf_ringbuf *rb, u64 size) 
	cons_pos = smp_load_acquire(&rb->consumer_pos);



	if (in_nmi()) {

		if (!spin_trylock_irqsave(&rb->spinlock, flags))

		if (!raw_spin_trylock_irqsave(&rb->spinlock, flags))

			return NULL;

	} else {

		spin_lock_irqsave(&rb->spinlock, flags);

		raw_spin_lock_irqsave(&rb->spinlock, flags);

	}



	pend_pos = rb->pending_pos;
@@ -368,7 +368,7 @@ static void *__bpf_ringbuf_reserve(struct bpf_ringbuf *rb, u64 size) 
	 */

	if (new_prod_pos - cons_pos > rb->mask ||

	    new_prod_pos - pend_pos > rb->mask) {

		spin_unlock_irqrestore(&rb->spinlock, flags);

		raw_spin_unlock_irqrestore(&rb->spinlock, flags);

		return NULL;

	}
@@ -380,7 +380,7 @@ static void *__bpf_ringbuf_reserve(struct bpf_ringbuf *rb, u64 size) 
	/* pairs with consumer's smp_load_acquire() */

	smp_store_release(&rb->producer_pos, new_prod_pos);



	spin_unlock_irqrestore(&rb->spinlock, flags);

	raw_spin_unlock_irqrestore(&rb->spinlock, flags);



	return (void *)hdr + BPF_RINGBUF_HDR_SZ;

}