From xen-changelog-bounces@lists.xenproject.org Mon May 01 22:11:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 01 May 2023 22:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.528307.821277 (Exim 4.92) (envelope-from ) id 1ptbjb-0007HU-JE; Mon, 01 May 2023 22:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 528307.821277; Mon, 01 May 2023 22:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ptbjb-0007HM-GJ; Mon, 01 May 2023 22:11:03 +0000 Received: by outflank-mailman (input) for mailman id 528307; Mon, 01 May 2023 22:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ptbja-0007Gx-2Q for xen-changelog@lists.xenproject.org; Mon, 01 May 2023 22:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ptbjZ-0004kW-Pa for xen-changelog@lists.xenproject.org; Mon, 01 May 2023 22:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ptbjZ-0005Dr-OK for xen-changelog@lists.xenproject.org; Mon, 01 May 2023 22:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IlCkwRXTUfubsSOBxqNI0gfeuWJrtkQS8Vb1wK5Z2oA=; b=57yeOG5uHSd/XccE70cgt1w22j u5ev3HEMUV70z6gKa6UiMfdRg8L0clpTHk+JqNWsrnfKHScRfO8A01C70x+Eq9Zd/TKRsBjSIooTE WgC1yhhs4QLPexQp6S0BBPh+Xh9jT2fIVwEr+0q7I/CLSdTslESKINOPXe5B2+cZrhFQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: move test artifacts jobs to the top Message-Id: Date: Mon, 01 May 2023 22:11:01 +0000 commit c17473dcc554042afcacd92ba5c81f7bf229c7b2 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 1 00:42:22 2023 +0200 Commit: Andrew Cooper CommitDate: Mon May 1 10:57:13 2023 +0100 automation: move test artifacts jobs to the top Make them run earlier, so tests can start earlier in parallel to the build jobs. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper --- automation/gitlab-ci/build.yaml | 152 ++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d323c30a83..3f44902c44 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -236,6 +236,82 @@ variables: <<: *gcc +## Test artifacts common + +.test-jobs-artifact-common: + stage: build + except: !reference [.test-jobs-common, except] + +# Arm test artifacts + +alpine-3.12-arm64-rootfs-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12-arm64v8 + script: + - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz + artifacts: + paths: + - binaries/initrd.tar.gz + tags: + - arm64 + +kernel-5.19-arm64-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 + script: + - mkdir binaries && cp /Image binaries/Image + artifacts: + paths: + - binaries/Image + tags: + - arm64 + +qemu-system-aarch64-6.0.0-arm64-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 + script: + - mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch64 + artifacts: + paths: + - binaries/qemu-system-aarch64 + tags: + - arm64 + +qemu-system-aarch64-6.0.0-arm32-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 + script: + - mkdir binaries && cp /qemu-system-arm binaries/qemu-system-arm + artifacts: + paths: + - binaries/qemu-system-arm + tags: + - arm64 + +# x86_64 test artifacts + +alpine-3.12-rootfs-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12 + script: + - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz + artifacts: + paths: + - binaries/initrd.tar.gz + tags: + - x86_64 + +kernel-6.1.19-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 + script: + - mkdir binaries && cp /bzImage binaries/bzImage + artifacts: + paths: + - binaries/bzImage + tags: + - x86_64 + # Jobs below this line archlinux-gcc: @@ -705,79 +781,3 @@ debian-unstable-gcc-arm64-cppcheck: CONTAINER: debian:unstable-cppcheck CPPCHECK: y HYPERVISOR_ONLY: y - -## Test artifacts common - -.test-jobs-artifact-common: - stage: build - except: !reference [.test-jobs-common, except] - -# Arm test artifacts - -alpine-3.12-arm64-rootfs-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12-arm64v8 - script: - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - artifacts: - paths: - - binaries/initrd.tar.gz - tags: - - arm64 - -kernel-5.19-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - -qemu-system-aarch64-6.0.0-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 - script: - - mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch64 - artifacts: - paths: - - binaries/qemu-system-aarch64 - tags: - - arm64 - -qemu-system-aarch64-6.0.0-arm32-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 - script: - - mkdir binaries && cp /qemu-system-arm binaries/qemu-system-arm - artifacts: - paths: - - binaries/qemu-system-arm - tags: - - arm64 - -# x86_64 test artifacts - -alpine-3.12-rootfs-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12 - script: - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - artifacts: - paths: - - binaries/initrd.tar.gz - tags: - - x86_64 - -kernel-6.1.19-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 - script: - - mkdir binaries && cp /bzImage binaries/bzImage - artifacts: - paths: - - binaries/bzImage - tags: - - x86_64 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 01 22:11:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 01 May 2023 22:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.528308.821280 (Exim 4.92) (envelope-from ) id 1ptbjl-0007KV-Kk; Mon, 01 May 2023 22:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 528308.821280; Mon, 01 May 2023 22:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ptbjl-0007KO-Hy; Mon, 01 May 2023 22:11:13 +0000 Received: by outflank-mailman (input) for mailman id 528308; Mon, 01 May 2023 22:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ptbjj-0007K1-Ul for xen-changelog@lists.xenproject.org; Mon, 01 May 2023 22:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ptbjj-0004ka-Tu for xen-changelog@lists.xenproject.org; Mon, 01 May 2023 22:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ptbjj-0005EP-S4 for xen-changelog@lists.xenproject.org; Mon, 01 May 2023 22:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=k/ymMtIyj6Bb2cQ5rREp2nGaCwVsBxOijgGJiiTE8io=; b=uF8AOr3d8JY/ba/XoVahRhw17g qQXfvsEUJGQ328yWgjGVXpRE9VxnQsQvkBUQaYNpInhdGp3l+3Y+kgRleR4wk2dWtB5S4Tywdgmj8 JgH5tSMZOedJcBGNEbXCuzcdt1w45zziqqzWvUZJ6tTsEGI1EP+mKtZgaTRUgc1TA01g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: optimize build jobs order Message-Id: Date: Mon, 01 May 2023 22:11:11 +0000 commit ef841d2a2377f5297add27e637b725426bb4840a Author: Marek Marczykowski-Górecki AuthorDate: Mon May 1 00:42:23 2023 +0200 Commit: Andrew Cooper CommitDate: Mon May 1 10:57:13 2023 +0100 automation: optimize build jobs order Put jobs that are needed for (any) test earlier, so the tests can start running in parallel to builds. This commits splits only x86 build jobs into two sections (one on top and one on bottom), but keep ARM build jobs in one section, as most of them have some test connected and the few that do not are not worth reducing readability of the file. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper --- automation/gitlab-ci/build.yaml | 462 ++++++++++++++++++++-------------------- 1 file changed, 233 insertions(+), 229 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 3f44902c44..420ffa5acb 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -314,252 +314,28 @@ kernel-6.1.19-export: # Jobs below this line -archlinux-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: archlinux:current +# Build jobs needed for tests -archlinux-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: archlinux:current - -centos-7-gcc: +alpine-3.12-gcc: extends: .gcc-x86-64-build variables: - CONTAINER: centos:7 + CONTAINER: alpine:3.12 -centos-7-gcc-debug: +alpine-3.12-gcc-debug: extends: .gcc-x86-64-build-debug variables: - CONTAINER: centos:7 - -debian-stretch-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: debian:stretch - -debian-stretch-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: debian:stretch - -debian-stretch-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: debian:stretch + CONTAINER: alpine:3.12 debian-stretch-gcc-debug: extends: .gcc-x86-64-build-debug variables: CONTAINER: debian:stretch -debian-stretch-32-clang-debug: - extends: .clang-x86-32-build-debug - variables: - CONTAINER: debian:stretch-i386 - -debian-stretch-32-gcc-debug: - extends: .gcc-x86-32-build-debug - variables: - CONTAINER: debian:stretch-i386 - -debian-buster-gcc-ibt: - extends: .gcc-x86-64-build - variables: - CONTAINER: debian:buster-gcc-ibt - RANDCONFIG: y - EXTRA_FIXED_RANDCONFIG: | - CONFIG_XEN_IBT=y - -debian-unstable-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: debian:unstable - debian-unstable-clang-debug: extends: .clang-x86-64-build-debug variables: CONTAINER: debian:unstable -debian-unstable-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: debian:unstable - -debian-unstable-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: debian:unstable - -debian-unstable-gcc-randconfig: - extends: .gcc-x86-64-build - variables: - CONTAINER: debian:unstable - RANDCONFIG: y - -debian-unstable-gcc-debug-randconfig: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: debian:unstable - RANDCONFIG: y - -debian-unstable-32-clang-debug: - extends: .clang-x86-32-build-debug - variables: - CONTAINER: debian:unstable-i386 - -debian-unstable-32-gcc-debug: - extends: .gcc-x86-32-build-debug - variables: - CONTAINER: debian:unstable-i386 - -fedora-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: fedora:29 - -fedora-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: fedora:29 - -# Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5 - -ubuntu-trusty-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: ubuntu:trusty - -ubuntu-trusty-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: ubuntu:trusty - -ubuntu-xenial-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: ubuntu:xenial - -ubuntu-xenial-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: ubuntu:xenial - -ubuntu-xenial-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: ubuntu:xenial - -ubuntu-xenial-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: ubuntu:xenial - -ubuntu-bionic-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: ubuntu:bionic - -ubuntu-bionic-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: ubuntu:bionic - -ubuntu-bionic-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: ubuntu:bionic - -ubuntu-bionic-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: ubuntu:bionic - -ubuntu-focal-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: ubuntu:focal - -ubuntu-focal-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: ubuntu:focal - -ubuntu-focal-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: ubuntu:focal - -ubuntu-focal-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: ubuntu:focal - -opensuse-leap-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: suse:opensuse-leap - -opensuse-leap-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: suse:opensuse-leap - -opensuse-leap-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: suse:opensuse-leap - -opensuse-leap-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: suse:opensuse-leap - -opensuse-tumbleweed-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: suse:opensuse-tumbleweed - allow_failure: true - -opensuse-tumbleweed-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: suse:opensuse-tumbleweed - allow_failure: true - -opensuse-tumbleweed-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: suse:opensuse-tumbleweed - allow_failure: true - -opensuse-tumbleweed-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: suse:opensuse-tumbleweed - allow_failure: true - -alpine-3.12-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: alpine:3.12 - -alpine-3.12-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: alpine:3.12 - -alpine-3.12-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: alpine:3.12 - -alpine-3.12-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: alpine:3.12 - # Arm32 cross-build debian-unstable-gcc-arm32: @@ -781,3 +557,231 @@ debian-unstable-gcc-arm64-cppcheck: CONTAINER: debian:unstable-cppcheck CPPCHECK: y HYPERVISOR_ONLY: y + +# Build jobs not needed for tests + +alpine-3.12-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: alpine:3.12 + +alpine-3.12-clang-debug: + extends: .clang-x86-64-build-debug + variables: + CONTAINER: alpine:3.12 + +archlinux-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: archlinux:current + +archlinux-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: archlinux:current + +centos-7-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: centos:7 + +centos-7-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: centos:7 + +debian-stretch-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: debian:stretch + +debian-stretch-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: debian:stretch + +debian-stretch-clang-debug: + extends: .clang-x86-64-build-debug + variables: + CONTAINER: debian:stretch + +debian-stretch-32-clang-debug: + extends: .clang-x86-32-build-debug + variables: + CONTAINER: debian:stretch-i386 + +debian-stretch-32-gcc-debug: + extends: .gcc-x86-32-build-debug + variables: + CONTAINER: debian:stretch-i386 + +debian-buster-gcc-ibt: + extends: .gcc-x86-64-build + variables: + CONTAINER: debian:buster-gcc-ibt + RANDCONFIG: y + EXTRA_FIXED_RANDCONFIG: | + CONFIG_XEN_IBT=y + +debian-unstable-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: debian:unstable + +debian-unstable-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: debian:unstable + +debian-unstable-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: debian:unstable + +debian-unstable-gcc-randconfig: + extends: .gcc-x86-64-build + variables: + CONTAINER: debian:unstable + RANDCONFIG: y + +debian-unstable-gcc-debug-randconfig: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: debian:unstable + RANDCONFIG: y + +debian-unstable-32-clang-debug: + extends: .clang-x86-32-build-debug + variables: + CONTAINER: debian:unstable-i386 + +debian-unstable-32-gcc-debug: + extends: .gcc-x86-32-build-debug + variables: + CONTAINER: debian:unstable-i386 + +fedora-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: fedora:29 + +fedora-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: fedora:29 + +# Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5 + +ubuntu-trusty-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: ubuntu:trusty + +ubuntu-trusty-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: ubuntu:trusty + +ubuntu-xenial-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: ubuntu:xenial + +ubuntu-xenial-clang-debug: + extends: .clang-x86-64-build-debug + variables: + CONTAINER: ubuntu:xenial + +ubuntu-xenial-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: ubuntu:xenial + +ubuntu-xenial-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: ubuntu:xenial + +ubuntu-bionic-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: ubuntu:bionic + +ubuntu-bionic-clang-debug: + extends: .clang-x86-64-build-debug + variables: + CONTAINER: ubuntu:bionic + +ubuntu-bionic-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: ubuntu:bionic + +ubuntu-bionic-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: ubuntu:bionic + +ubuntu-focal-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: ubuntu:focal + +ubuntu-focal-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: ubuntu:focal + +ubuntu-focal-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: ubuntu:focal + +ubuntu-focal-clang-debug: + extends: .clang-x86-64-build-debug + variables: + CONTAINER: ubuntu:focal + +opensuse-leap-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: suse:opensuse-leap + +opensuse-leap-clang-debug: + extends: .clang-x86-64-build-debug + variables: + CONTAINER: suse:opensuse-leap + +opensuse-leap-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: suse:opensuse-leap + +opensuse-leap-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: suse:opensuse-leap + +opensuse-tumbleweed-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: suse:opensuse-tumbleweed + allow_failure: true + +opensuse-tumbleweed-clang-debug: + extends: .clang-x86-64-build-debug + variables: + CONTAINER: suse:opensuse-tumbleweed + allow_failure: true + +opensuse-tumbleweed-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: suse:opensuse-tumbleweed + allow_failure: true + +opensuse-tumbleweed-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: suse:opensuse-tumbleweed + allow_failure: true -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 03 00:11:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 May 2023 00:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.528930.822715 (Exim 4.92) (envelope-from ) id 1pu05I-0004Mx-8P; Wed, 03 May 2023 00:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 528930.822715; Wed, 03 May 2023 00:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05I-0004Mo-5D; Wed, 03 May 2023 00:11:04 +0000 Received: by outflank-mailman (input) for mailman id 528930; Wed, 03 May 2023 00:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05G-0004Mi-PN for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05G-0004YN-GK for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pu05G-0001Xe-Ez for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Orryzy1bLdK0yg30jpQ4RQVtZhl6AHaqe82dPMKuyUU=; b=OHgXNtT+ej6MObdQj/Kixe9IKV 7QxwRbbWq6XpEtLDB7K1pRACOPQdlocncf5gNs61I+WAF54iyyqQSjUJzQUMfeptoLdzHoI4YcnBP KH1L9kgFsl8kwf/GPOC3gleFW52k+Z6nkkJ2tNyjpxNDuVpDWRCuwq+UcD9wBte/hOaI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: drop log-dirty-enable's log_global parameter Message-Id: Date: Wed, 03 May 2023 00:11:02 +0000 commit 82417e0fd8da27efb403c82ac22811f53123c5fd Author: Jan Beulich AuthorDate: Tue May 2 12:03:18 2023 +0200 Commit: Jan Beulich CommitDate: Tue May 2 12:03:18 2023 +0200 x86/mm: drop log-dirty-enable's log_global parameter As of XSA-397 the only caller passes true for it. Simplify things by getting rid of the parameter for both the internal paging function and the involved hook. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/domain.h | 2 +- xen/arch/x86/mm/hap/hap.c | 22 ++++++++++------------ xen/arch/x86/mm/paging.c | 8 ++++---- xen/arch/x86/mm/shadow/common.c | 4 ++-- xen/arch/x86/mm/shadow/none.c | 12 +++--------- 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index ad5729d5c2..c2d9fc333b 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -186,7 +186,7 @@ struct log_dirty_domain { /* functions which are paging mode specific */ const struct log_dirty_ops { - int (*enable )(struct domain *d, bool log_global); + int (*enable )(struct domain *d); int (*disable )(struct domain *d); void (*clean )(struct domain *d); } *ops; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index de1b8189d9..d05f1b7a95 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -164,10 +164,10 @@ out: /* * hap code to call when log_dirty is enable. return 0 if no problem found. * - * NB: Domain that having device assigned should not set log_global. Because + * NB: Domains having a device assigned should not come here, because * there is no way to track the memory updating from device. */ -static int cf_check hap_enable_log_dirty(struct domain *d, bool log_global) +static int cf_check hap_enable_log_dirty(struct domain *d) { struct p2m_domain *p2m = p2m_get_hostp2m(d); @@ -175,7 +175,7 @@ static int cf_check hap_enable_log_dirty(struct domain *d, bool log_global) * Refuse to turn on global log-dirty mode if * there are outstanding p2m_ioreq_server pages. */ - if ( log_global && read_atomic(&p2m->ioreq.entry_count) ) + if ( read_atomic(&p2m->ioreq.entry_count) ) return -EBUSY; /* turn on PG_log_dirty bit in paging mode */ @@ -186,15 +186,13 @@ static int cf_check hap_enable_log_dirty(struct domain *d, bool log_global) /* Enable hardware-assisted log-dirty if it is supported. */ p2m_enable_hardware_log_dirty(d); - if ( log_global ) - { - /* - * Switch to log dirty mode, either by setting l1e entries of P2M table - * to be read-only, or via hardware-assisted log-dirty. - */ - p2m_change_entry_type_global(d, p2m_ram_rw, p2m_ram_logdirty); - guest_flush_tlb_mask(d, d->dirty_cpumask); - } + /* + * Switch to log dirty mode, either by setting l1e entries of P2M table + * to be read-only, or via hardware-assisted log-dirty. + */ + p2m_change_entry_type_global(d, p2m_ram_rw, p2m_ram_logdirty); + guest_flush_tlb_mask(d, d->dirty_cpumask); + return 0; } diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 9ec305730a..b1d6bfe10e 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -201,11 +201,11 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) return rc; } -static int paging_log_dirty_enable(struct domain *d, bool log_global) +static int paging_log_dirty_enable(struct domain *d) { int ret; - if ( has_arch_pdevs(d) && log_global ) + if ( has_arch_pdevs(d) ) { /* * Refuse to turn on global log-dirty mode @@ -218,7 +218,7 @@ static int paging_log_dirty_enable(struct domain *d, bool log_global) return -EINVAL; domain_pause(d); - ret = d->arch.paging.log_dirty.ops->enable(d, log_global); + ret = d->arch.paging.log_dirty.ops->enable(d); domain_unpause(d); return ret; @@ -728,7 +728,7 @@ int paging_domctl(struct domain *d, struct xen_domctl_shadow_op *sc, break; /* Else fall through... */ case XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY: - return paging_log_dirty_enable(d, true); + return paging_log_dirty_enable(d); case XEN_DOMCTL_SHADOW_OP_OFF: if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 6d84ff3d99..e522267325 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -67,7 +67,7 @@ const uint8_t sh_type_to_size[] = { DEFINE_PER_CPU(uint32_t,trace_shadow_path_flags); -static int cf_check sh_enable_log_dirty(struct domain *, bool log_global); +static int cf_check sh_enable_log_dirty(struct domain *); static int cf_check sh_disable_log_dirty(struct domain *); static void cf_check sh_clean_dirty_bitmap(struct domain *); @@ -3030,7 +3030,7 @@ static int shadow_test_disable(struct domain *d) /* Shadow specific code which is called in paging_log_dirty_enable(). * Return 0 if no problem found. */ -static int cf_check sh_enable_log_dirty(struct domain *d, bool log_global) +static int cf_check sh_enable_log_dirty(struct domain *d) { int ret; diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index f28fb76a9b..c462639eab 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -1,13 +1,7 @@ #include #include -static int cf_check _enable_log_dirty(struct domain *d, bool log_global) -{ - ASSERT(is_pv_domain(d)); - return -EOPNOTSUPP; -} - -static int cf_check _disable_log_dirty(struct domain *d) +static int cf_check _toggle_log_dirty(struct domain *d) { ASSERT(is_pv_domain(d)); return -EOPNOTSUPP; @@ -27,8 +21,8 @@ int shadow_domain_init(struct domain *d) { /* For HVM set up pointers for safety, then fail. */ static const struct log_dirty_ops sh_none_ops = { - .enable = _enable_log_dirty, - .disable = _disable_log_dirty, + .enable = _toggle_log_dirty, + .disable = _toggle_log_dirty, .clean = _clean_dirty_bitmap, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 03 00:11:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 May 2023 00:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.528931.822719 (Exim 4.92) (envelope-from ) id 1pu05R-0004Oc-9j; Wed, 03 May 2023 00:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 528931.822719; Wed, 03 May 2023 00:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05R-0004OS-6n; Wed, 03 May 2023 00:11:13 +0000 Received: by outflank-mailman (input) for mailman id 528931; Wed, 03 May 2023 00:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05Q-0004OK-Kk for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05Q-0004Z7-Ji for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pu05Q-0001Y5-Ip for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8S3sbhPrchJvhnFmN/foFPKIhhFXw9JdhrKQvYhvJNg=; b=s9XXPUHfQwNBjaZSCIuvXz08ZJ NW7Tt9kgHJOmRNYPpZRmB1ESs6Qcmz2noJm28xXoR+RyZ/4tX/4RyNMyCqZ8VaqcQwf4THFMh/ffc XrKqTdhRVqZS9zTYHae4qJqhT1Ig7gfYi50qcsDGGjWOwIEozEfvRs3mpObC1fl4DifY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: update two license headers Message-Id: Date: Wed, 03 May 2023 00:11:12 +0000 commit 60b18e55c2ad0e0c840422b25b155a1544542907 Author: Ayan Kumar Halder AuthorDate: Tue May 2 12:04:14 2023 +0200 Commit: Jan Beulich CommitDate: Tue May 2 12:04:14 2023 +0200 xen/riscv: update two license headers Updated the license header in a separate comment of its own. Signed-off-by: Ayan Kumar Halder Reviewed-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/csr.h | 3 +-- xen/arch/riscv/include/asm/riscv_encoding.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/riscv/include/asm/csr.h b/xen/arch/riscv/include/asm/csr.h index 8215562343..be57dcce1c 100644 --- a/xen/arch/riscv/include/asm/csr.h +++ b/xen/arch/riscv/include/asm/csr.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* - * SPDX-License-Identifier: GPL-2.0-only - * * Copyright (C) 2015 Regents of the University of California */ diff --git a/xen/arch/riscv/include/asm/riscv_encoding.h b/xen/arch/riscv/include/asm/riscv_encoding.h index 43dd4f6981..58abe5eccc 100644 --- a/xen/arch/riscv/include/asm/riscv_encoding.h +++ b/xen/arch/riscv/include/asm/riscv_encoding.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2019 Western Digital Corporation or its affiliates. * * Authors: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 03 00:11:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 May 2023 00:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.528932.822723 (Exim 4.92) (envelope-from ) id 1pu05b-0004RU-B0; Wed, 03 May 2023 00:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 528932.822723; Wed, 03 May 2023 00:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05b-0004RM-8J; Wed, 03 May 2023 00:11:23 +0000 Received: by outflank-mailman (input) for mailman id 528932; Wed, 03 May 2023 00:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05a-0004RE-O0 for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu05a-0004Zx-NE for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pu05a-0001Yd-MB for xen-changelog@lists.xenproject.org; Wed, 03 May 2023 00:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UqHvlzfaLjC9eg8Xw78NBstzPnU3bm80/0VYjADnUls=; b=sK+YHHL9tw1qULKOYAc2av3I+S bnKC5k3THVPv8UKHMsMLSKGz0DBUo9jK0xT7CSSTteimsa2hkrxC8MLhB2HTqu57FDGPPth3fO/qJ wirN04Sc/AxfBnOM7Xo9vAnzUSb/tt5nPDb57bXJx4lcvPjRHZ9URDb7PCIXWW0s/YII=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sysctl: fix XEN_SYSCTL_getdomaininfolist handling with XSM Message-Id: Date: Wed, 03 May 2023 00:11:22 +0000 commit b033eddc9779109c06a26936321d27a2ef4e088b Author: Juergen Gross AuthorDate: Tue May 2 12:04:58 2023 +0200 Commit: Jan Beulich CommitDate: Tue May 2 12:04:58 2023 +0200 xen/sysctl: fix XEN_SYSCTL_getdomaininfolist handling with XSM In case XSM is active, the handling of XEN_SYSCTL_getdomaininfolist can fail if the last domain scanned isn't allowed to be accessed by the calling domain (i.e. xsm_getdomaininfo(XSM_HOOK, d) is failing). Fix that by just ignoring scanned domains where xsm_getdomaininfo() is returning an error, like it is effectively done when such a situation occurs for a domain not being the last one scanned. Fixes: d046f361dc93 ("Xen Security Modules: XSM") Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/common/sysctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 02505ab044..0cbfe8bd44 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -89,8 +89,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) if ( num_domains == op->u.getdomaininfolist.max_domains ) break; - ret = xsm_getdomaininfo(XSM_HOOK, d); - if ( ret ) + if ( xsm_getdomaininfo(XSM_HOOK, d) ) continue; getdomaininfo(d, &info); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:22:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530026.825213 (Exim 4.92) (envelope-from ) id 1pueWh-0003ae-BP; Thu, 04 May 2023 19:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530026.825213; Thu, 04 May 2023 19:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueWh-0003aW-8K; Thu, 04 May 2023 19:22:03 +0000 Received: by outflank-mailman (input) for mailman id 530026; Thu, 04 May 2023 19:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueWf-0003aP-MT for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueWf-0007FY-Lb for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueWf-0005Pu-KY for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/AM6BOqcSifE6FHbhNGYhK4vZEwqtwRS5MsLYeaAz0I=; b=N8cTklUzql7zV3yOLkNoHQi+xp Zi3bhtrpLNj2awIqRGiPulW5IsNpiXmCexYWgixST4Y41hrBWAK/WJo9EI4sXgutItyhMDVnrdX6d fjrJGH+SxJdQTUJexf8op7YKiz4K2mrKLRuiSMyOzgz9R8qgT2jY8i/davjYDBgSbXSs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: allow generic virtio device types to contain device-id Message-Id: Date: Thu, 04 May 2023 19:22:01 +0000 commit f8135d234a90777b4b6606a241605fb75f239530 Author: Viresh Kumar AuthorDate: Wed May 3 13:35:40 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 3 13:35:40 2023 +0200 docs: allow generic virtio device types to contain device-id For generic virtio devices, where we don't need to add compatible or other special DT properties, the type field is set to "virtio,device". But this misses the case where the user sets the type with a valid virtio device id as well, like "virtio,device1a" for file system device. The complete list of virtio device ids is mentioned here: https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-2160005 Update documentation to support that as well. Fixes: dd54ea500be8 ("docs: add documentation for generic virtio devices") Signed-off-by: Viresh Kumar Reviewed-by: Oleksandr Tyshchenko --- docs/man/xl.cfg.5.pod.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 10f37990be..24ac927182 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -1608,8 +1608,11 @@ present here: L -For generic virtio devices, where we don't need to set special or compatible -properties in the Device Tree, the type field must be set to "virtio,device". +For other generic virtio devices, where we don't need to set special or +compatible properties in the Device Tree, the type field must be set to +"virtio,device" or "virtio,device", where "N" is the virtio device id in +hexadecimal format, without the "0x" prefix and all in lower case, like +"virtio,device1a" for the file system device. =item B -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530027.825217 (Exim 4.92) (envelope-from ) id 1pueWr-0003cU-Ch; Thu, 04 May 2023 19:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530027.825217; Thu, 04 May 2023 19:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueWr-0003cK-9t; Thu, 04 May 2023 19:22:13 +0000 Received: by outflank-mailman (input) for mailman id 530027; Thu, 04 May 2023 19:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueWp-0003cA-QG for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueWp-0007Ft-PM for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueWp-0005QV-OQ for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5fLlx35KndYd9by1xZpZpPcsW0aHMxIl/Ea8GMRl4jw=; b=Pd9We96xfXkCXLiUdwUNzAoYHC r/dgMjBQcj3iSwzaeTsfms6OuNVhc/Ve0BxoGWApD8GAbxEGhaZV4R3wIPIkZFBl3qjsKVLnK/Xet bZPMS9PVSPhTPof2+LqtgMQTHRXM13uoS9FmMm9ulwhweb/uQNferGht9QaHURXq1mAc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/vcpu: ignore VCPU_SSHOTTMR_future Message-Id: Date: Thu, 04 May 2023 19:22:11 +0000 commit 19c6cbd90965b1440bd551069373d6fa3f2f365d Author: Roger Pau Monné AuthorDate: Wed May 3 13:36:05 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 3 13:36:05 2023 +0200 xen/vcpu: ignore VCPU_SSHOTTMR_future The usage of VCPU_SSHOTTMR_future in Linux prior to 4.7 is bogus. When the hypervisor returns -ETIME (timeout in the past) Linux keeps retrying to setup the timer with a higher timeout instead of self-injecting a timer interrupt. On boxes without any hardware assistance for logdirty we have seen HVM Linux guests < 4.7 with 32vCPUs give up trying to setup the timer when logdirty is enabled: CE: Reprogramming failure. Giving up CE: xen increased min_delta_ns to 1000000 nsec CE: Reprogramming failure. Giving up CE: Reprogramming failure. Giving up CE: xen increased min_delta_ns to 506250 nsec CE: xen increased min_delta_ns to 759375 nsec CE: xen increased min_delta_ns to 1000000 nsec CE: Reprogramming failure. Giving up CE: Reprogramming failure. Giving up CE: Reprogramming failure. Giving up Freezing user space processes ... INFO: rcu_sched detected stalls on CPUs/tasks: { 14} (detected by 10, t=60002 jiffies, g=4006, c=4005, q=14130) Task dump for CPU 14: swapper/14 R running task 0 0 1 0x00000000 Call Trace: [] ? rcu_eqs_enter_common.isra.30+0x3d/0xf0 [] ? default_idle+0x1e/0xd0 [] ? arch_cpu_idle+0x20/0xc0 [] ? cpu_startup_entry+0x14a/0x1e0 [] ? start_secondary+0x1f7/0x270 [] ? start_cpu+0x5/0x14 INFO: rcu_sched detected stalls on CPUs/tasks: { 26} (detected by 24, t=60002 jiffies, g=6922, c=6921, q=7013) Task dump for CPU 26: swapper/26 R running task 0 0 1 0x00000000 Call Trace: [] ? rcu_eqs_enter_common.isra.30+0x3d/0xf0 [] ? default_idle+0x1e/0xd0 [] ? arch_cpu_idle+0x20/0xc0 [] ? cpu_startup_entry+0x14a/0x1e0 [] ? start_secondary+0x1f7/0x270 [] ? start_cpu+0x5/0x14 INFO: rcu_sched detected stalls on CPUs/tasks: { 26} (detected by 24, t=60002 jiffies, g=8499, c=8498, q=7664) Task dump for CPU 26: swapper/26 R running task 0 0 1 0x00000000 Call Trace: [] ? rcu_eqs_enter_common.isra.30+0x3d/0xf0 [] ? default_idle+0x1e/0xd0 [] ? arch_cpu_idle+0x20/0xc0 [] ? cpu_startup_entry+0x14a/0x1e0 [] ? start_secondary+0x1f7/0x270 [] ? start_cpu+0x5/0x14 Thus leading to CPU stalls and a broken system as a result. Workaround this bogus usage by ignoring the VCPU_SSHOTTMR_future in the hypervisor. Old Linux versions are the only ones known to have (wrongly) attempted to use the flag, and ignoring it is compatible with the behavior expected by any guests setting that flag. Note the usage of the flag has been removed from Linux by commit: c06b6d70feb3 xen/x86: don't lose event interrupts Which landed in Linux 4.7. Signed-off-by: Roger Pau Monné Acked-by: Henry Wang # CHANGELOG Acked-by: Jan Beulich --- CHANGELOG.md | 2 ++ xen/common/domain.c | 13 ++++++++++--- xen/include/public/vcpu.h | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dbf8b06d7..5bfd3aa5c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Changed - Repurpose command line gnttab_max_{maptrack_,}frames options so they don't cap toolstack provided values. + - Ignore VCPUOP_set_singleshot_timer's VCPU_SSHOTTMR_future flag. The only + known user doesn't use it properly, leading to in-guest breakage. ### Added - On x86, support for features new in Intel Sapphire Rapids CPUs: diff --git a/xen/common/domain.c b/xen/common/domain.c index 626debbae0..6a440590fe 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1762,9 +1762,16 @@ long common_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&set, arg, 1) ) return -EFAULT; - if ( (set.flags & VCPU_SSHOTTMR_future) && - (set.timeout_abs_ns < NOW()) ) - return -ETIME; + if ( set.timeout_abs_ns < NOW() ) + { + /* + * Simplify the logic if the timeout has already expired and just + * inject the event. + */ + stop_timer(&v->singleshot_timer); + send_timer_event(v); + break; + } migrate_timer(&v->singleshot_timer, smp_processor_id()); set_timer(&v->singleshot_timer, set.timeout_abs_ns); diff --git a/xen/include/public/vcpu.h b/xen/include/public/vcpu.h index 81a3b3a743..a836b264a9 100644 --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -150,7 +150,10 @@ typedef struct vcpu_set_singleshot_timer vcpu_set_singleshot_timer_t; DEFINE_XEN_GUEST_HANDLE(vcpu_set_singleshot_timer_t); /* Flags to VCPUOP_set_singleshot_timer. */ - /* Require the timeout to be in the future (return -ETIME if it's passed). */ + /* + * Request the timeout to be in the future (return -ETIME if it's passed) + * but can be ignored by the hypervisor. + */ #define _VCPU_SSHOTTMR_future (0) #define VCPU_SSHOTTMR_future (1U << _VCPU_SSHOTTMR_future) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:22:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530028.825221 (Exim 4.92) (envelope-from ) id 1pueX1-0003ff-E9; Thu, 04 May 2023 19:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530028.825221; Thu, 04 May 2023 19:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueX1-0003fX-BO; Thu, 04 May 2023 19:22:23 +0000 Received: by outflank-mailman (input) for mailman id 530028; Thu, 04 May 2023 19:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueWz-0003fA-TY for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueWz-0007G2-Sk for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueWz-0005R9-Rj for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jmyemzwr6ZzT4uuuO3ve3PXvmTmKh5hDi+CaCv2u8CU=; b=kbWnX1rz2aFPwpyeg7U85Aexk8 nPX6w4g5lRb3rKfGWDe+k+OrxLz6J5MJn6c9tSEDp2X8PSJt6D0O65RzzbhYXZS4S1mXq5z/KXSLW Fty/xtf91pmYSa2Bn/a6DE9UYYzYeOoF6tuyFGAEvXF9eLosjsyTBYwhmVkoUfQwBTuU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/head: check base address alignment Message-Id: Date: Thu, 04 May 2023 19:22:21 +0000 commit 0946068e7faea22868c577d7afa54ba4970ff520 Author: Roger Pau Monné AuthorDate: Wed May 3 13:36:25 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 3 13:36:25 2023 +0200 x86/head: check base address alignment Ensure that the base address is 2M aligned, or else the page table entries created would be corrupt as reserved bits on the PDE end up set. We have encountered a broken firmware where grub2 would end up loading Xen at a non 2M aligned region when using the multiboot2 protocol, and that caused a very difficult to debug triple fault. If the alignment is not as required by the page tables print an error message and stop the boot. Also add a build time check that the calculation of symbol offsets don't break alignment of passed addresses. The check could be performed earlier, but so far the alignment is required by the page tables, and hence feels more natural that the check lives near to the piece of code that requires it. Note that when booted as an EFI application from the PE entry point the alignment check is already performed by efi_arch_load_addr_check(), and hence there's no need to add another check at the point where page tables get built in efi_arch_memory_setup(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/boot/head.S | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 0fb7dd3029..09bebf8635 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -1,3 +1,4 @@ +#include #include #include #include @@ -121,6 +122,7 @@ multiboot2_header: .Lbad_ldr_nst: .asciz "ERR: EFI SystemTable is not provided by bootloader!" .Lbad_ldr_nih: .asciz "ERR: EFI ImageHandle is not provided by bootloader!" .Lbad_efi_msg: .asciz "ERR: EFI IA-32 platforms are not supported!" +.Lbag_alg_msg: .asciz "ERR: Xen must be loaded at a 2Mb boundary!" .section .init.data, "aw", @progbits .align 4 @@ -146,6 +148,9 @@ bad_cpu: not_multiboot: add $sym_offs(.Lbad_ldr_msg),%esi # Error message jmp .Lget_vtb +.Lnot_aligned: + add $sym_offs(.Lbag_alg_msg),%esi # Error message + jmp .Lget_vtb .Lmb2_no_st: /* * Here we are on EFI platform. vga_text_buffer was zapped earlier @@ -670,6 +675,15 @@ trampoline_setup: cmp %edi, %eax jb 1b + .if !IS_ALIGNED(sym_offs(0), 1 << L2_PAGETABLE_SHIFT) + .error "Symbol offset calculation breaks alignment" + .endif + + /* Check that the image base is aligned. */ + lea sym_esi(_start), %eax + test $(1 << L2_PAGETABLE_SHIFT) - 1, %eax + jnz .Lnot_aligned + /* Map Xen into the higher mappings using 2M superpages. */ lea _PAGE_PSE + PAGE_HYPERVISOR_RWX + sym_esi(_start), %eax mov $sym_offs(_start), %ecx /* %eax = PTE to write ^ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:22:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530029.825226 (Exim 4.92) (envelope-from ) id 1pueXB-0003is-Fx; Thu, 04 May 2023 19:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530029.825226; Thu, 04 May 2023 19:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXB-0003ij-Cq; Thu, 04 May 2023 19:22:33 +0000 Received: by outflank-mailman (input) for mailman id 530029; Thu, 04 May 2023 19:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXA-0003iU-0s for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXA-0007GT-03 for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueX9-0005RY-VA for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=G9ULcBnAKmgz3Hld2WiIwWHVHjNzNUv6fJfeFnvgcbM=; b=DaIKAr5zOif3EkXy6pI+gcd+4N GJBmYt94kPZQD3i5mGk6eCAwmtyjvsCmAgq8tIXAHA/pHsLX77d9tmf2p31fRFMd40E18bJaWzu/d x6S+N0QSjTx6ld9z9qb+y96tmSqW3Nsf1n1orSpOM1KCEDPWESUhrsDfgt/enBhhidzs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/trampoline: load the GDT located in the trampoline page Message-Id: Date: Thu, 04 May 2023 19:22:31 +0000 commit eaa324bfebcf17333d993b74024901701e0e2162 Author: Roger Pau Monné AuthorDate: Wed May 3 13:37:19 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 3 13:37:19 2023 +0200 x86/trampoline: load the GDT located in the trampoline page When booting the BSP the portion of the code executed from the trampoline page will be using the GDT located in the hypervisor .text.head section rather than the GDT located in the relocated trampoline page. If skip_realmode is not set the GDT located in the trampoline page will be loaded after having executed the BIOS call, otherwise the GDT from .text.head will be used for all the protected mode trampoline code execution. Note that both gdt_boot_descr and gdt_48 contain the same entries, but the former is located inside the hypervisor .text section, while the later lives in the relocated trampoline page. This is not harmful as-is, as both GDTs contain the same entries, but for consistency with the APs switch the BSP trampoline code to also use the GDT on the relocated trampoline page. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/boot/trampoline.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index cdecf949b4..c6005fa33d 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -164,6 +164,9 @@ GLOBAL(trampoline_cpu_started) .code32 trampoline_boot_cpu_entry: + /* Switch to relocated trampoline GDT. */ + lgdt bootsym_rel(gdt_48, 4) + cmpb $0,bootsym_rel(skip_realmode,5) jnz .Lskip_realmode -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:22:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530030.825229 (Exim 4.92) (envelope-from ) id 1pueXL-0003lW-H7; Thu, 04 May 2023 19:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530030.825229; Thu, 04 May 2023 19:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXL-0003lO-EJ; Thu, 04 May 2023 19:22:43 +0000 Received: by outflank-mailman (input) for mailman id 530030; Thu, 04 May 2023 19:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXK-0003lD-4R for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXK-0007Gc-3e for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueXK-0005Rz-2W for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=H6GLhUZu6GoQzqDZ3dzWTL11oy1BwPw+r1K1tG/l3z8=; b=UjGibrSNUZJ+1HM1d+LW2BDwPu oDb+mpH5TLSCcJVTqCqXOM6WS3s1Bnq0ozDdefdzNdX3nuxOqz//UMgTiuwODcH2pCAjsZovWZ3/e INSc/tJSY/2rxzdXkeUlrCncREKQL4MagEAh33F5z136GJh0lCeT+csZb6mAnU6k7Kxo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: replace bogus assertion in paging_log_dirty_op() Message-Id: Date: Thu, 04 May 2023 19:22:42 +0000 commit 0956aa2219745a198bb6a0a99e2108a3c09b280e Author: Jan Beulich AuthorDate: Wed May 3 13:38:30 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 3 13:38:30 2023 +0200 x86/mm: replace bogus assertion in paging_log_dirty_op() While I was the one to introduce it, I don't think it is correct: A bogus continuation call issued by a tool stack domain may find another continuation in progress. IOW we've been asserting caller controlled state (which is reachable only via a domctl), and the early (lock-less) check in paging_domctl() helps in a limited way only. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm/paging.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index b1d6bfe10e..34d833251b 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -431,8 +431,8 @@ static int paging_log_dirty_op(struct domain *d, d->arch.paging.preempt.op != sc->op ) { paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); + if ( !resuming ) + domain_unpause(d); return -EBUSY; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:22:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530031.825232 (Exim 4.92) (envelope-from ) id 1pueXV-0003oQ-IB; Thu, 04 May 2023 19:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530031.825232; Thu, 04 May 2023 19:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXV-0003oJ-Fh; Thu, 04 May 2023 19:22:53 +0000 Received: by outflank-mailman (input) for mailman id 530031; Thu, 04 May 2023 19:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXU-0003nw-92 for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXU-0007Gk-7U for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueXU-0005Sb-6E for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ck2oaS2ZSzEo1SguRm1+MKgzjFsX59FVha1Sn4rQ1bk=; b=JGQOqeCZGzwUFhsv0xl4IUD4F6 JqJsfEpdq6IAm20A+Tb+oNvja1QAsAaQKhSRaGC93sR7QowVagb8sNZLp1aiqS4W+ce9RqI1qcEsJ tNmFjdM0AlQQHsJr7JxoE1d1Ps5j8pN0ICtwwS/3udc5x/P95uzHXKdnbOVuFK2YOzD0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: fix matching of generic virtio device Message-Id: Date: Thu, 04 May 2023 19:22:52 +0000 commit 646d28cb2a93f0a0059e85f7ba883f57ac77a8cb Author: Viresh Kumar AuthorDate: Wed May 3 15:06:26 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 3 15:06:26 2023 +0200 libxl: fix matching of generic virtio device The strings won't be an exact match, as we are only looking to match the prefix here, i.e. "virtio,device". This is already done properly in libxl_virtio.c file, lets do the same here too. Fixes: 43ba5202e2ee ("libxl: add support for generic virtio device") Signed-off-by: Viresh Kumar Reviewed-by: Oleksandr Tyshchenko Acked-by: Anthony PERARD --- tools/libs/light/libxl_arm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index ddc7b2a159..97c80d7ed0 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -1033,10 +1033,14 @@ static int make_virtio_mmio_node_device(libxl__gc *gc, void *fdt, uint64_t base, } else if (!strcmp(type, VIRTIO_DEVICE_TYPE_GPIO)) { res = make_virtio_mmio_node_gpio(gc, fdt); if (res) return res; - } else if (strcmp(type, VIRTIO_DEVICE_TYPE_GENERIC)) { - /* Doesn't match generic virtio device */ - LOG(ERROR, "Invalid type for virtio device: %s", type); - return -EINVAL; + } else { + int len = sizeof(VIRTIO_DEVICE_TYPE_GENERIC) - 1; + + if (strncmp(type, VIRTIO_DEVICE_TYPE_GENERIC, len)) { + /* Doesn't match generic virtio device */ + LOG(ERROR, "Invalid type for virtio device: %s", type); + return -EINVAL; + } } return fdt_end_node(fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:23:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530032.825237 (Exim 4.92) (envelope-from ) id 1pueXf-0003qp-KT; Thu, 04 May 2023 19:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530032.825237; Thu, 04 May 2023 19:23:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXf-0003qi-HI; Thu, 04 May 2023 19:23:03 +0000 Received: by outflank-mailman (input) for mailman id 530032; Thu, 04 May 2023 19:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXe-0003qY-Bn for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXe-0007HA-Aw for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueXe-0005TF-A1 for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jzwg+Uhj2WVUtaYwRSKzE49JWqBR5B5yURhLAvNNAdE=; b=1eB1H2w+Nf09s5pD3gIDVxTrqq cALgYX68EjO0+vuA6ExwCqWkXqpftJo4G+ZTZkMRK+yd/aiUUOdHYKhCtCtaRkIvNhlsf3HAy4ZbS 8lBF30hOD7AkFf8JrhreQLbZsBZBvHnx8wkxhW4D9MUQ+PmXlsDOSIrmjMLEY1Ov3kVw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/guest: assist gcc13's realloc analyzer Message-Id: Date: Thu, 04 May 2023 19:23:02 +0000 commit 99a9c3d7141063ae3f357892c6181cfa3be8a280 Author: Olaf Hering AuthorDate: Wed May 3 15:06:41 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 3 15:06:41 2023 +0200 tools/libs/guest: assist gcc13's realloc analyzer gcc13 fails to track the allocated memory in backup_ptes: xg_offline_page.c: In function 'backup_ptes': xg_offline_page.c:191:13: error: pointer 'orig' may be used after 'realloc' [-Werror=use-after-free] 191 | free(orig); Assist the analyzer by slightly rearranging the code: In case realloc succeeds, the previous allocation is either extended or released internally. In case realloc fails, the previous allocation is left unchanged. Return an error in this case, the caller will release the currently allocated memory in its error path. http://bugzilla.suse.com/show_bug.cgi?id=1210570 Signed-off-by: Olaf Hering Reviewed-by: Juergen Gross Compile-tested-by: Jason Andryuk Acked-by: Jan Beulich --- tools/libs/guest/xg_offline_page.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/libs/guest/xg_offline_page.c b/tools/libs/guest/xg_offline_page.c index ccd0299f0f..8f0a252417 100644 --- a/tools/libs/guest/xg_offline_page.c +++ b/tools/libs/guest/xg_offline_page.c @@ -181,18 +181,14 @@ static int backup_ptes(xen_pfn_t table_mfn, int offset, if (backup->max == backup->cur) { - void *orig = backup->entries; + void *entries = realloc(backup->entries, backup->max * 2 * + sizeof(struct pte_backup_entry)); - backup->entries = realloc( - orig, backup->max * 2 * sizeof(struct pte_backup_entry)); - - if (backup->entries == NULL) - { - free(orig); + if (entries == NULL) return -1; - } - else - backup->max *= 2; + + backup->entries = entries; + backup->max *= 2; } backup->entries[backup->cur].table_mfn = table_mfn; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:23:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530033.825241 (Exim 4.92) (envelope-from ) id 1pueXp-0003tu-Nv; Thu, 04 May 2023 19:23:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530033.825241; Thu, 04 May 2023 19:23:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXp-0003tm-L7; Thu, 04 May 2023 19:23:13 +0000 Received: by outflank-mailman (input) for mailman id 530033; Thu, 04 May 2023 19:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXo-0003td-F3 for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXo-0007HH-EQ for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueXo-0005Tt-De for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mNTkOEv2Xp7EkVkZgIoF7SenHEYTHbL5d9cyhe5TQkY=; b=6IL0EvHRtA9x5wRFBbYKhjJMRF ksZzHM1jBqgdW2tu/D1Z8QBHUeoGgHNKc3G0yg7lbSxELhXcvidJWSwXeDS96mLsMOMVpRw25+Xb1 c+0XZ2UY0xH+ozdpMd/zSX0UAYzNM8lB6Q5Zbnx0TNOfA7uZY80cesIgJAA0spI9qi3w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenctrl: add xc_get_cpu_version() Message-Id: Date: Thu, 04 May 2023 19:23:12 +0000 commit f1e574fa6dea74517cb700fb072b52f9b49d984e Author: Sergey Dyasli AuthorDate: Mon Apr 17 14:53:33 2023 +0100 Commit: Andrew Cooper CommitDate: Wed May 3 18:36:46 2023 +0100 tools/xenctrl: add xc_get_cpu_version() As a wrapper for XENPF_get_cpu_version platform op. Signed-off-by: Sergey Dyasli Reviewed-by: Andrew Cooper --- tools/include/xenctrl.h | 1 + tools/libs/ctrl/xc_misc.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 752fc87580..a82d8bc73b 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -1215,6 +1215,7 @@ int xc_physinfo(xc_interface *xch, xc_physinfo_t *info); int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo); int xc_microcode_update(xc_interface *xch, const void *buf, size_t len); +int xc_get_cpu_version(xc_interface *xch, struct xenpf_pcpu_version *cpu_ver); int xc_numainfo(xc_interface *xch, unsigned *max_nodes, xc_meminfo_t *meminfo, uint32_t *distance); int xc_pcitopoinfo(xc_interface *xch, unsigned num_devs, diff --git a/tools/libs/ctrl/xc_misc.c b/tools/libs/ctrl/xc_misc.c index 265f15ec2d..90d50faa4f 100644 --- a/tools/libs/ctrl/xc_misc.c +++ b/tools/libs/ctrl/xc_misc.c @@ -226,6 +226,23 @@ int xc_microcode_update(xc_interface *xch, const void *buf, size_t len) return ret; } +int xc_get_cpu_version(xc_interface *xch, struct xenpf_pcpu_version *cpu_ver) +{ + int ret; + struct xen_platform_op op = { + .cmd = XENPF_get_cpu_version, + .u.pcpu_version.xen_cpuid = cpu_ver->xen_cpuid, + }; + + ret = do_platform_op(xch, &op); + if ( ret != 0 ) + return ret; + + *cpu_ver = op.u.pcpu_version; + + return 0; +} + int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:23:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:23:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530034.825245 (Exim 4.92) (envelope-from ) id 1pueY0-0003wi-Pg; Thu, 04 May 2023 19:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530034.825245; Thu, 04 May 2023 19:23:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueY0-0003wa-Mc; Thu, 04 May 2023 19:23:24 +0000 Received: by outflank-mailman (input) for mailman id 530034; Thu, 04 May 2023 19:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXy-0003wJ-PJ for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueXy-0007HV-IE for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueXy-0005UM-HF for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z7yEidkoVSAtBWjcqf1mvjTU1wMCEWUH+ESbIu7vhu4=; b=N7nxnq1+GBMWebKm47ybfbG26C 0dQnUtYPLD6k1SxjXofslV/DpbP+RT4+4PlJCFhmiSJwKYtUi3lNoAEqovEgImwqsgyyQ0hkVN7Mq 99lFho0V8BqeFGF3fiTDY86h2GpCa0YoU4y44/Zyih3SEtkpsW9fiq7tRzaZPXPJh6N4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/platform: introduce XENPF_get_ucode_revision Message-Id: Date: Thu, 04 May 2023 19:23:22 +0000 commit 161c37d020a7a958a10bc784dd7914308a5cc367 Author: Sergey Dyasli AuthorDate: Mon Apr 17 14:53:34 2023 +0100 Commit: Andrew Cooper CommitDate: Wed May 3 18:36:46 2023 +0100 x86/platform: introduce XENPF_get_ucode_revision Currently it's hard to get CPU's microcode revision from Xen after late loading without looking into Xen logs, which is not always convenient. Add a new platform op in order to get the required data from Xen and provide a wrapper for libxenctrl. Signed-off-by: Sergey Dyasli Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/include/xenctrl.h | 2 ++ tools/libs/ctrl/xc_misc.c | 18 ++++++++++++++++++ xen/arch/x86/platform_hypercall.c | 29 +++++++++++++++++++++++++++++ xen/arch/x86/x86_64/platform_hypercall.c | 4 ++++ xen/include/public/platform.h | 11 +++++++++++ xen/include/xlat.lst | 1 + 6 files changed, 65 insertions(+) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index a82d8bc73b..086314d28a 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -1216,6 +1216,8 @@ int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo); int xc_microcode_update(xc_interface *xch, const void *buf, size_t len); int xc_get_cpu_version(xc_interface *xch, struct xenpf_pcpu_version *cpu_ver); +int xc_get_ucode_revision(xc_interface *xch, + struct xenpf_ucode_revision *ucode_rev); int xc_numainfo(xc_interface *xch, unsigned *max_nodes, xc_meminfo_t *meminfo, uint32_t *distance); int xc_pcitopoinfo(xc_interface *xch, unsigned num_devs, diff --git a/tools/libs/ctrl/xc_misc.c b/tools/libs/ctrl/xc_misc.c index 90d50faa4f..4159294b2e 100644 --- a/tools/libs/ctrl/xc_misc.c +++ b/tools/libs/ctrl/xc_misc.c @@ -243,6 +243,24 @@ int xc_get_cpu_version(xc_interface *xch, struct xenpf_pcpu_version *cpu_ver) return 0; } +int xc_get_ucode_revision(xc_interface *xch, + struct xenpf_ucode_revision *ucode_rev) +{ + int ret; + struct xen_platform_op op = { + .cmd = XENPF_get_ucode_revision, + .u.ucode_revision.cpu = ucode_rev->cpu, + }; + + ret = do_platform_op(xch, &op); + if ( ret != 0 ) + return ret; + + *ucode_rev = op.u.ucode_revision; + + return 0; +} + int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo) { diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index a2d9526355..9ff2da8fc3 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -640,6 +640,35 @@ ret_t do_platform_op( } break; + case XENPF_get_ucode_revision: + { + struct xenpf_ucode_revision *rev = &op->u.ucode_revision; + + if ( !get_cpu_maps() ) + { + ret = -EBUSY; + break; + } + + /* TODO: make it possible to know ucode revisions for parked CPUs */ + if ( (rev->cpu >= nr_cpu_ids) || !cpu_online(rev->cpu) ) + ret = -ENOENT; + else + { + const struct cpu_signature *sig = &per_cpu(cpu_sig, rev->cpu); + + rev->signature = sig->sig; + rev->pf = sig->pf; + rev->revision = sig->rev; + } + + put_cpu_maps(); + + if ( __copy_field_to_guest(u_xenpf_op, op, u.ucode_revision) ) + ret = -EFAULT; + } + break; + case XENPF_cpu_online: { int cpu = op->u.cpu_ol.cpuid; diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index 5bf6b958d2..99440f4076 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -28,6 +28,10 @@ CHECK_pf_pcpuinfo; CHECK_pf_pcpu_version; #undef xen_pf_pcpu_version +#define xen_pf_ucode_revision xenpf_ucode_revision +CHECK_pf_ucode_revision; +#undef xen_pf_pucode_revision + #define xen_pf_enter_acpi_sleep xenpf_enter_acpi_sleep CHECK_pf_enter_acpi_sleep; #undef xen_pf_enter_acpi_sleep diff --git a/xen/include/public/platform.h b/xen/include/public/platform.h index 60caa5ce7e..15777b5416 100644 --- a/xen/include/public/platform.h +++ b/xen/include/public/platform.h @@ -614,6 +614,16 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_symdata_t); typedef struct dom0_vga_console_info xenpf_dom0_console_t; DEFINE_XEN_GUEST_HANDLE(xenpf_dom0_console_t); +#define XENPF_get_ucode_revision 65 +struct xenpf_ucode_revision { + uint32_t cpu; /* IN: CPU number to get the revision from. */ + uint32_t signature; /* OUT: CPU signature (CPUID.1.EAX). */ + uint32_t pf; /* OUT: Platform Flags (Intel only) */ + uint32_t revision; /* OUT: Microcode Revision. */ +}; +typedef struct xenpf_ucode_revision xenpf_ucode_revision_t; +DEFINE_XEN_GUEST_HANDLE(xenpf_ucode_revision_t); + /* * ` enum neg_errnoval * ` HYPERVISOR_platform_op(const struct xen_platform_op*); @@ -645,6 +655,7 @@ struct xen_platform_op { xenpf_resource_op_t resource_op; xenpf_symdata_t symdata; xenpf_dom0_console_t dom0_console; + xenpf_ucode_revision_t ucode_revision; uint8_t pad[128]; } u; }; diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index d601a8a984..9c41948514 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -157,6 +157,7 @@ ? xenpf_pcpuinfo platform.h ? xenpf_pcpu_version platform.h ? xenpf_resource_entry platform.h +? xenpf_ucode_revision platform.h ? pmu_data pmu.h ? pmu_params pmu.h ! sched_poll sched.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 04 19:23:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 May 2023 19:23:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530035.825249 (Exim 4.92) (envelope-from ) id 1pueY9-0003zc-Qs; Thu, 04 May 2023 19:23:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530035.825249; Thu, 04 May 2023 19:23:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueY9-0003zU-O2; Thu, 04 May 2023 19:23:33 +0000 Received: by outflank-mailman (input) for mailman id 530035; Thu, 04 May 2023 19:23:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueY8-0003zK-MO for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pueY8-0007Hy-Lh for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pueY8-0005Uv-Ko for xen-changelog@lists.xenproject.org; Thu, 04 May 2023 19:23:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dm88MN2oKG0gtot38Fl69IR4OuyLV2LFUpffI7bqDpo=; b=Q+zqOnIJJyB95mT+pHOYUpMFNq 03CNxSpOwjPUtf0RhI7nkYaVcT7f7R1I+9G1uSKkaZvXWaw2rzQLo7AQugZsLcvHan6vhnFqkBrPq lP+gop45Fkuqrksieoy4z7Myd6xp4XCnMHEIKVoDGkdmgrd/aRryx1JdEHxGCy0f7yZc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xen-ucode: print information about currently loaded ucode Message-Id: Date: Thu, 04 May 2023 19:23:32 +0000 commit b95a72bb5b2df24ff1baaa27920e57947dc97d49 Author: Sergey Dyasli AuthorDate: Mon Apr 17 14:53:35 2023 +0100 Commit: Andrew Cooper CommitDate: Wed May 3 18:36:46 2023 +0100 tools/xen-ucode: print information about currently loaded ucode Add an option to xen-ucode tool to print the currently loaded ucode revision and also print it during usage info. Print CPU signature and platform flags as well. The raw data comes from XENPF_get_cpu_version and XENPF_get_ucode_revision platform ops. Example output: Intel: CPU signature 06-55-04 (raw 0x00050654) pf 0x1 revision 0x02006e05 AMD: CPU signature 19-01-01 (raw 0x00a00f11) revision 0x0a0011ce Signed-off-by: Sergey Dyasli Acked-by: Andrew Cooper --- tools/misc/xen-ucode.c | 85 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 75 insertions(+), 10 deletions(-) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index ad32face2b..c6ae6498d6 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -12,22 +12,95 @@ #include #include +static xc_interface *xch; + +static const char intel_id[] = "GenuineIntel"; +static const char amd_id[] = "AuthenticAMD"; + +static void show_curr_cpu(FILE *f) +{ + int ret; + struct xenpf_pcpu_version cpu_ver = { .xen_cpuid = 0 }; + struct xenpf_ucode_revision ucode_rev = { .cpu = 0 }; + /* Always exit with 2 when called during usage-info */ + int exit_code = (f == stderr) ? 2 : 1; + + ret = xc_get_cpu_version(xch, &cpu_ver); + if ( ret ) + { + fprintf(stderr, "Failed to get CPU information. (err: %s)\n", + strerror(errno)); + exit(exit_code); + } + + ret = xc_get_ucode_revision(xch, &ucode_rev); + if ( ret ) + { + fprintf(stderr, "Failed to get microcode information. (err: %s)\n", + strerror(errno)); + exit(exit_code); + } + + /* + * Print signature in a form that allows to quickly identify which ucode + * blob to load, e.g.: + * + * Intel: /lib/firmware/intel-ucode/06-55-04 + * AMD: /lib/firmware/amd-ucode/microcode_amd_fam19h.bin + */ + if ( memcmp(cpu_ver.vendor_id, intel_id, + sizeof(cpu_ver.vendor_id)) == 0 ) + { + fprintf(f, + "CPU signature %02x-%02x-%02x (raw 0x%08x) pf %#x revision 0x%08x\n", + cpu_ver.family, cpu_ver.model, cpu_ver.stepping, + ucode_rev.signature, ucode_rev.pf, ucode_rev.revision); + } + else if ( memcmp(cpu_ver.vendor_id, amd_id, + sizeof(cpu_ver.vendor_id)) == 0 ) + { + fprintf(f, + "CPU signature %02x-%02x-%02x (raw 0x%08x) revision 0x%08x\n", + cpu_ver.family, cpu_ver.model, cpu_ver.stepping, + ucode_rev.signature, ucode_rev.revision); + } + else + { + fprintf(f, "Unsupported CPU vendor: %s\n", cpu_ver.vendor_id); + exit(exit_code); + } +} + int main(int argc, char *argv[]) { int fd, ret; char *filename, *buf; size_t len; struct stat st; - xc_interface *xch; + + xch = xc_interface_open(NULL, NULL, 0); + if ( xch == NULL ) + { + fprintf(stderr, "Error opening xc interface. (err: %s)\n", + strerror(errno)); + exit(1); + } if ( argc < 2 ) { fprintf(stderr, "xen-ucode: Xen microcode updating tool\n" - "Usage: %s \n", argv[0]); + "Usage: %s [ | show-cpu-info]\n", argv[0]); + show_curr_cpu(stderr); exit(2); } + if ( !strcmp(argv[1], "show-cpu-info") ) + { + show_curr_cpu(stdout); + return 0; + } + filename = argv[1]; fd = open(filename, O_RDONLY); if ( fd < 0 ) @@ -52,14 +125,6 @@ int main(int argc, char *argv[]) exit(1); } - xch = xc_interface_open(NULL, NULL, 0); - if ( xch == NULL ) - { - fprintf(stderr, "Error opening xc interface. (err: %s)\n", - strerror(errno)); - exit(1); - } - ret = xc_microcode_update(xch, buf, len); if ( ret ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 06 08:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 May 2023 08:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530830.826585 (Exim 4.92) (envelope-from ) id 1pvDLj-0003ht-5p; Sat, 06 May 2023 08:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530830.826585; Sat, 06 May 2023 08:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDLj-0003hl-2g; Sat, 06 May 2023 08:33:03 +0000 Received: by outflank-mailman (input) for mailman id 530830; Sat, 06 May 2023 08:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDLi-0003hZ-7H for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDLi-0003jw-5u for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pvDLi-0005F8-4p for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BotGdtBI1k8JuSFoBdN2byazvgOI09uMjI7nfh/RE8U=; b=C3tPlGgFdx1FeFOJMoFuncopgC DsocUTEl+cUNrVE4uojxe43FQMtQv1SD4tQskGSm0nFrhqqJJg1qpZaJFIUMQOFi0LD2u3bd50LP0 uAj0waLtPDPrqkdsA8LiS2tlMGHsXug0RSZySHRFsGGBFoPU5jTF5FTixhBa6xUjEs6E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: don't export building_out_of_srctree Message-Id: Date: Sat, 06 May 2023 08:33:02 +0000 commit e1b8adf9f39cf192e1e05f76d903b99fe87e5116 Author: Jan Beulich AuthorDate: Fri May 5 09:10:28 2023 +0200 Commit: Jan Beulich CommitDate: Fri May 5 09:10:28 2023 +0200 build: don't export building_out_of_srctree I don't view a variable of this name as suitable for exporting, the more that it carries entirely redundant information. The reasons for its introduction in Linux commit 051f278e9d81 ("kbuild: replace KBUILD_SRCTREE with boolean building_out_of_srctree") also don't apply to us. Ditch exporting of the variable, replacing uses suitably. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD --- xen/Makefile | 2 +- xen/arch/x86/boot/Makefile | 2 +- xen/scripts/Makefile.host | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 5166403cff..745a3fadab 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -208,7 +208,7 @@ endif objtree := . VPATH := $(srctree) -export building_out_of_srctree srctree objtree VPATH +export srctree objtree VPATH export XEN_ROOT := $(abs_srctree)/.. diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index d6bc8fc084..03d8ce3a9e 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -14,7 +14,7 @@ $(obj)/head.o: $(head-bin-objs:.o=.bin) CFLAGS_x86_32 := $(subst -m64,-m32 -march=i686,$(XEN_TREEWIDE_CFLAGS)) $(call cc-options-add,CFLAGS_x86_32,CC,$(EMBEDDED_EXTRA_CFLAGS)) CFLAGS_x86_32 += -Werror -fno-builtin -g0 -msoft-float -ifdef building_out_of_srctree +ifneq ($(abs_objtree),$(abs_srctree)) CFLAGS_x86_32 += -I$(objtree)/include endif CFLAGS_x86_32 += -I$(srctree)/include diff --git a/xen/scripts/Makefile.host b/xen/scripts/Makefile.host index d6c358095e..ed24847575 100644 --- a/xen/scripts/Makefile.host +++ b/xen/scripts/Makefile.host @@ -88,7 +88,7 @@ _hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ $(HOSTCXXFLAGS_$(target-stem).o) # $(objtree)/$(obj) for including generated headers from checkin source files -ifdef building_out_of_srctree +ifneq ($(abs_objtree),$(abs_srctree)) _hostc_flags += -I $(objtree)/$(obj) _hostcxx_flags += -I $(objtree)/$(obj) endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 06 08:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 May 2023 08:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530831.826589 (Exim 4.92) (envelope-from ) id 1pvDLt-0003nE-7i; Sat, 06 May 2023 08:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530831.826589; Sat, 06 May 2023 08:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDLt-0003n6-4y; Sat, 06 May 2023 08:33:13 +0000 Received: by outflank-mailman (input) for mailman id 530831; Sat, 06 May 2023 08:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDLs-0003mt-AQ for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDLs-0003kE-9Y for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pvDLs-0005Fq-8P for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6sHHUZQvI6cc/pUnaxToLI+LLbUgiz1YfffQDEV4ucI=; b=QGOsJ94lsvrLx5Kfg77E8es6kD Hs9/TkEnT6PP8mtwyqsjZwCdqxDXlkYqmTA/rzi1evrDYtlSBQrMms6OsmSGkh56qZSJ7OBOnZeMf kaWCeezBGW8pnAfJbw2yrIX2FJJcoRpGgT7QqV9fUgWluliKrRIrrixPpPuWxCzfMvvU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: omit "source" symlink when building hypervisor in-tree Message-Id: Date: Sat, 06 May 2023 08:33:12 +0000 commit 96467d7d77b4e4ab032145b39eee86e463871ade Author: Jan Beulich AuthorDate: Fri May 5 09:10:56 2023 +0200 Commit: Jan Beulich CommitDate: Fri May 5 09:10:56 2023 +0200 build: omit "source" symlink when building hypervisor in-tree This symlink is getting in the way of using e.g. "find" on the xen/ subtree, and it isn't really needed when not building out-of-tree: The one use that there was can easily be avoided. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD --- .gitignore | 1 - xen/Makefile | 2 +- xen/common/efi/efi-common.mk | 7 ++++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index beac034784..c94c51ade3 100644 --- a/.gitignore +++ b/.gitignore @@ -295,7 +295,6 @@ xen/include/xen/acm_policy.h xen/include/xen/compile.h xen/include/xen/hypercall-defs.h xen/include/xen/lib/x86/cpuid-autogen.h -xen/source xen/test/livepatch/config.h xen/test/livepatch/expect_config.h xen/test/livepatch/*.livepatch diff --git a/xen/Makefile b/xen/Makefile index 745a3fadab..e89fc461fc 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -310,7 +310,6 @@ cmd_makefile = { \ } > Makefile outputmakefile: - $(Q)ln -fsn $(srctree) source ifdef building_out_of_srctree $(Q)if [ -f $(srctree)/.config -o \ -d $(srctree)/include/config -o \ @@ -321,6 +320,7 @@ ifdef building_out_of_srctree echo >&2 "***"; \ false; \ fi + $(Q)ln -fsn $(srctree) source $(call cmd,makefile) $(Q)test -e .gitignore || \ { echo "# this is build directory, ignore it"; echo "*"; } > .gitignore diff --git a/xen/common/efi/efi-common.mk b/xen/common/efi/efi-common.mk index 53fdb81583..23cafcf20c 100644 --- a/xen/common/efi/efi-common.mk +++ b/xen/common/efi/efi-common.mk @@ -5,11 +5,16 @@ CFLAGS-y += -fshort-wchar CFLAGS-y += -iquote $(srctree)/common/efi CFLAGS-y += -iquote $(srcdir) +source := +ifneq ($(abs_objtree),$(abs_srctree)) +source := source/ +endif + # Part of the command line transforms $(obj) # e.g.: It transforms "dir/foo/bar" into successively # "dir foo bar", ".. .. ..", "../../.." $(obj)/%.c: $(srctree)/common/efi/%.c FORCE - $(Q)ln -nfs $(subst $(space),/,$(patsubst %,..,$(subst /, ,$(obj))))/source/common/efi/$( Envelope-to: archives@lists.xen.org Delivery-date: Sat, 06 May 2023 08:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.530832.826593 (Exim 4.92) (envelope-from ) id 1pvDM3-0003ur-9x; Sat, 06 May 2023 08:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 530832.826593; Sat, 06 May 2023 08:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDM3-0003uk-6h; Sat, 06 May 2023 08:33:23 +0000 Received: by outflank-mailman (input) for mailman id 530832; Sat, 06 May 2023 08:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDM2-0003tH-EZ for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pvDM2-0003kd-Dn for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pvDM2-0005GJ-CS for xen-changelog@lists.xenproject.org; Sat, 06 May 2023 08:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tuK1bteC6U/kMXKukMFmGsifuTjClRKs+bHnzZnuEo8=; b=J15ugT7wY+Zv79re8oDSn3Tf8b oJr15pXO0x0i6oCTDRHSHefbn4VT7hb1XqQ//0O7r2YMnnSR8ANq8eBD32NpBt503EOmnxawOgKh0 U3G0prsMeitjOxYv72t4VrLAQXL5Lx5iLyaqp0Akju/u+K+noFfgMok447YqHiqziUSk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libacpi: switch to SPDX Message-Id: Date: Sat, 06 May 2023 08:33:22 +0000 commit e93e635e142d45e3904efb4a05e2b3b52a708b4f Author: Jan Beulich AuthorDate: Fri May 5 09:12:07 2023 +0200 Commit: Jan Beulich CommitDate: Fri May 5 09:12:07 2023 +0200 libacpi: switch to SPDX Commit 68823df358e8 ("acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1") added references to a "special exception on linking described in file LICENSE", without actually adding such a file. Quite likely COPYING was meant instead, yet then its text matches LICENSES/LGPL-2.1 except for some explanatory text (clarifying the "only" aspect) at the top (and formatting). Hence replace the text in all the files with SPDX references to LGPL-2.1. Note that dsdt_acpi_info.asl had no license text. An SPDX tag is being added there nevertheless. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/libacpi/COPYING | 468 ------------------------------------ tools/libacpi/Makefile | 12 +- tools/libacpi/acpi2_0.h | 11 +- tools/libacpi/build.c | 11 +- tools/libacpi/dsdt.asl | 11 +- tools/libacpi/dsdt_acpi_info.asl | 1 + tools/libacpi/libacpi.h | 11 +- tools/libacpi/mk_dsdt.c | 12 +- tools/libacpi/ssdt_laptop_slate.asl | 11 +- tools/libacpi/ssdt_pm.asl | 11 +- tools/libacpi/ssdt_s3.asl | 11 +- tools/libacpi/ssdt_s4.asl | 11 +- tools/libacpi/ssdt_tpm.asl | 11 +- tools/libacpi/static_tables.c | 11 +- 14 files changed, 13 insertions(+), 590 deletions(-) diff --git a/tools/libacpi/COPYING b/tools/libacpi/COPYING deleted file mode 100644 index 063062b97c..0000000000 --- a/tools/libacpi/COPYING +++ /dev/null @@ -1,468 +0,0 @@ -This library is licensed under LGPL v2.1 to allow its usage in LGPL-2.1 -libraries such as libxl. Note that the only valid version of the LGPL as -far as the files in this directory (and its subdirectories) are concerned -is _this_ particular version of the license (i.e., *only* v2.1, not v2.2 -or v3.x, unless explicitly otherwise stated. - -Where clause 3 is invoked in order to relicense under the GPL then -this shall be considered to be GPL v2 only for files which have -specified LGPL v2.1 only. - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile index 60860eaa00..aa9c520cbe 100644 --- a/tools/libacpi/Makefile +++ b/tools/libacpi/Makefile @@ -1,16 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1 # # Copyright (c) 2004, Intel Corporation. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; version 2.1 only. with the special -# exception on linking described in file LICENSE. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h index 2619ba32db..212f5ab641 100644 --- a/tools/libacpi/acpi2_0.h +++ b/tools/libacpi/acpi2_0.h @@ -1,15 +1,6 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /* * Copyright (c) 2004, Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ #ifndef _ACPI_2_0_H_ #define _ACPI_2_0_H_ diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index fe2db66a62..830d37c61f 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -1,16 +1,7 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /* * Copyright (c) 2004, Intel Corporation. * Copyright (c) 2006, Keir Fraser, XenSource Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ #include LIBACPI_STDUTILS diff --git a/tools/libacpi/dsdt.asl b/tools/libacpi/dsdt.asl index fa8ff317b2..c6691b56a9 100644 --- a/tools/libacpi/dsdt.asl +++ b/tools/libacpi/dsdt.asl @@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /****************************************************************************** * DSDT for Xen with Qemu device model * * Copyright (c) 2004, Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0) diff --git a/tools/libacpi/dsdt_acpi_info.asl b/tools/libacpi/dsdt_acpi_info.asl index 0136dce55c..c6e82f1fe6 100644 --- a/tools/libacpi/dsdt_acpi_info.asl +++ b/tools/libacpi/dsdt_acpi_info.asl @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ Scope (\_SB) { diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index a2efd23b0b..acf012e355 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -1,18 +1,9 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /****************************************************************************** * libacpi.h * * libacpi interfaces * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. */ diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index 1d27809116..c74b270c0c 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -1,14 +1,4 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - */ +/* SPDX-License-Identifier: LGPL-2.1 */ #include #include diff --git a/tools/libacpi/ssdt_laptop_slate.asl b/tools/libacpi/ssdt_laptop_slate.asl index 3e5fbd5503..494f2d048d 100644 --- a/tools/libacpi/ssdt_laptop_slate.asl +++ b/tools/libacpi/ssdt_laptop_slate.asl @@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /* * ssdt_conv.asl * * Copyright (c) 2017 Citrix Systems, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ /* diff --git a/tools/libacpi/ssdt_pm.asl b/tools/libacpi/ssdt_pm.asl index d81b1f2a36..e577e85c07 100644 --- a/tools/libacpi/ssdt_pm.asl +++ b/tools/libacpi/ssdt_pm.asl @@ -1,18 +1,9 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /* * ssdt_pm.asl * * Copyright (c) 2008 Kamala Narasimhan * Copyright (c) 2008 Citrix Systems, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ /* diff --git a/tools/libacpi/ssdt_s3.asl b/tools/libacpi/ssdt_s3.asl index c83bbbfb5f..8f3177ec5a 100644 --- a/tools/libacpi/ssdt_s3.asl +++ b/tools/libacpi/ssdt_s3.asl @@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /* * ssdt_s3.asl * * Copyright (c) 2011 Citrix Systems, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ DefinitionBlock ("SSDT_S3.aml", "SSDT", 2, "Xen", "HVM", 0) diff --git a/tools/libacpi/ssdt_s4.asl b/tools/libacpi/ssdt_s4.asl index 325ac111e7..979318eca1 100644 --- a/tools/libacpi/ssdt_s4.asl +++ b/tools/libacpi/ssdt_s4.asl @@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /* * ssdt_s4.asl * * Copyright (c) 2011 Citrix Systems, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ DefinitionBlock ("SSDT_S4.aml", "SSDT", 2, "Xen", "HVM", 0) diff --git a/tools/libacpi/ssdt_tpm.asl b/tools/libacpi/ssdt_tpm.asl index a0fb1fda1a..6c3267218f 100644 --- a/tools/libacpi/ssdt_tpm.asl +++ b/tools/libacpi/ssdt_tpm.asl @@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /* * ssdt_tpm.asl * * Copyright (c) 2006, IBM Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ /* SSDT for TPM TIS Interface for Xen with Qemu device model. */ diff --git a/tools/libacpi/static_tables.c b/tools/libacpi/static_tables.c index f3d859726a..631fb91141 100644 --- a/tools/libacpi/static_tables.c +++ b/tools/libacpi/static_tables.c @@ -1,16 +1,7 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ /* * Copyright (c) 2004, Intel Corporation. * Copyright (c) 2006, Keir Fraser, XenSource Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; version 2.1 only. with the special - * exception on linking described in file LICENSE. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. */ #include "acpi2_0.h" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 09 01:22:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 May 2023 01:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.531948.827932 (Exim 4.92) (envelope-from ) id 1pwC3G-0001jG-OS; Tue, 09 May 2023 01:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 531948.827932; Tue, 09 May 2023 01:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3G-0001j8-Lg; Tue, 09 May 2023 01:22:02 +0000 Received: by outflank-mailman (input) for mailman id 531948; Tue, 09 May 2023 01:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3F-0001j2-LZ for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3F-0007ho-Jq for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pwC3F-0004vU-Ik for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zmEw1EoNM8Kodtv2LzozOsh10PdPzX85nZYO0kRgAMc=; b=U4ONCmzfO9U5fnwozMKrF4lz6i kq+2Pjw8LuI0S4bRuDEUkC8ZQ3SlTioM5T4HPslaJkRFWwfA0WS7YY3Qp++DTJ6dMI9SdT5L7vUKr tcCpYD2UGdd2fPrB7ANRDvtpMIXLdTHsgtf02qpZ4p4yCo49289qV+zVUafG7iWYZx+E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] acpi: make TPM version configurable Message-Id: Date: Tue, 09 May 2023 01:22:01 +0000 commit 5828b94b252ca29c8ef4a7464b9dd32a5f8a7ded Author: Jennifer Herbert AuthorDate: Mon May 8 14:13:56 2023 +0200 Commit: Jan Beulich CommitDate: Mon May 8 14:13:56 2023 +0200 acpi: make TPM version configurable This patch makes the TPM version, for which the ACPI library probes, configurable. If acpi_config.tpm_verison is set to 1, it indicates that 1.2 (TCPA) should be probed. I have also added to hvmloader an option to allow setting this new config, which can be triggered by setting the platform/tpm_verion xenstore key. Signed-off-by: Jennifer Herbert Reviewed-by: Jason Andryuk Acked-by: Jan Beulich --- docs/misc/xenstore-paths.pandoc | 9 ++++++ tools/firmware/hvmloader/util.c | 28 ++++++++++++----- tools/libacpi/build.c | 68 +++++++++++++++++++++++------------------ tools/libacpi/libacpi.h | 3 +- 4 files changed, 70 insertions(+), 38 deletions(-) diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index 5cd5c8a3b9..e67e164855 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -269,6 +269,15 @@ at the guest physical address in HVM_PARAM_VM_GENERATION_ID_ADDR. See Microsoft's "Virtual Machine Generation ID" specification for the circumstances where the generation ID needs to be changed. + +#### ~/platform/tpm_version = INTEGER [HVM,INTERNAL] + +The TPM version to be probed for. + +A value of 1 indicates to probe for TPM 1.2. +A value of 0 or an invalid value will result in no TPM being probed. +If unset, a default of 1 is assumed. + ### Frontend device paths Paravirtual device frontends are generally specified by their own diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 581b35e5cf..e3c37b88ce 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -920,6 +920,8 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, { const char *s; struct acpi_ctxt ctxt; + long long tpm_version; + char *end; /* Allocate and initialise the acpi info area. */ mem_hole_populate_ram(ACPI_INFO_PHYSICAL_ADDRESS >> PAGE_SHIFT, 1); @@ -967,8 +969,6 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, s = xenstore_read("platform/generation-id", "0:0"); if ( s ) { - char *end; - config->vm_gid[0] = strtoll(s, &end, 0); config->vm_gid[1] = 0; if ( end && end[0] == ':' ) @@ -994,13 +994,27 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, if ( !strncmp(xenstore_read("platform/acpi_laptop_slate", "0"), "1", 1) ) config->table_flags |= ACPI_HAS_SSDT_LAPTOP_SLATE; - config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | - ACPI_HAS_WAET | ACPI_HAS_PMTIMER | - ACPI_HAS_BUTTONS | ACPI_HAS_VGA | - ACPI_HAS_8042 | ACPI_HAS_CMOS_RTC); + config->table_flags |= (ACPI_HAS_IOAPIC | ACPI_HAS_WAET | + ACPI_HAS_PMTIMER | ACPI_HAS_BUTTONS | + ACPI_HAS_VGA | ACPI_HAS_8042 | + ACPI_HAS_CMOS_RTC); config->acpi_revision = 4; - config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS; + config->tpm_version = 0; + s = xenstore_read("platform/tpm_version", "1"); + tpm_version = strtoll(s, &end, 0); + + if ( end[0] == '\0' ) + { + switch ( tpm_version ) + { + case 1: + config->table_flags |= ACPI_HAS_TPM; + config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS; + config->tpm_version = 1; + break; + } + } config->numa.nr_vmemranges = nr_vmemranges; config->numa.nr_vnodes = nr_vnodes; diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index 830d37c61f..9b9bc29d2c 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -400,38 +400,46 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt, memcpy(ssdt, ssdt_laptop_slate, sizeof(ssdt_laptop_slate)); table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt); } - - /* TPM TCPA and SSDT. */ - if ( (config->table_flags & ACPI_HAS_TCPA) && - (config->tis_hdr[0] != 0 && config->tis_hdr[0] != 0xffff) && - (config->tis_hdr[1] != 0 && config->tis_hdr[1] != 0xffff) ) + /* TPM and its SSDT. */ + if ( config->table_flags & ACPI_HAS_TPM ) { - ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm), 16); - if (!ssdt) return -1; - memcpy(ssdt, ssdt_tpm, sizeof(ssdt_tpm)); - table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt); - - tcpa = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_tcpa), 16); - if (!tcpa) return -1; - memset(tcpa, 0, sizeof(*tcpa)); - table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, tcpa); - - tcpa->header.signature = ACPI_2_0_TCPA_SIGNATURE; - tcpa->header.length = sizeof(*tcpa); - tcpa->header.revision = ACPI_2_0_TCPA_REVISION; - fixed_strcpy(tcpa->header.oem_id, ACPI_OEM_ID); - fixed_strcpy(tcpa->header.oem_table_id, ACPI_OEM_TABLE_ID); - tcpa->header.oem_revision = ACPI_OEM_REVISION; - tcpa->header.creator_id = ACPI_CREATOR_ID; - tcpa->header.creator_revision = ACPI_CREATOR_REVISION; - if ( (lasa = ctxt->mem_ops.alloc(ctxt, ACPI_2_0_TCPA_LAML_SIZE, 16)) != NULL ) + switch ( config->tpm_version ) { - tcpa->lasa = ctxt->mem_ops.v2p(ctxt, lasa); - tcpa->laml = ACPI_2_0_TCPA_LAML_SIZE; - memset(lasa, 0, tcpa->laml); - set_checksum(tcpa, - offsetof(struct acpi_header, checksum), - tcpa->header.length); + case 1: + if ( config->tis_hdr[0] == 0 || config->tis_hdr[0] == 0xffff || + config->tis_hdr[1] == 0 || config->tis_hdr[1] == 0xffff ) + break; + + ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm), 16); + if (!ssdt) return -1; + memcpy(ssdt, ssdt_tpm, sizeof(ssdt_tpm)); + table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt); + + tcpa = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_tcpa), 16); + if (!tcpa) return -1; + memset(tcpa, 0, sizeof(*tcpa)); + table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, tcpa); + + tcpa->header.signature = ACPI_2_0_TCPA_SIGNATURE; + tcpa->header.length = sizeof(*tcpa); + tcpa->header.revision = ACPI_2_0_TCPA_REVISION; + fixed_strcpy(tcpa->header.oem_id, ACPI_OEM_ID); + fixed_strcpy(tcpa->header.oem_table_id, ACPI_OEM_TABLE_ID); + tcpa->header.oem_revision = ACPI_OEM_REVISION; + tcpa->header.creator_id = ACPI_CREATOR_ID; + tcpa->header.creator_revision = ACPI_CREATOR_REVISION; + + lasa = ctxt->mem_ops.alloc(ctxt, ACPI_2_0_TCPA_LAML_SIZE, 16); + if ( lasa ) + { + tcpa->lasa = ctxt->mem_ops.v2p(ctxt, lasa); + tcpa->laml = ACPI_2_0_TCPA_LAML_SIZE; + memset(lasa, 0, tcpa->laml); + set_checksum(tcpa, + offsetof(struct acpi_header, checksum), + tcpa->header.length); + } + break; } } diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index acf012e355..187b977af5 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -18,7 +18,7 @@ #define ACPI_HAS_SSDT_PM (1<<4) #define ACPI_HAS_SSDT_S3 (1<<5) #define ACPI_HAS_SSDT_S4 (1<<6) -#define ACPI_HAS_TCPA (1<<7) +#define ACPI_HAS_TPM (1<<7) #define ACPI_HAS_IOAPIC (1<<8) #define ACPI_HAS_WAET (1<<9) #define ACPI_HAS_PMTIMER (1<<10) @@ -57,6 +57,7 @@ struct acpi_config { uint32_t table_flags; uint8_t acpi_revision; + uint8_t tpm_version; uint64_t vm_gid[2]; unsigned long vm_gid_addr; /* OUT parameter */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 09 01:22:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 May 2023 01:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.531949.827935 (Exim 4.92) (envelope-from ) id 1pwC3Q-0001ks-Q3; Tue, 09 May 2023 01:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 531949.827935; Tue, 09 May 2023 01:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3Q-0001kj-NO; Tue, 09 May 2023 01:22:12 +0000 Received: by outflank-mailman (input) for mailman id 531949; Tue, 09 May 2023 01:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3P-0001kd-Ny for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3P-0007ht-N3 for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pwC3P-0004xQ-M6 for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8hwEXIqsQm14IwcxQE7BmvDuHUg7G4xyTCH9p1VSAE4=; b=lKkacGBpaNGSxGVHOvivWsz/IA fyBFCbn7Xs70zelROiI2dQwqCX9cbYGTF7MzCSeGbVSNT+MWECkp/KsRwLg+RA3ba8MbJ4roLUqzf GRrzro/RXUlBF9lb2cyG3OsfkgvgbHxh3f5EVPwJQesmwIT4w1EP77FaOOlElLUBsjzU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] acpi: add TPM2 interface definition Message-Id: Date: Tue, 09 May 2023 01:22:11 +0000 commit fb751d9a2431e01586844978d38b7fa5b5468ff4 Author: Jennifer Herbert AuthorDate: Mon May 8 14:15:20 2023 +0200 Commit: Jan Beulich CommitDate: Mon May 8 14:15:20 2023 +0200 acpi: add TPM2 interface definition This patch introduces an optional TPM 2 interface definition to the ACPI table, which is to be used as part of a vTPM 2 implementation. Signed-off-by: Jennifer Herbert Reviewed-by: Jason Andryuk Acked-by: Jan Beulich --- docs/misc/xenstore-paths.pandoc | 3 ++- tools/firmware/hvmloader/util.c | 10 ++++++++++ tools/libacpi/Makefile | 3 ++- tools/libacpi/acpi2_0.h | 33 +++++++++++++++++++++++++++++++++ tools/libacpi/build.c | 40 ++++++++++++++++++++++++++++++++++++++++ tools/libacpi/libacpi.h | 1 + tools/libacpi/ssdt_tpm2.asl | 27 +++++++++++++++++++++++++++ 7 files changed, 115 insertions(+), 2 deletions(-) diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index e67e164855..bffb8ea544 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -274,7 +274,8 @@ circumstances where the generation ID needs to be changed. The TPM version to be probed for. -A value of 1 indicates to probe for TPM 1.2. +A value of 1 indicates to probe for TPM 1.2, whereas a value of 2 +indicates that a TPM 2.0 using CRB should be probed. A value of 0 or an invalid value will result in no TPM being probed. If unset, a default of 1 is assumed. diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index e3c37b88ce..e82047d993 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -1013,6 +1013,16 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS; config->tpm_version = 1; break; + + case 2: + config->table_flags |= ACPI_HAS_TPM; + config->crb_id = (uint16_t *)TPM_CRB_INTF_ID; + + mem_hole_populate_ram(TPM_LOG_AREA_ADDRESS >> PAGE_SHIFT, + TPM_LOG_SIZE >> PAGE_SHIFT); + memset((void *)TPM_LOG_AREA_ADDRESS, 0, TPM_LOG_SIZE); + config->tpm_version = 2; + break; } } diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile index aa9c520cbe..0e6fbe897a 100644 --- a/tools/libacpi/Makefile +++ b/tools/libacpi/Makefile @@ -15,7 +15,8 @@ C_SRC-$(CONFIG_X86) = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c dsdt_pvh C_SRC-$(CONFIG_ARM_64) = dsdt_anycpu_arm.c DSDT_FILES ?= $(C_SRC-y) C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, $(DSDT_FILES)) -H_SRC = $(addprefix $(ACPI_BUILD_DIR)/, ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h ssdt_laptop_slate.h) +H_SRC = $(addprefix $(ACPI_BUILD_DIR)/, ssdt_s3.h ssdt_s4.h ssdt_pm.h) +H_SRC += $(addprefix $(ACPI_BUILD_DIR)/, ssdt_tpm.h ssdt_tpm2.h ssdt_laptop_slate.h) MKDSDT_CFLAGS-$(CONFIG_ARM_64) = -DCONFIG_ARM_64 MKDSDT_CFLAGS-$(CONFIG_X86) = -DCONFIG_X86 diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h index 212f5ab641..fbbf8da660 100644 --- a/tools/libacpi/acpi2_0.h +++ b/tools/libacpi/acpi2_0.h @@ -112,6 +112,37 @@ struct acpi_20_tcpa { }; #define ACPI_2_0_TCPA_LAML_SIZE (64*1024) +/* + * TPM2 + */ +struct acpi_20_tpm2 { + struct acpi_header header; + uint16_t platform_class; + uint16_t reserved; + uint64_t control_area_address; + uint32_t start_method; + uint8_t start_method_params[12]; + uint32_t log_area_minimum_length; + uint64_t log_area_start_address; +}; +#define TPM2_ACPI_CLASS_CLIENT 0 +#define TPM2_START_METHOD_CRB 7 + +/* + * TPM register I/O Mapped region, location of which defined in the + * TCG PC Client Platform TPM Profile Specification for TPM 2.0. + * See table 9 - Only Locality 0 is used here. This is emulated by QEMU. + * Definition of Register space is found in table 12. + */ +#define TPM_REGISTER_BASE 0xFED40000 +#define TPM_CRB_CTRL_REQ (TPM_REGISTER_BASE + 0x40) +#define TPM_CRB_INTF_ID (TPM_REGISTER_BASE + 0x30) + +#define TPM_LOG_AREA_ADDRESS 0xFED50000 + +#define TPM_LOG_AREA_MINIMUM_SIZE (64 << 10) +#define TPM_LOG_SIZE (64 << 10) + /* * Fixed ACPI Description Table Structure (FADT) in ACPI 1.0. */ @@ -422,6 +453,7 @@ struct acpi_20_slit { #define ACPI_2_0_RSDT_SIGNATURE ASCII32('R','S','D','T') #define ACPI_2_0_XSDT_SIGNATURE ASCII32('X','S','D','T') #define ACPI_2_0_TCPA_SIGNATURE ASCII32('T','C','P','A') +#define ACPI_2_0_TPM2_SIGNATURE ASCII32('T','P','M','2') #define ACPI_2_0_HPET_SIGNATURE ASCII32('H','P','E','T') #define ACPI_2_0_WAET_SIGNATURE ASCII32('W','A','E','T') #define ACPI_2_0_SRAT_SIGNATURE ASCII32('S','R','A','T') @@ -435,6 +467,7 @@ struct acpi_20_slit { #define ACPI_2_0_RSDT_REVISION 0x01 #define ACPI_2_0_XSDT_REVISION 0x01 #define ACPI_2_0_TCPA_REVISION 0x02 +#define ACPI_2_0_TPM2_REVISION 0x04 #define ACPI_2_0_HPET_REVISION 0x01 #define ACPI_2_0_WAET_REVISION 0x01 #define ACPI_1_0_FADT_REVISION 0x01 diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index 9b9bc29d2c..4e5c20b32e 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -10,6 +10,7 @@ #include "ssdt_s3.h" #include "ssdt_s4.h" #include "ssdt_tpm.h" +#include "ssdt_tpm2.h" #include "ssdt_pm.h" #include "ssdt_laptop_slate.h" #include @@ -341,6 +342,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt, struct acpi_20_hpet *hpet; struct acpi_20_waet *waet; struct acpi_20_tcpa *tcpa; + struct acpi_20_tpm2 *tpm2; unsigned char *ssdt; void *lasa; @@ -440,6 +442,44 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt, tcpa->header.length); } break; + + case 2: + /* + * Check VID stored in bits 37:32 (3rd 16 bit word) of CRB + * identifier register. See table 16 of TCG PC client platform + * TPM profile specification for TPM 2.0. + */ + if ( config->crb_id[2] == 0 || config->crb_id[2] == 0xffff ) + break; + + ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm2), 16); + if (!ssdt) return -1; + memcpy(ssdt, ssdt_tpm2, sizeof(ssdt_tpm2)); + table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt); + + tpm2 = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_tpm2), 16); + if (!tpm2) return -1; + memset(tpm2, 0, sizeof(*tpm2)); + table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, tpm2); + + tpm2->header.signature = ACPI_2_0_TPM2_SIGNATURE; + tpm2->header.length = sizeof(*tpm2); + tpm2->header.revision = ACPI_2_0_TPM2_REVISION; + fixed_strcpy(tpm2->header.oem_id, ACPI_OEM_ID); + fixed_strcpy(tpm2->header.oem_table_id, ACPI_OEM_TABLE_ID); + tpm2->header.oem_revision = ACPI_OEM_REVISION; + tpm2->header.creator_id = ACPI_CREATOR_ID; + tpm2->header.creator_revision = ACPI_CREATOR_REVISION; + tpm2->platform_class = TPM2_ACPI_CLASS_CLIENT; + tpm2->control_area_address = TPM_CRB_CTRL_REQ; + tpm2->start_method = TPM2_START_METHOD_CRB; + tpm2->log_area_minimum_length = TPM_LOG_AREA_MINIMUM_SIZE; + tpm2->log_area_start_address = TPM_LOG_AREA_ADDRESS; + + set_checksum(tpm2, + offsetof(struct acpi_header, checksum), + tpm2->header.length); + break; } } diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index 187b977af5..d9387fc6eb 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -71,6 +71,7 @@ struct acpi_config { const struct hvm_info_table *hvminfo; const uint16_t *tis_hdr; + const uint16_t *crb_id; /* * Address where acpi_info should be placed. diff --git a/tools/libacpi/ssdt_tpm2.asl b/tools/libacpi/ssdt_tpm2.asl new file mode 100644 index 0000000000..e0f0ccd9c5 --- /dev/null +++ b/tools/libacpi/ssdt_tpm2.asl @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: LGPL-2.1-only */ +/* + * ssdt_tpm2.asl + * + * Copyright (c) 2018-2022, Citrix Systems, Inc. + */ + +/* SSDT for TPM CRB Interface for Xen with Qemu device model. */ + +DefinitionBlock ("SSDT_TPM2.aml", "SSDT", 2, "Xen", "HVM", 0) +{ + Device (TPM) + { + Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */) // _HID: Hardware ID + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings + { + Memory32Fixed (ReadWrite, + 0xFED40000, // Address Base + 0x00001000, // Address Length + ) + }) + Method (_STA, 0, NotSerialized) // _STA: Status + { + Return (0x0F) + } + } +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 09 01:22:22 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 May 2023 01:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.531950.827940 (Exim 4.92) (envelope-from ) id 1pwC3a-0001nR-Rt; Tue, 09 May 2023 01:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 531950.827940; Tue, 09 May 2023 01:22:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3a-0001nI-PB; Tue, 09 May 2023 01:22:22 +0000 Received: by outflank-mailman (input) for mailman id 531950; Tue, 09 May 2023 01:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3Z-0001n4-RS for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwC3Z-0007i4-Qb for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pwC3Z-0004yG-PU for xen-changelog@lists.xenproject.org; Tue, 09 May 2023 01:22:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jNYYgtH1uoGXnhL1jSSE92DM7s3kfGZlg0vkp/JQeKE=; b=vW1uT/zhYWou/Zzbdn+01YOuZe 311HdU8sJ1cgjcs+W12BjlH5WuEOiqr6ar7Dsb6ZGp/Uip0nCgu8XIQCcGUivDyA+X2GDo+fCZ8W3 FiVgjUuSFyk78E5mbEyARJb57SnTyyieRckpJ6pD6CG7i/9g7axNsfufmQXevqTYWcbY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ns16550: enable memory decoding on MMIO-based PCI console card Message-Id: Date: Tue, 09 May 2023 01:22:21 +0000 commit a16fb78515d54be95f81c0d1c0a3a7b954a54d0a Author: Marek Marczykowski-Górecki AuthorDate: Mon May 8 14:15:38 2023 +0200 Commit: Jan Beulich CommitDate: Mon May 8 14:15:38 2023 +0200 ns16550: enable memory decoding on MMIO-based PCI console card pci_serial_early_init() enables PCI_COMMAND_IO for IO-based UART devices, add setting PCI_COMMAND_MEMORY for MMIO-based UART devices too. Note the MMIO-based devices in practice need a "pci" sub-option, otherwise a few parameters are not initialized (including bar_idx, reg_shift, reg_width etc). The "pci" is not supposed to be used with explicit BDF, so do not key setting PCI_COMMAND_MEMORY on explicit BDF being set. Contrary to the IO-based UART, pci_serial_early_init() will not attempt to set BAR0 address, even if user provided io_base manually - in most cases, those are with an offest and the current cmdline syntax doesn't allow expressing it. Due to this, enable PCI_COMMAND_MEMORY only if uart->bar is already populated. In similar spirit, this patch does not support setting BAR0 of the bridge. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/char/ns16550.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 1b21eb93c4..212a9c49ae 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -272,6 +272,14 @@ static int cf_check ns16550_getc(struct serial_port *port, char *pc) static void pci_serial_early_init(struct ns16550 *uart) { #ifdef NS16550_PCI + if ( uart->bar && uart->io_base >= 0x10000 ) + { + pci_conf_write16(PCI_SBDF(0, uart->ps_bdf[0], uart->ps_bdf[1], + uart->ps_bdf[2]), + PCI_COMMAND, PCI_COMMAND_MEMORY); + return; + } + if ( !uart->ps_bdf_enable || uart->io_base >= 0x10000 ) return; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 10 01:44:11 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 May 2023 01:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.532616.828828 (Exim 4.92) (envelope-from ) id 1pwYs7-0003DU-Bh; Wed, 10 May 2023 01:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 532616.828828; Wed, 10 May 2023 01:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYs7-0003DL-8j; Wed, 10 May 2023 01:44:03 +0000 Received: by outflank-mailman (input) for mailman id 532616; Wed, 10 May 2023 01:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYs5-0003DF-R5 for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYs5-0001RL-OU for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pwYs5-0005yO-Ml for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7ntDXTPcBPDafqasxnvTDQPJAotw/vXS7mB6EbRM4v4=; b=DLSeC7KpuMmG71jzNHjRoEEw3n lNWfD3AhpZ0OB4TAy1y4Yc4xRQX5LIVqg9RneMx+yt57WwMkfpcEHyP/FRxhU+VmgFiHSzrlnqhAd wEkFycDIAC2nVRgAMc2csF6twAVW5ALNqpHeTQtTiRo5r+hiiW4HjJjOPW2dK2R4e27I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] LICENSES: Improve the legibility of these files Message-Id: Date: Wed, 10 May 2023 01:44:01 +0000 commit 6b9781d96a7c36765a8910fd9bbbaf6df8d56327 Author: Andrew Cooper AuthorDate: Fri May 5 13:36:40 2023 +0100 Commit: Andrew Cooper CommitDate: Tue May 9 10:37:29 2023 +0100 LICENSES: Improve the legibility of these files A few newlines go a very long way. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- LICENSES/BSD-2-Clause | 4 ++++ LICENSES/BSD-3-Clause | 4 ++++ LICENSES/BSD-3-Clause-Clear | 4 ++++ LICENSES/CC-BY-4.0 | 5 +++++ LICENSES/GPL-2.0 | 6 ++++++ LICENSES/LGPL-2.0 | 6 ++++++ LICENSES/LGPL-2.1 | 6 ++++++ LICENSES/MIT | 4 ++++ 8 files changed, 39 insertions(+) diff --git a/LICENSES/BSD-2-Clause b/LICENSES/BSD-2-Clause index da366e2ce5..694d8c9322 100644 --- a/LICENSES/BSD-2-Clause +++ b/LICENSES/BSD-2-Clause @@ -1,10 +1,14 @@ Valid-License-Identifier: BSD-2-Clause + SPDX-URL: https://spdx.org/licenses/BSD-2-Clause.html + Usage-Guide: + To use the BSD 2-clause "Simplified" License put the following SPDX tag/value pair into a comment according to the placement guidelines in the licensing rules documentation: SPDX-License-Identifier: BSD-2-Clause + License-Text: Copyright (c) . All rights reserved. diff --git a/LICENSES/BSD-3-Clause b/LICENSES/BSD-3-Clause index 34c7f057c8..1441947f92 100644 --- a/LICENSES/BSD-3-Clause +++ b/LICENSES/BSD-3-Clause @@ -1,10 +1,14 @@ Valid-License-Identifier: BSD-3-Clause + SPDX-URL: https://spdx.org/licenses/BSD-3-Clause.html + Usage-Guide: + To use the BSD 3-clause "New" or "Revised" License put the following SPDX tag/value pair into a comment according to the placement guidelines in the licensing rules documentation: SPDX-License-Identifier: BSD-3-Clause + License-Text: Copyright (c) . All rights reserved. diff --git a/LICENSES/BSD-3-Clause-Clear b/LICENSES/BSD-3-Clause-Clear index e53b56092b..2b27f24a65 100644 --- a/LICENSES/BSD-3-Clause-Clear +++ b/LICENSES/BSD-3-Clause-Clear @@ -1,10 +1,14 @@ Valid-License-Identifier: BSD-3-Clause-Clear + SPDX-URL: https://spdx.org/licenses/BSD-3-Clause-Clear.html + Usage-Guide: + To use the BSD 3-clause "Clear" License put the following SPDX tag/value pair into a comment according to the placement guidelines in the licensing rules documentation: SPDX-License-Identifier: BSD-3-Clause-Clear + License-Text: The Clear BSD License diff --git a/LICENSES/CC-BY-4.0 b/LICENSES/CC-BY-4.0 index 27dfefa95c..4197ceb180 100644 --- a/LICENSES/CC-BY-4.0 +++ b/LICENSES/CC-BY-4.0 @@ -1,15 +1,20 @@ Valid-License-Identifier: CC-BY-4.0 + SPDX-URL: https://spdx.org/licenses/CC-BY-4.0 + Usage-Guide: + Do NOT use this license for code, but it's acceptable for content like artwork or documentation. When using it for the latter, it's best to use it together with a GPL2 compatible license using "OR", as CC-BY-4.0 texts processed by the kernel's build system might combine it with content taken from more restrictive licenses. + To use the Creative Commons Attribution 4.0 International license put the following SPDX tag/value pair into a comment according to the placement guidelines in the licensing rules documentation: SPDX-License-Identifier: CC-BY-4.0 + License-Text: Creative Commons Attribution 4.0 International diff --git a/LICENSES/GPL-2.0 b/LICENSES/GPL-2.0 index 9f09528a8b..fa5c66236f 100644 --- a/LICENSES/GPL-2.0 +++ b/LICENSES/GPL-2.0 @@ -2,19 +2,25 @@ Valid-License-Identifier: GPL-2.0 Valid-License-Identifier: GPL-2.0-only Valid-License-Identifier: GPL-2.0+ Valid-License-Identifier: GPL-2.0-or-later + SPDX-URL: https://spdx.org/licenses/GPL-2.0.html + Usage-Guide: + To use this license in source code, put one of the following SPDX tag/value pairs into a comment according to the placement guidelines in the licensing rules documentation. + For 'GNU General Public License (GPL) version 2 only' use: SPDX-License-Identifier: GPL-2.0-only or (now deprecated) SPDX-License-Identifier: GPL-2.0 + For 'GNU General Public License (GPL) version 2 or any later version' use: SPDX-License-Identifier: GPL-2.0+ or SPDX-License-Identifier: GPL-2.0-or-later + License-Text: GNU GENERAL PUBLIC LICENSE diff --git a/LICENSES/LGPL-2.0 b/LICENSES/LGPL-2.0 index 957d798fe0..2fa16d72ea 100644 --- a/LICENSES/LGPL-2.0 +++ b/LICENSES/LGPL-2.0 @@ -1,15 +1,21 @@ Valid-License-Identifier: LGPL-2.0 Valid-License-Identifier: LGPL-2.0+ + SPDX-URL: https://spdx.org/licenses/LGPL-2.0.html + Usage-Guide: + To use this license in source code, put one of the following SPDX tag/value pairs into a comment according to the placement guidelines in the licensing rules documentation. + For 'GNU Library General Public License (LGPL) version 2.0 only' use: SPDX-License-Identifier: LGPL-2.0 + For 'GNU Library General Public License (LGPL) version 2.0 or any later version' use: SPDX-License-Identifier: LGPL-2.0+ + License-Text: GNU LIBRARY GENERAL PUBLIC LICENSE diff --git a/LICENSES/LGPL-2.1 b/LICENSES/LGPL-2.1 index 27bb4342a3..b366c7e491 100644 --- a/LICENSES/LGPL-2.1 +++ b/LICENSES/LGPL-2.1 @@ -1,15 +1,21 @@ Valid-License-Identifier: LGPL-2.1 Valid-License-Identifier: LGPL-2.1+ + SPDX-URL: https://spdx.org/licenses/LGPL-2.1.html + Usage-Guide: + To use this license in source code, put one of the following SPDX tag/value pairs into a comment according to the placement guidelines in the licensing rules documentation. + For 'GNU Lesser General Public License (LGPL) version 2.1 only' use: SPDX-License-Identifier: LGPL-2.1 + For 'GNU Lesser General Public License (LGPL) version 2.1 or any later version' use: SPDX-License-Identifier: LGPL-2.1+ + License-Text: GNU LESSER GENERAL PUBLIC LICENSE diff --git a/LICENSES/MIT b/LICENSES/MIT index f33a68ceb3..eba1549f93 100644 --- a/LICENSES/MIT +++ b/LICENSES/MIT @@ -1,10 +1,14 @@ Valid-License-Identifier: MIT + SPDX-URL: https://spdx.org/licenses/MIT.html + Usage-Guide: + To use the MIT License put the following SPDX tag/value pair into a comment according to the placement guidelines in the licensing rules documentation: SPDX-License-Identifier: MIT + License-Text: MIT License -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 10 01:44:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 May 2023 01:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.532617.828832 (Exim 4.92) (envelope-from ) id 1pwYsH-0003FB-EK; Wed, 10 May 2023 01:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 532617.828832; Wed, 10 May 2023 01:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYsH-0003F3-AM; Wed, 10 May 2023 01:44:13 +0000 Received: by outflank-mailman (input) for mailman id 532617; Wed, 10 May 2023 01:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYsF-0003Ev-Sq for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYsF-0001RR-Ry for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pwYsF-0005yp-R2 for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BlzZOnCEI2uPEGbh0I5aGrqIV/zuMJn89F+18iGO8as=; b=uTdZxv6vCU3RsgMYd4o8pwX1hk +K4rPq8pM84jYsNV5ucmRJ8AjWsAXAJfIqyuL7mPaKZlLRo/8gH1b8Eiqd+dKxSYdtdIUEAl2jpft Ma0QU+9Otft3SE2pEgaLYNAg6iJ82mFLCGC1TeF59mKJIcRta7vRSZUKxjNnkFkwH2uQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] LICENSES: Remove the use of deprecated SPDX tags Message-Id: Date: Wed, 10 May 2023 01:44:11 +0000 commit be1fdacf5454120becf932fcccd0998839863cb8 Author: Andrew Cooper AuthorDate: Fri May 5 11:19:14 2023 +0100 Commit: Andrew Cooper CommitDate: Tue May 9 10:37:29 2023 +0100 LICENSES: Remove the use of deprecated SPDX tags The GPL and LGPL SPDX forms without an explicit -only or -or-later suffix are deprecated and should not be used. Update the documention. Somewhat unhelpfully at the time of writing, this only appears to be indicated by the separation of the two tables at https://spdx.org/licenses/ The recent changes to libacpi are the only examples of deprecated LGPL tags in tree, so fix them all up. For GPL, we have many examples using deprecated tags. For now, just identify them as such and recommend that no new instances get added. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- LICENSES/GPL-2.0 | 15 ++++++++------- LICENSES/LGPL-2.0 | 11 ++++++----- LICENSES/LGPL-2.1 | 11 ++++++----- tools/libacpi/Makefile | 2 +- tools/libacpi/acpi2_0.h | 2 +- tools/libacpi/build.c | 2 +- tools/libacpi/dsdt.asl | 2 +- tools/libacpi/dsdt_acpi_info.asl | 2 +- tools/libacpi/libacpi.h | 2 +- tools/libacpi/mk_dsdt.c | 2 +- tools/libacpi/ssdt_laptop_slate.asl | 2 +- tools/libacpi/ssdt_pm.asl | 2 +- tools/libacpi/ssdt_s3.asl | 2 +- tools/libacpi/ssdt_s4.asl | 2 +- tools/libacpi/ssdt_tpm.asl | 2 +- tools/libacpi/static_tables.c | 2 +- 16 files changed, 33 insertions(+), 30 deletions(-) diff --git a/LICENSES/GPL-2.0 b/LICENSES/GPL-2.0 index fa5c66236f..07f332641c 100644 --- a/LICENSES/GPL-2.0 +++ b/LICENSES/GPL-2.0 @@ -1,9 +1,11 @@ -Valid-License-Identifier: GPL-2.0 Valid-License-Identifier: GPL-2.0-only -Valid-License-Identifier: GPL-2.0+ Valid-License-Identifier: GPL-2.0-or-later -SPDX-URL: https://spdx.org/licenses/GPL-2.0.html +SPDX-URL: https://spdx.org/licenses/GPL-2.0-only.html +SPDX-URL: https://spdx.org/licenses/GPL-2.0-or-later.html + +Deprecated-Identifier: GPL-2.0 +Deprecated-Identifier: GPL-2.0+ Usage-Guide: @@ -13,14 +15,13 @@ Usage-Guide: For 'GNU General Public License (GPL) version 2 only' use: SPDX-License-Identifier: GPL-2.0-only - or (now deprecated) - SPDX-License-Identifier: GPL-2.0 For 'GNU General Public License (GPL) version 2 or any later version' use: - SPDX-License-Identifier: GPL-2.0+ - or SPDX-License-Identifier: GPL-2.0-or-later + The deprecated tags should not be used for any new additions. Where + possible, their existing uses should be phased out. + License-Text: GNU GENERAL PUBLIC LICENSE diff --git a/LICENSES/LGPL-2.0 b/LICENSES/LGPL-2.0 index 2fa16d72ea..100c72c6db 100644 --- a/LICENSES/LGPL-2.0 +++ b/LICENSES/LGPL-2.0 @@ -1,7 +1,8 @@ -Valid-License-Identifier: LGPL-2.0 -Valid-License-Identifier: LGPL-2.0+ +Valid-License-Identifier: LGPL-2.0-only +Valid-License-Identifier: LGPL-2.0-or-later -SPDX-URL: https://spdx.org/licenses/LGPL-2.0.html +SPDX-URL: https://spdx.org/licenses/LGPL-2.0-only.html +SPDX-URL: https://spdx.org/licenses/LGPL-2.0-or-later.html Usage-Guide: @@ -10,11 +11,11 @@ Usage-Guide: guidelines in the licensing rules documentation. For 'GNU Library General Public License (LGPL) version 2.0 only' use: - SPDX-License-Identifier: LGPL-2.0 + SPDX-License-Identifier: LGPL-2.0-only For 'GNU Library General Public License (LGPL) version 2.0 or any later version' use: - SPDX-License-Identifier: LGPL-2.0+ + SPDX-License-Identifier: LGPL-2.0-or-later License-Text: diff --git a/LICENSES/LGPL-2.1 b/LICENSES/LGPL-2.1 index b366c7e491..d3e213c39c 100644 --- a/LICENSES/LGPL-2.1 +++ b/LICENSES/LGPL-2.1 @@ -1,7 +1,8 @@ -Valid-License-Identifier: LGPL-2.1 -Valid-License-Identifier: LGPL-2.1+ +Valid-License-Identifier: LGPL-2.1-only +Valid-License-Identifier: LGPL-2.1-or-later -SPDX-URL: https://spdx.org/licenses/LGPL-2.1.html +SPDX-URL: https://spdx.org/licenses/LGPL-2.1-only.html +SPDX-URL: https://spdx.org/licenses/LGPL-2.1-or-later.html Usage-Guide: @@ -10,11 +11,11 @@ Usage-Guide: guidelines in the licensing rules documentation. For 'GNU Lesser General Public License (LGPL) version 2.1 only' use: - SPDX-License-Identifier: LGPL-2.1 + SPDX-License-Identifier: LGPL-2.1-only For 'GNU Lesser General Public License (LGPL) version 2.1 or any later version' use: - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later License-Text: diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile index 0e6fbe897a..b21a64c6b4 100644 --- a/tools/libacpi/Makefile +++ b/tools/libacpi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1 +# SPDX-License-Identifier: LGPL-2.1-only # # Copyright (c) 2004, Intel Corporation. diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h index fbbf8da660..6dfa939a8c 100644 --- a/tools/libacpi/acpi2_0.h +++ b/tools/libacpi/acpi2_0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /* * Copyright (c) 2004, Intel Corporation. */ diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index 4e5c20b32e..2f29863db1 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /* * Copyright (c) 2004, Intel Corporation. * Copyright (c) 2006, Keir Fraser, XenSource Inc. diff --git a/tools/libacpi/dsdt.asl b/tools/libacpi/dsdt.asl index c6691b56a9..32b42f85ae 100644 --- a/tools/libacpi/dsdt.asl +++ b/tools/libacpi/dsdt.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /****************************************************************************** * DSDT for Xen with Qemu device model * diff --git a/tools/libacpi/dsdt_acpi_info.asl b/tools/libacpi/dsdt_acpi_info.asl index c6e82f1fe6..6e114fa234 100644 --- a/tools/libacpi/dsdt_acpi_info.asl +++ b/tools/libacpi/dsdt_acpi_info.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ Scope (\_SB) { diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index d9387fc6eb..deda39e5db 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /****************************************************************************** * libacpi.h * diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index c74b270c0c..34f6753f61 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ #include #include diff --git a/tools/libacpi/ssdt_laptop_slate.asl b/tools/libacpi/ssdt_laptop_slate.asl index 494f2d048d..69fd504c19 100644 --- a/tools/libacpi/ssdt_laptop_slate.asl +++ b/tools/libacpi/ssdt_laptop_slate.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /* * ssdt_conv.asl * diff --git a/tools/libacpi/ssdt_pm.asl b/tools/libacpi/ssdt_pm.asl index e577e85c07..db578d10ac 100644 --- a/tools/libacpi/ssdt_pm.asl +++ b/tools/libacpi/ssdt_pm.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /* * ssdt_pm.asl * diff --git a/tools/libacpi/ssdt_s3.asl b/tools/libacpi/ssdt_s3.asl index 8f3177ec5a..f6e9636f47 100644 --- a/tools/libacpi/ssdt_s3.asl +++ b/tools/libacpi/ssdt_s3.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /* * ssdt_s3.asl * diff --git a/tools/libacpi/ssdt_s4.asl b/tools/libacpi/ssdt_s4.asl index 979318eca1..8014f5fc90 100644 --- a/tools/libacpi/ssdt_s4.asl +++ b/tools/libacpi/ssdt_s4.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /* * ssdt_s4.asl * diff --git a/tools/libacpi/ssdt_tpm.asl b/tools/libacpi/ssdt_tpm.asl index 6c3267218f..944658d251 100644 --- a/tools/libacpi/ssdt_tpm.asl +++ b/tools/libacpi/ssdt_tpm.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /* * ssdt_tpm.asl * diff --git a/tools/libacpi/static_tables.c b/tools/libacpi/static_tables.c index 631fb91141..715f46fee0 100644 --- a/tools/libacpi/static_tables.c +++ b/tools/libacpi/static_tables.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: LGPL-2.1-only */ /* * Copyright (c) 2004, Intel Corporation. * Copyright (c) 2006, Keir Fraser, XenSource Inc. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 10 01:44:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 May 2023 01:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.532618.828835 (Exim 4.92) (envelope-from ) id 1pwYsR-0003HF-Ed; Wed, 10 May 2023 01:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 532618.828835; Wed, 10 May 2023 01:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYsR-0003H8-Bz; Wed, 10 May 2023 01:44:23 +0000 Received: by outflank-mailman (input) for mailman id 532618; Wed, 10 May 2023 01:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYsP-0003Gy-Vr for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pwYsP-0001Ri-V4 for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pwYsP-0005zI-U4 for xen-changelog@lists.xenproject.org; Wed, 10 May 2023 01:44:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GesTaEh4nT/BhSvCdo/Mz7NyzCBBSGWfgnQoyeaun88=; b=yywIQ8LpYuKEf7VxU06M1r3hhQ kdirdvU2L08+8bl96Lak5uxeFbgABJNXd9YQiMQeS4pdmCmPlSsMNtkkblzW+0FPTn/d8H8ZMHlvI H/p/ScNNsmB0Ibx7zEPsmsefTLpiIiKYT+xdIehD0E87MgZRQLBTGkMOc/umiMf/1Pxk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/man: fix xenstore-write synopsis Message-Id: Date: Wed, 10 May 2023 01:44:21 +0000 commit 8b1ac353b4db7c5bb2f82cb6afee9cc641e756a4 Author: Yann Dirson AuthorDate: Tue May 9 09:01:36 2023 +0000 Commit: Andrew Cooper CommitDate: Tue May 9 10:37:29 2023 +0100 docs/man: fix xenstore-write synopsis Reported-by: zithro Signed-off-by: Yann Dirson Reviewed-by: Andrew Cooper --- docs/man/xenstore-write.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/man/xenstore-write.1.pod b/docs/man/xenstore-write.1.pod index a0b1bca333..74f80f7b1b 100644 --- a/docs/man/xenstore-write.1.pod +++ b/docs/man/xenstore-write.1.pod @@ -4,7 +4,7 @@ xenstore-write - write Xenstore values =head1 SYNOPSIS -B [I