From patchwork Wed Mar 26 08:18:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 14029858 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8FA71A3142 for ; Wed, 26 Mar 2025 08:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742977147; cv=none; b=ojxrP7T99NaHCkXCyLy0n/WzNArU8pnFHfNXWX4UC/2OkiQn9g4Z4CvSWXWrFXp3RgYMbXWwxzoBIckOVhboecnaxsMsrCCNIk8FXV697txkzOcpAUSE4O/TCXh4o9RMrGtX1jE7ZzuuFzYNbNh+wwBMNEkJqUVhu6pC1tHOqjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742977147; c=relaxed/simple; bh=iofBJfRVG4BOlspccJuOxKZ8GN7yJUVTePwGTFtKji8=; h=From:Subject:Date:Message-Id:MIME-Version:Content-Type:To:Cc; b=uX0q+hX7IXZ3W//fThxkoYiAEaZIn9zjvRQ0a9nOXAzbdr4D82RV7l6WkVd5XO83D1NqnVlceUsTh2j+lKo5qWhHng5qhmKZ5x4ulb4N4Ep54bUaEz22cAg6BN/I7Iy4/Rt+us8A6ZjjJzQlL//hIyD1r3yO75xm3ab5wL5bhCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SdUk/oRJ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SdUk/oRJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742977145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJrq4mLJiJXWNMpizUXhY6u/aCQe+JkhHXm5jj4+P0s=; b=SdUk/oRJcafcxYMJSEKJTp87FSp1i6BHEJXKinqMpiCizWCtoQMEX6ZYjrWNNoMbxYIiQI lE2+c52DZkNRgQ6KvQfCre22Qun1vUoTrTaoQ3Cadv9/u7nkQ+hYQ4AlpFmYCJXhF82QkK kWTPsxbKT4F1UiSTuAlb3WYhHMg/KBo= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-508-S9pgXUohM6e4G7DpgASJKg-1; Wed, 26 Mar 2025 04:19:03 -0400 X-MC-Unique: S9pgXUohM6e4G7DpgASJKg-1 X-Mimecast-MFC-AGG-ID: S9pgXUohM6e4G7DpgASJKg_1742977142 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-ac21873859dso42254066b.2 for ; Wed, 26 Mar 2025 01:19:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742977142; x=1743581942; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BJrq4mLJiJXWNMpizUXhY6u/aCQe+JkhHXm5jj4+P0s=; b=X821zjTgVvB0m1K76/WWrxeXQdmQ8l+yvYv4CUBSm9NeqXQeLWqv0lrSzpZhEc3jO+ 4hXU/sDcZkY2bUtKWzZbVmuWMfZiFYybigJqlJkwoHAI3OfmYtM6XBM4P0dTzauv5d3S 1NZ0D6xg/Rx5XiM3KGPCj4+l2+EmPDPMqQdNcYPok6wnaiwvuW42rCJv0guGa8w1KRf8 ixv1eTXusKC553zXHj3C86ItOQ9lONHhGS2DGnyuIpwNiNef6QAO2xXYrt1EitFyn/OD UwAmXhQX3ejq/9aLmhZSHsDaS2loeSQzmVwHt4p6vHZVCQQhikr9Id0GP+RlmwvNgD20 gCJQ== X-Forwarded-Encrypted: i=1; AJvYcCXLgOmbvB3Fj049ZOvAmxxwOSohYg1ukKDr9rttgkljvzADbEzhxCX2oezkWIN1aCp9xO0=@vger.kernel.org X-Gm-Message-State: AOJu0YxbQ0i9j/DrsMwnuiv323AZNkgz3dXb655u16Llp84YNaYadDVL tJ6eA28hrEw9EEY8kLPY6swbEzdZapfHov9GgmMM5brwhk/AkNcN82NoraJ78/ss9IOt8w2JpON 8Fxhuaem14OaduT13HwpnLFA5C+2hy35xe8ruLzAjrPUpMQOgNQ== X-Gm-Gg: ASbGncu5p7YznjsRvw5Ej/zfkXGR4kUKBUgAw9ylkZ9qCXGvQNKLHKVxPM/nU9voy4G TKsO4BHNzv5Cs/DByDhoB/5lFEHS/pjbnR5eHRYCQOsDNkLxESQXl5INW0JOzkqOwZnN8OBZo2d BM7ON+1YgEi+mbG34Bh5KEX8TqkOsOkXoyVWFWRuj+rg8jX6F6HFqmA9tJkF13H+2Peaj1V90ed iO3d0vRU0twdB7SgAEBensbBPysqsWb+O8uFC+pWrRgY7zC/mLYcB/c8hotXxRkEVrpSYCkmzYD pUC5XazBYtxkkp1OxHi4PZag1QbL8k85/yFlzW2S X-Received: by 2002:a17:907:96a5:b0:ac3:5c8e:d3f5 with SMTP id a640c23a62f3a-ac3f2238ac9mr1964307566b.27.1742977141996; Wed, 26 Mar 2025 01:19:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHAVihNCBcqrY7fTmWzpMKedPdAfC8xKs8i1WcBmyCG1SOQFnIZkqUTCro3SjnL+rAel5iZ/A== X-Received: by 2002:a17:907:96a5:b0:ac3:5c8e:d3f5 with SMTP id a640c23a62f3a-ac3f2238ac9mr1964303566b.27.1742977141528; Wed, 26 Mar 2025 01:19:01 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3efbe0356sm1006017366b.144.2025.03.26.01.19.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 01:19:00 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 4E36118FC9CA; Wed, 26 Mar 2025 09:18:54 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH net-next v3 0/3] Fix late DMA unmap crash for page pool Date: Wed, 26 Mar 2025 09:18:37 +0100 Message-Id: <20250326-page-pool-track-dma-v3-0-8e464016e0ac@redhat.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAF2442cC/23NQQrCMBAF0KuUWRtJJmmLrryHuIjp1AZtU5IQK qV3NwQXCl3++fw3KwTylgKcqxU8JRusm3KQhwrMoKcHMdvlDMix5lJwNut8m517sei1ebJu1Ix LiVJJrRpOkJezp94uRb3CRJFNtES45WawITr/Lu+SKP1XVrtyEowzgwKpbnWrDF48dYOOR+PGA ib8QbDeRzAjQki6G3FSTS//kG3bPoiHBwcGAQAA X-Change-ID: 20250310-page-pool-track-dma-0332343a460e To: "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Andrew Lunn , Eric Dumazet , Paolo Abeni , Ilias Apalodimas , Simon Horman , Andrew Morton , Mina Almasry , Yonglong Liu , Yunsheng Lin , Pavel Begunkov , Matthew Wilcox Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-rdma@vger.kernel.org, linux-mm@kvack.org, =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Qiuling Ren , Yuying Ma X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org This series fixes the late dma_unmap crash for page pool first reported by Yonglong Liu in [0]. It is an alternative approach to the one submitted by Yunsheng Lin, most recently in [1]. The first two commits are small refactors of the page pool code, in preparation of the main change in patch 3. See the commit message of patch 3 for the details. -Toke [0] https://lore.kernel.org/lkml/8067f204-1380-4d37-8ffd-007fc6f26738@kernel.org/T/ [1] https://lore.kernel.org/r/20250307092356.638242-1-linyunsheng@huawei.com Signed-off-by: Toke Høiland-Jørgensen --- Changes in v3: - Use a full-width bool for pp->dma_sync instead of a full unsigned long (in patch 2), and leave pp->dma_sync_cpu alone. - Link to v2: https://lore.kernel.org/r/20250325-page-pool-track-dma-v2-0-113ebc1946f3@redhat.com Changes in v2: - Always leave two bits at the top of pp_magic as zero, instead of one - Add an rcu_read_lock() around __page_pool_dma_sync_for_device() - Add a comment in poison.h with a reference to the bitmask definition - Add a longer description of the logic of the bitmask definitions to the comment in types.h, and a summary of the security implications of using the pp_magic field to the commit message of patch 3 - Collect Mina's Reviewed-by and Yonglong's Tested-by tags - Link to v1: https://lore.kernel.org/r/20250314-page-pool-track-dma-v1-0-c212e57a74c2@redhat.com --- Toke Høiland-Jørgensen (3): page_pool: Move pp_magic check into helper functions page_pool: Turn dma_sync into a full-width bool field page_pool: Track DMA-mapped pages and unmap them when destroying the pool drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 +- include/linux/poison.h | 4 ++ include/net/page_pool/types.h | 65 ++++++++++++++++++- mm/page_alloc.c | 9 +-- net/core/netmem_priv.h | 33 +++++++++- net/core/page_pool.c | 81 ++++++++++++++++++++---- net/core/skbuff.c | 16 +---- net/core/xdp.c | 4 +- 8 files changed, 176 insertions(+), 40 deletions(-) --- base-commit: 45e36a8e3c17c4d50ecbc863893f253fb46ac070 change-id: 20250310-page-pool-track-dma-0332343a460e