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 980B6C636CC for ; Wed, 8 Feb 2023 14:12:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22D436B0071; Wed, 8 Feb 2023 09:12:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B6C36B0072; Wed, 8 Feb 2023 09:12:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0577D6B0073; Wed, 8 Feb 2023 09:12:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E82D36B0071 for ; Wed, 8 Feb 2023 09:12:15 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 92A011A0707 for ; Wed, 8 Feb 2023 14:12:15 +0000 (UTC) X-FDA: 80444314230.29.ACA9113 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 53E7F1C002D for ; Wed, 8 Feb 2023 14:12:13 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dLwSavBU; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675865533; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MVdXAMmBKMdGVdB031db9qoOwXwbq1WnNqDyKF+cm50=; b=x8HwX0Y8hDFW5WSGVR8OeU7ODQ1IcuoZ9JayEsNUbNuHIwKGlRCCWPLQP67yo3grhELryL /rIApaMlHKdG6q8saGzYR66ZK/cKT8dmt2i8N+JIFy5dkUHJ2HpfivlO62JxNa/eqOROlK o3sSsQ6ol9MWF7/LddE6zGun5VoR7y8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dLwSavBU; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675865533; a=rsa-sha256; cv=none; b=c3ReLoGtwhhZPXNz2J1mpKYVJK36huQGy/PTeuatCkk0KO0+ux5+LF/4JPJhVw/VzqZdCr iyZ4AnFiMYYQIXERkD2bPnRCdbhuLKPCyWiIrHqDqbPiiWR5latIIwPmPcO6uThj/XzhTj RQJ/pqyfV8BvgwaGF7a50LvIXB8VzSA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675865532; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MVdXAMmBKMdGVdB031db9qoOwXwbq1WnNqDyKF+cm50=; b=dLwSavBU4t06fi51AXk6R87JknE+gFYHznnwXgX5QTAxgvNDLfAldR6i0/T+7Kdw7RvxWT WigG6t9fWr8ISG3Tt+XgDnQ7cCZvwsT+aiPM4xA4Dt1b3nIkyDqb7LtTkYLWXcBKitdFPP 5suV0rYX7dtkXQpbXC1qoZXdo1Y1NKU= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-649-6-bjYX92PdWHU5Jb2Apnow-1; Wed, 08 Feb 2023 09:12:11 -0500 X-MC-Unique: 6-bjYX92PdWHU5Jb2Apnow-1 Received: by mail-wr1-f69.google.com with SMTP id u10-20020a5d6daa000000b002bfc2f61048so2924898wrs.23 for ; Wed, 08 Feb 2023 06:12:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:subject:organization:from :references:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MVdXAMmBKMdGVdB031db9qoOwXwbq1WnNqDyKF+cm50=; b=lnNEX+KRj+NMUx/4ACjXvWxfyTOGK9e+jjoTB377WyNrv0yTXeTzVGGVovs4CqW77A 7mBfAMabg6nb7ahTFeligB2+ZWFP2ZE5BHRuU7gfMc0l/mANHbyKOpwk97FDYEBF0+Zo o4clV/OIEYUo2ahTOAQxbnmsX0NcEO3BuExhoxpTyBMiZ6+l1nOxURkmB7K4z9tmmEhl KFwZXBCZ1qo80CJ99LgYOlG9gGN7MMHOoOO6njeTMJ+/29p8+XJKaIaFpiGWGAfdgil3 ZQBIYxoiS0ju8etbRbqvYNr+8aqnoLIFkpnQkQSNSojXBhTLgNp2xZoe0wBE/oy2hFwF bXlQ== X-Gm-Message-State: AO0yUKVexicjCJrwKIBD1InbxTv+0H7yseQOvOrvHM0Q0rfcoF4GOO+U lFYkp7FlJpGr5oWbni5WpMLEE7JqGEQ926vg59E4ihToKqikh31gMwfGSnUABl7Yh4eMcvAei05 unKwLcx1Sw8U= X-Received: by 2002:a05:600c:2ac8:b0:3d9:fb59:c16b with SMTP id t8-20020a05600c2ac800b003d9fb59c16bmr6807532wme.36.1675865529850; Wed, 08 Feb 2023 06:12:09 -0800 (PST) X-Google-Smtp-Source: AK7set9buY9+5cxJmjHAU1gwkYhkjh45ggBfiU2I1/g0SGqFxOSQ99Rkm86npGHpTIA79oxlUNrbqQ== X-Received: by 2002:a05:600c:2ac8:b0:3d9:fb59:c16b with SMTP id t8-20020a05600c2ac800b003d9fb59c16bmr6807491wme.36.1675865529588; Wed, 08 Feb 2023 06:12:09 -0800 (PST) Received: from ?IPV6:2003:cb:c704:b300:758c:6214:cd51:8ab0? (p200300cbc704b300758c6214cd518ab0.dip0.t-ipconnect.de. [2003:cb:c704:b300:758c:6214:cd51:8ab0]) by smtp.gmail.com with ESMTPSA id a3-20020a05600c224300b003db01178b62sm2066527wmm.40.2023.02.08.06.12.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Feb 2023 06:12:08 -0800 (PST) Message-ID: <39fd91e3-c93b-23c6-afc6-cbe473bb0ca9@redhat.com> Date: Wed, 8 Feb 2023 15:12:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 To: Mark Brown Cc: linux-kernel@vger.kernel.org, Andrew Morton , Hugh Dickins , John Hubbard , Jason Gunthorpe , Mike Rapoport , Yang Shi , Vlastimil Babka , Nadav Amit , Andrea Arcangeli , Peter Xu , linux-mm@kvack.org, x86@kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, Russell King References: <20230113171026.582290-1-david@redhat.com> <20230113171026.582290-5-david@redhat.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH mm-unstable v1 04/26] arm/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 53E7F1C002D X-Stat-Signature: 466yn3cj9ysow5hzm3jz639ssnexhy1q X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1675865533-368912 X-HE-Meta: U2FsdGVkX1/95oD0iRYp1SMbJqCY74XOhCUe3izz2ObfVEgvyKrcv6hBRpv7evQ3R957odnboRpeYzSv22n2zvWblle1i1YNG5XEiwn+VdurLnIQVCLB5xbyeyoY4+NVt/eo4KdA6ECVy4CB7fa5lfK9PtWAd2/ipG0gI405FxW5FzAnmjR4CvAvKKiWncm3x8i+FmmOeqOhD7UBEp+3a/16aNAoN6Nw07sYIJo7jRKLsJEyGa590liHuZV49+UvK7gvsllgTe9eDVr/nREnVdTHlvBxPYWKWm6OC5CR43/kwHtlTKVZ74DfZomaThwgqruoNGvBD07IgvHoCKeeH23XPGOW3+OoP3ilmLlK1vwVFwh5nqAcVdkNv/SX2Gwk1XjCj4edcEVLDYUxjVptLAyntcAS4pb7f1WeVQRM/QpeNqL/t57Nw4o6TLBdXUUXp/tkKN5ECeThtfSILUfjSK9Pr1gF2jtDQIrEYDQleOCJ6mXNc+pOuD/TWvyFgn9EAufxJuckzu+/JK93YjRtGVpTcbRNuMIUrmHiJi8ZohX1vAtcQK3TS8I3m4j5WBT5u4BWj5Zda382AtVj0TlS4EA98Iy1cisIlczKFfrWda31UQle5JWphdpoX6ZwsG56s9cML6XTjwHO2PjmSVS87YuocNF53kGxqNfNv07OFN6jHTaO40mYw0UxCdwn3ieLOPXl723pKBf93G8DZMuSYmOqJSXP6fF83eXIlAtdJxp80oSYTzyOg4m/T/6Z7yzPLVEuXKgr89xX2YowY4xGHknLrb0fxeCKhwqj/HZmLhUSQ7xdLDTvKCc+ci1Fwvia+DKwc0WTrW6/NuXPfYt4LpIp1VALw/yTDth4UX+3dxPhdJ4z7KtibBjNR9ViDSI/N0x/JkTyuLMqZw1Ij/IiqTfzzN5UnZ2r2T1NbQYh6HL6WgzessmZI4+nOdZkCvGQoPl2oRUqboR1kRj4IVZ qZ2z73zt er2hhJ6prwxPa/H4YD1FS+IU7RtNQYje5/qFoAcYigYU3uG/3rA4xwci57SC+icUCBrxAbV485Cw+wljnt238OOyeuhzAjSErbdxt3iAawFdJFX7JvTL0KdNVYeW05YTt8F9HUMfRbMHDZ3N9k7dJjLM79z1n1v3Ep1V87h/tOARdNTlyYJtN4IWLxe6SmOcBFh1UM2nIX5PStSySRUjVKl6wFoZ39ei1DxbCCkcePNvWYTzMEyEzEpE6gIvdDy3va6Qx9h0mea4fzJ7YFAEpixyDRzritN9FWXzIIoiSOWZxUYDO32KENJruS6Grot+V9ZJQfB669/OwFgzjU4r3axARAk3SZFfUz3VGT/4OR1a2V1TTSbKFnpVEfuvom6YasLNXnHYi7zz0zD54c3uxpjcwCVGHx1q8uKpifKpbvrm7jRRWXw4CEEVIdW8ERiS9FslkyoJzZ+E5YCPnqZve0LM5mHQw8U9qv5oPlzYFRYskn5enoF+TKY6SK5s9Mo9Bg9WQYgkbRowjlmm5BRxe6Jol7YsvjX0PfhoJ9p46i5xEjZgiTsMwJ3Ne6qhRJHeUyYOT 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 07.02.23 01:32, Mark Brown wrote: > On Fri, Jan 13, 2023 at 06:10:04PM +0100, David Hildenbrand wrote: >> Let's support __HAVE_ARCH_PTE_SWP_EXCLUSIVE by stealing one bit from the >> offset. This reduces the maximum swap space per file to 64 GiB (was 128 >> GiB). >> >> While at it drop the PTE_TYPE_FAULT from __swp_entry_to_pte() which is >> defined to be 0 and is rather confusing because we should be dealing >> with "Linux PTEs" not "hardware PTEs". Also, properly mask the type in >> __swp_entry(). > > Today's -next (and at least back to Friday, older logs are unclear - I > only noticed -next issues today) fails to NFS boot on an AT91SAM9G20-EK > (an old ARMv5 platform) with multi_v5_defconfig, a bisect appears to > point to this patch (20aae9eff5acd8f5 in today's -next) as the culprit. It's been in -next for quite a while, thanks for the report! > > The failure happens at some point after starting userspace, the kernel > starts spamming the console with messages in the form: > > get_swap_device: Bad swap file entry 10120d20 > _swap_info_get() tells us that the swp type seems to be bad. I assume we're dealing with a migration entry, if swap is disabled, and fail to detect is_migration_entry() correctly because the type is messed up. Could you give the following a test? From 8c4bdbd9862f85782d5919d044c172b584063e83 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Wed, 8 Feb 2023 15:08:01 +0100 Subject: [PATCH] arm/mm: Fix swp type masking in __swp_entry() We're masking with the number of type bits instead of the type mask, which is obviously wrong. Fixes: 20aae9eff5ac ("arm/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE") Reported-by: Mark Brown Signed-off-by: David Hildenbrand --- arch/arm/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 2e626e6da9a3..a58ccbb406ad 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -292,7 +292,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) #define __swp_type(x) (((x).val >> __SWP_TYPE_SHIFT) & __SWP_TYPE_MASK) #define __swp_offset(x) ((x).val >> __SWP_OFFSET_SHIFT) -#define __swp_entry(type, offset) ((swp_entry_t) { (((type) & __SWP_TYPE_BITS) << __SWP_TYPE_SHIFT) | \ +#define __swp_entry(type, offset) ((swp_entry_t) { (((type) & __SWP_TYPE_MASK) << __SWP_TYPE_SHIFT) | \ ((offset) << __SWP_OFFSET_SHIFT) }) #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) -- 2.39.1 -- Thanks, David / dhildenb