From patchwork Wed Nov 25 22:48:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Elver X-Patchwork-Id: 333448 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7854C56201 for ; Wed, 25 Nov 2020 22:49:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BA92206B5 for ; Wed, 25 Nov 2020 22:49:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lStWPDdd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728194AbgKYWsr (ORCPT ); Wed, 25 Nov 2020 17:48:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728078AbgKYWsr (ORCPT ); Wed, 25 Nov 2020 17:48:47 -0500 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01C5EC0617A7 for ; Wed, 25 Nov 2020 14:48:46 -0800 (PST) Received: by mail-qt1-x849.google.com with SMTP id v9so3425031qtw.12 for ; Wed, 25 Nov 2020 14:48:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=I/075ht73AX9Kc7flNELYjveaVIhsSGQzC21UbF6hgI=; b=lStWPDddstoAXeYRqd5z0qlHDtcQk1WJNK8DLchpGZkeyZi7OteAoP2zsEptNCZvvG EoYqW+NE5OO4n8e/x83gwGlTfu3QtVpje9ZEQ1rh+zToUd6WoWySMz2Cf17x3X24M66+ 65cv4VblOOe6OHOmy7wDmGmbQfixctL252G21aYa07ifY0/q2Ixd3tb1q73Fjdqfmmkc gwQkVdyZO/U1LGOul9EITUmJhbiP7AKcDAR+rNAy4e7Kfe2EAFqYELc+QKaI4nUMmc3l B8vW0VxF30CgFB5dbs1q9Gv7iTPumfQAUTj2ZhnxsfjY7pKb6p3FOPcTgnv1CEuYonwD pzww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=I/075ht73AX9Kc7flNELYjveaVIhsSGQzC21UbF6hgI=; b=c6xBma1j5Od111aWbAmN5Z3oujdcAC51E4E9E8OLs+vazvqi8OI9LxG+38I+866/n3 AN/dhfsPspawYQsWUGdJFBHwjdi3PcToMK3UxQsstedcGS4KuLVjDy0S5IsIMLmVLlL+ AASSC7hiHhHMbLr4Ag74eaKRwDT4SuqDNVvnxMefsUNOSf7L2UV1dDDK8OePDJnf/c+j 6IMydUq4kXRAz/keypWgcTRynFT/QmhR+WFK2X6B7XuALh2WXKeGam0HR6821smZ29mR I92K2o8bqJOgDZcnEiw4Ma2TE8HYwCpuFCLBFI3ESNR9hPB+qtyWdf6uKeRCN00eUM4B UPzw== X-Gm-Message-State: AOAM530kYPAgC1mCG9K0j0gnMh4rGJAq2TUGOOXoAQels7q6HQyI8M0s 8DEiML+AyHDorAGpC93EPCxFLmoXwQ== X-Google-Smtp-Source: ABdhPJyfAUOOdfCug3XnQAY0HY7GW15qb62GOtkQHazukM4VAvjapZE/kQUdB9bYiJ4LGnzlgKXnC6MAWg== Sender: "elver via sendgmr" X-Received: from elver.muc.corp.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) (user=elver job=sendgmr) by 2002:a05:6214:504:: with SMTP id v4mr390062qvw.38.1606344526039; Wed, 25 Nov 2020 14:48:46 -0800 (PST) Date: Wed, 25 Nov 2020 23:48:40 +0100 Message-Id: <20201125224840.2014773-1-elver@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH net-next v2] net: switch to storing KCOV handle directly in sk_buff From: Marco Elver To: elver@google.com, kuba@kernel.org, davem@davemloft.net Cc: johannes@sipsolutions.net, a.nogikh@gmail.com, andreyknvl@google.com, dvyukov@google.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, idosch@idosch.org, fw@strlen.de, willemb@google.com Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org It turns out that usage of skb extensions can cause memory leaks. Ido Schimmel reported: "[...] there are instances that blindly overwrite 'skb->extensions' by invoking skb_copy_header() after __alloc_skb()." Therefore, give up on using skb extensions for KCOV handle, and instead directly store kcov_handle in sk_buff. Fixes: 6370cc3bbd8a ("net: add kcov handle to skb extensions") Fixes: 85ce50d337d1 ("net: kcov: don't select SKB_EXTENSIONS when there is no NET") Fixes: 97f53a08cba1 ("net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling") Link: https://lore.kernel.org/linux-wireless/20201121160941.GA485907@shredder.lan/ Reported-by: Ido Schimmel Signed-off-by: Marco Elver --- v2: * Restore missing skb_set_kcov_handle() which got lost in the rebase. --- include/linux/skbuff.h | 37 +++++++++++++------------------------ lib/Kconfig.debug | 1 - net/core/skbuff.c | 6 ------ 3 files changed, 13 insertions(+), 31 deletions(-) base-commit: 470dfd808ac4135f313967f9d3e107b87fc6a0b3 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0a1239819fd2..333bcdc39635 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -701,6 +701,7 @@ typedef unsigned char *sk_buff_data_t; * @transport_header: Transport layer header * @network_header: Network layer header * @mac_header: Link layer header + * @kcov_handle: KCOV remote handle for remote coverage collection * @tail: Tail pointer * @end: End pointer * @head: Head of buffer @@ -904,6 +905,10 @@ struct sk_buff { __u16 network_header; __u16 mac_header; +#ifdef CONFIG_KCOV + u64 kcov_handle; +#endif + /* private: */ __u32 headers_end[0]; /* public: */ @@ -4150,9 +4155,6 @@ enum skb_ext_id { #endif #if IS_ENABLED(CONFIG_MPTCP) SKB_EXT_MPTCP, -#endif -#if IS_ENABLED(CONFIG_KCOV) - SKB_EXT_KCOV_HANDLE, #endif SKB_EXT_NUM, /* must be last */ }; @@ -4608,35 +4610,22 @@ static inline void skb_reset_redirect(struct sk_buff *skb) #endif } -#if IS_ENABLED(CONFIG_KCOV) && IS_ENABLED(CONFIG_SKB_EXTENSIONS) static inline void skb_set_kcov_handle(struct sk_buff *skb, const u64 kcov_handle) { - /* Do not allocate skb extensions only to set kcov_handle to zero - * (as it is zero by default). However, if the extensions are - * already allocated, update kcov_handle anyway since - * skb_set_kcov_handle can be called to zero a previously set - * value. - */ - if (skb_has_extensions(skb) || kcov_handle) { - u64 *kcov_handle_ptr = skb_ext_add(skb, SKB_EXT_KCOV_HANDLE); - - if (kcov_handle_ptr) - *kcov_handle_ptr = kcov_handle; - } +#ifdef CONFIG_KCOV + skb->kcov_handle = kcov_handle; +#endif } static inline u64 skb_get_kcov_handle(struct sk_buff *skb) { - u64 *kcov_handle = skb_ext_find(skb, SKB_EXT_KCOV_HANDLE); - - return kcov_handle ? *kcov_handle : 0; -} +#ifdef CONFIG_KCOV + return skb->kcov_handle; #else -static inline void skb_set_kcov_handle(struct sk_buff *skb, - const u64 kcov_handle) { } -static inline u64 skb_get_kcov_handle(struct sk_buff *skb) { return 0; } -#endif /* CONFIG_KCOV && CONFIG_SKB_EXTENSIONS */ + return 0; +#endif +} #endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */ diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 826a205ffd1c..1d15cdaf1b89 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1879,7 +1879,6 @@ config KCOV depends on CC_HAS_SANCOV_TRACE_PC || GCC_PLUGINS select DEBUG_FS select GCC_PLUGIN_SANCOV if !CC_HAS_SANCOV_TRACE_PC - select SKB_EXTENSIONS if NET help KCOV exposes kernel code coverage information in a form suitable for coverage-guided fuzzing (randomized testing). diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ffe3dcc0ebea..b21f01662f98 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4208,9 +4208,6 @@ static const u8 skb_ext_type_len[] = { #if IS_ENABLED(CONFIG_MPTCP) [SKB_EXT_MPTCP] = SKB_EXT_CHUNKSIZEOF(struct mptcp_ext), #endif -#if IS_ENABLED(CONFIG_KCOV) - [SKB_EXT_KCOV_HANDLE] = SKB_EXT_CHUNKSIZEOF(u64), -#endif }; static __always_inline unsigned int skb_ext_total_length(void) @@ -4227,9 +4224,6 @@ static __always_inline unsigned int skb_ext_total_length(void) #endif #if IS_ENABLED(CONFIG_MPTCP) skb_ext_type_len[SKB_EXT_MPTCP] + -#endif -#if IS_ENABLED(CONFIG_KCOV) - skb_ext_type_len[SKB_EXT_KCOV_HANDLE] + #endif 0; }