From patchwork Thu Aug 8 09:38:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 1143914 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="L7g3XM0C"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4643Fv2WhNz9sNy for ; Thu, 8 Aug 2019 19:38:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732591AbfHHJiJ (ORCPT ); Thu, 8 Aug 2019 05:38:09 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:47005 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732590AbfHHJiJ (ORCPT ); Thu, 8 Aug 2019 05:38:09 -0400 Received: by mail-lf1-f66.google.com with SMTP id z15so62056206lfh.13 for ; Thu, 08 Aug 2019 02:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KKq6Rq+EYX8ExcTVOf/aov+7OPET0b1D6K1n31UVB3c=; b=L7g3XM0CuaMcn8hysQiAwokrdf3uqIKmkZ8fZ7ry8SmuWC3ecsFb7VNl10/lP7yd/x /E0u/ayUH8PafZlMX+eET7r8DVS3gTNBCMsxDUZOPp9OzAXvNBxfoyu3Pq8ci6XkORQe tZFRgq9gqK1ElBj747sU15wkuSikL7IVt7CezdOFlaGps24pW942lPcXuo17N4ZBg2K4 SPp7MeMtFQMhTLstz/zV1ZALgQI16ZpLEQ3UnLh1EsCu6jnXeo/q9jOCCTOZl64TjxeQ tyo8jYFPeauPU5tHKH4CppT/cCHg+74BpkE3cyHE3RzAg2xyluC015PMBevegNjPTb7i d7mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KKq6Rq+EYX8ExcTVOf/aov+7OPET0b1D6K1n31UVB3c=; b=eGRTP3Gn+nh+yyEze0WB2cwHs6bztHDWVTSzESCJl5A4JSaP+zo2rfURaqiFarqS8b oWdhHv6jXukNJcQDtb1m8HAnguJrnesAHECH+WOBJmT0E1HVmlx9zYmz1SruiYV9sOBQ pj7mqbSh4tnpz50/ZIw5yUG9r8kFhghYmatmkgcKhuLxWuJq87lp+o/ZXmkjOChBtyG/ t0OvGruWNyfdtS3EgFqB0yVSfhjCQ9UV888GJov1e1tSBdRvEZ227LzZkC0v8Sy5pG3N nDE9zpbmLPBqgoDXansD09whgtGYHl2oS5rCIPybsWsDFjVadQufSONcam5vGI8jFkD1 5A5A== X-Gm-Message-State: APjAAAVRvyOR6VN6pjnWcRdl4mHAQXg0dFshO4mAdbXeBZ15NbXa436R uwYISFiAjqwDHHnAXp25YF5Ut2DkTcU= X-Google-Smtp-Source: APXvYqyuMdt7jID+q3HcQXEifvW4J/jspv2uf3zNhF13WH6UysEsAqmZJj9n6zkM8fFyTHX7tVgVIA== X-Received: by 2002:ac2:44ce:: with SMTP id d14mr9058953lfm.143.1565257087328; Thu, 08 Aug 2019 02:38:07 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id r21sm3444783lfi.32.2019.08.08.02.38.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 08 Aug 2019 02:38:06 -0700 (PDT) From: Ivan Khoronzhuk To: bjorn.topel@intel.com, magnus.karlsson@intel.com Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, hawk@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, xdp-newbies@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH v2 bpf-next] xdp: xdp_umem: fix umem pages mapping for 32bits systems Date: Thu, 8 Aug 2019 12:38:03 +0300 Message-Id: <20190808093803.4918-1-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Use kmap instead of page_address as it's not always in low memory. Acked-by: Björn Töpel Signed-off-by: Ivan Khoronzhuk --- Based on bpf-next/master v2..v1: included highmem.h v1: https://lkml.org/lkml/2019/6/26/693 net/xdp/xdp_umem.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 83de74ca729a..a0607969f8c0 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "xdp_umem.h" #include "xsk_queue.h" @@ -164,6 +165,14 @@ void xdp_umem_clear_dev(struct xdp_umem *umem) umem->zc = false; } +static void xdp_umem_unmap_pages(struct xdp_umem *umem) +{ + unsigned int i; + + for (i = 0; i < umem->npgs; i++) + kunmap(umem->pgs[i]); +} + static void xdp_umem_unpin_pages(struct xdp_umem *umem) { unsigned int i; @@ -207,6 +216,7 @@ static void xdp_umem_release(struct xdp_umem *umem) xsk_reuseq_destroy(umem); + xdp_umem_unmap_pages(umem); xdp_umem_unpin_pages(umem); kfree(umem->pages); @@ -369,7 +379,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) } for (i = 0; i < umem->npgs; i++) - umem->pages[i].addr = page_address(umem->pgs[i]); + umem->pages[i].addr = kmap(umem->pgs[i]); return 0;