From patchwork Wed Apr 12 07:25:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deming Wang X-Patchwork-Id: 82288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp138560vqo; Wed, 12 Apr 2023 00:41:59 -0700 (PDT) X-Google-Smtp-Source: AKy350Z9ZCT/QiKrJRFVQhtnZRFZuY2iac3unx9uosV9HFntB7fxYbayuzXs1FGluv2BWt1SQgnf X-Received: by 2002:a17:90a:a684:b0:23f:8752:98be with SMTP id d4-20020a17090aa68400b0023f875298bemr1634591pjq.4.1681285319475; Wed, 12 Apr 2023 00:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681285319; cv=none; d=google.com; s=arc-20160816; b=J5vQDQgtIU70jfAUXyuM/rYYDohXr/XTw+wibjOxj6dy2bRURurQum/gP07lim0dVg 6xQFaKpjCqjYR+ZPviAdCI9dBS92+v08IUFtyyjYKVHRvmXEJ3D5sftt+VUYEz9Ah4RQ HNWDP1I/DbIDE0O/MOR7Xqj2SPfm/Ap3WnT3y4pQ1tDCFA3dFDrsW/YK2UkQbDE1jban oCBjQttLDk9X3DxaO3Y2sSo0DhIdNV52yN8eIcsY3kjzJV7XOpKwFWD+GMJO3edUGBve t20pMhPEHejCDwYR2H2q6vXEMrBKjdA+ihBm+nTz+/K9VyifJOzvfwuG0ujyNPWVKFCt jxEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:abuse-reports-to:tuid:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from; bh=EN6+7hTH8adF1vdn1ywJhSlnxF2Zr/vJJzCDO8WPbt0=; b=boKssJ8hZs71kvFv+R2RT0549amtUX1ZetSe+2sllArIUsLnrIap9ervjRURW+78fh habiKKA/858mqMnooELg14yNTELfrKTmG9ariUn6+qOAMKi9vPbhCtgZnmlT5K20YXUf xXnUVnq3fncXplYLDUL3Cn9m/T7dpFpWZGLDwj/K/NeYfZiWTbEA7gjApNMiMPX7aFfA +ukubAeBikffXnbtPvL5HWf8y2aqRsY5iJF0TfmDAd135xnt2S1lfzB7OlARbfxCKKJQ aWGpXRfz0ysELv8dpsOuZYJVGQ63yI0K/nImj3ksBhgatfq7ElFOx3Jrpr821tPGoh1r ISdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lk12-20020a17090b33cc00b00244ae429c86si1434338pjb.36.2023.04.12.00.41.47; Wed, 12 Apr 2023 00:41:59 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229875AbjDLH07 (ORCPT + 99 others); Wed, 12 Apr 2023 03:26:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229485AbjDLH05 (ORCPT ); Wed, 12 Apr 2023 03:26:57 -0400 X-Greylist: delayed 64 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 12 Apr 2023 00:26:54 PDT Received: from ssh248.corpemail.net (ssh248.corpemail.net [210.51.61.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 144A8FA for ; Wed, 12 Apr 2023 00:26:53 -0700 (PDT) Received: from ssh248.corpemail.net by ssh248.corpemail.net ((D)) with ASMTP (SSL) id HBL00142; Wed, 12 Apr 2023 15:25:42 +0800 Received: from localhost.localdomain.com (10.200.104.82) by jtjnmail201603.home.langchao.com (10.100.2.3) with Microsoft SMTP Server id 15.1.2507.21; Wed, 12 Apr 2023 15:25:42 +0800 From: Deming Wang To: , CC: , , Deming Wang Subject: [PATCH] tools/virtio/ringtest: Replace obsolete memalign() with posix_memalign() Date: Wed, 12 Apr 2023 03:25:36 -0400 Message-ID: <20230412072536.2029-1-wangdeming@inspur.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Originating-IP: [10.200.104.82] tUid: 20234121525426b2ff674ebb2c8b70bbc1e239a9a10c3 X-Abuse-Reports-To: service@corp-email.com Abuse-Reports-To: service@corp-email.com X-Complaints-To: service@corp-email.com X-Report-Abuse-To: service@corp-email.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762955199375934019?= X-GMAIL-MSGID: =?utf-8?q?1762955435084582751?= memalign() is obsolete according to its manpage. Replace memalign() with posix_memalign() and remove malloc.h include that was there for memalign(). As a pointer is passed into posix_memalign(), initialize *p to NULL to silence a warning about the function's return value being used as uninitialized (which is not valid anyway because the error is properly checked before p is returned). Signed-off-by: Deming Wang Reviewed-by: Xuan Zhuo --- tools/virtio/ringtest/ptr_ring.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/virtio/ringtest/ptr_ring.c b/tools/virtio/ringtest/ptr_ring.c index c9b26335f891..a0bf4978eace 100644 --- a/tools/virtio/ringtest/ptr_ring.c +++ b/tools/virtio/ringtest/ptr_ring.c @@ -26,9 +26,12 @@ typedef int gfp_t; static void *kmalloc(unsigned size, gfp_t gfp) { - void *p = memalign(64, size); - if (!p) - return p; + void *p; + int ret; + + ret = posix_memalign(&p, 64, size); + if (ret < 0) + return NULL; if (gfp & __GFP_ZERO) memset(p, 0, size);