From patchwork Wed Mar 15 11:31:28 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: 70157 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2273293wrd; Wed, 15 Mar 2023 04:34:04 -0700 (PDT) X-Google-Smtp-Source: AK7set85SyMTu38G2eaX/1qsymwpJtB3kyfhI4Y20PtKG8s28P0q5BJJB020AO8/2kgWwec9dy3t X-Received: by 2002:a92:cf03:0:b0:314:f7f:a35a with SMTP id c3-20020a92cf03000000b003140f7fa35amr4705415ilo.7.1678880044335; Wed, 15 Mar 2023 04:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678880044; cv=none; d=google.com; s=arc-20160816; b=rCrEAFZ0VvByfV8hN6eSqbIYc76TJ4PkA4PQOM1G5rQejAKmrZ7Zxn4Df0iaspUfHC zVV5SbPyBHDqntUtxu73epTS4mufXAXjorFf82Qls59Tu/b/QET/7sCEwWOfvy5cl16S LB+LqonFJbRKEwcrJE9rpHVL9SeheO2gAwpbcVhFXnNJOzbyxV0gtx8PwuZwubyAe59s YidVLP/S1i9uLccW6P5PCDg1N0HlSjSRK9KVm6o7HV4nF/l/KPOcXWQwFb/0eEvMQdH/ Yr0KaTiMrQj8/ishyX6mx/mC75I4pU3xqIcAezI9i0qo79b7/nQisXNbD+CK5hoogCdH 9kBg== 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=9V8eylqcIM14HkIIx9TRWvpBvzEt953XO6IZPlCr1Vc=; b=z6oIwDg+KA+kmWzq/0Jt36i+mOx5o/MxiOTcqLd+iGp9xMdbhu272KPp2ewKJXsMnL jSz8HYgRYBx9CBfPZ78WSBZVyWKtIP9h1QprYJ5v5GOLGc2g0uidoEOSae+WWvMOSz/C FHDc/pEI40fCJoYGs3+XtzFrmr13Y+g9YQMoxmffizUi3Fc7tTV1IAKWI33JqGsWJTGe 5JXo6IYVsKmtTPLk3Tc/OIZb301pcmdtkbZkSigJfj4iue0eJUE8VQ0pLX8J5cSJS6Fp yDw40b/3GvJfIxmJos1aWiXkARxxpOa0DGowipC3pgDO220gbmVIMwAo3PZ82DQlF7A2 +2fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LP5If7LQ; 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 a14-20020a056638004e00b003c505a6f89bsi4769613jap.158.2023.03.15.04.33.50; Wed, 15 Mar 2023 04:34:04 -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=LP5If7LQ; 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 S231867AbjCOLcD (ORCPT + 99 others); Wed, 15 Mar 2023 07:32:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbjCOLbr (ORCPT ); Wed, 15 Mar 2023 07:31:47 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6EA0637F7; Wed, 15 Mar 2023 04:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678879905; x=1710415905; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UWzGGkVyoi9uLhDhUj8Gm1X5MYwKK4ubOq9Kr6YKifI=; b=LP5If7LQQDIeFvZKfUTepVi+kW5v9SUL6pXdWk+G3wJHtdSOMAV1AGiE byOTvtaQin2k+ta54sO95fL514S3vDcD8h9ctYE4uzyzwIzWXOs3RGcrs gVR0LhPukfSjx8YAN8LwEZoSG/12KuAvs0wArL+1ARApTGu6qBaJtzAiO 17sEQA1oDzZc+/uxY3ugwbzF0R6n/UgGCHfGUPzZGTDHEhQsKLMAJY24L 84WlrTKJeL6+NIHe+aQbeFYbqf2RK8A9W71cQAdDtorNFRJu3QvS7fXkd UlO6jl5mg5JPgAa5FqaHNGXApnRW5AX9Q/LCxN78Wxkrnf+jowf+velyY w==; X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="340040119" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="340040119" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 04:31:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="768456010" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="768456010" Received: from nopopovi-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.33.48]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 04:31:42 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id CAC6910CCA1; 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" , Frank Haverkamp Subject: [PATCH 05/10] genwqe: Fix MAX_ORDER usage Date: Wed, 15 Mar 2023 14:31:28 +0300 Message-Id: <20230315113133.11326-6-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_NONE, 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?1760433321311533033?= X-GMAIL-MSGID: =?utf-8?q?1760433321311533033?= MAX_ORDER is not inclusive: the maximum allocation order buddy allocator can deliver is MAX_ORDER-1. Fix MAX_ORDER usage in genwqe driver. Signed-off-by: Kirill A. Shutemov Cc: Frank Haverkamp Acked-by: Vlastimil Babka --- drivers/misc/genwqe/card_dev.c | 2 +- drivers/misc/genwqe/card_utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/misc/genwqe/card_dev.c b/drivers/misc/genwqe/card_dev.c index 55fc5b80e649..d0e27438a73c 100644 --- a/drivers/misc/genwqe/card_dev.c +++ b/drivers/misc/genwqe/card_dev.c @@ -443,7 +443,7 @@ static int genwqe_mmap(struct file *filp, struct vm_area_struct *vma) if (vsize == 0) return -EINVAL; - if (get_order(vsize) > MAX_ORDER) + if (get_order(vsize) >= MAX_ORDER) return -ENOMEM; dma_map = kzalloc(sizeof(struct dma_mapping), GFP_KERNEL); diff --git a/drivers/misc/genwqe/card_utils.c b/drivers/misc/genwqe/card_utils.c index f778e11237a6..ac29698d085a 100644 --- a/drivers/misc/genwqe/card_utils.c +++ b/drivers/misc/genwqe/card_utils.c @@ -308,7 +308,7 @@ int genwqe_alloc_sync_sgl(struct genwqe_dev *cd, struct genwqe_sgl *sgl, sgl->write = write; sgl->sgl_size = genwqe_sgl_size(sgl->nr_pages); - if (get_order(sgl->sgl_size) > MAX_ORDER) { + if (get_order(sgl->sgl_size) >= MAX_ORDER) { dev_err(&pci_dev->dev, "[%s] err: too much memory requested!\n", __func__); return ret;