[focal:linux-azure][PATCH 0/1] LP:#1881338 - linux-azure: Update SGX version to version LD_1.33

Wed Jul 1 08:34:50 UTC 2020

On 01.07.20 04:43, Khaled Elmously wrote:
> I'm unable to apply these patches to the nominated branches:
> 
> Applying: UBUNTU: SAUCE: linux-azure: Update SGX to version LD_1.33
> error: arch/x86/include/asm/sgx.h: does not exist in index
> error: arch/x86/include/asm/sgx_arch.h: does not exist in index
> error: arch/x86/include/asm/sgx_pr.h: does not exist in index
> error: arch/x86/include/dcap.h: already exists in index
> error: arch/x86/include/uapi/asm/sgx.h: does not exist in index
> error: arch/x86/include/uapi/asm/sgx_oot.h: already exists in index
> error: patch failed: ubuntu/sgx/Makefile:1
> error: ubuntu/sgx/Makefile: patch does not apply
> error: ubuntu/sgx/arch.h: already exists in index
> error: ubuntu/sgx/dkms.conf: already exists in index
> error: ubuntu/sgx/driver.c: already exists in index
> error: ubuntu/sgx/driver.h: already exists in index
> error: ubuntu/sgx/encl.c: already exists in index
> error: ubuntu/sgx/encl.h: already exists in index
> error: ubuntu/sgx/encls.h: already exists in index
> error: ubuntu/sgx/ioctl.c: already exists in index
> error: ubuntu/sgx/main.c: already exists in index
> error: ubuntu/sgx/reclaim.c: already exists in index
> error: patch failed: ubuntu/sgx/sgx.h:1
> error: ubuntu/sgx/sgx.h: patch does not apply
> error: ubuntu/sgx/sgx_driver_info.h: does not exist in index
> error: ubuntu/sgx/sgx_encl.c: does not exist in index
> error: ubuntu/sgx/sgx_ioctl.c: does not exist in index
> error: ubuntu/sgx/sgx_main.c: does not exist in index
> error: ubuntu/sgx/sgx_page_cache.c: does not exist in index
> error: ubuntu/sgx/sgx_util.c: does not exist in index
> error: ubuntu/sgx/sgx_version.h: does not exist in index
> error: ubuntu/sgx/sgx_vma.c: does not exist in index
> error: ubuntu/sgx/version.h: already exists in index
> Patch failed at 0001 UBUNTU: SAUCE: linux-azure: Update SGX to version LD_1.33
> 
> 
> 
> 
> Is there something special needed to apply these changes?

When looking a little back in history I found a submission which adds the SGX
driver to previous releases (guess focal was in devel then). That was applied to
the main kernel branch then. It somehow was not done for focal. However it had
been applied to the azure tree. And the patch cannot be applied because it is
already there. And seems to be part of the version currently in proposed.
Marcelo, you probably should have sent either nack or applied to the focal part
of this submission.

