From nobody Tue Nov 23 13:48:25 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9B7B91888963; Tue, 23 Nov 2021 13:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hz57t3k4Mz3ssS; Tue, 23 Nov 2021 13:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED11117899; Tue, 23 Nov 2021 13:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ANDmPqb072772; Tue, 23 Nov 2021 13:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANDmPNp072771; Tue, 23 Nov 2021 13:48:25 GMT (envelope-from git) Date: Tue, 23 Nov 2021 13:48:25 GMT Message-Id: <202111231348.1ANDmPNp072771@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: e050de4b9c32 - main - sysutils/xen-tools: fix build with clang 13.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e050de4b9c320dffc668db53b6c65657d33884cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637675306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F9vx2yqEGX2F9rdEAjIeVHtREhS/EPN8c9atPKGp8Tc=; b=E6ucQtK3rn7OD21Mk6bHFHzAvaVgkY9Kiv5hOADHmUaXkgnUlj4JMCvTSUYN7zp3xSu/cI rab86EVwh9D5Rw2aAQRZ8dVdlY74Nh2bU4pjK967Vcc5e3vJFwi8ZySGnsnbfeEumWfF9u mY8FICHx/XCc1/3WwcTxNds3RUQOHQ5XxgpDAf5Bsv8LR961Tly3vLP7pwgcrNRJzCLOYP xc+DLH2WJrfDLCV8tLNPmjf+mKLetn9bPy6kzBQDCmUjY2+Yg9wpohamtDYj4y86lzbw2r kR6Rj3qmQejTwKcY0tcgD/Gf6rYGTWCXSRyYR4zWuWi9GWc4b8XCoq9YOgLJYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637675306; a=rsa-sha256; cv=none; b=iwA6est0UbD9B0FzkAbiROv2G9+sFgD8cytXnqqRXfYDNs+5IVFpQ7GokOOCJRSIsP+/rR Erucufdn5QJv6KHpLtZ30R614kz5ipH1RxAiHpjJhzMBdS9quUXB6RtC2xLdqiBOvNpMO5 3yjBqMSIrsH++WTEixQKE+Y4kRnaw9zJRCg0zVM7WsvL8va2wFCyLAHPJrNekXQVMcZZ9s uG+t43RcVPr38xFHXbo2vvCu7tnvFbsI2J06f/KiMYdBkNalRKI5SH103wkCigm+Zr02Xr RcnAeeUAPYzzsGhbJBk4Uwd5DNO60iZSYA7NPElrnu0qyD8HWmK1haqCEmWv4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=e050de4b9c320dffc668db53b6c65657d33884cc commit e050de4b9c320dffc668db53b6c65657d33884cc Author: Roger Pau Monné AuthorDate: 2021-11-23 09:01:08 +0000 Commit: Roger Pau Monné CommitDate: 2021-11-23 13:47:47 +0000 sysutils/xen-tools: fix build with clang 13.0.0 Sponsored by: Citrix Systems R&D Approved by: bapt (implicit) --- sysutils/xen-tools/Makefile | 5 +- ...gnment-of-function-parameters-in-compat-m.patch | 105 +++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index 64dcddc10a7d..1d2d3ec85c42 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -1,7 +1,7 @@ PORTNAME= xen PKGNAMESUFFIX= -tools PORTVERSION= 4.15.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -59,6 +59,9 @@ DOCS_ALL_TARGET= docs INSTALL_TARGET= install-tools DOCS_INSTALL_TARGET= install-docs +# Fix pv shim build with clang 13.0.0 +EXTRA_PATCHES+= ${PATCHDIR}/0001-efi-fix-alignment-of-function-parameters-in-compat-m.patch:-p1 + .include .if ${OPSYS} != FreeBSD diff --git a/sysutils/xen-tools/files/0001-efi-fix-alignment-of-function-parameters-in-compat-m.patch b/sysutils/xen-tools/files/0001-efi-fix-alignment-of-function-parameters-in-compat-m.patch new file mode 100644 index 000000000000..1612c5a113a1 --- /dev/null +++ b/sysutils/xen-tools/files/0001-efi-fix-alignment-of-function-parameters-in-compat-m.patch @@ -0,0 +1,105 @@ +From be12fcca8b784e456df3adedbffe657d753c5ff9 Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne +Date: Thu, 18 Nov 2021 09:28:06 +0100 +Subject: [PATCH] efi: fix alignment of function parameters in compat mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Currently the max_store_size, remain_store_size and max_size in +compat_pf_efi_runtime_call are 4 byte aligned, which makes clang +13.0.0 complain with: + +In file included from compat.c:30: +./runtime.c:646:13: error: passing 4-byte aligned argument to 8-byte aligned parameter 2 of 'QueryVariableInfo' may result in an unaligned pointer access [-Werror,-Walign-mismatch] + &op->u.query_variable_info.max_store_size, + ^ +./runtime.c:647:13: error: passing 4-byte aligned argument to 8-byte aligned parameter 3 of 'QueryVariableInfo' may result in an unaligned pointer access [-Werror,-Walign-mismatch] + &op->u.query_variable_info.remain_store_size, + ^ +./runtime.c:648:13: error: passing 4-byte aligned argument to 8-byte aligned parameter 4 of 'QueryVariableInfo' may result in an unaligned pointer access [-Werror,-Walign-mismatch] + &op->u.query_variable_info.max_size); + ^ +Fix this by bouncing the variables on the stack in order for them to +be 8 byte aligned. + +Note this could be done in a more selective manner to only apply to +compat code calls, but given the overhead of making an EFI call doing +an extra copy of 3 variables doesn't seem to warrant the special +casing. + +Signed-off-by: Roger Pau Monné +Release-Acked-by: Ian Jackson +Reviewed-by: Ian Jackson +Signed-off-by: Ian Jackson +Reviewed-by: Jan Beulich + +--- +Changes since v3: + - Remove hard tabs. Apply Jan's r-b as authorised in email. +Changes since v2: + - Adjust the commentary as per discussion. +Changes since v1: + - Copy back the results. +--- + xen/common/efi/runtime.c | 31 +++++++++++++++++++++++++++---- + 1 file changed, 27 insertions(+), 4 deletions(-) + +diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c +index 375b94229e..d2fdc28df3 100644 +--- a/xen/common/efi/runtime.c ++++ b/xen/common/efi/runtime.c +@@ -607,6 +607,9 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) + break; + + case XEN_EFI_query_variable_info: ++ { ++ uint64_t max_store_size, remain_store_size, max_size; ++ + if ( op->misc & ~XEN_EFI_VARINFO_BOOT_SNAPSHOT ) + return -EINVAL; + +@@ -638,16 +641,36 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) + + if ( !efi_enabled(EFI_RS) || (efi_rs->Hdr.Revision >> 16) < 2 ) + return -EOPNOTSUPP; ++ ++ /* ++ * Bounce the variables onto the stack to make them 8 byte aligned when ++ * called from the compat handler, as their placement in ++ * compat_pf_efi_runtime_call will make them 4 byte aligned instead and ++ * and compilers may validly complain. ++ * ++ * Note that while the function parameters are OUT only, copy the ++ * values here anyway just in case. This is done regardless of whether ++ * called from the compat handler or not, as it's not worth the extra ++ * logic to differentiate. ++ */ ++ max_store_size = op->u.query_variable_info.max_store_size; ++ remain_store_size = op->u.query_variable_info.remain_store_size; ++ max_size = op->u.query_variable_info.max_size; ++ + state = efi_rs_enter(); + if ( !state.cr3 ) + return -EOPNOTSUPP; + status = efi_rs->QueryVariableInfo( +- op->u.query_variable_info.attr, +- &op->u.query_variable_info.max_store_size, +- &op->u.query_variable_info.remain_store_size, +- &op->u.query_variable_info.max_size); ++ op->u.query_variable_info.attr, &max_store_size, &remain_store_size, ++ &max_size); + efi_rs_leave(&state); ++ ++ op->u.query_variable_info.max_store_size = max_store_size; ++ op->u.query_variable_info.remain_store_size = remain_store_size; ++ op->u.query_variable_info.max_size = max_size; ++ + break; ++ } + + case XEN_EFI_query_capsule_capabilities: + case XEN_EFI_update_capsule: +-- +2.33.0 +