Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13707f9e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

drivers/net: remove some rcu sparse warnings 



Add missing __rcu annotations and helpers.
minor : Fix some rcu_dereference() calls in macvtap

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ccf43438

drivers/net/bnx2.c

+4 −2
Original line number Diff line number Diff line
@@ -435,7 +435,8 @@ bnx2_cnic_stop(struct bnx2 *bp) 
	struct cnic_ctl_info info;



	mutex_lock(&bp->cnic_lock);

	c_ops = bp->cnic_ops;

	c_ops = rcu_dereference_protected(bp->cnic_ops,

					  lockdep_is_held(&bp->cnic_lock));

	if (c_ops) {

		info.cmd = CNIC_CTL_STOP_CMD;

		c_ops->cnic_ctl(bp->cnic_data, &info);
@@ -450,7 +451,8 @@ bnx2_cnic_start(struct bnx2 *bp) 
	struct cnic_ctl_info info;



	mutex_lock(&bp->cnic_lock);

	c_ops = bp->cnic_ops;

	c_ops = rcu_dereference_protected(bp->cnic_ops,

					  lockdep_is_held(&bp->cnic_lock));

	if (c_ops) {

		if (!(bp->flags & BNX2_FLAG_USING_MSIX)) {

			struct bnx2_napi *bnapi = &bp->bnx2_napi[0];

drivers/net/bnx2.h

+1 −1
Original line number Diff line number Diff line
@@ -6759,7 +6759,7 @@ struct bnx2 { 
	u32		tx_wake_thresh;



#ifdef BCM_CNIC

	struct cnic_ops		*cnic_ops;

	struct cnic_ops	__rcu	*cnic_ops;

	void			*cnic_data;

#endif

drivers/net/bnx2x/bnx2x.h

+1 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ struct bnx2x { 
#define BNX2X_CNIC_FLAG_MAC_SET		1

	void			*t2;

	dma_addr_t		t2_mapping;

	struct cnic_ops		*cnic_ops;

	struct cnic_ops	__rcu	*cnic_ops;

	void			*cnic_data;

	u32			cnic_tag;

	struct cnic_eth_dev	cnic_eth_dev;

drivers/net/bnx2x/bnx2x_main.c

+2 −1
Original line number Diff line number Diff line
@@ -9862,7 +9862,8 @@ static int bnx2x_cnic_ctl_send(struct bnx2x *bp, struct cnic_ctl_info *ctl) 
	int rc = 0;



	mutex_lock(&bp->cnic_mutex);

	c_ops = bp->cnic_ops;

	c_ops = rcu_dereference_protected(bp->cnic_ops,

					  lockdep_is_held(&bp->cnic_mutex));

	if (c_ops)

		rc = c_ops->cnic_ctl(bp->cnic_data, ctl);

	mutex_unlock(&bp->cnic_mutex);

drivers/net/cnic.c

+18 −9
Original line number Diff line number Diff line
@@ -65,7 +65,14 @@ static LIST_HEAD(cnic_udev_list); 
static DEFINE_RWLOCK(cnic_dev_lock);

static DEFINE_MUTEX(cnic_lock);



static struct cnic_ulp_ops *cnic_ulp_tbl[MAX_CNIC_ULP_TYPE];

static struct cnic_ulp_ops __rcu *cnic_ulp_tbl[MAX_CNIC_ULP_TYPE];



/* helper function, assuming cnic_lock is held */

static inline struct cnic_ulp_ops *cnic_ulp_tbl_prot(int type)

{

	return rcu_dereference_protected(cnic_ulp_tbl[type],

					 lockdep_is_held(&cnic_lock));

}



static int cnic_service_bnx2(void *, void *);

static int cnic_service_bnx2x(void *, void *);
@@ -435,7 +442,7 @@ int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops) 
		return -EINVAL;

	}

	mutex_lock(&cnic_lock);

	if (cnic_ulp_tbl[ulp_type]) {

	if (cnic_ulp_tbl_prot(ulp_type)) {

		pr_err("%s: Type %d has already been registered\n",

		       __func__, ulp_type);

		mutex_unlock(&cnic_lock);
@@ -478,7 +485,7 @@ int cnic_unregister_driver(int ulp_type) 
		return -EINVAL;

	}

	mutex_lock(&cnic_lock);

	ulp_ops = cnic_ulp_tbl[ulp_type];

	ulp_ops = cnic_ulp_tbl_prot(ulp_type);

	if (!ulp_ops) {

		pr_err("%s: Type %d has not been registered\n",

		       __func__, ulp_type);
@@ -529,7 +536,7 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type, 
		return -EINVAL;

	}

	mutex_lock(&cnic_lock);

	if (cnic_ulp_tbl[ulp_type] == NULL) {

	if (cnic_ulp_tbl_prot(ulp_type) == NULL) {

		pr_err("%s: Driver with type %d has not been registered\n",

		       __func__, ulp_type);

		mutex_unlock(&cnic_lock);
@@ -544,7 +551,7 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type, 


	clear_bit(ULP_F_START, &cp->ulp_flags[ulp_type]);

	cp->ulp_handle[ulp_type] = ulp_ctx;

	ulp_ops = cnic_ulp_tbl[ulp_type];

	ulp_ops = cnic_ulp_tbl_prot(ulp_type);

	rcu_assign_pointer(cp->ulp_ops[ulp_type], ulp_ops);

	cnic_hold(dev);
@@ -2953,7 +2960,8 @@ static void cnic_ulp_stop(struct cnic_dev *dev) 
		struct cnic_ulp_ops *ulp_ops;



		mutex_lock(&cnic_lock);

		ulp_ops = cp->ulp_ops[if_type];

		ulp_ops = rcu_dereference_protected(cp->ulp_ops[if_type],

						    lockdep_is_held(&cnic_lock));

		if (!ulp_ops) {

			mutex_unlock(&cnic_lock);

			continue;
@@ -2977,7 +2985,8 @@ static void cnic_ulp_start(struct cnic_dev *dev) 
		struct cnic_ulp_ops *ulp_ops;



		mutex_lock(&cnic_lock);

		ulp_ops = cp->ulp_ops[if_type];

		ulp_ops = rcu_dereference_protected(cp->ulp_ops[if_type],

						    lockdep_is_held(&cnic_lock));

		if (!ulp_ops || !ulp_ops->cnic_start) {

			mutex_unlock(&cnic_lock);

			continue;
@@ -3041,7 +3050,7 @@ static void cnic_ulp_init(struct cnic_dev *dev) 
		struct cnic_ulp_ops *ulp_ops;



		mutex_lock(&cnic_lock);

		ulp_ops = cnic_ulp_tbl[i];

		ulp_ops = cnic_ulp_tbl_prot(i);

		if (!ulp_ops || !ulp_ops->cnic_init) {

			mutex_unlock(&cnic_lock);

			continue;
@@ -3065,7 +3074,7 @@ static void cnic_ulp_exit(struct cnic_dev *dev) 
		struct cnic_ulp_ops *ulp_ops;



		mutex_lock(&cnic_lock);

		ulp_ops = cnic_ulp_tbl[i];

		ulp_ops = cnic_ulp_tbl_prot(i);

		if (!ulp_ops || !ulp_ops->cnic_exit) {

			mutex_unlock(&cnic_lock);

			continue;