From patchwork Thu Oct 13 17:52:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2198 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp410025wrs; Thu, 13 Oct 2022 11:05:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5v+aCdL7ctxbNkPzQb/pUQkrhV6tVIrTmZMvpEcKYSUMHtL0xh/PaDbG7+f7H94ejg7gPj X-Received: by 2002:a17:90a:4ec6:b0:20a:96cd:2a46 with SMTP id v6-20020a17090a4ec600b0020a96cd2a46mr1100595pjl.171.1665684347176; Thu, 13 Oct 2022 11:05:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684347; cv=none; d=google.com; s=arc-20160816; b=AArxNvgs8jM4ZQXvhuP28aZ8DKk8QBWIYC7cRYsL5BBauBKAh50uUcy8Y2lrVgJgDg wULEAk9ikKKbaDv8OS1O67bY98Tncw62EuLph/eYSMKVCl1xYSXJLW/zqi9eRncjT5hO JD/TdAASH1jcwgftOh49gOCRa5k1mhVK65ooHAzam4j+FQztss6g1b7Hih0fW4Wu4GOP Mp1c41mKF1KfbmaVK+wxuNDs6ElVS+ePw3xNRGlifmyh2SGcJ+T4/BJudZ9zBmP6PAYl 0BODzcSrdtzm9zMDtzq1o9+45s+nDkdWfGqK6n+dDakAdze3mGaiF0DOHw8pyaszwmGS LUhQ== 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=qP9I28kY7pFeC7FaX/cjJeU9w8lvBNegVsYwPFyKiMU=; b=YjP9MY/9ZPqja6Bg86cPhak9xUhYcsTYGlR3x83tblYJgaJJcQUYrav2ixFKMRyS/M Cx+wCpWw4HtxRASCDdgPVcuV/fY4yuAAOTA1PreycCP/VbnTgE+DsqYXh9N5aj1q9lXZ giVGG7HX8VDyB6hmA0SPymK2JQLWRKp05aPng7p4wD9ypLOhaEstEOB1tH0y+34OuzGH agJqYtWsv+dCsPoOt5sUcJhztiqJ15GTL5VjFjcgf0QOl17WlCVc7p3xb1clMUvYHXQx ajWaQ3DKcBcGcMffOZjHzTiTTdRfgWYmUpv7sQzN4Tw67LrpsRP0nD3r53Htx2/fdSTS sh4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q4tvDJZH; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bj20-20020a17090b089400b0020d4b43d8b5si5647983pjb.103.2022.10.13.11.05.34; Thu, 13 Oct 2022 11:05:47 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=q4tvDJZH; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230475AbiJMSFN (ORCPT + 99 others); Thu, 13 Oct 2022 14:05:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230521AbiJMSDX (ORCPT ); Thu, 13 Oct 2022 14:03:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2DD9152C6D; Thu, 13 Oct 2022 11:03:09 -0700 (PDT) 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 E174F61940; Thu, 13 Oct 2022 17:59:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6558C433C1; Thu, 13 Oct 2022 17:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683975; bh=TtqNUNWlPTyKk3R9AHqRdsMadV8TWTbVuO0bnrdbaEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q4tvDJZHpVjjg0NSCnpXUHN34wK9qSCAbHyBL21yO3eoe94H0iNd8i+J5Hg/JD4Aa f4hCOrhDQy9y5qWbRBA0pkOM8Wh6TvtqriKgKn2KnP7uwkEawPx2y7I0npzXRaBo0n iAeZXU+XoATwdPZKKD6odGwjKLU5oqsGDn9SJWDM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rishabh Bhatnagar , Christoph Hellwig Subject: [PATCH 5.19 06/33] nvme-pci: set min_align_mask before calculating max_hw_sectors Date: Thu, 13 Oct 2022 19:52:38 +0200 Message-Id: <20221013175145.442325068@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175145.236739253@linuxfoundation.org> References: <20221013175145.236739253@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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?1746596630110307311?= X-GMAIL-MSGID: =?utf-8?q?1746596630110307311?= From: Rishabh Bhatnagar commit 61ce339f19fabbc3e51237148a7ef6f2270e44fa upstream. If swiotlb is force enabled dma_max_mapping_size ends up calling swiotlb_max_mapping_size which takes into account the min align mask for the device. Set the min align mask for nvme driver before calling dma_max_mapping_size while calculating max hw sectors. Signed-off-by: Rishabh Bhatnagar Signed-off-by: Christoph Hellwig Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2825,6 +2825,8 @@ static void nvme_reset_work(struct work_ goto out; } + dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1); + /* * If we're called to reset a live controller first shut it down before * moving on. @@ -2858,7 +2860,6 @@ static void nvme_reset_work(struct work_ * Don't limit the IOMMU merged segment size. */ dma_set_max_seg_size(dev->dev, 0xffffffff); - dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1); mutex_unlock(&dev->shutdown_lock);