From patchwork Tue Jul 3 17:05:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10504775 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 C2B636035E for ; Tue, 3 Jul 2018 17:05:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABA5327852 for ; Tue, 3 Jul 2018 17:05:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F8112836F; Tue, 3 Jul 2018 17:05:56 +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 0F46B27852 for ; Tue, 3 Jul 2018 17:05:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0033D6B026A; Tue, 3 Jul 2018 13:05:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ECEEA6B026B; Tue, 3 Jul 2018 13:05:54 -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 D972B6B026C; Tue, 3 Jul 2018 13:05:54 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id 97A986B026A for ; Tue, 3 Jul 2018 13:05:54 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id c2-v6so1169969edi.20 for ; Tue, 03 Jul 2018 10:05:54 -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:message-id; bh=tZ9et+VQPA7JNkGsgg1U7+yqcWgwSa4PyF6j1zlPrTE=; b=cBNvOcliEE9nLopM7RHPbjuRb4I0vCtYKsdj5pa9hW7HjDhCKo4+0Fu4WBMzG5KCc/ 5I83PTXkPM3BwA2YvLqYfi3lWqBN0jACZCQYGluFLijh9EXhNEOCVIWMHE5ZTIIseSdE 3sgGFyyQPKh+k0RmcY1cD7DDqdR9LzQny8EykdbwFywjeYZl64b/PyIAOTecB5lLlrTA 9YDdISrDVCFowgKqCCFIlVXmokRHqcThIVlZuey5/aP93mjgnJ+LarZU0Fd8fVMKu0+R v6YtBICLTh0zFvjijAGK3FKcrpK1x0jNtpeJxWCF1piRkdqyqsxDBzF+IplgAYl/Yw/3 sWmw== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 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: APt69E2fhtQrHdcr1PZcb2WGJuC24F/KJv0J+P+gvkpJ9mpusun4R3gI 6KPcwQ9k6kAKA/V+8S55ND/DedbDunh243Ngw7CAI4lhCt2WmZbi/dgbR80hbiKuG8MwRDGn3vO EjHEiJ4AWWQVN+2aAKA0A/ApkWkyfPTVdIacVzLMZWsx4+1rpQDyoX64MNrWK3IU= X-Received: by 2002:a50:8466:: with SMTP id 93-v6mr29691766edp.304.1530637554150; Tue, 03 Jul 2018 10:05:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfszzsQNnk0IKkXBs4qbXOQmReM4FTsKW+QhngDSnSPR2HHF3lpcJmW/Br5JZOlo418FQr+ X-Received: by 2002:a50:8466:: with SMTP id 93-v6mr29691676edp.304.1530637552687; Tue, 03 Jul 2018 10:05:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530637552; cv=none; d=google.com; s=arc-20160816; b=uVgUlZ2JTl3GWqN+swStGjscxUR+5hJuHxXtOOiG0bUxrLGvZjXvppciGEC+HS+K6R 38GNWwWKj5QPC/SCEQzWk/oTou5U0L1tuofiNEAM74nn4+pN0dFfBpCMNi59c2pyIhY5 IwIuiu/1qvwslY1KkXbQiTiLm8YUzUM3mz7Hs2dq4i9Aq7+3ISmRsHardwCl8wetvWmX jND8tyJvc1o/nePkAGnHTfHJrgnzjw8QDh0/CvcjIR/1t4IEUUIAfVRX3wzf7VIUxB7w MBDPcQhxGybh52m7K82o/81DZssykCrY3oDt1Rmk8NUsMPjjuREoROcn3PZGnXv/ikZ+ HpIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=tZ9et+VQPA7JNkGsgg1U7+yqcWgwSa4PyF6j1zlPrTE=; b=GEITZJD1jHsA3WYQEIj7CYaUFd4WYBAapJ/YGMFLnysVi5FjzdA0NYuQ3owA4CwWuT 7msrDBh24me1bn9W5mi960Zecd6bUimsfXR6c1N9jK/6nmI6o88FmSBK1i5C22JkZjZH IfFtlluizOiuqsPWcpKBeJBoNQiGr57/OoTTfPfDB3VK1xL7QSA73gqhybQMSteZiLiq SfSLZYjc2fui872Fd7x+YuC8Z6SKxkAwll3E/pp5KbEDBh5mpOvYvY2HStKX0KM4cvrY gVryWN0kI9kzWPObqmBF/4pmIU8g48hmYC5YGt8iOQyubYsf78vM9u/ECFFniwR4P4fr 9IrA== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.156.1 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 (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id n12-v6si1432217edr.216.2018.07.03.10.05.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 10:05:52 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.156.1; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 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 (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w63H5hk2000669 for ; Tue, 3 Jul 2018 13:05:50 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2k0bhq4mn4-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 03 Jul 2018 13:05:49 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 3 Jul 2018 18:05:14 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 3 Jul 2018 18:05:11 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w63H5AQB44105894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 3 Jul 2018 17:05:10 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D6006AE056; Tue, 3 Jul 2018 20:05:12 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 43D1BAE051; Tue, 3 Jul 2018 20:05:11 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.206.209]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Tue, 3 Jul 2018 20:05:11 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Tue, 03 Jul 2018 20:05:07 +0300 From: Mike Rapoport To: Andrew Morton Cc: linux-mm , lkml , Mike Rapoport , Michal Hocko , Matthew Wilcox Subject: [PATCH] mm/memblock: replace u64 with phys_addr_t where appropriate Date: Tue, 3 Jul 2018 20:05:06 +0300 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 x-cbid: 18070317-0012-0000-0000-000002865FCD X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18070317-0013-0000-0000-000020B7DD86 Message-Id: <1530637506-1256-1-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-03_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=583 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807030194 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 Most functions in memblock already use phys_addr_t to represent a physical address with __memblock_free_late() being an exception. This patch replaces u64 with phys_addr_t in __memblock_free_late() and switches several format strings from %llx to %pa to avoid casting from phys_addr_t to u64. CC: Michal Hocko CC: Matthew Wilcox Signed-off-by: Mike Rapoport Reviewed-by: Pavel Tatashin Acked-by: Michal Hocko --- mm/memblock.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 03d48d8..20ad8e9 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -330,7 +330,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type, { struct memblock_region *new_array, *old_array; phys_addr_t old_alloc_size, new_alloc_size; - phys_addr_t old_size, new_size, addr; + phys_addr_t old_size, new_size, addr, new_end; int use_slab = slab_is_available(); int *in_slab; @@ -391,9 +391,9 @@ static int __init_memblock memblock_double_array(struct memblock_type *type, return -1; } - memblock_dbg("memblock: %s is doubled to %ld at [%#010llx-%#010llx]", - type->name, type->max * 2, (u64)addr, - (u64)addr + new_size - 1); + new_end = addr + new_size - 1; + memblock_dbg("memblock: %s is doubled to %ld at [%pa-%pa]", + type->name, type->max * 2, &addr, &new_end); /* * Found space, we now need to move the array over before we add the @@ -1343,9 +1343,9 @@ void * __init memblock_virt_alloc_try_nid_raw( { void *ptr; - memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=0x%llx max_addr=0x%llx %pF\n", - __func__, (u64)size, (u64)align, nid, (u64)min_addr, - (u64)max_addr, (void *)_RET_IP_); + memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n", + __func__, (u64)size, (u64)align, nid, &min_addr, + &max_addr, (void *)_RET_IP_); ptr = memblock_virt_alloc_internal(size, align, min_addr, max_addr, nid); @@ -1380,9 +1380,9 @@ void * __init memblock_virt_alloc_try_nid_nopanic( { void *ptr; - memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=0x%llx max_addr=0x%llx %pF\n", - __func__, (u64)size, (u64)align, nid, (u64)min_addr, - (u64)max_addr, (void *)_RET_IP_); + memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n", + __func__, (u64)size, (u64)align, nid, &min_addr, + &max_addr, (void *)_RET_IP_); ptr = memblock_virt_alloc_internal(size, align, min_addr, max_addr, nid); @@ -1416,9 +1416,9 @@ void * __init memblock_virt_alloc_try_nid( { void *ptr; - memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=0x%llx max_addr=0x%llx %pF\n", - __func__, (u64)size, (u64)align, nid, (u64)min_addr, - (u64)max_addr, (void *)_RET_IP_); + memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n", + __func__, (u64)size, (u64)align, nid, &min_addr, + &max_addr, (void *)_RET_IP_); ptr = memblock_virt_alloc_internal(size, align, min_addr, max_addr, nid); if (ptr) { @@ -1426,9 +1426,8 @@ void * __init memblock_virt_alloc_try_nid( return ptr; } - panic("%s: Failed to allocate %llu bytes align=0x%llx nid=%d from=0x%llx max_addr=0x%llx\n", - __func__, (u64)size, (u64)align, nid, (u64)min_addr, - (u64)max_addr); + panic("%s: Failed to allocate %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n", + __func__, (u64)size, (u64)align, nid, &min_addr, &max_addr); return NULL; } @@ -1442,9 +1441,10 @@ void * __init memblock_virt_alloc_try_nid( */ void __init __memblock_free_early(phys_addr_t base, phys_addr_t size) { - memblock_dbg("%s: [%#016llx-%#016llx] %pF\n", - __func__, (u64)base, (u64)base + size - 1, - (void *)_RET_IP_); + phys_addr_t end = base + size - 1; + + memblock_dbg("%s: [%pa-%pa] %pF\n", + __func__, &base, &end, (void *)_RET_IP_); kmemleak_free_part_phys(base, size); memblock_remove_range(&memblock.reserved, base, size); } @@ -1460,11 +1460,11 @@ void __init __memblock_free_early(phys_addr_t base, phys_addr_t size) */ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size) { - u64 cursor, end; + phys_addr_t cursor, end; - memblock_dbg("%s: [%#016llx-%#016llx] %pF\n", - __func__, (u64)base, (u64)base + size - 1, - (void *)_RET_IP_); + end = base + size - 1; + memblock_dbg("%s: [%pa-%pa] %pF\n", + __func__, &base, &end, (void *)_RET_IP_); kmemleak_free_part_phys(base, size); cursor = PFN_UP(base); end = PFN_DOWN(base + size);