Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190119151450.26879-1-Florian.LaRoche@googlemail.com>
In-Reply-To: <20190119151450.26879-1-Florian.LaRoche@googlemail.com>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon, 21 Jan 2019 13:20:33 +1300
Message-ID: <CAHk-=wjruxUdKWjn-PvZMOPn3pGO5yTcbc_J4hc4TrS0P15vaw@mail.gmail.com>
Subject: Re: fix int_sqrt() for very large numbers
To:     Florian La Roche <florian.laroche@googlemail.com>
Cc:     Linux List Kernel Mailing <linux-kernel@vger.kernel.org>,
        Crt Mori <cmo@melexis.com>, Joe Perches <joe@perches.com>,
        Davidlohr Bueso <dave@stgolabs.net>,
        Will Deacon <will.deacon@arm.com>,
        Peter Zijlstra <peterz@infradead.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, Jan 20, 2019 at 4:15 AM Florian La Roche
<florian.laroche@googlemail.com> wrote:
>
> @@ -52,7 +52,7 @@ u32 int_sqrt64(u64 x)
>         if (x <= ULONG_MAX)
>                 return int_sqrt((unsigned long) x);
>
> -       m = 1ULL << (fls64(x) & ~1ULL);
> +       m = 1ULL << ((fls64(x) - 1) & ~1ULL);

I've applied this part of the patch as commit fbfaf851902c ("fix
int_sqrt64() for very large numbers") with slightly edited commit
log.

I still think there are some oddities in here in the types. I
mentioned the caller that unnecessarily does the int_sqrt64() twice,
even though the outer one doesn't actually take a 64-bit value.

But in the very line above, there's another type oddity: the "& ~1ULL"
is entirely the wrong type. The shift *count* shouldn't be an unsigned
long long, so that type doesn't make much sense. It should be just a
~1, or even just "62".

But I didn't actually start micro-editing the patch, and just did that
one-liner off-by-one fix.

             Linus