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 0F9AB41B369 for ; Fri, 29 May 2026 15:23:33 +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=1780068215; cv=none; b=Rb5i9xQMxxpeZFmSplhkYGmUp5F6JpLTQ9oZVDYwQdgK764Mm2qVcJ9n8VwR8g60bnijrevHNpTy8Lwi2IwIZyDFXkgGDgAPwvcgp/1ZL2NiYBB9GwgbZiJ2SxCfT8D1IiwsEm6Ky8tdAbFWZWbmSUMOuOBao+kfK2jGxsW1Z9I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780068215; c=relaxed/simple; bh=NCrpBEyb9BtjGhGhnTsHPNPFOIuuUXGjOyr7FM5hCbE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=NSCEIut7Y1kX18xkKCKXUS6svpsPls2XMMpdgSVBofcm0D4+bksTziseAzkcbvMG8lugFbpJrsvM+yy1J12x01dLi6l2BCcFx1f1t1s9d+w94xGvT2q9xrtNX8/PAGDn9O/uXU8wcw3cHDnOpK0q8AVnKCYJeYfo3o6R+H5l81I= 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=Z6hsLO3B; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=MxEyEPzu; 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="Z6hsLO3B"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="MxEyEPzu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780068213; 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=YBx6SgN438Kse3DYiPhfWEcJAMkqbJwsQPerWAK4QDs=; b=Z6hsLO3BMe8klH2VVDjVJXVVnee73LsklJ2YPGaMPx7LZjO+oVOV9QchRHM9NoIZZO2tm0 6pfRslmQzACOIWUUEyBTP6XOQg3dsedstUGSlmizy9N+5vTv1V/JssFYxR08sQ7ITj/6lZ vnqWBwDjtqvpjra26wa1L7NIRn+NG5E= 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-411-SZ8MVMt5ODe8VjOq_usSVw-1; Fri, 29 May 2026 11:23:32 -0400 X-MC-Unique: SZ8MVMt5ODe8VjOq_usSVw-1 X-Mimecast-MFC-AGG-ID: SZ8MVMt5ODe8VjOq_usSVw_1780068211 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-45ef3c7073eso483524f8f.2 for ; Fri, 29 May 2026 08:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1780068211; x=1780673011; 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=YBx6SgN438Kse3DYiPhfWEcJAMkqbJwsQPerWAK4QDs=; b=MxEyEPzuM+qs8/MXYUx/mxmEsUCzYB+AFuxWl84A8XwCGeqdDdwDe7Zu/pYKZLNS54 WALgRhYUAyXKtf2oLZu98WYQDoX3rnLsFozqnIgwcMMP17p0WkeLNOHmx63dE3EEaKFH PM3QYOzG/njTlooAK6+jvZjuR61a+ff6pRJXKJ7+B4SZ08OiulKCwKhljRQxwfALcgsx tynzwxPIhOdPJdh6VvBFUV6bDUJnsdofLn7zxDtwFip5HA3bd1NbFDNuMjD5LX+aPh6t GrQsEWsSABpvxuIGclWs4zXaE9MjnU0hCH8Py93lpHDHZX8v32UPmPB0IA/azXd4hkKe B+NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780068211; x=1780673011; 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=YBx6SgN438Kse3DYiPhfWEcJAMkqbJwsQPerWAK4QDs=; b=GSbPYOqMPLrq7+g7CZbazG2evZsTVBmv/RDCo2r6jMXRceYNYv3XZsHE8FGcmGWPm/ q01yZ62RtWvmRJXZlhCVhl4IUNTftCgBtCgVL9LyvhtQqgEqDsAmZDh8Zzn7HG6jvqhU JqCtdSG0Ddpze6zHu7cTATUkRTIyWO95CU9lN1QcAWARK8zS9ds8M/DgroVibrBoNlBY qmjCeS1hqZXowCoOyDJbT/hn8TZj/V0dU7HMeFnmwa3BKwo+wdy3GdbGsy6rQsnUEuV/ q5Rv2ttwUpk14K9BM2QPj4QsGMwTuufncqxao1IoXSvoPfFiAk/UbxPFNY0CdL59oIUM G0AA== X-Gm-Message-State: AOJu0YxpY1mS9gi6p33AXNh/uolQd84ZSkoqdckFepgkbszwsCyJc5lx M3WEo182CUItBXtc1C+U4ODIS7pfdeD/WDj/uon9b53NtI0KUroZkN+iHv//1u1tXB8Mdqb8dNH tkAtUuPNSVsJspbo2eGYEfdENK26TqHJIplyWdKze4LQYO5RmfoR6GKXHyLNpPnT79nLa5tPIRg EXnl5yhi6F2anqVtDdW2S9iEN7Yz8TAU25WMdlltdFUmw= X-Gm-Gg: Acq92OGZpxQiUURo+21z5kaR32ccMOEEFxnePtvb+1xuJa3dhVzCP24qbjXYajOwyx/ 1KiPcuaoZbVSlkKatS8p5GVMG6pu+MyKq4dbVB6WImHhQJhsj1zQjvk45yBZM3EzxUQ3DO1plaN rgAtXK+qeCpwlE4vmMFZyfk2OJ9JDPBAxpeK4Qy0OsbvVgZO0qcm9ZPV7rOnepZS4VL0jCJoiRE VLcJxZyqhZC2JhEbE1kB1kvkQlEjSPpo4Sm9EZGnJAV3zC6hePh5O9gUm6TcBFbsQPeHZAVsedt LM37KoJFNeJlTecVT2jjXWVs7efnAiD0v1VgAdOecHDiGbWvu9nNaZKTnMCyrIXF33zArFbwPny l3JQhO13uLSI0Xnjnk+5MjkguIi+X6MsqbW6/FJHSZPXD+XzZpdNQWg== X-Received: by 2002:a05:6000:4812:b0:45e:f6d5:7db5 with SMTP id ffacd0b85a97d-45ef6d57f21mr93726f8f.18.1780068210718; Fri, 29 May 2026 08:23:30 -0700 (PDT) X-Received: by 2002:a05:6000:4812:b0:45e:f6d5:7db5 with SMTP id ffacd0b85a97d-45ef6d57f21mr93615f8f.18.1780068210090; Fri, 29 May 2026 08:23:30 -0700 (PDT) Received: from redhat.com (IGLD-80-230-25-45.inter.net.il. [80.230.25.45]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45ef35601d7sm5883909f8f.28.2026.05.29.08.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 08:23:29 -0700 (PDT) Date: Fri, 29 May 2026 11:23:25 -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 v9 16/37] mm: alloc_swap_folio: pass raw fault address to vma_alloc_folio Message-ID: 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 Reviewed-by: Gregory Price 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 75bee9501666..adc228fe3578 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