2020-04-29 10:10:31

by Jules Irenge

[permalink] [raw]
Subject: [PATCH 0/6] Lock warnings cleanup

This patch serie propose a solution to functions that record context
imbalance by adding annotations

Jules Irenge (6):
usb: gadget: Add missing annotation for xudc_handle_setup()
udp: Add missing annotations for busylock_acquire() and
busylock_release()
udp: Add annotations for udp_rmem_release()
net: atm: Add missing annotation for lec_seq_stop()
USB: dummy-hcd: Add missing annotation for set_link_state()
net: atm: Add annotation for lec_priv_walk()

drivers/usb/gadget/udc/dummy_hcd.c | 1 +
drivers/usb/gadget/udc/udc-xilinx.c | 1 +
net/atm/lec.c | 11 ++++++++++-
net/ipv4/udp.c | 11 +++++++++++
4 files changed, 23 insertions(+), 1 deletion(-)

--
2.25.3


2020-04-29 10:10:42

by Jules Irenge

[permalink] [raw]
Subject: [PATCH 2/6] udp: Add missing annotations for busylock_acquire() and busylock_release()

Sparse reports warnings

warning: context imbalance in busylock_acquire() - wrong count at exit
warning: context imbalance in busylock_release() - unexpected unlock

The root cause is the missing annotations at
busylock_acquire() and busylock_release()

The __release(busy) annotation inside busylock_release()
tells Sparse and not GCC to shutdown the warning
in case the condition is not satisfied.

Add the missing __acquires(busy) annotation
Add the missing __releases(busy) annotation
Add the __release(busy) annotation

Signed-off-by: Jules Irenge <[email protected]>
---
net/ipv4/udp.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index db76b9609299..5ca12a945ac3 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1430,6 +1430,7 @@ static int udp_busylocks_log __read_mostly;
static spinlock_t *udp_busylocks __read_mostly;

static spinlock_t *busylock_acquire(void *ptr)
+ __acquires(busy)
{
spinlock_t *busy;

@@ -1439,9 +1440,13 @@ static spinlock_t *busylock_acquire(void *ptr)
}

static void busylock_release(spinlock_t *busy)
+ __releases(busy)
{
if (busy)
spin_unlock(busy);
+ else
+ /* annotation for sparse */
+ __release(busy);
}

int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)
--
2.25.3