Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Ross Philipson <ross.philipson@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org
Cc:     ross.philipson@oracle.com, daniel.kiper@oracle.com,
        dpsmith@apertussolutions.com, tglx@linutronix.de, mingo@redhat.com,
        bp@alien8.de, hpa@zytor.com, luto@amacapital.net,
        kanth.ghatraju@oracle.com, trenchboot-devel@googlegroups.com
Subject: [PATCH 2/2] x86/boot: Add setup_indirect support in early_memremap_is_setup_data
Date:   Thu, 27 Jan 2022 12:04:16 -0500
Message-Id: <1643303056-22272-3-git-send-email-ross.philipson@oracle.com>
In-Reply-To: <1643303056-22272-1-git-send-email-ross.philipson@oracle.com>
References: <1643303056-22272-1-git-send-email-ross.philipson@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uqHajLF682F5UbwJwUSpA7pqapADC3Bh1HxtZ2qIpTwDOhMMhX3Pq9ycQGnM?=
 =?us-ascii?Q?AhvvqrssW3yHokthmp0BFt5Eaj/fFStTvrpRY8eUTNKDl9dSajDT82umXXUu?=
 =?us-ascii?Q?LkyyfC1K9JuxLseU2NK6xwMfeJybAe5UAk3dyDHc7QcnSZEcc7wRvOY7dbzj?=
 =?us-ascii?Q?xf3oxNMLAm4alKoSQfZpV3d/W1HitkI6z6zjdhBto/50y6AVumUGMdZ+ZjXc?=
 =?us-ascii?Q?1OfQtSP5X1ZCD1EufZBvo3cTADWas/hx4EwyD85HFFQIOhEtyaw2a9VjhHWL?=
 =?us-ascii?Q?v8AvmCBEiGAY7DWjt0T9Ni0RLhp9zLrL/Pm+HSPSiqm2vjd0VFJqF0gujjTg?=
 =?us-ascii?Q?iKHOLQ8Q0S77wK7Der2qm8YgLFJaQya9vju2mbC3pBHQtPAFOzJerMYVszZD?=
 =?us-ascii?Q?wCItRl4XmEKDGb78bGtmaTAIdpvvo70/DoYQV50YrAJcB33wbFVSgE411XkQ?=
 =?us-ascii?Q?in4PT629igfX2dl7TDdylMj/mm+iP3na3K0CTVFSxWowbFmKm0w7HpGtdxdA?=
 =?us-ascii?Q?1f+E6nln5tpnPuj+NymOoaBDRidnrY5Dg6Vu91YsukmI/1leP1S1RNtFDNlE?=
 =?us-ascii?Q?3NEe+Z52hiVPE4OMPUov4NR/58vwhjXrfdshLWuFzfOY5sgzn5vgQyF9QnxD?=
 =?us-ascii?Q?BILmvzAJzpbZ05J8Bdcx3FYglc9hjzgnhKUUSwYjMk7k0/k+phgjO8JnNGGo?=
 =?us-ascii?Q?u1+MCmTmfaFH+gbAgS4u054hU34o3A4PSEG9maN9lCyoquESdXLbtpPb392N?=
 =?us-ascii?Q?gn96RXnZWBLAWMJsfLKHLEZoV5EGiJ62k1TF6UCh04xCZERQTohmhFzdlFqs?=
 =?us-ascii?Q?PX/HPh7bgThH2F4WMh3kDfnWgoB2WUVWbOtnd5EUMAJ0FQi9h/4XgpQ0Eest?=
 =?us-ascii?Q?t+eWy+j47ktomKqsf06VnKCinXWD2LQsfvmZ00d11/4QV14co+eLdPvwIf8T?=
 =?us-ascii?Q?HNYfvtVZ+T6Qebej8RBeZXXb7GMfQ+YfyduVmx5rzlqmUp0miJkGVoUM1XPr?=
 =?us-ascii?Q?5NoL43w50LsFfy7QnQqVKB0hTjUTrBtlof1FnRMkQ1gMrrXwE1RiWNvrRDar?=
 =?us-ascii?Q?wYq7Ev01IHqrD55fWZomKo6Lu4ImvvJ9nWhU04fwe4dDVMo6wfj728oKMf+r?=
 =?us-ascii?Q?Ab8aKdD/Dl8NHj0vFNtiBk/xC6wGoYdsUistBySU4CZu+nhSRETkq9526bvz?=
 =?us-ascii?Q?O49IgRFxIm4S/auEoPpVlJ8kJvXw6PtP/sV1lnIfRzV+Ok9ipoh/+FN2jGH4?=
 =?us-ascii?Q?HxdgzR/COrdZ629Y/JUmSg4q3ElWs81a26i/l0I2s/+2GcZFf47kpa2pL2sW?=
 =?us-ascii?Q?tM6MgLnyy5BcvyIy9kBFjQLGodAvgzftP9gEy41Kb6oo9EplGqQkpqSqDSyd?=
 =?us-ascii?Q?TI6Ivc9fDwsubeYfN2hgA0pIYw+iJ041jzGXRPf0b3AoI6NOainXYm1Xp2Hq?=
 =?us-ascii?Q?Nd/5TfV0h+hKPhOzJ32A/Vx3OwD1VkVV6IVxu4ydbxm3y7qp5yVJxtI/ev2D?=
 =?us-ascii?Q?6TRmAcmBFvtwZxvCy59taNsvfbPQzFIJ1eK55Z3M2Vf/LORSRsWfKh9bQRS3?=
 =?us-ascii?Q?/L4AcJ54eTFDko1qxLlr0UwvLlsEsC2/oaYen+uQTO6XgUHB1Li4Q+n6CanX?=
 =?us-ascii?Q?UKpjp7KFg/jMCPL0bLlOIGeGrtm6DBWQuOsfTZIjneEPaxhHCbc/FR12TZf4?=
 =?us-ascii?Q?bviC2w=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 36ce748c-0256-45e4-b525-08d9e1b5a8ac
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3793.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 16:54:18.6262
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: s30l60tguHwH2zbpOhtjJgLDS2hZn87qyen3WV4MYjAPsp776Uah8qbqzbhEolXwY/DMmVaf8UOtgXiAFFuLe7wqsFhAp9Nj8bxyk6P84Zg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4370
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10239 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0 phishscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2201270100
X-Proofpoint-GUID: Nygd_stf76UStTfp7JPmeXfP-vA0r3mG
X-Proofpoint-ORIG-GUID: Nygd_stf76UStTfp7JPmeXfP-vA0r3mG
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The x86 boot documentation describes the setup_indirect structures and
how they are used. Only one of the two functions in ioremap.c that needed
to be modified to be aware of the introduction of setup_indirect
functionality was updated. This adds comparable support to the other
function where it was missing.

