Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Dongli Zhang <dongli.zhang@oracle.com>
To:     iommu@lists.linux-foundation.org, xen-devel@lists.xenproject.org,
        x86@kernel.org, linuxppc-dev@lists.ozlabs.org,
        virtualization@lists.linux-foundation.org
Cc:     linux-kernel@vger.kernel.org, hch@infradead.org,
        m.szyprowski@samsung.com, jgross@suse.com, tglx@linutronix.de,
        mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com,
        sstabellini@kernel.org, mpe@ellerman.id.au, konrad.wilk@oracle.com,
        mst@redhat.com, jasowang@redhat.com, joe.jin@oracle.com
Subject: [PATCH RFC v1 3/7] swiotlb-xen: support highmem for xen specific code
Date:   Wed,  8 Jun 2022 17:55:49 -0700
Message-Id: <20220609005553.30954-4-dongli.zhang@oracle.com>
In-Reply-To: <20220609005553.30954-1-dongli.zhang@oracle.com>
References: <20220609005553.30954-1-dongli.zhang@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sfgOr+8UOIHRQ9h1HrP2h4gTUpqVmHaZY3cOSyzq5TX5E60Iix8nNwlOk6op?=
 =?us-ascii?Q?qQ3FUKz8pPs+VSYbysYg1f+Zc/RIwYtXJAk7uZtegageY8Y3gpJ0GJWdesSW?=
 =?us-ascii?Q?OqR3i/iFMiwupduy5ShrUFx4QH7+6ZKGQ893NRbONBzLYnM/JAB3KS7YySuq?=
 =?us-ascii?Q?uywklzD1ibTWugePuvfwtNG2UOYqwyFIsgeZefsf7eYCbIxMPsL22XKNPxnk?=
 =?us-ascii?Q?AUBsRhUx1+sJLpwpeC3dil3tfSiW5LOr+24uIArUmddVWZFYvg9obOvlhe3a?=
 =?us-ascii?Q?SV+Aj+wkMgyJEZDduc3pbrNokfU3b2IWl/EtmHyJCveiXXcyXS6dkstYCepl?=
 =?us-ascii?Q?lRsiGM704IVQ0SgB5S8v+uQfaRq/UxPk81XNt1nC6D8RNduVLV5C3FhJ33Z3?=
 =?us-ascii?Q?F6Y7oxSiBwOleP7IHrnN0f/HzZUz+ankO2Pu8EnpPU9YfhHc0AttAa1FV0rd?=
 =?us-ascii?Q?SFlCj2Gl2qBTpxqvP0iPzyrX6h1ayfiLbjt0Y8+RAqtieqKO57JGeKl6EW6/?=
 =?us-ascii?Q?ma6h+KfS2BxlEamK/w+oNnAdTqLb3ZR1cV8VaubQ+x+dAQpfx/f6cBtOw3yI?=
 =?us-ascii?Q?BYmChkUJpDnV9U/uU2pcMzMrvBCtLsPZHp66bf7I1xSCVxXqzQMSw4cHv5H0?=
 =?us-ascii?Q?3bfjCJhsO8ZNjJo+rWIYkRgD61hQNHLqipEqKGPhSPrVKsfo/MuEUatNpeY0?=
 =?us-ascii?Q?cc71RP7PH1RFqwWhWvB3G5TfR6x/RTzqhY5hJLA5TIn2PUJDDMp9NwgaAOH6?=
 =?us-ascii?Q?TUrjrIxdwNQYOyRTuEFSOJ3tT/sZp3x5ZRrwWm5CuO9ypNiEftYGE0P7IACM?=
 =?us-ascii?Q?Rgq3l1HoglWCknpoeHz5nQooVaHj+dcpeaa0Z5BWK71H+XvxMNK/tb5LP0mm?=
 =?us-ascii?Q?YZ5P+Y2DP+GkT6gU4oIm+dZHJmSHB8ChtJ8WoZX1E/ZIuCP7tEdN7enAYaML?=
 =?us-ascii?Q?RpFd8RYnkrh2cCQswC/tbO+aa8PEZ9utW/yz5/Kbi7nULi9T9fsdEUpYPQ83?=
 =?us-ascii?Q?dfat2rgVFZVxafSSgj+U0B2jijQsAkzPlriQdaF7gyeY+v1YZMXne2UPh+76?=
 =?us-ascii?Q?57zwKBjFhHtpyg8voeQwX3x4Fq2wiB3RqP2eashyM0JRmzos8YML92oze6LT?=
 =?us-ascii?Q?l2eZQnQzPDrrE4EDDEr7TJUcsDOzCBVBmmUDhlHMbDSMSeGDPbJ3sUeprYE7?=
 =?us-ascii?Q?JVAdVWYZeoYG9TsYm6UDBVZVwoL6Qe5nhBvBvW2au8ms/o2L+df3QmwS8Vy+?=
 =?us-ascii?Q?WsU/i+E2RS7VW8NgDM2U9qAsARspmwhq8NJdUY3v7x85VW2XATottkAj9z6K?=
 =?us-ascii?Q?XNayvuYuAwHII1JrKC2BMqMnynBEmVyhJZbIU+qfURKBX9cB84zFjILyiQic?=
 =?us-ascii?Q?5lWCQXKq5mFP0U+dwg76H0KHNpdFe3tn4dE68xHALh5Xz62smoE4RcO+gDr2?=
 =?us-ascii?Q?H8buvZd5cCXFhRmrfpja0q4moCPVJM8c8J9nH/O3VcprC9sUDrcm4/sgWcyq?=
 =?us-ascii?Q?73rYESTIGmeczX3PrS8ZBS4jWSnYgBaWjQOkz+D8eE0BZuyvK6G1F8kGUJNY?=
 =?us-ascii?Q?6zNXgZpz95Awa2Vs7KOVxz2YBL2xnp1T8g7LSDxz2FocrNZqxuIOvCectB+A?=
 =?us-ascii?Q?QHsrpC++9DuIPaB4JMZ2Gre+qG3nSF+4AHsf4QnW8yJlwZH9tsoHHy74nx29?=
 =?us-ascii?Q?+cnx3vLpqNhHFiob6Cz1zakOqzRxnuQmTTneTBIPS09+A59IvR/zH/W/+2hu?=
 =?us-ascii?Q?CFOVTAIO6QZ0qroxi9FBwSHupoKI2Xc=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ecf46f83-b4e4-4d7c-6f67-08da49b33346
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2022 00:58:43.5667
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JbPhiEqyQnVmI+eCEuwlTjZtQpRe2rp1ezhhToipkCg2LIAnizsl7/YPuKNfQXMLxyuF5+GehHtTpKxnEUC5LQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5126
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874
 definitions=2022-06-08_04:2022-06-07,2022-06-08 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0
 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206090001
