Author: zbb
Date: Tue Jul 21 15:28:07 2015
New Revision: 285755
URL: https://svnweb.freebsd.org/changeset/base/285755
Log:
Don't allow malloc() to wait for resource while holding a lock in ITS
malloc() should not go to sleep in case of lack of resource while
the kernel thread is holding a non-sleepable lock.
- change malloc() flags to M_NOWAIT in such cases implement
lpi_free_chunk() routine as it will be needed when ITT
allocation fails in its_device_alloc_locked()
- do not increase verbosity of this code since upper layers will
communicate an error if the interrupt setup fails
Obtained from: Semihalf
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D3121
Modified:
head/sys/arm64/arm64/gic_v3_its.c
Modified: head/sys/arm64/arm64/gic_v3_its.c
==============================================================================
--- head/sys/arm64/arm64/gic_v3_its.c Tue Jul 21 15:08:13 2015
(r285754)
+++ head/sys/arm64/arm64/gic_v3_its.c Tue Jul 21 15:28:07 2015
(r285755)
@@ -814,6 +814,26 @@ retry:
}
static void
+lpi_free_chunk(struct gic_v3_its_softc *sc, struct lpi_chunk *lpic)
+{
+ int start, end;
+ uint8_t *bitmap;
+
+ bitmap = (uint8_t *)sc->its_lpi_bitmap;
+
+ KASSERT((lpic->lpi_free == lpic->lpi_num),
+ ("Trying to free LPI chunk that is still in use.\n"));
+
+ /* First bit of this chunk in a global bitmap */
+ start = lpic->lpi_base - GIC_FIRST_LPI;
+ /* and last bit of this chunk... */
+ end = start + lpic->lpi_num - 1;
+
+ /* Finally free this chunk */
+ bit_nclear(bitmap, start, end);
+}
+
+static void
lpi_configure(struct gic_v3_its_softc *sc, struct its_dev *its_dev,
uint32_t lpinum, boolean_t unmask)
{
@@ -1322,7 +1342,10 @@ its_device_alloc_locked(struct gic_v3_it
devid = its_get_devid(pci_dev);
/* There was no previously created device. Create one now */
- newdev = malloc(sizeof(*newdev), M_GIC_V3_ITS, (M_WAITOK | M_ZERO));
+ newdev = malloc(sizeof(*newdev), M_GIC_V3_ITS, (M_NOWAIT | M_ZERO));
+ if (newdev == NULL)
+ return (NULL);
+
newdev->pci_dev = pci_dev;
newdev->devid = devid;
@@ -1340,7 +1363,12 @@ its_device_alloc_locked(struct gic_v3_it
*/
newdev->itt = (vm_offset_t)contigmalloc(
roundup2(roundup2(nvecs, 2) * esize, 0x100), M_GIC_V3_ITS,
- (M_WAITOK | M_ZERO), 0, ~0UL, 0x100, 0);
+ (M_NOWAIT | M_ZERO), 0, ~0UL, 0x100, 0);
+ if (newdev->itt == 0) {
+ lpi_free_chunk(sc, &newdev->lpis);
+ free(newdev, M_GIC_V3_ITS);
+ return (NULL);
+ }
/*
* XXX ARM64TODO: Currently all interrupts are going
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
