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,
        iommu@lists.linux-foundation.org, linux-integrity@vger.kernel.org,
        linux-doc@vger.kernel.org
Cc:     ross.philipson@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 v4 02/14] x86/boot: Add setup_indirect support in early_memremap_is_setup_data
Date:   Fri, 27 Aug 2021 09:28:25 -0400
Message-Id: <1630070917-9896-3-git-send-email-ross.philipson@oracle.com>
In-Reply-To: <1630070917-9896-1-git-send-email-ross.philipson@oracle.com>
References: <1630070917-9896-1-git-send-email-ross.philipson@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from lateralus.us.oracle.com (209.17.40.45) by SN6PR05CA0011.namprd05.prod.outlook.com (2603:10b6:805:de::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.8 via Frontend Transport; Fri, 27 Aug 2021 13:20:38 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 236405ed-0399-4d5b-ceac-08d9695d7707
X-MS-TrafficTypeDiagnostic: BYAPR10MB3621:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR10MB3621DFAADFA8610D85134537E6C89@BYAPR10MB3621.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:6790;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: HHHBDowIX4IVeQUR2GDfh26exyxSyBd5pZcanMUc0EHxxEHKS28RvwN9yEIImC+3JwNnfku626DHhxxbmbnHjmsIpZkQB8ObIZiIvRCUGlVXKfKb7lj/jw8Z1bjWvrZhDn1Y9wy4yS5eS3tc7qXLCYEISufyxz1oJ2/oBCPO26QuvDGbthZJ2FM8/HuotCLW8FPi7qoDgIdKlJizfUKrt5tPtGSyEmbogfv96EzNnAVN3ZVSvS1296+IEvVt4VM9h9KMjLhnvucWbZgdNEJ0bXQznJ7L8bvBwXEoGYFNtC35QDvgz+H9R/mAA2caCtfDb/VspJDozyZzf4dh5UsbneFT+KZw5P91sNBnmBZ7htfv8n82TTekTucVFSt9BFJ7JOX6KesK/AXZ3Ry9+De+nWGDeS1mR+qjdcphQfko+c/6+sy+RxLWv6LNHT+BOYKxejuhDs6LoUcgssq4P3owv4WP++hOjI3Cn0i7z6hNakOsUnWs/xrnXqX8eGOmk9qjr7GYVuffCLTPPlUC8/DEvkBIZIsuxWO2+YYPMzTUhG4iS1mel2s0s7WZ1JjEBhiGrSdIyWcn4d0aqqjtgFwJzcOP7SVkBl4M/GwBLGvgm2I1OnuTn568iip/Fg9Fkn+jow34dLkC/3FNNTSIpiNkDrmkfU3iEmkznU24FQYOqif5uMwYPsNkRjjXEKI++UQrnsAERMIYN1nTDyosR6ZXgw==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3793.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(346002)(376002)(39860400002)(396003)(136003)(26005)(44832011)(316002)(86362001)(186003)(36756003)(83380400001)(7416002)(5660300002)(478600001)(6486002)(38100700002)(52116002)(7696005)(4326008)(38350700002)(8936002)(8676002)(6666004)(66556008)(2906002)(2616005)(956004)(66946007)(66476007);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AMsTsc0H9kTFbWIBVQDyeRklh2tFm0qXwJIZ6Dfi8BeK24TQVz8Rw/aN2OQ2?=
 =?us-ascii?Q?Xl/azu7+qEhFrWxhoAKgR4oTyyz6HxkRHuilbcSHufX5jn1r695rVOOt/9Yh?=
 =?us-ascii?Q?gnSJCyx14Kq3mshsbHh3AlROOCz9FNd2bGmkPgeUBfeIrNXS7WDWvdLsphUI?=
 =?us-ascii?Q?vWevVEHlbwjBbxAx3d2uzKfn6U60KvCGxjgZdiP1Fc+1JoUC3X7DgCdMJJsh?=
 =?us-ascii?Q?heYyxLsn86H9wFFKdVMRFWvdxmpSKrjWcnn0rz4Z5bAVbNszRuO8ibHkpwcq?=
 =?us-ascii?Q?vyIERae/5+337bRLCi5L5cQ8UP57/YTgQcaEzhyA60J1SeA+XtCB6hkC+1po?=
 =?us-ascii?Q?ZT8WzZ//uNnC+RvMqHDb2ZFiBdNNNFLBT5x+DqIMoFQ0/XKm3ZPXhVuB30Lx?=
 =?us-ascii?Q?S2xVTT633tTo1I9ZFQaHsjN1FWsk8LOaSWyQxNVsR/zj4hdMOnSPmFjmn6F4?=
 =?us-ascii?Q?eLu5RR8T61n6L8oF2C3MbDWIRwOg4Cav949dR+e29rCP7ltjvchyZShFtPmY?=
 =?us-ascii?Q?0R6zMDI1bsBFVAKgJJOLFpZE06bqwFoVQ8drCJw39AEIVx+tgzDYPCksDtGi?=
 =?us-ascii?Q?Iq0xEMc9oATyKei380/gyTEpenM2wfvHXhHEHXpGsrBLmM192LOOXYodcpiq?=
 =?us-ascii?Q?h/gtUKKoADgCV+YOudq/WAMnxiajp4kWafrks8crHfL9uQvyoreL7gcKDhH8?=
 =?us-ascii?Q?R1RZgHzAn1ZNYqd1DpKZ2PXKkSD59o9OjK9RPqkGSeXmDS6V0WCisvqZ8Qr+?=
 =?us-ascii?Q?/QWODaoZhJyx8cC/yYAL+8OuEUMrIapGOjP0KAsv+U2DxN6AizExgqTbMJ56?=
 =?us-ascii?Q?PEyeTV2xajo8MkKp2IdYqOR7kxQYgQQnnNSVlTGmGD7KW66vF5IOIzz6JGcg?=
 =?us-ascii?Q?FpHEplvbypJqrLdCZbL0dMnOs7S+jh64NYD2GKiCMgW6jc4k+jWmbFfH5vWK?=
 =?us-ascii?Q?gCTDrAzFYblxxhPgBZMPF40lFVUCW/b+HGF2zoL9QW95FJ0fbwETNWIgehbg?=
 =?us-ascii?Q?YYa0bEjNwUk9Cp00g1h0GwqJmiXdHaxiX3q5ch9lm8ixgI4OPqU+o9d/l+Qu?=
 =?us-ascii?Q?3KQvbogDAsoZrbLs92kh2v2t5DXQFYyU+YkkTArV5W7QvhrFZkmypqXKz7+5?=
 =?us-ascii?Q?nkIyUmhi1vXIDEWhY5CgUp0wHptzGVGOPZfyAjqfpoqTswldGA4ahtyXLnM6?=
 =?us-ascii?Q?YjH+19Y0yf99w/dbMo4feyHeAQMk7/6wlTVSihg5PEZHGlQKXDmYjAbJqyTt?=
 =?us-ascii?Q?laoDtb1VhCcV6L/PrLGdSNm+Ys2n5rJYNcT5rrISTYD0RCSWK6EN+zQmhUi6?=
 =?us-ascii?Q?uaG88TONg1miNJz59UpmkI4S?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 236405ed-0399-4d5b-ceac-08d9695d7707
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3793.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 13:20:40.1130
 (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: MLKU3TdSMPHoqv4QafiQmdH4VMrMW+bOqPJ7gHMRlFCKO5QtJnXipgnnhPJ62GYexVc1PdvSXE+2XJcPz5S0aeUMfGTozbGtfsFD5HNmhmk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3621
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10088 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 malwarescore=0
 spamscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000
 definitions=main-2108270086
X-Proofpoint-GUID: waUfI55wC4QR_fzVivaiUztW22bxIArN
X-Proofpoint-ORIG-GUID: waUfI55wC4QR_fzVivaiUztW22bxIArN
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>
---
 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 ab74e4f..f2b34c5 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -669,17 +669,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