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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 E8D25C433DB for ; Wed, 10 Feb 2021 18:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A154E64E35 for ; Wed, 10 Feb 2021 18:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234388AbhBJSz2 (ORCPT ); Wed, 10 Feb 2021 13:55:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23526 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234373AbhBJSwT (ORCPT ); Wed, 10 Feb 2021 13:52:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612983051; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sDSZq7ICJ0AfHa8/wG0kYNPnZuec3lptyyORunouOpY=; b=iaf+CFartxIa3OU7+lbXxn3bLRQO31HCcE8gICDeXpjpFm/yHh328nWZFVtJA6fiVxFz+y 09Xvy11I3FVon9RjuivWSObzMXD20XG0uYgEOHn4vyvdSZ3cC7cVkXC1av9bmRfx2Zo5r3 0ZPY6WVI4UNZhc/SF66pkfc8d0uBO+g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-564-XZ2RXzyyMWyxoLkiVpGXxg-1; Wed, 10 Feb 2021 13:50:49 -0500 X-MC-Unique: XZ2RXzyyMWyxoLkiVpGXxg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78E83195D56B; Wed, 10 Feb 2021 18:50:47 +0000 (UTC) Received: from llong.remote.csb (ovpn-115-20.rdu2.redhat.com [10.10.115.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 934655D6D1; Wed, 10 Feb 2021 18:50:45 +0000 (UTC) Subject: Re: [PATCH] locking/arch: Move qrwlock.h include after qspinlock.h To: Paolo Bonzini , Peter Zijlstra , Ingo Molnar , Will Deacon , Catalin Marinas , Thomas Bogendoerfer , Chris Zankel , Max Filippov Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-xtensa@linux-xtensa.org, Naresh Kamboju , Guenter Roeck , Ben Gardon References: <20210210144556.10932-1-longman@redhat.com> <1d7d564c-cc73-372b-be8b-1cfd51cf476c@redhat.com> From: Waiman Long Organization: Red Hat Message-ID: <382d4c4b-6dc8-75bc-f223-01aef8a2ef90@redhat.com> Date: Wed, 10 Feb 2021 13:50:45 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <1d7d564c-cc73-372b-be8b-1cfd51cf476c@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/10/21 1:28 PM, Paolo Bonzini wrote: > On 10/02/21 15:45, Waiman Long wrote: >> The queued rwlock code has a dependency on the current spinlock >> implementation (likely to be qspinlock), but not vice versa. Including >> qrwlock.h before qspinlock.h can be problematic when expanding qrwlock >> functionality. >> >> If both qspinlock.h and qrwlock.h are to be included, the qrwlock.h >> include should always be after qspinlock.h. Update the current set of >> asm/spinlock.h files to enforce that. >> >> Signed-off-by: Waiman Long > > arch/sparc/include/asm/spinlock_64.h is missing.  Also, the include in > kernel/locking/qrwlock.c is not necessary (it may be there for > aesthetic reasons, but it complicates thing in this case). Sorry for missing arch/sparc/include/asm/spinlock_64.h. I was just focusing on asm/spinlock.h and not aware that there are other variants there. It is true that the asm/qrwlock.h include in qrwlock.c is not really necessary. I can't recall why it was there. > > I'll send a v2 that is based on the kvm/next tree. > > Paolo > Thanks for taking care of that. Cheers, Longman