Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4768510pxk; Wed, 30 Sep 2020 11:09:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGulIaMtD9N5M+z6m4Qa2iaQb2wNVLRmazDvxSI2bzmM96mVztrA/QmiOvtAjlfJ5z3qK7 X-Received: by 2002:a50:d94d:: with SMTP id u13mr3953712edj.365.1601489351464; Wed, 30 Sep 2020 11:09:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601489351; cv=none; d=google.com; s=arc-20160816; b=yT7OR5hffnIZmuwzgBrCm6d6UbT9Ujntqmc6EZyW0aB3iIH/P+aOigy82N3KsldIuv QR+UlBkF0IjzOdICol4Sc0c5hwg1qni14RK+BvwGXPlAl7d6o/g915DfNx7D5x/GlqWn hylOcMP/4c5M01IUn4wBrJsULVv5sNvU51BXqeFMaL4x6Yv+DFpZSd/lhWN1xnVLdstK ZXjXJLgQzAaHo+lY8+BP42YdMM0buMWRYG6u614zAY1Vri9DgJpvrtgoGPsttTEbPudY SzfwaIE/iJ1DhupQObaZcr71ZgRBnB+JKNwDIHHrA+DOM0ZJJCB8hfcjI1QOe3e/eGnW E6fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :ironport-sdr:ironport-sdr; bh=snVRlwlZ2t9OJT6Xg7NBVR29JkxLE5+VWWP/6C0+hSY=; b=mTIEwq7FAol613AyKMRyH5ysbTH0LcHuT7Mxx8b0CkZ9/ApDZiZ0Q1UgkmqZ54fPWv udy4ez/tEJvWCogqKFJ7WXbSWU77emjmoQi4rlL4scIWhxONdp4tv7MAc7/2xFL9QJdO zw7VjKgvzrkvMigqlSGujV9ysY6o3JdWduNRZ34T2oVzwC627ZJUm+MCMZDm9XaaXKeL Tzwy3+k9qc1A8z8CwCr+lX13DNsWm1tMm2z1dU5t9bhIQ6GhaV9Gsgf7YQTF2Giosacr haMif7WJWfwYp+47E3cdxgFxX1pvQlyykpbeOi9c1XeFWfRKSzqtR+COPuKyeM0EC3fQ 3w5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h21si1544272eds.289.2020.09.30.11.08.48; Wed, 30 Sep 2020 11:09:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729143AbgI3SHF (ORCPT + 99 others); Wed, 30 Sep 2020 14:07:05 -0400 Received: from mga14.intel.com ([192.55.52.115]:34849 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725372AbgI3SHF (ORCPT ); Wed, 30 Sep 2020 14:07:05 -0400 IronPort-SDR: n5cbLMJQwbey1Ird093JkM/boNlRpSKjD9RLf6M5cwy5NIl1uBoR5XOp39dmwoQE90bDsiteaL YMUgYTWYZyKw== X-IronPort-AV: E=McAfee;i="6000,8403,9760"; a="161740366" X-IronPort-AV: E=Sophos;i="5.77,322,1596524400"; d="scan'208";a="161740366" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2020 11:06:22 -0700 IronPort-SDR: D2/UMYLeLJ9lhsTi+X2HkbSHDzIbPtCGLyxXRZWURaksbI1g2Jb8sjQZLAnZZE+7clC57wvKu6 9qCIQlZgQ04Q== X-IronPort-AV: E=Sophos;i="5.77,322,1596524400"; d="scan'208";a="498683745" Received: from sjchrist-coffee.jf.intel.com (HELO linux.intel.com) ([10.54.74.160]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2020 11:06:21 -0700 Date: Wed, 30 Sep 2020 11:06:20 -0700 From: Sean Christopherson To: Ben Gardon Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Cannon Matthews , Paolo Bonzini , Peter Xu , Peter Shier , Peter Feiner , Junaid Shahid , Jim Mattson , Yulei Zhang , Wanpeng Li , Vitaly Kuznetsov , Xiao Guangrong Subject: Re: [PATCH 19/22] kvm: mmu: Support write protection for nesting in tdp MMU Message-ID: <20200930180620.GI32672@linux.intel.com> References: <20200925212302.3979661-1-bgardon@google.com> <20200925212302.3979661-20-bgardon@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200925212302.3979661-20-bgardon@google.com> User-Agent: Mutt/1.5.24 (2015-08-30) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 25, 2020 at 02:22:59PM -0700, Ben Gardon wrote: > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 12892fc4f146d..e6f5093ba8f6f 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -1667,6 +1667,11 @@ bool kvm_mmu_slot_gfn_write_protect(struct kvm *kvm, > write_protected |= __rmap_write_protect(kvm, rmap_head, true); > } > > + if (kvm->arch.tdp_mmu_enabled) > + write_protected = > + kvm_tdp_mmu_write_protect_gfn(kvm, slot, gfn) || > + write_protected; Similar to other comments, this can use |=. > + > return write_protected; > }