From patchwork Tue Oct 17 00:29:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 826660 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="fP95Folg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yGGnN4Jnvz9sP1 for ; Tue, 17 Oct 2017 11:50:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758618AbdJQAt4 (ORCPT ); Mon, 16 Oct 2017 20:49:56 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:56444 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933284AbdJQAre (ORCPT ); Mon, 16 Oct 2017 20:47:34 -0400 Received: by mail-pf0-f175.google.com with SMTP id b85so59034pfj.13 for ; Mon, 16 Oct 2017 17:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qWUMFu2CQnm9atAyyW5reMD4Czw9wO2vaUi4TdU2afU=; b=fP95FolgGvMc3pQiLf8JH9T7PpfwiHlo1B6KFNkaW9kibItqdS/fUtNDUpQGtIRT0g 5EHXT4+6/GjTdnAUlOf0V1K3BKosaNZxuMkZxih5MSaIDJTIknq/5B7isRM/zoMM74yl mk+dym89RztvqftrKrPEoBFw/BSij/CRn/IlI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qWUMFu2CQnm9atAyyW5reMD4Czw9wO2vaUi4TdU2afU=; b=UTRYH37CzxMN+Uj3o0hw5g7LeUVee/JnNycZ/4a0mVpdrBpWfgX2HyyYCVbRCKkpFJ 1ptFCQ2N7AGZGQBgp/pZN/Qmx7p1kpLwRt46RmBHVOHIKV7ZlUVPK4YkuuWrodI9nPKF oDqDgA97Wvsus365QyIschC7h4us2A/OtuzwSv/zpMvn0/bsZg/t6UlZS9fjLKvNnNmi 89udKjwwvo2KZZQt2eZm93JDeHYHkuf/pM302LuX0GRhYLtEOAx/IoJBN92BMyylZEyy s546Dcm8PHBYfr2a6HOpCiu2lEzkJAG/T/umsPSvbO2Ar2IxkYGlGx4VF6iVBXMDd87Y 5B9A== X-Gm-Message-State: AMCzsaVqehmp3bkMhOKtE+2qITAxhtOji7FBWn44Zbf1n8q4QM93r+eK KriMoSBTafFoPxn7bmcOO2rQYg== X-Google-Smtp-Source: AOwi7QDAEDq5vNs69H93mY/SxDZTAKKjPrA+BS0dsIRhDQh+gDg7OlE/S6lmysr9Jh5lFx2l93DPLw== X-Received: by 10.159.216.131 with SMTP id s3mr10281946plp.434.1508201253728; Mon, 16 Oct 2017 17:47:33 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id p70sm17117814pfk.130.2017.10.16.17.47.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:47:29 -0700 (PDT) From: Kees Cook To: "David S. Miller" Cc: Kees Cook , Wei Liu , Paul Durrant , xen-devel@lists.xenproject.org, netdev@vger.kernel.org, Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH 54/58] net/xen-netback: Convert timers to use timer_setup() Date: Mon, 16 Oct 2017 17:29:38 -0700 Message-Id: <1508200182-104605-55-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508200182-104605-1-git-send-email-keescook@chromium.org> References: <1508200182-104605-1-git-send-email-keescook@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Wei Liu Cc: Paul Durrant Cc: xen-devel@lists.xenproject.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook Acked-by: Wei Liu --- drivers/net/xen-netback/common.h | 2 +- drivers/net/xen-netback/interface.c | 2 +- drivers/net/xen-netback/netback.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 5b1d2e8402d9..a46a1e94505d 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h @@ -307,7 +307,7 @@ static inline struct xenbus_device *xenvif_to_xenbus_device(struct xenvif *vif) return to_xenbus_device(vif->dev->dev.parent); } -void xenvif_tx_credit_callback(unsigned long data); +void xenvif_tx_credit_callback(struct timer_list *t); struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index dcfcb153918c..5cbe0ae55a07 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -520,7 +520,7 @@ int xenvif_init_queue(struct xenvif_queue *queue) queue->credit_bytes = queue->remaining_credit = ~0UL; queue->credit_usec = 0UL; - setup_timer(&queue->credit_timeout, xenvif_tx_credit_callback, 0UL); + timer_setup(&queue->credit_timeout, xenvif_tx_credit_callback, 0); queue->credit_window_start = get_jiffies_64(); queue->rx_queue_max = XENVIF_RX_QUEUE_BYTES; diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 5042ff8d449a..a27daa23c9dc 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -183,9 +183,9 @@ static void tx_add_credit(struct xenvif_queue *queue) queue->rate_limited = false; } -void xenvif_tx_credit_callback(unsigned long data) +void xenvif_tx_credit_callback(struct timer_list *t) { - struct xenvif_queue *queue = (struct xenvif_queue *)data; + struct xenvif_queue *queue = from_timer(queue, t, credit_timeout); tx_add_credit(queue); xenvif_napi_schedule_or_enable_events(queue); } @@ -700,8 +700,6 @@ static bool tx_credit_exceeded(struct xenvif_queue *queue, unsigned size) /* Still too big to send right now? Set a callback. */ if (size > queue->remaining_credit) { - queue->credit_timeout.data = - (unsigned long)queue; mod_timer(&queue->credit_timeout, next_credit); queue->credit_window_start = next_credit;