Re: [PATCH v3 1/1] s390: ipl: fix physical-virtual confusion for diag308

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Mar 10, 2023 at 02:34:11PM +0100, Nico Boehr wrote:
> Diag 308 subcodes expect a physical address as their parameter.
> 
> This currently is not a bug, but in the future physical and virtual
> addresses might differ.
> 
> Fix the confusion by doing a virtual-to-physical conversion in the
> exported diag308() and leave the assembly wrapper __diag308() alone.
> 
> Note that several callers pass NULL as addr, so check for the case when
> NULL is passed and pass 0 to hardware since virt_to_phys(0) might be
> nonzero.
> 
> Suggested-by: Marc Hartmayer <mhartmay@xxxxxxxxxxxxx>
> Signed-off-by: Nico Boehr <nrb@xxxxxxxxxxxxx>
> ---
>  arch/s390/kernel/ipl.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
> index 5f0f5c86963a..afac9970ce42 100644
> --- a/arch/s390/kernel/ipl.c
> +++ b/arch/s390/kernel/ipl.c
> @@ -176,11 +176,11 @@ static bool reipl_fcp_clear;
>  static bool reipl_ccw_clear;
>  static bool reipl_eckd_clear;
>  
> -static inline int __diag308(unsigned long subcode, void *addr)
> +static inline int __diag308(unsigned long subcode, unsigned long addr)
>  {
>  	union register_pair r1;
>  
> -	r1.even = (unsigned long) addr;
> +	r1.even = addr;
>  	r1.odd	= 0;
>  	asm volatile(
>  		"	diag	%[r1],%[subcode],0x308\n"
> @@ -195,7 +195,7 @@ static inline int __diag308(unsigned long subcode, void *addr)
>  int diag308(unsigned long subcode, void *addr)
>  {
>  	diag_stat_inc(DIAG_STAT_X308);
> -	return __diag308(subcode, addr);
> +	return __diag308(subcode, addr ? virt_to_phys(addr) : 0);
>  }
>  EXPORT_SYMBOL_GPL(diag308);

Reviewed-by: Alexander Gordeev <agordeev@xxxxxxxxxxxxx>



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Kernel Development]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Info]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Linux Media]     [Device Mapper]

  Powered by Linux