From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B74B3C4363A for ; Fri, 30 Oct 2020 02:26:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C9E720756 for ; Fri, 30 Oct 2020 02:26:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ADRI4UwZ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VRQjNPlf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C9E720756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pZBh/pzX/lwcXcdqtabyUkE5apC+s2M9NV2m4J/zd7Y=; b=ADRI4UwZ2VVLkDDuw4my4zqPq 7nkLREBvbZR6j67d+EnvbD5zR9y9ys46RqK5A8CrujNzwTxi9xR5ov9xfPS4cYhRjPgpRVtBFlxAD Gm5fSDPHgPWHtq6/YTCyEG8IVe4wQCIM1LR6miOSDq7ZdaeGk4M+FBCW+xJkm7En763Gd+lOZS5Lm PaPGa9JEJxvGA+jq33WbPr07Q/akbtqQJqYyDAdsGHSj+SUMuOTYfdlWtAlf6essX72yEYJ1h0qxa EpN6dd1ksH3MBAxZh68XmJ+0Fpp4DRI3NrfprQbxAzF+hlCkoRXW1FrFJr/riBvv9xRBzkH3RrxGU FDVCk6WhQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYK73-0006WA-0O; Fri, 30 Oct 2020 02:25:57 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYK71-0006V7-1p for linux-arm-kernel@lists.infradead.org; Fri, 30 Oct 2020 02:25:55 +0000 Received: by mail-pg1-x541.google.com with SMTP id h6so3923207pgk.4 for ; Thu, 29 Oct 2020 19:25:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=JCLkm7+Zth9H4Ep/9Ry3oTGjaCYQs85rwFGOzKVYCKk=; b=VRQjNPlfBETExe5GPaQobkcbO046YkCjn7ALJTSm2xGUxUIkTfssU44hILw02Cbpng EVNV5kDStjHW3HcxGDGiCgm9M/BRkohA6KKR7egVZWeiarnvyJ/W9PgbvGPAgB4LCM4g hgbG6NP6UooFAUiDBzrRqcWlQ/8XthzommypmozNnvvybeZuDcb8mHxpuv1xV3pwFpr9 GE/x2xInIZnSfW2P5aZKndyngMJoBTtV5a5BZmXXRWlw22YaS70UDZVUHsvhbxKL565j eBOhru5emoo/tgdEZY++6/YeIz/KXQHNRJ14jP6F1Gn8y7UqI/5qZ1Mx1LiV2NJ35/MF A3Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JCLkm7+Zth9H4Ep/9Ry3oTGjaCYQs85rwFGOzKVYCKk=; b=HFojMCnKx1FuII1Gs9d2rZy8uBKGcXAMnLl2hR8UlBn3MDStZfH4SSqGlI6C6lKEWe VYfAj0OhjQfynbg5qPfv8xiUA+6P8DyuC0CEPThj2B8bd0eNY4gGWr2MU/xzQmxPNlhK gNtX0K/qXG0bzwvvboJef2BYQkfhCYjdWn8yE6jg80nkpi1FCXHU+L5SJYoCy54X4N1G lAWVZvFSOGY+q04l+T5lIhb5CXXhrUeL13IFmidqKf7z4SOXzUzQtJO/IDeJ8lGf51MC 0NcUrkgNFjvbN2zCjHDnEgUz89LGaU3w5VLQqB3PxqhQPv5HRH52hMHOxQfPrLGHD57Z 85Zw== X-Gm-Message-State: AOAM532K+2ZDO4LLS14bgk/GoxhtovDgo8UGDQkLTpL9tDGrz/ehyaEp LYXnA4iMwhkKwfyyKz83uVE= X-Google-Smtp-Source: ABdhPJyZR77mJYExxhbgb+OeyOGd3G4c/Y+dd+eBIw5ZhvhyP6NOJ4RBi4lTWq9fNfq36d80tc9NAQ== X-Received: by 2002:a63:e705:: with SMTP id b5mr219910pgi.230.1604024748510; Thu, 29 Oct 2020 19:25:48 -0700 (PDT) Received: from [10.230.28.251] ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id t26sm4429198pfq.8.2020.10.29.19.25.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Oct 2020 19:25:47 -0700 (PDT) Subject: Re: [PATCH] ARM: highmem: avoid clobbering non-page aligned memory reservations To: Ard Biesheuvel , Linux ARM References: <20201029110334.4118-1-ardb@kernel.org> From: Florian Fainelli Message-ID: <013f82d6-d20f-1242-2cdd-9ea9c2ab9f9c@gmail.com> Date: Thu, 29 Oct 2020 19:25:46 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_222555_150723_73C2244E X-CRM114-Status: GOOD ( 22.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Russell King , "# 3.4.x" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 10/29/2020 4:14 AM, Ard Biesheuvel wrote: > On Thu, 29 Oct 2020 at 12:03, Ard Biesheuvel wrote: >> >> free_highpages() iterates over the free memblock regions in high >> memory, and marks each page as available for the memory management >> system. However, as it rounds the end of each region downwards, we >> may end up freeing a page that is memblock_reserve()d, resulting >> in memory corruption. So align the end of the range to the next >> page instead. >> >> Cc: >> Signed-off-by: Ard Biesheuvel >> --- >> arch/arm/mm/init.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c >> index a391804c7ce3..d41781cb5496 100644 >> --- a/arch/arm/mm/init.c >> +++ b/arch/arm/mm/init.c >> @@ -354,7 +354,7 @@ static void __init free_highpages(void) >> for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE, >> &range_start, &range_end, NULL) { >> unsigned long start = PHYS_PFN(range_start); >> - unsigned long end = PHYS_PFN(range_end); >> + unsigned long end = PHYS_PFN(PAGE_ALIGN(range_end)); >> > > Apologies, this should be > > - unsigned long start = PHYS_PFN(range_start); > + unsigned long start = PHYS_PFN(PAGE_ALIGN(range_start)); > unsigned long end = PHYS_PFN(range_end); > > > Strangely enough, the wrong version above also fixed the issue I was > seeing, but it is start that needs rounding up, not end. Is there a particular commit that you identified which could be used as Fixes: tag to ease the back porting of such a change? -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel