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 6985BEB64DA for ; Wed, 5 Jul 2023 16:15:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06DE58D0003; Wed, 5 Jul 2023 12:15:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01E748D0001; Wed, 5 Jul 2023 12:15:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E280A8D0003; Wed, 5 Jul 2023 12:15:30 -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 D47698D0001 for ; Wed, 5 Jul 2023 12:15:30 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7F012B05A9 for ; Wed, 5 Jul 2023 16:15:29 +0000 (UTC) X-FDA: 80978058378.05.C29B70C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 28D3A20002 for ; Wed, 5 Jul 2023 16:15:26 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WvPEzUC3; spf=pass (imf13.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688573727; 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=41PfzToKq/ZuIyZbmkk75ijXjF0S6iwGioZqQv3YYas=; b=hxb3drJ/n10eOM8MHPpcQS0RxC25T331pB1XXFtRM1yDeV/e2Nk5NQYLlKlufNpiZO4UHO sN1ma/Re2p/DJCpY6C087ERh5PPk7OZkdlN+EmXqIc7xiFC/zkTlTeNzy2s/PKxZG1Jxqc TSKtdQC4oLMpSpyLC5yJIPyESFYDb2M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688573727; a=rsa-sha256; cv=none; b=Qpp1YK+Ba83vPcc6cU73x04CJI6adOpv+eaqs8EGjmD4HaGQPmrQ9ZXRSaC1Z/Bww9/Zm5 Vz/WudaOA6Hg6YnQdVaj/1dq8P8zBQLbT+8Tf9pGd7onvLM6ZqIUfE23V2+UNtqyTszvaS AmMv9TQvOUlDbT3x5vN/l4+rBGxyHSs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WvPEzUC3; spf=pass (imf13.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688573726; 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=41PfzToKq/ZuIyZbmkk75ijXjF0S6iwGioZqQv3YYas=; b=WvPEzUC3lj1tQOlUj9N/wJLicQhC5OzYowVlGfmvsnNbqIXFsF3WjhHi49t9lJkx822mxc QMoC4cYOM0aGYjQJEdO7X6FlywRjNuBQ5c/SnCzNp0TAGqr97T6zU+n6z7A/eD/6g9tU0r eRwJHE22oO0qTwQsQbPEoVehlC/RXP8= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-550-y0XwVTKWP3ikmatv6dERHA-1; Wed, 05 Jul 2023 12:15:25 -0400 X-MC-Unique: y0XwVTKWP3ikmatv6dERHA-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-401e1fc831fso10145451cf.1 for ; Wed, 05 Jul 2023 09:15:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688573725; x=1691165725; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=41PfzToKq/ZuIyZbmkk75ijXjF0S6iwGioZqQv3YYas=; b=NQpasDjuKJiUy59iQ078TUjpzuwwRQKod4cA3KAphmgdUuq+iR/p3nNHhEh4fI9YbM O4Okey6wlvBMQllBzowxj72spxWeyjt3TueUDilBEK7PdEI/bZyzyrbE3F0xXY6blOEI 27ILRpwnO2lLKfKWbllEeZl2/AoPIU+ieneMhjglKpfn+KTADbRiLpqPC0Exri2k8oFP Cprjtd242r938bK+9W/8qRnKvbeL7ngmsH/piUaWMRwhIs9umhbHBg6ZQrt/3q7Zyxfa ujv9radGMe/zdb7JXKejyn94HtThmItAnfmxMRp2I7wH1CNsjG4TG72q19jau8I+1zM7 CrqQ== X-Gm-Message-State: AC+VfDx0N/G5ThWjKVp7F0yghOGkeZsPamaK4OfjInpkiuvsN7kovVZF vjngrmLsyBKhhHM5jJ7cUKqphRwt5AZps8MiiLQSpYwzi4Mc1Hcuz7jFmafbmTH+kUAtM1zqgd1 ZAtIrc8q0Mkg= X-Received: by 2002:a05:622a:1308:b0:403:28e3:8ab7 with SMTP id v8-20020a05622a130800b0040328e38ab7mr22343573qtk.5.1688573724894; Wed, 05 Jul 2023 09:15:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4yBoNCHR9da42kEmUepXtWH/uy0qhFWUMq3XZYbfp+4KgDzX7xEj2WTC/YgjKg5UtSOPzSvA== X-Received: by 2002:a05:622a:1308:b0:403:28e3:8ab7 with SMTP id v8-20020a05622a130800b0040328e38ab7mr22343534qtk.5.1688573724597; Wed, 05 Jul 2023 09:15:24 -0700 (PDT) Received: from x1n (cpe5c7695f3aee0-cm5c7695f3aede.cpe.net.cable.rogers.com. [99.254.144.39]) by smtp.gmail.com with ESMTPSA id e16-20020ac80110000000b0040346ce43a5sm6442576qtg.44.2023.07.05.09.15.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 09:15:24 -0700 (PDT) Date: Wed, 5 Jul 2023 12:15:22 -0400 From: Peter Xu To: James Houghton Cc: Axel Rasmussen , Alexander Viro , Andrew Morton , Christian Brauner , David Hildenbrand , Huang Ying , Hugh Dickins , Jiaqi Yan , Jonathan Corbet , "Liam R. Howlett" , Miaohe Lin , Mike Kravetz , "Mike Rapoport (IBM)" , Muchun Song , Nadav Amit , Naoya Horiguchi , Shuah Khan , ZhangPeng , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH v2 1/6] mm: userfaultfd: add new UFFDIO_POISON ioctl Message-ID: References: <20230629205040.665834-1-axelrasmussen@google.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 X-Rspamd-Queue-Id: 28D3A20002 X-Rspam-User: X-Stat-Signature: xucy4c8uh5yjypxksjdixokaozy7exh7 X-Rspamd-Server: rspam03 X-HE-Tag: 1688573726-897279 X-HE-Meta: U2FsdGVkX19QOmDE01s2RPuR4vtJKMu6h4l0QYJYzPisSxjqgYcLamlCh1uj9tsfOKqX4Op0UfsifIDVMGq+X2dIaoWGS0MkSgWrrKKY6WvYjrfbcNkXmoO6z4C72eOeJJKehA1vLdmQ32ZaGo7pP2ZFaRKQtgAUdthYdWWt0UCrJMOU1XBEEQn7HTbr2itHEsZm8huS11AiuSTRH5iz3cLQGwGtetip8YwR59xHnY9ZWRTYF2zaP3Z7/Sk8D0k2ZPFbJd0IOUddTDeDrAUs3D8KrND3Cupjy1S4i4cwv9HQ03U4XfaO/NDxCdgl5sPEsEmL+++f86+Ioq5StSWe05J6iOr0uWuCDjrB5jIDzBKbDhEmpDh6C1RzIwX7Nq4IO+XdXVxFT+4l4vYvVpkox/stcbxR9ZNEYjxeanz7IInctWssYuHpH+vIIIj78OiX0jTJqBl6Uo4dxfLIP7sm6JVxIfn0hI0zikIQwBeumngoaux5bWx/4AyQE6ivQlVi3d9p3oCBO9h8UdtLdDwzn109Ux/IkGUujS++jiFsxDifhQ0BlN1c1Popj9HYAvtfFOIJLmaohHDvz41FgfItUiIIm1abFiFRUf7PAnic9rMwAxpP5bq9oOPGdY5yLqG4vHCMdO6jMAznUDUqw1zEcfk/M0JoeAaFS4yGt8XhPb15h+E8W5ot337n5Ksg3dRDUUW48cAm2cuo3Vz87Q3QeGx0GoFo5/vTnRu9PY4AneBeof7Sl1M99Htrm6mJ5lTOCtslF9+QmK4O9TIpbByKxxoAPyFo0ef2Wzc511s9ortawcHJdKepZ9NPsLfuCRxxRxaOnJp6ReTxoDwS88alg6wHh2k8NKgoB6VEwLmdCm24Y8mswwvfmDHF7gn8j+dRMnhhA9kutSLCnygrYY6ed59UMdqYC3V9iPOkVTPmOzeZy2/c/fqvroUhGdnbThZqk+3PDEQgvMj9+FuGgTU gKvPRxqa ptWgpFbzAQaSxqslTvdQSJwajqYdeqSDw4UCt4CPu1CWSei4aELMXGjeAi48X4Zp5jXivFb/GDlzpXT3S/Q610OnXx7956K8htBK8ovvZ4np9B3aw3hG+oGzWFXqNeXDQM41Hkry7YouLoC0yB8idKC60jLo+jT+sn8xCerMNGT0gPh47/mO78o0sVmLgaDsFB9d+wsCw0L3oLRaH6KrV0pxYoJ8GaBF1cVKVIe2A3Wb3M2s2LY44YsQ9DXe591kN7iWziH5oCbe002ciqCnAIlSc6pTFQTWTxYR3aCw32dTRFcLxFIpdURZfPob299TRYma5M7QisMn3GlBNDOpmzUyl4AqY3ExFcY7InMue/u7ijjeZoYkQwVK1GvUFsA2m6CcPXUkDbmHtTGQKvlEbnja81uf//1KRi+gd 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 Wed, Jul 05, 2023 at 09:09:19AM -0700, James Houghton wrote: > > > diff --git a/include/linux/swapops.h b/include/linux/swapops.h > > > index 4c932cb45e0b..8259fee32421 100644 > > > --- a/include/linux/swapops.h > > > +++ b/include/linux/swapops.h > > > @@ -394,7 +394,8 @@ typedef unsigned long pte_marker; > > > > > > #define PTE_MARKER_UFFD_WP BIT(0) > > > #define PTE_MARKER_SWAPIN_ERROR BIT(1) > > > -#define PTE_MARKER_MASK (BIT(2) - 1) > > > +#define PTE_MARKER_UFFD_POISON BIT(2) > > > > One more tab. > > > > Though I remembered the last time we discussed IIRC we plan to rename > > SWAPIN_ERROR and reuse it, could you explain why a new bit is still needed? > > > > I think I commented this but I'll do it again: IIUC any existing host > > swapin errors for guest pages should be reported as MCE too, afaict, > > happened in kvm context. > > I think swapin errors are treated differently than poison. Swapin > errors get VM_FAULT_SIGBUS, and poison gets VM_FAULT_HWPOISON, so > UFFDIO_POISON should also get VM_FAULT_HWPOISON (so that's what Axel > has implemented). And I think that needs a separate PTE marker. My question was, should we also make SWAPIN_ERROR return VM_FAULT_HWPOISON always? Just to recap from what I already commented above - if a guest page got error in swapin due to block sector failures, it should be treated as VM_FAULT_HWPOISON too, IMHO. IOW, I think current SWAPIN_ERROR is wrong when in kvm context and we should fix it first. > > > > > > +#define PTE_MARKER_MASK (BIT(3) - 1) > > > > > > static inline swp_entry_t make_pte_marker_entry(pte_marker marker) > > > { > > > diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h > > > index ac7b0c96d351..ac8c6854097c 100644 > > > --- a/include/linux/userfaultfd_k.h > > > +++ b/include/linux/userfaultfd_k.h > > > @@ -46,6 +46,7 @@ enum mfill_atomic_mode { > > > MFILL_ATOMIC_COPY, > > > MFILL_ATOMIC_ZEROPAGE, > > > MFILL_ATOMIC_CONTINUE, > > > + MFILL_ATOMIC_POISON, > > > NR_MFILL_ATOMIC_MODES, > > > }; > > > > > > @@ -83,6 +84,9 @@ extern ssize_t mfill_atomic_zeropage(struct mm_struct *dst_mm, > > > extern ssize_t mfill_atomic_continue(struct mm_struct *dst_mm, unsigned long dst_start, > > > unsigned long len, atomic_t *mmap_changing, > > > uffd_flags_t flags); > > > +extern ssize_t mfill_atomic_poison(struct mm_struct *dst_mm, unsigned long start, > > > + unsigned long len, atomic_t *mmap_changing, > > > + uffd_flags_t flags); > > > extern int mwriteprotect_range(struct mm_struct *dst_mm, > > > unsigned long start, unsigned long len, > > > bool enable_wp, atomic_t *mmap_changing); > > > diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h > > > index 66dd4cd277bd..62151706c5a3 100644 > > > --- a/include/uapi/linux/userfaultfd.h > > > +++ b/include/uapi/linux/userfaultfd.h > > > @@ -39,7 +39,8 @@ > > > UFFD_FEATURE_MINOR_SHMEM | \ > > > UFFD_FEATURE_EXACT_ADDRESS | \ > > > UFFD_FEATURE_WP_HUGETLBFS_SHMEM | \ > > > - UFFD_FEATURE_WP_UNPOPULATED) > > > + UFFD_FEATURE_WP_UNPOPULATED | \ > > > + UFFD_FEATURE_POISON) > > > #define UFFD_API_IOCTLS \ > > > ((__u64)1 << _UFFDIO_REGISTER | \ > > > (__u64)1 << _UFFDIO_UNREGISTER | \ > > > @@ -49,12 +50,14 @@ > > > (__u64)1 << _UFFDIO_COPY | \ > > > (__u64)1 << _UFFDIO_ZEROPAGE | \ > > > (__u64)1 << _UFFDIO_WRITEPROTECT | \ > > > - (__u64)1 << _UFFDIO_CONTINUE) > > > + (__u64)1 << _UFFDIO_CONTINUE | \ > > > + (__u64)1 << _UFFDIO_POISON) > > > #define UFFD_API_RANGE_IOCTLS_BASIC \ > > > ((__u64)1 << _UFFDIO_WAKE | \ > > > (__u64)1 << _UFFDIO_COPY | \ > > > + (__u64)1 << _UFFDIO_WRITEPROTECT | \ > > > (__u64)1 << _UFFDIO_CONTINUE | \ > > > - (__u64)1 << _UFFDIO_WRITEPROTECT) > > > + (__u64)1 << _UFFDIO_POISON) > > > > May not be a large deal, but it's still better to declare the feature & > > ioctls after all things implemented. Maybe make these few lines > > (UFFD_API*, and the new feature bit) as the last patch to enable the > > feature? > > I agree. Another option would be to have a separate feature for > UFFDIO_POISON for hugetlb, but I don't think we should do that. :) Yeah let's make the features "memory-type-free" if possible. :) Thanks, -- Peter Xu