From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751733AbdISNtG (ORCPT ); Tue, 19 Sep 2017 09:49:06 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:50516 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751227AbdISNsw (ORCPT ); Tue, 19 Sep 2017 09:48:52 -0400 From: Robin Murphy To: joro@8bytes.org Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] iommu/iova: Try harder to allocate from rcache magazine Date: Tue, 19 Sep 2017 14:48:41 +0100 Message-Id: <8127fabc219811d8169189e9d7177d42bc74bcbf.1505827369.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.13.4.dirty In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When devices with different DMA masks are using the same domain, or for PCI devices where we usually try a speculative 32-bit allocation first, there is a fair possibility that the top PFN of the rcache stack at any given time may be unsuitable for the lower limit, prompting a fallback to allocating anew from the rbtree. Consequently, we may end up artifically increasing pressure on the 32-bit IOVA space as unused IOVAs accumulate lower down in the rcache stacks, while callers with 32-bit masks also impose unnecessary rbtree overhead. In such cases, let's try a bit harder to satisfy the allocation locally first - scanning the whole stack should still be relatively inexpensive, and even rotating an entry up from the very bottom probably has less overall impact than going to the rbtree. Signed-off-by: Robin Murphy --- drivers/iommu/iova.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index 8f8b436afd81..a7af8273fa98 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -826,12 +826,25 @@ static bool iova_magazine_empty(struct iova_magazine *mag) static unsigned long iova_magazine_pop(struct iova_magazine *mag, unsigned long limit_pfn) { + int i; + unsigned long pfn; + BUG_ON(iova_magazine_empty(mag)); - if (mag->pfns[mag->size - 1] > limit_pfn) - return 0; + /* + * If we can pull a suitable pfn from anywhere in the stack, that's + * still probably preferable to falling back to the rbtree. + */ + for (i = mag->size - 1; mag->pfns[i] > limit_pfn; i--) + if (i == 0) + return 0; - return mag->pfns[--mag->size]; + pfn = mag->pfns[i]; + mag->size--; + for (; i < mag->size; i++) + mag->pfns[i] = mag->pfns[i + 1]; + + return pfn; } static void iova_magazine_push(struct iova_magazine *mag, unsigned long pfn) -- 2.13.4.dirty