From patchwork Wed Jun 14 07:35:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 107770 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1066633vqr; Wed, 14 Jun 2023 00:51:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ64Cp+kYQsO48w9qygLxaa1vE/OfqgwDGbky3ZejEJTfwfaRSO0IIYffVYPwJht4tLS8SsZ X-Received: by 2002:a17:907:2dac:b0:978:666e:3bf with SMTP id gt44-20020a1709072dac00b00978666e03bfmr752310ejc.35.1686729071636; Wed, 14 Jun 2023 00:51:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686729071; cv=none; d=google.com; s=arc-20160816; b=IJrLvHaHck1XJGoIskt3/ycabjcIqPCDXjYt8TcERbccLxgw8YvhCzN9lwBo7adNqR PNx0xRi7V7mngK+JCD9wlh0sbpvKs0mYxAsWXA23/JN+2dxKkNlrdDrfrZ/TTnKsXCzH yNXzxqSiEho3VdojmaaRdCxhjRtzel5hZO8n40gcb/tFf/nNo3yJ8zWtSYbqdJWqTYC4 GRUWrrL8tXAXZcE6fe8qr3Tm83SdZd/DeUzi+yqvOCV7C+Slk+nFdSdpbJoQ5a+P23Ry vnjM+5MPU2Ila5INqehYdcnSD5R86/dcDaT0mWjShNdP6ixL1VWeEQn92Yuky4LR3rF+ 0qpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YgJA17a1c7AVDrVoB4HwZlBuwIqmPEUlEc3gzIFv3pY=; b=mIk83j1rgnmrDxPeAnKnALl7zqMxnSJ44gEqsmVz3vRxNoHxyQeY/ihiS6a8pmUTw9 ehn0QCwh4MUartZ40avzqYb2bI66aeKdFUGliEVbztVaqetYTcUikwc8tp2EK8zUJ3xe e3Z+c/ePlDoPiGLGdduZWcYuPhUmEe/33L3Uk/FCMSIJWHIX5OHqgzHKuBffisBWL4zz 0uMQnXQMn2ZoluwHDrAWaeg63CqUkVAawznIrPly0bPVvbmRnSuZ7KBWcKBHAkellS5W K1T1bY8BsjOmwQm9GjB1mrMbKuY8d8QE9vxtLdb0z5QdBtTJ2fPFZCO7x3WeyQwl2nLu AdCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=SrM4IiLy; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t22-20020a170906949600b00977d46f8f86si7435896ejx.369.2023.06.14.00.50.43; Wed, 14 Jun 2023 00:51:11 -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=@suse.com header.s=susede1 header.b=SrM4IiLy; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243356AbjFNHfX (ORCPT + 99 others); Wed, 14 Jun 2023 03:35:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243255AbjFNHfU (ORCPT ); Wed, 14 Jun 2023 03:35:20 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C16F31727 for ; Wed, 14 Jun 2023 00:35:15 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 73AED21857; Wed, 14 Jun 2023 07:35:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1686728114; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YgJA17a1c7AVDrVoB4HwZlBuwIqmPEUlEc3gzIFv3pY=; b=SrM4IiLyt4N7guH1CZIQ0nKGj3L6b9HODrNWAv2YMcYoNAzVz4cSCZUEiGSmZnKipU46r4 2rb0hubPsFyJGeQAp07phllcBHG8owzj2AAk30x9UBgKykWUiR7mPeWxvtj2r6yf+D8NcY MlCT16p+pawSJdSdangqU0dacCuGAAU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 20CA01391E; Wed, 14 Jun 2023 07:35:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wH2bBrJtiWQyHwAAMHmgww (envelope-from ); Wed, 14 Jun 2023 07:35:14 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org, Arnd Bergmann Subject: [PATCH v4 1/2] x86/xen: add prototypes for paravirt mmu functions Date: Wed, 14 Jun 2023 09:35:00 +0200 Message-Id: <20230614073501.10101-2-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230614073501.10101-1-jgross@suse.com> References: <20230614073501.10101-1-jgross@suse.com> MIME-Version: 1.0 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,URIBL_BLOCKED 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768663623182385233?= X-GMAIL-MSGID: =?utf-8?q?1768663623182385233?= The paravirt MMU functions called via the PV_CALLEE_SAVE_REGS_THUNK() macro can't be defined to be static, as the macro is generating a function via asm() statement calling the paravirt MMU function. In order to avoid warnings when specifying "-Wmissing-prototypes" for the build, add local prototypes (there should never be any external caller of those functions). Reported-by: Arnd Bergmann Signed-off-by: Juergen Gross --- arch/x86/xen/mmu_pv.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index b3b8d289b9ab..e0a975165de7 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -86,6 +86,22 @@ #include "mmu.h" #include "debugfs.h" +/* + * Prototypes for functions called via PV_CALLEE_SAVE_REGS_THUNK() in order + * to avoid warnings with "-Wmissing-prototypes". + */ +pteval_t xen_pte_val(pte_t pte); +pgdval_t xen_pgd_val(pgd_t pgd); +pmdval_t xen_pmd_val(pmd_t pmd); +pudval_t xen_pud_val(pud_t pud); +p4dval_t xen_p4d_val(p4d_t p4d); +pte_t xen_make_pte(pteval_t pte); +pgd_t xen_make_pgd(pgdval_t pgd); +pmd_t xen_make_pmd(pmdval_t pmd); +pud_t xen_make_pud(pudval_t pud); +p4d_t xen_make_p4d(p4dval_t p4d); +pte_t xen_make_pte_init(pteval_t pte); + #ifdef CONFIG_X86_VSYSCALL_EMULATION /* l3 pud for userspace vsyscall mapping */ static pud_t level3_user_vsyscall[PTRS_PER_PUD] __page_aligned_bss; From patchwork Wed Jun 14 07:35:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 107784 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1069754vqr; Wed, 14 Jun 2023 00:59:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7rBLCuk7z9XVvxIW9o4524T8IEhqdgTgOuKQLFYshHi5M4Ouymjw33eGQEXmilsHbwVmDU X-Received: by 2002:a17:902:9009:b0:1b2:48b:a22 with SMTP id a9-20020a170902900900b001b2048b0a22mr10514430plp.58.1686729598724; Wed, 14 Jun 2023 00:59:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686729598; cv=none; d=google.com; s=arc-20160816; b=0VNUwWxx28w/dHmKr3zkkuBxAeZeKKohAWf39AM0JxgdL9ZuSzUcyBse71XzU2nf3h wskt+UVMgb9bcs6eZA8P2XYKtiqhcnzTFkBo69qLuKa3kibTbw2TjAABncs06gknDdGF YazarbtL1hN0tCNrrNspyJs0XqFm72GGSdWVheuQqdjhdCZvqZlL/NKSr0XYixch4hyv J9Eev/sVa5jIfvobDMNZV7l2ANVeFXzuCtUrZKgVAAw38gpioWmQNpXMSB7lSI4/jUXh dDupMpNEafBflZA0oICvosBPBIVd6BEWc4pfRdgQSfqUlIRiF1V10XK1FLNgOigNSpBe A3SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jKTmIuG44BdSii87EddLytcEKZcOQpLokCYRhdq7cjM=; b=q+nygPSMGvBANuNMAXgnT6sAF87QF9UBNvtwHd3RYyFrA3xOiyqcgr0nSSjgS+c0rS m/mP+Klin4yMQQHGHIvVl/T6YenJ3KzLKBxXOy0v98F9DR2qGLKMifKE8Appidh3bSVr DL9lqbya0o9WsPtfSKF46e9czaCjBhE+vLV2bO0LaodeOTfKyaAwHlWBw+O4eFmlEM4T jtADJlDVTRtcdLVk0atzFRvvDhw/rbsDc5QOZyWg/S/L/x7xGBUTLfEBXpay4fds0MN0 8JirN5NihFABtWxWPkQ3FR6BYP9E6Bsea8ba/9fgPberp6sZnyhht49XSEDVaVisXmYX NkZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=oIvCas+c; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u3-20020a170902e5c300b001ab29399c72si10306997plf.502.2023.06.14.00.59.46; Wed, 14 Jun 2023 00:59:58 -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=@suse.com header.s=susede1 header.b=oIvCas+c; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242891AbjFNHf0 (ORCPT + 99 others); Wed, 14 Jun 2023 03:35:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243251AbjFNHfW (ORCPT ); Wed, 14 Jun 2023 03:35:22 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9307E10D8 for ; Wed, 14 Jun 2023 00:35:21 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3C98C1FD6A; Wed, 14 Jun 2023 07:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1686728120; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jKTmIuG44BdSii87EddLytcEKZcOQpLokCYRhdq7cjM=; b=oIvCas+cd9SDP91Ts9iEvkChPfeGhwMxFt/iaiZ5ygGF17F6cJ/XiH08XzsYKrHT8MXhtk 6itKTL5e3Mx72I9S8uNCXhCl8VGkXe5kOsPCRfg2k1Uwuc9pmmZN713yyAOvhkzO+oqPPr l4PHceSRrfbdCugCtHRe4hhYqyrrFUc= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id DA9731391E; Wed, 14 Jun 2023 07:35:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EWQDNLdtiWRVHwAAMHmgww (envelope-from ); Wed, 14 Jun 2023 07:35:19 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Arnd Bergmann , Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Stefano Stabellini , Oleksandr Tyshchenko , xen-devel@lists.xenproject.org Subject: [PATCH v4 2/2] x86: xen: add missing prototypes Date: Wed, 14 Jun 2023 09:35:01 +0200 Message-Id: <20230614073501.10101-3-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230614073501.10101-1-jgross@suse.com> References: <20230614073501.10101-1-jgross@suse.com> MIME-Version: 1.0 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,URIBL_BLOCKED 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768663622514356184?= X-GMAIL-MSGID: =?utf-8?q?1768664175887072527?= From: Arnd Bergmann These function are all called from assembler files, or from inline assembler, so there is no immediate need for a prototype in a header, but if -Wmissing-prototypes is enabled, the compiler warns about them: arch/x86/xen/efi.c:130:13: error: no previous prototype for 'xen_efi_init' [-Werror=missing-prototypes] arch/x86/platform/pvh/enlighten.c:120:13: error: no previous prototype for 'xen_prepare_pvh' [-Werror=missing-prototypes] arch/x86/xen/enlighten_pv.c:1233:34: error: no previous prototype for 'xen_start_kernel' [-Werror=missing-prototypes] arch/x86/xen/irq.c:22:14: error: no previous prototype for 'xen_force_evtchn_callback' [-Werror=missing-prototypes] arch/x86/entry/common.c:302:24: error: no previous prototype for 'xen_pv_evtchn_do_upcall' [-Werror=missing-prototypes] Declare all of them in an appropriate header file to avoid the warnings. For consistency, also move the asm_cpu_bringup_and_idle() declaration out of smp_pv.c. Signed-off-by: Arnd Bergmann Signed-off-by: Juergen Gross --- v4: [jgross]: remove some stubs, carve out mmu_pv.c prototypes into other patch v3: move declations of conditional function in an #ifdef with a stub v2: fix up changelog --- arch/x86/xen/efi.c | 2 ++ arch/x86/xen/smp.h | 4 ++++ arch/x86/xen/smp_pv.c | 1 - arch/x86/xen/xen-ops.h | 3 +++ include/xen/xen.h | 3 +++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/x86/xen/efi.c b/arch/x86/xen/efi.c index 7d7ffb9c826a..863d0d6b3edc 100644 --- a/arch/x86/xen/efi.c +++ b/arch/x86/xen/efi.c @@ -16,6 +16,8 @@ #include #include +#include "xen-ops.h" + static efi_char16_t vendor[100] __initdata; static efi_system_table_t efi_systab_xen __initdata = { diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h index 22fb982ff971..c20cbb14c82b 100644 --- a/arch/x86/xen/smp.h +++ b/arch/x86/xen/smp.h @@ -2,6 +2,10 @@ #ifndef _XEN_SMP_H #ifdef CONFIG_SMP + +void asm_cpu_bringup_and_idle(void); +asmlinkage void cpu_bringup_and_idle(void); + extern void xen_send_IPI_mask(const struct cpumask *mask, int vector); extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask, diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index a9cf8c8fa074..9ccf9759870d 100644 --- a/arch/x86/xen/smp_pv.c +++ b/arch/x86/xen/smp_pv.c @@ -55,7 +55,6 @@ static DEFINE_PER_CPU(struct xen_common_irq, xen_irq_work) = { .irq = -1 }; static DEFINE_PER_CPU(struct xen_common_irq, xen_pmu_irq) = { .irq = -1 }; static irqreturn_t xen_irq_work_interrupt(int irq, void *dev_id); -void asm_cpu_bringup_and_idle(void); static void cpu_bringup(void) { diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index a10903785a33..1bbbe216e6e1 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -148,9 +148,12 @@ int xen_cpuhp_setup(int (*cpu_up_prepare_cb)(unsigned int), void xen_pin_vcpu(int cpu); void xen_emergency_restart(void); +void xen_force_evtchn_callback(void); + #ifdef CONFIG_XEN_PV void xen_pv_pre_suspend(void); void xen_pv_post_suspend(int suspend_cancelled); +void xen_start_kernel(struct start_info *si); #else static inline void xen_pv_pre_suspend(void) {} static inline void xen_pv_post_suspend(int suspend_cancelled) {} diff --git a/include/xen/xen.h b/include/xen/xen.h index 0efeb652f9b8..f989162983c3 100644 --- a/include/xen/xen.h +++ b/include/xen/xen.h @@ -31,6 +31,9 @@ extern uint32_t xen_start_flags; #include extern struct hvm_start_info pvh_start_info; +void xen_prepare_pvh(void); +struct pt_regs; +void xen_pv_evtchn_do_upcall(struct pt_regs *regs); #ifdef CONFIG_XEN_DOM0 #include