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 EE5043BFE33 for ; Wed, 20 May 2026 22:21:59 +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=1779315721; cv=none; b=alXd5MNw4rOra1f4meOuWOu4WTQZvsY9zfUGqY1rGKEV9f+Fr8i2Z5rStNhYpTvQ0sE7J/qExXM24hfXmS+I37IFvpWLnCQIyhFaPcXVYtyfb8pmJFr1Oqx+7hzabDdJ9zvYpcxUnuhqno2sozm2FF0Z9/do0zFG9XwjZ71Of/U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779315721; c=relaxed/simple; bh=NCrpBEyb9BtjGhGhnTsHPNPFOIuuUXGjOyr7FM5hCbE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=nFxcYeCpUaCRbBXjDZpr4lopKRsMZqJq/qT3lZDNFdGnPgZb5QSme7Di42dEBjsgyhL3ZxPlFVru/ql/NtE08OK1UGQoJQ8iZHAxqc/o0qzGKB+/dVG7TCkhYz6wI7Edc1ogRUa1eepVoK5ABWGGL4ajjeYdmxJygrV8CPPT/ys= 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=ASsbQhI6; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=hTXwRs0m; 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="ASsbQhI6"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="hTXwRs0m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779315719; 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=ASsbQhI66DkMqQZGWYpgm5d0etNxDM1KTnwrBg4UY0vmitEA7JebVh1YLQhlWG+dAdxQFg WFojMQFXGH0PlY+vD1qYK4EmjX+RGExuXpl8ZfMCjhd29CDEGyF4g4XUwhcmQqYip4s+Hq 6I8TbSIPAjYCfu35qO/ZMb8ku5bMlfg= 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-342-78eu8uQ-NTKpbKZY4BgMhw-1; Wed, 20 May 2026 18:21:57 -0400 X-MC-Unique: 78eu8uQ-NTKpbKZY4BgMhw-1 X-Mimecast-MFC-AGG-ID: 78eu8uQ-NTKpbKZY4BgMhw_1779315716 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43ff19e54beso3596810f8f.2 for ; Wed, 20 May 2026 15:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779315716; x=1779920516; 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=hTXwRs0mDK8NhLRrzagP4Y6MkM8+Clc2gf39LhFJ9TB5K9xMH/08BlgExukdxOK9Gx fRruGZCwR0Dfk/PMYfqhJOgZDGu0Vucx5ykqu5sezfy/aTgdd8aw1kNND4Q6O0d66+zT 9R4VoapHwibgcwCmycsH4JKqdripBa825v6q7AFQxcOh84sr1ywWeFwkgwpanmWONWUv iiwPb5bUdwjJxH69gfeK0u1VH9RmFQw1+UezI3Ypt6UkTXuChz1LxAn/ohfPRr53j3r3 7S94O80HfAm2BDFoUi4i3ftCB+FJgQxP7nS9WZ+AhVsse50JU18mZ4PmQoLAtgcKQ/Si TWrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779315716; x=1779920516; 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=qy2tsf4wPxp/lVB6NGKzZkbe1HzxKiSG/JdDDOGDJapLwArAUpUbnyDgWDrDvitaRq EaoFKHO72hVgexJSDxrZXkcbMsbg3/0jhFmEJhgs0oLOYzdzJxZ5VVkT24waxyWztolh ydHyLiA1nSAx8WS9IjeygQiEW2Rghig2RBjssqskTVeyhgzJQIh8QdVZiL/reLWFDdZc axLWILcUDtaZFsHRtW96ILRCyQurkVQ99EhbBCQcrEC64vhIExtkuX99DMTnWB6fYaAs q1VpDa3rpym+2Zr434Kb0KmtKvsA/8iLCtXJ2LlJ2DfJYQD7NORiyDJOmXUHfnUwXu34 7Qxw== X-Gm-Message-State: AOJu0YyxCgIs5U/mRt88mmPwvFU+amtv0iMYNr6zmN+rZAdzYW3CQMcM fLxNQn/3ZHadnP+0V6FJQ7yMPHdUGHUqpxVdrQLwTHmGyNbSwico1WbxazBDk7aQGqnBUFvVbZU LPr8zS7/uRd6O02217slNipMPzd9wQgMJMu8QIR4pfIPSYjHxmzNgF7iTo1Ty8cdwMTWbfagVYW Vy1RWlCvNDuIcjSypDaFDC66WLLdhE6KYzB6YXaMyZEr8= X-Gm-Gg: Acq92OEfvytRfttJfCfYlj/T8EFIb+yxgGVTMo8Km+iaOL5+uZvJ0RPXsU7OwFPiQJi O4cjChDbGNkvbJOPkiewK0FdFgXg2+Ma2bbOZRVEYFAyETW6MXKXKrSwI7QMLsljDNfN22ckcWr MSfwIjRP3YqrGg6SwrvyaDP+vPqN+8w+LyjCoEbrRKb+tZbNVpxIZ8RC7ursSuxj6+JOuS7tM+o ZCrXW0Yx2fdSvf1Nv430R2VpfrfDC7lQN+fmuX7sdybso1iHr5zCO64/WcpNclB5Xk7ra/Ma7pR k18Fr3dVXka3eqo4jiZb/PuyIUn0nwMQohhDbrjU83ES+5MKIhwuwLLc4CzybgARvyodQ91USUH bIp/3F89KP6KxywpNHiX55jKqltbgo0A2zwlx88EKFRMzJD8ePB7O3w== X-Received: by 2002:a05:600c:468b:b0:488:aa33:dcbd with SMTP id 5b1f17b1804b1-490360c12cbmr2778975e9.26.1779315716258; Wed, 20 May 2026 15:21:56 -0700 (PDT) X-Received: by 2002:a05:600c:468b:b0:488:aa33:dcbd with SMTP id 5b1f17b1804b1-490360c12cbmr2778335e9.26.1779315715676; Wed, 20 May 2026 15:21:55 -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 5b1f17b1804b1-49035ecc679sm2541065e9.6.2026.05.20.15.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 15:21:55 -0700 (PDT) Date: Wed, 20 May 2026 18:21:50 -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 v8 16/37] mm: alloc_swap_folio: pass raw fault address to vma_alloc_folio Message-ID: <00a4571e8ae75a457353726e1ec9111aebf76e31.1779315441.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 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