Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp889636rwe; Wed, 31 Aug 2022 12:57:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR7+SBFBKKuKqQGAg4mSiGe+R72lRsiwg/fmeqH/d2P+xh/d/MR3WH3FyiTFN2Zb/L1Tz8D5 X-Received: by 2002:a05:6402:3509:b0:43e:d80b:44a8 with SMTP id b9-20020a056402350900b0043ed80b44a8mr26451588edd.255.1661975865353; Wed, 31 Aug 2022 12:57:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661975865; cv=none; d=google.com; s=arc-20160816; b=ALLc0u4nUvO6BkGnsiM/aKxfq6wKO/wcVY7/AcONr+xkWJPaq1rLoi1KInDwhNUXeu f0faGlLqQ38electa4qekBX6GH1kRi8+1B05BGMHh8YiCIZIY01P0XALI3bYxGvndQEu RtUBzieEEBR/GmOVijzh9ojhCsf9pXs/8KXdXRnoqQge99/GO9gh77LvpCIJL4nMaWD1 vi44EA/5Ay2YGwHhf6BqRSGN30vZtAGsgar7QWA2S/p8aAQktmo5WylLRQGHFENhjTs+ hXvnzfpUjCkKJkhbqata+9XRfDEbVtcggDMME5m/krLuji39XdOyeFL5DF5vwa01VdaQ uzWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=zHM07eO+Ah42PE786kyCsTV2son2tBDz1ynwCBNBtXk=; b=yXK4t1Az5p7+hAxLIzAu7nq7Cs/wy20gEjyRqrK0i+Az+HdIXJbzvBj2KEpqpUybCX B4NCTmr9wIezYOtASCp5TuQv284kURk5t6Czurw4YbFFWNh9R81Cads3GYgBZ9zRISFP 5Zfk+zDkhM303r8moFbAjw/6tb4oHYymYRPxpt7ZU4poVbM3bEQ9XJhgfhRDYRSSsCAM fSww+QDE6ZRl3U+8a4r4Uc5rjJvh1lC5GHJKwcWHfgJrXtbdfPVho89lwTCTVWEklsDI wEumuq38ARXK2yOaUXgb+pL9zXtORYPLUIBCOJqUJWxfrqrnR6d293zqVjJM+tVMHF5c pYMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=dIuoJFUP; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sb14-20020a1709076d8e00b007315809ec88si11965265ejc.399.2022.08.31.12.57.20; Wed, 31 Aug 2022 12:57:45 -0700 (PDT) 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=dIuoJFUP; 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 S229737AbiHaTRZ (ORCPT + 99 others); Wed, 31 Aug 2022 15:17:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229555AbiHaTRX (ORCPT ); Wed, 31 Aug 2022 15:17:23 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C67BDA3F4 for ; Wed, 31 Aug 2022 12:17:20 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id j5so11137265plj.5 for ; Wed, 31 Aug 2022 12:17:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=zHM07eO+Ah42PE786kyCsTV2son2tBDz1ynwCBNBtXk=; b=dIuoJFUP2Y35KD6v2SGjH0spplZBk1M2V7nqufMQvhuEkgyTgSu2+wraTtkMlK48IC 6NUbU3PkmZa9bko5OkmBvssxs5z2dLx8nTFKXl4QVUHrUI0NKpu036zIzrkcNsNDBPKP VPXyiVJsrcwpcriAABRQDVYN6cpOq51do4YRgaQwjSsNFTosilC/AUspFeScVKQsnSwE EHPlYKc+7SD92shbf8Uf25zKXW04xG31u0pO5Kr93F/UZoUM7KZjkT3RYAgz4oPw3gbC Q9ta6BaKg2pZUx/LsJqSyTOsbmkWsDsYESUvBAbIaD1PBpkkZPomOQNOPNKeWktfZhMG NYaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=zHM07eO+Ah42PE786kyCsTV2son2tBDz1ynwCBNBtXk=; b=sz+dwPUeWIfyEITy0+eHJWNcSzxvuM4aKLCuONfvqDWCSyTr7Ng8067pR+bJQYBtjn F2bMoh8jrZ5WtfMHBu+0fj5Xf/t63Iz371exgGXNWNVnVltifnofOMRsC0RKMvl976gG YXPtbCgubLc1hMML9oJGKNy9ckwqAoHloMwnCxs7TZbGUWfrkUEa3oWFclxrIKC0jhUU CZyKYvhVxdw9EtrRTATedh/NXBusvxqQXhJKxMdd2U+KEzabgvefgBBuDFJ/Q3QO84x8 wUs5R+Lnx9aZnKwHuVKy+vW50vBdsMqJQIDVYb05A38hZdPyfRRb0nwYIPS5c0lGygsD xSMw== X-Gm-Message-State: ACgBeo3lTyKF6w6a+/5yLvKk0Bqh8WrL/TyDlMWsVbnEaDeG+yeyjgpg /qDOuh+vfTOpZ+MSEencxno13A== X-Received: by 2002:a17:90a:ec05:b0:1fd:9368:2c8 with SMTP id l5-20020a17090aec0500b001fd936802c8mr4641721pjy.183.1661973439925; Wed, 31 Aug 2022 12:17:19 -0700 (PDT) Received: from google.com (7.104.168.34.bc.googleusercontent.com. [34.168.104.7]) by smtp.gmail.com with ESMTPSA id f9-20020aa79689000000b00528a097aeffsm11604082pfk.118.2022.08.31.12.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Aug 2022 12:17:18 -0700 (PDT) Date: Wed, 31 Aug 2022 19:17:15 +0000 From: Sean Christopherson To: Maxim Levitsky Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Suravee Suthikulpanit , Li RongQing Subject: Re: [PATCH 16/19] KVM: x86: Explicitly track all possibilities for APIC map's logical modes Message-ID: References: <20220831003506.4117148-1-seanjc@google.com> <20220831003506.4117148-17-seanjc@google.com> <9c3e126bdee38bc4a0fa03eec994878aca4f3b3e.camel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9c3e126bdee38bc4a0fa03eec994878aca4f3b3e.camel@redhat.com> X-Spam-Status: No, score=-17.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham 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 On Wed, Aug 31, 2022, Maxim Levitsky wrote: > On Wed, 2022-08-31 at 00:35 +0000, Sean Christopherson wrote: > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > > index 8209caffe3ab..3b6ef36b3963 100644 > > --- a/arch/x86/kvm/lapic.c > > +++ b/arch/x86/kvm/lapic.c > > @@ -168,7 +168,12 @@ static bool kvm_use_posted_timer_interrupt(struct kvm_vcpu *vcpu) > > > > static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map, > > u32 dest_id, struct kvm_lapic ***cluster, u16 *mask) { > > - switch (map->mode) { > > + switch (map->logical_mode) { > > + case KVM_APIC_MODE_SW_DISABLED: > > + /* Arbitrarily use the flat map so that @cluster isn't NULL. */ > > + *cluster = map->xapic_flat_map; > > + *mask = 0; > > + return true; > > case KVM_APIC_MODE_X2APIC: { > > u32 offset = (dest_id >> 16) * 16; > > u32 max_apic_id = map->max_apic_id; > > @@ -193,8 +198,10 @@ static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map, > > *cluster = map->xapic_cluster_map[(dest_id >> 4) & 0xf]; > > *mask = dest_id & 0xf; > > return true; > > + case KVM_APIC_MODE_MAP_DISABLED: > > + return false; > > default: > > - /* Not optimized. */ > > + WARN_ON_ONCE(1); > > BTW unless I am mistaken, this warning is guest triggerable, and thus as you > say when 'panic_on_warn=1', this will panic the host kernel. If it's guest triggerable then it's a bug in this patch. The "default" case was reachable with the old approach of OR-ing in bits, but the intent of this patch is to fully enumerate all values of map->logical_mode and make the "default" case impossible. And I don't think it's reachable. The case statements are: case KVM_APIC_MODE_SW_DISABLED: case KVM_APIC_MODE_X2APIC: case KVM_APIC_MODE_XAPIC_FLAT: case KVM_APIC_MODE_XAPIC_CLUSTER: case KVM_APIC_MODE_MAP_DISABLED: default: which covers all of the possible enum values. enum kvm_apic_logical_mode { KVM_APIC_MODE_SW_DISABLED, KVM_APIC_MODE_XAPIC_CLUSTER, KVM_APIC_MODE_XAPIC_FLAT, KVM_APIC_MODE_X2APIC, KVM_APIC_MODE_MAP_DISABLED, }; The map is explicitly initialized to KVM_APIC_MODE_SW_DISABLED (to avoid relying on KVM_APIC_MODE_SW_DISABLED==0) new->logical_mode = KVM_APIC_MODE_SW_DISABLED; so unless I've missed a "logical_mode |= ..." somewhere, reaching "default" should be impossible.