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 EBB1F3C3420 for ; Mon, 11 May 2026 08:53:50 +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=1778489632; cv=none; b=HSh+LX0bQ5aOhxniGsZXIuMZM2WSyApzxs6C1UC9GqxbDdLCKpblNU0Mmu0hG0RRcJw+GYgoetkFRP542GtEcUzeUYR0Fp8upNXLSuQYzZIY5TTeKi6oVRI9wYdjTQno29LKNIYxrXaeIIU37nAjlKb6ivDTvmCOH/kmUtPBsVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778489632; c=relaxed/simple; bh=WO4MHxi65GFX0xUNciL8bEMuUsPiR9dGIohoqGtzw3w=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=kNZ7llJlGvskpj/d+9BCb8+I+SAYwWPKxK8KHo9yoyl63jzX46kx92llvsCWTIRNKw4jCxfJhxrbc4g2sSk3ZAUwZ1yNs/x3lmk1UpvL4KogE72EJaDeK6amAsElhCywS50CiuC53Te71QxZaAqDIzN+VXN9CpfStJJlz+G62gA= 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=dXWo7ovt; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=pmQ/eTuL; 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="dXWo7ovt"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="pmQ/eTuL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778489630; 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=dXWo7ovtZsh7uVd4p5Iv7D+unenchb7MiUNWtpywst6qYqSDT/JY9KsgzhxpZy67KxBL0g adj3Kb310OJVMmrdwiq2qQp0QZyk5Sp1gyHbSPFtdr2O114GzOaSYonyjZ/+D1GPIXd5+Y 2HeuoP73IrNjABzpqjZD1jMar422Sro= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-43-EGuYvVyRPzyw00PqQ_UsKw-1; Mon, 11 May 2026 04:53:48 -0400 X-MC-Unique: EGuYvVyRPzyw00PqQ_UsKw-1 X-Mimecast-MFC-AGG-ID: EGuYvVyRPzyw00PqQ_UsKw_1778489628 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-48919890a95so25987815e9.2 for ; Mon, 11 May 2026 01:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778489627; x=1779094427; 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=pmQ/eTuLlC9gQFxiNeWE7PGiRw0Xm1Rih/Vd42vJBFo91koeJryrMZ8nYoEkauIo1a z3VIrPOPy+gKuNGLnd4rbq8heNxga6aRhbPLLNTPWOeqptTmVn93tjyaQ9Qkv/fNKbs5 aPrltzijtBIDOtLOROZkL6guzG/T2KYoAipPigrGZIDx7vJeX1tcJPaCBXbCm5nMMmkA BHTpitooGZkqtVRrxlWlqQgj5fbh2bRrKqHJG7EIq0di7cpGdULTF/+UlXtZcD3xwdbE 6hKhCY6mWMJ+bLP6tvW37Nr4H9h5mDafrrIRR4eEc6pIUTzm+nbNbwREKaiDnPFq7jOt C1tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778489627; x=1779094427; 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=lNwpHUYE92JXs6y0ikPovQr4JkJrIVvJfWijpnJVWra7gXT5L+ihsYdCGiH00t7cKC KNBPxxmABaICOvA/nIxXQdvdUMln9D4Tl4kzv/e5yz9rSS6uRK+rfwECbgMIAryTKo9x IXUNCCOKY2ONd6cf4tNY0oClzkpRv3oCQBn2b2dpvEBxdGSfuWBBAUq7GrjJJWsSRNjE IYe6biDPnfDmooy1ICpiSBIu+XkcwFFrBcFHjAl8fmp+LfhmO1QCWVjXuvnVOucmxNTY srggESnFI6q4L1aVLOT/x9SoAKiA8Ao6t9E/+hYjnVIMEHxTBQLpdC4Mf08T7Hw4O0Mx F1NA== X-Gm-Message-State: AOJu0Yy4/9D8I80J9PtENC2SQK21OIaIydt/jS3IX1RWTKR2xmNWK1O6 9SNN9dyJ5BhApZkGzAgxwJrzdOOhueiuzUx2MCDP9qbNoMEmSSpSdU4sOrid9vo1/0IT14D267l nftGQliIsvJu9cAig+jbTy8+vg/GVADHI3IOwfcdUhNqJf5ULfDMWetI27XtMmSKP6X6AXmZKfi 6iBD/a55+U4bIQGynwrjGsBfPTrH6ac18bmNQ4XWXlHZ1hWg== X-Gm-Gg: Acq92OGF+h8GuDwNz/nIJeC4lxd4aRwZYE/K9D3hvWNM9bXZH28qR/WR6tdvLCYKy0z M2EyCB0nVgy+AGfRirq3QSxQrz98CVQ+Hti5FbW+GRPamAZhcI7aN7xvYB/rhp0juseV6tg++uv zACgncXlI1GD96l77muFcBJ+gfYumd1lWXsbp8Phs9vDniOnQNMmMucp0Y30DdN75H9nGE2odHq ltPw6KA31ZjF9ehiEXWHQ9se6vsbkM9DOKPNvWgNgmGPuF2tSJygfmC27VyN1fTmqu3h6rOxZ2U 5EXJWYbwCkzjUwKHc3fK9VMXUne0srJ0QWoQQhMdfvJRYCtAfnnoh9DuHY9S6Ot/OJYONZstZ6N nmljVLbIfmVFzWLQDlJn9k5f8KHvCJWexw2JBOIeVpr/fqbazFNc= X-Received: by 2002:a05:600c:8211:b0:489:c57:7836 with SMTP id 5b1f17b1804b1-48e51f40ecemr408951095e9.27.1778489626883; Mon, 11 May 2026 01:53:46 -0700 (PDT) X-Received: by 2002:a05:600c:8211:b0:489:c57:7836 with SMTP id 5b1f17b1804b1-48e51f40ecemr408949875e9.27.1778489626227; Mon, 11 May 2026 01:53:46 -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-45491ca2fd6sm24939735f8f.30.2026.05.11.01.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 01:53:45 -0700 (PDT) Date: Mon, 11 May 2026 04:53:40 -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 , "Liam R. Howlett" Subject: [PATCH v6 09/30] mm: alloc_swap_folio: pass raw fault address to vma_alloc_folio Message-ID: <7205b70bc71ef0794b5148242ba18254d9e421e6.1778487000.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