From patchwork Tue Feb 7 00:21:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 53567 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2547930wrn; Mon, 6 Feb 2023 16:24:45 -0800 (PST) X-Google-Smtp-Source: AK7set/IOowLr8FhOP6oiY7VZuTS7oQpY5xUPkwwAgX5sb/T5TCoE8ZyFnUzh4a78g9mCi6olJT6 X-Received: by 2002:a62:3858:0:b0:580:fb8e:3044 with SMTP id f85-20020a623858000000b00580fb8e3044mr1328153pfa.22.1675729484875; Mon, 06 Feb 2023 16:24:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675729484; cv=none; d=google.com; s=arc-20160816; b=kgiGetbXErdHBRFtgNm9RUzQjzAq2QByxsbabtOmd35YSxRoiBiEQXy+gaYqz2sykZ yS6Nj8Z0GonzL7EzEIJbqbdDqhEDo/KsHW40HQ3UBIS+0GlaYrNSWMoxnVU8IfTuYcBb jjfAB1ct/iwNbjfKTUB2KQzYRwDaHG8zxEGKmmQ4hXb8cCMo+ak075YgtlYX/K5fJmw8 J/qI39bwnPr72R4hDGqQJjzeElN8ZKSIQaDLakQnBjv8Lotv5MZT4q/vnH9zl4RxODQ9 ynVpFSeoOqBNSJijantCtUChe/GpQPMu5JQF3fTjxbJ/ZBbc6wdygyIqRtZYDQw9RtU3 rbgA== 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:reply-to:dkim-signature; bh=Z+LmZZRuX+KyZW/71ICS7KxhCfKW5CHjrLQNU61de+A=; b=XnLFB4olhUXAE6WLzDXe0IltzsNcMQ3AZVxncrWC3mxXbkVldj0pIUClqP44IlzC7g gs6WqxDleLi6rwG3WU9vY89k+61Xp4xAIXAuvG1xoTlhhQHTAMLeZPncB6EWNax3jU20 hrPH2y9wA13ieqtsQu4dFUqS9vMOAK6tYnx4YYY4Gi44EGY/14evqccmZPA4md1KqJYn Nj51En9EOug1o7hMb+9SKYg+xTBtcE/B0/Lwv0P6xZOI9OFNUaMwenYQFmxgs4xSL+6G X2l903zxSpbL2KFiLukY8XS+Qpxo3jjo9aLArBeEh22UXGxau2f3gneUg/8TpSQJMKaB OV3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="l/9qGaSn"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y8-20020aa78048000000b0058bc338c9b2si12565189pfm.372.2023.02.06.16.24.32; Mon, 06 Feb 2023 16:24:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="l/9qGaSn"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230204AbjBGAWQ (ORCPT + 99 others); Mon, 6 Feb 2023 19:22:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230208AbjBGAWF (ORCPT ); Mon, 6 Feb 2023 19:22:05 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E19D32E60 for ; Mon, 6 Feb 2023 16:22:03 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id mm21-20020a17090b359500b00230aa18342bso1921985pjb.4 for ; Mon, 06 Feb 2023 16:22:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=Z+LmZZRuX+KyZW/71ICS7KxhCfKW5CHjrLQNU61de+A=; b=l/9qGaSnf0c5yPSH7xrquOODy/3TnXfj8KaD3epHTviVTmOJYgWndznufP1aYLuuOJ YcbUl1G15s146UHSB3syejf9+slsLGXulYhLZl94LQQTvZtL6CaIknehSmbIgdn4cuG8 KGf7Vkd1FQsk0Am3KInurKzNKnym94ZGoLzBolWTHVLKIaNveW2X9CjCTvidppbeAyyn YGN6dcxtuwBK5mRxnzrYu7GaEsHS91pz6AbfHdH4R0ek8afC+JCp0vWT7q+aprQRY/4k swb0UaCOdiztOvS54BhVN7lOq3Fw1VssYVcgxbKPjJIE87zu4m65o4HxiuQ0GwnuqPAJ obUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Z+LmZZRuX+KyZW/71ICS7KxhCfKW5CHjrLQNU61de+A=; b=ijba8I79UcAW7c3B2ue/VECLW6PDmJBJMdsMtDVzzNkR4HC27UGydn/k9s3nkFfh8j z+5wEnlgDJY+ED4YFtkliehYj4b02H9S/DNQVt2vP+uMImAPHSbY4fFN+qPt4wveUYYl GQwOOY1Rl1PGDtbMjU0trpLSJOv2sYpzwwdybmIu2beNv1nshyMnA3KT8y9+EIblxuxW 9taL6hbwuxShWFLrGjBPgBspEOpZ1zQnjEwhe9sxQ8qT6dNQccIqFLq06fEmDKhelFIu ws+SMOCjChFIAhw3chxqj8eUeJdJRgD7hV/h9See8AOVAAqfA1SgtBhkZEEqcV8xtj37 tDww== X-Gm-Message-State: AO0yUKXMMlylBRYw0o5TFKv0o6tBeftq2/GJmIQCFXvxOzOeqc88DhLm k1n5J7uHve1tIOvHD0UlKX5VnG+A6RY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:903:2309:b0:199:292f:dbc7 with SMTP id d9-20020a170903230900b00199292fdbc7mr225078plh.1.1675729323330; Mon, 06 Feb 2023 16:22:03 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 7 Feb 2023 00:21:56 +0000 In-Reply-To: <20230207002156.521736-1-seanjc@google.com> Mime-Version: 1.0 References: <20230207002156.521736-1-seanjc@google.com> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230207002156.521736-4-seanjc@google.com> Subject: [PATCH v2 3/3] KVM: SVM: WARN if GATag generation drops VM or vCPU ID information From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Alejandro Jimenez , Suravee Suthikulpanit X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757129720600860400?= X-GMAIL-MSGID: =?utf-8?q?1757129720600860400?= WARN if generating a GATag given a VM ID and vCPU ID doesn't yield the same IDs when pulling the IDs back out of the tag. Don't bother adding error handling to callers, this is very much a paranoid sanity check as KVM fully controls the VM ID and is supposed to reject too-big vCPU IDs. Signed-off-by: Sean Christopherson Reviewed-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 326341a22153..cfc8ab773025 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -43,12 +43,21 @@ #define AVIC_VM_ID_SHIFT HWEIGHT32(AVIC_PHYSICAL_MAX_INDEX_MASK) #define AVIC_VM_ID_MASK (GENMASK(31, AVIC_VM_ID_SHIFT) >> AVIC_VM_ID_SHIFT) -#define AVIC_GATAG(x, y) (((x & AVIC_VM_ID_MASK) << AVIC_VM_ID_SHIFT) | \ - (y & AVIC_VCPU_ID_MASK)) #define AVIC_GATAG_TO_VMID(x) ((x >> AVIC_VM_ID_SHIFT) & AVIC_VM_ID_MASK) #define AVIC_GATAG_TO_VCPUID(x) (x & AVIC_VCPU_ID_MASK) -static_assert(AVIC_GATAG(AVIC_VM_ID_MASK, AVIC_VCPU_ID_MASK) == -1u); +#define __AVIC_GATAG(vm_id, vcpu_id) ((((vm_id) & AVIC_VM_ID_MASK) << AVIC_VM_ID_SHIFT) | \ + ((vcpu_id) & AVIC_VCPU_ID_MASK)) +#define AVIC_GATAG(vm_id, vcpu_id) \ +({ \ + u32 ga_tag = __AVIC_GATAG(vm_id, vcpu_id); \ + \ + WARN_ON_ONCE(AVIC_GATAG_TO_VCPUID(ga_tag) != (vcpu_id)); \ + WARN_ON_ONCE(AVIC_GATAG_TO_VMID(ga_tag) != (vm_id)); \ + ga_tag; \ +}) + +static_assert(__AVIC_GATAG(AVIC_VM_ID_MASK, AVIC_VCPU_ID_MASK) == -1u); static bool force_avic; module_param_unsafe(force_avic, bool, 0444);