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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBEE3C433EF for ; Mon, 9 May 2022 11:01:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 83D026B0075; Mon, 9 May 2022 07:01:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C7066B0078; Mon, 9 May 2022 07:01:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6191F6B007B; Mon, 9 May 2022 07:01:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4D6A16B0075 for ; Mon, 9 May 2022 07:01:10 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 2FE3C60C90 for ; Mon, 9 May 2022 11:01:10 +0000 (UTC) X-FDA: 79445912700.23.E8AE3A4 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf03.hostedemail.com (Postfix) with ESMTP id 5DB0220095 for ; Mon, 9 May 2022 11:01:02 +0000 (UTC) Received: by mail-pl1-f181.google.com with SMTP id i17so13485791pla.10 for ; Mon, 09 May 2022 04:01:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lgBugjMBjpGQ7xeNvhxji4XO8XtdFmxbyx8qWXB/d1E=; b=Pj3odeW7eWCV6Y3wbzSEpD8iLoimaxAI1ooehshks8JT1P+ojlGgtSlicuvorjqyuO kT/iSH9IeTlMksEU/xWsoNwYko7rqXxxjzmm7oEHy9uBn+PwWOaxTT/EMhftkdQSxcNs eGk5ULQ2fgZEg9dJac5mZduPWbV1z0FGFUj8xKI7mox5vPPrbdfNxmtVi1H3bZwnCcgR E4bjgy+vFNnAUACAkd4XWb2qxrFBOJ1RYP1wyhLjvM97E3+yfhHY3zIHCohiu5BeTRVE IE3l1JXhD1BJyLIUALFNepOCs3HyemnMQzn2YuOIZ/1ccCAkhgRSWZN+uw75l01f5aGc 7Qmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lgBugjMBjpGQ7xeNvhxji4XO8XtdFmxbyx8qWXB/d1E=; b=3fa8kFtWokDcQu2Dv9PM238ybYyhe1M7Pw5fl3+jArTyezgB4VEkNDscVGY134vaAS evXmR97QEWVSHwLrtkBVTnxfinroEuoaLSOznay3CT1mNPosP9gP8C+KHqj2T1IADnEK w88wUKpxx3qKVdG2Fc2EhRUBEDAEP/G2JfQA1CpdTBVGdsUwNsMxVox63O0NHwk7isD9 fmcL9arf0LALtf6NRheHAx2/ZWAPbQPq86MnCNPdwyCwvJhbCbYwq3fUqI8/W3E+ivJw 4qMwRTc4b7vBC/P+8KQP8igSZxsaDirrrdPXh6+y8poaI7lzz7cvKvZinmastq6EaJLI y+CQ== X-Gm-Message-State: AOAM533lBSCGcY01GhRGGl72mQ+aLTFXH62jCxsQrsgnIOvuOoauWsuk mv+jNWo44C+v6GhaSzkzUMElVA== X-Google-Smtp-Source: ABdhPJzX90hgfGWeg918bEYrTW1cS8gQltC1OktUE0gYPnZCoiRblOWmhlkao5W1SGi61URQ7uy4sQ== X-Received: by 2002:a17:903:210:b0:15e:f139:f901 with SMTP id r16-20020a170903021000b0015ef139f901mr14084732plh.66.1652094068623; Mon, 09 May 2022 04:01:08 -0700 (PDT) Received: from always-x1.www.tendawifi.com ([139.177.225.239]) by smtp.gmail.com with ESMTPSA id n12-20020a170902968c00b0015e8d4eb244sm6813303plp.142.2022.05.09.04.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 04:01:08 -0700 (PDT) From: zhenwei pi To: akpm@linux-foundation.org, naoya.horiguchi@nec.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zhenwei pi Subject: [PATCH v2 3/5] mm/memory-failure.c: add hwpoison_filter for soft offline Date: Mon, 9 May 2022 18:56:39 +0800 Message-Id: <20220509105641.491313-4-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509105641.491313-1-pizhenwei@bytedance.com> References: <20220509105641.491313-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 5DB0220095 X-Stat-Signature: 8yddx4hqsju11aoi7n97uedegbage54x Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=Pj3odeW7; spf=pass (imf03.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-HE-Tag: 1652094062-301256 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: hwpoison_filter is missing in the soft offline path, this leads an issue: after enabling the corrupt filter, the user process still has a chance to inject hwpoison fault by madvise(addr, len, MADV_SOFT_OFFLINE) at PFN which is expected to reject. Also do a minor change in comment of memory_failure(). Signed-off-by: zhenwei pi --- mm/memory-failure.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index ece05858568f..ed280ef5473d 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1762,7 +1762,7 @@ static DEFINE_MUTEX(mf_mutex); * enabled and no spinlocks hold. * * Return: 0 for successfully handled the memory error, - * -EOPNOTSUPP for memory_filter() filtered the error event, + * -EOPNOTSUPP for hwpoison_filter() filtered the error event, * < 0(except -EOPNOTSUPP) on failure. */ int memory_failure(unsigned long pfn, int flags) @@ -2317,7 +2317,9 @@ static void put_ref_page(struct page *page) * @pfn: pfn to soft-offline * @flags: flags. Same as memory_failure(). * - * Returns 0 on success, otherwise negated errno. + * Returns 0 on success + * -EOPNOTSUPP for hwpoison_filter() filtered the error event + * < 0 otherwise negated errno. * * Soft offline a page, by migration or invalidation, * without killing anything. This is for the case when @@ -2368,6 +2370,16 @@ int soft_offline_page(unsigned long pfn, int flags) ret = get_hwpoison_page(page, flags | MF_SOFT_OFFLINE); put_online_mems(); + if (hwpoison_filter(page)) { + if (ret > 0) + put_page(page); + else + put_ref_page(ref_page); + + mutex_unlock(&mf_mutex); + return -EOPNOTSUPP; + } + if (ret > 0) { ret = soft_offline_in_use_page(page); } else if (ret == 0) { -- 2.20.1