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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE325C433F5 for ; Mon, 17 Jan 2022 17:09:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233028AbiAQRJU (ORCPT ); Mon, 17 Jan 2022 12:09:20 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:52218 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242835AbiAQRGc (ORCPT ); Mon, 17 Jan 2022 12:06:32 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 54885B81160; Mon, 17 Jan 2022 17:06:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B6AAC36AF2; Mon, 17 Jan 2022 17:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642439190; bh=dPECgQQvYcxOo2hldr1cbm6OU4xhatPfSlbAjSYEegw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sY3pSK2Rpq3fHz5KAYMUOHvj3oDhLyBu9SHaqpp/mlZSXMTmzMTXmuabXoLcoRhBm Y6yYOp+r+/pkaQjtlhg42ty0/QB3T01GopJRMzis8/nlaFpPuS6mW5kqE+EHJI0O0y yUnWraDqjihNmHV4t6KB4p4u3lpMiKLcbBvtWiIDzwC3cOUkfr3/wPBzwWJaGcYbmV llqZkdLHygM+sqnOpET/Co37jf2jB2hEqlvZOUbkKMp2fjBb3oOM+D3andCP0YmvYP JAge4y42VWKaEcODQAxEKsmD0H5aRIS3AyDKP4zco35vMlJH6HkXv2Pgchd8OiUd9+ kcAFolaNGEIUg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christoph Hellwig , Baoquan He , "Martin K . Petersen" , Sasha Levin , jejb@linux.ibm.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 16/17] scsi: sr: Don't use GFP_DMA Date: Mon, 17 Jan 2022 12:05:50 -0500 Message-Id: <20220117170551.1472640-16-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117170551.1472640-1-sashal@kernel.org> References: <20220117170551.1472640-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Hellwig [ Upstream commit d94d94969a4ba07a43d62429c60372320519c391 ] The allocated buffers are used as a command payload, for which the block layer and/or DMA API do the proper bounce buffering if needed. Link: https://lore.kernel.org/r/20211222090842.920724-1-hch@lst.de Reported-by: Baoquan He Reviewed-by: Baoquan He Signed-off-by: Christoph Hellwig Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sr.c | 2 +- drivers/scsi/sr_vendor.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 84dd776d36c33..fdbd5c691d333 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -885,7 +885,7 @@ static void get_capabilities(struct scsi_cd *cd) /* allocate transfer buffer */ - buffer = kmalloc(512, GFP_KERNEL | GFP_DMA); + buffer = kmalloc(512, GFP_KERNEL); if (!buffer) { sr_printk(KERN_ERR, cd, "out of memory.\n"); return; diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c index b9db2ec6d0361..996bccadd3866 100644 --- a/drivers/scsi/sr_vendor.c +++ b/drivers/scsi/sr_vendor.c @@ -113,7 +113,7 @@ int sr_set_blocklength(Scsi_CD *cd, int blocklength) if (cd->vendor == VENDOR_TOSHIBA) density = (blocklength > 2048) ? 0x81 : 0x83; - buffer = kmalloc(512, GFP_KERNEL | GFP_DMA); + buffer = kmalloc(512, GFP_KERNEL); if (!buffer) return -ENOMEM; @@ -161,7 +161,7 @@ int sr_cd_check(struct cdrom_device_info *cdi) if (cd->cdi.mask & CDC_MULTI_SESSION) return 0; - buffer = kmalloc(512, GFP_KERNEL | GFP_DMA); + buffer = kmalloc(512, GFP_KERNEL); if (!buffer) return -ENOMEM; -- 2.34.1