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=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no 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 692D7C433DF for ; Thu, 16 Jul 2020 21:45:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3EEE0207DD for ; Thu, 16 Jul 2020 21:45:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594935957; bh=nabHMHfxouVOgXAubFAsxUERlxYHP0w+AX1OTqvuH8U=; h=Date:From:To:Subject:In-Reply-To:Reply-To:List-ID:From; b=wx84pKYpjqhEJZRB1Q/RYN7TiSKDXX9z1kX11ao7Y96UWLlUbL0MmDMMtMEY5/ITu UZJtS9C7ABhCO+qSNIWOSFzIxTiOO77Y0kWUSYUXuimfG4QHw+5HbQiMs1ShPYFCgx FIpb/iIJ5jR7jftBh6e8RyIncLbblTsL1RYFScWs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726256AbgGPVp5 (ORCPT ); Thu, 16 Jul 2020 17:45:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:45654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726002AbgGPVp4 (ORCPT ); Thu, 16 Jul 2020 17:45:56 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D92722076D; Thu, 16 Jul 2020 21:45:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594935956; bh=nabHMHfxouVOgXAubFAsxUERlxYHP0w+AX1OTqvuH8U=; h=Date:From:To:Subject:In-Reply-To:From; b=fejGlbkwgardohniELnyifOB3oeJH/ZA+w7kL3CVCV46lsofExQINvt6Q57kyhRJx 3sLOv7ib8FVnguekJoLd3E4b4aoySrkunrRTFnU33dP5K2yTt5XxbK6YVVR0JegBZ7 Jamx4tHHS4TYs3XRlSASQZXdeiasn33sWs8Ubx44= Date: Thu, 16 Jul 2020 14:45:55 -0700 From: Andrew Morton To: aneesh.kumar@linux.vnet.ibm.com, dave.hansen@intel.com, david@redhat.com, mhocko@suse.com, mike.kravetz@oracle.com, mm-commits@vger.kernel.org, n-horiguchi@ah.jp.nec.com, naoya.horiguchi@nec.com, osalvador@suse.com, osalvador@suse.de, tony.luck@intel.com, zeil@yandex-team.ru Subject: + mmmadvise-refactor-madvise_inject_error.patch added to -mm tree Message-ID: <20200716214555.T9V5cLlP3%akpm@linux-foundation.org> In-Reply-To: <20200703151445.b6a0cfee402c7c5c4651f1b1@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: mm-commits-owner@vger.kernel.org Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm,madvise: Refactor madvise_inject_error has been added to the -mm tree. Its filename is mmmadvise-refactor-madvise_inject_error.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mmmadvise-refactor-madvise_inject_error.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mmmadvise-refactor-madvise_inject_error.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Oscar Salvador Subject: mm,madvise: Refactor madvise_inject_error Make a proper if-else condition for {hard,soft}-offline. Link: http://lkml.kernel.org/r/20200716123810.25292-5-osalvador@suse.de Signed-off-by: Oscar Salvador Acked-by: Naoya Horiguchi Cc: Aneesh Kumar K.V Cc: Dave Hansen Cc: David Hildenbrand Cc: Dmitry Yakunin Cc: Michal Hocko Cc: Mike Kravetz Cc: Naoya Horiguchi Cc: Tony Luck Signed-off-by: Andrew Morton --- mm/madvise.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) --- a/mm/madvise.c~mmmadvise-refactor-madvise_inject_error +++ a/mm/madvise.c @@ -869,7 +869,6 @@ static long madvise_remove(struct vm_are static int madvise_inject_error(int behavior, unsigned long start, unsigned long end) { - struct page *page; struct zone *zone; unsigned long size; @@ -879,6 +878,7 @@ static int madvise_inject_error(int beha for (; start < end; start += size) { unsigned long pfn; + struct page *page; int ret; ret = get_user_pages_fast(start, 1, 0, &page); @@ -908,17 +908,15 @@ static int madvise_inject_error(int beha if (behavior == MADV_SOFT_OFFLINE) { pr_info("Soft offlining pfn %#lx at process virtual address %#lx\n", - pfn, start); + pfn, start); ret = soft_offline_page(pfn, 0); - if (ret) - return ret; - continue; + } else { + pr_info("Injecting memory failure for pfn %#lx at process virtual address %#lx\n", + pfn, start); + ret = memory_failure(pfn, 0); } - pr_info("Injecting memory failure for pfn %#lx at process virtual address %#lx\n", - pfn, start); - ret = memory_failure(pfn, 0); if (ret) return ret; } _ Patches currently in -mm which might be from osalvador@suse.de are mmmadvise-refactor-madvise_inject_error.patch mmhwpoison-un-export-get_hwpoison_page-and-make-it-static.patch mmhwpoison-kill-put_hwpoison_page.patch mmhwpoison-unify-thp-handling-for-hard-and-soft-offline.patch mmhwpoison-rework-soft-offline-for-free-pages.patch mmhwpoison-rework-soft-offline-for-in-use-pages.patch mmhwpoison-refactor-soft_offline_huge_page-and-__soft_offline_page.patch mmhwpoison-return-0-if-the-page-is-already-poisoned-in-soft-offline.patch mmhwpoison-introduce-mf_msg_unsplit_thp.patch