From nobody Mon Feb 9 18:45:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6787C433F5 for ; Sat, 8 Oct 2022 15:10:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbiJHPKm (ORCPT ); Sat, 8 Oct 2022 11:10:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229677AbiJHPKg (ORCPT ); Sat, 8 Oct 2022 11:10:36 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B34AF2C12B for ; Sat, 8 Oct 2022 08:10:34 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id qw20so16224128ejc.8 for ; Sat, 08 Oct 2022 08:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BJfFnZUElo4fDCQOc+GUeP/mNGH0ahT8QNQddIgzFpg=; b=g8aEsBuSKZ+1up29Gc0SivPAU0QfBvEDsDLSm/BA/WXxN1bgp6/ngqfrbqm2DWVHLw XY8BXGqopp6EWzVAt9v4zmoAu6Jbpj0rLDLEU7d1IjG38hYiQitRNR61MMREM0lqONMW WNOejInVh1VNU8xCdlu2gGUxtnyeyDK/he9Y7VJw4AK7iugU2I1s3KutVEVcLuoghSY2 NQAW8eDDrLuM9/t3Aiccabh+YNbgX+hG6puCWDK/Shdi8LAkwVk2JbYaZOTgHfs+ZJfh gOjpzeOjYWGMgF5upe3h1GLGqIuLRi8laVdgMnKu5jjdzeB4pIQZ6Qi90e0vj9Sza4WE +h4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BJfFnZUElo4fDCQOc+GUeP/mNGH0ahT8QNQddIgzFpg=; b=yYdg8Sg/dne2dYwYa9cvLitfN6F0B0Hs+lVH2PwYCPOjvGMlcXxnU0c8wG4FSgzTrZ 4tNgOO2lpnePRl5ValalzsTIym2atw4BeZNI1adjL2q8uGgGEmvvqpqAURZ8fzVH7ABp 1jZnFP9LJneLDpymZUuvowOxsnU5nGjZUe77ao5ff8ZSrrwTGsahm6j34F3WiD2lmZ/K ckcfXHdWJ2yEIqFHPP2nayIOsf0uOmaYM0ZxsT7w7Sk8c1Hl/zOMZRk8gBq8MUm9TL5k HJv3yv4v2f83i5X/pEUHwJhz2Gd+gIBs1YxcRTSv2NylKac/1ChGwCLyGDWXp+gxoib1 FexQ== X-Gm-Message-State: ACrzQf0TbnCFSTsTZXZgwHjaOqGlVjzVlNiqESHShtErZPMYhwrUFa1K itb0BLoz0hJzpMcDfHuq+oUoK/K6wpw= X-Google-Smtp-Source: AMsMyM4cQnfbv1dRZ3p5BrDqTgfEyct+5Knto6fqk5S+UPZWC9Wybbx5bOvo/nRGWvYlCvM7hU59hA== X-Received: by 2002:a17:907:802:b0:781:8017:b2df with SMTP id wv2-20020a170907080200b007818017b2dfmr8109754ejb.606.1665241834228; Sat, 08 Oct 2022 08:10:34 -0700 (PDT) Received: from otyshchenko.router ([212.22.223.21]) by smtp.gmail.com with ESMTPSA id l25-20020a50d6d9000000b0045723aa48ccsm3523119edj.93.2022.10.08.08.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Oct 2022 08:10:33 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Oleksandr Tyshchenko , Stefano Stabellini , Juergen Gross , Xenia Ragiadakou Subject: [PATCH V2 2/2] xen/virtio: Convert PAGE_SIZE/PAGE_SHIFT/PFN_UP to Xen counterparts Date: Sat, 8 Oct 2022 18:10:13 +0300 Message-Id: <20221008151013.2537826-3-olekstysh@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221008151013.2537826-1-olekstysh@gmail.com> References: <20221008151013.2537826-1-olekstysh@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Oleksandr Tyshchenko Currently, a grant ref is always based on the Xen page granularity (4KB), and guest commonly uses the same page granularity. But the guest may use a different page granularity (i.e 64KB). So adopt the code to be able to deal with it. Signed-off-by: Oleksandr Tyshchenko Acked-by: Stefano Stabellini Reviewed-by: Xenia Ragiadakou --- Cc: Juergen Gross Cc: Xenia Ragiadakou Changes V1 -> V2: - update commit description - rebase - use xen_offset_in_page() in xen_grant_dma_map(unmap)_page() Previous discussion is at: https://lore.kernel.org/xen-devel/20221006120912.1948459-1-olekstysh@gmail.= com/ --- drivers/xen/grant-dma-ops.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index 1d018e3a68a0..aff0f95ed954 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -31,12 +31,12 @@ static DEFINE_XARRAY_FLAGS(xen_grant_dma_devices, XA_FL= AGS_LOCK_IRQ); =20 static inline dma_addr_t grant_to_dma(grant_ref_t grant) { - return XEN_GRANT_DMA_ADDR_OFF | ((dma_addr_t)grant << PAGE_SHIFT); + return XEN_GRANT_DMA_ADDR_OFF | ((dma_addr_t)grant << XEN_PAGE_SHIFT); } =20 static inline grant_ref_t dma_to_grant(dma_addr_t dma) { - return (grant_ref_t)((dma & ~XEN_GRANT_DMA_ADDR_OFF) >> PAGE_SHIFT); + return (grant_ref_t)((dma & ~XEN_GRANT_DMA_ADDR_OFF) >> XEN_PAGE_SHIFT); } =20 static struct xen_grant_dma_data *find_xen_grant_dma_data(struct device *d= ev) @@ -79,7 +79,7 @@ static void *xen_grant_dma_alloc(struct device *dev, size= _t size, unsigned long attrs) { struct xen_grant_dma_data *data; - unsigned int i, n_pages =3D PFN_UP(size); + unsigned int i, n_pages =3D XEN_PFN_UP(size); unsigned long pfn; grant_ref_t grant; void *ret; @@ -91,14 +91,14 @@ static void *xen_grant_dma_alloc(struct device *dev, si= ze_t size, if (unlikely(data->broken)) return NULL; =20 - ret =3D alloc_pages_exact(n_pages * PAGE_SIZE, gfp); + ret =3D alloc_pages_exact(n_pages * XEN_PAGE_SIZE, gfp); if (!ret) return NULL; =20 pfn =3D virt_to_pfn(ret); =20 if (gnttab_alloc_grant_reference_seq(n_pages, &grant)) { - free_pages_exact(ret, n_pages * PAGE_SIZE); + free_pages_exact(ret, n_pages * XEN_PAGE_SIZE); return NULL; } =20 @@ -116,7 +116,7 @@ static void xen_grant_dma_free(struct device *dev, size= _t size, void *vaddr, dma_addr_t dma_handle, unsigned long attrs) { struct xen_grant_dma_data *data; - unsigned int i, n_pages =3D PFN_UP(size); + unsigned int i, n_pages =3D XEN_PFN_UP(size); grant_ref_t grant; =20 data =3D find_xen_grant_dma_data(dev); @@ -138,7 +138,7 @@ static void xen_grant_dma_free(struct device *dev, size= _t size, void *vaddr, =20 gnttab_free_grant_reference_seq(grant, n_pages); =20 - free_pages_exact(vaddr, n_pages * PAGE_SIZE); + free_pages_exact(vaddr, n_pages * XEN_PAGE_SIZE); } =20 static struct page *xen_grant_dma_alloc_pages(struct device *dev, size_t s= ize, @@ -168,9 +168,9 @@ static dma_addr_t xen_grant_dma_map_page(struct device = *dev, struct page *page, unsigned long attrs) { struct xen_grant_dma_data *data; - unsigned long dma_offset =3D offset_in_page(offset), - pfn_offset =3D PFN_DOWN(offset); - unsigned int i, n_pages =3D PFN_UP(dma_offset + size); + unsigned long dma_offset =3D xen_offset_in_page(offset), + pfn_offset =3D XEN_PFN_DOWN(offset); + unsigned int i, n_pages =3D XEN_PFN_UP(dma_offset + size); grant_ref_t grant; dma_addr_t dma_handle; =20 @@ -203,8 +203,8 @@ static void xen_grant_dma_unmap_page(struct device *dev= , dma_addr_t dma_handle, unsigned long attrs) { struct xen_grant_dma_data *data; - unsigned long offset =3D dma_handle & (PAGE_SIZE - 1); - unsigned int i, n_pages =3D PFN_UP(offset + size); + unsigned long dma_offset =3D xen_offset_in_page(dma_handle); + unsigned int i, n_pages =3D XEN_PFN_UP(dma_offset + size); grant_ref_t grant; =20 if (WARN_ON(dir =3D=3D DMA_NONE)) --=20 2.25.1