Commit 958a140d authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski

mlxsw: pci: Allocate skbs using GFP_KERNEL during initialization

The driver allocates skbs during initialization and during Rx
processing. Take advantage of the fact that the former happens in
process context and allocate the skbs using GFP_KERNEL to decrease the
probability of allocation failure.

Tested with CONFIG_DEBUG_ATOMIC_SLEEP=y.
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/dfa6ed0926e045fe7c14f0894cc0c37fee81bf9d.1697034729.git.petrm@nvidia.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5ee0a3bd
...@@ -352,14 +352,15 @@ static void mlxsw_pci_wqe_frag_unmap(struct mlxsw_pci *mlxsw_pci, char *wqe, ...@@ -352,14 +352,15 @@ static void mlxsw_pci_wqe_frag_unmap(struct mlxsw_pci *mlxsw_pci, char *wqe,
} }
static int mlxsw_pci_rdq_skb_alloc(struct mlxsw_pci *mlxsw_pci, static int mlxsw_pci_rdq_skb_alloc(struct mlxsw_pci *mlxsw_pci,
struct mlxsw_pci_queue_elem_info *elem_info) struct mlxsw_pci_queue_elem_info *elem_info,
gfp_t gfp)
{ {
size_t buf_len = MLXSW_PORT_MAX_MTU; size_t buf_len = MLXSW_PORT_MAX_MTU;
char *wqe = elem_info->elem; char *wqe = elem_info->elem;
struct sk_buff *skb; struct sk_buff *skb;
int err; int err;
skb = netdev_alloc_skb_ip_align(NULL, buf_len); skb = __netdev_alloc_skb_ip_align(NULL, buf_len, gfp);
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
...@@ -420,7 +421,7 @@ static int mlxsw_pci_rdq_init(struct mlxsw_pci *mlxsw_pci, char *mbox, ...@@ -420,7 +421,7 @@ static int mlxsw_pci_rdq_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
for (i = 0; i < q->count; i++) { for (i = 0; i < q->count; i++) {
elem_info = mlxsw_pci_queue_elem_info_producer_get(q); elem_info = mlxsw_pci_queue_elem_info_producer_get(q);
BUG_ON(!elem_info); BUG_ON(!elem_info);
err = mlxsw_pci_rdq_skb_alloc(mlxsw_pci, elem_info); err = mlxsw_pci_rdq_skb_alloc(mlxsw_pci, elem_info, GFP_KERNEL);
if (err) if (err)
goto rollback; goto rollback;
/* Everything is set up, ring doorbell to pass elem to HW */ /* Everything is set up, ring doorbell to pass elem to HW */
...@@ -640,7 +641,7 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci, ...@@ -640,7 +641,7 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci,
if (q->consumer_counter++ != consumer_counter_limit) if (q->consumer_counter++ != consumer_counter_limit)
dev_dbg_ratelimited(&pdev->dev, "Consumer counter does not match limit in RDQ\n"); dev_dbg_ratelimited(&pdev->dev, "Consumer counter does not match limit in RDQ\n");
err = mlxsw_pci_rdq_skb_alloc(mlxsw_pci, elem_info); err = mlxsw_pci_rdq_skb_alloc(mlxsw_pci, elem_info, GFP_ATOMIC);
if (err) { if (err) {
dev_err_ratelimited(&pdev->dev, "Failed to alloc skb for RDQ\n"); dev_err_ratelimited(&pdev->dev, "Failed to alloc skb for RDQ\n");
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment