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 X-Spam-Level: X-Spam-Status: No, score=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B717CC47083 for ; Wed, 2 Jun 2021 14:39:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4F863613BA for ; Wed, 2 Jun 2021 14:39:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F863613BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C81C06B009D; Wed, 2 Jun 2021 10:39:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0AD86B009E; Wed, 2 Jun 2021 10:39:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A86476B009F; Wed, 2 Jun 2021 10:39:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0220.hostedemail.com [216.40.44.220]) by kanga.kvack.org (Postfix) with ESMTP id 6EA466B009D for ; Wed, 2 Jun 2021 10:39:45 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0B2CFB793 for ; Wed, 2 Jun 2021 14:39:45 +0000 (UTC) X-FDA: 78209042730.17.10D7D89 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf27.hostedemail.com (Postfix) with ESMTP id 518558019375 for ; Wed, 2 Jun 2021 14:39:31 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id EF6D7613AA; Wed, 2 Jun 2021 14:39:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622644783; bh=jI+GIBfW+TTSPEkqnl9cajZsedb1xU15s5PN+0Ulsm4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XLA8dEJsn5AN9LP9sVq8efoYniWRR1tfgU0lv7D1Z1C0PGsBAIivJU601YNX0koiX ZAfeGHRjs49+Nj1WYzTRQ+pFlQKUtNpi7FXoxto+ya+HEffNbDKjmWGhb0uBBXmUMG omPTip3iY20rdDSiiUkUeqZHFGc6FcoMBxzTNKgIT95Q4RmueG7vq5nWQIKpFwQRVv kPZpqWrtB+vSQZvfh89RPF9UiNSwaMYxAZba80cZWBHUoz0D8eP8atmVW04j7IlY9U FTFtalztjYK6q9/YGuMQrNqgAXj7dpilUUMuWZbm1+KiwNnwSKTKsLw3BK/vK9pmB2 0Glq1dhflBldw== Date: Wed, 2 Jun 2021 07:39:40 -0700 From: Keith Busch To: Max Gurtovoy Cc: linux-nvme@lists.infradead.org, dan.j.williams@intel.com, logang@deltatee.com, linux-mm@kvack.org, hch@lst.de, sagi@grimberg.me, david@redhat.com, oren@nvidia.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: Re: [PATCH 3/3] nvme-pci: align CMB size according to P2PMEM alignment Message-ID: <20210602143940.GA5751@dhcp-10-100-145-180.wdc.com> References: <20210602111055.10480-1-mgurtovoy@nvidia.com> <20210602111055.10480-4-mgurtovoy@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210602111055.10480-4-mgurtovoy@nvidia.com> Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=XLA8dEJs; spf=pass (imf27.hostedemail.com: domain of kbusch@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=kbusch@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 518558019375 X-Stat-Signature: qdqjacnfzpbhqmfu9jhimgek3hm37kmz X-HE-Tag: 1622644771-276559 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: On Wed, Jun 02, 2021 at 02:10:55PM +0300, Max Gurtovoy wrote: > P2PMEM is using mhp framework to connect to the memory subsystem. In > case the CMB size is not compatible to mhp alignment, the CMB mapping > will fail. Use pci_p2pdma_align_size to align CMB size in order to > successfully map non-aligned original CMB. > > Signed-off-by: Max Gurtovoy > --- > drivers/nvme/host/pci.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index a29b170701fc..1197263b4cd0 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -1817,6 +1817,7 @@ static void nvme_map_cmb(struct nvme_dev *dev) > u64 size, offset; > resource_size_t bar_size; > struct pci_dev *pdev = to_pci_dev(dev->dev); > + unsigned long nr_pages, min_align; These new variables don't appear to be used anywhere. > int bar; > > if (dev->cmb_size) > @@ -1856,6 +1857,12 @@ static void nvme_map_cmb(struct nvme_dev *dev) > if (size > bar_size - offset) > size = bar_size - offset; > > + size = pci_p2pdma_align_size(size); > + if (!size) { > + dev_warn(dev->ctrl.device, "CMB size is 0 after alignment\n"); > + return; > + } > + > if (pci_p2pdma_add_resource(pdev, bar, size, offset)) { > dev_warn(dev->ctrl.device, > "failed to register the CMB\n"); > --