From patchwork Tue Dec 1 08:07:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 336675 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=-15.7 required=3.0 tests=BAYES_00,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 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 5AFFBC64E8A for ; Tue, 1 Dec 2020 08:08:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39B852085B for ; Tue, 1 Dec 2020 08:08:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="fVs26v09" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727641AbgLAIIc (ORCPT ); Tue, 1 Dec 2020 03:08:32 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:39811 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726402AbgLAIIc (ORCPT ); Tue, 1 Dec 2020 03:08:32 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4ClZTd1gxvz9s1l; Tue, 1 Dec 2020 19:07:48 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1606810069; bh=OidLWJFFOmo7ZgrNn5TNWAZxfnkfVBDpo8lzfpGX9NM=; h=Date:From:To:Cc:Subject:From; b=fVs26v09ueuSabThLyTPrqNxhQbEdiNKM3KtB8y/pOlYyb/OIY5Ob0ZE79ojhKKdg rSupt68xPltqPTNZrHfpiDf3V240VDG5mJzQddJTTHm4NxfCO6C6TzQsY5oElzhIrj Xw9zydZtaSollBd51lWh0Nze3QiXbA0pmc/Z2VJduX/1dLehyMlWgPFW1+avxCg9cZ TBU2O1VMUK4Hc6j8QiM0KwfKCgxzJLhIvPYj2vXcUSUXIONBXQlSMb1Qa4vV+VF8SE RtvOJRhK0/6Bd7VWSv+HZimapKaruxec4tgASnyUxzWREaq4bD1CgEf3RHNP8paJIN bJrky0bXJVDxg== Date: Tue, 1 Dec 2020 19:07:46 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Networking Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the bpf-next tree Message-ID: <20201201190746.7d3357fb@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, After merging the bpf-next tree, today's linux-next build (x86_64 allnoconfig) failed like this: In file included from fs/select.c:32: include/net/busy_poll.h: In function 'sk_mark_napi_id_once': include/net/busy_poll.h:150:36: error: 'const struct sk_buff' has no member named 'napi_id' 150 | __sk_mark_napi_id_once_xdp(sk, skb->napi_id); | ^~ Caused by commit b02e5a0ebb17 ("xsk: Propagate napi_id to XDP socket Rx path") sk_buff only has a napi_id if defined(CONFIG_NET_RX_BUSY_POLL) || defined(CONFIG_XPS). I have applied the following patch for today. >From bd2a1a4a773c1f306460b4309b12cad245a5edad Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 1 Dec 2020 19:02:58 +1100 Subject: [PATCH] fix for "xsk: Propagate napi_id to XDP socket Rx path" Signed-off-by: Stephen Rothwell --- include/net/busy_poll.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index 45b3e04b99d3..07a88f592e72 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -147,7 +147,9 @@ static inline void __sk_mark_napi_id_once_xdp(struct sock *sk, unsigned int napi static inline void sk_mark_napi_id_once(struct sock *sk, const struct sk_buff *skb) { +#ifdef CONFIG_NET_RX_BUSY_POLL __sk_mark_napi_id_once_xdp(sk, skb->napi_id); +#endif } static inline void sk_mark_napi_id_once_xdp(struct sock *sk,