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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 6BD69C433E3 for ; Fri, 31 Jul 2020 09:18:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2F2F122BF3 for ; Fri, 31 Jul 2020 09:18:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZZeBuEgU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F2F122BF3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C3CCE8D001A; Fri, 31 Jul 2020 05:18:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BEBB38D000B; Fri, 31 Jul 2020 05:18:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB5F78D001A; Fri, 31 Jul 2020 05:18:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0054.hostedemail.com [216.40.44.54]) by kanga.kvack.org (Postfix) with ESMTP id 965328D000B for ; Fri, 31 Jul 2020 05:18:55 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 4AF80181AEF09 for ; Fri, 31 Jul 2020 09:18:55 +0000 (UTC) X-FDA: 77097821430.14.size95_470fea726f82 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 2000218229818 for ; Fri, 31 Jul 2020 09:18:55 +0000 (UTC) X-HE-Tag: size95_470fea726f82 X-Filterd-Recvd-Size: 8755 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Fri, 31 Jul 2020 09:18:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596187133; 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=Nm9hdEOPm77EQVaUlUcV47hpK3bGj715U/FFPYWuGso=; b=ZZeBuEgUYjXSWjYP/P6h1kUXu8NJw4rU3JXgs6L2VecooPeHsavx0kHPz1RGhKS+H92HcV uCmeNxmOstP7aZeN5RKu0pnyFnEeq8sVJtrGB8MTtgz84DYoXb+1vfWOe2yluc9bmyJe4I AEfUVSdIGNMnmjn4Tg5PO91+cXxb0ZE= 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-423-eybjEKR1P9C14MolFOWKEA-1; Fri, 31 Jul 2020 05:18:51 -0400 X-MC-Unique: eybjEKR1P9C14MolFOWKEA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D2E6101C8A7; Fri, 31 Jul 2020 09:18:50 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-22.ams2.redhat.com [10.36.113.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 564781A835; Fri, 31 Jul 2020 09:18:47 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org, linux-mm@kvack.org, linux-hyperv@vger.kernel.org, xen-devel@lists.xenproject.org, David Hildenbrand , Andrew Morton , Michal Hocko , Dan Williams , Jason Gunthorpe , Kees Cook , Ard Biesheuvel , Wei Yang Subject: [PATCH RFCv1 1/5] kernel/resource: make release_mem_region_adjustable() never fail Date: Fri, 31 Jul 2020 11:18:34 +0200 Message-Id: <20200731091838.7490-2-david@redhat.com> In-Reply-To: <20200731091838.7490-1-david@redhat.com> References: <20200731091838.7490-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Rspamd-Queue-Id: 2000218229818 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 Content-Transfer-Encoding: quoted-printable 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: Let's make sure splitting a resource on memory hotunplug will never fail. This will become more relevant once we merge selected system ram resources - then, we'll trigger that case more often un memory unplug. In general, this function is already unlikely to fail. When we remove memory, we free up quite a lot of metadata (memmap, page tables, memory block device, etc.). All other error cases inside release_mem_region_adjustable() seem to be sanity checks if the function would be abused in different context - let's add WARN_ON_ONCE(). Cc: Andrew Morton Cc: Michal Hocko Cc: Dan Williams Cc: Jason Gunthorpe Cc: Kees Cook Cc: Ard Biesheuvel Cc: Wei Yang Signed-off-by: David Hildenbrand --- include/linux/ioport.h | 4 ++-- kernel/resource.c | 49 ++++++++++++++++++++++++------------------ mm/memory_hotplug.c | 22 +------------------ 3 files changed, 31 insertions(+), 44 deletions(-) diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 6c2b06fe8beb7..52a91f5fa1a36 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -248,8 +248,8 @@ extern struct resource * __request_region(struct reso= urce *, extern void __release_region(struct resource *, resource_size_t, resource_size_t); #ifdef CONFIG_MEMORY_HOTREMOVE -extern int release_mem_region_adjustable(struct resource *, resource_siz= e_t, - resource_size_t); +extern void release_mem_region_adjustable(struct resource *, resource_si= ze_t, + resource_size_t); #endif =20 /* Wrappers for managed devices */ diff --git a/kernel/resource.c b/kernel/resource.c index 841737bbda9e5..249c6b54014de 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1255,21 +1255,28 @@ EXPORT_SYMBOL(__release_region); * assumes that all children remain in the lower address entry for * simplicity. Enhance this logic when necessary. */ -int release_mem_region_adjustable(struct resource *parent, - resource_size_t start, resource_size_t size) +void release_mem_region_adjustable(struct resource *parent, + resource_size_t start, resource_size_t size) { + struct resource *new_res =3D NULL; + bool alloc_nofail =3D false; struct resource **p; struct resource *res; - struct resource *new_res; resource_size_t end; - int ret =3D -EINVAL; =20 end =3D start + size - 1; - if ((start < parent->start) || (end > parent->end)) - return ret; + if (WARN_ON_ONCE((start < parent->start) || (end > parent->end))) + return; =20 - /* The alloc_resource() result gets checked later */ - new_res =3D alloc_resource(GFP_KERNEL); + /* + * We free up quite a lot of memory on memory hotunplug (esp. memap), + * just before releasing the region. This is highly unlikely to + * fail - let's play save and make it never fail as the caller cannot + * perform any error handling (e.g., trying to re-add memory will fail + * similarly). + */ +retry: + new_res =3D alloc_resource(GFP_KERNEL | alloc_nofail ? __GFP_NOFAIL : 0= ); =20 p =3D &parent->child; write_lock(&resource_lock); @@ -1295,7 +1302,6 @@ int release_mem_region_adjustable(struct resource *= parent, * so if we are dealing with them, let us just back off here. */ if (!(res->flags & IORESOURCE_SYSRAM)) { - ret =3D 0; break; } =20 @@ -1312,20 +1318,23 @@ int release_mem_region_adjustable(struct resource= *parent, /* free the whole entry */ *p =3D res->sibling; free_resource(res); - ret =3D 0; } else if (res->start =3D=3D start && res->end !=3D end) { /* adjust the start */ - ret =3D __adjust_resource(res, end + 1, - res->end - end); + WARN_ON_ONCE(__adjust_resource(res, end + 1, + res->end - end)); } else if (res->start !=3D start && res->end =3D=3D end) { /* adjust the end */ - ret =3D __adjust_resource(res, res->start, - start - res->start); + WARN_ON_ONCE(__adjust_resource(res, res->start, + start - res->start)); } else { - /* split into two entries */ + /* split into two entries - we need a new resource */ if (!new_res) { - ret =3D -ENOMEM; - break; + new_res =3D alloc_resource(GFP_ATOMIC); + if (!new_res) { + alloc_nofail =3D true; + write_unlock(&resource_lock); + goto retry; + } } new_res->name =3D res->name; new_res->start =3D end + 1; @@ -1336,9 +1345,8 @@ int release_mem_region_adjustable(struct resource *= parent, new_res->sibling =3D res->sibling; new_res->child =3D NULL; =20 - ret =3D __adjust_resource(res, res->start, - start - res->start); - if (ret) + if (WARN_ON_ONCE(__adjust_resource(res, res->start, + start - res->start))) break; res->sibling =3D new_res; new_res =3D NULL; @@ -1349,7 +1357,6 @@ int release_mem_region_adjustable(struct resource *= parent, =20 write_unlock(&resource_lock); free_resource(new_res); - return ret; } #endif /* CONFIG_MEMORY_HOTREMOVE */ =20 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index da374cd3d45b3..258656b819dbe 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1709,26 +1709,6 @@ void try_offline_node(int nid) } EXPORT_SYMBOL(try_offline_node); =20 -static void __release_memory_resource(resource_size_t start, - resource_size_t size) -{ - int ret; - - /* - * When removing memory in the same granularity as it was added, - * this function never fails. It might only fail if resources - * have to be adjusted or split. We'll ignore the error, as - * removing of memory cannot fail. - */ - ret =3D release_mem_region_adjustable(&iomem_resource, start, size); - if (ret) { - resource_size_t endres =3D start + size - 1; - - pr_warn("Unable to release resource <%pa-%pa> (%d)\n", - &start, &endres, ret); - } -} - static int __ref try_remove_memory(int nid, u64 start, u64 size) { int rc =3D 0; @@ -1762,7 +1742,7 @@ static int __ref try_remove_memory(int nid, u64 sta= rt, u64 size) memblock_remove(start, size); } =20 - __release_memory_resource(start, size); + release_mem_region_adjustable(&iomem_resource, start, size); =20 try_offline_node(nid); =20 --=20 2.26.2