2022-07-08 16:23:22

by Kristen Carlson Accardi

[permalink] [raw]
Subject: [PATCH] x86/sgx: Drop 'page_index' from sgx_backing

From: Sean Christopherson <[email protected]>

Storing the 'page_index' value in the sgx_backing struct is
dead code and no longer needed.

Signed-off-by: Sean Christopherson <[email protected]>
Signed-off-by: Kristen Carlson Accardi <[email protected]>
Cc: Sean Christopherson <[email protected]>
---
arch/x86/kernel/cpu/sgx/encl.c | 1 -
arch/x86/kernel/cpu/sgx/encl.h | 1 -
2 files changed, 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
index 19876ebfb504..fa93586a536c 100644
--- a/arch/x86/kernel/cpu/sgx/encl.c
+++ b/arch/x86/kernel/cpu/sgx/encl.c
@@ -735,7 +735,6 @@ static int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index,
return PTR_ERR(pcmd);
}

- backing->page_index = page_index;
backing->contents = contents;
backing->pcmd = pcmd;
backing->pcmd_offset = page_pcmd_off & (PAGE_SIZE - 1);
diff --git a/arch/x86/kernel/cpu/sgx/encl.h b/arch/x86/kernel/cpu/sgx/encl.h
index 332ef3568267..eeb1a53ddf48 100644
--- a/arch/x86/kernel/cpu/sgx/encl.h
+++ b/arch/x86/kernel/cpu/sgx/encl.h
@@ -78,7 +78,6 @@ struct sgx_va_page {
};

struct sgx_backing {
- pgoff_t page_index;
struct page *contents;
struct page *pcmd;
unsigned long pcmd_offset;
--
2.20.1


Subject: [tip: x86/sgx] x86/sgx: Drop 'page_index' from sgx_backing

The following commit has been merged into the x86/sgx branch of tip:

Commit-ID: e0a5915f1cca21da8ffc0563aea9fa1df5d16fb4
Gitweb: https://git.kernel.org/tip/e0a5915f1cca21da8ffc0563aea9fa1df5d16fb4
Author: Sean Christopherson <[email protected]>
AuthorDate: Fri, 08 Jul 2022 09:21:24 -07:00
Committer: Dave Hansen <[email protected]>
CommitterDate: Fri, 08 Jul 2022 09:31:11 -07:00

x86/sgx: Drop 'page_index' from sgx_backing

Storing the 'page_index' value in the sgx_backing struct is
dead code and no longer needed.

Signed-off-by: Sean Christopherson <[email protected]>
Signed-off-by: Kristen Carlson Accardi <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
arch/x86/kernel/cpu/sgx/encl.c | 1 -
arch/x86/kernel/cpu/sgx/encl.h | 1 -
2 files changed, 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
index 295a9c9..73bfc5a 100644
--- a/arch/x86/kernel/cpu/sgx/encl.c
+++ b/arch/x86/kernel/cpu/sgx/encl.c
@@ -943,7 +943,6 @@ int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index,
return PTR_ERR(pcmd);
}

- backing->page_index = page_index;
backing->contents = contents;
backing->pcmd = pcmd;
backing->pcmd_offset = page_pcmd_off & (PAGE_SIZE - 1);
diff --git a/arch/x86/kernel/cpu/sgx/encl.h b/arch/x86/kernel/cpu/sgx/encl.h
index 3d0e0ba..57cc236 100644
--- a/arch/x86/kernel/cpu/sgx/encl.h
+++ b/arch/x86/kernel/cpu/sgx/encl.h
@@ -79,7 +79,6 @@ struct sgx_va_page {
};

struct sgx_backing {
- pgoff_t page_index;
struct page *contents;
struct page *pcmd;
unsigned long pcmd_offset;

2022-07-11 02:52:14

by Jarkko Sakkinen

[permalink] [raw]
Subject: Re: [PATCH] x86/sgx: Drop 'page_index' from sgx_backingf

On Fri, Jul 08, 2022 at 09:21:24AM -0700, Kristen Carlson Accardi wrote:
> From: Sean Christopherson <[email protected]>
>
> Storing the 'page_index' value in the sgx_backing struct is
> dead code and no longer needed.
>
> Signed-off-by: Sean Christopherson <[email protected]>
> Signed-off-by: Kristen Carlson Accardi <[email protected]>
> Cc: Sean Christopherson <[email protected]>
> ---
> arch/x86/kernel/cpu/sgx/encl.c | 1 -
> arch/x86/kernel/cpu/sgx/encl.h | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
> index 19876ebfb504..fa93586a536c 100644
> --- a/arch/x86/kernel/cpu/sgx/encl.c
> +++ b/arch/x86/kernel/cpu/sgx/encl.c
> @@ -735,7 +735,6 @@ static int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index,
> return PTR_ERR(pcmd);
> }
>
> - backing->page_index = page_index;
> backing->contents = contents;
> backing->pcmd = pcmd;
> backing->pcmd_offset = page_pcmd_off & (PAGE_SIZE - 1);
> diff --git a/arch/x86/kernel/cpu/sgx/encl.h b/arch/x86/kernel/cpu/sgx/encl.h
> index 332ef3568267..eeb1a53ddf48 100644
> --- a/arch/x86/kernel/cpu/sgx/encl.h
> +++ b/arch/x86/kernel/cpu/sgx/encl.h
> @@ -78,7 +78,6 @@ struct sgx_va_page {
> };
>
> struct sgx_backing {
> - pgoff_t page_index;
> struct page *contents;
> struct page *pcmd;
> unsigned long pcmd_offset;
> --
> 2.20.1
>


Reviewed-by: Jarkko Sakkinen <[email protected]>

BR, Jarkko