From patchwork Tue Dec 12 20:46:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Shahar X-Patchwork-Id: 177576 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7994156vqy; Tue, 12 Dec 2023 12:49:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IGi17+nVTBvjQQWoIE92bDri11S0+32FeCVL7c0z5xnH7Yb/FlpoQQwg629gTrctETV8P+s X-Received: by 2002:a05:6e02:1d0c:b0:35d:768b:6ebe with SMTP id i12-20020a056e021d0c00b0035d768b6ebemr8005988ila.26.1702414183289; Tue, 12 Dec 2023 12:49:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702414183; cv=none; d=google.com; s=arc-20160816; b=Gw5ZZQZJ8w8gB7LYP1pqYp4CQPrSUOqADwRJFdOQSGTKsTg+sBsZtL8jWUZ4PVUum1 H9Tvexstxx/Ne2BvWmnExa0fLvm3hdZEMgKfNTZh2wa/b+Q/xV2deb8G8Ga/w9Y5qdq3 tJWD8Z7L1rYWpnS6+zjy0fyRFeAzBSN6R3AlWHuUiaK2O5Mg/DPc4s28yOKOV8ErrkfE lI6odKz+YVcame1T5VCZJQ4rNwnjJOOQqH6G+iCeEYLPHmEHhmHYnNvc0yGenGCPcRLa diuPujK+ETG50y4pFMNZoN20bRMVdNQjJ+DDnrWP1AOze2UvEOuDN4aYoBuVpR9GB2Z7 QDVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=TFmE+BG4/EJDZrVEh/xZNdnTy9FeH/PqMcDgQWjrrOU=; fh=Y5ua58y+ybdOPwRkMynUdu+Hv1LrozBumh8skcuOhBI=; b=DQl6aRrJo5mKkkN1IYXjJDuqgpRVbnGI6PbCc9nuwn+JoSEbCQ7hhhegmbIb+gXVhC JACHK/1Qm9qigwoT2FZWmLXNe65V9KlxdHPzZ/m0NVx+3XfCkGFKJQLOtIoANfCvE/CS 89WLS5J6riQjEiZY8fmYbHeIEKas08El/mBCkKKnu8HUXyEPtxBoLNfKZOgcOBP0BfFE aYJ/q0gvJB4XIiQyk9HeKoUTRNQxZ6HE7/KM8LscoblIK5v9jrJLUt7Jq05B1S4C5Iz7 gikxW5pvKzRCnxjZKqey2rYa4jmO0VyJM0NwEf9NZS9ZJ3+Gd3qAswkpGGzm5j3UujBW VkyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=KO1fhvEq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id a23-20020a634d17000000b005ab2613a571si8302818pgb.495.2023.12.12.12.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 12:49:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=KO1fhvEq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id AF6508023719; Tue, 12 Dec 2023 12:49:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235222AbjLLUtV (ORCPT + 99 others); Tue, 12 Dec 2023 15:49:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235177AbjLLUsn (ORCPT ); Tue, 12 Dec 2023 15:48:43 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A27691FDA for ; Tue, 12 Dec 2023 12:47:48 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-db512266d27so6409844276.3 for ; Tue, 12 Dec 2023 12:47:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702414067; x=1703018867; darn=vger.kernel.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=TFmE+BG4/EJDZrVEh/xZNdnTy9FeH/PqMcDgQWjrrOU=; b=KO1fhvEqSnWjbbd24F9xNUUoNic6nJw5QlWdLiaY2/t6mmt2DuSGLbGWmtuJr2Et1t GqhUuBBAwUbG2cj2Xl8vHL2WpJK1O90k9XkTJxyqVAfyVSav/QVBguBih8lZ0qzAoy6U Zf0tzH8GCWmg2B3qlzb0ey9zvI446FRhDMCIDgqXpNr9lQfESw6uOeP3wvVfiBFIJbUT WUf0PY8RNQ9FZIcCA4emQ9BdMnJOxV0lHMw78fz3SfLxhXDndpnwf+dRgE0dMyFyvbh/ 5CY+5wTN9TQBbv3z2YWFqbECdObzcedrIToGy/BgdPfHvbcqcIy9fv1SudSqcWsmEEox RKNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702414067; x=1703018867; 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=TFmE+BG4/EJDZrVEh/xZNdnTy9FeH/PqMcDgQWjrrOU=; b=SrHjvZJYsRHz0gdUHkhnrIAoA4xsW6XcElKls+2++IcHkBnTfxk2WYBruJBQndaxwk pwzvlZQ4y+x8gG5JlCVSMLNarhkRhMFvbM4x4dmxHO+yXzSzHjMqrPOMt1iEYjy1Wy/1 iOyO6iqEzGDqAvMNZe+ZVfRVi6OllFTDfvRizKm8pf5LLLWWIrLRQOC+8sdOA2N51d21 UCsY1xx3mbEUB+jw9YS/1mX2EzSp0zT8eCWkyQP0OVndJOLnwqnmN5UortqrU/xfn422 Xkms54cHmArz3X67VXSjBQlk6Jbk2LOz9xw2xOSKtq00KwDRTk5ePemKuPUw0fN4ul91 SzFQ== X-Gm-Message-State: AOJu0Yx8rAVxcBuKpcVB5zeTtrzkBYbKXDnCcLt92awIf8BwNcKxen8b D3dGNf+i4CXjHIGuM+aLzSlvg8Ojsw== X-Received: from sagi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:241b]) (user=sagis job=sendgmr) by 2002:a25:d204:0:b0:dbc:cbd9:3cd0 with SMTP id j4-20020a25d204000000b00dbccbd93cd0mr566ybg.8.1702414067193; Tue, 12 Dec 2023 12:47:47 -0800 (PST) Date: Tue, 12 Dec 2023 12:46:42 -0800 In-Reply-To: <20231212204647.2170650-1-sagis@google.com> Mime-Version: 1.0 References: <20231212204647.2170650-1-sagis@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231212204647.2170650-28-sagis@google.com> Subject: [RFC PATCH v5 27/29] KVM: selftests: Propagate KVM_EXIT_MEMORY_FAULT to userspace From: Sagi Shahar To: linux-kselftest@vger.kernel.org, Ackerley Tng , Ryan Afranji , Erdem Aktas , Sagi Shahar , Isaku Yamahata Cc: Sean Christopherson , Paolo Bonzini , Shuah Khan , Peter Gonda , Haibo Xu , Chao Peng , Vishal Annapurve , Roger Wang , Vipin Sharma , jmattson@google.com, dmatlack@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 12 Dec 2023 12:49:38 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785110654579479345 X-GMAIL-MSGID: 1785110654579479345 Allow userspace to handle KVM_EXIT_MEMORY_FAULT instead of triggering TEST_ASSERT. From the KVM_EXIT_MEMORY_FAULT documentation: Note! KVM_EXIT_MEMORY_FAULT is unique among all KVM exit reasons in that it accompanies a return code of '-1', not '0'! errno will always be set to EFAULT or EHWPOISON when KVM exits with KVM_EXIT_MEMORY_FAULT, userspace should assume kvm_run.exit_reason is stale/undefined for all other error numbers. Signed-off-by: Sagi Shahar --- tools/testing/selftests/kvm/lib/kvm_util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index d024abc5379c..8fb041e51484 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1742,6 +1742,10 @@ void vcpu_run(struct kvm_vcpu *vcpu) { int ret = _vcpu_run(vcpu); + // Allow this scenario to be handled by the caller. + if (ret == -1 && errno == EFAULT) + return; + TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_RUN, ret)); }