From patchwork Thu May 20 15:59:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1481778 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=j/PUouDb; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=BktDYCSA; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=E5EVNaVa; dkim=neutral header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=mYoHNPxs; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FmDxJ23xQz9s1l for ; Fri, 21 May 2021 02:01:08 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RrZCJu4pjQrabw/FCI+iXDY9m2N49U8He12Q5KoMUuU=; b=j/PUouDbSfk+a+UneAwGulJd8C fA2NDa3OHmFK7oC1QTY6DgyyobvIJUVJpL5LTUhgg3xr+cNU0d8v1X8BInBtXpdox81kgn1lUH/1J EhrO/BrnfXogyrvYyvxMEwSPLo5cfMvfDblDuPxiW5+sTHDTmUaAC6u2tthkGR1emKJ+xMbysuywa AGPZ4lfs5iEnh7Bv+501XKNm0cZApzd2JZJ6rQuBzw7CWqS8v4IfQZL2DbHmeY8Pxgso8sXM5MAcv XFrLZ5bEN+GiQ62KejWlVKFZMciqWWJ5ZSfIL5luFixmFWc+i4EJjTQeRNIod+OZWqaO1211dIgz4 fKusypEw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljl6Z-001pfA-Qt; Thu, 20 May 2021 16:01:00 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljl5Q-001pAR-J6 for opensbi@desiato.infradead.org; Thu, 20 May 2021 15:59:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=AMfhLJypvwNLhO7lSbJEq8sUFGr0ixoVKwG16b3XET0=; b=BktDYCSAiLrFd/r93m36HbwGT0 qacS0LcFF1Q7cW1CnT6Scm61ZIryGr4o8lw6JGBeXsjWMNFNxLwHffGLCMPzfB6Iz1GPb8NDai4E2 JIyDoamiM+STC5ecYhIg4+iRAIeJFY2ubs2hsWtDl6CmdUcLNf++4sOY9adQ2x3BC2XJGVaYavrFC I9+9rH12lXLywohXgR4IYvxnt8aLGbG1S8+A73oFxEuHP+bhFwz9DrtK7y1TmaJ2VS0atx2x9gH4c xHT1I/vEiBFpZFYbRfM9x0PnKyrlJbTRkJnl2IQc/mZZEg9PdVjakRQTwvoJdh21d0o2lxUD9MGa/ BSZP7eqA==; Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljl5N-00GUPc-Tx for opensbi@lists.infradead.org; Thu, 20 May 2021 15:59:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1621526386; x=1653062386; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=mI/cr4e38mfBwGZ7z9qbp1Da8TSAV0KG3P2lVyDM4rw=; b=E5EVNaVazRdDvsrw/UjpnGw+cko7YsfIn5WVBvPK5eK6IYwWm1SPu7VM paMOAdk5NGLsUxvuGCzamBXZH2kmUr4G/i+2GqCuX5WUZkAXgdrF7RXME 0+iD/jbGpLOtlcCyTUp7Iv5LqK7FoxnAS+iGXHYZImSpz2Z86sYubr3GX Wuu7tnO1xuMJP/jC5lTckfkeiM9VXQYzN+uLcH9kGck03MnvkqWvQEsEY jDp2Cowcn3Ustk+at/EHjeYkwOrQ7KAEALVymG5lNWksGZLXWHR/wjMEP sYR11iCfjBPu4yF20MZ7cUyp6QXf5gzz+Qe9xeXusnKZKPTu/x21fmIlw Q==; IronPort-SDR: pHFLU/4LRlf2FRhEC1yq/RksAtMbH7oQQxOkYrQgH7Om14WtsyLkhaLOwlvsGusRs39aJjJ50I b5VVf1LIyzgyIvI9rz+6/hcyay+42OOQsIrs9G3bqQRE7oLlr/+fw/IgknbbB7qBiMsp3O3G64 2zVU71SJJN6ChCGTHlLAr1fBk1hnjExv5TYq7/LFTxZRoV9OH2034pvXO5DKr50MOKAtbPTeXn YxeqpPdMSrQvFUjk4wBXuDsOuWOJRCyPfrMeBQ+aCD7AcKn7v4LF8facAwM+Gp0AcnPz8z1k1Q ULA= X-IronPort-AV: E=Sophos;i="5.82,313,1613404800"; d="scan'208";a="169406948" Received: from mail-bn7nam10lp2103.outbound.protection.outlook.com (HELO NAM10-BN7-obe.outbound.protection.outlook.com) ([104.47.70.103]) by ob1.hgst.iphmx.com with ESMTP; 20 May 2021 23:59:44 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d+/6Ff7neeIyHM9Sra9ydHkYTyGzYx1kXjqFWplD59BCtp+Feqe/l2T10D3VLBoBq73i7AVc4HmHALiPBaCpwFd76iT7XGY7DNzv34LK3F/Zp1mb+ftneKgx3z6wmsRjgh0EMgxD6+2UmOjdnZAi9MUeg3YKBYsz3/WuL/PqA6MiRyDwLg9w4n9EHtHpxH5mYDPt09Hnx0WcUNI+8X6JcdAvCaHL1ggdJ33GzCkGXn7Xh/ftHcztSwT/ancllfvGIZNc/1ltMXrd2AbV29ZNuGHb75qlrDQ7VEQwA0MI9oGnNV2rrSSXf13DtRaAuwRLkcKIjQ/7DFvUYzr39hMmhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AMfhLJypvwNLhO7lSbJEq8sUFGr0ixoVKwG16b3XET0=; b=bAoK3GPApRTp73xiN7y0XbOv7aFKvPOoMjYOcZwDYvhCychWBFJ7WTuiewz4eYzHULHs0sFyjVapGPTOHhJTEByJpdmPoa4IVya4B3xuU9bkV1AMBa/ElBXB3P56THom8HJY/dctLM2zlyAhzwnruXqYrjXSw9q+XOHHng2ZQer9l5tH1IzdfPnZ1Lq3L7hieAAVwJSaG6OXw/xiIlmkcrkWHR9/Y2B//iL/cW+mWcMpCnCBE3FJh0CfwZ/kRq7/aW7s9G+UnNr+7zCBwOlj8kmolCl5cWYsqeHAV2exWu6S58qGKJPbzQngvZu5Tvnmw2rZ32/trKTvVC3k5O3vCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AMfhLJypvwNLhO7lSbJEq8sUFGr0ixoVKwG16b3XET0=; b=mYoHNPxsKGdJrLQ1kooQmiM4jmhk3WLbkLdaTLRDUSPBy4VbtNm4U+ThaxsJt7ASIXlxEwGnYdnQ7MMzQxKLKIeRPQxfBvweKri230V1pKUziJDk6iP2s0GqYx8zk642qa2o8a/VgCPa12YvC2azZGS5ehsNgD4glOGCgLLnncM= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) by CO6PR04MB7858.namprd04.prod.outlook.com (2603:10b6:5:357::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.25; Thu, 20 May 2021 15:59:43 +0000 Received: from CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::88a0:bf18:b01d:1a50]) by CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::88a0:bf18:b01d:1a50%4]) with mapi id 15.20.4129.035; Thu, 20 May 2021 15:59:43 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Cc: Anup Patel , opensbi@lists.infradead.org, Anup Patel Subject: [PATCH 1/2] lib: Check region base for merging in sbi_domain_root_add_memregion() Date: Thu, 20 May 2021 21:29:11 +0530 Message-Id: <20210520155912.1336836-2-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210520155912.1336836-1-anup.patel@wdc.com> References: <20210520155912.1336836-1-anup.patel@wdc.com> X-Originating-IP: [122.171.137.200] X-ClientProxiedBy: MA1PR01CA0129.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::23) To CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.137.200) by MA1PR01CA0129.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Thu, 20 May 2021 15:59:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2278eec1-b893-4acb-44c9-08d91ba847e8 X-MS-TrafficTypeDiagnostic: CO6PR04MB7858: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:299; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SiyPPXa1ScCLoI1Q17iAvblnosgfKwvugUVE6Q1LZ/rgbH/0h7CL6uwS1oICaq3ppHTtd1+pbudkihsdXgvDNrAc5pwOAeyrMctDm06spELh+syT1UP5g3GbBa/ZaYP3kBS62Az1+v41ITXoH3zwK5qNeIp+N7EFHX90Vh7xM9yIReMhVo9U3kQ941hLeu1N/ptZjF6Aned6YjMUTIW/wR6pymfA4tDkxcerfQrlxKBRUWdwcS68fn4MK7WxSujwbkg0185mMtxrzIBUrKZCdZE2LexoaXkRTw+VYWX31QdBY/0pbGTsmos17MbM5uaWSLCeELrKPz5JoocQfhTk55G56CjrayU/NR6im/XLeijOflYN6ckBd4CXsMtW7bXQaBbxRFfquETce3433X7t9sPn0U0OgwNK7ahBS55T+OHxqA9gpynHybns2RoS0c68F4FbkKKklFv5+Igvm9FcgiZ35BF2MN7FnRpvKDOtDgp1wUbGvkPqXcTJDGv6KfnZk6V0Xp9yNgChYFfxoEq7OlEttBJLVeGl9fjFKL0RsAWuJlT2aE8OkPFERR6QGEu+gGA6gIR0zaT5mY3PhONTaZfifSvgzrph/L2APm5/cpWL08LzQD2SQPGGNziT1PqPDkzsgHDhefbScm0gz2xk9TgizOWBwwQ4in53tMxqoMU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR04MB7812.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(396003)(376002)(346002)(39860400002)(38100700002)(86362001)(38350700002)(5660300002)(8676002)(8886007)(8936002)(6666004)(83380400001)(55016002)(1076003)(478600001)(2906002)(26005)(44832011)(110136005)(66946007)(956004)(16526019)(186003)(66556008)(4744005)(36756003)(66476007)(7696005)(52116002)(316002)(6636002)(4326008)(54906003)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Yi16+2IYSTdPfrex8iCNlg7mmhcGoHmY0O7LzKzv4/3usAla3PfIAbJS/p+OSYxff9j++mmBRX7Hpnxf6zDKIrb6ZXGrvzRCbr2hokMMUypYxFXgwUIX/P3jgBlaKpRqaCyNiY04436x9wMCVgSjn/MV77OKKiraOWtjpoA4fqR1wpFZW0GYXwiksHllxYNrcjKVS3/a0onnhG+88/HCFo2QHBWeVrR/M195GxvpHqKgDfYIfk49yBTRZbGzPCMRCJIe1fNq1ndMZQcMZxbfs3b/PISMvQghuk0ZlNc/jHKzCMRV+Bf8/JlEBmDoCct82cOr4YX+5JBUfr07Xgkj/8AZz1QFUmzcpLPSdTlRSV7YBmOjRp8RRlXnnjQio2VacTM04npvrd5FsAoVW05O8DWfq+BN8I5X0V7e+bfviXM+p5qdToYJ/t6RKN06E4/vhF8sGuFef11IEkdF4p7pyyi8lm41HARZoABH+44YiskF+cVp/rM/b78oJ+lvHeydB8+nJvqfCNQMhRmtYRJ/hFJHXEP2+Cg/z4pfDzujEQmK9cU1OILmt6XM5z83Vpaz6NykO84aA9DXvptz2FMmz97b9WsZa7wlJvyd5rhOyuebc9Fpu3i13QBso9+bRFQTh8Z6rk0PhAyO6VPLQ7C795fXdaHRgzKLETdAng+1IsuKqvlmHLwKGJ5apQH/vInxqcXu3gOjZs5ZFdWxudEpYG5BIfoawbKkNqYMfh4WuNu+6u/I3Ptqg7faxvjCcwUokSDgcpNFo8/+79JfUKJ6S04EhijfAebnHAjPI4uKN8BTbUlcWdmeZqIW4KQojd+MF1VUzdKIg3t32F5zuUplGLTiUjuLHbEP5RUAAfK4OiB4C6JGCPBAtJmIczkt66LriRZZs/sGTo5IVAOyhmHE7UkgVWMeXHBN9EdPbgIOn/Rx7SkC0KpC7irhxDg+ez4OgCcb99CH6ED09hzavHHCae0oUnC4SpID+XnWRI39hilxbD2a/P22M1oFji55c8PdMGuSVChI7Y3HK6NSPbHmehfEm8bdKdwWfPHmqImmpnk8Y39hdnOOM7TrflkIIPm/oCYs4Eh/B9MQQ0vHC/IPMCquZTyX75WX5PF2d+hfnoqU+eGp18C6v9wHydoymLQaV7T6INmiDv5S6Od42J1RlYP52dIFmK221dJ4wC5OEyFbMJE+aB9O9eCj/1idIIojZL983Zhbzgpt6BYfZmVQ90D2XzkbcuZoTZsu4F2XVwpm8DGonTAzSH94CygxUWlON95w9KbtkMvXCF+16vNJdzz6cdAeA+23b1BE3ICOWQePFhuxrDyJOG1wR/TMUj7b X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2278eec1-b893-4acb-44c9-08d91ba847e8 X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2021 15:59:42.9195 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qx/cM9NjOIqpu8YtgEN7NSZ2mqpbh9TzBReiVcd3ihFBmQQjHCfkzfbrkJXolToDX946wKio+XjH4Lfa245YtA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7858 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_085946_047017_60D147EB X-CRM114-Status: GOOD ( 12.53 ) X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: We can merge region B onto region A only if base of region A is aligned to region A order + 1. Signed-off-by: Anup Patel --- lib/sbi/sbi_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Content analysis details: (-0.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [216.71.154.45 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org We can merge region B onto region A only if base of region A is aligned to region A order + 1. Signed-off-by: Anup Patel Reviewed-by: Atish Patra Reviewed-by: Xiang W --- lib/sbi/sbi_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c index 84f30b9..3096af0 100644 --- a/lib/sbi/sbi_domain.c +++ b/lib/sbi/sbi_domain.c @@ -511,7 +511,8 @@ int sbi_domain_root_add_memregion(const struct sbi_domain_memregion *reg) if (!nreg1->order) continue; - if ((nreg->base + BIT(nreg->order)) == nreg1->base && + if (!(nreg->base & (BIT(nreg->order + 1) - 1)) && + (nreg->base + BIT(nreg->order)) == nreg1->base && nreg->order == nreg1->order && nreg->flags == nreg1->flags) { nreg->order++;