From nobody Thu Apr 9 07:18:18 2026 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2DE73E8C50 for ; Tue, 10 Mar 2026 08:08:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773130105; cv=none; b=PjgnBPxhZr23iKj6bR8nmynOgZP18X/ujD+HB0oPMq0ECmMATPyqFIeazGe4VSV74NLa97CK6GMvb+PNVPnY5BYh3G1C/YClP8/FKZoXmi6r8Ay8bs3h4wo6QnCoxpu+KoU+F4q6plTbkXmG942qfAPIk67yB57O2r5pQUjWW3w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773130105; c=relaxed/simple; bh=7X9Q/Qq5DK5qYSbZ/ZctBIT4BKTNlTslDTBo1sf6VlI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=ncYwwwteehbv1kayVn3IOyQujVQUk9yWN3fOBaEIlTb4CC/ouczQhy+PYpg+DKj4IKbt9CoLysUuhZea32c374FWQBddDTQ7hdLr6S0EpgoSldIrinK9X3cgb/ggTGlvCIJuyP8N8nR/NYfzjvThlpoNs36KKTRtWqEqbnJIoMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [210.73.43.101]) by APP-03 (Coremail) with SMTP id rQCowAD3E9to0a9pDDQ7Cg--.45464S2; Tue, 10 Mar 2026 16:08:09 +0800 (CST) From: Pengpeng Hou To: Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, Pengpeng Hou Subject: [PATCH v2] xen/grant-table: guard gnttab_suspend/resume with CONFIG_HIBERNATE_CALLBACKS Date: Tue, 10 Mar 2026 08:08:00 +0000 Message-Id: <20260310080800.742223-1-pengpeng.hou@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: rQCowAD3E9to0a9pDDQ7Cg--.45464S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Zr15ZFWDtrW5uFyfXw4Utwb_yoW8tF4xpF Z8JrWqyr95Ja4SyFWaya9YkFy5ua93J3yxGr4Y9rZxZan7Gr17ArWSqFyjvr1kWrW8Jr4v vF4qgrW3Cr4UuaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvv14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j 6r4UM28EF7xvwVC2z280aVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r 4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUAVWUtwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWU AVWUtwCY02Avz4vE14v_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr 1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE 14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7 IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E 87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73Uj IFyTuYvjfUjkucDUUUU X-CM-SenderInfo: pshqw1hhqjhx1rx6x21ufox2xfdvhtffof0/ Content-Type: text/plain; charset="utf-8" In current linux.git, gnttab_suspend() and gnttab_resume() are defined and declared unconditionally. However, their only in-tree callers reside in drivers/xen/manage.c, which are guarded by CONFIG_HIBERNATE_CALLBACKS. Match the helper scope to their callers by wrapping the definitions in CONFIG_HIBERNATE_CALLBACKS and providing no-op stubs in the header. This fixes the config-scope mismatch and reduces the code footprint when hibernation callbacks are disabled. Signed-off-by: Pengpeng Hou --- Hi Juergen, Thank you for the feedback. I apologize for the non-standard patch format=20 in the previous version.=20 As requested, I have regenerated this patch using `git format-patch` to=20 ensure proper hunk headers and context line numbers are included. Changes in v2: - Re-generated with proper git formatting (line numbers and context). - No functional changes from v1. drivers/xen/grant-table.c | 3 ++- include/xen/grant_table.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 97e27f754d396..a6abf1ccd54ce 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1579,7 +1579,7 @@ static int gnttab_setup(void) } return gnttab_map(0, nr_grant_frames - 1); } - +#ifdef CONFIG_HIBERNATE_CALLBACKS int gnttab_resume(void) { gnttab_request_version(); @@ -1592,6 +1592,7 @@ int gnttab_suspend(void) gnttab_interface->unmap_frames(); return 0; } +#endif =20 static int gnttab_expand(unsigned int req_entries) { diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index 69ac6d80a006b..a33a60a2ea72d 100644 --- a/include/xen/grant_table.h +++ b/include/xen/grant_table.h @@ -84,8 +84,20 @@ struct gntab_unmap_queue_data }; =20 int gnttab_init(void); +#ifdef CONFIG_HIBERNATE_CALLBACKS int gnttab_suspend(void); int gnttab_resume(void); +#else +static inline int gnttab_suspend(void) +{ + return 0; +} + +static inline int gnttab_resume(void) +{ + return 0; +} +#endif =20 int gnttab_grant_foreign_access(domid_t domid, unsigned long frame, int readonly); --=20 2.25.1