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=-2.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 E107BC35247 for ; Thu, 6 Feb 2020 19:22:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AF63220659 for ; Thu, 6 Feb 2020 19:22:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LaHv5lop" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF63220659 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JdCk1cKQ2Jf2NCReuxDcTp/3ZiEnR1iEY7YewaHKdmA=; b=LaHv5lopLeZ4G7 JwMl/RBLmRGPCJYsvAEyDRBWwAQZgpzHsW/Ly/PaFyzloviylmqVlqjFHWzW941wbbU0GQJnoF2Bt BI6DO4IE8T4GUCdDhOAHPeyR5CRyaFabpyM3UlToB1GhssmBLJz9PBOJJNwD8L23aN6+6oWy1J2Rn Oo22/hPyJSrQq32tRtJgPGjQV+MC+od+2WAFjjY9KcY8HF+td+n5UBwcALEmtnWyGAS7p0Yut+Rhz WNGgyhNWsGkX2zlu+p7X+5dj/TLpLhMNSy5lSM0SCk52PJujhExFiOL7Q+T6spi6XQtiniLevU5N0 FbQilX6Sx/54w7HMA6Uw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1izmjT-0001wt-Bn; Thu, 06 Feb 2020 19:22:35 +0000 Received: from mga11.intel.com ([192.55.52.93]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1izmjP-0001wD-Pf for linux-arm-kernel@lists.infradead.org; Thu, 06 Feb 2020 19:22:33 +0000 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Feb 2020 11:22:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,410,1574150400"; d="scan'208";a="232140746" Received: from sjchrist-coffee.jf.intel.com (HELO linux.intel.com) ([10.54.74.202]) by orsmga003.jf.intel.com with ESMTP; 06 Feb 2020 11:22:30 -0800 Date: Thu, 6 Feb 2020 11:22:30 -0800 From: Sean Christopherson To: Peter Xu Subject: Re: [PATCH v5 14/19] KVM: Clean up local variable usage in __kvm_set_memory_region() Message-ID: <20200206192230.GE13067@linux.intel.com> References: <20200121223157.15263-1-sean.j.christopherson@intel.com> <20200121223157.15263-15-sean.j.christopherson@intel.com> <20200206190641.GA700495@xz-x1> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200206190641.GA700495@xz-x1> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200206_112231_844207_FA144F34 X-CRM114-Status: GOOD ( 13.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wanpeng Li , kvm@vger.kernel.org, David Hildenbrand , linux-mips@vger.kernel.org, Paul Mackerras , kvmarm@lists.cs.columbia.edu, Janosch Frank , Marc Zyngier , Joerg Roedel , Christian Borntraeger , Julien Thierry , Suzuki K Poulose , kvm-ppc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jim Mattson , Cornelia Huck , Christoffer Dall , linux-kernel@vger.kernel.org, James Morse , Paolo Bonzini , Vitaly Kuznetsov , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Feb 06, 2020 at 02:06:41PM -0500, Peter Xu wrote: > On Tue, Jan 21, 2020 at 02:31:52PM -0800, Sean Christopherson wrote: > > [...] > > > @@ -1101,52 +1099,55 @@ int __kvm_set_memory_region(struct kvm *kvm, > > if (mem->guest_phys_addr + mem->memory_size < mem->guest_phys_addr) > > return -EINVAL; > > > > - slot = id_to_memslot(__kvm_memslots(kvm, as_id), id); > > - base_gfn = mem->guest_phys_addr >> PAGE_SHIFT; > > - npages = mem->memory_size >> PAGE_SHIFT; > > - > > - if (npages > KVM_MEM_MAX_NR_PAGES) > > - return -EINVAL; > > - > > /* > > * Make a full copy of the old memslot, the pointer will become stale > > * when the memslots are re-sorted by update_memslots(). > > */ > > - old = *slot; > > + tmp = id_to_memslot(__kvm_memslots(kvm, as_id), id); > > + old = *tmp; > > + tmp = NULL; > > Shall we keep this chunk to the patch where it will be used? Other > than that, it looks good to me. I assume you're talking about doing this instead of using @tmp? old = *id_to_memslot(__kvm_memslots(kvm, as_id), id); It's obviously possible, but I really like resulting diff for __kvm_set_memory_region() in "KVM: Terminate memslot walks via used_slots" when tmp is used. @@ -1104,8 +1203,13 @@ int __kvm_set_memory_region(struct kvm *kvm, * when the memslots are re-sorted by update_memslots(). */ tmp = id_to_memslot(__kvm_memslots(kvm, as_id), id); - old = *tmp; - tmp = NULL; + if (tmp) { + old = *tmp; + tmp = NULL; + } else { + memset(&old, 0, sizeof(old)); + old.id = id; + } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel