Date:   Fri, 17 Mar 2023 15:55:34 +0800
From:   Yan Zhao <yan.y.zhao@intel.com>
To:     Sean Christopherson <seanjc@google.com>
CC:     Paolo Bonzini <pbonzini@redhat.com>,
        Zhenyu Wang <zhenyuw@linux.intel.com>,
        Zhi Wang <zhi.a.wang@intel.com>, <kvm@vger.kernel.org>,
        <intel-gvt-dev@lists.freedesktop.org>,
        <intel-gfx@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
        Ben Gardon <bgardon@google.com>
Subject: Re: [PATCH v2 23/27] KVM: x86/mmu: Assert that correct locks are
 held for page write-tracking
Message-ID: <ZBQc9owYBNdKmMuG@yzhao56-desk.sh.intel.com>
Reply-To: Yan Zhao <yan.y.zhao@intel.com>
References: <20230311002258.852397-1-seanjc@google.com>
 <20230311002258.852397-24-seanjc@google.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230311002258.852397-24-seanjc@google.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RFy6vZe4P++qaPNRlDwhZKo6p41EsgknC1kqU5G8iq47QH/NgwPHg2dmCWDY?=
 =?us-ascii?Q?DRv2SyLzAPUD4kqnR/Sa4OAf7myToINKUCgk7aNOXDp6UJBIFj41zslEvznn?=
 =?us-ascii?Q?Ahfen1l2qVWPiOHcmxxVcV9RTpiUNz0CyXi4StPyeFu8PYAmY6ALbCJKhiIC?=
 =?us-ascii?Q?JYozuOue4puOGz+8O8OclBn46ju7/3QiR0Umad947+NlkN4QILgxyWy2+LsK?=
 =?us-ascii?Q?NU7glghSjrN8uJJhQUf8Q5zeZKz0NI/hw9rU9hoQsNep3Hg+5MG6E4T0uQMx?=
 =?us-ascii?Q?H6CEk8Qxc9yvcBqS0OukQ/kZtj8IGo3dcBZ5Pb2isdSBzn0LvBcamwseX6Zr?=
 =?us-ascii?Q?5nri7qHqQYUjbQVN1f2D4eRXeKOuUQ8YVaBp7OubSzU1OLPSYDGXSBFUSnlF?=
 =?us-ascii?Q?ozazM7/NG5WlSOUw5dJJcLGVL1wKAHKv3mcLYJyUn3VltenxMldYBNGqxJdd?=
 =?us-ascii?Q?PuvB1gj1Qucy9sbmb45sP8m4I3DCyCEeHX/PvgMnelHjx7S5xzBZakTe/846?=
 =?us-ascii?Q?xktODunCf79c1bIHzYp5Ose+VeMgk/b1Mp2ma3Kz0b7QMyUzfZg3ILLBxEQi?=
 =?us-ascii?Q?451P6o+Q6KCxbzerhHQj8u9rfjFoBrustDqXycGTcwQ3d3bUoO2kwQ67TDw5?=
 =?us-ascii?Q?8Bj//z/k7ybtG5M9GAGWKTXlSiMer76fB0jQYn1Sm99pOuTX53Y4iwa+7tQA?=
 =?us-ascii?Q?DOpfkUpeLzIhj6ZKIRwKTMJDNbct3N85PGfeVGmQ1Z35YIHB4dZZnbvrmvb7?=
 =?us-ascii?Q?6ErQtr2aTROWsSS8rIO5dcN5Zx4vnaO/1/bJmgjps5yRb7zzjq7m25DiLLMn?=
 =?us-ascii?Q?7p81TJ1EPFnc03DPp8KdA8HUjAE+MA56+jAqvevTDpXKEshGnXyP4UJB0YrW?=
 =?us-ascii?Q?VQ0oXFlIoxCmZn1ie5jWdjkrb53ew+gKvfcourAuaa+yrTyJFO0I1FiiZkhb?=
 =?us-ascii?Q?jKA8cetAwNT4FJM0VnosfQ3f/sN06J1Xe0sWUBJE/SGer5iyeX39O+VZgjAa?=
 =?us-ascii?Q?ERDKyvIepWP+X56GXeP3f/cVsSHZ8u9Lrfh8yEa6HLE3F8oc/rOm0CGK/Q2X?=
 =?us-ascii?Q?IGqQAaWUPuA9AohTtn6dio5qKS344MMumXjKMsIEDPg4OT1OQeqENpXsKE+p?=
 =?us-ascii?Q?oVU9LGAMt1A6OfU1JsAA4GHu1kmDa/qxzYSQunvQH8F/5z9IGStUXTFrH2+J?=
 =?us-ascii?Q?cQYucgY0nQeel+BTCO4dcp9f/2aGrdZcYxkEUsxY3Mx2v2rbK0pPFZV+VMv3?=
 =?us-ascii?Q?KgtTUNBJ2lfpDtlVRGRr6YO4A8G66tsDoxR60CvVSs3GBdFbXrPaIxaf8tsy?=
 =?us-ascii?Q?I1bkxWbhZQgHCv0JcTTWGeO/MjwhA4JHlheocCwbbSxYfrYffkaaHSwu5/kt?=
 =?us-ascii?Q?n2Bc/PyoZaP2uzbUYUVc3MK8Xli1oudpmcevQgeX4CWcg0yfAFGMLAhzl0xW?=
 =?us-ascii?Q?1Za+47XRCEu5mdulIepChOnz0XuagUA8x1/W++TSAMCnDzMgv/80DiZ58vdf?=
 =?us-ascii?Q?8QrhX3eCiDyzZTpGrk8074reVDDuCjWd2eixGqNXDG1aK4ZXhpSrt6z01AaJ?=
 =?us-ascii?Q?0GPQ1zzdF9TgANwTDzAusFijg94gFh9nxm01T+tDPOeDup67GkQtr2sGsHHg?=
 =?us-ascii?Q?/g=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 186ba4d1-825f-4866-b079-08db26c06e1b
