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;
Date:   Tue, 5 Jul 2022 07:47:47 -0700
From:   Colin Foster <colin.foster@in-advantage.com>
To:     Vladimir Oltean <vladimir.oltean@nxp.com>
Cc:     netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Maxim Kochetkov <fido_max@inbox.ru>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next 1/2] net: sched: provide shim definitions for
 taprio_offload_{get,free}
Message-ID: <20220705144747.GA1522144@euler>
References: <20220704190241.1288847-1-vladimir.oltean@nxp.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220704190241.1288847-1-vladimir.oltean@nxp.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?T4dluZP2WnG2XTmEvNtNoGs8TYT1GH/ahCGV8i7QCll8FoOQKvqVqpaA+1e+?=
 =?us-ascii?Q?FkFrE/PBQP3YnbY6C8MEFbuRsa5n+NHMRvm+5ZBFml/4yKSR7xkrZSZRiO6r?=
 =?us-ascii?Q?dkvF3aaJ4qSiJroVqEN4psUUFSnVqNmqL87QEiln/UIwq6T6S6NnSNXUTRj0?=
 =?us-ascii?Q?sjKYs9TMKFxJBNJNlLkB+XL4pl/f8+G3AgsGgdzb7NKGiTXk6sfYLhoplnJK?=
 =?us-ascii?Q?ASXuA4JTOpxRJW1cvHRbUCswvZTcoiz3nj7DVjvdLQNd/fhCuqknTQP2hGob?=
 =?us-ascii?Q?KaZWWLAKFi6s1hmxjg/pZFyvs+9HVC/HFsTBkES9A+CT3RtZzbleAc1A92G6?=
 =?us-ascii?Q?MWB3xINeqI/aoDmyVvj+zsDHd6dcYRo/Svowgs5Prga48FOvBR+PT2tzyhM2?=
 =?us-ascii?Q?Vi7j6Ea8MlfFfB/SLr1D0vkMDFb82Jx6bKY8mZvNOjG6zkNWPbou1oeR58Hw?=
 =?us-ascii?Q?63MMGMDNb4m45gPj3PFL63yGvwPjd/IfCRlEK5S8fAZ+B2rsfzJzl8wohra3?=
 =?us-ascii?Q?mel/kNzW+XwpbPkUmT22+RjL8nP/aoUQ/0BzcwlxLN+siVH51h+vQAvO7Fta?=
 =?us-ascii?Q?/NoHEi/fcYudy+GrnQSOmVl2hZUx8LMFPnMHA0qeyk12bSnmm4zW/Cv46akv?=
 =?us-ascii?Q?U0nj/bM2f3ZzXweyjwcyWC7moIdgbnBUJ1s2FkcKtoGdn8k0keH2SyDe+BSr?=
 =?us-ascii?Q?ulhBTU3vxzuOEmShjvP8FXwLcTiE7g+22tJs1smXPxSIRDa7tguNVzKODZ/L?=
 =?us-ascii?Q?VpFp/WBuF16/nqvHFwGbNO/D49Kqk6vpCx3VdEaE3c/TsfY7AlHAYAlPyE/B?=
 =?us-ascii?Q?2YJmQjzKr7QzoOoX7xwZQj2IgovSIbbV7xpdPMj/A/96DS3/lgBDSO8bEjCk?=
 =?us-ascii?Q?2kwFQvmLm9yJohhC0/ASgGaPrL4B6f+NWOvsJ555hsDM3ogXCC+Snpj+xHH0?=
 =?us-ascii?Q?+bS4nJR+oA4Pu5qLlTMu1yfEa2TENaIUOsuLu8agGBW2qbrDIU/BoGFcSX3j?=
 =?us-ascii?Q?hJv5KY427UslaMxA5VXcNVSaJZJ00szQ3jth++yaHOyPKpq9S7umRy91nsKZ?=
 =?us-ascii?Q?sRcMr0qBsEedJ4A3ZckcRtNqh7eW6hKrUj1BrosvuPIadZ2TXu34qgYbXi/v?=
 =?us-ascii?Q?c+x0DbfVofHp4hjn3xdTxIqW53MrBypSBnrs6U3mlokvbqlneaH6kjEy/7SS?=
 =?us-ascii?Q?gWc9NuJaH+jfQITn0VuqPyLht6+qsvxMSb2eb0nGyTQsm3JJlkZJtZUAzEyf?=
 =?us-ascii?Q?RU0QaXE2AKYY1vTJxK3evqIn3QoKVY6oHSlP2ieZDR8dPdOwNRa7RVihaDxh?=
 =?us-ascii?Q?VfWQBCdKUrTSAmN+Rt2pDyhdnGV/WvoGyw5ilbiD1P/hQgdG9OJ+DJ7Nz0Pz?=
 =?us-ascii?Q?Ynv3LkRmq3xQ5IUrnfh0WZtNhPZs99+e6kyLLmQ+WnniTGydA7HK5TYDwB4Y?=
 =?us-ascii?Q?eBFXeIsMp7Qmi2ZCR2P4OJUDPTbi+nsdXPopVqppr+UA1hV4fvPlFeh+cT4k?=
 =?us-ascii?Q?K4v/EaYs9/GM9w4kUtm3Bj0XsuVoH5THq3JkMJEbF9ZEsQYQlbHU0Z7ckKf5?=
 =?us-ascii?Q?W4X8WWEbcO5ri2jeSwb67/ve+6hPZTG6jftWHCuDK13PLHhi6IQp4sXo7JpW?=
 =?us-ascii?Q?rg=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4f69054a-3b56-4a71-8297-08da5e95579f
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 14:47:54.2993
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: IXeZC+hIPha7FGdJf4Uxo01+1lq6tOAtHhc+sx6kps1oygH+jCwuHGr2KnIF/dV4XuusP1jOFuuunzjVFYvOWikSWcCX0ExfEh1URQX+hWA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4850
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE 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

On Mon, Jul 04, 2022 at 10:02:40PM +0300, Vladimir Oltean wrote:
> All callers of taprio_offload_get() and taprio_offload_free() prior to
> the blamed commit are conditionally compiled based on CONFIG_NET_SCH_TAPRIO.
> 
> felix_vsc9959.c is different; it provides vsc9959_qos_port_tas_set()
> even when taprio is compiled out.
> 
> Provide shim definitions for the functions exported by taprio so that
> felix_vsc9959.c is able to compile. vsc9959_qos_port_tas_set() in that
> case is dead code anyway, and ocelot_port->taprio remains NULL, which is
> fine for the rest of the logic.
> 
> Fixes: 1c9017e44af2 ("net: dsa: felix: keep reference on entire tc-taprio config")
> Reported-by: Colin Foster <colin.foster@in-advantage.com>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> ---
>  include/net/pkt_sched.h | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
> index 44a35531952e..3372a1f67cf4 100644
> --- a/include/net/pkt_sched.h
> +++ b/include/net/pkt_sched.h
> @@ -173,11 +173,28 @@ struct tc_taprio_qopt_offload {
>  	struct tc_taprio_sched_entry entries[];
>  };
>  
> +#if IS_ENABLED(CONFIG_NET_SCH_TAPRIO)
> +
>  /* Reference counting */
>  struct tc_taprio_qopt_offload *taprio_offload_get(struct tc_taprio_qopt_offload
>  						  *offload);
>  void taprio_offload_free(struct tc_taprio_qopt_offload *offload);
>  
> +#else
> +
> +/* Reference counting */
> +static inline struct tc_taprio_qopt_offload *
> +taprio_offload_get(struct tc_taprio_qopt_offload *offload)
> +{
> +	return NULL;
> +}
> +
> +static inline void taprio_offload_free(struct tc_taprio_qopt_offload *offload)
> +{
> +}
> +
> +#endif
> +
>  /* Ensure skb_mstamp_ns, which might have been populated with the txtime, is
>   * not mistaken for a software timestamp, because this will otherwise prevent
>   * the dispatch of hardware timestamps to the socket.
> -- 
> 2.25.1
> 

Fixes my build!

Tested-by: Colin Foster <colin.foster@in-advantage.com>