From patchwork Thu Aug 3 15:59:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 130730 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1266707vqx; Thu, 3 Aug 2023 09:33:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHt75kRAZmQyuzvLJ+NyP1aeqGGqmBcwikwmGfmJw0VlzyA5EMY4qmlQKMUkG1pxTXAM1mN X-Received: by 2002:a05:6402:6c9:b0:523:7b1:3720 with SMTP id n9-20020a05640206c900b0052307b13720mr3125981edy.15.1691080388357; Thu, 03 Aug 2023 09:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691080388; cv=none; d=google.com; s=arc-20160816; b=NXudS9x3NMlzZBj+ZjD22l9rNna9QIPSeFIF6YxYPvXcyTMZl1M3af2nHc5WPb9TGc +mFsFuOFiUxSOkbuqbZPL5tbwYLpf1i5fY6f4S5XkeQ6Y4zGNw/nKFTUD0+w/k8JUQ0k qTY9NzlS79Oneh9w0EurfYdBUF3ft865uXubiH+5zokGjyULQFVckL0B5hJcWXnfTkXQ jFL8DSSAAa7R8x8MuUwkgauzYrr75H2piEAagdu6G0tK7XyPlPrcNtUiNKP7ww6NFmMG ICLFk2zb1fkhwTwdHc5Lf6000dO9qV3zsc3ujYoo6COx4kygth+PVUT4AGQKl/V3c/IL 27LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=3Z4xD1qwh1zepzOUtE/MTHsMbJqTZfxO85iXeVBf80s=; fh=GmswEOGbKr3VXwADkGMdbYvANKaeXXy9MxNXblyNAM0=; b=tc69M0npc3AMowRkobvVK8G28tIof4Wp+EZOA1R4SCG1Aj0SLvil0FknK6fEWS1ktO gBxUTP1KMqBwWYHVXX4AxUVRpPG3EkcUgeO0i2hAEK9dOEbAd6qbQ/2+NyMAvBpv5Oxg q3Mj5OEfX5F7MDESE2ICYxZppS6mCm2NaOex8rrHsR/XhLVQKF4VCStsBSJ+Jv1s3TzT xga99qu12JGQi0qiDNh3LTJ9c8CocTJy0GzQq6xVLdXAQP/V4rhz7vMtbiGyoYHpnjOU giOz19u4R00mZHUTpg57CIrWhrJI2SiYtjwW4xSkFeydK7RBa5cIHxentbTE4AN0gIA5 HqzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2LIfbwQR; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=X0bBKytV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u13-20020a056402064d00b0051e0fd434eesi8379edx.582.2023.08.03.09.32.44; Thu, 03 Aug 2023 09:33:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2LIfbwQR; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=X0bBKytV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237269AbjHCP7S (ORCPT + 99 others); Thu, 3 Aug 2023 11:59:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232768AbjHCP7R (ORCPT ); Thu, 3 Aug 2023 11:59:17 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B676211B; Thu, 3 Aug 2023 08:59:15 -0700 (PDT) Date: Thu, 03 Aug 2023 15:59:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691078353; h=from:from:sender:sender:reply-to: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=3Z4xD1qwh1zepzOUtE/MTHsMbJqTZfxO85iXeVBf80s=; b=2LIfbwQRNpgb0sQXpdgARcCpd14iim/iwCZMmD+JgYVylDqB2ASPcx/mMzDP1jl3YipXSV 96a1N6nGQTCaJsXvuF1xDsxR5TTd/GAgAkwOgva1zlWFsKDb466RBL5fG0pHvHekLgGxC3 v9p61SmoOlIzg6ayhp10IVFMiN+XKRX7VSO9coay+qllHiOPpN+QTBrKFhes74hVZbm/ge XhL68e88nQyY+pZ2ShGYsmOHBNsKrVSt6y4DN3iQ5jAxyeYyzdKhyeBC7Pezyy99wLAnMo wu0kZpPsRFDqoF2J8pqxvcmYeQUYqNWg+AzIy7bhQOJ+ap+dNRN0zpkzuL71Eg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691078353; h=from:from:sender:sender:reply-to: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=3Z4xD1qwh1zepzOUtE/MTHsMbJqTZfxO85iXeVBf80s=; b=X0bBKytVVJPTh3uUNJgKmwRNbEUe9mb94OFl1vxwFDE1o1EUPZDHMMgTeLIzBm+BAJlIaG 5v9kHiQpt8eHvCAA== From: "tip-bot2 for Arnd Bergmann" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/qspinlock-paravirt: Fix missing-prototype warning Cc: Arnd Bergmann , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230803082619.1369127-8-arnd@kernel.org> References: <20230803082619.1369127-8-arnd@kernel.org> MIME-Version: 1.0 Message-ID: <169107835290.28540.5117595767740504105.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773226309465214726 X-GMAIL-MSGID: 1773226309465214726 The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 8874a414f8f706daf1de467cbf2550988ebec09d Gitweb: https://git.kernel.org/tip/8874a414f8f706daf1de467cbf2550988ebec09d Author: Arnd Bergmann AuthorDate: Thu, 03 Aug 2023 10:26:19 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 03 Aug 2023 17:15:05 +02:00 x86/qspinlock-paravirt: Fix missing-prototype warning __pv_queued_spin_unlock_slowpath() is defined in a header file as a global function, and designed to be called from inline asm, but there is no prototype visible in the definition: kernel/locking/qspinlock_paravirt.h:493:1: error: no previous \ prototype for '__pv_queued_spin_unlock_slowpath' [-Werror=missing-prototypes] Add this to the x86 header that contains the inline asm calling it, and ensure this gets included before the definition, rather than after it. Signed-off-by: Arnd Bergmann Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230803082619.1369127-8-arnd@kernel.org --- arch/x86/include/asm/qspinlock_paravirt.h | 2 ++ kernel/locking/qspinlock_paravirt.h | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/qspinlock_paravirt.h b/arch/x86/include/asm/qspinlock_paravirt.h index 42b17cf..85b6e36 100644 --- a/arch/x86/include/asm/qspinlock_paravirt.h +++ b/arch/x86/include/asm/qspinlock_paravirt.h @@ -4,6 +4,8 @@ #include +void __lockfunc __pv_queued_spin_unlock_slowpath(struct qspinlock *lock, u8 locked); + /* * For x86-64, PV_CALLEE_SAVE_REGS_THUNK() saves and restores 8 64-bit * registers. For i386, however, only 1 32-bit register needs to be saved diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h index 6afc249..6a0184e 100644 --- a/kernel/locking/qspinlock_paravirt.h +++ b/kernel/locking/qspinlock_paravirt.h @@ -486,6 +486,16 @@ gotlock: } /* + * Include the architecture specific callee-save thunk of the + * __pv_queued_spin_unlock(). This thunk is put together with + * __pv_queued_spin_unlock() to make the callee-save thunk and the real unlock + * function close to each other sharing consecutive instruction cachelines. + * Alternatively, architecture specific version of __pv_queued_spin_unlock() + * can be defined. + */ +#include + +/* * PV versions of the unlock fastpath and slowpath functions to be used * instead of queued_spin_unlock(). */ @@ -533,16 +543,6 @@ __pv_queued_spin_unlock_slowpath(struct qspinlock *lock, u8 locked) pv_kick(node->cpu); } -/* - * Include the architecture specific callee-save thunk of the - * __pv_queued_spin_unlock(). This thunk is put together with - * __pv_queued_spin_unlock() to make the callee-save thunk and the real unlock - * function close to each other sharing consecutive instruction cachelines. - * Alternatively, architecture specific version of __pv_queued_spin_unlock() - * can be defined. - */ -#include - #ifndef __pv_queued_spin_unlock __visible __lockfunc void __pv_queued_spin_unlock(struct qspinlock *lock) {