Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1160429imm; Wed, 25 Jul 2018 12:36:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdO3q9O4FqRTpaaofOQnGXdEHYMPAHdqFRXaUe0iIWps93rwrROz7L7Lpwx4ipVNv8yCUU+ X-Received: by 2002:a17:902:6501:: with SMTP id b1-v6mr7432918plk.31.1532547380294; Wed, 25 Jul 2018 12:36:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532547380; cv=none; d=google.com; s=arc-20160816; b=BYpicn25BLzN9sb3g+POROP8xezFwJCKceOzFPB9ZJB7DwYPTltfXr/8xWJXjRDFaZ r1CJxp5WtrBI8+dTY3GcG7rRRo2HFxvNbXM2+SYmvFOlmk+CdeoVvFFwqdgRlmtItSTJ lt2zWBJRGec5MmlGQtXPCMqOClzAD5eBqVIP5L3/AgmxT33u2QILF29ck0TSbCLfIAqg Bb3CT48h13F1jqV0hZTnvA/y86t05+QWBBq0Hv20ezHwWOelxsrFgbhaT29q5vROOxdi LXUoiptL8E+clFGWogo7ZeNIaqPOYhIpt1LaT+6SpZHPVLpji+CIBzBYTq1fqRf1OXQv 5E3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :arc-authentication-results; bh=LMGZhDZfvvR81SQ+X9MMXyPPot1DTIK8S+SMsLdrkyA=; b=EXA9fMBvVBIsYgn3sJMb+j+GhHsM4FhZHGCaadUVQTEmzkrjxFSIqhbltUUKV0cfeg jwiNcn798oIe+vWOYuZKODqR2F7TseYw9xKS1oAXd229h5IwCrdng+yzZHjjX0eG7BOk QqOCKEXqUQbkzaeFi9g12adX4N6vvE7vNPIbkSKna9BhGvgkXlDN/nRQVqMJS3nwv5/E /RsGaUSImgjE0AfoV7aQanJrRfBAiYTfKT0zOg1qWV0KsrqDFkqE3g7KgcA+D5FTU9VJ UgmaLTm5O2hsrwRKs6nYPzGndup9Rs5UxwcBvlol/FsDDQqi4XY/qsSmjHuwzeeFop4i aGUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s7-v6si14989338pfb.16.2018.07.25.12.36.04; Wed, 25 Jul 2018 12:36:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730102AbeGYUsV (ORCPT + 99 others); Wed, 25 Jul 2018 16:48:21 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55296 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729213AbeGYUsV (ORCPT ); Wed, 25 Jul 2018 16:48:21 -0400 Received: from localhost.localdomain (c-24-4-125-7.hsd1.ca.comcast.net [24.4.125.7]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id AB701CE5; Wed, 25 Jul 2018 19:35:14 +0000 (UTC) Date: Wed, 25 Jul 2018 12:35:13 -0700 From: Andrew Morton To: Davidlohr Bueso Cc: jbaron@akamai.com, viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org, Davidlohr Bueso Subject: Re: [PATCH -next] fs/epoll: simply CONFIG_NET_RX_BUSY_POLL ifdefery Message-Id: <20180725123513.5f36a6b787d06c8066a24ade@linux-foundation.org> In-Reply-To: <20180725185620.11020-1-dave@stgolabs.net> References: <20180725185620.11020-1-dave@stgolabs.net> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 25 Jul 2018 11:56:20 -0700 Davidlohr Bueso wrote: > ... 'tis easier on the eye. true, but. > +#else > +#define ep_busy_loop(ep, nonblock) do { } while (0) > +#define ep_reset_busy_poll_napi_id(ep) do { } while (0) > +#define ep_set_busy_poll_napi_id(epi) do { } while (0) > + > +#endif /* CONFIG_NET_RX_BUSY_POLL */ inlines are preferred. Because macros are fugly and can cause unused-var warnings when the stub versions are used. This? --- a/fs/eventpoll.c~fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix +++ a/fs/eventpoll.c @@ -449,9 +449,18 @@ static inline void ep_set_busy_poll_napi } #else -#define ep_busy_loop(ep, nonblock) do { } while (0) -#define ep_reset_busy_poll_napi_id(ep) do { } while (0) -#define ep_set_busy_poll_napi_id(epi) do { } while (0) + +static inline void ep_busy_loop(struct eventpoll *ep, int nonblock) +{ +} + +static inline void ep_reset_busy_poll_napi_id(struct eventpoll *ep) +{ +} + +static inline void ep_set_busy_poll_napi_id(struct epitem *epi) +{ +} #endif /* CONFIG_NET_RX_BUSY_POLL */ _