s390/ism: fix receive message buffer allocation
Subsystems (4)
PATCH v2 1/1 s390/ism: fix receive message buffer allocation
Since [1], dma_alloc_coherent() does not accept requests for GFP_COMP anymore, even on archs that may be able to fulfill this. Functionality that relied on the receive buffer being a compound page broke at that point:
The SMC-D protocol, that utilizes the ism device driver, passes receive buffers to the splice processor in a struct splice_pipe_desc with a single entry list of struct pages. As the buffer is no longer a compound page, the splice processor now rejects requests to handle more than a page worth of data.
Replace dma_alloc_coherent() and allocate a buffer with folio_alloc and create a DMA map for it with dma_map_page(). Since only receive buffers on ISM devices use DMA, qualify the mapping as FROM_DEVICE. Since ISM devices are available on arch s390, only and on that arch all DMA is coherent, there is no need to introduce and export some kind of dma_sync_to_cpu() method to be called by the SMC-D protocol layer.
Analogously, replace dma_free_coherent by a two step dma_unmap_page, then folio_put to free the receive buffer.
[1] https://lore.kernel.org/all/[email protected]/
---
Sorry for the immediate resend - forgot to mark this for "net"
changelog:v1->v2:
- replaced kmalloc/kfree with folio_alloc/folio_put as suggested.
--- drivers/s390/net/ism_drv.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-)
drivers/s390/net/ism_drv.c +29 -9
@@ -14,6 +14,8 @@#include <linux/err.h> #include <linux/ctype.h> #include <linux/processor.h> +#include <linux/dma-mapping.h> +#include <linux/mm.h> #include "ism.h"
@@ -292,13 +294,15 @@ static int ism_read_local_gid(struct ism_dev *ism)static void ism_free_dmb (struct ism_dev *ism,struct ism_dmb *dmb) {clear_bit (dmb->sba_idx, ism->sba_bitmap); -dma_free_coherent (&ism->pdev->dev, dmb->dmb_len, - dmb->cpu_addr, dmb->dma_addr); +dma_unmap_page (&ism->pdev->dev, dmb->dma_addr, dmb->dmb_len, +DMA_FROM_DEVICE ); +folio_put (virt_to_folio (dmb->cpu_addr)); }static int ism_alloc_dmb (struct ism_dev *ism,struct ism_dmb *dmb) {unsigned long bit; +int rc;if (PAGE_ALIGN (dmb->dmb_len) >dma_get_max_seg_size (&ism->pdev->dev))return -EINVAL ;
@@ -315,14 +319,30 @@ static int ism_alloc_dmb(struct ism_dev *ism, struct ism_dmb *dmb) test_and_set_bit(dmb->sba_idx, ism->sba_bitmap)) return -EINVAL; - dmb->cpu_addr =dma_alloc_coherent (&ism->pdev->dev, dmb->dmb_len, - &dmb->dma_addr, -GFP_KERNEL | __GFP_NOWARN | - __GFP_NOMEMALLOC | __GFP_NORETRY); -if (!dmb->cpu_addr) -clear_bit (dmb->sba_idx, ism->sba_bitmap); + dmb->cpu_addr = +folio_address (folio_alloc (GFP_KERNEL | __GFP_NOWARN | + __GFP_NOMEMALLOC | __GFP_NORETRY, +get_order (dmb->dmb_len))); -return dmb->cpu_addr ?0 : -ENOMEM ; +if (!dmb->cpu_addr) { + rc = -ENOMEM ; + goto out_bit; + } + dmb->dma_addr =dma_map_page (&ism->pdev->dev, +virt_to_page (dmb->cpu_addr),0 , + dmb->dmb_len,DMA_FROM_DEVICE ); +if (dma_mapping_error (&ism->pdev->dev, dmb->dma_addr)) { + rc = -ENOMEM ; + goto out_free; + } + +return 0 ; + +out_free: +kfree (dmb->cpu_addr); +out_bit: +clear_bit (dmb->sba_idx, ism->sba_bitmap); +return rc; } int ism_register_dmb(struct ism_dev *ism, struct ism_dmb *dmb,
Signature · 1 line
2.44.0
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 10 lines · On Fri, 5 Apr 2024 13:16:06 +0200 you wrote:
Since [1],
dma_alloc_coherent()does not accept requests forGFP_COMPanymore, even on archs that may be able to fulfill this. Functionality that relied on the receive buffer being a compound page broke at that point:
The SMC-D protocol, that utilizes the ism device driver, passes receive buffers to the splice processor in a structsplice_pipe_descwith a single entry list of struct pages. As the buffer is no longer a compound page, the splice processor now rejects requests to handle more than a page worth of data.[...]
Here is the summary with links:
- [net,v2] s390/ism: fix receive message buffer allocation
https://git.kernel.org/netdev/net/c/58effa347653
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 15 lines · On Mon, 2024-04-08 at 11:00 +0000, [email protected] wrote:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:Quoted 9 lines · On Fri, 5 Apr 2024 13:16:06 +0200 you wrote:
Since [1],
dma_alloc_coherent()does not accept requests forGFP_COMPanymore, even on archs that may be able to fulfill this. Functionality that relied on the receive buffer being a compound page broke at that point:
The SMC-D protocol, that utilizes the ism device driver, passes receive buffers to the splice processor in a structsplice_pipe_descwith a single entry list of struct pages. As the buffer is no longer a compound page, the splice processor now rejects requests to handle more than a page worth of data.
Quoted 7 lines
Quoted 1 line
[...]
Here is the summary with links:
- [net,v2] s390/ism: fix receive message buffer allocationhttps://git.kernel.org/netdev/net/c/58effa347653You are awesome, thank you!
This version of the patch has an outstanding issue around handling allocation failure see the comments on v1 here[0]. Please drop. Gerd will send a v3 with that issue fixed.
Thanks,
Niklas
Quoted 32 lines · Niklas Schnelle
Quoted 22 lines · On Mon, 2024-04-08 at 11:00 +0000, [email protected] wrote:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:Quoted 16 lines · On Fri, 5 Apr 2024 13:16:06 +0200 you wrote:
Since [1],
dma_alloc_coherent()does not accept requests forGFP_COMP
anymore, even on archs that may be able to fulfill this. Functionality that
relied on the receive buffer being a compound page broke at that point:
The SMC-D protocol, that utilizes the ism device driver, passes receive
buffers to the splice processor in a structsplice_pipe_descwith a
single entry list of struct pages. As the buffer is no longer a compound
page, the splice processor now rejects requests to handle more than a
page worth of data.Quoted 7 lines
Quoted 1 line
[...]
Here is the summary with links:
- [net,v2] s390/ism: fix receive message buffer allocation
https://git.kernel.org/netdev/net/c/58effa347653You are awesome, thank you!
Quoted 8 lines
This version of the patch has an outstanding issue around handling allocation failure see the comments on v1 here[0]. Please drop. Gerd will send a v3 with that issue fixed.
Thanks,
Niklas
Hi Dave,
so how do we go forward? Would you revert this v2 in the netdev tree to have my next v3 properly reviewed?
Second best option: I can send a fixup to address the last issue from [0], but that would still leave some pieces sent with (v1/v2) not properly R-by'd or at least ack'd.
Thanks,
Gerd
Jakub Kicinski
maintainerQuoted 1 line · On Mon, 08 Apr 2024 21:05:47 +0200 Gerd Bayer wrote:
Hi Dave,
Hi, from the Dave replacement service.
Quoted 6 lines
so how do we go forward? Would you revert this v2 in the netdev tree to have my next v3 properly reviewed?
Second best option: I can send a fixup to address the last issue from [0], but that would still leave some pieces sent with (v1/v2) not properly R-by'd or at least ack'd.
If there's a chance we can get an incremental fix ready to merge by Wednesday morning, let's try that. If we fail please post a revert by Wednesday morning. On Thu morning EU time we'll ship the fixes to Linus, so we gotta have the tree in a good share at that point.
Quoted 4 lines · Jakub Kicinski
Quoted 1 line · On Mon, 08 Apr 2024 21:05:47 +0200 Gerd Bayer wrote:
Hi Dave,
Hi, from the Dave replacement service.
Hi Jakub,
Quoted 4 lines
If there's a chance we can get an incremental fix ready to merge by Wednesday morning, let's try that. If we fail please post a revert by Wednesday morning. On Thu morning EU time we'll ship the fixes to Linus, so we gotta have the tree in a good share at that point.
I'm preparing a revert right now, as I'm not sure the review is at the bottom of things, yet.
Thanks,
Gerd