From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 636713B14C1 for ; Mon, 27 Jul 2026 18:12:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785175963; cv=none; b=evvvNIvm8mSLRuPs8esL7cnMA57RclEEJjhoUT7Xh/PmVCoq+R+ez0Lyg8tsb2tDICL3wS9vqYatji1m7EZqne2ZXqbk+daLC1RdzFjP8+6CwaRA5LoJ4YIUYy4HYNiBHFFrR3CsebhD86lMqOkBxpCteiJuNrSN/ehuIFIysjc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785175963; c=relaxed/simple; bh=N+mlLLFzr7ztiKmM8bSxWdkJrHAVpRDMVp+nWQYDTdU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=sWMQyXZMBSfXajZHlV7GWPZuJH8xcBy2tK0TPiVIcIjS+K+pxxEKIwjvysb3EITpKvXqAQuyWAknV58g84se7aFf0GdfkkDZjqRSMRz7sdNAs4bs7eivwzKiyn+ALn9GO3iwbmF41Yd9L0lkDBqa6+vZwt76oHnScnSKDkajVDs= 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=fsAwNkZ+; arc=none smtp.client-ip=209.85.128.45 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="fsAwNkZ+" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-495757ccbc1so28009625e9.2 for ; Mon, 27 Jul 2026 11:12:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785175961; x=1785780761; 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:content-type; bh=3wYLZ7xaCueJ0HKXGOYqw27/ElSiF4nHj9CgFbPY+D4=; b=fsAwNkZ+qPlWjeO5suv++oYKLoZmGEmgvY8f2yzqXi7dQYNrsCmyDOOYm/IKq2DIQm U4+Oic14jpeVuzPpMPQ7FeTyroHFSWMgmjoXp1W7HC/5TP2eGoPNXm8420zlNd/WVjIn GT2sq12gOjSPBltsywWSL/srau0fh6/hwagm+6eaRIyMW9uHmGw87BO1Jc6LFoKQmI2I JQ9xo4aEbURWbNtQ8T0kNRZJYpxf/pYKQvUESVawYEg07mgfz/lnFL6u9Kvc7Khdyz8W NhokOwtAbnx6s/vRDvvUMvAe/J83Tak4NS+VdVAG9ec3SRnGgRoMrv52kitlSX4Y5T6t dbBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785175961; x=1785780761; 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:content-type; bh=3wYLZ7xaCueJ0HKXGOYqw27/ElSiF4nHj9CgFbPY+D4=; b=WtUFK/32KLVNxK6/Tskhtlr6SHPp7admqTc+IJsYYM/hHFVBxDuwe2O9xwVyIxcu1Y YYzL8OE+72LokDywX7jaTuRRHdsyDZuMDB2xr+/a7erNy/0t2cLLHeu9uXRGU/mfuJtR DNhJtwTRULWGulP8Qj5OXUMUUZVD4HMSzqiPv74RYzBTrdwIFVEvVWC1mGwb4Jc9sC8Q WHj8jKl1mPMqJYarsIOBjoL2bqFGJF1wqlixVNEXBIDqc8l6CtmGFLHVNp10/cXlM3Ck sFor0DBJuL6iFQYDjEJ/zx4KzArf0qLfcalS7/mgPxkXgQd0albXnw93Oryv55Bl0tLa hERQ== X-Forwarded-Encrypted: i=1; AHgh+RquNBanmqABeFpiH+4PY3FuBCKLkbYmedVkJgNEV+skyG9P4JAN6+XdtE8pV51wekYVsb8sTsebWiStLk0=@vger.kernel.org X-Gm-Message-State: AOJu0YzakRkr0UMyrJywpcmNNruqESsh6nPjsQ38cIvU43ZYeUYfmoPv KL71Cv+JC+VhMb4T0Vrupz6uquFtxZhxMRvS/XuKYo8EksYuhND5iv2d7+cWsyc= X-Gm-Gg: AR+sD1216rIdEyEhefh7aKdkHSUdxDLtzNZt0DoxCP9z/0ljbDoPHnwHdJ2GorcNL2o 21ObaC3tpHbNCPQ0yfg1DbdqRqcwJUdQupapey68/dMhBqRB0DwdKJ1Vd8YVMnK2VTFjI1z2llG ln/l2SNzz7MKg9TNKst0wf5iBQc4AuqrH1XxkjIhFXTWI1vS3D4kExhG9oaI/oEIjQFJdSCN6WD tcJFVzQXHaJyLI6w3JOzLG1Dn08+2/NtltpgfY7TDCldqYS/394uEBj39ij/5kVHBuIkuGOLQ0s LlCT5qvu/qkkbRXc0Nk3q97eLBewFbjSAoXkE8iyAKruiOGQOC+tK7rC9PrNeY1xK2thpl50ZJF JYkj12OdJ7cr/+xBY/kC7SG7BMdwUey7n2irFbCKG86kr7WR/BrZZHZMZSrm2HvK8e+PfdiJYm8 XxT/VojBuFdcRWDyIjwnVI8Q627j8jVZedp9W3+uYogAXey8FUNMUpZ3sodHQtqNL3VrGAC4nJ8 kGhUCZ8uYY0z4BfGoWB29ncK2dMoTNO X-Received: by 2002:a05:600c:a4f:b0:493:d741:5d72 with SMTP id 5b1f17b1804b1-496b57116e2mr151773555e9.38.1785175960626; Mon, 27 Jul 2026 11:12:40 -0700 (PDT) Received: from archtop.localdomain (92-242-248-94.broadband.mtnet.hr. [92.242.248.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f85c67339sm53643668f8f.31.2026.07.27.11.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 11:12:40 -0700 (PDT) From: Jakov Novak To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , David Hildenbrand , Lorenzo Stoakes Cc: Zi Yan , Baolin Wang , "\\ Liam R . Howlett \\ " , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Usama Arif , linux-kernel-mentees@lists.linux.dev, Shuah Khan , Jakov Novak Subject: [PATCH] mm/khugepaged: replace mutex_lock/mutex_unlock usage with guard macro Date: Mon, 27 Jul 2026 20:11:36 +0200 Message-ID: <20260727181136.2542-1-jakovnovak30@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Currently, khugepaged locks the khugepaged_mutex in two functions: start_stop_khugepaged and khugepaged_min_free_kbytes_update. Remove mutex_lock/mutex_unlock usage in these functions and replace it with the guard macro. This makes the code more readable (removing a goto statement) and makes it harder to introduce bugs in the future. No functional changes introduced. Signed-off-by: Jakov Novak --- mm/khugepaged.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 617bca76db49..c583867f2e7a 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -3113,7 +3113,7 @@ int start_stop_khugepaged(void) { int err = 0; - mutex_lock(&khugepaged_mutex); + guard(mutex)(&khugepaged_mutex); if (hugepage_enabled()) { if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL, @@ -3122,7 +3122,7 @@ int start_stop_khugepaged(void) pr_err("khugepaged: kthread_run(khugepaged) failed\n"); err = PTR_ERR(khugepaged_thread); khugepaged_thread = NULL; - goto fail; + return err; } if (!list_empty(&khugepaged_scan.mm_head)) @@ -3132,17 +3132,14 @@ int start_stop_khugepaged(void) khugepaged_thread = NULL; } set_recommended_min_free_kbytes(); -fail: - mutex_unlock(&khugepaged_mutex); return err; } void khugepaged_min_free_kbytes_update(void) { - mutex_lock(&khugepaged_mutex); + guard(mutex)(&khugepaged_mutex); if (hugepage_enabled() && khugepaged_thread) set_recommended_min_free_kbytes(); - mutex_unlock(&khugepaged_mutex); } bool current_is_khugepaged(void) -- 2.55.0