From: Stephen Hemminger <stephen@networkplumber.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Stephen Hemminger <sthemmin@microsoft.com>
Subject: [PATCH net-next 13/15] netvsc: convert open count from atomic to refcount
Date: Wed, 3 May 2017 16:01:15 -0700 [thread overview]
Message-ID: <20170503230117.20070-14-sthemmin@microsoft.com> (raw)
In-Reply-To: <20170503230117.20070-1-sthemmin@microsoft.com>
Refcount provides wraparond protection.
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
drivers/net/hyperv/hyperv_net.h | 2 +-
drivers/net/hyperv/netvsc.c | 3 ++-
drivers/net/hyperv/rndis_filter.c | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 5627003bd8b6..29555317ca05 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -772,7 +772,7 @@ struct netvsc_device {
atomic_t num_outstanding_recvs;
- atomic_t open_cnt;
+ refcount_t open_cnt;
struct netvsc_channel chan_table[VRSS_CHANNEL_MAX];
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 56e0721f703c..eb9f3e517fa5 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -80,7 +80,8 @@ static struct netvsc_device *alloc_net_device(u32 recvslot_max)
init_waitqueue_head(&net_device->wait_drain);
net_device->destroy = false;
- atomic_set(&net_device->open_cnt, 0);
+
+ refcount_set(&net_device->open_cnt, 0);
net_device->max_pkt = RNDIS_MAX_PKT_DEFAULT;
net_device->pkt_align = RNDIS_PKT_ALIGN_DEFAULT;
init_completion(&net_device->channel_init_wait);
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index bfeaa0549f7f..2a89bbd6e42b 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -1259,7 +1259,7 @@ int rndis_filter_open(struct netvsc_device *nvdev)
if (!nvdev)
return -EINVAL;
- if (atomic_inc_return(&nvdev->open_cnt) != 1)
+ if (refcount_inc_not_zero(&nvdev->open_cnt))
return 0;
return rndis_filter_open_device(nvdev->extension);
@@ -1270,7 +1270,7 @@ int rndis_filter_close(struct netvsc_device *nvdev)
if (!nvdev)
return -EINVAL;
- if (atomic_dec_return(&nvdev->open_cnt) != 0)
+ if (refcount_dec_not_one(&nvdev->open_cnt))
return 0;
return rndis_filter_close_device(nvdev->extension);
--
2.11.0
next prev parent reply other threads:[~2017-05-03 23:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 23:01 [PATCH net-next 00/15] netvsc: misc patches Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 01/15] vmbus: simplify hv_ringbuffer_read Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 02/15] vmbus: fix unnecessary signal events as result of NAPI Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 03/15] netvsc: make sure napi enabled before vmbus_open Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 04/15] netvsc: don't reacquire rtnl on device removal Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 05/15] netvsc: optimize avail percent calculation Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 06/15] netvsc: prefetch the first incoming ring element Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 07/15] netvsc: convert ring_size to unsigned Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 08/15] netvsc: allow overriding send/recv buffer size Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 09/15] netvsc: optimize netvsc_send_pkt Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 10/15] netvsc: replace modulus with mask for alignment Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 11/15] netvsc: reduce unnecessary memset Stephen Hemminger
2017-05-03 23:01 ` [PATCH net-next 12/15] netvsc: size receive completion ring based on receive area Stephen Hemminger
2017-05-03 23:01 ` Stephen Hemminger [this message]
2017-05-03 23:01 ` [PATCH net-next 14/15] netvsc: optimize receive completions Stephen Hemminger
2017-05-03 23:01 ` [PATCH 15/15] netvsc: use vzalloc_node for receive completion data Stephen Hemminger
2017-05-03 23:35 ` [PATCH net-next 00/15] netvsc: misc patches David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170503230117.20070-14-sthemmin@microsoft.com \
--to=stephen@networkplumber.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sthemmin@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).