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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 29653C43460 for ; Thu, 15 Apr 2021 22:15:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02AEC610FC for ; Thu, 15 Apr 2021 22:15:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235015AbhDOWPk (ORCPT ); Thu, 15 Apr 2021 18:15:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234764AbhDOWPh (ORCPT ); Thu, 15 Apr 2021 18:15:37 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 370E1C061574 for ; Thu, 15 Apr 2021 15:15:12 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id t23so12850722pjy.3 for ; Thu, 15 Apr 2021 15:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=uVqj7VZY1Cf3w1LwGxwJQ9xLnZwQGyxy7mn+rml5pJo=; b=kpgxOledReTF8a07zTbARWX2I3wkhKrz9ypgDTDRg3+J1EydMS4Lu/8Mm/sNY+fSg8 j7DFvkwuDAAaNN4z84Za4zTkFerEy1Bwix1OZtdC6s+BHmRvPNtpT1zXh02FLmgWkKcf LB/cLwJSDlQvTWbXZScDCP+8r6owoBWm/TuCaRlw45OYFqrbAHOMxO/ewbervOJyG7AX H+FqzWlZSm0k1zWP/ZPjRC3lF3EjXNIRlhNoQv6OWign/XCvzEuV54xzlgKmaWJkKrSX U8BHiQPxJn0j/Bx5ufZB+9PiZ+27ryEnynIG9hFeG7AVXz0ZltSql55OKonOodvEONHC mrcA== 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=uVqj7VZY1Cf3w1LwGxwJQ9xLnZwQGyxy7mn+rml5pJo=; b=HzuANItFDHfLlForQtoc0xMLk4UgG/x1rL2qjDlTChoVeWawjPHhNlEFr96Laf489o t/5jT6zLhKK0YbM2ywYhkwgi9TY2dUIzCJNUS/nPWvKmexZXdG6LFPwGpMbfjjcQda5I UQMMaaSjX5fIj/miy5NSddZaY6wdWXLjvfCYkRHQPxyFLGnIqwX7MsUDcFmk+wl2oN4t oLyiMqm4J24dLjqu/t7HLT7PsAAyOUxuitneOBqx0q7zDsynqGR5jyegEv5Y2Iephp7G rjJVmI7mRx4n+C0nxVkYRGCAT+gOwu2GwDBnEzS2Iv3CzYE1W7YI+u+jU+FW6W7/14cT vh/g== X-Gm-Message-State: AOAM533/t60eFNQcq/yK4ksGfj2eWS1F84Si2EW2eQC3T4n4Fo4iBT5C V5cwG/1STqNxXUsFRG6S6/AX0w== X-Google-Smtp-Source: ABdhPJxjZfBpIv21RYEycpOb//LPlDHIjj8rL96tnLsp2qvHau2r/6V7FJIeJVDZ/Z1VaRKAwoFbdA== X-Received: by 2002:a17:90b:349:: with SMTP id fh9mr6170529pjb.126.1618524911342; Thu, 15 Apr 2021 15:15:11 -0700 (PDT) Received: from google.com (240.111.247.35.bc.googleusercontent.com. [35.247.111.240]) by smtp.gmail.com with ESMTPSA id k19sm3356192pgl.1.2021.04.15.15.15.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 15:15:10 -0700 (PDT) Date: Thu, 15 Apr 2021 22:15:06 +0000 From: Sean Christopherson To: Jim Mattson Cc: Paolo Bonzini , kvm list , LKML , Hao Sun Subject: Re: [PATCH 3/3] KVM: Add proper lockdep assertion in I/O bus unregister Message-ID: References: <20210412222050.876100-1-seanjc@google.com> <20210412222050.876100-4-seanjc@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 15, 2021, Jim Mattson wrote: > On Mon, Apr 12, 2021 at 3:23 PM Sean Christopherson wrote: > > > > Convert a comment above kvm_io_bus_unregister_dev() into an actual > > lockdep assertion, and opportunistically add curly braces to a multi-line > > for-loop. > > > > Signed-off-by: Sean Christopherson > > --- > > virt/kvm/kvm_main.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > > index ab1fa6f92c82..ccc2ef1dbdda 100644 > > --- a/virt/kvm/kvm_main.c > > +++ b/virt/kvm/kvm_main.c > > @@ -4485,21 +4485,23 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, > > return 0; > > } > > > > -/* Caller must hold slots_lock. */ > > int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, > > struct kvm_io_device *dev) > > { > > int i, j; > > struct kvm_io_bus *new_bus, *bus; > > > > + lockdep_assert_held(&kvm->slots_lock); > > + > > bus = kvm_get_bus(kvm, bus_idx); > > if (!bus) > > return 0; > > > > - for (i = 0; i < bus->dev_count; i++) > > + for (i = 0; i < bus->dev_count; i++) { > > if (bus->range[i].dev == dev) { > > break; > > } > > + } > Per coding-style.rst, neither the for loop nor the if-block should have braces. > > "Do not unnecessarily use braces where a single statement will do." Doh, the if-statement should indeed not use braces. I think I meant to clean that up, and then saw something shiny... But the for-loop... keep reading :-D Also, use braces when a loop contains more than a single simple statement: .. code-block:: c while (condition) { if (test) do_something(); }