From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH] KVM: x86: lapic: Fix the misuse of likely() in find_highest_vector() Date: Thu, 30 Aug 2012 13:10:33 +0300 Message-ID: <20120830101033.GA19622@redhat.com> References: <20120824181549.e1535ae0.yoshikawa.takuya@oss.ntt.co.jp> <20120827202542.GA1414@amt.cnet> <20120828185756.c754f4b4.yoshikawa.takuya@oss.ntt.co.jp> <20120829191057.GA10834@amt.cnet> <20120829225120.GA9146@redhat.com> <20120830100906.5b4bcffd.yoshikawa.takuya@oss.ntt.co.jp> <20120830063702.GB9286@redhat.com> <20120830185052.086cbb0f.yoshikawa.takuya@oss.ntt.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Marcelo Tosatti , avi@redhat.com, kvm@vger.kernel.org To: Takuya Yoshikawa Return-path: Received: from mx1.redhat.com ([209.132.183.28]:27467 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751032Ab2H3KJQ (ORCPT ); Thu, 30 Aug 2012 06:09:16 -0400 Content-Disposition: inline In-Reply-To: <20120830185052.086cbb0f.yoshikawa.takuya@oss.ntt.co.jp> Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Aug 30, 2012 at 06:50:52PM +0900, Takuya Yoshikawa wrote: > On Thu, 30 Aug 2012 09:37:02 +0300 > "Michael S. Tsirkin" wrote: > > > After staring at your code for a while it does appear to > > do the right thing, and looks cleaner than what > > we have now. commit log could be clearer. > > It should state something like: > > > > > > Clean up code in find_highest_vector: > > - likely() is there for historical reasons, it is no longer > > clear it's optimizing for the correct branch, > > and find_highest_vector might not be worth optimizing at all > > - checking word[0] separately does not make sense: > > if (word[word_offset << 2]) would be clearer > > - since we test word[...] != 0 beforehand, we can use __fls > > instead of fls() > > - for loop iterating over an array is clearer than while > > Yes, I'll update the patch. > > > Since you are going for cleanups, maybe we could also add: > > - get rid of ugly >> 5 << 2, switch to using REG_POS instead? > > OK, I'll do these on top of this patch. Tweaking these 5 lines for readability across multiple patches is just not worth it. As long as we do random cleanups of this function it's probably easier to just do them all in one patch. > > Something like the below pseudo code would do this I think? > > > > #define APIC_VECTORS_PER_REG 32 > > > > int vec; > > for (vec = MAX_APIC_VECTOR - APIC_VECTORS_PER_REG; > > vec -= APIC_VECTORS_PER_REG; vec >= 0) { > > u32 *reg = bitmap + REG_POS(vec); > > We want to introduce apic_read_register(bitmap, reg) instead. > u32 reg = apic_read_register(bitmap, REG_POS(vec)); If Marcelo takes it, I don't mind :) > > if (*reg) > > return __fls(*reg) - 1 + vec; > > Because it is not clear that this *reg is the same value > tested before. Before - where? Looks like this is the only place where *reg is used. > > } > > return -1 > > > > count_vectors similar: > > > > for (vec = 0; vec < MAX_APIC_VECTOR; vec += APIC_VECTORS_PER_REG) { > > u32 *reg = bitmap + REG_POS(vec); > > Same here. Same question :) > > count += hweight32(*reg); > > } > > > > hmm? > > Looks very good! > > Thanks, > Takuya