Date: Tue, 4 Jun 2024 16:02:49 -0700 From: John Baldwin <jhb@FreeBSD.org> To: Kevin Bowling <kbowling@FreeBSD.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1c45a62a2f66 - main - qlnxe: Fix multiple locking issues Message-ID: <1ade77c1-f15a-4e20-a8ea-29ac3a86e85e@FreeBSD.org> In-Reply-To: <202405280643.44S6hBkh054482@gitrepo.freebsd.org> References: <202405280643.44S6hBkh054482@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 5/28/24 2:43 AM, Kevin Bowling wrote: > The branch main has been updated by kbowling: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1c45a62a2f667b45ec10a92ad58ff5a34e68b569 > > commit 1c45a62a2f667b45ec10a92ad58ff5a34e68b569 > Author: Keith Reynolds <keith.reynolds@hpe.com> > AuthorDate: 2024-05-28 06:41:05 +0000 > Commit: Kevin Bowling <kbowling@FreeBSD.org> > CommitDate: 2024-05-28 06:41:05 +0000 > > qlnxe: Fix multiple locking issues > > Multiple issues are reported with WITNESS and code inspection of the > locking and lock initialization. > > PR: 278084 > MFC after: 1 week > --- > sys/dev/qlnx/qlnxe/bcm_osal.h | 8 +++---- > sys/dev/qlnx/qlnxe/ecore.h | 1 + > sys/dev/qlnx/qlnxe/ecore_mcp.c | 48 +++++++++++++++++++++--------------------- > sys/dev/qlnx/qlnxe/ecore_mcp.h | 6 +++--- > sys/dev/qlnx/qlnxe/qlnx_def.h | 2 +- > sys/dev/qlnx/qlnxe/qlnx_os.c | 9 ++++---- > sys/dev/qlnx/qlnxe/qlnx_os.h | 4 ++-- > 7 files changed, 40 insertions(+), 38 deletions(-) > > diff --git a/sys/dev/qlnx/qlnxe/bcm_osal.h b/sys/dev/qlnx/qlnxe/bcm_osal.h > index 5d940d3272d6..c820532c9e0a 100644 > --- a/sys/dev/qlnx/qlnxe/bcm_osal.h > +++ b/sys/dev/qlnx/qlnxe/bcm_osal.h > @@ -72,7 +72,7 @@ extern void qlnx_dma_free_coherent(void *ecore_dev, void *v_addr, > bus_addr_t phys, uint32_t size); > > extern void qlnx_link_update(void *p_hwfn); > -extern void qlnx_barrier(void *p_hwfn); > +extern void qlnx_barrier(void *p_dev); > > extern void *qlnx_zalloc(uint32_t size); > > @@ -213,14 +213,14 @@ typedef struct osal_list_t > #define OSAL_SPIN_LOCK_ALLOC(p_hwfn, mutex) > #define OSAL_SPIN_LOCK_DEALLOC(mutex) mtx_destroy(mutex) > #define OSAL_SPIN_LOCK_INIT(lock) {\ > - mtx_init(lock, __func__, MTX_NETWORK_LOCK, MTX_SPIN); \ > + mtx_init(lock, __func__, "OSAL spin lock", MTX_SPIN); \ > } > Do you really need MTX_SPIN here? Device drivers rarely need spin locks. The equivalent to a Linux spin lock in drivers is generally a MTX_DEF mutex. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1ade77c1-f15a-4e20-a8ea-29ac3a86e85e>