From patchwork Wed Apr 10 10:14:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 10893569 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 AAB6614DB for ; Wed, 10 Apr 2019 10:15:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 927952842A for ; Wed, 10 Apr 2019 10:15:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 829B02844C; Wed, 10 Apr 2019 10:15:02 +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 12AF5283E8 for ; Wed, 10 Apr 2019 10:15:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BF3D6B0277; Wed, 10 Apr 2019 06:15:01 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 045376B0278; Wed, 10 Apr 2019 06:15:00 -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 E4F6D6B0279; Wed, 10 Apr 2019 06:15:00 -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 BF17A6B0277 for ; Wed, 10 Apr 2019 06:15:00 -0400 (EDT) Received: by mail-qk1-f197.google.com with SMTP id g7so1534186qkb.7 for ; Wed, 10 Apr 2019 03:15:00 -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:mime-version:content-transfer-encoding; bh=NlFuMUS94v2NpXZV1dscR6EYhD7U+tt6O7E/YGeBZFI=; b=kyQZOhu7CctKwWcn79vI+3r+gEFI9hWbMSDZGFw+wP2/Ut1+ZyFNHonJSS8z726CGj i8Djqt3RyMFq7XPz5hTMNkVjzGwkMvjE5Vhby52QqBm43YdzAPtqB3daKVeoCCHSf7l3 iS05Yts9hBbcsdroN/cS5fcg53hbfZtEpQWkmXda9tuUJ+ujetG5ySeEMnnjdce0YxXl nD8j17hCcIvo27k9TygiSaQVtz7Ww7ER22FKqcLLh1O+L9qY7cYoM/h33xAZkM8jXOzU UG+WAbEGPqA04d0QEkCGravYRXITtnq+e3zEyLul/yv/Mw+CKk/DPi2sJtvEWOPZzYUs mNIw== 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: APjAAAUx0LS3XH5OGglGv8IgYdVjq493dqY17lL3aknH8/miT4twoACQ IOJbDr4RvEu6MbxIreTy44DU6qfdz+FzI9ZQddBRdZXJ8+NzaeJONI6dtKFfNWcbaLeMXl/idn0 cXB9ppWJHVLQ3a+UEO/fLfZwRsLStLUf46N2OTRHQMSmEqtg4JYyMuIm4wq7m5SmSYQ== X-Received: by 2002:a0c:9666:: with SMTP id 35mr34172042qvy.30.1554891300532; Wed, 10 Apr 2019 03:15:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxYscZGVUm4AJ6dOzogYyns97Ku8p4tgxlbE5FDNAHB/5lP2PSVRktirQxKXnz7pMbAXY/ X-Received: by 2002:a0c:9666:: with SMTP id 35mr34171982qvy.30.1554891299599; Wed, 10 Apr 2019 03:14:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554891299; cv=none; d=google.com; s=arc-20160816; b=Xcbw8tPH9DiWCTirkt2yv4CFBbT2p73tC6VTIULflvbA9sJsRKDazqD0J2bFbccNk6 T63t1OeDKJ6U+dJvc8mULPXsClLq0m2rhUU5J7FXeJlUAofDXTqn/p5TFhMuiCvWpj7e T6KvyruuNcB3rVkFujlVWfr/DrmoUax4zq8VKDaA4kFrDqxm+tFAHYrs5tW4ZttP7eoj 44iXQpBwwMMkEavI9JQd47X1Y2XU/WI+SIE+3dhXEs5FoODNZPBYYBrzi3mZebGafy8D S5oJk/JCSPJGiQnECO+47jm+bfLN54KPHmS760uj7wIxgpYog4Q54gB4isapverhgeXP d+AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=NlFuMUS94v2NpXZV1dscR6EYhD7U+tt6O7E/YGeBZFI=; b=GWc3rjR4d1+z58fSiThrFzBS/1jIQ2nyuVstlWp/kXI2T+PUHGu9TzhHo4st7oKKrt GELgkLApjYxj6klgnQ+L4FQEv7R96SxC+fg76Xnn33h7ro8eys4tXo0F5jgZTZjzw8DY 0exDL/o20Wtzl2E4ns2FmjCwt733ShltzW6jo8y0TWJSYMRxykeyIQ4ybO1BgzIuz2Ye 7j8PzwtryX2kwdh+IU4ep0uwHUNlLSYHrE1eRVEXp7dYyAHtfYal59qEZN+7k0412vJs UauAy12aGLyo1K9h8GIjt3hlCK8KrqKT6FiCmRQsQuonb6GHJwn4aNz5fxBBR8bV10vN 7GCg== 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 i13si2561908qta.371.2019.04.10.03.14.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 03:14:59 -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-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A3C4EC01089C; Wed, 10 Apr 2019 10:14:58 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55B5917F4C; Wed, 10 Apr 2019 10:14:56 +0000 (UTC) From: David Hildenbrand To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, David Hildenbrand , Andrew Morton , Oscar Salvador , Michal Hocko , Pavel Tatashin , Wei Yang , Qian Cai , Arun KS , Mathieu Malaterre Subject: [PATCH] mm/memory_hotplug: Drop memory device reference after find_memory_block() Date: Wed, 10 Apr 2019 12:14:55 +0200 Message-Id: <20190410101455.17338-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 10 Apr 2019 10:14:58 +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 While current node handling is probably terribly broken for memory block devices that span several nodes (only possible when added during boot, and something like that should be blocked completely), properly put the device reference we obtained via find_memory_block() to get the nid. Fixes: d0dc12e86b31 ("mm/memory_hotplug: optimize memory hotplug") Cc: Andrew Morton Cc: Oscar Salvador Cc: Michal Hocko Cc: David Hildenbrand Cc: Pavel Tatashin Cc: Wei Yang Cc: Qian Cai Cc: Arun KS Cc: Mathieu Malaterre Signed-off-by: David Hildenbrand Reviewed-by: Oscar Salvador Reviewed-by: Wei Yang Acked-by: Michal Hocko --- mm/memory_hotplug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 5eb4a4c7c21b..328878b6799d 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -854,6 +854,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ */ mem = find_memory_block(__pfn_to_section(pfn)); nid = mem->nid; + put_device(&mem->dev); /* associate pfn range with the zone */ zone = move_pfn_range(online_type, nid, pfn, nr_pages);