Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Check return from nxsem_wait_initialize()

Browse Source 
Resolution of Issue 619 will require multiple steps, this part of the first step in that resolution:  Every call to nxsem_wait_uninterruptible() must handle the return value from nxsem_wait_uninterruptible properly.  This commit is only for those files under fs/driver, fs/aio, fs/nfs, crypto/, and boards/.

Please note:  The modified file under fs/nfs generates several " Mixed case identifier found" errors.  Please ignore these.  These cannot be fixed without changes to numerous other files.  They also follow a non-standard convention that is used many files:  Using lower case structure names in custom SIZEOF_ definitions.
This commit is contained in:
Gregory Nutt
2020-03-30 09:00:51 -06:00
committed by Abdelatif Guettouche
parent 15fac7743c
commit ae401cecdd
13 changed files with 496 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/arm/samv7/samv71-xult/src/sam_ili9488.c
+31 -18
View File
@@ -204,7 +204,7 @@
# define CONFIG_SAMV71XULT_LCD_BGCOLOR 0 # define CONFIG_SAMV71XULT_LCD_BGCOLOR 0
#endif #endif
/* Display/Color Properties **************************************************/ /* Display/Color Properties *************************************************/
/* Display Resolution */ /* Display Resolution */
@@ -228,7 +228,7 @@
#define RGB_BLUE(rgb) RGB16BLUE(rgb) #define RGB_BLUE(rgb) RGB16BLUE(rgb)
#define RGB_COLOR(r,g,b) RGBTO16(r,g,b) #define RGB_COLOR(r,g,b) RGBTO16(r,g,b)
/* SAMV7-XULT LCD Hardware Definitions ***************************************/ /* SAMV7-XULT LCD Hardware Definitions **************************************/
/* LCD /CS is NCS3 */ /* LCD /CS is NCS3 */
@@ -286,7 +286,7 @@
# define LCD_RUNBUFFER_PIXELS SAM_XRES # define LCD_RUNBUFFER_PIXELS SAM_XRES
#endif #endif
/* Debug *********************************************************************/ /* Debug ********************************************************************/
#ifdef CONFIG_DEBUG_DMA #ifdef CONFIG_DEBUG_DMA
# define SAMPLENDX_BEFORE_SETUP 0 # define SAMPLENDX_BEFORE_SETUP 0
@@ -422,7 +422,8 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
static int sam_getpower(FAR struct lcd_dev_s *dev); static int sam_getpower(FAR struct lcd_dev_s *dev);
static int sam_setpower(FAR struct lcd_dev_s *dev, int power); static int sam_setpower(FAR struct lcd_dev_s *dev, int power);
static int sam_getcontrast(FAR struct lcd_dev_s *dev); static int sam_getcontrast(FAR struct lcd_dev_s *dev);
static int sam_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast); static int sam_setcontrast(FAR struct lcd_dev_s *dev,
unsigned int contrast);
/* Initialization */ /* Initialization */
@@ -458,26 +459,27 @@ static const uint32_t g_lcdpin[] =
* if there are multiple LCD devices, they must each have unique run buffers. * if there are multiple LCD devices, they must each have unique run buffers.
*/ */
static uint16_t g_runbuffer[LCD_RUNBUFFER_BYTES] __attribute__((aligned(LCD_ALIGN))); static uint16_t g_runbuffer[LCD_RUNBUFFER_BYTES]
__attribute__((aligned(LCD_ALIGN)));
/* This structure describes the overall LCD video controller */ /* This structure describes the overall LCD video controller */
static const struct fb_videoinfo_s g_videoinfo = static const struct fb_videoinfo_s g_videoinfo =
{ {
.fmt = SAM_COLORFMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ .fmt = SAM_COLORFMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
.xres = SAM_XRES, /* Horizontal resolution in pixel columns */ .xres = SAM_XRES, /* Horizontal resolution in pixel columns */
.yres = SAM_YRES, /* Vertical resolution in pixel rows */ .yres = SAM_YRES, /* Vertical resolution in pixel rows */
.nplanes = 1, /* Number of color planes supported */ .nplanes = 1, /* Number of color planes supported */
}; };
/* This is the standard, NuttX Plane information object */ /* This is the standard, NuttX Plane information object */
static const struct lcd_planeinfo_s g_planeinfo = static const struct lcd_planeinfo_s g_planeinfo =
{ {
.putrun = sam_putrun, /* Put a run into LCD memory */ .putrun = sam_putrun, /* Put a run into LCD memory */
.getrun = sam_getrun, /* Get a run from LCD memory */ .getrun = sam_getrun, /* Get a run from LCD memory */
.buffer = (uint8_t*)g_runbuffer, /* Run scratch buffer */ .buffer = (FAR uint8_t *)g_runbuffer, /* Run scratch buffer */
.bpp = SAM_BPP, /* Bits-per-pixel */ .bpp = SAM_BPP, /* Bits-per-pixel */
}; };
/* This is the ILI9488 LCD driver object */ /* This is the ILI9488 LCD driver object */
@@ -751,7 +753,8 @@ static void sam_disable_backlight(void)
* Name: sam_set_backlight * Name: sam_set_backlight
* *
* Description: * Description:
* The the backlight to the level associated with the specified power value. * The the backlight to the level associated with the specified power
* value.
* *
****************************************************************************/ ****************************************************************************/
@@ -994,7 +997,11 @@ static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout)
* incremented and there will be no wait. * incremented and there will be no wait.
*/ */
nxsem_wait_uninterruptible(&priv->waitsem); ret = nxsem_wait_uninterruptible(&priv->waitsem);
if (ret < 0)
{
return ret;
}
} }
/* Dump the collect DMA sample data */ /* Dump the collect DMA sample data */
@@ -1041,7 +1048,8 @@ static void sam_lcd_dmacallback(DMA_HANDLE handle, void *arg, int result)
****************************************************************************/ ****************************************************************************/
static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv, static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv,
FAR const uint16_t *buffer, unsigned int buflen) FAR const uint16_t *buffer,
unsigned int buflen)
{ {
irqstate_t flags; irqstate_t flags;
int ret; int ret;
@@ -1083,7 +1091,8 @@ static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv,
****************************************************************************/ ****************************************************************************/
static int sam_lcd_rxtransfer(FAR struct sam_dev_s *priv, static int sam_lcd_rxtransfer(FAR struct sam_dev_s *priv,
FAR const uint16_t *buffer, unsigned int buflen) FAR const uint16_t *buffer,
unsigned int buflen)
{ {
irqstate_t flags; irqstate_t flags;
int ret; int ret;
@@ -1415,7 +1424,11 @@ static inline void sam_smc_initialize(void)
static inline int sam_lcd_initialize(void) static inline int sam_lcd_initialize(void)
{ {
FAR struct sam_dev_s *priv = &g_lcddev; FAR struct sam_dev_s *priv = &g_lcddev;
uint8_t buffer[4] = {0, 0, 0, 0}; uint8_t buffer[4] =
{
0, 0, 0, 0
};
uint16_t id; uint16_t id;
uint16_t param; uint16_t param;
int ret; int ret;
crypto/random_pool.c
+39 -20
View File
@@ -120,9 +120,13 @@ static struct entropy_pool_s entropy_pool;
#endif #endif
/* Polynomial from paper "The Linux Pseudorandom Number Generator Revisited" /* Polynomial from paper "The Linux Pseudorandom Number Generator Revisited"
* x^POOL_SIZE + x^104 + x^76 + x^51 + x^25 + x + 1 */ * x^POOL_SIZE + x^104 + x^76 + x^51 + x^25 + x + 1
*/
static const uint32_t pool_stir[] = { POOL_SIZE, 104, 76, 51, 25, 1 }; static const uint32_t pool_stir[] =
{
POOL_SIZE, 104, 76, 51, 25, 1
};
/* Derived from IEEE 802.3 CRC-32 */ /* Derived from IEEE 802.3 CRC-32 */
@@ -198,7 +202,7 @@ static void addentropy(FAR const uint32_t *buf, size_t n, bool inc_new)
{ {
g_rng.rd_newentr += 1; g_rng.rd_newentr += 1;
} }
} }
} }
/**************************************************************************** /****************************************************************************
@@ -260,15 +264,18 @@ static void getentropy(FAR blake2s_state *S)
* number generator (DRBG) as used here. BLAKE2 specification is available * number generator (DRBG) as used here. BLAKE2 specification is available
* at https://blake2.net/ * at https://blake2.net/
* *
* BLAKE2Xs here implementation is based on public-domain/CC0 BLAKE2 reference * BLAKE2Xs here implementation is based on public-domain/CC0 BLAKE2
* implementation by Samual Neves, at * reference implementation by Samual Neves, at
* https://github.com/BLAKE2/BLAKE2/tree/master/ref *
* Copyright 2012, Samuel Neves <sneves@dei.uc.pt> * https://github.com/BLAKE2/BLAKE2/tree/master/ref
* Copyright 2012, Samuel Neves <sneves@dei.uc.pt>
*/ */
static void rng_reseed(void) static void rng_reseed(void)
{ {
blake2s_param P = {}; blake2s_param P =
{
};
/* Reset output node counter. */ /* Reset output node counter. */
@@ -336,8 +343,9 @@ static void rng_buf_internal(FAR void *bytes, size_t nbytes)
} }
else if (g_rng.blake2xs.out_node_offset == UINT32_MAX) else if (g_rng.blake2xs.out_node_offset == UINT32_MAX)
{ {
/* Maximum BLAKE2Xs output reached (2^32-1 output blocks, maximum 128 GiB /* Maximum BLAKE2Xs output reached (2^32-1 output blocks, maximum 128
* bytes), reseed. */ * GiB bytes), reseed.
*/
rng_reseed(); rng_reseed();
} }
@@ -436,7 +444,8 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf,
if (kindof == RND_SRC_IRQ && n > 0) if (kindof == RND_SRC_IRQ && n > 0)
{ {
/* Ignore interrupt randomness if previous interrupt was from same /* Ignore interrupt randomness if previous interrupt was from same
* source. */ * source.
*/
if (buf[0] == g_rng.rd_prev_irq) if (buf[0] == g_rng.rd_prev_irq)
{ {
@@ -463,7 +472,8 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf,
uint8_t curr_time = ts.tv_sec * 8 + ts.tv_nsec / (NSEC_PER_SEC / 8); uint8_t curr_time = ts.tv_sec * 8 + ts.tv_nsec / (NSEC_PER_SEC / 8);
/* Allow interrupts/timers increase entropy counter at max rate /* Allow interrupts/timers increase entropy counter at max rate
* of 8 Hz. */ * of 8 Hz.
*/
if (g_rng.rd_prev_time == curr_time) if (g_rng.rd_prev_time == curr_time)
{ {
@@ -500,14 +510,18 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf,
void up_rngreseed(void) void up_rngreseed(void)
{ {
nxsem_wait_uninterruptible(&g_rng.rd_sem); int ret;
if (g_rng.rd_newentr >= MIN_SEED_NEW_ENTROPY_WORDS) ret = nxsem_wait_uninterruptible(&g_rng.rd_sem);
if (ret >= 0)
{ {
rng_reseed(); if (g_rng.rd_newentr >= MIN_SEED_NEW_ENTROPY_WORDS)
} {
rng_reseed();
}
nxsem_post(&g_rng.rd_sem); nxsem_post(&g_rng.rd_sem);
}
} }
/**************************************************************************** /****************************************************************************
@@ -549,7 +563,12 @@ void up_randompool_initialize(void)
void getrandom(FAR void *bytes, size_t nbytes) void getrandom(FAR void *bytes, size_t nbytes)
{ {
nxsem_wait_uninterruptible(&g_rng.rd_sem); int ret;
rng_buf_internal(bytes, nbytes);
nxsem_post(&g_rng.rd_sem); ret = nxsem_wait_uninterruptible(&g_rng.rd_sem);
if (ret >= 0)
{
rng_buf_internal(bytes, nbytes);
nxsem_post(&g_rng.rd_sem);
}
} }
fs/aio/aio.h
+14 -29
View File
@@ -1,35 +1,20 @@
/**************************************************************************** /****************************************************************************
* fs/aio/aio.h * fs/aio/aio.h
* *
* Copyright (C) 2014 Gregory Nutt. All rights reserved. * Licensed to the Apache Software Foundation (ASF) under one or more
* Author: Gregory Nutt <gnutt@nuttx.org> * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* *
* Redistribution and use in source and binary forms, with or without * http://www.apache.org/licenses/LICENSE-2.0
* modification, are permitted provided that the following conditions
* are met:
* *
* 1. Redistributions of source code must retain the above copyright * Unless required by applicable law or agreed to in writing, software
* notice, this list of conditions and the following disclaimer. * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* 2. Redistributions in binary form must reproduce the above copyright * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* notice, this list of conditions and the following disclaimer in * License for the specific language governing permissions and limitations
* the documentation and/or other materials provided with the * under the License.
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* *
****************************************************************************/ ****************************************************************************/
@@ -150,11 +135,11 @@ void aio_initialize(void);
* None * None
* *
* Returned Value: * Returned Value:
* None * aio_lock() return -ECANCELED if the calling thread is canceled.
* *
****************************************************************************/ ****************************************************************************/
void aio_lock(void); int aio_lock(void);
void aio_unlock(void); void aio_unlock(void);
/**************************************************************************** /****************************************************************************
fs/aio/aio_cancel.c
+13 -28
View File
@@ -1,35 +1,20 @@
/**************************************************************************** /****************************************************************************
* fs/aio/aio_cancel.c * fs/aio/aio_cancel.c
* *
* Copyright (C) 2014 Gregory Nutt. All rights reserved. * Licensed to the Apache Software Foundation (ASF) under one or more
* Author: Gregory Nutt <gnutt@nuttx.org> * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* *
* Redistribution and use in source and binary forms, with or without * http://www.apache.org/licenses/LICENSE-2.0
* modification, are permitted provided that the following conditions
* are met:
* *
* 1. Redistributions of source code must retain the above copyright * Unless required by applicable law or agreed to in writing, software
* notice, this list of conditions and the following disclaimer. * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* 2. Redistributions in binary form must reproduce the above copyright * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* notice, this list of conditions and the following disclaimer in * License for the specific language governing permissions and limitations
* the documentation and/or other materials provided with the * under the License.
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* *
****************************************************************************/ ****************************************************************************/
@@ -110,7 +95,7 @@ int aio_cancel(int fildes, FAR struct aiocb *aiocbp)
ret = AIO_ALLDONE; ret = AIO_ALLDONE;
sched_lock(); sched_lock();
aio_lock(); ret = aio_lock();
if (aiocbp) if (aiocbp)
{ {
fs/aio/aio_initialize.c
+53 -41
View File
@@ -1,35 +1,20 @@
/**************************************************************************** /****************************************************************************
* fs/aio/aio_initialize.c * fs/aio/aio_initialize.c
* *
* Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. * Licensed to the Apache Software Foundation (ASF) under one or more
* Author: Gregory Nutt <gnutt@nuttx.org> * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* *
* Redistribution and use in source and binary forms, with or without * http://www.apache.org/licenses/LICENSE-2.0
* modification, are permitted provided that the following conditions
* are met:
* *
* 1. Redistributions of source code must retain the above copyright * Unless required by applicable law or agreed to in writing, software
* notice, this list of conditions and the following disclaimer. * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* 2. Redistributions in binary form must reproduce the above copyright * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* notice, this list of conditions and the following disclaimer in * License for the specific language governing permissions and limitations
* the documentation and/or other materials provided with the * under the License.
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* *
****************************************************************************/ ****************************************************************************/
@@ -140,13 +125,14 @@ void aio_initialize(void)
* None * None
* *
* Returned Value: * Returned Value:
* None * aio_lock() return -ECANCELED if the calling thread is canceled.
* *
****************************************************************************/ ****************************************************************************/
void aio_lock(void) int aio_lock(void)
{ {
pid_t me = getpid(); pid_t me = getpid();
int ret = OK;
/* Does this thread already hold the semaphore? */ /* Does this thread already hold the semaphore? */
@@ -159,13 +145,17 @@ void aio_lock(void)
} }
else else
{ {
nxsem_wait_uninterruptible(&g_aio_exclsem); ret = nxsem_wait_uninterruptible(&g_aio_exclsem);
if (ret >= 0)
{
/* And mark it as ours */
/* And mark it as ours */ g_aio_holder = me;
g_aio_count = 1;
g_aio_holder = me; }
g_aio_count = 1;
} }
return ret;
} }
void aio_unlock(void) void aio_unlock(void)
@@ -211,21 +201,30 @@ void aio_unlock(void)
FAR struct aio_container_s *aioc_alloc(void) FAR struct aio_container_s *aioc_alloc(void)
{ {
FAR struct aio_container_s *aioc; FAR struct aio_container_s *aioc = NULL;
int ret;
/* Take a count from semaphore, thus guaranteeing that we have an AIO /* Take a count from semaphore, thus guaranteeing that we have an AIO
* container set aside for us. * container set aside for us.
*/ */
nxsem_wait_uninterruptible(&g_aioc_freesem); ret = nxsem_wait_uninterruptible(&g_aioc_freesem);
if (ret < 0)
{
return NULL;
}
/* Get our AIO container */ /* Get our AIO container */
aio_lock(); ret = aio_lock();
aioc = (FAR struct aio_container_s *)dq_remfirst(&g_aioc_free); if (ret >= 0)
aio_unlock(); {
aioc = (FAR struct aio_container_s *)dq_remfirst(&g_aioc_free);
aio_unlock();
DEBUGASSERT(aioc);
}
DEBUGASSERT(aioc);
return aioc; return aioc;
} }
@@ -246,11 +245,24 @@ FAR struct aio_container_s *aioc_alloc(void)
void aioc_free(FAR struct aio_container_s *aioc) void aioc_free(FAR struct aio_container_s *aioc)
{ {
int ret;
DEBUGASSERT(aioc); DEBUGASSERT(aioc);
/* Return the container to the free list */ /* Return the container to the free list */
aio_lock(); do
{
ret = aio_lock();
/* The only possible error should be if we were awakened only by
* thread cancellation.
*/
DEBUGASSERT(ret == OK || ret == -ECANCELED);
}
while (ret < 0);
dq_addlast(&aioc->aioc_link, &g_aioc_free); dq_addlast(&aioc->aioc_link, &g_aioc_free);
aio_unlock(); aio_unlock();
fs/aio/aioc_contain.c
+47 -48
View File
@@ -1,35 +1,20 @@
/**************************************************************************** /****************************************************************************
* fs/aio/aioc_contain.c * fs/aio/aioc_contain.c
* *
* Copyright (C) 2014, 2017-2018 Gregory Nutt. All rights reserved. * Licensed to the Apache Software Foundation (ASF) under one or more
* Author: Gregory Nutt <gnutt@nuttx.org> * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* *
* Redistribution and use in source and binary forms, with or without * http://www.apache.org/licenses/LICENSE-2.0
* modification, are permitted provided that the following conditions
* are met:
* *
* 1. Redistributions of source code must retain the above copyright * Unless required by applicable law or agreed to in writing, software
* notice, this list of conditions and the following disclaimer. * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* 2. Redistributions in binary form must reproduce the above copyright * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* notice, this list of conditions and the following disclaimer in * License for the specific language governing permissions and limitations
* the documentation and/or other materials provided with the * under the License.
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* *
****************************************************************************/ ****************************************************************************/
@@ -121,29 +106,38 @@ FAR struct aio_container_s *aio_contain(FAR struct aiocb *aiocbp)
#endif #endif
/* Allocate the AIO control block container, waiting for one to become /* Allocate the AIO control block container, waiting for one to become
* available if necessary. This should never fail. * available if necessary. This should not fail except for in the case
* where the calling thread is canceled.
*/ */
aioc = aioc_alloc(); aioc = aioc_alloc();
DEBUGASSERT(aioc); if (aioc != NULL)
{
/* Initialize the container */
/* Initialize the container */ memset(aioc, 0, sizeof(struct aio_container_s));
aioc->aioc_aiocbp = aiocbp;
memset(aioc, 0, sizeof(struct aio_container_s)); aioc->u.ptr = u.ptr;
aioc->aioc_aiocbp = aiocbp; aioc->aioc_pid = getpid();
aioc->u.ptr = u.ptr;
aioc->aioc_pid = getpid();
#ifdef CONFIG_PRIORITY_INHERITANCE #ifdef CONFIG_PRIORITY_INHERITANCE
DEBUGVERIFY(nxsched_getparam (aioc->aioc_pid, &param)); DEBUGVERIFY(nxsched_getparam (aioc->aioc_pid, &param));
aioc->aioc_prio = param.sched_priority; aioc->aioc_prio = param.sched_priority;
#endif #endif
/* Add the container to the pending transfer list. */ /* Add the container to the pending transfer list. */
ret = aio_lock();
if (ret < 0)
{
aioc_free(aioc);
goto errout;
}
dq_addlast(&aioc->aioc_link, &g_aio_pending);
aio_unlock();
}
aio_lock();
dq_addlast(&aioc->aioc_link, &g_aio_pending);
aio_unlock();
return aioc; return aioc;
errout: errout:
@@ -168,21 +162,26 @@ errout:
FAR struct aiocb *aioc_decant(FAR struct aio_container_s *aioc) FAR struct aiocb *aioc_decant(FAR struct aio_container_s *aioc)
{ {
FAR struct aiocb *aiocbp; FAR struct aiocb *aiocbp = NULL;
int ret;
DEBUGASSERT(aioc); DEBUGASSERT(aioc);
/* Remove the container to the pending transfer list. */ /* Remove the container to the pending transfer list. */
aio_lock(); ret = aio_lock();
dq_rem(&aioc->aioc_link, &g_aio_pending); if (ret >= 0)
{
dq_rem(&aioc->aioc_link, &g_aio_pending);
/* De-cant the AIO control block and return the container to the free list */ /* De-cant the AIO control block and return the container to the free list */
aiocbp = aioc->aioc_aiocbp; aiocbp = aioc->aioc_aiocbp;
aioc_free(aioc); aioc_free(aioc);
aio_unlock();
}
aio_unlock();
return aiocbp; return aiocbp;
} }
fs/driver/fs_blockproxy.c
+18 -28
View File
@@ -1,35 +1,20 @@
/**************************************************************************** /****************************************************************************
* fs/driver/fs_blockproxy.c * fs/driver/fs_blockproxy.c
* *
* Copyright (C) 2015-2018 Gregory Nutt. All rights reserved. * Licensed to the Apache Software Foundation (ASF) under one or more
* Author: Gregory Nutt <gnutt@nuttx.org> * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* *
* Redistribution and use in source and binary forms, with or without * http://www.apache.org/licenses/LICENSE-2.0
* modification, are permitted provided that the following conditions
* are met:
* *
* 1. Redistributions of source code must retain the above copyright * Unless required by applicable law or agreed to in writing, software
* notice, this list of conditions and the following disclaimer. * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* 2. Redistributions in binary form must reproduce the above copyright * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* notice, this list of conditions and the following disclaimer in * License for the specific language governing permissions and limitations
* the documentation and/or other materials provided with the * under the License.
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* *
****************************************************************************/ ****************************************************************************/
@@ -101,7 +86,12 @@ static FAR char *unique_chardev(void)
{ {
/* Get the semaphore protecting the path number */ /* Get the semaphore protecting the path number */
nxsem_wait_uninterruptible(&g_devno_sem); ret = nxsem_wait_uninterruptible(&g_devno_sem);
if (ret < 0)
{
ferr("ERROR: nxsem_wait_uninterruptible failed: %d\n", ret);
return NULL;
}
/* Get the next device number and release the semaphore */ /* Get the next device number and release the semaphore */
fs/driver/fs_mtdproxy.c
+9 -4
View File
@@ -96,7 +96,12 @@ static FAR char *unique_blkdev(void)
{ {
/* Get the semaphore protecting the path number */ /* Get the semaphore protecting the path number */
nxsem_wait_uninterruptible(&g_devno_sem); ret = nxsem_wait_uninterruptible(&g_devno_sem);
if (ret < 0)
{
ferr("ERROR: nxsem_wait_uninterruptible failed: %d\n", ret);
return NULL;
}
/* Get the next device number and release the semaphore */ /* Get the next device number and release the semaphore */
@@ -197,9 +202,9 @@ int mtd_proxy(FAR const char *mtddev, int mountflags,
goto out_with_fltdev; goto out_with_fltdev;
} }
/* Unlink and free the block device name. The driver instance will persist, /* Unlink and free the block device name. The driver instance will
* provided that CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y (otherwise, we have * persist, provided that CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y (otherwise,
* a problem here!) * we have a problem here!)
*/ */
out_with_fltdev: out_with_fltdev:
fs/inode/fs_inoderelease.c
+8 -6
View File
@@ -52,16 +52,18 @@ void inode_release(FAR struct inode *node)
{ {
/* Decrement the references of the inode */ /* Decrement the references of the inode */
ret = inode_semtake(); do
if (ret < 0)
{ {
/* REVISIT: Reference count will be wrong. This could only ret = inode_semtake();
* happen on thread cancellation.
/* This only possible error is due to cancellation of the thread.
* We need to try again anyway in this case, otherwise the
* reference count would be wrong.
*/ */
ferr("ERROR: inode_semtake failed: %d\n", ret); DEBUGASSERT(ret = OK || ret == -ECANCELED);
return;
} }
while (ret < 0);
if (node->i_crefs) if (node->i_crefs)
{ {
fs/mqueue/mq_close.c
+7 -6
View File
@@ -176,16 +176,17 @@ void mq_inode_release(FAR struct inode *inode)
/* Decrement the reference count on the inode */ /* Decrement the reference count on the inode */
ret = inode_semtake(); do
if (ret < 0)
{ {
/* REVISIT: Should get here only on task cancellation. The MQ inode ret = inode_semtake();
* would not not be released in this case.
/* The only error that is expected is due to thread cancellation.
* At this point, we must continue to free the mqueue anyway.
*/ */
ferr("ERROR: inode_semtake() failed: %d\n", ret); DEBUGASSERT(ret == OK || ret == -ECANCELED);
return;
} }
while (ret < 0);
if (inode->i_crefs > 0) if (inode->i_crefs > 0)
{ {
fs/nfs/Kconfig
+1 -1
View File
@@ -13,7 +13,7 @@ config NFS
#if NFS #if NFS
config NFS_STATISTICS config NFS_STATISTICS
bool "NFS Statics" bool "NFS Statistics"
default n default n
depends on NFS depends on NFS
---help--- ---help---
fs/nfs/nfs_vfsops.c
+249 -177
View File
File diff suppressed because it is too large Load Diff
fs/semaphore/sem_close.c
+7 -6
View File
@@ -81,16 +81,17 @@ int sem_close(FAR sem_t *sem)
/* Decrement the reference count on the inode */ /* Decrement the reference count on the inode */
ret = inode_semtake(); do
if (ret < 0)
{ {
/* REVISIT: This failure is probably -ECANCELED meaning that the ret = inode_semtake();
* thread was canceled. In this case, the semaphore will not be
* closed. /* The only error that is expected is due to thread cancellation.
* At this point, we must continue to free the semaphore anyway.
*/ */
return ret; DEBUGASSERT(ret == OK || ret == -ECANCELED);
} }
while (ret < 0);
if (inode->i_crefs > 0) if (inode->i_crefs > 0)
{ {