Commit a390bde7 authored by John Garry's avatar John Garry Committed by Joerg Roedel
Browse files

iova: Remove some magazine pointer NULL checks 



Since commit 32e92d9f ("iommu/iova: Separate out rcache init") it
has not been possible to have NULL CPU rcache "loaded" or "prev" magazine
pointers once the IOVA domain has been properly initialized. Previously it
was only possible to have NULL pointers from failure to allocate the
magazines in the IOVA domain initialization. The only other two functions
to modify these pointers - __iova_rcache_{get, insert}() - would already
ensure that these pointers were non-NULL if initially non-NULL.

As such, the mag NULL pointer checks in iova_magazine_full(),
iova_magazine_empty(), and iova_magazine_free_pfns() may be dropped.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/1662557681-145906-2-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent f2042ed2

drivers/iommu/iova.c

+2 −5
Original line number Diff line number Diff line
@@ -661,9 +661,6 @@ iova_magazine_free_pfns(struct iova_magazine *mag, struct iova_domain *iovad) 
	unsigned long flags;

	int i;



	if (!mag)

		return;



	spin_lock_irqsave(&iovad->iova_rbtree_lock, flags);



	for (i = 0 ; i < mag->size; ++i) {
@@ -683,12 +680,12 @@ iova_magazine_free_pfns(struct iova_magazine *mag, struct iova_domain *iovad) 


static bool iova_magazine_full(struct iova_magazine *mag)

{

	return (mag && mag->size == IOVA_MAG_SIZE);

	return mag->size == IOVA_MAG_SIZE;

}



static bool iova_magazine_empty(struct iova_magazine *mag)

{

	return (!mag || mag->size == 0);

	return mag->size == 0;

}



static unsigned long iova_magazine_pop(struct iova_magazine *mag,