From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 42DDC20ADEE for ; Thu, 6 Mar 2025 12:59:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741265953; cv=none; b=sLqeQfA7muSaUqyqrPcKk/lrCcH9H22Csu6tXa+Xoux13MaGbJCkhvttGe/65+4UU1XqSjYieZCCfjRhS1NnH4OHzBY/4uV6v55SXaJPYOOqEnhnQrnIltAwQcWjk/a7b883xvPGpw4ImT62R/v7mgw7Ox7Uma7Iq8I/EPUIXYs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741265953; c=relaxed/simple; bh=kJBYGqMal4SxF/NThbJ6HtgUX9RxgEeASg7l2eu9jHs=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HenKQ1snJ2cydpiego0sAfPOSz3dKsYg34SynYqksD6y5BbxJz+IYBUyvLLRngHob5Jz+b+TmgA9Qc/7IOpGd3ngRj64hdeb5/JY7N8kps9ukb8ApBDPtOnKxckYOjPnjClRyz8LKP9SYmrrcY93rmdrbV+xpQ+aeER+U5NFx74= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6BA601007; Thu, 6 Mar 2025 04:59:23 -0800 (PST) Received: from [10.1.37.172] (XHFQ2J9959.cambridge.arm.com [10.1.37.172]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8C60B3F673; Thu, 6 Mar 2025 04:59:09 -0800 (PST) Message-ID: <86d241b1-a8a8-4e12-be5a-4e2a0a9bbcd7@arm.com> Date: Thu, 6 Mar 2025 12:59:08 +0000 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 6.13 100/157] arm64: hugetlb: Fix huge_ptep_get_and_clear() for non-present ptes Content-Language: en-GB To: Greg Kroah-Hartman Cc: Jiri Slaby , stable@vger.kernel.org, patches@lists.linux.dev, Catalin Marinas , Will Deacon References: <20250305174505.268725418@linuxfoundation.org> <20250305174509.330888653@linuxfoundation.org> <44400ac2-4c46-498c-a5d1-5a0441dd5571@kernel.org> <4d1cfbc1-0bae-4d3a-a3c5-fb3668b14ae6@arm.com> <2025030612-polio-handclasp-49f8@gregkh> From: Ryan Roberts In-Reply-To: <2025030612-polio-handclasp-49f8@gregkh> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 06/03/2025 11:57, Greg Kroah-Hartman wrote: > On Thu, Mar 06, 2025 at 11:49:15AM +0000, Ryan Roberts wrote: >> On 06/03/2025 08:08, Jiri Slaby wrote: >>> On 06. 03. 25, 9:07, Jiri Slaby wrote: >>>> On 05. 03. 25, 18:48, Greg Kroah-Hartman wrote: >>>>> 6.13-stable review patch.  If anyone has any objections, please let me know. >>>>> >>>>> ------------------ >>>>> >>>>> From: Ryan Roberts >>>>> >>>>> commit 49c87f7677746f3c5bd16c81b23700bb6b88bfd4 upstream. >>> ... >>>>> @@ -401,13 +393,8 @@ pte_t huge_ptep_get_and_clear(struct mm_ >>>>>   { >>>>>       int ncontig; >>>>>       size_t pgsize; >>>>> -    pte_t orig_pte = __ptep_get(ptep); >>>>> - >>>>> -    if (!pte_cont(orig_pte)) >>>>> -        return __ptep_get_and_clear(mm, addr, ptep); >>>>> - >>>>> -    ncontig = find_num_contig(mm, addr, ptep, &pgsize); >>>>> +    ncontig = num_contig_ptes(sz, &pgsize); >>>> >>>> >>>> This fails to build: >>>> >>>> /usr/bin/gcc-current/gcc (SUSE Linux) 14.2.1 20250220 [revision >>>> 9ffecde121af883b60bbe60d00425036bc873048] >>>> /usr/bin/aarch64-suse-linux-gcc (SUSE Linux) 14.2.1 20250220 [revision >>>> 9ffecde121af883b60bbe60d00425036bc873048] >>>> run_oldconfig.sh --check... PASS >>>> Build...                    FAIL >>>> + make -j48 -s -C /dev/shm/kbuild/linux.34170/current ARCH=arm64 HOSTCC=gcc >>>> CROSS_COMPILE=aarch64-suse-linux- clean >>>> arch/arm64/mm/hugetlbpage.c:397:35: error: 'sz' undeclared (first use in this >>>> function); did you mean 's8'? >>>>        |                                   s8 >>>> arch/arm64/mm/hugetlbpage.c:397:35: note: each undeclared identifier is >>>> reported only once for each function it appears in >>>> make[4]: *** [scripts/Makefile.build:197: arch/arm64/mm/hugetlbpage.o] Error 1 >>> >>> It looks like the stable tree is missing this pre-req: >>> commit 02410ac72ac3707936c07ede66e94360d0d65319 >>> Author: Ryan Roberts >>> Date:   Wed Feb 26 12:06:51 2025 +0000 >>> >>>     mm: hugetlb: Add huge page size param to huge_ptep_get_and_clear() >> >> Although this patch is marked for stable there was a conflict so it wasn't >> applied. I'll try to get the backport done in the next few days. > > I'll just drop this one now, can you send me the backports for both of > these when they are ready? Yep will do. > > thanks, > > greg k-h