From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (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 854FB2D7DF8 for ; Fri, 16 Jan 2026 19:27:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768591640; cv=none; b=Tu/CObwxsHa+pQMh4hKoCwfZ97ydqavv9HWXRcsDqNMmZKtGLA978SLmaZ5RffQWXwGiAm83BvkB/CGPZy8HxsACrKXdIYGnXjcGYUIwxBvRZrRh+Pjx+p5LlLV9Tiiiuqh2qiNx0YFdFantCVtfIGpfWwcfRWnpO7goUkL3Rd4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768591640; c=relaxed/simple; bh=+Cp42K2YNWwfAABrLqpx7laqzzSK7+aAP6ddHe48WPE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=neR3bWMkLOJreJ/6ifzsxhgxiQiMybfkHeZv55MbVkHZBITetMl+lvLEZq7WYDAIyeh1CitSHDvyEXwUTzEIBiAVdNWFTjFEQftKqrs8xmaFXNZhPodjs3JHR0lcnVlvmkzHn7wcYt301OoWssaaqc8eJm5DKExv80PjNgIi1Is= 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=NPnXKzyA; arc=none smtp.client-ip=209.85.128.181 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="NPnXKzyA" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-790ac42fd00so22540097b3.3 for ; Fri, 16 Jan 2026 11:27:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768591638; x=1769196438; 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=uTMBfChikiIcOHf6FYYpeyBEYYwNF4nP+fKI7jaBDyU=; b=NPnXKzyAJNr3U5QUinyimaQKyUQgsLsQn4p2vshLF3VpbFxRGjeohnUN3mxfUmSZpU tU9CQT0WFzGxNXduPoupQ9Gy3ekjaGTjmgv6L4gAIXZBRmUzg9h/gWt7SQat6pW69pw4 QbO1zqzcv0CPUnL/sKMP+5bHQTUhD1PvUyPUgZEhBks7B+LqzgVC95qS3dl4IA6XN9Sv oPh7r+/DbZAZFezV42IaV0Xz+25Ub1TNKKk64Qf9ciCm3nrCW0KWOtQZuDUEikr7iG3E 2h9Y5feRMM0+4yxxYE7kgd1PbrVeHkUELC7W/9KorLDvTE5kK8QXIXJT5WX3ROb1+7/e NH4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768591638; x=1769196438; 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=uTMBfChikiIcOHf6FYYpeyBEYYwNF4nP+fKI7jaBDyU=; b=ZArWs+sNISLOZgw1cZzVFin30i4UznAGOw8iRPR5as9leeeo9IHY6TDiJ4TnLAoto7 XfksWjmp73ZvaCHYFYMSBs+0YbTaNdFUT+RhlylQMCAU31NhQl8F3HEG+grD4kv5y0yw 3biiEyNLp61BwJx/iV16owCj2eCj1OIOEfTCpHPX25WezoLhtXriiZ5BYuhWHQO++W2R kKkXZ+zryme0DmBX2RSkS+8zRS8dy7D+nGmzA4XC3Bk4swVpyiNUbjCS6Rn0QRGkb5ZE RSKnQHX2zyubA+Hd95bwYbb9b51AkKjHc1T9xdWAobHppo4dPIfWEZnunlrhVNc2EnP7 SU+g== X-Forwarded-Encrypted: i=1; AJvYcCVt3GVOWCd3Qqtqdx2JtbUfeFAr2bNLp5bMODlZf1zDjgZq+rpwHwsGmm5IdBYVOL189HcgdFvqfK4EJeQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwgUcxis5OMAaD7kdvW7ux33mUFsLZq0uZtHhzycpZGiqdGzfBK w0y8UB6N/WVPAhGDfI84tnSAIm1VVNcV6XJLi3wEKMx+jWYZmasCY312 X-Gm-Gg: AY/fxX7jLS52y+1AZ3C5mPqkqNU7uSPhJf7qShGRnkj9zd0IdtGdkrp6iFXflRwfw1T xaOG+p39HCapkTIZ5SUTWCHPyaPdbzIoJ42sQxEQ8xu3LNtPg75eqUNQKohkcpdx3kF9Zc0E7jb J1Tp8Oqpo4qytE+I+MGJPBizkatw6dpA9t98HjcMvnKq68w638eclLDuuboAA2Y1+IIDATxOTUD Zdj7foFf9OGpvn7dHyyJIkAYtYTRoCcT3jWGzkyyFts03nFLJbGkBmVMTTlmRbbZZz0jEErEl3T KaytCslph0WDij3aA+0JP+60WW0St+LC2x5EyVWi9xf1ZzOfO3u9cr52JC4SGgnCuiRLIufIwNG sGDUwG4PMLuGETmBNTvximGEQ8hVtmMdTFsVl5EGwscTtZj4k2H4QfOng2oZ+t1Z6yWLNUDXDOj /6j+xQ2gaA X-Received: by 2002:a05:690c:398:b0:792:7745:730b with SMTP id 00721157ae682-793c53851b5mr78967317b3.43.1768591638464; Fri, 16 Jan 2026 11:27:18 -0800 (PST) Received: from localhost ([2a03:2880:25ff:5::]) by smtp.gmail.com with ESMTPSA id 00721157ae682-793c68312adsm12088897b3.33.2026.01.16.11.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 11:27:18 -0800 (PST) From: Joshua Hahn To: Andrew Morton Cc: David Hildenbrand , Muchun Song , Oscar Salvador , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kernel-team@meta.com Subject: [PATCH v2 1/2] mm/hugetlb: Remove unnecessary if condition Date: Fri, 16 Jan 2026 14:27:15 -0500 Message-ID: <20260116192717.1600049-1-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit if (map_chg) is always true, since it is nested in another if statement which checks for map_chg == MAP_CHG_NEEDED, which is equal to 1. if (unlikely(map_chg == MAP_CHG_NEEDED && retval == 0)) { ... if (map_chg) { ... } } Remove the check, un-indent, and collapse the function call for readability. No functional change intended. Acked-by: David Hildenbrand (Red Hat) Reviewed-by: SeongJae Park Signed-off-by: Joshua Hahn --- v1 --> v2: - Collapse the "folio" argument into the line above, as suggested by Andrew and SeongJae. - Explicitly note that MAP_CHG_NEEDED == 1, as suggested by David. - Collect signatures. mm/hugetlb.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 5a147026633f..2e5592c5cbb2 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3028,13 +3028,10 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, rsv_adjust = hugepage_subpool_put_pages(spool, 1); hugetlb_acct_memory(h, -rsv_adjust); - if (map_chg) { - spin_lock_irq(&hugetlb_lock); - hugetlb_cgroup_uncharge_folio_rsvd( - hstate_index(h), pages_per_huge_page(h), - folio); - spin_unlock_irq(&hugetlb_lock); - } + spin_lock_irq(&hugetlb_lock); + hugetlb_cgroup_uncharge_folio_rsvd( + hstate_index(h), pages_per_huge_page(h), folio); + spin_unlock_irq(&hugetlb_lock); } } -- 2.47.3