[bpf-next,v3,2/4] net: page_pool, skbuff: make skb_mark_for_recycle() always available
Message ID | 20230313190813.1036595-3-aleksander.lobakin@intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp363216wrt; Thu, 16 Mar 2023 01:53:05 -0700 (PDT) X-Google-Smtp-Source: AK7set+JWx/0DEeR4G6SxNnVDyrGzc4nM6h91fDrld9oNDqVRTVBIQ8XwqinSu6VIRovI/v3+ayJ X-Received: by 2002:a05:6a20:12cd:b0:cb:ac6c:13d3 with SMTP id v13-20020a056a2012cd00b000cbac6c13d3mr2910081pzg.21.1678956784693; Thu, 16 Mar 2023 01:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678956784; cv=none; d=google.com; s=arc-20160816; b=IZmanjC5eI47cshbhJXYjyaiPeeFVK9ve9LGLwCfYow1r2qRLtMn1FP5zSN+RD6QHz 9Nl0pdA+tWN3T2cl1buw3XHneErUt1InlJE3qkR4wKStp7wDwK4iyPyEfeWIbkBv13Ke Nq02YCgiY6pyJFtZCnGQvMNc7y1H5NvPeR9/bXFDD0eZQVuIwe/fr1S9/YubCr9iuieX KzSSVdMqMKklR0bJ9ODU7yfuSOoE1NQ+LvdnBxo/GwHjuntl+pvdLRDZJD1mX2nP7eOa g0Uiuqsk2CHdqPmOUKghf+4BXGneOJ8IFw6wM3BFNaIgGvTpLaILzBaVdBOUwLIXmoJH smDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CErF05Pxkbg8TlBX5rNA+1nEY6eFFfwq5DTottbupX8=; b=c5GY8qfsWgG5YrU3avITgrEB7OESG9P9SZVWROwswJLEZkx/42pZTKgXPa6XpVqSVm Cw8GidKMjkn+EtB6BG5hWJSEe+/7P9K14SLRtIOBzRE/Dt0NmBDXY7ek8uzYgkOKwoEL ekXUb3jPWJpMWUmOwOG9Zhq/53qh5uS1zj3hHDm8Vp7jD29mkNJfBJi6T7XgtEKz/ndY Kb14/733OTvCaXW2qdWzA2DH78iE75zfw/tPkCF1WNo32cf7SRx9ub6wlAF2pfqTK0J9 1qP74FtGyoKHEZO0jrqY/CstsNXHuAwu3B21ARQyCOZMHZfkn5K4a8p2e3AgLDuuV/bD 3N3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Zf0dDpdL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j191-20020a6380c8000000b00508bf5974fdsi7539803pgd.237.2023.03.16.01.52.51; Thu, 16 Mar 2023 01:53:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Zf0dDpdL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230451AbjCPIZD (ORCPT <rfc822;pwkd43@gmail.com> + 99 others); Thu, 16 Mar 2023 04:25:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230474AbjCPIYx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 16 Mar 2023 04:24:53 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06A81AFB84; Thu, 16 Mar 2023 01:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678955088; x=1710491088; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=g5nPL1hfwFccNcFtYw7ZevITqww5GF47MwYYKvo0Lf4=; b=Zf0dDpdL0my5r1ooZvYtyqyy5XD6YM9N8t5sj9tcMpyFJAC6iDOT6jrV WjeElW7kV/UPrm+InyhI8jHBmhKnOXdfv+JG3IheSiIU4gXogu+sPyyWs MGGh7hIf3G+I27ISi9pblSXbIgREO4f80HpelGhEOEQlQdK788gbdfvOt YJfv+cxS6TiiSBfK0HIiB+9b7IbRhk9VeeopRtZfxNC3Xq5iKXI9RSRY1 sDWWfbHCoK5BGCs3nY9P6zTlKTqB6xIXrAsGN4HsYa1GeM+qQNiKIVeIr G42weI41acF6BiVSZp4L859J5JEzCEZJLlpQdegH2hVyRN4GJeCylnMfv Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="402794233" X-IronPort-AV: E=Sophos;i="5.98,265,1673942400"; d="scan'208";a="402794233" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2023 01:24:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="823141552" X-IronPort-AV: E=Sophos;i="5.98,265,1673942400"; d="scan'208";a="823141552" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmsmga001.fm.intel.com with ESMTP; 16 Mar 2023 01:24:43 -0700 Received: from newjersey.igk.intel.com (newjersey.igk.intel.com [10.102.20.203]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 5A0F275261; Mon, 13 Mar 2023 19:09:42 +0000 (GMT) From: Alexander Lobakin <aleksander.lobakin@intel.com> To: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Andrii Nakryiko <andrii@kernel.org>, Martin KaFai Lau <martin.lau@linux.dev> Cc: Alexander Lobakin <aleksander.lobakin@intel.com>, Maciej Fijalkowski <maciej.fijalkowski@intel.com>, Larysa Zaremba <larysa.zaremba@intel.com>, =?utf-8?q?Toke_H=C3=B8iland-J?= =?utf-8?q?=C3=B8rgensen?= <toke@redhat.com>, Song Liu <song@kernel.org>, Jesper Dangaard Brouer <hawk@kernel.org>, John Fastabend <john.fastabend@gmail.com>, Menglong Dong <imagedong@tencent.com>, Mykola Lysenko <mykolal@fb.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Eric Dumazet <edumazet@google.com>, Paolo Abeni <pabeni@redhat.com>, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel test robot <lkp@intel.com> Subject: [PATCH bpf-next v3 2/4] net: page_pool, skbuff: make skb_mark_for_recycle() always available Date: Mon, 13 Mar 2023 20:08:11 +0100 Message-Id: <20230313190813.1036595-3-aleksander.lobakin@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313190813.1036595-1-aleksander.lobakin@intel.com> References: <20230313190813.1036595-1-aleksander.lobakin@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760513789524121155?= X-GMAIL-MSGID: =?utf-8?q?1760513789524121155?= |
Series |
xdp: recycle Page Pool backed skbs built from XDP frames
|
|
Commit Message
Alexander Lobakin
March 13, 2023, 7:08 p.m. UTC
skb_mark_for_recycle() is guarded with CONFIG_PAGE_POOL, this creates
unneeded complication when using it in the generic code. For now, it's
only used in the drivers always selecting Page Pool, so this works.
Move the guards so that preprocessor will cut out only the operation
itself and the function will still be a noop on !PAGE_POOL systems,
but available there as well.
No functional changes.
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202303020342.Wi2PRFFH-lkp@intel.com
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
---
include/linux/skbuff.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index fe661011644b..3f3a2a82a86b 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -5069,12 +5069,12 @@ static inline u64 skb_get_kcov_handle(struct sk_buff *skb) #endif } -#ifdef CONFIG_PAGE_POOL static inline void skb_mark_for_recycle(struct sk_buff *skb) { +#ifdef CONFIG_PAGE_POOL skb->pp_recycle = 1; -} #endif +} #endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */