From patchwork Wed Apr 24 10:25:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 10914459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 640D01515 for ; Wed, 24 Apr 2019 10:25:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 546DA28A72 for ; Wed, 24 Apr 2019 10:25:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 487D728A74; Wed, 24 Apr 2019 10:25:48 +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 2F19628A6D for ; Wed, 24 Apr 2019 10:25:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23D156B0008; Wed, 24 Apr 2019 06:25:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1CDDB6B000C; Wed, 24 Apr 2019 06:25:44 -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 EC1B76B000D; Wed, 24 Apr 2019 06:25:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by kanga.kvack.org (Postfix) with ESMTP id C443E6B0008 for ; Wed, 24 Apr 2019 06:25:43 -0400 (EDT) Received: by mail-qk1-f197.google.com with SMTP id t67so10206163qkd.15 for ; Wed, 24 Apr 2019 03:25:43 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=Sstr/K0HceJCPLq+MhzSzTpSmFovLaEMCGEENQ8I26Y=; b=Y3t1sShMXfhDhJ9Gao9GtLePmNMkE5oAAJZaAZ7F5nzE1cuSnI8dKsOdN7QnrCeZ/N 4DO2h4AjaWr6mG6DYo7WQtU3SB4QmL0eDd2oG2Z8lXRcsBRcPAsXwLH6wRub3G9EJKmC 45mnM3kRMV2CyjOpfRzM5QRxFB8SMs/oD36v+xfO1wJoLAQ3A9OVSN9+KTafIg73gN7V /pKZr9fgpnTuEVluCgZqFzi0nL/jerVRFtaH1PZVV3FMMY0eSYqiQNqjKSyunak0/uq7 E4Yo6JPstzX5BVTInn9GzPB9VQNW78rRB7QuIAGsab8nRcT8yJ0vS4prXqhu7j9zXxw6 //Wg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAUSbd/MPDrBVmNP74ZMaMXrSsLdyv/aXyaPOrtvPKzS5n5kw5sZ vKMnM7+nJ/c9miRMeOsmPSvz/8OSkTE77ghKArji8Fv4zQgimD6f8Ejk1ulACCebJW6mYju0Rvm JmrskqqRW68J5KXlGJUKkClzpdZkDI5oiac7pxELKUY5lqiBp2t1sT3fKicc8LMIU7g== X-Received: by 2002:ac8:74d6:: with SMTP id j22mr5135052qtr.144.1556101543583; Wed, 24 Apr 2019 03:25:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqx64zuXMgoeTF83FCEa5ZmbEVOjuJzIVFNxwHgDZuvW3jAXEEjW15E0g212YPwys2UeH6Qb X-Received: by 2002:ac8:74d6:: with SMTP id j22mr5135012qtr.144.1556101543004; Wed, 24 Apr 2019 03:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556101542; cv=none; d=google.com; s=arc-20160816; b=OVI8mQ1fpCGR5yIgdgFP9fqxj2y3YdUZ8gE6pWvd/C5SpBHgf7vc1b1bOOxM40iZPk bMgZI2t9Onn1hNIKgaXHCp52sBGk4p/QjQcmMh5e1UCrAl1q+uXzhHsvML8mlxmpDhGl aQhndjX/z8hXKcEDqNjztl+13zX9tYgS9xzMuppDngCropgWEmEVidXevGfwOtV7m03T M1bqQktDbtiRMV+/dcaBt8VjqaRRB/U4aX8ik8l/1KlKwBEB1CQHRcMvXtLksU2jcp20 7rOXw8vm+oX1WQz6jlCRVmEwfqS5k7Ih9By+l6IkJq2CIZ2GePeA/XOFaWfJn2hyuLGP enJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Sstr/K0HceJCPLq+MhzSzTpSmFovLaEMCGEENQ8I26Y=; b=Z6MV9KiHtq3CiZFzAFfaNhqffqn15PsgOWfGZWLj/M7XFCNB/Z/B+4OOYZVbpt9IQk +dGmMMzv/KkYUe1ASgXeaja4bJ5pA2B1/evACrDXtK2mEdQDHoDqrS8dC8nARTBYiisO ZczvyxuA1xjaMnMhzKOU03cPj+EZKO6Lu1jSrphpP4gljcDfXCVKipQyVHBnPtHMSoYv i8uHxCrPd33BZGzVQQT9BDLt5q89TV4ySerIuQjiXORYGqcJexr3u46bFI2D97UFcOmC tWHeLqklF141y5898127TsvSa6UVrD9c240IsdBe1FSI2g8ehw+i7Tmif8SiIeLiMjtA bL7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id c9si4814226qte.102.2019.04.24.03.25.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 03:25:42 -0700 (PDT) Received-SPF: pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D2062D6A11; Wed, 24 Apr 2019 10:25:42 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6357E600C1; Wed, 24 Apr 2019 10:25:39 +0000 (UTC) From: David Hildenbrand To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, akpm@linux-foundation.org, Dan Williams , David Hildenbrand , Martin Schwidefsky , Heiko Carstens , Michal Hocko , Mike Rapoport , Vasily Gorbik , Oscar Salvador Subject: [PATCH v1 2/7] s390x/mm: Implement arch_remove_memory() Date: Wed, 24 Apr 2019 12:25:06 +0200 Message-Id: <20190424102511.29318-3-david@redhat.com> In-Reply-To: <20190424102511.29318-1-david@redhat.com> References: <20190424102511.29318-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 24 Apr 2019 10:25:42 +0000 (UTC) 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 Will come in handy when wanting to handle errors after arch_add_memory(). Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Andrew Morton Cc: Michal Hocko Cc: Mike Rapoport Cc: David Hildenbrand Cc: Vasily Gorbik Cc: Oscar Salvador Signed-off-by: David Hildenbrand --- arch/s390/mm/init.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 31b1071315d7..2636d62df04e 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -237,12 +237,13 @@ int arch_add_memory(int nid, u64 start, u64 size, void arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap) { - /* - * There is no hardware or firmware interface which could trigger a - * hot memory remove on s390. So there is nothing that needs to be - * implemented. - */ - BUG(); + unsigned long start_pfn = start >> PAGE_SHIFT; + unsigned long nr_pages = size >> PAGE_SHIFT; + struct zone *zone; + + vmem_remove_mapping(start, size); + zone = page_zone(pfn_to_page(start_pfn)); + __remove_pages(zone, start_pfn, nr_pages, altmap); } #endif #endif /* CONFIG_MEMORY_HOTPLUG */