Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Lu Baolu <baolu.lu@linux.intel.com>,
        Joerg Roedel <joro@8bytes.org>,
        Kevin Tian <kevin.tian@intel.com>,
        Matthew Rosato <mjrosato@linux.ibm.com>,
        Robin Murphy <robin.murphy@arm.com>
Cc:     Alex Williamson <alex.williamson@redhat.com>,
        ath10k@lists.infradead.org, ath11k@lists.infradead.org,
        Christian Borntraeger <borntraeger@linux.ibm.com>,
        dri-devel@lists.freedesktop.org, iommu@lists.linux.dev,
        kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org,
        linux-rdma@vger.kernel.org, linux-remoteproc@vger.kernel.org,
        linux-s390@vger.kernel.org,
        linux-stm32@st-md-mailman.stormreply.com,
        linux-tegra@vger.kernel.org, linux-wireless@vger.kernel.org,
        netdev@vger.kernel.org, nouveau@lists.freedesktop.org,
        Niklas Schnelle <schnelle@linux.ibm.com>,
        virtualization@lists.linux-foundation.org
Subject: [PATCH v2 04/10] iommu/dma: Use the gfp parameter in __iommu_dma_alloc_noncontiguous()
Date:   Wed, 18 Jan 2023 14:00:38 -0400
Message-Id: <4-v2-ce66f632bd0d+484-iommu_map_gfp_jgg@nvidia.com>
In-Reply-To: <0-v2-ce66f632bd0d+484-iommu_map_gfp_jgg@nvidia.com>
References: 
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2f0Uut1aescwxLLm2nudPyU7lR6i3Jh6wJTsepXy+lAJ3Yrq567SDzNCsuxO?=
 =?us-ascii?Q?n7miKfQDY2iNpOCM0oXGyjx7IP/msuTEWpM9zwBvY4XHYwUcoGKFk8rIOzUH?=
 =?us-ascii?Q?2gAEYWSAnHJzOKncKycY4axodL28uBXKM0t9vCXSr5/shLIl7xeqb1gB1KVW?=
 =?us-ascii?Q?DYLtjZL3sWa+4vWwCZgA8fpatbmj3WOyIj+VFQd3evRCQMTrJozUSTQ9Ok6h?=
 =?us-ascii?Q?BsewM+03mr9n+BNLsQ8/FjnbUrbARlkxZioQK46336anodmBKw07jsr2eqjv?=
 =?us-ascii?Q?YQuYU8aFA9nTB+A39r19ZjvS8o9ZwLw7J5k1SppIqw3FmGY7XSeveZlzlVw5?=
 =?us-ascii?Q?CaxOrPG1VyXG21coMM4AzZwb3EGEqIDjcEwzDR6MdMX4Iw0Z8mqfIRSKG0Rb?=
 =?us-ascii?Q?YF9ux7NHebRge8S3fc8kkIT8Lysc2sIpdRfYoK2IZK67IHWWnHhUSaTWWNXQ?=
 =?us-ascii?Q?JodiAIrnU240OEsOy6qvK3PkeJ9BFKIB6MwyO9tsVS90SiDV2a0P/rCC2mqA?=
 =?us-ascii?Q?7wzbxQB2ThVask+v2z+vP8Z5OiHGWgPe7r0Jvyj29gMOxmsteo22JDSQeH1B?=
 =?us-ascii?Q?KNt8ZltYquKXNmJsmXRx2oOlha2TFrDHTuILS+9L9135DQs1tUe2ByCx68Oh?=
 =?us-ascii?Q?+Hucd3GHcvBfvQdltLK0UulM+cj3rLp8xOWoHDqesa6Ft444kMMQRS27x0rH?=
 =?us-ascii?Q?15bFHNBP59kkqHRo0a+2ArtQ58qInqElabz1ZaVCO20aQU/s69IibE92cZzR?=
 =?us-ascii?Q?RritzZRGswxaZxTfx/WgWA7RmlvzRZ/0O/5Lmy/GWdi6EP1ZdRz7bnzonVwW?=
 =?us-ascii?Q?Tfze3MtHjmFEQpFF6K0MsJYKVnPbd02YbeembMH2JcrG8PT/i8zGTI86IT3o?=
 =?us-ascii?Q?OSKtVl7Q9PmufMQfj/fj82NTsRiWDq3OZxcawXze00/0hBUW48QskqunCgcx?=
 =?us-ascii?Q?2EufA5y7BqKDP2RWmQRpdN2CQ4rSUpz/Sr5w4i7MGsGkrKUYrKSJ/N/B3/lH?=
 =?us-ascii?Q?3/Ie2pe61LI0lLKaGbqX15kqamrhG7irtnZEpCVFwrIXNdi/zpUJjoDJqXcN?=
 =?us-ascii?Q?FUPeWGkg2U6flmzOYCo4+2RKBR0LIln6AbGgFidAn+VkbxBRPT4Scmc8Sp/Y?=
 =?us-ascii?Q?Q0nQlSZ7iS42ORrt/9GB7IlRRCTRbt4QgqKTstNmoacMBh2/afCVsHvRBCKH?=
 =?us-ascii?Q?y+JHzYg+uk/f6NNs9bDhwtZ1sbLI7qBp04Xji7SOJa+Mf6MEdW/WtjmHk7CR?=
 =?us-ascii?Q?vnOuniSJjCkny/+9LeR1g+l+bmWixAktIJP4LPCGcx97/USAS74G00y1rv3L?=
 =?us-ascii?Q?WLSaQ2Ak16XOqsjvqAlyD0GBGZC60bv+S6cSRKi+qjIKGwbsrirt41SwG4Lx?=
 =?us-ascii?Q?Nh3T3KbTTu2C14OaCNtxJFaZprakT0lNhYalLQ5CuTRDGxouYpZm7Pf9D+5Y?=
 =?us-ascii?Q?lgWFpIsdVbJxRsb27IAJ1bIzVXiz3cx+GqC5I2W+8TsUnA3HSb0hriInCtJL?=
 =?us-ascii?Q?4jCBbbZrHYEZi5PrbhrASDoR02hMQZR3a8/x9e24xd9iZM4bRAd6fXAcNMhO?=
 =?us-ascii?Q?KRq5hWo5a96jnjAuMZCUuwE9ngtT3S/kE9NACeLv?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3a42fed2-83fa-4c5b-cefd-08daf97decd0
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 18:00:46.8806
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: mzD/OnsX4Ro4ty43+yJ9jWAKT/OVO/tqlP+BiA2m7qlXlZRx8unJtenyDPa2RjUd
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5818
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no 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: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Change the sg_alloc_table_from_pages() allocation that was hardwired to
GFP_KERNEL to use the gfp parameter like the other allocations in this
function.

Auditing says this is never called from an atomic context, so it is safe
as is, but reads wrong.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
 drivers/iommu/dma-iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 8c2788633c1766..e4bf1bb159f7c7 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -822,7 +822,7 @@ static struct page **__iommu_dma_alloc_noncontiguous(struct device *dev,
 	if (!iova)
 		goto out_free_pages;
 
-	if (sg_alloc_table_from_pages(sgt, pages, count, 0, size, GFP_KERNEL))
+	if (sg_alloc_table_from_pages(sgt, pages, count, 0, size, gfp))
 		goto out_free_iova;
 
 	if (!(ioprot & IOMMU_CACHE)) {
-- 
2.39.0