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 A554FC433EF for ; Thu, 21 Jul 2022 00:42:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E37F6B0073; Wed, 20 Jul 2022 20:42:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 094B06B0074; Wed, 20 Jul 2022 20:42:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC4F16B0075; Wed, 20 Jul 2022 20:42:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DE7496B0073 for ; Wed, 20 Jul 2022 20:42:42 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B77801A080E for ; Thu, 21 Jul 2022 00:42:42 +0000 (UTC) X-FDA: 79709256564.22.6AE04DA Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by imf30.hostedemail.com (Postfix) with ESMTP id 05EE28009E for ; Thu, 21 Jul 2022 00:42:41 +0000 (UTC) Received: by mail-pg1-f169.google.com with SMTP id s206so200090pgs.3 for ; Wed, 20 Jul 2022 17:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:in-reply-to:message-id:references :mime-version; bh=MRVVI62oGtFmpqvdAnGo9nGFI5CMfjPjaaeCVDA/w/o=; b=psmhdTBTF5ns257xN+nuR7c6csRhZLYbUwz/dfcGaCXb1OnoXxsyhcFmTejzsmt+s6 80hH4BZ8YHPxwhibokG0NmO36wEyUbl+pP4J9UI2zIthc3B3wdsFBNbwhE3lV72fSey2 OY3tcIY8rtLUQVPulmgcIppTepvUHHY1zMyaHPC+kmmbusSEg42/yLkDnPTZRXXJdnZ6 HUkruxYx82GfZY9lN3FfSYgUSnrL8D4TCx+9FMPQw3we+Hlq7xkjRDFTv/hw0mg7/Ctb H7fU2AHIB+iu24dudKhuLFq5RnEMZPmToGCfYKpMD6Gz3e19ThVgjyabVg2aKW1UOIio Rb2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=MRVVI62oGtFmpqvdAnGo9nGFI5CMfjPjaaeCVDA/w/o=; b=5P3MugW13nMWFXNUlxAB1oYrsGUTwsuJPTllup6d9nkG6E5GJY6LjMN0EH5SfFNc6d I3FYKXJLs84CFMzHpk/SD3cuI9fu5Y+AnmJ2KAWDI8STV6SqiFL7AcTdD4MQv5stQ58O K2ZdvFXuzIyjv9tn6AXT950dQvUpK+nzfI5gSjpFzZl/rwph1XX/QO7oZ4ZQcwmjeiqz 76YFuGMfcxb9RLhYsxGqCCHfB9eXQbRawBoyyYO0xKk90RSkbhTynmPZbtNKVJXwfugA k6p1+/ZhnuK3x3F9qvkqW/YQn7CdYz16beuTU+pKIy+NBlamZFse8EmU1swU6ExjmY/a rjkg== X-Gm-Message-State: AJIora/YOvSAugBOR8Xp6WTtGn3hkyr4d/AIarPaDur3KdV4g5XJqPke ZoHpTgVc7VjuTajFmVvsCVL/hQ== X-Google-Smtp-Source: AGRyM1sSkAAPCFPcTYOWfFiOLf1vJ0wolcVqCjKXy58wdGsO/z+bxyzUIy3SNPTpU5+QdL0bFaV7JA== X-Received: by 2002:a63:5618:0:b0:419:e1d8:2298 with SMTP id k24-20020a635618000000b00419e1d82298mr25556745pgb.429.1658364160989; Wed, 20 Jul 2022 17:42:40 -0700 (PDT) Received: from [2620:15c:29:203:50d4:8f58:81c8:1cb8] ([2620:15c:29:203:50d4:8f58:81c8:1cb8]) by smtp.gmail.com with ESMTPSA id iw17-20020a170903045100b0015e8d4eb26esm164899plb.184.2022.07.20.17.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 17:42:40 -0700 (PDT) Date: Wed, 20 Jul 2022 17:42:40 -0700 (PDT) From: David Rientjes To: Zach O'Keefe cc: Andrew Morton , linux-mm@kvack.org, Hugh Dickins , Yang Shi , Miaohe Lin Subject: Re: [PATCH mm-unstable 2/4] mm/khugepaged: consistently order cc->is_khugepaged and pte_* checks In-Reply-To: <20220720140603.1958773-3-zokeefe@google.com> Message-ID: <4943bf1c-92dc-14d8-7fc7-b1a1d3dd06a@google.com> References: <20220720140603.1958773-1-zokeefe@google.com> <20220720140603.1958773-3-zokeefe@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658364162; 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:dkim-signature; bh=MRVVI62oGtFmpqvdAnGo9nGFI5CMfjPjaaeCVDA/w/o=; b=zPz+jfPVZZ1wu21gAm0p+SWB9orypKIyGmSAHd9mDTpFebyc0XYgQVKX/AGrhcrn9uI1J9 ztTmBrRrPXPsL9tlLP2eCVEDMfCSDQ36o0LdYAL74Egxtf/l3RV0bStwFMBWa/fWbbk9Jm WixPro0gJPhTApFdeldjhGaEnvfnQRA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658364162; a=rsa-sha256; cv=none; b=D6cVwey0/jHaKH0LMBgE/B2ATOttvW4macLsq72CmSKClN8sfOaZLwLGO5HdSFhEimmjKt BvKqIsg8czej+XxfndkPud42tX2MVo3sWhvSkFu3BokooT8WDA+YZwRHbvgh/Jr4/z3pXk ZqC7AGlt8lyehsWF4zMQTddSPwX7VfQ= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=psmhdTBT; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of rientjes@google.com designates 209.85.215.169 as permitted sender) smtp.mailfrom=rientjes@google.com X-Rspamd-Queue-Id: 05EE28009E Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=psmhdTBT; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of rientjes@google.com designates 209.85.215.169 as permitted sender) smtp.mailfrom=rientjes@google.com X-Rspamd-Server: rspam12 X-Rspam-User: X-Stat-Signature: ip3cr8sgutpjzuq8niqd9oekr9fitrr9 X-HE-Tag: 1658364161-176014 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, 20 Jul 2022, Zach O'Keefe wrote: > cc->is_khugepaged is used to predicate the khugepaged-only behavior > of enforcing khugepaged heuristics limited by the sysfs knobs > khugepaged_max_ptes_[none|swap|shared]. > > In branches where khugepaged_max_ptes_* is checked, consistently check > cc->is_khugepaged first. Also, local counters (for comparison vs > khugepaged_max_ptes_* limits) were previously incremented in the > comparison expression. Some of these counters (unmapped) are > additionally used outside of khugepaged_max_ptes_* enforcement, and > all counters are communicated in tracepoints. Move the correct > accounting of these counters before branching statements to avoid future > errors due to C's short-circuiting evaluation. > > Fixes: 9fab4752a181 ("mm/khugepaged: add flag to predicate khugepaged-only behavior") > Link: https://lore.kernel.org/linux-mm/Ys2qJm6FaOQcxkha@google.com/ > Signed-off-by: Zach O'Keefe Acked-by: David Rientjes