Fixes: b3c72fc9a78e ("x86/boot: Introduce setup_indirect")

Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
 arch/x86/mm/ioremap.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index b45e86e..9129b29 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -670,17 +670,34 @@ static bool __init early_memremap_is_setup_data(resource_size_t phys_addr,
 
 	paddr = boot_params.hdr.setup_data;
 	while (paddr) {
-		unsigned int len;
+		unsigned int len, size;
 
 		if (phys_addr == paddr)
 			return true;
 
 		data = early_memremap_decrypted(paddr, sizeof(*data));
+		size = sizeof(*data);
 
 		paddr_next = data->next;
 		len = data->len;
 
-		early_memunmap(data, sizeof(*data));
+		if ((phys_addr > paddr) && (phys_addr < (paddr + len))) {
+			early_memunmap(data, sizeof(*data));
+			return true;
+		}
+
+		if (data->type == SETUP_INDIRECT) {
+			size += len;
+			early_memunmap(data, sizeof(*data));
+			data = early_memremap_decrypted(paddr, size);
+
+			if (((struct setup_indirect *)data->data)->type != SETUP_INDIRECT) {
+				paddr = ((struct setup_indirect *)data->data)->addr;
+				len = ((struct setup_indirect *)data->data)->len;
+			}
+		}
+
+		early_memunmap(data, size);
 
 		if ((phys_addr > paddr) && (phys_addr < (paddr + len)))
 			return true;
-- 
1.8.3.1