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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD0D4C4332F for ; Mon, 6 Nov 2023 07:08:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4AF8144017B; Mon, 6 Nov 2023 02:08:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 437F7440150; Mon, 6 Nov 2023 02:08:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D75544017B; Mon, 6 Nov 2023 02:08:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1ACAE440150 for ; Mon, 6 Nov 2023 02:08:52 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E4FBAA049A for ; Mon, 6 Nov 2023 07:08:51 +0000 (UTC) X-FDA: 81426652062.01.BC26D59 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by imf21.hostedemail.com (Postfix) with ESMTP id 118201C000F for ; Mon, 6 Nov 2023 07:08:49 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; spf=pass (imf21.hostedemail.com: domain of hch@lst.de designates 213.95.11.211 as permitted sender) smtp.mailfrom=hch@lst.de; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699254530; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GlF92UAWKzaEmYbGytCUDCrcLsDkpAnruGZbnCNilAg=; b=jnahk4u+dT9FdOWChmyy65m4raQc5aOg8nPMvRh6WdLVDlJy1e/IIfcfvUe0JStyCYm2DG 7TddS+oFhGspOM+LoWIEZFaLAkx3EeL5ghpvLkc0TMDCyesk21RL0R2vN57KwPUtnPdH6I rn0HuMnAmVh/AWKQrd3SjGXVCWi0e7U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699254530; a=rsa-sha256; cv=none; b=UEIFrmtKaZI92Sc3yq7hMFaGo5GNUEfRrjtZaE9kzf1rUNRzvWrFaS618tBMk+OjOe2o/2 dmsYDI6tL6THr2E7Q/Od+4CwyyPi2/G6NDt2HxkPAo08Z85tLiIk7PXm9FySsBPqpL6o60 yoOz83a2surrPcmhoMvc++g7thsKJWE= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; spf=pass (imf21.hostedemail.com: domain of hch@lst.de designates 213.95.11.211 as permitted sender) smtp.mailfrom=hch@lst.de; dmarc=none Received: by verein.lst.de (Postfix, from userid 2407) id 3581C6732D; Mon, 6 Nov 2023 08:08:45 +0100 (CET) Date: Mon, 6 Nov 2023 08:08:44 +0100 From: Christoph Hellwig To: Keith Busch Cc: Marek Marczykowski-G'orecki , Mikulas Patocka , Jens Axboe , Christoph Hellwig , Sagi Grimberg , Jan Kara , Vlastimil Babka , Andrew Morton , Matthew Wilcox , Michal Hocko , stable@vger.kernel.org, regressions@lists.linux.dev, Alasdair Kergon , Mike Snitzer , dm-devel@lists.linux.dev, linux-mm@kvack.org Subject: Re: Intermittent storage (dm-crypt?) freeze - regression 6.4->6.5 Message-ID: <20231106070844.GA17022@lst.de> References: <20231031140136.25bio5wajc5pmdtl@quack3> <8a35cdea-3a1a-e859-1f7c-55d1c864a48@redhat.com> <3cb4133c-b6db-9187-a678-11ed8c9456e@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17 (2007-11-01) X-Rspamd-Queue-Id: 118201C000F X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 9sjy34xqcfb64i7bu5wr97p49gsokpzt X-HE-Tag: 1699254529-655913 X-HE-Meta: U2FsdGVkX1/asSaUlxCYjk76nP2clJSBAZk2y45p8U+Tl61/2USl9XxiYTMyCQ42yEdmNwGwoO4/CA60O7tXThsP/4DVQJUPD2JUvv0W5Y4sDIzKqm5vEeUws+wHTPZF4Kp809KVU8vlc4iBOYePjn5NETZBgKivG8K2f3Ofk0h4OVuR4IINOLf2SJdshiTT6aOLKBb+5IoByPepfEdvSe8cqmxJoKC3xlyUa2uuiWbbJR/920pFRzmGHaT2awAtoLYPj3WD9ABP9hAg9395J0hEvwMJJKOTGe8VGXE3VUu7J+7Rbe58OetvZPaDtd9EUDKPImq32gbkMbm7LGUQGVRFEpEOWkcenhaAG3sL1T9lqMo0XRfCHIia+6t3doEXSveUgwEfkLSvELHSjy9KsbgjHgLLfe9Q2C1+5Pc6PfpMBrwoSH+gtxwm0cklPND+p2P608sXv3W5MuOSy66kIoosqI9yY2CRO269cJw7TYJ4MRUrP1t0ohI3Ws6tQZVtBHP1HPstBVZ5xe8oiOIAcRP26r2B6VE0eh3JbfRayvBErmoWAhrw4LtSKeUSWex4XEsBhTOcaXBx6+jWMI5VENTOdrX4j/wEjzssKa8SU/9uHuJWC62hgyurT3heYj69/G+aE9g1jKOAK1Km7z6qRnSelAuzGGAt62ur4jIUGPYmfljjoAN6B1pp2+/UmB+YlYrQNVR7vtd4qPHFk4RhPIk9liyKm6SQXqRe1U47obqLzFycvdYM9yUqvdxjlbbVX5b+A8fovdoGBlGBZfQEBxKjdoIF1R9qYKkjKo4qKFo27b/ZvG/0i6wnIA8ZrNP4ULtGjyxsVdjyuASljmFDcor9HrSB3rhtXQAnxsdteiqRhR3YItqD6prTms8BNwoAQj9pEMvFoTuD+6tZuhtNHREKSCwEaQnaUOqtaVOiwxAxW4kVDKdQ29hF/SpFXTGSknND1YCBCna/y8LTDll LrOgQszF OxijrLd01f3EC6cRHgzFIxEu7FDG0Z+bgobGJRtEW8o3Wz+/yAhM+f09CirSFpXCaNWmrSZvMZyNWPxIVsj5EW8ab3g== 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: List-Subscribe: List-Unsubscribe: > - dev->ctrl.max_hw_sectors = min_t(u32, > - NVME_MAX_KB_SZ << 1, dma_opt_mapping_size(&pdev->dev) >> 9); > + dev->ctrl.max_hw_sectors = min3(NVME_MAX_KB_SZ << 1, > + dma_opt_mapping_size(&pdev->dev) >> 9, > + dma_max_mapping_size(&pdev->dev) >> 9); dma_opt_mapping_size is already capped by dma_max_mapping_size, so no need for this hunk. > dev->ctrl.max_segments = NVME_MAX_SEGS; > > /* > diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c > index 946bd56f0ac53..0e6c6c25d154f 100644 > --- a/drivers/xen/swiotlb-xen.c > +++ b/drivers/xen/swiotlb-xen.c > @@ -405,4 +405,5 @@ const struct dma_map_ops xen_swiotlb_dma_ops = { > .get_sgtable = dma_common_get_sgtable, > .alloc_pages = dma_common_alloc_pages, > .free_pages = dma_common_free_pages, > + .max_mapping_size = swiotlb_max_mapping_size, > }; > -- And this is the right thing to do. I'm pretty sure I wrote this myself a while ago, but I must not have sent it out in the end.