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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 17490CA0EFF for ; Thu, 21 Aug 2025 20:08:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D9E910EA14; Thu, 21 Aug 2025 20:08:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="B3sr6LQt"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA8CB10EA18 for ; Thu, 21 Aug 2025 20:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755806915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uIthYg0x+2djveHghlw2Jb9wmVGYKVQz7R4ULrPQfiU=; b=B3sr6LQtuUYizDjn6wgyn4F8MIpcNMkOlNbstW7Lrh1yOQfJh6FyQI1fBivC8m3n1PEpt4 or15qoSGc60hlmpqErc5TRvoNumZc2o1aWXhvOjmhZGsMkhh4ujr9jVxpNuvhFhsQF64Pd VV+9mXFF+oho47PjJV9PGd1WQovW/gk= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-541-iETNdoSQPUiAqVrWoIiaMQ-1; Thu, 21 Aug 2025 16:08:33 -0400 X-MC-Unique: iETNdoSQPUiAqVrWoIiaMQ-1 X-Mimecast-MFC-AGG-ID: iETNdoSQPUiAqVrWoIiaMQ_1755806912 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3b9e4157303so922963f8f.2 for ; Thu, 21 Aug 2025 13:08:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755806912; x=1756411712; 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=uIthYg0x+2djveHghlw2Jb9wmVGYKVQz7R4ULrPQfiU=; b=oBkAVH425MqZR4TfpAqxmCwnrpdj9s5BFVJP7lGdTbfdrpUhshFUPSGBVIPJifBzqB RLt9gEhO8eHAoss4vVddjjFQjr9NLY09eJCkIHRl8sMI/O5XKeKw8BNHkAn6tUbfp5Iv KVn96njyQM+UWI0+818k464h6tOD6FMvPfuPOqL25aPk8s4UBZzcVYs5+0+RKx94Nuop 6SWGmu8n9yF04P8Z/2aldr3rcLJTiWRUPM1gDjR8ipGqDG5BzA17F7JAYKaX+O1VL+e5 QFmKXPmEK4npIuzzf6D//MGNb7GSNBelc6SXlhmWpzJsqmfdc/qNjfCziYtY4B2C0Bw5 S6Aw== X-Forwarded-Encrypted: i=1; AJvYcCWAg3lTkI11VbDNikFGSWaTiJS6cO8WKZmmu1YhyW4mDDyLJUrNkyspcFwfuTzIkYehsAYWjsdG6Bk=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yzmu3I3eCEWPyuoJo5aArrh10JiaAP7AicAN9ICa7YLWvdwnG0n XRZA2p4Kt6ZfMyMoEXegYE16QihNafzJG9/rAn421fxIWJ++A8TTmIuF2ivvC4AAfkxdo5zbJte vMSlaURZEtKfFLAGIs91vwpFBuBTMju95p5SwN+wYSp8cCz/HO+sEMsOXMjPKcQWBlg8NUw== X-Gm-Gg: ASbGncvcBm90I9ALjjYpScA1Hf++qw09w9ruIBSQn5rCWgdShOk/oI6RggjN0C1Suk3 IRBsGw4kPfvro/WtRmU/tcrRO2F39rG69DlkCkddD1iO/34fseJokpRO575PYX8IQnnDXQWYFPZ Yy5a9DywbgaJsYiuNgVhaQ6PPaC3ggoGotHZgcERrt4++xaRO93bcVHjoXR4Zihvw4TmTu7OJNJ lwP9FtR5MldoDG2EvFosmfqcNvebVALwGZl6KIVPQqLaa+5PusM8LX4T1eGJBq47cPTgIJ5EHWd xg3nXaFWP5mSmvTiUgZ1zhA8kUQ+NTwdZjbs0QWDMleuBDCH8nJRO3ATLptZAAaMex35RwhJIUX 5M0PV2KThsS9+jZgDGHljWQ== X-Received: by 2002:a05:6000:40de:b0:3a5:783f:528a with SMTP id ffacd0b85a97d-3c5dcefee22mr195263f8f.59.1755806912309; Thu, 21 Aug 2025 13:08:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRe/VOMg0cdir08bDTWMwU06A85Ixelypa7wMbtHpunFYS8URS38ofNnAO5nDnYJmoWLlWSQ== X-Received: by 2002:a05:6000:40de:b0:3a5:783f:528a with SMTP id ffacd0b85a97d-3c5dcefee22mr195231f8f.59.1755806911819; Thu, 21 Aug 2025 13:08:31 -0700 (PDT) Received: from localhost (p200300d82f26ba0008036ec5991806fd.dip0.t-ipconnect.de. [2003:d8:2f26:ba00:803:6ec5:9918:6fd]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-45b50f16eb1sm7598185e9.3.2025.08.21.13.08.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Aug 2025 13:08:31 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: David Hildenbrand , Brett Creeley , Jason Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , Alexander Potapenko , Andrew Morton , Brendan Jackman , Christoph Lameter , Dennis Zhou , Dmitry Vyukov , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, iommu@lists.linux.dev, io-uring@vger.kernel.org, Jason Gunthorpe , Jens Axboe , Johannes Weiner , John Hubbard , kasan-dev@googlegroups.com, kvm@vger.kernel.org, "Liam R. Howlett" , Linus Torvalds , linux-arm-kernel@axis.com, linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-ide@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, Lorenzo Stoakes , Marco Elver , Marek Szyprowski , Michal Hocko , Mike Rapoport , Muchun Song , netdev@vger.kernel.org, Oscar Salvador , Peter Xu , Robin Murphy , Suren Baghdasaryan , Tejun Heo , virtualization@lists.linux.dev, Vlastimil Babka , wireguard@lists.zx2c4.com, x86@kernel.org, Zi Yan Subject: [PATCH RFC 30/35] vfio/pci: drop nth_page() usage within SG entry Date: Thu, 21 Aug 2025 22:06:56 +0200 Message-ID: <20250821200701.1329277-31-david@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250821200701.1329277-1-david@redhat.com> References: <20250821200701.1329277-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xf0gvwDH2JibPdkmQ1lhgxylfeZ3pY8Cc4GMhslpocg_1755806912 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" It's no longer required to use nth_page() when iterating pages within a single SG entry, so let's drop the nth_page() usage. Cc: Brett Creeley Cc: Jason Gunthorpe Cc: Yishai Hadas Cc: Shameer Kolothum Cc: Kevin Tian Cc: Alex Williamson Signed-off-by: David Hildenbrand --- drivers/vfio/pci/pds/lm.c | 3 +-- drivers/vfio/pci/virtio/migrate.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/vfio/pci/pds/lm.c b/drivers/vfio/pci/pds/lm.c index f2673d395236a..4d70c833fa32e 100644 --- a/drivers/vfio/pci/pds/lm.c +++ b/drivers/vfio/pci/pds/lm.c @@ -151,8 +151,7 @@ static struct page *pds_vfio_get_file_page(struct pds_vfio_lm_file *lm_file, lm_file->last_offset_sg = sg; lm_file->sg_last_entry += i; lm_file->last_offset = cur_offset; - return nth_page(sg_page(sg), - (offset - cur_offset) / PAGE_SIZE); + return sg_page(sg) + (offset - cur_offset) / PAGE_SIZE; } cur_offset += sg->length; } diff --git a/drivers/vfio/pci/virtio/migrate.c b/drivers/vfio/pci/virtio/migrate.c index ba92bb4e9af94..7dd0ac866461d 100644 --- a/drivers/vfio/pci/virtio/migrate.c +++ b/drivers/vfio/pci/virtio/migrate.c @@ -53,8 +53,7 @@ virtiovf_get_migration_page(struct virtiovf_data_buffer *buf, buf->last_offset_sg = sg; buf->sg_last_entry += i; buf->last_offset = cur_offset; - return nth_page(sg_page(sg), - (offset - cur_offset) / PAGE_SIZE); + return sg_page(sg) + (offset - cur_offset) / PAGE_SIZE; } cur_offset += sg->length; } -- 2.50.1