-Stefan
> 
> 
> 
> On 2020-06-09 13:51:42 , Marcelo Henrique Cerri wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1881338
>>
>> As requested by Microsoft. The change was tested on Azure ACC
>> instances as well on local Hyper-V instances. And only affect
>> linux-azure running on very specific instances types.
>>
>> Unfortunately the driver repo uses a different directory structure and
>> the commits since the last update are not very organized and include
>> several revert and rename of file.
>>
>> Because of that I decided to squash the update in a single commit
>> referring the driver repository changes.
>>
>> Besides LD_1.33 change I added an additional #if around
>> sgx_encl_mm_release_deferred() in order to fix the compilation for
>> 5.4. This change as approved my Microsoft and Intel.
>>
>> Focal required a separate patches because we applied a small change
>> when 5.4 linux-azure was prepared.
>>
>> ---
>> Marcelo Henrique Cerri (1):
>>   UBUNTU: SAUCE: linux-azure: Update SGX to version LD_1.33
>>
>>  arch/x86/include/asm/sgx.h          | 233 -------
>>  arch/x86/include/asm/sgx_arch.h     | 278 --------
>>  arch/x86/include/asm/sgx_pr.h       |  80 ---
>>  arch/x86/include/dcap.h             |  39 ++
>>  arch/x86/include/uapi/asm/sgx.h     | 154 -----
>>  arch/x86/include/uapi/asm/sgx_oot.h | 114 ++++
>>  ubuntu/sgx/Makefile                 |  68 +-
>>  ubuntu/sgx/arch.h                   | 342 ++++++++++
>>  ubuntu/sgx/dkms.conf                |   6 +
>>  ubuntu/sgx/driver.c                 | 223 +++++++
>>  ubuntu/sgx/driver.h                 |  33 +
>>  ubuntu/sgx/encl.c                   | 821 +++++++++++++++++++++++
>>  ubuntu/sgx/encl.h                   | 132 ++++
>>  ubuntu/sgx/encls.h                  | 239 +++++++
>>  ubuntu/sgx/ioctl.c                  | 829 ++++++++++++++++++++++++
>>  ubuntu/sgx/main.c                   | 329 ++++++++++
>>  ubuntu/sgx/reclaim.c                | 505 +++++++++++++++
>>  ubuntu/sgx/sgx.h                    | 342 +++-------
>>  ubuntu/sgx/sgx_driver_info.h        |  62 --
>>  ubuntu/sgx/sgx_encl.c               | 973 ----------------------------
>>  ubuntu/sgx/sgx_ioctl.c              | 332 ----------
>>  ubuntu/sgx/sgx_main.c               | 498 --------------
>>  ubuntu/sgx/sgx_page_cache.c         | 596 -----------------
>>  ubuntu/sgx/sgx_util.c               | 382 -----------
>>  ubuntu/sgx/sgx_version.h            |  60 --
>>  ubuntu/sgx/sgx_vma.c                | 242 -------
>>  ubuntu/sgx/version.h                |  10 +
>>  27 files changed, 3708 insertions(+), 4214 deletions(-)
>>  delete mode 100644 arch/x86/include/asm/sgx.h
>>  delete mode 100755 arch/x86/include/asm/sgx_arch.h
>>  delete mode 100644 arch/x86/include/asm/sgx_pr.h
>>  create mode 100644 arch/x86/include/dcap.h
>>  delete mode 100644 arch/x86/include/uapi/asm/sgx.h
>>  create mode 100644 arch/x86/include/uapi/asm/sgx_oot.h
>>  create mode 100644 ubuntu/sgx/arch.h
>>  create mode 100644 ubuntu/sgx/dkms.conf
>>  create mode 100644 ubuntu/sgx/driver.c
>>  create mode 100644 ubuntu/sgx/driver.h
>>  create mode 100644 ubuntu/sgx/encl.c
>>  create mode 100644 ubuntu/sgx/encl.h
>>  create mode 100644 ubuntu/sgx/encls.h
>>  create mode 100644 ubuntu/sgx/ioctl.c
>>  create mode 100644 ubuntu/sgx/main.c
>>  create mode 100644 ubuntu/sgx/reclaim.c
>>  delete mode 100644 ubuntu/sgx/sgx_driver_info.h
>>  delete mode 100644 ubuntu/sgx/sgx_encl.c
>>  delete mode 100644 ubuntu/sgx/sgx_ioctl.c
>>  delete mode 100644 ubuntu/sgx/sgx_main.c
>>  delete mode 100644 ubuntu/sgx/sgx_page_cache.c
>>  delete mode 100644 ubuntu/sgx/sgx_util.c
>>  delete mode 100644 ubuntu/sgx/sgx_version.h
>>  delete mode 100644 ubuntu/sgx/sgx_vma.c
>>  create mode 100644 ubuntu/sgx/version.h
>>
>> -- 
>> 2.25.1
>>
>>
>> -- 
>> kernel-team mailing list
>> kernel-team at lists.ubuntu.com
>> https://lists.ubuntu.com/mailman/listinfo/kernel-team
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20200701/b730b582/attachment.sig>