From nobody Fri Jul 24 21:29:08 2026 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9D622C86D for ; Fri, 24 Jul 2026 13:44:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784900701; cv=none; b=iYw44IUOnk1R5KtxF8sP2U7yzInNbRikVrQJx59nGZJRhUer+sE0u8tBCMuAEbb7PLIFj+1sW/A/3Ilo6ScSaQZ46LHOZu5uWSPWXygA2s4ZpQm7VYLGNChqHqJOuT0qD4k4UpFsALg7/unNPv5VURd8BLWFccgHv1NdE55n1i4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784900701; c=relaxed/simple; bh=lKQonR4ehLSrdg7Q9EQmcaFN4H/cXaBULLkvW6+uEfg=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=IJCWLD3xiAqDpV20J8c6ZKLiWFPIN9n5nTpSqqgVzNEQfe2G/p+TchXougrG3ijiRGF1fm3fUHSSFU6JtKdGsGV1ilM6aeduaqdQ//veqwb8iNd/FFHSAtCbsoiS2JBHkVo82PeHFpP9rjP9lqLVqCKScC9LocVOiF1UqVz+EH0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--mclapinski.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=OvbdOtjV; arc=none smtp.client-ip=209.85.128.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--mclapinski.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="OvbdOtjV" Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4955ecd8a10so5296985e9.3 for ; Fri, 24 Jul 2026 06:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784900698; x=1785505498; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:mime-version:date:from :to:cc:subject:date:message-id:reply-to:content-type; bh=1lx/Tz8Zmq/2rMr5850VaaKZJq/iHDsvqGoxRZtlKNQ=; b=OvbdOtjVR0zlXD7S2YA7XaycctsLm8iZOfroNcdKQ1k/deKuoKE5SH3hA0MYeOuOBd hmui5cmyNULRvFne7/Dll7uDkUmyW6oVp1KFL4c6vU7YvRVNpNLCtzbtwySbRB0dZy1F tPSKiqsBI/KC7l7aAv3PeApa41AatFvn3AQ5E9NO1ZxE6StADw89czdVxzTDe0rAc6Sl KGzkGpaOCP7UbVVMimLrpyYLbfWYc/sfpcSoiljTKMQZvk0C3/1H7W/XQ9UIy0kyvV1l kn56L/bVIdf+gEEj0jdCmiIbwV9Tjtt/3Iw6f/aIr07JgHtBjUabY5I5olaTt0887b+v umsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784900698; x=1785505498; h=content-type:cc:to:from:subject:message-id:mime-version:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=1lx/Tz8Zmq/2rMr5850VaaKZJq/iHDsvqGoxRZtlKNQ=; b=DMiYSRa6o7lR9K6xsJW4HsNsIrBVZMpG1szx9pP0e2PLGVlSpdrm09RqnL/Q6AL/uf ZfGV8wwLSQKBA3GEIcWyW5uQEHifizI2BpmnSrQwWHFpVN4K1L1lRAfRhy7D9E04QzW5 RcuJ2aRJBX6jlacRiiX9Yyrblx/6XrkGtHPvYCDd0qETuBQTrNR+RajeCRAx5yfb/GxI RvYE9dRmIk2gRaFrcra2ynLlus8XciUgKmMe8h7NifCIHOcMLCGflZeBi0mZFvvaB8a2 M6hUaarIRy+mgiB4w+S1ziTTJjX77h+p5WHZrRxlSDjmbW+0ND01J8gzMV6nghgXlWmF c5WA== X-Gm-Message-State: AOJu0YxsTbRwyhr84YhaoBba38tBPNT552oh8jUvfgxVi0IFMDNgvvto oz2pzXYMC6xUOdhs24VH7fcAEnO3V9EJpvCt6uF5JQuLJaDxQHj+uH1TbpbdsB/5oLAiiZvscXo InLT/MYWqYS3Y36+uXM08hA== X-Received: from wmna5.prod.google.com ([2002:a05:600c:685:b0:493:c773:ff79]) (user=mclapinski job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:35d0:b0:495:5d5b:7533 with SMTP id 5b1f17b1804b1-49573ccd91fmr79588505e9.13.1784900697966; Fri, 24 Jul 2026 06:44:57 -0700 (PDT) Date: Fri, 24 Jul 2026 15:44:19 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260724134419.1051078-1-mclapinski@google.com> Subject: [PATCH v2 RESEND] iommu/iova: Move CPU magazine init to first insert From: Michal Clapinski To: Robin Murphy , "Joerg Roedel (AMD)" , Will Deacon , iommu@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Samiullah Khawaja , Logan Odell , Michal Clapinski Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Logan Odell A large amount of memory may be allocated for these magazines on machines with a lot of IOMMU groups and CPU cores. Not all may be used as some devices may be unused or be bound to drivers that do not use the DMA-API. Furthermore, some drivers may not use all levels or CPUs. Move the initialization of the loaded and prev magazines for each CPU on the first attempt to try to insert a freed IOVA to them. Signed-off-by: Logan Odell Signed-off-by: Michal Clapinski --- v2: only rebase --- drivers/iommu/iova.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index 021daf6528de..1a4bbf45dbb9 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -621,6 +621,9 @@ iova_magazine_free_pfns(struct iova_magazine *mag, stru= ct iova_domain *iovad) unsigned long flags; int i; =20 + if (!mag) + return; + spin_lock_irqsave(&iovad->iova_rbtree_lock, flags); =20 for (i =3D 0 ; i < mag->size; ++i) { @@ -737,14 +740,7 @@ int iova_domain_init_rcaches(struct iova_domain *iovad) } for_each_possible_cpu(cpu) { cpu_rcache =3D per_cpu_ptr(rcache->cpu_rcaches, cpu); - spin_lock_init(&cpu_rcache->lock); - cpu_rcache->loaded =3D iova_magazine_alloc(GFP_KERNEL); - cpu_rcache->prev =3D iova_magazine_alloc(GFP_KERNEL); - if (!cpu_rcache->loaded || !cpu_rcache->prev) { - ret =3D -ENOMEM; - goto out_err; - } } } =20 @@ -777,8 +773,20 @@ static bool __iova_rcache_insert(struct iova_domain *i= ovad, cpu_rcache =3D raw_cpu_ptr(rcache->cpu_rcaches); spin_lock_irqsave(&cpu_rcache->lock, flags); =20 + if (!cpu_rcache->loaded) { + cpu_rcache->loaded =3D iova_magazine_alloc(GFP_ATOMIC | __GFP_NOWARN); + if (!cpu_rcache->loaded) + goto unlock; + } + if (!iova_magazine_full(cpu_rcache->loaded)) { can_insert =3D true; + } else if (!cpu_rcache->prev) { + cpu_rcache->prev =3D iova_magazine_alloc(GFP_ATOMIC | __GFP_NOWARN); + if (!cpu_rcache->prev) + goto unlock; + swap(cpu_rcache->prev, cpu_rcache->loaded); + can_insert =3D true; } else if (!iova_magazine_full(cpu_rcache->prev)) { swap(cpu_rcache->prev, cpu_rcache->loaded); can_insert =3D true; @@ -799,6 +807,7 @@ static bool __iova_rcache_insert(struct iova_domain *io= vad, if (can_insert) iova_magazine_push(cpu_rcache->loaded, iova_pfn); =20 +unlock: spin_unlock_irqrestore(&cpu_rcache->lock, flags); =20 return can_insert; @@ -831,9 +840,9 @@ static unsigned long __iova_rcache_get(struct iova_rcac= he *rcache, cpu_rcache =3D raw_cpu_ptr(rcache->cpu_rcaches); spin_lock_irqsave(&cpu_rcache->lock, flags); =20 - if (!iova_magazine_empty(cpu_rcache->loaded)) { + if (cpu_rcache->loaded && !iova_magazine_empty(cpu_rcache->loaded)) { has_pfn =3D true; - } else if (!iova_magazine_empty(cpu_rcache->prev)) { + } else if (cpu_rcache->prev && !iova_magazine_empty(cpu_rcache->prev)) { swap(cpu_rcache->prev, cpu_rcache->loaded); has_pfn =3D true; } else { --=20 2.55.0.795.g602f6c329a-goog