From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2FD36C48260 for ; Fri, 16 Feb 2024 11:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jztwujiEsd85L7b+y5oBm1+OklWrad/LfSY8dmxyXIY=; b=KgWpCBB1WtynfP kBJth7MMgcpHHfoKJbk6YSsPRrxeivPhCT6ky2LpB4VIBRDtAfJ9RZGDX8Q5/HBiP5MyCnxmLIZzJ zCQStEQTEwkbwbDQWe6VCTEcG73qsdi9OWsapNQxOz1L8/rP68/I7dLK/2266Wx1z6YLFHqs+Q52q /RqK9vHhwYrAxLY/DRaqqqXf8oHkkx1IMIhGVmaN7C9rUxqpITPv7UpVtyMYsohbYiq5rGCe7JikQ Kmus5WzZ4FxV15n4SuxmzofVmRAGOSmpG9ldnZO4nGvSEDbLsl0EAlG1bk/NOpmOjoWFhA4h0mMqw y8/91stx9TK1VWwV9Hew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rawsT-00000002EHS-3gK4; Fri, 16 Feb 2024 11:59:38 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rawsO-00000002EF5-10s6 for linux-arm-kernel@lists.infradead.org; Fri, 16 Feb 2024 11:59:35 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-411d9e901dcso42995e9.1 for ; Fri, 16 Feb 2024 03:59:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708084771; x=1708689571; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=JEgwa2CJZVWqfoiL61uxKFYfo6g3B6LbKWPFOUh15oQ=; b=buzclNpadPzVon5uOo3uD723rhjPdV5ChmvcsMew3Ce21iqdFSCVq2qjuUsbQwn7w0 o2I7t06x/JPywaDzqKqHj5enUPSCneg6QmEG7EsigBtxTp23DxYolbHUqepWNbBtxxME TpTCDoQFcgSv7vSnRdFcY+L3J5OuU6NzhdpcRRI7hRj4A4F9W4/PLXJd8ciHZp7M4lV+ RQElroJFD6CpkWhbIE5i7POxpFQ28pCZezhX3Em086f2H/dqZLO0fkd1ObwPE8koeWJV n60iHYS9vRhmvRc7WbSP5JIgzwLwStxv18VmVjahYg9I+2apPMenwap+UGo9FTk9pnfq 7xmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708084771; x=1708689571; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JEgwa2CJZVWqfoiL61uxKFYfo6g3B6LbKWPFOUh15oQ=; b=T2F1vPjZeTpfGPk55Nog1Zv2DSaKcmeMK63VKKz34ykeVzEt56R5sGz0DrIj3WqOkC mkpDs6YPhF0Qlr9+DjYBKNudAgj8+CekmjIuHHgg+ymhhCriGUoIYi5KS+aGcLasZykw l8qqUoAy9GGHOfaJv/hXUpheNA826KdCp2KNxQTbUsVWy2WO7vlhps1ZwZEZrC90Tim6 KGkvn52MTVe2XLDUCP4Olr08TkDOqDX2nI+rqFSKudquMUO/sWxhJ1T32MJTsjOo8Mr4 lo70gAQ4k1tFrlQJCd+fsCOj03M3MIf6TCJwPnJpMhQNmtJzBO6D6RK9RzVVYeEk2NGZ sdXA== X-Forwarded-Encrypted: i=1; AJvYcCVgMv6WmijZlvWGxDdSzKcXhIDtPjv2hgUaBWidd+KP6bb3F4FQSMqzAy8WveWxEwA8ZP7jJjMXvM8dcV/T/75Hv6loMrDbnKiUVQ2LCCoss6o4frQ= X-Gm-Message-State: AOJu0YwGlbs8NtjNEeWUZSgN6R3B6FYpdx8FnkpGMMUvMP6khoqP8jaq wLZBmImL7/pw9zcD2Yrfm4NGOaSr0p1crL+KnonIK0x7+LOkHgNaGYwH/VTrbQ== X-Google-Smtp-Source: AGHT+IFrWNU2tq/8dun0sOJnkeBiTgbSlXW5PpRtrfXDapNVydPJsEc6RWaIh0k6K7p2X6CTFXGqnA== X-Received: by 2002:a05:600c:1e0f:b0:412:2c30:9a7 with SMTP id ay15-20020a05600c1e0f00b004122c3009a7mr175498wmb.2.1708084770674; Fri, 16 Feb 2024 03:59:30 -0800 (PST) Received: from google.com (185.83.140.34.bc.googleusercontent.com. [34.140.83.185]) by smtp.gmail.com with ESMTPSA id bx15-20020a5d5b0f000000b0033d202abf01sm1202622wrb.28.2024.02.16.03.59.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 03:59:30 -0800 (PST) Date: Fri, 16 Feb 2024 11:59:26 +0000 From: Mostafa Saleh To: Jean-Philippe Brucker Cc: maz@kernel.org, catalin.marinas@arm.com, will@kernel.org, joro@8bytes.org, robin.murphy@arm.com, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, dbrazdil@google.com, ryan.roberts@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, iommu@lists.linux.dev Subject: Re: [RFC PATCH 20/45] KVM: arm64: iommu: Add map() and unmap() operations Message-ID: References: <20230201125328.2186498-1-jean-philippe@linaro.org> <20230201125328.2186498-21-jean-philippe@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230201125328.2186498-21-jean-philippe@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240216_035932_396047_3109F3E0 X-CRM114-Status: GOOD ( 22.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Jean, On Wed, Feb 01, 2023 at 12:53:04PM +0000, Jean-Philippe Brucker wrote: > Handle map() and unmap() hypercalls by calling the io-pgtable library. > > Signed-off-by: Jean-Philippe Brucker > --- > arch/arm64/kvm/hyp/nvhe/iommu/iommu.c | 144 ++++++++++++++++++++++++++ > 1 file changed, 144 insertions(+) > > diff --git a/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c b/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c > index 7404ea77ed9f..0550e7bdf179 100644 > --- a/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c > +++ b/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c > @@ -183,6 +183,150 @@ int kvm_iommu_detach_dev(pkvm_handle_t iommu_id, pkvm_handle_t domain_id, > return ret; > } > > +static int __kvm_iommu_unmap_pages(struct io_pgtable *iopt, unsigned long iova, > + size_t pgsize, size_t pgcount) > +{ > + int ret; > + size_t unmapped; > + phys_addr_t paddr; > + size_t total_unmapped = 0; > + size_t size = pgsize * pgcount; > + > + while (total_unmapped < size) { > + paddr = iopt_iova_to_phys(iopt, iova); > + if (paddr == 0) > + return -EINVAL; > + > + /* > + * One page/block at a time, because the range provided may not > + * be physically contiguous, and we need to unshare all physical > + * pages. > + */ > + unmapped = iopt_unmap_pages(iopt, iova, pgsize, 1, NULL); > + if (!unmapped) > + return -EINVAL; > + > + ret = __pkvm_host_unshare_dma(paddr, pgsize); > + if (ret) > + return ret; > + > + iova += unmapped; > + pgcount -= unmapped / pgsize; > + total_unmapped += unmapped; > + } > + > + return 0; > +} > + > +#define IOMMU_PROT_MASK (IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE |\ > + IOMMU_NOEXEC | IOMMU_MMIO) Is there a reason IOMMU_PRIV is not allowed? > + > +int kvm_iommu_map_pages(pkvm_handle_t iommu_id, pkvm_handle_t domain_id, > + unsigned long iova, phys_addr_t paddr, size_t pgsize, > + size_t pgcount, int prot) > +{ > + size_t size; > + size_t granule; > + int ret = -EINVAL; > + size_t mapped = 0; > + struct io_pgtable iopt; > + struct kvm_hyp_iommu *iommu; > + size_t pgcount_orig = pgcount; > + unsigned long iova_orig = iova; > + struct kvm_hyp_iommu_domain *domain; > + > + if (prot & ~IOMMU_PROT_MASK) > + return -EINVAL; > + > + if (__builtin_mul_overflow(pgsize, pgcount, &size) || > + iova + size < iova || paddr + size < paddr) > + return -EOVERFLOW; > + > + hyp_spin_lock(&iommu_lock); > + > + domain = handle_to_domain(iommu_id, domain_id, &iommu); > + if (!domain) > + goto err_unlock; > + > + granule = 1 << __ffs(iommu->pgtable->cfg.pgsize_bitmap); > + if (!IS_ALIGNED(iova | paddr | pgsize, granule)) > + goto err_unlock; > + > + ret = __pkvm_host_share_dma(paddr, size, !(prot & IOMMU_MMIO)); > + if (ret) > + goto err_unlock; > + > + iopt = domain_to_iopt(iommu, domain, domain_id); > + while (pgcount) { > + ret = iopt_map_pages(&iopt, iova, paddr, pgsize, pgcount, prot, > + 0, &mapped); > + WARN_ON(!IS_ALIGNED(mapped, pgsize)); > + pgcount -= mapped / pgsize; > + if (ret) > + goto err_unmap; > + iova += mapped; > + paddr += mapped; > + } > + > + hyp_spin_unlock(&iommu_lock); > + return 0; > + > +err_unmap: > + __kvm_iommu_unmap_pages(&iopt, iova_orig, pgsize, pgcount_orig - pgcount); > +err_unlock: > + hyp_spin_unlock(&iommu_lock); > + return ret; > +} > + > +int kvm_iommu_unmap_pages(pkvm_handle_t iommu_id, pkvm_handle_t domain_id, > + unsigned long iova, size_t pgsize, size_t pgcount) > +{ > + size_t size; > + size_t granule; > + int ret = -EINVAL; > + struct io_pgtable iopt; > + struct kvm_hyp_iommu *iommu; > + struct kvm_hyp_iommu_domain *domain; > + > + if (__builtin_mul_overflow(pgsize, pgcount, &size) || > + iova + size < iova) > + return -EOVERFLOW; > + > + hyp_spin_lock(&iommu_lock); > + domain = handle_to_domain(iommu_id, domain_id, &iommu); > + if (!domain) > + goto out_unlock; > + > + granule = 1 << __ffs(iommu->pgtable->cfg.pgsize_bitmap); > + if (!IS_ALIGNED(iova | pgsize, granule)) > + goto out_unlock; > + > + iopt = domain_to_iopt(iommu, domain, domain_id); > + ret = __kvm_iommu_unmap_pages(&iopt, iova, pgsize, pgcount); > +out_unlock: > + hyp_spin_unlock(&iommu_lock); > + return ret; > +} > + > +phys_addr_t kvm_iommu_iova_to_phys(pkvm_handle_t iommu_id, > + pkvm_handle_t domain_id, unsigned long iova) > +{ > + phys_addr_t phys = 0; > + struct io_pgtable iopt; > + struct kvm_hyp_iommu *iommu; > + struct kvm_hyp_iommu_domain *domain; > + > + hyp_spin_lock(&iommu_lock); > + domain = handle_to_domain(iommu_id, domain_id, &iommu); > + if (domain) { > + iopt = domain_to_iopt(iommu, domain, domain_id); > + > + phys = iopt_iova_to_phys(&iopt, iova); > + } > + hyp_spin_unlock(&iommu_lock); > + return phys; > +} > + > int kvm_iommu_init_device(struct kvm_hyp_iommu *iommu) > { > void *domains; > -- > 2.39.0 > Thanks, Mostafa _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel