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 3438AC19F28 for ; Wed, 3 Aug 2022 13:18:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ACFCC6B0071; Wed, 3 Aug 2022 09:18:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A7E5C6B0072; Wed, 3 Aug 2022 09:18:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 945CF8E0001; Wed, 3 Aug 2022 09:18:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 856D16B0071 for ; Wed, 3 Aug 2022 09:18:19 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 528C1120114 for ; Wed, 3 Aug 2022 13:18:19 +0000 (UTC) X-FDA: 79758335118.07.0D6A8EB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 18508C00F6 for ; Wed, 3 Aug 2022 13:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659532697; 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=gQmr5zxXBeS+lEJrTKyBVLP3zOI2K8Zz09a8Jl2j1mE=; b=UAUBaUp6GW+C7QhRgJ1RP4hC8kYTVne9KcETnEKC+23Eb1s9epcZMUW04FouM8GGeDNUPV Dbwr54xj+MCOSPaMs9Kq8GMO5PVylqsqwlpPeOvqPWd42vfGCeewXVLgGPM0HSiw+gXcDA f5GCp/boN9FrX06yQ63zUizdmed3jdQ= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-428-PfTuPx0NPkar08iZDiYepA-1; Wed, 03 Aug 2022 09:18:16 -0400 X-MC-Unique: PfTuPx0NPkar08iZDiYepA-1 Received: by mail-wm1-f71.google.com with SMTP id r10-20020a05600c284a00b003a2ff6c9d6aso1034170wmb.4 for ; Wed, 03 Aug 2022 06:18:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=gQmr5zxXBeS+lEJrTKyBVLP3zOI2K8Zz09a8Jl2j1mE=; b=ksAzVTQ7bc+ILqcYZiO0AfxXwd8FfS5Ci2bV/HQlxj4Fz7Ho5wbbuWz94JpHZWAHOl P46MlHHtd249yGGc361kHlwgaNHyPdVDJophuu0btpdDDnXQ8TVY+A3Yma6hucxkOb0F CT9rxab+HUZGzjmlvn8Gm+7H2rkWsBLW1t1cgoDeMbLsgtuxbcDe9Exu6FkDHNhoUzoV U+Qdzjzhp48abcnw34L1uULjJla5ha8Oau2GcWij4XnRWOvlrHaLR8T3XBRQ2fqO9EjH IlUtXqku75UPpGNo82ioZ5ttqmPNOTgfhc1dYHqWCQpVgb/urYyPkF7C/pxaa8/SfaMk bhBg== X-Gm-Message-State: ACgBeo3fApKl1VrmIKPH4XdUJ4Fgm9eh5kr/KvTMr0QfNvLJIuUFapUR K7iKey1yDtz9brLiOuHpDYmSa4TP0U8JkI8NCavO9uJHoC3SZnkGf82CUAwAL6GXBr9YR0Pqmpy qTtFL5I57Zfk= X-Received: by 2002:a05:600c:1986:b0:3a3:490b:1fd4 with SMTP id t6-20020a05600c198600b003a3490b1fd4mr2768458wmq.140.1659532695209; Wed, 03 Aug 2022 06:18:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR7gAwT2BPTspfhxNUy0lMGgiAhAO0xJhEFw1rSOXOPEgCd9IRmUbNYCiMoy0pSKBwI4T7m3sA== X-Received: by 2002:a05:600c:1986:b0:3a3:490b:1fd4 with SMTP id t6-20020a05600c198600b003a3490b1fd4mr2768440wmq.140.1659532694934; Wed, 03 Aug 2022 06:18:14 -0700 (PDT) Received: from ?IPV6:2003:cb:c705:9a00:1f5d:aaab:2398:9728? (p200300cbc7059a001f5daaab23989728.dip0.t-ipconnect.de. [2003:cb:c705:9a00:1f5d:aaab:2398:9728]) by smtp.gmail.com with ESMTPSA id e15-20020adfe7cf000000b0021e8d205705sm17693526wrn.51.2022.08.03.06.18.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Aug 2022 06:18:14 -0700 (PDT) Message-ID: <9b018e35-de8e-76ab-8f7b-c7b23e640217@redhat.com> Date: Wed, 3 Aug 2022 15:18:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] mm/x86: Use SWP_TYPE_BITS in 3-level swap macros To: Peter Xu , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton References: <20220803003745.35263-1-peterx@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20220803003745.35263-1-peterx@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659532699; 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=gQmr5zxXBeS+lEJrTKyBVLP3zOI2K8Zz09a8Jl2j1mE=; b=rjLofr2MW76lC/OM4JkQeFGaUk58PYgIxPCBdX2TiuU9HpnDTtnHV5A9sn1zQrokJjGtYR q8fbf8NrS09LG62bTtHLhJkAHEgtgnQmwtF0BB0QyUUikFvLeeXhAsfAI4IDK0LIYBBZoY f/UM3pokVjt/+oBuHhWBoVg9JYaLqw0= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UAUBaUp6; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1659532699; a=rsa-sha256; cv=none; b=AsZViOVPZfG29FBQBCTMB5AM8MxF6vFNx1HSh0fk6cctBxyl1EDwRkA1bGig9LksGooZwx l2I0IJqpwTmwUFqDLQgEt7mPWjamPu1dOlVgoGzRbcZBwqpFAEuyqdf2z5iBAKHoRuYuY8 IWGOg+XzG3TaPoMPH/dkOmgrQvZjUHk= X-Stat-Signature: 6np1sz97nc5dqhzdpypebakripgbn5m4 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 18508C00F6 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UAUBaUp6; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1659532697-208314 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 03.08.22 02:37, Peter Xu wrote: > Replace all the magic "5" with the macro. > > Signed-off-by: Peter Xu > --- > arch/x86/include/asm/pgtable-3level.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h > index e896ebef8c24..28421a887209 100644 > --- a/arch/x86/include/asm/pgtable-3level.h > +++ b/arch/x86/include/asm/pgtable-3level.h > @@ -256,10 +256,10 @@ static inline pud_t native_pudp_get_and_clear(pud_t *pudp) > /* We always extract/encode the offset by shifting it all the way up, and then down again */ > #define SWP_OFFSET_SHIFT (SWP_OFFSET_FIRST_BIT + SWP_TYPE_BITS) > > -#define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > 5) > -#define __swp_type(x) (((x).val) & 0x1f) > -#define __swp_offset(x) ((x).val >> 5) > -#define __swp_entry(type, offset) ((swp_entry_t){(type) | (offset) << 5}) > +#define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > SWP_TYPE_BITS) > +#define __swp_type(x) (((x).val) & ((1UL << SWP_TYPE_BITS) - 1)) > +#define __swp_offset(x) ((x).val >> SWP_TYPE_BITS) > +#define __swp_entry(type, offset) ((swp_entry_t){(type) | (offset) << SWP_TYPE_BITS}) > > /* > * Normally, __swp_entry() converts from arch-independent swp_entry_t to Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb