From patchwork Wed Feb 22 07:04:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 60354 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp427942wrd; Tue, 21 Feb 2023 23:07:22 -0800 (PST) X-Google-Smtp-Source: AK7set93FhKQpbVVvLqpuzaVeY5UZCq5i2EIxTGUdfTba6XChZ/ME28N4JfrxxDYS5DO2qhgnFj/ X-Received: by 2002:a17:902:d4c4:b0:199:16c6:8a24 with SMTP id o4-20020a170902d4c400b0019916c68a24mr9402692plg.61.1677049641964; Tue, 21 Feb 2023 23:07:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677049641; cv=none; d=google.com; s=arc-20160816; b=CkdrXUdrK4abQmaczLaih980uWFmVa4YvWrFMaAgEmu0cuDzZe0d0LIrvnFcLQjqc6 AaGXygogOfN5gYg6+PC4eRIskc5hFCPI3vEN1Wkrvnn74mXFoP4WvLainjRHrwEJ3HcZ D+mSW+mb8Twso3l+5PrZBaS0GynJMkcXIisc9U6yx7kDA6lUYen63olXp5i/146JTTU+ uLGPo7CoNAeTb7078MGMjC8c2c4E4qbhiDwFwV5jLPqwfSmhdX+Y5o8egInWI0+1S8eq 8+MCYNEHSLe28N8yQ2eaNjxqG6NTm2aQEp07cE6jcQNrptAR24lpjnzPPwSVXeytnXOC RSug== 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:dkim-signature; bh=MNjuw99R4HgS/gXxR2rjHmB3r482Mpv9GRPW/CNskZA=; b=YrXnbktBBriavIXnz1D3yeeag0Hfzz3kxeImwSNno+Cenn1hz+1843oV9Y0vOS1IGn kYnemlQ+Gp0l2iO1G1rnd4fJ1NA8bOTzzbSsSiHgC5OS0eDNpf+QUI4jGo7Znedq2e76 qEc0zH603WL++9FeJ8lYy8nKUtVDFAtA2oqsv3A3F5C2Md6Qs7RDfdnouBetgxb7RVRu DDotHPND2JndNo2RQxNLxnzR++0cVKgF3vRG3KK0Iv0Fpw2xHStOTnXFCqQhu3vL5PC4 +tAjGk0XrbW/BhevHd8JTJaiO4DPwrT0E+excAS261PnuFo/xoNitzP/pxJNbuotNogv aarA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=1jOsEuWg; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f8-20020a170902ce8800b0019a940178casi17194172plg.309.2023.02.21.23.07.08; Tue, 21 Feb 2023 23:07:21 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b=1jOsEuWg; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230472AbjBVHER (ORCPT + 99 others); Wed, 22 Feb 2023 02:04:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230300AbjBVHEO (ORCPT ); Wed, 22 Feb 2023 02:04:14 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E747D24CBF for ; Tue, 21 Feb 2023 23:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=MNjuw99R4HgS/gXxR2rjHmB3r482Mpv9GRPW/CNskZA=; b=1jOsEuWgQSmtMaFWKT/scfSbVT lUFFM6ktVoaRkQFLyF2Dqnlavx3hi4StHJOm3DIiyzYMOpwbJ/WiD7wqWbLdQo8P/dysFa+u8qZ7/ 1MvcLDhfikHckihLkREpGhA4gg5GQtI2db0kGet+cg5T+sz0sQ/ewjGxM9k9gaU3BwTUUiMH+KfqD /s9h3kxBXjw459cZ0TTwSJpkRXO+OtKN2smJA1oX4s20l56bHONL4yKZUcHSqtuMVy0tWPTUh6Hu0 Nv4I0pQkkr9AiEsRjrUIOEJtPb0FW/mnpre2CKXICO+75bn2r2Nmd+jrHN9UoGutp3RNYMgq/aOZW t6b7kSeg==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pUjAi-00B17L-2z; Wed, 22 Feb 2023 07:04:12 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Alexey Kardashevskiy , Christoph Hellwig , iommu@lists.linux.dev, Mike Rapoport , linux-mm@kvack.org Subject: [PATCH] swiotlb: mark swiotlb_memblock_alloc() as __init Date: Tue, 21 Feb 2023 23:04:11 -0800 Message-Id: <20230222070411.6186-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.2 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_NONE 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?1758514005006244810?= X-GMAIL-MSGID: =?utf-8?q?1758514005006244810?= swiotlb_memblock_alloc() calls memblock_alloc(), which calls (__init) memblock_alloc_try_nid(). However, swiotlb_membloc_alloc() can be marked as __init since it is only called by swiotlb_init_remap(), which is already marked as __init. This prevents a modpost build warning/error: WARNING: modpost: vmlinux.o: section mismatch in reference: swiotlb_memblock_alloc (section: .text) -> memblock_alloc_try_nid (section: .init.text) WARNING: modpost: vmlinux.o: section mismatch in reference: swiotlb_memblock_alloc (section: .text) -> memblock_alloc_try_nid (section: .init.text) This fixes the build warning/error seen on ARM64, PPC64, S390, i386, and x86_64. Fixes: 8d58aa484920 ("swiotlb: reduce the swiotlb buffer size on allocation failure") Signed-off-by: Randy Dunlap Cc: Alexey Kardashevskiy Cc: Christoph Hellwig Cc: iommu@lists.linux.dev Cc: Mike Rapoport Cc: linux-mm@kvack.org --- kernel/dma/swiotlb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -- a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -292,8 +292,9 @@ static void swiotlb_init_io_tlb_mem(stru return; } -static void *swiotlb_memblock_alloc(unsigned long nslabs, unsigned int flags, - int (*remap)(void *tlb, unsigned long nslabs)) +static void __init *swiotlb_memblock_alloc(unsigned long nslabs, + unsigned int flags, + int (*remap)(void *tlb, unsigned long nslabs)) { size_t bytes = PAGE_ALIGN(nslabs << IO_TLB_SHIFT); void *tlb;