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.129.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 5132B3C943B for ; Tue, 12 May 2026 21:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778619987; cv=none; b=gk3OSWcjVusAceB8TpcQL1k50LT/jakkqQ9c469neY7ET9ZiQeZcAq6Haf00LysBzE2gIQgxOqtL+1ONBfcSTOIueuOmwcTyxYZKTnIQVheAVKqU1Utnm58Py3P2LUfO19EEDKj+sjHJSe7K3XbAUH7J43Rb3M6plzY+frli4eY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778619987; c=relaxed/simple; bh=WO4MHxi65GFX0xUNciL8bEMuUsPiR9dGIohoqGtzw3w=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OGQ51Arw9eL9ZHdHEf/Lds8D6Qkce+4vs4q9N9jAh5i35ny8HDc6bR2QSM1SucThDdd8/B4+i9mmklISoeVXNftbsQGyGGhacm9nioIe8q+DyYxFZxlA1zwXs/t2pgbHIP/u1dw5ki3Hj034KFJ+Q3tK7xkRdsdc2DBb5Y9SwtE= 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=QkKq1OGt; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=KA26UHov; arc=none smtp.client-ip=170.10.129.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="QkKq1OGt"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="KA26UHov" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778619985; 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: in-reply-to:in-reply-to:references:references; bh=XL/pBrxkXlfOOto9pZb2YfWp+jJTrqFtHfQ0Ihv6FSM=; b=QkKq1OGtm1T9q34SByaG4Bpz/gibJm6IJo3ZXY58k22T0cQWLzvMMpb4ItjJIlNejy86Em 8+SHxf2SZm15xEfTnOwdyYH+uBAFBc3ttnCZMhAJ2z6WldJ0zoHLZ8yXDc5NH6/PBs6GKE XBI4gJ8gXywJ9mlima53Lc843KQvkm8= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-317-Uydhw8WZNPq7uosrx_v2WQ-1; Tue, 12 May 2026 17:06:24 -0400 X-MC-Unique: Uydhw8WZNPq7uosrx_v2WQ-1 X-Mimecast-MFC-AGG-ID: Uydhw8WZNPq7uosrx_v2WQ_1778619983 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-48eb0da933fso5867785e9.0 for ; Tue, 12 May 2026 14:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778619982; x=1779224782; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=XL/pBrxkXlfOOto9pZb2YfWp+jJTrqFtHfQ0Ihv6FSM=; b=KA26UHovV07ax0MDRN/CahufvtSaoFX0uo6XOGufWdTgSPOIOVpVzJ/UONNMbUnFDa moFLG2EJzVdhaX19qE6uubHB4zhdCiTUolgZrGjyFdc4Bwvlb6PzwZlqpVYo0OfPS0NG 79KtewKBjD7wdtSZpei+EnCx1KXpKSmTnJCHLRIA/c/6RzzW++duw9ZsnJWmuGhHt2g5 pa37p/zoOY6MBcDk9T6Uk7zT0JgogDh7FWQsxP2bpeMhn8WJtjt558K3tvUqe+wSYdy8 SX7b5mSJXo4FqvIZ0LrUHQQbxz0SHFa78LkvjMxet9NBk2/PN978vLX/B1sgNoDibpFM RjOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778619982; x=1779224782; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XL/pBrxkXlfOOto9pZb2YfWp+jJTrqFtHfQ0Ihv6FSM=; b=W/hn2SKgJ1G+HnjjT6arJxmoXJZTxcMMFlsMRWJ591ODElzoDfrlEPRQPa62EcYWw0 rxhZ/cVQb1Nx/6uY/qaqFKUvdPL24E03Hzs3FmbfkYamhdGSvdfa8B02cwijMKXhKiye DhO3mJDlZ/4F2WD/vRhjPGFcU4tgk1wIKnPUJLWuVXpto1X11PjAtacLZrjudWyNoSgU dcMU/MzklHIMr64jlfw0jOnSdsZB2shCkQ4lyTeD/9pCNIhhrDUN77JrGrInBHxExr/g tjrT7is9efE3r2vqhUhyLFJxrai2WityNb+PCSbG8xuwv6VyVaPDeUp418VBeK0oGljk ty9g== X-Gm-Message-State: AOJu0Ywu3yqGw5yGYlChknRsv2E8AjaB+o8vUanLlRN07kNNG6eHgtZQ 48V5icDlHzQr3BwcOKth2xl/sqY1tp3o3P2OsKNODTVOASDFfhhr3bIfXHm3biBE5fDFj53jMiK Hh2emYNPazcKWzCV3prZT1p7cqEfvTKxEMVPJyLwrYJdStMD1R+TgGbmDEeK9cxOhUGoIwCuJLo PkXH5HMq7HGCU17w5hvC5IZmCNoMIPQyTMuJgZmGmpl0Q= X-Gm-Gg: Acq92OGF3OzgzgaxT747I0ebT+9yaRiXMJo2D8ewNQcJcnaBo4LAKAKQCbyRAnNDn4R LehWyDcc2b6W96iRlJQVE0ecn0tEPJExMFedSEVygyA4OiDkVxQJcKcsFxEv9ctpLf/3f7bwzuv BerIQ7mm9X2wUmK81+//SLsGtdikLPS/9hA/1g1k2ZOWEQMy0AEl2Eq7DtNTsrwX6eqtxQA99GB czlN3Jxk4LVp3LRudufm6aR2AcCLg9PIGXvg//51bvwkwCvL3se5+FvoQSNNflRfRjEUIx6zRMY ROfzexF3Cch1EJqMpBP0Cuu+4S5tA6kj9eQVnO1D/gOsJodi4Q2KTvzNBaCQbCMwGAubK4tVE2U mdX13y7j9C/0snKloW4G34lAtqnhJUPbJfN/JW1Z2 X-Received: by 2002:a05:600c:444b:b0:48e:706b:53e3 with SMTP id 5b1f17b1804b1-48fc9a0231emr7733435e9.1.1778619982452; Tue, 12 May 2026 14:06:22 -0700 (PDT) X-Received: by 2002:a05:600c:444b:b0:48e:706b:53e3 with SMTP id 5b1f17b1804b1-48fc9a0231emr7732775e9.1.1778619981835; Tue, 12 May 2026 14:06:21 -0700 (PDT) Received: from redhat.com (IGLD-80-230-48-7.inter.net.il. [80.230.48.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45491cab9c2sm37226840f8f.31.2026.05.12.14.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 14:06:20 -0700 (PDT) Date: Tue, 12 May 2026 17:06:16 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: "David Hildenbrand (Arm)" , Jason Wang , Xuan Zhuo , Eugenio =?utf-8?B?UMOpcmV6?= , Muchun Song , Oscar Salvador , Andrew Morton , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Hugh Dickins , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo , Axel Rasmussen , Yuanchu Xie , Wei Xu , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , virtualization@lists.linux.dev, linux-mm@kvack.org, Andrea Arcangeli Subject: [PATCH v7 13/31] mm: alloc_swap_folio: pass raw fault address to vma_alloc_folio Message-ID: <66119d3bab318d74c1586b99dd70fb74e2da1ec0.1778616612.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Same change as the previous patch but for alloc_swap_folio: pass vmf->address directly instead of ALIGN_DOWN(vmf->address, ...). Signed-off-by: Michael S. Tsirkin Assisted-by: Claude:claude-opus-4-6 Assisted-by: cursor-agent:GPT-5.4-xhigh --- mm/memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 0824441a6ba1..74523bc00d8a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4734,8 +4734,7 @@ static struct folio *alloc_swap_folio(struct vm_fault *vmf) /* Try allocating the highest of the remaining orders. */ gfp = vma_thp_gfp_mask(vma); while (orders) { - addr = ALIGN_DOWN(vmf->address, PAGE_SIZE << order); - folio = vma_alloc_folio(gfp, order, vma, addr); + folio = vma_alloc_folio(gfp, order, vma, vmf->address); if (folio) { if (!mem_cgroup_swapin_charge_folio(folio, vma->vm_mm, gfp, entry)) -- MST