X-MS-Exchange-CrossTenant-AuthSource: DS7PR11MB5966.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2023 08:20:12.7816
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UE1lihJ5FvytnVn0JMCMX9dcSL1/pPA4tQo9Iq1c4al22/BOEVbMp6XkwlbZnWnmYaRtmn7+ONy+y9SppbQqUQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR11MB7338
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Tested-by: Yan Zhao <yan.y.zhao@intel.com>

On Fri, Mar 10, 2023 at 04:22:54PM -0800, Sean Christopherson wrote:
> When adding/removing gfns to/from write-tracking, assert that mmu_lock
> is held for write, and that either slots_lock or kvm->srcu is held.
> mmu_lock must be held for write to protect gfn_write_track's refcount,
> and SRCU or slots_lock must be held to protect the memslot itself.
> 
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
>  arch/x86/kvm/mmu/page_track.c | 17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c
> index 1993db4578e5..ffcd7ac66f9e 100644
> --- a/arch/x86/kvm/mmu/page_track.c
> +++ b/arch/x86/kvm/mmu/page_track.c
> @@ -12,6 +12,7 @@
>   */
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>  
> +#include <linux/lockdep.h>
>  #include <linux/kvm_host.h>
>  #include <linux/rculist.h>
>  
> @@ -77,9 +78,6 @@ static void update_gfn_write_track(struct kvm_memory_slot *slot, gfn_t gfn,
>   * add guest page to the tracking pool so that corresponding access on that
>   * page will be intercepted.
>   *
> - * It should be called under the protection both of mmu-lock and kvm->srcu
> - * or kvm->slots_lock.
> - *
>   * @kvm: the guest instance we are interested in.
>   * @slot: the @gfn belongs to.
>   * @gfn: the guest page.
> @@ -87,6 +85,11 @@ static void update_gfn_write_track(struct kvm_memory_slot *slot, gfn_t gfn,
>  void kvm_write_track_add_gfn(struct kvm *kvm, struct kvm_memory_slot *slot,
>  			     gfn_t gfn)
>  {
> +	lockdep_assert_held_write(&kvm->mmu_lock);
> +
> +	lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) ||
> +			    srcu_read_lock_held(&kvm->srcu));
> +
>  	if (WARN_ON(!kvm_page_track_write_tracking_enabled(kvm)))
>  		return;
>  
> @@ -107,9 +110,6 @@ EXPORT_SYMBOL_GPL(kvm_write_track_add_gfn);
>   * remove the guest page from the tracking pool which stops the interception
>   * of corresponding access on that page.
>   *
> - * It should be called under the protection both of mmu-lock and kvm->srcu
> - * or kvm->slots_lock.
> - *
>   * @kvm: the guest instance we are interested in.
>   * @slot: the @gfn belongs to.
>   * @gfn: the guest page.
> @@ -117,6 +117,11 @@ EXPORT_SYMBOL_GPL(kvm_write_track_add_gfn);
>  void kvm_write_track_remove_gfn(struct kvm *kvm,
>  				struct kvm_memory_slot *slot, gfn_t gfn)
>  {
> +	lockdep_assert_held_write(&kvm->mmu_lock);
> +
> +	lockdep_assert_once(lockdep_is_held(&kvm->slots_lock) ||
> +			    srcu_read_lock_held(&kvm->srcu));
> +
>  	if (WARN_ON(!kvm_page_track_write_tracking_enabled(kvm)))
>  		return;
>  
> -- 
> 2.40.0.rc1.284.g88254d51c5-goog
>