From patchwork Thu Jul 25 18:42:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059539 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B60B1912 for ; Thu, 25 Jul 2019 18:43:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F77128A62 for ; Thu, 25 Jul 2019 18:43:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9394928A64; Thu, 25 Jul 2019 18:43:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E4D628A68 for ; Thu, 25 Jul 2019 18:43:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0AA396B0003; Thu, 25 Jul 2019 14:43:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 052956B0008; Thu, 25 Jul 2019 14:43:40 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3DE18E0002; Thu, 25 Jul 2019 14:43:40 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id B06826B0003 for ; Thu, 25 Jul 2019 14:43:40 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id o6so26792625plk.23 for ; Thu, 25 Jul 2019 11:43:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OxsBtkR8V6+s0OkCC+Hu7HIqYT8kxjr7WRYhfDwWQac=; b=fkIAGpSc46Yfv2YYCkRGC0k3DXtaKy0fTAQZLmRtsxPoxpsGNsVjjRhPpcBUPSqst5 j/+KpoNu7X3UWutrn6Pj3C4mdxwFm+/brgu+kn9Rlr1HrE3aQTiqM60ZvovFYqa8ukql 5epZzDskUWgrugxLCv5W6RXQicAXv+Q0ICWw1+vkFMDeH4i8hPs14TFRquLnc9ZZW13/ ZWmzNet4MEgqxlbtpUaB6yUxV0XlZoFq0egOpI2q13knVccRBrjUim0ek5DTgU1ZSvig ky/PMAr9vewnN4ep+mN5voUimWkP02s650D+NYTkVpQzwsoyqbRGwZgsHUjMRxqm8mtB RWAQ== X-Gm-Message-State: APjAAAVyn0y0EX3udq3NqU/dcscdO9luqqrLoQxzHczTYFYIfPDt2IQl Y4iUyQa+3OO9LbKqsnO5r0w/eaTlING9+IOO+Gm2gDlFl7ma0cBS2tRCOnmwD57QruHUpuerDAx G/gAxwzMXTBYqEGHkACkrhkpHvvaDzQsuH9jyCbkX91u9LuIi7shuRw1WUxJpsrwhOg== X-Received: by 2002:aa7:8481:: with SMTP id u1mr17258059pfn.243.1564080220297; Thu, 25 Jul 2019 11:43:40 -0700 (PDT) X-Received: by 2002:aa7:8481:: with SMTP id u1mr17257988pfn.243.1564080219281; Thu, 25 Jul 2019 11:43:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080219; cv=none; d=google.com; s=arc-20160816; b=pECUN0HvIWN2r19mnTTGYmyhEIa+wplEiV5sRMbu8w+67L7+tunRx1xVdiV3WEeTrd yOGHtlw7SWgecaYISOnztbUfLRVkSDqFAmCgAgNRrmrDBz4qpj2b7xrU6JBs7vpzOkAj OMNZIiIhUDdyCzSK3OCHjqlhUnVxxKcO9svSv8KYbG2KGdGb33s4ypOp0cs4ckTMCHEJ 3F1z+HCYmDRUjXRjNeIG9luZ5qg4b3TrfWkZMPTKGykrTCTqq9jNDzGsiDOOVhskIaJa gvq8nKPFEzt3Hs6MNCUZaH9DInAPUiQXUHa8Ek2lo8c17HfPctuj7uiW0uahIaoCBIG5 895A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=OxsBtkR8V6+s0OkCC+Hu7HIqYT8kxjr7WRYhfDwWQac=; b=jc5HlBI/G7uitWPDDmj71ip4LzU3I5zuJ0ayw1Vlf1BJPoYhrDMd3iMvbCSTcHMRo9 tV4wWsB20yKei7Ft5SeFrhdgf5qMQD0m8aFwGTCD9PsEuxWh4wJa87rYuBghKha1QhI7 8zcO0icPiiMKl/WFbyNOxOFupaU5OpQDCD+deG7kYw+/s2vN9aYjnmRK/hSD08y1TctT AvKQ6VC7UAD8XYVIjeINDD7Lb2KNTCmwhAYTuYyZtxHoogpoCk3DT/yXzUztUGlLgzXV 2VZKuEEJyh+JynqhQ/otDmCpeYFDqdsB5kKKQ6OboBDlODZyRo2IcFAgEwIzKuNcC54B xZaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ry2zmLqy; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id q65sor31793754pfq.38.2019.07.25.11.43.39 for (Google Transport Security); Thu, 25 Jul 2019 11:43:39 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ry2zmLqy; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OxsBtkR8V6+s0OkCC+Hu7HIqYT8kxjr7WRYhfDwWQac=; b=ry2zmLqy2lsaOf19QbIYeTpO253PbKl4qzCc1S9mFX+H9n3B+/+5u83D1qe5RePhVE TOyPjcoM92ICenSmuv7isTDBNg2TZUX4CZ8vOcuARZ9WvJ5OLO7oE9lip/0QLEmYnyo7 MpXJTJPjkL2/X2ge8PyV40QreWCZaWZDFQIAy7f+Zb9QR2NiEGbLtQSchU5EFKj7uktJ eR3tbUXE5U30f/r8yHwKI2Yth+uYH+Bpn3aWc8EQzx2JVNnRkCZmnpyBvEMr6BHvQOIY kEjVrQWbskaEntYS6HGUzlzdlG473FUzeVUnyks1SV5C6E6xKjIzV6Kkh6/5Ps6ytE8c A7YA== X-Google-Smtp-Source: APXvYqx/qV8WrsVV5Jeo7kC8964Q2Z2pSXahBIrPoXsoo219HEPPNsilSeBuWsKIQejpQYkJR+GM7g== X-Received: by 2002:a62:3347:: with SMTP id z68mr18528585pfz.174.1564080219029; Thu, 25 Jul 2019 11:43:39 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.43.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:43:38 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 01/10] mm/page_alloc: use unsigned int for "order" in should_compact_retry() Date: Fri, 26 Jul 2019 02:42:44 +0800 Message-Id: <20190725184253.21160-2-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Like another should_compact_retry(), use unsigned int for "order". And modify trace_compact_retry() accordingly. Signed-off-by: Pengfei Li --- include/trace/events/oom.h | 6 +++--- mm/page_alloc.c | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/trace/events/oom.h b/include/trace/events/oom.h index 26a11e4a2c36..b7fa989349c7 100644 --- a/include/trace/events/oom.h +++ b/include/trace/events/oom.h @@ -154,7 +154,7 @@ TRACE_EVENT(skip_task_reaping, #ifdef CONFIG_COMPACTION TRACE_EVENT(compact_retry, - TP_PROTO(int order, + TP_PROTO(unsigned int order, enum compact_priority priority, enum compact_result result, int retries, @@ -164,7 +164,7 @@ TRACE_EVENT(compact_retry, TP_ARGS(order, priority, result, retries, max_retries, ret), TP_STRUCT__entry( - __field( int, order) + __field(unsigned int, order) __field( int, priority) __field( int, result) __field( int, retries) @@ -181,7 +181,7 @@ TRACE_EVENT(compact_retry, __entry->ret = ret; ), - TP_printk("order=%d priority=%s compaction_result=%s retries=%d max_retries=%d should_retry=%d", + TP_printk("order=%u priority=%s compaction_result=%s retries=%d max_retries=%d should_retry=%d", __entry->order, __print_symbolic(__entry->priority, COMPACTION_PRIORITY), __print_symbolic(__entry->result, COMPACTION_FEEDBACK), diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 272c6de1bf4e..75c18f4fd66a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3940,10 +3940,9 @@ __alloc_pages_direct_compact(gfp_t gfp_mask, unsigned int order, } static inline bool -should_compact_retry(struct alloc_context *ac, int order, int alloc_flags, - enum compact_result compact_result, - enum compact_priority *compact_priority, - int *compaction_retries) +should_compact_retry(struct alloc_context *ac, unsigned int order, + int alloc_flags, enum compact_result compact_result, + enum compact_priority *compact_priority, int *compaction_retries) { int max_retries = MAX_COMPACT_RETRIES; int min_priority; From patchwork Thu Jul 25 18:42:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059541 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B4F256C5 for ; Thu, 25 Jul 2019 18:43:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A525228A68 for ; Thu, 25 Jul 2019 18:43:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98BAF28A6F; Thu, 25 Jul 2019 18:43:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2523828A68 for ; Thu, 25 Jul 2019 18:43:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 340F46B0008; Thu, 25 Jul 2019 14:43:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2F2F36B000A; Thu, 25 Jul 2019 14:43:49 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E19B8E0002; Thu, 25 Jul 2019 14:43:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id DFD2D6B0008 for ; Thu, 25 Jul 2019 14:43:48 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id x18so31437493pfj.4 for ; Thu, 25 Jul 2019 11:43:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=75v+7kFOX3fDCU6QmGh0HhSEpSdixRD3VTEDmH00T24=; b=l0AlyB99Cy8IjPkMfqbRJl2VtI5ABtbLAaXwF2JE3cpZREGzLYJHXCWvfrfZJr2HBA b2jxHkth6/CaYky0ezYnRAbR5l559Gc76vAeU/PN6s7cxHMq3zv8lsMrBG+W1IxyQfCW ITT/IGTnE2NY76OvDwWw9Oz/kDRvGRXyyNfuukqAdEwxMyM6WTOgUeiUls9W5PNCPIIL 9wkVR/i5/vQzP6VYHD1IGQuuGGAZhJn9fbEy8YmgMGEgBTTrpusEW0nDtmslAD7t+sPL 0dolLju6H32QbTc9fAVwpTxKaZsZxD/4NO2wbDK8SnhGoadcN6pGN/UTSRMXShSuJ8jL 5/7Q== X-Gm-Message-State: APjAAAWt2f4yw3RkcvjTY/FjwEWrq6ICrfcK89Z9E+Hq8aq0mW3GLzYy S4wWypwaDWi8ZsFFIdSIu+5HtkF250Y6N5FMmB0Q2wD571v2lz6xwKvsuSsMys2GfuTijuOseRa DzVpB3Beg4Zv1SEPHBBaaeiCR9JDgl12DVMokIJZhYcNmsVvkIj7Zllj0b64soI9uyg== X-Received: by 2002:a17:902:124:: with SMTP id 33mr94438104plb.145.1564080228609; Thu, 25 Jul 2019 11:43:48 -0700 (PDT) X-Received: by 2002:a17:902:124:: with SMTP id 33mr94438043plb.145.1564080227608; Thu, 25 Jul 2019 11:43:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080227; cv=none; d=google.com; s=arc-20160816; b=lr0B//GW6AjhnJDuASHmL1emroHB3YSHjWeKLnUGXKmkdnctLLoS6XP+60BhR/QLv1 RCRuffZZfBzQHVdGkxxdvTm4bv6qnaNMAV4q1VVKr99hpJ5RdNDGkKhSvcvpT0LvjGqB meJW6PGO8xtzWW/DB9jviBsG2iH0NvU0zVDr5dLOOerscocdaya88+i0QgxL38bTgLZB iwx7FjySu9xg/GjTFz+bjLM2dUlMJy7xBSpAh2KV8FPPQMbdJviL4xNHe2XLe+bRXCYl jjQH2PY2HNwozt7yeVmyFneyUPQiM/OelmUj0uvg/AauHaFyYzmvR8u2z70+UCdqC911 o5hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=75v+7kFOX3fDCU6QmGh0HhSEpSdixRD3VTEDmH00T24=; b=QG9WJX4xzv6z3BJxCXImxRp9/LRCBxhsKUer62C19rnoBLKWHfSF1Rdx/YTRRZaOcn xOmcm23O986TUiFYh5/tAbBjdY7Gq8jA/iHVc4w3pA9h87J1LFDeFhSvPrNknRELpEKB Qv/SqVigqSS0CQfvD6oLd1YFrsouENrvoBNYncfrBiTbpM1/mEDTOwu9+6siKiSWwtnr AwjyAhk4g/O5q4Wmj7WWZOuTBjLXekH3va9t3kfB3kUkqs+08N/PHq8BQudhZnT9+xg5 cEy7FdKM+re0bH0PDfqr5TI4k4CqObirP6G3lfDGrGVSmLGr9TuQCcktpBWLWcAiQGKZ Rv2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dlyJ1Kob; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l10sor30015911pgp.54.2019.07.25.11.43.47 for (Google Transport Security); Thu, 25 Jul 2019 11:43:47 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dlyJ1Kob; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=75v+7kFOX3fDCU6QmGh0HhSEpSdixRD3VTEDmH00T24=; b=dlyJ1KobmoWLtFv7IcNUQJNez9fMahwQ5BinTISnEvaeniV2pgG2noG7Q17DcQHHhe kv1BWR9vH2jTvOCKHrFyHl2Z7FSzGX7IPCY1DtjJnKYZr9ao4LPqqwI/qzKZUmlfxxj9 gWoQjCwtrBIwL1CotH8OwPNZxE9sm3Gals+8TapRsll0joD1XmNmjoyhW2vel99FHMLl +v2xNA2JhyFRoDDtSggDSTjUFy4qrEY7KYIupvhwaByb4Y46kYtK2z4ns4C1yqY7zYyU ILNBVtcrVmOqkgkdWurIguRB5tzt0l1D6fPe1Y8dpyE5iGLmrtcwqAub4syvDoI9McrV GsEQ== X-Google-Smtp-Source: APXvYqyJ16tErcZCd6V50Gl8u2liDc4czpUPjNQ0NEfS8/hL14rWy3Alcf4zsPe/54zld/LC6CpQZw== X-Received: by 2002:a63:b555:: with SMTP id u21mr89025235pgo.222.1564080227314; Thu, 25 Jul 2019 11:43:47 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.43.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:43:46 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 02/10] mm/page_alloc: use unsigned int for "order" in __rmqueue_fallback() Date: Fri, 26 Jul 2019 02:42:45 +0800 Message-Id: <20190725184253.21160-3-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Because "order" will never be negative in __rmqueue_fallback(), so just make "order" unsigned int. And modify trace_mm_page_alloc_extfrag() accordingly. Signed-off-by: Pengfei Li --- include/trace/events/kmem.h | 6 +++--- mm/page_alloc.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index eb57e3037deb..31f4d09aa31f 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -277,7 +277,7 @@ TRACE_EVENT(mm_page_pcpu_drain, TRACE_EVENT(mm_page_alloc_extfrag, TP_PROTO(struct page *page, - int alloc_order, int fallback_order, + unsigned int alloc_order, int fallback_order, int alloc_migratetype, int fallback_migratetype), TP_ARGS(page, @@ -286,7 +286,7 @@ TRACE_EVENT(mm_page_alloc_extfrag, TP_STRUCT__entry( __field( unsigned long, pfn ) - __field( int, alloc_order ) + __field( unsigned int, alloc_order ) __field( int, fallback_order ) __field( int, alloc_migratetype ) __field( int, fallback_migratetype ) @@ -303,7 +303,7 @@ TRACE_EVENT(mm_page_alloc_extfrag, get_pageblock_migratetype(page)); ), - TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d", + TP_printk("page=%p pfn=%lu alloc_order=%u fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d", pfn_to_page(__entry->pfn), __entry->pfn, __entry->alloc_order, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 75c18f4fd66a..1432cbcd87cd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2631,8 +2631,8 @@ static bool unreserve_highatomic_pageblock(const struct alloc_context *ac, * condition simpler. */ static __always_inline bool -__rmqueue_fallback(struct zone *zone, int order, int start_migratetype, - unsigned int alloc_flags) +__rmqueue_fallback(struct zone *zone, unsigned int order, + int start_migratetype, unsigned int alloc_flags) { struct free_area *area; int current_order; From patchwork Thu Jul 25 18:42:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059543 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9273A6C5 for ; Thu, 25 Jul 2019 18:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8355528A64 for ; Thu, 25 Jul 2019 18:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76F1828A6D; Thu, 25 Jul 2019 18:43:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BEDA28A64 for ; Thu, 25 Jul 2019 18:43:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42B5B6B0005; Thu, 25 Jul 2019 14:43:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3DBD16B000A; Thu, 25 Jul 2019 14:43:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F32E8E0002; Thu, 25 Jul 2019 14:43:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id F14C16B0005 for ; Thu, 25 Jul 2019 14:43:56 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id d190so31425993pfa.0 for ; Thu, 25 Jul 2019 11:43:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AtweZa/Z6F63u6BGDtxfZL6SRwzo4lD4iM0Os9b2INA=; b=IT0Uj2dQ3E7nG5+d1hxdlpimXU6EHHHMa48R450vlmB7sDtyMwZLR9s41mGONht8Pj ZFADSMi7c8/eY78TepFIS11Laayt6W3vrmwYxPthqt5aID9e79o9lUERwqiIjvSexas7 eeAY+Sxn2PxkJ6rkYPsII/rnjdkl80CaHLajeMlBa7GOIPsH2lpKe0qibq2LFDVBnIBt ErWbB9IHOf4h9lGGA/1p5Vtcwvv3QcPXuOKgTCyH5D5TY1NbJfi3PIKUTujo9hutCp96 fkF0QaNKHTEq7fXtPj6cB0qS25rXUegD0gQ36Qmuh3E0LVci7bIK9q7O45/OcqfF1HXy l07w== X-Gm-Message-State: APjAAAV6nujkyrKBr3RwvfnBK3YNglbPOBayBtwCQqfogIqK/i7W2VZ1 dDBaVcRZY6IvfoqAnWJI0FRw5HCa7zRkzlYwt2+SDKgEOSRu2qX9+pLOuBDrYXwmGk2/3RgvkuO ViX63MhIrsXVGplDA8VHJJOf4ysy9kJnGcUDhL+22yh/V7CyDBj4ufe8a7ZyVKtJLWA== X-Received: by 2002:a63:f941:: with SMTP id q1mr88161146pgk.350.1564080236628; Thu, 25 Jul 2019 11:43:56 -0700 (PDT) X-Received: by 2002:a63:f941:: with SMTP id q1mr88161115pgk.350.1564080236061; Thu, 25 Jul 2019 11:43:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080236; cv=none; d=google.com; s=arc-20160816; b=ulBX7aZXn4U+f0IkFEPMnROKomGuEnBQlPPJP8Fmc/73PRgAnp2A95kRHbf+4V1d6Y aICLelg3XLTOwYhCLLJysSdbAuuXlq0pLzmbzyP0R3Z33KVe97aM/crlqEzVphjI/Gnh cw6rNgWAf45xGjIYEbuuA9Qoqb9QQVZp0Ge+7uJCuOVAUeqz0YKjYuojpnLti8RW93gJ 5EzlZ6ZD0X/HLcTA3PLLy4behl8VOGybvl0y71xv7He7pcEFo3GlHAeluDIKVznX/Iqy LBBir7aYyuETuE+gUr7qIKYlgBGUAh//0nSg00HkrVHDHW9UhYyUOjGSKuVJfV1VqlQI RLGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=AtweZa/Z6F63u6BGDtxfZL6SRwzo4lD4iM0Os9b2INA=; b=uBxjJGUZgOscZLHyR/Q0PSGBgyj+VuALhfNCayYKm54ToUlqP/P0G3UvgsYltZ0qjs FEqv9o82D4sqAAWxFslmKcptHOZLduqmV7xe1J5P3WZFoFCEgPBI+RmEjQJcKqx6Ow/y 69Fx3zfcSV0E/1/qPyLuzyjPYTnbxfOJY9O86xlx+kNBGL6b9xFHJcsYdZTR9okzWMSD 2PifhkqCBg1LelUA66V6pZE1VwBep+Mllm4eyy4vRWt4y2i1gYePFIjGcqjsa9Yt/SE2 slu/I//uIav4eACEFFHZfEBF9mUFSr/eCbFEMSTgQ9Lau77K3JBCp4ppOQG7uRoZF1bI aq8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ebzZdKnq; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m39sor61004792plg.49.2019.07.25.11.43.55 for (Google Transport Security); Thu, 25 Jul 2019 11:43:56 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ebzZdKnq; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AtweZa/Z6F63u6BGDtxfZL6SRwzo4lD4iM0Os9b2INA=; b=ebzZdKnqccWwtZwsMRzf5dLs66cvT47cvTOupG9sQ1axgMouSlzYHllw4szdTYKBLZ g1ZdTZFw13XszJ8qE73aGeFFYM9pYIQp0NuxgO9EsQRc3FzxGTfLaEsE4okN2DEJ/qPp EkDOEF4pFgN3/5zsqMjEbEEPGEC0m2PX8a34iW8qlMgG7H6agaEA6RhAZCNH6g1bykps spfRDwLfZ+HmDgav54rp1H6iQtsTLsasHxY8gAzelL0nEZVqJKai88jeAcPoipuzNpSX RkKnjcl/A8ILOT+tgjQRkDU3dMJP35QLW0U6+NNwyOEHJZIyo9bIhlH2buli4LdQrTMI 9IXA== X-Google-Smtp-Source: APXvYqzc9P14nGXtvX/LEuC0l4T+N/irxzGOcvtRr7MZQhPIkaH8tJw5GEjVuz0DSjvlv5/7QxHJ7g== X-Received: by 2002:a17:902:8a87:: with SMTP id p7mr91805919plo.124.1564080235858; Thu, 25 Jul 2019 11:43:55 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.43.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:43:55 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 03/10] mm/page_alloc: use unsigned int for "order" in should_compact_retry() Date: Fri, 26 Jul 2019 02:42:46 +0800 Message-Id: <20190725184253.21160-4-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Because "order" will never be negative in should_compact_retry(), so just make "order" unsigned int. Signed-off-by: Pengfei Li --- mm/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1432cbcd87cd..7d47af09461f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -839,7 +839,7 @@ static inline struct capture_control *task_capc(struct zone *zone) static inline bool compaction_capture(struct capture_control *capc, struct page *page, - int order, int migratetype) + unsigned int order, int migratetype) { if (!capc || order != capc->cc->order) return false; @@ -870,7 +870,7 @@ static inline struct capture_control *task_capc(struct zone *zone) static inline bool compaction_capture(struct capture_control *capc, struct page *page, - int order, int migratetype) + unsigned int order, int migratetype) { return false; } From patchwork Thu Jul 25 18:42:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 645C76C5 for ; Thu, 25 Jul 2019 18:44:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5735D288AF for ; Thu, 25 Jul 2019 18:44:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BA1028A6D; Thu, 25 Jul 2019 18:44:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68E5528A69 for ; Thu, 25 Jul 2019 18:44:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D02F6B000A; Thu, 25 Jul 2019 14:44:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 981736B000C; Thu, 25 Jul 2019 14:44:05 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 871D08E0002; Thu, 25 Jul 2019 14:44:05 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 4F6E66B000A for ; Thu, 25 Jul 2019 14:44:05 -0400 (EDT) Received: by mail-pg1-f197.google.com with SMTP id w5so31253894pgs.5 for ; Thu, 25 Jul 2019 11:44:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bPDs9aZTbcVy9P5At/6nzEj0xAhZgvBWq0iu1KF/hyM=; b=kzWHltFuYqZFlaE7BptoyO1T33OtV7sZp1MhuY1G1WuQIC65wD2RaYvnVmqymqjDtD UsJtdOyvWdnHqDcTszGaUtxCekdYfYHUzfMzFGeKBY4jTbuNzsZV43DuBmUJSG87LJeH w5wMddeXXaiTSLWo2ZX6km9LrmIZiYtZomdiwl2yFmvZSW5wugrW8/ALlr4J2NRdSG73 eFycEKINfLSfPCZ/heXMAqUhI2ykXx4ojvZ/7fVW0C4USlfUj+yN2JwC3igwvVgjCB9F KSZohmKFjNuySlLp9Pap4/fpKgGoXycHXFykPDnfP00xDOtKr5aKlxKPKy5PeIIDnNTS QVww== X-Gm-Message-State: APjAAAVFTKz5KjcjgUi0PPwFSG6VN+fI/45u+A4BI3Fz2ypSynIUwjQN UmQWfR+64NVD71Kh007wzhkotYVilGjUXoRj51bcNrs2eB05muJRMvwbejV799RaAd9V4BGkxy+ KALdi7BYomejQ6B05YuG7fEHebAUpIyzUbrdIsdVUuqY5UFrNPLJ+JaZPEH9/fC+e7A== X-Received: by 2002:aa7:818b:: with SMTP id g11mr18280277pfi.122.1564080244983; Thu, 25 Jul 2019 11:44:04 -0700 (PDT) X-Received: by 2002:aa7:818b:: with SMTP id g11mr18280236pfi.122.1564080244224; Thu, 25 Jul 2019 11:44:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080244; cv=none; d=google.com; s=arc-20160816; b=Pa9VRf0LLWRu2W73/2G4Wj1ntv0UiQ83yBc7gbqZPRoNilQVZXUHeY0zoLzBM2DjtU MNERsuDWy1wFHeG12m1ZAunm9x64WiVhreK7D3unq4/qKE+2A5qiPBGFnuncbbbB70wo 4kCorYjVG+70QXPCkqazZx64bjhWYhpVlsVJu3uUTKfwQKQ1BMTFox5gd3UM04dedKQo 0MiJBOaW1fjKPzXG0vpKYQjbyEbU41lVZXa0plr11nifGxB9xTqGkS03vhUm2VOwOwl1 sBOg5Pv9hmvVWEC8Hp75iwtWHKR08EWx0Tt1tqA3JePwSHvq0GQvBNXrGJMpJRZmKJHt boxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=bPDs9aZTbcVy9P5At/6nzEj0xAhZgvBWq0iu1KF/hyM=; b=aF73GjooVw99eiqZpLLMax4luYGCnjJzx+sNy9fpBQH7QJZymUnvn87V6YKjBTCjUd o8L6ysJXlhE/iDQUDNPK04gfNjNqVmRPloiWvJKI+FqE5aiKpfCIPgK2PzqqGZRRDKhD yFotwWQIhwKQFl8MKG9d4I6aKVf7VzzgZM3f10My2XbBngOeghe6h/N+QSLVEL7qrrcl M9GUmNY9cKmlZZMsahYVoTNsjtHbBT+Y6vWOEoBQSP0jkrCOr8uDA168O6zNomHK1hsk H33U23lwtebj2eeyZoIviiu29eIDyrti29qnlzO+VDjFDfoKx/E4C6FXu/R1rZw8aEuY S/5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=eJM1DtC5; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id i2sor7253951pgm.8.2019.07.25.11.44.04 for (Google Transport Security); Thu, 25 Jul 2019 11:44:04 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=eJM1DtC5; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bPDs9aZTbcVy9P5At/6nzEj0xAhZgvBWq0iu1KF/hyM=; b=eJM1DtC5tc7N+x3bUDdfU3a6aCPNIKs5Ea/Z/fUOdrJjaLs5VmctkQkOfWa5ycQmWy T5eFh5Pv2d56b42dZkAQcWzM/FzmI6m7UaLTTYpXxUJOE1+rTja/64NwSq+YXHDtkVhj UoDfaFAKiw0bjo8MjuKksMwuHF6M1UgGh6b4OyJFpU/RGI7iV6615GCVMwt+fzzREu+q F0x/mjJzP3lhCGVKSOcsUzuZMTn3ZbHwy9xR6IjoO9VTr2CUPe9CEu3D+nWk8iwRAWbP 43C4KdlQ8/ROPCjSjhtS41Jp0XOnZKjzAHMrAVWtaOzkiLvj7kzrci0zbLlYjWwWycJJ wfYA== X-Google-Smtp-Source: APXvYqxBv96pUxmfgMQrftaFG4psDx0UQ6pg+dJPW4c2ZWiusVnPoWSeEsuxPW2mk3fqgO0+1KFlLg== X-Received: by 2002:a63:4522:: with SMTP id s34mr86869675pga.362.1564080243954; Thu, 25 Jul 2019 11:44:03 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.43.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:44:03 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 04/10] mm/page_alloc: remove never used "order" in alloc_contig_range() Date: Fri, 26 Jul 2019 02:42:47 +0800 Message-Id: <20190725184253.21160-5-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP The "order" will never be used in alloc_contig_range(), and "order" is a negative number is very strange. So just remove it. Signed-off-by: Pengfei Li --- mm/page_alloc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7d47af09461f..6208ebfac980 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8347,7 +8347,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, struct compact_control cc = { .nr_migratepages = 0, - .order = -1, .zone = page_zone(pfn_to_page(start)), .mode = MIGRATE_SYNC, .ignore_skip_hint = true, From patchwork Thu Jul 25 18:42:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 021646C5 for ; Thu, 25 Jul 2019 18:44:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7DD6288AF for ; Thu, 25 Jul 2019 18:44:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB65F28A6B; Thu, 25 Jul 2019 18:44:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10EE2288AF for ; Thu, 25 Jul 2019 18:44:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 369086B000C; Thu, 25 Jul 2019 14:44:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 317528E0002; Thu, 25 Jul 2019 14:44:15 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2082D6B000E; Thu, 25 Jul 2019 14:44:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id DF8046B000C for ; Thu, 25 Jul 2019 14:44:14 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id i2so31473889pfe.1 for ; Thu, 25 Jul 2019 11:44:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GxVVw+uo+vFwM7PZaI+aVqiAbCOjCI60HaAqMSq8WWY=; b=lbIm1EnTq7UPwyQPkzc4oymG+acrsZVKqXYrPZmhzGPeDZyN7PBoA0LIq1AW7bIK3U RC9aNUac4ihXRrYiPNhh/q5osm01Of4KMqRBRmNCYM4nAuxiPVMWBsENZBLsz6opIkba 1x9+AE92HArtVoQesvf4ywxPLBtkNcOfVJdeBHjqMA6BjOQt+nFUCoegbWYG0NaJWPOm y+CxeOA79zJYkzRm6CjKYuXlKXZpjAezqmmSNn7utW0hqOoFnGDdVfHiTnnFnDu68EfR 9WPxIQEn93LCRQ5iLzT8I7gzaTPDx2kDez8ukN7PAWfdXi1FTe/xbWBNEs66JCLThOJJ kH1w== X-Gm-Message-State: APjAAAXu8XhlyYntn+3V5KFerTVa8ZivL0ejQ0aZ82egDMMTSZi1jxKp kosz8jTRjAn77cpdooEq1lPFgtUbCdsGklPhE1mJOMssm1y7TxGWx3YVzBfKhp9yCbAn0q8c7G+ x26foyOXAolaKPsXA8NSKsiXHnRFism9W84qrjiWJLTfO43jHaNCm4nzO9SA1eYo+Eg== X-Received: by 2002:a63:1310:: with SMTP id i16mr86347476pgl.187.1564080254458; Thu, 25 Jul 2019 11:44:14 -0700 (PDT) X-Received: by 2002:a63:1310:: with SMTP id i16mr86347389pgl.187.1564080252833; Thu, 25 Jul 2019 11:44:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080252; cv=none; d=google.com; s=arc-20160816; b=YvclgRjimUiRJs1AXcMsC3LAweD2V+53LAgjb5agcG3iSwtbNUcmL7sqFpGy5Kcxtg CPZyPqGYoRHUZ+CQ5pUS9zHS91/HvGu6Ij5nxX3NU3DT4CSZ6BfNLPiU+6BHY0q+SlAh zB801vyASGm2UZwueS9pdmgLEmkHb7UVP8tBNTwHjSOiu03ZD1Pc84791uD7iv/muG3O OkRV/hT3el2Ybi1WT3XrpsKdCsubGIUGPWVf92oj/wqaeab0ST1ObouI44LERelnhBpq 9Ltxt3+g3SFbJnFMEOyWwiuZ+jDmtZQ9kcpDmOcY8JKJuPtT4xeog95xROqWT1XcLrm8 Jx0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=GxVVw+uo+vFwM7PZaI+aVqiAbCOjCI60HaAqMSq8WWY=; b=i5KXcXo6/I9KaSSXLkBG6zA6PlnLMUkOeEnKf45lKO61Q8j1D0A53PBuU2T0feJ64+ Wyhcg5PADuD6byo48tHtyuEp9kO6o4eoQx99JVhCFpEUsmnL4uPRIVuefzUCfPTMbtz0 GKfmr67WskiOSOO0RwfzXn3wEJjUdfnKuQbnq5Mqs9ecoJ9SlPO8EzYysI6yqdJuACnJ Dpk9tXFyGSUDiJF5pBhjyph0dQxp5F9FyguL6B7Yyq5URUIlsGYfrRTFtNQtvpcCUsQ/ qt7QO3XOkj+zRnpA3k9cFPtnwNEcIA6qlfpV8uWizhAXpMZliwjuAByxINhRyV9klNao jElA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ce3BfUeG; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id w8sor30004694pgr.42.2019.07.25.11.44.12 for (Google Transport Security); Thu, 25 Jul 2019 11:44:12 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ce3BfUeG; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GxVVw+uo+vFwM7PZaI+aVqiAbCOjCI60HaAqMSq8WWY=; b=ce3BfUeGr5RpaaJuxLzqnTv6kfjovpk0RpJi4XkdjoZ09kuLbjLfifBWwVxGtr0P5N c+JPAyQXIvDXOJlb8TvzZesIbMhQ7Q+VOb8kgcEyU4Q1BFWJGFXEA7egGcpgDf4k25t6 rL1lu1W8Z6v1z/wBXGWZMYXGq43yAzT2Yq4JtFYJ/lwBZx6kb+0iTGtQ4PjaH3dvB1fS W/P3nEbQGwu4Yo+D2rivw270jqdSfiAZTgEfvb90A2vbyE2o3M3FRqO5DsPhVUTW92Jp xQv77ACbAaizSP+KRVeCYrxET/NyCdZWrl/ImYs95iLb8fDR5EVn2Bd+SYgw7i9PeLq6 SB2A== X-Google-Smtp-Source: APXvYqyXEVRoC4diyAozk4NBAOKJzOBURSN/nlzqvND8mGjSVxSBPVf6BuR77GbLQICsMucmgFRs0w== X-Received: by 2002:a63:d415:: with SMTP id a21mr85176650pgh.229.1564080252386; Thu, 25 Jul 2019 11:44:12 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.44.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:44:11 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 05/10] mm/compaction: make "order" and "search_order" unsigned int in struct compact_control Date: Fri, 26 Jul 2019 02:42:48 +0800 Message-Id: <20190725184253.21160-6-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Objective ---- The "order"and "search_order" is int in struct compact_control. This commit is aim to make "order" is unsigned int like other mm subsystem. Change ---- 1) Change "order" and "search_order" to unsigned int 2) Make is_via_compact_memory() return true when "order" is equal to MAX_ORDER instead of -1, and rename it to is_manual_compaction() for a clearer meaning. 3) Modify next_search_order() to fit unsigned order. 4) Restore fast_search_fail to unsigned int. This is ok because search_order is already unsigned int, and after reverting fast_search_fail to unsigned int, compact_control is still within two cache lines. Signed-off-by: Pengfei Li --- mm/compaction.c | 96 +++++++++++++++++++++++++------------------------ mm/internal.h | 6 ++-- 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 952dc2fb24e5..e47d8fa943a6 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -75,7 +75,7 @@ static void split_map_pages(struct list_head *list) list_for_each_entry_safe(page, next, list, lru) { list_del(&page->lru); - order = page_private(page); + order = page_order(page); nr_pages = 1 << order; post_alloc_hook(page, order, __GFP_MOVABLE); @@ -879,7 +879,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, * potential isolation targets. */ if (PageBuddy(page)) { - unsigned long freepage_order = page_order_unsafe(page); + unsigned int freepage_order = page_order_unsafe(page); /* * Without lock, we cannot be sure that what we got is @@ -1119,6 +1119,15 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn, #endif /* CONFIG_COMPACTION || CONFIG_CMA */ #ifdef CONFIG_COMPACTION +/* + * order == MAX_ORDER is expected when compacting via + * /proc/sys/vm/compact_memory + */ +static inline bool is_manual_compaction(struct compact_control *cc) +{ + return cc->order == MAX_ORDER; +} + static bool suitable_migration_source(struct compact_control *cc, struct page *page) { @@ -1167,7 +1176,7 @@ static bool suitable_migration_target(struct compact_control *cc, static inline unsigned int freelist_scan_limit(struct compact_control *cc) { - unsigned short shift = BITS_PER_LONG - 1; + unsigned int shift = BITS_PER_LONG - 1; return (COMPACT_CLUSTER_MAX >> min(shift, cc->fast_search_fail)) + 1; } @@ -1253,21 +1262,24 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn, unsigned long } /* Search orders in round-robin fashion */ -static int next_search_order(struct compact_control *cc, int order) +static unsigned int +next_search_order(struct compact_control *cc, unsigned int order) { - order--; - if (order < 0) - order = cc->order - 1; + unsigned int next_order = order - 1; - /* Search wrapped around? */ - if (order == cc->search_order) { - cc->search_order--; - if (cc->search_order < 0) + if (order == 0) + next_order = cc->order - 1; + + if (next_order == cc->search_order) { + next_order = UINT_MAX; + + order = cc->search_order; + cc->search_order -= 1; + if (order == 0) cc->search_order = cc->order - 1; - return -1; } - return order; + return next_order; } static unsigned long @@ -1280,10 +1292,10 @@ fast_isolate_freepages(struct compact_control *cc) unsigned long distance; struct page *page = NULL; bool scan_start = false; - int order; + unsigned int order; - /* Full compaction passes in a negative order */ - if (cc->order <= 0) + /* Full compaction when manual compaction */ + if (is_manual_compaction(cc)) return cc->free_pfn; /* @@ -1310,10 +1322,10 @@ fast_isolate_freepages(struct compact_control *cc) * Search starts from the last successful isolation order or the next * order to search after a previous failure */ - cc->search_order = min_t(unsigned int, cc->order - 1, cc->search_order); + cc->search_order = min(cc->order - 1, cc->search_order); for (order = cc->search_order; - !page && order >= 0; + !page && order < MAX_ORDER; order = next_search_order(cc, order)) { struct free_area *area = &cc->zone->free_area[order]; struct list_head *freelist; @@ -1837,15 +1849,6 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone, return cc->nr_migratepages ? ISOLATE_SUCCESS : ISOLATE_NONE; } -/* - * order == -1 is expected when compacting via - * /proc/sys/vm/compact_memory - */ -static inline bool is_via_compact_memory(int order) -{ - return order == -1; -} - static enum compact_result __compact_finished(struct compact_control *cc) { unsigned int order; @@ -1872,7 +1875,7 @@ static enum compact_result __compact_finished(struct compact_control *cc) return COMPACT_PARTIAL_SKIPPED; } - if (is_via_compact_memory(cc->order)) + if (is_manual_compaction(cc)) return COMPACT_CONTINUE; /* @@ -1962,9 +1965,6 @@ static enum compact_result __compaction_suitable(struct zone *zone, int order, { unsigned long watermark; - if (is_via_compact_memory(order)) - return COMPACT_CONTINUE; - watermark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK); /* * If watermarks for high-order allocation are already met, there @@ -2071,7 +2071,7 @@ bool compaction_zonelist_suitable(struct alloc_context *ac, int order, static enum compact_result compact_zone(struct compact_control *cc, struct capture_control *capc) { - enum compact_result ret; + enum compact_result ret = COMPACT_CONTINUE; unsigned long start_pfn = cc->zone->zone_start_pfn; unsigned long end_pfn = zone_end_pfn(cc->zone); unsigned long last_migrated_pfn; @@ -2079,21 +2079,25 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) bool update_cached; cc->migratetype = gfpflags_to_migratetype(cc->gfp_mask); - ret = compaction_suitable(cc->zone, cc->order, cc->alloc_flags, - cc->classzone_idx); - /* Compaction is likely to fail */ - if (ret == COMPACT_SUCCESS || ret == COMPACT_SKIPPED) - return ret; - /* huh, compaction_suitable is returning something unexpected */ - VM_BUG_ON(ret != COMPACT_CONTINUE); + if (!is_manual_compaction(cc)) { + ret = compaction_suitable(cc->zone, cc->order, + cc->alloc_flags, cc->classzone_idx); - /* - * Clear pageblock skip if there were failures recently and compaction - * is about to be retried after being deferred. - */ - if (compaction_restarting(cc->zone, cc->order)) - __reset_isolation_suitable(cc->zone); + /* Compaction is likely to fail */ + if (ret == COMPACT_SUCCESS || ret == COMPACT_SKIPPED) + return ret; + + /* huh, compaction_suitable is returning something unexpected */ + VM_BUG_ON(ret != COMPACT_CONTINUE); + + /* + * Clear pageblock skip if there were failures recently and + * compaction is about to be retried after being deferred. + */ + if (compaction_restarting(cc->zone, cc->order)) + __reset_isolation_suitable(cc->zone); + } /* * Setup to move all movable pages to the end of the zone. Used cached @@ -2407,7 +2411,7 @@ static void compact_node(int nid) int zoneid; struct zone *zone; struct compact_control cc = { - .order = -1, + .order = MAX_ORDER, /* is manual compaction */ .total_migrate_scanned = 0, .total_free_scanned = 0, .mode = MIGRATE_SYNC, diff --git a/mm/internal.h b/mm/internal.h index e32390802fd3..4e0ab641fb6c 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -188,10 +188,10 @@ struct compact_control { struct zone *zone; unsigned long total_migrate_scanned; unsigned long total_free_scanned; - unsigned short fast_search_fail;/* failures to use free list searches */ - short search_order; /* order to start a fast search at */ + unsigned int fast_search_fail; /* failures to use free list searches */ const gfp_t gfp_mask; /* gfp mask of a direct compactor */ - int order; /* order a direct compactor needs */ + unsigned int order; /* order a direct compactor needs */ + unsigned int search_order; /* order to start a fast search at */ int migratetype; /* migratetype of direct compactor */ const unsigned int alloc_flags; /* alloc flags of a direct compactor */ const int classzone_idx; /* zone index of a direct compactor */ From patchwork Thu Jul 25 18:42:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D6A70912 for ; Thu, 25 Jul 2019 18:44:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C34B428A6F for ; Thu, 25 Jul 2019 18:44:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B777828A64; Thu, 25 Jul 2019 18:44:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4F97288AF for ; Thu, 25 Jul 2019 18:44:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00C866B000D; Thu, 25 Jul 2019 14:44:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EFEB66B000E; Thu, 25 Jul 2019 14:44:22 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA0CF6B0010; Thu, 25 Jul 2019 14:44:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id A611D6B000D for ; Thu, 25 Jul 2019 14:44:22 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id w5so31254256pgs.5 for ; Thu, 25 Jul 2019 11:44:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=abO8zis5qyQ9jMy/dQEIxCIeoB176hkWi+GQror9w/4=; b=EsUbPu1QBTAqkiwNJj2Ejy1AuJZpMHGFPnVT0mM66uivBkoyqi3bLdP/YrbcsT2CJh BXk2nYlVrZC7BrdSfRx98/uf0/jAmydLlRm1io2RopWfqWsHaKwDKO79aP2RPeJlb8VK ZprWbjvpaxARETLkHhZkToLZf7EmGxobF5E3RI+J7JnYwc39Lrtw6pjMDzHW9vhewEWy xvxIqtq49jljZ/yCXhHHlcRxoDmNhbqnUBKy2vCajO1RSJoB/OTHkSaToUvWXpPjMyRv Q/X5UhNTfWYvjdMtsOjoZcIDU/XwqxKIXj/x2FvBfzz0eaiTKgnRR7h79FjKDmx3lXNr pNiw== X-Gm-Message-State: APjAAAXloX7zkzA8bhjEu0d43YsMnT0hn4//DAzSBr9mb7hIorydeT5w tFLGQKaVExpAT7LgHCWOHZJPGUZXqVkDjQwFiS1fjIqFb8M9NeihVN2W3iJeHKofMOTYfGEDQyj B+0SkuWJpfsMgG1kyfOR38Piqca7nTq5WKf5B2LXsK9SLkvE9PMEDnED6R/r3T/YRIg== X-Received: by 2002:a62:1a8e:: with SMTP id a136mr17799440pfa.22.1564080262365; Thu, 25 Jul 2019 11:44:22 -0700 (PDT) X-Received: by 2002:a62:1a8e:: with SMTP id a136mr17799379pfa.22.1564080261107; Thu, 25 Jul 2019 11:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080261; cv=none; d=google.com; s=arc-20160816; b=wR6PsTrH5Rt49HIDboQKV8JBLR/Z4NnWj/yRgI/lWTwIGW/idd7PRGHn6vBFyxRfmN DSj8FA5YUVm6J+NB5E0sIku+5ZjI6EbXrCq5VbtkOGdm9/ZwqUIgy1uc/Ki5wq6dwJpa W0r/fB4jBmMdKOlZujuoGi2PVOA+DOHvPhbs5t4cec+mg5Ir4e7WHw0TTvqP5bVELJgL 3iuK+/duurfViMmtHXQuLguCGcI1XnIC1tgh7hGhVFbWPJI1SjxPuD0XyhSLb8T+lcmn YUJrDK7qVd/8glCXPeIsVKsQNyOCMOD9r2iZmOLl3lGkvo7VcO05/bkHKPwC6Qx/tuNN axRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=abO8zis5qyQ9jMy/dQEIxCIeoB176hkWi+GQror9w/4=; b=XfgsXv+VFR/WUEm7mMs3eBdaJ4Cde7p2GQU3phyZBlVU8tWFiHpsU32ThqxV7tzyLg u4ge2PXNMiAJUxnkD3IxtmwGhJWno89a8HVOB380zWQkq9HeHXZ7TpEXppChyw29Gr+3 vqqgA/Hy/oGNL/6RDEBe03dvq8VO/prlbVjNKGhIVRz87WEtC4ciDy1aFRGT6Bd2L1Yf 3Ma0++BOG4rbc6rNpDQZwdIYEnL+YZVdgD7JE/i74GCEcZNXNIP3DFJrN3tPvNx2Uapj yQdbgRf8QBmrY6Hik1CT+F3YciU4sVNUfOb8sYVhIKfzoXs3VAaOR5FVygTwBOSTENg7 0Tpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=vUtykOa0; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m13sor7411520pgi.71.2019.07.25.11.44.21 for (Google Transport Security); Thu, 25 Jul 2019 11:44:21 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=vUtykOa0; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=abO8zis5qyQ9jMy/dQEIxCIeoB176hkWi+GQror9w/4=; b=vUtykOa02Pa10uCbtLnoIvcUdFu3JThtZDgo7uW93gVBQuQ6Dc6mKJH4uPVqsVU8sm i3zJWEzbfjRWgBmpct25rX/J1WFFmQve2ve4ubTiw18sLQ4FYkdeyrDOw+4/zgtp8BH5 9jCeL2BIcDFv+r5lDJ3aWMEFu1UqN2LoN7OvZ9e+t0kt5VAG7L4hRS2R22GRIai/hOwX pezFLT9P8x3g0sId1DVpAF21XwTxPKS15UmJxeL38Jn92SA8bD7OsQy0F/vXKuA4OIQ3 IZ/5y9xvKWRRRKi9FOiV7vi5XrTFGoMZHdYAwycNVE6aGnoWCpR2Et1Uy8LS72Xkrzup tjEg== X-Google-Smtp-Source: APXvYqwJOb28TKf+TbxnRmxPgCBkeIkNDYkj3cI7IIoSwn/D3InHcQUxaF6kTZhxG3DdTaQjTi0y/A== X-Received: by 2002:a63:f13:: with SMTP id e19mr87244311pgl.132.1564080260681; Thu, 25 Jul 2019 11:44:20 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.44.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:44:20 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 06/10] mm/compaction: make "order" unsigned int in compaction.c Date: Fri, 26 Jul 2019 02:42:49 +0800 Message-Id: <20190725184253.21160-7-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Since compact_control->order and compact_control->search_order have been modified to unsigned int in the previous commit, then some of the functions in compaction.c are modified accordingly. Signed-off-by: Pengfei Li --- include/linux/compaction.h | 12 ++++++------ mm/compaction.c | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index 9569e7c786d3..0201dfa57d44 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -96,8 +96,8 @@ extern enum compact_result try_to_compact_pages(gfp_t gfp_mask, const struct alloc_context *ac, enum compact_priority prio, struct page **page); extern void reset_isolation_suitable(pg_data_t *pgdat); -extern enum compact_result compaction_suitable(struct zone *zone, int order, - unsigned int alloc_flags, int classzone_idx); +extern enum compact_result compaction_suitable(struct zone *zone, + unsigned int order, unsigned int alloc_flags, int classzone_idx); extern void defer_compaction(struct zone *zone, int order); extern bool compaction_deferred(struct zone *zone, int order); @@ -170,8 +170,8 @@ static inline bool compaction_withdrawn(enum compact_result result) } -bool compaction_zonelist_suitable(struct alloc_context *ac, int order, - int alloc_flags); +bool compaction_zonelist_suitable(struct alloc_context *ac, + unsigned int order, int alloc_flags); extern int kcompactd_run(int nid); extern void kcompactd_stop(int nid); @@ -182,8 +182,8 @@ static inline void reset_isolation_suitable(pg_data_t *pgdat) { } -static inline enum compact_result compaction_suitable(struct zone *zone, int order, - int alloc_flags, int classzone_idx) +static inline enum compact_result compaction_suitable(struct zone *zone, + unsigned int order, int alloc_flags, int classzone_idx) { return COMPACT_SKIPPED; } diff --git a/mm/compaction.c b/mm/compaction.c index e47d8fa943a6..ac5df82d46e0 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1639,7 +1639,7 @@ static unsigned long fast_find_migrateblock(struct compact_control *cc) unsigned long distance; unsigned long pfn = cc->migrate_pfn; unsigned long high_pfn; - int order; + unsigned int order; /* Skip hints are relied on to avoid repeats on the fast search */ if (cc->ignore_skip_hint) @@ -1958,10 +1958,9 @@ static enum compact_result compact_finished(struct compact_control *cc) * COMPACT_SUCCESS - If the allocation would succeed without compaction * COMPACT_CONTINUE - If compaction should run now */ -static enum compact_result __compaction_suitable(struct zone *zone, int order, - unsigned int alloc_flags, - int classzone_idx, - unsigned long wmark_target) +static enum compact_result __compaction_suitable(struct zone *zone, + unsigned int order, unsigned int alloc_flags, + int classzone_idx, unsigned long wmark_target) { unsigned long watermark; @@ -1998,7 +1997,7 @@ static enum compact_result __compaction_suitable(struct zone *zone, int order, return COMPACT_CONTINUE; } -enum compact_result compaction_suitable(struct zone *zone, int order, +enum compact_result compaction_suitable(struct zone *zone, unsigned int order, unsigned int alloc_flags, int classzone_idx) { @@ -2036,7 +2035,7 @@ enum compact_result compaction_suitable(struct zone *zone, int order, return ret; } -bool compaction_zonelist_suitable(struct alloc_context *ac, int order, +bool compaction_zonelist_suitable(struct alloc_context *ac, unsigned int order, int alloc_flags) { struct zone *zone; @@ -2278,10 +2277,10 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) return ret; } -static enum compact_result compact_zone_order(struct zone *zone, int order, - gfp_t gfp_mask, enum compact_priority prio, - unsigned int alloc_flags, int classzone_idx, - struct page **capture) +static enum compact_result compact_zone_order(struct zone *zone, + unsigned int order, gfp_t gfp_mask, + enum compact_priority prio, unsigned int alloc_flags, + int classzone_idx, struct page **capture) { enum compact_result ret; struct compact_control cc = { From patchwork Thu Jul 25 18:42:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059551 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 821AD912 for ; Thu, 25 Jul 2019 18:44:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6EE7D288C4 for ; Thu, 25 Jul 2019 18:44:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FA4128A64; Thu, 25 Jul 2019 18:44:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF0C628A62 for ; Thu, 25 Jul 2019 18:44:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16C316B000E; Thu, 25 Jul 2019 14:44:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 11D3A6B0010; Thu, 25 Jul 2019 14:44:31 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00C168E0002; Thu, 25 Jul 2019 14:44:30 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id C2FF86B000E for ; Thu, 25 Jul 2019 14:44:30 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id 191so31456805pfy.20 for ; Thu, 25 Jul 2019 11:44:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cSpp6Nuo51h9S4IQ0r6ZMWrFSMbu5tBaK4Gt2EEXwJY=; b=afuGAoOF7Xb+25WrEr5vgu6oqegY2OcTUrXpUdJt50ZNV15yB8DUHMgIQLVcL7KEUY pP8IacGoXSriRzWaS2+zzVmULknZP8N6JkQpBFf/KJ6C/nAvT7RMlSXLaVMVQdv9QsHm ll81qycNgLloWT3zWifBkuiOLKJg/qyJsFqhHYhXgjAxTZi3bEfLOGOoO38Vi8qkqyZl dilzD9bRf0OIRjZOiEgiGg+BUx6kfC/xr01ULyatfw9Yz4FpmdlNMf9Bfz6OZsFQVayn Qo3JXiT/EulIp+tH3qczJGXp6/zyOKlaPll9/REl1crUhLqM91Ofit3sXDbBVRuWqBoF za7A== X-Gm-Message-State: APjAAAUJfnMX+YpxL1iVFYpb7JX4C+mtBU4qQ9fA+YXhNdsoK2q3qB89 SMh6+zKlCjon6OE5cO1lLnQJhXlQpbD4QlwmvZjEdVymcfjTARUz6A8CrklV3altgVmprdVl++F cYefRMQQpknNZFPgh1PHXmDg8FhElgUkBchF0GGhCMmL+yCXBkbFD7kAkN/lF5huYzA== X-Received: by 2002:a62:35c6:: with SMTP id c189mr18090658pfa.96.1564080270496; Thu, 25 Jul 2019 11:44:30 -0700 (PDT) X-Received: by 2002:a62:35c6:: with SMTP id c189mr18090610pfa.96.1564080269456; Thu, 25 Jul 2019 11:44:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080269; cv=none; d=google.com; s=arc-20160816; b=zF56st2z8r2NhUwmZy6FRr/8ak7b+0CT6VRxZ7D4i3skGCj4N0g8gpfr97/bzhJRwV l2ReVJEc08YVLH3f+l5aAzY0OUqcXm2l1ISycHx2WHe6GG0swsmTolwPee1Vdq42W2Zt hGiwIlShgCWsj2seNlOlgw2UvH/6QgXSoFwkLEVI8K6h7oTV6iCiaO9hRUjUZM8Ni9HV hW5LS6/leU7T+/30nkoA+bt/VPd8S9HQ7I+eHi0NYTFruwAvZCIDPHv6gsFpc3XgHnya HbK8oEApiUY2J+axp26OxTXqbabJdzzWomkWRly89Q02OVK9l0d0WFppHmAdW+XWzCxh J9Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=cSpp6Nuo51h9S4IQ0r6ZMWrFSMbu5tBaK4Gt2EEXwJY=; b=WwG9BLv57NHWgKCptUvb90m75hulHu6sCeKqvZfrC+/RstPWqDqPzy+xoyP8q/68k0 dIGoJalFRxErX7BmUrXZav/p0o5OV7mCubrfonczcmc9vf13v+6vqb9zUbqnaducGk5l IT+Rl2/FWQmVb81HOZdSLH9nHyOcLNq1++jyAhX1zDKQ3kTi1A60WIABWn/VqQxuk9Ct u2Q8Q7RWOCE91UFrMobFldz2UtjQktwf/dm+ptiT75JeTkA5L5h4vuNlQYwXf9fiXQTT trrMA7JvE+8ajLsi0m3bQ1RC9TYiLuiXRY2sMZG+R/jl/uyO30tTNZvS3T/9feek0UuI ZlKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DyZA8GwF; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j21sor31721649pfr.2.2019.07.25.11.44.29 for (Google Transport Security); Thu, 25 Jul 2019 11:44:29 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DyZA8GwF; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cSpp6Nuo51h9S4IQ0r6ZMWrFSMbu5tBaK4Gt2EEXwJY=; b=DyZA8GwFGugFPNtlb6hWQqdevFK/xcnOR1T7j4zqKSmueRWnvAGKZ0TdyG/ILXydMP QaU8fhvkVZuTxAypDDsTHwTjK8tk8Nny7LbDvofi1XkmE2WvdMeRs8CC628qrXpWlgFc mUdAzbj+Ayk8SxOiM2a3sSsK0gRsqtVFcRLHA7eLN/WE+xniQdjex/IEdmAwQMCP2oqU GrWuxTFPGidJ5KWv1Iu0N2QHh7uIWNiJvmDCK6BJmuVmaGFfWakftJPHqNe9T4h6MivC GFpAEtR2f0Mq0zscxlhOKj/ci7H3xrWIY1Ai83IKPF2oxCEK/sbjFL5hHouF9Q/GkQHD TW1g== X-Google-Smtp-Source: APXvYqy9vQL6e+v//sfsxpH4SLF2FPA0wZMNMcxumuKmThjZf3GrZIKXbXgaGk5WSR6ilxCI3gSWhA== X-Received: by 2002:a63:4846:: with SMTP id x6mr51416449pgk.332.1564080269118; Thu, 25 Jul 2019 11:44:29 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.44.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:44:28 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 07/10] trace/events/compaction: make "order" unsigned int Date: Fri, 26 Jul 2019 02:42:50 +0800 Message-Id: <20190725184253.21160-8-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Make the same type as "compact_control->order". Signed-off-by: Pengfei Li --- include/trace/events/compaction.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h index e5bf6ee4e814..1e1e74f6d128 100644 --- a/include/trace/events/compaction.h +++ b/include/trace/events/compaction.h @@ -170,14 +170,14 @@ TRACE_EVENT(mm_compaction_end, TRACE_EVENT(mm_compaction_try_to_compact_pages, TP_PROTO( - int order, + unsigned int order, gfp_t gfp_mask, int prio), TP_ARGS(order, gfp_mask, prio), TP_STRUCT__entry( - __field(int, order) + __field(unsigned int, order) __field(gfp_t, gfp_mask) __field(int, prio) ), @@ -188,7 +188,7 @@ TRACE_EVENT(mm_compaction_try_to_compact_pages, __entry->prio = prio; ), - TP_printk("order=%d gfp_mask=%s priority=%d", + TP_printk("order=%u gfp_mask=%s priority=%d", __entry->order, show_gfp_flags(__entry->gfp_mask), __entry->prio) @@ -197,7 +197,7 @@ TRACE_EVENT(mm_compaction_try_to_compact_pages, DECLARE_EVENT_CLASS(mm_compaction_suitable_template, TP_PROTO(struct zone *zone, - int order, + unsigned int order, int ret), TP_ARGS(zone, order, ret), @@ -205,7 +205,7 @@ DECLARE_EVENT_CLASS(mm_compaction_suitable_template, TP_STRUCT__entry( __field(int, nid) __field(enum zone_type, idx) - __field(int, order) + __field(unsigned int, order) __field(int, ret) ), @@ -216,7 +216,7 @@ DECLARE_EVENT_CLASS(mm_compaction_suitable_template, __entry->ret = ret; ), - TP_printk("node=%d zone=%-8s order=%d ret=%s", + TP_printk("node=%d zone=%-8s order=%u ret=%s", __entry->nid, __print_symbolic(__entry->idx, ZONE_TYPE), __entry->order, @@ -226,7 +226,7 @@ DECLARE_EVENT_CLASS(mm_compaction_suitable_template, DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_finished, TP_PROTO(struct zone *zone, - int order, + unsigned int order, int ret), TP_ARGS(zone, order, ret) @@ -235,7 +235,7 @@ DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_finished, DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_suitable, TP_PROTO(struct zone *zone, - int order, + unsigned int order, int ret), TP_ARGS(zone, order, ret) From patchwork Thu Jul 25 18:42:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059553 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 515A26C5 for ; Thu, 25 Jul 2019 18:44:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4303728A62 for ; Thu, 25 Jul 2019 18:44:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3752328A69; Thu, 25 Jul 2019 18:44:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E73828A62 for ; Thu, 25 Jul 2019 18:44:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E5EF6B0010; Thu, 25 Jul 2019 14:44:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 896FA6B0266; Thu, 25 Jul 2019 14:44:39 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 787838E0002; Thu, 25 Jul 2019 14:44:39 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 445D36B0010 for ; Thu, 25 Jul 2019 14:44:39 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id g2so9983900pgj.2 for ; Thu, 25 Jul 2019 11:44:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=J873l7lCPa+QolPzlUg++nHCXxrMC4Fmw1tQXHj9o08=; b=qcIcYRnKxff8GSKJ7l3D8Sw0g7WvUpCbc23qaqNJjicRfd6sXa6Mi1kDwgWtVog5k3 2I2Osq9DiTVKH7nL0+L606fpJDMyOV9qExrh4k/Vb1FSZ70+LYcsSPNCQmqQm5VnAl4G 6Er6tip9tur2Irz/sFJFSMXek7mHEGpFm9+evMhjKy1Atj6ZbXucIZay8WjRT9S426L0 qVr4jPIuPbG/hcYRqmpov9IE8XL048DLvRm30h+W62JGbSUUa9ReDIWIFhB7supWoTC7 TdrZYmOeiNWE7kkZr6bcYcdQhYhva+TTqm4OEMDpYzDMVJ4iNL2MFmnzzUWoEFesEgo/ 6CSQ== X-Gm-Message-State: APjAAAUTYRq9dsN2e3eSSU2VsNh8LS+MP4rC2pCly1PbwCjQQQhWdLcb V9Vayd8f7jr6L/Uctnv/k6xaoumGJ6Qo3KPfrnki9Iv1wh3ZEvw4V2dmCCBq6F2Ebr5LLBmG8n1 /0cerDlld42+Lyzjk0TEKTTk8aGrGLTAuAKC4kZef4OI0ZyjetpsSH7ewph8oLtEVOg== X-Received: by 2002:aa7:8108:: with SMTP id b8mr18433348pfi.197.1564080278893; Thu, 25 Jul 2019 11:44:38 -0700 (PDT) X-Received: by 2002:aa7:8108:: with SMTP id b8mr18433280pfi.197.1564080277707; Thu, 25 Jul 2019 11:44:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080277; cv=none; d=google.com; s=arc-20160816; b=0m/zAbgVS4xSHCfg53STvhprYDnWNTG8EgcmdZfn8aiMXycSYP1piUZFGBOt/qzGae ady44v+Ji37VXddDAIMwIn65WNbseE7xc+IVLswWPivkzU3RzflkITaXLvS+VE48bz0G qOR7dBNqtMS1IygYXFo3J2hRl0WSqulIhNpVvlG4Le8nSzZn+NtqU45Ymc1Dq5Alf+5f PgY31ngMXuU+xgY2wuNG3HOBvp+inH2P6iDEZb47p1b8FM8btTlknnw3rkL1J2HGpu1h Tm6wsp4p4KgYIxKJ5JaEoKcKgQ5BWhGBi8uK7Hj7AjUTdMINCx2KdaMIb9CQv8bVPzjq IWPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=J873l7lCPa+QolPzlUg++nHCXxrMC4Fmw1tQXHj9o08=; b=oHv65LT3MwXo0dkfj0+V7p2FS7wMDqrWv8ok4T3Pq5XMI0z6vXDKUOYlAVvEnlZcJV modatc7TMSHVDbl+WbYHwCVhJBDqslSVXmpeqU98s0UHVZHWAxYbo/M3wSvEFPP/UBcX OsjZWRlxd97eO1jvzfUG8mnrOGVcJWE2lsEX9J1/cIHovm6SzoUPVuaXt8OUXsfB2F3O 4fv+Dg1OOIRdLIJ+4TjYy7WRZfhbTRhI3XZZshIeBayACL+acCaAcTkzKpTI8oNKkcbR xoVvohfhDLO4+cgUK7b97zuTUbXkjjVAHUQpUPz0V5kt0byl4gRGSh1wQ6AYODQnCofk fV7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RJzIWT6p; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 125sor10491710pgi.63.2019.07.25.11.44.37 for (Google Transport Security); Thu, 25 Jul 2019 11:44:37 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RJzIWT6p; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J873l7lCPa+QolPzlUg++nHCXxrMC4Fmw1tQXHj9o08=; b=RJzIWT6paD7ZJL2tpjW5Ma6HpOCKdfWeXRD2vnTwJZh2N+35UR5DKekXI88Xe4vBOw 8HtjuDi5CyzP5RL/Fm5lwdn0QgqaPNHF0iFdRcrXtROUqOpmEHs9iscOO8hOcq/Qhx10 Pr/mm8WfuwKrkXjn+Vg74jX0m5AbHzx84kAt7OjrEpYKMFFsSYKkGYrLolzlvoJ1TIWM rsNRywamFxX4lYOCgAWlTZ3qPWxgFXNW37iDXw35a3UdDrZqalhKYFYz0spQ17MO+it4 Z26oHS5/0o9ysNwzjjtuPA5esNh4pG99SJI+BA6DPnPEog949quGyOohq9IhFJu7x2rA GjJg== X-Google-Smtp-Source: APXvYqwo1eTAvDaBp9lnIuBms8Io2Fugm1ugWOpWhcpk//Dd3/eCcG6T3EvxJjRQep96tUFWHAJ2cQ== X-Received: by 2002:a63:1765:: with SMTP id 37mr18700674pgx.447.1564080277359; Thu, 25 Jul 2019 11:44:37 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.44.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:44:37 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 08/10] mm/compaction: use unsigned int for "compact_order_failed" in struct zone Date: Fri, 26 Jul 2019 02:42:51 +0800 Message-Id: <20190725184253.21160-9-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Because "compact_order_failed" will never be negative, so just make it unsigned int. And modify three related trace functions accordingly. Signed-off-by: Pengfei Li --- include/linux/compaction.h | 12 ++++++------ include/linux/mmzone.h | 2 +- include/trace/events/compaction.h | 14 +++++++------- mm/compaction.c | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index 0201dfa57d44..a8049d582265 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -99,11 +99,11 @@ extern void reset_isolation_suitable(pg_data_t *pgdat); extern enum compact_result compaction_suitable(struct zone *zone, unsigned int order, unsigned int alloc_flags, int classzone_idx); -extern void defer_compaction(struct zone *zone, int order); -extern bool compaction_deferred(struct zone *zone, int order); -extern void compaction_defer_reset(struct zone *zone, int order, +extern void defer_compaction(struct zone *zone, unsigned int order); +extern bool compaction_deferred(struct zone *zone, unsigned int order); +extern void compaction_defer_reset(struct zone *zone, unsigned int order, bool alloc_success); -extern bool compaction_restarting(struct zone *zone, int order); +extern bool compaction_restarting(struct zone *zone, unsigned int order); /* Compaction has made some progress and retrying makes sense */ static inline bool compaction_made_progress(enum compact_result result) @@ -188,11 +188,11 @@ static inline enum compact_result compaction_suitable(struct zone *zone, return COMPACT_SKIPPED; } -static inline void defer_compaction(struct zone *zone, int order) +static inline void defer_compaction(struct zone *zone, unsigned int order) { } -static inline bool compaction_deferred(struct zone *zone, int order) +static inline bool compaction_deferred(struct zone *zone, unsigned int order) { return true; } diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index d77d717c620c..0947e7cb4214 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -545,7 +545,7 @@ struct zone { */ unsigned int compact_considered; unsigned int compact_defer_shift; - int compact_order_failed; + unsigned int compact_order_failed; #endif #if defined CONFIG_COMPACTION || defined CONFIG_CMA diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h index 1e1e74f6d128..f83ba40f9614 100644 --- a/include/trace/events/compaction.h +++ b/include/trace/events/compaction.h @@ -243,17 +243,17 @@ DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_suitable, DECLARE_EVENT_CLASS(mm_compaction_defer_template, - TP_PROTO(struct zone *zone, int order), + TP_PROTO(struct zone *zone, unsigned int order), TP_ARGS(zone, order), TP_STRUCT__entry( __field(int, nid) __field(enum zone_type, idx) - __field(int, order) + __field(unsigned int, order) __field(unsigned int, considered) __field(unsigned int, defer_shift) - __field(int, order_failed) + __field(unsigned int, order_failed) ), TP_fast_assign( @@ -265,7 +265,7 @@ DECLARE_EVENT_CLASS(mm_compaction_defer_template, __entry->order_failed = zone->compact_order_failed; ), - TP_printk("node=%d zone=%-8s order=%d order_failed=%d consider=%u limit=%lu", + TP_printk("node=%d zone=%-8s order=%u order_failed=%u consider=%u limit=%lu", __entry->nid, __print_symbolic(__entry->idx, ZONE_TYPE), __entry->order, @@ -276,21 +276,21 @@ DECLARE_EVENT_CLASS(mm_compaction_defer_template, DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_deferred, - TP_PROTO(struct zone *zone, int order), + TP_PROTO(struct zone *zone, unsigned int order), TP_ARGS(zone, order) ); DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_defer_compaction, - TP_PROTO(struct zone *zone, int order), + TP_PROTO(struct zone *zone, unsigned int order), TP_ARGS(zone, order) ); DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_defer_reset, - TP_PROTO(struct zone *zone, int order), + TP_PROTO(struct zone *zone, unsigned int order), TP_ARGS(zone, order) ); diff --git a/mm/compaction.c b/mm/compaction.c index ac5df82d46e0..aad638ad2cc6 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -139,7 +139,7 @@ EXPORT_SYMBOL(__ClearPageMovable); * allocation success. 1 << compact_defer_limit compactions are skipped up * to a limit of 1 << COMPACT_MAX_DEFER_SHIFT */ -void defer_compaction(struct zone *zone, int order) +void defer_compaction(struct zone *zone, unsigned int order) { zone->compact_considered = 0; zone->compact_defer_shift++; @@ -154,7 +154,7 @@ void defer_compaction(struct zone *zone, int order) } /* Returns true if compaction should be skipped this time */ -bool compaction_deferred(struct zone *zone, int order) +bool compaction_deferred(struct zone *zone, unsigned int order) { unsigned long defer_limit = 1UL << zone->compact_defer_shift; @@ -178,7 +178,7 @@ bool compaction_deferred(struct zone *zone, int order) * which means an allocation either succeeded (alloc_success == true) or is * expected to succeed. */ -void compaction_defer_reset(struct zone *zone, int order, +void compaction_defer_reset(struct zone *zone, unsigned int order, bool alloc_success) { if (alloc_success) { @@ -192,7 +192,7 @@ void compaction_defer_reset(struct zone *zone, int order, } /* Returns true if restarting compaction after many failures */ -bool compaction_restarting(struct zone *zone, int order) +bool compaction_restarting(struct zone *zone, unsigned int order) { if (order < zone->compact_order_failed) return false; From patchwork Thu Jul 25 18:42:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059555 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64578912 for ; Thu, 25 Jul 2019 18:44:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54851288AA for ; Thu, 25 Jul 2019 18:44:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4855B288C6; Thu, 25 Jul 2019 18:44:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C880F28A60 for ; Thu, 25 Jul 2019 18:44:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEEEE6B0003; Thu, 25 Jul 2019 14:44:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D9FDD6B0269; Thu, 25 Jul 2019 14:44:47 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8E5C8E0002; Thu, 25 Jul 2019 14:44:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 957656B0003 for ; Thu, 25 Jul 2019 14:44:47 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id k9so26795013pls.13 for ; Thu, 25 Jul 2019 11:44:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NhwngYDbvri5ejmcM0XgYmhjUBSSl/buGnAbDPDI9EI=; b=akiJhJxa1hdgqYljxJXVhLqM8mU3co9e9buEyxAhvLOyBpKFakBKXqoqIyAKQ08xJH SgKpvHs2IGHwK0c7ZYEIWS3DWbN9PzGR8owWtpAfYxLEqNrsvm4jZGsHcuC3Eyk1nW95 1Ur3tslnTyLScp3+3b7nGrd1RcmflVjc/Qtg7qRBvm8sRHXJ+J08Mr8Z5mf0IN4m1cIz eDiwRWSxiA3w1xxfgFR6VwOXkCccHKQ9x7pXjACx3zTxF8qxpmG1I06Gwo82j1RbKrpR EVc+jijxmlmRWcuFxA95ZmTsHZa+uN9NghciyeHhlhL2AzxqBnKaKhN2s3JUYd0BJP4I 0Ucg== X-Gm-Message-State: APjAAAWEYdeCbElWvezdjvs8ChqhtXvg66FzEIfw49tZihz9Hjwf4CoU jiWaOK3W8vobFbK5DCdwHQCLWjujFaDIEhXbwvJZ1ptGW2g2uXbUjUu/lskjhdAQHj+MRVt/q0e amNYZLZQe17jjZcDq1eYN2Y8kTfbVxrAkxEXjVZynIFJJMMljMhdmFhOaQD/v/1g34w== X-Received: by 2002:a17:902:82c4:: with SMTP id u4mr92268038plz.196.1564080287294; Thu, 25 Jul 2019 11:44:47 -0700 (PDT) X-Received: by 2002:a17:902:82c4:: with SMTP id u4mr92267985plz.196.1564080286303; Thu, 25 Jul 2019 11:44:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080286; cv=none; d=google.com; s=arc-20160816; b=dy3/gPn0HOkFladEn3rPPAhbDszdqysXW3ByOUp9I/brCA0iN//UDMeLiv7qf8LzyH acZ77cxM7mrOd22ktUKQ1JlPWDDypMg+DvmAyRJcvY8n6Jfpv6eFVO5jvwjxzhvmZyDG YXElpJeKOTvBvydsOY+Bi/xO7NMTecYISlKI5WcvR0SimfoVd4GR9zB7z5F52jiP19bv jn/yx7rx78qZnVJ0yYymenqdzrAPwGjSnokGJsgKj6AEcPuhKranBRSTf6ro2RU8KEol qwbU+CZSek1OJ2tPBUwwLjIPNqBW9euOrsZ9XGKhbLah6ZqGWeTlmDkTxuKE1NFd4qMi pJGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NhwngYDbvri5ejmcM0XgYmhjUBSSl/buGnAbDPDI9EI=; b=mrlzq/3wt3Zw0YJ5R2wz+VtDCrTfLk5hUQcvsA4c51+E97U62y3EgImJ9i9J1St7je 6rX+aCk6cKoPEu8kjFcUBfKffyN4wSwjF1sqKWl5QV/PVpbV84BoHkIh/Bc39gU9bIsJ 4qAeHtVUaOICCZMakN9BDE6nQQqlbPZi9fGmh9yktC/buGWp7bjU78gJwm/mhmXrzG9U axSIHeuCU+FBRD0ndnjkk+o/OnGBC53sFqpJRGCZd0T/rsQreHWIAp8rPkeaj125a29s ranRvycxkHl0jIw1ayVmzi3F/Z3GskR2o9AxlVDWYXbyaCYrxqw0+mixpa1MmcvoAWuI JqQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=itn+ATRx; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id n6sor61305904plp.9.2019.07.25.11.44.46 for (Google Transport Security); Thu, 25 Jul 2019 11:44:46 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=itn+ATRx; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NhwngYDbvri5ejmcM0XgYmhjUBSSl/buGnAbDPDI9EI=; b=itn+ATRxnc66FvQMYJryteL+cOXPgFskNlezDWkecZsggx+jExRT3w/o6Zozs9r4lG 7p+nYoCch1hfycj2Nee5j56Dal/g7Fchu2Bo2iHKtJuZT1VJX80T3oUPlIJFK8zFzP3l fLnG1YQh79ExZFmGg3Vdh4sIhJXUvwotn0Rdca8RSEGgBD61h9ckWIZGcKP63fnc4DeU NtdzrRSRiFo6iIaf5S09Z1w1VIWf47s6ZRjqMN/SQet0AgUstkkV0e/If8ZBqHwuVvZw n7UJO9EjWtc94vpUjFu23209ncO9R4sRtMWsUI649YSjzndG72fY/mV2qUIliSKCqnrP qPng== X-Google-Smtp-Source: APXvYqxd1avMi033AmybLadPo/1ryj1iZmvCPadNNWuTSgJQuR4oMLhBqyYbEtyoNYRC9tLu3admKA== X-Received: by 2002:a17:902:28e9:: with SMTP id f96mr88604969plb.114.1564080285671; Thu, 25 Jul 2019 11:44:45 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.44.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:44:45 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 09/10] mm/compaction: use unsigned int for "kcompactd_max_order" in struct pglist_data Date: Fri, 26 Jul 2019 02:42:52 +0800 Message-Id: <20190725184253.21160-10-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Because "kcompactd_max_order" will never be negative, so just make it unsigned int. Signed-off-by: Pengfei Li --- include/linux/compaction.h | 6 ++++-- include/linux/mmzone.h | 2 +- mm/compaction.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index a8049d582265..1b296de6efef 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -175,7 +175,8 @@ bool compaction_zonelist_suitable(struct alloc_context *ac, extern int kcompactd_run(int nid); extern void kcompactd_stop(int nid); -extern void wakeup_kcompactd(pg_data_t *pgdat, int order, int classzone_idx); +extern void wakeup_kcompactd(pg_data_t *pgdat, unsigned int order, + int classzone_idx); #else static inline void reset_isolation_suitable(pg_data_t *pgdat) @@ -220,7 +221,8 @@ static inline void kcompactd_stop(int nid) { } -static inline void wakeup_kcompactd(pg_data_t *pgdat, int order, int classzone_idx) +static inline void wakeup_kcompactd(pg_data_t *pgdat, unsigned int order, + int classzone_idx) { } diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 0947e7cb4214..60bebdf47661 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -723,7 +723,7 @@ typedef struct pglist_data { int kswapd_failures; /* Number of 'reclaimed == 0' runs */ #ifdef CONFIG_COMPACTION - int kcompactd_max_order; + unsigned int kcompactd_max_order; enum zone_type kcompactd_classzone_idx; wait_queue_head_t kcompactd_wait; struct task_struct *kcompactd; diff --git a/mm/compaction.c b/mm/compaction.c index aad638ad2cc6..909ead244cff 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2607,7 +2607,7 @@ static void kcompactd_do_work(pg_data_t *pgdat) pgdat->kcompactd_classzone_idx = pgdat->nr_zones - 1; } -void wakeup_kcompactd(pg_data_t *pgdat, int order, int classzone_idx) +void wakeup_kcompactd(pg_data_t *pgdat, unsigned int order, int classzone_idx) { if (!order) return; From patchwork Thu Jul 25 18:42:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Li X-Patchwork-Id: 11059557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2F57912 for ; Thu, 25 Jul 2019 18:44:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3C05288AF for ; Thu, 25 Jul 2019 18:44:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7D8B28A6A; Thu, 25 Jul 2019 18:44:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F8B528A6B for ; Thu, 25 Jul 2019 18:44:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B5556B0008; Thu, 25 Jul 2019 14:44:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 366AE6B0269; Thu, 25 Jul 2019 14:44:56 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 255CF8E0002; Thu, 25 Jul 2019 14:44:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id E3BD46B0008 for ; Thu, 25 Jul 2019 14:44:55 -0400 (EDT) Received: by mail-pl1-f200.google.com with SMTP id e95so26795653plb.9 for ; Thu, 25 Jul 2019 11:44:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=p7anoNZvbE1SmPE7vSkzLr+EkemuOAJ6vumDZVqMY6I=; b=TZv53C9u4VM045c7ymhTC++P/v2W1EaNOLYSwhLPwRj3nriasgp12UyxV0l5rvn0DZ Dla4Zi6T8rbjdHI7eUahGDjIdEDVTD46UYvNIwVXC87kWmZflA05E6NGCRNffGThoWWG WXALz1KTJRmLmH10Nt9XM7GLje9s1f276gg7WLhxwUJKzgmSk47RMdWK+0Un6zxe4+uU 4b7FJPfB02jGqWhjR2J+54rk5ILvgH4Pg1/AlvDaaNqwDYuyiv7/fA6AfeOjsZRhr52M xsfl/V1Ckp7Tst9NMzeB1vu6qiTdZ2zKmfje8G73dTmau8j6FTUroiB/jfNGwDp5OSYj v5Hw== X-Gm-Message-State: APjAAAWeIKZHvcot5uD3A1UHVW8LqN+Qv+iGW6Gcw9IPHIWuqKtAcwrw arYI2M1TNpJUCe2ti91RjIkBm2iEB9UAFWe7DO3b/WSz8UOTpZt9cd5YMzo0JQLTknUWacXw+c3 wV0gGgxQ/Gg4CLAsig3YK+HN/Z6sR8QixMjg3mJL61A+0TW/AJUym6pCNfpAOF+2wpA== X-Received: by 2002:a65:4189:: with SMTP id a9mr60778674pgq.399.1564080295520; Thu, 25 Jul 2019 11:44:55 -0700 (PDT) X-Received: by 2002:a65:4189:: with SMTP id a9mr60778626pgq.399.1564080294312; Thu, 25 Jul 2019 11:44:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564080294; cv=none; d=google.com; s=arc-20160816; b=QMRlXtImTJBLSVGTRavWD7b5cvfdWAGRWNIEAYfvMQmHYVKQU5J+oyJ/kSVR29wGbq sUgbtToEQkVnyUI0H3u3OCb67hGO7wVpRLjJ20fLBClYFBcoImC03nGNVACAJx3umrSK X+sMnMRKCkuTemaFlqqoPR6ICzlR8THifeqXP4Gu39rd//OH9RE1f8s01IKH0L6WUADK 8S/J3ROvMol8MGTz7uV/TrH/M9zNpEH06v8+0rfiAfjWOYP6eCdUrB2OtSA05UnF/Ibn mCtEe8ABMYIqK/3RDVAmyGQ0IU8K6l8wFuI5kckc80g9OW3ACz/cGVsWDabxF3NoThgf TjkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=p7anoNZvbE1SmPE7vSkzLr+EkemuOAJ6vumDZVqMY6I=; b=EuA9JWDcMPWmv1yRjcwLHaPNXFB88DJ/++j4I0G+Yg2o+l/opZPW9wJ9e4k/hrcb6j 9B77sXbHeNHBi33HGl0gROcec4cunZG5/XUlddF8FCWwmTMi4RzBa531Hend/t6eaUK3 IcuK7fH6k5OJUJw/G9sz4CQNf6MPgbAEVKiuMfEYVMjcudhs3OlmvkabT/tJkhzaFL+i zIMXB5Kctl26jjIUYKABn8vmhJ9JdTmWuzZG21FVgtN88EigJqcw8TDru/7EdGNiCEE+ N1TTzDZ/O4K/T6UObhAF0VEScS1L8IMEPme79F7wGSN8Rw8F5bSQOFrEHikHQITc31g4 m4Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tJBS9eBY; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id g85sor31819079pfb.62.2019.07.25.11.44.54 for (Google Transport Security); Thu, 25 Jul 2019 11:44:54 -0700 (PDT) Received-SPF: pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tJBS9eBY; spf=pass (google.com: domain of lpf.vector@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=lpf.vector@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p7anoNZvbE1SmPE7vSkzLr+EkemuOAJ6vumDZVqMY6I=; b=tJBS9eBYwj5uFnvpYiOFMVcvakA/gNlpWBLT8ABmrbAMIlcvS5T5oRS5m3dKEQ25Bl 8AusFNV4/jIOLj3fBavzY82wfCx5RoXf+dE20Nnnt0xXpvKquTSMiItJLWgEOoXsjt7Y ehfj3CQf43o371r/d1vAi+eeSeWV++2ZZLt+1LdWwluIeWLw4/IzgQy0a4pGLmLGhYiP IwGkgvsELiIEgxhha6sbuvNuy18XtzADZ4I90Aa5Rn1QRu8q7RPpr/KsyDRof+JXMBOT J1XUbuzl4K3hgKDfOEBKjMXC1MSMvMyfGeUljO6JpN+OJqdSyd/zp5ddzuqhZmKN42C2 kfFw== X-Google-Smtp-Source: APXvYqwZbtVPZxFGTdpe3wuAozXuab4sqkGSpbGjI1Hce0XSqcULaSlK3GMHEQ89iHU3g+UWizUZYQ== X-Received: by 2002:a62:1444:: with SMTP id 65mr17795430pfu.145.1564080293985; Thu, 25 Jul 2019 11:44:53 -0700 (PDT) Received: from localhost.localdomain.localdomain ([2408:823c:c11:624:b8c3:8577:bf2f:3]) by smtp.gmail.com with ESMTPSA id w3sm43818257pgl.31.2019.07.25.11.44.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 11:44:53 -0700 (PDT) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@suse.com, vbabka@suse.cz, cai@lca.pw, aryabinin@virtuozzo.com, osalvador@suse.de, rostedt@goodmis.org, mingo@redhat.com, pavel.tatashin@microsoft.com, rppt@linux.ibm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 10/10] mm/vmscan: use unsigned int for "kswapd_order" in struct pglist_data Date: Fri, 26 Jul 2019 02:42:53 +0800 Message-Id: <20190725184253.21160-11-lpf.vector@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190725184253.21160-1-lpf.vector@gmail.com> References: <20190725184253.21160-1-lpf.vector@gmail.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Because "kswapd_order" will never be negative, so just make it unsigned int. And modify wakeup_kswapd(), kswapd_try_to_sleep() and trace_mm_vmscan_kswapd_wake() accordingly. Besides, make "order" unsigned int in two related trace functions. Signed-off-by: Pengfei Li --- include/linux/mmzone.h | 4 ++-- include/trace/events/compaction.h | 10 +++++----- include/trace/events/vmscan.h | 4 ++-- mm/vmscan.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 60bebdf47661..1196ed0cee67 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -717,7 +717,7 @@ typedef struct pglist_data { wait_queue_head_t pfmemalloc_wait; struct task_struct *kswapd; /* Protected by mem_hotplug_begin/end() */ - int kswapd_order; + unsigned int kswapd_order; enum zone_type kswapd_classzone_idx; int kswapd_failures; /* Number of 'reclaimed == 0' runs */ @@ -802,7 +802,7 @@ static inline bool pgdat_is_empty(pg_data_t *pgdat) #include void build_all_zonelists(pg_data_t *pgdat); -void wakeup_kswapd(struct zone *zone, gfp_t gfp_mask, int order, +void wakeup_kswapd(struct zone *zone, gfp_t gfp_mask, unsigned int order, enum zone_type classzone_idx); bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, int classzone_idx, unsigned int alloc_flags, diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h index f83ba40f9614..34a9fac3b4d6 100644 --- a/include/trace/events/compaction.h +++ b/include/trace/events/compaction.h @@ -314,13 +314,13 @@ TRACE_EVENT(mm_compaction_kcompactd_sleep, DECLARE_EVENT_CLASS(kcompactd_wake_template, - TP_PROTO(int nid, int order, enum zone_type classzone_idx), + TP_PROTO(int nid, unsigned int order, enum zone_type classzone_idx), TP_ARGS(nid, order, classzone_idx), TP_STRUCT__entry( __field(int, nid) - __field(int, order) + __field(unsigned int, order) __field(enum zone_type, classzone_idx) ), @@ -330,7 +330,7 @@ DECLARE_EVENT_CLASS(kcompactd_wake_template, __entry->classzone_idx = classzone_idx; ), - TP_printk("nid=%d order=%d classzone_idx=%-8s", + TP_printk("nid=%d order=%u classzone_idx=%-8s", __entry->nid, __entry->order, __print_symbolic(__entry->classzone_idx, ZONE_TYPE)) @@ -338,14 +338,14 @@ DECLARE_EVENT_CLASS(kcompactd_wake_template, DEFINE_EVENT(kcompactd_wake_template, mm_compaction_wakeup_kcompactd, - TP_PROTO(int nid, int order, enum zone_type classzone_idx), + TP_PROTO(int nid, unsigned int order, enum zone_type classzone_idx), TP_ARGS(nid, order, classzone_idx) ); DEFINE_EVENT(kcompactd_wake_template, mm_compaction_kcompactd_wake, - TP_PROTO(int nid, int order, enum zone_type classzone_idx), + TP_PROTO(int nid, unsigned int order, enum zone_type classzone_idx), TP_ARGS(nid, order, classzone_idx) ); diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h index c37e2280e6dd..13c214f3750b 100644 --- a/include/trace/events/vmscan.h +++ b/include/trace/events/vmscan.h @@ -74,7 +74,7 @@ TRACE_EVENT(mm_vmscan_kswapd_wake, TRACE_EVENT(mm_vmscan_wakeup_kswapd, - TP_PROTO(int nid, int zid, int order, gfp_t gfp_flags), + TP_PROTO(int nid, int zid, unsigned int order, gfp_t gfp_flags), TP_ARGS(nid, zid, order, gfp_flags), @@ -92,7 +92,7 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd, __entry->gfp_flags = gfp_flags; ), - TP_printk("nid=%d order=%d gfp_flags=%s", + TP_printk("nid=%d order=%u gfp_flags=%s", __entry->nid, __entry->order, show_gfp_flags(__entry->gfp_flags)) diff --git a/mm/vmscan.c b/mm/vmscan.c index f4fd02ae233e..9d98a2e5f736 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3781,8 +3781,8 @@ static enum zone_type kswapd_classzone_idx(pg_data_t *pgdat, return pgdat->kswapd_classzone_idx; } -static void kswapd_try_to_sleep(pg_data_t *pgdat, int alloc_order, int reclaim_order, - unsigned int classzone_idx) +static void kswapd_try_to_sleep(pg_data_t *pgdat, unsigned int alloc_order, + unsigned int reclaim_order, unsigned int classzone_idx) { long remaining = 0; DEFINE_WAIT(wait); @@ -3956,7 +3956,7 @@ static int kswapd(void *p) * has failed or is not needed, still wake up kcompactd if only compaction is * needed. */ -void wakeup_kswapd(struct zone *zone, gfp_t gfp_flags, int order, +void wakeup_kswapd(struct zone *zone, gfp_t gfp_flags, unsigned int order, enum zone_type classzone_idx) { pg_data_t *pgdat;