From patchwork Mon Sep 18 14:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 141591 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2980671vqi; Mon, 18 Sep 2023 15:05:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSNcjFt9ePtnipYzCS/4cwWZfCcrgsp6WYzpMyi+YTtK2bjMNV+q030IeR7U81vXcCA+Sw X-Received: by 2002:a05:6a20:2583:b0:153:8db6:c4fe with SMTP id k3-20020a056a20258300b001538db6c4femr10071800pzd.39.1695074722966; Mon, 18 Sep 2023 15:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695074722; cv=none; d=google.com; s=arc-20160816; b=ijGwe+fhyOwifJ2VUcMB0V/FqL27Rp7LID85xZdoX18aeoWXMxn2wI2HuTOM+BA6wh kLCouFp0i9FsI0qehesygTUANdQRl4oNCs9R/Yi78vPoof0e0hmfFXxeGqSGVcV7JKN5 5YGK9/Em9B7XvJ5Eo/EM6VzaYn2iYWwx4F48P/ch0L/Lrs1wXBxpZiyvRQO8GJJFNQsW vCIq6v3lGON6tUpUVAnqA21afx87Ve+PmwBCBVxugSMLYXf/AppgQbEoqykOZCuzfYWa RS2zWAN/WeBDaC9StvQ7JkNXVrpwcbxJJ1V6t8WLB3EXZKna6Iyd50MFVf7aq1H0SI4w IdVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=daQKqPz4lN3mboBM/jvRe9yPAi0c9kCRdyVAIEbpHSg=; fh=NVKswJvclYk1MEC7AfFzo67YIylApYMwZ7eFzXKDgdk=; b=iCogNk1CQqKlOiueF+Qxm/nv1RODA8LmMlM3/DFK86TujSHs7cPuo7ROnA6qneFfJv OX3hTcRC+LhsQc+SVsuUWdJ9SCSgEj5SDuu5WI9Cf6BcnDoj2P+MTAPALblSm+ffF5n8 uTbzDHpQoKA0Yz7x5t8zKYhPKX493LsXn12i8vUmmQTm1uZzliheGo7qoG9wwglXtUBm +bcF+bHUwIq4nL0AUOHXAwkaa6qoksrYjoYJFvVJAKnv6Sfwby3SPGKPQkZLuPey7eeO BqaAdqozCD2AJXzTz2mSOZmbiTaEGsEx8UpRAyM942GtzbaBIPWgOECgbSxIMfQRPbQP PfLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=oBLNzGO4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bv190-20020a632ec7000000b00565f611a1f8si8145399pgb.263.2023.09.18.15.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 15:05:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=oBLNzGO4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 5642C8093D7E; Mon, 18 Sep 2023 09:21:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230217AbjIRQVV (ORCPT + 25 others); Mon, 18 Sep 2023 12:21:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230120AbjIRQVR (ORCPT ); Mon, 18 Sep 2023 12:21:17 -0400 Received: from mail.xenproject.org (mail.xenproject.org [104.130.215.37]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D85441334; Mon, 18 Sep 2023 09:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=daQKqPz4lN3mboBM/jvRe9yPAi0c9kCRdyVAIEbpHSg=; b=oBLNzGO4uvOnKtz8aUtc1XyVxn xjknr6v97cYtOEoKTO6DeCSZmbfMiIWRqSJN5Yq6C9sWz8nuXeVQOsByMxoRtY9wkrfN74+qKVzlb fr9kIevqkNYOni4qHhEMTyrFam3PH81rLq9vzAudDvZuSRK5QpaZn6MGhEG2uJC14ZRE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiFSh-0003UC-Av; Mon, 18 Sep 2023 14:42:55 +0000 Received: from ec2-63-33-11-17.eu-west-1.compute.amazonaws.com ([63.33.11.17] helo=REM-PW02S00X.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qiFRK-0006IJ-U1; Mon, 18 Sep 2023 14:41:31 +0000 From: Paul Durrant To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Durrant , Sean Christopherson , Paolo Bonzini , David Woodhouse Subject: [PATCH v3 12/13] KVM: selftests / xen: don't explicitly set the vcpu_info address Date: Mon, 18 Sep 2023 14:41:10 +0000 Message-Id: <20230918144111.641369-13-paul@xen.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230918144111.641369-1-paul@xen.org> References: <20230918144111.641369-1-paul@xen.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 18 Sep 2023 09:21:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777414673086508376 X-GMAIL-MSGID: 1777414673086508376 From: Paul Durrant If the vCPU id is set and the shared_info is mapped using HVA then we can infer that KVM has the ability to use a default vcpu_info mapping. Hence we can stop setting the address of the vcpu_info structure. NOTE: We still explicitly set vcpu_info half way through testing (to point at exactly the place it already is) to make sure that setting the attribute does not fail. Signed-off-by: Paul Durrant Reviewed-by: David Woodhouse --- Cc: Sean Christopherson Cc: Paolo Bonzini Cc: David Woodhouse v3: - Add a guest sync point to set the vcpu_info attribute v2: - New in this version. --- .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c b/tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c index e786fa370140..7e74b3063437 100644 --- a/tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +++ b/tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c @@ -68,6 +68,7 @@ enum { TEST_POLL_TIMEOUT, TEST_POLL_MASKED, TEST_POLL_WAKE, + SET_VCPU_INFO, TEST_TIMER_PAST, TEST_LOCKING_SEND_RACE, TEST_LOCKING_POLL_RACE, @@ -327,6 +328,10 @@ static void guest_code(void) GUEST_SYNC(TEST_POLL_WAKE); + /* Set the vcpu_info to point at exactly the place it already is to + * make sure the attribute is functional. */ + GUEST_SYNC(SET_VCPU_INFO); + /* A timer wake an *unmasked* port which should wake us with an * actual interrupt, while we're polling on a different port. */ ports[0]++; @@ -549,7 +554,10 @@ int main(int argc, char *argv[]) .type = KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO, .u.gpa = VCPU_INFO_ADDR, }; - vcpu_ioctl(vcpu, KVM_XEN_VCPU_SET_ATTR, &vi); + + if (!has_vcpu_id || !has_shinfo_hva) { + vcpu_ioctl(vcpu, KVM_XEN_VCPU_SET_ATTR, &vi); + } struct kvm_xen_vcpu_attr pvclock = { .type = KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO, @@ -903,6 +911,10 @@ int main(int argc, char *argv[]) alarm(1); break; + case SET_VCPU_INFO: + vcpu_ioctl(vcpu, KVM_XEN_VCPU_SET_ATTR, &vi); + break; + case TEST_TIMER_PAST: TEST_ASSERT(!evtchn_irq_expected, "Expected event channel IRQ but it didn't happen");