Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3979048pxb; Tue, 25 Jan 2022 00:31:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJytVELU8raDqh2w4youcgV4u1gLQuV7vTtmjSAKRbridM4tHtntc9y8umNiCgYePuL8+uzb X-Received: by 2002:a63:8142:: with SMTP id t63mr9831899pgd.184.1643099483277; Tue, 25 Jan 2022 00:31:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643099483; cv=none; d=google.com; s=arc-20160816; b=DRmz09o/AfBVjRpKxh2RPjgeHhR8YSn9g17oVbnlf7hjHtcJJtJuOnRU7o5M1fMUxL r7TDT7bfmQm7Szh5qxxeamLToy5Mf7T8aK24+yPAWvPvEzvTu0KIgxqCx0MH9JEH92HT Xfhmnbd6XapCGS36IB8DNaZaxbCSCyYOqS3jcILSebxkzZTNwqBU2gX117Wsf5orY3Xn lpTCUWaTDaHfsQWVf8mdGnJaA23th5XIYhfAnPkVw0ntCIDU1E7MgC1nGUmPNXHcwPrY NMEZi7PR5u11IwsZqyQIaw/xVqxqAYOeQZ7CBe9oKu7zIAIhOkpukBJ2J4h8pT7eajTz DE7A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Zq1ljgBjFsxoxtXXHQ8B5uJoPzZa1O0XItv+3IFmOSo=; b=YmNYWXiqPXuWtKw6UPeqe7cdFUpJYeuW3ma4PB1k0vS30357F35HCsiXaEnHOs7bf8 BtOw51BQ7aqxpKb7g+8nEN92M0h53TXNP6uJwQ8l+WoeKdD2X9dOtR2EkCXCGGoLKtfn OnJDYcB49W/7nAF4mCKPxcb4DWf6DBYyMzrNw3nqKGbcoBjBI60/oF2Xujz83zQr0AR/ YGo0y3UF01NC7Cn8o1pecqaRU3feeTWYvCxqV/io1dSM+zKIuvrCazvwTz6Kthkc6xo9 4XhBi605nxIDqNOviQmcrgXw4FSu6LNtXQfpTuRtE6vov9XAbz1Mk1OI4UBbx/s1yrmV e6MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hd1ACcFD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j10si1582044pjl.128.2022.01.25.00.31.11; Tue, 25 Jan 2022 00:31:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hd1ACcFD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1313262AbiAYCsL (ORCPT + 99 others); Mon, 24 Jan 2022 21:48:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355765AbiAXVDJ (ORCPT ); Mon, 24 Jan 2022 16:03:09 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED392C06B584; Mon, 24 Jan 2022 12:03:00 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 880DF6131E; Mon, 24 Jan 2022 20:03:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 994DFC340E5; Mon, 24 Jan 2022 20:02:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054580; bh=etu1+QawpUz4kFPhtE4lzzUtDzxSXDESMys7UCF3mVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hd1ACcFDUOzjzhLAUozl24JESmzXkjYdfGfxtVlZrDzwIs4ZUcBoXCeXq6YrSBCnO Ab47ThMKXfXH4Ktzv7Vz7UTlt4Ee41QE2dSHLpRZdjShpqngFqROAB26t5hn5stBYs 53BftVH3ZYBoss7LbyUwpuOsTlY7yk48oXInzOo8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Baoquan He , Christoph Hellwig , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.10 436/563] scsi: sr: Dont use GFP_DMA Date: Mon, 24 Jan 2022 19:43:21 +0100 Message-Id: <20220124184039.521251314@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 4cb4ab9c6137e..464418413ced0 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -917,7 +917,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 1f988a1b9166f..a61635326ae0a 100644 --- a/drivers/scsi/sr_vendor.c +++ b/drivers/scsi/sr_vendor.c @@ -131,7 +131,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; @@ -179,7 +179,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