diff options
| author |   Jakub Kicinski <jakub.kicinski@netronome.com> | 2017-03-21 17:59:12 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-03-22 12:59:07 -0700 |
| commit | a831ffb56048fdd1d99178c34d05469421fd2a36 (patch) | |
| tree | 89d7aabdcbee2a758bef5fe5e2137d52710080ea /drivers/net/ethernet/netronome/nfp/nfpcore | |
| parent | nfp: document expected locking in the core (diff) | |
| download | linux-dev-a831ffb56048fdd1d99178c34d05469421fd2a36.tar.xz linux-dev-a831ffb56048fdd1d99178c34d05469421fd2a36.zip | |
nfp: lock area cache earlier
We shouldn't access area_cache_list without its lock even
to check if it's empty.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfpcore')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c index 4e08362d8c97..5189fedb0f4f 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c @@ -821,10 +821,7 @@ area_cache_get(struct nfp_cpp *cpp, u32 id, * the need for special case code below when * checking against available cache size. */ - if (length == 0) - return NULL; - - if (list_empty(&cpp->area_cache_list) || id == 0) + if (length == 0 || id == 0) return NULL; /* Remap from cpp_island to cpp_target */ @@ -832,10 +829,15 @@ area_cache_get(struct nfp_cpp *cpp, u32 id, if (err < 0) return NULL; - addr += *offset; - mutex_lock(&cpp->area_cache_mutex); + if (list_empty(&cpp->area_cache_list)) { + mutex_unlock(&cpp->area_cache_mutex); + return NULL; + } + + addr += *offset; + /* See if we have a match */ list_for_each_entry(cache, &cpp->area_cache_list, entry) { if (id == cache->id && |