From patchwork Mon Aug 15 23:38:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 12944248 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2652C00140 for ; Tue, 16 Aug 2022 03:08:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229722AbiHPDIt (ORCPT ); Mon, 15 Aug 2022 23:08:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231434AbiHPDIR (ORCPT ); Mon, 15 Aug 2022 23:08:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D8002E8C94; Mon, 15 Aug 2022 16:39:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 297D8B8124F; Mon, 15 Aug 2022 23:39:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5854CC433D7; Mon, 15 Aug 2022 23:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660606745; bh=qmjZ4VfoErl0HUaV16z74Z18RW6WrpKKhPI4toHPMiY=; h=From:To:Cc:Subject:Date:From; b=Pd7EVekyiPNtM88omvFi3jbVRbWlsDJceMzUgfD8cUujsjGv73srxyTCXRA6djrIM FtVwpy6t+SOUZmR6p1yio1BTGiNQEZkpXQsJB5wdEQrII8kEzhr8avKUGAye3sFa9x Y11MKVyGq1i9TQPkTAqkALkSmPoGkMBBSFGMWS91u/O2pkYg+C8ugT+wSAHDpolIGN VLbFoRTJ/U/bSOBxfE1FsJfF5itngziAukRG2dheOTtXThOVQ2WgjKaOIcVeSRzH8j ylyRhizcH+XoRDMMNmujGSU7QaCDAYe7XkKjRh4MSysfdjyU+CIB6bRd5QY1zEJ7CP kkOJx71oyW6Og== From: Jarkko Sakkinen To: Dave Hansen , linux-sgx@vger.kernel.org Cc: Haitao Huang , Vijay Dhanraj , Jarkko Sakkinen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , Reinette Chatre , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH 1/2] x86/sgx: Handle VA page allocation failure for EAUG on PF. Date: Tue, 16 Aug 2022 02:38:59 +0300 Message-Id: <20220815233900.11225-1-jarkko@kernel.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org From: Haitao Huang VM_FAULT_NOPAGE is expected behaviour for -EBUSY failure path, when augmenting a page, as this means that the reclaimer thread has been triggered, and the intention is just to round-trip in ring-3, and retry with a new page fault. Fixes: 5a90d2c3f5ef ("x86/sgx: Support adding of pages to an initialized enclave") Signed-off-by: Haitao Huang Tested-by: Vijay Dhanraj Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen --- I rewrote the commit message because it was not explanatory enough, added the missing fixes tag, and all cumulated tags. arch/x86/kernel/cpu/sgx/encl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c index 24c1bb8eb196..de92c1c8b79d 100644 --- a/arch/x86/kernel/cpu/sgx/encl.c +++ b/arch/x86/kernel/cpu/sgx/encl.c @@ -344,8 +344,11 @@ static vm_fault_t sgx_encl_eaug_page(struct vm_area_struct *vma, } va_page = sgx_encl_grow(encl, false); - if (IS_ERR(va_page)) + if (IS_ERR(va_page)) { + if (PTR_ERR(va_page) == -EBUSY) + vmret = VM_FAULT_NOPAGE; goto err_out_epc; + } if (va_page) list_add(&va_page->list, &encl->va_pages);