From patchwork Sun Jun 3 05:23:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10445195 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 B1C67602BC for ; Sun, 3 Jun 2018 05:33:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4A6927E63 for ; Sun, 3 Jun 2018 05:33:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 998D0289E4; Sun, 3 Jun 2018 05:33:26 +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 3BF8E27E63 for ; Sun, 3 Jun 2018 05:33:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AAA456B026E; Sun, 3 Jun 2018 01:33:24 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A57226B026F; Sun, 3 Jun 2018 01:33:24 -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 8F7246B0270; Sun, 3 Jun 2018 01:33:24 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 4AF5F6B026E for ; Sun, 3 Jun 2018 01:33:24 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id y26-v6so7217490pfn.14 for ; Sat, 02 Jun 2018 22:33:24 -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:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=ZuQ26JdP1rjgPhN86L0+K1nIfZmxjN68OHROnzWJ8Gg=; b=VtRXF86EKZmWCZ1Q8j/E9bIaxlRmKVpRb7Gm4ZfEJbWo8LQuVC0Q1uWszeP6O3dMg5 PNJ0dD5m7Q9nYhR/uaQx3Wb8l1OtH1zp6payI2dtIrT95Wo1tJzZhhMYgkvx1fQDBMI1 J9fpBVy1aUp5d6iGq4kZLnTf2yk2gJAJq1BeA4XFrubdmxLMOu/Z6YWj1GAsp5aRTMma pQ3DMfXHD/tFuz0pWpAXHQ0r8zB/vuVBeAP8bBk6/0Z9jW5W+ylcs2eH/mh2iXtoLLi+ u65DAsxYizbyP2APxtlB7Z7EuMaaOuuD7WLCnfB+1Kz86zaMjmTHcMTe8bxYM1Jtpq07 chPQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: ALKqPwdqR6kHB5bSPN3sengEMEImZuKA+WLCg7CRL4UuMrTmtf1eXWmD cBMQ13wqc4Q/h9JyB8g52FHUchxPIgmAEhy19ht/WO2vfYL9eiZVl+x7O1Pdsy1RmQxhq/Mm1fa cgIlj0pH1zuyRVBiUpHlShGJv1nGXrOPb3Y+U0SHLtC6owTlOP1qlYa/kYHEWQDh1ew== X-Received: by 2002:a62:121a:: with SMTP id a26-v6mr12617385pfj.104.1528004003973; Sat, 02 Jun 2018 22:33:23 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLDTotaSRHut8hTslU7Tmv8s26xJG8QCNULqPsf5ZuBU8MtZPkOHodFdt1h4ejIKQqS/HDL X-Received: by 2002:a62:121a:: with SMTP id a26-v6mr12617358pfj.104.1528004003211; Sat, 02 Jun 2018 22:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528004003; cv=none; d=google.com; s=arc-20160816; b=TovKcVG1ZwADGB3exSnqMaNTpmYS4MWLDO+EnwwA3yz0PfLq1ToQ6+LCAd5NO+3UZf /ht2KoKj3ooZj5HRYF7FiYONehwuT0GrAvxJ2U6SiYBL+VJQGf01P7ViB985vKczxC/1 3Ar15yQVpvbKDmWgYsj0Z0wBHTHPOPlbmCAtBksNRfqlrxTuQz4vzX1WP6PUR+YAvZqa 2HC4FcVaxeIOfE5zzA+uoRlOinstdlkCnOJ47rkBE12fUyJyR/b1Hrgk0W9wnMvRCm6s QVRrFMKPznBY9sHgcizDZY84kfEf4L0aad/saBDyrpsCclqutm1e8+n218AkkufJa97c gDYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject :arc-authentication-results; bh=ZuQ26JdP1rjgPhN86L0+K1nIfZmxjN68OHROnzWJ8Gg=; b=GvA37FZcF8ucBbG9PJ+VlER34Y/N8glQOEBAsXSHP8Jlji5lRTRLFPfijRKHSAwQpV HnFlh84ur1GxRZo4sVob1Y5j3JcyDbtnEIUik9611hvfurbk+CpcQIWKrmIeetzDw4J6 hGPafzjE/DYXj/YBuHXKybegdaDt3Bn702Al46w/g3J4BxETTQazMyT+G99Zofv/lE2z lAKa0t1KTZ5v2yO0acvgIcZ/UR8/lLK9gUiHtekfCjFkuqT8nnI/AUnX/bHIweEr7ULt HTWSjGCwEIsT+6vMlsuqT5KcNg/PdlEhkIOPaYgp1UCufl4ZV1qm1Wc+x+fTws1O0OpY DkWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga03.intel.com (mga03.intel.com. [134.134.136.65]) by mx.google.com with ESMTPS id t82-v6si4972894pfi.221.2018.06.02.22.33.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 22:33:23 -0700 (PDT) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.65 as permitted sender) client-ip=134.134.136.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (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 orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jun 2018 22:33:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,472,1520924400"; d="scan'208";a="46338081" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga008.jf.intel.com with ESMTP; 02 Jun 2018 22:33:22 -0700 Subject: [PATCH v2 08/11] mm, memory_failure: Pass page size to kill_proc() From: Dan Williams To: linux-nvdimm@lists.01.org Cc: Naoya Horiguchi , hch@lst.de, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, jack@suse.cz Date: Sat, 02 Jun 2018 22:23:26 -0700 Message-ID: <152800340597.17112.168294239903562357.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <152800336321.17112.3300876636370683279.stgit@dwillia2-desk3.amr.corp.intel.com> References: <152800336321.17112.3300876636370683279.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 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 Given that ZONE_DEVICE / dev_pagemap pages are never assembled into compound pages, the size determination logic in kill_proc() needs updating for the dev_pagemap case. In preparation for dev_pagemap support rework memory_failure() and kill_proc() to pass / consume the page size explicitly. Acked-by: Naoya Horiguchi Signed-off-by: Dan Williams --- mm/memory-failure.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 9d142b9b86dc..42a193ee14d3 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -179,18 +179,16 @@ EXPORT_SYMBOL_GPL(hwpoison_filter); * ``action required'' if error happened in current execution context */ static int kill_proc(struct task_struct *t, unsigned long addr, - unsigned long pfn, struct page *page, int flags) + unsigned long pfn, unsigned size_shift, int flags) { - short addr_lsb; int ret; pr_err("Memory failure: %#lx: Killing %s:%d due to hardware memory corruption\n", pfn, t->comm, t->pid); - addr_lsb = compound_order(compound_head(page)) + PAGE_SHIFT; if ((flags & MF_ACTION_REQUIRED) && t->mm == current->mm) { ret = force_sig_mceerr(BUS_MCEERR_AR, (void __user *)addr, - addr_lsb, current); + size_shift, current); } else { /* * Don't use force here, it's convenient if the signal @@ -199,7 +197,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, * to SIG_IGN, but hopefully no one will do that? */ ret = send_sig_mceerr(BUS_MCEERR_AO, (void __user *)addr, - addr_lsb, t); /* synchronous? */ + size_shift, t); /* synchronous? */ } if (ret < 0) pr_info("Memory failure: Error sending signal to %s:%d: %d\n", @@ -318,7 +316,7 @@ static void add_to_kill(struct task_struct *tsk, struct page *p, * wrong earlier. */ static void kill_procs(struct list_head *to_kill, int forcekill, - bool fail, struct page *page, unsigned long pfn, + bool fail, unsigned size_shift, unsigned long pfn, int flags) { struct to_kill *tk, *next; @@ -343,7 +341,7 @@ static void kill_procs(struct list_head *to_kill, int forcekill, * process anyways. */ else if (kill_proc(tk->tsk, tk->addr, - pfn, page, flags) < 0) + pfn, size_shift, flags) < 0) pr_err("Memory failure: %#lx: Cannot send advisory machine check signal to %s:%d\n", pfn, tk->tsk->comm, tk->tsk->pid); } @@ -928,6 +926,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn, struct address_space *mapping; LIST_HEAD(tokill); bool unmap_success; + unsigned size_shift; int kill = 1, forcekill; struct page *hpage = *hpagep; bool mlocked = PageMlocked(hpage); @@ -1012,7 +1011,8 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn, * any accesses to the poisoned memory. */ forcekill = PageDirty(hpage) || (flags & MF_MUST_KILL); - kill_procs(&tokill, forcekill, !unmap_success, p, pfn, flags); + size_shift = compound_order(compound_head(p)) + PAGE_SHIFT; + kill_procs(&tokill, forcekill, !unmap_success, size_shift, pfn, flags); return unmap_success; }