From patchwork Mon Dec 11 03:05:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: guanjun X-Patchwork-Id: 176440 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6805985vqy; Sun, 10 Dec 2023 19:05:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IHhx7cbU1SvnInyiqW6k42lBdhLRL36aIvsfsrO/6DqD7oD8Rzv9dILnIVeMKOQstgP2UsE X-Received: by 2002:a05:690c:3405:b0:5df:5d59:60bd with SMTP id fn5-20020a05690c340500b005df5d5960bdmr1771318ywb.28.1702263947884; Sun, 10 Dec 2023 19:05:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702263947; cv=none; d=google.com; s=arc-20160816; b=z83ehmkGJ/1Pv9TbkDIzAtEPO4NAVy13CqAxCk5geqCk+f7qDWDtNsJV77wPbab6ri UAriKMXCg/4wzlqt46IGQo6LENtojEDcUocLUk8lfL0e5v6FzLAfvvgXVtD+5P37mD7I LeeEaUEL9KokK40Juf24K5xXLpVGzY+Rje44MKY9Hx04vwTtbw5IbAxlYA7IdswjrMJo S3cdJ/mFMvLkAg4dRBOTCu6hAXvHTHSc7/bFF1Ck2uhKDiHRObAGhGmaCmbQgggmV7Ub uVrXmHrKFyKjUUfU837s4nGQtAo3iAXgidLd1lkv3BEBrGVszk4Bzbdit/3G06qN9GWe moPQ== 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 :message-id:date:subject:cc:to:from; bh=ii4L+XgRvgeFPeORbICRzQnOeCXngpLJek8qHq1IeNM=; fh=J8D/3zsqD0jD53hzoEyjh/rFasfgMwS9Ly+x4ePkuEI=; b=b+66DCswHSNWluYSAZM61pxqYFVh42lb6EPFwq6pPrJJu2F0/izo+69GIUS6Zk1CQG JfhIaQJWXZ4ieTS9VrZYgVxDtSEBAG7Ox9nJ2QL01wL59TgDuGyLzvRDnogQ7x4d4Fdl 9W7U6jWmLJFlLEOHFhnJ1ifa03ze9XXYu8h7ZmyBHZGQzVwv7AWd6qeHBAXlHjJDRJKY mklRrxZpGrbB8shFKG9nTSsJ11LSFmo1CTp1WaEt/85k9VzICFz8dP477v5x/BGlTQOH lr3FV7gmdQQWScN1hovXfUy3p6dLdeKq/kWcy3v86jftpKkbTo7rkp+rA97uS4Ox4zBd DO/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id jc12-20020a17090325cc00b001d04db0a359si5294566plb.199.2023.12.10.19.05.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 19:05:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 89D6C80782B9; Sun, 10 Dec 2023 19:05:26 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229589AbjLKDFS (ORCPT + 99 others); Sun, 10 Dec 2023 22:05:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229564AbjLKDFR (ORCPT ); Sun, 10 Dec 2023 22:05:17 -0500 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1BDF9D; Sun, 10 Dec 2023 19:05:21 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R871e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=guanjun@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0Vy9Z.J._1702263918; Received: from localhost(mailfrom:guanjun@linux.alibaba.com fp:SMTPD_---0Vy9Z.J._1702263918) by smtp.aliyun-inc.com; Mon, 11 Dec 2023 11:05:19 +0800 From: 'Guanjun' To: dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, kirill.shutemov@linux.intel.com, yu.c.zhang@linux.intel.com, tabba@google.com, xiaoyao.li@intel.com Cc: pbonzini@redhat.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/1] KVM: Move kvm_gmem_migrate_folio inside CONFIG_MIGRATION Date: Mon, 11 Dec 2023 11:05:18 +0800 Message-Id: <20231211030518.2722714-1-guanjun@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 10 Dec 2023 19:05:26 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784953121729554064 X-GMAIL-MSGID: 1784953121729554064 From: Guanjun 'kvm_gmem_migrate_folio' is only used when CONFIG_MIGRATION is defined, And it will triggers the compiler warning about 'kvm_gmem_migrate_folio' defined but not used when CONFIG_MIGRATION isn't defined. The compiler complained like that: arch/x86/kvm/../../../virt/kvm/guest_memfd.c:262:12: error: ‘kvm_gmem_migrate_folio’ defined but not used [-Werror=unused-function] 262 | static int kvm_gmem_migrate_folio(struct address_space *mapping, | ^~~~~~~~~~~~~~~~~~~~~~ Fixes: a7800aa80ea4 (KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory) Signed-off-by: Guanjun --- virt/kvm/guest_memfd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 16d58806e913..62bb8a1a47d1 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -259,6 +259,7 @@ void kvm_gmem_init(struct module *module) kvm_gmem_fops.owner = module; } +#ifdef CONFIG_MIGRATION static int kvm_gmem_migrate_folio(struct address_space *mapping, struct folio *dst, struct folio *src, enum migrate_mode mode) @@ -266,6 +267,7 @@ static int kvm_gmem_migrate_folio(struct address_space *mapping, WARN_ON_ONCE(1); return -EINVAL; } +#endif static int kvm_gmem_error_folio(struct address_space *mapping, struct folio *folio)