Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp587891pxx; Thu, 29 Oct 2020 09:33:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyioOKf2HE0onndx3Bn14R6RbiBNQ8m66ter2pfiV+7FvLPil8//rJEk4szQTwOOPtq+/rd X-Received: by 2002:a17:906:742:: with SMTP id z2mr4752699ejb.57.1603989179776; Thu, 29 Oct 2020 09:32:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603989179; cv=none; d=google.com; s=arc-20160816; b=sfh3e3qdMR/0ybWXis1ODl9T+SHbuuOHUfqu3WJTNPE7dkDuVRZj1KFqLKHIWo4heM GwUbDh7Clmbi2cub4oCuXwUDXWRyZ/FiQ/B1VL3jT4bIbJDZig6/ydHOQgi9Q1KD3T5R UtIxom0T7Lg9lpLkcmYdhggYvJrov2Cn51OiCTFU2QVLCJV2xMxWgoQgMHkQzjC9fDIX /j/MsX5eKNiFjhPprskepti0Ab6OkTcjDLU8w9xjpH/5104JyZ1rozNtARipSoRcRGTT vJj/a30xBh4MaYfajr0o9zlW1Sq1motT58ECz8OQDcv94bTOP6gUHG1E0s+QX5lJ2onC PgHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eyjb0Fv4lc9CptBMz+do+gEYBguYa6mRp53hXC/5S2A=; b=toiztrF2a5/vfftlcmUs/lPUoSXysapQwkRQIXETbw1g/FFA6m8Mk5B+pl/ZS2cKnR I1JfYVewEwmgcxDgCEE4oml09qjFR9JzFzI7k2tYAQvVZHj2RGbo70olkquIFhdhh7GA HoQ2b0pnsiU9FYug1cMcgHfz4Jf7y70Oap6BILGTeHcnEsHo/IXVUhtVPkj6rpYNmOI7 Kf1WK1kveoqhm4gEaC84It3SmYuRKWbLYfQKh6G/vJwLQ3mlwU0RUURq+CxGt+zpKJeR JeF8FLRqx3+fGMH8JvtAj9Z8Drw2vHaALCUJLgBVYyhEgaeYGxrdjkCtW+lvlNLalweL SDHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KMuoq22z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h22si1909293ejf.69.2020.10.29.09.32.36; Thu, 29 Oct 2020 09:32:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KMuoq22z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726977AbgJ2Q1q (ORCPT + 99 others); Thu, 29 Oct 2020 12:27:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60918 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726858AbgJ2Q1m (ORCPT ); Thu, 29 Oct 2020 12:27:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603988861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eyjb0Fv4lc9CptBMz+do+gEYBguYa6mRp53hXC/5S2A=; b=KMuoq22zmOjPZzaESZhnswq7wofI6nYHdJQc5CxHoF9sN0NXumNFVK3OcHWK7JF6RLohLu 3J3MSO7jTOE6cWeaDsnZmPYVtjebtR9qYgOFvmP65bB2z6CPQjrW1MK144n1PCjD73Y9A6 ONBMZXKqTN1LaXfNHdmWv/Y2CtGykDo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-432-KpRqbABxNDijQDBsKVrb6A-1; Thu, 29 Oct 2020 12:27:39 -0400 X-MC-Unique: KpRqbABxNDijQDBsKVrb6A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C619A80B714; Thu, 29 Oct 2020 16:27:36 +0000 (UTC) Received: from t480s.redhat.com (ovpn-112-181.ams2.redhat.com [10.36.112.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EC1E5C1C4; Thu, 29 Oct 2020 16:27:33 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, David Hildenbrand , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Rashmica Gupta , Andrew Morton , Mike Rapoport , Michal Hocko , Oscar Salvador , Wei Yang Subject: [PATCH v1 3/4] powerpc/mm: remove linear mapping if __add_pages() fails in arch_add_memory() Date: Thu, 29 Oct 2020 17:27:17 +0100 Message-Id: <20201029162718.29910-4-david@redhat.com> In-Reply-To: <20201029162718.29910-1-david@redhat.com> References: <20201029162718.29910-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let's revert what we did in case seomthing goes wrong and we return an error. Cc: Michael Ellerman Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Rashmica Gupta Cc: Andrew Morton Cc: Mike Rapoport Cc: Michal Hocko Cc: Oscar Salvador Cc: Wei Yang Signed-off-by: David Hildenbrand --- arch/powerpc/mm/mem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 685028451dd2..69b3e8072261 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -165,7 +165,10 @@ int __ref arch_add_memory(int nid, u64 start, u64 size, rc = arch_create_linear_mapping(nid, start, size, params); if (rc) return rc; - return __add_pages(nid, start_pfn, nr_pages, params); + rc = __add_pages(nid, start_pfn, nr_pages, params); + if (rc) + arch_remove_linear_mapping(start, size); + return rc; } void __ref arch_remove_memory(int nid, u64 start, u64 size, -- 2.26.2