From patchwork Fri Jul 6 19:06:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 10512413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 80E4A603D7 for ; Fri, 6 Jul 2018 19:07:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 700BF2876D for ; Fri, 6 Jul 2018 19:07:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6383A287A0; Fri, 6 Jul 2018 19:07:23 +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=unavailable 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 029762876D for ; Fri, 6 Jul 2018 19:07:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC3916B0010; Fri, 6 Jul 2018 15:07:21 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E4CFB6B0266; Fri, 6 Jul 2018 15:07:21 -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 CF0036B0269; Fri, 6 Jul 2018 15:07:21 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id 8A1896B0010 for ; Fri, 6 Jul 2018 15:07:21 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id e1-v6so5146609pld.23 for ; Fri, 06 Jul 2018 12:07:21 -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; bh=drrm/u5t5hjp+fLKNP8ZqgRqH2V1wfNeazIDnQFh0IQ=; b=OwbkeF44BX8oMMpdYQT5f9ALUmWYwa4I7j1ioqe1xtYyNJ+7PaLq79DlWyU/lclniv bAixSdvSBU6xUD9u90yzP71nbQYTcSoo7wA/Ln8I/3p26JfV9Lh7fQX5JI1+/flVqyHc JrCEvRXTmwqN0hw3g4OKr2BvV1FGBxvqoxTPmMfUZof71HTphGboAk6O0rv1iQYg8rht 4BKrPLpj/tu9HjB8p05RHRJ3LcMG1LjFv1525IAkgLBp43zj0qfVlrQ3hWvUFCx2XJcW 2AeX+gp2nue7apvEI0AxulZFOrySFbru3yZ46bBO2QkvUKkN0noyu1I7DgeCcFLXeOn7 T5hA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of ross.zwisler@linux.intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=ross.zwisler@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E34SZuUjKC8u2e7dR6U5ORY/nm88/XGKjaQjj5EHNCgVaady5+I mCGoWtmzwVP9Yth8F2wNsaTVhihA6vO+iD+u5AA0vAbl89Zk+Fh5C0pxQlC4KyB4w8LNVYwuaho LChK+ivPB6s8oACRE8w3ugh3VGboSXnET7bC747q1IcN41K3gA86bHuHeOPGmIF7mGQ== X-Received: by 2002:a65:5907:: with SMTP id f7-v6mr10157609pgu.83.1530904041248; Fri, 06 Jul 2018 12:07:21 -0700 (PDT) X-Google-Smtp-Source: AAOMgpemXYYuVTDqJgIMC42DmpOe0bjq2dBF+/KPTWSgVLufqApF9aE6tmbZ5Yt0LyOczQjoApWm X-Received: by 2002:a65:5907:: with SMTP id f7-v6mr10157571pgu.83.1530904040323; Fri, 06 Jul 2018 12:07:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530904040; cv=none; d=google.com; s=arc-20160816; b=bVnvhFQ+zZnnwJLovSevK0vy3azTphKR29Y2nfXU4Yep9HCkTADmRSGzQ4G5BTtyvw jHYr2fHY6Nvkgc/9ex926+pX5l9C6XOJuDZPCkk39nYHn4CjZtN/3/Lt3e6bcSefVF// TMD32fsYNfeJfutzdtJ+zAt5mdUzvjDqwX2At9Wxi6HtvcEv43qVOor+fYNRQ06NWwkB JNZNp+sQScG7zl6Z18PWjdN9GJANZdmD04bkEYOAMo9Jm0OD4Z2hhVnvHm2gahkrU6OG j3UG5fFFXrehmtSPf4VzCtiSiTtjtRu9SXLfzuOJ9GLPOOMXErJXvybUiZ+ypRMIguBk MxTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=drrm/u5t5hjp+fLKNP8ZqgRqH2V1wfNeazIDnQFh0IQ=; b=YDvduYqUSzZ7WRKl9YYWYAp4KCVGTo/35n9ZUu0c78GY+lwyinAzwu6iOn4kqXmnkQ EQr3leGmtZloLcpbr/P0Fkc76hxI4/LOvCniYR0KRdPci5V1PoP6cxh6iSs24dvAmD8d iGBvWxWoIhGdQI1b9mRxptJAyS0uV6A0/dP6NQsBuPvFX7EFrCX+/YOeg8H3QOxWwNWQ 2CD5+NPdHsjj5YFUhKgWn65Wd65ZgpsHHaUb15rKdcCQigcaDm1exm2yZ2kmHpqjuurK 0BwYguLyh5ZH6K5k4OVrQ2j7BgkIiqv9QWhP6sorGBm4wQik9Rv/MPVBBQ5ODxD7pCgt LvmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of ross.zwisler@linux.intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=ross.zwisler@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id n6-v6si5541394pla.398.2018.07.06.12.07.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jul 2018 12:07:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of ross.zwisler@linux.intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of ross.zwisler@linux.intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=ross.zwisler@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jul 2018 12:07:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,317,1526367600"; d="scan'208";a="62819344" Received: from theros.lm.intel.com ([10.232.112.164]) by FMSMGA003.fm.intel.com with ESMTP; 06 Jul 2018 12:07:07 -0700 From: Ross Zwisler To: pasha.tatashin@oracle.com, linux-nvdimm@lists.01.org Cc: Ross Zwisler , osalvador@techadventures.net, bhe@redhat.com, Dave Hansen , LKML , Linux MM , Michal Hocko , Vlastimil Babka , Andrew Morton , "Kirill A. Shutemov" , osalvador@suse.de Subject: [PATCH] mm/sparse.c: fix error path in sparse_add_one_section Date: Fri, 6 Jul 2018 13:06:58 -0600 Message-Id: <20180706190658.6873-1-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.14.4 in-reply-to: 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 The following commit in -next: commit 054620849110 ("mm/sparse.c: make sparse_init_one_section void and remove check") changed how the error handling in sparse_add_one_section() works. Previously sparse_index_init() could return -EEXIST, and the function would continue on happily. 'ret' would get unconditionally overwritten by the result from sparse_init_one_section() and the error code after the 'out:' label wouldn't be triggered. With the above referenced commit, though, an -EEXIST error return from sparse_index_init() now takes us through the function and into the error case after 'out:'. This eventually causes a kernel BUG, probably because we've just freed a memory section that we successfully set up and marked as present: BUG: unable to handle kernel paging request at ffffea0005000080 RIP: 0010:memmap_init_zone+0x154/0x1cf Call Trace: move_pfn_range_to_zone+0x168/0x180 devm_memremap_pages+0x29b/0x480 pmem_attach_disk+0x1ae/0x6c0 [nd_pmem] ? devm_memremap+0x79/0xb0 nd_pmem_probe+0x7e/0xa0 [nd_pmem] nvdimm_bus_probe+0x6e/0x160 [libnvdimm] driver_probe_device+0x310/0x480 __device_attach_driver+0x86/0x100 ? __driver_attach+0x110/0x110 bus_for_each_drv+0x6e/0xb0 __device_attach+0xe2/0x160 device_initial_probe+0x13/0x20 bus_probe_device+0xa6/0xc0 device_add+0x41b/0x660 ? lock_acquire+0xa3/0x210 nd_async_device_register+0x12/0x40 [libnvdimm] async_run_entry_fn+0x3e/0x170 process_one_work+0x230/0x680 worker_thread+0x3f/0x3b0 kthread+0x12f/0x150 ? process_one_work+0x680/0x680 ? kthread_create_worker_on_cpu+0x70/0x70 ret_from_fork+0x3a/0x50 Fix this by clearing 'ret' back to 0 if sparse_index_init() returns -EEXIST. This restores the previous behavior. Signed-off-by: Ross Zwisler --- mm/sparse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mm/sparse.c b/mm/sparse.c index 9574113fc745..d254bd2d3289 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -753,8 +753,12 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat, * plus, it does a kmalloc */ ret = sparse_index_init(section_nr, pgdat->node_id); - if (ret < 0 && ret != -EEXIST) - return ret; + if (ret < 0) { + if (ret == -EEXIST) + ret = 0; + else + return ret; + } memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, altmap); if (!memmap) return -ENOMEM;