From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 680A6C35247 for ; Thu, 6 Feb 2020 22:04:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37B2D22522 for ; Thu, 6 Feb 2020 22:04:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZCrBK0sG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727585AbgBFWEE (ORCPT ); Thu, 6 Feb 2020 17:04:04 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:27355 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726765AbgBFWED (ORCPT ); Thu, 6 Feb 2020 17:04:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581026641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=dz1uoo006UjtoREFQWYnwIS83IIptUYIWImaDlSbYB4=; b=ZCrBK0sGmA2QLXYWI0UERoKto8eD3raHVkkCSbFavG+XfSrNa4L4MSl9onBWSCdCneCPhF DmUNUGtKzzzbW1OcKj7Bk6wfMGoQiW6vgy8YyPt36tJsso5HI2JhHHC7DiXApbBfhSoS6i hxJqt5UgpyJBuNvBTMv/x5Ysa0AOsvs= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-440-tC9osU5uPvqB7UQeHfJjmA-1; Thu, 06 Feb 2020 17:03:59 -0500 X-MC-Unique: tC9osU5uPvqB7UQeHfJjmA-1 Received: by mail-qv1-f70.google.com with SMTP id g15so4618440qvk.11 for ; Thu, 06 Feb 2020 14:03:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=dz1uoo006UjtoREFQWYnwIS83IIptUYIWImaDlSbYB4=; b=f+gaQqNWNPju0FYfImseQcNlGUu2ZnD20WiG7TShVgh6mEF2/DF9p+E2BMGCNAEg5l QNsjkbtOVx+lP3afqtO25ryRAe7sD3i8bDjw7FDFxJNwFqXJjJGnyRdEqqePjOdfqa/S YWxJjFORgX5vFeCVPIRY7lIvKzjYJ52wr3Vm4TWls6X6gEQJywrXz8lIQdUfUku470A6 o2mBCbMOCWqCku7hba/E+nC82r19uAxfClz4hGObpNv9dqRUGuyQMme3BfaSzz6bcJ0A rQoq+cnhG9KCTbMeYbXSjszMIe/rfpHbyVbD6TJv6wiel57Bllh1QXF4GfN3+GPVaJnc 8u1w== X-Gm-Message-State: APjAAAVyxY+sRO5vD5PBK740xqTE9C07+WGcA+L/+Yaef9dyuVfXdC89 JpJikk6PffY4PkB0TTYqRiPNAFx/0PLh3AUYzxCZTcspH9ibw5/LT4aJ8B9I6m6DtV5XnR6wqQL CcvudtPDcs0TI X-Received: by 2002:ac8:7396:: with SMTP id t22mr4707009qtp.269.1581026639165; Thu, 06 Feb 2020 14:03:59 -0800 (PST) X-Google-Smtp-Source: APXvYqwu2LJdikIjEQUWHwIaSDYrGQrBVVncwkTn7Iy+PzbVsPREs+ohxiEeOt5zr/YlX26hX6iftw== X-Received: by 2002:ac8:7396:: with SMTP id t22mr4706974qtp.269.1581026638877; Thu, 06 Feb 2020 14:03:58 -0800 (PST) Received: from xz-x1 ([2607:9880:19c8:32::2]) by smtp.gmail.com with ESMTPSA id i7sm312515qki.83.2020.02.06.14.03.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 14:03:58 -0800 (PST) Date: Thu, 6 Feb 2020 17:03:55 -0500 From: Peter Xu To: Sean Christopherson Cc: James Hogan , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , Marc Zyngier , linux-arm-kernel@lists.infradead.org, Wanpeng Li , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, David Hildenbrand , Joerg Roedel , Cornelia Huck , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, kvm-ppc@vger.kernel.org, Vitaly Kuznetsov , kvmarm@lists.cs.columbia.edu, Jim Mattson Subject: Re: [PATCH v4 16/19] KVM: Ensure validity of memslot with respect to kvm_get_dirty_log() Message-ID: <20200206220355.GH700495@xz-x1> References: <20191217204041.10815-1-sean.j.christopherson@intel.com> <20191217204041.10815-17-sean.j.christopherson@intel.com> <20191224181930.GC17176@xz-x1> <20200114182506.GF16784@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200114182506.GF16784@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Archived-At: List-Archive: List-Post: On Tue, Jan 14, 2020 at 10:25:07AM -0800, Sean Christopherson wrote: > On Tue, Dec 24, 2019 at 01:19:30PM -0500, Peter Xu wrote: > > On Tue, Dec 17, 2019 at 12:40:38PM -0800, Sean Christopherson wrote: > > > +int kvm_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log, > > > + int *is_dirty, struct kvm_memory_slot **memslot) > > > { > > > struct kvm_memslots *slots; > > > - struct kvm_memory_slot *memslot; > > > int i, as_id, id; > > > unsigned long n; > > > unsigned long any = 0; > > > > > > + *memslot = NULL; > > > + *is_dirty = 0; > > > + > > > as_id = log->slot >> 16; > > > id = (u16)log->slot; > > > if (as_id >= KVM_ADDRESS_SPACE_NUM || id >= KVM_USER_MEM_SLOTS) > > > return -EINVAL; > > > > > > slots = __kvm_memslots(kvm, as_id); > > > - memslot = id_to_memslot(slots, id); > > > - if (!memslot->dirty_bitmap) > > > + *memslot = id_to_memslot(slots, id); > > > + if (!(*memslot)->dirty_bitmap) > > > return -ENOENT; > > > > > > - n = kvm_dirty_bitmap_bytes(memslot); > > > + kvm_arch_sync_dirty_log(kvm, *memslot); > > > > Should this line belong to previous patch? > > No. > > The previous patch, "KVM: Provide common implementation for generic dirty > log functions", is consolidating the implementation of dirty log functions > for architectures with CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y. > > This code is being moved from s390's kvm_vm_ioctl_get_dirty_log(), as s390 > doesn't select KVM_GENERIC_DIRTYLOG_READ_PROTECT. It's functionally a nop > as kvm_arch_sync_dirty_log() is empty for PowerPC, the only other arch that > doesn't select KVM_GENERIC_DIRTYLOG_READ_PROTECT. > > Arguably, the call to kvm_arch_sync_dirty_log() should be moved in a > separate prep patch. It can't be a follow-on patch as that would swap the > ordering of kvm_arch_sync_dirty_log() and kvm_dirty_bitmap_bytes(), etc... > > My reasoning for not splitting it to a separate patch is that prior to this > patch, the common code and arch specific code are doing separate memslot > lookups via id_to_memslot(), i.e. moving the kvm_arch_sync_dirty_log() call > would operate on a "different" memslot. It can't actually be a different > memslot because slots_lock is held, it just felt weird. > > All that being said, I don't have a strong opinion on moving the call to > kvm_arch_sync_dirty_log() in a separate patch; IIRC, I vascillated between > the two options when writing the code. If anyone wants it to be a separate > patch I'll happily split it out. (Sorry to respond so late) I think the confusing part is the subject, where you only mentioned the memslot change. IMHO you can split the change to make it clearer, or at least would you mind mention that kvm_arch_sync_dirty_log() move in the commit message? Thanks, -- Peter Xu