X-Proofpoint-GUID: 3b6ywZH7eCaeEphEqt9imafHd3QE9lGi
X-Proofpoint-ORIG-GUID: 3b6ywZH7eCaeEphEqt9imafHd3QE9lGi
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

While for most of times the swiotlb-xen relies on the generic swiotlb api
to initialize and use swiotlb, this patch is to support highmem swiotlb
for swiotlb-xen specific code.

E.g., the xen_swiotlb_fixup() may request the hypervisor to provide
64-bit memory pages as swiotlb buffer.

Cc: Konrad Wilk <konrad.wilk@oracle.com>
Cc: Joe Jin <joe.jin@oracle.com>
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
---
 drivers/xen/swiotlb-xen.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 339f46e21053..d15321e9f9db 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -38,7 +38,8 @@
 #include <asm/dma-mapping.h>
 
 #include <trace/events/swiotlb.h>
-#define MAX_DMA_BITS 32
+#define MAX_DMA32_BITS 32
+#define MAX_DMA64_BITS 64
 
 /*
  * Quick lookup value of the bus address of the IOTLB.
@@ -109,19 +110,25 @@ int xen_swiotlb_fixup(void *buf, unsigned long nslabs, bool high)
 	int rc;
 	unsigned int order = get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT);
 	unsigned int i, dma_bits = order + PAGE_SHIFT;
+	unsigned int max_dma_bits = MAX_DMA32_BITS;
 	dma_addr_t dma_handle;
 	phys_addr_t p = virt_to_phys(buf);
 
 	BUILD_BUG_ON(IO_TLB_SEGSIZE & (IO_TLB_SEGSIZE - 1));
 	BUG_ON(nslabs % IO_TLB_SEGSIZE);
 
+	if (high) {
+		dma_bits = MAX_DMA64_BITS;
+		max_dma_bits = MAX_DMA64_BITS;
+	}
+
 	i = 0;
 	do {
 		do {
 			rc = xen_create_contiguous_region(
 				p + (i << IO_TLB_SHIFT), order,
 				dma_bits, &dma_handle);
-		} while (rc && dma_bits++ < MAX_DMA_BITS);
+		} while (rc && dma_bits++ < max_dma_bits);
 		if (rc)
 			return rc;
 
@@ -381,7 +388,8 @@ xen_swiotlb_sync_sg_for_device(struct device *dev, struct scatterlist *sgl,
 static int
 xen_swiotlb_dma_supported(struct device *hwdev, u64 mask)
 {
-	return xen_phys_to_dma(hwdev, io_tlb_default_mem.end - 1) <= mask;
+	return xen_phys_to_dma(hwdev, io_tlb_default_mem.end - 1) <= mask ||
+	       xen_phys_to_dma(hwdev, io_tlb_high_mem.end - 1) <= mask;
 }
 
 const struct dma_map_ops xen_swiotlb_dma_ops = {
-- 
2.17.1