From nobody Sat Jun 20 16:30:39 2026 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96BCF3B27ED for ; Mon, 13 Apr 2026 13:09:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776085779; cv=none; b=Sei/g7RHJ16XuoBcqC1o4O+p86rKeihDtvosHnnPCGzyaz9HqBi/DttI4H4TXucvxpC7o4PBI0Ih3CrzxTn0+ycxKVLUB3kOTftMxiaEqvbySj1dM6q373DCERzT9BSEalxsJahFIdC1GhvohPWtspEZBGDDZ0gRRsRpCItmPCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776085779; c=relaxed/simple; bh=bBRO7s37Sn/R1s0OSBhuTokIhVZHOyBLGjPr9h/aHZA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XYtwOEUGM4iSMiK6EqswUJPhfzizoWtGCnj3UqQ0WrrqoEeuyrBvKxTwKtizcqarovVzaxUj0Yfnx0TdQx/4WAOyyzn6GRZa/OWgMDYsaFlmIHMHw1oPYircIqQB9L+rHz46Fqsl5sd+U19TCdokBW/OQeBI9mJPBZYH65L7nls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LRpgJtpH; arc=none smtp.client-ip=209.85.215.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LRpgJtpH" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-c757a9251faso1612215a12.1 for ; Mon, 13 Apr 2026 06:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776085778; x=1776690578; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Nzm5Y59GccoLKoaxA20w0qhFW7WhAUyMbCaScju2noo=; b=LRpgJtpHdcJfQcHs8hkTXYrikgvm4GJ82JC3qkXF6jz2cG+2SiZrBP/03TzWPoXG+n BULllRKALrm4R+wCaWcf9OA2eBn1MJLKd9KaBQsHRIAxMNI1LelNBBpk12miCh3/UdD1 Tm9nzjVOdyRbZPPuHiVF0RAqfAkE0ESTQ37+0WBNhX8lgLmNvASuF2f7AkKHKGPuqTS8 L8SWycR9Nmo2Ma7/O+iimGy5ghQmTkxp9qeIyb7ci3L6cKwA+6/DlMQlZgRYNYsesl+x Rtbmx3S/RQgWQ1Qe9IqYE0sRnc7ZSoAW98nCSyibzVimsoK9L88V8x1AgTNoEAcFLpco RG9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776085778; x=1776690578; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Nzm5Y59GccoLKoaxA20w0qhFW7WhAUyMbCaScju2noo=; b=WKb798YuZchiBWEanmClvg3A7YT3n3uA9QDZUmeA4okWBtz+hWDoZIBa/9H/+ms446 OIKMpFeVZFpiQUet0OBDGWjRHnXYp/aADelxYuTCiFyqiFm7e6jSoN1o1vUDI7IH4vs1 qwdVb6A4ns/MAgzeUWQDousXd+15ZlmGt4OSAWDjELTyF/LhQi95DuyqSWCzPcUFQUjK enbEZKYWYY9B12bVErOgJXEeRltmICCqDffTD8ozPNWjrhbV40Bw3c+YlXrqDVQqANvg afeNMstx8pD6opsAyGN0ibEKIrxFN18M1ftPhRaYEa7C7sQG5dzel9mvdYxCI+bsl6Y7 84YA== X-Forwarded-Encrypted: i=1; AFNElJ9NxhBRsMx8urfeWNii97BgMyjGlYyAsklQUcGg9DyJREhbyYAPAq/65Ij/bW8BuxtvfRtF5kN+zwMkidU=@vger.kernel.org X-Gm-Message-State: AOJu0YzT8H6SnlVnyjC56KrsqD90+yZ3vvUqx7WLogUaYoVN6Y4iwSL/ UwSPPi5+6vqY593ntG/5CGZMEHcO9tWlUlM9YsUnXcSq6V48jAPBZ/uF X-Gm-Gg: AeBDieubcY8xXdEvHvSXQCZcVABCvmUv/sJfuMnd6TEDIOAL33pHzns3tglBkyFCD5C TYqSjH1/A6OW6ZypbNmn5AomfM6jFuPCtRQAHiBpeWBfxl9w+MOTK8A0SujnNyrY8cqW+GRvrTg HtO+cAzjzXLHK3oPP7pcVmPp6Uv15cM142YcApUEwppeRuDVSWAEqQquIr60OsBRc749F7rqikR ozZ7mO4gpiV4wNGb5uChzAsOmpeWkSFCixUjnER84JmNH/dsyaERyBZWg7dRmLClxrFJriSgr1W y+Ggc8gHBDKag4RCy4T0lG3mTNQ8sbZPP4Q5bZiPUhNw6FkpiSpJ7vvP+Bn18SlfLPxsAn8DSGB sDv8NOeVYySU2bBFNTz0txbVa6s8qk99WU2xnsAhPMgorgtMSusV9NVEIjz7wOjo7pBEu3pw8+h P8knURUI69QEUJ4xsdE8Mou/bzoq0P2v3BX7xwZv5Z9KCB X-Received: by 2002:a17:902:6acb:b0:2b0:5520:f497 with SMTP id d9443c01a7336-2b2d591ddc8mr100858455ad.9.1776085777837; Mon, 13 Apr 2026 06:09:37 -0700 (PDT) Received: from tech-Alienware-m15-R6.. ([122.171.18.84]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2d4ddb742sm119475395ad.27.2026.04.13.06.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 06:09:37 -0700 (PDT) From: Sunny Patel To: Andrew Morton , David Hildenbrand Cc: Zi Yan , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sunny Patel Subject: [PATCH] mm/migrate_device: fix double unlock and remove dead code Date: Mon, 13 Apr 2026 18:39:23 +0530 Message-ID: <20260413130927.13263-1-nueralspacetech@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix two bugs in device migration paths: 1) migrate_vma_collect_huge_pmd() calls spin_unlock after softleaf_entry_wait_on_locked(), which already releases the ptl. 2) migrate_vma_insert_huge_pmd_page() has a dead else-if branch and this branch is always unreachable. Signed-off-by: Sunny Patel --- mm/migrate_device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 8079676c8f1f..0e005c26ee88 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -177,7 +177,6 @@ static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, un= signed long start, =20 if (softleaf_is_migration(entry)) { softleaf_entry_wait_on_locked(entry, ptl); - spin_unlock(ptl); return -EAGAIN; } =20 @@ -869,8 +868,7 @@ static int migrate_vma_insert_huge_pmd_page(struct migr= ate_vma *migrate, if (!is_huge_zero_pmd(*pmdp)) goto unlock_abort; flush =3D true; - } else if (!pmd_none(*pmdp)) - goto unlock_abort; + } =20 add_mm_counter(vma->vm_mm, MM_ANONPAGES, HPAGE_PMD_NR); folio_add_new_anon_rmap(folio, vma, addr, RMAP_EXCLUSIVE); --=20 2.43.0