From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 2B62537D5D6 for ; Thu, 21 Aug 2025 20:08:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755806917; cv=none; b=fytwWpLoeFfY/ZMPsU3GKc4PNOHBwyE7IeiYHabXqIve+cnlZPNI0gQa+L+tZyLTu9Snk7JDhycqdYxCmqSD9V1NaMG+ZQqbsXoG8trDQIArUZPbq6gcwJpUi6Pzdfaswzc9P1LJSIiAWn0G0y0qdiDOMYyQh9t9gO6FIG6MVuw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755806917; c=relaxed/simple; bh=u2IvbkeQqipan9xn1FH8uDngo5kbDeDcvQE423cldao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VuZpuDq/6VrGgTnxX0ULNkFS+pNDbvTleNmwboHpGMOmwvf94hfZva0eRn+ht+TgfYCSQBBVuDgQvRMnTxBdT4eo++mf3FA0VIMaECc/hPLwngkKYoP3s9UHSPCmBO+wMElekZ2V4c5h3wCOjex7nzdo7eVxr2lnemhmiw1hQB0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gWu3gNCR; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gWu3gNCR" 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uIthYg0x+2djveHghlw2Jb9wmVGYKVQz7R4ULrPQfiU=; b=gWu3gNCRFOsVNUuWNJEaJT4/smWuwebgkhI909aCi18ILvJjj5U7YQmWWGABCmv4chp0TV zV/fj1uRmOb/F8sJKTzbOiQuWGXb4y/HFFB5tpH6G0ZKaRgehJHsUCAVNpNvX0+YSn0rDQ d62ftm4cV7f9jCf68yOkQkEp79sT6Pg= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-14-EoPN1wS_O9yJxky6MUit1Q-1; Thu, 21 Aug 2025 16:08:33 -0400 X-MC-Unique: EoPN1wS_O9yJxky6MUit1Q-1 X-Mimecast-MFC-AGG-ID: EoPN1wS_O9yJxky6MUit1Q_1755806912 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3b9dc566cb4so996945f8f.1 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=taL1vqfMkg4wv8/Lsa+Yt2slv2h23za8+BZR2daur4Luom2irSodP0N1ox7GL3yQ/9 97LOOOFnvDPrR+zKx3O/pp18TwoVizsOKGGB3uS1i2+1yx8XgQYgR6hpE2/xNs59+HVq PlcmFNRQFg3oy8thNd7+ETIvE8qGwXaf1Tgvu+K0TCmkg/Cvm9HLLHKP0FW2M4CytXqV Oo681NBi815B+OChbhqDsuSNv8eFW6nCZzPD4ZRH1SmyLdBCzeM3B2wjy48ku3RTF47i eCaFoI9iZiQE02WNc87lU4R0/1oK5lrs3BO6XytVtYSQSG4CB5704Vm3HKUe2/q2ZbAS a2JA== X-Forwarded-Encrypted: i=1; AJvYcCWwiboatJfp1w3CY3YdheTKxIAWMPZInCb6SJb4tP+QN9I7cKxegM1VMJRnP+MUbz45XETMrtFPMeI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxe/ORGhANwVJb1pYF++vmilSym9RwuKLX8BxmRWIYI/JUQMS/A knDA0GjqsxwhAysfG5uloSrog35jD2EZcf5XgUCmUbDcxOmOgFR1Y1l63gibLpnmKKAgsU39zlz O5SJ5fe5wDwEgbo0C09RWvZbLjiOuZLRGAhDRSZM9K5zyGYhUk5tTjzxp2sMOpw== X-Gm-Gg: ASbGnctAfUGtqh7iX26xm4ZlZZdanwxVod9/8lF7xJbmGMtOdylLVpJ4Z32VPCIoA2f z0hOB0A/PP1hfLMMz+qLjvsl6DerADm35t9yjYoArVMF2QKIzLwHvfdP+iWXj8cb9Loe+3Ncj+b x9hbsfzX/o8yn6H/nDyZSIJeJN0FomKTIN4viWpj4PTmmt/jT+r4gvA+BoioAY2VVz76u+xKaUS l6kcQ2n502colwh7IPaYN2E6EZU4Sa1ALyA9Xpor0uUI//wgrt7ZiitNN49GlS/YZfNZ9O94UKY NAuTYYwchb6I2c9p3nYDFk1y/ZNrDloiyviEDkgA/Nd6fWibzv+GjMA1KTfNRfhHD6N5wbtqLwC fSiQWpW3REq9czwl8AdPHFQ== X-Received: by 2002:a05:6000:40de:b0:3a5:783f:528a with SMTP id ffacd0b85a97d-3c5dcefee22mr195278f8f.59.1755806912319; 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> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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