From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 4665E36165E for ; Wed, 3 Jun 2026 11:05:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780484733; cv=none; b=IefBy55ybD8qiotsdvwUXP2X5rguBA86sZQAnU3ZMNi708BEHsRZ009hRIZ33aUIqEUL4tWd3RGClI8zINNIWgbLf2nDbPNbV6TAEQoccjjsQXkWziWn/r4nLgc2oG139+2tQQ8CoyWGhYiOL3EsYnTopsmIjlzV1EWRYMCqb8Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780484733; c=relaxed/simple; bh=N4nUkQGM7/NHyDefp+wz7m+O5ovVwz3oUwrZbaLkYZ0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Y/SnikU0K5fbvcTRJCGSxgyHySYc9CRWKr5gOCoDrzWKQzVprJrmYwoBOr0rmNkQy0d9dE+TU6imQ0pE3ZdK5kCFNdD3Wgr+UCdzHblwCG/RTfJrqktdHxKAYk80zMaA5HzEFnJOpo92WhansXrk2z6nEeXXyGHERqqSwqtTXj8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=E92K0nrV; arc=none smtp.client-ip=209.85.128.74 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--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="E92K0nrV" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-490bae3a39bso1845385e9.1 for ; Wed, 03 Jun 2026 04:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780484731; x=1781089531; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xGcwkTAP+0x56KFi5xH9yzo8Ys7TxU7DTYK9eKfTIZY=; b=E92K0nrVcD+aWmAuVhdSsTpR6+AGLGlEyRgELfvI4ENC9FqZawAEUP95FJvdMvL/Y4 SDR8wmEH5rY2wQDdlWzBIOshl0X7eSIH6Bp5Fwzr2t7YWmlcUG3S/DniNR+kB1yHYVzh pcl5aryuk6QT5DQdiKI7FBb2RfVxEeJVhCSUIHJkVNDQg+gZGT1u7RnW7bEKLnwnL+X4 33I7ZmfRAORmRmb8x5vPcuqeo7Wx39uksOemvTYwFrE/N8tNc0vIKyxZNFrL8BKuriZd vuFFijN91QnORRcFBH/ioIkszVUmQnXV9q0hQVrG68JOOYbdK+b2O/25dRMaqPGhTvAp +ILQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780484731; x=1781089531; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xGcwkTAP+0x56KFi5xH9yzo8Ys7TxU7DTYK9eKfTIZY=; b=ZOxSKjC74wMH0/gQTAXK9A4pHjo9ycYvA9P3ZuZP10bxF4lXw/BLayn7Xweh3XHBSz qbD891jsOdktW+wece6i6ellpOkMOhSp0Qd+cwJlMogXQBX+gVLvFXz0FsYi5FwnFOjH DCtDNiBKQEL9YbW5w34UTYgyTz1hgVnePB6IkKe7El/6Xit4ryZAasOk6Zn7+R7XDoOH FJGPAV2gRUtG8sS989mwmELMQs7tMXOAoADl/yQJykahSnTJ8wsUUG7dKAUViZneWWvY Lnu8uP5oXw9PA/IxjM343rUtwsUmfCB1hxyLAnj/j/Ft5CkYvE1LDNdzkyziVddW6zsN meKQ== X-Forwarded-Encrypted: i=1; AFNElJ8go0zPqiZK74f0PgJWnCVndcmEWH3ZifcShnPEASBjzxGnn5C5owzx+rB9rdaeIxYkQvaIOO+dzcC8BcM=@vger.kernel.org X-Gm-Message-State: AOJu0YwRtPiIUIea5mdOHPeo/d0tVIL7DXDpbb7PlTUyn/WM8DSGXAVY w5YIhE8qg28aiHgugV6vuW7tmuLenj6Uz19we7v2K+0nkK/cImJbhXpkNcVMVdV1dseC6TXiu1D f9atrmvS/4siSpg== X-Received: from wmbz27.prod.google.com ([2002:a05:600c:c09b:b0:490:b258:4672]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1c1e:b0:490:5466:8591 with SMTP id 5b1f17b1804b1-490b5ecff9cmr47408085e9.12.1780484730594; Wed, 03 Jun 2026 04:05:30 -0700 (PDT) Date: Wed, 3 Jun 2026 11:05:20 +0000 In-Reply-To: <20260603110522.3331819-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260603110522.3331819-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260603110522.3331819-2-smostafa@google.com> Subject: [PATCH 1/3] arm64/mm: Simplify SWIOTLB setup in arch_mm_preinit() From: Mostafa Saleh To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, catalin.marinas@arm.com, will@kernel.org, rppt@kernel.org, maz@kernel.org, aneesh.kumar@kernel.org, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" At the moment, arch_mm_preinit() checks if the system has limited addressing or is running under CCA to enable SWIOTLB, only after to be forced to true anyway if it was false due to CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC being unconditionally true for arm64. Simplify this logic, by making it clear that SWIOTLB is always used but its size depends on the address layout of the system. Signed-off-by: Mostafa Saleh --- arch/arm64/mm/init.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 97987f850a33..fcc9c05a8fe6 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -336,25 +336,22 @@ void __init arch_setup_zero_pages(void) void __init arch_mm_preinit(void) { unsigned int flags = SWIOTLB_VERBOSE; - bool swiotlb = max_pfn > PFN_DOWN(arm64_dma_phys_limit); + bool limited_addressing = max_pfn > PFN_DOWN(arm64_dma_phys_limit); if (is_realm_world()) { - swiotlb = true; flags |= SWIOTLB_FORCE; - } - - if (IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) && !swiotlb) { + } else if (!limited_addressing) { /* * If no bouncing needed for ZONE_DMA, reduce the swiotlb * buffer for kmalloc() bouncing to 1MB per 1GB of RAM. */ unsigned long size = DIV_ROUND_UP(memblock_phys_mem_size(), 1024); + swiotlb_adjust_size(min(swiotlb_size_or_default(), size)); - swiotlb = true; } - swiotlb_init(swiotlb, flags); + swiotlb_init(true, flags); /* * Check boundaries twice: Some fundamental inconsistencies can be -- 2.54.0.1032.g2f8565e1d1-goog