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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ACC49C4167B for ; Fri, 1 Dec 2023 17:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=px+/+Sql4PlHnXvHWUBHRi2MI6tNbEZqM90SzY5LIV4=; b=HpPPMq/8X/hT4ULoy4cYvAuU35 YIDpclNgNkeAL47v4uk/WeV4riu3KLd/3kBQ+i7aA1tHsi5sF8l0Sl1KpFvSjbME9tLLIzHOzz9xj xXLSbBN0INPs/W3lhLUuergYVi5WHa43Hh71fYN/IckoKquyo+jkBznxHxsA65KI22Hy9YqZSPsbG gHASwpI7vxbpcTYZTZE7PZ3DAjqMtPMnnHdyWBPOIh3GLczJ87mLhJD78c85nmbfzWFlacikAkvtL aAP43LQSVlrYxifqi+XjagKYgQ53J3FrvJLB8pgONLttDCSe64yp3YbIZsYjAbkMnkXVVUgzdFiAD CB/2IjxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r96wk-00EHan-26; Fri, 01 Dec 2023 17:04:58 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r96wh-00EHa7-0x for linux-arm-kernel@lists.infradead.org; Fri, 01 Dec 2023 17:04:56 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-db53f73eefeso956848276.0 for ; Fri, 01 Dec 2023 09:04:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701450292; x=1702055092; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=YbmCSI5K+Qp+wla/FUZNboDkH6vkaCc9VLdnolKakNc=; b=LK+EE6rzmlIhcRXg4z36n6h5b0njSw8bqxb+2fZgjvOovyE+eEq2vXQbQdCpXAAaX+ gmaSJqSqncy2any34lgebK5+90+fB/wsw79AzIZldMqfCzjS0+3HWd5DDtmZeZZWzlj4 Uwo1VitYYE5AJ+5ZxjOBOZqCi7imRC1KLF50DjTRV9b+1k1G1bF8TusMh03cS1KXdLPX bd8KLZUlXOJG7lWAJy/KudMQ3xj7XWz5hz185XfGDeGUubb7fgrAI+ZCp8Fs3c6An+tY mpW21orRJ3T/XRm4bllDsNWDzkKUPIub30XQOKIG3vlKRosmGVeRk0y3WrIj21ElXwKB jq1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701450292; x=1702055092; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YbmCSI5K+Qp+wla/FUZNboDkH6vkaCc9VLdnolKakNc=; b=mtGKlaFosSbInmZQycNuo7ljcIo3mKUmKTRr5V5/lnCp/Tzhr0oiGt6EEuImry7Fiw ztLKy/1rK5oHHrEvLiFyrnWbhI+seAI6+626kXCMLWH4ybHHdfmMWZ3+vJZF9ZXITRKy r2HRNrFyo9bPJYPfkhOACuR3lmKjQp3IbYzblgh+dwMjO20JGd4CJQsH6LBSwu+DJCnH coOOO16466gK/+11jUtuVnjoIkcS4/oCqJ+dme4GT7d/QUeg/+zjLxMp6K1nQpO9j9Ca I+vjUAsw2aTXgnOXP+PZcZI1bLsJUJJpmzZlRgpqKItWZfZiyLN4gicV3COkxW0cSUpD x9SQ== X-Gm-Message-State: AOJu0YxZwBA6l9Mk3VML8Jw8ZCjxLfVdqeBFmAC03r5s/BtJubnW8VXX +/WQAHzYNDJ9ZlD2NQCmn6DBYrdYsWQ= X-Google-Smtp-Source: AGHT+IEa3BfWc92nmp+AtwxI8x7qhWNabfXhEQhxlZ9l+TV5/mqVnAJW8EBvcmW340xIWHXBNkD9Ysp+RPg= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:6e83:0:b0:d9a:e3d9:99bd with SMTP id j125-20020a256e83000000b00d9ae3d999bdmr780648ybc.5.1701450292702; Fri, 01 Dec 2023 09:04:52 -0800 (PST) Date: Fri, 1 Dec 2023 09:04:51 -0800 In-Reply-To: <20231123003513.24292-3-ankita@nvidia.com> Mime-Version: 1.0 References: <20231123003513.24292-1-ankita@nvidia.com> <20231123003513.24292-3-ankita@nvidia.com> Message-ID: Subject: Re: [PATCH v2 2/4] mm: Add poison error check in fixup_user_fault() for mapped pfn From: Sean Christopherson To: ankita@nvidia.com Cc: jgg@nvidia.com, alex.williamson@redhat.com, naoya.horiguchi@nec.com, akpm@linux-foundation.org, tony.luck@intel.com, bp@alien8.de, linmiaohe@huawei.com, rafael@kernel.org, lenb@kernel.org, james.morse@arm.com, shiju.jose@huawei.com, bhelgaas@google.com, pabeni@redhat.com, yishaih@nvidia.com, shameerali.kolothum.thodi@huawei.com, kevin.tian@intel.com, aniketa@nvidia.com, cjia@nvidia.com, kwankhede@nvidia.com, targupta@nvidia.com, vsethi@nvidia.com, acurrid@nvidia.com, apopple@nvidia.com, anuaggarwal@nvidia.com, jhubbard@nvidia.com, danw@nvidia.com, mochs@nvidia.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-edac@vger.kernel.org, linux-acpi@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231201_090455_341739_DB269542 X-CRM114-Status: GOOD ( 23.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Nov 23, 2023, ankita@nvidia.com wrote: > From: Ankit Agrawal > > The fixup_user_fault() currently does not expect a VM_FAULT_HWPOISON > and hence does not check for it while calling vm_fault_to_errno(). Since > we now have a new code path which can trigger such case, change > fixup_user_fault to look for VM_FAULT_HWPOISON. > > Also make hva_to_pfn_remapped check for -EHWPOISON and communicate the > poison fault up to the user_mem_abort(). I would much prefer the KVM change be split out to its own patch, I see no reason why it needs to be bundled with the fixup_user_fault() change. KVM will set pfn to KVM_PFN_ERR_FAULT before and after the fixup_user_fault() change. > Signed-off-by: Ankit Agrawal > --- > mm/gup.c | 2 +- > virt/kvm/kvm_main.c | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/mm/gup.c b/mm/gup.c > index 231711efa390..b78af20a0f52 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1414,7 +1414,7 @@ int fixup_user_fault(struct mm_struct *mm, > } > > if (ret & VM_FAULT_ERROR) { > - int err = vm_fault_to_errno(ret, 0); > + int err = vm_fault_to_errno(ret, FOLL_HWPOISON); > > if (err) > return err; > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 486800a7024b..2ff067f21a7c 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2731,6 +2731,12 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool interruptible, > r = hva_to_pfn_remapped(vma, addr, write_fault, writable, &pfn); > if (r == -EAGAIN) > goto retry; > + > + if (r == -EHWPOISON) { > + pfn = KVM_PFN_ERR_HWPOISON; > + goto exit; > + } > + > if (r < 0) > pfn = KVM_PFN_ERR_FAULT; I vote for if (r == -EHWPOISON) pfn = KVM_PFN_ERR_HWPOISON; else if (r < 0) pfn = KVM_PFN_ERR_FAULT; or even opportunstically fix the < 0 weirdness: if (r == -EHWPOISON) pfn = KVM_PFN_ERR_HWPOISON; else if (r) pfn = KVM_PFN_ERR_FAULT; It's rather confusing to see a goto in one error path but an effective fallthrough in a different error path, i.e. gives the impression that KVM_PFN_ERR_HWPOISON has some special behavior that doesn't apply to KVM_PFN_ERR_FAULT. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel