From patchwork Tue Aug 21 10:44:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 10571351 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 6F1B7139B for ; Tue, 21 Aug 2018 10:44:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64D3829DA3 for ; Tue, 21 Aug 2018 10:44:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5892529DA4; Tue, 21 Aug 2018 10:44:35 +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 B6D0C29DA1 for ; Tue, 21 Aug 2018 10:44:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 792F66B1E45; Tue, 21 Aug 2018 06:44:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 71B176B1E46; Tue, 21 Aug 2018 06:44:33 -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 5E3566B1E47; Tue, 21 Aug 2018 06:44:33 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f199.google.com (mail-qt0-f199.google.com [209.85.216.199]) by kanga.kvack.org (Postfix) with ESMTP id 302076B1E45 for ; Tue, 21 Aug 2018 06:44:33 -0400 (EDT) Received: by mail-qt0-f199.google.com with SMTP id o18-v6so15861954qtm.11 for ; Tue, 21 Aug 2018 03:44:33 -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=2fvsgSZhun/SjO8alM7BftZg262QXbusi418RCEviyE=; b=ghVj7cyuAAux89UszrNp+zYGhtwuEtxWLlTig+RUQA0u5kOBx7IxBAAV6/MR1BzfBA ysW3vzOwTzineYPTnsu8CsrWhQ/fkbWWQkyjpw7BQa2MWBFx8p5wjpfv690u2mEKgUV+ xREBB49jFY4o+bEXkLlUHhDr46Be+vZmSNP89e3qP+ah3iRdDGdvcMGY0lGW5Qq4rBtS 1tcxVx7YSeBTQwbhWZv0S9/Xub6GJ6ZWMMZLO4LMpNc0wLJjbCVrmmMrsq/1QRih45AR KVTUlLSp5Xi8EUD3qJTDxrvczR8pw26w+20q97nWmHjeckYzEGL29Es961jCHUY4felR TlgQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APzg51C/6NLaYA998Vf6/84sAxE5q9X9Yq/Il8twSAaIQSEEQ01sNbs1 n0ylbPOSDb2ViphjNNHZ5iutKVQihrpSWK/E02UPosAdCu/EoRVi1SDECimOXvPtwdFgMgzDYel eIvGPeAX3ovDm94iJGyXNe7mQjX3LSd17oiRt7JTkFYDhXgR1H4X2zK7SYQ5s1MvrhA== X-Received: by 2002:a37:f9b:: with SMTP id 27-v6mr1579866qkp.278.1534848272966; Tue, 21 Aug 2018 03:44:32 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYFEuTulKOlaSwr/iWTDW5qnV9kS6Nudg5EQ9efgm2JJsODJBMX3AaWlJeLkmCmR9NYADCA X-Received: by 2002:a37:f9b:: with SMTP id 27-v6mr1579839qkp.278.1534848272251; Tue, 21 Aug 2018 03:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534848272; cv=none; d=google.com; s=arc-20160816; b=hDu4yfAs01cFPzUS7HLsZjicwOVeCWDhfAb6jSGdXpdqXC84YX5mUc28rM1YOi5zqi ZUPsLBf03njd3HKMtPFQPiJDqxVbUOMrInC1P4F11/febgKR75AcY7wmcE+bbPawhiaD iAjzM3noo3auljsaxCiwoXKkmwBezl5VmfvKHAR/qpM1xpRtKWsU08kCzvt8eJ4qkGl8 L5i1MUG2HCZIKM14CL1VDgUgLev2W6VOYiz7vK32AVdX1HpJt86VvsXRsTG5NDMaoCYY nKaB4K8ClIEEBKg06Nj7wfLdqpe6YyNwEkw4K7bdz6u/mIl2hx90K768Ke6UEMtT2rIg JvBg== 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=2fvsgSZhun/SjO8alM7BftZg262QXbusi418RCEviyE=; b=XaXMrbKQT8ZWkx2hpWp0bGvS1MuadHxcEeOdqYWJdJ2kTXydQUtjqktjOOswK+B6M0 7ZRi3k/bAfxDHquGBtn3rdxPMYPAfoifo0EqnI0obAzf9F0fpCRsPy14VcjuJziwRRe5 yP+upNhZqTp3qkx2xxM/j6wIOzoHNSgABLJLrOcWqkF3bE9OWCUjmDUs/h6C+PDEG12U gKmsAusg9684Dz4oJIvQh5kOUSWz08r6l2Bd1jaK2+4lpAE5W0w14IdgpGJ1ySMaN/UW rHfFsIodGibtO9y4mVELIAIzCTjAQBVr0UftsWhYT++0oKe1As1DD+7Z2WA8NVq3EQsX HMEA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 66.187.233.73 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 (mx3-rdu2.redhat.com. [66.187.233.73]) by mx.google.com with ESMTPS id x11-v6si996761qtf.296.2018.08.21.03.44.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 03:44:32 -0700 (PDT) Received-SPF: pass (google.com: domain of david@redhat.com designates 66.187.233.73 as permitted sender) client-ip=66.187.233.73; Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 66.187.233.73 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-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6268D402178A; Tue, 21 Aug 2018 10:44:31 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-96.ams2.redhat.com [10.36.117.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CE5094647; Tue, 21 Aug 2018 10:44:19 +0000 (UTC) From: David Hildenbrand To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org, xen-devel@lists.xenproject.org, devel@linuxdriverproject.org, David Hildenbrand , Andrew Morton , Balbir Singh , Benjamin Herrenschmidt , Boris Ostrovsky , Dan Williams , Greg Kroah-Hartman , Haiyang Zhang , Heiko Carstens , John Allen , Jonathan Corbet , Joonsoo Kim , Juergen Gross , Kate Stewart , "K. Y. Srinivasan" , Len Brown , Martin Schwidefsky , Mathieu Malaterre , Michael Ellerman , Michael Neuling , Michal Hocko , Nathan Fontenot , Oscar Salvador , Paul Mackerras , Pavel Tatashin , Philippe Ombredanne , "Rafael J. Wysocki" , Rashmica Gupta , Stephen Hemminger , Thomas Gleixner , Vlastimil Babka , YASUAKI ISHIMATSU Subject: [PATCH RFCv2 0/6] mm: online/offline_pages called w.o. mem_hotplug_lock Date: Tue, 21 Aug 2018 12:44:12 +0200 Message-Id: <20180821104418.12710-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 21 Aug 2018 10:44:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 21 Aug 2018 10:44:31 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'david@redhat.com' RCPT:'' 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 This is the same approach as in the first RFC, but this time without exporting device_hotplug_lock (requested by Greg) and with some more details and documentation regarding locking. Tested only on x86 so far. -------------------------------------------------------------------------- Reading through the code and studying how mem_hotplug_lock is to be used, I noticed that there are two places where we can end up calling device_online()/device_offline() - online_pages()/offline_pages() without the mem_hotplug_lock. And there are other places where we call device_online()/device_offline() without the device_hotplug_lock. While e.g. echo "online" > /sys/devices/system/memory/memory9/state is fine, e.g. echo 1 > /sys/devices/system/memory/memory9/online Will not take the mem_hotplug_lock. However the device_lock() and device_hotplug_lock. E.g. via memory_probe_store(), we can end up calling add_memory()->online_pages() without the device_hotplug_lock. So we can have concurrent callers in online_pages(). We e.g. touch in online_pages() basically unprotected zone->present_pages then. Looks like there is a longer history to that (see Patch #2 for details), and fixing it to work the way it was intended is not really possible. We would e.g. have to take the mem_hotplug_lock in device/base/core.c, which sounds wrong. Summary: We had a lock inversion on mem_hotplug_lock and device_lock(). More details can be found in patch 3 and patch 6. I propose the general rules (documentation added in patch 6): 1. add_memory/add_memory_resource() must only be called with device_hotplug_lock. 2. remove_memory() must only be called with device_hotplug_lock. This is already documented and holds for all callers. 3. device_online()/device_offline() must only be called with device_hotplug_lock. This is already documented and true for now in core code. Other callers (related to memory hotplug) have to be fixed up. 4. mem_hotplug_lock is taken inside of add_memory/remove_memory/ online_pages/offline_pages. To me, this looks way cleaner than what we have right now (and easier to verify). And looking at the documentation of remove_memory, using lock_device_hotplug also for add_memory() feels natural. RFC -> RFCv2: - Don't export device_hotplug_lock, provide proper remove_memory/add_memory wrappers. - Split up the patches a bit. - Try to improve powernv memtrace locking - Add some documentation for locking that matches my knowledge David Hildenbrand (6): mm/memory_hotplug: make remove_memory() take the device_hotplug_lock mm/memory_hotplug: make add_memory() take the device_hotplug_lock mm/memory_hotplug: fix online/offline_pages called w.o. mem_hotplug_lock powerpc/powernv: hold device_hotplug_lock when calling device_online() powerpc/powernv: hold device_hotplug_lock in memtrace_offline_pages() memory-hotplug.txt: Add some details about locking internals Documentation/memory-hotplug.txt | 39 +++++++++++- arch/powerpc/platforms/powernv/memtrace.c | 14 +++-- .../platforms/pseries/hotplug-memory.c | 8 +-- drivers/acpi/acpi_memhotplug.c | 4 +- drivers/base/memory.c | 22 +++---- drivers/xen/balloon.c | 3 + include/linux/memory_hotplug.h | 4 +- mm/memory_hotplug.c | 59 +++++++++++++++---- 8 files changed, 115 insertions(+), 38 deletions(-)