From patchwork Tue Jul 4 12:19:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 115743 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1180010vqx; Tue, 4 Jul 2023 05:23:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4dLxF6qxktKUQEzWQm6uJ6X/aQ+cUAQooJweSZZ9rHCjKEKIk02UGeQ/a4cQQs0r9eF9it X-Received: by 2002:a05:6808:1910:b0:3a1:dc2a:a1dd with SMTP id bf16-20020a056808191000b003a1dc2aa1ddmr12998287oib.47.1688473413742; Tue, 04 Jul 2023 05:23:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688473413; cv=none; d=google.com; s=arc-20160816; b=aNcFaYCO4amzkQktj5nJerJa7I+EDtGCilXt9j3w1Z/l09gINuJxXI9vzWGQteqZXh EJnNULULtgP1ynCcx7B/e6+pJYrKVHSVWInOYdlYk0sLzLGc3inbEc9x+tOhrE5YiY8W hyXGvIZ9eh7Hvkg+kDH8KU1vvuql23B6Xk3gLUX3EEIOW3CvJFuNXMgZcjYSOcpEHJvU EqZP+ZS+jBxOBal5i6+Nzxx9nl6CWQV8h73+16YejHUrcepFSUs7Wn9fNG1pzTcAnst8 NIPHwU1amb4yd3WshBTaukw92HYfAPtRnkcyZGAcRPGUKxY40PoN+hWrUF1YTV377FAu 4nLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=WzINyPxiImXbXbfG0RrP/e7vlMFBDhPBnDHL1BUHGCk=; fh=kP0L7jzW604qIlwIWwCV4xHGxfeYL9qfthvX96QEubA=; b=qh8DuJrT2sd3G/K2XT6kxGxbQUu9/RgPFHmQW5LJCc5wAN5Fh/Z8g4/OQeaSllQyJh Mksx3q46v7jb8mexX1hmnasE3rrh+AZ17Cj10PjnUmbI/jThxBVrz/+kxllT++kx++/M z8B3Bsd9FEVAQ/Wd4GUQwdTPeoXNaBFvEVRk88zjRCY/k3HNTBzIuun/6eOJSvEePZDP P0MyK4yXU1pTPfYUIlJCvPQigUKdah2ZJmYFK7qSUtn3HvcBVDfpSzXr8G+vUJM3i7ff 94EQCdkT7Kvy7TxF96EwGS2I26qzCLMeyN5La0U0jNUgE0CrmWhrQu6PzWContZaGzkm ZZ+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020a63c005000000b0054f8b4d2979si20826037pgg.10.2023.07.04.05.23.19; Tue, 04 Jul 2023 05:23:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230129AbjGDMTd (ORCPT + 99 others); Tue, 4 Jul 2023 08:19:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231460AbjGDMTc (ORCPT ); Tue, 4 Jul 2023 08:19:32 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E109E10CA for ; Tue, 4 Jul 2023 05:19:27 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QwMKK5Zqnz1HCsQ; Tue, 4 Jul 2023 20:19:01 +0800 (CST) Received: from huawei.com (10.174.151.185) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 4 Jul 2023 20:19:25 +0800 From: Miaohe Lin To: , CC: , , Subject: [RFC PATCH] mm: memory-failure: add missing set_mce_nospec() for memory_failure() Date: Tue, 4 Jul 2023 20:19:48 +0800 Message-ID: <20230704121948.1331846-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Originating-IP: [10.174.151.185] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770492698549218636?= X-GMAIL-MSGID: =?utf-8?q?1770492698549218636?= If memory_failure() succeeds to hwpoison a page, the set_mce_nospec() is expected to be called to prevent speculative access to the page by marking it not-present. Add such missing call to set_mce_nospec() in async memory failure handling scene. Signed-off-by: Miaohe Lin --- mm/memory-failure.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index e245191e6b04..c7f88c4042d4 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -63,6 +63,7 @@ #include #include #include +#include #include "swap.h" #include "internal.h" #include "ras/ras_event.h" @@ -2407,7 +2408,9 @@ static void memory_failure_work_func(struct work_struct *work) if (entry.flags & MF_SOFT_OFFLINE) soft_offline_page(entry.pfn, entry.flags); else - memory_failure(entry.pfn, entry.flags); + if (!memory_failure(entry.pfn, entry.flags)) + if (!entry.flags & MF_SW_SIMULATED) + set_mce_nospec(entry.pfn); } }