From patchwork Wed Mar 15 11:31:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 70159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2273908wrd; Wed, 15 Mar 2023 04:35:16 -0700 (PDT) X-Google-Smtp-Source: AK7set98YxN5djLak7HmaSE/g12cMeMEJO8BBxeZT1JK9Fe6sleTf27HO77xNCEUhr2Puo/eu99f X-Received: by 2002:a17:902:f90e:b0:19b:da8:1ce6 with SMTP id kw14-20020a170902f90e00b0019b0da81ce6mr1981923plb.55.1678880115884; Wed, 15 Mar 2023 04:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678880115; cv=none; d=google.com; s=arc-20160816; b=ZeQgyZJYFSUKbyYVaM5Zs2BR/vJXDkvSRElCx1Jq75ZVdy9S+u7IVhVzG96Ms/ix2E PjeH/GqwaUFGOhzrACsX0TIrk9FzevsAf4bWCIfNW5TUIGsuKrovGPb3J13+Z7gLplFa DmPt+aUBh/P/3M91joOqGNmVWF+6qpN+zF7rZBL8ol06utEPYjjb7zE3HQ78zanhWkVF ifNYQyJNzP2iVmdESs/1TmP+uahj46WHNlcD3NTYZkwPzmsL6Zv1fFSva4kUQgg4zRlh By0mtGbHGquyYah5nTHKwnJMkU6vyOkBwMiFR1nrWvzoca45ym23a0rlM3GpHMgRGQeY r3zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yD3tpaPj4k5AQgW+6Vkwtj3EtMhv0S63rcLrWTfZmGk=; b=UE8XMi5niq9e74m900jiD9+ipai/BedQ858cTVI5hxE4J060X+ZI5xOikBtbpl9V5X WlLXZt5/M5+8AhmXsqhknrH8ID4xOyvaJE8qvCQ1/5e784XLWCagpinvTYNRfArpMqIN 72XvKM0gDKRQq7IdAVFo/lkQQBRH+yMIl1jy71Z8boBVKIm6tzYpJis1NW6eyv+coUEU CwoLHVtdnqmbx27e5kQ3LhP8AkApnW9yfEFJf9Dc+h6n2BeTy8lEnFq35bRiiluekqLY 0CbI+vx/JAenqXe28UaZkL51TlnhNC6MGLxyA8U6vYazQSN2fjGC9uaErvXHuc+ONAjL /lkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bIAbhfVz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c4-20020a170902848400b001a07175c797si2895201plo.191.2023.03.15.04.35.00; Wed, 15 Mar 2023 04:35:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bIAbhfVz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231608AbjCOLbt (ORCPT + 99 others); Wed, 15 Mar 2023 07:31:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231431AbjCOLbo (ORCPT ); Wed, 15 Mar 2023 07:31:44 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33B30637EB; Wed, 15 Mar 2023 04:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678879903; x=1710415903; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QBCZQm/SBz0B4srej1vb8GPqV7WaEgnSaSI+esoAbhU=; b=bIAbhfVzz5J3HDJT4ozzENKHtlTtY2IlEkQcFSwaXa9CXQ87lf2wgJml 9Q5bmDJu4bw8GA/lfgwOB2pOEZ4p7193V8lmDtLOF35rp4M6o7z2u3pOy wike/23T3F7NTqB2c/WCLUOL7luHnq5XDeCIVmj9dEDn+a4JFRPeFw2T4 aKSQLSHzxSyHZo2TIVJN7JUeb5TTz2iGwY8uFe/O06vGRrYp5e+n2XLFK w9sd2qVLU6D9u2jBpEj3PgYe8b7WLyrfXAT2ZFj1mPVLdrvN0YdgWqaTP 8QiJLGRgGLJxDZwhJaZKF1FUTeCmufNzDfUdApHbdBdhdd8p/qkwkeaNK w==; X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="317330287" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="317330287" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 04:31:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="925310515" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="925310515" Received: from nopopovi-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.33.48]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 04:31:38 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id B452D10CC9E; Wed, 15 Mar 2023 14:31:35 +0300 (+03) From: "Kirill A. Shutemov" To: Andrew Morton , Mel Gorman , Vlastimil Babka , David Hildenbrand Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" , Richard Weinberger , Anton Ivanov , Johannes Berg Subject: [PATCH 02/10] um: Fix MAX_ORDER usage in linux_main() Date: Wed, 15 Mar 2023 14:31:25 +0300 Message-Id: <20230315113133.11326-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315113133.11326-1-kirill.shutemov@linux.intel.com> References: <20230315113133.11326-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760433396297377201?= X-GMAIL-MSGID: =?utf-8?q?1760433396297377201?= MAX_ORDER is not inclusive: the maximum allocation order buddy allocator can deliver is MAX_ORDER-1. Fix MAX_ORDER usage in linux_main(). Signed-off-by: Kirill A. Shutemov Cc: Richard Weinberger Cc: Anton Ivanov Cc: Johannes Berg Acked-by: Mike Rapoport (IBM) Acked-by: Vlastimil Babka --- arch/um/kernel/um_arch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 8dcda617b8bf..5e5a9c8e0e5d 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -368,10 +368,10 @@ int __init linux_main(int argc, char **argv) max_physmem = TASK_SIZE - uml_physmem - iomem_size - MIN_VMALLOC; /* - * Zones have to begin on a 1 << MAX_ORDER page boundary, + * Zones have to begin on a 1 << MAX_ORDER-1 page boundary, * so this makes sure that's true for highmem */ - max_physmem &= ~((1 << (PAGE_SHIFT + MAX_ORDER)) - 1); + max_physmem &= ~((1 << (PAGE_SHIFT + MAX_ORDER - 1)) - 1); if (physmem_size + iomem_size > max_physmem) { highmem = physmem_size + iomem_size - max_physmem; physmem_size -= highmem;