scsi: ips: Replace kmap_atomic() with kmap_local_page()
Subsystems (3)
PATCH 1/1 scsi: ips: Replace kmap_atomic() with kmap_local_page()
kmap_atomic() is deprecated in favor of kmap_local_page(). Therefore, replace kmap_atomic() with kmap_local_page() in ips_is_passthru(). In the meantime remove an unnecessary comment soon before local mapping, align code and remove spaces (the function is short, therefore the reviewers job won't be over-complicated by these logically unrelated clean-ups).
kmap_atomic() is implemented like a kmap_local_page() which also disables page-faults and preemption (the latter only for !PREEMPT_RT kernels). The code within the mapping/unmapping in ips_is_passthru() is already in atomic context because of a call to local_irq_save() and kmap_local_page() can be called in atomic context too (including interrupts).
Therefore, a mere replacement of the old API with the new one is all it is required (i.e., there is no need to explicitly add any calls to pagefault_disable() and/or preempt_disable()).
--- drivers/scsi/ips.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/scsi/ips.c +5 -6
@@ -1499,17 +1499,16 @@ static int ips_is_passthru(struct scsi_cmnd *SC)struct scatterlist *sg =scsi_sglist (SC );char *buffer; -/* kmap_atomic() ensures addressability of the user buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg_page (sg)) + sg->offset; -if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && - buffer[2 ] =='P' && buffer[3 ] =='P' ) { -kunmap_atomic (buffer - sg->offset); + buffer =kmap_local_page (sg_page (sg)) + sg->offset; +if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && + buffer[2 ] =='P' && buffer[3 ] =='P' ) { +kunmap_local (buffer);local_irq_restore (flags);return 1 ; } -kunmap_atomic (buffer - sg->offset); +kunmap_local (buffer);local_irq_restore (flags); }return 0 ;
Signature · 1 line
2.39.0
Quoted 14 lines · Fabio M. De Francesco
kmap_atomic()is deprecated in favor ofkmap_local_page(). Therefore, replacekmap_atomic()withkmap_local_page()inips_is_passthru(). In the meantime remove an unnecessary comment soon before local mapping, align code and remove spaces (the function is short, therefore the reviewers job won't be over-complicated by these logically unrelated clean-ups).
kmap_atomic()is implemented like akmap_local_page()which also disables page-faults and preemption (the latter only for !PREEMPT_RT kernels). The code within the mapping/unmapping inips_is_passthru()is already in atomic context because of a call tolocal_irq_save()andkmap_local_page()can be called in atomic context too (including interrupts).
Quoted 5 lines
Therefore, a mere replacement of the old API with the new one is all it is required (i.e., there is no need to explicitly add any calls to
pagefault_disable()and/orpreempt_disable()).Suggested-by Ira Weiny <[email protected]>
The discussion about preemption is irrelevant AFAICS. But what you say above is not wrong and the code looks right.
Quoted 35 lines
Signed-off-by Fabio M. De Francesco <[email protected]>--- drivers/scsi/ips.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)drivers/scsi/ips.c +5
-6@@ -1499,17 +1499,16 @@ static int ips_is_passthru(struct scsi_cmnd *SC)struct scatterlist *sg =scsi_sglist (SC );char *buffer; -/* kmap_atomic() ensures addressability of the user buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg_page (sg)) + sg->offset; -if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && - buffer[2 ] =='P' && buffer[3 ] =='P' ) { -kunmap_atomic (buffer - sg->offset); + buffer =kmap_local_page (sg_page (sg)) + sg->offset; +if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && + buffer[2 ] =='P' && buffer[3 ] =='P' ) { +kunmap_local (buffer);local_irq_restore (flags);return 1 ; } -kunmap_atomic (buffer - sg->offset); +kunmap_local (buffer);local_irq_restore (flags); }return 0 ;Signature · 1 line
2.39.0
Martin K. Petersen
AppliedFabio,
Quoted 3 lines
Therefore, a mere replacement of the old API with the new one is all it is required (i.e., there is no need to explicitly add any calls to
pagefault_disable()and/orpreempt_disable()).
Applied to 6.3/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 8 lines · Fabio M. De Francesco
kmap_atomic()is deprecated in favor ofkmap_local_page(). Therefore, replacekmap_atomic()withkmap_local_page()inips_is_passthru(). In the meantime remove an unnecessary comment soon before local mapping, align code and remove spaces (the function is short, therefore the reviewers job won't be over-complicated by these logically unrelated clean-ups).[...]
Applied to 6.3/scsi-queue, thanks!
[1/1] scsi: ips: Replace kmap_atomic() with kmap_local_page()
https://git.kernel.org/mkp/scsi/c/7edd053b3327
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering