From patchwork Wed Jul 4 13:18:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10506879 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B45EE601D7 for ; Wed, 4 Jul 2018 13:18:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5C3528E00 for ; Wed, 4 Jul 2018 13:18:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A20828E27; Wed, 4 Jul 2018 13:18:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C92C28E00 for ; Wed, 4 Jul 2018 13:18:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A7116B0271; Wed, 4 Jul 2018 09:18:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 831A66B0273; Wed, 4 Jul 2018 09:18:29 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A98A6B0272; Wed, 4 Jul 2018 09:18:29 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f71.google.com (mail-wm0-f71.google.com [74.125.82.71]) by kanga.kvack.org (Postfix) with ESMTP id 07C4F6B026F for ; Wed, 4 Jul 2018 09:18:29 -0400 (EDT) Received: by mail-wm0-f71.google.com with SMTP id b203-v6so2083144wme.2 for ; Wed, 04 Jul 2018 06:18:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=1Y1449rGesiQt9zXydOvgcPzmSSvQavBm4gBTNTW63M=; b=Yq47+F1nhPJ6/LBwPb3GjaClyX4kWfmHyUMKpP7tO27aGQ8zPCqHi7Cczx4239ES6n wZZEvlb8ykpGg3ECIMvKlWZDL5GgUArikoTV5B9C/ccL9FRiypKALZbaXbjn7SbKz5uf vd5hJy4N8pTEiRr3s3DUrVhG1/kOOuKARmHshURv4gF+Pgp1/kz5uNu0IeKbvLkpw2ko erriR7cpDLeG9aBQxV4vdwvUey0Zjvt0mrT5YmaFj2yZ7oCpEbo5N4yosf0RZUKLh8ud HdEa0myWQvvOfCskw5V4+79Di1GYJrcw9eB1q2VSUyaYfHTgPW9bEQdVfhKTeVn7BgoO 8zXA== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: APt69E0yl7qQs/1e+bV2aV0LEbNZXo/6tvFHz+tWrzJefOJvIYVptkBz UrlpsFdEvC4W7oyiejC03zs4geDUW3wfhx6TXyIy0yKoycc7Jv9KqM7eed3G1U1xhJkgLgJD0OI 7ba8wq/tQdz0/bpXv3t07N/6WK9sOwxx4bnCSdk1qTnppSRvHOvqF13b2GuK9Rr4= X-Received: by 2002:a1c:2905:: with SMTP id p5-v6mr1622021wmp.78.1530710308568; Wed, 04 Jul 2018 06:18:28 -0700 (PDT) X-Google-Smtp-Source: AAOMgpefDS/O88kTNZqmbG4P2/J+alSPmm6DnVfxylzChMF1/FZhpQkcYMoyKZle6CuYqQV7rTCP X-Received: by 2002:a1c:2905:: with SMTP id p5-v6mr1621985wmp.78.1530710307728; Wed, 04 Jul 2018 06:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530710307; cv=none; d=google.com; s=arc-20160816; b=JP4R2w8l2+xr9ex3xSxLBuHWhvyMYpQ+wuC+H5vGVrNbHS29pa2MPTaweckN2MO0cJ Gjinz7bLh3yoIjo1suAuPjF8RIWQfxTYHC0cwf8m7CHCgngQpMNVYDTzsgA2pyzbGKeA dRn1T7bEjTp/NNIn6Wwxqaxya/PiPPtnOsVDAnf3iNhQ4c+JAb5KnpszlUVhpoc5jXhx ohQsfskNvnUzEeAwmcFEHZTda4kCOn0HiMQT3Jli1IEI/k7209N75TMbt9At2L8b5v+X tYBuS/2gngxFS1m95Usk0mb/+xtEw8W2s07W4lPBgoyZVX1R8I28XakvyCxDEw6sYo46 ziUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=1Y1449rGesiQt9zXydOvgcPzmSSvQavBm4gBTNTW63M=; b=UljqJTSSHws0IHJB8e+IAruh9Q4XaQfUuvM5+vFAkYbuttEEro8CbxlE7lv1pEk6mG hwRxqRVbOS8GTNDfTKWASqGXtB9fw4Ty9idRa8TAc9cCwV0f+9XwZx3rJ/JMIiLxdXms CSgiL/qJmGFbUJCGIQI8kmOqCHqe1S2ChwO7nzEzi8FHL1GARXZQOqVXEhceZKhPY/1Q 6MQMlEMIERmc3hR71gC/di2EN5gWammcGIvF27OsfYrwFK+w3o+EHP2TEJy2WVLg0bwc G3W5OtH9U/DA5CC6uKe1Eo9SGrrtx8Wzoo8TDFCj1MI210WE7152ETRK4xlz3rwxFWJf /kDg== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id l1-v6si1660451wre.114.2018.07.04.06.18.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jul 2018 06:18:27 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w64D9C6V045405 for ; Wed, 4 Jul 2018 09:18:26 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2k0wb5mk99-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 04 Jul 2018 09:18:26 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Jul 2018 14:18:24 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 4 Jul 2018 14:18:21 +0100 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w64DIKkW30277830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 4 Jul 2018 13:18:20 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D3D805204F; Wed, 4 Jul 2018 16:18:45 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.160]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 41A0A5204E; Wed, 4 Jul 2018 16:18:44 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 04 Jul 2018 16:18:18 +0300 From: Mike Rapoport To: Ley Foon Tan Cc: Rob Herring , Frank Rowand , Michal Hocko , nios2-dev@lists.rocketboards.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH 1/3] of: ignore sub-page memory regions Date: Wed, 4 Jul 2018 16:18:13 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530710295-10774-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1530710295-10774-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18070413-0028-0000-0000-000002D822C7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18070413-0029-0000-0000-0000238FAA64 Message-Id: <1530710295-10774-2-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-04_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807040152 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Memory region size is rounded down to page boundary and with sub-page region it becomes 0 and there is no point to add an empty region. Moreover, when the base is less than PAGE_SIZE we get a bogus size as (base + size - 1) evaluates to -1. The commit 8cccffc52694 ("of: check for size < 0 after rounding in early_init_dt_add_memory_arch") introduced a test for wrap around for the case when base is not page aligned, the same test can be used to ignore sub-page region sizes. Signed-off-by: Mike Rapoport --- drivers/of/fdt.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 6da20b9..e866745 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1134,12 +1134,13 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) { const u64 phys_offset = MIN_MEMBLOCK_ADDR; + if (size < PAGE_SIZE - (base & ~PAGE_MASK)) { + pr_warn("Ignoring memory block 0x%llx - 0x%llx\n", + base, base + size); + return; + } + if (!PAGE_ALIGNED(base)) { - if (size < PAGE_SIZE - (base & ~PAGE_MASK)) { - pr_warn("Ignoring memory block 0x%llx - 0x%llx\n", - base, base + size); - return; - } size -= PAGE_SIZE - (base & ~PAGE_MASK); base = PAGE_ALIGN(base); }