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 A2A53C433EF for ; Thu, 21 Jul 2022 16:57:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 07A726B0071; Thu, 21 Jul 2022 12:57:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 02A0D8E0001; Thu, 21 Jul 2022 12:57:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E32E86B0074; Thu, 21 Jul 2022 12:57:22 -0400 (EDT) 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 D44E96B0071 for ; Thu, 21 Jul 2022 12:57:22 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A29F6120612 for ; Thu, 21 Jul 2022 16:57:22 +0000 (UTC) X-FDA: 79711712724.18.7E58D17 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id CC10F120087 for ; Thu, 21 Jul 2022 16:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658422639; 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: in-reply-to:in-reply-to:references:references; bh=QYkkBe6l4cX/NT5fsK6oNEqOI7IEBj6r0KNIEZJp5rs=; b=NZ/BkTW1c5/j9Mhl/E1XVYwqhIu3xeraoZ0S30zEZgABfKsePywcI4e1mSM/CctjUubG09 +qfc+vPfa+JycA6bcgwTAJryXfFiYrCgwjKXy3FfHyL7sbXoemWB4MlbTVndtLdAO0w8TB aBz+oA2fBFxzFvRSYtmjlNnXM4IG0Xc= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-a9XbnHxEPxaMkqGf7o24Mw-1; Thu, 21 Jul 2022 12:57:18 -0400 X-MC-Unique: a9XbnHxEPxaMkqGf7o24Mw-1 Received: by mail-qk1-f198.google.com with SMTP id l15-20020a05620a28cf00b006b46997c070so1744742qkp.20 for ; Thu, 21 Jul 2022 09:57:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=QYkkBe6l4cX/NT5fsK6oNEqOI7IEBj6r0KNIEZJp5rs=; b=KjOwp5d9YKzWo73tGH+yrZOn1Xeq8m3T901zx4QqfBsT3xgB3H1cD24hNCK8sL0LRb NIBQuDyN3qxjdE4XBLcbPtj2leQps8LjXRNQdHZybXcxsklu04xNGotYqQVTKvP8GO5Q jaFAmOBcuV/70bfMrTusB5C+pcKSEu0yKQ9IdBoxYYOd90vmHk7aF4mTjCOkipqyySyG jhZ108t49u8fb7LE5Op2MJna63Hu2+c9185Z8F/ssSTkMLShZbImUIbxmUL+I9MS0goV o7WtKqIKZsWZNOMl3LGDYec1PJjNANAmP2686yaUEIR7mRJdUomWCIEkL0skMJhTEZoa E9Aw== X-Gm-Message-State: AJIora/wUbaG70jOZqtMiGXiCBqHB+JwtiXMBNUuufUzk7/YR4HHOgIT jNBvI9p+m/Ilxo5qslxcigFYvdpnPYtHJg5i+XG6tVuNnhqNTdvuMZwwxUCsrWKe5GHOg08bSQD mEZGERGrwAso= X-Received: by 2002:a05:6214:519a:b0:473:6d83:17e9 with SMTP id kl26-20020a056214519a00b004736d8317e9mr33980089qvb.115.1658422637674; Thu, 21 Jul 2022 09:57:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tKfr/Iqt4xNR2rSwhG38OkcKQpC8U78lMeM2rzT2mJddVbR2NygckqZ5bcu3ovsLkOvv11/g== X-Received: by 2002:a05:6214:519a:b0:473:6d83:17e9 with SMTP id kl26-20020a056214519a00b004736d8317e9mr33980061qvb.115.1658422637327; Thu, 21 Jul 2022 09:57:17 -0700 (PDT) Received: from xz-m1.local (bras-base-aurron9127w-grc-35-70-27-3-10.dsl.bell.ca. [70.27.3.10]) by smtp.gmail.com with ESMTPSA id bn31-20020a05620a2adf00b006b5ef0aff29sm1631388qkb.87.2022.07.21.09.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 09:57:16 -0700 (PDT) Date: Thu, 21 Jul 2022 12:57:15 -0400 From: Peter Xu To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrea Arcangeli , Nadav Amit , Andrew Morton Subject: Re: [PATCH v2] mm/mprotect: Fix soft-dirty check in can_change_pte_writable() Message-ID: References: <20220720220324.88538-1-peterx@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658422639; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QYkkBe6l4cX/NT5fsK6oNEqOI7IEBj6r0KNIEZJp5rs=; b=zSqwqru1/wrdvzbn0CaoSVO+pmNedCn7JJfvkGHJ4d9L7tCiOmdm+aFJsRqKk4zu9PgBWn 7JFt2ZskbEunlvB5i3qkR3vVcr60xLAzBQ2KM9w3ggMd+ngWvpxaxdmI0jsxeULi+Fift2 5PAqcPVt/A/vfXSUKK3XG3NIGjQ7iyg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658422639; a=rsa-sha256; cv=none; b=iV/WmqAJb0xwGOiN1Yoq/9AsyQNCDz2PABfoF6almSdKHJZ3rJY/ivk7+4Uj3DN+tereBX 1UuPE3y9B9PO3yRTRT2W+dnX3X9P/MDzkL1yrvtHaEaaRXMoHLodwC1/k+7vxZ+0yiCCoR Kpe/F6VIXp5aJg4vdIaEYzCmTa6Yk68= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="NZ/BkTW1"; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf29.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="NZ/BkTW1"; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf29.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com X-Rspam-User: X-Rspamd-Queue-Id: CC10F120087 X-Rspamd-Server: rspam06 X-Stat-Signature: fay4mhtsiiix9yjwr3hfhz4tj3wa5chm X-HE-Tag: 1658422639-341656 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: On Thu, Jul 21, 2022 at 09:28:47AM +0200, David Hildenbrand wrote: > Modifying your test to map page from a file MAP_SHARED gives me under > 5.18.11-100.fc35.x86_64: > > > 53,54d52 > < FILE *file = fopen("tmpfile", "w+"); > < int file_fd; > 56d53 > < assert(file); > 59,61d55 > < > < file_fd = fileno(file); > < ftruncate(file_fd, psize); > 63c57 > < MAP_SHARED, file_fd, 0); > --- > > MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); > > > t480s: ~ $ sudo ./tmp > ERROR: Wrote page again, soft-dirty=0 (expect: 1 > > > > IMHO, while the check in vma_wants_writenotify() is correct and makes > sure that the pages are kept R/O by the generic machinery. We get > vma_wants_writenotify(), so we activate MM_CP_TRY_CHANGE_WRITABLE. The > wrong logic in can_change_pte_writable(), however, maps the page > writable again without caring about softdirty. > > At least that would be my explanation for the failure. But maybe I > messes up something else :) Correct, I missed that part. I verified that the same test also fails for me easily on a xfs file test of an old kernel. Let me touch up the commit message for that. Though I think I'll still keep the Fixes since the patch won't apply to before the commit, but I'll mention that's only for tracking purpose. [...] > Can we turn that into a vm selftest in > tools/testing/selftests/vm/soft-dirty.c, and also extend it by > MAP_SHARED froma file as above? Sure. I'll post a v3 with that. [...] > > @@ -48,8 +48,11 @@ static inline bool can_change_pte_writable(struct vm_area_struct *vma, > > if (pte_protnone(pte) || !pte_dirty(pte)) > > return false; > > > > - /* Do we need write faults for softdirty tracking? */ > > - if ((vma->vm_flags & VM_SOFTDIRTY) && !pte_soft_dirty(pte)) > > + /* > > + * Do we need write faults for softdirty tracking? Note, > > + * soft-dirty is enabled when !VM_SOFTDIRTY. > > + */ > > + if (!(vma->vm_flags & VM_SOFTDIRTY) && !pte_soft_dirty(pte)) > > return false; > > I wonder if we now want, just as in vma_wants_writenotify(), an early > check for IS_ENABLED(CONFIG_MEM_SOFT_DIRTY), to optimize this out > completely. Hmm, it may not even be an optimization issue, since when !CONFIG_MEM_SOFT_DIRTY we have VM_SOFTDIRTY defined as 0x0. It means !(vma->vm_flags & VM_SOFTDIRTY) will be constantly true even if soft dirty not compiled in. I'll add that check too. Thanks, -- Peter Xu