From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 25C7213C9A3 for ; Thu, 13 Jun 2024 07:56:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718265394; cv=none; b=GnjlS9NZCRzrQ4/36uyV3DsSfFrxmu4dcHhkg2h+/dywvVb+hG314DMBHaYsbv8w1OAwlNUVQFvV7c9490a323bQ36zE8JNYQkTdBWFbBHRjkrVW3CEWi7tSVQBcZquueetDO9k2PQHWi+IpwMTJCmFtl3SfwZPH2rX5Ohj87Q0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718265394; c=relaxed/simple; bh=GkQ7FXFT6Heth8/fyriOGYbqmtBLYPOrsQ2wdqEMWTI=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=QAsSDaMrhZfsmDKK2lAE2XXw213LZLJ5WbDgD9iIyePOGAbkoGhc1dT1GHwUc18uwR9q9aFULzr9bb2kh0yRDA3Vq6CYSPrJXGJkCr38GG67J3cpidg2ZnReDsEKhajDr+//+m0NmRic+s4cfRJivcXNDmSFi2gYSB+KJoxh/ig= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=m1U7Tb99; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="m1U7Tb99" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C6C3C2BBFC; Thu, 13 Jun 2024 07:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718265394; bh=GkQ7FXFT6Heth8/fyriOGYbqmtBLYPOrsQ2wdqEMWTI=; h=Subject:To:Cc:From:Date:From; b=m1U7Tb99ajFXeHyU2RYKxYhf1HJRrDONvKx9uTWcFwbtbHlCiX9IUWAcCS7M3XN5b Y/Mvc1RjDNHTYlwUi3IGHi6eFT/E/qs7+BFRKFn+M1YpJwv4VDBi1TcIE/JRPtYGiO vz3tPFOWLu9a1qQsN1bPsCEvKZNBSzLaAx53K/iY= Subject: FAILED: patch "[PATCH] selftests/mm: compaction_test: fix incorrect write of zero to" failed to apply to 6.1-stable tree To: dev.jain@arm.com,akpm@linux-foundation.org,anshuman.khandual@arm.com,shuah@kernel.org,sjayaram@akamai.com,stable@vger.kernel.org Cc: From: Date: Thu, 13 Jun 2024 09:56:31 +0200 Message-ID: <2024061331-these-daunting-6dba@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 9ad665ef55eaad1ead1406a58a34f615a7c18b5e # git commit -s git send-email --to '' --in-reply-to '2024061331-these-daunting-6dba@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 9ad665ef55ea ("selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9ad665ef55eaad1ead1406a58a34f615a7c18b5e Mon Sep 17 00:00:00 2001 From: Dev Jain Date: Tue, 21 May 2024 13:13:57 +0530 Subject: [PATCH] selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages Currently, the test tries to set nr_hugepages to zero, but that is not actually done because the file offset is not reset after read(). Fix that using lseek(). Link: https://lkml.kernel.org/r/20240521074358.675031-3-dev.jain@arm.com Fixes: bd67d5c15cc1 ("Test compaction of mlocked memory") Signed-off-by: Dev Jain Cc: Cc: Anshuman Khandual Cc: Shuah Khan Cc: Sri Jayaramappa Signed-off-by: Andrew Morton diff --git a/tools/testing/selftests/mm/compaction_test.c b/tools/testing/selftests/mm/compaction_test.c index 0b249a06a60b..5e9bd1da9370 100644 --- a/tools/testing/selftests/mm/compaction_test.c +++ b/tools/testing/selftests/mm/compaction_test.c @@ -108,6 +108,8 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size) goto close_fd; } + lseek(fd, 0, SEEK_SET); + /* Start with the initial condition of 0 huge pages*/ if (write(fd, "0", sizeof(char)) != sizeof(char)) { ksft_print_msg("Failed to write 0 to /proc/sys/vm/nr_hugepages: %s\n",