From nobody Sun Nov 24 12:03:01 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77CE41DF277; Wed, 6 Nov 2024 11:50:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730893831; cv=none; b=AEP3hhOS6OpYbEJRKS+ViVWbv0640qcCbB9S4sgjvIN/NutWH2t14lhuCLQYH0lBGX8o7L2vZaNLzB42/PH6NXykXSLNpMqWtjBer7iyFoA4VBAd1eBXazCM+eXxUItPBv2ErczsFHjsvpbIqdr/4fe5aCTSnPVA5Yk/FlzvFY0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730893831; c=relaxed/simple; bh=QdMPZHgJrfGoDCyj4CISAO6jV7whENAAUWugSV2GSyc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bqJQH8XCT8ZMjjqCDExAP5lqJegyUA4ju4xf5nEE69TeGgKzliXlFZr7LQrux62mlK+FB2YP4iQxgmzLgvRteebUKu0g/nxJN2xkjN7Hpzj8CiDqVK0bPi0a/YX7z44pIyWxadgRqUHoNi8I8/OWhqOMgOl8Jy9uZrYmZbmcJ6M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X3xjIyhq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="X3xjIyhq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9539C4CED2; Wed, 6 Nov 2024 11:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730893831; bh=QdMPZHgJrfGoDCyj4CISAO6jV7whENAAUWugSV2GSyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X3xjIyhq24iZe673vRAZfOBIaMxw63aj0oCZiuMf+cMUfa3KEwuHxFv10lfPd+LXi cX8RndroDQo8mAxGlNrQKsBGrT+Tn9ncvrOczGH1fOzbfcWtZcz+o2ZklicpXkljhj CR82ei9oaYq+EpM67T4Z+pAyawHDus2fFTo2JuJ7x8RwEPpyDe7fV1lwuc6pJ2z+g0 HJ6UKOajq0zu26WNinUjCfUaFl6njx0GBNaIjRVIK3YxTAorE/KaH86NTMRdt+YlWx 7dFq5n/713WK7CpEXfxiWlqOnT4MY3HeWkL8TPFNWYmD8uRdS258NMiVMn0h0Sqz/d Yx8czOHfsUw5A== From: Leon Romanovsky To: Jens Axboe , Jason Gunthorpe , Robin Murphy , Joerg Roedel , Will Deacon , Christoph Hellwig , Sagi Grimberg Cc: Leon Romanovsky , Keith Busch , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , Marek Szyprowski , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Randy Dunlap Subject: [PATCH v2 10/17] mm/hmm: let users to tag specific PFN with DMA mapped bit Date: Wed, 6 Nov 2024 15:49:38 +0200 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Leon Romanovsky Introduce new sticky flag (HMM_PFN_DMA_MAPPED), which isn't overwritten by HMM range fault. Such flag allows users to tag specific PFNs with inform= ation if this specific PFN was already DMA mapped. Signed-off-by: Leon Romanovsky --- include/linux/hmm.h | 14 ++++++++++++++ mm/hmm.c | 34 +++++++++++++++++++++------------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/include/linux/hmm.h b/include/linux/hmm.h index 126a36571667..5dd655f6766b 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -23,6 +23,8 @@ struct mmu_interval_notifier; * HMM_PFN_WRITE - if the page memory can be written to (requires HMM_PFN_= VALID) * HMM_PFN_ERROR - accessing the pfn is impossible and the device should * fail. ie poisoned memory, special pages, no vma, etc + * HMM_PFN_DMA_MAPPED - Flag preserved on input-to-output transformation + * to mark that page is already DMA mapped * * On input: * 0 - Return the current state of the page, do not fault = it. @@ -36,6 +38,10 @@ enum hmm_pfn_flags { HMM_PFN_VALID =3D 1UL << (BITS_PER_LONG - 1), HMM_PFN_WRITE =3D 1UL << (BITS_PER_LONG - 2), HMM_PFN_ERROR =3D 1UL << (BITS_PER_LONG - 3), + + /* Sticky flag, carried from Input to Output */ + HMM_PFN_DMA_MAPPED =3D 1UL << (BITS_PER_LONG - 7), + HMM_PFN_ORDER_SHIFT =3D (BITS_PER_LONG - 8), =20 /* Input flags */ @@ -57,6 +63,14 @@ static inline struct page *hmm_pfn_to_page(unsigned long= hmm_pfn) return pfn_to_page(hmm_pfn & ~HMM_PFN_FLAGS); } =20 +/* + * hmm_pfn_to_phys() - return physical address pointed to by a device entry + */ +static inline phys_addr_t hmm_pfn_to_phys(unsigned long hmm_pfn) +{ + return __pfn_to_phys(hmm_pfn & ~HMM_PFN_FLAGS); +} + /* * hmm_pfn_to_map_order() - return the CPU mapping size order * diff --git a/mm/hmm.c b/mm/hmm.c index 7e0229ae4a5a..2a0c34d7cb2b 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -44,8 +44,10 @@ static int hmm_pfns_fill(unsigned long addr, unsigned lo= ng end, { unsigned long i =3D (addr - range->start) >> PAGE_SHIFT; =20 - for (; addr < end; addr +=3D PAGE_SIZE, i++) - range->hmm_pfns[i] =3D cpu_flags; + for (; addr < end; addr +=3D PAGE_SIZE, i++) { + range->hmm_pfns[i] &=3D HMM_PFN_DMA_MAPPED; + range->hmm_pfns[i] |=3D cpu_flags; + } return 0; } =20 @@ -202,8 +204,10 @@ static int hmm_vma_handle_pmd(struct mm_walk *walk, un= signed long addr, return hmm_vma_fault(addr, end, required_fault, walk); =20 pfn =3D pmd_pfn(pmd) + ((addr & ~PMD_MASK) >> PAGE_SHIFT); - for (i =3D 0; addr < end; addr +=3D PAGE_SIZE, i++, pfn++) - hmm_pfns[i] =3D pfn | cpu_flags; + for (i =3D 0; addr < end; addr +=3D PAGE_SIZE, i++, pfn++) { + hmm_pfns[i] &=3D HMM_PFN_DMA_MAPPED; + hmm_pfns[i] |=3D pfn | cpu_flags; + } return 0; } #else /* CONFIG_TRANSPARENT_HUGEPAGE */ @@ -236,7 +240,7 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, uns= igned long addr, hmm_pte_need_fault(hmm_vma_walk, pfn_req_flags, 0); if (required_fault) goto fault; - *hmm_pfn =3D 0; + *hmm_pfn =3D *hmm_pfn & HMM_PFN_DMA_MAPPED; return 0; } =20 @@ -253,14 +257,14 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, u= nsigned long addr, cpu_flags =3D HMM_PFN_VALID; if (is_writable_device_private_entry(entry)) cpu_flags |=3D HMM_PFN_WRITE; - *hmm_pfn =3D swp_offset_pfn(entry) | cpu_flags; + *hmm_pfn =3D (*hmm_pfn & HMM_PFN_DMA_MAPPED) | swp_offset_pfn(entry) | = cpu_flags; return 0; } =20 required_fault =3D hmm_pte_need_fault(hmm_vma_walk, pfn_req_flags, 0); if (!required_fault) { - *hmm_pfn =3D 0; + *hmm_pfn =3D *hmm_pfn & HMM_PFN_DMA_MAPPED; return 0; } =20 @@ -304,11 +308,11 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, u= nsigned long addr, pte_unmap(ptep); return -EFAULT; } - *hmm_pfn =3D HMM_PFN_ERROR; + *hmm_pfn =3D (*hmm_pfn & HMM_PFN_DMA_MAPPED) | HMM_PFN_ERROR; return 0; } =20 - *hmm_pfn =3D pte_pfn(pte) | cpu_flags; + *hmm_pfn =3D (*hmm_pfn & HMM_PFN_DMA_MAPPED) | pte_pfn(pte) | cpu_flags; return 0; =20 fault: @@ -448,8 +452,10 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned long= start, unsigned long end, } =20 pfn =3D pud_pfn(pud) + ((addr & ~PUD_MASK) >> PAGE_SHIFT); - for (i =3D 0; i < npages; ++i, ++pfn) - hmm_pfns[i] =3D pfn | cpu_flags; + for (i =3D 0; i < npages; ++i, ++pfn) { + hmm_pfns[i] &=3D HMM_PFN_DMA_MAPPED; + hmm_pfns[i] |=3D pfn | cpu_flags; + } goto out_unlock; } =20 @@ -507,8 +513,10 @@ static int hmm_vma_walk_hugetlb_entry(pte_t *pte, unsi= gned long hmask, } =20 pfn =3D pte_pfn(entry) + ((start & ~hmask) >> PAGE_SHIFT); - for (; addr < end; addr +=3D PAGE_SIZE, i++, pfn++) - range->hmm_pfns[i] =3D pfn | cpu_flags; + for (; addr < end; addr +=3D PAGE_SIZE, i++, pfn++) { + range->hmm_pfns[i] &=3D HMM_PFN_DMA_MAPPED; + range->hmm_pfns[i] |=3D pfn | cpu_flags; + } =20 spin_unlock(ptl); return 0; --=20 2.47.0