From mboxrd@z Thu Jan 1 00:00:00 1970 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=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 4281EC433DF for ; Fri, 22 May 2020 00:09:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0DF12078B for ; Fri, 22 May 2020 00:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590106177; bh=VT6rgSIyosdUHrRtnNMoLLYHXaPFQ3aDF5yVyjZocns=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=zJTJjejqg+9azNwPIzyYpZyB7Z2J10Uj+OhuyOnsDjudJWG6MMKyhoKDbnim8lXph m+Br0JXmHLr2qGJRcHbTOKJsgj/5HxvkbwK1zxz9CUfrR6Q+2+RaK4hr+uBsaKyafS vEIR+3g01Fkxz/xuZfNzXS9SBfHfqcCB38KS0m4Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730474AbgEVAJg (ORCPT ); Thu, 21 May 2020 20:09:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:56642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730255AbgEVAJg (ORCPT ); Thu, 21 May 2020 20:09:36 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CFF322078B; Fri, 22 May 2020 00:09:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590106176; bh=VT6rgSIyosdUHrRtnNMoLLYHXaPFQ3aDF5yVyjZocns=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FvRFViMZISnnMFcVtk6MiH5qO8KEuYbrow26PQPwyC3rafu94ILMA6SKkOxNr7soT eHSxg13t+leL3rWaU/Vu9R5uCIBfV3pmenEUbYyddpke0d9P7NhPVfvlgbBnhcjF7O jAXSQ1j6WEKpQ9tuy82Rj869mBpK53N970XQywOI= Date: Thu, 21 May 2020 20:09:34 -0400 From: Sasha Levin To: Lorenz Bauer Cc: stable@vger.kernel.org, kernel-team@cloudflare.com, kernel test robot Subject: Re: [PATCH 4.19.y] selftests: bpf: fix use of undeclared RET_IF macro Message-ID: <20200522000934.GM33628@sasha-vm> References: <20200521144841.7074-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20200521144841.7074-1-lmb@cloudflare.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, May 21, 2020 at 03:48:41PM +0100, Lorenz Bauer wrote: >commit 634efb750435 ("selftests: bpf: Reset global state between >reuseport test runs") uses a macro RET_IF which doesn't exist in >the v4.19 tree. It is defined as follows: > > #define RET_IF(condition, tag, format...) ({ > if (CHECK_FAIL(condition)) { > printf(tag " " format); > return; > } > }) > >CHECK_FAIL in turn is defined as: > > #define CHECK_FAIL(condition) ({ > int __ret = !!(condition); > int __save_errno = errno; > if (__ret) { > test__fail(); > fprintf(stdout, "%s:FAIL:%d\n", __func__, __LINE__); > } > errno = __save_errno; > __ret; > }) > >Replace occurences of RET_IF with CHECK. This will abort the test binary >if clearing the intermediate state fails. > >Fixes: 634efb750435 ("selftests: bpf: Reset global state between reuseport test runs") >Reported-by: kernel test robot >Signed-off-by: Lorenz Bauer Thanks for the backport Lorenz. We'll need to wait for it to make it into Linus's tree before queueing up for the stable trees. -- Thanks, Sasha