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 DB1BB3B3BFE for ; Mon, 8 Jun 2026 08:37:52 +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=1780907881; cv=none; b=kmOVKLcU2SrxBxcYXvIRD96n5eWUV+JOuyCEVD6nBa9TnzUmoTMFeqWr2bGKlHsgy3YLrjYh2SEwiailwTox/rlFPMN7s4nA4c5zKUX+JBzjA6vsib44S4Gi8wMvKayTBz/dQdWP2qOTrvy1pfbC1zxzY4wsRwuLPKLFta7IG/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780907881; c=relaxed/simple; bh=TnddcwSWkBVpMxUBPESy99JTSMn25mXLp3afUCWRn7U=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=RDz+7t7FSKM3w7I01bn7Nti1iyZopbJJmGlXXLWpVXYge1IbtaECazthqRFnCzbNBSzUlWo+BPGz1uMqByYeUgLUT7lUTJ1wwb3d+nvrha5AtjCE1BevXI4Hzp1nNj4C6rU1FS5x+99itcrxTWxOYVmSHwTXXBlqXrjYKqBQh4U= 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=U8PBVLBm; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=JpIok/ZG; 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="U8PBVLBm"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="JpIok/ZG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780907871; 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=Zy4rtaIprLz/f2YXF/2fwOOOF4wr4AdMW87y/Btd5qo=; b=U8PBVLBmP96HJJDJdtgrEKs7d0gWNuRRD/mS+4EgusKdFAHiSxjmPwdaFbbD4d8ISG19dz QdLkkaysLpBL+4aTtTZOORN5QqAry9xehrT1FY88CyLR1MpuFYebLEcHegMQkpzD2cylXJ fMQeWVz5xasbitNA7+JjV6bN3kqdzkk= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-88-9P5-6xwjMtGn-9e6LMyCsg-1; Mon, 08 Jun 2026 04:37:50 -0400 X-MC-Unique: 9P5-6xwjMtGn-9e6LMyCsg-1 X-Mimecast-MFC-AGG-ID: 9P5-6xwjMtGn-9e6LMyCsg_1780907870 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-490a786f987so47024965e9.3 for ; Mon, 08 Jun 2026 01:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1780907869; x=1781512669; 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=Zy4rtaIprLz/f2YXF/2fwOOOF4wr4AdMW87y/Btd5qo=; b=JpIok/ZGWj65xny7yMgNlOzRehX1crG4LioqEk2nvHh8iCRuFI/VLE4JB+I0ygBfYK qVsDtnbuTWh7UwWhhcBk5mHhJPzuz7DchS34y5mIifQfONzkTdlDk6lKulJqZsQhH6VF 9sqRz0ZNSOxfvfL47HTlyrjkh2PYcOcRZE6esJTSXQWLBQn9suH1b7/jfiCbwTpOpiA4 Cp+IpkXE9i+EEie4ToehP4n3OlmnfTUVE6ULKq/AkJWcC8m//4vZZ1II37HMkfumbGU1 UA7ldS/DfmGig7Bx3mx1kyFxloAkoc3ezXrlQA0iltB0Wi6qMZs4nIkDGrORzOs2Onv2 wapA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780907869; x=1781512669; 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=Zy4rtaIprLz/f2YXF/2fwOOOF4wr4AdMW87y/Btd5qo=; b=libLwjIDkoefYxVs/3rLiF/Xfgu7Ik7kt8xEZ+J1jM25TWO4O1jJ3CRHz6DMGybSAf yC090XS5sSzj3BWQkeilW8ZXE+5iK0wBS9KmnmJknnvwnJSe033niQ9QdhMkEeoTVwj+ raAOVguWxyKf+YCD78m2ZoYItF9oCq63QfQgjkesHztwQTy3aVOqHl5TAXYBwRRZGJL0 E57I46/Zp9GEZiX5wvyz133w+BcAA32t4QuGpKB7sY4Zl37TswgkEYrKZ6FT2XBU/nmw Ic5q8uwec/vZW5PIP7/zO2NvFNgAg4doK0Zvg3KQYs+aEkONj19bnYmk5+hgnXQh8qwW FVDw== X-Gm-Message-State: AOJu0Yy0+PiAiZr+jTq9Y7Weav8qqKiPVCcWxQ0wsnqd7TPPFlOCcnxC SJ0RVYdK7aKUrhyed5gHK7p/U9IkuIA6sIbgmjfNtEfViI6EsuA0mQSX5mgbqnLLfZds8iYN5km oTpEhNcXkbiTuZ3HMhPyvbXdmil7NPWtiWYx8G7zq0iOT0QDYM9PiRA9VsDEEFuwcY1S8UL3Hk3 SfIK0JsHQkLebeQFCC6MaHp7j7L/dVpvxd4I28M7uSPEc= X-Gm-Gg: Acq92OG2QiKyXxTsZ1O8fZ18H0GiBTH0vT8aUHE8kFsScAiVF62Xi9MsRgk1V1+F8QF TwzjgP+88EdsxjJMHj2Tw5xTDUcDtUOKOfKqOrahL+CZfePaORmPXLDgUE6cZBWTqZ+yUs8p4Wx qoD6Pw/FitYhdQwxPEVe5a82Hx2qgDSoeUexk7dWspJoAmHFmgnK2aGPXESnFqQm6hVBQtQIYqn +7jbsFVl5rRLhZkA01D7RvDh5sqAn0v376xE2clqlEZpYguYGT8NSSL900EGmfXR7JR65iCVSyy zcNFPrASZQ0eAC3rW4ATilVhosUZZHURKVrg8m/GWVU8BS6bCeCdm4bKof/TxGKPr8/FDxJoYmV i3HgVup/3Ac9pG0ISvL/0Hvw= X-Received: by 2002:a05:600c:1549:b0:490:c7dd:7cc2 with SMTP id 5b1f17b1804b1-490c7dd7defmr154053705e9.24.1780907869364; Mon, 08 Jun 2026 01:37:49 -0700 (PDT) X-Received: by 2002:a05:600c:1549:b0:490:c7dd:7cc2 with SMTP id 5b1f17b1804b1-490c7dd7defmr154052515e9.24.1780907868720; Mon, 08 Jun 2026 01:37:48 -0700 (PDT) Received: from redhat.com ([31.152.37.159]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490bc3cc140sm450465175e9.9.2026.06.08.01.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 01:37:48 -0700 (PDT) Date: Mon, 8 Jun 2026 04:37:41 -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 v10 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.51.2.2891.g4157995a80.dirty 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, ...). Note: NUMA interleave is not affected by the raw address; the ilx calculation shifts addr >> PAGE_SHIFT >> order, dropping sub-page bits regardless of alignment. 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 21f640674c4f..6c14b90f558e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4750,8 +4750,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