From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92871EB64DC for ; Fri, 21 Jul 2023 15:24:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2744D8D0003; Fri, 21 Jul 2023 11:24:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 224B08D0001; Fri, 21 Jul 2023 11:24:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0ECA28D0003; Fri, 21 Jul 2023 11:24:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id F02148D0001 for ; Fri, 21 Jul 2023 11:24:29 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D0F0BC02CC for ; Fri, 21 Jul 2023 15:24:29 +0000 (UTC) X-FDA: 81035990658.10.F6363A1 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf21.hostedemail.com (Postfix) with ESMTP id A6FE61C0012 for ; Fri, 21 Jul 2023 15:24:26 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=0qIqyuOQ; spf=pass (imf21.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689953066; a=rsa-sha256; cv=none; b=quRdTGH0BwQPPjyZM57IfzpApMBFQi6x1jxERsNctrSMbwz5RM6CeIPSaKCoi8UKnyyNsm 3+QFw2m7piqPpANkFILauE4mPTqq0HLoPJJJjYCWa3UWBfDy1w6PxobsZAnclspou+Eh8N d4DFe+aW80lTcNl9zQB0joZfdzN+bFY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=0qIqyuOQ; spf=pass (imf21.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689953066; h=from:from:sender: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: references:dkim-signature; bh=5bj/qjHHlQPHRuPMv+ZSfMFtpJBZN1I0WCg44HzJHNQ=; b=7TJAIyY3AwXuN33DdshrchW31hgpiFYihJaMBo+GSBXC8rwPZBYXpLE/sVnUTHnW+XW4Xu 8rVNUUe9rs7ZjDbcCGKz6cdL/ec7LuLcFJ7rALV5Je9NG+ISaMhW5GJBZ8Or4V9LfF5WI6 9cJJLQIGmy6FJFUQ95dXbFuzUwxwitY= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A7B2E61CAD; Fri, 21 Jul 2023 15:24:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89E2FC433C8; Fri, 21 Jul 2023 15:24:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689953065; bh=4vyHB7EQZwg9omt+p08A1Wl1SFkgzANAN3Bd2PvcyGc=; h=Subject:To:Cc:From:Date:From; b=0qIqyuOQT7JHR6TijddYsC2EQvZRjc4cy1pl0byJLP9bDZdXLzdlrG2nvLw+niZ0z e0YooGyitCYtfj6ZAytaj71xVtjvC5gzvPS0ydHI70FnFRTj/7rnVoCw1UR1KHE+GL 4QQgR8YH1mXn+NnkHQnxQNEBGdi/qXZ3DjHliwjA= Subject: Patch "swiotlb: mark swiotlb_memblock_alloc() as __init" has been added to the 6.1-stable tree To: aik@amd.com,gregkh@linuxfoundation.org,hch@lst.de,iommu@lists.linux.dev,linux-mm@kvack.org,rdunlap@infradead.org,rppt@kernel.org Cc: From: Date: Fri, 21 Jul 2023 17:24:14 +0200 Message-ID: <2023072114-umpire-ruined-a924@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: A6FE61C0012 X-Stat-Signature: mdo73ks4b6oke5hhu6966hhgmxgi6u1t X-Rspam-User: X-HE-Tag: 1689953066-851519 X-HE-Meta: U2FsdGVkX19exQ+DMVwpKIfH3x/AvHa0TK8+SUBUsludyMZeLVqJX9C89IxMut7gkqrUFeCdBWkjuQnzsqwb5lqGi9EL9/bC5LcZ7woe75oofvwIinFQ7WkegLsUpGRnIQYOt/LtkZW5H0QirrwCvHClHlnapQcCLcRvWsg+wLcfqhclaH61KDrHMJwuFNGaX3Cucx93ugWpD+2N8iMLpEwI4g0crHmId98ot8OnXbM0Zank30+EuAGPiNUjrWO+crxTUPAXtqrN+PNcePE/AY6COowgEmiWk/ABC9MwhRTvAv75u1B9aNXlSwmT0Q7VUhe8iFAYuXgg/H2YNaxTLjmEgBFtSVY0WkZzwLqvuQ0xTDB0xBfEM8kDCpeWB1qrLBQ93XDOQKVColfVkQW8Y25mdmDGahxefWHa/+EXEEWq5qkgD162+py9TK0+ovYqx/zQgE7rpJ7BZv7iSbOJdzNLEG0N0FkTZYo4x61atbxIDQY5iu/33y4LecDB2HTibfC8a98fP7g4g8VuRQMo9QL094QnFh1tNDj6Brqir0EMZlGCLZ7H4dpA6skTdvErDbcPs5U+LtsKJC41XbYrBD2Q814sxMnubYNQUR9zlB3CPnEa1N55UIDv6vYS/hOyCZWpNuIJogRBiwmkloclirmLL6O+xNbgmtsHU1cnWS+Jm7aCE0IY3Ud1kYRVIYKukGBwMysffm6E4+r2Ph0yEZK+s7rQp5v7gzzuvykkertw2R2DovcctW7iPrXp79p/Ld9HRq6Wk3cERh2T7M3d1T9RxWGFRA8kY8KFSFhh76Yyj1k5VPLxhHg+usLIaqvPSsMazPHGr9/KoynKMpbR8JOUqaX9JeOoAWi7WH/3Vti9Rw73mimYuepPgpgRlAFSHDTNUxsIjKN7G/eAvGNnNFL5y0N46QT90+IjX2ni8gQ/CXm5GFukTXytO2jaSUyVyv22TSDZU9nTdONxKC7 CuxDGsFz uW8Lx5ewPFxr0RgUw+O7D4apkTCvjFkF4v8ufxiR+VgKmKRDR3p2q1aCHjmdrxqOacYwlC6JBfpQ8KAmf2GF5nd5VOwvfMVZQ8iJnXaOIlD+OT7/AFT0yqzCacc3f2iSAyuxeoKLR4EVXipc3X1HY9D+b+C915zvy0hw9ehwZ1A2SLoAo/LOXOdvPWpUAZmWqzKHWryqYLSUloeRmlG1Uudrc33OM1pctA/G7Fou/X94gvIiPzyDeN/IMs2cLu8EWdb2xoHawjM/D59VUu5vODnLVi92ADvMD38CTb7qvt7FKh4mHOWzvX9oa45Yo/6L7qtWjNzppsC1FvF82xIoB2O+aN6hsRpWP29qQuArUF28Y9xRqxYZk8LBLKBKSjZGjmGHz1eUjNZMYP3b6N8WH1nGd7GHr3vGlSAzqgVbVehGrLQM+J2+1vidIAoohqYbIbAKcgEWpi3g2PgpU3MygchXL21Vy2xJXANCoVhoV1wqs+7uSkIxBJN5+X2DEZ+qzd0c45KAb10+Cj09TiPgvHcH1wJQNwXog0aPNNtPVGcQTZcmLcGM/nOqlyNoUGAk2khoKqHtFdXaMHAQ31tGn1RSyTZXomK/nDki62eb6lXcDMTA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This is a note to let you know that I've just added the patch titled swiotlb: mark swiotlb_memblock_alloc() as __init to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: swiotlb-mark-swiotlb_memblock_alloc-as-__init.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 9b07d27d0fbb7f7441aa986859a0f53ec93a0335 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 21 Feb 2023 23:04:11 -0800 Subject: swiotlb: mark swiotlb_memblock_alloc() as __init From: Randy Dunlap commit 9b07d27d0fbb7f7441aa986859a0f53ec93a0335 upstream. 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 Signed-off-by: Christoph Hellwig Signed-off-by: Greg Kroah-Hartman --- kernel/dma/swiotlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -324,7 +324,8 @@ static void swiotlb_init_io_tlb_mem(stru return; } -static void *swiotlb_memblock_alloc(unsigned long nslabs, unsigned int flags, +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); Patches currently in stable-queue which might be from rdunlap@infradead.org are queue-6.1/swiotlb-mark-swiotlb_memblock_alloc-as-__init.patch queue-6.1/wifi-airo-avoid-uninitialized-warning-in-airo_get_ra.patch queue-6.1/scsi-ufs-ufs-mediatek-add-dependency-for-reset_contr.patch