From patchwork Sat May 13 00:35:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93456 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5485558vqo; Fri, 12 May 2023 17:53:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4j5L1gCXFdetA9zz75qjdTHJJkHI13Hu+Rgcs4z/EJIejeTEjruowCgIARk0e6XsXjZCWo X-Received: by 2002:a05:6a00:1894:b0:646:c56c:f0e0 with SMTP id x20-20020a056a00189400b00646c56cf0e0mr19604860pfh.15.1683939201424; Fri, 12 May 2023 17:53:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683939201; cv=none; d=google.com; s=arc-20160816; b=OdJjiAWBhFtJtBL24vrfp2ELZTTg94pDdVcFfF7HaOKrkLYDY2F5ieSHeWZ2FqKM23 z9BtoxYh+TwBrgZA2pBnfZIcTUXH1Ptc2y5/n2RdhL8IRIuE7bjcjOoO56CFKjvkjyIJ YWomlFJWd4hE0NNxgC/TLWykWgPA7g0QBcj1UIpK+UpVSm97mHWRAqRehsmFYruLeNhO /fQRjlkgo/S3DVIOeI68Qq/1Dqh9dM7n0H/fAZuy3bWI+zORLNBjhBbjTAw8wL2DGOSX fhHNJhnWS9jOda+OisSNN4MaYKugXv/0UCTu3yrxkY8JudXiZaUS3NgESEyFfwKRhdfj H9Tw== 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=K7Ya3jZlcB5DIRxzkVo+FZAIt5xtGXopE24BSYXVJKk=; b=ByDpETGRGIyPBCeV1papfrepqV7lwGUp8GBuBeGlIRdLKdoAYsLqbf/3Y41/sDtXds H9U2O6Ulqyha6yhxm2XTXS6CzTA1L4hPfaaaMobDHB3OIvwOwShk3n7mLtJVTrcZPVBx ZpQAjaGqaqnP3XAHEIhJV58Zq3NZWAblthO6A1l2Katx9d16RSKTaQkmxdB7INanRmpH TGxDk8GF+3GDLrgGYbUpJFbw6j8y8ZGHv48KeAkc0nvubVbDOhUVSpKjp1DfqA+vT2IJ +fX6dkCSdkbbQI2a8BRSNw0Ejo8lhoC3n9b4HfzGNc/vAIbC2hU2XFRpRd3FZ6ezLawg dcGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=XGrwjfzU; 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 g205-20020a6252d6000000b006452ad4ae32si11340739pfb.237.2023.05.12.17.53.07; Fri, 12 May 2023 17:53:21 -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=20221208 header.b=XGrwjfzU; 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 S241073AbjEMAgd (ORCPT + 99 others); Fri, 12 May 2023 20:36:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241251AbjEMAgY (ORCPT ); Fri, 12 May 2023 20:36:24 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 068CE6199 for ; Fri, 12 May 2023 17:36:17 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-643a1fed384so5614690b3a.3 for ; Fri, 12 May 2023 17:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938177; x=1686530177; 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=K7Ya3jZlcB5DIRxzkVo+FZAIt5xtGXopE24BSYXVJKk=; b=XGrwjfzUB5Z1Jr54Bh0GK3KWvn+DCPj5RUIT8j+z/Np9og8cN1KchmZJeni93Uvy7s diX49O5EZtEAZDH2WnfFLiyblqMGn3njDBFEEx4TsGcwwfWlJUozJCqrroNvuCoxbIYz J0FqR0PoQrdGlfChocEzL4ehm6rj3oVBLYzpxsgigepwA3t/aWUQalt82flPm5MqOlRV yvOJrlvI7bNR8cuw6XxGtB9scFveudIqc6MylQO/+aUTS/d8dFu3I5ONlqZkRBCavgOK RZZqzwsCiukW+fDl2ye5ropvD2aVluFjExuqqI/dhyiqhNsRe/dsALVzXvEPG+ETz5qV D3rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938177; x=1686530177; 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=K7Ya3jZlcB5DIRxzkVo+FZAIt5xtGXopE24BSYXVJKk=; b=OFGDH8RteQ7l8UTYlK/yUh7PQu91C9q6leDCODfgRCD8fTMkrZOisEuksVG0unWQnc xasF8aLIeHCyZgQPFYc5R58hNlazoWQhk8Parfbg4TzZP2PPKfKUjCr+BlWrwqd6plAT 5fTKMBokwcUviv7egoquoiAtlLujzE2I0J/ZCSWWwqpUUkBGGyK3/9mYhBwwzSZDaZNG qIcLjJrb+NTweWVws2M4BaCpqUOn6wsNOdFmA2uYX1+1oLfVqY9UJQcKb/F3q6LjoBsC RFbfKupyrqFnlLf6tk/aGClCacqXvncbyrMWS5JJDqg9CneOgge2OHQ16o0cTNM/fdKS r1VA== X-Gm-Message-State: AC+VfDwrEa0CHfkrLjSdiOMdOLstVmivGxWjHicTGqqMkpA/41HXx7kz dTVnQHPVfIN9EfNImyT2CBUPXKaFTYk= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:3a8:b0:643:ae47:9bc0 with SMTP id y40-20020a056a0003a800b00643ae479bc0mr6493792pfs.3.1683938177325; Fri, 12 May 2023 17:36:17 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:35:38 -0700 In-Reply-To: <20230513003600.818142-1-seanjc@google.com> Mime-Version: 1.0 References: <20230513003600.818142-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230513003600.818142-7-seanjc@google.com> Subject: [PATCH v3 06/28] drm/i915/gvt: Error out on an attempt to shadowing an unknown GTT entry type From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Zhenyu Wang , Zhi Wang Cc: kvm@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yan Zhao , Ben Gardon 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,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 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?1765738231930072541?= X-GMAIL-MSGID: =?utf-8?q?1765738231930072541?= Bail from ppgtt_populate_shadow_entry() if an unexpected GTT entry type is encountered instead of subtly falling through to the common "direct shadow" path. Eliminating the default/error path's reliance on the common handling will allow hoisting intel_gvt_dma_map_guest_page() into the case statements so that the 2MiB case can try intel_gvt_dma_map_guest_page() and fallback to splitting the entry on failure. Signed-off-by: Sean Christopherson Reviewed-by: Zhi Wang --- drivers/gpu/drm/i915/gvt/gtt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c index 2aed31b497c9..61e38acee2d5 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -1306,6 +1306,7 @@ static int ppgtt_populate_shadow_entry(struct intel_vgpu *vgpu, return -EINVAL; default: GEM_BUG_ON(1); + return -EINVAL; } /* direct shadow */