From patchwork Thu Nov 10 15:17:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13038899 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 7EA63C4332F for ; Thu, 10 Nov 2022 15:17:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED72A6B0074; Thu, 10 Nov 2022 10:17:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E3AF26B0075; Thu, 10 Nov 2022 10:17:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8DEC8E0001; Thu, 10 Nov 2022 10:17:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B99716B0072 for ; Thu, 10 Nov 2022 10:17:11 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8638C8146C for ; Thu, 10 Nov 2022 15:17:11 +0000 (UTC) X-FDA: 80117885862.09.0FD1B3D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 1271C80012 for ; Thu, 10 Nov 2022 15:17:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668093430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6CDOnJYMZah4WeGmtiqmew/mMyquYuFWazZX9Q40Hac=; b=UtZIhFFkEgkxC5nCClVaMEa3jEoJhXDv09Nt0InlDP4+20j4PfjjtIt5u2FEZgE3frF6OD Ua5iYWZ1OwuAsK9UyRgEEcuGADzHbfPQDwuzo6eBH3dNb8AbjkpnNG1OKQ38PN/2byWHrg VVTFoAGwS1Zgwt4hp2AWQr5JfFQbTuE= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-32-GbtVpv2mOu265TwJOwEIWw-1; Thu, 10 Nov 2022 10:17:08 -0500 X-MC-Unique: GbtVpv2mOu265TwJOwEIWw-1 Received: by mail-qv1-f72.google.com with SMTP id 71-20020a0c804d000000b004b2fb260447so1675855qva.10 for ; Thu, 10 Nov 2022 07:17:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6CDOnJYMZah4WeGmtiqmew/mMyquYuFWazZX9Q40Hac=; b=MSiZz1Tl+r699EEtZjCCaNuax/jSg048KrMfEQstcGURS/TxvuyC1xXj7WXg6d3Yii NbUdNe502YWp+YCrpUBxxeYRgbyWFBzeiEdYpABraa17XoE/lC3kX3iF7H+rgiBQKlY3 sv5KLvDA52wcjg62V6NhUPK2I7lHL5fa2/32gBHNeMjYcKB29ylGDXnAiVBEmNv68Oz0 TnA9qdlZfDP3wVajvog2ZQbWobdajezbA6N7B8VU0NrS8JAaKduN91uQi/dEam96SR1m srqBN6HpSBmD3AoySyvxqKFwdpzNkeauu20y/eQ9nx0V+nh0u649lENC5LEoZXl+5eq/ 49CQ== X-Gm-Message-State: ACrzQf3KiifljQhutjU0NB+LYT8mP5QA9prPLU9zFWBWjOD/g5bTMhO5 W+uqSC7yDtle/a+4xSjZOl3HePxAB00RGryVI7BRl1I9WA4j/Nrrf3GJhMAspiJkBNGcmdV69oV 1Ne1c/iFSbcK1q+EsR5xsR4ecGyNl4BetfImqp59QNv3XlhpH1pXNxN6+vz4R X-Received: by 2002:a05:620a:cc2:b0:6fa:2175:5fa7 with SMTP id b2-20020a05620a0cc200b006fa21755fa7mr44267859qkj.0.1668093427888; Thu, 10 Nov 2022 07:17:07 -0800 (PST) X-Google-Smtp-Source: AMsMyM5sZc0MPXl3k0/8piyAMxvk9MkH6fZqGYMI8ObhnZ5YYr0EEA2u8MpiOMTdbYs26mM5B7/hMg== X-Received: by 2002:a05:620a:cc2:b0:6fa:2175:5fa7 with SMTP id b2-20020a05620a0cc200b006fa21755fa7mr44267821qkj.0.1668093427556; Thu, 10 Nov 2022 07:17:07 -0800 (PST) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id l19-20020a05620a28d300b006ec771d8f89sm13621596qkp.112.2022.11.10.07.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 07:17:07 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Mike Rapoport , peterx@redhat.com, Nadav Amit , Andrew Morton , Axel Rasmussen , Andrea Arcangeli , Ives van Hoorne Subject: [PATCH 2/2] mm/uffd: Sanity check write bit for uffd-wp protected ptes Date: Thu, 10 Nov 2022 10:17:02 -0500 Message-Id: <20221110151702.1478763-3-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221110151702.1478763-1-peterx@redhat.com> References: <20221110151702.1478763-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668093431; a=rsa-sha256; cv=none; b=KjXh76nzyha23css6QyQuADhKaRy68LG9D0gdSK5Dbpc0RFkhxxelPXoBKfSg52WGCN3Zp TB8jsZLEJKd9Evsg9OOMtpNKSolYO5UPWnZyjTgeq9TfvfhYEzEFiPp8lZ8HEBM0qpjj2b cPw0tiiB3WIGRlz1/2kdguS7C1flI04= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UtZIhFFk; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668093431; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=6CDOnJYMZah4WeGmtiqmew/mMyquYuFWazZX9Q40Hac=; b=Noc7IbYGHnRlkgeW83gpeXNtZ14A+ylr5SrMfePdsKbeJR5q9bunuDe+aCoYK04DXCbS4q /wLVjzf/zYvXTFIY4Kuu8/00oh4E8KvVyncm325iatN5gUSRQIe6mDl/JPPAwrMZhztQhB HWMLr5fVClk7dkQ/EPa/ybSzXmpati0= X-Rspam-User: X-Stat-Signature: yt5wum4mxf1gqehc9pn5sdr1dys5d1ik X-Rspamd-Queue-Id: 1271C80012 Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UtZIhFFk; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com X-Rspamd-Server: rspam03 X-HE-Tag: 1668093430-394282 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: Let's add one sanity check for CONFIG_DEBUG_VM on the write bit in whatever chance we have when walking through the pgtables. It can bring the error earlier even before the app notices the data was corrupted on the snapshot. Also it helps us to identify this is a wrong pgtable setup, so hopefully a great information to have for debugging too. Wrapping with CONFIG_DEBUG_VM is not that useful considering we have that in many distros already, but still do that just in case some custom build doesn't want anything like it. Cc: Andrea Arcangeli Signed-off-by: Peter Xu --- arch/x86/include/asm/pgtable.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 5059799bebe3..27fff6b14929 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -291,7 +291,21 @@ static inline pte_t pte_clear_flags(pte_t pte, pteval_t clear) #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_WP static inline int pte_uffd_wp(pte_t pte) { - return pte_flags(pte) & _PAGE_UFFD_WP; + bool wp = pte_flags(pte) & _PAGE_UFFD_WP; +#ifdef CONFIG_DEBUG_VM + /* + * Having write bit for wr-protect-marked present ptes is fatal, + * because it means the uffd-wp bit will be ignored and write will + * just go through. + * + * Use any chance of pgtable walking to verify this (e.g., when + * page swapped out or being migrated for all purposes). It means + * something is already wrong. Tell the admin even before the + * process crashes. We also nail it with wrong pgtable setup. + */ + WARN_ON_ONCE(wp && pte_write(pte)); +#endif + return wp; } static inline pte_t pte_mkuffd_wp(pte_t pte)